diff options
| author | Dan Finlay <flyswatter@users.noreply.github.com> | 2017-03-07 08:34:24 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-07 08:34:24 +0800 |
| commit | 51aa95a65cf0a12d273fc3655b5407d3e23f1997 (patch) | |
| tree | e2c21a396f4cbb4653693082d1a6d2a6bc4e8696 /app | |
| parent | eb75996b22826d15ea280c4cb62f085da80cf0bf (diff) | |
| parent | e91ddfcacc37c0b45289a6df017c32e803b55d88 (diff) | |
| download | tangerine-wallet-browser-51aa95a65cf0a12d273fc3655b5407d3e23f1997.tar tangerine-wallet-browser-51aa95a65cf0a12d273fc3655b5407d3e23f1997.tar.gz tangerine-wallet-browser-51aa95a65cf0a12d273fc3655b5407d3e23f1997.tar.bz2 tangerine-wallet-browser-51aa95a65cf0a12d273fc3655b5407d3e23f1997.tar.lz tangerine-wallet-browser-51aa95a65cf0a12d273fc3655b5407d3e23f1997.tar.xz tangerine-wallet-browser-51aa95a65cf0a12d273fc3655b5407d3e23f1997.tar.zst tangerine-wallet-browser-51aa95a65cf0a12d273fc3655b5407d3e23f1997.zip | |
Merge branch 'master' into i1173-ShowPersonalMessage
Diffstat (limited to 'app')
| -rw-r--r-- | app/scripts/metamask-controller.js | 8 | ||||
| -rw-r--r-- | app/scripts/transaction-manager.js | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index bd01a260d..3dddf7065 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -414,14 +414,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)}`)) } }) }) diff --git a/app/scripts/transaction-manager.js b/app/scripts/transaction-manager.js index 07c90af7e..c6cfdf11d 100644 --- a/app/scripts/transaction-manager.js +++ b/app/scripts/transaction-manager.js @@ -353,7 +353,7 @@ module.exports = class TransactionManager extends EventEmitter { txMeta.status = status this.emit(`${txMeta.id}:${status}`, txId) if (status === 'submitted' || status === 'rejected') { - this.emit(`${txMeta.id}:finished`, status) + this.emit(`${txMeta.id}:finished`, txMeta) } this.updateTx(txMeta) this.emit('updateBadge') |