Skip to content
Merged
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
21 changes: 20 additions & 1 deletion src/components/MoneyRequestConfirmationList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ import {
getTaxValue,
hasMissingSmartscanFields,
hasRoute as hasRouteUtil,
isCustomUnitRateIDForP2P as isCustomUnitRateIDForP2PUtil,
isMerchantMissing,
isScanRequest as isScanRequestUtil,
} from '@libs/TransactionUtils';
Expand Down Expand Up @@ -269,6 +270,7 @@ function MoneyRequestConfirmationList({
const isTypeInvoice = iouType === CONST.IOU.TYPE.INVOICE;
const isScanRequest = useMemo(() => isScanRequestUtil(transaction), [transaction]);
const isCreateExpenseFlow = !!transaction?.isFromGlobalCreate && !isPerDiemRequest;
const isCustomUnitRateIDForP2P = isCustomUnitRateIDForP2PUtil(transaction);

const transactionID = transaction?.transactionID;
const customUnitRateID = getRateID(transaction);
Expand Down Expand Up @@ -427,9 +429,26 @@ function MoneyRequestConfirmationList({
return;
}

if (isCustomUnitRateIDForP2P && DistanceRequestUtils.getDefaultMileageRate(policy)) {
const defaultMileageRatePolicy = DistanceRequestUtils.getDefaultMileageRate(policy);
setCustomUnitRateID(transactionID, defaultMileageRatePolicy?.customUnitRateID);
return;
}

// If none of the above conditions are met, display the rate error
setFormError(errorKey);
}, [isDistanceRequest, isPolicyExpenseChat, transactionID, mileageRate, customUnitRateID, policy, isMovingTransactionFromTrackExpense, setFormError, clearFormErrors]);
}, [
isDistanceRequest,
isPolicyExpenseChat,
transactionID,
mileageRate,
customUnitRateID,
policy,
isMovingTransactionFromTrackExpense,
setFormError,
clearFormErrors,
isCustomUnitRateIDForP2P,
]);

const routeError = Object.values(transaction?.errorFields?.route ?? {}).at(0);
const isFirstUpdatedDistanceAmount = useRef(false);
Expand Down
Loading