From 1c7b325a9b62c6e31d311e71a151d1ab82fcea7e Mon Sep 17 00:00:00 2001
From: Iuri Matias <iuri.matias@gmail.com>
Date: Tue, 20 Feb 2018 17:17:06 -0500
Subject: [PATCH] refactor: remove unnecessary level of depth from runInNode

---
 src/app/execution/txRunner.js | 57 +++++++++++++++++------------------
 1 file changed, 28 insertions(+), 29 deletions(-)

diff --git a/src/app/execution/txRunner.js b/src/app/execution/txRunner.js
index bb0b452f57..748ca1a24a 100644
--- a/src/app/execution/txRunner.js
+++ b/src/app/execution/txRunner.js
@@ -155,37 +155,36 @@ TxRunner.prototype.runInNode = function (from, to, data, value, gasLimit, useCal
 
     tx.gas = gasEstimation
 
-    if (!self._api.config.getUnpersistedProperty('doNotShowTransactionConfirmationAgain')) {
-      self._api.detectNetwork((err, network) => {
-        if (err) {
-          console.log(err)
-        } else {
-          if (network.name === 'Main') {
-            var content = confirmDialog(tx, gasEstimation, self)
-            modalDialog('Confirm transaction', content,
-              { label: 'Confirm',
+    if (self._api.config.getUnpersistedProperty('doNotShowTransactionConfirmationAgain')) {
+      return executeTx(tx, null, self._api, callback)
+    }
+    self._api.detectNetwork((err, network) => {
+      if (err) {
+        console.log(err)
+      } else {
+        if (network.name === 'Main') {
+          var content = confirmDialog(tx, gasEstimation, self)
+          modalDialog('Confirm transaction', content,
+            { label: 'Confirm',
+              fn: () => {
+                self._api.config.setUnpersistedProperty('doNotShowTransactionConfirmationAgain', content.querySelector('input#confirmsetting').checked)
+                if (!content.gasPriceStatus) {
+                  callback('Given gas grice is not correct')
+                } else {
+                  var gasPrice = executionContext.web3().toWei(content.querySelector('#gasprice').value, 'gwei')
+                  executeTx(tx, gasPrice, self._api, callback)
+                }
+              }}, {
+                label: 'Cancel',
                 fn: () => {
-                  self._api.config.setUnpersistedProperty('doNotShowTransactionConfirmationAgain', content.querySelector('input#confirmsetting').checked)
-                  if (!content.gasPriceStatus) {
-                    callback('Given gas grice is not correct')
-                  } else {
-                    var gasPrice = executionContext.web3().toWei(content.querySelector('#gasprice').value, 'gwei')
-                    executeTx(tx, gasPrice, self._api, callback)
-                  }
-                }}, {
-                  label: 'Cancel',
-                  fn: () => {
-                    return callback('Transaction canceled by user.')
-                  }
-                })
-          } else {
-            executeTx(tx, null, self._api, callback)
-          }
+                  return callback('Transaction canceled by user.')
+                }
+              })
+        } else {
+          executeTx(tx, null, self._api, callback)
         }
-      })
-    } else {
-      executeTx(tx, null, self._api, callback)
-    }
+      }
+    })
   })
 }