Skip to content

Receipt required over CA$25.00 displayed briefly and changes to C$25.00 #70957

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
stitesExpensify merged 2 commits into from
Sep 29, 2025
Merged

Receipt required over CA$25.00 displayed briefly and changes to C$25.00 #70957

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f8e530
fix: local symbol
lorretheboy Sep 21, 2025
004a15a
Merge branch 'main' of https://github.com/Expensify/App into fix/70244
lorretheboy Sep 22, 2025
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
16 changes: 15 additions & 1 deletion src/libs/CurrencyUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

let currencyList: OnyxValues[typeof ONYXKEYS.CURRENCY_LIST] = {};

Onyx.connect({

Check warning on line 11 in src/libs/CurrencyUtils.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function

Check warning on line 11 in src/libs/CurrencyUtils.ts

View workflow job for this annotation

GitHub Actions / ESLint check 

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
key: ONYXKEYS.CURRENCY_LIST,
callback: (val) => {
if (!val || Object.keys(val).length === 0) {
Expand Down Expand Up @@ -105,7 +105,7 @@
* @param amountInCents – should be an integer. Anything after a decimal place will be dropped.
* @param currency - IOU currency
*/
function convertToDisplayString(amountInCents = 0, currency: string = CONST.CURRENCY.USD): string {
function convertToDisplayString(amountInCents = 0, currency: string = CONST.CURRENCY.USD, shouldUseLocalCurrencySymbol = false): string {
const convertedAmount = convertToFrontendAmountAsInteger(amountInCents, currency);
/**
* Fallback currency to USD if it empty string or undefined
Expand All @@ -114,6 +114,20 @@
if (!currency) {
currencyWithFallback = CONST.CURRENCY.USD;
}

if (shouldUseLocalCurrencySymbol) {
const currencySymbol = getCurrencySymbol(currencyWithFallback);

if (currencySymbol) {
const formattedNumber = format(IntlStore.getCurrentLocale(), convertedAmount, {
style: 'decimal',
minimumFractionDigits: getCurrencyDecimals(currency),
maximumFractionDigits: 2,
});
return `${currencySymbol}${formattedNumber}`;
}
}

return format(IntlStore.getCurrentLocale(), convertedAmount, {
style: 'currency',
currency: currencyWithFallback,
Expand Down
2 changes: 1 addition & 1 deletion src/libs/Violations/ViolationsUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ const ViolationsUtils = {
shouldShowCategoryReceiptRequiredViolation || !policy.maxExpenseAmountNoReceipt
? undefined
: {
formattedLimit: CurrencyUtils.convertToDisplayString(policy.maxExpenseAmountNoReceipt, policy.outputCurrency),
formattedLimit: CurrencyUtils.convertToDisplayString(policy.maxExpenseAmountNoReceipt, policy.outputCurrency, true),
},
type: CONST.VIOLATION_TYPES.VIOLATION,
showInReview: true,
Expand Down
Loading