Skip to content
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

Jump to bottom

fix: convert distance value to meters if necessary #43819

Merged
merged 3 commits into from
Jul 11, 2024
Merged

fix: convert distance value to meters if necessary #43819

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3d70532
fix: convert distance value to meters if necessary
dominictb Jun 17, 2024
654b8b4
Merge remote-tracking branch 'origin/main' into fix/42959-distance-track
dominictb Jul 11, 2024
ca8d718
fix: do not convert distance in case API call is not finished
dominictb Jul 11, 2024
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
15 changes: 12 additions & 3 deletions src/components/MoneyRequestConfirmationList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,10 +259,7 @@ function MoneyRequestConfirmationList({

const {unit, rate} = mileageRate ?? {};

const distance = TransactionUtils.getDistance(transaction);
const prevRate = usePrevious(rate);
const prevDistance = usePrevious(distance);
const shouldCalculateDistanceAmount = isDistanceRequest && (iouAmount === 0 || prevRate !== rate || prevDistance !== distance);

const currency = (mileageRate as MileageRate)?.currency ?? policyCurrency;

Expand Down Expand Up @@ -305,6 +302,18 @@ function MoneyRequestConfirmationList({
// A flag for showing the billable field
const shouldShowBillable = policy?.disabledFields?.defaultBillable === false;
const isMovingTransactionFromTrackExpense = IOUUtils.isMovingTransactionFromTrackExpense(action);

const distance = useMemo(() => {
const value = TransactionUtils.getDistance(transaction);
if (isMovingTransactionFromTrackExpense && unit) {
return DistanceRequestUtils.convertToDistanceInMeters(value, unit);
}
return value;
}, [isMovingTransactionFromTrackExpense, unit, transaction]);
const prevDistance = usePrevious(distance);

const shouldCalculateDistanceAmount = isDistanceRequest && (iouAmount === 0 || prevRate !== rate || prevDistance !== distance);

const hasRoute = TransactionUtils.hasRoute(transaction, isDistanceRequest);
const isDistanceRequestWithPendingRoute = isDistanceRequest && (!hasRoute || !rate) && !isMovingTransactionFromTrackExpense;
const formattedAmount = isDistanceRequestWithPendingRoute
Expand Down
Loading