Add missing params in vbba setup flow and clean up

src/libs/API/parameters/AcceptACHContractForBankAccount.ts

@@ -1,5 +1,5 @@
 import type {ACHContractStepProps} from '@src/types/form/ReimbursementAccountForm';
 
-type AcceptACHContractForBankAccount = ACHContractStepProps & {bankAccountID: number; canUseNewVbbaFlow?: boolean};
+type AcceptACHContractForBankAccount = ACHContractStepProps & {bankAccountID: number; policyID: string; canUseNewVbbaFlow?: boolean};
 
 export default AcceptACHContractForBankAccount;

src/libs/API/parameters/AddPersonalBankAccountParams.ts

@@ -1,8 +1,8 @@
 type AddPersonalBankAccountParams = {
-    addressName: string;
+    addressName?: string;
     routingNumber: string;
     accountNumber: string;
-    isSavings: boolean;
+    isSavings?: boolean;
     setupType: string;
     bank?: string;
     plaidAccountID: string;

src/libs/API/parameters/ConnectBankAccountParams.ts

@@ -0,0 +1,14 @@
+type ConnectBankAccountParams = {
+    bankAccountID: number;
+    routingNumber: string;
+    accountNumber: string;
+    bank?: string;
+    plaidAccountID?: string;
+    plaidAccessToken?: string;
+    plaidMask?: string;
+    isSavings?: boolean;
+    policyID?: string;
+    canUseNewVbbaFlow?: boolean;
+};
+
+export default ConnectBankAccountParams;

src/libs/API/parameters/OpenReimbursementAccountPageParams.ts

@@ -7,8 +7,8 @@ type OpenReimbursementAccountPageParams = {
     stepToOpen: ReimbursementAccountStep;
     subStep: ReimbursementAccountSubStep;
     localCurrentStep: ReimbursementAccountStep;
-    policyID?: string;
     canUseNewVbbaFlow?: boolean;
+    policyID: string;
 };
 
 export default OpenReimbursementAccountPageParams;

src/libs/API/parameters/OpenWorkspaceViewParams.ts

@@ -0,0 +1,5 @@
+type OpenWorkspaceViewParams = {
+    policyID: string;
+};
+
+export default OpenWorkspaceViewParams;

src/libs/API/parameters/UpdateBeneficialOwnersForBankAccountParams.ts

@@ -1,5 +1,5 @@
-import type {ACHContractStepProps} from '@src/types/form/ReimbursementAccountForm';
+import type {BeneficialOwnersStepProps} from '@src/types/form/ReimbursementAccountForm';
 
-type UpdateBeneficialOwnersForBankAccountParams = ACHContractStepProps & {bankAccountID: number; canUseNewVbbaFlow?: boolean};
+type UpdateBeneficialOwnersForBankAccountParams = BeneficialOwnersStepProps & {bankAccountID: number; policyID: string; canUseNewVbbaFlow?: boolean};
 
 export default UpdateBeneficialOwnersForBankAccountParams;

src/libs/API/parameters/UpdateCompanyInformationForBankAccountParams.ts

@@ -1,8 +1,5 @@
-import type {BankAccountStepProps, CompanyStepProps, ReimbursementAccountProps} from '@src/types/form/ReimbursementAccountForm';
+import type {CompanyStepProps} from '@src/types/form/ReimbursementAccountForm';
 
-type BankAccountCompanyInformation = BankAccountStepProps & CompanyStepProps & ReimbursementAccountProps;
-
-type UpdateCompanyInformationForBankAccountParams = BankAccountCompanyInformation & {bankAccountID: number; canUseNewVbbaFlow?: boolean};
+type UpdateCompanyInformationForBankAccountParams = CompanyStepProps & {bankAccountID: number; policyID: string; canUseNewVbbaFlow?: boolean};
 
 export default UpdateCompanyInformationForBankAccountParams;
-export type {BankAccountCompanyInformation};

src/libs/API/parameters/UpdatePersonalInformationForBankAccountParams.ts

@@ -1,5 +1,5 @@
 import type {RequestorStepProps} from '@src/types/form/ReimbursementAccountForm';
 
-type UpdatePersonalInformationForBankAccountParams = RequestorStepProps & {bankAccountID: number; canUseNewVbbaFlow: boolean};
+type UpdatePersonalInformationForBankAccountParams = RequestorStepProps & {bankAccountID: number; policyID: string; canUseNewVbbaFlow: boolean};
 
 export default UpdatePersonalInformationForBankAccountParams;

src/libs/API/parameters/ValidateBankAccountWithTransactionsParams.ts

@@ -1,6 +1,7 @@
 type ValidateBankAccountWithTransactionsParams = {
     bankAccountID: number;
     validateCode: string;
+    policyID: string;
 };
 
 export default ValidateBankAccountWithTransactionsParams;

src/libs/API/parameters/VerifyIdentityForBankAccountParams.ts

@@ -1,6 +1,7 @@
 type VerifyIdentityForBankAccountParams = {
     bankAccountID: number;
     onfidoData: string;
+    policyID: string;
     canUseNewVbbaFlow?: boolean;
 };
 export default VerifyIdentityForBankAccountParams;

src/libs/API/parameters/index.ts

@@ -9,8 +9,7 @@ export type {default as BeginAppleSignInParams} from './BeginAppleSignInParams';
 export type {default as BeginGoogleSignInParams} from './BeginGoogleSignInParams';
 export type {default as BeginSignInParams} from './BeginSignInParams';
 export type {default as CloseAccountParams} from './CloseAccountParams';
-export type {default as ConnectBankAccountManuallyParams} from './ConnectBankAccountManuallyParams';
-export type {default as ConnectBankAccountWithPlaidParams} from './ConnectBankAccountWithPlaidParams';
+export type {default as ConnectBankAccountParams} from './ConnectBankAccountParams';
 export type {default as DeleteContactMethodParams} from './DeleteContactMethodParams';
 export type {default as DeletePaymentBankAccountParams} from './DeletePaymentBankAccountParams';
 export type {default as DeletePaymentCardParams} from './DeletePaymentCardParams';
@@ -109,6 +108,7 @@ export type {default as UpdateWorkspaceAvatarParams} from './UpdateWorkspaceAvat
 export type {default as AddMembersToWorkspaceParams} from './AddMembersToWorkspaceParams';
 export type {default as DeleteMembersFromWorkspaceParams} from './DeleteMembersFromWorkspaceParams';
 export type {default as OpenWorkspaceParams} from './OpenWorkspaceParams';
+export type {default as OpenWorkspaceViewParams} from './OpenWorkspaceViewParams';
 export type {default as OpenWorkspaceReimburseViewParams} from './OpenWorkspaceReimburseViewParams';
 export type {default as OpenWorkspaceInvitePageParams} from './OpenWorkspaceInvitePageParams';
 export type {default as OpenWorkspaceMembersPageParams} from './OpenWorkspaceMembersPageParams';

src/libs/API/types.ts

@@ -160,7 +160,7 @@ type WriteCommandParameters = {
     [WRITE_COMMANDS.VALIDATE_BANK_ACCOUNT_WITH_TRANSACTIONS]: Parameters.ValidateBankAccountWithTransactionsParams;
     [WRITE_COMMANDS.UPDATE_COMPANY_INFORMATION_FOR_BANK_ACCOUNT]: Parameters.UpdateCompanyInformationForBankAccountParams;
     [WRITE_COMMANDS.UPDATE_BENEFICIAL_OWNERS_FOR_BANK_ACCOUNT]: UpdateBeneficialOwnersForBankAccountParams;
-    [WRITE_COMMANDS.CONNECT_BANK_ACCOUNT_MANUALLY]: Parameters.ConnectBankAccountManuallyParams;
+    [WRITE_COMMANDS.CONNECT_BANK_ACCOUNT_MANUALLY]: Parameters.ConnectBankAccountParams;
     [WRITE_COMMANDS.VERIFY_IDENTITY_FOR_BANK_ACCOUNT]: Parameters.VerifyIdentityForBankAccountParams;
     [WRITE_COMMANDS.BANK_ACCOUNT_HANDLE_PLAID_ERROR]: Parameters.BankAccountHandlePlaidErrorParams;
     [WRITE_COMMANDS.REPORT_VIRTUAL_EXPENSIFY_CARD_FRAUD]: Parameters.ReportVirtualExpensifyCardFraudParams;
@@ -213,7 +213,7 @@ type WriteCommandParameters = {
     [WRITE_COMMANDS.TWO_FACTOR_AUTH_VALIDATE]: Parameters.ValidateTwoFactorAuthParams;
     [WRITE_COMMANDS.ADD_COMMENT]: Parameters.AddCommentOrAttachementParams;
     [WRITE_COMMANDS.ADD_ATTACHMENT]: Parameters.AddCommentOrAttachementParams;
-    [WRITE_COMMANDS.CONNECT_BANK_ACCOUNT_WITH_PLAID]: Parameters.ConnectBankAccountWithPlaidParams;
+    [WRITE_COMMANDS.CONNECT_BANK_ACCOUNT_WITH_PLAID]: Parameters.ConnectBankAccountParams;
     [WRITE_COMMANDS.ADD_PERSONAL_BANK_ACCOUNT]: Parameters.AddPersonalBankAccountParams;
     [WRITE_COMMANDS.OPT_IN_TO_PUSH_NOTIFICATIONS]: Parameters.OptInOutToPushNotificationsParams;
     [WRITE_COMMANDS.OPT_OUT_OF_PUSH_NOTIFICATIONS]: Parameters.OptInOutToPushNotificationsParams;
@@ -325,7 +325,7 @@ type ReadCommand = ValueOf<typeof READ_COMMANDS>;
 type ReadCommandParameters = {
     [READ_COMMANDS.OPEN_APP]: Parameters.OpenAppParams;
     [READ_COMMANDS.OPEN_REIMBURSEMENT_ACCOUNT_PAGE]: Parameters.OpenReimbursementAccountPageParams;
-    [READ_COMMANDS.OPEN_WORKSPACE_VIEW]: EmptyObject;
+    [READ_COMMANDS.OPEN_WORKSPACE_VIEW]: Parameters.OpenWorkspaceViewParams;
     [READ_COMMANDS.GET_MAPBOX_ACCESS_TOKEN]: EmptyObject;
     [READ_COMMANDS.OPEN_PAYMENTS_PAGE]: EmptyObject;
     [READ_COMMANDS.OPEN_PERSONAL_DETAILS]: EmptyObject;

src/libs/actions/BankAccounts.ts

@@ -3,8 +3,7 @@ import * as API from '@libs/API';
 import type {
     AddPersonalBankAccountParams,
     BankAccountHandlePlaidErrorParams,
-    ConnectBankAccountManuallyParams,
-    ConnectBankAccountWithPlaidParams,
+    ConnectBankAccountParams,
     DeletePaymentBankAccountParams,
     OpenReimbursementAccountPageParams,
     ValidateBankAccountWithTransactionsParams,
@@ -152,13 +151,15 @@ function addBusinessWebsiteForDraft(websiteUrl: string) {
  * Submit Bank Account step with Plaid data so php can perform some checks.
  */
 function connectBankAccountWithPlaid(bankAccountID: number, selectedPlaidBankAccount: PlaidBankAccount, policyID: string) {
-    const parameters: ConnectBankAccountWithPlaidParams = {
+    const parameters: ConnectBankAccountParams = {
         bankAccountID,
         routingNumber: selectedPlaidBankAccount.routingNumber,
         accountNumber: selectedPlaidBankAccount.accountNumber,
         bank: selectedPlaidBankAccount.bankName,
         plaidAccountID: selectedPlaidBankAccount.plaidAccountID,
         plaidAccessToken: selectedPlaidBankAccount.plaidAccessToken,
+        plaidMask: selectedPlaidBankAccount.mask,
+        isSavings: selectedPlaidBankAccount.isSavings,
         canUseNewVbbaFlow: true,
         policyID,
     };
@@ -254,22 +255,24 @@ function deletePaymentBankAccount(bankAccountID: number) {
  * @param bankAccountID - ID for bank account
  * @param params - User personal data
  */
-function updatePersonalInformationForBankAccount(bankAccountID: number, params: RequestorStepProps) {
+function updatePersonalInformationForBankAccount(bankAccountID: number, params: RequestorStepProps, policyID: string) {
     API.write(
         WRITE_COMMANDS.UPDATE_PERSONAL_INFORMATION_FOR_BANK_ACCOUNT,
         {
             ...params,
             bankAccountID,
+            policyID,
             canUseNewVbbaFlow: true,
         },
         getVBBADataForOnyx(CONST.BANK_ACCOUNT.STEP.REQUESTOR),
     );
 }
 
-function validateBankAccount(bankAccountID: number, validateCode: string) {
+function validateBankAccount(bankAccountID: number, validateCode: string, policyID: string) {
     const parameters: ValidateBankAccountWithTransactionsParams = {
         bankAccountID,
         validateCode,
+        policyID,
     };
 
     const onyxData: OnyxData = {
@@ -363,12 +366,13 @@ function openReimbursementAccountPage(stepToOpen: ReimbursementAccountStep, subS
  * Updates the bank account in the database with the company step data
  * @param params - Business step form data
  */
-function updateCompanyInformationForBankAccount(bankAccountID: number, params: CompanyStepProps) {
+function updateCompanyInformationForBankAccount(bankAccountID: number, params: CompanyStepProps, policyID: string) {
     API.write(
         WRITE_COMMANDS.UPDATE_COMPANY_INFORMATION_FOR_BANK_ACCOUNT,
         {
             ...params,
             bankAccountID,
+            policyID,
             canUseNewVbbaFlow: true,
         },
         getVBBADataForOnyx(CONST.BANK_ACCOUNT.STEP.COMPANY),
@@ -379,12 +383,13 @@ function updateCompanyInformationForBankAccount(bankAccountID: number, params: C
  * Add beneficial owners for the bank account and verify the accuracy of the information provided
  * @param params - Beneficial Owners step form params
  */
-function updateBeneficialOwnersForBankAccount(bankAccountID: number, params: BeneficialOwnersStepProps) {
+function updateBeneficialOwnersForBankAccount(bankAccountID: number, params: BeneficialOwnersStepProps, policyID: string) {
     API.write(
         WRITE_COMMANDS.UPDATE_BENEFICIAL_OWNERS_FOR_BANK_ACCOUNT,
         {
             ...params,
             bankAccountID,
+            policyID,
             canUseNewVbbaFlow: true,
         },
         getVBBADataForOnyx(),
@@ -395,12 +400,13 @@ function updateBeneficialOwnersForBankAccount(bankAccountID: number, params: Ben
  * Accept the ACH terms and conditions and verify the accuracy of the information provided
  * @param params - Verification step form params
  */
-function acceptACHContractForBankAccount(bankAccountID: number, params: ACHContractStepProps) {
+function acceptACHContractForBankAccount(bankAccountID: number, params: ACHContractStepProps, policyID: string) {
     API.write(
         WRITE_COMMANDS.ACCEPT_ACH_CONTRACT_FOR_BANK_ACCOUNT,
         {
             ...params,
             bankAccountID,
+            policyID,
             canUseNewVbbaFlow: true,
         },
         getVBBADataForOnyx(),
@@ -409,14 +415,17 @@ function acceptACHContractForBankAccount(bankAccountID: number, params: ACHContr
 
 /**
  * Create the bank account with manually entered data.
- * @param plaidMask - scheme for Plaid account number
  */
-function connectBankAccountManually(bankAccountID: number, accountNumber?: string, routingNumber?: string, plaidMask?: string, policyID?: string) {
-    const parameters: ConnectBankAccountManuallyParams = {
+function connectBankAccountManually(bankAccountID: number, bankAccount: PlaidBankAccount, policyID: string) {
+    const parameters: ConnectBankAccountParams = {
         bankAccountID,
-        accountNumber,
-        routingNumber,
-        plaidMask,
+        routingNumber: bankAccount.routingNumber,
+        accountNumber: bankAccount.accountNumber,
+        bank: bankAccount.bankName,
+        plaidAccountID: bankAccount.plaidAccountID,
+        plaidAccessToken: bankAccount.plaidAccessToken,
+        plaidMask: bankAccount.mask,
+        isSavings: bankAccount.isSavings,
         canUseNewVbbaFlow: true,
         policyID,
     };
@@ -427,20 +436,23 @@ function connectBankAccountManually(bankAccountID: number, accountNumber?: strin
 /**
  * Verify the user's identity via Onfido
  */
-function verifyIdentityForBankAccount(bankAccountID: number, onfidoData: Record<string, unknown>) {
+function verifyIdentityForBankAccount(bankAccountID: number, onfidoData: Record<string, unknown>, policyID: string) {
     const parameters: VerifyIdentityForBankAccountParams = {
         bankAccountID,
         onfidoData: JSON.stringify(onfidoData),
+        policyID,
         canUseNewVbbaFlow: true,
     };
 
     API.write(WRITE_COMMANDS.VERIFY_IDENTITY_FOR_BANK_ACCOUNT, parameters, getVBBADataForOnyx());
 }
 
-function openWorkspaceView() {
+function openWorkspaceView(policyID: string) {
     API.read(
         READ_COMMANDS.OPEN_WORKSPACE_VIEW,
-        {},
+        {
+            policyID,
+        },
         {
             optimisticData: [
                 {

src/libs/actions/ReimbursementAccount/resetFreePlanBankAccount.js

@@ -9,8 +9,9 @@ import ONYXKEYS from '@src/ONYXKEYS';
  * Reset user's reimbursement account. This will delete the bank account.
  * @param {Number} bankAccountID
  * @param {Object} session
+ * @param {String} policyID
  */
-function resetFreePlanBankAccount(bankAccountID, session) {
+function resetFreePlanBankAccount(bankAccountID, session, policyID) {
     if (!bankAccountID) {
         throw new Error('Missing bankAccountID when attempting to reset free plan bank account');
     }
@@ -23,6 +24,7 @@ function resetFreePlanBankAccount(bankAccountID, session) {
         {
             bankAccountID,
             ownerEmail: session.email,
+            policyID,
         },
         {
             optimisticData: [

src/pages/ReimbursementAccount/BankAccountStep.js

@@ -97,7 +97,12 @@ function BankAccountStep(props) {
     };
 
     if (subStep === CONST.BANK_ACCOUNT.SETUP_TYPE.PLAID || subStep === CONST.BANK_ACCOUNT.SETUP_TYPE.MANUAL) {
-        return <BankInfo onBackButtonPress={props.onBackButtonPress} />;
+        return (
+            <BankInfo
+                onBackButtonPress={props.onBackButtonPress}
+                policyID={props.policyID}
+            />
+        );
     }
 
     return (

src/pages/ReimbursementAccount/BankInfo/BankInfo.tsx

@@ -31,6 +31,8 @@ type BankInfoOnyxProps = {
 
     /** The draft values of the bank account being setup */
     reimbursementAccountDraft: OnyxEntry<ReimbursementAccountForm>;
+
+    policyID: string;
 };
 
 type BankInfoProps = BankInfoOnyxProps & {
@@ -43,7 +45,7 @@ const manualSubsteps: Array<React.ComponentType<SubStepProps>> = [Manual, Confir
 const plaidSubsteps: Array<React.ComponentType<SubStepProps>> = [Plaid, Confirmation];
 const receivedRedirectURI = getPlaidOAuthReceivedRedirectURI();
 
-function BankInfo({reimbursementAccount, reimbursementAccountDraft, plaidLinkToken, onBackButtonPress}: BankInfoProps) {
+function BankInfo({reimbursementAccount, reimbursementAccountDraft, plaidLinkToken, onBackButtonPress, policyID}: BankInfoProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
 
@@ -57,15 +59,20 @@ function BankInfo({reimbursementAccount, reimbursementAccountDraft, plaidLinkTok
         setupType = CONST.BANK_ACCOUNT.SETUP_TYPE.PLAID;
     }
 
-    const policyID = reimbursementAccount?.achData?.policyID ?? '';
     const bankAccountID = Number(reimbursementAccount?.achData?.bankAccountID ?? '0');
     const submit = useCallback(() => {
         if (setupType === CONST.BANK_ACCOUNT.SETUP_TYPE.MANUAL) {
             BankAccounts.connectBankAccountManually(
                 bankAccountID,
-                values[BANK_INFO_STEP_KEYS.ACCOUNT_NUMBER],
-                values[BANK_INFO_STEP_KEYS.ROUTING_NUMBER],
-                values[BANK_INFO_STEP_KEYS.PLAID_MASK],
+                {
+                    [BANK_INFO_STEP_KEYS.ROUTING_NUMBER]: values[BANK_INFO_STEP_KEYS.ROUTING_NUMBER] ?? '',
+                    [BANK_INFO_STEP_KEYS.ACCOUNT_NUMBER]: values[BANK_INFO_STEP_KEYS.ACCOUNT_NUMBER] ?? '',
+                    [BANK_INFO_STEP_KEYS.BANK_NAME]: values[BANK_INFO_STEP_KEYS.BANK_NAME] ?? '',
+                    [BANK_INFO_STEP_KEYS.PLAID_ACCOUNT_ID]: values[BANK_INFO_STEP_KEYS.PLAID_ACCOUNT_ID] ?? '',
+                    [BANK_INFO_STEP_KEYS.PLAID_ACCESS_TOKEN]: values[BANK_INFO_STEP_KEYS.PLAID_ACCESS_TOKEN] ?? '',
+                    [BANK_INFO_STEP_KEYS.PLAID_MASK]: values[BANK_INFO_STEP_KEYS.PLAID_MASK] ?? '',
+                    [BANK_INFO_STEP_KEYS.IS_SAVINGS]: values[BANK_INFO_STEP_KEYS.IS_SAVINGS] ?? false,
+                },
                 policyID,
             );
         } else if (setupType === CONST.BANK_ACCOUNT.SETUP_TYPE.PLAID) {
@@ -77,6 +84,8 @@ function BankInfo({reimbursementAccount, reimbursementAccountDraft, plaidLinkTok
                     [BANK_INFO_STEP_KEYS.BANK_NAME]: values[BANK_INFO_STEP_KEYS.BANK_NAME] ?? '',
                     [BANK_INFO_STEP_KEYS.PLAID_ACCOUNT_ID]: values[BANK_INFO_STEP_KEYS.PLAID_ACCOUNT_ID] ?? '',
                     [BANK_INFO_STEP_KEYS.PLAID_ACCESS_TOKEN]: values[BANK_INFO_STEP_KEYS.PLAID_ACCESS_TOKEN] ?? '',
+                    [BANK_INFO_STEP_KEYS.PLAID_MASK]: values[BANK_INFO_STEP_KEYS.PLAID_MASK] ?? '',
+                    [BANK_INFO_STEP_KEYS.IS_SAVINGS]: values[BANK_INFO_STEP_KEYS.IS_SAVINGS] ?? false,
                 },
                 policyID,
             );