diff options
| author | Chi Kei Chan <chikeichan@gmail.com> | 2017-10-26 10:46:42 +0800 |
|---|---|---|
| committer | Chi Kei Chan <chikeichan@gmail.com> | 2017-10-26 10:46:42 +0800 |
| commit | db5326dfc288015a4d9f792653a71fd4d7abca33 (patch) | |
| tree | cb93f52f999816d07a6146274093aaebdb7ed8d3 /app/scripts/controllers/network.js | |
| parent | a9a841ba01f6bffa29a3e0491e3a88f6aff72ac7 (diff) | |
| parent | b2e440e4ffba6db29cf8a928a41534c1f204d485 (diff) | |
| download | tangerine-wallet-browser-db5326dfc288015a4d9f792653a71fd4d7abca33.tar tangerine-wallet-browser-db5326dfc288015a4d9f792653a71fd4d7abca33.tar.gz tangerine-wallet-browser-db5326dfc288015a4d9f792653a71fd4d7abca33.tar.bz2 tangerine-wallet-browser-db5326dfc288015a4d9f792653a71fd4d7abca33.tar.lz tangerine-wallet-browser-db5326dfc288015a4d9f792653a71fd4d7abca33.tar.xz tangerine-wallet-browser-db5326dfc288015a4d9f792653a71fd4d7abca33.tar.zst tangerine-wallet-browser-db5326dfc288015a4d9f792653a71fd4d7abca33.zip | |
Merge branch 'NewUI-flat' into uat
Diffstat (limited to 'app/scripts/controllers/network.js')
| -rw-r--r-- | app/scripts/controllers/network.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/scripts/controllers/network.js b/app/scripts/controllers/network.js index 0f9db4d53..23afdc12b 100644 --- a/app/scripts/controllers/network.js +++ b/app/scripts/controllers/network.js @@ -51,6 +51,10 @@ module.exports = class NetworkController extends EventEmitter { } lookupNetwork () { + // Prevent firing when provider is not defined. + if (!this.ethQuery || !this.ethQuery.sendAsync) { + return + } this.ethQuery.sendAsync({ method: 'net_version' }, (err, network) => { if (err) return this.setNetworkState('loading') log.info('web3.getNetwork returned ' + network) @@ -101,7 +105,7 @@ module.exports = class NetworkController extends EventEmitter { this.emit('networkDidChange') } - _configureStandardProvider(_providerParams) { + _configureStandardProvider (_providerParams) { const providerParams = extend(this._baseProviderParams, _providerParams) const provider = createMetamaskProvider(providerParams) this._setProvider(provider) |