diff options
| author | frankiebee <frankie.diamond@gmail.com> | 2018-08-07 16:38:32 +0800 |
|---|---|---|
| committer | frankiebee <frankie.diamond@gmail.com> | 2018-08-07 16:38:32 +0800 |
| commit | 115d3c9aaf0f61b0b6b54e9143f632cd48adcca2 (patch) | |
| tree | 4afc0a749e3e832c9e2e0cc62577d5f83ceee35d /app/scripts | |
| parent | 024ebe07e0c61e7185e84499a2f19885ac52e4a9 (diff) | |
| parent | c2d4b237ebef45ff19ddcec5f364a251cd7662bf (diff) | |
| download | tangerine-wallet-browser-115d3c9aaf0f61b0b6b54e9143f632cd48adcca2.tar tangerine-wallet-browser-115d3c9aaf0f61b0b6b54e9143f632cd48adcca2.tar.gz tangerine-wallet-browser-115d3c9aaf0f61b0b6b54e9143f632cd48adcca2.tar.bz2 tangerine-wallet-browser-115d3c9aaf0f61b0b6b54e9143f632cd48adcca2.tar.lz tangerine-wallet-browser-115d3c9aaf0f61b0b6b54e9143f632cd48adcca2.tar.xz tangerine-wallet-browser-115d3c9aaf0f61b0b6b54e9143f632cd48adcca2.tar.zst tangerine-wallet-browser-115d3c9aaf0f61b0b6b54e9143f632cd48adcca2.zip | |
Merge branch 'network-remove-provider-engine' into network-remove-provider-engine-tests
Diffstat (limited to 'app/scripts')
| -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 628e32fa4..76fdc3391 100644 --- a/app/scripts/controllers/network/network.js +++ b/app/scripts/controllers/network/network.js @@ -59,7 +59,7 @@ module.exports = class NetworkController extends EventEmitter { // return the proxies so the references will always be good getProviderAndBlockTracker () { const provider = this._providerProxy - const blockTracker = this._blockTracker + const blockTracker = this._blockTrackerProxy return { provider, blockTracker } } |