diff options
| author | Kevin Serrano <kevgagser@gmail.com> | 2017-03-08 02:37:31 +0800 |
|---|---|---|
| committer | Kevin Serrano <kevgagser@gmail.com> | 2017-03-08 02:37:31 +0800 |
| commit | 08ca7dac5a15e104084c6da3eb6015136b316809 (patch) | |
| tree | 3e0b1a61f3be3aa1e01824512b4df0a793dc6a17 /app/scripts/metamask-controller.js | |
| parent | 01f2ec4823e83d986e7ecfd268f6b293f38a13e8 (diff) | |
| parent | 2acf991b67bc42fb904ff77af6ff6a7ca3a683fd (diff) | |
| download | tangerine-wallet-browser-08ca7dac5a15e104084c6da3eb6015136b316809.tar.gz tangerine-wallet-browser-08ca7dac5a15e104084c6da3eb6015136b316809.tar.zst tangerine-wallet-browser-08ca7dac5a15e104084c6da3eb6015136b316809.zip | |
Merge branch 'master' into i1144-moarrpc
Diffstat (limited to 'app/scripts/metamask-controller.js')
| -rw-r--r-- | app/scripts/metamask-controller.js | 8 |
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)}`)) } }) }) |