zec
/
secant-android-wallet
mirror of https://github.com/zcash/secant-android-wallet.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Currency conversion floating point hotfix

This commit is contained in:
Milan Cerovsky 2024-08-26 10:19:30 +02:00
parent bdf105e356
commit 7b808c53c8
3 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@ -131,7 +131,7 @@ ZCASH_EMULATOR_WTF_API_KEY=
# Optional absolute path to a Zcash SDK checkout. # Optional absolute path to a Zcash SDK checkout.
# When blank, it pulls the SDK from Maven. # When blank, it pulls the SDK from Maven.
# When set, it uses the path for a Gradle included build. Path can either be absolute or relative to the root of this app's Gradle project. # When set, it uses the path for a Gradle included build. Path can either be absolute or relative to the root of this app's Gradle project.
SDK_INCLUDED_BUILD_PATH= SDK_INCLUDED_BUILD_PATH=/Users/milancerovsky/Developer/zcash/zcash-android-wallet-sdk
# When blank, it pulls the BIP-39 library from Maven. # When blank, it pulls the BIP-39 library from Maven.
# When set, it uses the path for a Gradle included build. Path can either be absolute or relative to the root of this app's Gradle project. # When set, it uses the path for a Gradle included build. Path can either be absolute or relative to the root of this app's Gradle project.

14
ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/exchangerate/widget/StyledExchangeBalance.kt
View File

@ -158,15 +158,11 @@ internal fun createExchangeRateText(
if (isHideBalances) { if (isHideBalances) {
"${currencySymbol}${hiddenBalancePlaceholder.getValue()}" "${currencySymbol}${hiddenBalancePlaceholder.getValue()}"
} else if (state.currencyConversion != null) { } else if (state.currencyConversion != null) {
val value = zatoshi.toFiatString(
zatoshi.toFiatString( currencyConversion = state.currencyConversion,
currencyConversion = state.currencyConversion, locale = Locale.current.toKotlinLocale(),
locale = Locale.current.toKotlinLocale(), monetarySeparators = MonetarySeparators.current(java.util.Locale.getDefault()),
monetarySeparators = MonetarySeparators.current(java.util.Locale.getDefault()), )
includeSymbols = false
)
"$currencySymbol$value"
} else { } else {
currencySymbol currencySymbol
} }

3
ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/send/model/AmountState.kt
View File

@ -69,8 +69,7 @@ sealed interface AmountState {
currencyConversion = currencyConversion, currencyConversion = currencyConversion,
locale = Locale.current.toKotlinLocale(), locale = Locale.current.toKotlinLocale(),
monetarySeparators = MonetarySeparators.current(java.util.Locale.getDefault()), monetarySeparators = MonetarySeparators.current(java.util.Locale.getDefault()),
includeSymbols = false ).replace(currencyConversion.fiatCurrency.symbol, "")
)
} }
) )
} }