Merge pull request #689 from ethereum/fixUnlockAccount

src/app/execution/txListener.js

@@ -25,7 +25,8 @@ class TxListener {
         this.startListening(context)
       }
     })
-    opt.event.udapp.register('transactionExecuted', (to, data, txResult) => {
+    opt.event.udapp.register('transactionExecuted', (error, to, data, lookupOnly, txResult) => {
+      if (error) return
       if (this.loopId && this._api.isVM()) {
         this._api.web3().eth.getTransaction(txResult.transactionHash, (error, tx) => {
           if (error) return console.log(error)

src/app/execution/txRunner.js

@@ -114,6 +114,7 @@ TxRunner.prototype.execute = function (args, callback) {
         if (args.useCall) {
           self.vm.stateManager.revert(function () {})
         }
+        err = err ? err.message : err
         callback(err, {
           result: result,
           transactionHash: ethJSUtil.bufferToHex(new Buffer(tx.hash()))

src/app/tabs/run-tab.js

@@ -371,7 +371,8 @@ function settings (appAPI, appEvents) {
   `
 
   // EVENTS
-  appEvents.udapp.register('transactionExecuted', (to, data, lookupOnly, txResult) => {
+  appEvents.udapp.register('transactionExecuted', (error, to, data, lookupOnly, txResult) => {
+    if (error) return
     if (!lookupOnly) el.querySelector('#value').value = '0'
   })
 

src/universal-dapp.js

@@ -478,7 +478,7 @@ UniversalDApp.prototype.runTx = function (args, cb) {
     function (callback) {
       self.txRunner.rawRun(tx, function (error, result) {
         if (!args.useCall) {
-          self.event.trigger('transactionExecuted', [args.to, args.data, result])
+          self.event.trigger('transactionExecuted', [error, args.to, args.data, false, result])
         }
         callback(error, result)
       })