From 7bb53a87487a8d88e86ca3ca5c3696f480a8fc97 Mon Sep 17 00:00:00 2001 From: allgandaf Date: Fri, 24 Jul 2026 14:15:43 +0530 Subject: [PATCH 1/5] Read travel invoicing settings from the resolved fund --- .../workspace/travel/WorkspaceTravelInvoicingSection.tsx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/pages/workspace/travel/WorkspaceTravelInvoicingSection.tsx b/src/pages/workspace/travel/WorkspaceTravelInvoicingSection.tsx index bec0f8ddf074..279c5ff8b0d0 100644 --- a/src/pages/workspace/travel/WorkspaceTravelInvoicingSection.tsx +++ b/src/pages/workspace/travel/WorkspaceTravelInvoicingSection.tsx @@ -9,6 +9,7 @@ import Text from '@components/Text'; import useConfirmModal from '@hooks/useConfirmModal'; import {useCurrencyListActions} from '@hooks/useCurrencyList'; +import useDefaultFundID from '@hooks/useDefaultFundID'; import useLocalize from '@hooks/useLocalize'; import useNetwork from '@hooks/useNetwork'; import useOnyx from '@hooks/useOnyx'; @@ -73,6 +74,7 @@ function WorkspaceTravelInvoicingSection({policyID}: WorkspaceTravelInvoicingSec const {translate} = useLocalize(); const {convertToDisplayString} = useCurrencyListActions(); const workspaceAccountID = useWorkspaceAccountID(policyID); + const defaultFundID = useDefaultFundID(policyID); const {showConfirmModal, closeModal} = useConfirmModal(); const [isDisableConfirmModalVisible, setIsDisableConfirmModalVisible] = useState(false); @@ -84,9 +86,8 @@ function WorkspaceTravelInvoicingSection({policyID}: WorkspaceTravelInvoicingSec // Ref to track if we should auto-resume the toggle flow after returning from TravelLegalNamePage const shouldResumeToggleRef = useRef(false); - // 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)); + // Read the travel feed from the resolved fund so a shared domain feed shows feed-wide spend and limit. + const [cardSettings] = useOnyx(getTravelInvoicingCardSettingsKey(defaultFundID)); const [cardOnWaitlist] = useOnyx(`${ONYXKEYS.COLLECTION.NVP_EXPENSIFY_ON_CARD_WAITLIST}${policyID}`); const [account] = useOnyx(ONYXKEYS.ACCOUNT); const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`); From a162542764c9d2388c31f3afc73d5fbe8667f62a Mon Sep 17 00:00:00 2001 From: allgandaf Date: Thu, 13 Aug 2026 16:15:45 +0530 Subject: [PATCH 2/5] use resolved fund for travel feed operations in invoicing section --- .../WorkspaceTravelInvoicingSection.tsx | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/src/pages/workspace/travel/WorkspaceTravelInvoicingSection.tsx b/src/pages/workspace/travel/WorkspaceTravelInvoicingSection.tsx index 63efe571f5cd..4bc256648c32 100644 --- a/src/pages/workspace/travel/WorkspaceTravelInvoicingSection.tsx +++ b/src/pages/workspace/travel/WorkspaceTravelInvoicingSection.tsx @@ -16,7 +16,6 @@ import useOnyx from '@hooks/useOnyx'; import usePolicyFeatureWriteAccess from '@hooks/usePolicyFeatureWriteAccess'; import useResponsiveLayout from '@hooks/useResponsiveLayout'; import useThemeStyles from '@hooks/useThemeStyles'; -import useWorkspaceAccountID from '@hooks/useWorkspaceAccountID'; import { clearTravelInvoicingErrors, @@ -79,7 +78,6 @@ function WorkspaceTravelInvoicingSection({policyID}: WorkspaceTravelInvoicingSec const {isLargeScreenWidth} = useResponsiveLayout(); const {translate} = useLocalize(); const {convertToDisplayString} = useCurrencyListActions(); - const workspaceAccountID = useWorkspaceAccountID(policyID); const defaultFundID = useDefaultFundID(policyID); const {showConfirmModal, closeModal} = useConfirmModal(); @@ -101,7 +99,7 @@ function WorkspaceTravelInvoicingSection({policyID}: WorkspaceTravelInvoicingSec const [bankAccountList] = useOnyx(ONYXKEYS.BANK_ACCOUNT_LIST); const [reimbursementAccount] = useOnyx(ONYXKEYS.REIMBURSEMENT_ACCOUNT); const [privatePersonalDetails] = useOnyx(ONYXKEYS.PRIVATE_PERSONAL_DETAILS); - const [domainMemberData] = useOnyx(`${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_DOMAIN_MEMBER}${workspaceAccountID}`); + const [domainMemberData] = useOnyx(`${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_DOMAIN_MEMBER}${defaultFundID}`); // Resolve travel-specific settings from the shared card settings key const travelSettings = getCardSettings(cardSettings, CONST.TRAVEL.PROGRAM_TRAVEL_US); @@ -199,7 +197,7 @@ function WorkspaceTravelInvoicingSection({policyID}: WorkspaceTravelInvoicingSec * can reconcile their travel spend. */ const handleViewOnSpend = () => { - const travelFeedID = getTravelInvoicingFeedID(workspaceAccountID); + const travelFeedID = getTravelInvoicingFeedID(defaultFundID); const query = buildQueryStringFromFilterFormValues({ type: CONST.SEARCH.DATA_TYPES.EXPENSE, feed: [travelFeedID], @@ -213,7 +211,7 @@ function WorkspaceTravelInvoicingSection({policyID}: WorkspaceTravelInvoicingSec */ const handleConfirmPayBalance = () => { setIsPayBalanceModalVisible(false); - payTravelInvoicingSpend(workspaceAccountID, travelSpend); + payTravelInvoicingSpend(defaultFundID, travelSpend); }; const continueToggleFlow = () => { @@ -244,7 +242,7 @@ function WorkspaceTravelInvoicingSection({policyID}: WorkspaceTravelInvoicingSec // Has settlement account - enable Travel Invoicing and navigate to settlement page to show verification state if (settlementAccount?.bankAccountID) { - configureTravelInvoicingForPolicy(policyID, workspaceAccountID, settlementAccount.bankAccountID); + configureTravelInvoicingForPolicy(policyID, defaultFundID, settlementAccount.bankAccountID); } Navigation.navigate(ROUTES.WORKSPACE_TRAVEL_SETTINGS_ACCOUNT.getRoute(policyID)); }; @@ -304,7 +302,7 @@ function WorkspaceTravelInvoicingSection({policyID}: WorkspaceTravelInvoicingSec const handleConfirmDisable = () => { setIsDisableConfirmModalVisible(false); - deactivateTravelInvoicing(policyID, workspaceAccountID); + deactivateTravelInvoicing(policyID, defaultFundID); }; // Dismiss the "Update to USD" modal check if the currency changes to USD externally (e.g. from another device) @@ -353,7 +351,7 @@ function WorkspaceTravelInvoicingSection({policyID}: WorkspaceTravelInvoicingSec retryTravelCardsProvisioning(policyID, workspaceAccountID, travelProvisioningErrors ?? {})} + onRetry={() => retryTravelCardsProvisioning(policyID, defaultFundID, travelProvisioningErrors ?? {})} variant={CONST.BUTTON_VARIANT.DANGER} shouldAlignButtonToMessage /> @@ -412,7 +410,7 @@ function WorkspaceTravelInvoicingSection({policyID}: WorkspaceTravelInvoicingSec clearTravelInvoicingSettlementAccountErrors(workspaceAccountID, travelSettings?.previousPaymentBankAccountID ?? null)} + onClose={() => clearTravelInvoicingSettlementAccountErrors(defaultFundID, travelSettings?.previousPaymentBankAccountID ?? null)} errorRowStyles={styles.mh2half} errorRowTextStyles={styles.mr3} > @@ -431,7 +429,7 @@ function WorkspaceTravelInvoicingSection({policyID}: WorkspaceTravelInvoicingSec clearTravelInvoicingSettlementFrequencyErrors(workspaceAccountID, travelSettings?.previousMonthlySettlementDate)} + onClose={() => clearTravelInvoicingSettlementFrequencyErrors(defaultFundID, travelSettings?.previousMonthlySettlementDate)} errorRowStyles={styles.mh2half} errorRowTextStyles={styles.mr3} > @@ -450,7 +448,7 @@ function WorkspaceTravelInvoicingSection({policyID}: WorkspaceTravelInvoicingSec clearTravelInvoicingMonthlyLimitErrors(workspaceAccountID)} + onClose={() => clearTravelInvoicingMonthlyLimitErrors(defaultFundID)} errorRowStyles={styles.mh2half} errorRowTextStyles={styles.mr3} > @@ -484,7 +482,7 @@ function WorkspaceTravelInvoicingSection({policyID}: WorkspaceTravelInvoicingSec showLockIcon={!canWriteMoreFeatures || isOnWaitlist || hasOutstandingBalance} pendingAction={togglePendingAction} errors={toggleErrors} - onCloseError={() => clearTravelInvoicingErrors(workspaceAccountID)} + onCloseError={() => clearTravelInvoicingErrors(defaultFundID)} subMenuItems={travelInvoicingSubMenuItems} /> From f272118c1fb1c2af8869dbbdfd27752cfe2b35c6 Mon Sep 17 00:00:00 2001 From: allgandaf Date: Thu, 13 Aug 2026 16:15:47 +0530 Subject: [PATCH 3/5] use resolved fund for travel feed operations in settlement and limit subpages --- .../WorkspaceTravelInvoicingMonthlyLimitPage.tsx | 8 ++++---- .../WorkspaceTravelInvoicingSettlementAccountPage.tsx | 10 +++++----- ...WorkspaceTravelInvoicingSettlementFrequencyPage.tsx | 8 ++++---- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/pages/workspace/travel/WorkspaceTravelInvoicingMonthlyLimitPage.tsx b/src/pages/workspace/travel/WorkspaceTravelInvoicingMonthlyLimitPage.tsx index 95f4acf6edd6..ccdb949e260c 100644 --- a/src/pages/workspace/travel/WorkspaceTravelInvoicingMonthlyLimitPage.tsx +++ b/src/pages/workspace/travel/WorkspaceTravelInvoicingMonthlyLimitPage.tsx @@ -9,10 +9,10 @@ import Text from '@components/Text'; import useAutoFocusInput from '@hooks/useAutoFocusInput'; import useConfirmModal from '@hooks/useConfirmModal'; +import useDefaultFundID from '@hooks/useDefaultFundID'; import useLocalize from '@hooks/useLocalize'; import useOnyx from '@hooks/useOnyx'; import useThemeStyles from '@hooks/useThemeStyles'; -import useWorkspaceAccountID from '@hooks/useWorkspaceAccountID'; import {updateTravelInvoicingMonthlyLimit} from '@libs/actions/TravelInvoicing'; import {getCardSettings} from '@libs/CardUtils'; @@ -36,8 +36,8 @@ function WorkspaceTravelInvoicingMonthlyLimitPage({route}: WorkspaceTravelInvoic const styles = useThemeStyles(); const {translate} = useLocalize(); const policyID = route.params?.policyID; - const workspaceAccountID = useWorkspaceAccountID(policyID); - const [cardSettings] = useOnyx(getTravelInvoicingCardSettingsKey(workspaceAccountID)); + const defaultFundID = useDefaultFundID(policyID); + const [cardSettings] = useOnyx(getTravelInvoicingCardSettingsKey(defaultFundID)); const travelSettings = getCardSettings(cardSettings, CONST.TRAVEL.PROGRAM_TRAVEL_US); const currentLimit = travelSettings?.monthlySpendLimitPerUser ?? 0; const defaultValue = convertToFrontendAmountAsString(currentLimit, CONST.DEFAULT_CURRENCY_DECIMALS); @@ -45,7 +45,7 @@ function WorkspaceTravelInvoicingMonthlyLimitPage({route}: WorkspaceTravelInvoic const {showConfirmModal} = useConfirmModal(); const submitLimit = (newLimitInCents: number) => { - updateTravelInvoicingMonthlyLimit(workspaceAccountID, newLimitInCents, currentLimit); + updateTravelInvoicingMonthlyLimit(defaultFundID, newLimitInCents, currentLimit); Navigation.setNavigationActionToMicrotaskQueue(Navigation.goBack); }; diff --git a/src/pages/workspace/travel/WorkspaceTravelInvoicingSettlementAccountPage.tsx b/src/pages/workspace/travel/WorkspaceTravelInvoicingSettlementAccountPage.tsx index 016c732c29c0..6296bcdcc425 100644 --- a/src/pages/workspace/travel/WorkspaceTravelInvoicingSettlementAccountPage.tsx +++ b/src/pages/workspace/travel/WorkspaceTravelInvoicingSettlementAccountPage.tsx @@ -7,10 +7,10 @@ import SettlementAccountSelector, {BankAccountListItemLeftElement} from '@compon import type {BankAccountListItem} from '@components/SettlementAccountSelector'; import Text from '@components/Text'; +import useDefaultFundID from '@hooks/useDefaultFundID'; import useLocalize from '@hooks/useLocalize'; import useOnyx from '@hooks/useOnyx'; import useThemeStyles from '@hooks/useThemeStyles'; -import useWorkspaceAccountID from '@hooks/useWorkspaceAccountID'; import {configureTravelInvoicingForPolicy, setTravelInvoicingSettlementAccount} from '@libs/actions/TravelInvoicing'; import {getLastFourDigits} from '@libs/BankAccountUtils'; @@ -37,10 +37,10 @@ function WorkspaceTravelInvoicingSettlementAccountPage({route}: WorkspaceTravelI const styles = useThemeStyles(); const {translate} = useLocalize(); const policyID = route.params?.policyID; - const workspaceAccountID = useWorkspaceAccountID(policyID); + const defaultFundID = useDefaultFundID(policyID); const [bankAccountsList] = useOnyx(ONYXKEYS.BANK_ACCOUNT_LIST); - const [cardSettings] = useOnyx(getTravelInvoicingCardSettingsKey(workspaceAccountID)); + const [cardSettings] = useOnyx(getTravelInvoicingCardSettingsKey(defaultFundID)); const [cardOnWaitlist] = useOnyx(`${ONYXKEYS.COLLECTION.NVP_EXPENSIFY_ON_CARD_WAITLIST}${policyID}`); const travelSettings = getCardSettings(cardSettings, CONST.TRAVEL.PROGRAM_TRAVEL_US); @@ -89,12 +89,12 @@ function WorkspaceTravelInvoicingSettlementAccountPage({route}: WorkspaceTravelI } if (!isTravelInvoicingEnabled) { - configureTravelInvoicingForPolicy(policyID, workspaceAccountID, value); + configureTravelInvoicingForPolicy(policyID, defaultFundID, value); return; } const previousPaymentBankAccountID = travelSettings?.previousPaymentBankAccountID ?? travelSettings?.paymentBankAccountID; - setTravelInvoicingSettlementAccount(policyID, workspaceAccountID, value, previousPaymentBankAccountID); + setTravelInvoicingSettlementAccount(policyID, defaultFundID, value, previousPaymentBankAccountID); Navigation.goBack(); }; diff --git a/src/pages/workspace/travel/WorkspaceTravelInvoicingSettlementFrequencyPage.tsx b/src/pages/workspace/travel/WorkspaceTravelInvoicingSettlementFrequencyPage.tsx index cdf9106d5f96..64cc22fb6d71 100644 --- a/src/pages/workspace/travel/WorkspaceTravelInvoicingSettlementFrequencyPage.tsx +++ b/src/pages/workspace/travel/WorkspaceTravelInvoicingSettlementFrequencyPage.tsx @@ -5,10 +5,10 @@ import SingleSelectListItem from '@components/SelectionList/ListItem/SingleSelec import type {ListItem} from '@components/SelectionList/types'; import Text from '@components/Text'; +import useDefaultFundID from '@hooks/useDefaultFundID'; import useLocalize from '@hooks/useLocalize'; import useOnyx from '@hooks/useOnyx'; import useThemeStyles from '@hooks/useThemeStyles'; -import useWorkspaceAccountID from '@hooks/useWorkspaceAccountID'; import {updateTravelInvoiceSettlementFrequency} from '@libs/actions/TravelInvoicing'; import {getCardSettings} from '@libs/CardUtils'; @@ -36,8 +36,8 @@ function WorkspaceTravelInvoicingSettlementFrequencyPage({route}: WorkspaceTrave const styles = useThemeStyles(); const {translate} = useLocalize(); const policyID = route.params?.policyID; - const workspaceAccountID = useWorkspaceAccountID(policyID); - const [cardSettings] = useOnyx(getTravelInvoicingCardSettingsKey(workspaceAccountID)); + const defaultFundID = useDefaultFundID(policyID); + const [cardSettings] = useOnyx(getTravelInvoicingCardSettingsKey(defaultFundID)); const travelSettings = getCardSettings(cardSettings, CONST.TRAVEL.PROGRAM_TRAVEL_US); const currentFrequency = getTravelSettlementFrequency(travelSettings); @@ -68,7 +68,7 @@ function WorkspaceTravelInvoicingSettlementFrequencyPage({route}: WorkspaceTrave const monthlySettlementDate = travelSettings?.monthlySettlementDate; const saveAndGoBack = () => { if (selectedFrequency && (selectedFrequency !== currentFrequency || hasFrequencyError)) { - updateTravelInvoiceSettlementFrequency(workspaceAccountID, selectedFrequency, monthlySettlementDate ? new Date(monthlySettlementDate) : undefined); + updateTravelInvoiceSettlementFrequency(defaultFundID, selectedFrequency, monthlySettlementDate ? new Date(monthlySettlementDate) : undefined); } Navigation.goBack(); }; From ec4d56d77c58d735cd76fa35a6744450e888b849 Mon Sep 17 00:00:00 2001 From: allgandaf Date: Fri, 14 Aug 2026 09:48:21 +0530 Subject: [PATCH 4/5] send policyID for pay travel invoicing so the server resolves the feed --- src/libs/API/parameters/PayTravelInvoicingSpendParams.ts | 2 +- src/libs/actions/TravelInvoicing.ts | 4 ++-- .../workspace/travel/WorkspaceTravelInvoicingSection.tsx | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libs/API/parameters/PayTravelInvoicingSpendParams.ts b/src/libs/API/parameters/PayTravelInvoicingSpendParams.ts index 71487e4e7959..69b7cb9f7272 100644 --- a/src/libs/API/parameters/PayTravelInvoicingSpendParams.ts +++ b/src/libs/API/parameters/PayTravelInvoicingSpendParams.ts @@ -1,5 +1,5 @@ type PayTravelInvoicingSpendParams = { - domainAccountID: number; + policyID: string; }; export default PayTravelInvoicingSpendParams; diff --git a/src/libs/actions/TravelInvoicing.ts b/src/libs/actions/TravelInvoicing.ts index 8c5a185fb3cd..256056012474 100644 --- a/src/libs/actions/TravelInvoicing.ts +++ b/src/libs/actions/TravelInvoicing.ts @@ -565,7 +565,7 @@ function retryTravelCardsProvisioning(policyID: string, workspaceAccountID: numb * Optimistically sets the manual billing flag to true (payment queued state). * The backend will send updates for private_expensifyCardManualBilling_ to clear it when billing runs. */ -function payTravelInvoicingSpend(workspaceAccountID: number, travelSpend: number) { +function payTravelInvoicingSpend(policyID: string, workspaceAccountID: number, travelSpend: number) { const cardSettingsKey = getTravelInvoicingCardSettingsKey(workspaceAccountID); const optimisticData: Array> = [ @@ -593,7 +593,7 @@ function payTravelInvoicingSpend(workspaceAccountID: number, travelSpend: number ]; const params: PayTravelInvoicingSpendParams = { - domainAccountID: workspaceAccountID, + policyID, }; return API.write(WRITE_COMMANDS.PAY_TRAVEL_INVOICING_SPEND, params, {optimisticData, failureData}); diff --git a/src/pages/workspace/travel/WorkspaceTravelInvoicingSection.tsx b/src/pages/workspace/travel/WorkspaceTravelInvoicingSection.tsx index 4bc256648c32..fedfb79b13ba 100644 --- a/src/pages/workspace/travel/WorkspaceTravelInvoicingSection.tsx +++ b/src/pages/workspace/travel/WorkspaceTravelInvoicingSection.tsx @@ -211,7 +211,7 @@ function WorkspaceTravelInvoicingSection({policyID}: WorkspaceTravelInvoicingSec */ const handleConfirmPayBalance = () => { setIsPayBalanceModalVisible(false); - payTravelInvoicingSpend(defaultFundID, travelSpend); + payTravelInvoicingSpend(policyID, defaultFundID, travelSpend); }; const continueToggleFlow = () => { From 210dd8a061b3a11ad8d6bec8eb189b6e68f5bb65 Mon Sep 17 00:00:00 2001 From: allgandaf Date: Tue, 18 Aug 2026 11:10:24 +0530 Subject: [PATCH 5/5] Update the travel billing section pay test for the resolved-fund 3-arg call --- tests/ui/WorkspaceTravelBillingSectionTest.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/ui/WorkspaceTravelBillingSectionTest.tsx b/tests/ui/WorkspaceTravelBillingSectionTest.tsx index bbd9538d1c4c..4434c8ca1ff2 100644 --- a/tests/ui/WorkspaceTravelBillingSectionTest.tsx +++ b/tests/ui/WorkspaceTravelBillingSectionTest.tsx @@ -415,7 +415,7 @@ describe('WorkspaceTravelBillingSection', () => { expect(payButton).toBeNull(); }); - it('should show confirmation modal and call payTravelInvoicingSpend on confirm', async () => { + it('should show confirmation modal and call payTravelBillingSpend on confirm', async () => { await act(async () => { await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`, mockPolicy); await Onyx.merge(cardSettingsKey, { @@ -453,7 +453,7 @@ describe('WorkspaceTravelBillingSection', () => { } await waitForBatchedUpdatesWithAct(); - expect(payTravelBillingSpend).toHaveBeenCalledWith(WORKSPACE_ACCOUNT_ID, 5000); + expect(payTravelBillingSpend).toHaveBeenCalledWith(POLICY_ID, WORKSPACE_ACCOUNT_ID, 5000); }); it('should hide Pay Balance button and show queued message when settlement is pending', async () => {