Create callback and Clean-up details

1 files changed, 8 insertions, 6 deletions

diff --git a/ui/app/actions.js b/ui/app/actions.js
index 9cacadc0d..1f0d8fc78 100644
--- a/ui/app/actions.js
+++ b/ui/app/actions.js
@@ -277,15 +277,17 @@ function signMsg (msgData) {
 }
 
 function signTx (txData) {
-  _accountManager.setGasMultiplier(txData.gasMultiplier)
   return (dispatch) => {
-    web3.eth.sendTransaction(txData, (err, data) => {
-      dispatch(actions.hideLoadingIndication())
+    _accountManager.setGasMultiplier(txData.gasMultiplier, (err) => {
       if (err) return dispatch(actions.displayWarning(err.message))
-      dispatch(actions.hideWarning())
-      dispatch(actions.goHome())
+      web3.eth.sendTransaction(txData, (err, data) => {
+        dispatch(actions.hideLoadingIndication())
+        if (err) return dispatch(actions.displayWarning(err.message))
+        dispatch(actions.hideWarning())
+        dispatch(actions.goHome())
+      })
+      dispatch(this.showConfTxPage())
     })
-    dispatch(this.showConfTxPage())
   }
 }