Merge branch 'master' into i1144-moarrpc

1 files changed, 4 insertions, 4 deletions

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index ab55ed697..f6dbf899d 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -415,14 +415,14 @@ module.exports = class MetamaskController extends EventEmitter {
       self.sendUpdate()
       self.opts.showUnapprovedTx(txMeta)
       // listen for tx completion (success, fail)
-      self.txManager.once(`${txMeta.id}:finished`, (status) => {
-        switch (status) {
+      self.txManager.once(`${txMeta.id}:finished`, (completedTx) => {
+        switch (completedTx.status) {
           case 'submitted':
-            return cb(null, txMeta.hash)
+            return cb(null, completedTx.hash)
           case 'rejected':
             return cb(new Error('MetaMask Tx Signature: User denied transaction signature.'))
           default:
-            return cb(new Error(`MetaMask Tx Signature: Unknown problem: ${JSON.stringify(txMeta.txParams)}`))
+            return cb(new Error(`MetaMask Tx Signature: Unknown problem: ${JSON.stringify(completedTx.txParams)}`))
         }
       })
     })