diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2017-09-27 05:09:17 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-27 05:09:17 +0800 |
| commit | ff5e8746bee0d7461df02e7f2186ff7c90bfcb50 (patch) | |
| tree | b78ee58bb8c79ca27aa7be7490d3502ce9583b3b /app/scripts/controllers/transactions.js | |
| parent | 87fc44c45a5bb511fe60b2c3fe7e7c78f5f6584f (diff) | |
| parent | 9d1cb0f76dce203299200940f21e868f6a5efef3 (diff) | |
| download | tangerine-wallet-browser-ff5e8746bee0d7461df02e7f2186ff7c90bfcb50.tar tangerine-wallet-browser-ff5e8746bee0d7461df02e7f2186ff7c90bfcb50.tar.gz tangerine-wallet-browser-ff5e8746bee0d7461df02e7f2186ff7c90bfcb50.tar.bz2 tangerine-wallet-browser-ff5e8746bee0d7461df02e7f2186ff7c90bfcb50.tar.lz tangerine-wallet-browser-ff5e8746bee0d7461df02e7f2186ff7c90bfcb50.tar.xz tangerine-wallet-browser-ff5e8746bee0d7461df02e7f2186ff7c90bfcb50.tar.zst tangerine-wallet-browser-ff5e8746bee0d7461df02e7f2186ff7c90bfcb50.zip | |
Merge pull request #2180 from MetaMask/proxy-blockTracker
Wrap block tracker in events proxy
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 fb3be6073..4e52a3c14 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 ethStore hasent been populated by the results yet |