From bea61d4e642f680194c9c66d43d9bc382db255c4 Mon Sep 17 00:00:00 2001 From: cretadn22 Date: Mon, 1 Dec 2025 18:30:25 +0700 Subject: [PATCH 1/2] add-defaultTaxCode-as-fallback --- .../iou/request/step/IOURequestStepDistanceRate.tsx | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/pages/iou/request/step/IOURequestStepDistanceRate.tsx b/src/pages/iou/request/step/IOURequestStepDistanceRate.tsx index e27773498d9b5..08199cef41f6b 100644 --- a/src/pages/iou/request/step/IOURequestStepDistanceRate.tsx +++ b/src/pages/iou/request/step/IOURequestStepDistanceRate.tsx @@ -16,7 +16,15 @@ import {shouldUseTransactionDraft} from '@libs/IOUUtils'; import Navigation from '@libs/Navigation/Navigation'; import {getDistanceRateCustomUnitRate, isTaxTrackingEnabled} from '@libs/PolicyUtils'; import {isReportInGroupPolicy} from '@libs/ReportUtils'; -import {calculateTaxAmount, getCurrency, getDistanceInMeters, getRateID, getTaxValue, isDistanceRequest as isDistanceRequestTransactionUtils} from '@libs/TransactionUtils'; +import { + calculateTaxAmount, + getCurrency, + getDefaultTaxCode, + getDistanceInMeters, + getRateID, + getTaxValue, + isDistanceRequest as isDistanceRequestTransactionUtils, +} from '@libs/TransactionUtils'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import type SCREENS from '@src/SCREENS'; @@ -93,7 +101,8 @@ function IOURequestStepDistanceRate({ let taxRateExternalID; if (shouldShowTax) { const policyCustomUnitRate = getDistanceRateCustomUnitRate(policy, customUnitRateID); - taxRateExternalID = policyCustomUnitRate?.attributes?.taxRateExternalID; + const defaultTaxCode = getDefaultTaxCode(policy, transaction) ?? ''; + taxRateExternalID = policyCustomUnitRate?.attributes?.taxRateExternalID || defaultTaxCode; const unit = DistanceRequestUtils.getDistanceUnit(transaction, rates[customUnitRateID]); const taxableAmount = DistanceRequestUtils.getTaxableAmount(policy, customUnitRateID, getDistanceInMeters(transaction, unit)); const taxPercentage = taxRateExternalID ? getTaxValue(policy, transaction, taxRateExternalID) : undefined; From a73162e91a92a7fff5275472416ffd9293a94b29 Mon Sep 17 00:00:00 2001 From: cretadn22 Date: Mon, 1 Dec 2025 18:52:12 +0700 Subject: [PATCH 2/2] add eslint-disable-next-line --- src/pages/iou/request/step/IOURequestStepDistanceRate.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/iou/request/step/IOURequestStepDistanceRate.tsx b/src/pages/iou/request/step/IOURequestStepDistanceRate.tsx index 08199cef41f6b..2db9739adc717 100644 --- a/src/pages/iou/request/step/IOURequestStepDistanceRate.tsx +++ b/src/pages/iou/request/step/IOURequestStepDistanceRate.tsx @@ -102,6 +102,7 @@ function IOURequestStepDistanceRate({ if (shouldShowTax) { const policyCustomUnitRate = getDistanceRateCustomUnitRate(policy, customUnitRateID); const defaultTaxCode = getDefaultTaxCode(policy, transaction) ?? ''; + // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing taxRateExternalID = policyCustomUnitRate?.attributes?.taxRateExternalID || defaultTaxCode; const unit = DistanceRequestUtils.getDistanceUnit(transaction, rates[customUnitRateID]); const taxableAmount = DistanceRequestUtils.getTaxableAmount(policy, customUnitRateID, getDistanceInMeters(transaction, unit));