Merge pull request #11466 from Expensify/nat-onf

Fix onfido flow (cherry picked from commit 204d780)
Expensify · Sep 30, 2022 · 8c1fdd2 · 8c1fdd2
1 parent 2e8f8cd
commit 8c1fdd2
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 5 deletions.
diff --git a/src/libs/actions/BankAccounts.js b/src/libs/actions/BankAccounts.js
@@ -44,7 +44,7 @@ function updatePlaidData(plaidData) {
     Onyx.merge(ONYXKEYS.PLAID_DATA, plaidData);
 }
 
-function clearOnfido() {
+function clearOnfidoToken() {
     Onyx.merge(ONYXKEYS.ONFIDO_TOKEN, '');
 }
 
@@ -265,7 +265,7 @@ export {
     deletePaymentBankAccount,
     clearPersonalBankAccount,
     clearPlaid,
-    clearOnfido,
+    clearOnfidoToken,
     updatePersonalInformationForBankAccount,
     validateBankAccount,
     connectBankAccountWithPlaid,

diff --git a/src/pages/ReimbursementAccount/ACHContractStep.js b/src/pages/ReimbursementAccount/ACHContractStep.js
@@ -171,7 +171,10 @@ class ACHContractStep extends React.Component {
                     title={this.props.translate('beneficialOwnersStep.additionalInformation')}
                     stepCounter={{step: 4, total: 5}}
                     onCloseButtonPress={Navigation.dismissModal}
-                    onBackButtonPress={() => BankAccounts.goToWithdrawalAccountSetupStep(CONST.BANK_ACCOUNT.STEP.REQUESTOR)}
+                    onBackButtonPress={() => {
+                        BankAccounts.clearOnfidoToken();
+                        BankAccounts.goToWithdrawalAccountSetupStep(CONST.BANK_ACCOUNT.STEP.REQUESTOR);
+                    }}
                     shouldShowGetAssistanceButton
                     guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_BANK_ACCOUNT}
                     shouldShowBackButton

diff --git a/src/pages/ReimbursementAccount/RequestorStep.js b/src/pages/ReimbursementAccount/RequestorStep.js
@@ -147,6 +147,20 @@ class RequestorStep extends React.Component {
         BankAccounts.updatePersonalInformationForBankAccount(payload);
     }
 
+    submitOnfidoVerification() {
+        if (!this.validate()) {
+            return;
+        }
+
+        const payload = {
+            bankAccountID: ReimbursementAccountUtils.getDefaultStateForField(this.props, 'bankAccountID', 0),
+            ...this.state,
+            dob: moment(this.state.dob).format(CONST.DATE.MOMENT_FORMAT_STRING),
+        };
+
+        BankAccounts.setupWithdrawalAccount(payload);
+    }
+
     render() {
         const achData = this.props.reimbursementAccount.achData;
         const shouldShowOnfido = achData.useOnfido && this.props.onfidoToken && !this.state.isOnfidoSetupComplete;
@@ -161,7 +175,7 @@ class RequestorStep extends React.Component {
                     shouldShowBackButton
                     onBackButtonPress={() => {
                         if (shouldShowOnfido) {
-                            BankAccounts.clearOnfido();
+                            BankAccounts.clearOnfidoToken();
                         } else {
                             BankAccounts.goToWithdrawalAccountSetupStep(CONST.BANK_ACCOUNT.STEP.COMPANY);
                         }
@@ -185,7 +199,7 @@ class RequestorStep extends React.Component {
                                 this.setState({
                                     onfidoData,
                                     isOnfidoSetupComplete: true,
-                                }, this.submit);
+                                }, this.submitOnfidoVerification);
                             }}
                         />
                     </ScrollView>