Migrate BankAccount_SetupWithdrawalAccount API

src/CONST.js

@@ -6,8 +6,40 @@ const CONST = {
         IOS: 'https://apps.apple.com/us/app/expensify-cash/id1530278510',
         DESKTOP: 'https://expensify.cash/Expensify.cash.dmg',
     },
+    SMS: {
+        DOMAIN: '@expensify.sms',
+    },
     BANK_ACCOUNT: {
-        ADD_METHOD: {
+        STEP: {
+            BANK_ACCOUNT: 'BankAccountStep',
+            COMPANY: 'CompanyStep',
+            REQUESTOR: 'RequestorStep',
+            ACH_CONTRACT: 'ACHContractStep',
+            VALIDATION: 'ValidationStep',
+            ENABLE: 'EnableStep',
+        },
+        SUBSTEP: {
+            MANUAL: 'manual',
+        },
+        VERIFICATIONS: {
+            ERROR_MESSAGE: 'verifications.errorMessage',
+            EXTERNAL_API_RESPONSES: 'verifications.externalApiResponses',
+            REQUESTOR_IDENTITY_ID: 'verifications.externalApiResponses.requestorIdentityID',
+            REQUESTOR_IDENTITY_ONFIDO: 'verifications.externalApiResponses.requestorIdentityOnfido',
+            THROTTLED: 'verifications.throttled',
+        },
+        FIELDS_TYPE: {
+            LOCAL: 'local',
+        },
+        ONFIDO_RESPONSE: {
+            SDK_TOKEN: 'apiResult.sdkToken',
+            PASS: 'pass',
+        },
+        QUESTIONS: {
+            QUESTION: 'apiResult.questions.question',
+            DIFFERENTIATOR_QUESTION: 'apiResult.differentiator-question',
+        },
+        SETUP_TYPE: {
             MANUAL: 'manual',
             PLAID: 'plaid',
         },
@@ -30,6 +62,12 @@ const CONST = {
         PRESSED: 'pressed',
         COMPLETE: 'complete',
     },
+    COUNTRY: {
+        US: 'US',
+        MX: 'MX',
+        AU: 'AU',
+        CA: 'CA',
+    },
     PLATFORM: {
         IOS: 'ios',
         ANDROID: 'android',
@@ -120,6 +158,8 @@ const CONST = {
         PAYPAL_ME_ADDRESS: 'expensify_payPalMeAddress',
         PRIORITY_MODE: 'priorityMode',
         TIMEZONE: 'timeZone',
+        FREE_PLAN_BANK_ACCOUNT_ID: 'expensify_freePlanBankAccountID',
+        ACH_DATA_THROTTLED: 'expensify_ACHData_throttled',
     },
     DEFAULT_TIME_ZONE: {automatic: true, selected: 'America/Los_Angeles'},
     DEFAULT_ACCOUNT_DATA: {error: '', success: '', loading: false},

src/ONYXKEYS.js

@@ -98,4 +98,7 @@ export default {
 
     // Object containing Wallet terms step state
     WALLET_TERMS: 'walletTerms',
+
+    // Stores information about the active reimbursement account being set up
+    REIMBURSEMENT_ACCOUNT: 'reimbursementAccount',
 };

src/ROUTES.js

@@ -9,7 +9,7 @@ const REPORT = 'r';
 
 export default {
     ADD_PERSONAL_BANK_ACCOUNT: 'add-personal-bank-account',
-    BANK_ACCOUNT_NEW: 'bank-account/new',
+    ADD_VERIFIED_BANK_ACCOUNT: 'add-verified-bank-account',
     HOME: '',
     SETTINGS: 'settings',
     SETTINGS_PROFILE: 'settings/profile',

src/languages/en.js

@@ -273,6 +273,8 @@ export default {
         plaidBodyCopy: 'Give your employees an easier way to pay - and get paid back - for company expenses.',
         checkHelpLine: 'Your routing number and account number can be found on a check for the account.',
         iAcceptThe: 'I accept the ',
+        hasPhoneLoginError: 'To add a verified bank account please ensure your primary login is a valid email and try again. You can add your phone number as a secondary login.',
+        hasBeenThrottledError: ({fromNow}) => `For security reasons, we're taking a break from bank account setup so you can double-check your company information. Please try again ${fromNow}. Sorry!`,
     },
     addPersonalBankAccountPage: {
         enterPassword: 'Enter password',

src/languages/es.js

@@ -265,6 +265,8 @@ export default {
         plaidBodyCopy: 'Ofrezca a sus empleados una forma más sencilla de pagar - y recuperar - los gastos de la empresa.',
         checkHelpLine: 'Su número de ruta y número de cuenta se pueden encontrar en un cheque para la cuenta.',
         iAcceptThe: 'Acepto los ',
+        hasPhoneLoginError: 'Para agregar una cuenta bancaria verificada, asegúrese de que su inicio de sesión principal sea un correo electrónico válido y vuelva a intentarlo. Puede agregar su número de teléfono como inicio de sesión secundario.',
+        hasBeenThrottledError: ({fromNow}) => `Por razones de seguridad, nos tomamos un descanso de la configuración de la cuenta bancaria para que pueda verificar la información de su empresa. Inténtalo de nuevo ${fromNow}. Lo siento!`,
     },
     addPersonalBankAccountPage: {
         enterPassword: 'Escribe una contraseña',

src/libs/API.js

@@ -812,6 +812,48 @@ function BankAccount_Create(parameters) {
     return Network.post(commandName, parameters, CONST.NETWORK.METHOD.POST, true);
 }
 
+/**
+ * @param {*} parameters
+ * @returns {Promise}
+ */
+function BankAccount_SetupWithdrawal(parameters) {
+    const commandName = 'BankAccount_SetupWithdrawal';
+    let allowedParameters = [
+        'currentStep', 'policyID', 'bankAccountID', 'useOnfido', 'errorAttemptsCount',
+
+        // data from bankAccount step:
+        'setupType', 'routingNumber', 'accountNumber', 'addressName', 'plaidAccountID', 'ownershipType', 'isSavings',
+        'acceptTerms', 'bankName', 'plaidAccessToken', 'alternateRoutingNumber',
+
+        // data from company step:
+        'companyName', 'companyTaxID', 'addressStreet', 'addressCity', 'addressState', 'addressZipCode',
+        'hasNoConnectionToCannabis', 'incorporationType', 'incorporationState', 'incorporationDate', 'industryCode',
+        'website', 'companyPhone', 'ficticiousBusinessName',
+
+        // data from requestor step:
+        'firstName', 'lastName', 'dob', 'requestorAddressStreet', 'requestorAddressCity', 'requestorAddressState',
+        'requestorAddressZipCode', 'isOnfidoSetupComplete', 'onfidoData', 'isControllingOfficer', 'ssnLast4',
+
+        // data from ACHContract step (which became the "Beneficial Owners" step, but the key is still ACHContract as
+        // it's used in several logic:
+        'ownsMoreThan25Percent', 'beneficialOwners', 'acceptTermsAndConditions', 'certifyTrueInformation',
+    ];
+
+    if (!parameters.useOnfido) {
+        allowedParameters = allowedParameters.concat(['passport', 'answers']);
+    }
+
+    // Only keep allowed parameters in the additionalData object
+    const additionalData = _.pick(parameters, allowedParameters);
+
+    requireParameters(['currentStep'], parameters, commandName);
+    return Network.post(
+        commandName, {additionalData: JSON.stringify(additionalData), password: parameters.password},
+        CONST.NETWORK.METHOD.POST,
+        true,
+    );
+}
+
 /**
  * @param {Object} parameters
  * @param {String[]} data
@@ -850,6 +892,7 @@ export {
     Authenticate,
     BankAccount_Create,
     BankAccount_Get,
+    BankAccount_SetupWithdrawal,
     ChangePassword,
     CreateChatReport,
     CreateLogin,

src/libs/Navigation/AppNavigator/AuthScreens.js

@@ -49,8 +49,8 @@ import {
     NewChatModalStackNavigator,
     SettingsModalStackNavigator,
     EnablePaymentsStackNavigator,
-    BusinessBankAccountModalStackNavigator,
     AddPersonalBankAccountModalStackNavigator,
+    ReimbursementAccountModalStackNavigator,
     NewWorkspaceStackNavigator,
 } from './ModalStackNavigators';
 import SCREENS from '../../../SCREENS';
@@ -278,15 +278,15 @@ class AuthScreens extends React.Component {
                     listeners={modalScreenListeners}
                 />
                 <RootStack.Screen
-                    name="NewWorkspace"
+                    name="ReimbursementAccount"
                     options={modalScreenOptions}
-                    component={NewWorkspaceStackNavigator}
+                    component={ReimbursementAccountModalStackNavigator}
+                    listeners={modalScreenListeners}
                 />
                 <RootStack.Screen
-                    name="BusinessBankAccount"
+                    name="NewWorkspace"
                     options={modalScreenOptions}
-                    component={BusinessBankAccountModalStackNavigator}
-                    listeners={modalScreenListeners}
+                    component={NewWorkspaceStackNavigator}
                 />
             </RootStack.Navigator>
         );

src/libs/Navigation/AppNavigator/ModalStackNavigators.js

@@ -20,8 +20,8 @@ import SettingsAddSecondaryLoginPage from '../../../pages/settings/AddSecondaryL
 import IOUCurrencySelection from '../../../pages/iou/IOUCurrencySelection';
 import ReportParticipantsPage from '../../../pages/ReportParticipantsPage';
 import EnablePaymentsPage from '../../../pages/EnablePayments';
-import BusinessBankAccountNewPage from '../../../pages/BusinessBankAccount/NewPage';
 import AddPersonalBankAccountPage from '../../../pages/AddPersonalBankAccountPage';
+import ReimbursementAccountPage from '../../../pages/ReimbursementAccount/ReimbursementAccountPage';
 import NewWorkspacePage from '../../../pages/workspace/NewWorkspacePage';
 
 const defaultSubRouteOptions = {
@@ -154,18 +154,16 @@ const AddPersonalBankAccountModalStackNavigator = createModalStackNavigator([{
     name: 'AddPersonalBankAccount_Root',
 }]);
 
+const ReimbursementAccountModalStackNavigator = createModalStackNavigator([{
+    Component: ReimbursementAccountPage,
+    name: 'ReimbursementAccount_Root',
+}]);
+
 const NewWorkspaceStackNavigator = createModalStackNavigator([{
     Component: NewWorkspacePage,
     name: 'NewWorkspace_Root',
 }]);
 
-const BusinessBankAccountModalStackNavigator = createModalStackNavigator([
-    {
-        Component: BusinessBankAccountNewPage,
-        name: 'BusinessBankAccount_New',
-    },
-]);
-
 export {
     IOUBillStackNavigator,
     IOURequestModalStackNavigator,
@@ -177,7 +175,7 @@ export {
     NewChatModalStackNavigator,
     SettingsModalStackNavigator,
     EnablePaymentsStackNavigator,
-    BusinessBankAccountModalStackNavigator,
     AddPersonalBankAccountModalStackNavigator,
+    ReimbursementAccountModalStackNavigator,
     NewWorkspaceStackNavigator,
 };

src/libs/Navigation/linkingConfig.js

@@ -109,14 +109,14 @@ export default {
                     AddPersonalBankAccount_Root: ROUTES.ADD_PERSONAL_BANK_ACCOUNT,
                 },
             },
-            BusinessBankAccount: {
+            EnablePayments: {
                 screens: {
-                    BusinessBankAccount_New: ROUTES.BANK_ACCOUNT_NEW,
+                    EnablePayments_Root: ROUTES.ENABLE_PAYMENTS,
                 },
             },
-            EnablePayments: {
+            ReimbursementAccount: {
                 screens: {
-                    EnablePayments_Root: ROUTES.ENABLE_PAYMENTS,
+                    ReimbursementAccount_Root: ROUTES.ADD_VERIFIED_BANK_ACCOUNT,
                 },
             },
             NewWorkspace: {