diff options
| author | frankiebee <frankie.diamond@gmail.com> | 2017-03-08 09:59:21 +0800 |
|---|---|---|
| committer | frankiebee <frankie.diamond@gmail.com> | 2017-03-08 09:59:21 +0800 |
| commit | af5ad218e21096b499e7dc264c4dad4f7d8dbdde (patch) | |
| tree | 5c25c606956e223c4a8e66797f25e735cd81b76a /app/scripts/metamask-controller.js | |
| parent | 3e8b584c9811b06526e69203a5e03f8eb82e8211 (diff) | |
| parent | 22785a4cf1007904594cc486678d3ce119146e2f (diff) | |
| download | tangerine-wallet-browser-af5ad218e21096b499e7dc264c4dad4f7d8dbdde.tar.gz tangerine-wallet-browser-af5ad218e21096b499e7dc264c4dad4f7d8dbdde.tar.zst tangerine-wallet-browser-af5ad218e21096b499e7dc264c4dad4f7d8dbdde.zip | |
Merge branch 'master' into i#1032
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 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)}`)) } }) }) |