From c9f22916dd026445b2eb0ba343b54cc672fdf6f0 Mon Sep 17 00:00:00 2001
From: Whymarrh Whitby <whymarrh.whitby@gmail.com>
Date: Thu, 27 Sep 2018 12:22:12 -0230
Subject: [PATCH] Rework estimateGas logic

The tests still pass!
---
 ui/app/components/send/send.utils.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/ui/app/components/send/send.utils.js b/ui/app/components/send/send.utils.js
index ccfdd67c0..a18a9e4b3 100644
--- a/ui/app/components/send/send.utils.js
+++ b/ui/app/components/send/send.utils.js
@@ -212,6 +212,16 @@ async function estimateGas ({
 }) {
   const paramsForGasEstimate = { from: selectedAddress, value, gasPrice }
 
+  // if recipient has no code, gas is 21k max:
+  if (!selectedToken && !data) {
+    const code = Boolean(to) && await global.eth.getCode(to)
+    if (!code || code === '0x') {
+      return SIMPLE_GAS_COST
+    }
+  } else if (selectedToken && !to) {
+    return BASE_TOKEN_GAS_COST
+  }
+
   if (selectedToken) {
     paramsForGasEstimate.value = '0x0'
     paramsForGasEstimate.data = generateTokenTransferData({ toAddress: to, amount: value, selectedToken })
@@ -226,16 +236,6 @@ async function estimateGas ({
     }
   }
 
-  // if recipient has no code, gas is 21k max:
-  if (!selectedToken && !data) {
-    const code = Boolean(to) && await global.eth.getCode(to)
-    if (!code || code === '0x') {
-      return SIMPLE_GAS_COST
-    }
-  } else if (selectedToken && !to) {
-    return BASE_TOKEN_GAS_COST
-  }
-
   // if not, fall back to block gasLimit
   paramsForGasEstimate.gas = ethUtil.addHexPrefix(multiplyCurrencies(blockGasLimit, 0.95, {
     multiplicandBase: 16,