ui - use variable to clarify result of emptiness check

3 files changed, 10 insertions, 4 deletions

diff --git a/old-ui/app/components/pending-tx.js b/old-ui/app/components/pending-tx.js
index d8d2334a4..b02476f46 100644
--- a/old-ui/app/components/pending-tx.js
+++ b/old-ui/app/components/pending-tx.js
@@ -488,8 +488,10 @@ PendingTx.prototype.verifyGasParams = function () {
   )
 }
 
-PendingTx.prototype._notZeroOrEmptyString = function (obj) {
-  return obj !== '' && obj !== '0x0' && obj !== '0x' // '0x' means null
+PendingTx.prototype._notZeroOrEmptyString = function (value) {
+  // Geth will return '0x', and ganache-core v2.2.1 will return '0x0'
+  const valueIsEmpty = !value || value === '0x' || value === '0x0'
+  return !valueIsEmpty
 }
 
 PendingTx.prototype.bnMultiplyByFraction = function (targetBN, numerator, denominator) {
diff --git a/ui/app/components/send/send.utils.js b/ui/app/components/send/send.utils.js
index af7b3823f..eb1667c63 100644
--- a/ui/app/components/send/send.utils.js
+++ b/ui/app/components/send/send.utils.js
@@ -215,7 +215,9 @@ 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' || code === '0x0') { // Infura will return '0x', and ganache-core v2.2.1 will return '0x0'
+    // Geth will return '0x', and ganache-core v2.2.1 will return '0x0'
+    const codeIsEmpty = !code || code === '0x' || code === '0x0'
+    if (codeIsEmpty) {
       return SIMPLE_GAS_COST
     }
   } else if (selectedToken && !to) {
diff --git a/ui/app/helpers/transactions.util.js b/ui/app/helpers/transactions.util.js
index 9be77e14f..cfe2c4229 100644
--- a/ui/app/helpers/transactions.util.js
+++ b/ui/app/helpers/transactions.util.js
@@ -114,7 +114,9 @@ export function getLatestSubmittedTxWithNonce (transactions = [], nonce = '0x0')
 
 export async function isSmartContractAddress (address) {
   const code = await global.eth.getCode(address)
-  return code && code !== '0x' && code !== '0x0' // Infura will return '0x', and ganache-core v2.2.1 will return '0x0'
+  // Geth will return '0x', and ganache-core v2.2.1 will return '0x0'
+  const codeIsEmpty = !code || code === '0x' || code === '0x0'
+  return !codeIsEmpty
 }
 
 export function sumHexes (...args) {