From ec123a93158dd81b74be92f528c82dbbf463206d Mon Sep 17 00:00:00 2001 From: Fedi Rajhi Date: Sat, 21 Mar 2026 22:09:55 +0000 Subject: [PATCH 01/21] Add refresh card feed connection route and screen - Introduced a new route for refreshing the company card feed connection in ROUTES.ts. - Added corresponding screen identifier in SCREENS.ts. - Updated navigation types to include parameters for the new screen. - Registered the new screen in the modal stack navigator. - Updated linking configuration to support the new route. --- src/ROUTES.ts | 4 ++++ src/SCREENS.ts | 1 + .../Navigation/AppNavigator/ModalStackNavigators/index.tsx | 1 + src/libs/Navigation/linkingConfig/config.ts | 3 +++ src/libs/Navigation/types.ts | 4 ++++ src/pages/workspace/withPolicy.tsx | 1 + 6 files changed, 14 insertions(+) diff --git a/src/ROUTES.ts b/src/ROUTES.ts index e4c93c0e366a..3dccfcc5d3a8 100644 --- a/src/ROUTES.ts +++ b/src/ROUTES.ts @@ -2459,6 +2459,10 @@ const ROUTES = { route: 'workspaces/:policyID/company-cards/:feed/broken-card-feed-connection', getRoute: (policyID: string, feed: CompanyCardFeedWithDomainID) => `workspaces/${policyID}/company-cards/${encodeURIComponent(feed)}/broken-card-feed-connection` as const, }, + WORKSPACE_COMPANY_CARDS_REFRESH_CARD_FEED_CONNECTION: { + route: 'workspaces/:policyID/company-cards/:feed/refresh-card-feed-connection', + getRoute: (policyID: string, feed: CompanyCardFeedWithDomainID) => `workspaces/${policyID}/company-cards/${encodeURIComponent(feed)}/refresh-card-feed-connection` as const, + }, WORKSPACE_COMPANY_CARDS_ASSIGN_CARD_ASSIGNEE: { route: 'workspaces/:policyID/company-cards/:feed/assign-card/:cardID/assignee', getRoute: (params: WorkspaceCompanyCardsAssignCardParams, backTo?: string) => diff --git a/src/SCREENS.ts b/src/SCREENS.ts index 51fffec8051d..7395562ac4e9 100644 --- a/src/SCREENS.ts +++ b/src/SCREENS.ts @@ -639,6 +639,7 @@ const SCREENS = { PROFILE: 'Workspace_Overview', COMPANY_CARDS: 'Workspace_CompanyCards', COMPANY_CARDS_BROKEN_CARD_FEED_CONNECTION: 'Workspace_CompanyCards_BrokenCardFeedConnection', + COMPANY_CARDS_REFRESH_CARD_FEED_CONNECTION: 'Workspace_CompanyCards_RefreshCardFeedConnection', COMPANY_CARDS_ASSIGN_CARD_ASSIGNEE: 'Workspace_CompanyCards_AssignCard_Assignee', COMPANY_CARDS_ASSIGN_CARD_BANK_CONNECTION: 'Workspace_CompanyCards_AssignCard_Bank_Connection', COMPANY_CARDS_ASSIGN_CARD_PLAID_CONNECTION: 'Workspace_CompanyCards_AssignCard_Plaid_Connection', diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx index 69427c1a1949..e55ee7a53ca3 100644 --- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx +++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx @@ -783,6 +783,7 @@ const SettingsModalStackNavigator = createModalStackNavigator require('../../../../pages/workspace/invoices/WorkspaceInvoicingDetailsWebsite').default, [SCREENS.WORKSPACE.INVOICES_VERIFY_ACCOUNT]: () => require('../../../../pages/workspace/invoices/WorkspaceInvoicesVerifyAccountPage').default, [SCREENS.WORKSPACE.COMPANY_CARDS_BROKEN_CARD_FEED_CONNECTION]: () => require('../../../../pages/workspace/companyCards/BrokenCardFeedConnectionPage').default, + [SCREENS.WORKSPACE.COMPANY_CARDS_REFRESH_CARD_FEED_CONNECTION]: () => require('../../../../pages/workspace/companyCards/RefreshCardFeedConnectionPage').default, [SCREENS.WORKSPACE.COMPANY_CARDS_ASSIGN_CARD_ASSIGNEE]: () => require('../../../../pages/workspace/companyCards/assignCard/AssigneeStep').default, [SCREENS.WORKSPACE.COMPANY_CARDS_ASSIGN_CARD_CARD_SELECTION]: () => require('../../../../pages/workspace/companyCards/assignCard/CardSelectionStep').default, [SCREENS.WORKSPACE.COMPANY_CARDS_ASSIGN_CARD_TRANSACTION_START_DATE]: () => diff --git a/src/libs/Navigation/linkingConfig/config.ts b/src/libs/Navigation/linkingConfig/config.ts index 1e28d24ef4ed..9aaf283349fd 100644 --- a/src/libs/Navigation/linkingConfig/config.ts +++ b/src/libs/Navigation/linkingConfig/config.ts @@ -878,6 +878,9 @@ const config: LinkingOptions['config'] = { [SCREENS.WORKSPACE.COMPANY_CARDS_BROKEN_CARD_FEED_CONNECTION]: { path: ROUTES.WORKSPACE_COMPANY_CARDS_BROKEN_CARD_FEED_CONNECTION.route, }, + [SCREENS.WORKSPACE.COMPANY_CARDS_REFRESH_CARD_FEED_CONNECTION]: { + path: ROUTES.WORKSPACE_COMPANY_CARDS_REFRESH_CARD_FEED_CONNECTION.route, + }, [SCREENS.WORKSPACE.COMPANY_CARDS_ASSIGN_CARD_ASSIGNEE]: { path: ROUTES.WORKSPACE_COMPANY_CARDS_ASSIGN_CARD_ASSIGNEE.route, }, diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts index 6dd584f49c9f..78438edba198 100644 --- a/src/libs/Navigation/types.ts +++ b/src/libs/Navigation/types.ts @@ -1302,6 +1302,10 @@ type SettingsNavigatorParamList = { // eslint-disable-next-line no-restricted-syntax -- `backTo` usages in this file are legacy. Do not add new `backTo` params to screens. See contributingGuides/NAVIGATION.md backTo?: Routes; }; + [SCREENS.WORKSPACE.COMPANY_CARDS_REFRESH_CARD_FEED_CONNECTION]: { + policyID: string; + feed: CompanyCardFeedWithDomainID; + }; [SCREENS.WORKSPACE.COMPANY_CARDS_ASSIGN_CARD_ASSIGNEE]: { policyID: string; feed: CompanyCardFeedWithDomainID; diff --git a/src/pages/workspace/withPolicy.tsx b/src/pages/workspace/withPolicy.tsx index f4ef4b7212a5..4a2e610b4e1d 100644 --- a/src/pages/workspace/withPolicy.tsx +++ b/src/pages/workspace/withPolicy.tsx @@ -53,6 +53,7 @@ type PolicyRouteName = | typeof SCREENS.WORKSPACE.RULES | typeof SCREENS.WORKSPACE.EXPENSIFY_CARD_ISSUE_NEW | typeof SCREENS.WORKSPACE.COMPANY_CARDS_BROKEN_CARD_FEED_CONNECTION + | typeof SCREENS.WORKSPACE.COMPANY_CARDS_REFRESH_CARD_FEED_CONNECTION | typeof SCREENS.WORKSPACE.ACCOUNTING.CLAIM_OFFER | typeof SCREENS.WORKSPACE.TIME_TRACKING; From 2f3cfa18f9bc9385b93ca8dd82a9c5922fb44d81 Mon Sep 17 00:00:00 2001 From: Fedi Rajhi Date: Sat, 21 Mar 2026 22:42:38 +0000 Subject: [PATCH 02/21] Add translations for assigning new cards in English and Spanish - Added new translation keys for 'Assign new cards' and its description in both en.ts and es.ts files. --- src/languages/en.ts | 4 ++++ src/languages/es.ts | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/languages/en.ts b/src/languages/en.ts index 9edf6ea39d71..a1ffb6408d78 100644 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -5113,6 +5113,10 @@ const translations = { flipAmountSign: 'Flip amount sign', importButton: 'Import transactions', }, + assignNewCards: { + title: 'Assign new cards', + description: 'Get the latest cards to assign from your bank', + }, }, expensifyCard: { issueAndManageCards: 'Issue and manage your Expensify Cards', diff --git a/src/languages/es.ts b/src/languages/es.ts index 656b3a881a86..7854eda08eb9 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -4997,6 +4997,10 @@ ${amount} para ${merchant} - ${date}`, flipAmountSign: 'Invertir el signo del monto', importButton: 'Importar transacciones', }, + assignNewCards: { + title: 'Asignar nuevas tarjetas', + description: 'Obtén las últimas tarjetas para asignar desde tu banco', + }, }, expensifyCard: { issueAndManageCards: 'Emitir y gestionar Tarjetas Expensify', From f04096747ef7a2495c1e8fa0701e509e9f6b5a32 Mon Sep 17 00:00:00 2001 From: Fedi Rajhi Date: Sun, 22 Mar 2026 00:41:40 +0000 Subject: [PATCH 03/21] Add RefreshCardFeedConnectionPage and integrate with WorkspaceCompanyCardsSettingsPage - Created a new RefreshCardFeedConnectionPage component to handle the card feed connection process. - Implemented logic to manage navigation based on the current step of the card assignment process. - Updated WorkspaceCompanyCardsSettingsPage to include a menu item for assigning new cards, linking it to the new refresh card feed connection page. - Enhanced the user experience by conditionally displaying the new menu item based on the feed type. --- .../RefreshCardFeedConnectionPage.tsx | 62 +++++++++++++++++++ .../WorkspaceCompanyCardsSettingsPage.tsx | 31 +++++++++- 2 files changed, 91 insertions(+), 2 deletions(-) create mode 100644 src/pages/workspace/companyCards/RefreshCardFeedConnectionPage.tsx diff --git a/src/pages/workspace/companyCards/RefreshCardFeedConnectionPage.tsx b/src/pages/workspace/companyCards/RefreshCardFeedConnectionPage.tsx new file mode 100644 index 000000000000..7a81b6edc14c --- /dev/null +++ b/src/pages/workspace/companyCards/RefreshCardFeedConnectionPage.tsx @@ -0,0 +1,62 @@ +import React, {useEffect} from 'react'; +import useLocalize from '@hooks/useLocalize'; +import useOnyx from '@hooks/useOnyx'; +import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types'; +import Navigation from '@libs/Navigation/Navigation'; +import type {SettingsNavigatorParamList} from '@navigation/types'; +import LoadingPage from '@pages/LoadingPage'; +import type {WithPolicyAndFullscreenLoadingProps} from '@pages/workspace/withPolicyAndFullscreenLoading'; +import withPolicyAndFullscreenLoading from '@pages/workspace/withPolicyAndFullscreenLoading'; +import {clearAssignCardStepAndData} from '@userActions/CompanyCards'; +import CONST from '@src/CONST'; +import ONYXKEYS from '@src/ONYXKEYS'; +import type SCREENS from '@src/SCREENS'; +import PlaidConnectionStep from './addNew/PlaidConnectionStep'; +import BankConnection from './BankConnection'; + +type RefreshCardFeedConnectionPageProps = PlatformStackScreenProps & + WithPolicyAndFullscreenLoadingProps; + +function RefreshCardFeedConnectionPage({route, policy}: RefreshCardFeedConnectionPageProps) { + const feed = route.params?.feed; + const policyID = policy?.id; + + const {translate} = useLocalize(); + + const [assignCard] = useOnyx(ONYXKEYS.ASSIGN_CARD); + const currentStep = assignCard?.currentStep; + + useEffect(() => { + return () => { + clearAssignCardStepAndData(); + }; + }, []); + + useEffect(() => { + const isConnectionStep = currentStep === CONST.COMPANY_CARD.STEP.BANK_CONNECTION || currentStep === CONST.COMPANY_CARD.STEP.PLAID_CONNECTION; + if (currentStep && !isConnectionStep) { + Navigation.closeRHPFlow(); + } + }, [currentStep]); + + switch (currentStep) { + case CONST.COMPANY_CARD.STEP.BANK_CONNECTION: + return ( + + ); + case CONST.COMPANY_CARD.STEP.PLAID_CONNECTION: + return ( + + ); + default: + return ; + } +} + +export default withPolicyAndFullscreenLoading(RefreshCardFeedConnectionPage); diff --git a/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsPage.tsx b/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsPage.tsx index 655090ea74fd..bd33cbc7f07d 100644 --- a/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsPage.tsx +++ b/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsPage.tsx @@ -10,13 +10,15 @@ import ScrollView from '@components/ScrollView'; import Text from '@components/Text'; import useCardFeeds from '@hooks/useCardFeeds'; import useCardsList from '@hooks/useCardsList'; +import {useCurrencyListState} from '@hooks/useCurrencyList'; import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset'; import useLocalize from '@hooks/useLocalize'; import useOnyx from '@hooks/useOnyx'; import usePolicy from '@hooks/usePolicy'; import useThemeStyles from '@hooks/useThemeStyles'; import {deleteWorkspaceCompanyCardFeed, setWorkspaceCompanyCardTransactionLiability} from '@libs/actions/CompanyCards'; -import {getCompanyCardFeed, getCompanyFeeds, getCustomOrFormattedFeedName, getDomainOrWorkspaceAccountID, getSelectedFeed} from '@libs/CardUtils'; +import {setAddNewCompanyCardStepAndData, setAssignCardStepAndData} from '@userActions/CompanyCards'; +import {getCompanyCardFeed, getCompanyFeeds, getCustomOrFormattedFeedName, getDomainOrWorkspaceAccountID, getPlaidCountry, getPlaidInstitutionId, getSelectedFeed, isDirectFeed} from '@libs/CardUtils'; import Navigation from '@libs/Navigation/Navigation'; import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types'; import type {SettingsNavigatorParamList} from '@libs/Navigation/types'; @@ -43,12 +45,14 @@ function WorkspaceCompanyCardsSettingsPage({ const [cardFeeds] = useCardFeeds(policyID); const [lastSelectedFeed] = useOnyx(`${ONYXKEYS.COLLECTION.LAST_SELECTED_FEED}${policyID}`); + const [countryByIp] = useOnyx(ONYXKEYS.COUNTRY); + const {currencyList} = useCurrencyListState(); const selectedFeed = useMemo(() => getSelectedFeed(lastSelectedFeed, cardFeeds), [cardFeeds, lastSelectedFeed]); const feed = selectedFeed ? getCompanyCardFeed(selectedFeed) : undefined; const [cardsList] = useCardsList(selectedFeed); - const icons = useMemoizedLazyExpensifyIcons(['Trashcan'] as const); + const icons = useMemoizedLazyExpensifyIcons(['Sync', 'Trashcan'] as const); const feedName = selectedFeed ? getCustomOrFormattedFeedName(translate, feed, cardFeeds?.[selectedFeed]?.customFeedName) : undefined; const companyFeeds = getCompanyFeeds(cardFeeds); const selectedFeedData = selectedFeed ? companyFeeds[selectedFeed] : undefined; @@ -56,6 +60,7 @@ function WorkspaceCompanyCardsSettingsPage({ const isPersonal = liabilityType === CONST.COMPANY_CARDS.DELETE_TRANSACTIONS.ALLOW; const domainOrWorkspaceAccountID = getDomainOrWorkspaceAccountID(workspaceAccountID, selectedFeedData); const isPending = !!selectedFeedData?.pending; + const isDirectFeedType = isDirectFeed(feed); const statementCloseDate = useMemo(() => { if (!selectedFeedData?.statementPeriodEndDay) { return undefined; @@ -149,6 +154,28 @@ function WorkspaceCompanyCardsSettingsPage({ /> {translate('workspace.moreFeatures.companyCards.setTransactionLiabilityDescription')} + {isDirectFeedType && ( + { + if (!selectedFeed) { + return; + } + const isPlaid = !!getPlaidInstitutionId(feed); + const initialStep = isPlaid ? CONST.COMPANY_CARD.STEP.PLAID_CONNECTION : CONST.COMPANY_CARD.STEP.BANK_CONNECTION; + if (isPlaid) { + const country = getPlaidCountry(policy?.outputCurrency, currencyList, countryByIp); + setAddNewCompanyCardStepAndData({data: {selectedCountry: country}}); + } + setAssignCardStepAndData({currentStep: initialStep}); + Navigation.setNavigationActionToMicrotaskQueue(() => { + Navigation.navigate(ROUTES.WORKSPACE_COMPANY_CARDS_REFRESH_CARD_FEED_CONNECTION.getRoute(policyID, selectedFeed)); + }); + }} + /> + )} Date: Sun, 22 Mar 2026 01:34:19 +0000 Subject: [PATCH 04/21] Enhance card assignment flow with refresh state management - Updated the AssignCard type to include an isRefreshing property to track the refresh state. - Modified setAssignCardStepAndData function to accept and merge the isRefreshing state. - Implemented logic in RefreshCardFeedConnectionPage to prevent navigation during refresh. - Adjusted WorkspaceCompanyCardsSettingsPage to set the isRefreshing state when initiating card assignment. --- src/libs/actions/CompanyCards.ts | 9 +++++++-- src/libs/actions/Plaid.ts | 19 ++++++++++++++++++- .../RefreshCardFeedConnectionPage.tsx | 9 +++++---- .../WorkspaceCompanyCardsSettingsPage.tsx | 4 ++-- src/types/onyx/AssignCard.ts | 3 +++ 5 files changed, 35 insertions(+), 9 deletions(-) diff --git a/src/libs/actions/CompanyCards.ts b/src/libs/actions/CompanyCards.ts index 4439218ab5ef..f55bc65d3ab5 100644 --- a/src/libs/actions/CompanyCards.ts +++ b/src/libs/actions/CompanyCards.ts @@ -48,8 +48,8 @@ type AddNewCompanyCardFlowData = { data?: Partial; }; -function setAssignCardStepAndData({cardToAssign, isEditing, currentStep}: Partial) { - Onyx.merge(ONYXKEYS.ASSIGN_CARD, {cardToAssign, isEditing, currentStep}); +function setAssignCardStepAndData({cardToAssign, isEditing, currentStep, isRefreshing}: Partial) { + Onyx.merge(ONYXKEYS.ASSIGN_CARD, {cardToAssign, isEditing, currentStep, isRefreshing}); } function setTransactionStartDate(startDate: string) { @@ -64,6 +64,10 @@ function clearAssignCardErrors() { Onyx.merge(ONYXKEYS.ASSIGN_CARD, {errors: null}); } +function setFeedRefreshComplete() { + Onyx.merge(ONYXKEYS.ASSIGN_CARD, {isRefreshing: false}); +} + function setAddNewCompanyCardStepAndData({data, isEditing, step}: NullishDeep) { Onyx.merge(ONYXKEYS.ADD_NEW_COMPANY_CARD, {data, isEditing, currentStep: step}); } @@ -1080,4 +1084,5 @@ export { setFeedStatementPeriodEndDay, clearErrorField, clearAssignCardErrors, + setFeedRefreshComplete, }; diff --git a/src/libs/actions/Plaid.ts b/src/libs/actions/Plaid.ts index 1bdd86ae8f82..8767997b1a49 100644 --- a/src/libs/actions/Plaid.ts +++ b/src/libs/actions/Plaid.ts @@ -141,7 +141,24 @@ function importPlaidAccounts( plaidAccessToken, }; - API.write(WRITE_COMMANDS.IMPORT_PLAID_ACCOUNTS, parameters); + const onyxData = { + successData: [ + { + onyxMethod: Onyx.METHOD.MERGE, + key: ONYXKEYS.ASSIGN_CARD, + value: {isRefreshing: null}, + }, + ], + failureData: [ + { + onyxMethod: Onyx.METHOD.MERGE, + key: ONYXKEYS.ASSIGN_CARD, + value: {isRefreshing: null}, + }, + ], + }; + + API.write(WRITE_COMMANDS.IMPORT_PLAID_ACCOUNTS, parameters, onyxData); } export {openPlaidBankAccountSelector, openPlaidBankLogin, openPlaidCompanyCardLogin, importPlaidAccounts}; diff --git a/src/pages/workspace/companyCards/RefreshCardFeedConnectionPage.tsx b/src/pages/workspace/companyCards/RefreshCardFeedConnectionPage.tsx index 7a81b6edc14c..982e312742cf 100644 --- a/src/pages/workspace/companyCards/RefreshCardFeedConnectionPage.tsx +++ b/src/pages/workspace/companyCards/RefreshCardFeedConnectionPage.tsx @@ -25,6 +25,7 @@ function RefreshCardFeedConnectionPage({route, policy}: RefreshCardFeedConnectio const [assignCard] = useOnyx(ONYXKEYS.ASSIGN_CARD); const currentStep = assignCard?.currentStep; + const isRefreshing = assignCard?.isRefreshing; useEffect(() => { return () => { @@ -33,11 +34,11 @@ function RefreshCardFeedConnectionPage({route, policy}: RefreshCardFeedConnectio }, []); useEffect(() => { - const isConnectionStep = currentStep === CONST.COMPANY_CARD.STEP.BANK_CONNECTION || currentStep === CONST.COMPANY_CARD.STEP.PLAID_CONNECTION; - if (currentStep && !isConnectionStep) { - Navigation.closeRHPFlow(); + if (isRefreshing) { + return; } - }, [currentStep]); + Navigation.closeRHPFlow(); + }, [isRefreshing]); switch (currentStep) { case CONST.COMPANY_CARD.STEP.BANK_CONNECTION: diff --git a/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsPage.tsx b/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsPage.tsx index bd33cbc7f07d..311ff05895f1 100644 --- a/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsPage.tsx +++ b/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsPage.tsx @@ -164,12 +164,12 @@ function WorkspaceCompanyCardsSettingsPage({ return; } const isPlaid = !!getPlaidInstitutionId(feed); - const initialStep = isPlaid ? CONST.COMPANY_CARD.STEP.PLAID_CONNECTION : CONST.COMPANY_CARD.STEP.BANK_CONNECTION; + const currentStep = isPlaid ? CONST.COMPANY_CARD.STEP.PLAID_CONNECTION : CONST.COMPANY_CARD.STEP.BANK_CONNECTION; if (isPlaid) { const country = getPlaidCountry(policy?.outputCurrency, currencyList, countryByIp); setAddNewCompanyCardStepAndData({data: {selectedCountry: country}}); } - setAssignCardStepAndData({currentStep: initialStep}); + setAssignCardStepAndData({currentStep, isRefreshing: true}); Navigation.setNavigationActionToMicrotaskQueue(() => { Navigation.navigate(ROUTES.WORKSPACE_COMPANY_CARDS_REFRESH_CARD_FEED_CONNECTION.getRoute(policyID, selectedFeed)); }); diff --git a/src/types/onyx/AssignCard.ts b/src/types/onyx/AssignCard.ts index 91a892733eb3..4cb7f4601893 100644 --- a/src/types/onyx/AssignCard.ts +++ b/src/types/onyx/AssignCard.ts @@ -85,6 +85,9 @@ type AssignCard = { /** Whether the card is assigning */ isAssigning?: boolean; + + /** Whether the feed connection is currently being refreshed */ + isRefreshing?: boolean; }; export type {AssignCard, AssignCardStep, AssignCardData}; From a6a1eec038aba178bb4d99c2a372a6f29d82287d Mon Sep 17 00:00:00 2001 From: Fedi Rajhi Date: Sun, 22 Mar 2026 01:37:49 +0000 Subject: [PATCH 05/21] Refactor RefreshCardFeedConnectionPage to improve refresh state handling - Introduced usePrevious hook to track the previous isRefreshing state. - Updated navigation logic to close the RHP flow only when transitioning from refreshing to not refreshing. - Adjusted useEffect dependencies for better state management. --- .../companyCards/RefreshCardFeedConnectionPage.tsx | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/pages/workspace/companyCards/RefreshCardFeedConnectionPage.tsx b/src/pages/workspace/companyCards/RefreshCardFeedConnectionPage.tsx index 982e312742cf..b57e82f5dda4 100644 --- a/src/pages/workspace/companyCards/RefreshCardFeedConnectionPage.tsx +++ b/src/pages/workspace/companyCards/RefreshCardFeedConnectionPage.tsx @@ -1,6 +1,7 @@ import React, {useEffect} from 'react'; import useLocalize from '@hooks/useLocalize'; import useOnyx from '@hooks/useOnyx'; +import usePrevious from '@hooks/usePrevious'; import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types'; import Navigation from '@libs/Navigation/Navigation'; import type {SettingsNavigatorParamList} from '@navigation/types'; @@ -26,6 +27,7 @@ function RefreshCardFeedConnectionPage({route, policy}: RefreshCardFeedConnectio const [assignCard] = useOnyx(ONYXKEYS.ASSIGN_CARD); const currentStep = assignCard?.currentStep; const isRefreshing = assignCard?.isRefreshing; + const prevIsRefreshing = usePrevious(isRefreshing); useEffect(() => { return () => { @@ -34,11 +36,10 @@ function RefreshCardFeedConnectionPage({route, policy}: RefreshCardFeedConnectio }, []); useEffect(() => { - if (isRefreshing) { - return; + if (prevIsRefreshing === true && !isRefreshing) { + Navigation.closeRHPFlow(); } - Navigation.closeRHPFlow(); - }, [isRefreshing]); + }, [prevIsRefreshing, isRefreshing]); switch (currentStep) { case CONST.COMPANY_CARD.STEP.BANK_CONNECTION: From f591523c7294ae137c49aa6a4328deefd3d4adc8 Mon Sep 17 00:00:00 2001 From: Fedi Rajhi Date: Sun, 22 Mar 2026 01:50:23 +0000 Subject: [PATCH 06/21] Enhance card connection components with title prop support - Added a title prop to BankConnection and PlaidConnectionStep components for better header customization. - Updated RefreshCardFeedConnectionPage to utilize the new title prop, improving consistency in header titles across components. - Refactored LoadingPage to use the title prop for a unified user experience. --- .../workspace/companyCards/BankConnection/index.tsx | 7 +++++-- .../companyCards/RefreshCardFeedConnectionPage.tsx | 5 ++++- .../companyCards/addNew/PlaidConnectionStep.tsx | 11 +++++++++-- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/src/pages/workspace/companyCards/BankConnection/index.tsx b/src/pages/workspace/companyCards/BankConnection/index.tsx index 79e91521b3ca..91aea689d9ae 100644 --- a/src/pages/workspace/companyCards/BankConnection/index.tsx +++ b/src/pages/workspace/companyCards/BankConnection/index.tsx @@ -44,9 +44,12 @@ type BankConnectionProps = { /** Route params for add new card flow */ route?: PlatformStackRouteProp; + + /** Title of the header */ + title?: string; }; -function BankConnection({policyID: policyIDFromProps, feed, route}: BankConnectionProps) { +function BankConnection({policyID: policyIDFromProps, feed, route, title}: BankConnectionProps) { const styles = useThemeStyles(); const {translate} = useLocalize(); const [addNewCard] = useOnyx(ONYXKEYS.ADD_NEW_COMPANY_CARD); @@ -236,7 +239,7 @@ function BankConnection({policyID: policyIDFromProps, feed, route}: BankConnecti enableEdgeToEdgeBottomSafeAreaPadding > {getContent()} diff --git a/src/pages/workspace/companyCards/RefreshCardFeedConnectionPage.tsx b/src/pages/workspace/companyCards/RefreshCardFeedConnectionPage.tsx index b57e82f5dda4..8635f4ffb4ba 100644 --- a/src/pages/workspace/companyCards/RefreshCardFeedConnectionPage.tsx +++ b/src/pages/workspace/companyCards/RefreshCardFeedConnectionPage.tsx @@ -28,6 +28,7 @@ function RefreshCardFeedConnectionPage({route, policy}: RefreshCardFeedConnectio const currentStep = assignCard?.currentStep; const isRefreshing = assignCard?.isRefreshing; const prevIsRefreshing = usePrevious(isRefreshing); + const title = translate('workspace.companyCards.assignNewCards.title'); useEffect(() => { return () => { @@ -47,6 +48,7 @@ function RefreshCardFeedConnectionPage({route, policy}: RefreshCardFeedConnectio ); case CONST.COMPANY_CARD.STEP.PLAID_CONNECTION: @@ -54,10 +56,11 @@ function RefreshCardFeedConnectionPage({route, policy}: RefreshCardFeedConnectio ); default: - return ; + return ; } } diff --git a/src/pages/workspace/companyCards/addNew/PlaidConnectionStep.tsx b/src/pages/workspace/companyCards/addNew/PlaidConnectionStep.tsx index c6b9762af087..3af4bce12410 100644 --- a/src/pages/workspace/companyCards/addNew/PlaidConnectionStep.tsx +++ b/src/pages/workspace/companyCards/addNew/PlaidConnectionStep.tsx @@ -27,7 +27,14 @@ import type {CompanyCardFeedWithDomainID} from '@src/types/onyx'; import type {CardFeedWithNumber} from '@src/types/onyx/CardFeeds'; import {isEmptyObject} from '@src/types/utils/EmptyObject'; -function PlaidConnectionStep({feed, policyID, onExit}: {feed?: CompanyCardFeedWithDomainID; policyID?: string; onExit?: () => void}) { +type PlaidConnectionStepProps = { + feed?: CompanyCardFeedWithDomainID; + policyID?: string; + onExit?: () => void; + title?: string; +}; + +function PlaidConnectionStep({feed, policyID, onExit, title}: PlaidConnectionStepProps) { const {translate} = useLocalize(); const styles = useThemeStyles(); const [addNewCard] = useOnyx(ONYXKEYS.ADD_NEW_COMPANY_CARD); @@ -218,7 +225,7 @@ function PlaidConnectionStep({feed, policyID, onExit}: {feed?: CompanyCardFeedWi shouldEnableMaxHeight > {isPlaidDisabled ? ( From 3f800d3b17d5f2cf3f5e9b9ac320dd9d411189c4 Mon Sep 17 00:00:00 2001 From: Fedi Rajhi Date: Sun, 22 Mar 2026 02:10:17 +0000 Subject: [PATCH 07/21] Enhance RefreshCardFeedConnectionPage with feed expiration handling - Integrated useCardFeeds hook to manage card feed data and expiration. - Added logic to trigger setFeedRefreshComplete on feed expiration changes during refresh. - Improved state management in RefreshCardFeedConnectionPage for better user experience. - Refactored imports in WorkspaceCompanyCardsSettingsPage for clarity and organization. --- .../RefreshCardFeedConnectionPage.tsx | 17 +++++++++++++++-- .../WorkspaceCompanyCardsSettingsPage.tsx | 13 +++++++++++-- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/src/pages/workspace/companyCards/RefreshCardFeedConnectionPage.tsx b/src/pages/workspace/companyCards/RefreshCardFeedConnectionPage.tsx index 8635f4ffb4ba..1a0fd3329ab0 100644 --- a/src/pages/workspace/companyCards/RefreshCardFeedConnectionPage.tsx +++ b/src/pages/workspace/companyCards/RefreshCardFeedConnectionPage.tsx @@ -1,14 +1,15 @@ import React, {useEffect} from 'react'; +import useCardFeeds from '@hooks/useCardFeeds'; import useLocalize from '@hooks/useLocalize'; import useOnyx from '@hooks/useOnyx'; import usePrevious from '@hooks/usePrevious'; -import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types'; import Navigation from '@libs/Navigation/Navigation'; +import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types'; import type {SettingsNavigatorParamList} from '@navigation/types'; import LoadingPage from '@pages/LoadingPage'; import type {WithPolicyAndFullscreenLoadingProps} from '@pages/workspace/withPolicyAndFullscreenLoading'; import withPolicyAndFullscreenLoading from '@pages/workspace/withPolicyAndFullscreenLoading'; -import {clearAssignCardStepAndData} from '@userActions/CompanyCards'; +import {clearAssignCardStepAndData, setFeedRefreshComplete} from '@userActions/CompanyCards'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import type SCREENS from '@src/SCREENS'; @@ -30,18 +31,30 @@ function RefreshCardFeedConnectionPage({route, policy}: RefreshCardFeedConnectio const prevIsRefreshing = usePrevious(isRefreshing); const title = translate('workspace.companyCards.assignNewCards.title'); + const [cardFeeds] = useCardFeeds(policyID); + const feedExpiration = feed ? cardFeeds?.[feed]?.expiration : undefined; + const prevFeedExpiration = usePrevious(feedExpiration); + useEffect(() => { return () => { clearAssignCardStepAndData(); }; }, []); + // Plaid feeds: isRefreshing is cleared by importPlaidAccounts successData useEffect(() => { if (prevIsRefreshing === true && !isRefreshing) { Navigation.closeRHPFlow(); } }, [prevIsRefreshing, isRefreshing]); + // OAuth feeds: expiration updates after bank re-authentication completes + useEffect(() => { + if (prevFeedExpiration !== undefined && prevFeedExpiration !== feedExpiration && isRefreshing) { + setFeedRefreshComplete(); + } + }, [prevFeedExpiration, feedExpiration, isRefreshing]); + switch (currentStep) { case CONST.COMPANY_CARD.STEP.BANK_CONNECTION: return ( diff --git a/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsPage.tsx b/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsPage.tsx index 311ff05895f1..69cca44361c8 100644 --- a/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsPage.tsx +++ b/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsPage.tsx @@ -17,13 +17,22 @@ import useOnyx from '@hooks/useOnyx'; import usePolicy from '@hooks/usePolicy'; import useThemeStyles from '@hooks/useThemeStyles'; import {deleteWorkspaceCompanyCardFeed, setWorkspaceCompanyCardTransactionLiability} from '@libs/actions/CompanyCards'; -import {setAddNewCompanyCardStepAndData, setAssignCardStepAndData} from '@userActions/CompanyCards'; -import {getCompanyCardFeed, getCompanyFeeds, getCustomOrFormattedFeedName, getDomainOrWorkspaceAccountID, getPlaidCountry, getPlaidInstitutionId, getSelectedFeed, isDirectFeed} from '@libs/CardUtils'; +import { + getCompanyCardFeed, + getCompanyFeeds, + getCustomOrFormattedFeedName, + getDomainOrWorkspaceAccountID, + getPlaidCountry, + getPlaidInstitutionId, + getSelectedFeed, + isDirectFeed, +} from '@libs/CardUtils'; import Navigation from '@libs/Navigation/Navigation'; import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types'; import type {SettingsNavigatorParamList} from '@libs/Navigation/types'; import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper'; import ToggleSettingOptionRow from '@pages/workspace/workflows/ToggleSettingsOptionRow'; +import {setAddNewCompanyCardStepAndData, setAssignCardStepAndData} from '@userActions/CompanyCards'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES from '@src/ROUTES'; From 5172537c30e363b6e2fe729341f9a8e598dc1e06 Mon Sep 17 00:00:00 2001 From: Fedi Rajhi Date: Sun, 22 Mar 2026 02:37:52 +0000 Subject: [PATCH 08/21] Add unit tests for RefreshCardFeedConnectionPage - Created comprehensive tests for the RefreshCardFeedConnectionPage component to validate rendering based on different states. - Included tests for loading state, bank connection, and plaid connection steps. - Verified that the correct actions are called on component unmount and when feed expiration updates. - Enhanced test coverage to ensure robust handling of card feed connection scenarios. --- src/libs/actions/CompanyCards.ts | 2 +- .../BankConnection/index.native.tsx | 7 +- .../RefreshCardFeedConnectionPageTest.tsx | 226 ++++++++++++++++++ 3 files changed, 232 insertions(+), 3 deletions(-) create mode 100644 tests/unit/RefreshCardFeedConnectionPageTest.tsx diff --git a/src/libs/actions/CompanyCards.ts b/src/libs/actions/CompanyCards.ts index f55bc65d3ab5..39f863ce9fa3 100644 --- a/src/libs/actions/CompanyCards.ts +++ b/src/libs/actions/CompanyCards.ts @@ -65,7 +65,7 @@ function clearAssignCardErrors() { } function setFeedRefreshComplete() { - Onyx.merge(ONYXKEYS.ASSIGN_CARD, {isRefreshing: false}); + Onyx.merge(ONYXKEYS.ASSIGN_CARD, {isRefreshing: null}); } function setAddNewCompanyCardStepAndData({data, isEditing, step}: NullishDeep) { diff --git a/src/pages/workspace/companyCards/BankConnection/index.native.tsx b/src/pages/workspace/companyCards/BankConnection/index.native.tsx index 870bc4928d32..4f79cf623cff 100644 --- a/src/pages/workspace/companyCards/BankConnection/index.native.tsx +++ b/src/pages/workspace/companyCards/BankConnection/index.native.tsx @@ -40,9 +40,12 @@ type BankConnectionProps = { /** Route params for add new card flow */ route?: PlatformStackRouteProp; + + /** Title of the header */ + title?: string; }; -function BankConnection({policyID: policyIDFromProps, feed, route}: BankConnectionProps) { +function BankConnection({policyID: policyIDFromProps, feed, route, title}: BankConnectionProps) { const styles = useThemeStyles(); const {translate} = useLocalize(); const webViewRef = useRef(null); @@ -176,7 +179,7 @@ function BankConnection({policyID: policyIDFromProps, feed, route}: BankConnecti shouldEnableMaxHeight > diff --git a/tests/unit/RefreshCardFeedConnectionPageTest.tsx b/tests/unit/RefreshCardFeedConnectionPageTest.tsx new file mode 100644 index 000000000000..8d17672b14d4 --- /dev/null +++ b/tests/unit/RefreshCardFeedConnectionPageTest.tsx @@ -0,0 +1,226 @@ +import {act, cleanup, render, screen} from '@testing-library/react-native'; +import React from 'react'; +import Onyx from 'react-native-onyx'; +import * as CompanyCardsActions from '@libs/actions/CompanyCards'; +import * as Navigation from '@libs/Navigation/Navigation'; +import CONST from '@src/CONST'; +import ONYXKEYS from '@src/ONYXKEYS'; +import waitForBatchedUpdates from '../utils/waitForBatchedUpdates'; + +// Bypass the HOC and render the inner component directly +jest.mock('@pages/workspace/withPolicyAndFullscreenLoading', () => (Component: React.ComponentType) => Component); + +jest.mock('@hooks/useCardFeeds', () => ({ + __esModule: true, + default: jest.fn(), +})); + +jest.mock('@pages/workspace/companyCards/BankConnection', () => ({ + __esModule: true, + // eslint-disable-next-line react/display-name + default: () => { + const {View} = require('react-native'); + return ; + }, +})); + +jest.mock('@pages/workspace/companyCards/addNew/PlaidConnectionStep', () => ({ + __esModule: true, + // eslint-disable-next-line react/display-name + default: () => { + const {View} = require('react-native'); + return ; + }, +})); + +jest.mock('@pages/LoadingPage', () => ({ + __esModule: true, + // eslint-disable-next-line react/display-name + default: () => { + const {View} = require('react-native'); + return ; + }, +})); + +jest.mock('@libs/Navigation/Navigation', () => ({ + closeRHPFlow: jest.fn(), + navigate: jest.fn(), + goBack: jest.fn(), + setNavigationActionToMicrotaskQueue: jest.fn(), +})); + +jest.mock('@libs/actions/CompanyCards', () => ({ + ...jest.requireActual('@libs/actions/CompanyCards'), + clearAssignCardStepAndData: jest.fn(), + setFeedRefreshComplete: jest.fn(), +})); + +jest.mock('@hooks/useLocalize', () => ({ + __esModule: true, + default: () => ({translate: (key: string) => key}), +})); + +// eslint-disable-next-line @typescript-eslint/no-var-requires +const useCardFeeds = require('@hooks/useCardFeeds').default as jest.Mock; +// eslint-disable-next-line @typescript-eslint/no-var-requires +const RefreshCardFeedConnectionPage = require('@pages/workspace/companyCards/RefreshCardFeedConnectionPage').default; + +const MOCK_FEED = 'oauth.chase_bank_card_99999' as const; + +function buildProps(overrides = {}) { + return { + policy: {id: 'policy1'}, + route: {params: {feed: MOCK_FEED}}, + ...overrides, + }; +} + +describe('RefreshCardFeedConnectionPage', () => { + beforeAll(() => { + Onyx.init({keys: ONYXKEYS}); + }); + + afterEach(async () => { + cleanup(); + await Onyx.clear(); + await waitForBatchedUpdates(); + jest.clearAllMocks(); + }); + + beforeEach(() => { + useCardFeeds.mockReturnValue([{[MOCK_FEED]: {expiration: '2024-01-01'}}, {status: 'loaded'}]); + }); + + it('renders LoadingPage while currentStep is not set', async () => { + render(); + await act(async () => { + await waitForBatchedUpdates(); + }); + + expect(screen.getByTestId('LoadingPage')).toBeTruthy(); + expect(screen.queryByTestId('BankConnection')).toBeNull(); + }); + + it('renders BankConnection when currentStep is BANK_CONNECTION', async () => { + await Onyx.merge(ONYXKEYS.ASSIGN_CARD, { + currentStep: CONST.COMPANY_CARD.STEP.BANK_CONNECTION, + isRefreshing: true, + }); + + render(); + await act(async () => { + await waitForBatchedUpdates(); + }); + + expect(screen.getByTestId('BankConnection')).toBeTruthy(); + }); + + it('renders PlaidConnectionStep when currentStep is PLAID_CONNECTION', async () => { + await Onyx.merge(ONYXKEYS.ASSIGN_CARD, { + currentStep: CONST.COMPANY_CARD.STEP.PLAID_CONNECTION, + isRefreshing: true, + }); + + render(); + await act(async () => { + await waitForBatchedUpdates(); + }); + + expect(screen.getByTestId('PlaidConnectionStep')).toBeTruthy(); + }); + + it('closes RHP flow when Plaid isRefreshing clears after successful import', async () => { + await Onyx.merge(ONYXKEYS.ASSIGN_CARD, { + currentStep: CONST.COMPANY_CARD.STEP.PLAID_CONNECTION, + isRefreshing: true, + }); + + render(); + await act(async () => { + await waitForBatchedUpdates(); + }); + + // Simulate importPlaidAccounts successData clearing isRefreshing (Plaid path) + await act(async () => { + await Onyx.merge(ONYXKEYS.ASSIGN_CARD, {isRefreshing: null}); + await waitForBatchedUpdates(); + }); + + expect(Navigation.closeRHPFlow).toHaveBeenCalledTimes(1); + }); + + it('calls setFeedRefreshComplete when OAuth feed expiration updates while refreshing', async () => { + await Onyx.merge(ONYXKEYS.ASSIGN_CARD, { + currentStep: CONST.COMPANY_CARD.STEP.BANK_CONNECTION, + isRefreshing: true, + }); + + const props = buildProps(); + const {rerender} = render(); + await act(async () => { + await waitForBatchedUpdates(); + }); + + // Simulate bank re-authentication updating the feed expiration (OAuth path). + // Re-render is needed to propagate the new mock return value. + await act(async () => { + useCardFeeds.mockReturnValue([{[MOCK_FEED]: {expiration: '2025-01-01'}}, {status: 'loaded'}]); + rerender(); + await waitForBatchedUpdates(); + }); + + expect(CompanyCardsActions.setFeedRefreshComplete).toHaveBeenCalledTimes(1); + }); + + it('calls clearAssignCardStepAndData on unmount', async () => { + const {unmount} = render(); + await act(async () => { + await waitForBatchedUpdates(); + }); + + unmount(); + + expect(CompanyCardsActions.clearAssignCardStepAndData).toHaveBeenCalledTimes(1); + }); +}); + +describe('setFeedRefreshComplete action', () => { + let assignCard: Record | undefined; + + beforeAll(() => { + Onyx.init({keys: ONYXKEYS}); + Onyx.connect({ + key: ONYXKEYS.ASSIGN_CARD, + callback: (val) => { + assignCard = val as Record; + }, + }); + }); + + beforeEach(async () => { + await Onyx.clear(); + await waitForBatchedUpdates(); + }); + + it('clears isRefreshing when OAuth feed connection refreshes', async () => { + await Onyx.merge(ONYXKEYS.ASSIGN_CARD, {isRefreshing: true, currentStep: CONST.COMPANY_CARD.STEP.BANK_CONNECTION}); + await waitForBatchedUpdates(); + expect(assignCard?.isRefreshing).toBe(true); + + const {setFeedRefreshComplete} = jest.requireActual('@libs/actions/CompanyCards'); + setFeedRefreshComplete(); + await waitForBatchedUpdates(); + + // Onyx removes the key when merging null, so isRefreshing becomes falsy + expect(assignCard?.isRefreshing).toBeFalsy(); + }); + + it('sets isRefreshing and currentStep when starting a feed refresh', async () => { + const {setAssignCardStepAndData} = jest.requireActual('@libs/actions/CompanyCards'); + setAssignCardStepAndData({currentStep: CONST.COMPANY_CARD.STEP.BANK_CONNECTION, isRefreshing: true}); + await waitForBatchedUpdates(); + + expect(assignCard?.isRefreshing).toBe(true); + expect(assignCard?.currentStep).toBe(CONST.COMPANY_CARD.STEP.BANK_CONNECTION); + }); +}); From 5a684b366dc2d9fe1367db0d7d78c61814a3ce85 Mon Sep 17 00:00:00 2001 From: Fedi Rajhi Date: Sun, 22 Mar 2026 03:06:52 +0000 Subject: [PATCH 09/21] Add WorkspaceCompanyCardsVerifyAccountPage and related routing logic - Introduced a new page for verifying company card accounts, enhancing the user flow for account validation. - Updated ROUTES.ts and SCREENS.ts to include the new verification route and screen identifier. - Modified navigation logic in existing components to redirect users to the verification page when account validation is required. - Ensured proper linking configuration for the new route to maintain navigation integrity. --- src/ROUTES.ts | 5 ++ src/SCREENS.ts | 1 + .../ModalStackNavigators/index.tsx | 1 + src/libs/Navigation/linkingConfig/config.ts | 3 + src/libs/Navigation/types.ts | 6 ++ .../WorkspaceCompanyCardFeedSelectorPage.tsx | 6 ++ .../WorkspaceCompanyCardPageEmptyState.tsx | 6 ++ .../WorkspaceCompanyCardsSettingsPage.tsx | 6 ++ ...WorkspaceCompanyCardsVerifyAccountPage.tsx | 62 +++++++++++++++++++ 9 files changed, 96 insertions(+) create mode 100644 src/pages/workspace/companyCards/WorkspaceCompanyCardsVerifyAccountPage.tsx diff --git a/src/ROUTES.ts b/src/ROUTES.ts index 3dccfcc5d3a8..199edfeab840 100644 --- a/src/ROUTES.ts +++ b/src/ROUTES.ts @@ -2463,6 +2463,11 @@ const ROUTES = { route: 'workspaces/:policyID/company-cards/:feed/refresh-card-feed-connection', getRoute: (policyID: string, feed: CompanyCardFeedWithDomainID) => `workspaces/${policyID}/company-cards/${encodeURIComponent(feed)}/refresh-card-feed-connection` as const, }, + WORKSPACE_COMPANY_CARDS_VERIFY_ACCOUNT: { + route: `workspaces/:policyID/company-cards/${VERIFY_ACCOUNT}`, + getRoute: (policyID: string, feed?: CompanyCardFeedWithDomainID) => + feed ? (`workspaces/${policyID}/company-cards/${VERIFY_ACCOUNT}?feed=${encodeURIComponent(feed)}` as const) : (`workspaces/${policyID}/company-cards/${VERIFY_ACCOUNT}` as const), + }, WORKSPACE_COMPANY_CARDS_ASSIGN_CARD_ASSIGNEE: { route: 'workspaces/:policyID/company-cards/:feed/assign-card/:cardID/assignee', getRoute: (params: WorkspaceCompanyCardsAssignCardParams, backTo?: string) => diff --git a/src/SCREENS.ts b/src/SCREENS.ts index 7395562ac4e9..0cee6d53d564 100644 --- a/src/SCREENS.ts +++ b/src/SCREENS.ts @@ -640,6 +640,7 @@ const SCREENS = { COMPANY_CARDS: 'Workspace_CompanyCards', COMPANY_CARDS_BROKEN_CARD_FEED_CONNECTION: 'Workspace_CompanyCards_BrokenCardFeedConnection', COMPANY_CARDS_REFRESH_CARD_FEED_CONNECTION: 'Workspace_CompanyCards_RefreshCardFeedConnection', + COMPANY_CARDS_VERIFY_ACCOUNT: 'Workspace_CompanyCards_VerifyAccount', COMPANY_CARDS_ASSIGN_CARD_ASSIGNEE: 'Workspace_CompanyCards_AssignCard_Assignee', COMPANY_CARDS_ASSIGN_CARD_BANK_CONNECTION: 'Workspace_CompanyCards_AssignCard_Bank_Connection', COMPANY_CARDS_ASSIGN_CARD_PLAID_CONNECTION: 'Workspace_CompanyCards_AssignCard_Plaid_Connection', diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx index e55ee7a53ca3..1877169962bc 100644 --- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx +++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx @@ -784,6 +784,7 @@ const SettingsModalStackNavigator = createModalStackNavigator require('../../../../pages/workspace/invoices/WorkspaceInvoicesVerifyAccountPage').default, [SCREENS.WORKSPACE.COMPANY_CARDS_BROKEN_CARD_FEED_CONNECTION]: () => require('../../../../pages/workspace/companyCards/BrokenCardFeedConnectionPage').default, [SCREENS.WORKSPACE.COMPANY_CARDS_REFRESH_CARD_FEED_CONNECTION]: () => require('../../../../pages/workspace/companyCards/RefreshCardFeedConnectionPage').default, + [SCREENS.WORKSPACE.COMPANY_CARDS_VERIFY_ACCOUNT]: () => require('../../../../pages/workspace/companyCards/WorkspaceCompanyCardsVerifyAccountPage').default, [SCREENS.WORKSPACE.COMPANY_CARDS_ASSIGN_CARD_ASSIGNEE]: () => require('../../../../pages/workspace/companyCards/assignCard/AssigneeStep').default, [SCREENS.WORKSPACE.COMPANY_CARDS_ASSIGN_CARD_CARD_SELECTION]: () => require('../../../../pages/workspace/companyCards/assignCard/CardSelectionStep').default, [SCREENS.WORKSPACE.COMPANY_CARDS_ASSIGN_CARD_TRANSACTION_START_DATE]: () => diff --git a/src/libs/Navigation/linkingConfig/config.ts b/src/libs/Navigation/linkingConfig/config.ts index 9aaf283349fd..4bc20f9a6fee 100644 --- a/src/libs/Navigation/linkingConfig/config.ts +++ b/src/libs/Navigation/linkingConfig/config.ts @@ -881,6 +881,9 @@ const config: LinkingOptions['config'] = { [SCREENS.WORKSPACE.COMPANY_CARDS_REFRESH_CARD_FEED_CONNECTION]: { path: ROUTES.WORKSPACE_COMPANY_CARDS_REFRESH_CARD_FEED_CONNECTION.route, }, + [SCREENS.WORKSPACE.COMPANY_CARDS_VERIFY_ACCOUNT]: { + path: ROUTES.WORKSPACE_COMPANY_CARDS_VERIFY_ACCOUNT.route, + }, [SCREENS.WORKSPACE.COMPANY_CARDS_ASSIGN_CARD_ASSIGNEE]: { path: ROUTES.WORKSPACE_COMPANY_CARDS_ASSIGN_CARD_ASSIGNEE.route, }, diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts index 78438edba198..edfdaf09fe9d 100644 --- a/src/libs/Navigation/types.ts +++ b/src/libs/Navigation/types.ts @@ -1306,6 +1306,12 @@ type SettingsNavigatorParamList = { policyID: string; feed: CompanyCardFeedWithDomainID; }; + [SCREENS.WORKSPACE.COMPANY_CARDS_VERIFY_ACCOUNT]: { + policyID: string; + + /** Present when verifying before a feed refresh; absent when verifying before adding a new feed */ + feed?: CompanyCardFeedWithDomainID; + }; [SCREENS.WORKSPACE.COMPANY_CARDS_ASSIGN_CARD_ASSIGNEE]: { policyID: string; feed: CompanyCardFeedWithDomainID; diff --git a/src/pages/workspace/companyCards/WorkspaceCompanyCardFeedSelectorPage.tsx b/src/pages/workspace/companyCards/WorkspaceCompanyCardFeedSelectorPage.tsx index b41c11d73b62..4ff13f10e1de 100644 --- a/src/pages/workspace/companyCards/WorkspaceCompanyCardFeedSelectorPage.tsx +++ b/src/pages/workspace/companyCards/WorkspaceCompanyCardFeedSelectorPage.tsx @@ -17,6 +17,7 @@ import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset'; import useLocalize from '@hooks/useLocalize'; import useOnyx from '@hooks/useOnyx'; import usePolicy from '@hooks/usePolicy'; +import {isUserValidatedSelector} from '@selectors/Account'; import useThemeIllustrations from '@hooks/useThemeIllustrations'; import useThemeStyles from '@hooks/useThemeStyles'; import {getCardFeedIcon, getCustomOrFormattedFeedName, getPlaidInstitutionIconUrl} from '@libs/CardUtils'; @@ -49,6 +50,7 @@ function WorkspaceCompanyCardFeedSelectorPage({route}: WorkspaceCompanyCardFeedS const {translate} = useLocalize(); const [allDomains] = useOnyx(ONYXKEYS.COLLECTION.DOMAIN); + const [isUserValidated] = useOnyx(ONYXKEYS.ACCOUNT, {selector: isUserValidatedSelector}); const styles = useThemeStyles(); const illustrations = useThemeIllustrations(); const companyCardFeedIcons = useCompanyCardFeedIcons(); @@ -93,6 +95,10 @@ function WorkspaceCompanyCardFeedSelectorPage({route}: WorkspaceCompanyCardFeedS }); const onAddCardsPress = () => { + if (!isUserValidated) { + Navigation.navigate(ROUTES.WORKSPACE_COMPANY_CARDS_VERIFY_ACCOUNT.getRoute(policyID)); + return; + } clearAddNewCardFlow(); if (isBlockedToAddNewFeeds) { Navigation.navigate( diff --git a/src/pages/workspace/companyCards/WorkspaceCompanyCardPageEmptyState.tsx b/src/pages/workspace/companyCards/WorkspaceCompanyCardPageEmptyState.tsx index a987899c5aed..b1c6800993c3 100644 --- a/src/pages/workspace/companyCards/WorkspaceCompanyCardPageEmptyState.tsx +++ b/src/pages/workspace/companyCards/WorkspaceCompanyCardPageEmptyState.tsx @@ -12,6 +12,7 @@ import useResponsiveLayout from '@hooks/useResponsiveLayout'; import useThemeStyles from '@hooks/useThemeStyles'; import {hasIssuedExpensifyCard} from '@libs/CardUtils'; import Navigation from '@libs/Navigation/Navigation'; +import {isUserValidatedSelector} from '@selectors/Account'; import colors from '@styles/theme/colors'; import {clearAddNewCardFlow} from '@userActions/CompanyCards'; import CONST from '@src/CONST'; @@ -31,6 +32,7 @@ function WorkspaceCompanyCardPageEmptyState({policyID, shouldShowGBDisclaimer}: const {isActingAsDelegate} = useDelegateNoAccessState(); const {showDelegateNoAccessModal} = useDelegateNoAccessActions(); const [allWorkspaceCards] = useOnyx(ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST); + const [isUserValidated] = useOnyx(ONYXKEYS.ACCOUNT, {selector: isUserValidatedSelector}); const policy = usePolicy(policyID); const workspaceAccountID = policy?.workspaceAccountID ?? CONST.DEFAULT_NUMBER_ID; @@ -90,6 +92,10 @@ function WorkspaceCompanyCardPageEmptyState({policyID, shouldShowGBDisclaimer}: showDelegateNoAccessModal(); return; } + if (!isUserValidated) { + Navigation.navigate(ROUTES.WORKSPACE_COMPANY_CARDS_VERIFY_ACCOUNT.getRoute(policy.id)); + return; + } clearAddNewCardFlow(); Navigation.navigate(ROUTES.WORKSPACE_COMPANY_CARDS_ADD_NEW.getRoute(policy.id)); }; diff --git a/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsPage.tsx b/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsPage.tsx index 69cca44361c8..02f05e513b7e 100644 --- a/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsPage.tsx +++ b/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsPage.tsx @@ -32,6 +32,7 @@ import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavig import type {SettingsNavigatorParamList} from '@libs/Navigation/types'; import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper'; import ToggleSettingOptionRow from '@pages/workspace/workflows/ToggleSettingsOptionRow'; +import {isUserValidatedSelector} from '@selectors/Account'; import {setAddNewCompanyCardStepAndData, setAssignCardStepAndData} from '@userActions/CompanyCards'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; @@ -55,6 +56,7 @@ function WorkspaceCompanyCardsSettingsPage({ const [cardFeeds] = useCardFeeds(policyID); const [lastSelectedFeed] = useOnyx(`${ONYXKEYS.COLLECTION.LAST_SELECTED_FEED}${policyID}`); const [countryByIp] = useOnyx(ONYXKEYS.COUNTRY); + const [isUserValidated] = useOnyx(ONYXKEYS.ACCOUNT, {selector: isUserValidatedSelector}); const {currencyList} = useCurrencyListState(); const selectedFeed = useMemo(() => getSelectedFeed(lastSelectedFeed, cardFeeds), [cardFeeds, lastSelectedFeed]); @@ -172,6 +174,10 @@ function WorkspaceCompanyCardsSettingsPage({ if (!selectedFeed) { return; } + if (!isUserValidated) { + Navigation.navigate(ROUTES.WORKSPACE_COMPANY_CARDS_VERIFY_ACCOUNT.getRoute(policyID, selectedFeed)); + return; + } const isPlaid = !!getPlaidInstitutionId(feed); const currentStep = isPlaid ? CONST.COMPANY_CARD.STEP.PLAID_CONNECTION : CONST.COMPANY_CARD.STEP.BANK_CONNECTION; if (isPlaid) { diff --git a/src/pages/workspace/companyCards/WorkspaceCompanyCardsVerifyAccountPage.tsx b/src/pages/workspace/companyCards/WorkspaceCompanyCardsVerifyAccountPage.tsx new file mode 100644 index 000000000000..f22364355e77 --- /dev/null +++ b/src/pages/workspace/companyCards/WorkspaceCompanyCardsVerifyAccountPage.tsx @@ -0,0 +1,62 @@ +import React, {useCallback} from 'react'; +import {useCurrencyListState} from '@hooks/useCurrencyList'; +import useOnyx from '@hooks/useOnyx'; +import usePolicy from '@hooks/usePolicy'; +import {getPlaidCountry, getPlaidInstitutionId} from '@libs/CardUtils'; +import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types'; +import type {SettingsNavigatorParamList} from '@navigation/types'; +import VerifyAccountPageBase from '@pages/settings/VerifyAccountPageBase'; +import {clearAddNewCardFlow, setAddNewCompanyCardStepAndData, setAssignCardStepAndData} from '@userActions/CompanyCards'; +import CONST from '@src/CONST'; +import ONYXKEYS from '@src/ONYXKEYS'; +import ROUTES from '@src/ROUTES'; +import type SCREENS from '@src/SCREENS'; + +type WorkspaceCompanyCardsVerifyAccountPageProps = PlatformStackScreenProps; + +function WorkspaceCompanyCardsVerifyAccountPage({route}: WorkspaceCompanyCardsVerifyAccountPageProps) { + const {policyID, feed} = route.params; + const policy = usePolicy(policyID); + const [cardFeeds] = useCardFeeds(policyID); + const [countryByIp] = useOnyx(ONYXKEYS.COUNTRY); + const {currencyList} = useCurrencyListState(); + + const companyCardsRoute = ROUTES.WORKSPACE_COMPANY_CARDS.getRoute(policyID); + + // Seed Onyx state for the refresh flow once the account is validated + const onValidationSuccess = useCallback(() => { + if (!feed) { + return; + } + + const isPlaid = !!getPlaidInstitutionId(feed); + const currentStep = isPlaid ? CONST.COMPANY_CARD.STEP.PLAID_CONNECTION : CONST.COMPANY_CARD.STEP.BANK_CONNECTION; + + if (isPlaid) { + const country = getPlaidCountry(policy?.outputCurrency, currencyList, countryByIp); + setAddNewCompanyCardStepAndData({data: {selectedCountry: country}}); + } + + setAssignCardStepAndData({currentStep, isRefreshing: true}); + }, [feed, policy?.outputCurrency, currencyList, countryByIp]); + + if (feed) { + return ( + + ); + } + + return ( + + ); +} + +export default WorkspaceCompanyCardsVerifyAccountPage; From 1c588a4d522fc96b7a1c31a4de15e77a96e359e2 Mon Sep 17 00:00:00 2001 From: Fedi Rajhi Date: Sun, 22 Mar 2026 03:14:27 +0000 Subject: [PATCH 10/21] Enhance company card feed functionality with new refresh logic - Introduced seedCardFeedRefresh and startCardFeedRefresh functions to manage the card feed refresh flow. - Updated WorkspaceCompanyCardsVerifyAccountPage to utilize the new refresh logic upon successful account validation. - Refactored WorkspaceCompanyCardsSettingsPage to initiate the card feed refresh process using the new functions. - Improved import organization across multiple components for better clarity and maintainability. --- src/libs/actions/CompanyCards.ts | 34 +++++++++++++++++-- .../WorkspaceCompanyCardFeedSelectorPage.tsx | 2 +- .../WorkspaceCompanyCardPageEmptyState.tsx | 2 +- .../WorkspaceCompanyCardsSettingsPage.tsx | 26 +++----------- ...WorkspaceCompanyCardsVerifyAccountPage.tsx | 22 +++--------- 5 files changed, 43 insertions(+), 43 deletions(-) diff --git a/src/libs/actions/CompanyCards.ts b/src/libs/actions/CompanyCards.ts index 39f863ce9fa3..d9fe87cfa0b3 100644 --- a/src/libs/actions/CompanyCards.ts +++ b/src/libs/actions/CompanyCards.ts @@ -16,13 +16,15 @@ import type { } from '@libs/API/parameters'; import {READ_COMMANDS, WRITE_COMMANDS} from '@libs/API/types'; import * as CardUtils from '@libs/CardUtils'; -import {getCardFeedWithDomainID} from '@libs/CardUtils'; +import {getCardFeedWithDomainID, getPlaidCountry, getPlaidInstitutionId} from '@libs/CardUtils'; import * as ErrorUtils from '@libs/ErrorUtils'; +import Navigation from '@libs/Navigation/Navigation'; import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils'; import * as ReportUtils from '@libs/ReportUtils'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; -import type {Card, Policy} from '@src/types/onyx'; +import ROUTES from '@src/ROUTES'; +import type {Card, CurrencyList, Policy} from '@src/types/onyx'; import type {AssignCard, AssignCardData} from '@src/types/onyx/AssignCard'; import type { AddNewCardFeedData, @@ -1059,6 +1061,32 @@ function clearErrorField(bankName: CompanyCardFeedWithNumber, domainAccountID: n }); } +/** + * Seeds the Onyx state required before entering the card feed refresh flow. + * Used as the onValidationSuccess callback in the verify account page, where + * VerifyAccountPageBase handles navigation separately via navigateForwardTo. + */ +function seedCardFeedRefresh(feed: CompanyCardFeedWithDomainID, outputCurrency?: string, currencyList?: CurrencyList, countryByIp?: string) { + const isPlaid = !!getPlaidInstitutionId(feed); + const currentStep = isPlaid ? CONST.COMPANY_CARD.STEP.PLAID_CONNECTION : CONST.COMPANY_CARD.STEP.BANK_CONNECTION; + + if (isPlaid) { + const country = getPlaidCountry(outputCurrency, currencyList, countryByIp); + setAddNewCompanyCardStepAndData({data: {selectedCountry: country}}); + } + + setAssignCardStepAndData({currentStep, isRefreshing: true}); +} + +/** Seeds the Onyx state and navigates to the card feed refresh flow. */ +function startCardFeedRefresh(policyID: string, feed: CompanyCardFeedWithDomainID, outputCurrency?: string, currencyList?: CurrencyList, countryByIp?: string) { + seedCardFeedRefresh(feed, outputCurrency, currencyList, countryByIp); + + Navigation.setNavigationActionToMicrotaskQueue(() => { + Navigation.navigate(ROUTES.WORKSPACE_COMPANY_CARDS_REFRESH_CARD_FEED_CONNECTION.getRoute(policyID, feed)); + }); +} + export { setWorkspaceCompanyCardFeedName, deleteWorkspaceCompanyCardFeed, @@ -1085,4 +1113,6 @@ export { clearErrorField, clearAssignCardErrors, setFeedRefreshComplete, + seedCardFeedRefresh, + startCardFeedRefresh, }; diff --git a/src/pages/workspace/companyCards/WorkspaceCompanyCardFeedSelectorPage.tsx b/src/pages/workspace/companyCards/WorkspaceCompanyCardFeedSelectorPage.tsx index 4ff13f10e1de..55f766922240 100644 --- a/src/pages/workspace/companyCards/WorkspaceCompanyCardFeedSelectorPage.tsx +++ b/src/pages/workspace/companyCards/WorkspaceCompanyCardFeedSelectorPage.tsx @@ -1,3 +1,4 @@ +import {isUserValidatedSelector} from '@selectors/Account'; import {Str} from 'expensify-common'; import React from 'react'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; @@ -17,7 +18,6 @@ import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset'; import useLocalize from '@hooks/useLocalize'; import useOnyx from '@hooks/useOnyx'; import usePolicy from '@hooks/usePolicy'; -import {isUserValidatedSelector} from '@selectors/Account'; import useThemeIllustrations from '@hooks/useThemeIllustrations'; import useThemeStyles from '@hooks/useThemeStyles'; import {getCardFeedIcon, getCustomOrFormattedFeedName, getPlaidInstitutionIconUrl} from '@libs/CardUtils'; diff --git a/src/pages/workspace/companyCards/WorkspaceCompanyCardPageEmptyState.tsx b/src/pages/workspace/companyCards/WorkspaceCompanyCardPageEmptyState.tsx index b1c6800993c3..f3c68cd85873 100644 --- a/src/pages/workspace/companyCards/WorkspaceCompanyCardPageEmptyState.tsx +++ b/src/pages/workspace/companyCards/WorkspaceCompanyCardPageEmptyState.tsx @@ -1,3 +1,4 @@ +import {isUserValidatedSelector} from '@selectors/Account'; import React from 'react'; import {View} from 'react-native'; import {useDelegateNoAccessActions, useDelegateNoAccessState} from '@components/DelegateNoAccessModalProvider'; @@ -12,7 +13,6 @@ import useResponsiveLayout from '@hooks/useResponsiveLayout'; import useThemeStyles from '@hooks/useThemeStyles'; import {hasIssuedExpensifyCard} from '@libs/CardUtils'; import Navigation from '@libs/Navigation/Navigation'; -import {isUserValidatedSelector} from '@selectors/Account'; import colors from '@styles/theme/colors'; import {clearAddNewCardFlow} from '@userActions/CompanyCards'; import CONST from '@src/CONST'; diff --git a/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsPage.tsx b/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsPage.tsx index 02f05e513b7e..078c635425c7 100644 --- a/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsPage.tsx +++ b/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsPage.tsx @@ -1,3 +1,4 @@ +import {isUserValidatedSelector} from '@selectors/Account'; import React, {useMemo, useState} from 'react'; import {InteractionManager, View} from 'react-native'; import ConfirmModal from '@components/ConfirmModal'; @@ -17,23 +18,13 @@ import useOnyx from '@hooks/useOnyx'; import usePolicy from '@hooks/usePolicy'; import useThemeStyles from '@hooks/useThemeStyles'; import {deleteWorkspaceCompanyCardFeed, setWorkspaceCompanyCardTransactionLiability} from '@libs/actions/CompanyCards'; -import { - getCompanyCardFeed, - getCompanyFeeds, - getCustomOrFormattedFeedName, - getDomainOrWorkspaceAccountID, - getPlaidCountry, - getPlaidInstitutionId, - getSelectedFeed, - isDirectFeed, -} from '@libs/CardUtils'; +import {getCompanyCardFeed, getCompanyFeeds, getCustomOrFormattedFeedName, getDomainOrWorkspaceAccountID, getSelectedFeed, isDirectFeed} from '@libs/CardUtils'; import Navigation from '@libs/Navigation/Navigation'; import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types'; import type {SettingsNavigatorParamList} from '@libs/Navigation/types'; import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper'; import ToggleSettingOptionRow from '@pages/workspace/workflows/ToggleSettingsOptionRow'; -import {isUserValidatedSelector} from '@selectors/Account'; -import {setAddNewCompanyCardStepAndData, setAssignCardStepAndData} from '@userActions/CompanyCards'; +import {startCardFeedRefresh} from '@userActions/CompanyCards'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES from '@src/ROUTES'; @@ -178,16 +169,7 @@ function WorkspaceCompanyCardsSettingsPage({ Navigation.navigate(ROUTES.WORKSPACE_COMPANY_CARDS_VERIFY_ACCOUNT.getRoute(policyID, selectedFeed)); return; } - const isPlaid = !!getPlaidInstitutionId(feed); - const currentStep = isPlaid ? CONST.COMPANY_CARD.STEP.PLAID_CONNECTION : CONST.COMPANY_CARD.STEP.BANK_CONNECTION; - if (isPlaid) { - const country = getPlaidCountry(policy?.outputCurrency, currencyList, countryByIp); - setAddNewCompanyCardStepAndData({data: {selectedCountry: country}}); - } - setAssignCardStepAndData({currentStep, isRefreshing: true}); - Navigation.setNavigationActionToMicrotaskQueue(() => { - Navigation.navigate(ROUTES.WORKSPACE_COMPANY_CARDS_REFRESH_CARD_FEED_CONNECTION.getRoute(policyID, selectedFeed)); - }); + startCardFeedRefresh(policyID, selectedFeed, policy?.outputCurrency, currencyList, countryByIp); }} /> )} diff --git a/src/pages/workspace/companyCards/WorkspaceCompanyCardsVerifyAccountPage.tsx b/src/pages/workspace/companyCards/WorkspaceCompanyCardsVerifyAccountPage.tsx index f22364355e77..589a084664fb 100644 --- a/src/pages/workspace/companyCards/WorkspaceCompanyCardsVerifyAccountPage.tsx +++ b/src/pages/workspace/companyCards/WorkspaceCompanyCardsVerifyAccountPage.tsx @@ -2,12 +2,10 @@ import React, {useCallback} from 'react'; import {useCurrencyListState} from '@hooks/useCurrencyList'; import useOnyx from '@hooks/useOnyx'; import usePolicy from '@hooks/usePolicy'; -import {getPlaidCountry, getPlaidInstitutionId} from '@libs/CardUtils'; import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types'; import type {SettingsNavigatorParamList} from '@navigation/types'; import VerifyAccountPageBase from '@pages/settings/VerifyAccountPageBase'; -import {clearAddNewCardFlow, setAddNewCompanyCardStepAndData, setAssignCardStepAndData} from '@userActions/CompanyCards'; -import CONST from '@src/CONST'; +import {clearAddNewCardFlow, seedCardFeedRefresh} from '@userActions/CompanyCards'; import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES from '@src/ROUTES'; import type SCREENS from '@src/SCREENS'; @@ -17,27 +15,17 @@ type WorkspaceCompanyCardsVerifyAccountPageProps = PlatformStackScreenProps { + // Seeds Onyx state for the refresh flow; VerifyAccountPageBase handles navigation via navigateForwardTo + const onRefreshValidationSuccess = useCallback(() => { if (!feed) { return; } - - const isPlaid = !!getPlaidInstitutionId(feed); - const currentStep = isPlaid ? CONST.COMPANY_CARD.STEP.PLAID_CONNECTION : CONST.COMPANY_CARD.STEP.BANK_CONNECTION; - - if (isPlaid) { - const country = getPlaidCountry(policy?.outputCurrency, currencyList, countryByIp); - setAddNewCompanyCardStepAndData({data: {selectedCountry: country}}); - } - - setAssignCardStepAndData({currentStep, isRefreshing: true}); + seedCardFeedRefresh(feed, policy?.outputCurrency, currencyList, countryByIp); }, [feed, policy?.outputCurrency, currencyList, countryByIp]); if (feed) { @@ -45,7 +33,7 @@ function WorkspaceCompanyCardsVerifyAccountPage({route}: WorkspaceCompanyCardsVe ); } From 1dfd79ab5670700f0057fa9a0be273092907ec23 Mon Sep 17 00:00:00 2001 From: Fedi Rajhi Date: Sun, 22 Mar 2026 03:25:12 +0000 Subject: [PATCH 11/21] Refactor RefreshCardFeedConnectionPage and WorkspaceCompanyCardsSettingsPage for improved state handling - Updated RefreshCardFeedConnectionPage to enhance the logic for closing the RHP flow and setting feed refresh completion based on state changes. - Refactored useEffect dependencies to prevent unnecessary executions and improve clarity. - Moved the import statement for isUserValidatedSelector in WorkspaceCompanyCardsSettingsPage for better organization. --- .../companyCards/RefreshCardFeedConnectionPage.tsx | 10 ++++++---- .../companyCards/WorkspaceCompanyCardsSettingsPage.tsx | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/pages/workspace/companyCards/RefreshCardFeedConnectionPage.tsx b/src/pages/workspace/companyCards/RefreshCardFeedConnectionPage.tsx index 1a0fd3329ab0..b5c4fb76484a 100644 --- a/src/pages/workspace/companyCards/RefreshCardFeedConnectionPage.tsx +++ b/src/pages/workspace/companyCards/RefreshCardFeedConnectionPage.tsx @@ -43,16 +43,18 @@ function RefreshCardFeedConnectionPage({route, policy}: RefreshCardFeedConnectio // Plaid feeds: isRefreshing is cleared by importPlaidAccounts successData useEffect(() => { - if (prevIsRefreshing === true && !isRefreshing) { - Navigation.closeRHPFlow(); + if (prevIsRefreshing !== true || isRefreshing) { + return; } + Navigation.closeRHPFlow(); }, [prevIsRefreshing, isRefreshing]); // OAuth feeds: expiration updates after bank re-authentication completes useEffect(() => { - if (prevFeedExpiration !== undefined && prevFeedExpiration !== feedExpiration && isRefreshing) { - setFeedRefreshComplete(); + if (prevFeedExpiration === undefined || prevFeedExpiration === feedExpiration || !isRefreshing) { + return; } + setFeedRefreshComplete(); }, [prevFeedExpiration, feedExpiration, isRefreshing]); switch (currentStep) { diff --git a/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsPage.tsx b/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsPage.tsx index 078c635425c7..689ae035e3df 100644 --- a/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsPage.tsx +++ b/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsPage.tsx @@ -1,4 +1,3 @@ -import {isUserValidatedSelector} from '@selectors/Account'; import React, {useMemo, useState} from 'react'; import {InteractionManager, View} from 'react-native'; import ConfirmModal from '@components/ConfirmModal'; @@ -30,6 +29,7 @@ import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES from '@src/ROUTES'; import type SCREENS from '@src/SCREENS'; import type {CompanyCardFeedWithDomainID} from '@src/types/onyx'; +import {isUserValidatedSelector} from '@selectors/Account'; type WorkspaceCompanyCardsSettingsPageProps = PlatformStackScreenProps; From f7fb56524bfe558269b507e8fb376d4ce8daddec Mon Sep 17 00:00:00 2001 From: Fedi Rajhi Date: Sun, 22 Mar 2026 03:38:14 +0000 Subject: [PATCH 12/21] Refactor imports and enhance test structure for RefreshCardFeedConnectionPage --- .../WorkspaceCompanyCardsSettingsPage.tsx | 2 +- .../RefreshCardFeedConnectionPageTest.tsx | 115 +++++++++++------- 2 files changed, 71 insertions(+), 46 deletions(-) diff --git a/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsPage.tsx b/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsPage.tsx index 689ae035e3df..078c635425c7 100644 --- a/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsPage.tsx +++ b/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsPage.tsx @@ -1,3 +1,4 @@ +import {isUserValidatedSelector} from '@selectors/Account'; import React, {useMemo, useState} from 'react'; import {InteractionManager, View} from 'react-native'; import ConfirmModal from '@components/ConfirmModal'; @@ -29,7 +30,6 @@ import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES from '@src/ROUTES'; import type SCREENS from '@src/SCREENS'; import type {CompanyCardFeedWithDomainID} from '@src/types/onyx'; -import {isUserValidatedSelector} from '@selectors/Account'; type WorkspaceCompanyCardsSettingsPageProps = PlatformStackScreenProps; diff --git a/tests/unit/RefreshCardFeedConnectionPageTest.tsx b/tests/unit/RefreshCardFeedConnectionPageTest.tsx index 8d17672b14d4..63f619c5e23b 100644 --- a/tests/unit/RefreshCardFeedConnectionPageTest.tsx +++ b/tests/unit/RefreshCardFeedConnectionPageTest.tsx @@ -1,8 +1,8 @@ import {act, cleanup, render, screen} from '@testing-library/react-native'; import React from 'react'; +import {View} from 'react-native'; import Onyx from 'react-native-onyx'; -import * as CompanyCardsActions from '@libs/actions/CompanyCards'; -import * as Navigation from '@libs/Navigation/Navigation'; +import {clearAssignCardStepAndData, setFeedRefreshComplete} from '@libs/actions/CompanyCards'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import waitForBatchedUpdates from '../utils/waitForBatchedUpdates'; @@ -10,70 +10,61 @@ import waitForBatchedUpdates from '../utils/waitForBatchedUpdates'; // Bypass the HOC and render the inner component directly jest.mock('@pages/workspace/withPolicyAndFullscreenLoading', () => (Component: React.ComponentType) => Component); +const mockCloseRHPFlow = jest.fn(); + jest.mock('@hooks/useCardFeeds', () => ({ + // eslint-disable-next-line @typescript-eslint/naming-convention __esModule: true, default: jest.fn(), })); jest.mock('@pages/workspace/companyCards/BankConnection', () => ({ + // eslint-disable-next-line @typescript-eslint/naming-convention __esModule: true, // eslint-disable-next-line react/display-name - default: () => { - const {View} = require('react-native'); - return ; - }, + default: () => , })); jest.mock('@pages/workspace/companyCards/addNew/PlaidConnectionStep', () => ({ + // eslint-disable-next-line @typescript-eslint/naming-convention __esModule: true, // eslint-disable-next-line react/display-name - default: () => { - const {View} = require('react-native'); - return ; - }, + default: () => , })); jest.mock('@pages/LoadingPage', () => ({ + // eslint-disable-next-line @typescript-eslint/naming-convention __esModule: true, // eslint-disable-next-line react/display-name - default: () => { - const {View} = require('react-native'); - return ; - }, + default: () => , })); jest.mock('@libs/Navigation/Navigation', () => ({ - closeRHPFlow: jest.fn(), + closeRHPFlow: mockCloseRHPFlow, navigate: jest.fn(), goBack: jest.fn(), setNavigationActionToMicrotaskQueue: jest.fn(), })); jest.mock('@libs/actions/CompanyCards', () => ({ - ...jest.requireActual('@libs/actions/CompanyCards'), clearAssignCardStepAndData: jest.fn(), setFeedRefreshComplete: jest.fn(), })); jest.mock('@hooks/useLocalize', () => ({ + // eslint-disable-next-line @typescript-eslint/naming-convention __esModule: true, default: () => ({translate: (key: string) => key}), })); -// eslint-disable-next-line @typescript-eslint/no-var-requires +// eslint-disable-next-line @typescript-eslint/no-var-requires, @typescript-eslint/no-unsafe-member-access const useCardFeeds = require('@hooks/useCardFeeds').default as jest.Mock; -// eslint-disable-next-line @typescript-eslint/no-var-requires +// eslint-disable-next-line @typescript-eslint/no-var-requires, @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access const RefreshCardFeedConnectionPage = require('@pages/workspace/companyCards/RefreshCardFeedConnectionPage').default; const MOCK_FEED = 'oauth.chase_bank_card_99999' as const; - -function buildProps(overrides = {}) { - return { - policy: {id: 'policy1'}, - route: {params: {feed: MOCK_FEED}}, - ...overrides, - }; -} +const MOCK_POLICY = {id: 'policy1'}; +const MOCK_ROUTE = {params: {feed: MOCK_FEED}}; describe('RefreshCardFeedConnectionPage', () => { beforeAll(() => { @@ -92,7 +83,12 @@ describe('RefreshCardFeedConnectionPage', () => { }); it('renders LoadingPage while currentStep is not set', async () => { - render(); + render( + , + ); await act(async () => { await waitForBatchedUpdates(); }); @@ -107,7 +103,12 @@ describe('RefreshCardFeedConnectionPage', () => { isRefreshing: true, }); - render(); + render( + , + ); await act(async () => { await waitForBatchedUpdates(); }); @@ -121,7 +122,12 @@ describe('RefreshCardFeedConnectionPage', () => { isRefreshing: true, }); - render(); + render( + , + ); await act(async () => { await waitForBatchedUpdates(); }); @@ -135,7 +141,12 @@ describe('RefreshCardFeedConnectionPage', () => { isRefreshing: true, }); - render(); + render( + , + ); await act(async () => { await waitForBatchedUpdates(); }); @@ -146,7 +157,7 @@ describe('RefreshCardFeedConnectionPage', () => { await waitForBatchedUpdates(); }); - expect(Navigation.closeRHPFlow).toHaveBeenCalledTimes(1); + expect(mockCloseRHPFlow).toHaveBeenCalledTimes(1); }); it('calls setFeedRefreshComplete when OAuth feed expiration updates while refreshing', async () => { @@ -155,32 +166,44 @@ describe('RefreshCardFeedConnectionPage', () => { isRefreshing: true, }); - const props = buildProps(); - const {rerender} = render(); + const {rerender} = render( + , + ); await act(async () => { await waitForBatchedUpdates(); }); // Simulate bank re-authentication updating the feed expiration (OAuth path). // Re-render is needed to propagate the new mock return value. - await act(async () => { - useCardFeeds.mockReturnValue([{[MOCK_FEED]: {expiration: '2025-01-01'}}, {status: 'loaded'}]); - rerender(); - await waitForBatchedUpdates(); - }); + useCardFeeds.mockReturnValue([{[MOCK_FEED]: {expiration: '2025-01-01'}}, {status: 'loaded'}]); + rerender( + , + ); + await waitForBatchedUpdates(); - expect(CompanyCardsActions.setFeedRefreshComplete).toHaveBeenCalledTimes(1); + expect(setFeedRefreshComplete).toHaveBeenCalledTimes(1); }); it('calls clearAssignCardStepAndData on unmount', async () => { - const {unmount} = render(); + const {unmount} = render( + , + ); await act(async () => { await waitForBatchedUpdates(); }); unmount(); - expect(CompanyCardsActions.clearAssignCardStepAndData).toHaveBeenCalledTimes(1); + expect(clearAssignCardStepAndData).toHaveBeenCalledTimes(1); }); }); @@ -207,8 +230,9 @@ describe('setFeedRefreshComplete action', () => { await waitForBatchedUpdates(); expect(assignCard?.isRefreshing).toBe(true); - const {setFeedRefreshComplete} = jest.requireActual('@libs/actions/CompanyCards'); - setFeedRefreshComplete(); + // eslint-disable-next-line @typescript-eslint/consistent-type-imports + const {setFeedRefreshComplete: actualSetFeedRefreshComplete} = jest.requireActual('@libs/actions/CompanyCards'); + actualSetFeedRefreshComplete(); await waitForBatchedUpdates(); // Onyx removes the key when merging null, so isRefreshing becomes falsy @@ -216,8 +240,9 @@ describe('setFeedRefreshComplete action', () => { }); it('sets isRefreshing and currentStep when starting a feed refresh', async () => { - const {setAssignCardStepAndData} = jest.requireActual('@libs/actions/CompanyCards'); - setAssignCardStepAndData({currentStep: CONST.COMPANY_CARD.STEP.BANK_CONNECTION, isRefreshing: true}); + // eslint-disable-next-line @typescript-eslint/consistent-type-imports + const {setAssignCardStepAndData: actualSetAssignCardStepAndData} = jest.requireActual('@libs/actions/CompanyCards'); + actualSetAssignCardStepAndData({currentStep: CONST.COMPANY_CARD.STEP.BANK_CONNECTION, isRefreshing: true}); await waitForBatchedUpdates(); expect(assignCard?.isRefreshing).toBe(true); From 19ae51a5e96833010980d9b9ed02742afc090198 Mon Sep 17 00:00:00 2001 From: Fedi Rajhi Date: Mon, 23 Mar 2026 16:46:56 +0000 Subject: [PATCH 13/21] Add 'assignNewCards' feature to multiple language files with titles and descriptions for card assignment --- src/languages/de.ts | 1 + src/languages/fr.ts | 1 + src/languages/it.ts | 1 + src/languages/ja.ts | 1 + src/languages/nl.ts | 1 + src/languages/pl.ts | 1 + src/languages/pt-BR.ts | 1 + src/languages/zh-hans.ts | 1 + 8 files changed, 8 insertions(+) diff --git a/src/languages/de.ts b/src/languages/de.ts index 6eeb121a5d70..5920f8dcab7b 100644 --- a/src/languages/de.ts +++ b/src/languages/de.ts @@ -5124,6 +5124,7 @@ _Für ausführlichere Anweisungen [besuchen Sie unsere Hilfeseite](${CONST.NETSU flipAmountSign: 'Betragsvorzeichen umkehren', importButton: 'Transaktionen importieren', }, + assignNewCards: {title: 'Neue Karten zuweisen', description: 'Holen Sie die neuesten Karten zum Zuweisen von Ihrer Bank'}, }, expensifyCard: { issueAndManageCards: 'Geben Sie Expensify Karten aus und verwalten Sie sie', diff --git a/src/languages/fr.ts b/src/languages/fr.ts index af591fc486d7..a11ab734e098 100644 --- a/src/languages/fr.ts +++ b/src/languages/fr.ts @@ -5135,6 +5135,7 @@ _Pour des instructions plus détaillées, [visitez notre site d’aide](${CONST. flipAmountSign: 'Inverser le signe du montant', importButton: 'Importer des transactions', }, + assignNewCards: {title: 'Assigner de nouvelles cartes', description: 'Obtenez les dernières cartes à assigner depuis votre banque'}, }, expensifyCard: { issueAndManageCards: 'Émettre et gérer vos Cartes Expensify', diff --git a/src/languages/it.ts b/src/languages/it.ts index fb28455e7278..48f268a1e249 100644 --- a/src/languages/it.ts +++ b/src/languages/it.ts @@ -5106,6 +5106,7 @@ _Per istruzioni più dettagliate, [visita il nostro sito di assistenza](${CONST. flipAmountSign: 'Inverti segno importo', importButton: 'Importa transazioni', }, + assignNewCards: {title: 'Assegna nuove carte', description: 'Ottieni le ultime carte da assegnare dalla tua banca'}, }, expensifyCard: { issueAndManageCards: 'Emetti e gestisci le tue Carte Expensify', diff --git a/src/languages/ja.ts b/src/languages/ja.ts index bf1b026047cc..c7d1f37f5f21 100644 --- a/src/languages/ja.ts +++ b/src/languages/ja.ts @@ -5058,6 +5058,7 @@ _詳しい手順については、[ヘルプサイトをご覧ください](${CO flipAmountSign: '金額の符号を反転', importButton: '取引をインポート', }, + assignNewCards: {title: '新しいカードを割り当てる', description: '銀行から割り当て可能な最新のカードを取得します'}, }, expensifyCard: { issueAndManageCards: 'Expensify カードを発行して管理する', diff --git a/src/languages/nl.ts b/src/languages/nl.ts index 1ce903379e07..cc321dce798c 100644 --- a/src/languages/nl.ts +++ b/src/languages/nl.ts @@ -5097,6 +5097,7 @@ _Voor meer gedetailleerde instructies, [bezoek onze help-site](${CONST.NETSUITE_ flipAmountSign: 'Teken van bedrag omdraaien', importButton: 'Transacties importeren', }, + assignNewCards: {title: 'Nieuwe kaarten toewijzen', description: 'Haal de nieuwste kaarten op om toe te wijzen vanuit je bank'}, }, expensifyCard: { issueAndManageCards: 'Geef Expensify Kaarten uit en beheer ze', diff --git a/src/languages/pl.ts b/src/languages/pl.ts index 894305d79e1f..688658dfb83d 100644 --- a/src/languages/pl.ts +++ b/src/languages/pl.ts @@ -5089,6 +5089,7 @@ _Aby uzyskać bardziej szczegółowe instrukcje, [odwiedź naszą stronę pomocy flipAmountSign: 'Odwróć znak kwoty', importButton: 'Importuj transakcje', }, + assignNewCards: {title: 'Przydziel nowe karty', description: 'Pobierz z banku najnowsze karty do przypisania'}, }, expensifyCard: { issueAndManageCards: 'Wydawaj i zarządzaj Kartami Expensify', diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts index 0ac1a3cd5c46..a8ffd092e9c6 100644 --- a/src/languages/pt-BR.ts +++ b/src/languages/pt-BR.ts @@ -5089,6 +5089,7 @@ _Para instruções mais detalhadas, [visite nossa central de ajuda](${CONST.NETS flipAmountSign: 'Inverter sinal do valor', importButton: 'Importar transações', }, + assignNewCards: {title: 'Atribuir novos cartões', description: 'Obtenha do seu banco os cartões mais recentes para atribuir'}, }, expensifyCard: { issueAndManageCards: 'Emita e gerencie seus Cartões Expensify', diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts index db6b177620ad..d3a55f6d172c 100644 --- a/src/languages/zh-hans.ts +++ b/src/languages/zh-hans.ts @@ -4978,6 +4978,7 @@ _如需更详细的说明,请[访问我们的帮助网站](${CONST.NETSUITE_IM flipAmountSign: '翻转金额符号', importButton: '导入交易', }, + assignNewCards: {title: '分配新卡', description: '从您的银行获取可分配的最新银行卡'}, }, expensifyCard: { issueAndManageCards: '发放并管理您的 Expensify 卡', From 08a33b7515384b6138eb6dd125cf2f1ac4a19762 Mon Sep 17 00:00:00 2001 From: Fedi Rajhi Date: Mon, 23 Mar 2026 16:52:45 +0000 Subject: [PATCH 14/21] Refactor CompanyCards actions by removing unused setFeedRefreshComplete function and updating imports in related components. --- src/libs/actions/CompanyCards.ts | 5 ----- .../companyCards/RefreshCardFeedConnectionPage.tsx | 4 ++-- .../companyCards/WorkspaceCompanyCardsVerifyAccountPage.tsx | 6 +++--- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/libs/actions/CompanyCards.ts b/src/libs/actions/CompanyCards.ts index d9fe87cfa0b3..135f264b4d00 100644 --- a/src/libs/actions/CompanyCards.ts +++ b/src/libs/actions/CompanyCards.ts @@ -66,10 +66,6 @@ function clearAssignCardErrors() { Onyx.merge(ONYXKEYS.ASSIGN_CARD, {errors: null}); } -function setFeedRefreshComplete() { - Onyx.merge(ONYXKEYS.ASSIGN_CARD, {isRefreshing: null}); -} - function setAddNewCompanyCardStepAndData({data, isEditing, step}: NullishDeep) { Onyx.merge(ONYXKEYS.ADD_NEW_COMPANY_CARD, {data, isEditing, currentStep: step}); } @@ -1112,7 +1108,6 @@ export { setFeedStatementPeriodEndDay, clearErrorField, clearAssignCardErrors, - setFeedRefreshComplete, seedCardFeedRefresh, startCardFeedRefresh, }; diff --git a/src/pages/workspace/companyCards/RefreshCardFeedConnectionPage.tsx b/src/pages/workspace/companyCards/RefreshCardFeedConnectionPage.tsx index b5c4fb76484a..2b6cd7082bdd 100644 --- a/src/pages/workspace/companyCards/RefreshCardFeedConnectionPage.tsx +++ b/src/pages/workspace/companyCards/RefreshCardFeedConnectionPage.tsx @@ -9,7 +9,7 @@ import type {SettingsNavigatorParamList} from '@navigation/types'; import LoadingPage from '@pages/LoadingPage'; import type {WithPolicyAndFullscreenLoadingProps} from '@pages/workspace/withPolicyAndFullscreenLoading'; import withPolicyAndFullscreenLoading from '@pages/workspace/withPolicyAndFullscreenLoading'; -import {clearAssignCardStepAndData, setFeedRefreshComplete} from '@userActions/CompanyCards'; +import {clearAssignCardStepAndData} from '@userActions/CompanyCards'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import type SCREENS from '@src/SCREENS'; @@ -54,7 +54,7 @@ function RefreshCardFeedConnectionPage({route, policy}: RefreshCardFeedConnectio if (prevFeedExpiration === undefined || prevFeedExpiration === feedExpiration || !isRefreshing) { return; } - setFeedRefreshComplete(); + Navigation.closeRHPFlow(); }, [prevFeedExpiration, feedExpiration, isRefreshing]); switch (currentStep) { diff --git a/src/pages/workspace/companyCards/WorkspaceCompanyCardsVerifyAccountPage.tsx b/src/pages/workspace/companyCards/WorkspaceCompanyCardsVerifyAccountPage.tsx index 589a084664fb..b17fb199a74d 100644 --- a/src/pages/workspace/companyCards/WorkspaceCompanyCardsVerifyAccountPage.tsx +++ b/src/pages/workspace/companyCards/WorkspaceCompanyCardsVerifyAccountPage.tsx @@ -1,4 +1,4 @@ -import React, {useCallback} from 'react'; +import React from 'react'; import {useCurrencyListState} from '@hooks/useCurrencyList'; import useOnyx from '@hooks/useOnyx'; import usePolicy from '@hooks/usePolicy'; @@ -21,12 +21,12 @@ function WorkspaceCompanyCardsVerifyAccountPage({route}: WorkspaceCompanyCardsVe const companyCardsRoute = ROUTES.WORKSPACE_COMPANY_CARDS.getRoute(policyID); // Seeds Onyx state for the refresh flow; VerifyAccountPageBase handles navigation via navigateForwardTo - const onRefreshValidationSuccess = useCallback(() => { + const onRefreshValidationSuccess = () => { if (!feed) { return; } seedCardFeedRefresh(feed, policy?.outputCurrency, currencyList, countryByIp); - }, [feed, policy?.outputCurrency, currencyList, countryByIp]); + }; if (feed) { return ( From 2e377ba2c795dbf629838993aad8cfb30880c3f8 Mon Sep 17 00:00:00 2001 From: Fedi Rajhi Date: Mon, 23 Mar 2026 17:03:58 +0000 Subject: [PATCH 15/21] Remove unused setFeedRefreshComplete function from RefreshCardFeedConnectionPageTest and update related test cases to reflect this change. --- .../RefreshCardFeedConnectionPageTest.tsx | 50 ++----------------- 1 file changed, 3 insertions(+), 47 deletions(-) diff --git a/tests/unit/RefreshCardFeedConnectionPageTest.tsx b/tests/unit/RefreshCardFeedConnectionPageTest.tsx index 63f619c5e23b..56d30ba16027 100644 --- a/tests/unit/RefreshCardFeedConnectionPageTest.tsx +++ b/tests/unit/RefreshCardFeedConnectionPageTest.tsx @@ -2,7 +2,7 @@ import {act, cleanup, render, screen} from '@testing-library/react-native'; import React from 'react'; import {View} from 'react-native'; import Onyx from 'react-native-onyx'; -import {clearAssignCardStepAndData, setFeedRefreshComplete} from '@libs/actions/CompanyCards'; +import {clearAssignCardStepAndData} from '@libs/actions/CompanyCards'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import waitForBatchedUpdates from '../utils/waitForBatchedUpdates'; @@ -48,7 +48,6 @@ jest.mock('@libs/Navigation/Navigation', () => ({ jest.mock('@libs/actions/CompanyCards', () => ({ clearAssignCardStepAndData: jest.fn(), - setFeedRefreshComplete: jest.fn(), })); jest.mock('@hooks/useLocalize', () => ({ @@ -160,7 +159,7 @@ describe('RefreshCardFeedConnectionPage', () => { expect(mockCloseRHPFlow).toHaveBeenCalledTimes(1); }); - it('calls setFeedRefreshComplete when OAuth feed expiration updates while refreshing', async () => { + it('closes RHP flow when OAuth feed expiration updates while refreshing', async () => { await Onyx.merge(ONYXKEYS.ASSIGN_CARD, { currentStep: CONST.COMPANY_CARD.STEP.BANK_CONNECTION, isRefreshing: true, @@ -187,7 +186,7 @@ describe('RefreshCardFeedConnectionPage', () => { ); await waitForBatchedUpdates(); - expect(setFeedRefreshComplete).toHaveBeenCalledTimes(1); + expect(mockCloseRHPFlow).toHaveBeenCalledTimes(1); }); it('calls clearAssignCardStepAndData on unmount', async () => { @@ -206,46 +205,3 @@ describe('RefreshCardFeedConnectionPage', () => { expect(clearAssignCardStepAndData).toHaveBeenCalledTimes(1); }); }); - -describe('setFeedRefreshComplete action', () => { - let assignCard: Record | undefined; - - beforeAll(() => { - Onyx.init({keys: ONYXKEYS}); - Onyx.connect({ - key: ONYXKEYS.ASSIGN_CARD, - callback: (val) => { - assignCard = val as Record; - }, - }); - }); - - beforeEach(async () => { - await Onyx.clear(); - await waitForBatchedUpdates(); - }); - - it('clears isRefreshing when OAuth feed connection refreshes', async () => { - await Onyx.merge(ONYXKEYS.ASSIGN_CARD, {isRefreshing: true, currentStep: CONST.COMPANY_CARD.STEP.BANK_CONNECTION}); - await waitForBatchedUpdates(); - expect(assignCard?.isRefreshing).toBe(true); - - // eslint-disable-next-line @typescript-eslint/consistent-type-imports - const {setFeedRefreshComplete: actualSetFeedRefreshComplete} = jest.requireActual('@libs/actions/CompanyCards'); - actualSetFeedRefreshComplete(); - await waitForBatchedUpdates(); - - // Onyx removes the key when merging null, so isRefreshing becomes falsy - expect(assignCard?.isRefreshing).toBeFalsy(); - }); - - it('sets isRefreshing and currentStep when starting a feed refresh', async () => { - // eslint-disable-next-line @typescript-eslint/consistent-type-imports - const {setAssignCardStepAndData: actualSetAssignCardStepAndData} = jest.requireActual('@libs/actions/CompanyCards'); - actualSetAssignCardStepAndData({currentStep: CONST.COMPANY_CARD.STEP.BANK_CONNECTION, isRefreshing: true}); - await waitForBatchedUpdates(); - - expect(assignCard?.isRefreshing).toBe(true); - expect(assignCard?.currentStep).toBe(CONST.COMPANY_CARD.STEP.BANK_CONNECTION); - }); -}); From aaab346585d6ddfbad8ce77cef6d47a32697c159 Mon Sep 17 00:00:00 2001 From: Fedi Rajhi Date: Mon, 23 Mar 2026 17:32:50 +0000 Subject: [PATCH 16/21] Refactor mock components in RefreshCardFeedConnectionPageTest to dynamically require 'View' from 'react-native' for improved compatibility. --- .../RefreshCardFeedConnectionPageTest.tsx | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/tests/unit/RefreshCardFeedConnectionPageTest.tsx b/tests/unit/RefreshCardFeedConnectionPageTest.tsx index 56d30ba16027..fae3ad286335 100644 --- a/tests/unit/RefreshCardFeedConnectionPageTest.tsx +++ b/tests/unit/RefreshCardFeedConnectionPageTest.tsx @@ -1,6 +1,5 @@ import {act, cleanup, render, screen} from '@testing-library/react-native'; import React from 'react'; -import {View} from 'react-native'; import Onyx from 'react-native-onyx'; import {clearAssignCardStepAndData} from '@libs/actions/CompanyCards'; import CONST from '@src/CONST'; @@ -22,21 +21,33 @@ jest.mock('@pages/workspace/companyCards/BankConnection', () => ({ // eslint-disable-next-line @typescript-eslint/naming-convention __esModule: true, // eslint-disable-next-line react/display-name - default: () => , + default: () => { + // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-var-requires + const {View} = require('react-native'); + return ; + }, })); jest.mock('@pages/workspace/companyCards/addNew/PlaidConnectionStep', () => ({ // eslint-disable-next-line @typescript-eslint/naming-convention __esModule: true, // eslint-disable-next-line react/display-name - default: () => , + default: () => { + // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-var-requires + const {View} = require('react-native'); + return ; + }, })); jest.mock('@pages/LoadingPage', () => ({ // eslint-disable-next-line @typescript-eslint/naming-convention __esModule: true, // eslint-disable-next-line react/display-name - default: () => , + default: () => { + // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-var-requires + const {View} = require('react-native'); + return ; + }, })); jest.mock('@libs/Navigation/Navigation', () => ({ From 66c6c15bc105a6a30b4d21271db25808aa302bee Mon Sep 17 00:00:00 2001 From: Fedi Rajhi Date: Wed, 25 Mar 2026 17:23:08 +0100 Subject: [PATCH 17/21] Add NotFoundPage component and validation for direct feed in RefreshCardFeedConnectionPage --- .../companyCards/RefreshCardFeedConnectionPage.tsx | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/pages/workspace/companyCards/RefreshCardFeedConnectionPage.tsx b/src/pages/workspace/companyCards/RefreshCardFeedConnectionPage.tsx index 2b6cd7082bdd..ecfabdbff490 100644 --- a/src/pages/workspace/companyCards/RefreshCardFeedConnectionPage.tsx +++ b/src/pages/workspace/companyCards/RefreshCardFeedConnectionPage.tsx @@ -13,6 +13,8 @@ import {clearAssignCardStepAndData} from '@userActions/CompanyCards'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import type SCREENS from '@src/SCREENS'; +import NotFoundPage from '@pages/ErrorPage/NotFoundPage'; +import { isDirectFeed } from '@libs/CardUtils'; import PlaidConnectionStep from './addNew/PlaidConnectionStep'; import BankConnection from './BankConnection'; @@ -57,6 +59,10 @@ function RefreshCardFeedConnectionPage({route, policy}: RefreshCardFeedConnectio Navigation.closeRHPFlow(); }, [prevFeedExpiration, feedExpiration, isRefreshing]); + if (!isDirectFeed(feed) || !cardFeeds?.[feed]) { + return ; + } + switch (currentStep) { case CONST.COMPANY_CARD.STEP.BANK_CONNECTION: return ( From 2f18dd58e3f6b9110990009fca4a6e6c4d97a239 Mon Sep 17 00:00:00 2001 From: Fedi Rajhi Date: Wed, 25 Mar 2026 17:28:17 +0100 Subject: [PATCH 18/21] Refactor imports in RefreshCardFeedConnectionPage to streamline code and improve readability --- .../workspace/companyCards/RefreshCardFeedConnectionPage.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/workspace/companyCards/RefreshCardFeedConnectionPage.tsx b/src/pages/workspace/companyCards/RefreshCardFeedConnectionPage.tsx index ecfabdbff490..cad80801313b 100644 --- a/src/pages/workspace/companyCards/RefreshCardFeedConnectionPage.tsx +++ b/src/pages/workspace/companyCards/RefreshCardFeedConnectionPage.tsx @@ -3,9 +3,11 @@ import useCardFeeds from '@hooks/useCardFeeds'; import useLocalize from '@hooks/useLocalize'; import useOnyx from '@hooks/useOnyx'; import usePrevious from '@hooks/usePrevious'; +import {isDirectFeed} from '@libs/CardUtils'; import Navigation from '@libs/Navigation/Navigation'; import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types'; import type {SettingsNavigatorParamList} from '@navigation/types'; +import NotFoundPage from '@pages/ErrorPage/NotFoundPage'; import LoadingPage from '@pages/LoadingPage'; import type {WithPolicyAndFullscreenLoadingProps} from '@pages/workspace/withPolicyAndFullscreenLoading'; import withPolicyAndFullscreenLoading from '@pages/workspace/withPolicyAndFullscreenLoading'; @@ -13,8 +15,6 @@ import {clearAssignCardStepAndData} from '@userActions/CompanyCards'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import type SCREENS from '@src/SCREENS'; -import NotFoundPage from '@pages/ErrorPage/NotFoundPage'; -import { isDirectFeed } from '@libs/CardUtils'; import PlaidConnectionStep from './addNew/PlaidConnectionStep'; import BankConnection from './BankConnection'; From fa3d94efecd9800e87605cadfdad8e5b01bddbbf Mon Sep 17 00:00:00 2001 From: Fedi Rajhi Date: Wed, 25 Mar 2026 18:02:40 +0100 Subject: [PATCH 19/21] Enhance validation in RefreshCardFeedConnectionPage by adding currentStep check to ensure proper feed handling --- .../workspace/companyCards/RefreshCardFeedConnectionPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/workspace/companyCards/RefreshCardFeedConnectionPage.tsx b/src/pages/workspace/companyCards/RefreshCardFeedConnectionPage.tsx index cad80801313b..057600c27d6d 100644 --- a/src/pages/workspace/companyCards/RefreshCardFeedConnectionPage.tsx +++ b/src/pages/workspace/companyCards/RefreshCardFeedConnectionPage.tsx @@ -59,7 +59,7 @@ function RefreshCardFeedConnectionPage({route, policy}: RefreshCardFeedConnectio Navigation.closeRHPFlow(); }, [prevFeedExpiration, feedExpiration, isRefreshing]); - if (!isDirectFeed(feed) || !cardFeeds?.[feed]) { + if (!isDirectFeed(feed) || !cardFeeds?.[feed] || !currentStep) { return ; } From 0b8b7daf147abd3f1a4a8af5642772a38c1ce28e Mon Sep 17 00:00:00 2001 From: Fedi Rajhi Date: Thu, 26 Mar 2026 03:06:56 +0100 Subject: [PATCH 20/21] Enhance RefreshCardFeedConnectionPage tests to include NotFoundPage rendering for unset currentStep and handle unrecognized currentStep values. --- .../RefreshCardFeedConnectionPageTest.tsx | 34 ++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/tests/unit/RefreshCardFeedConnectionPageTest.tsx b/tests/unit/RefreshCardFeedConnectionPageTest.tsx index fae3ad286335..41fcaf778644 100644 --- a/tests/unit/RefreshCardFeedConnectionPageTest.tsx +++ b/tests/unit/RefreshCardFeedConnectionPageTest.tsx @@ -50,11 +50,23 @@ jest.mock('@pages/LoadingPage', () => ({ }, })); +jest.mock('@pages/ErrorPage/NotFoundPage', () => ({ + // eslint-disable-next-line @typescript-eslint/naming-convention + __esModule: true, + // eslint-disable-next-line react/display-name + default: () => { + // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-var-requires + const {View} = require('react-native'); + return ; + }, +})); + jest.mock('@libs/Navigation/Navigation', () => ({ closeRHPFlow: mockCloseRHPFlow, navigate: jest.fn(), goBack: jest.fn(), setNavigationActionToMicrotaskQueue: jest.fn(), + getTopmostReportId: jest.fn(), })); jest.mock('@libs/actions/CompanyCards', () => ({ @@ -92,7 +104,27 @@ describe('RefreshCardFeedConnectionPage', () => { useCardFeeds.mockReturnValue([{[MOCK_FEED]: {expiration: '2024-01-01'}}, {status: 'loaded'}]); }); - it('renders LoadingPage while currentStep is not set', async () => { + it('renders NotFoundPage when currentStep is not set', async () => { + render( + , + ); + await act(async () => { + await waitForBatchedUpdates(); + }); + + expect(screen.getByTestId('NotFoundPage')).toBeTruthy(); + expect(screen.queryByTestId('BankConnection')).toBeNull(); + }); + + it('renders LoadingPage when currentStep is an unrecognized value', async () => { + await Onyx.merge(ONYXKEYS.ASSIGN_CARD, { + currentStep: 'UNKNOWN_STEP' as typeof CONST.COMPANY_CARD.STEP.BANK_CONNECTION, + isRefreshing: true, + }); + render( Date: Thu, 26 Mar 2026 03:16:36 +0100 Subject: [PATCH 21/21] Add tests for ROUTES helper functions in RefreshCardFeedConnectionPageTest --- tests/unit/RefreshCardFeedConnectionPageTest.tsx | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/tests/unit/RefreshCardFeedConnectionPageTest.tsx b/tests/unit/RefreshCardFeedConnectionPageTest.tsx index 41fcaf778644..37b76556d5dd 100644 --- a/tests/unit/RefreshCardFeedConnectionPageTest.tsx +++ b/tests/unit/RefreshCardFeedConnectionPageTest.tsx @@ -4,6 +4,7 @@ import Onyx from 'react-native-onyx'; import {clearAssignCardStepAndData} from '@libs/actions/CompanyCards'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; +import ROUTES from '@src/ROUTES'; import waitForBatchedUpdates from '../utils/waitForBatchedUpdates'; // Bypass the HOC and render the inner component directly @@ -248,3 +249,18 @@ describe('RefreshCardFeedConnectionPage', () => { expect(clearAssignCardStepAndData).toHaveBeenCalledTimes(1); }); }); + +describe('Related route getRoute helpers', () => { + it('WORKSPACE_COMPANY_CARDS_REFRESH_CARD_FEED_CONNECTION encodes feed in URL', () => { + const result = ROUTES.WORKSPACE_COMPANY_CARDS_REFRESH_CARD_FEED_CONNECTION.getRoute('pol1', 'oauth.chase 99999' as never); + expect(result).toBe('workspaces/pol1/company-cards/oauth.chase%2099999/refresh-card-feed-connection'); + }); + + it('WORKSPACE_COMPANY_CARDS_VERIFY_ACCOUNT returns route without feed when omitted', () => { + expect(ROUTES.WORKSPACE_COMPANY_CARDS_VERIFY_ACCOUNT.getRoute('pol1')).toBe('workspaces/pol1/company-cards/verify-account'); + }); + + it('WORKSPACE_COMPANY_CARDS_VERIFY_ACCOUNT returns route with encoded feed when provided', () => { + expect(ROUTES.WORKSPACE_COMPANY_CARDS_VERIFY_ACCOUNT.getRoute('pol1', 'oauth.amex 1001' as never)).toBe('workspaces/pol1/company-cards/verify-account?feed=oauth.amex%201001'); + }); +});