Merge pull request #29847 from getusha/fix-navigate-to-enable-payment

Expensify · Oct 18, 2023 · 843b955 · 843b955
2 parents 1d8b6e3 + 5d73a1f
commit 843b955
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 5 deletions.
diff --git a/src/components/SettlementButton.js b/src/components/SettlementButton.js
@@ -15,6 +15,8 @@ import KYCWall from './KYCWall';
 import withNavigation from './withNavigation';
 import * as Expensicons from './Icon/Expensicons';
 import ButtonWithDropdownMenu from './ButtonWithDropdownMenu';
+import * as BankAccounts from '../libs/actions/BankAccounts';
+import ROUTES from '../ROUTES';
 
 const propTypes = {
     /** Callback to execute when this button is pressed. Receives a single payment type argument. */
@@ -191,6 +193,7 @@ function SettlementButton({
     const selectPaymentType = (event, iouPaymentType, triggerKYCFlow) => {
         if (iouPaymentType === CONST.IOU.PAYMENT_TYPE.EXPENSIFY || iouPaymentType === CONST.IOU.PAYMENT_TYPE.VBBA) {
             triggerKYCFlow(event, iouPaymentType);
+            BankAccounts.setPersonalBankAccountContinueKYCOnSuccess(ROUTES.ENABLE_PAYMENTS);
             return;
         }
 

diff --git a/src/libs/actions/BankAccounts.ts b/src/libs/actions/BankAccounts.ts
@@ -55,6 +55,13 @@ function openPersonalBankAccountSetupView(exitReportID: string) {
     });
 }
 
+/**
+ * Whether after adding a bank account we should continue with the KYC flow
+ */
+function setPersonalBankAccountContinueKYCOnSuccess(onSuccessFallbackRoute: string) {
+    Onyx.merge(ONYXKEYS.PERSONAL_BANK_ACCOUNT, {onSuccessFallbackRoute});
+}
+
 function clearPersonalBankAccount() {
     clearPlaid();
     Onyx.set(ONYXKEYS.PERSONAL_BANK_ACCOUNT, {});
@@ -431,6 +438,7 @@ export {
     connectBankAccountWithPlaid,
     deletePaymentBankAccount,
     handlePlaidError,
+    setPersonalBankAccountContinueKYCOnSuccess,
     openPersonalBankAccountSetupView,
     clearReimbursementAccount,
     openReimbursementAccountPage,

diff --git a/src/libs/actions/PaymentMethods.ts b/src/libs/actions/PaymentMethods.ts
@@ -22,14 +22,14 @@ const kycWallRef = createRef<KYCWallRef>();
 /**
  * When we successfully add a payment method or pass the KYC checks we will continue with our setup action if we have one set.
  */
-function continueSetup() {
+function continueSetup(fallbackRoute = ROUTES.HOME) {
     if (!kycWallRef.current?.continue) {
-        Navigation.goBack(ROUTES.HOME);
+        Navigation.goBack(fallbackRoute);
         return;
     }
 
     // Close the screen (Add Debit Card, Add Bank Account, or Enable Payments) on success and continue with setup
-    Navigation.goBack(ROUTES.HOME);
+    Navigation.goBack(fallbackRoute);
     kycWallRef.current.continue();
 }
 

diff --git a/src/pages/AddPersonalBankAccountPage.js b/src/pages/AddPersonalBankAccountPage.js
@@ -17,6 +17,7 @@ import Form from '../components/Form';
 import ROUTES from '../ROUTES';
 import * as PlaidDataProps from './ReimbursementAccount/plaidDataPropTypes';
 import ConfirmationPage from '../components/ConfirmationPage';
+import * as PaymentMethods from '../libs/actions/PaymentMethods';
 
 const propTypes = {
     ...withLocalizePropTypes,
@@ -86,10 +87,14 @@ class AddPersonalBankAccountPage extends React.Component {
         BankAccounts.addPersonalBankAccount(selectedPlaidBankAccount);
     }
 
-    exitFlow() {
+    exitFlow(shouldContinue = false) {
         const exitReportID = lodashGet(this.props, 'personalBankAccount.exitReportID');
+        const onSuccessFallbackRoute = lodashGet(this.props, 'personalBankAccount.onSuccessFallbackRoute', '');
+
         if (exitReportID) {
             Navigation.dismissModal(exitReportID);
+        } else if (shouldContinue && onSuccessFallbackRoute) {
+            PaymentMethods.continueSetup(onSuccessFallbackRoute);
         } else {
             Navigation.goBack(ROUTES.SETTINGS_WALLET);
         }
@@ -115,7 +120,7 @@ class AddPersonalBankAccountPage extends React.Component {
                         description={this.props.translate('addPersonalBankAccountPage.successMessage')}
                         shouldShowButton
                         buttonText={this.props.translate('common.continue')}
-                        onButtonPress={this.exitFlow}
+                        onButtonPress={() => this.exitFlow(true)}
                     />
                 ) : (
                     <Form

diff --git a/src/types/onyx/PersonalBankAccount.ts b/src/types/onyx/PersonalBankAccount.ts
@@ -15,6 +15,9 @@ type PersonalBankAccount = {
 
     /** Any reportID we should redirect to at the end of the flow */
     exitReportID?: string;
+
+    /** The route to redirect after adding PBA successfully */
+    onSuccessFallbackRoute?: string;
 };
 
 export default PersonalBankAccount;