🍒 Cherry pick PR #11750 to staging 🍒

android/app/build.gradle

@@ -156,8 +156,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001021304
-        versionName "1.2.13-4"
+        versionCode 1001021305
+        versionName "1.2.13-5"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
         if (isNewArchitectureEnabled()) {

ios/NewExpensify/Info.plist

@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.2.13.4</string>
+	<string>1.2.13.5</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/NewExpensifyTests/Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.2.13.4</string>
+	<string>1.2.13.5</string>
 </dict>
 </plist>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.2.13-4",
+  "version": "1.2.13-5",
   "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.",

src/components/AddPlaidBankAccount.js

@@ -26,6 +26,9 @@ const propTypes = {
     /** Contains plaid data */
     plaidData: plaidDataPropTypes,
 
+    /** Selected account ID from the Picker associated with the end of the Plaid flow */
+    selectedPlaidAccountID: PropTypes.string,
+
     /** Plaid SDK token to use to initialize the widget */
     plaidLinkToken: PropTypes.string,
 
@@ -61,6 +64,7 @@ const defaultProps = {
         isLoading: false,
         error: '',
     },
+    selectedPlaidAccountID: '',
     plaidLinkToken: '',
     onExitPlaid: () => {},
     onSelect: () => {},
@@ -75,7 +79,6 @@ class AddPlaidBankAccount extends React.Component {
     constructor(props) {
         super(props);
 
-        this.selectAccount = this.selectAccount.bind(this);
         this.getPlaidLinkToken = this.getPlaidLinkToken.bind(this);
     }
 
@@ -88,15 +91,6 @@ class AddPlaidBankAccount extends React.Component {
         BankAccounts.openPlaidBankLogin(this.props.allowDebit, this.props.bankAccountID);
     }
 
-    /**
-     * Get list of bank accounts
-     *
-     * @returns {Object[]}
-     */
-    getPlaidBankAccounts() {
-        return lodashGet(this.props.plaidData, 'bankAccounts', []);
-    }
-
     /**
      * @returns {String}
      */
@@ -110,25 +104,13 @@ class AddPlaidBankAccount extends React.Component {
         }
     }
 
-    /**
-     * Triggered when user selects a Plaid bank account.
-     * @param {String} plaidAccountID
-     */
-    selectAccount(plaidAccountID) {
-        const selectedPlaidBankAccount = _.findWhere(this.getPlaidBankAccounts(), {plaidAccountID});
-        selectedPlaidBankAccount.bankName = this.props.plaidData.bankName;
-        selectedPlaidBankAccount.plaidAccessToken = this.props.plaidData.plaidAccessToken;
-        this.props.onSelect({selectedPlaidBankAccount});
-    }
-
     render() {
-        const plaidBankAccounts = this.getPlaidBankAccounts();
+        const plaidBankAccounts = lodashGet(this.props.plaidData, 'bankAccounts', []);
         const token = this.getPlaidLinkToken();
         const options = _.map(plaidBankAccounts, account => ({
-            value: account.plaidAccountID, label: `${account.addressName} ${account.mask}`,
+            value: account.plaidAccountID,
+            label: `${account.addressName} ${account.mask}`,
         }));
-        const institutionName = lodashGet(this.props, 'plaidData.institution.name', '');
-        const selectedPlaidBankAccount = lodashGet(this.props, 'plaidData.selectedPlaidBankAccount', {});
         const {icon, iconSize} = getBankIcon();
 
         // Plaid Link view
@@ -180,18 +162,18 @@ class AddPlaidBankAccount extends React.Component {
                         height={iconSize}
                         width={iconSize}
                     />
-                    <Text style={[styles.ml3, styles.textStrong]}>{institutionName}</Text>
+                    <Text style={[styles.ml3, styles.textStrong]}>{this.props.plaidData.bankName}</Text>
                 </View>
                 <View style={[styles.mb5]}>
                     <Picker
                         label={this.props.translate('addPersonalBankAccountPage.chooseAccountLabel')}
-                        onInputChange={this.selectAccount}
+                        onInputChange={this.props.onSelect}
                         items={options}
-                        placeholder={_.isUndefined(this.props.plaidData.selectedPlaidBankAccount) ? {
+                        placeholder={{
                             value: '',
                             label: this.props.translate('bankAccount.chooseAnAccount'),
-                        } : {}}
-                        value={selectedPlaidBankAccount.plaidAccountID}
+                        }}
+                        value={this.props.selectedPlaidAccountID}
                     />
                 </View>
             </View>

src/libs/actions/BankAccounts.js

@@ -141,6 +141,7 @@ function addPersonalBankAccount(account, password) {
                 value: {
                     isLoading: true,
                     errors: null,
+                    plaidAccountID: account.plaidAccountID,
                 },
             },
         ],

src/libs/actions/PaymentMethods.js

@@ -230,7 +230,7 @@ function addPaymentCard(params) {
 function clearDebitCardFormErrorAndSubmit() {
     Onyx.set(ONYXKEYS.FORMS.ADD_DEBIT_CARD_FORM, {
         isLoading: false,
-        error: null,
+        errors: null,
     });
 }
 

src/pages/AddPersonalBankAccountPage.js

@@ -27,10 +27,20 @@ import ROUTES from '../ROUTES';
 
 const propTypes = {
     ...withLocalizePropTypes,
+
+    /** The details about the Personal bank account we are adding saved in Onyx */
     personalBankAccount: PropTypes.shape({
+        /** An error message to display to the user */
         error: PropTypes.string,
+
+        /** Whether we should show the view that the bank account was successfully added */
         shouldShowSuccess: PropTypes.bool,
+
+        /** Whether the form is loading */
         isLoading: PropTypes.bool,
+
+        /** The account ID of the selected bank account from Plaid */
+        plaidAccountID: PropTypes.string,
     }),
 };
 
@@ -39,6 +49,7 @@ const defaultProps = {
         error: '',
         shouldShowSuccess: false,
         isLoading: false,
+        plaidAccountID: '',
     },
 };
 
@@ -50,7 +61,7 @@ class AddPersonalBankAccountPage extends React.Component {
         this.submit = this.submit.bind(this);
 
         this.state = {
-            selectedPlaidBankAccount: undefined,
+            selectedPlaidAccountID: this.props.personalBankAccount.plaidAccountID,
         };
     }
 
@@ -60,7 +71,8 @@ class AddPersonalBankAccountPage extends React.Component {
 
     /**
      * @param {Object} values - form input values passed by the Form component
-     * @returns {Ojbect}
+     * @param {Object} values.password The password of the user adding the bank account, for security.
+     * @returns {Object}
      */
     validate(values) {
         const errors = {};
@@ -74,9 +86,14 @@ class AddPersonalBankAccountPage extends React.Component {
 
     /**
      * @param {Object} values - form input values passed by the Form component
+     * @param {Object} values.password The password of the user adding the bank account, for security.
      */
     submit(values) {
-        BankAccounts.addPersonalBankAccount(this.state.selectedPlaidBankAccount, values.password);
+        const selectedPlaidBankAccount = _.findWhere(lodashGet(this.props.plaidData, 'bankAccounts', []), {
+            plaidAccountID: this.state.selectedPlaidAccountID,
+        });
+
+        BankAccounts.addPersonalBankAccount(selectedPlaidBankAccount, values.password);
     }
 
     render() {
@@ -121,23 +138,22 @@ class AddPersonalBankAccountPage extends React.Component {
                 ) : (
                     <Form
                         formID={ONYXKEYS.PERSONAL_BANK_ACCOUNT}
-                        isSubmitButtonVisible={!_.isUndefined(this.state.selectedPlaidBankAccount)}
+                        isSubmitButtonVisible={Boolean(this.state.selectedPlaidAccountID)}
                         submitButtonText={this.props.translate('common.saveAndContinue')}
                         onSubmit={this.submit}
                         validate={this.validate}
                         style={[styles.mh5, styles.flex1]}
                     >
                         <>
                             <AddPlaidBankAccount
-                                onSelect={(params) => {
-                                    this.setState({
-                                        selectedPlaidBankAccount: params.selectedPlaidBankAccount,
-                                    });
+                                onSelect={(selectedPlaidAccountID) => {
+                                    this.setState({selectedPlaidAccountID});
                                 }}
                                 onExitPlaid={Navigation.goBack}
                                 receivedRedirectURI={getPlaidOAuthReceivedRedirectURI()}
+                                selectedPlaidAccountID={this.state.selectedPlaidAccountID}
                             />
-                            {!_.isUndefined(this.state.selectedPlaidBankAccount) && (
+                            {Boolean(this.state.selectedPlaidAccountID) && (
                             <TextInput
                                 inputID="password"
                                 label={this.props.translate('addPersonalBankAccountPage.enterPassword')}
@@ -165,5 +181,8 @@ export default compose(
         personalBankAccount: {
             key: ONYXKEYS.PERSONAL_BANK_ACCOUNT,
         },
+        plaidData: {
+            key: ONYXKEYS.PLAID_DATA,
+        },
     }),
 )(AddPersonalBankAccountPage);

src/pages/ReimbursementAccount/BankAccountPlaidStep.js

@@ -2,6 +2,7 @@ import _ from 'underscore';
 import React from 'react';
 import {withOnyx} from 'react-native-onyx';
 import PropTypes from 'prop-types';
+import lodashGet from 'lodash/get';
 import HeaderWithCloseButton from '../../components/HeaderWithCloseButton';
 import CONST from '../../CONST';
 import * as BankAccounts from '../../libs/actions/BankAccounts';
@@ -37,27 +38,28 @@ class BankAccountPlaidStep extends React.Component {
     }
 
     submit() {
-        const selectedPlaidBankAccount = this.props.plaidData.selectedPlaidBankAccount;
-        if (!selectedPlaidBankAccount) {
-            return;
-        }
+        const selectedPlaidBankAccount = _.findWhere(lodashGet(this.props.plaidData, 'bankAccounts', []), {
+            plaidAccountID: ReimbursementAccountUtils.getDefaultStateForField(this.props, 'plaidAccountID'),
+        });
 
-        ReimbursementAccount.updateReimbursementAccountDraft({
+        const bankAccountData = {
             routingNumber: selectedPlaidBankAccount.routingNumber,
             accountNumber: selectedPlaidBankAccount.accountNumber,
             plaidMask: selectedPlaidBankAccount.mask,
             isSavings: selectedPlaidBankAccount.isSavings,
-            bankName: selectedPlaidBankAccount.bankName,
+            bankName: this.props.plaidData.bankName,
             plaidAccountID: selectedPlaidBankAccount.plaidAccountID,
-            plaidAccessToken: selectedPlaidBankAccount.plaidAccessToken,
-        });
+            plaidAccessToken: this.props.plaidData.plaidAccessToken,
+        };
+        ReimbursementAccount.updateReimbursementAccountDraft(bankAccountData);
 
         const bankAccountID = ReimbursementAccountUtils.getDefaultStateForField(this.props, 'bankAccountID', 0);
-        BankAccounts.connectBankAccountWithPlaid(bankAccountID, selectedPlaidBankAccount);
+        BankAccounts.connectBankAccountWithPlaid(bankAccountID, bankAccountData);
     }
 
     render() {
         const bankAccountID = ReimbursementAccountUtils.getDefaultStateForField(this.props, 'bankAccountID', 0);
+        const selectedPlaidAccountID = ReimbursementAccountUtils.getDefaultStateForField(this.props, 'plaidAccountID', '');
 
         return (
             <>
@@ -76,18 +78,19 @@ class BankAccountPlaidStep extends React.Component {
                     onSubmit={this.submit}
                     submitButtonText={this.props.translate('common.saveAndContinue')}
                     style={[styles.mh5, styles.flexGrow1]}
-                    isSubmitButtonVisible={!_.isUndefined(this.props.plaidData.selectedPlaidBankAccount)}
+                    isSubmitButtonVisible={Boolean(selectedPlaidAccountID)}
                 >
                     <AddPlaidBankAccount
                         text={this.props.translate('bankAccount.plaidBodyCopy')}
-                        onSelect={(params) => {
-                            BankAccounts.updatePlaidData({selectedPlaidBankAccount: params.selectedPlaidBankAccount});
+                        onSelect={(plaidAccountID) => {
+                            ReimbursementAccount.updateReimbursementAccountDraft({plaidAccountID});
                         }}
                         onExitPlaid={() => BankAccounts.setBankAccountSubStep(null)}
                         receivedRedirectURI={this.props.receivedRedirectURI}
                         plaidLinkOAuthToken={this.props.plaidLinkOAuthToken}
                         allowDebit
                         bankAccountID={bankAccountID}
+                        selectedPlaidAccountID={selectedPlaidAccountID}
                     />
                 </Form>
             </>

src/pages/ReimbursementAccount/BankAccountStep.js

@@ -25,8 +25,12 @@ import getPlaidDesktopMessage from '../../libs/getPlaidDesktopMessage';
 import CONFIG from '../../CONFIG';
 import ROUTES from '../../ROUTES';
 import Button from '../../components/Button';
+import plaidDataPropTypes from './plaidDataPropTypes';
 
 const propTypes = {
+    /** Contains plaid data */
+    plaidData: plaidDataPropTypes,
+
     /** The OAuth URI + stateID needed to re-initialize the PlaidLink after the user logs into their bank */
     receivedRedirectURI: PropTypes.string,
 
@@ -45,6 +49,9 @@ const propTypes = {
 const defaultProps = {
     receivedRedirectURI: null,
     plaidLinkOAuthToken: '',
+    plaidData: {
+        isPlaidDisabled: false,
+    },
     user: {},
 };
 
@@ -105,7 +112,7 @@ const BankAccountStep = (props) => {
                         BankAccounts.clearPlaid();
                         BankAccounts.setBankAccountSubStep(CONST.BANK_ACCOUNT.SETUP_TYPE.PLAID);
                     }}
-                    disabled={props.isPlaidDisabled || !props.user.validated}
+                    disabled={props.plaidData.isPlaidDisabled || !props.user.validated}
                     style={[styles.mt5, styles.buttonCTA]}
                     iconStyles={[styles.buttonCTAIcon]}
                     shouldShowRightIcon
@@ -168,5 +175,8 @@ export default compose(
         reimbursementAccount: {
             key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
         },
+        plaidData: {
+            key: ONYXKEYS.PLAID_DATA,
+        },
     }),
 )(BankAccountStep);