Merge pull request #15074 from Expensify/update-staging-from-main

Update version to 1.2.70-1 on staging
Expensify · Feb 11, 2023 · d5ff4d0 · d5ff4d0
2 parents 78a3f6b + 8c30656
commit d5ff4d0
Show file tree

Hide file tree

Showing 12 changed files with 52 additions and 19 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -156,8 +156,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001027000
-        versionName "1.2.70-0"
+        versionCode 1001027001
+        versionName "1.2.70-1"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
         if (isNewArchitectureEnabled()) {

diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml
@@ -1,7 +1,7 @@
 <resources>
     <color name="bootsplash_background">#061B09</color>
     <color name="white">#FFFFFF</color>
-    <color name="accent">#0185ff</color>
+    <color name="accent">#03D47C</color>
     <color name="dark">#0b1b34</color>
     <color name="gray4">#7D8B8F</color>
 </resources>
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
@@ -5,7 +5,6 @@
 
     <!-- Base application theme. Applied to all Android versions -->
     <style name="BaseAppTheme" parent="Theme.AppCompat.NoActionBar">
-        <item name="android:textColor">@color/dark</item>
         <item name="android:colorEdgeEffect">@color/gray4</item>
         <item name="android:statusBarColor">#061B09</item>
         <item name="colorAccent">@color/accent</item>

diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.2.70.0</string>
+	<string>1.2.70.1</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.2.70.0</string>
+	<string>1.2.70.1</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.2.70-0",
+  "version": "1.2.70-1",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

diff --git a/src/components/Picker.js b/src/components/Picker.js
@@ -46,6 +46,9 @@ const propTypes = {
     // eslint-disable-next-line react/forbid-prop-types
     containerStyles: PropTypes.arrayOf(PropTypes.object),
 
+    /** Customize the Picker background color */
+    backgroundColor: PropTypes.string,
+
     /** The ID used to uniquely identify the input in a Form */
     inputID: PropTypes.string,
 
@@ -79,6 +82,7 @@ const defaultProps = {
     isDisabled: false,
     errorText: '',
     containerStyles: [],
+    backgroundColor: undefined,
     inputID: undefined,
     shouldSaveDraft: false,
     value: undefined,
@@ -88,7 +92,7 @@ const defaultProps = {
         <Icon
             src={Expensicons.DownArrow}
             // eslint-disable-next-line react/jsx-props-no-spreading
-            {...(size === 'small' ? {width: styles.pickerSmall.icon.width, height: styles.pickerSmall.icon.height} : {})}
+            {...(size === 'small' ? {width: styles.pickerSmall().icon.width, height: styles.pickerSmall().icon.height} : {})}
         />
     ),
     onBlur: () => {},
@@ -162,14 +166,18 @@ class Picker extends PureComponent {
                     ]}
                 >
                     {this.props.label && (
-                        <Text style={[styles.pickerLabel, styles.textLabelSupporting]}>{this.props.label}</Text>
+                        <Text pointerEvents="none" style={[styles.pickerLabel, styles.textLabelSupporting]}>
+                            {this.props.label}
+                        </Text>
                     )}
                     <RNPickerSelect
                         onValueChange={this.onInputChange}
 
                         // We add a text color to prevent white text on white background dropdown items on Windows
                         items={_.map(this.props.items, item => ({...item, color: themeColors.pickerOptionsTextColor}))}
-                        style={this.props.size === 'normal' ? styles.picker(this.props.isDisabled) : styles.pickerSmall}
+                        style={this.props.size === 'normal'
+                            ? styles.picker(this.props.isDisabled, this.props.backgroundColor)
+                            : styles.pickerSmall(this.props.backgroundColor)}
                         useNativeAndroidPickerStyle={false}
                         placeholder={this.placeholder}
                         value={this.props.value}

diff --git a/src/pages/workspace/reimburse/WorkspaceReimburseView.js b/src/pages/workspace/reimburse/WorkspaceReimburseView.js
@@ -8,6 +8,7 @@ import TextInput from '../../../components/TextInput';
 import Picker from '../../../components/Picker';
 import Text from '../../../components/Text';
 import styles from '../../../styles/styles';
+import themeColors from '../../../styles/themes/default';
 import withLocalize, {withLocalizePropTypes} from '../../../components/withLocalize';
 import * as Expensicons from '../../../components/Icon/Expensicons';
 import * as Illustrations from '../../../components/Icon/Illustrations';
@@ -277,6 +278,7 @@ class WorkspaceReimburseView extends React.Component {
                                     items={this.getUnitItems()}
                                     value={this.state.unitValue}
                                     onInputChange={value => this.setUnit(value)}
+                                    backgroundColor={themeColors.cardBG}
                                 />
                             </View>
                         </View>

diff --git a/src/styles/styles.js b/src/styles/styles.js
@@ -559,7 +559,7 @@ const styles = {
         height: 140,
     },
 
-    pickerSmall: {
+    pickerSmall: (backgroundColor = themeColors.highlightBG) => ({
         inputIOS: {
             fontFamily: fontFamily.EXP_NEUE,
             fontSize: variables.fontSizeSmall,
@@ -574,6 +574,16 @@ const styles = {
             opacity: 1,
             backgroundColor: 'transparent',
         },
+        done: {
+            color: themeColors.text,
+        },
+        modalViewMiddle: {
+            backgroundColor: themeColors.border,
+            borderTopWidth: 0,
+        },
+        modalViewBottom: {
+            backgroundColor: themeColors.highlightBG,
+        },
         inputWeb: {
             fontFamily: fontFamily.EXP_NEUE,
             fontSize: variables.fontSizeSmall,
@@ -588,7 +598,7 @@ const styles = {
             height: 26,
             opacity: 1,
             cursor: 'pointer',
-            backgroundColor: 'transparent',
+            backgroundColor,
         },
         inputAndroid: {
             fontFamily: fontFamily.EXP_NEUE,
@@ -602,6 +612,7 @@ const styles = {
             color: themeColors.text,
             height: 26,
             opacity: 1,
+            backgroundColor: 'transparent',
         },
         iconContainer: {
             top: 7,
@@ -611,7 +622,7 @@ const styles = {
             width: variables.iconSizeExtraSmall,
             height: variables.iconSizeExtraSmall,
         },
-    },
+    }),
 
     badge: {
         backgroundColor: themeColors.border,
@@ -839,6 +850,7 @@ const styles = {
         justifyContent: 'center',
         backgroundColor: 'transparent',
         height: variables.inputHeight,
+        overflow: 'hidden',
     },
 
     pickerContainerSmall: {
@@ -849,24 +861,36 @@ const styles = {
         position: 'absolute',
         left: 0,
         top: 6,
+        zIndex: 1,
     },
 
-    picker: (disabled = false) => ({
+    picker: (disabled = false, backgroundColor = themeColors.appBG) => ({
         iconContainer: {
             top: Math.round(variables.inputHeight * 0.5) - 11,
             right: 0,
-            zIndex: -1,
+            ...pointerEventsNone,
         },
 
         inputWeb: {
             appearance: 'none',
             cursor: disabled ? 'not-allowed' : 'pointer',
             ...picker,
+            backgroundColor,
         },
 
         inputIOS: {
             ...picker,
         },
+        done: {
+            color: themeColors.text,
+        },
+        modalViewMiddle: {
+            backgroundColor: themeColors.border,
+            borderTopWidth: 0,
+        },
+        modalViewBottom: {
+            backgroundColor: themeColors.highlightBG,
+        },
 
         inputAndroid: {
             ...picker,

diff --git a/src/styles/themes/default.js b/src/styles/themes/default.js
@@ -58,7 +58,7 @@ const darkTheme = {
     dropUIBG: 'rgba(6,27,9,0.92)',
     dropTransparentOverlay: 'rgba(255,255,255,0)',
     checkBox: colors.green,
-    pickerOptionsTextColor: colors.midnight,
+    pickerOptionsTextColor: colors.white,
     imageCropBackgroundColor: colors.greenIcons,
 };
 

diff --git a/web/index.html b/web/index.html
@@ -24,7 +24,7 @@
             height: 100% !important;
         }
         :root {
-            color-scheme: dark;
+            color-scheme: dark !important;
         }
         body {
            overflow: hidden;