diff --git a/src/ROUTES.ts b/src/ROUTES.ts index 7ade1df2713b..d63e882b1179 100644 --- a/src/ROUTES.ts +++ b/src/ROUTES.ts @@ -261,7 +261,10 @@ const ROUTES = { getRoute: (cardID: string) => `settings/card/${cardID}/report-virtual-fraud` as const, }, SETTINGS_ADD_DEBIT_CARD: 'settings/wallet/add-debit-card', - SETTINGS_ADD_BANK_ACCOUNT: 'settings/wallet/add-bank-account', + SETTINGS_ADD_BANK_ACCOUNT: { + route: 'settings/wallet/add-bank-account', + getRoute: (backTo?: string) => getUrlWithBackToParam('settings/wallet/add-bank-account', backTo), + }, SETTINGS_ADD_US_BANK_ACCOUNT: 'settings/wallet/add-us-bank-account', SETTINGS_ENABLE_PAYMENTS: 'settings/wallet/enable-payments', SETTINGS_WALLET_CARD_DIGITAL_DETAILS_UPDATE_ADDRESS: { diff --git a/src/libs/Navigation/linkingConfig/config.ts b/src/libs/Navigation/linkingConfig/config.ts index 6b04d7e1fda8..674aa26c8ca7 100644 --- a/src/libs/Navigation/linkingConfig/config.ts +++ b/src/libs/Navigation/linkingConfig/config.ts @@ -250,7 +250,7 @@ const config: LinkingOptions['config'] = { exact: true, }, [SCREENS.SETTINGS.ADD_BANK_ACCOUNT]: { - path: ROUTES.SETTINGS_ADD_BANK_ACCOUNT, + path: ROUTES.SETTINGS_ADD_BANK_ACCOUNT.route, exact: true, }, [SCREENS.SETTINGS.ADD_US_BANK_ACCOUNT]: { diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts index e86d74acf89a..842752c10083 100644 --- a/src/libs/ReportUtils.ts +++ b/src/libs/ReportUtils.ts @@ -1612,7 +1612,7 @@ function getBankAccountRoute(report: OnyxEntry): Route { return ROUTES.WORKSPACE_INVOICES.getRoute(report?.invoiceReceiver?.policyID); } - return ROUTES.SETTINGS_ADD_BANK_ACCOUNT; + return ROUTES.SETTINGS_ADD_BANK_ACCOUNT.route; } /** diff --git a/src/libs/actions/BankAccounts.ts b/src/libs/actions/BankAccounts.ts index a3d2c5bfdf17..410dd12cca58 100644 --- a/src/libs/actions/BankAccounts.ts +++ b/src/libs/actions/BankAccounts.ts @@ -83,10 +83,10 @@ function openPersonalBankAccountSetupView(exitReportID?: string, policyID?: stri Onyx.merge(ONYXKEYS.PERSONAL_BANK_ACCOUNT, {source}); } if (!isUserValidated) { - Navigation.navigate(ROUTES.SETTINGS_WALLET_VERIFY_ACCOUNT.getRoute(Navigation.getActiveRoute(), ROUTES.SETTINGS_ADD_BANK_ACCOUNT)); + Navigation.navigate(ROUTES.SETTINGS_WALLET_VERIFY_ACCOUNT.getRoute(Navigation.getActiveRoute(), ROUTES.SETTINGS_ADD_BANK_ACCOUNT.route)); return; } - Navigation.navigate(ROUTES.SETTINGS_ADD_BANK_ACCOUNT); + Navigation.navigate(ROUTES.SETTINGS_ADD_BANK_ACCOUNT.getRoute(Navigation.getActiveRoute())); }); } diff --git a/src/pages/settings/Wallet/PaymentMethodList.tsx b/src/pages/settings/Wallet/PaymentMethodList.tsx index 9c3658d45e88..1ffd61969d8d 100644 --- a/src/pages/settings/Wallet/PaymentMethodList.tsx +++ b/src/pages/settings/Wallet/PaymentMethodList.tsx @@ -380,7 +380,7 @@ function PaymentMethodList({ const onPressItem = useCallback(() => { if (!isUserValidated) { - Navigation.navigate(ROUTES.SETTINGS_WALLET_VERIFY_ACCOUNT.getRoute(Navigation.getActiveRoute(), ROUTES.SETTINGS_ADD_BANK_ACCOUNT)); + Navigation.navigate(ROUTES.SETTINGS_WALLET_VERIFY_ACCOUNT.getRoute(Navigation.getActiveRoute(), ROUTES.SETTINGS_ADD_BANK_ACCOUNT.route)); return; } onPress(); diff --git a/src/pages/settings/Wallet/WalletPage/WalletPage.tsx b/src/pages/settings/Wallet/WalletPage/WalletPage.tsx index c2bb15df44b7..56d64413836f 100644 --- a/src/pages/settings/Wallet/WalletPage/WalletPage.tsx +++ b/src/pages/settings/Wallet/WalletPage/WalletPage.tsx @@ -517,7 +517,7 @@ function WalletPage({shouldListenForResize = false}: WalletPageProps) { setPersonalBankAccountContinueKYCOnSuccess(ROUTES.SETTINGS_WALLET); }} enablePaymentsRoute={ROUTES.SETTINGS_ENABLE_PAYMENTS} - addBankAccountRoute={ROUTES.SETTINGS_ADD_BANK_ACCOUNT} + addBankAccountRoute={ROUTES.SETTINGS_ADD_BANK_ACCOUNT.route} addDebitCardRoute={ROUTES.SETTINGS_ADD_DEBIT_CARD} source={hasActivatedWallet ? CONST.KYC_WALL_SOURCE.TRANSFER_BALANCE : CONST.KYC_WALL_SOURCE.ENABLE_WALLET} shouldIncludeDebitCard={hasActivatedWallet}