From f0b959b4968c5da9f6e79278aec0f128a303f789 Mon Sep 17 00:00:00 2001
From: Severiano Jaramillo <severiano.jaramillo@gmail.com>
Date: Thu, 3 Jan 2019 10:27:17 -0600
Subject: [PATCH] Fix error in SendTransactionFragment, when the user typed an
 amount larger than its current balance an error would appear, but if after
 that the user erased everything the error would still be there. Also solved a
 similar error with the To account field.

---
 .../fragments/SendTransactionFragment.kt      | 33 +++++++++++++------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/SendTransactionFragment.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/SendTransactionFragment.kt
index 1b1c9bd..e453c46 100644
--- a/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/SendTransactionFragment.kt
+++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/SendTransactionFragment.kt
@@ -180,9 +180,9 @@ class SendTransactionFragment : Fragment(), ZXingScannerView.ResultHandler, Serv
         // Use RxJava Debounce to avoid making calls to the NetworkService on every text change event
         mDisposables.add(
             tietTo.textChanges()
+                .skipInitialValue()
                 .debounce(500, TimeUnit.MILLISECONDS)
                 .map { it.toString().trim() }
-                .filter { it.length > 1 }
                 .subscribe {
                     val id = mNetworkService!!.sendMessage(GetAccountByName(it!!), GetAccountByName.REQUIRED_API)
                     responseMap[id] = RESPONSE_GET_ACCOUNT_BY_NAME
@@ -192,9 +192,9 @@ class SendTransactionFragment : Fragment(), ZXingScannerView.ResultHandler, Serv
         // Use RxJava Debounce to update the Amount error only after the user stops writing for > 500 ms
         mDisposables.add(
             tietAmount.textChanges()
+                .skipInitialValue()
                 .debounce(500, TimeUnit.MILLISECONDS)
-                .filter { it.isNotEmpty() }
-                .map { it.toString().trim().toDouble() }
+                .map { it.toString().trim() }
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe { validateAmount(it!!) }
         )
@@ -370,17 +370,30 @@ class SendTransactionFragment : Fragment(), ZXingScannerView.ResultHandler, Serv
         }
     }
 
-    private fun validateAmount(amount: Double) {
+    private fun validateAmount(txtAmount: String) {
         if (mBalancesDetailsAdapter?.isEmpty != false) return
         val balance = mBalancesDetailsAdapter?.getItem(spAsset.selectedItemPosition) ?: return
         val currentAmount = balance.amount.toDouble() / Math.pow(10.0, balance.precision.toDouble())
 
-        if (currentAmount < amount) {
-            tilAmount.error = getString(R.string.error__not_enough_funds)
-            isAmountCorrect = false
-        } else {
-            tilAmount.isErrorEnabled = false
-            isAmountCorrect = true
+        val amount: Double = try {
+            txtAmount.toDouble()
+        } catch (e: Exception) {
+            0.0
+        }
+
+        when {
+            currentAmount < amount -> {
+                tilAmount.error = getString(R.string.error__not_enough_funds)
+                isAmountCorrect = false
+            }
+            amount == 0.0 -> {
+                tilAmount.isErrorEnabled = false
+                isAmountCorrect = false
+            }
+            else -> {
+                tilAmount.isErrorEnabled = false
+                isAmountCorrect = true
+            }
         }
 
         enableDisableSendFAB()