Merge pull request #52812 from callstack-internal/feature/GR-step-two…

…-api-integration

feat: Update corpay fields logic, integrate API

src/CONST.ts

@@ -665,6 +665,7 @@ const CONST = {
                 HANG_TIGHT: 4,
             },
         },
+        BANK_INFO_STEP_ACCOUNT_HOLDER_KEY_PREFIX: 'accountHolder',
     },
     INCORPORATION_TYPES: {
         LLC: 'LLC',

src/ONYXKEYS.ts

@@ -458,6 +458,9 @@ const ONYXKEYS = {
     /** The user's Concierge reportID */
     CONCIERGE_REPORT_ID: 'conciergeReportID',
 
+    /* Corpay fieds to be used in the bank account creation setup */
+    CORPAY_FIELDS: 'corpayFields',
+
     /** The user's session that will be preserved when using imported state */
     PRESERVED_USER_SESSION: 'preservedUserSession',
 
@@ -1027,6 +1030,7 @@ type OnyxValuesMapping = {
     [ONYXKEYS.IS_USING_IMPORTED_STATE]: boolean;
     [ONYXKEYS.NVP_EXPENSIFY_COMPANY_CARDS_CUSTOM_NAMES]: Record<string, string>;
     [ONYXKEYS.CONCIERGE_REPORT_ID]: string;
+    [ONYXKEYS.CORPAY_FIELDS]: OnyxTypes.CorpayFields;
     [ONYXKEYS.PRESERVED_USER_SESSION]: OnyxTypes.Session;
     [ONYXKEYS.NVP_DISMISSED_PRODUCT_TRAINING]: OnyxTypes.DismissedProductTraining;
 };

src/libs/API/parameters/BankAccountCreateCorpayParams.ts

@@ -0,0 +1,8 @@
+type BankAccountCreateCorpayParams = {
+    type: number;
+    isSavings: boolean;
+    isWithdrawal: boolean;
+    inputs: string;
+};
+
+export default BankAccountCreateCorpayParams;

src/libs/API/parameters/GetCorpayBankAccountFieldsParams.ts

@@ -0,0 +1,8 @@
+type GetCorpayBankAccountFieldsParams = {
+    countryISO: string;
+    currency: string;
+    isWithdrawal: boolean;
+    isBusinessBankAccount: boolean;
+};
+
+export default GetCorpayBankAccountFieldsParams;

src/libs/API/parameters/VerifyIdentityForBankAccountParams.ts

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

src/libs/API/parameters/index.ts

@@ -8,6 +8,7 @@ export type {default as RestartBankAccountSetupParams} from './RestartBankAccoun
 export type {default as AddSchoolPrincipalParams} from './AddSchoolPrincipalParams';
 export type {default as AuthenticatePusherParams} from './AuthenticatePusherParams';
 export type {default as BankAccountHandlePlaidErrorParams} from './BankAccountHandlePlaidErrorParams';
+export type {default as BankAccountCreateCorpayParams} from './BankAccountCreateCorpayParams';
 export type {default as BeginAppleSignInParams} from './BeginAppleSignInParams';
 export type {default as BeginGoogleSignInParams} from './BeginGoogleSignInParams';
 export type {default as BeginSignInParams} from './BeginSignInParams';
@@ -29,6 +30,7 @@ export type {default as ExpandURLPreviewParams} from './ExpandURLPreviewParams';
 export type {default as GetMissingOnyxMessagesParams} from './GetMissingOnyxMessagesParams';
 export type {default as GetNewerActionsParams} from './GetNewerActionsParams';
 export type {default as GetOlderActionsParams} from './GetOlderActionsParams';
+export type {default as GetCorpayBankAccountFieldsParams} from './GetCorpayBankAccountFieldsParams';
 export type {default as GetPolicyCategoriesParams} from './GetPolicyCategories';
 export type {default as GetReportPrivateNoteParams} from './GetReportPrivateNoteParams';
 export type {default as GetRouteParams} from './GetRouteParams';

src/libs/API/types.ts

@@ -440,6 +440,7 @@ const WRITE_COMMANDS = {
     SELF_TOUR_VIEWED: 'SelfTourViewed',
     UPDATE_INVOICE_COMPANY_NAME: 'UpdateInvoiceCompanyName',
     UPDATE_INVOICE_COMPANY_WEBSITE: 'UpdateInvoiceCompanyWebsite',
+    BANK_ACCOUNT_CREATE_CORPAY: 'BankAccount_CreateCorpay',
     UPDATE_WORKSPACE_CUSTOM_UNIT: 'UpdateWorkspaceCustomUnit',
     VALIDATE_USER_AND_GET_ACCESSIBLE_POLICIES: 'ValidateUserAndGetAccessiblePolicies',
     DISMISS_PRODUCT_TRAINING: 'DismissProductTraining',
@@ -774,6 +775,7 @@ type WriteCommandParameters = {
     [WRITE_COMMANDS.HOLD_MONEY_REQUEST_ON_SEARCH]: Parameters.HoldMoneyRequestOnSearchParams;
     [WRITE_COMMANDS.APPROVE_MONEY_REQUEST_ON_SEARCH]: Parameters.ApproveMoneyRequestOnSearchParams;
     [WRITE_COMMANDS.UNHOLD_MONEY_REQUEST_ON_SEARCH]: Parameters.UnholdMoneyRequestOnSearchParams;
+    [WRITE_COMMANDS.BANK_ACCOUNT_CREATE_CORPAY]: Parameters.BankAccountCreateCorpayParams;
 
     [WRITE_COMMANDS.REQUEST_REFUND]: null;
     [WRITE_COMMANDS.CONNECT_POLICY_TO_SAGE_INTACCT]: Parameters.ConnectPolicyToSageIntacctParams;
@@ -902,6 +904,7 @@ type WriteCommandParameters = {
 };
 
 const READ_COMMANDS = {
+    GET_CORPAY_BANK_ACCOUNT_FIELDS: 'GetCorpayBankAccountFields',
     CONNECT_POLICY_TO_QUICKBOOKS_ONLINE: 'ConnectPolicyToQuickbooksOnline',
     CONNECT_POLICY_TO_XERO: 'ConnectPolicyToXero',
     SYNC_POLICY_TO_QUICKBOOKS_ONLINE: 'SyncPolicyToQuickbooksOnline',
@@ -983,6 +986,7 @@ type ReadCommandParameters = {
     [READ_COMMANDS.OPEN_PLAID_BANK_ACCOUNT_SELECTOR]: Parameters.OpenPlaidBankAccountSelectorParams;
     [READ_COMMANDS.GET_OLDER_ACTIONS]: Parameters.GetOlderActionsParams;
     [READ_COMMANDS.GET_NEWER_ACTIONS]: Parameters.GetNewerActionsParams;
+    [READ_COMMANDS.GET_CORPAY_BANK_ACCOUNT_FIELDS]: Parameters.GetCorpayBankAccountFieldsParams;
     [READ_COMMANDS.EXPAND_URL_PREVIEW]: Parameters.ExpandURLPreviewParams;
     [READ_COMMANDS.GET_REPORT_PRIVATE_NOTE]: Parameters.GetReportPrivateNoteParams;
     [READ_COMMANDS.OPEN_ROOM_MEMBERS_PAGE]: Parameters.OpenRoomMembersPageParams;

src/libs/actions/BankAccounts.ts

@@ -20,7 +20,7 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type {Route} from '@src/ROUTES';
 import type {PersonalBankAccountForm} from '@src/types/form';
-import type {ACHContractStepProps, BeneficialOwnersStepProps, CompanyStepProps, RequestorStepProps} from '@src/types/form/ReimbursementAccountForm';
+import type {ACHContractStepProps, BeneficialOwnersStepProps, CompanyStepProps, ReimbursementAccountForm, RequestorStepProps} from '@src/types/form/ReimbursementAccountForm';
 import type PlaidBankAccount from '@src/types/onyx/PlaidBankAccount';
 import type {BankAccountStep, ReimbursementAccountStep, ReimbursementAccountSubStep} from '@src/types/onyx/ReimbursementAccount';
 import type {OnyxData} from '@src/types/onyx/Request';
@@ -334,7 +334,7 @@ function validateBankAccount(bankAccountID: number, validateCode: string, policy
                 key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
                 value: {
                     isLoading: false,
-                    errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('bankAccount.error.validationAmounts'),
+                    errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
                 },
             },
         ],
@@ -344,166 +344,104 @@ function validateBankAccount(bankAccountID: number, validateCode: string, policy
 }
 
 function getCorpayBankAccountFields(country: string, currency: string) {
-    // TODO - Use parameters when API is ready
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     const parameters = {
         countryISO: country,
         currency,
         isWithdrawal: true,
         isBusinessBankAccount: true,
     };
 
-    // return API.read(READ_COMMANDS.GET_CORPAY_BANK_ACCOUNT_FIELDS, parameters);
-    return {
-        bankCountry: 'AU',
-        bankCurrency: 'AUD',
-        classification: 'Business',
-        destinationCountry: 'AU',
-        formFields: [
+    const onyxData: OnyxData = {
+        optimisticData: [
             {
-                errorMessage: 'Swift must be less than 12 characters',
-                id: 'swiftBicCode',
-                isRequired: false,
-                isRequiredInValueSet: true,
-                label: 'Swift Code',
-                regEx: '^.{0,12}$',
-                validationRules: [
-                    {
-                        errorMessage: 'Swift must be less than 12 characters',
-                        regEx: '^.{0,12}$',
-                    },
-                    {
-                        errorMessage: 'The following characters are not allowed: <,>, "',
-                        regEx: '^[^<>\\x22]*$',
-                    },
-                ],
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: ONYXKEYS.CORPAY_FIELDS,
+                value: {
+                    isLoading: true,
+                    isSuccess: false,
+                },
             },
+        ],
+        successData: [
             {
-                errorMessage: 'Beneficiary Bank Name must be less than 250 characters',
-                id: 'bankName',
-                isRequired: true,
-                isRequiredInValueSet: true,
-                label: 'Bank Name',
-                regEx: '^.{0,250}$',
-                validationRules: [
-                    {
-                        errorMessage: 'Beneficiary Bank Name must be less than 250 characters',
-                        regEx: '^.{0,250}$',
-                    },
-                    {
-                        errorMessage: 'The following characters are not allowed: <,>, "',
-                        regEx: '^[^<>\\x22]*$',
-                    },
-                ],
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: ONYXKEYS.CORPAY_FIELDS,
+                value: {
+                    isLoading: false,
+                    isSuccess: true,
+                },
             },
+        ],
+        failureData: [
             {
-                errorMessage: 'City must be less than 100 characters',
-                id: 'bankCity',
-                isRequired: true,
-                isRequiredInValueSet: true,
-                label: 'Bank City',
-                regEx: '^.{0,100}$',
-                validationRules: [
-                    {
-                        errorMessage: 'City must be less than 100 characters',
-                        regEx: '^.{0,100}$',
-                    },
-                    {
-                        errorMessage: 'The following characters are not allowed: <,>, "',
-                        regEx: '^[^<>\\x22]*$',
-                    },
-                ],
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: ONYXKEYS.CORPAY_FIELDS,
+                value: {
+                    isLoading: false,
+                    isSuccess: false,
+                },
             },
+        ],
+    };
+
+    return API.read(READ_COMMANDS.GET_CORPAY_BANK_ACCOUNT_FIELDS, parameters, onyxData);
+}
+
+function createCorpayBankAccount(fields: ReimbursementAccountForm) {
+    const parameters = {
+        type: 1,
+        isSavings: false,
+        isWithdrawal: true,
+        inputs: JSON.stringify(fields),
+    };
+
+    const onyxData: OnyxData = {
+        optimisticData: [
             {
-                errorMessage: 'Bank Address Line 1 must be less than 1000 characters',
-                id: 'bankAddressLine1',
-                isRequired: true,
-                isRequiredInValueSet: true,
-                label: 'Bank Address',
-                regEx: '^.{0,1000}$',
-                validationRules: [
-                    {
-                        errorMessage: 'Bank Address Line 1 must be less than 1000 characters',
-                        regEx: '^.{0,1000}$',
-                    },
-                    {
-                        errorMessage: 'The following characters are not allowed: <,>, "',
-                        regEx: '^[^<>\\x22]*$',
-                    },
-                ],
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
+                value: {
+                    isLoading: true,
+                    isCreateCorpayBankAccount: true,
+                },
             },
+        ],
+        successData: [
             {
-                detailedRule: [
-                    {
-                        isRequired: true,
-                        value: [
-                            {
-                                errorMessage: 'Beneficiary Account Number is invalid. Value should be 1 to 50 characters long.',
-                                regEx: '^.{1,50}$',
-                                ruleDescription: '1 to 50 characters',
-                            },
-                        ],
-                    },
-                ],
-                errorMessage: 'Beneficiary Account Number is invalid. Value should be 1 to 50 characters long.',
-                id: 'accountNumber',
-                isRequired: true,
-                isRequiredInValueSet: true,
-                label: 'Account Number (iACH)',
-                regEx: '^.{1,50}$',
-                validationRules: [
-                    {
-                        errorMessage: 'Beneficiary Account Number is invalid. Value should be 1 to 50 characters long.',
-                        regEx: '^.{1,50}$',
-                        ruleDescription: '1 to 50 characters',
-                    },
-                    {
-                        errorMessage: 'The following characters are not allowed: <,>, "',
-                        regEx: '^[^<>\\x22]*$',
-                    },
-                ],
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
+                value: {
+                    isLoading: false,
+                    isCreateCorpayBankAccount: false,
+                    isSuccess: true,
+                },
             },
+        ],
+        failureData: [
             {
-                detailedRule: [
-                    {
-                        isRequired: true,
-                        value: [
-                            {
-                                errorMessage: 'BSB Number is invalid. Value should be exactly 6 digits long.',
-                                regEx: '^[0-9]{6}$',
-                                ruleDescription: 'Exactly 6 digits',
-                            },
-                        ],
-                    },
-                ],
-                errorMessage: 'BSB Number is invalid. Value should be exactly 6 digits long.',
-                id: 'routingCode',
-                isRequired: true,
-                isRequiredInValueSet: true,
-                label: 'BSB Number',
-                regEx: '^[0-9]{6}$',
-                validationRules: [
-                    {
-                        errorMessage: 'BSB Number is invalid. Value should be exactly 6 digits long.',
-                        regEx: '^[0-9]{6}$',
-                        ruleDescription: 'Exactly 6 digits',
-                    },
-                    {
-                        errorMessage: 'The following characters are not allowed: <,>, "',
-                        regEx: '^[^<>\\x22]*$',
-                    },
-                ],
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
+                value: {
+                    isLoading: false,
+                    isCreateCorpayBankAccount: false,
+                    isSuccess: false,
+                    errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
+                },
             },
         ],
-        paymentMethods: ['E'],
-        preferredMethod: 'E',
     };
+
+    return API.write(WRITE_COMMANDS.BANK_ACCOUNT_CREATE_CORPAY, parameters, onyxData);
 }
 
 function clearReimbursementAccount() {
     Onyx.set(ONYXKEYS.REIMBURSEMENT_ACCOUNT, null);
 }
 
+function clearReimbursementAccountBankCreation() {
+    Onyx.merge(ONYXKEYS.REIMBURSEMENT_ACCOUNT, {isCreateCorpayBankAccount: null, isSuccess: null, isLoading: null});
+}
+
 /**
  * Function to display and fetch data for Reimbursement Account step
  * @param stepToOpen - current step to open
@@ -629,7 +567,7 @@ function verifyIdentityForBankAccount(bankAccountID: number, onfidoData: OnfidoD
     const parameters: VerifyIdentityForBankAccountParams = {
         bankAccountID,
         onfidoData: JSON.stringify(onfidoData),
-        policyID: policyID ?? '-1',
+        policyID,
     };
 
     API.write(WRITE_COMMANDS.VERIFY_IDENTITY_FOR_BANK_ACCOUNT, parameters, getVBBADataForOnyx());
@@ -712,6 +650,7 @@ export {
     openPlaidView,
     connectBankAccountManually,
     connectBankAccountWithPlaid,
+    createCorpayBankAccount,
     deletePaymentBankAccount,
     handlePlaidError,
     setPersonalBankAccountContinueKYCOnSuccess,
@@ -730,6 +669,7 @@ export {
     clearPersonalBankAccountSetupType,
     validatePlaidSelection,
     getCorpayBankAccountFields,
+    clearReimbursementAccountBankCreation,
 };
 
 export type {BusinessAddress, PersonalAddress};

src/libs/actions/Policy/Policy.ts

@@ -1193,9 +1193,9 @@ function clearAvatarErrors(policyID: string) {
  * Optimistically update the general settings. Set the general settings as pending until the response succeeds.
  * If the response fails set a general error message. Clear the error message when updating.
  */
-function updateGeneralSettings(policyID: string, name: string, currencyValue?: string) {
+function updateGeneralSettings(name: string, currencyValue?: string, policyID?: string) {
     const policy = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`];
-    if (!policy) {
+    if (!policy || !policyID) {
         return;
     }