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

Currency conversion floating point hotfix #1569

Merged
merged 4 commits into from
Aug 27, 2024
Merged

Currency conversion floating point hotfix #1569

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2a0774d
Currency conversion floating point hotfix
Milan-Cerovsky Aug 26, 2024
e2d23ae
Revert "Currency conversion floating point hotfix"
Milan-Cerovsky Aug 26, 2024
c60b522
Currency conversion floating point hotfix
Milan-Cerovsky Aug 26, 2024
83ac357
Currency conversion floating point hotfix
Milan-Cerovsky Aug 27, 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
20 changes: 9 additions & 11 deletions sdk-incubator-lib/src/main/java/cash/z/ecc/android/sdk/model/ZatoshiExt.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,18 +73,10 @@ fun BigDecimal.convertFiatDecimalToFiatString(
monetarySeparators: MonetarySeparators,
includeSymbols: Boolean = true
): String {
val numberFormat =
if (includeSymbols) {
NumberFormat.getCurrencyInstance(locale)
} else {
NumberFormat.getInstance(locale)
}
val numberFormat = NumberFormat.getCurrencyInstance(locale)

return numberFormat.apply {
if (includeSymbols) {
currency = fiatCurrency
}

currency = fiatCurrency
roundingMode = RoundingMode.HALF_EVEN
if (this is DecimalFormat) {
decimalFormatSymbols.apply {
Expand All @@ -95,5 +87,11 @@ fun BigDecimal.convertFiatDecimalToFiatString(
}
}
}
}.format(this)
}.format(this).let {
if (includeSymbols) {
it
} else {
it.replace(fiatCurrency.symbol, "")
Copy link
Contributor

@daira daira Aug 26, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

This won't remove spaces from the output. For example, the currency format for the CANADA_FRENCH locale is something like "1,23\u00A0$", and so the "\u00A0" (non-breaking space) won't be removed.

Suggested change
it.replace(fiatCurrency.symbol, "")
it.replace(fiatCurrency.symbol, "").strip()

(see java.lang.String.strip).

}
}
}
Loading