From eef3f9a1e027ee52558fe382635c61d9813842bc Mon Sep 17 00:00:00 2001 From: Yehor Kharchenko Date: Wed, 3 Sep 2025 11:38:09 +0200 Subject: [PATCH 1/9] added two routes in two places and removed backTo and forwardTo in paymentmethodlist --- src/ROUTES.ts | 5 +++++ src/SCREENS.ts | 2 ++ .../AppNavigator/ModalStackNavigators/index.tsx | 2 ++ src/libs/Navigation/linkingConfig/config.ts | 8 ++++++++ src/libs/Navigation/types.ts | 4 ++++ .../Wallet/NewBankAccount/VerifyAccount.tsx | 14 ++++++++++++++ src/pages/settings/Wallet/PaymentMethodList.tsx | 12 ++++++++++-- src/pages/workspace/invoices/VerifyAccount.tsx | 15 +++++++++++++++ .../invoices/WorkspaceInvoiceVBASection.tsx | 1 + 9 files changed, 61 insertions(+), 2 deletions(-) create mode 100644 src/pages/settings/Wallet/NewBankAccount/VerifyAccount.tsx create mode 100644 src/pages/workspace/invoices/VerifyAccount.tsx diff --git a/src/ROUTES.ts b/src/ROUTES.ts index e2db4020e702..68d56630d763 100644 --- a/src/ROUTES.ts +++ b/src/ROUTES.ts @@ -284,6 +284,7 @@ const ROUTES = { route: 'settings/wallet/add-bank-account', getRoute: (backTo?: string) => getUrlWithBackToParam('settings/wallet/add-bank-account', backTo), }, + SETTINGS_ADD_NEW_BANK_ACCOUNT_VERIFY_ACCOUNT: 'settings/wallet/add-new-bank-account/verify-account', 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: { @@ -1346,6 +1347,10 @@ const ROUTES = { return `workspaces/${policyID}/invoices` as const; }, }, + WORKSPACE_INVOICES_VERIFY_ACCOUNT: { + route: 'workspaces/:policyID/invoices/verify-account', + getRoute: (policyID: string) => `workspaces/${policyID}/invoices/verify-account` as const, + }, WORKSPACE_INVOICES_COMPANY_NAME: { route: 'workspaces/:policyID/invoices/company-name', getRoute: (policyID: string) => `workspaces/${policyID}/invoices/company-name` as const, diff --git a/src/SCREENS.ts b/src/SCREENS.ts index d7f78e1ddaba..0d3453ce0f9f 100644 --- a/src/SCREENS.ts +++ b/src/SCREENS.ts @@ -87,6 +87,7 @@ const SCREENS = { APP_DOWNLOAD_LINKS: 'Settings_App_Download_Links', ADD_DEBIT_CARD: 'Settings_Add_Debit_Card', ADD_PAYMENT_CARD_CHANGE_CURRENCY: 'Settings_Add_Payment_Card_Change_Currency', + ADD_NEW_BANK_ACCOUNT_VERIFY_ACCOUNT: 'Settings_Add_New_Bank_Account_Verify_Account', ADD_BANK_ACCOUNT: 'Settings_Add_Bank_Account', ADD_US_BANK_ACCOUNT: 'Settings_Add_US_Bank_Account', CLOSE: 'Settings_Close', @@ -549,6 +550,7 @@ const SCREENS = { EXPENSIFY_CARD_SETTINGS_ACCOUNT: 'Workspace_ExpensifyCard_Settings_Account', EXPENSIFY_CARD_SETTINGS_FREQUENCY: 'Workspace_ExpensifyCard_Settings_Frequency', INVOICES: 'Workspace_Invoices', + INVOICES_VERIFY_ACCOUNT: 'Workspace_Invoices_Verify_Account', INVOICES_COMPANY_NAME: 'Workspace_Invoices_Company_Name', INVOICES_COMPANY_WEBSITE: 'Workspace_Invoices_Company_Website', MEMBERS: 'Workspace_Members', diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx index 410880b0f148..b9d43d145fdf 100644 --- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx +++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx @@ -304,6 +304,7 @@ const SettingsModalStackNavigator = createModalStackNavigator require('../../../../pages/settings/Wallet/ChooseTransferAccountPage').default, [SCREENS.SETTINGS.WALLET.ENABLE_PAYMENTS]: () => require('../../../../pages/EnablePayments/EnablePayments').default, [SCREENS.SETTINGS.ADD_DEBIT_CARD]: () => require('../../../../pages/settings/Wallet/AddDebitCardPage').default, + [SCREENS.SETTINGS.ADD_NEW_BANK_ACCOUNT_VERIFY_ACCOUNT]: () => require('../../../../pages/settings/Wallet/NewBankAccount/VerifyAccount').default, [SCREENS.SETTINGS.ADD_BANK_ACCOUNT]: () => require('../../../../pages/settings/Wallet/InternationalDepositAccount').default, [SCREENS.SETTINGS.ADD_US_BANK_ACCOUNT]: () => require('../../../../pages/AddPersonalBankAccountPage').default, [SCREENS.SETTINGS.PROFILE.STATUS]: () => require('../../../../pages/settings/Profile/CustomStatus/StatusPage').default, @@ -591,6 +592,7 @@ const SettingsModalStackNavigator = createModalStackNavigator require('../../../../pages/workspace/taxes/WorkspaceTaxCodePage').default, [SCREENS.WORKSPACE.INVOICES_COMPANY_NAME]: () => require('../../../../pages/workspace/invoices/WorkspaceInvoicingDetailsName').default, [SCREENS.WORKSPACE.INVOICES_COMPANY_WEBSITE]: () => require('../../../../pages/workspace/invoices/WorkspaceInvoicingDetailsWebsite').default, + [SCREENS.WORKSPACE.INVOICES_VERIFY_ACCOUNT]: () => require('../../../../pages/workspace/invoices/VerifyAccount').default, [SCREENS.WORKSPACE.COMPANY_CARDS_ASSIGN_CARD]: () => require('../../../../pages/workspace/companyCards/assignCard/AssignCardFeedPage').default, [SCREENS.WORKSPACE.COMPANY_CARDS_SELECT_FEED]: () => require('../../../../pages/workspace/companyCards/WorkspaceCompanyCardFeedSelectorPage').default, [SCREENS.WORKSPACE.COMPANY_CARDS_BANK_CONNECTION]: () => require('../../../../pages/workspace/companyCards/BankConnection').default, diff --git a/src/libs/Navigation/linkingConfig/config.ts b/src/libs/Navigation/linkingConfig/config.ts index ffe17de0d8be..afabe0b37146 100644 --- a/src/libs/Navigation/linkingConfig/config.ts +++ b/src/libs/Navigation/linkingConfig/config.ts @@ -268,6 +268,10 @@ const config: LinkingOptions['config'] = { path: ROUTES.SETTINGS_ADD_BANK_ACCOUNT.route, exact: true, }, + [SCREENS.SETTINGS.ADD_NEW_BANK_ACCOUNT_VERIFY_ACCOUNT]: { + path: ROUTES.SETTINGS_ADD_NEW_BANK_ACCOUNT_VERIFY_ACCOUNT, + exact: true, + }, [SCREENS.SETTINGS.ADD_US_BANK_ACCOUNT]: { path: ROUTES.SETTINGS_ADD_US_BANK_ACCOUNT, exact: true, @@ -639,6 +643,10 @@ const config: LinkingOptions['config'] = { [SCREENS.WORKSPACE.INVOICES_COMPANY_WEBSITE]: { path: ROUTES.WORKSPACE_INVOICES_COMPANY_WEBSITE.route, }, + [SCREENS.WORKSPACE.INVOICES_VERIFY_ACCOUNT]: { + path: ROUTES.WORKSPACE_INVOICES_VERIFY_ACCOUNT.route, + exact: true, + }, [SCREENS.WORKSPACE.COMPANY_CARDS_SELECT_FEED]: { path: ROUTES.WORKSPACE_COMPANY_CARDS_SELECT_FEED.route, }, diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts index 8467d812cb89..5d67930e4046 100644 --- a/src/libs/Navigation/types.ts +++ b/src/libs/Navigation/types.ts @@ -165,6 +165,7 @@ type SettingsNavigatorParamList = { [SCREENS.SETTINGS.WALLET.ENABLE_PAYMENTS]: undefined; [SCREENS.SETTINGS.ADD_DEBIT_CARD]: undefined; [SCREENS.SETTINGS.ADD_BANK_ACCOUNT]: undefined; + [SCREENS.SETTINGS.ADD_NEW_BANK_ACCOUNT_VERIFY_ACCOUNT]: undefined; [SCREENS.SETTINGS.ADD_US_BANK_ACCOUNT]: undefined; [SCREENS.SETTINGS.PROFILE.STATUS]: undefined; [SCREENS.SETTINGS.PROFILE.STATUS_CLEAR_AFTER]: undefined; @@ -968,6 +969,9 @@ type SettingsNavigatorParamList = { [SCREENS.WORKSPACE.INVOICES_COMPANY_WEBSITE]: { policyID: string; }; + [SCREENS.WORKSPACE.INVOICES_VERIFY_ACCOUNT]: { + policyID: string; + }; [SCREENS.WORKSPACE.COMPANY_CARDS_SELECT_FEED]: { policyID: string; }; diff --git a/src/pages/settings/Wallet/NewBankAccount/VerifyAccount.tsx b/src/pages/settings/Wallet/NewBankAccount/VerifyAccount.tsx new file mode 100644 index 000000000000..bf22f85b84c3 --- /dev/null +++ b/src/pages/settings/Wallet/NewBankAccount/VerifyAccount.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/PaymentMethodList.tsx b/src/pages/settings/Wallet/PaymentMethodList.tsx index 7fbc44f655bd..c8094141da0e 100644 --- a/src/pages/settings/Wallet/PaymentMethodList.tsx +++ b/src/pages/settings/Wallet/PaymentMethodList.tsx @@ -107,6 +107,8 @@ type PaymentMethodListProps = { /** Whether the bank accounts should be displayed in private and business sections */ shouldShowBankAccountSections?: boolean; + + policyID?: string; }; type PaymentMethodItem = PaymentMethod & { @@ -196,6 +198,7 @@ function PaymentMethodList({ shouldShowRightIcon = true, invoiceTransferBankAccountID, shouldShowBankAccountSections = false, + policyID = '', }: PaymentMethodListProps) { const styles = useThemeStyles(); const StyleUtils = useStyleUtils(); @@ -388,11 +391,16 @@ function PaymentMethodList({ const onPressItem = useCallback(() => { if (!isUserValidated) { - Navigation.navigate(ROUTES.SETTINGS_CONTACT_METHOD_VERIFY_ACCOUNT.getRoute(Navigation.getActiveRoute(), ROUTES.SETTINGS_ADD_BANK_ACCOUNT.route)); + const path = Navigation.getActiveRoute(); + if (path.includes(ROUTES.WORKSPACES_LIST.route) && policyID) { + Navigation.navigate(ROUTES.WORKSPACE_INVOICES_VERIFY_ACCOUNT.getRoute(policyID)); + } else { + Navigation.navigate(ROUTES.SETTINGS_ADD_NEW_BANK_ACCOUNT_VERIFY_ACCOUNT); + } return; } onPress(); - }, [isUserValidated, onPress]); + }, [isUserValidated, onPress, policyID]); const renderListFooterComponent = useCallback( () => diff --git a/src/pages/workspace/invoices/VerifyAccount.tsx b/src/pages/workspace/invoices/VerifyAccount.tsx new file mode 100644 index 000000000000..f803af3e5f68 --- /dev/null +++ b/src/pages/workspace/invoices/VerifyAccount.tsx @@ -0,0 +1,15 @@ +import React from 'react'; +import VerifyAccountPageBase from '@pages/settings/VerifyAccountPageBase'; +import ROUTES from '@src/ROUTES'; + +function VerifyAccountPage(policyID: string) { + const workspaceInvoicePath = ROUTES.WORKSPACE_INVOICES.getRoute(policyID); + return ( + + ); +} + +export default VerifyAccountPage; diff --git a/src/pages/workspace/invoices/WorkspaceInvoiceVBASection.tsx b/src/pages/workspace/invoices/WorkspaceInvoiceVBASection.tsx index 27ec3d36b553..5a6bedc99052 100644 --- a/src/pages/workspace/invoices/WorkspaceInvoiceVBASection.tsx +++ b/src/pages/workspace/invoices/WorkspaceInvoiceVBASection.tsx @@ -193,6 +193,7 @@ function WorkspaceInvoiceVBASection({policyID}: WorkspaceInvoiceVBASectionProps) buttonRef={addPaymentMethodAnchorRef} style={[styles.mt5, hasBankAccount && [shouldUseNarrowLayout ? styles.mhn5 : styles.mhn8]]} listItemStyle={shouldUseNarrowLayout ? styles.ph5 : styles.ph8} + policyID={policyID} /> Date: Wed, 3 Sep 2025 12:56:07 +0200 Subject: [PATCH 2/9] small changes, adding comments --- src/libs/Navigation/types.ts | 6 +++--- src/pages/settings/Wallet/PaymentMethodList.tsx | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts index 5d67930e4046..eb9ebbcb6580 100644 --- a/src/libs/Navigation/types.ts +++ b/src/libs/Navigation/types.ts @@ -963,13 +963,13 @@ type SettingsNavigatorParamList = { policyID: string; taxID: string; }; - [SCREENS.WORKSPACE.INVOICES_COMPANY_NAME]: { + [SCREENS.WORKSPACE.INVOICES_VERIFY_ACCOUNT]: { policyID: string; }; - [SCREENS.WORKSPACE.INVOICES_COMPANY_WEBSITE]: { + [SCREENS.WORKSPACE.INVOICES_COMPANY_NAME]: { policyID: string; }; - [SCREENS.WORKSPACE.INVOICES_VERIFY_ACCOUNT]: { + [SCREENS.WORKSPACE.INVOICES_COMPANY_WEBSITE]: { policyID: string; }; [SCREENS.WORKSPACE.COMPANY_CARDS_SELECT_FEED]: { diff --git a/src/pages/settings/Wallet/PaymentMethodList.tsx b/src/pages/settings/Wallet/PaymentMethodList.tsx index c8094141da0e..dabfeec66085 100644 --- a/src/pages/settings/Wallet/PaymentMethodList.tsx +++ b/src/pages/settings/Wallet/PaymentMethodList.tsx @@ -108,6 +108,7 @@ type PaymentMethodListProps = { /** Whether the bank accounts should be displayed in private and business sections */ shouldShowBankAccountSections?: boolean; + /** The policy ID associated with the workspace, if component is rendered in workspace context */ policyID?: string; }; From 1b5eae35f68e69ff8c33060e35a5ae9fc71245d6 Mon Sep 17 00:00:00 2001 From: Yehor Kharchenko Date: Fri, 5 Sep 2025 16:37:45 +0200 Subject: [PATCH 3/9] fixed some things --- src/ROUTES.ts | 6 +++--- .../AppNavigator/ModalStackNavigators/index.tsx | 4 ++-- .../{VerifyAccount.tsx => VerifyAccountPage.tsx} | 0 .../invoices/{VerifyAccount.tsx => VerifyAccountPage.tsx} | 8 ++++++-- 4 files changed, 11 insertions(+), 7 deletions(-) rename src/pages/settings/Wallet/NewBankAccount/{VerifyAccount.tsx => VerifyAccountPage.tsx} (100%) rename src/pages/workspace/invoices/{VerifyAccount.tsx => VerifyAccountPage.tsx} (50%) diff --git a/src/ROUTES.ts b/src/ROUTES.ts index 92c1e70f322b..795b81696541 100644 --- a/src/ROUTES.ts +++ b/src/ROUTES.ts @@ -247,7 +247,7 @@ const ROUTES = { route: 'settings/wallet/add-bank-account', getRoute: (backTo?: string) => getUrlWithBackToParam('settings/wallet/add-bank-account', backTo), }, - SETTINGS_ADD_NEW_BANK_ACCOUNT_VERIFY_ACCOUNT: 'settings/wallet/add-new-bank-account/verify-account', + SETTINGS_ADD_NEW_BANK_ACCOUNT_VERIFY_ACCOUNT: `settings/wallet/add-new-bank-account/${VERIFY_ACCOUNT}`, SETTINGS_ADD_US_BANK_ACCOUNT: 'settings/wallet/add-us-bank-account', SETTINGS_ENABLE_PAYMENTS: 'settings/wallet/enable-payments', SETTINGS_WALLET_ENABLE_GLOBAL_REIMBURSEMENTS: { @@ -1312,8 +1312,8 @@ const ROUTES = { }, }, WORKSPACE_INVOICES_VERIFY_ACCOUNT: { - route: 'workspaces/:policyID/invoices/verify-account', - getRoute: (policyID: string) => `workspaces/${policyID}/invoices/verify-account` as const, + route: `workspaces/:policyID/invoices/${VERIFY_ACCOUNT}`, + getRoute: (policyID: string) => `workspaces/${policyID}/invoices/${VERIFY_ACCOUNT}` as const, }, WORKSPACE_INVOICES_COMPANY_NAME: { route: 'workspaces/:policyID/invoices/company-name', diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx index cd6e28dce0cb..5ecfec1f7282 100644 --- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx +++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx @@ -321,7 +321,7 @@ const SettingsModalStackNavigator = createModalStackNavigator require('../../../../pages/EnablePayments/EnablePayments').default, [SCREENS.SETTINGS.WALLET.ENABLE_GLOBAL_REIMBURSEMENTS]: () => require('../../../../pages/settings/Wallet/EnableGlobalReimbursements').default, [SCREENS.SETTINGS.ADD_DEBIT_CARD]: () => require('../../../../pages/settings/Wallet/AddDebitCardPage').default, - [SCREENS.SETTINGS.ADD_NEW_BANK_ACCOUNT_VERIFY_ACCOUNT]: () => require('../../../../pages/settings/Wallet/NewBankAccount/VerifyAccount').default, + [SCREENS.SETTINGS.ADD_NEW_BANK_ACCOUNT_VERIFY_ACCOUNT]: () => require('../../../../pages/settings/Wallet/NewBankAccount/VerifyAccountPage').default, [SCREENS.SETTINGS.ADD_BANK_ACCOUNT]: () => require('../../../../pages/settings/Wallet/InternationalDepositAccount').default, [SCREENS.SETTINGS.ADD_US_BANK_ACCOUNT]: () => require('../../../../pages/AddPersonalBankAccountPage').default, [SCREENS.SETTINGS.PROFILE.STATUS]: () => require('../../../../pages/settings/Profile/CustomStatus/StatusPage').default, @@ -613,7 +613,7 @@ const SettingsModalStackNavigator = createModalStackNavigator require('../../../../pages/workspace/taxes/WorkspaceTaxCodePage').default, [SCREENS.WORKSPACE.INVOICES_COMPANY_NAME]: () => require('../../../../pages/workspace/invoices/WorkspaceInvoicingDetailsName').default, [SCREENS.WORKSPACE.INVOICES_COMPANY_WEBSITE]: () => require('../../../../pages/workspace/invoices/WorkspaceInvoicingDetailsWebsite').default, - [SCREENS.WORKSPACE.INVOICES_VERIFY_ACCOUNT]: () => require('../../../../pages/workspace/invoices/VerifyAccount').default, + [SCREENS.WORKSPACE.INVOICES_VERIFY_ACCOUNT]: () => require('../../../../pages/workspace/invoices/VerifyAccountPage').default, [SCREENS.WORKSPACE.COMPANY_CARDS_ASSIGN_CARD]: () => require('../../../../pages/workspace/companyCards/assignCard/AssignCardFeedPage').default, [SCREENS.WORKSPACE.COMPANY_CARDS_SELECT_FEED]: () => require('../../../../pages/workspace/companyCards/WorkspaceCompanyCardFeedSelectorPage').default, [SCREENS.WORKSPACE.COMPANY_CARDS_BANK_CONNECTION]: () => require('../../../../pages/workspace/companyCards/BankConnection').default, diff --git a/src/pages/settings/Wallet/NewBankAccount/VerifyAccount.tsx b/src/pages/settings/Wallet/NewBankAccount/VerifyAccountPage.tsx similarity index 100% rename from src/pages/settings/Wallet/NewBankAccount/VerifyAccount.tsx rename to src/pages/settings/Wallet/NewBankAccount/VerifyAccountPage.tsx diff --git a/src/pages/workspace/invoices/VerifyAccount.tsx b/src/pages/workspace/invoices/VerifyAccountPage.tsx similarity index 50% rename from src/pages/workspace/invoices/VerifyAccount.tsx rename to src/pages/workspace/invoices/VerifyAccountPage.tsx index f803af3e5f68..f7a30b3e9070 100644 --- a/src/pages/workspace/invoices/VerifyAccount.tsx +++ b/src/pages/workspace/invoices/VerifyAccountPage.tsx @@ -1,9 +1,13 @@ import React from 'react'; +import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types'; +import type {WorkspaceSplitNavigatorParamList} from '@libs/Navigation/types'; import VerifyAccountPageBase from '@pages/settings/VerifyAccountPageBase'; import ROUTES from '@src/ROUTES'; +import type SCREENS from '@src/SCREENS'; -function VerifyAccountPage(policyID: string) { - const workspaceInvoicePath = ROUTES.WORKSPACE_INVOICES.getRoute(policyID); +type WorkspaceInvoicesPageProps = PlatformStackScreenProps; +function VerifyAccountPage({route}: WorkspaceInvoicesPageProps) { + const workspaceInvoicePath = ROUTES.WORKSPACE_INVOICES.getRoute(route.params.policyID); return ( Date: Fri, 5 Sep 2025 17:21:54 +0200 Subject: [PATCH 4/9] changed props for VerifyAccountPage --- src/libs/Navigation/types.ts | 3 +++ src/pages/workspace/invoices/VerifyAccountPage.tsx | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts index d61f1bb23c26..787202098103 100644 --- a/src/libs/Navigation/types.ts +++ b/src/libs/Navigation/types.ts @@ -1960,6 +1960,9 @@ type WorkspaceSplitNavigatorParamList = { [SCREENS.WORKSPACE.INVOICES]: { policyID: string; }; + [SCREENS.WORKSPACE.INVOICES_VERIFY_ACCOUNT]: { + policyID: string; + }; [SCREENS.WORKSPACE.MEMBERS]: { policyID: string; }; diff --git a/src/pages/workspace/invoices/VerifyAccountPage.tsx b/src/pages/workspace/invoices/VerifyAccountPage.tsx index f7a30b3e9070..356f41b50fe3 100644 --- a/src/pages/workspace/invoices/VerifyAccountPage.tsx +++ b/src/pages/workspace/invoices/VerifyAccountPage.tsx @@ -5,8 +5,8 @@ import VerifyAccountPageBase from '@pages/settings/VerifyAccountPageBase'; import ROUTES from '@src/ROUTES'; import type SCREENS from '@src/SCREENS'; -type WorkspaceInvoicesPageProps = PlatformStackScreenProps; -function VerifyAccountPage({route}: WorkspaceInvoicesPageProps) { +type WorkspaceInvoicesVerifyAccountPageProps = PlatformStackScreenProps; +function VerifyAccountPage({route}: WorkspaceInvoicesVerifyAccountPageProps) { const workspaceInvoicePath = ROUTES.WORKSPACE_INVOICES.getRoute(route.params.policyID); return ( Date: Fri, 5 Sep 2025 18:18:54 +0200 Subject: [PATCH 5/9] fixed some screens + RHP related to deep links and fixed path for verifyAccountScreen --- src/ROUTES.ts | 2 +- src/SCREENS.ts | 2 +- .../Navigation/AppNavigator/ModalStackNavigators/index.tsx | 2 +- .../Navigation/linkingConfig/RELATIONS/SETTINGS_TO_RHP.ts | 1 + .../Navigation/linkingConfig/RELATIONS/WORKSPACE_TO_RHP.ts | 2 +- src/libs/Navigation/linkingConfig/config.ts | 4 ++-- src/libs/Navigation/types.ts | 2 +- src/pages/settings/Wallet/PaymentMethodList.tsx | 2 +- 8 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/ROUTES.ts b/src/ROUTES.ts index 795b81696541..38e39202048f 100644 --- a/src/ROUTES.ts +++ b/src/ROUTES.ts @@ -247,7 +247,7 @@ const ROUTES = { route: 'settings/wallet/add-bank-account', getRoute: (backTo?: string) => getUrlWithBackToParam('settings/wallet/add-bank-account', backTo), }, - SETTINGS_ADD_NEW_BANK_ACCOUNT_VERIFY_ACCOUNT: `settings/wallet/add-new-bank-account/${VERIFY_ACCOUNT}`, + SETTINGS_ADD_BANK_ACCOUNT_VERIFY_ACCOUNT: `settings/wallet/add-bank-account/${VERIFY_ACCOUNT}`, SETTINGS_ADD_US_BANK_ACCOUNT: 'settings/wallet/add-us-bank-account', SETTINGS_ENABLE_PAYMENTS: 'settings/wallet/enable-payments', SETTINGS_WALLET_ENABLE_GLOBAL_REIMBURSEMENTS: { diff --git a/src/SCREENS.ts b/src/SCREENS.ts index f8bbe22a2d23..a387ae116f8a 100644 --- a/src/SCREENS.ts +++ b/src/SCREENS.ts @@ -92,7 +92,7 @@ const SCREENS = { APP_DOWNLOAD_LINKS: 'Settings_App_Download_Links', ADD_DEBIT_CARD: 'Settings_Add_Debit_Card', ADD_PAYMENT_CARD_CHANGE_CURRENCY: 'Settings_Add_Payment_Card_Change_Currency', - ADD_NEW_BANK_ACCOUNT_VERIFY_ACCOUNT: 'Settings_Add_New_Bank_Account_Verify_Account', + ADD_BANK_ACCOUNT_VERIFY_ACCOUNT: 'Settings_Add_Bank_Account_Verify_Account', ADD_BANK_ACCOUNT: 'Settings_Add_Bank_Account', ADD_US_BANK_ACCOUNT: 'Settings_Add_US_Bank_Account', CLOSE: 'Settings_Close', diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx index 5ecfec1f7282..a22e3c8065a4 100644 --- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx +++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx @@ -321,7 +321,7 @@ const SettingsModalStackNavigator = createModalStackNavigator require('../../../../pages/EnablePayments/EnablePayments').default, [SCREENS.SETTINGS.WALLET.ENABLE_GLOBAL_REIMBURSEMENTS]: () => require('../../../../pages/settings/Wallet/EnableGlobalReimbursements').default, [SCREENS.SETTINGS.ADD_DEBIT_CARD]: () => require('../../../../pages/settings/Wallet/AddDebitCardPage').default, - [SCREENS.SETTINGS.ADD_NEW_BANK_ACCOUNT_VERIFY_ACCOUNT]: () => require('../../../../pages/settings/Wallet/NewBankAccount/VerifyAccountPage').default, + [SCREENS.SETTINGS.ADD_BANK_ACCOUNT_VERIFY_ACCOUNT]: () => require('../../../../pages/settings/Wallet/NewBankAccount/VerifyAccountPage').default, [SCREENS.SETTINGS.ADD_BANK_ACCOUNT]: () => require('../../../../pages/settings/Wallet/InternationalDepositAccount').default, [SCREENS.SETTINGS.ADD_US_BANK_ACCOUNT]: () => require('../../../../pages/AddPersonalBankAccountPage').default, [SCREENS.SETTINGS.PROFILE.STATUS]: () => require('../../../../pages/settings/Profile/CustomStatus/StatusPage').default, diff --git a/src/libs/Navigation/linkingConfig/RELATIONS/SETTINGS_TO_RHP.ts b/src/libs/Navigation/linkingConfig/RELATIONS/SETTINGS_TO_RHP.ts index 0d5857426e88..6340fef26fdd 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['config'] = { path: ROUTES.SETTINGS_ADD_BANK_ACCOUNT.route, exact: true, }, - [SCREENS.SETTINGS.ADD_NEW_BANK_ACCOUNT_VERIFY_ACCOUNT]: { - path: ROUTES.SETTINGS_ADD_NEW_BANK_ACCOUNT_VERIFY_ACCOUNT, + [SCREENS.SETTINGS.ADD_BANK_ACCOUNT_VERIFY_ACCOUNT]: { + path: ROUTES.SETTINGS_ADD_BANK_ACCOUNT_VERIFY_ACCOUNT, exact: true, }, [SCREENS.SETTINGS.ADD_US_BANK_ACCOUNT]: { diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts index 787202098103..e7b54e1b62c5 100644 --- a/src/libs/Navigation/types.ts +++ b/src/libs/Navigation/types.ts @@ -170,7 +170,7 @@ type SettingsNavigatorParamList = { }; [SCREENS.SETTINGS.ADD_DEBIT_CARD]: undefined; [SCREENS.SETTINGS.ADD_BANK_ACCOUNT]: undefined; - [SCREENS.SETTINGS.ADD_NEW_BANK_ACCOUNT_VERIFY_ACCOUNT]: undefined; + [SCREENS.SETTINGS.ADD_BANK_ACCOUNT_VERIFY_ACCOUNT]: undefined; [SCREENS.SETTINGS.ADD_US_BANK_ACCOUNT]: undefined; [SCREENS.SETTINGS.PROFILE.STATUS]: undefined; [SCREENS.SETTINGS.PROFILE.STATUS_CLEAR_AFTER]: undefined; diff --git a/src/pages/settings/Wallet/PaymentMethodList.tsx b/src/pages/settings/Wallet/PaymentMethodList.tsx index f236c0f8f8fe..8009899a1553 100644 --- a/src/pages/settings/Wallet/PaymentMethodList.tsx +++ b/src/pages/settings/Wallet/PaymentMethodList.tsx @@ -396,7 +396,7 @@ function PaymentMethodList({ if (path.includes(ROUTES.WORKSPACES_LIST.route) && policyID) { Navigation.navigate(ROUTES.WORKSPACE_INVOICES_VERIFY_ACCOUNT.getRoute(policyID)); } else { - Navigation.navigate(ROUTES.SETTINGS_ADD_NEW_BANK_ACCOUNT_VERIFY_ACCOUNT); + Navigation.navigate(ROUTES.SETTINGS_ADD_BANK_ACCOUNT_VERIFY_ACCOUNT); } return; } From 8c20907356bc3c3c133197d36b11a3500465809c Mon Sep 17 00:00:00 2001 From: Yehor Kharchenko Date: Mon, 15 Sep 2025 12:38:51 +0200 Subject: [PATCH 6/9] added displayName --- src/pages/settings/Wallet/NewBankAccount/VerifyAccountPage.tsx | 2 ++ src/pages/workspace/invoices/VerifyAccountPage.tsx | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/pages/settings/Wallet/NewBankAccount/VerifyAccountPage.tsx b/src/pages/settings/Wallet/NewBankAccount/VerifyAccountPage.tsx index bf22f85b84c3..1e1ec06c4bd3 100644 --- a/src/pages/settings/Wallet/NewBankAccount/VerifyAccountPage.tsx +++ b/src/pages/settings/Wallet/NewBankAccount/VerifyAccountPage.tsx @@ -11,4 +11,6 @@ function VerifyAccountPage() { ); } +VerifyAccountPage.displayName = 'VerifyAccountPage'; + export default VerifyAccountPage; diff --git a/src/pages/workspace/invoices/VerifyAccountPage.tsx b/src/pages/workspace/invoices/VerifyAccountPage.tsx index 356f41b50fe3..34dcb7558445 100644 --- a/src/pages/workspace/invoices/VerifyAccountPage.tsx +++ b/src/pages/workspace/invoices/VerifyAccountPage.tsx @@ -16,4 +16,6 @@ function VerifyAccountPage({route}: WorkspaceInvoicesVerifyAccountPageProps) { ); } +VerifyAccountPage.displayName = 'VerifyAccountPage'; + export default VerifyAccountPage; From 797f42962de83286a17247bfa702724a5f200bb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Musia=C5=82?= Date: Wed, 17 Sep 2025 10:06:57 +0200 Subject: [PATCH 7/9] rename VerifyAccountPage --- .../Navigation/AppNavigator/ModalStackNavigators/index.tsx | 2 +- ...countPage.tsx => WorkspaceInvoicesVerifyAccountPage.tsx} | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) rename src/pages/workspace/invoices/{VerifyAccountPage.tsx => WorkspaceInvoicesVerifyAccountPage.tsx} (78%) diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx index d88a3cbd47ea..549f82db9738 100644 --- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx +++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx @@ -654,7 +654,7 @@ const SettingsModalStackNavigator = createModalStackNavigator require('../../../../pages/workspace/taxes/WorkspaceTaxCodePage').default, [SCREENS.WORKSPACE.INVOICES_COMPANY_NAME]: () => require('../../../../pages/workspace/invoices/WorkspaceInvoicingDetailsName').default, [SCREENS.WORKSPACE.INVOICES_COMPANY_WEBSITE]: () => require('../../../../pages/workspace/invoices/WorkspaceInvoicingDetailsWebsite').default, - [SCREENS.WORKSPACE.INVOICES_VERIFY_ACCOUNT]: () => require('../../../../pages/workspace/invoices/VerifyAccountPage').default, + [SCREENS.WORKSPACE.INVOICES_VERIFY_ACCOUNT]: () => require('../../../../pages/workspace/invoices/WorkspaceInvoicesVerifyAccountPage').default, [SCREENS.WORKSPACE.COMPANY_CARDS_ASSIGN_CARD]: () => require('../../../../pages/workspace/companyCards/assignCard/AssignCardFeedPage').default, [SCREENS.WORKSPACE.COMPANY_CARDS_SELECT_FEED]: () => require('../../../../pages/workspace/companyCards/WorkspaceCompanyCardFeedSelectorPage').default, [SCREENS.WORKSPACE.COMPANY_CARDS_BANK_CONNECTION]: () => require('../../../../pages/workspace/companyCards/BankConnection').default, diff --git a/src/pages/workspace/invoices/VerifyAccountPage.tsx b/src/pages/workspace/invoices/WorkspaceInvoicesVerifyAccountPage.tsx similarity index 78% rename from src/pages/workspace/invoices/VerifyAccountPage.tsx rename to src/pages/workspace/invoices/WorkspaceInvoicesVerifyAccountPage.tsx index 34dcb7558445..82c36b2cf5bd 100644 --- a/src/pages/workspace/invoices/VerifyAccountPage.tsx +++ b/src/pages/workspace/invoices/WorkspaceInvoicesVerifyAccountPage.tsx @@ -6,7 +6,7 @@ import ROUTES from '@src/ROUTES'; import type SCREENS from '@src/SCREENS'; type WorkspaceInvoicesVerifyAccountPageProps = PlatformStackScreenProps; -function VerifyAccountPage({route}: WorkspaceInvoicesVerifyAccountPageProps) { +function WorkspaceInvoicesVerifyAccountPage({route}: WorkspaceInvoicesVerifyAccountPageProps) { const workspaceInvoicePath = ROUTES.WORKSPACE_INVOICES.getRoute(route.params.policyID); return ( Date: Wed, 17 Sep 2025 15:10:43 +0200 Subject: [PATCH 8/9] rename VarifyAccountPage v2 --- .../Navigation/AppNavigator/ModalStackNavigators/index.tsx | 2 +- ...yAccountPage.tsx => NewBankAccountVerifyAccountPage.tsx} | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) rename src/pages/settings/Wallet/{NewBankAccount/VerifyAccountPage.tsx => NewBankAccountVerifyAccountPage.tsx} (65%) diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx index 549f82db9738..eea2848e048b 100644 --- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx +++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx @@ -360,7 +360,7 @@ const SettingsModalStackNavigator = createModalStackNavigator require('../../../../pages/EnablePayments/EnablePayments').default, [SCREENS.SETTINGS.WALLET.ENABLE_GLOBAL_REIMBURSEMENTS]: () => require('../../../../pages/settings/Wallet/EnableGlobalReimbursements').default, [SCREENS.SETTINGS.ADD_DEBIT_CARD]: () => require('../../../../pages/settings/Wallet/AddDebitCardPage').default, - [SCREENS.SETTINGS.ADD_BANK_ACCOUNT_VERIFY_ACCOUNT]: () => require('../../../../pages/settings/Wallet/NewBankAccount/VerifyAccountPage').default, + [SCREENS.SETTINGS.ADD_BANK_ACCOUNT_VERIFY_ACCOUNT]: () => require('../../../../pages/settings/Wallet/NewBankAccountVerifyAccountPage').default, [SCREENS.SETTINGS.ADD_BANK_ACCOUNT]: () => require('../../../../pages/settings/Wallet/InternationalDepositAccount').default, [SCREENS.SETTINGS.ADD_US_BANK_ACCOUNT]: () => require('../../../../pages/AddPersonalBankAccountPage').default, [SCREENS.SETTINGS.PROFILE.STATUS]: () => require('../../../../pages/settings/Profile/CustomStatus/StatusPage').default, diff --git a/src/pages/settings/Wallet/NewBankAccount/VerifyAccountPage.tsx b/src/pages/settings/Wallet/NewBankAccountVerifyAccountPage.tsx similarity index 65% rename from src/pages/settings/Wallet/NewBankAccount/VerifyAccountPage.tsx rename to src/pages/settings/Wallet/NewBankAccountVerifyAccountPage.tsx index 1e1ec06c4bd3..5a6e6d99a2d8 100644 --- a/src/pages/settings/Wallet/NewBankAccount/VerifyAccountPage.tsx +++ b/src/pages/settings/Wallet/NewBankAccountVerifyAccountPage.tsx @@ -2,7 +2,7 @@ import React from 'react'; import VerifyAccountPageBase from '@pages/settings/VerifyAccountPageBase'; import ROUTES from '@src/ROUTES'; -function VerifyAccountPage() { +function NewBankAccountVerifyAccountPage() { return ( Date: Wed, 17 Sep 2025 17:11:53 +0200 Subject: [PATCH 9/9] missed it indeed --- .../workspace/invoices/WorkspaceInvoicesVerifyAccountPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/workspace/invoices/WorkspaceInvoicesVerifyAccountPage.tsx b/src/pages/workspace/invoices/WorkspaceInvoicesVerifyAccountPage.tsx index 82c36b2cf5bd..f04995a5c6e9 100644 --- a/src/pages/workspace/invoices/WorkspaceInvoicesVerifyAccountPage.tsx +++ b/src/pages/workspace/invoices/WorkspaceInvoicesVerifyAccountPage.tsx @@ -16,6 +16,6 @@ function WorkspaceInvoicesVerifyAccountPage({route}: WorkspaceInvoicesVerifyAcco ); } -WorkspaceInvoicesVerifyAccountPage.displayName = 'VerifyAccountPage'; +WorkspaceInvoicesVerifyAccountPage.displayName = 'WorkspaceInvoicesVerifyAccountPage'; export default WorkspaceInvoicesVerifyAccountPage;