Skip to content

Fix manual distance expense from QAB showing amount as zero #84658

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
francoisl merged 10 commits into from
Mar 12, 2026
Merged

Fix manual distance expense from QAB showing amount as zero #84658

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
dd50aaa
Fix: Compute amount for manual distance expenses created via QAB
MelvinBot Mar 10, 2026
7099eaf
Fix: use getRate() for P2P manual distance amount calculation
MelvinBot Mar 10, 2026
d5f0295
Fix: compute merchant string for manual distance skip-confirmation path
MelvinBot Mar 12, 2026
6b496a0
Fix: make toLocaleDigit and getCurrencySymbol optional in MoneyReques…
MelvinBot Mar 12, 2026
3ab015e
Fix: initialize toLocaleDigit and getCurrencySymbol locally
MelvinBot Mar 12, 2026
e81786b
Remove redundant setMoneyRequestMerchant call
MelvinBot Mar 12, 2026
91c4920
Fix: correct import ordering for Prettier compliance
MelvinBot Mar 12, 2026
e6fce8d
Merge remote-tracking branch 'origin/claude-fixManualDistanceQABZeroA…
MelvinBot Mar 12, 2026
5e274a8
Fix: restore setMoneyRequestMerchant call to update Onyx transaction
MelvinBot Mar 12, 2026
78fe023
Use CONST.CURRENCY.USD instead of string literal
MelvinBot Mar 12, 2026
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
31 changes: 26 additions & 5 deletions src/libs/actions/IOU/MoneyRequest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
import {getCurrencySymbol} from '@libs/CurrencyUtils';
import DistanceRequestUtils from '@libs/DistanceRequestUtils';
import getCurrentPosition from '@libs/getCurrentPosition';
import {calculateDefaultReimbursable, getExistingTransactionID, navigateToConfirmationPage, navigateToParticipantPage} from '@libs/IOUUtils';
import {toLocaleDigit} from '@libs/LocaleDigitUtils';
import Log from '@libs/Log';
import Navigation from '@libs/Navigation/Navigation';
import {roundToTwoDecimalPlaces} from '@libs/NumberUtils';
Expand All @@ -15,6 +17,7 @@ import type {ReceiptFile} from '@pages/iou/request/step/IOURequestStepScan/types
import {setTransactionReport} from '@userActions/Transaction';
import type {IOUType} from '@src/CONST';
import CONST from '@src/CONST';
import IntlStore from '@src/languages/IntlStore';
import type {TranslationParameters, TranslationPaths} from '@src/languages/types';
import ONYXKEYS from '@src/ONYXKEYS';
import type {Route} from '@src/ROUTES';
Expand Down Expand Up @@ -620,7 +623,6 @@ function handleMoneyRequestStepDistanceNavigation({
cancelSpan(CONST.TELEMETRY.SPAN_CONFIRMATION_LIST_READY);
cancelSpan(CONST.TELEMETRY.SPAN_CONFIRMATION_RECEIPT_LOAD);
setMoneyRequestPendingFields(transactionID, {waypoints: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD});
setMoneyRequestMerchant(transactionID, translate('iou.fieldPending'), false);
const isCreatingTrackExpense = iouType === CONST.IOU.TYPE.TRACK;
const participant = participants.at(0);
const isPolicyExpenseChat = !!participant?.isPolicyExpenseChat;
Expand All @@ -634,6 +636,25 @@ function handleMoneyRequestStepDistanceNavigation({

const validWaypoints = !isManualDistance && !isOdometerDistance ? getValidWaypoints(waypoints, true, isGPSDistance) : undefined;

let amount = 0;
let merchant = translate('iou.fieldPending');
if (isManualDistance && distance !== undefined && unit) {
const distanceInMeters = DistanceRequestUtils.convertToDistanceInMeters(distance, unit);
const mileageRate = DistanceRequestUtils.getRate({transaction, policy});
amount = DistanceRequestUtils.getDistanceRequestAmount(distanceInMeters, unit, mileageRate?.rate ?? 0);
merchant = DistanceRequestUtils.getDistanceMerchant(
true,
distanceInMeters,
unit,
mileageRate?.rate ?? 0,
mileageRate?.currency ?? transaction?.currency ?? CONST.CURRENCY.USD,
translate,
(digit) => toLocaleDigit(IntlStore.getCurrentLocale(), digit),
getCurrencySymbol,
true,
);
}
setMoneyRequestMerchant(transactionID, merchant, false);
if (isCreatingTrackExpense && participant) {
trackExpense({
report,
Expand All @@ -647,11 +668,11 @@ function handleMoneyRequestStepDistanceNavigation({
policy,
},
transactionParams: {
amount: 0,
amount,
distance,
currency: transaction?.currency ?? 'USD',
created: transaction?.created ?? '',
merchant: translate('iou.fieldPending'),
merchant,
receipt: {},
billable: false,
reimbursable: defaultReimbursable,
Expand Down Expand Up @@ -682,12 +703,12 @@ function handleMoneyRequestStepDistanceNavigation({
iouType,
existingTransaction: transaction,
transactionParams: {
amount: 0,
amount,
distance,
comment: '',
created: transaction?.created ?? '',
currency: transaction?.currency ?? 'USD',
merchant: translate('iou.fieldPending'),
merchant,
billable: !!policy?.defaultBillable,
reimbursable: defaultReimbursable,
validWaypoints,
Expand Down
Loading