From 691ec1cfd8162fc463b935112acf0f62fd67170c Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Fri, 8 Sep 2017 18:37:10 +0200
Subject: [PATCH] try catch on sendTransation (metamask can throw)

---
 src/app/execution/txRunner.js | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/app/execution/txRunner.js b/src/app/execution/txRunner.js
index 2e7a59942e..9812fe1b39 100644
--- a/src/app/execution/txRunner.js
+++ b/src/app/execution/txRunner.js
@@ -64,13 +64,17 @@ TxRunner.prototype.execute = function (args, callback) {
         }
         tx.gas = gasEstimation
         var sendTransaction = self.personalMode ? executionContext.web3().personal.sendTransaction : executionContext.web3().eth.sendTransaction
-        sendTransaction(tx, function (err, resp) {
-          if (err) {
-            return callback(err, resp)
-          }
+        try {
+          sendTransaction(tx, function (err, resp) {
+            if (err) {
+              return callback(err, resp)
+            }
 
-          tryTillResponse(resp, callback)
-        })
+            tryTillResponse(resp, callback)
+          })
+        } catch (e) {
+          return callback(`Send transaction failed: ${e.message} . if you use an injected provider, please check it is properly unlocked. `)
+        }
       })
     }
   } else {