From 85a4fd446acd0ea53f0125bfc6ecab38295c5d4c Mon Sep 17 00:00:00 2001 From: mkzie2 Date: Tue, 4 Feb 2025 11:48:57 +0700 Subject: [PATCH 1/2] fix: pending is displayed when deleting the distance rate --- src/libs/DistanceRequestUtils.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libs/DistanceRequestUtils.ts b/src/libs/DistanceRequestUtils.ts index fd57144c98ca..d5843a9fde72 100644 --- a/src/libs/DistanceRequestUtils.ts +++ b/src/libs/DistanceRequestUtils.ts @@ -362,8 +362,8 @@ function getRate({ } const policyCurrency = policy?.outputCurrency ?? getPersonalPolicy()?.outputCurrency ?? CONST.CURRENCY.USD; const defaultMileageRate = getDefaultMileageRate(policy); - const customUnitRateID = getRateID(transaction); - const customMileageRate = customUnitRateID ? mileageRates?.[customUnitRateID] : defaultMileageRate; + const customUnitRateID = getRateID(transaction) ?? String(CONST.DEFAULT_NUMBER_ID); + const customMileageRate = mileageRates?.[customUnitRateID] ?? defaultMileageRate; const mileageRate = isCustomUnitRateIDForP2P(transaction) ? getRateForP2P(policyCurrency, transaction) : customMileageRate; const unit = getDistanceUnit(useTransactionDistanceUnit ? transaction : undefined, mileageRate); return { From 1da5948be26effb895943662919236cb672baf0e Mon Sep 17 00:00:00 2001 From: mkzie2 Date: Thu, 6 Feb 2025 16:55:24 +0700 Subject: [PATCH 2/2] remove string default value --- src/libs/DistanceRequestUtils.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/libs/DistanceRequestUtils.ts b/src/libs/DistanceRequestUtils.ts index ce417a944676..56877e1c60d4 100644 --- a/src/libs/DistanceRequestUtils.ts +++ b/src/libs/DistanceRequestUtils.ts @@ -367,8 +367,9 @@ function getRate({ } const policyCurrency = policy?.outputCurrency ?? getPersonalPolicy()?.outputCurrency ?? CONST.CURRENCY.USD; const defaultMileageRate = getDefaultMileageRate(policy); - const customUnitRateID = getRateID(transaction) ?? String(CONST.DEFAULT_NUMBER_ID); - const customMileageRate = mileageRates?.[customUnitRateID] ?? defaultMileageRate; + const customUnitRateID = getRateID(transaction); + // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing + const customMileageRate = (customUnitRateID && mileageRates?.[customUnitRateID]) || defaultMileageRate; const mileageRate = isCustomUnitRateIDForP2P(transaction) ? getRateForP2P(policyCurrency, transaction) : customMileageRate; const unit = getDistanceUnit(useTransactionDistanceUnit ? transaction : undefined, mileageRate); return {