m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Merge branch 'master' into i1173-ShowPersonalMessage

Browse Source
This commit is contained in:
Dan Finlay 2017-03-06 16:34:24 -08:00 committed by GitHub
commit 51aa95a65c
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/scripts/metamask-controller.js
View File

@ -414,14 +414,14 @@ module.exports = class MetamaskController extends EventEmitter {
self.sendUpdate() self.sendUpdate()
self.opts.showUnapprovedTx(txMeta) self.opts.showUnapprovedTx(txMeta)
// listen for tx completion (success, fail) // listen for tx completion (success, fail)
self.txManager.once(`${txMeta.id}:finished`, (status) => { self.txManager.once(`${txMeta.id}:finished`, (completedTx) => {
switch (status) { switch (completedTx.status) {
case 'submitted': case 'submitted':
return cb(null, txMeta.hash) return cb(null, completedTx.hash)
case 'rejected': case 'rejected':
return cb(new Error('MetaMask Tx Signature: User denied transaction signature.')) return cb(new Error('MetaMask Tx Signature: User denied transaction signature.'))
default: 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)}`))
} }
}) })
}) })

2
app/scripts/transaction-manager.js
View File

@ -353,7 +353,7 @@ module.exports = class TransactionManager extends EventEmitter {
txMeta.status = status txMeta.status = status
this.emit(`${txMeta.id}:${status}`, txId) this.emit(`${txMeta.id}:${status}`, txId)
if (status === 'submitted' || status === 'rejected') { if (status === 'submitted' || status === 'rejected') {
this.emit(`${txMeta.id}:finished`, status) this.emit(`${txMeta.id}:finished`, txMeta)
} }
this.updateTx(txMeta) this.updateTx(txMeta)
this.emit('updateBadge') this.emit('updateBadge')