Phase 3: Remove flat fallbacks and nest travel writes under TRAVEL_US

src/libs/CardUtils.ts

@@ -1105,34 +1105,61 @@ function isExpensifyCardFullySetUp(policy?: OnyxEntry<Policy>, cardSettings?: On
     return !!(policy?.areExpensifyCardsEnabled && cardSettings?.paymentBankAccountID);
 }
 
-function getCardSettings(cardSettings: OnyxEntry<ExpensifyCardSettings>, feedCountry?: string): ExpensifyCardSettingsBase | undefined {
+/**
+ * The set of valid card program keys used to key nested settings in ExpensifyCardSettings.
+ * 'US' and 'GB' are geo-based programs, 'CURRENT' is the legacy pre-2024 US program,
+ * and 'TRAVEL_US' is the travel invoicing program. These map directly to the keys
+ * the backend nests card settings under.
+ */
+type CardProgramKey = typeof CONST.COUNTRY.US | typeof CONST.EXPENSIFY_CARD.CARD_PROGRAM.CURRENT | typeof CONST.COUNTRY.GB | typeof CONST.TRAVEL.PROGRAM_TRAVEL_US;
+
+/**
+ * Detects which card program key exists in the card settings object.
+ * Returns the first matching program key (US, CURRENT, or GB), or undefined if none found.
+ * Used to determine the correct nested key for optimistic writes.
+ */
+function getCardProgramKey(cardSettings: OnyxEntry<ExpensifyCardSettings>): CardProgramKey | undefined {
+    if (!cardSettings) {
+        return undefined;
+    }
+
+    const programKeys: CardProgramKey[] = [CONST.COUNTRY.US, CONST.EXPENSIFY_CARD.CARD_PROGRAM.CURRENT, CONST.COUNTRY.GB];
+    return programKeys.find((key) => {
+        const value = cardSettings[key];
+        return value !== null && typeof value === 'object' && !Array.isArray(value);
+    });
+}
+
+function getCardSettings(cardSettings: OnyxEntry<ExpensifyCardSettings>, programKey?: CardProgramKey): ExpensifyCardSettingsBase | undefined {
     if (!cardSettings) {
         return undefined;
     }
 
-    const getMergedProgramSettings = (programKey: string): ExpensifyCardSettingsBase | undefined => {
-        const programSettings = cardSettings[programKey as keyof typeof cardSettings];
+    const getMergedProgramSettings = (key: CardProgramKey): ExpensifyCardSettingsBase | undefined => {
+        const programSettings = cardSettings[key];
         if (programSettings && typeof programSettings === 'object' && !Array.isArray(programSettings)) {
             // Nested program values take precedence — they are the authoritative source for
-            // program-specific fields once the backend sends the full nested format (Phase 2).
-            return {...cardSettings, ...(programSettings as ExpensifyCardSettingsBase)} as ExpensifyCardSettingsBase;
+            // program-specific fields (e.g. paymentBankAccountID, monthlySettlementDate).
+            return {...cardSettings, ...programSettings} as ExpensifyCardSettingsBase;
         }
         return undefined;
     };
 
-    if (feedCountry) {
-        return getMergedProgramSettings(feedCountry) ?? cardSettings;
+    if (programKey) {
+        return getMergedProgramSettings(programKey);
     }
 
-    // Auto-detect: try known card programs in priority order so callers that
-    // don't pass feedCountry still get the right program sub-object when the
-    // backend sends nested settings (Phase 2 of fixing shared Onyx key).
-    const result = getMergedProgramSettings(CONST.COUNTRY.US) ?? getMergedProgramSettings(CONST.EXPENSIFY_CARD.CARD_PROGRAM.CURRENT) ?? getMergedProgramSettings(CONST.COUNTRY.GB);
-    if (result) {
-        return result;
-    }
-
-    return cardSettings;
+    // Auto-detect: try known card programs in priority order.
+    // Newer domains nest settings under US/GB, legacy ones under CURRENT.
+    // The flat root fallback supports domains that the backend still sends without nesting
+    // (e.g. older accounts that haven't been migrated). Writes always go to the nested key
+    // (via getCardProgramKey), so this flat path is read-only display fallback only.
+    return (
+        getMergedProgramSettings(CONST.COUNTRY.US) ??
+        getMergedProgramSettings(CONST.EXPENSIFY_CARD.CARD_PROGRAM.CURRENT) ??
+        getMergedProgramSettings(CONST.COUNTRY.GB) ??
+        (cardSettings as ExpensifyCardSettingsBase)
+    );
 }
 
 function isCardPendingIssue(card?: Card) {
@@ -1422,21 +1449,21 @@ function getCardCurrency(card?: OnyxEntry<Card>, cardSettings?: OnyxEntry<Expens
     }
 
     // If not, attempt to get currency from the card settings.
-    const feedCountry = card?.nameValuePairs?.feedCountry;
-    const settings = getCardSettings(cardSettings, feedCountry);
+    const programKey = card?.nameValuePairs?.feedCountry as CardProgramKey | undefined;
+    const settings = getCardSettings(cardSettings, programKey);
     if (settings?.currency) {
         return settings.currency;
     }
 
     // Fall back to the program and country to try to determine the correct currency.
     // US programs are always USD
-    if (feedCountry === CONST.COUNTRY.US || feedCountry === CONST.EXPENSIFY_CARD.CARD_PROGRAM.CURRENT) {
+    if (programKey === CONST.COUNTRY.US || programKey === CONST.EXPENSIFY_CARD.CARD_PROGRAM.CURRENT) {
         return CONST.CURRENCY.USD;
     }
 
     // For UK/EU cards, determine currency by country
     const country = card?.nameValuePairs?.country;
-    if (feedCountry === CONST.COUNTRY.GB) {
+    if (programKey === CONST.COUNTRY.GB) {
         // Only Gibraltar and UK use GBP. If country is not set at all, also assume GBP.
         if (!country || country === CONST.COUNTRY.GB || country === CONST.COUNTRY.GI) {
             return CONST.CURRENCY.GBP;
@@ -1508,6 +1535,7 @@ export {
     hasIssuedExpensifyCard,
     isExpensifyCardFullySetUp,
     getCardSettings,
+    getCardProgramKey,
     filterAllInactiveCards,
     filterInactiveCards,
     isCardPendingIssue,
@@ -1545,4 +1573,4 @@ export {
     getCardCurrency,
 };
 
-export type {CompanyCardFeedIcons, CompanyCardBankIcons};
+export type {CompanyCardFeedIcons, CompanyCardBankIcons, CardProgramKey};

src/libs/actions/Card.ts

@@ -22,6 +22,7 @@ import type {
     UpdateExpensifyCardTitleParams,
 } from '@libs/API/parameters';
 import {READ_COMMANDS, SIDE_EFFECT_REQUEST_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
+import type {CardProgramKey} from '@libs/CardUtils';
 import DateUtils from '@libs/DateUtils';
 import * as ErrorUtils from '@libs/ErrorUtils';
 import Log from '@libs/Log';
@@ -645,36 +646,38 @@ function revealVirtualCardDetails(cardID: number, validateCode: string): Promise
     });
 }
 
-function updateSettlementFrequency(workspaceAccountID: number, settlementFrequency: ValueOf<typeof CONST.EXPENSIFY_CARD.FREQUENCY_SETTING>, currentFrequency?: Date) {
+function updateSettlementFrequency(
+    workspaceAccountID: number,
+    programKey: CardProgramKey,
+    settlementFrequency: ValueOf<typeof CONST.EXPENSIFY_CARD.FREQUENCY_SETTING>,
+    currentFrequency?: Date,
+) {
     const monthlySettlementDate = settlementFrequency === CONST.EXPENSIFY_CARD.FREQUENCY_SETTING.DAILY ? null : new Date();
 
+    const settlementValue = {[programKey]: {monthlySettlementDate}};
+    const failureValue = {[programKey]: {monthlySettlementDate: currentFrequency}};
+
     const optimisticData: Array<OnyxUpdate<typeof ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS>> = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${workspaceAccountID}`,
-            value: {
-                monthlySettlementDate,
-            },
+            value: settlementValue,
         },
     ];
 
     const successData: Array<OnyxUpdate<typeof ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS>> = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${workspaceAccountID}`,
-            value: {
-                monthlySettlementDate,
-            },
+            value: settlementValue,
         },
     ];
 
     const failureData: Array<OnyxUpdate<typeof ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS>> = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${workspaceAccountID}`,
-            value: {
-                monthlySettlementDate: currentFrequency,
-            },
+            value: failureValue,
         },
     ];
 
@@ -686,42 +689,49 @@ function updateSettlementFrequency(workspaceAccountID: number, settlementFrequen
     API.write(WRITE_COMMANDS.UPDATE_CARD_SETTLEMENT_FREQUENCY, parameters, {optimisticData, successData, failureData});
 }
 
-function updateSettlementAccount(domainName: string, workspaceAccountID: number, policyID: string, settlementBankAccountID?: number, currentSettlementBankAccountID?: number) {
+function updateSettlementAccount(
+    domainName: string,
+    workspaceAccountID: number,
+    policyID: string,
+    programKey: CardProgramKey,
+    settlementBankAccountID?: number,
+    currentSettlementBankAccountID?: number,
+) {
     if (!settlementBankAccountID) {
         return;
     }
 
+    const optimisticValue = {[programKey]: {paymentBankAccountID: settlementBankAccountID}, isLoading: true};
+
+    const successValue = {[programKey]: {paymentBankAccountID: settlementBankAccountID}, isLoading: false};
+
+    const failureValue = {
+        [programKey]: {paymentBankAccountID: currentSettlementBankAccountID},
+        isLoading: false,
+        errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
+    };
+
     const optimisticData: Array<OnyxUpdate<typeof ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS>> = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${workspaceAccountID}`,
-            value: {
-                paymentBankAccountID: settlementBankAccountID,
-                isLoading: true,
-            },
+            value: optimisticValue,
         },
     ];
 
     const successData: Array<OnyxUpdate<typeof ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS>> = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${workspaceAccountID}`,
-            value: {
-                paymentBankAccountID: settlementBankAccountID,
-                isLoading: false,
-            },
+            value: successValue,
         },
     ];
 
     const failureData: Array<OnyxUpdate<typeof ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS>> = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${workspaceAccountID}`,
-            value: {
-                paymentBankAccountID: currentSettlementBankAccountID,
-                isLoading: false,
-                errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
-            },
+            value: failureValue,
         },
     ];
 

src/libs/actions/TravelInvoicing.ts

@@ -91,9 +91,11 @@ function setTravelInvoicingSettlementAccount(policyID: string, workspaceAccountI
             onyxMethod: Onyx.METHOD.MERGE,
             key: cardSettingsKey,
             value: {
-                paymentBankAccountID: settlementBankAccountID,
-                previousPaymentBankAccountID,
-                monthlySettlementDate,
+                [CONST.TRAVEL.PROGRAM_TRAVEL_US]: {
+                    paymentBankAccountID: settlementBankAccountID,
+                    previousPaymentBankAccountID,
+                    monthlySettlementDate,
+                },
                 isLoading: true,
                 pendingFields: {
                     paymentBankAccountID: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
@@ -110,9 +112,11 @@ function setTravelInvoicingSettlementAccount(policyID: string, workspaceAccountI
             onyxMethod: Onyx.METHOD.MERGE,
             key: cardSettingsKey,
             value: {
-                paymentBankAccountID: settlementBankAccountID,
-                previousPaymentBankAccountID: null,
-                monthlySettlementDate,
+                [CONST.TRAVEL.PROGRAM_TRAVEL_US]: {
+                    paymentBankAccountID: settlementBankAccountID,
+                    previousPaymentBankAccountID: null,
+                    monthlySettlementDate,
+                },
                 isLoading: false,
                 pendingFields: {
                     paymentBankAccountID: null,
@@ -129,10 +133,11 @@ function setTravelInvoicingSettlementAccount(policyID: string, workspaceAccountI
             onyxMethod: Onyx.METHOD.MERGE,
             key: cardSettingsKey,
             value: {
-                // Keep the attempted value visible (grayed out) until error is dismissed
-                paymentBankAccountID: settlementBankAccountID,
-                previousPaymentBankAccountID,
-                monthlySettlementDate,
+                [CONST.TRAVEL.PROGRAM_TRAVEL_US]: {
+                    paymentBankAccountID: settlementBankAccountID,
+                    previousPaymentBankAccountID,
+                    monthlySettlementDate,
+                },
                 isLoading: false,
                 pendingFields: {
                     paymentBankAccountID: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
@@ -158,8 +163,10 @@ function setTravelInvoicingSettlementAccount(policyID: string, workspaceAccountI
  */
 function clearTravelInvoicingSettlementAccountErrors(workspaceAccountID: number, paymentBankAccountID: number | null) {
     Onyx.merge(getTravelInvoicingCardSettingsKey(workspaceAccountID), {
-        paymentBankAccountID,
-        previousPaymentBankAccountID: null,
+        [CONST.TRAVEL.PROGRAM_TRAVEL_US]: {
+            paymentBankAccountID,
+            previousPaymentBankAccountID: null,
+        },
         pendingFields: {
             paymentBankAccountID: null,
         },
@@ -185,8 +192,10 @@ function updateTravelInvoiceSettlementFrequency(workspaceAccountID: number, freq
             onyxMethod: Onyx.METHOD.MERGE,
             key: cardSettingsKey,
             value: {
-                monthlySettlementDate,
-                previousMonthlySettlementDate: currentMonthlySettlementDate,
+                [CONST.TRAVEL.PROGRAM_TRAVEL_US]: {
+                    monthlySettlementDate,
+                    previousMonthlySettlementDate: currentMonthlySettlementDate,
+                },
                 pendingFields: {
                     monthlySettlementDate: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
                 },
@@ -202,8 +211,10 @@ function updateTravelInvoiceSettlementFrequency(workspaceAccountID: number, freq
             onyxMethod: Onyx.METHOD.MERGE,
             key: cardSettingsKey,
             value: {
-                monthlySettlementDate,
-                previousMonthlySettlementDate: null,
+                [CONST.TRAVEL.PROGRAM_TRAVEL_US]: {
+                    monthlySettlementDate,
+                    previousMonthlySettlementDate: null,
+                },
                 pendingFields: {
                     monthlySettlementDate: null,
                 },
@@ -219,8 +230,10 @@ function updateTravelInvoiceSettlementFrequency(workspaceAccountID: number, freq
             onyxMethod: Onyx.METHOD.MERGE,
             key: cardSettingsKey,
             value: {
-                monthlySettlementDate,
-                previousMonthlySettlementDate: currentMonthlySettlementDate ?? null,
+                [CONST.TRAVEL.PROGRAM_TRAVEL_US]: {
+                    monthlySettlementDate,
+                    previousMonthlySettlementDate: currentMonthlySettlementDate ?? null,
+                },
                 pendingFields: {
                     monthlySettlementDate: null,
                 },
@@ -244,8 +257,10 @@ function updateTravelInvoiceSettlementFrequency(workspaceAccountID: number, freq
  */
 function clearTravelInvoicingSettlementFrequencyErrors(workspaceAccountID: number, monthlySettlementDate: Date | null | undefined) {
     Onyx.merge(getTravelInvoicingCardSettingsKey(workspaceAccountID), {
-        monthlySettlementDate: monthlySettlementDate ?? null,
-        previousMonthlySettlementDate: null,
+        [CONST.TRAVEL.PROGRAM_TRAVEL_US]: {
+            monthlySettlementDate: monthlySettlementDate ?? null,
+            previousMonthlySettlementDate: null,
+        },
         pendingFields: {
             monthlySettlementDate: null,
         },
@@ -327,7 +342,6 @@ function deactivateTravelInvoicing(policyID: string, workspaceAccountID: number)
             onyxMethod: Onyx.METHOD.MERGE,
             key: cardSettingsKey,
             value: {
-                isEnabled: false,
                 [CONST.TRAVEL.PROGRAM_TRAVEL_US]: {
                     isEnabled: false,
                 },
@@ -342,10 +356,10 @@ function deactivateTravelInvoicing(policyID: string, workspaceAccountID: number)
             onyxMethod: Onyx.METHOD.MERGE,
             key: cardSettingsKey,
             value: {
-                pendingAction: null,
                 [CONST.TRAVEL.PROGRAM_TRAVEL_US]: {
                     isEnabled: false,
                 },
+                pendingAction: null,
             },
         },
     ];
@@ -355,7 +369,6 @@ function deactivateTravelInvoicing(policyID: string, workspaceAccountID: number)
             onyxMethod: Onyx.METHOD.MERGE,
             key: cardSettingsKey,
             value: {
-                isEnabled: true,
                 [CONST.TRAVEL.PROGRAM_TRAVEL_US]: {
                     isEnabled: true,
                 },