Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/libs/actions/Policy/CopyPolicySettings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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},
},
});

Expand All @@ -456,7 +462,7 @@ function buildCopyPolicySettingsData(
onyxMethod: Onyx.METHOD.MERGE,
key: policyKey,
value: {
pendingFields: {...clearedPendingFields, ...timeTrackingClearedPendingFields, ...receiptPartnersClearedPendingFields},
pendingFields: {...clearedPendingFields, ...timeTrackingClearedPendingFields, ...receiptPartnersClearedPendingFields, ...codingRulesClearedPendingFields},
errors: null,
},
});
Expand Down
31 changes: 31 additions & 0 deletions tests/actions/CopyPolicySettingsTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
Loading