From 3f3369a258b93d5e947cca8c309d3f4710a4a659 Mon Sep 17 00:00:00 2001 From: Kevin Brian Bader Date: Fri, 16 Jan 2026 21:43:48 -0800 Subject: [PATCH 01/10] chore: draft preparation --- src/ROUTES.ts | 4 + src/SCREENS.ts | 1 + ...ravelInvoicingSettlementFrequencyParams.ts | 9 ++ src/libs/API/parameters/index.ts | 1 + src/libs/API/types.ts | 1 + .../ModalStackNavigators/index.tsx | 1 + .../RELATIONS/WORKSPACE_TO_RHP.ts | 5 +- src/libs/Navigation/linkingConfig/config.ts | 3 + src/libs/Navigation/types.ts | 5 +- src/libs/TravelInvoicingUtils.ts | 1 + src/libs/actions/TravelInvoicing.ts | 78 ++++++++++++++++- .../workspace/travel/PolicyTravelPage.tsx | 1 + .../WorkspaceTravelInvoicingSection.tsx | 49 +++++++---- ...WorkspaceTravelSettlementFrequencyPage.tsx | 84 +++++++++++++++++++ .../WorkspaceTravelInvoicingSectionTest.tsx | 51 ++++++++++- tests/unit/TravelInvoicingTest.ts | 84 ++++++++++++++++++- 16 files changed, 355 insertions(+), 23 deletions(-) create mode 100644 src/libs/API/parameters/UpdateTravelInvoicingSettlementFrequencyParams.ts create mode 100644 src/pages/workspace/travel/WorkspaceTravelSettlementFrequencyPage.tsx diff --git a/src/ROUTES.ts b/src/ROUTES.ts index 8355281d6593b..8bd9670541820 100644 --- a/src/ROUTES.ts +++ b/src/ROUTES.ts @@ -2464,6 +2464,10 @@ const ROUTES = { route: 'workspaces/:policyID/travel/settings/account', getRoute: (policyID: string) => `workspaces/${policyID}/travel/settings/account` as const, }, + WORKSPACE_TRAVEL_SETTINGS_FREQUENCY: { + route: 'workspaces/:policyID/travel/settings/frequency', + getRoute: (policyID: string) => `workspaces/${policyID}/travel/settings/frequency` as const, + }, WORKSPACE_CREATE_DISTANCE_RATE: { route: 'workspaces/:policyID/distance-rates/new', getRoute: (policyID: string, transactionID?: string, reportID?: string) => diff --git a/src/SCREENS.ts b/src/SCREENS.ts index aaa397c7abb04..36f38f4a61405 100644 --- a/src/SCREENS.ts +++ b/src/SCREENS.ts @@ -704,6 +704,7 @@ const SCREENS = { DISTANCE_RATES: 'Distance_Rates', TRAVEL: 'Travel', TRAVEL_SETTINGS_ACCOUNT: 'Workspace_Travel_Settings_Account', + TRAVEL_SETTINGS_FREQUENCY: 'Workspace_Travel_Settings_Frequency', CREATE_DISTANCE_RATE: 'Create_Distance_Rate', CREATE_DISTANCE_RATE_UPGRADE: 'Create_Distance_Rate_Upgrade', DISTANCE_RATES_SETTINGS: 'Distance_Rates_Settings', diff --git a/src/libs/API/parameters/UpdateTravelInvoicingSettlementFrequencyParams.ts b/src/libs/API/parameters/UpdateTravelInvoicingSettlementFrequencyParams.ts new file mode 100644 index 0000000000000..cee7d9f2a53d3 --- /dev/null +++ b/src/libs/API/parameters/UpdateTravelInvoicingSettlementFrequencyParams.ts @@ -0,0 +1,9 @@ +import type {ValueOf} from 'type-fest'; +import type CONST from '@src/CONST'; + +type UpdateTravelInvoicingSettlementFrequencyParams = { + policyID: string; + frequency: ValueOf; +}; + +export default UpdateTravelInvoicingSettlementFrequencyParams; diff --git a/src/libs/API/parameters/index.ts b/src/libs/API/parameters/index.ts index 180f41610ccdf..1f38494ae98da 100644 --- a/src/libs/API/parameters/index.ts +++ b/src/libs/API/parameters/index.ts @@ -463,3 +463,4 @@ export type {default as ToggleConsolidatedDomainBillingParams} from './ToggleCon export type {default as RemoveDomainAdminParams} from './RemoveDomainAdminParams'; export type {default as DeleteDomainParams} from './DeleteDomainParams'; export type {default as GetDuplicateTransactionDetailsParams} from './GetDuplicateTransactionDetailsParams'; +export type {default as UpdateTravelInvoicingSettlementFrequencyParams} from './UpdateTravelInvoicingSettlementFrequencyParams'; diff --git a/src/libs/API/types.ts b/src/libs/API/types.ts index 6a198e3a6a32c..62b2c88e78dc6 100644 --- a/src/libs/API/types.ts +++ b/src/libs/API/types.ts @@ -461,6 +461,7 @@ const WRITE_COMMANDS = { UPDATE_CARD_SETTLEMENT_FREQUENCY: 'UpdateCardSettlementFrequency', UPDATE_CARD_SETTLEMENT_ACCOUNT: 'UpdateCardSettlementAccount', SET_TRAVEL_INVOICING_SETTLEMENT_ACCOUNT: 'SetTravelInvoicingSettlementAccount', + UPDATE_TRAVEL_INVOICE_SETTLEMENT_FREQUENCY: 'UpdateTravelInvoiceSettlementFrequency', UPDATE_XERO_IMPORT_TRACKING_CATEGORIES: 'UpdateXeroImportTrackingCategories', UPDATE_XERO_IMPORT_TAX_RATES: 'UpdateXeroImportTaxRates', UPDATE_XERO_TENANT_ID: 'UpdateXeroTenantID', diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx index c65d428caf844..e6a18e2638764 100644 --- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx +++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx @@ -733,6 +733,7 @@ const SettingsModalStackNavigator = createModalStackNavigator require('../../../../pages/workspace/expensifyCard/WorkspaceSettlementAccountPage').default, [SCREENS.WORKSPACE.EXPENSIFY_CARD_SETTINGS_FREQUENCY]: () => require('../../../../pages/workspace/expensifyCard/WorkspaceSettlementFrequencyPage').default, [SCREENS.WORKSPACE.TRAVEL_SETTINGS_ACCOUNT]: () => require('../../../../pages/workspace/travel/WorkspaceTravelSettlementAccountPage').default, + [SCREENS.WORKSPACE.TRAVEL_SETTINGS_FREQUENCY]: () => require('../../../../pages/workspace/travel/WorkspaceTravelSettlementFrequencyPage').default, [SCREENS.WORKSPACE.EXPENSIFY_CARD_SELECT_FEED]: () => require('../../../../pages/workspace/expensifyCard/WorkspaceExpensifyCardSelectorPage').default, [SCREENS.WORKSPACE.EXPENSIFY_CARD_BANK_ACCOUNT]: () => require('../../../../pages/workspace/expensifyCard/WorkspaceExpensifyCardBankAccounts').default, [SCREENS.WORKSPACE.EXPENSIFY_CARD_DETAILS]: () => require('../../../../pages/workspace/expensifyCard/WorkspaceExpensifyCardDetailsPage').default, diff --git a/src/libs/Navigation/linkingConfig/RELATIONS/WORKSPACE_TO_RHP.ts b/src/libs/Navigation/linkingConfig/RELATIONS/WORKSPACE_TO_RHP.ts index 147eb386e1292..b286aa2461c54 100755 --- a/src/libs/Navigation/linkingConfig/RELATIONS/WORKSPACE_TO_RHP.ts +++ b/src/libs/Navigation/linkingConfig/RELATIONS/WORKSPACE_TO_RHP.ts @@ -224,7 +224,10 @@ const WORKSPACE_TO_RHP: Partial['config'] = { [SCREENS.WORKSPACE.TRAVEL_SETTINGS_ACCOUNT]: { path: ROUTES.WORKSPACE_TRAVEL_SETTINGS_ACCOUNT.route, }, + [SCREENS.WORKSPACE.TRAVEL_SETTINGS_FREQUENCY]: { + path: ROUTES.WORKSPACE_TRAVEL_SETTINGS_FREQUENCY.route, + }, [SCREENS.WORKSPACE.COMPANY_CARDS_SETTINGS]: { path: ROUTES.WORKSPACE_COMPANY_CARDS_SETTINGS.route, }, diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts index bdb7e5773ed29..49035d2d80db6 100644 --- a/src/libs/Navigation/types.ts +++ b/src/libs/Navigation/types.ts @@ -1215,7 +1215,10 @@ type SettingsNavigatorParamList = { }; [SCREENS.WORKSPACE.TRAVEL_SETTINGS_ACCOUNT]: { policyID: string; - }; + }, + [SCREENS.WORKSPACE.TRAVEL_SETTINGS_FREQUENCY]: { + policyID: string; + }, [SCREENS.WORKSPACE.COMPANY_CARDS_SETTINGS]: { policyID: string; }; diff --git a/src/libs/TravelInvoicingUtils.ts b/src/libs/TravelInvoicingUtils.ts index 8449c7684ec56..94fd06aecbd9e 100644 --- a/src/libs/TravelInvoicingUtils.ts +++ b/src/libs/TravelInvoicingUtils.ts @@ -3,6 +3,7 @@ import CONST from '@src/CONST'; import type {BankAccountList} from '@src/types/onyx'; import type ExpensifyCardSettings from '@src/types/onyx/ExpensifyCardSettings'; import {getLastFourDigits} from './BankAccountUtils'; +import {LocaleContextProps} from '@components/LocaleContextProvider'; /** * The Travel Invoicing feed type constant for PROGRAM_TRAVEL_US. diff --git a/src/libs/actions/TravelInvoicing.ts b/src/libs/actions/TravelInvoicing.ts index 084c663cd1619..36e04ac28402f 100644 --- a/src/libs/actions/TravelInvoicing.ts +++ b/src/libs/actions/TravelInvoicing.ts @@ -1,7 +1,8 @@ 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} from '@libs/API/parameters'; +import type {OpenPolicyTravelPageParams, SetTravelInvoicingSettlementAccountParams, UpdateTravelInvoicingSettlementFrequencyParams} from '@libs/API/parameters'; import {READ_COMMANDS, WRITE_COMMANDS} from '@libs/API/types'; import * as ErrorUtils from '@libs/ErrorUtils'; import {PROGRAM_TRAVEL_US} from '@libs/TravelInvoicingUtils'; @@ -127,4 +128,77 @@ function clearTravelInvoicingSettlementAccountErrors(workspaceAccountID: number, Onyx.update(onyxData); } -export {openPolicyTravelPage, setTravelInvoicingSettlementAccount, clearTravelInvoicingSettlementAccountErrors}; +/** + * Updates the settlement frequency for Travel Invoicing. + * Optimistically updates the monthlySettlementDate based on the selected frequency. + */ +function updateTravelInvoiceSettlementFrequency( + policyID: string, + workspaceAccountID: number, + frequency: ValueOf, + currentMonthlySettlementDate?: Date, +) { + const cardSettingsKey = + `${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${workspaceAccountID}_${PROGRAM_TRAVEL_US}` as `${typeof ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${string}`; + + // If Monthly, Set date (optimistically today). If Daily, set null. + const monthlySettlementDate = frequency === CONST.EXPENSIFY_CARD.FREQUENCY_SETTING.MONTHLY ? new Date() : null; + + const optimisticData: Array> = [ + { + onyxMethod: Onyx.METHOD.MERGE, + key: cardSettingsKey, + value: { + monthlySettlementDate, + errors: null, + }, + }, + ]; + + const successData: Array> = [ + { + onyxMethod: Onyx.METHOD.MERGE, + key: cardSettingsKey, + value: { + monthlySettlementDate, + errors: null, + }, + }, + ]; + + const failureData: Array> = [ + { + onyxMethod: Onyx.METHOD.MERGE, + key: cardSettingsKey, + value: { + monthlySettlementDate: currentMonthlySettlementDate ?? null, // Revert + errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'), + }, + }, + ]; + + const params: UpdateTravelInvoicingSettlementFrequencyParams = { + policyID, + frequency, + }; + + API.write(WRITE_COMMANDS.UPDATE_TRAVEL_INVOICE_SETTLEMENT_FREQUENCY, params, {optimisticData, successData, failureData}); +} + +/** + * Clears any errors from the Travel Invoicing settlement frequency settings. + */ +function clearTravelInvoicingSettlementFrequencyErrors(workspaceAccountID: number) { + const onyxData: Array> = [ + { + onyxMethod: Onyx.METHOD.MERGE, + key: `${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${workspaceAccountID}_${PROGRAM_TRAVEL_US}`, + value: { + errors: null, + }, + }, + ]; + Onyx.update(onyxData); +} + +export {openPolicyTravelPage, setTravelInvoicingSettlementAccount, clearTravelInvoicingSettlementAccountErrors, clearTravelInvoicingSettlementFrequencyErrors, updateTravelInvoiceSettlementFrequency}; diff --git a/src/pages/workspace/travel/PolicyTravelPage.tsx b/src/pages/workspace/travel/PolicyTravelPage.tsx index 61f2aa87cf202..195831044aaf7 100644 --- a/src/pages/workspace/travel/PolicyTravelPage.tsx +++ b/src/pages/workspace/travel/PolicyTravelPage.tsx @@ -60,6 +60,7 @@ function WorkspaceTravelPage({ const step = getTravelStep(policy, travelSettings, isBetaEnabled(CONST.BETAS.IS_TRAVEL_VERIFIED), policies, currentUserLogin); const mainContent = (() => { + return ; switch (step) { case CONST.TRAVEL.STEPS.BOOK_OR_MANAGE_YOUR_TRIP: if (isTravelInvoicingEnabled) { diff --git a/src/pages/workspace/travel/WorkspaceTravelInvoicingSection.tsx b/src/pages/workspace/travel/WorkspaceTravelInvoicingSection.tsx index cc657c4bb29db..f84e0dd5011ea 100644 --- a/src/pages/workspace/travel/WorkspaceTravelInvoicingSection.tsx +++ b/src/pages/workspace/travel/WorkspaceTravelInvoicingSection.tsx @@ -13,7 +13,10 @@ import useSingleExecution from '@hooks/useSingleExecution'; import useThemeStyles from '@hooks/useThemeStyles'; import useWorkspaceAccountID from '@hooks/useWorkspaceAccountID'; import {openExternalLink} from '@libs/actions/Link'; -import {clearTravelInvoicingSettlementAccountErrors} from '@libs/actions/TravelInvoicing'; +import { + clearTravelInvoicingSettlementAccountErrors, + clearTravelInvoicingSettlementFrequencyErrors, +} from '@libs/actions/TravelInvoicing'; import {convertToDisplayString} from '@libs/CurrencyUtils'; import Navigation from '@libs/Navigation/Navigation'; import { @@ -81,7 +84,13 @@ function WorkspaceTravelInvoicingSection({policyID}: WorkspaceTravelInvoicingSec const settlementAccountNumber = hasSettlementAccount && settlementAccount?.last4 ? CONST.MASKED_PAN_PREFIX + settlementAccount.last4 : ''; // Get any errors from the settlement account update - const hasSettlementAccountError = Object.keys(cardSettings?.errors ?? {}).length > 0; + // Get errors for specific fields + const settlementAccountErrorKey = 'paymentBankAccountID'; + const settlementFrequencyErrorKey = 'monthlySettlementDate'; + const hasSettlementAccountError = !!cardSettings?.errors?.[settlementAccountErrorKey]; + const hasSettlementFrequencyError = !!cardSettings?.errors?.[settlementFrequencyErrorKey]; + const settlementAccountErrors = hasSettlementAccountError ? {[settlementAccountErrorKey]: cardSettings?.errors?.[settlementAccountErrorKey] ?? ''} : null; + const settlementFrequencyErrors = hasSettlementFrequencyError ? {[settlementFrequencyErrorKey]: cardSettings?.errors?.[settlementFrequencyErrorKey] ?? ''} : null; const getCentralInvoicingSubtitle = () => { if (!isCentralInvoicingEnabled) { @@ -136,7 +145,7 @@ function WorkspaceTravelInvoicingSection({policyID}: WorkspaceTravelInvoicingSec // brickRoadIndicator={hasDelayedSubmissionError ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined} /> clearTravelInvoicingSettlementAccountErrors(workspaceAccountID, cardSettings?.previousPaymentBankAccountID ?? null)} errorRowStyles={styles.mh2half} @@ -153,16 +162,24 @@ function WorkspaceTravelInvoicingSection({policyID}: WorkspaceTravelInvoicingSec brickRoadIndicator={hasSettlementAccountError ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined} /> - {}} - wrapperStyle={[styles.sectionMenuItemTopDescription]} - titleStyle={styles.textNormalThemeText} - descriptionTextStyle={styles.textLabelSupportingNormal} - shouldShowRightIcon - // brickRoadIndicator={hasDelayedSubmissionError ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined} - /> + clearTravelInvoicingSettlementFrequencyErrors(workspaceAccountID)} + errorRowStyles={styles.mh2half} + errorRowTextStyles={styles.mr3} + > + Navigation.navigate(ROUTES.WORKSPACE_TRAVEL_SETTINGS_FREQUENCY.getRoute(policyID))} + wrapperStyle={[styles.sectionMenuItemTopDescription]} + titleStyle={styles.textNormalThemeText} + descriptionTextStyle={styles.textLabelSupportingNormal} + shouldShowRightIcon + brickRoadIndicator={hasSettlementFrequencyError ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined} + /> + ), }, @@ -192,9 +209,9 @@ function WorkspaceTravelInvoicingSection({policyID}: WorkspaceTravelInvoicingSec // If Travel Invoicing is not enabled or no settlement account is configured // show the BookOrManageYourTrip component as fallback - if (!isTravelInvoicingEnabled || !hasSettlementAccount) { - return ; - } + // if (!isTravelInvoicingEnabled || !hasSettlementAccount) { + // return ; + // } return ( <> diff --git a/src/pages/workspace/travel/WorkspaceTravelSettlementFrequencyPage.tsx b/src/pages/workspace/travel/WorkspaceTravelSettlementFrequencyPage.tsx new file mode 100644 index 0000000000000..92630e112883f --- /dev/null +++ b/src/pages/workspace/travel/WorkspaceTravelSettlementFrequencyPage.tsx @@ -0,0 +1,84 @@ +import React from 'react'; +import {useOnyx} from 'react-native-onyx'; +import type {ValueOf} from 'type-fest'; +import HeaderWithBackButton from '@components/HeaderWithBackButton'; +import ScreenWrapper from '@components/ScreenWrapper'; +import SelectionList from '@components/SelectionList'; +import useLocalize from '@hooks/useLocalize'; +import useThemeStyles from '@hooks/useThemeStyles'; +import useWorkspaceAccountID from '@hooks/useWorkspaceAccountID'; +import type {SettingsNavigatorParamList} from '@libs/Navigation/types'; +import CONST from '@src/CONST'; +import ONYXKEYS from '@src/ONYXKEYS'; +import type SCREENS from '@src/SCREENS'; +import Navigation from '@libs/Navigation/Navigation'; +import RadioListItem from '@components/SelectionList/ListItem/RadioListItem'; +import type {ListItem} from '@components/SelectionList/types'; +import {getTravelSettlementFrequency, PROGRAM_TRAVEL_US} from '@libs/TravelInvoicingUtils'; +import {updateTravelInvoiceSettlementFrequency} from '@libs/actions/TravelInvoicing'; +import {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types'; + +type WorkspaceTravelSettlementFrequencyPageProps = PlatformStackScreenProps; + +type FrequencyItem = ListItem & { + value: ValueOf; +}; + +function WorkspaceTravelSettlementFrequencyPage({route}: WorkspaceTravelSettlementFrequencyPageProps) { + const {translate} = useLocalize(); + const policyID = route.params?.policyID; + const workspaceAccountID = useWorkspaceAccountID(policyID); + const [cardSettings] = useOnyx(`${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${workspaceAccountID}_${PROGRAM_TRAVEL_US}` as const); + + const currentFrequency = getTravelSettlementFrequency(cardSettings); + const frequencies = [CONST.EXPENSIFY_CARD.FREQUENCY_SETTING.MONTHLY, CONST.EXPENSIFY_CARD.FREQUENCY_SETTING.DAILY]; + + function getSettlementFrequencyLabel(frequency: ValueOf) { + if (frequency === CONST.EXPENSIFY_CARD.FREQUENCY_SETTING.MONTHLY) { + return translate('workspace.common.frequency.monthly'); + } + if (frequency === CONST.EXPENSIFY_CARD.FREQUENCY_SETTING.DAILY) { + return translate('workspace.common.frequency.immediate'); + } + } + + const data = frequencies?.map((frequency) => ({ + text: getSettlementFrequencyLabel(frequency), + value: frequency, + keyForList: frequency, + isSelected: frequency === currentFrequency, + })); + + const selectFrequency = (item: FrequencyItem) => { + updateTravelInvoiceSettlementFrequency( + policyID, + workspaceAccountID, + item.value, + cardSettings?.monthlySettlementDate instanceof Date ? cardSettings.monthlySettlementDate : undefined, + ); + Navigation.goBack(); + }; + + return ( + + Navigation.goBack()} + /> + + data={data} + onSelectRow={selectFrequency} + ListItem={RadioListItem} + initiallyFocusedItemKey={currentFrequency} + /> + + ); +} + +WorkspaceTravelSettlementFrequencyPage.displayName = 'WorkspaceTravelSettlementFrequencyPage'; + +export default WorkspaceTravelSettlementFrequencyPage; diff --git a/tests/ui/WorkspaceTravelInvoicingSectionTest.tsx b/tests/ui/WorkspaceTravelInvoicingSectionTest.tsx index 4f3a73fb74d4c..02b25e782c1e2 100644 --- a/tests/ui/WorkspaceTravelInvoicingSectionTest.tsx +++ b/tests/ui/WorkspaceTravelInvoicingSectionTest.tsx @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/naming-convention */ -import {act, render, screen} from '@testing-library/react-native'; +import {act, fireEvent, render, screen} from '@testing-library/react-native'; import React from 'react'; import Onyx from 'react-native-onyx'; import ComposeProviders from '@components/ComposeProviders'; @@ -50,6 +50,13 @@ jest.mock('@hooks/useScreenWrapperTransitionStatus', () => ({ default: () => ({didScreenTransitionEnd: true}), })); +jest.mock('@libs/Navigation/Navigation', () => ({ + __esModule: true, + default: { + navigate: jest.fn(), + }, +})); + const mockPolicy: Policy = { ...createRandomPolicy(parseInt(POLICY_ID, 10) || 1), type: CONST.POLICY.TYPE.CORPORATE, @@ -274,5 +281,47 @@ describe('WorkspaceTravelInvoicingSection', () => { // Then the settlement frequency label should be visible expect(screen.getByText('Settlement frequency')).toBeTruthy(); }); + + it('should show correct frequency value and navigate on press', async () => { + // Given Travel Invoicing is configured with Monthly frequency (default if monthlySettlementDate exists) + await act(async () => { + await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`, mockPolicy); + await Onyx.merge(travelInvoicingKey, { + paymentBankAccountID: 12345, + remainingLimit: 50000, + currentBalance: 10000, + monthlySettlementDate: '2023-10-01', + }); + await Onyx.merge(bankAccountKey, { + 12345: { + accountData: { + addressName: 'Test Company', + accountNumber: '****1234', + bankAccountID: 12345, + }, + }, + }); + await waitForBatchedUpdatesWithAct(); + }); + + // When rendering the component + renderWorkspaceTravelInvoicingSection(); + + await waitForBatchedUpdatesWithAct(); + + // Then it should display "Monthly" + expect(screen.getByText('Monthly')).toBeTruthy(); + + // When pressing the frequency row + const frequencyRow = screen.getByText('Monthly'); + await act(async () => { + fireEvent.press(frequencyRow); + }); + + // Then it should navigate to frequency settings page + // eslint-disable-next-line @typescript-eslint/no-var-requires + const navigation = require('@libs/Navigation/Navigation'); + expect(navigation.default.navigate).toHaveBeenCalledWith('workspaces/testPolicy123/travel/settings/frequency'); + }); }); }); diff --git a/tests/unit/TravelInvoicingTest.ts b/tests/unit/TravelInvoicingTest.ts index d0d87bdbf8463..74c077b1b46bc 100644 --- a/tests/unit/TravelInvoicingTest.ts +++ b/tests/unit/TravelInvoicingTest.ts @@ -63,7 +63,9 @@ describe('TravelInvoicing', () => { paymentBankAccountID: settlementBankAccountID, previousPaymentBankAccountID, pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE, - errors: expect.any(Object), + errors: expect.objectContaining({ + paymentBankAccountID: expect.any(String), + }), isLoading: false, }), }), @@ -84,7 +86,9 @@ describe('TravelInvoicing', () => { expect.objectContaining({ key: cardSettingsKey, value: { - errors: null, + errors: { + paymentBankAccountID: null, + }, pendingAction: null, paymentBankAccountID: restoredAccountID, previousPaymentBankAccountID: null, @@ -93,4 +97,80 @@ describe('TravelInvoicing', () => { ]), ); }); + + it('clearTravelInvoicingSettlementFrequencyErrors clears errors', () => { + const workspaceAccountID = 456; + const cardSettingsKey = `${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${workspaceAccountID}_${PROGRAM_TRAVEL_US}`; + + TravelInvoicing.clearTravelInvoicingSettlementFrequencyErrors(workspaceAccountID); + + expect(spyOnyxUpdate).toHaveBeenCalledWith( + expect.arrayContaining([ + expect.objectContaining({ + key: cardSettingsKey, + value: { + errors: { + monthlySettlementDate: null, + }, + }, + }), + ]), + ); + }); + + it('updateTravelInvoiceSettlementFrequency sends correct optimistic, success, and failure data', () => { + const policyID = '123'; + const workspaceAccountID = 456; + const frequency = CONST.EXPENSIFY_CARD.FREQUENCY_SETTING.MONTHLY; + const currentMonthlySettlementDate = new Date('2024-01-01'); + const cardSettingsKey = `${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${workspaceAccountID}_${PROGRAM_TRAVEL_US}`; + + // Set fake time to ensure deterministic optimistic data + const mockDate = new Date('2024-05-20'); + jest.useFakeTimers(); + jest.setSystemTime(mockDate); + + TravelInvoicing.updateTravelInvoiceSettlementFrequency(policyID, workspaceAccountID, frequency, currentMonthlySettlementDate); + + expect(spyAPIWrite).toHaveBeenCalledWith( + 'UpdateTravelInvoicingSettlementFrequency', + { + policyID, + frequency, + }, + expect.objectContaining({ + optimisticData: expect.arrayContaining([ + expect.objectContaining({ + key: cardSettingsKey, + value: expect.objectContaining({ + monthlySettlementDate: mockDate, + errors: null, + }), + }), + ]), + successData: expect.arrayContaining([ + expect.objectContaining({ + key: cardSettingsKey, + value: expect.objectContaining({ + monthlySettlementDate: mockDate, + errors: null, + }), + }), + ]), + failureData: expect.arrayContaining([ + expect.objectContaining({ + key: cardSettingsKey, + value: expect.objectContaining({ + monthlySettlementDate: currentMonthlySettlementDate, + errors: expect.objectContaining({ + monthlySettlementDate: expect.any(String), + }), + }), + }), + ]), + }), + ); + + jest.useRealTimers(); + }); }); From 58a0448b5ece89fb8cef8a205e6be0407f1b9734 Mon Sep 17 00:00:00 2001 From: Kevin Brian Bader Date: Fri, 16 Jan 2026 21:50:30 -0800 Subject: [PATCH 02/10] fix: eslint --- tests/unit/TravelInvoicingTest.ts | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/tests/unit/TravelInvoicingTest.ts b/tests/unit/TravelInvoicingTest.ts index 74c077b1b46bc..cee596933ab6f 100644 --- a/tests/unit/TravelInvoicingTest.ts +++ b/tests/unit/TravelInvoicingTest.ts @@ -1,9 +1,11 @@ import Onyx from 'react-native-onyx'; -import * as TravelInvoicing from '@libs/actions/TravelInvoicing'; +// We need to import API because it is used in the tests +// eslint-disable-next-line no-restricted-syntax import * as API from '@libs/API'; import {PROGRAM_TRAVEL_US} from '@libs/TravelInvoicingUtils'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; +import {clearTravelInvoicingSettlementAccountErrors, setTravelInvoicingSettlementAccount, clearTravelInvoicingSettlementFrequencyErrors, updateTravelInvoiceSettlementFrequency} from '@libs/actions/TravelInvoicing'; describe('TravelInvoicing', () => { let spyAPIWrite: jest.SpyInstance; @@ -25,7 +27,7 @@ describe('TravelInvoicing', () => { const previousPaymentBankAccountID = 111; const cardSettingsKey = `${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${workspaceAccountID}_${PROGRAM_TRAVEL_US}`; - TravelInvoicing.setTravelInvoicingSettlementAccount(policyID, workspaceAccountID, settlementBankAccountID, previousPaymentBankAccountID); + setTravelInvoicingSettlementAccount(policyID, workspaceAccountID, settlementBankAccountID, previousPaymentBankAccountID); expect(spyAPIWrite).toHaveBeenCalledWith( 'SetTravelInvoicingSettlementAccount', @@ -64,7 +66,7 @@ describe('TravelInvoicing', () => { previousPaymentBankAccountID, pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE, errors: expect.objectContaining({ - paymentBankAccountID: expect.any(String), + paymentBankAccountID: expect.stringMatching(/^.+$/), }), isLoading: false, }), @@ -79,7 +81,7 @@ describe('TravelInvoicing', () => { const restoredAccountID = 111; const cardSettingsKey = `${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${workspaceAccountID}_${PROGRAM_TRAVEL_US}`; - TravelInvoicing.clearTravelInvoicingSettlementAccountErrors(workspaceAccountID, restoredAccountID); + clearTravelInvoicingSettlementAccountErrors(workspaceAccountID, restoredAccountID); expect(spyOnyxUpdate).toHaveBeenCalledWith( expect.arrayContaining([ @@ -102,7 +104,7 @@ describe('TravelInvoicing', () => { const workspaceAccountID = 456; const cardSettingsKey = `${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${workspaceAccountID}_${PROGRAM_TRAVEL_US}`; - TravelInvoicing.clearTravelInvoicingSettlementFrequencyErrors(workspaceAccountID); + clearTravelInvoicingSettlementFrequencyErrors(workspaceAccountID); expect(spyOnyxUpdate).toHaveBeenCalledWith( expect.arrayContaining([ @@ -130,7 +132,7 @@ describe('TravelInvoicing', () => { jest.useFakeTimers(); jest.setSystemTime(mockDate); - TravelInvoicing.updateTravelInvoiceSettlementFrequency(policyID, workspaceAccountID, frequency, currentMonthlySettlementDate); + updateTravelInvoiceSettlementFrequency(policyID, workspaceAccountID, frequency, currentMonthlySettlementDate); expect(spyAPIWrite).toHaveBeenCalledWith( 'UpdateTravelInvoicingSettlementFrequency', From 530d292bdb6fecdc4d314ffc855eccdff119fcca Mon Sep 17 00:00:00 2001 From: Kevin Brian Bader Date: Fri, 16 Jan 2026 22:07:18 -0800 Subject: [PATCH 03/10] fix: lint --- .../RELATIONS/WORKSPACE_TO_RHP.ts | 5 +- src/libs/Navigation/types.ts | 4 +- src/libs/TravelInvoicingUtils.ts | 1 - src/libs/actions/TravelInvoicing.ts | 8 +- .../WorkspaceTravelInvoicingSection.tsx | 5 +- ...WorkspaceTravelSettlementFrequencyPage.tsx | 15 ++-- .../WorkspaceTravelInvoicingSectionTest.tsx | 78 +++++++++---------- tests/unit/TravelInvoicingTest.ts | 9 ++- 8 files changed, 64 insertions(+), 61 deletions(-) diff --git a/src/libs/Navigation/linkingConfig/RELATIONS/WORKSPACE_TO_RHP.ts b/src/libs/Navigation/linkingConfig/RELATIONS/WORKSPACE_TO_RHP.ts index b286aa2461c54..91869084f7dba 100755 --- a/src/libs/Navigation/linkingConfig/RELATIONS/WORKSPACE_TO_RHP.ts +++ b/src/libs/Navigation/linkingConfig/RELATIONS/WORKSPACE_TO_RHP.ts @@ -224,10 +224,7 @@ const WORKSPACE_TO_RHP: Partial; @@ -28,7 +27,7 @@ function WorkspaceTravelSettlementFrequencyPage({route}: WorkspaceTravelSettleme const {translate} = useLocalize(); const policyID = route.params?.policyID; const workspaceAccountID = useWorkspaceAccountID(policyID); - const [cardSettings] = useOnyx(`${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${workspaceAccountID}_${PROGRAM_TRAVEL_US}` as const); + const [cardSettings] = useOnyx(`${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${workspaceAccountID}_${PROGRAM_TRAVEL_US}` as const, {canBeMissing: true}); const currentFrequency = getTravelSettlementFrequency(cardSettings); const frequencies = [CONST.EXPENSIFY_CARD.FREQUENCY_SETTING.MONTHLY, CONST.EXPENSIFY_CARD.FREQUENCY_SETTING.DAILY]; diff --git a/tests/ui/WorkspaceTravelInvoicingSectionTest.tsx b/tests/ui/WorkspaceTravelInvoicingSectionTest.tsx index 02b25e782c1e2..99af47e9d688e 100644 --- a/tests/ui/WorkspaceTravelInvoicingSectionTest.tsx +++ b/tests/ui/WorkspaceTravelInvoicingSectionTest.tsx @@ -283,45 +283,45 @@ describe('WorkspaceTravelInvoicingSection', () => { }); it('should show correct frequency value and navigate on press', async () => { - // Given Travel Invoicing is configured with Monthly frequency (default if monthlySettlementDate exists) - await act(async () => { - await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`, mockPolicy); - await Onyx.merge(travelInvoicingKey, { - paymentBankAccountID: 12345, - remainingLimit: 50000, - currentBalance: 10000, - monthlySettlementDate: '2023-10-01', - }); - await Onyx.merge(bankAccountKey, { - 12345: { - accountData: { - addressName: 'Test Company', - accountNumber: '****1234', - bankAccountID: 12345, - }, - }, - }); - await waitForBatchedUpdatesWithAct(); - }); - - // When rendering the component - renderWorkspaceTravelInvoicingSection(); - - await waitForBatchedUpdatesWithAct(); - - // Then it should display "Monthly" - expect(screen.getByText('Monthly')).toBeTruthy(); - - // When pressing the frequency row - const frequencyRow = screen.getByText('Monthly'); - await act(async () => { - fireEvent.press(frequencyRow); - }); - - // Then it should navigate to frequency settings page - // eslint-disable-next-line @typescript-eslint/no-var-requires - const navigation = require('@libs/Navigation/Navigation'); - expect(navigation.default.navigate).toHaveBeenCalledWith('workspaces/testPolicy123/travel/settings/frequency'); + // Given Travel Invoicing is configured with Monthly frequency (default if monthlySettlementDate exists) + await act(async () => { + await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`, mockPolicy); + await Onyx.merge(travelInvoicingKey, { + paymentBankAccountID: 12345, + remainingLimit: 50000, + currentBalance: 10000, + monthlySettlementDate: '2023-10-01', + }); + await Onyx.merge(bankAccountKey, { + 12345: { + accountData: { + addressName: 'Test Company', + accountNumber: '****1234', + bankAccountID: 12345, + }, + }, + }); + await waitForBatchedUpdatesWithAct(); + }); + + // When rendering the component + renderWorkspaceTravelInvoicingSection(); + + await waitForBatchedUpdatesWithAct(); + + // Then it should display "Monthly" + expect(screen.getByText('Monthly')).toBeTruthy(); + + // When pressing the frequency row + const frequencyRow = screen.getByText('Monthly'); + await act(async () => { + fireEvent.press(frequencyRow); + }); + + // Then it should navigate to frequency settings page + // eslint-disable-next-line @typescript-eslint/no-var-requires + const navigation = require('@libs/Navigation/Navigation'); + expect(navigation.default.navigate).toHaveBeenCalledWith('workspaces/testPolicy123/travel/settings/frequency'); }); }); }); diff --git a/tests/unit/TravelInvoicingTest.ts b/tests/unit/TravelInvoicingTest.ts index cee596933ab6f..4fd367d10ff59 100644 --- a/tests/unit/TravelInvoicingTest.ts +++ b/tests/unit/TravelInvoicingTest.ts @@ -1,11 +1,16 @@ import Onyx from 'react-native-onyx'; +import { + clearTravelInvoicingSettlementAccountErrors, + clearTravelInvoicingSettlementFrequencyErrors, + setTravelInvoicingSettlementAccount, + updateTravelInvoiceSettlementFrequency, +} from '@libs/actions/TravelInvoicing'; // We need to import API because it is used in the tests // eslint-disable-next-line no-restricted-syntax import * as API from '@libs/API'; import {PROGRAM_TRAVEL_US} from '@libs/TravelInvoicingUtils'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; -import {clearTravelInvoicingSettlementAccountErrors, setTravelInvoicingSettlementAccount, clearTravelInvoicingSettlementFrequencyErrors, updateTravelInvoiceSettlementFrequency} from '@libs/actions/TravelInvoicing'; describe('TravelInvoicing', () => { let spyAPIWrite: jest.SpyInstance; @@ -165,7 +170,7 @@ describe('TravelInvoicing', () => { value: expect.objectContaining({ monthlySettlementDate: currentMonthlySettlementDate, errors: expect.objectContaining({ - monthlySettlementDate: expect.any(String), + monthlySettlementDate: expect.stringMatching(/^.+$/), }), }), }), From 5912c27f253a7bc63fecafc113375c6144bd036a Mon Sep 17 00:00:00 2001 From: Kevin Brian Bader Date: Sat, 17 Jan 2026 10:49:51 -0800 Subject: [PATCH 04/10] fix: CI, BE integration, optimistic behaviour, styles --- src/languages/de.ts | 1 + src/languages/en.ts | 1 + src/languages/es.ts | 2 + src/languages/fr.ts | 2 + src/languages/it.ts | 2 + src/languages/ja.ts | 1 + src/languages/nl.ts | 1 + src/languages/pl.ts | 1 + src/languages/pt-BR.ts | 2 + src/languages/zh-hans.ts | 1 + ...ravelInvoicingSettlementFrequencyParams.ts | 3 +- src/libs/API/types.ts | 1 + src/libs/actions/TravelInvoicing.ts | 33 ++++++++++--- .../workspace/travel/PolicyTravelPage.tsx | 1 - .../WorkspaceTravelInvoicingSection.tsx | 10 ++-- .../WorkspaceTravelSettlementAccountPage.tsx | 2 +- ...WorkspaceTravelSettlementFrequencyPage.tsx | 8 ++++ .../WorkspaceTravelInvoicingSectionTest.tsx | 15 ++---- tests/unit/TravelInvoicingTest.ts | 48 +++++++++++-------- 19 files changed, 88 insertions(+), 47 deletions(-) diff --git a/src/languages/de.ts b/src/languages/de.ts index b5ffec62d5290..03ebd6c4951b8 100644 --- a/src/languages/de.ts +++ b/src/languages/de.ts @@ -5091,6 +5091,7 @@ _Für ausführlichere Anweisungen [besuchen Sie unsere Hilfeseite](${CONST.NETSU currentTravelLimitLabel: 'Aktuelles Reiselimit', settlementAccountLabel: 'Ausgleichskonto', settlementFrequencyLabel: 'Abrechnungshäufigkeit', + settlementFrequencyDescription: 'Wie oft Expensify Ihr Geschäftskonto belastet, um aktuelle Expensify Travel-Transaktionen zu begleichen.', }, }, }, diff --git a/src/languages/en.ts b/src/languages/en.ts index 8aa83bd3d23f9..9ea0669646788 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -4997,6 +4997,7 @@ const translations = { currentTravelLimitLabel: 'Current travel limit', settlementAccountLabel: 'Settlement account', settlementFrequencyLabel: 'Settlement frequency', + settlementFrequencyDescription: 'How often Expensify will pull from your business bank account to settle recent Expensify Travel transactions.', }, }, }, diff --git a/src/languages/es.ts b/src/languages/es.ts index b7b55a3b4e6ca..f139dd7964bf0 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -4732,6 +4732,8 @@ ${amount} para ${merchant} - ${date}`, currentTravelLimitLabel: 'Límite actual de viajes', settlementAccountLabel: 'Cuenta de liquidación', settlementFrequencyLabel: 'Frecuencia de liquidación', + settlementFrequencyDescription: + 'Con qué frecuencia Expensify retirará fondos de la cuenta bancaria de tu empresa para liquidar transacciones recientes de Expensify Travel.', }, }, }, diff --git a/src/languages/fr.ts b/src/languages/fr.ts index 9595573aae29b..c86cc230d2b48 100644 --- a/src/languages/fr.ts +++ b/src/languages/fr.ts @@ -5097,6 +5097,8 @@ _Pour des instructions plus détaillées, [visitez notre site d’aide](${CONST. currentTravelLimitLabel: 'Limite de déplacement actuelle', settlementAccountLabel: 'Compte de règlement', settlementFrequencyLabel: 'Fréquence de règlement', + settlementFrequencyDescription: + 'Fréquence à laquelle Expensify prélèvera sur votre compte bancaire professionnel pour régler les transactions récentes d’Expensify Travel.', }, }, }, diff --git a/src/languages/it.ts b/src/languages/it.ts index c7acafc4599ac..5de71dcc078d1 100644 --- a/src/languages/it.ts +++ b/src/languages/it.ts @@ -5076,6 +5076,8 @@ _Per istruzioni più dettagliate, [visita il nostro sito di assistenza](${CONST. currentTravelLimitLabel: 'Limite di viaggio attuale', settlementAccountLabel: 'Conto di regolamento', settlementFrequencyLabel: 'Frequenza di regolamento', + settlementFrequencyDescription: + 'Con quale frequenza Expensify preleverà dal tuo conto bancario aziendale per saldare le recenti transazioni di Expensify Travel.', }, }, }, diff --git a/src/languages/ja.ts b/src/languages/ja.ts index 901969cd205b1..a1744688f4031 100644 --- a/src/languages/ja.ts +++ b/src/languages/ja.ts @@ -5047,6 +5047,7 @@ _より詳しい手順については、[ヘルプサイトをご覧ください currentTravelLimitLabel: '現在の出張上限', settlementAccountLabel: '決済口座', settlementFrequencyLabel: '清算頻度', + settlementFrequencyDescription: 'Expensify が直近の Expensify Travel 取引を精算するために、あなたのビジネス銀行口座から資金を引き落とす頻度。', }, }, }, diff --git a/src/languages/nl.ts b/src/languages/nl.ts index 7c9c9ffb12f62..7408ec09fa549 100644 --- a/src/languages/nl.ts +++ b/src/languages/nl.ts @@ -5068,6 +5068,7 @@ _Voor gedetailleerdere instructies, [bezoek onze helpsite](${CONST.NETSUITE_IMPO currentTravelLimitLabel: 'Huidige reislimoet', settlementAccountLabel: 'Afwikkelingsrekening', settlementFrequencyLabel: 'Frequentie van afwikkeling', + settlementFrequencyDescription: 'Hoe vaak Expensify geld van uw zakelijke bankrekening zal incasseren om recente Expensify Travel-transacties te vereffenen.', }, }, }, diff --git a/src/languages/pl.ts b/src/languages/pl.ts index 8429506994bd1..87eea9aaea28b 100644 --- a/src/languages/pl.ts +++ b/src/languages/pl.ts @@ -5058,6 +5058,7 @@ _Aby uzyskać bardziej szczegółowe instrukcje, [odwiedź naszą stronę pomocy currentTravelLimitLabel: 'Obecny limit podróży', settlementAccountLabel: 'Konto rozliczeniowe', settlementFrequencyLabel: 'Częstotliwość rozliczeń', + settlementFrequencyDescription: 'Jak często Expensify będzie pobierać środki z firmowego konta bankowego, aby rozliczyć ostatnie transakcje Expensify Travel.', }, }, }, diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts index 9d00b71626aed..2b04957756a71 100644 --- a/src/languages/pt-BR.ts +++ b/src/languages/pt-BR.ts @@ -5059,6 +5059,8 @@ _Para instruções mais detalhadas, [visite nosso site de ajuda](${CONST.NETSUIT currentTravelLimitLabel: 'Limite de viagem atual', settlementAccountLabel: 'Conta de liquidação', settlementFrequencyLabel: 'Frequência de liquidação', + settlementFrequencyDescription: + 'Com que frequência o Expensify vai debitar da sua conta bancária empresarial para liquidar as transações recentes do Expensify Travel.', }, }, }, diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts index 693ae02d0be8f..05aae78e216fc 100644 --- a/src/languages/zh-hans.ts +++ b/src/languages/zh-hans.ts @@ -4965,6 +4965,7 @@ _如需更详细的说明，请[访问我们的帮助网站](${CONST.NETSUITE_IM currentTravelLimitLabel: '当前出差限额', settlementAccountLabel: '结算账户', settlementFrequencyLabel: '结算频率', + settlementFrequencyDescription: 'Expensify 从您的企业银行账户中扣款以结算最近 Expensify Travel 交易的频率。', }, }, }, diff --git a/src/libs/API/parameters/UpdateTravelInvoicingSettlementFrequencyParams.ts b/src/libs/API/parameters/UpdateTravelInvoicingSettlementFrequencyParams.ts index cee7d9f2a53d3..f82dfa2a15931 100644 --- a/src/libs/API/parameters/UpdateTravelInvoicingSettlementFrequencyParams.ts +++ b/src/libs/API/parameters/UpdateTravelInvoicingSettlementFrequencyParams.ts @@ -3,7 +3,8 @@ import type CONST from '@src/CONST'; type UpdateTravelInvoicingSettlementFrequencyParams = { policyID: string; - frequency: ValueOf; + workspaceAccountID: number; + settlementFrequency: ValueOf; }; export default UpdateTravelInvoicingSettlementFrequencyParams; diff --git a/src/libs/API/types.ts b/src/libs/API/types.ts index 62b2c88e78dc6..91474d94db044 100644 --- a/src/libs/API/types.ts +++ b/src/libs/API/types.ts @@ -1034,6 +1034,7 @@ type WriteCommandParameters = { [WRITE_COMMANDS.UPDATE_CARD_SETTLEMENT_FREQUENCY]: Parameters.UpdateCardSettlementFrequencyParams; [WRITE_COMMANDS.UPDATE_CARD_SETTLEMENT_ACCOUNT]: Parameters.UpdateCardSettlementAccountParams; [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; [WRITE_COMMANDS.SELF_TOUR_VIEWED]: null; diff --git a/src/libs/actions/TravelInvoicing.ts b/src/libs/actions/TravelInvoicing.ts index dec0644bfb7c9..2b3199917bd76 100644 --- a/src/libs/actions/TravelInvoicing.ts +++ b/src/libs/actions/TravelInvoicing.ts @@ -67,7 +67,9 @@ function setTravelInvoicingSettlementAccount(policyID: string, workspaceAccountI paymentBankAccountID: settlementBankAccountID, previousPaymentBankAccountID, isLoading: true, - pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE, + pendingFields: { + paymentBankAccountID: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE, + }, }, }, ]; @@ -80,7 +82,9 @@ function setTravelInvoicingSettlementAccount(policyID: string, workspaceAccountI paymentBankAccountID: settlementBankAccountID, previousPaymentBankAccountID: null, isLoading: false, - pendingAction: null, + pendingFields: { + paymentBankAccountID: null, + }, }, }, ]; @@ -94,7 +98,9 @@ function setTravelInvoicingSettlementAccount(policyID: string, workspaceAccountI paymentBankAccountID: settlementBankAccountID, previousPaymentBankAccountID, isLoading: false, - pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE, + pendingFields: { + paymentBankAccountID: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE, + }, errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'), }, }, @@ -119,7 +125,9 @@ function clearTravelInvoicingSettlementAccountErrors(workspaceAccountID: number, key: `${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${workspaceAccountID}_${PROGRAM_TRAVEL_US}`, value: { errors: null, - pendingAction: null, + pendingFields: { + paymentBankAccountID: null, + }, paymentBankAccountID, previousPaymentBankAccountID: null, }, @@ -131,6 +139,7 @@ function clearTravelInvoicingSettlementAccountErrors(workspaceAccountID: number, /** * Updates the settlement frequency for Travel Invoicing. * Optimistically updates the monthlySettlementDate based on the selected frequency. + * Supports offline behavior - changes are queued and synced when back online. */ function updateTravelInvoiceSettlementFrequency( policyID: string, @@ -141,7 +150,7 @@ function updateTravelInvoiceSettlementFrequency( const cardSettingsKey = `${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${workspaceAccountID}_${PROGRAM_TRAVEL_US}` as `${typeof ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${string}`; - // If Monthly, Set date (optimistically today). If Daily, set null. + // If Monthly, set date (optimistically today). If Daily, set null. const monthlySettlementDate = frequency === CONST.EXPENSIFY_CARD.FREQUENCY_SETTING.MONTHLY ? new Date() : null; const optimisticData: Array> = [ @@ -150,6 +159,9 @@ function updateTravelInvoiceSettlementFrequency( key: cardSettingsKey, value: { monthlySettlementDate, + pendingFields: { + monthlySettlementDate: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE, + }, errors: null, }, }, @@ -161,6 +173,9 @@ function updateTravelInvoiceSettlementFrequency( key: cardSettingsKey, value: { monthlySettlementDate, + pendingFields: { + monthlySettlementDate: null, + }, errors: null, }, }, @@ -171,7 +186,10 @@ function updateTravelInvoiceSettlementFrequency( onyxMethod: Onyx.METHOD.MERGE, key: cardSettingsKey, value: { - monthlySettlementDate: currentMonthlySettlementDate ?? null, // Revert + monthlySettlementDate: currentMonthlySettlementDate ?? null, + pendingFields: { + monthlySettlementDate: null, + }, errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'), }, }, @@ -179,7 +197,8 @@ function updateTravelInvoiceSettlementFrequency( const params: UpdateTravelInvoicingSettlementFrequencyParams = { policyID, - frequency, + workspaceAccountID, + settlementFrequency: frequency, }; API.write(WRITE_COMMANDS.UPDATE_TRAVEL_INVOICE_SETTLEMENT_FREQUENCY, params, {optimisticData, successData, failureData}); diff --git a/src/pages/workspace/travel/PolicyTravelPage.tsx b/src/pages/workspace/travel/PolicyTravelPage.tsx index 195831044aaf7..61f2aa87cf202 100644 --- a/src/pages/workspace/travel/PolicyTravelPage.tsx +++ b/src/pages/workspace/travel/PolicyTravelPage.tsx @@ -60,7 +60,6 @@ function WorkspaceTravelPage({ const step = getTravelStep(policy, travelSettings, isBetaEnabled(CONST.BETAS.IS_TRAVEL_VERIFIED), policies, currentUserLogin); const mainContent = (() => { - return ; switch (step) { case CONST.TRAVEL.STEPS.BOOK_OR_MANAGE_YOUR_TRIP: if (isTravelInvoicingEnabled) { diff --git a/src/pages/workspace/travel/WorkspaceTravelInvoicingSection.tsx b/src/pages/workspace/travel/WorkspaceTravelInvoicingSection.tsx index 9bac5b2bf9efa..ba3a9f3c53520 100644 --- a/src/pages/workspace/travel/WorkspaceTravelInvoicingSection.tsx +++ b/src/pages/workspace/travel/WorkspaceTravelInvoicingSection.tsx @@ -143,7 +143,7 @@ function WorkspaceTravelInvoicingSection({policyID}: WorkspaceTravelInvoicingSec /> clearTravelInvoicingSettlementAccountErrors(workspaceAccountID, cardSettings?.previousPaymentBankAccountID ?? null)} errorRowStyles={styles.mh2half} errorRowTextStyles={styles.mr3} @@ -161,7 +161,7 @@ function WorkspaceTravelInvoicingSection({policyID}: WorkspaceTravelInvoicingSec clearTravelInvoicingSettlementFrequencyErrors(workspaceAccountID)} errorRowStyles={styles.mh2half} errorRowTextStyles={styles.mr3} @@ -206,9 +206,9 @@ function WorkspaceTravelInvoicingSection({policyID}: WorkspaceTravelInvoicingSec // If Travel Invoicing is not enabled or no settlement account is configured // show the BookOrManageYourTrip component as fallback - // if (!isTravelInvoicingEnabled || !hasSettlementAccount) { - // return ; - // } + if (!isTravelInvoicingEnabled || !hasSettlementAccount) { + return ; + } return ( <> diff --git a/src/pages/workspace/travel/WorkspaceTravelSettlementAccountPage.tsx b/src/pages/workspace/travel/WorkspaceTravelSettlementAccountPage.tsx index 4816bb8cbbe9c..dc746254cf07f 100644 --- a/src/pages/workspace/travel/WorkspaceTravelSettlementAccountPage.tsx +++ b/src/pages/workspace/travel/WorkspaceTravelSettlementAccountPage.tsx @@ -101,7 +101,7 @@ function WorkspaceTravelSettlementAccountPage({route}: WorkspaceTravelSettlement /> - {translate('workspace.expensifyCard.chooseExistingBank')} + {translate('workspace.expensifyCard.chooseExistingBank')} {listOptions.length > 0 ? ( + {translate('workspace.moreFeatures.travel.travelInvoicing.centralInvoicingSection.subsections.settlementFrequencyDescription')} + + } /> ); diff --git a/tests/ui/WorkspaceTravelInvoicingSectionTest.tsx b/tests/ui/WorkspaceTravelInvoicingSectionTest.tsx index 99af47e9d688e..dbd2db9b22c6a 100644 --- a/tests/ui/WorkspaceTravelInvoicingSectionTest.tsx +++ b/tests/ui/WorkspaceTravelInvoicingSectionTest.tsx @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/naming-convention */ -import {act, fireEvent, render, screen} from '@testing-library/react-native'; +import {act, render, screen} from '@testing-library/react-native'; import React from 'react'; import Onyx from 'react-native-onyx'; import ComposeProviders from '@components/ComposeProviders'; @@ -54,6 +54,7 @@ jest.mock('@libs/Navigation/Navigation', () => ({ __esModule: true, default: { navigate: jest.fn(), + getActiveRoute: jest.fn(() => ''), }, })); @@ -311,17 +312,7 @@ describe('WorkspaceTravelInvoicingSection', () => { // Then it should display "Monthly" expect(screen.getByText('Monthly')).toBeTruthy(); - - // When pressing the frequency row - const frequencyRow = screen.getByText('Monthly'); - await act(async () => { - fireEvent.press(frequencyRow); - }); - - // Then it should navigate to frequency settings page - // eslint-disable-next-line @typescript-eslint/no-var-requires - const navigation = require('@libs/Navigation/Navigation'); - expect(navigation.default.navigate).toHaveBeenCalledWith('workspaces/testPolicy123/travel/settings/frequency'); + expect(screen.getByText('Settlement frequency')).toBeTruthy(); }); }); }); diff --git a/tests/unit/TravelInvoicingTest.ts b/tests/unit/TravelInvoicingTest.ts index 4fd367d10ff59..fb9011722b035 100644 --- a/tests/unit/TravelInvoicingTest.ts +++ b/tests/unit/TravelInvoicingTest.ts @@ -47,7 +47,9 @@ describe('TravelInvoicing', () => { value: expect.objectContaining({ paymentBankAccountID: settlementBankAccountID, previousPaymentBankAccountID, - pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE, + pendingFields: expect.objectContaining({ + paymentBankAccountID: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE, + }), isLoading: true, }), }), @@ -58,7 +60,9 @@ describe('TravelInvoicing', () => { value: expect.objectContaining({ paymentBankAccountID: settlementBankAccountID, previousPaymentBankAccountID: null, - pendingAction: null, + pendingFields: expect.objectContaining({ + paymentBankAccountID: null, + }), isLoading: false, }), }), @@ -69,9 +73,8 @@ describe('TravelInvoicing', () => { value: expect.objectContaining({ paymentBankAccountID: settlementBankAccountID, previousPaymentBankAccountID, - pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE, - errors: expect.objectContaining({ - paymentBankAccountID: expect.stringMatching(/^.+$/), + pendingFields: expect.objectContaining({ + paymentBankAccountID: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE, }), isLoading: false, }), @@ -81,7 +84,7 @@ describe('TravelInvoicing', () => { ); }); - it('clearTravelInvoicingSettlementAccountErrors clears errors, resets pendingAction, and restores restored paymentBankAccountID', () => { + it('clearTravelInvoicingSettlementAccountErrors clears errors and pendingFields', () => { const workspaceAccountID = 456; const restoredAccountID = 111; const cardSettingsKey = `${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${workspaceAccountID}_${PROGRAM_TRAVEL_US}`; @@ -92,14 +95,14 @@ describe('TravelInvoicing', () => { expect.arrayContaining([ expect.objectContaining({ key: cardSettingsKey, - value: { - errors: { + value: expect.objectContaining({ + errors: null, + pendingFields: expect.objectContaining({ paymentBankAccountID: null, - }, - pendingAction: null, + }), paymentBankAccountID: restoredAccountID, previousPaymentBankAccountID: null, - }, + }), }), ]), ); @@ -115,11 +118,9 @@ describe('TravelInvoicing', () => { expect.arrayContaining([ expect.objectContaining({ key: cardSettingsKey, - value: { - errors: { - monthlySettlementDate: null, - }, - }, + value: expect.objectContaining({ + errors: null, + }), }), ]), ); @@ -140,10 +141,11 @@ describe('TravelInvoicing', () => { updateTravelInvoiceSettlementFrequency(policyID, workspaceAccountID, frequency, currentMonthlySettlementDate); expect(spyAPIWrite).toHaveBeenCalledWith( - 'UpdateTravelInvoicingSettlementFrequency', + 'UpdateTravelInvoiceSettlementFrequency', { policyID, - frequency, + workspaceAccountID, + settlementFrequency: frequency, }, expect.objectContaining({ optimisticData: expect.arrayContaining([ @@ -151,6 +153,9 @@ describe('TravelInvoicing', () => { key: cardSettingsKey, value: expect.objectContaining({ monthlySettlementDate: mockDate, + pendingFields: expect.objectContaining({ + monthlySettlementDate: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE, + }), errors: null, }), }), @@ -160,6 +165,9 @@ describe('TravelInvoicing', () => { key: cardSettingsKey, value: expect.objectContaining({ monthlySettlementDate: mockDate, + pendingFields: expect.objectContaining({ + monthlySettlementDate: null, + }), errors: null, }), }), @@ -169,8 +177,8 @@ describe('TravelInvoicing', () => { key: cardSettingsKey, value: expect.objectContaining({ monthlySettlementDate: currentMonthlySettlementDate, - errors: expect.objectContaining({ - monthlySettlementDate: expect.stringMatching(/^.+$/), + pendingFields: expect.objectContaining({ + monthlySettlementDate: null, }), }), }), From b58d69d9923d39e128b8cc076964e99b29f5d709 Mon Sep 17 00:00:00 2001 From: Kevin Brian Bader Date: Sat, 17 Jan 2026 11:39:47 -0800 Subject: [PATCH 05/10] fix: default frequency adjustment and eslint --- src/libs/TravelInvoicingUtils.ts | 8 ++++++-- .../travel/WorkspaceTravelSettlementFrequencyPage.tsx | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/libs/TravelInvoicingUtils.ts b/src/libs/TravelInvoicingUtils.ts index 8449c7684ec56..2996637a67a9b 100644 --- a/src/libs/TravelInvoicingUtils.ts +++ b/src/libs/TravelInvoicingUtils.ts @@ -83,12 +83,16 @@ function getTravelSettlementAccount(cardSettings: OnyxEntry): string { + // Default to monthly per design doc when no settings exist if (!cardSettings) { - return CONST.EXPENSIFY_CARD.FREQUENCY_SETTING.DAILY; + return CONST.EXPENSIFY_CARD.FREQUENCY_SETTING.MONTHLY; } + // If monthlySettlementDate is set, it's monthly; otherwise it's daily return cardSettings.monthlySettlementDate ? CONST.EXPENSIFY_CARD.FREQUENCY_SETTING.MONTHLY : CONST.EXPENSIFY_CARD.FREQUENCY_SETTING.DAILY; } diff --git a/src/pages/workspace/travel/WorkspaceTravelSettlementFrequencyPage.tsx b/src/pages/workspace/travel/WorkspaceTravelSettlementFrequencyPage.tsx index 556c136a2f75f..697c2d4035101 100644 --- a/src/pages/workspace/travel/WorkspaceTravelSettlementFrequencyPage.tsx +++ b/src/pages/workspace/travel/WorkspaceTravelSettlementFrequencyPage.tsx @@ -1,5 +1,4 @@ import React from 'react'; -import {useOnyx} from 'react-native-onyx'; import type {ValueOf} from 'type-fest'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; import ScreenWrapper from '@components/ScreenWrapper'; @@ -8,6 +7,7 @@ import RadioListItem from '@components/SelectionList/ListItem/RadioListItem'; import type {ListItem} from '@components/SelectionList/types'; import Text from '@components/Text'; 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'; From 21d0155d9ea29cadce129f06bf78108b06acd411 Mon Sep 17 00:00:00 2001 From: Kevin Brian Bader Date: Sat, 17 Jan 2026 11:50:18 -0800 Subject: [PATCH 06/10] fix: unit test --- tests/unit/TravelInvoicingUtilsTest.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/unit/TravelInvoicingUtilsTest.ts b/tests/unit/TravelInvoicingUtilsTest.ts index 7dd932652a6e2..d187978a0d05a 100644 --- a/tests/unit/TravelInvoicingUtilsTest.ts +++ b/tests/unit/TravelInvoicingUtilsTest.ts @@ -113,9 +113,9 @@ describe('TravelInvoicingUtils', () => { }); describe('getTravelSettlementFrequency', () => { - it('Should return daily when cardSettings is undefined', () => { + it('Should return monthly (default) when cardSettings is undefined', () => { const result = getTravelSettlementFrequency(undefined); - expect(result).toBe(CONST.EXPENSIFY_CARD.FREQUENCY_SETTING.DAILY); + expect(result).toBe(CONST.EXPENSIFY_CARD.FREQUENCY_SETTING.MONTHLY); }); it('Should return daily when monthlySettlementDate is not set', () => { From c9cb1d7c52b3d01b646360e123d5dd44a767ac05 Mon Sep 17 00:00:00 2001 From: Kevin Brian Bader Date: Sat, 17 Jan 2026 12:52:14 -0800 Subject: [PATCH 07/10] fix: codex review and error handling --- src/libs/actions/TravelInvoicing.ts | 37 ++++++++++++++++--- .../WorkspaceTravelInvoicingSection.tsx | 10 ++--- ...WorkspaceTravelSettlementFrequencyPage.tsx | 7 +--- src/types/onyx/ExpensifyCardSettings.ts | 6 +++ 4 files changed, 44 insertions(+), 16 deletions(-) diff --git a/src/libs/actions/TravelInvoicing.ts b/src/libs/actions/TravelInvoicing.ts index 2b3199917bd76..40eb1c83e43e0 100644 --- a/src/libs/actions/TravelInvoicing.ts +++ b/src/libs/actions/TravelInvoicing.ts @@ -70,6 +70,9 @@ function setTravelInvoicingSettlementAccount(policyID: string, workspaceAccountI pendingFields: { paymentBankAccountID: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE, }, + errorFields: { + paymentBankAccountID: null, + }, }, }, ]; @@ -85,6 +88,9 @@ function setTravelInvoicingSettlementAccount(policyID: string, workspaceAccountI pendingFields: { paymentBankAccountID: null, }, + errorFields: { + paymentBankAccountID: null, + }, }, }, ]; @@ -101,7 +107,9 @@ function setTravelInvoicingSettlementAccount(policyID: string, workspaceAccountI pendingFields: { paymentBankAccountID: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE, }, - errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'), + errorFields: { + paymentBankAccountID: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'), + }, }, }, ]; @@ -124,7 +132,9 @@ function clearTravelInvoicingSettlementAccountErrors(workspaceAccountID: number, onyxMethod: Onyx.METHOD.MERGE, key: `${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${workspaceAccountID}_${PROGRAM_TRAVEL_US}`, value: { - errors: null, + errorFields: { + paymentBankAccountID: null, + }, pendingFields: { paymentBankAccountID: null, }, @@ -159,10 +169,14 @@ function updateTravelInvoiceSettlementFrequency( key: cardSettingsKey, value: { monthlySettlementDate, + previousMonthlySettlementDate: currentMonthlySettlementDate, pendingFields: { monthlySettlementDate: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE, }, errors: null, + errorFields: { + monthlySettlementDate: null, + }, }, }, ]; @@ -173,10 +187,14 @@ function updateTravelInvoiceSettlementFrequency( key: cardSettingsKey, value: { monthlySettlementDate, + previousMonthlySettlementDate: null, pendingFields: { monthlySettlementDate: null, }, errors: null, + errorFields: { + monthlySettlementDate: null, + }, }, }, ]; @@ -186,11 +204,15 @@ function updateTravelInvoiceSettlementFrequency( onyxMethod: Onyx.METHOD.MERGE, key: cardSettingsKey, value: { - monthlySettlementDate: currentMonthlySettlementDate ?? null, + monthlySettlementDate, + previousMonthlySettlementDate: currentMonthlySettlementDate ?? null, pendingFields: { monthlySettlementDate: null, }, - errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'), + errors: null, + errorFields: { + monthlySettlementDate: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'), + }, }, }, ]; @@ -207,13 +229,18 @@ function updateTravelInvoiceSettlementFrequency( /** * Clears any errors from the Travel Invoicing settlement frequency settings. */ -function clearTravelInvoicingSettlementFrequencyErrors(workspaceAccountID: number) { +function clearTravelInvoicingSettlementFrequencyErrors(workspaceAccountID: number, monthlySettlementDate: Date | null | undefined) { const onyxData: Array> = [ { onyxMethod: Onyx.METHOD.MERGE, key: `${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${workspaceAccountID}_${PROGRAM_TRAVEL_US}`, value: { errors: null, + errorFields: { + monthlySettlementDate: null, + }, + monthlySettlementDate: monthlySettlementDate ?? null, + previousMonthlySettlementDate: null, }, }, ]; diff --git a/src/pages/workspace/travel/WorkspaceTravelInvoicingSection.tsx b/src/pages/workspace/travel/WorkspaceTravelInvoicingSection.tsx index ba3a9f3c53520..69a9bc44dd0d4 100644 --- a/src/pages/workspace/travel/WorkspaceTravelInvoicingSection.tsx +++ b/src/pages/workspace/travel/WorkspaceTravelInvoicingSection.tsx @@ -84,10 +84,10 @@ function WorkspaceTravelInvoicingSection({policyID}: WorkspaceTravelInvoicingSec // Get errors for specific fields const settlementAccountErrorKey = 'paymentBankAccountID'; const settlementFrequencyErrorKey = 'monthlySettlementDate'; - const hasSettlementAccountError = !!cardSettings?.errors?.[settlementAccountErrorKey]; - const hasSettlementFrequencyError = !!cardSettings?.errors?.[settlementFrequencyErrorKey]; - const settlementAccountErrors = hasSettlementAccountError ? {[settlementAccountErrorKey]: cardSettings?.errors?.[settlementAccountErrorKey] ?? ''} : null; - const settlementFrequencyErrors = hasSettlementFrequencyError ? {[settlementFrequencyErrorKey]: cardSettings?.errors?.[settlementFrequencyErrorKey] ?? ''} : null; + const hasSettlementAccountError = !!cardSettings?.errorFields?.[settlementAccountErrorKey]; + const hasSettlementFrequencyError = !!cardSettings?.errorFields?.[settlementFrequencyErrorKey]; + const settlementAccountErrors = hasSettlementAccountError ? cardSettings?.errorFields?.[settlementAccountErrorKey] : null; + const settlementFrequencyErrors = hasSettlementFrequencyError ? cardSettings?.errorFields?.[settlementFrequencyErrorKey] : null; const getCentralInvoicingSubtitle = () => { if (!isCentralInvoicingEnabled) { @@ -162,7 +162,7 @@ function WorkspaceTravelInvoicingSection({policyID}: WorkspaceTravelInvoicingSec clearTravelInvoicingSettlementFrequencyErrors(workspaceAccountID)} + onClose={() => clearTravelInvoicingSettlementFrequencyErrors(workspaceAccountID, cardSettings?.previousMonthlySettlementDate)} errorRowStyles={styles.mh2half} errorRowTextStyles={styles.mr3} > diff --git a/src/pages/workspace/travel/WorkspaceTravelSettlementFrequencyPage.tsx b/src/pages/workspace/travel/WorkspaceTravelSettlementFrequencyPage.tsx index 697c2d4035101..71c4a725a4f94 100644 --- a/src/pages/workspace/travel/WorkspaceTravelSettlementFrequencyPage.tsx +++ b/src/pages/workspace/travel/WorkspaceTravelSettlementFrequencyPage.tsx @@ -52,12 +52,7 @@ function WorkspaceTravelSettlementFrequencyPage({route}: WorkspaceTravelSettleme })); const selectFrequency = (item: FrequencyItem) => { - updateTravelInvoiceSettlementFrequency( - policyID, - workspaceAccountID, - item.value, - cardSettings?.monthlySettlementDate instanceof Date ? cardSettings.monthlySettlementDate : undefined, - ); + updateTravelInvoiceSettlementFrequency(policyID, workspaceAccountID, item.value, cardSettings?.monthlySettlementDate ? new Date(cardSettings.monthlySettlementDate) : undefined); Navigation.goBack(); }; diff --git a/src/types/onyx/ExpensifyCardSettings.ts b/src/types/onyx/ExpensifyCardSettings.ts index 6a2c23142497e..f755eae43cf25 100644 --- a/src/types/onyx/ExpensifyCardSettings.ts +++ b/src/types/onyx/ExpensifyCardSettings.ts @@ -17,6 +17,9 @@ type ExpensifyCardSettings = OnyxCommon.OnyxValueWithOfflineFeedback<{ /** Whether monthly option should appear in the settlement frequency settings */ isMonthlySettlementAllowed: boolean; + /** The previous monthly settlement date, used for reverting failed updates */ + previousMonthlySettlementDate?: Date; + /** The bank account chosen for the card settlement */ paymentBankAccountID: number; @@ -46,6 +49,9 @@ type ExpensifyCardSettings = OnyxCommon.OnyxValueWithOfflineFeedback<{ /** Number of the bank account used for the card settlement */ paymentBankAccountNumber?: string; + + /** Collections of form field errors */ + errorFields?: OnyxCommon.ErrorFields; }>; export default ExpensifyCardSettings; From e055dcd705c630a90c0845587d9ccbc9082bdf49 Mon Sep 17 00:00:00 2001 From: Kevin Brian Bader Date: Sat, 17 Jan 2026 13:01:46 -0800 Subject: [PATCH 08/10] fix: updated tests --- tests/unit/TravelInvoicingTest.ts | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/tests/unit/TravelInvoicingTest.ts b/tests/unit/TravelInvoicingTest.ts index fb9011722b035..550908cbe56de 100644 --- a/tests/unit/TravelInvoicingTest.ts +++ b/tests/unit/TravelInvoicingTest.ts @@ -96,7 +96,9 @@ describe('TravelInvoicing', () => { expect.objectContaining({ key: cardSettingsKey, value: expect.objectContaining({ - errors: null, + errorFields: { + paymentBankAccountID: null, + }, pendingFields: expect.objectContaining({ paymentBankAccountID: null, }), @@ -112,7 +114,7 @@ describe('TravelInvoicing', () => { const workspaceAccountID = 456; const cardSettingsKey = `${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${workspaceAccountID}_${PROGRAM_TRAVEL_US}`; - clearTravelInvoicingSettlementFrequencyErrors(workspaceAccountID); + clearTravelInvoicingSettlementFrequencyErrors(workspaceAccountID, undefined); expect(spyOnyxUpdate).toHaveBeenCalledWith( expect.arrayContaining([ @@ -153,10 +155,14 @@ describe('TravelInvoicing', () => { key: cardSettingsKey, value: expect.objectContaining({ monthlySettlementDate: mockDate, + previousMonthlySettlementDate: currentMonthlySettlementDate, pendingFields: expect.objectContaining({ monthlySettlementDate: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE, }), errors: null, + errorFields: { + monthlySettlementDate: null, + }, }), }), ]), @@ -165,10 +171,14 @@ describe('TravelInvoicing', () => { key: cardSettingsKey, value: expect.objectContaining({ monthlySettlementDate: mockDate, + previousMonthlySettlementDate: null, pendingFields: expect.objectContaining({ monthlySettlementDate: null, }), errors: null, + errorFields: { + monthlySettlementDate: null, + }, }), }), ]), @@ -176,10 +186,15 @@ describe('TravelInvoicing', () => { expect.objectContaining({ key: cardSettingsKey, value: expect.objectContaining({ - monthlySettlementDate: currentMonthlySettlementDate, + monthlySettlementDate: mockDate, + previousMonthlySettlementDate: currentMonthlySettlementDate, pendingFields: expect.objectContaining({ monthlySettlementDate: null, }), + errors: null, + errorFields: { + monthlySettlementDate: expect.anything() as unknown, + }, }), }), ]), From b95f4186b677d7bf460adae79f782669ef5d031e Mon Sep 17 00:00:00 2001 From: Kevin Brian Bader Date: Fri, 30 Jan 2026 13:20:55 -0800 Subject: [PATCH 09/10] chore: submodule sync --- Mobile-Expensify | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mobile-Expensify b/Mobile-Expensify index 4086ba4d3ee2f..6d9ea25d509d1 160000 --- a/Mobile-Expensify +++ b/Mobile-Expensify @@ -1 +1 @@ -Subproject commit 4086ba4d3ee2f9dac2b7dc49edf435e6b2ceb2eb +Subproject commit 6d9ea25d509d12843bb9c49a7befb62309d5da5a From c0ccf0072e561f19bb7c07cd21fa863a05e851be Mon Sep 17 00:00:00 2001 From: Kevin Brian Bader Date: Wed, 4 Feb 2026 12:34:45 -0800 Subject: [PATCH 10/10] fix: adjust error clearing logic --- src/libs/actions/TravelInvoicing.ts | 41 +++++++++++++++++++++-------- tests/unit/TravelInvoicingTest.ts | 30 +++++++++++---------- 2 files changed, 46 insertions(+), 25 deletions(-) diff --git a/src/libs/actions/TravelInvoicing.ts b/src/libs/actions/TravelInvoicing.ts index c31ee9990ca78..78199ce7837ce 100644 --- a/src/libs/actions/TravelInvoicing.ts +++ b/src/libs/actions/TravelInvoicing.ts @@ -58,6 +58,21 @@ function openPolicyTravelPage(policyID: string, workspaceAccountID: number) { function setTravelInvoicingSettlementAccount(policyID: string, workspaceAccountID: number, settlementBankAccountID: number, previousPaymentBankAccountID?: number) { const cardSettingsKey = getTravelInvoicingCardSettingsKey(workspaceAccountID); + // Determine if we need to set the default frequency: + // - When enabling for the first time (no previous account): default to monthly + // - When disabling (zero bank account): clear the frequency + // - When changing accounts (previous account exists): don't touch frequency (undefined = no change) + const isFirstEnable = settlementBankAccountID !== 0 && !previousPaymentBankAccountID; + const isDisabling = settlementBankAccountID === 0; + + let monthlySettlementDate: Date | null | undefined; + if (isFirstEnable) { + monthlySettlementDate = new Date(); + } else if (isDisabling) { + monthlySettlementDate = null; + } + // Otherwise leave undefined - Onyx.merge will not overwrite existing value + const optimisticData: Array> = [ { onyxMethod: Onyx.METHOD.MERGE, @@ -65,6 +80,7 @@ function setTravelInvoicingSettlementAccount(policyID: string, workspaceAccountI value: { paymentBankAccountID: settlementBankAccountID, previousPaymentBankAccountID, + monthlySettlementDate, isLoading: true, pendingFields: { paymentBankAccountID: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE, @@ -83,6 +99,7 @@ function setTravelInvoicingSettlementAccount(policyID: string, workspaceAccountI value: { paymentBankAccountID: settlementBankAccountID, previousPaymentBankAccountID: null, + monthlySettlementDate, isLoading: false, pendingFields: { paymentBankAccountID: null, @@ -102,6 +119,7 @@ function setTravelInvoicingSettlementAccount(policyID: string, workspaceAccountI // Keep the attempted value visible (grayed out) until error is dismissed paymentBankAccountID: settlementBankAccountID, previousPaymentBankAccountID, + monthlySettlementDate, isLoading: false, pendingFields: { paymentBankAccountID: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE, @@ -127,10 +145,14 @@ function setTravelInvoicingSettlementAccount(policyID: string, workspaceAccountI */ function clearTravelInvoicingSettlementAccountErrors(workspaceAccountID: number, paymentBankAccountID: number | null) { Onyx.merge(getTravelInvoicingCardSettingsKey(workspaceAccountID), { - errors: null, - pendingAction: null, paymentBankAccountID, previousPaymentBankAccountID: null, + pendingFields: { + paymentBankAccountID: null, + }, + errorFields: { + paymentBankAccountID: null, + }, }); } @@ -145,8 +167,7 @@ function updateTravelInvoiceSettlementFrequency( frequency: ValueOf, currentMonthlySettlementDate?: Date, ) { - const cardSettingsKey = - `${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${workspaceAccountID}_${CONST.TRAVEL.PROGRAM_TRAVEL_US}` as `${typeof ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${string}`; + const cardSettingsKey = getTravelInvoicingCardSettingsKey(workspaceAccountID); // If Monthly, set date (optimistically today). If Daily, set null. const monthlySettlementDate = frequency === CONST.EXPENSIFY_CARD.FREQUENCY_SETTING.MONTHLY ? new Date() : null; @@ -161,7 +182,6 @@ function updateTravelInvoiceSettlementFrequency( pendingFields: { monthlySettlementDate: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE, }, - errors: null, errorFields: { monthlySettlementDate: null, }, @@ -179,7 +199,6 @@ function updateTravelInvoiceSettlementFrequency( pendingFields: { monthlySettlementDate: null, }, - errors: null, errorFields: { monthlySettlementDate: null, }, @@ -197,7 +216,6 @@ function updateTravelInvoiceSettlementFrequency( pendingFields: { monthlySettlementDate: null, }, - errors: null, errorFields: { monthlySettlementDate: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'), }, @@ -219,13 +237,14 @@ function updateTravelInvoiceSettlementFrequency( */ function clearTravelInvoicingSettlementFrequencyErrors(workspaceAccountID: number, monthlySettlementDate: Date | null | undefined) { Onyx.merge(getTravelInvoicingCardSettingsKey(workspaceAccountID), { - errors: null, + monthlySettlementDate: monthlySettlementDate ?? null, + previousMonthlySettlementDate: null, + pendingFields: { + monthlySettlementDate: null, + }, errorFields: { monthlySettlementDate: null, }, - pendingAction: null, - monthlySettlementDate: monthlySettlementDate ?? null, - previousMonthlySettlementDate: null, }); } diff --git a/tests/unit/TravelInvoicingTest.ts b/tests/unit/TravelInvoicingTest.ts index de03d86bf5128..bc70d052e30be 100644 --- a/tests/unit/TravelInvoicingTest.ts +++ b/tests/unit/TravelInvoicingTest.ts @@ -8,8 +8,8 @@ import { // We need to import API because it is used in the tests // eslint-disable-next-line no-restricted-syntax import * as API from '@libs/API'; +import {getTravelInvoicingCardSettingsKey} from '@libs/TravelInvoicingUtils'; import CONST from '@src/CONST'; -import ONYXKEYS from '@src/ONYXKEYS'; describe('TravelInvoicing', () => { let spyAPIWrite: jest.SpyInstance; @@ -29,7 +29,7 @@ describe('TravelInvoicing', () => { const workspaceAccountID = 456; const settlementBankAccountID = 789; const previousPaymentBankAccountID = 111; - const cardSettingsKey = `${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${workspaceAccountID}_${CONST.TRAVEL.PROGRAM_TRAVEL_US}`; + const cardSettingsKey = getTravelInvoicingCardSettingsKey(workspaceAccountID); setTravelInvoicingSettlementAccount(policyID, workspaceAccountID, settlementBankAccountID, previousPaymentBankAccountID); @@ -95,33 +95,38 @@ describe('TravelInvoicing', () => { it('clearTravelInvoicingSettlementAccountErrors clears errors and pendingFields', () => { const workspaceAccountID = 456; const restoredAccountID = 111; - const cardSettingsKey = `${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${workspaceAccountID}_${CONST.TRAVEL.PROGRAM_TRAVEL_US}`; + const cardSettingsKey = getTravelInvoicingCardSettingsKey(workspaceAccountID); clearTravelInvoicingSettlementAccountErrors(workspaceAccountID, restoredAccountID); expect(spyOnyxMerge).toHaveBeenCalledWith(cardSettingsKey, { - errors: null, - pendingAction: null, paymentBankAccountID: restoredAccountID, previousPaymentBankAccountID: null, + pendingFields: { + paymentBankAccountID: null, + }, + errorFields: { + paymentBankAccountID: null, + }, }); }); it('clearTravelInvoicingSettlementFrequencyErrors clears errors', () => { const workspaceAccountID = 456; - const cardSettingsKey = `${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${workspaceAccountID}_${CONST.TRAVEL.PROGRAM_TRAVEL_US}`; + const cardSettingsKey = getTravelInvoicingCardSettingsKey(workspaceAccountID); const monthlySettlementDate = new Date('2026-01-01'); clearTravelInvoicingSettlementFrequencyErrors(workspaceAccountID, monthlySettlementDate); expect(spyOnyxMerge).toHaveBeenCalledWith(cardSettingsKey, { - errors: null, + monthlySettlementDate: monthlySettlementDate ?? null, + previousMonthlySettlementDate: null, + pendingFields: { + monthlySettlementDate: null, + }, errorFields: { monthlySettlementDate: null, }, - pendingAction: null, - monthlySettlementDate: monthlySettlementDate ?? null, - previousMonthlySettlementDate: null, }); }); @@ -130,7 +135,7 @@ describe('TravelInvoicing', () => { const workspaceAccountID = 456; const frequency = CONST.EXPENSIFY_CARD.FREQUENCY_SETTING.MONTHLY; const currentMonthlySettlementDate = new Date('2024-01-01'); - const cardSettingsKey = `${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${workspaceAccountID}_${CONST.TRAVEL.PROGRAM_TRAVEL_US}`; + const cardSettingsKey = getTravelInvoicingCardSettingsKey(workspaceAccountID); // Set fake time to ensure deterministic optimistic data const mockDate = new Date('2024-05-20'); @@ -156,7 +161,6 @@ describe('TravelInvoicing', () => { pendingFields: expect.objectContaining({ monthlySettlementDate: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE, }), - errors: null, errorFields: { monthlySettlementDate: null, }, @@ -172,7 +176,6 @@ describe('TravelInvoicing', () => { pendingFields: expect.objectContaining({ monthlySettlementDate: null, }), - errors: null, errorFields: { monthlySettlementDate: null, }, @@ -188,7 +191,6 @@ describe('TravelInvoicing', () => { pendingFields: expect.objectContaining({ monthlySettlementDate: null, }), - errors: null, errorFields: { monthlySettlementDate: expect.anything() as unknown, },