1 files changed, 6 insertions, 5 deletions
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 148b8c0..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
@@ -67,19 +68,19 @@ class ManualWithdrawFragment : Fragment() {
     }
 
     private fun onCheckFees() {
-        if (ui.amountView.text?.isEmpty() != false) {
+        val currency = exchangeItem.currency
+        if (currency == null || ui.amountView.text?.isEmpty() != false) {
             ui.amountLayout.error = getString(R.string.withdraw_amount_error)
             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(exchangeItem.currency, value)
         ui.amountView.hideKeyboard()
 
         withdrawManager.getWithdrawalDetails(exchangeItem.exchangeBaseUrl, amount)