From 5bc2aa5b81706a222cb3e127c285996f7ca03100 Mon Sep 17 00:00:00 2001 From: "daledah (via MelvinBot)" Date: Mon, 5 Oct 2026 10:14:47 +0000 Subject: [PATCH] Enable Rules optimistically when copying merchant rules Co-authored-by: daledah --- src/libs/actions/Policy/CopyPolicySettings.ts | 10 ++++-- tests/actions/CopyPolicySettingsTest.ts | 31 +++++++++++++++++++ 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/src/libs/actions/Policy/CopyPolicySettings.ts b/src/libs/actions/Policy/CopyPolicySettings.ts index 80da4bc3d3c2..cda7cd084603 100644 --- a/src/libs/actions/Policy/CopyPolicySettings.ts +++ b/src/libs/actions/Policy/CopyPolicySettings.ts @@ -404,6 +404,11 @@ function buildCopyPolicySettingsData( : {}; const receiptPartnersPendingFields = isReceiptPartnersSelected ? {receiptPartners: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE} : {}; const receiptPartnersClearedPendingFields = isReceiptPartnersSelected ? {receiptPartners: null} : {}; + // Merchant rules are only visible while Rules is on, so copying them turns Rules on for the target, + // the same way the backend does. This keeps the target right while offline, before the server push lands. + const codingRulesPatch = isCodingRulesSelected ? {areRulesEnabled: true} : {}; + const codingRulesPendingFields = isCodingRulesSelected ? {areRulesEnabled: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE} : {}; + const codingRulesClearedPendingFields = isCodingRulesSelected ? {areRulesEnabled: null} : {}; const sourceCategoriesKey = `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${sourcePolicy.id}` as const; const sourceTagsKey = `${ONYXKEYS.COLLECTION.POLICY_TAGS}${sourcePolicy.id}` as const; @@ -447,7 +452,8 @@ function buildCopyPolicySettingsData( : {}), ...(travelSettingsPatch ?? {}), ...(receiptPartnersPatch ? {receiptPartners: receiptPartnersPatch.receiptPartners} : {}), - pendingFields: {...targetPolicy.pendingFields, ...pendingFields, ...timeTrackingPendingFields, ...receiptPartnersPendingFields}, + ...codingRulesPatch, + pendingFields: {...targetPolicy.pendingFields, ...pendingFields, ...timeTrackingPendingFields, ...receiptPartnersPendingFields, ...codingRulesPendingFields}, }, }); @@ -456,7 +462,7 @@ function buildCopyPolicySettingsData( onyxMethod: Onyx.METHOD.MERGE, key: policyKey, value: { - pendingFields: {...clearedPendingFields, ...timeTrackingClearedPendingFields, ...receiptPartnersClearedPendingFields}, + pendingFields: {...clearedPendingFields, ...timeTrackingClearedPendingFields, ...receiptPartnersClearedPendingFields, ...codingRulesClearedPendingFields}, errors: null, }, }); diff --git a/tests/actions/CopyPolicySettingsTest.ts b/tests/actions/CopyPolicySettingsTest.ts index 2873642e4c80..3d9356a9731d 100644 --- a/tests/actions/CopyPolicySettingsTest.ts +++ b/tests/actions/CopyPolicySettingsTest.ts @@ -220,6 +220,37 @@ describe('actions/Policy/CopyPolicySettings', () => { expect(policy?.pendingFields?.showTagGLCodes).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE); }); + it('enables Rules on the target when merchant rules are copied so they are visible while offline', () => { + // Given a target with Rules off, and a source whose Rules toggle was turned off after it got merchant rules + const sourcePolicy = makeSourcePolicy({areRulesEnabled: false}); + const targetPolicy = makeTargetPolicy({areRulesEnabled: false}); + + // When only merchant rules are copied + const {optimisticData, successData, failureData} = buildCopyPolicySettingsData(sourcePolicy, [targetPolicy], ['codingRules'], {}, {}, {}); + const policy = getOptimisticPolicy(optimisticData); + + // Then Rules is turned on optimistically and marked pending, because merchant rules only show up while Rules is on + expect(policy?.areRulesEnabled).toBe(true); + expect(policy?.pendingFields?.areRulesEnabled).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE); + + // Then success clears the pending marker and failure restores the original toggle + const successPatch = getMergedPolicyPatch(successData.find((entry) => entry.key === POLICY_KEY)); + expect(successPatch?.pendingFields?.areRulesEnabled).toBeNull(); + expect(getFailurePolicy(failureData)?.areRulesEnabled).toBe(false); + }); + + it('enables Rules on the target when merchant rules are copied together with rules from a source that has Rules off', () => { + // Given a source whose Rules toggle is off + const sourcePolicy = makeSourcePolicy({areRulesEnabled: false}); + const targetPolicy = makeTargetPolicy({areRulesEnabled: false}); + + // When rules and merchant rules are copied together + const {optimisticData} = buildCopyPolicySettingsData(sourcePolicy, [targetPolicy], ['rules', 'codingRules'], {}, {}, {}); + + // Then merchant rules still turn Rules on, so the copied merchant rules stay visible + expect(getOptimisticPolicy(optimisticData)?.areRulesEnabled).toBe(true); + }); + it('copies only autoAddTripName from travelSettings, never the Spotnana identity fields or terms acceptance', () => { const sourcePolicy = makeSourcePolicy({ travelSettings: {