From aa075ee6770b9c9942fda885c06b788b652c74a3 Mon Sep 17 00:00:00 2001 From: Bernhard Owen Josephus Date: Thu, 11 Dec 2025 12:48:37 +0800 Subject: [PATCH 1/2] fix deleted distance rate reappears --- src/libs/actions/Policy/DistanceRate.ts | 52 +++++++------------------ 1 file changed, 13 insertions(+), 39 deletions(-) diff --git a/src/libs/actions/Policy/DistanceRate.ts b/src/libs/actions/Policy/DistanceRate.ts index bf49e71f5e96..1196da67dd54 100644 --- a/src/libs/actions/Policy/DistanceRate.ts +++ b/src/libs/actions/Policy/DistanceRate.ts @@ -397,30 +397,18 @@ function deletePolicyDistanceRates( transactionIDsAffected: string[], transactionViolations: OnyxCollection, ) { - const currentRates = customUnit.rates; - const optimisticRates: Record = {}; - const successRates: Record = {}; - const failureRates: Record = {}; - - for (const rateID of Object.keys(currentRates)) { - if (rateIDsToDelete.includes(rateID)) { - optimisticRates[rateID] = { - ...currentRates[rateID], - enabled: false, - pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE, - }; - failureRates[rateID] = { - ...currentRates[rateID], - pendingAction: null, - errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'), - }; - } else { - optimisticRates[rateID] = currentRates[rateID]; - successRates[rateID] = { - ...currentRates[rateID], - pendingAction: null, - }; - } + const optimisticRates: Record> = {}; + const failureRates: Record> = {}; + + for (const rateID of rateIDsToDelete) { + optimisticRates[rateID] = { + enabled: false, + pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE, + }; + failureRates[rateID] = { + pendingAction: null, + errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'), + }; } const optimisticData: OnyxUpdate[] = [ @@ -437,20 +425,6 @@ function deletePolicyDistanceRates( }, ]; - const successData: OnyxUpdate[] = [ - { - onyxMethod: Onyx.METHOD.MERGE, - key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`, - value: { - customUnits: { - [customUnit.customUnitID]: { - rates: successRates, - }, - }, - }, - }, - ]; - const failureData: OnyxUpdate[] = [ { onyxMethod: Onyx.METHOD.MERGE, @@ -503,7 +477,7 @@ function deletePolicyDistanceRates( customUnitRateID: rateIDsToDelete, }; - API.write(WRITE_COMMANDS.DELETE_POLICY_DISTANCE_RATES, params, {optimisticData, successData, failureData}); + API.write(WRITE_COMMANDS.DELETE_POLICY_DISTANCE_RATES, params, {optimisticData, failureData}); } function updateDistanceTaxClaimableValue(policyID: string, customUnit: CustomUnit, customUnitRates: Rate[]) { From f9718b96d7110aca23dd3d3a3bf14111baf40541 Mon Sep 17 00:00:00 2001 From: Bernhard Owen Josephus Date: Fri, 12 Dec 2025 18:25:46 +0800 Subject: [PATCH 2/2] restore the enabled state on fails --- src/libs/actions/Policy/DistanceRate.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/libs/actions/Policy/DistanceRate.ts b/src/libs/actions/Policy/DistanceRate.ts index 1196da67dd54..11a705e20f2b 100644 --- a/src/libs/actions/Policy/DistanceRate.ts +++ b/src/libs/actions/Policy/DistanceRate.ts @@ -397,6 +397,7 @@ function deletePolicyDistanceRates( transactionIDsAffected: string[], transactionViolations: OnyxCollection, ) { + const currentRates = customUnit.rates; const optimisticRates: Record> = {}; const failureRates: Record> = {}; @@ -406,6 +407,7 @@ function deletePolicyDistanceRates( pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE, }; failureRates[rateID] = { + enabled: currentRates[rateID].enabled, pendingAction: null, errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'), };