aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorFrankie <frankie.diamond@gmail.com>2017-03-07 07:41:11 +0800
committerFrankie <frankie.diamond@gmail.com>2017-03-07 07:41:11 +0800
commitb84f1b053265fdabc0aaec4fa8aa3145b6fb7f51 (patch)
tree466b0d89f0e624c3aa7a1653f7615e0e32bbf5fe /app
parentf162a11585392df5e593018a02549f8b03018d22 (diff)
downloadtangerine-wallet-browser-b84f1b053265fdabc0aaec4fa8aa3145b6fb7f51.tar
tangerine-wallet-browser-b84f1b053265fdabc0aaec4fa8aa3145b6fb7f51.tar.gz
tangerine-wallet-browser-b84f1b053265fdabc0aaec4fa8aa3145b6fb7f51.tar.bz2
tangerine-wallet-browser-b84f1b053265fdabc0aaec4fa8aa3145b6fb7f51.tar.lz
tangerine-wallet-browser-b84f1b053265fdabc0aaec4fa8aa3145b6fb7f51.tar.xz
tangerine-wallet-browser-b84f1b053265fdabc0aaec4fa8aa3145b6fb7f51.tar.zst
tangerine-wallet-browser-b84f1b053265fdabc0aaec4fa8aa3145b6fb7f51.zip
Fix issue where old txMeta object was being used to pass the txHash to the cb
Diffstat (limited to 'app')
-rw-r--r--app/scripts/metamask-controller.js8
-rw-r--r--app/scripts/transaction-manager.js2
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')