From 5a6f2a065e7a0ff21e8a1c78b90b749f001fdfb3 Mon Sep 17 00:00:00 2001 From: Ben Limpich Date: Wed, 25 Feb 2026 11:49:56 -0800 Subject: [PATCH 01/26] Add new API parameter types and update WRITE_COMMANDS Replace TOGGLE_TRAVEL_INVOICING with CONFIGURE_TRAVEL_INVOICING_FOR_POLICY and DEACTIVATE_TRAVEL_INVOICING. Create corresponding parameter types. --- .../parameters/ConfigureTravelInvoicingForPolicyParams.ts | 6 ++++++ src/libs/API/parameters/DeactivateTravelInvoicingParams.ts | 5 +++++ src/libs/API/parameters/ToggleTravelInvoicingParams.ts | 6 ------ src/libs/API/parameters/index.ts | 3 ++- src/libs/API/types.ts | 6 ++++-- 5 files changed, 17 insertions(+), 9 deletions(-) create mode 100644 src/libs/API/parameters/ConfigureTravelInvoicingForPolicyParams.ts create mode 100644 src/libs/API/parameters/DeactivateTravelInvoicingParams.ts delete mode 100644 src/libs/API/parameters/ToggleTravelInvoicingParams.ts diff --git a/src/libs/API/parameters/ConfigureTravelInvoicingForPolicyParams.ts b/src/libs/API/parameters/ConfigureTravelInvoicingForPolicyParams.ts new file mode 100644 index 000000000000..6dbaf58cd8a0 --- /dev/null +++ b/src/libs/API/parameters/ConfigureTravelInvoicingForPolicyParams.ts @@ -0,0 +1,6 @@ +type ConfigureTravelInvoicingForPolicyParams = { + policyID: string; + settlementBankAccountID: number; +}; + +export default ConfigureTravelInvoicingForPolicyParams; diff --git a/src/libs/API/parameters/DeactivateTravelInvoicingParams.ts b/src/libs/API/parameters/DeactivateTravelInvoicingParams.ts new file mode 100644 index 000000000000..31a74c6995f8 --- /dev/null +++ b/src/libs/API/parameters/DeactivateTravelInvoicingParams.ts @@ -0,0 +1,5 @@ +type DeactivateTravelInvoicingParams = { + policyID: string; +}; + +export default DeactivateTravelInvoicingParams; diff --git a/src/libs/API/parameters/ToggleTravelInvoicingParams.ts b/src/libs/API/parameters/ToggleTravelInvoicingParams.ts deleted file mode 100644 index fe5c923a078e..000000000000 --- a/src/libs/API/parameters/ToggleTravelInvoicingParams.ts +++ /dev/null @@ -1,6 +0,0 @@ -type ToggleTravelInvoicingParams = { - policyID: string; - enabled: boolean; -}; - -export default ToggleTravelInvoicingParams; diff --git a/src/libs/API/parameters/index.ts b/src/libs/API/parameters/index.ts index 6f66f2af6a53..7b956982b797 100644 --- a/src/libs/API/parameters/index.ts +++ b/src/libs/API/parameters/index.ts @@ -384,7 +384,8 @@ export type {default as ExportTagsSpreadsheetParams} from './ExportTagsSpreadshe export type {default as UpdateXeroGenericTypeParams} from './UpdateXeroGenericTypeParams'; export type {default as UpdateCardSettlementFrequencyParams} from './UpdateCardSettlementFrequencyParams'; export type {default as UpdateCardSettlementAccountParams} from './UpdateCardSettlementAccountParams'; -export type {default as ToggleTravelInvoicingParams} from './ToggleTravelInvoicingParams'; +export type {default as ConfigureTravelInvoicingForPolicyParams} from './ConfigureTravelInvoicingForPolicyParams'; +export type {default as DeactivateTravelInvoicingParams} from './DeactivateTravelInvoicingParams'; export type {default as SetTravelInvoicingSettlementAccountParams} from './SetTravelInvoicingSettlementAccountParams'; export type {default as SetCompanyCardFeedName} from './SetCompanyCardFeedName'; export type {default as DeleteCompanyCardFeed} from './DeleteCompanyCardFeed'; diff --git a/src/libs/API/types.ts b/src/libs/API/types.ts index 31b4bb40e301..bdf2a0f300e7 100644 --- a/src/libs/API/types.ts +++ b/src/libs/API/types.ts @@ -475,7 +475,8 @@ const WRITE_COMMANDS = { DELETE_SAVED_SEARCH: 'DeleteSavedSearch', UPDATE_CARD_SETTLEMENT_FREQUENCY: 'UpdateCardSettlementFrequency', UPDATE_CARD_SETTLEMENT_ACCOUNT: 'UpdateCardSettlementAccount', - TOGGLE_TRAVEL_INVOICING: 'ToggleTravelInvoicing', + CONFIGURE_TRAVEL_INVOICING_FOR_POLICY: 'ConfigureTravelInvoicingForPolicy', + DEACTIVATE_TRAVEL_INVOICING: 'DeactivateTravelInvoicing', SET_TRAVEL_INVOICING_SETTLEMENT_ACCOUNT: 'SetTravelInvoicingSettlementAccount', UPDATE_TRAVEL_INVOICE_SETTLEMENT_FREQUENCY: 'UpdateTravelInvoiceSettlementFrequency', UPDATE_XERO_IMPORT_TRACKING_CATEGORIES: 'UpdateXeroImportTrackingCategories', @@ -1073,7 +1074,8 @@ type WriteCommandParameters = { [WRITE_COMMANDS.DELETE_SAVED_SEARCH]: Parameters.DeleteSavedSearchParams; [WRITE_COMMANDS.UPDATE_CARD_SETTLEMENT_FREQUENCY]: Parameters.UpdateCardSettlementFrequencyParams; [WRITE_COMMANDS.UPDATE_CARD_SETTLEMENT_ACCOUNT]: Parameters.UpdateCardSettlementAccountParams; - [WRITE_COMMANDS.TOGGLE_TRAVEL_INVOICING]: Parameters.ToggleTravelInvoicingParams; + [WRITE_COMMANDS.CONFIGURE_TRAVEL_INVOICING_FOR_POLICY]: Parameters.ConfigureTravelInvoicingForPolicyParams; + [WRITE_COMMANDS.DEACTIVATE_TRAVEL_INVOICING]: Parameters.DeactivateTravelInvoicingParams; [WRITE_COMMANDS.SET_TRAVEL_INVOICING_SETTLEMENT_ACCOUNT]: Parameters.SetTravelInvoicingSettlementAccountParams; [WRITE_COMMANDS.UPDATE_TRAVEL_INVOICE_SETTLEMENT_FREQUENCY]: Parameters.UpdateTravelInvoicingSettlementFrequencyParams; [WRITE_COMMANDS.SET_PERSONAL_DETAILS_AND_SHIP_EXPENSIFY_CARDS]: Parameters.SetPersonalDetailsAndShipExpensifyCardsParams; From fbe3873f02b1fa9c178e8f9fcee4f6a57e5b2185 Mon Sep 17 00:00:00 2001 From: Ben Limpich Date: Wed, 25 Feb 2026 11:50:02 -0800 Subject: [PATCH 02/26] Add configureTravelInvoicingForPolicy and deactivateTravelInvoicing actions Replace toggleTravelInvoicing with two separate actions. The enable action combines settlement account and isEnabled optimistic data into a single API call. Rename clearToggleTravelInvoicingErrors to clearTravelInvoicingErrors. --- src/libs/actions/TravelInvoicing.ts | 109 ++++++++++++++++++++++++---- 1 file changed, 93 insertions(+), 16 deletions(-) diff --git a/src/libs/actions/TravelInvoicing.ts b/src/libs/actions/TravelInvoicing.ts index 7da56385eebb..ab97b8f94ade 100644 --- a/src/libs/actions/TravelInvoicing.ts +++ b/src/libs/actions/TravelInvoicing.ts @@ -2,7 +2,13 @@ import Onyx from 'react-native-onyx'; import type {OnyxUpdate} from 'react-native-onyx'; import type {ValueOf} from 'type-fest'; import * as API from '@libs/API'; -import type {OpenPolicyTravelPageParams, SetTravelInvoicingSettlementAccountParams, ToggleTravelInvoicingParams, UpdateTravelInvoicingSettlementFrequencyParams} from '@libs/API/parameters'; +import type { + ConfigureTravelInvoicingForPolicyParams, + DeactivateTravelInvoicingParams, + OpenPolicyTravelPageParams, + SetTravelInvoicingSettlementAccountParams, + UpdateTravelInvoicingSettlementFrequencyParams, +} from '@libs/API/parameters'; import {READ_COMMANDS, WRITE_COMMANDS} from '@libs/API/types'; import * as ErrorUtils from '@libs/ErrorUtils'; import {getTravelInvoicingCardSettingsKey} from '@libs/TravelInvoicingUtils'; @@ -243,10 +249,10 @@ function clearTravelInvoicingSettlementFrequencyErrors(workspaceAccountID: numbe } /** - * Toggles Travel Invoicing on or off for a workspace. - * Sets isEnabled flag optimistically, backend confirms via onyx data. + * Enables Travel Invoicing for a policy with a settlement bank account. + * Single API call that configures both the settlement account and enables the feature. */ -function toggleTravelInvoicing(policyID: string, workspaceAccountID: number, enabled: boolean) { +function configureTravelInvoicingForPolicy(policyID: string, workspaceAccountID: number, settlementBankAccountID: number) { const cardSettingsKey = getTravelInvoicingCardSettingsKey(workspaceAccountID); const optimisticData: Array> = [ @@ -254,9 +260,81 @@ function toggleTravelInvoicing(policyID: string, workspaceAccountID: number, ena onyxMethod: Onyx.METHOD.MERGE, key: cardSettingsKey, value: { - isEnabled: enabled, + isEnabled: true, [CONST.TRAVEL.PROGRAM_TRAVEL_US]: { - isEnabled: enabled, + isEnabled: true, + paymentBankAccountID: settlementBankAccountID, + }, + pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE, + pendingFields: { + paymentBankAccountID: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE, + }, + errors: null, + errorFields: { + paymentBankAccountID: null, + }, + }, + }, + ]; + + const successData: Array> = [ + { + onyxMethod: Onyx.METHOD.MERGE, + key: cardSettingsKey, + value: { + pendingAction: null, + pendingFields: { + paymentBankAccountID: null, + }, + [CONST.TRAVEL.PROGRAM_TRAVEL_US]: { + isEnabled: true, + paymentBankAccountID: settlementBankAccountID, + }, + }, + }, + ]; + + const failureData: Array> = [ + { + onyxMethod: Onyx.METHOD.MERGE, + key: cardSettingsKey, + value: { + isEnabled: false, + [CONST.TRAVEL.PROGRAM_TRAVEL_US]: { + isEnabled: false, + paymentBankAccountID: undefined, + }, + pendingAction: null, + pendingFields: { + paymentBankAccountID: null, + }, + }, + }, + ]; + + const params: ConfigureTravelInvoicingForPolicyParams = { + policyID, + settlementBankAccountID, + }; + + API.write(WRITE_COMMANDS.CONFIGURE_TRAVEL_INVOICING_FOR_POLICY, params, {optimisticData, successData, failureData}); +} + +/** + * Disables Travel Invoicing for a workspace. + * Sets isEnabled flag to false optimistically, backend confirms via onyx data. + */ +function deactivateTravelInvoicing(policyID: string, workspaceAccountID: number) { + const cardSettingsKey = getTravelInvoicingCardSettingsKey(workspaceAccountID); + + const optimisticData: Array> = [ + { + onyxMethod: Onyx.METHOD.MERGE, + key: cardSettingsKey, + value: { + isEnabled: false, + [CONST.TRAVEL.PROGRAM_TRAVEL_US]: { + isEnabled: false, }, pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE, errors: null, @@ -271,39 +349,37 @@ function toggleTravelInvoicing(policyID: string, workspaceAccountID: number, ena value: { pendingAction: null, [CONST.TRAVEL.PROGRAM_TRAVEL_US]: { - isEnabled: enabled, + isEnabled: false, }, }, }, ]; - // On failure: revert isEnabled and show error const failureData: Array> = [ { onyxMethod: Onyx.METHOD.MERGE, key: cardSettingsKey, value: { - isEnabled: !enabled, + isEnabled: true, [CONST.TRAVEL.PROGRAM_TRAVEL_US]: { - isEnabled: !enabled, + isEnabled: true, }, pendingAction: null, }, }, ]; - const params: ToggleTravelInvoicingParams = { + const params: DeactivateTravelInvoicingParams = { policyID, - enabled, }; - API.write(WRITE_COMMANDS.TOGGLE_TRAVEL_INVOICING, params, {optimisticData, successData, failureData}); + API.write(WRITE_COMMANDS.DEACTIVATE_TRAVEL_INVOICING, params, {optimisticData, successData, failureData}); } /** * Clears any errors from the Travel Invoicing toggle action. */ -function clearToggleTravelInvoicingErrors(workspaceAccountID: number) { +function clearTravelInvoicingErrors(workspaceAccountID: number) { Onyx.merge(getTravelInvoicingCardSettingsKey(workspaceAccountID), { errors: null, pendingAction: null, @@ -316,6 +392,7 @@ export { clearTravelInvoicingSettlementAccountErrors, clearTravelInvoicingSettlementFrequencyErrors, updateTravelInvoiceSettlementFrequency, - toggleTravelInvoicing, - clearToggleTravelInvoicingErrors, + configureTravelInvoicingForPolicy, + deactivateTravelInvoicing, + clearTravelInvoicingErrors, }; From b355be53b6412627e63042d79462fa4be33937a5 Mon Sep 17 00:00:00 2001 From: Ben Limpich Date: Wed, 25 Feb 2026 11:50:08 -0800 Subject: [PATCH 03/26] Update Travel Invoicing UI to use new 1:1:1 compliant actions Settlement account page now calls configureTravelInvoicingForPolicy when enabling (single API call instead of two). Section page uses configureTravelInvoicingForPolicy for enable and deactivateTravelInvoicing for disable. --- .../WorkspaceTravelInvoicingSection.tsx | 19 ++++++++++++------- ...ceTravelInvoicingSettlementAccountPage.tsx | 16 +++++++++------- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/src/pages/workspace/travel/WorkspaceTravelInvoicingSection.tsx b/src/pages/workspace/travel/WorkspaceTravelInvoicingSection.tsx index be2f80bb0272..0f141efcff85 100644 --- a/src/pages/workspace/travel/WorkspaceTravelInvoicingSection.tsx +++ b/src/pages/workspace/travel/WorkspaceTravelInvoicingSection.tsx @@ -10,10 +10,11 @@ import useOnyx from '@hooks/useOnyx'; import useThemeStyles from '@hooks/useThemeStyles'; import useWorkspaceAccountID from '@hooks/useWorkspaceAccountID'; import { - clearToggleTravelInvoicingErrors, + clearTravelInvoicingErrors, clearTravelInvoicingSettlementAccountErrors, clearTravelInvoicingSettlementFrequencyErrors, - toggleTravelInvoicing, + configureTravelInvoicingForPolicy, + deactivateTravelInvoicing, } from '@libs/actions/TravelInvoicing'; import {getLastFourDigits} from '@libs/BankAccountUtils'; import {getEligibleBankAccountsForCard} from '@libs/CardUtils'; @@ -110,9 +111,9 @@ function WorkspaceTravelInvoicingSection({policyID}: WorkspaceTravelInvoicingSec /** * Handle toggle change for Central Invoicing. * When turning ON: - * - If has settlement account: call toggleTravelInvoicing(true) + * - If has settlement account: call configureTravelInvoicingForPolicy * - If no settlement account: navigate to selection (enable happens after selection) - * When turning OFF: show confirmation modal, then call toggleTravelInvoicing(false). + * When turning OFF: show confirmation modal, then call deactivateTravelInvoicing. */ const handleToggle = (isEnabled: boolean) => { // Check if user is on a public domain - Travel Invoicing requires a private domain @@ -154,12 +155,16 @@ function WorkspaceTravelInvoicingSection({policyID}: WorkspaceTravelInvoicingSec } // Has settlement account - enable Travel Invoicing directly - toggleTravelInvoicing(policyID, workspaceAccountID, true); + const existingPaymentBankAccountID = + cardSettings?.TRAVEL_US?.paymentBankAccountID ?? cardSettings?.paymentBankAccountID ?? settlementAccount?.bankAccountID; + if (existingPaymentBankAccountID) { + configureTravelInvoicingForPolicy(policyID, workspaceAccountID, existingPaymentBankAccountID); + } }; const handleConfirmDisable = () => { setIsDisableConfirmModalVisible(false); - toggleTravelInvoicing(policyID, workspaceAccountID, false); + deactivateTravelInvoicing(policyID, workspaceAccountID); }; const getCentralInvoicingSubtitle = () => { @@ -254,7 +259,7 @@ function WorkspaceTravelInvoicingSection({policyID}: WorkspaceTravelInvoicingSec isActive={isTravelInvoicingEnabled} pendingAction={togglePendingAction} errors={toggleErrors} - onCloseError={() => clearToggleTravelInvoicingErrors(workspaceAccountID)} + onCloseError={() => clearTravelInvoicingErrors(workspaceAccountID)} subMenuItems={centralInvoicingSubMenuItems} /> diff --git a/src/pages/workspace/travel/WorkspaceTravelInvoicingSettlementAccountPage.tsx b/src/pages/workspace/travel/WorkspaceTravelInvoicingSettlementAccountPage.tsx index 258e7ebbad52..1ad54fd59a12 100644 --- a/src/pages/workspace/travel/WorkspaceTravelInvoicingSettlementAccountPage.tsx +++ b/src/pages/workspace/travel/WorkspaceTravelInvoicingSettlementAccountPage.tsx @@ -8,7 +8,7 @@ import useLocalize from '@hooks/useLocalize'; import useOnyx from '@hooks/useOnyx'; import useThemeStyles from '@hooks/useThemeStyles'; import useWorkspaceAccountID from '@hooks/useWorkspaceAccountID'; -import {setTravelInvoicingSettlementAccount, toggleTravelInvoicing} from '@libs/actions/TravelInvoicing'; +import {configureTravelInvoicingForPolicy, setTravelInvoicingSettlementAccount} from '@libs/actions/TravelInvoicing'; import {getLastFourDigits} from '@libs/BankAccountUtils'; import {getEligibleBankAccountsForCard} from '@libs/CardUtils'; import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types'; @@ -65,13 +65,15 @@ function WorkspaceTravelInvoicingSettlementAccountPage({route}: WorkspaceTravelI return; } - const previousPaymentBankAccountID = cardSettings?.previousPaymentBankAccountID ?? cardSettings?.paymentBankAccountID; - setTravelInvoicingSettlementAccount(policyID, workspaceAccountID, value, previousPaymentBankAccountID); + const isTravelInvoicingEnabled = getIsTravelInvoicingEnabled(cardSettings); - // If Travel Invoicing is not yet enabled, enable it after setting the settlement account - // Backend requires settlement account to be configured before enabling - if (!getIsTravelInvoicingEnabled(cardSettings)) { - toggleTravelInvoicing(policyID, workspaceAccountID, true); + if (!isTravelInvoicingEnabled) { + // Enable Travel Invoicing with selected settlement account (single API call) + configureTravelInvoicingForPolicy(policyID, workspaceAccountID, value); + } else { + // Already enabled - just update the settlement account + const previousPaymentBankAccountID = cardSettings?.previousPaymentBankAccountID ?? cardSettings?.paymentBankAccountID; + setTravelInvoicingSettlementAccount(policyID, workspaceAccountID, value, previousPaymentBankAccountID); } Navigation.goBack(); From 088d58255f83936e4540c36c8e3ce68ce8892795 Mon Sep 17 00:00:00 2001 From: Ben Limpich Date: Wed, 25 Feb 2026 11:50:13 -0800 Subject: [PATCH 04/26] Update unit tests for new Travel Invoicing commands Replace toggleTravelInvoicing test with separate tests for configureTravelInvoicingForPolicy and deactivateTravelInvoicing. --- tests/unit/TravelInvoicingTest.ts | 78 ++++++++++++++++++++++++++----- 1 file changed, 67 insertions(+), 11 deletions(-) diff --git a/tests/unit/TravelInvoicingTest.ts b/tests/unit/TravelInvoicingTest.ts index ee4e4da15e07..a5257caf85e5 100644 --- a/tests/unit/TravelInvoicingTest.ts +++ b/tests/unit/TravelInvoicingTest.ts @@ -2,8 +2,9 @@ import Onyx from 'react-native-onyx'; import { clearTravelInvoicingSettlementAccountErrors, clearTravelInvoicingSettlementFrequencyErrors, + configureTravelInvoicingForPolicy, + deactivateTravelInvoicing, setTravelInvoicingSettlementAccount, - toggleTravelInvoicing, updateTravelInvoiceSettlementFrequency, } from '@libs/actions/TravelInvoicing'; // We need to import API because it is used in the tests @@ -202,28 +203,83 @@ describe('TravelInvoicing', () => { jest.useRealTimers(); }); - it('toggleTravelInvoicing sends correct optimistic, success, and failure data', () => { + it('configureTravelInvoicingForPolicy sends correct optimistic, success, and failure data', () => { + const policyID = '123'; + const workspaceAccountID = 456; + const settlementBankAccountID = 789; + const cardSettingsKey = getTravelInvoicingCardSettingsKey(workspaceAccountID); + + configureTravelInvoicingForPolicy(policyID, workspaceAccountID, settlementBankAccountID); + + expect(spyAPIWrite).toHaveBeenCalledWith( + 'ConfigureTravelInvoicingForPolicy', + { + policyID, + settlementBankAccountID, + }, + expect.objectContaining({ + optimisticData: expect.arrayContaining([ + expect.objectContaining({ + key: cardSettingsKey, + value: expect.objectContaining({ + isEnabled: true, + [CONST.TRAVEL.PROGRAM_TRAVEL_US]: expect.objectContaining({ + isEnabled: true, + paymentBankAccountID: settlementBankAccountID, + }), + pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE, + errors: null, + }), + }), + ]), + successData: expect.arrayContaining([ + expect.objectContaining({ + key: cardSettingsKey, + value: expect.objectContaining({ + pendingAction: null, + [CONST.TRAVEL.PROGRAM_TRAVEL_US]: expect.objectContaining({ + isEnabled: true, + paymentBankAccountID: settlementBankAccountID, + }), + }), + }), + ]), + failureData: expect.arrayContaining([ + expect.objectContaining({ + key: cardSettingsKey, + value: expect.objectContaining({ + isEnabled: false, + [CONST.TRAVEL.PROGRAM_TRAVEL_US]: expect.objectContaining({ + isEnabled: false, + }), + pendingAction: null, + }), + }), + ]), + }), + ); + }); + + it('deactivateTravelInvoicing sends correct optimistic, success, and failure data', () => { const policyID = '123'; const workspaceAccountID = 456; - const enabled = true; const cardSettingsKey = getTravelInvoicingCardSettingsKey(workspaceAccountID); - toggleTravelInvoicing(policyID, workspaceAccountID, enabled); + deactivateTravelInvoicing(policyID, workspaceAccountID); expect(spyAPIWrite).toHaveBeenCalledWith( - 'ToggleTravelInvoicing', + 'DeactivateTravelInvoicing', { policyID, - enabled, }, expect.objectContaining({ optimisticData: expect.arrayContaining([ expect.objectContaining({ key: cardSettingsKey, value: expect.objectContaining({ - isEnabled: enabled, + isEnabled: false, [CONST.TRAVEL.PROGRAM_TRAVEL_US]: expect.objectContaining({ - isEnabled: enabled, + isEnabled: false, }), pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE, errors: null, @@ -236,7 +292,7 @@ describe('TravelInvoicing', () => { value: expect.objectContaining({ pendingAction: null, [CONST.TRAVEL.PROGRAM_TRAVEL_US]: expect.objectContaining({ - isEnabled: enabled, + isEnabled: false, }), }), }), @@ -245,9 +301,9 @@ describe('TravelInvoicing', () => { expect.objectContaining({ key: cardSettingsKey, value: expect.objectContaining({ - isEnabled: !enabled, + isEnabled: true, [CONST.TRAVEL.PROGRAM_TRAVEL_US]: expect.objectContaining({ - isEnabled: !enabled, + isEnabled: true, }), pendingAction: null, }), From 04121c930f9c37c61a042964ba4bfa982798e150 Mon Sep 17 00:00:00 2001 From: Ben Limpich Date: Wed, 25 Feb 2026 12:26:34 -0800 Subject: [PATCH 05/26] Fix prettier formatting in WorkspaceTravelInvoicingSection Collapse multi-line variable assignment to single line to satisfy prettier check. --- src/pages/workspace/travel/WorkspaceTravelInvoicingSection.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/pages/workspace/travel/WorkspaceTravelInvoicingSection.tsx b/src/pages/workspace/travel/WorkspaceTravelInvoicingSection.tsx index 0f141efcff85..04c17a9474de 100644 --- a/src/pages/workspace/travel/WorkspaceTravelInvoicingSection.tsx +++ b/src/pages/workspace/travel/WorkspaceTravelInvoicingSection.tsx @@ -155,8 +155,7 @@ function WorkspaceTravelInvoicingSection({policyID}: WorkspaceTravelInvoicingSec } // Has settlement account - enable Travel Invoicing directly - const existingPaymentBankAccountID = - cardSettings?.TRAVEL_US?.paymentBankAccountID ?? cardSettings?.paymentBankAccountID ?? settlementAccount?.bankAccountID; + const existingPaymentBankAccountID = cardSettings?.TRAVEL_US?.paymentBankAccountID ?? cardSettings?.paymentBankAccountID ?? settlementAccount?.bankAccountID; if (existingPaymentBankAccountID) { configureTravelInvoicingForPolicy(policyID, workspaceAccountID, existingPaymentBankAccountID); } From 3e08b59746d28a84ad72b8dc55315f8af30b1c26 Mon Sep 17 00:00:00 2001 From: Ben Limpich Date: Wed, 25 Feb 2026 13:02:23 -0800 Subject: [PATCH 06/26] remove comments --- .../travel/WorkspaceTravelInvoicingSettlementAccountPage.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/pages/workspace/travel/WorkspaceTravelInvoicingSettlementAccountPage.tsx b/src/pages/workspace/travel/WorkspaceTravelInvoicingSettlementAccountPage.tsx index 1ad54fd59a12..d726bd299895 100644 --- a/src/pages/workspace/travel/WorkspaceTravelInvoicingSettlementAccountPage.tsx +++ b/src/pages/workspace/travel/WorkspaceTravelInvoicingSettlementAccountPage.tsx @@ -68,10 +68,8 @@ function WorkspaceTravelInvoicingSettlementAccountPage({route}: WorkspaceTravelI const isTravelInvoicingEnabled = getIsTravelInvoicingEnabled(cardSettings); if (!isTravelInvoicingEnabled) { - // Enable Travel Invoicing with selected settlement account (single API call) configureTravelInvoicingForPolicy(policyID, workspaceAccountID, value); } else { - // Already enabled - just update the settlement account const previousPaymentBankAccountID = cardSettings?.previousPaymentBankAccountID ?? cardSettings?.paymentBankAccountID; setTravelInvoicingSettlementAccount(policyID, workspaceAccountID, value, previousPaymentBankAccountID); } From 620c0ec8cd9d7686069bbb0ac63f39bd7af2ab98 Mon Sep 17 00:00:00 2001 From: Ben Limpich Date: Wed, 25 Feb 2026 14:15:43 -0800 Subject: [PATCH 07/26] add verifying state to the travel invoicing flow --- src/libs/actions/TravelInvoicing.ts | 18 +-- .../WorkspaceTravelInvoicingSection.tsx | 8 +- ...ceTravelInvoicingSettlementAccountPage.tsx | 106 +++++++++++++++--- 3 files changed, 100 insertions(+), 32 deletions(-) diff --git a/src/libs/actions/TravelInvoicing.ts b/src/libs/actions/TravelInvoicing.ts index ab97b8f94ade..f6fe6439a21d 100644 --- a/src/libs/actions/TravelInvoicing.ts +++ b/src/libs/actions/TravelInvoicing.ts @@ -260,11 +260,7 @@ function configureTravelInvoicingForPolicy(policyID: string, workspaceAccountID: onyxMethod: Onyx.METHOD.MERGE, key: cardSettingsKey, value: { - isEnabled: true, - [CONST.TRAVEL.PROGRAM_TRAVEL_US]: { - isEnabled: true, - paymentBankAccountID: settlementBankAccountID, - }, + isLoading: true, pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE, pendingFields: { paymentBankAccountID: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE, @@ -282,14 +278,11 @@ function configureTravelInvoicingForPolicy(policyID: string, workspaceAccountID: onyxMethod: Onyx.METHOD.MERGE, key: cardSettingsKey, value: { + isLoading: false, pendingAction: null, pendingFields: { paymentBankAccountID: null, }, - [CONST.TRAVEL.PROGRAM_TRAVEL_US]: { - isEnabled: true, - paymentBankAccountID: settlementBankAccountID, - }, }, }, ]; @@ -299,15 +292,12 @@ function configureTravelInvoicingForPolicy(policyID: string, workspaceAccountID: onyxMethod: Onyx.METHOD.MERGE, key: cardSettingsKey, value: { - isEnabled: false, - [CONST.TRAVEL.PROGRAM_TRAVEL_US]: { - isEnabled: false, - paymentBankAccountID: undefined, - }, + isLoading: false, pendingAction: null, pendingFields: { paymentBankAccountID: null, }, + errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'), }, }, ]; diff --git a/src/pages/workspace/travel/WorkspaceTravelInvoicingSection.tsx b/src/pages/workspace/travel/WorkspaceTravelInvoicingSection.tsx index 04c17a9474de..880ac8adc40a 100644 --- a/src/pages/workspace/travel/WorkspaceTravelInvoicingSection.tsx +++ b/src/pages/workspace/travel/WorkspaceTravelInvoicingSection.tsx @@ -59,6 +59,7 @@ function WorkspaceTravelInvoicingSection({policyID}: WorkspaceTravelInvoicingSec // For Travel Invoicing, we use a travel-specific card settings key // Uses the same key pattern as Expensify Card: private_expensifyCardSettings_{workspaceAccountID} const [cardSettings] = useOnyx(getTravelInvoicingCardSettingsKey(workspaceAccountID)); + const [cardOnWaitlist] = useOnyx(`${ONYXKEYS.COLLECTION.NVP_EXPENSIFY_ON_CARD_WAITLIST}${policyID}`); const [account] = useOnyx(ONYXKEYS.ACCOUNT); const [bankAccountList] = useOnyx(ONYXKEYS.BANK_ACCOUNT_LIST); const [reimbursementAccount] = useOnyx(ONYXKEYS.REIMBURSEMENT_ACCOUNT); @@ -107,6 +108,8 @@ function WorkspaceTravelInvoicingSection({policyID}: WorkspaceTravelInvoicingSec // Determine if Travel Invoicing is enabled based on isEnabled field const isTravelInvoicingEnabled = getIsTravelInvoicingEnabled(cardSettings); + const isOnWaitlist = !!cardOnWaitlist; + const isLoading = !!cardSettings?.isLoading; /** * Handle toggle change for Central Invoicing. @@ -154,10 +157,11 @@ function WorkspaceTravelInvoicingSection({policyID}: WorkspaceTravelInvoicingSec return; } - // Has settlement account - enable Travel Invoicing directly + // Has settlement account - enable Travel Invoicing and navigate to settlement page to show verification state const existingPaymentBankAccountID = cardSettings?.TRAVEL_US?.paymentBankAccountID ?? cardSettings?.paymentBankAccountID ?? settlementAccount?.bankAccountID; if (existingPaymentBankAccountID) { configureTravelInvoicingForPolicy(policyID, workspaceAccountID, existingPaymentBankAccountID); + Navigation.navigate(ROUTES.WORKSPACE_TRAVEL_SETTINGS_ACCOUNT.getRoute(policyID)); } }; @@ -256,6 +260,8 @@ function WorkspaceTravelInvoicingSection({policyID}: WorkspaceTravelInvoicingSec switchAccessibilityLabel={translate('workspace.moreFeatures.travel.travelInvoicing.centralInvoicingSection.subtitle')} onToggle={handleToggle} isActive={isTravelInvoicingEnabled} + disabled={isLoading || isOnWaitlist} + disabledAction={isOnWaitlist ? () => Navigation.navigate(ROUTES.WORKSPACE_TRAVEL_SETTINGS_ACCOUNT.getRoute(policyID)) : undefined} pendingAction={togglePendingAction} errors={toggleErrors} onCloseError={() => clearTravelInvoicingErrors(workspaceAccountID)} diff --git a/src/pages/workspace/travel/WorkspaceTravelInvoicingSettlementAccountPage.tsx b/src/pages/workspace/travel/WorkspaceTravelInvoicingSettlementAccountPage.tsx index d726bd299895..5466a4c1fdde 100644 --- a/src/pages/workspace/travel/WorkspaceTravelInvoicingSettlementAccountPage.tsx +++ b/src/pages/workspace/travel/WorkspaceTravelInvoicingSettlementAccountPage.tsx @@ -1,9 +1,14 @@ import React from 'react'; +import BlockingView from '@components/BlockingViews/BlockingView'; +import Button from '@components/Button'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; +import LottieAnimations from '@components/LottieAnimations'; import ScreenWrapper from '@components/ScreenWrapper'; import SettlementAccountSelector, {BankAccountListItemLeftElement} from '@components/SettlementAccountSelector'; import type {BankAccountListItem} from '@components/SettlementAccountSelector'; import Text from '@components/Text'; +import useBottomSafeSafeAreaPaddingStyle from '@hooks/useBottomSafeSafeAreaPaddingStyle'; +import {useMemoizedLazyIllustrations} from '@hooks/useLazyAsset'; import useLocalize from '@hooks/useLocalize'; import useOnyx from '@hooks/useOnyx'; import useThemeStyles from '@hooks/useThemeStyles'; @@ -17,6 +22,7 @@ import {getIsTravelInvoicingEnabled, getTravelInvoicingCardSettingsKey} from '@l import Navigation from '@navigation/Navigation'; import type {SettingsNavigatorParamList} from '@navigation/types'; import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper'; +import variables from '@styles/variables'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES from '@src/ROUTES'; @@ -25,22 +31,35 @@ import type {BankName} from '@src/types/onyx/Bank'; type WorkspaceTravelInvoicingSettlementAccountPageProps = PlatformStackScreenProps; -/** - * Settlement account selection page for Travel Invoicing. - * Uses the SettlementAccountSelector component for the selection UI. - */ function WorkspaceTravelInvoicingSettlementAccountPage({route}: WorkspaceTravelInvoicingSettlementAccountPageProps) { const styles = useThemeStyles(); const {translate} = useLocalize(); const policyID = route.params?.policyID; const workspaceAccountID = useWorkspaceAccountID(policyID); + const illustrations = useMemoizedLazyIllustrations(['Puzzle']); + const bottomSafeAreaPaddingStyle = useBottomSafeSafeAreaPaddingStyle(); const [bankAccountsList] = useOnyx(ONYXKEYS.BANK_ACCOUNT_LIST); const [cardSettings] = useOnyx(getTravelInvoicingCardSettingsKey(workspaceAccountID)); + const [cardOnWaitlist] = useOnyx(`${ONYXKEYS.COLLECTION.NVP_EXPENSIFY_ON_CARD_WAITLIST}${policyID}`); + const isLoading = !!cardSettings?.isLoading; const paymentBankAccountID = cardSettings?.paymentBankAccountID; const eligibleBankAccounts = getEligibleBankAccountsForCard(bankAccountsList); + const getVerificationState = () => { + if (cardOnWaitlist) { + return CONST.EXPENSIFY_CARD.VERIFICATION_STATE.ON_WAITLIST; + } + if (isLoading) { + return CONST.EXPENSIFY_CARD.VERIFICATION_STATE.LOADING; + } + return ''; + }; + + const verificationState = getVerificationState(); + const isInVerificationState = !!verificationState; + const eligibleBankAccountsOptions: BankAccountListItem[] = eligibleBankAccounts?.map((bankAccount) => { const bankName = (bankAccount.accountData?.addressName ?? '') as BankName; const bankAccountNumber = bankAccount.accountData?.accountNumber ?? ''; @@ -59,7 +78,6 @@ function WorkspaceTravelInvoicingSettlementAccountPage({route}: WorkspaceTravelI const listOptions: BankAccountListItem[] = eligibleBankAccountsOptions.length > 0 ? eligibleBankAccountsOptions : []; const handleSelectAccount = (value: number) => { - // If the same account is already selected, just close the page without making an API call if (value === paymentBankAccountID) { Navigation.goBack(); return; @@ -69,11 +87,11 @@ function WorkspaceTravelInvoicingSettlementAccountPage({route}: WorkspaceTravelI if (!isTravelInvoicingEnabled) { configureTravelInvoicingForPolicy(policyID, workspaceAccountID, value); - } else { - const previousPaymentBankAccountID = cardSettings?.previousPaymentBankAccountID ?? cardSettings?.paymentBankAccountID; - setTravelInvoicingSettlementAccount(policyID, workspaceAccountID, value, previousPaymentBankAccountID); + return; } + const previousPaymentBankAccountID = cardSettings?.previousPaymentBankAccountID ?? cardSettings?.paymentBankAccountID; + setTravelInvoicingSettlementAccount(policyID, workspaceAccountID, value, previousPaymentBankAccountID); Navigation.goBack(); }; @@ -89,6 +107,57 @@ function WorkspaceTravelInvoicingSettlementAccountPage({route}: WorkspaceTravelI const customHeaderContent = {translate('workspace.expensifyCard.chooseExistingBank')}; + const getHeaderTitle = () => { + switch (verificationState) { + case CONST.EXPENSIFY_CARD.VERIFICATION_STATE.ON_WAITLIST: + case CONST.EXPENSIFY_CARD.VERIFICATION_STATE.LOADING: + return translate('workspace.expensifyCard.verifyingHeader'); + default: + return translate('workspace.expensifyCard.settlementAccount'); + } + }; + + const renderVerificationStateView = () => { + switch (verificationState) { + case CONST.EXPENSIFY_CARD.VERIFICATION_STATE.LOADING: + return ( + + ); + case CONST.EXPENSIFY_CARD.VERIFICATION_STATE.ON_WAITLIST: + return ( + <> + +