diff options
| author | Dan Finlay <542863+danfinlay@users.noreply.github.com> | 2017-09-28 02:13:06 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-28 02:13:06 +0800 |
| commit | 828dbd7e3fcbb670d3dce4aa31109a4495832caa (patch) | |
| tree | 8177fb150ae254b838cabec028b3c5e08fbc951e /app/scripts/controllers/transactions.js | |
| parent | ca0dff06f5d9283e57b452dcc7e85c31b248b8aa (diff) | |
| parent | e72083f6e81f888f714125f7c050e777ea5c9bdd (diff) | |
| download | tangerine-wallet-browser-828dbd7e3fcbb670d3dce4aa31109a4495832caa.tar tangerine-wallet-browser-828dbd7e3fcbb670d3dce4aa31109a4495832caa.tar.gz tangerine-wallet-browser-828dbd7e3fcbb670d3dce4aa31109a4495832caa.tar.bz2 tangerine-wallet-browser-828dbd7e3fcbb670d3dce4aa31109a4495832caa.tar.lz tangerine-wallet-browser-828dbd7e3fcbb670d3dce4aa31109a4495832caa.tar.xz tangerine-wallet-browser-828dbd7e3fcbb670d3dce4aa31109a4495832caa.tar.zst tangerine-wallet-browser-828dbd7e3fcbb670d3dce4aa31109a4495832caa.zip | |
Merge pull request #2155 from MetaMask/filter-fixes-moar
Various fixes you've been waiting for, how exciting!
Diffstat (limited to 'app/scripts/controllers/transactions.js')
| -rw-r--r-- | app/scripts/controllers/transactions.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js index 2aff4e5ff..4cd307b07 100644 --- a/app/scripts/controllers/transactions.js +++ b/app/scripts/controllers/transactions.js @@ -70,7 +70,7 @@ module.exports = class TransactionController extends EventEmitter { this.pendingTxTracker.on('txFailed', this.setTxStatusFailed.bind(this)) this.pendingTxTracker.on('txConfirmed', this.setTxStatusConfirmed.bind(this)) - this.blockTracker.on('rawBlock', this.pendingTxTracker.checkForTxInBlock.bind(this.pendingTxTracker)) + this.blockTracker.on('block', 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 accountTracker hasent been populated by the results yet |