diff options
author | Torsten Grote <t@grobox.de> | 2023-06-12 15:19:10 -0300 |
---|---|---|
committer | Torsten Grote <t@grobox.de> | 2023-06-12 15:19:10 -0300 |
commit | b991a48dc206a006ff384a5194217e29b76dafd0 (patch) | |
tree | a1750e8bffebad1dac2ebabb973b0ff829bc13ba /wallet/src/main/java/net/taler/wallet/withdraw | |
parent | b064cb0fbbc90ed92539178075959a747c85b43c (diff) | |
download | taler-android-b991a48dc206a006ff384a5194217e29b76dafd0.tar.gz taler-android-b991a48dc206a006ff384a5194217e29b76dafd0.tar.bz2 taler-android-b991a48dc206a006ff384a5194217e29b76dafd0.zip |
Remove Amount#fromDouble() as it was buggy and isn't really needed
Diffstat (limited to 'wallet/src/main/java/net/taler/wallet/withdraw')
-rw-r--r-- | wallet/src/main/java/net/taler/wallet/withdraw/TransactionWithdrawalComposable.kt | 4 | ||||
-rw-r--r-- | wallet/src/main/java/net/taler/wallet/withdraw/manual/ManualWithdrawFragment.kt | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/wallet/src/main/java/net/taler/wallet/withdraw/TransactionWithdrawalComposable.kt b/wallet/src/main/java/net/taler/wallet/withdraw/TransactionWithdrawalComposable.kt index f1a22d3..3996ec1 100644 --- a/wallet/src/main/java/net/taler/wallet/withdraw/TransactionWithdrawalComposable.kt +++ b/wallet/src/main/java/net/taler/wallet/withdraw/TransactionWithdrawalComposable.kt @@ -133,8 +133,8 @@ fun TransactionWithdrawalComposablePreview() { extendedStatus = ExtendedStatus.Pending, exchangeBaseUrl = "https://exchange.demo.taler.net/", withdrawalDetails = ManualTransfer(exchangePaytoUris = emptyList()), - amountRaw = Amount.fromDouble("TESTKUDOS", 42.23), - amountEffective = Amount.fromDouble("TESTKUDOS", 42.1337), + amountRaw = Amount.fromString("TESTKUDOS", "42.23"), + amountEffective = Amount.fromString("TESTKUDOS", "42.1337"), error = TalerErrorInfo(code = TalerErrorCode.WALLET_WITHDRAWAL_KYC_REQUIRED), ) val listener = object : ActionListener { diff --git a/wallet/src/main/java/net/taler/wallet/withdraw/manual/ManualWithdrawFragment.kt b/wallet/src/main/java/net/taler/wallet/withdraw/manual/ManualWithdrawFragment.kt index aae8c95..c499c3b 100644 --- a/wallet/src/main/java/net/taler/wallet/withdraw/manual/ManualWithdrawFragment.kt +++ b/wallet/src/main/java/net/taler/wallet/withdraw/manual/ManualWithdrawFragment.kt @@ -25,6 +25,7 @@ import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.navigation.fragment.findNavController import net.taler.common.Amount +import net.taler.common.AmountParserException import net.taler.common.hideKeyboard import net.taler.wallet.MainViewModel import net.taler.wallet.R @@ -73,14 +74,13 @@ class ManualWithdrawFragment : Fragment() { return } ui.amountLayout.error = null - val value: Double + val amount: Amount try { - value = ui.amountView.text.toString().replace(',', '.').toDouble() - } catch (e: NumberFormatException) { + amount = Amount.fromString(currency, ui.amountView.text.toString()) + } catch (e: AmountParserException) { ui.amountLayout.error = getString(R.string.withdraw_amount_error) return } - val amount = Amount.fromDouble(currency, value) ui.amountView.hideKeyboard() withdrawManager.getWithdrawalDetails(exchangeItem.exchangeBaseUrl, amount) |