diff options
author | Frankie <frankie.diamond@gmail.com> | 2017-10-24 02:49:04 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-24 02:49:04 +0800 |
commit | 61eea51310508714d753965e3055f533434001e7 (patch) | |
tree | af60d680a8b18bb21cf2e87086e9d76930a1ae49 /app | |
parent | 1c273b50d3d36307e2149624f708aa7e6940ac84 (diff) | |
parent | 6d052384691b6336df0a60b47f3283ee2bb06ada (diff) | |
download | tangerine-wallet-browser-61eea51310508714d753965e3055f533434001e7.tar tangerine-wallet-browser-61eea51310508714d753965e3055f533434001e7.tar.gz tangerine-wallet-browser-61eea51310508714d753965e3055f533434001e7.tar.bz2 tangerine-wallet-browser-61eea51310508714d753965e3055f533434001e7.tar.lz tangerine-wallet-browser-61eea51310508714d753965e3055f533434001e7.tar.xz tangerine-wallet-browser-61eea51310508714d753965e3055f533434001e7.tar.zst tangerine-wallet-browser-61eea51310508714d753965e3055f533434001e7.zip |
Merge pull request #2429 from MetaMask/i2428-AltEnsTlds
Add support for alternative ENS TLDs
Diffstat (limited to 'app')
-rw-r--r-- | app/manifest.json | 2 | ||||
-rw-r--r-- | app/scripts/controllers/network.js | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/manifest.json b/app/manifest.json index c30d90dfa..eb499390a 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -1,7 +1,7 @@ { "name": "MetaMask", "short_name": "Metamask", - "version": "3.11.1", + "version": "3.11.2", "manifest_version": 2, "author": "https://metamask.io", "description": "Ethereum Browser Extension", diff --git a/app/scripts/controllers/network.js b/app/scripts/controllers/network.js index 0f9db4d53..7f0cbd379 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) |