From 6d8344d0d0af3734255a0e9e79d857d84b5fe2aa Mon Sep 17 00:00:00 2001
From: Dan <danjm.com@gmail.com>
Date: Wed, 30 May 2018 14:10:30 -0230
Subject: Update amount error on update of send screen.

---
 ui/app/components/send_/send.component.js | 37 ++++++++++++++++---------------
 1 file changed, 19 insertions(+), 18 deletions(-)

(limited to 'ui/app/components/send_/send.component.js')

diff --git a/ui/app/components/send_/send.component.js b/ui/app/components/send_/send.component.js
index 8b0a41f9e..21e1de09b 100644
--- a/ui/app/components/send_/send.component.js
+++ b/ui/app/components/send_/send.component.js
@@ -83,30 +83,31 @@ export default class SendTransactionScreen extends PersistentForm {
 
     const uninitialized = [prevBalance, prevGasTotal].every(n => n === null)
 
-    if (!uninitialized) {
-      const amountErrorRequiresUpdate = doesAmountErrorRequireUpdate({
+    const amountErrorRequiresUpdate = doesAmountErrorRequireUpdate({
+      balance,
+      gasTotal,
+      prevBalance,
+      prevGasTotal,
+      prevTokenBalance,
+      selectedToken,
+      tokenBalance,
+    })
+
+    if (amountErrorRequiresUpdate) {
+      const amountErrorObject = getAmountErrorObject({
+        amount,
+        amountConversionRate,
         balance,
+        conversionRate,
         gasTotal,
-        prevBalance,
-        prevGasTotal,
-        prevTokenBalance,
+        primaryCurrency,
         selectedToken,
         tokenBalance,
       })
+      updateSendErrors(amountErrorObject)
+    }
 
-      if (amountErrorRequiresUpdate) {
-        const amountErrorObject = getAmountErrorObject({
-          amount,
-          amountConversionRate,
-          balance,
-          conversionRate,
-          gasTotal,
-          primaryCurrency,
-          selectedToken,
-          tokenBalance,
-        })
-        updateSendErrors(amountErrorObject)
-      }
+    if (!uninitialized) {
 
       if (network !== prevNetwork && network !== 'loading') {
         updateSendTokenBalance({
-- 
cgit