Merge pull request #43308 from Expensify/monil-preventAPICalls

Return early and prevent calling API if value didn't change
Expensify · Jun 7, 2024 · 13fedce · 13fedce
2 parents a82dcb3 + 387097e
commit 13fedce
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 3 deletions.
diff --git a/src/pages/workspace/distanceRates/PolicyDistanceRateEditPage.tsx b/src/pages/workspace/distanceRates/PolicyDistanceRateEditPage.tsx
@@ -42,9 +42,13 @@ function PolicyDistanceRateEditPage({policy, route}: PolicyDistanceRateEditPageP
     const customUnit = customUnits[Object.keys(customUnits)[0]];
     const rate = customUnit?.rates[rateID];
     const currency = rate?.currency ?? CONST.CURRENCY.USD;
-    const currentRateValue = (rate?.rate ?? 0).toString();
+    const currentRateValue = (parseFloat((rate?.rate ?? 0).toString()) / CONST.POLICY.CUSTOM_UNIT_RATE_BASE_OFFSET).toFixed(3);
 
     const submitRate = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.POLICY_DISTANCE_RATE_EDIT_FORM>) => {
+        if (currentRateValue === values.rate) {
+            Navigation.goBack();
+            return;
+        }
         DistanceRate.updatePolicyDistanceRateValue(policyID, customUnit, [{...rate, rate: Number(values.rate) * CONST.POLICY.CUSTOM_UNIT_RATE_BASE_OFFSET}]);
         Keyboard.dismiss();
         Navigation.goBack();
@@ -92,7 +96,7 @@ function PolicyDistanceRateEditPage({policy, route}: PolicyDistanceRateEditPageP
                         InputComponent={AmountForm}
                         inputID={INPUT_IDS.RATE}
                         extraDecimals={1}
-                        defaultValue={(parseFloat(currentRateValue) / CONST.POLICY.CUSTOM_UNIT_RATE_BASE_OFFSET).toFixed(3)}
+                        defaultValue={currentRateValue}
                         isCurrencyPressable={false}
                         currency={currency}
                         ref={inputCallbackRef}

diff --git a/src/pages/workspace/distanceRates/PolicyDistanceRateTaxRateEditPage.tsx b/src/pages/workspace/distanceRates/PolicyDistanceRateTaxRateEditPage.tsx
@@ -50,6 +50,10 @@ function PolicyDistanceRateTaxRateEditPage({route, policy}: PolicyDistanceRateTa
     }, [policy, taxRateExternalID]);
 
     const onTaxRateChange = (newTaxRate: ListItemType) => {
+        if (taxRateExternalID === newTaxRate.value) {
+            Navigation.goBack();
+            return;
+        }
         DistanceRate.updateDistanceTaxRate(policyID, customUnit, [
             {
                 ...rate,

diff --git a/src/pages/workspace/distanceRates/PolicyDistanceRateTaxReclaimableEditPage.tsx b/src/pages/workspace/distanceRates/PolicyDistanceRateTaxReclaimableEditPage.tsx
@@ -40,6 +40,10 @@ function PolicyDistanceRateTaxReclaimableEditPage({route, policy}: PolicyDistanc
     const currentTaxReclaimableOnValue = rate.attributes?.taxClaimablePercentage && rate.rate ? ((rate.attributes.taxClaimablePercentage * rate.rate) / 100).toFixed(decimals) : '';
 
     const submitTaxReclaimableOn = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.POLICY_DISTANCE_RATE_TAX_RECLAIMABLE_ON_EDIT_FORM>) => {
+        if (values.taxClaimableValue === currentTaxReclaimableOnValue) {
+            Navigation.goBack();
+            return;
+        }
         DistanceRate.updateDistanceTaxClaimableValue(policyID, customUnit, [
             {
                 ...rate,

diff --git a/src/pages/workspace/taxes/ValuePage.tsx b/src/pages/workspace/taxes/ValuePage.tsx
@@ -42,10 +42,14 @@ function ValuePage({
 
     const submit = useCallback(
         (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_TAX_VALUE_FORM>) => {
+            if (defaultValue === values.value) {
+                goBack();
+                return;
+            }
             updatePolicyTaxValue(policyID, taxID, Number(values.value));
             goBack();
         },
-        [goBack, policyID, taxID],
+        [goBack, policyID, taxID, defaultValue],
     );
 
     if (!currentTaxRate) {