From fc377a2a39795264af6113726691bcd85b7c2d4a Mon Sep 17 00:00:00 2001 From: Yehor Kharchenko Date: Sat, 30 Aug 2025 18:20:09 +0200 Subject: [PATCH 1/7] added new page with verification with static backTo and ForwardTo routes for add-bank-account route --- src/ROUTES.ts | 1 + src/SCREENS.ts | 1 + .../AppNavigator/ModalStackNavigators/index.tsx | 1 + src/libs/Navigation/linkingConfig/config.ts | 4 ++++ src/libs/Navigation/types.ts | 1 + .../VerifyAccountPage.tsx | 14 ++++++++++++++ .../substeps/CountrySelection.tsx | 2 +- 7 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 src/pages/settings/Wallet/InternationalDepositAccount/VerifyAccountPage.tsx diff --git a/src/ROUTES.ts b/src/ROUTES.ts index e2db4020e702..45e773b4c2f5 100644 --- a/src/ROUTES.ts +++ b/src/ROUTES.ts @@ -285,6 +285,7 @@ const ROUTES = { getRoute: (backTo?: string) => getUrlWithBackToParam('settings/wallet/add-bank-account', backTo), }, SETTINGS_ADD_US_BANK_ACCOUNT: 'settings/wallet/add-us-bank-account', + SETTINGS_ADD_BANK_ACCOUNT_VERIFY_ACCOUNT: 'settings/wallet/add-bank-account/verify-account', SETTINGS_ENABLE_PAYMENTS: 'settings/wallet/enable-payments', SETTINGS_WALLET_CARD_DIGITAL_DETAILS_UPDATE_ADDRESS: { route: 'settings/wallet/card/:domain/digital-details/update-address', diff --git a/src/SCREENS.ts b/src/SCREENS.ts index d7f78e1ddaba..831e6e755b5a 100644 --- a/src/SCREENS.ts +++ b/src/SCREENS.ts @@ -89,6 +89,7 @@ const SCREENS = { ADD_PAYMENT_CARD_CHANGE_CURRENCY: 'Settings_Add_Payment_Card_Change_Currency', ADD_BANK_ACCOUNT: 'Settings_Add_Bank_Account', ADD_US_BANK_ACCOUNT: 'Settings_Add_US_Bank_Account', + ADD_BANK_ACCOUNT_VERIFY_ACCOUNT: 'Settings_Add_Bank_Account_Verify_Account', CLOSE: 'Settings_Close', REPORT_CARD_LOST_OR_DAMAGED: 'Settings_ReportCardLostOrDamaged', TROUBLESHOOT: 'Settings_Troubleshoot', diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx index 410880b0f148..a635f5554ff2 100644 --- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx +++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx @@ -306,6 +306,7 @@ const SettingsModalStackNavigator = createModalStackNavigator require('../../../../pages/settings/Wallet/AddDebitCardPage').default, [SCREENS.SETTINGS.ADD_BANK_ACCOUNT]: () => require('../../../../pages/settings/Wallet/InternationalDepositAccount').default, [SCREENS.SETTINGS.ADD_US_BANK_ACCOUNT]: () => require('../../../../pages/AddPersonalBankAccountPage').default, + [SCREENS.SETTINGS.ADD_BANK_ACCOUNT_VERIFY_ACCOUNT]: () => require('../../../../pages/settings/Wallet/InternationalDepositAccount/VerifyAccountPage').default, [SCREENS.SETTINGS.PROFILE.STATUS]: () => require('../../../../pages/settings/Profile/CustomStatus/StatusPage').default, [SCREENS.SETTINGS.PROFILE.STATUS_CLEAR_AFTER]: () => require('../../../../pages/settings/Profile/CustomStatus/StatusClearAfterPage').default, [SCREENS.SETTINGS.PROFILE.STATUS_CLEAR_AFTER_DATE]: () => require('../../../../pages/settings/Profile/CustomStatus/SetDatePage').default, diff --git a/src/libs/Navigation/linkingConfig/config.ts b/src/libs/Navigation/linkingConfig/config.ts index ffe17de0d8be..ce5614feb366 100644 --- a/src/libs/Navigation/linkingConfig/config.ts +++ b/src/libs/Navigation/linkingConfig/config.ts @@ -272,6 +272,10 @@ const config: LinkingOptions['config'] = { path: ROUTES.SETTINGS_ADD_US_BANK_ACCOUNT, exact: true, }, + [SCREENS.SETTINGS.ADD_BANK_ACCOUNT_VERIFY_ACCOUNT]: { + path: ROUTES.SETTINGS_ADD_BANK_ACCOUNT_VERIFY_ACCOUNT, + exact: true, + }, [SCREENS.SETTINGS.PROFILE.PRONOUNS]: { path: ROUTES.SETTINGS_PRONOUNS, exact: true, diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts index 8467d812cb89..b9f5bc008879 100644 --- a/src/libs/Navigation/types.ts +++ b/src/libs/Navigation/types.ts @@ -166,6 +166,7 @@ type SettingsNavigatorParamList = { [SCREENS.SETTINGS.ADD_DEBIT_CARD]: undefined; [SCREENS.SETTINGS.ADD_BANK_ACCOUNT]: undefined; [SCREENS.SETTINGS.ADD_US_BANK_ACCOUNT]: undefined; + [SCREENS.SETTINGS.ADD_BANK_ACCOUNT_VERIFY_ACCOUNT]: undefined; [SCREENS.SETTINGS.PROFILE.STATUS]: undefined; [SCREENS.SETTINGS.PROFILE.STATUS_CLEAR_AFTER]: undefined; [SCREENS.SETTINGS.PROFILE.STATUS_CLEAR_AFTER_DATE]: undefined; diff --git a/src/pages/settings/Wallet/InternationalDepositAccount/VerifyAccountPage.tsx b/src/pages/settings/Wallet/InternationalDepositAccount/VerifyAccountPage.tsx new file mode 100644 index 000000000000..c7c8431ea9fa --- /dev/null +++ b/src/pages/settings/Wallet/InternationalDepositAccount/VerifyAccountPage.tsx @@ -0,0 +1,14 @@ +import React from 'react'; +import VerifyAccountPageBase from '@pages/settings/VerifyAccountPageBase'; +import ROUTES from '@src/ROUTES'; + +function VerifyAccountPage() { + return ( + + ); +} + +export default VerifyAccountPage; diff --git a/src/pages/settings/Wallet/InternationalDepositAccount/substeps/CountrySelection.tsx b/src/pages/settings/Wallet/InternationalDepositAccount/substeps/CountrySelection.tsx index 2c07c7b8e811..8885e1ec365b 100644 --- a/src/pages/settings/Wallet/InternationalDepositAccount/substeps/CountrySelection.tsx +++ b/src/pages/settings/Wallet/InternationalDepositAccount/substeps/CountrySelection.tsx @@ -34,7 +34,7 @@ function CountrySelection({isEditing, onNext, formValues, resetScreenIndex, fiel if (isUserValidated) { Navigation.navigate(ROUTES.SETTINGS_ADD_US_BANK_ACCOUNT); } else { - Navigation.navigate(ROUTES.SETTINGS_CONTACT_METHOD_VERIFY_ACCOUNT.getRoute(Navigation.getActiveRoute(), ROUTES.SETTINGS_ADD_US_BANK_ACCOUNT)); + Navigation.navigate(ROUTES.SETTINGS_ADD_BANK_ACCOUNT_VERIFY_ACCOUNT); } return; } From a863efbf97ac3129cb6c3073826adfa36098394c Mon Sep 17 00:00:00 2001 From: Yehor Kharchenko Date: Fri, 5 Sep 2025 16:07:30 +0200 Subject: [PATCH 2/7] added constant to the route --- src/ROUTES.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ROUTES.ts b/src/ROUTES.ts index ba35dd6d4403..522d9035df05 100644 --- a/src/ROUTES.ts +++ b/src/ROUTES.ts @@ -248,7 +248,7 @@ const ROUTES = { getRoute: (backTo?: string) => getUrlWithBackToParam('settings/wallet/add-bank-account', backTo), }, SETTINGS_ADD_US_BANK_ACCOUNT: 'settings/wallet/add-us-bank-account', - SETTINGS_ADD_BANK_ACCOUNT_VERIFY_ACCOUNT: 'settings/wallet/add-bank-account/verify-account', + SETTINGS_ADD_BANK_ACCOUNT_VERIFY_ACCOUNT: `settings/wallet/add-bank-account/${VERIFY_ACCOUNT}`, SETTINGS_ENABLE_PAYMENTS: 'settings/wallet/enable-payments', SETTINGS_WALLET_ENABLE_GLOBAL_REIMBURSEMENTS: { route: 'settings/wallet/:bankAccountID/enable-global-reimbursements', From 5917fc597e4680479719af6014801260975e0083 Mon Sep 17 00:00:00 2001 From: Yehor Kharchenko Date: Fri, 5 Sep 2025 17:59:43 +0200 Subject: [PATCH 3/7] changed path to /select-country/verify-account --- src/ROUTES.ts | 2 +- src/SCREENS.ts | 2 +- .../Navigation/AppNavigator/ModalStackNavigators/index.tsx | 3 ++- src/libs/Navigation/linkingConfig/config.ts | 4 ++-- src/libs/Navigation/types.ts | 2 +- .../InternationalDepositAccount/substeps/CountrySelection.tsx | 2 +- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/ROUTES.ts b/src/ROUTES.ts index 522d9035df05..7aee351a8030 100644 --- a/src/ROUTES.ts +++ b/src/ROUTES.ts @@ -248,7 +248,7 @@ const ROUTES = { getRoute: (backTo?: string) => getUrlWithBackToParam('settings/wallet/add-bank-account', backTo), }, SETTINGS_ADD_US_BANK_ACCOUNT: 'settings/wallet/add-us-bank-account', - SETTINGS_ADD_BANK_ACCOUNT_VERIFY_ACCOUNT: `settings/wallet/add-bank-account/${VERIFY_ACCOUNT}`, + SETTINGS_ADD_BANK_ACCOUNT_SELECT_COUNTRY_VERIFY_ACCOUNT: `settings/wallet/add-bank-account/select-country/${VERIFY_ACCOUNT}`, SETTINGS_ENABLE_PAYMENTS: 'settings/wallet/enable-payments', SETTINGS_WALLET_ENABLE_GLOBAL_REIMBURSEMENTS: { route: 'settings/wallet/:bankAccountID/enable-global-reimbursements', diff --git a/src/SCREENS.ts b/src/SCREENS.ts index 3c131becbc2a..3e2c15d2989f 100644 --- a/src/SCREENS.ts +++ b/src/SCREENS.ts @@ -94,7 +94,7 @@ const SCREENS = { ADD_PAYMENT_CARD_CHANGE_CURRENCY: 'Settings_Add_Payment_Card_Change_Currency', ADD_BANK_ACCOUNT: 'Settings_Add_Bank_Account', ADD_US_BANK_ACCOUNT: 'Settings_Add_US_Bank_Account', - ADD_BANK_ACCOUNT_VERIFY_ACCOUNT: 'Settings_Add_Bank_Account_Verify_Account', + ADD_BANK_ACCOUNT_SELECT_COUNTRY_VERIFY_ACCOUNT: 'Settings_Add_Bank_Account_Select_Country_Verify_Account', CLOSE: 'Settings_Close', REPORT_CARD_LOST_OR_DAMAGED: 'Settings_ReportCardLostOrDamaged', TROUBLESHOOT: 'Settings_Troubleshoot', diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx index be2b8712d746..e0cbbf2ac8a1 100644 --- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx +++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx @@ -323,7 +323,8 @@ const SettingsModalStackNavigator = createModalStackNavigator require('../../../../pages/settings/Wallet/AddDebitCardPage').default, [SCREENS.SETTINGS.ADD_BANK_ACCOUNT]: () => require('../../../../pages/settings/Wallet/InternationalDepositAccount').default, [SCREENS.SETTINGS.ADD_US_BANK_ACCOUNT]: () => require('../../../../pages/AddPersonalBankAccountPage').default, - [SCREENS.SETTINGS.ADD_BANK_ACCOUNT_VERIFY_ACCOUNT]: () => require('../../../../pages/settings/Wallet/InternationalDepositAccount/VerifyAccountPage').default, + [SCREENS.SETTINGS.ADD_BANK_ACCOUNT_SELECT_COUNTRY_VERIFY_ACCOUNT]: () => + require('../../../../pages/settings/Wallet/InternationalDepositAccount/VerifyAccountPage').default, [SCREENS.SETTINGS.PROFILE.STATUS]: () => require('../../../../pages/settings/Profile/CustomStatus/StatusPage').default, [SCREENS.SETTINGS.PROFILE.STATUS_CLEAR_AFTER]: () => require('../../../../pages/settings/Profile/CustomStatus/StatusClearAfterPage').default, [SCREENS.SETTINGS.PROFILE.STATUS_CLEAR_AFTER_DATE]: () => require('../../../../pages/settings/Profile/CustomStatus/SetDatePage').default, diff --git a/src/libs/Navigation/linkingConfig/config.ts b/src/libs/Navigation/linkingConfig/config.ts index fd7c58cca135..6e71e206a1b9 100644 --- a/src/libs/Navigation/linkingConfig/config.ts +++ b/src/libs/Navigation/linkingConfig/config.ts @@ -276,8 +276,8 @@ const config: LinkingOptions['config'] = { path: ROUTES.SETTINGS_ADD_US_BANK_ACCOUNT, exact: true, }, - [SCREENS.SETTINGS.ADD_BANK_ACCOUNT_VERIFY_ACCOUNT]: { - path: ROUTES.SETTINGS_ADD_BANK_ACCOUNT_VERIFY_ACCOUNT, + [SCREENS.SETTINGS.ADD_BANK_ACCOUNT_SELECT_COUNTRY_VERIFY_ACCOUNT]: { + path: ROUTES.SETTINGS_ADD_BANK_ACCOUNT_SELECT_COUNTRY_VERIFY_ACCOUNT, exact: true, }, [SCREENS.SETTINGS.PROFILE.PRONOUNS]: { diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts index 1737b71c700c..990ff8b528c3 100644 --- a/src/libs/Navigation/types.ts +++ b/src/libs/Navigation/types.ts @@ -171,7 +171,7 @@ type SettingsNavigatorParamList = { [SCREENS.SETTINGS.ADD_DEBIT_CARD]: undefined; [SCREENS.SETTINGS.ADD_BANK_ACCOUNT]: undefined; [SCREENS.SETTINGS.ADD_US_BANK_ACCOUNT]: undefined; - [SCREENS.SETTINGS.ADD_BANK_ACCOUNT_VERIFY_ACCOUNT]: undefined; + [SCREENS.SETTINGS.ADD_BANK_ACCOUNT_SELECT_COUNTRY_VERIFY_ACCOUNT]: undefined; [SCREENS.SETTINGS.PROFILE.STATUS]: undefined; [SCREENS.SETTINGS.PROFILE.STATUS_CLEAR_AFTER]: undefined; [SCREENS.SETTINGS.PROFILE.STATUS_CLEAR_AFTER_DATE]: undefined; diff --git a/src/pages/settings/Wallet/InternationalDepositAccount/substeps/CountrySelection.tsx b/src/pages/settings/Wallet/InternationalDepositAccount/substeps/CountrySelection.tsx index 8885e1ec365b..2b130f1f9543 100644 --- a/src/pages/settings/Wallet/InternationalDepositAccount/substeps/CountrySelection.tsx +++ b/src/pages/settings/Wallet/InternationalDepositAccount/substeps/CountrySelection.tsx @@ -34,7 +34,7 @@ function CountrySelection({isEditing, onNext, formValues, resetScreenIndex, fiel if (isUserValidated) { Navigation.navigate(ROUTES.SETTINGS_ADD_US_BANK_ACCOUNT); } else { - Navigation.navigate(ROUTES.SETTINGS_ADD_BANK_ACCOUNT_VERIFY_ACCOUNT); + Navigation.navigate(ROUTES.SETTINGS_ADD_BANK_ACCOUNT_SELECT_COUNTRY_VERIFY_ACCOUNT); } return; } From 92939ee2ddd53e4d70b3e4d5c401d799a9c91f96 Mon Sep 17 00:00:00 2001 From: Yehor Kharchenko Date: Fri, 5 Sep 2025 18:28:26 +0200 Subject: [PATCH 4/7] fixed screen to rhp relation --- src/libs/Navigation/linkingConfig/RELATIONS/SETTINGS_TO_RHP.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libs/Navigation/linkingConfig/RELATIONS/SETTINGS_TO_RHP.ts b/src/libs/Navigation/linkingConfig/RELATIONS/SETTINGS_TO_RHP.ts index 0d5857426e88..442b64ebbccf 100755 --- a/src/libs/Navigation/linkingConfig/RELATIONS/SETTINGS_TO_RHP.ts +++ b/src/libs/Navigation/linkingConfig/RELATIONS/SETTINGS_TO_RHP.ts @@ -40,6 +40,7 @@ const SETTINGS_TO_RHP: Partial Date: Mon, 15 Sep 2025 12:35:53 +0200 Subject: [PATCH 5/7] added displayName --- .../Wallet/InternationalDepositAccount/VerifyAccountPage.tsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/pages/settings/Wallet/InternationalDepositAccount/VerifyAccountPage.tsx b/src/pages/settings/Wallet/InternationalDepositAccount/VerifyAccountPage.tsx index c7c8431ea9fa..137eb8393d88 100644 --- a/src/pages/settings/Wallet/InternationalDepositAccount/VerifyAccountPage.tsx +++ b/src/pages/settings/Wallet/InternationalDepositAccount/VerifyAccountPage.tsx @@ -11,4 +11,6 @@ function VerifyAccountPage() { ); } +VerifyAccountPage.displayName = 'VerifyAccountPage'; + export default VerifyAccountPage; From 0a6bb6f6ee0ca4c8ad48c03e05570ba1435588bc Mon Sep 17 00:00:00 2001 From: Yehor Kharchenko Date: Thu, 9 Oct 2025 13:36:20 +0200 Subject: [PATCH 6/7] removed settings to rhp config, because it was appearing on other full screen --- src/libs/Navigation/linkingConfig/RELATIONS/SETTINGS_TO_RHP.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/libs/Navigation/linkingConfig/RELATIONS/SETTINGS_TO_RHP.ts b/src/libs/Navigation/linkingConfig/RELATIONS/SETTINGS_TO_RHP.ts index 33969253bd64..77e13cbaf951 100755 --- a/src/libs/Navigation/linkingConfig/RELATIONS/SETTINGS_TO_RHP.ts +++ b/src/libs/Navigation/linkingConfig/RELATIONS/SETTINGS_TO_RHP.ts @@ -41,7 +41,6 @@ const SETTINGS_TO_RHP: Partial Date: Fri, 10 Oct 2025 16:05:31 +0200 Subject: [PATCH 7/7] changed component name to countrySelectionVerifyAccountPage --- .../Navigation/AppNavigator/ModalStackNavigators/index.tsx | 2 +- ...ccountPage.tsx => CountrySelectionVerifyAccountPage.tsx} | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) rename src/pages/settings/Wallet/InternationalDepositAccount/{VerifyAccountPage.tsx => CountrySelectionVerifyAccountPage.tsx} (65%) diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx index 3ee35fbf60fd..eb8efde4a739 100644 --- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx +++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx @@ -369,7 +369,7 @@ const SettingsModalStackNavigator = createModalStackNavigator require('../../../../pages/settings/Wallet/InternationalDepositAccount').default, [SCREENS.SETTINGS.ADD_US_BANK_ACCOUNT]: () => require('../../../../pages/AddPersonalBankAccountPage').default, [SCREENS.SETTINGS.ADD_BANK_ACCOUNT_SELECT_COUNTRY_VERIFY_ACCOUNT]: () => - require('../../../../pages/settings/Wallet/InternationalDepositAccount/VerifyAccountPage').default, + require('../../../../pages/settings/Wallet/InternationalDepositAccount/CountrySelectionVerifyAccountPage').default, [SCREENS.SETTINGS.PROFILE.STATUS]: () => require('../../../../pages/settings/Profile/CustomStatus/StatusPage').default, [SCREENS.SETTINGS.PROFILE.STATUS_CLEAR_AFTER]: () => require('../../../../pages/settings/Profile/CustomStatus/StatusClearAfterPage').default, [SCREENS.SETTINGS.PROFILE.STATUS_CLEAR_AFTER_DATE]: () => require('../../../../pages/settings/Profile/CustomStatus/SetDatePage').default, diff --git a/src/pages/settings/Wallet/InternationalDepositAccount/VerifyAccountPage.tsx b/src/pages/settings/Wallet/InternationalDepositAccount/CountrySelectionVerifyAccountPage.tsx similarity index 65% rename from src/pages/settings/Wallet/InternationalDepositAccount/VerifyAccountPage.tsx rename to src/pages/settings/Wallet/InternationalDepositAccount/CountrySelectionVerifyAccountPage.tsx index 137eb8393d88..88e99df55b83 100644 --- a/src/pages/settings/Wallet/InternationalDepositAccount/VerifyAccountPage.tsx +++ b/src/pages/settings/Wallet/InternationalDepositAccount/CountrySelectionVerifyAccountPage.tsx @@ -2,7 +2,7 @@ import React from 'react'; import VerifyAccountPageBase from '@pages/settings/VerifyAccountPageBase'; import ROUTES from '@src/ROUTES'; -function VerifyAccountPage() { +function CountrySelectionVerifyAccountPage() { return (