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

Update version to 1.2.8-0 on staging
Expensify · Sep 27, 2022 · f72770c · f72770c
2 parents 89bb18c + 72ffedb
commit f72770c
Show file tree

Hide file tree

Showing 14 changed files with 48 additions and 27 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 1001020702
-        versionName "1.2.7-2"
+        versionCode 1001020800
+        versionName "1.2.8-0"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
         if (isNewArchitectureEnabled()) {

diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.7</string>
+	<string>1.2.8</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.2.7.2</string>
+	<string>1.2.8.0</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.7</string>
+	<string>1.2.8</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.2.7.2</string>
+	<string>1.2.8.0</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.7-2",
+  "version": "1.2.8-0",
   "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/CONST.js b/src/CONST.js
@@ -460,6 +460,7 @@ const CONST = {
         NUMBER_PAD: 'number-pad',
         DECIMAL_PAD: 'decimal-pad',
         VISIBLE_PASSWORD: 'visible-password',
+        EMAIL_ADDRESS: 'email-address',
     },
 
     ATTACHMENT_SOURCE_ATTRIBUTE: 'data-expensify-source',

diff --git a/src/components/AvatarCropModal/AvatarCropModal.js b/src/components/AvatarCropModal/AvatarCropModal.js
@@ -266,8 +266,7 @@ const AvatarCropModal = (props) => {
         <Modal
             onClose={props.onClose}
             isVisible={props.isVisible}
-            type={CONST.MODAL.MODAL_TYPE.CENTERED_UNSWIPEABLE}
-            containerStyle={!props.isSmallScreenWidth ? styles.avatarCropModalContainer : null}
+            type={CONST.MODAL.MODAL_TYPE.RIGHT_DOCKED}
             onModalHide={resetState}
             statusBarTranslucent={false}
         >

diff --git a/src/components/CopyTextToClipboard.js b/src/components/CopyTextToClipboard.js
@@ -56,6 +56,7 @@ class CopyTextToClipboard extends React.Component {
             <Text
                 onPress={this.copyToClipboard}
                 style={[styles.flexRow, styles.cursorPointer]}
+                suppressHighlighting
             >
                 <Text style={this.props.textStyles}>{this.props.text}</Text>
                 <Tooltip text={this.props.translate('reportActionContextMenu.copyToClipboard')}>

diff --git a/src/components/LHNOptionsList/LHNOptionsList.js b/src/components/LHNOptionsList/LHNOptionsList.js
@@ -26,6 +26,13 @@ const propTypes = {
 
     /** Callback to execute when the SectionList lays out */
     onLayout: PropTypes.func.isRequired,
+
+    /** Whether to allow option focus or not */
+    shouldDisableFocusOptions: PropTypes.bool,
+};
+
+const defaultProps = {
+    shouldDisableFocusOptions: false,
 };
 
 class LHNOptionsList extends Component {
@@ -69,7 +76,7 @@ class LHNOptionsList extends Component {
             <OptionRowLHN
                 reportID={item}
                 viewMode={this.props.optionMode}
-                isFocused={this.props.focusedIndex === index}
+                isFocused={!this.props.shouldDisableFocusOptions && this.props.focusedIndex === index}
                 onSelectRow={this.props.onSelectRow}
             />
         );
@@ -100,5 +107,6 @@ class LHNOptionsList extends Component {
 }
 
 LHNOptionsList.propTypes = propTypes;
+LHNOptionsList.defaultProps = defaultProps;
 
 export default LHNOptionsList;
diff --git a/src/libs/actions/BankAccounts.js b/src/libs/actions/BankAccounts.js
@@ -216,8 +216,27 @@ function validateBankAccount(bankAccountID, validateCode) {
     });
 }
 
+/**
+ * Create the bank account with manually entered data.
+ *
+ * @param {String} [bankAccountID]
+ * @param {String} [accountNumber]
+ * @param {String} [routingNumber]
+ * @param {String} [plaidMask]
+ *
+ */
+function connectBankAccountManually(bankAccountID, accountNumber, routingNumber, plaidMask) {
+    API.write('ConnectBankAccountManually', {
+        bankAccountID,
+        accountNumber,
+        routingNumber,
+        plaidMask,
+    }, getVBBADataForOnyx());
+}
+
 export {
     addPersonalBankAccount,
+    connectBankAccountManually,
     deletePaymentBankAccount,
     clearPersonalBankAccount,
     clearPlaid,

diff --git a/src/pages/ReimbursementAccount/BankAccountManualStep.js b/src/pages/ReimbursementAccount/BankAccountManualStep.js
@@ -72,15 +72,12 @@ class BankAccountManualStep extends React.Component {
         if (!this.validate()) {
             return;
         }
-
-        const params = {
-            bankAccountID: ReimbursementAccountUtils.getDefaultStateForField(this.props, 'bankAccountID', 0),
-            mask: ReimbursementAccountUtils.getDefaultStateForField(this.props, 'plaidMask'),
-            bankName: ReimbursementAccountUtils.getDefaultStateForField(this.props, 'bankName'),
-            plaidAccountID: ReimbursementAccountUtils.getDefaultStateForField(this.props, 'plaidAccountID'),
-            ...this.state,
-        };
-        BankAccounts.setupWithdrawalAccount(params);
+        BankAccounts.connectBankAccountManually(
+            ReimbursementAccountUtils.getDefaultStateForField(this.props, 'bankAccountID', 0),
+            this.state.accountNumber,
+            this.state.routingNumber,
+            ReimbursementAccountUtils.getDefaultStateForField(this.props, 'plaidMask'),
+        );
     }
 
     /**

diff --git a/src/pages/home/sidebar/SidebarLinks.js b/src/pages/home/sidebar/SidebarLinks.js
@@ -162,7 +162,7 @@ class SidebarLinks extends React.Component {
                         Navigation.navigate(ROUTES.getReportRoute(option.reportID));
                         this.props.onLinkClick();
                     }}
-                    disableFocusOptions={this.props.isSmallScreenWidth}
+                    shouldDisableFocusOptions={this.props.isSmallScreenWidth}
                     optionMode={this.props.priorityMode === CONST.PRIORITY_MODE.GSD ? 'compact' : 'default'}
                     onLayout={App.setSidebarLoaded}
                 />

diff --git a/src/pages/settings/AddSecondaryLoginPage.js b/src/pages/settings/AddSecondaryLoginPage.js
@@ -121,7 +121,7 @@ class AddSecondaryLoginPage extends Component {
                             value={this.state.login}
                             onChangeText={this.onSecondaryLoginChange}
                             keyboardType={this.formType === CONST.LOGIN_TYPE.PHONE
-                                ? CONST.KEYBOARD_TYPE.PHONE_PAD : undefined}
+                                ? CONST.KEYBOARD_TYPE.PHONE_PAD : CONST.KEYBOARD_TYPE.EMAIL_ADDRESS}
                             returnKeyType="done"
                         />
                     </View>

diff --git a/src/styles/styles.js b/src/styles/styles.js
@@ -2623,10 +2623,6 @@ const styles = {
         height: 153,
     },
 
-    avatarCropModalContainer: {
-        maxWidth: 450, // this width was chosen to match layout to average mobile device
-    },
-
     imageCropContainer: {
         borderRadius: variables.componentBorderRadiusCard,
         overflow: 'hidden',