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

Get distance from transaction vs route #40307

Merged
merged 5 commits into from
Apr 30, 2024
Merged

Get distance from transaction vs route #40307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dc229ae
Define the TransactionCustomUnit type
neil-marcellini Apr 16, 2024
792cec8
Update how distance is accessed
neil-marcellini Apr 16, 2024
803dbb7
Merge branch 'main' into neil-TransactionCustomUnit
neil-marcellini Apr 30, 2024
9c2f556
Fix lint by removing type assertions
neil-marcellini Apr 30, 2024
2859ec2
Update getDistance util and use it more
neil-marcellini Apr 30, 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
2 changes: 1 addition & 1 deletion src/components/MoneyRequestConfirmationList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ function MoneyRequestConfirmationList({

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

const distance = transaction?.routes?.route0?.distance ?? 0;
const distance = TransactionUtils.getDistance(transaction);
const taxRates = policy?.taxRates ?? null;

// A flag for showing the categories field
Expand Down
6 changes: 3 additions & 3 deletions src/components/ReportActionItem/MoneyRequestView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,11 +195,11 @@ function MoneyRequestView({

const currency = policy ? policy.outputCurrency : PolicyUtils.getPersonalPolicy()?.outputCurrency ?? CONST.CURRENCY.USD;

const mileageRate = TransactionUtils.isCustomUnitRateIDForP2P(transaction) ? DistanceRequestUtils.getRateForP2P(currency) : distanceRates[rateID as string] ?? {};
const mileageRate = TransactionUtils.isCustomUnitRateIDForP2P(transaction) ? DistanceRequestUtils.getRateForP2P(currency) : distanceRates[rateID] ?? {};
const {unit} = mileageRate;
const rate = (transaction?.comment?.customUnit?.defaultP2PRate as number) ?? mileageRate.rate;
const rate = transaction?.comment?.customUnit?.defaultP2PRate ?? mileageRate.rate;

const distance = DistanceRequestUtils.convertToDistanceInMeters((transaction?.comment?.customUnit?.quantity as number) ?? 0, unit);
const distance = DistanceRequestUtils.convertToDistanceInMeters(TransactionUtils.getDistance(transaction), unit);
const rateToDisplay = DistanceRequestUtils.getRateForDisplay(unit, rate, currency, translate, toLocaleDigit, isOffline);
const distanceToDisplay = DistanceRequestUtils.getDistanceForDisplay(hasRoute, distance, unit, rate, translate);
let merchantTitle = isEmptyMerchant ? '' : transactionMerchant;
Expand Down
4 changes: 2 additions & 2 deletions src/libs/TransactionUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,8 +356,8 @@ function getMerchant(transaction: OnyxEntry<Transaction>): string {
return transaction?.modifiedMerchant ? transaction.modifiedMerchant : transaction?.merchant ?? '';
}

function getDistance(transaction: Transaction): number {
return transaction?.routes?.route0?.distance ?? 0;
function getDistance(transaction: Transaction | null): number {
return transaction?.comment?.customUnit?.quantity ?? 0;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Coming from #41389. With this change we also needed to tweak this

App/src/components/MoneyRequestConfirmationList.tsx

Line 266 in 5f50430

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

in order to adjust the quantity whenever there's a modification in the distance. More details here.

}

/**
Expand Down
10 changes: 9 additions & 1 deletion src/types/onyx/Transaction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,20 @@ type Comment = {
waypoints?: WaypointCollection;
isLoading?: boolean;
type?: string;
customUnit?: Record<string, unknown>;
customUnit?: TransactionCustomUnit;
source?: string;
originalTransactionID?: string;
splits?: Split[];
};

type TransactionCustomUnit = {
customUnitID?: string;
customUnitRateID?: string;
quantity?: number;
name?: string;
defaultP2PRate?: number;
};

type GeometryType = 'LineString';

type Geometry = {
Expand Down
Loading