diff options
author | Kevin Serrano <kevgagser@gmail.com> | 2017-09-27 06:47:31 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-27 06:47:31 +0800 |
commit | e998d528f0af71d1163bc89fe9e81195bb4f5dc3 (patch) | |
tree | 5bb9bbcdb3db6f8c1e7a34492aad18efe28462ed /app/scripts/controllers/transactions.js | |
parent | 57b5f15265be2ae39ddf538915f8bd57538760b6 (diff) | |
parent | 6ca519e97c4c282023ab6b7788715ff8d7ec8189 (diff) | |
download | tangerine-wallet-browser-e998d528f0af71d1163bc89fe9e81195bb4f5dc3.tar.gz tangerine-wallet-browser-e998d528f0af71d1163bc89fe9e81195bb4f5dc3.tar.zst tangerine-wallet-browser-e998d528f0af71d1163bc89fe9e81195bb4f5dc3.zip |
Merge branch 'master' into RemoveSlackLink
Diffstat (limited to 'app/scripts/controllers/transactions.js')
-rw-r--r-- | app/scripts/controllers/transactions.js | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js index fb3be6073..2aff4e5ff 100644 --- a/app/scripts/controllers/transactions.js +++ b/app/scripts/controllers/transactions.js @@ -22,7 +22,7 @@ module.exports = class TransactionController extends EventEmitter { this.provider = opts.provider this.blockTracker = opts.blockTracker this.signEthTx = opts.signTransaction - this.ethStore = opts.ethStore + this.accountTracker = opts.accountTracker this.nonceTracker = new NonceTracker({ provider: this.provider, @@ -52,7 +52,7 @@ module.exports = class TransactionController extends EventEmitter { provider: this.provider, nonceTracker: this.nonceTracker, getBalance: (address) => { - const account = this.ethStore.getState().accounts[address] + const account = this.accountTracker.getState().accounts[address] if (!account) return return account.balance }, @@ -73,7 +73,7 @@ module.exports = class TransactionController extends EventEmitter { this.blockTracker.on('rawBlock', this.pendingTxTracker.checkForTxInBlock.bind(this.pendingTxTracker)) // this is a little messy but until ethstore has been either // removed or redone this is to guard against the race condition - // where ethStore hasent been populated by the results yet + // where accountTracker hasent been populated by the results yet this.blockTracker.once('latest', () => { this.blockTracker.on('latest', this.pendingTxTracker.resubmitPendingTxs.bind(this.pendingTxTracker)) }) @@ -434,6 +434,7 @@ module.exports = class TransactionController extends EventEmitter { const txMeta = this.getTx(txId) txMeta.status = status this.emit(`${txMeta.id}:${status}`, txId) + this.emit(`${status}`, txId) if (status === 'submitted' || status === 'rejected') { this.emit(`${txMeta.id}:finished`, txMeta) } |