Restore non-default distance rates in optimistic duplicate clone

PR #89448 dropped non-default distance rates from the optimistic clone
to avoid stale duplicates after the server's Pusher response merged.
Online this is fine — the server response repopulates the rates. But
offline the response never arrives, leaving the duplicated workspace
with only the default rate visible (deploy blocker #89865).

Restore the non-default rates with their source IDs so they're visible
in the duplicate's distance rates page offline. To prevent the
optimistic-vs-server duplicate that the original PR was avoiding, null
the source rate IDs in successData — when the API succeeds, the server's
Pusher event populates the full rate set with fresh server IDs and the
stale optimistic IDs are gone.

Author: wildan-m

src/libs/PolicyUtils.ts

@@ -303,16 +303,27 @@ function cloneCustomUnitWithNewIDs(unit: CustomUnit, newCustomUnitID: string, ne
         // The server-side DUPLICATE_POLICY assigns newDefaultRateID to the source's default rate.
         // Mirror getDefaultMileageRate's selection (enabled rates, sorted by index with
         // CONST.DEFAULT_NUMBER_ID for missing indexes) so the optimistic clone aligns with the
-        // rate the expense flow will later treat as default. Other source rates get fresh server
-        // IDs, so we drop them from the optimistic state to avoid stale duplicates.
+        // rate the expense flow will later treat as default. Non-default rates keep their source
+        // IDs so they remain visible offline; successData clears them after the API succeeds so
+        // the server response can repopulate with fresh server IDs without leaving duplicates.
         const defaultRate = Object.values(unit.rates)
             .filter((rate) => rate.enabled !== false)
             .sort((a, b) => (a.index ?? CONST.DEFAULT_NUMBER_ID) - (b.index ?? CONST.DEFAULT_NUMBER_ID))
             .at(0);
+        const rates: Record<string, Rate> = {};
+        for (const rate of Object.values(unit.rates)) {
+            if (rate.customUnitRateID === defaultRate?.customUnitRateID) {
+                continue;
+            }
+            rates[rate.customUnitRateID] = rate;
+        }
+        if (defaultRate) {
+            rates[newDefaultRateID] = {...defaultRate, customUnitRateID: newDefaultRateID};
+        }
         return {
             ...unit,
             customUnitID: newCustomUnitID,
-            rates: defaultRate ? {[newDefaultRateID]: {...defaultRate, customUnitRateID: newDefaultRateID}} : {},
+            rates,
         };
     }
 

src/libs/actions/Policy/Policy.ts

@@ -3236,6 +3236,22 @@ function buildDuplicatePolicyData(policy: Policy, options: DuplicatePolicyDataOp
     const {customUnitID: distanceCustomUnitID, customUnitRateID} = buildOptimisticDistanceRateCustomUnits(outputCurrency);
     const perDiemCustomUnitID = generateCustomUnitID();
 
+    // Source non-default distance rate IDs — kept in optimistic data so they're visible offline,
+    // then nulled in successData so the server's Pusher response can repopulate with fresh server
+    // IDs without leaving optimistic-vs-server duplicates.
+    const sourceDistanceUnit = Object.values(policy?.customUnits ?? {}).find((unit) => unit.name === CONST.CUSTOM_UNITS.NAME_DISTANCE);
+    const sourceDistanceDefaultRate = sourceDistanceUnit
+        ? Object.values(sourceDistanceUnit.rates)
+              .filter((rate) => rate.enabled !== false)
+              .sort((a, b) => (a.index ?? CONST.DEFAULT_NUMBER_ID) - (b.index ?? CONST.DEFAULT_NUMBER_ID))
+              .at(0)
+        : undefined;
+    const sourceNonDefaultDistanceRateIDs = sourceDistanceUnit
+        ? Object.values(sourceDistanceUnit.rates)
+              .filter((rate) => rate.customUnitRateID !== sourceDistanceDefaultRate?.customUnitRateID)
+              .map((rate) => rate.customUnitRateID)
+        : [];
+
     const optimisticAnnounceChat = ReportUtils.buildOptimisticAnnounceChat(targetPolicyID, [...policyMemberAccountIDs], currentUserAccountID);
     const announceRoomChat = optimisticAnnounceChat.announceChatData;
 
@@ -3351,6 +3367,13 @@ function buildDuplicatePolicyData(policy: Policy, options: DuplicatePolicyDataOp
                     type: null,
                     areReportFieldsEnabled: null,
                 },
+                ...(sourceNonDefaultDistanceRateIDs.length > 0 && {
+                    customUnits: {
+                        [distanceCustomUnitID]: {
+                            rates: Object.fromEntries(sourceNonDefaultDistanceRateIDs.map((id) => [id, null])),
+                        },
+                    },
+                }),
             },
         },
         {

tests/unit/PolicyUtilsTest.ts

@@ -352,7 +352,7 @@ describe('PolicyUtils', () => {
             ).toBeUndefined();
         });
 
-        it('clones the source default rate (lowest enabled index) under the API-known customUnitRateID', () => {
+        it('rebinds the default rate to the API-known customUnitRateID and keeps non-default rates with their source IDs', () => {
             const distanceUnitWithMultipleRates = {
                 customUnitID: 'srcDist',
                 name: CONST.CUSTOM_UNITS.NAME_DISTANCE,
@@ -377,13 +377,14 @@ describe('PolicyUtils', () => {
                     ...distanceUnitWithMultipleRates,
                     customUnitID: 'newDist',
                     rates: {
+                        rateB: {customUnitRateID: 'rateB', name: 'New Rate 1', rate: 100, currency: 'USD', enabled: true, index: 1, attributes: {taxRateExternalID: 'tax_other'}},
                         newRate: {customUnitRateID: 'newRate', name: 'Default Rate', rate: 70, currency: 'USD', enabled: true, index: 0, attributes: {taxRateExternalID: 'tax_default'}},
                     },
                 },
             });
         });
 
-        it('drops all rates when no enabled rate exists', () => {
+        it('keeps source rates with their source IDs when no enabled rate exists', () => {
             const distanceUnitAllDisabled = {
                 customUnitID: 'srcDist',
                 name: CONST.CUSTOM_UNITS.NAME_DISTANCE,
@@ -402,7 +403,9 @@ describe('PolicyUtils', () => {
                 perDiemCustomUnitID: 'newPerDiem',
                 customUnitRateID: 'newRate',
             });
-            expect(result?.newDist.rates).toEqual({});
+            expect(result?.newDist.rates).toEqual({
+                rateA: {customUnitRateID: 'rateA', name: 'Disabled', rate: 50, currency: 'USD', enabled: false, index: 0},
+            });
         });
 
         it('treats missing index as 0 when picking the default rate', () => {
@@ -426,6 +429,7 @@ describe('PolicyUtils', () => {
                 customUnitRateID: 'newRate',
             });
             expect(result?.newDist.rates).toEqual({
+                rateB: {customUnitRateID: 'rateB', name: 'Indexed Rate', rate: 100, currency: 'USD', enabled: true, index: 1},
                 newRate: {customUnitRateID: 'newRate', name: 'No-Index Rate', rate: 70, currency: 'USD', enabled: true},
             });
         });