Skip to content

[CP Staging] Fix split distance expense showing wrong currency after workspace currency change #83618

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
lakchote merged 11 commits into from
Feb 27, 2026
Merged

[CP Staging] Fix split distance expense showing wrong currency after workspace currency change #83618

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2a82ab9
Fix split distance expense using wrong currency after workspace curre…
MelvinBot Feb 26, 2026
fa34aa8
Remove unused transactionCurrency param from getDistanceMerchantFromD…
MelvinBot Feb 26, 2026
ff5b551
Merge remote-tracking branch 'origin/main' into claude-fixSplitDistan…
MelvinBot Feb 26, 2026
9955a6b
Merge branch 'main' into claude-fixSplitDistanceCurrency
MelvinBot Feb 26, 2026
b30d222
Merge remote-tracking branch 'origin/main' into claude-fixSplitDistan…
MelvinBot Feb 26, 2026
e054219
Fix: Restore areAllConnectionsSet to DerivedValueContext type
MelvinBot Feb 26, 2026
86a88d9
Merge branch 'claude-fixSplitDistanceCurrency' of https://github.com/…
MelvinBot Feb 26, 2026
dd82e84
Revert unrelated TS changes (OnyxDerived areAllConnectionsSet)
MelvinBot Feb 26, 2026
01d9cd3
Restore areAllConnectionsSet to DerivedValueContext type
MelvinBot Feb 26, 2026
d169565
Remove non-split-related changes (OnyxDerived, tests)
MelvinBot Feb 27, 2026
897a7ee
Merge remote-tracking branch 'origin/main' into claude-fixSplitDistan…
MelvinBot Feb 27, 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
10 changes: 5 additions & 5 deletions src/libs/actions/IOU/Split.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1864,13 +1864,13 @@ function setIndividualShare(transactionID: string, participantAccountID: number,
/**
* Calculate merchant for distance transactions based on distance and rate
*/
function getDistanceMerchantFromDistance(distanceInUnits: number, unit: Unit | undefined, rate: number | undefined, currency: string, transactionCurrency?: string): string {
function getDistanceMerchantFromDistance(distanceInUnits: number, unit: Unit | undefined, rate: number | undefined, currency: string): string {
if (!rate || rate <= 0 || !unit) {
return '';
}

const distanceInMeters = DistanceRequestUtils.convertToDistanceInMeters(distanceInUnits, unit);
const currencyForMerchant = currency ?? transactionCurrency ?? CONST.CURRENCY.USD;
const currencyForMerchant = currency;
const currentLocale = IntlStore.getCurrentLocale();
return DistanceRequestUtils.getDistanceMerchant(
true,
Expand Down Expand Up @@ -1911,7 +1911,7 @@ function updateSplitExpenseDistanceFromAmount(
quantity,
};

const merchant = getDistanceMerchantFromDistance(distanceInUnits, unit, rate, mileageRate?.currency ?? transactionCurrency ?? CONST.CURRENCY.USD, transactionCurrency);
const merchant = getDistanceMerchantFromDistance(distanceInUnits, unit, rate, transactionCurrency ?? mileageRate?.currency ?? CONST.CURRENCY.USD);
Copy link

@chatgpt-codex-connector chatgpt-codex-connector bot Feb 26, 2026

Choose a reason for hiding this comment

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

P2 Badge Use selected rate currency in split amount recalculations

This change makes updateSplitExpenseDistanceFromAmount() prefer transactionCurrency over mileageRate.currency, which causes wrong merchant currency when a split expense rate is changed to one with a different currency. In split flows, amount recalculations (e.g., updateSplitExpenseAmountField) pass originalTransaction.currency as transactionCurrency, so the amount is recomputed from the new rate but the merchant string is formatted with the old currency, creating a currency/amount mismatch for edited split distances.

Useful? React with 👍 / 👎.


return {customUnit, merchant};
}
Expand Down Expand Up @@ -2339,8 +2339,8 @@ function updateSplitExpenseField(
updatedItem.amount = calculatedAmount;

// Update merchant for distance transactions
const currency = mileageRate?.currency ?? originalTransaction.currency ?? CONST.CURRENCY.USD;
updatedItem.merchant = getDistanceMerchantFromDistance(distanceInUnits, unit, rate, currency, originalTransaction.currency);
const currency = originalTransaction.currency ?? mileageRate?.currency ?? CONST.CURRENCY.USD;
Copy link

@chatgpt-codex-connector chatgpt-codex-connector bot Feb 26, 2026

Choose a reason for hiding this comment

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

P2 Badge Keep saved split-distance merchant aligned with chosen rate

When saving split distance edits, this now prioritizes originalTransaction.currency instead of mileageRate.currency for merchant formatting. In the split rate picker flow, changing customUnitRateID updates the draft transaction to the selected rate context, so if that rate uses a different currency, save will still stamp merchant text with the original transaction currency and show an incorrect currency symbol.

Useful? React with 👍 / 👎.

updatedItem.merchant = getDistanceMerchantFromDistance(distanceInUnits, unit, rate, currency);
}
}
}
Expand Down
Loading