diff options
| author | brunobar79 <brunobar79@gmail.com> | 2018-08-23 01:37:47 +0800 |
|---|---|---|
| committer | brunobar79 <brunobar79@gmail.com> | 2018-08-23 01:37:47 +0800 |
| commit | 055e0f8dacc8cf3f45d31755c36270403b9130f3 (patch) | |
| tree | f6bc28e8981df5697b0e95a1c42bc7efc783e702 /app/scripts/controllers/network/network.js | |
| parent | 1286ddaaed7ca1995fe093a30c20a1ae6a929e16 (diff) | |
| parent | babd59a2dc64e15ef2a415e349ef12d5b995e2e7 (diff) | |
| download | tangerine-wallet-browser-055e0f8dacc8cf3f45d31755c36270403b9130f3.tar.gz tangerine-wallet-browser-055e0f8dacc8cf3f45d31755c36270403b9130f3.tar.zst tangerine-wallet-browser-055e0f8dacc8cf3f45d31755c36270403b9130f3.zip | |
fix merge conflicts
Diffstat (limited to 'app/scripts/controllers/network/network.js')
| -rw-r--r-- | app/scripts/controllers/network/network.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/scripts/controllers/network/network.js b/app/scripts/controllers/network/network.js index 76fdc3391..c1667d9a6 100644 --- a/app/scripts/controllers/network/network.js +++ b/app/scripts/controllers/network/network.js @@ -185,7 +185,7 @@ module.exports = class NetworkController extends EventEmitter { if (this._blockTrackerProxy) { this._blockTrackerProxy.setTarget(blockTracker) } else { - this._blockTrackerProxy = createEventEmitterProxy(blockTracker) + this._blockTrackerProxy = createEventEmitterProxy(blockTracker, { eventFilter: 'skipInternal' }) } // set new provider and blockTracker this._provider = provider |