diff options
author | Dan Finlay <somniac@me.com> | 2016-07-30 04:08:14 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-30 04:08:14 +0800 |
commit | 212f9cf9452911d70643bbc18f4896d1c7442763 (patch) | |
tree | ff16ad39baa8626dabc8a0624aae1b1734edf271 /ui | |
parent | 591fe3f9be46ee53a7e9ad841347fee87aae7e50 (diff) | |
parent | c7691b7e64597b873da706d842e360f3e2ec8347 (diff) | |
download | tangerine-wallet-browser-212f9cf9452911d70643bbc18f4896d1c7442763.tar.gz tangerine-wallet-browser-212f9cf9452911d70643bbc18f4896d1c7442763.tar.zst tangerine-wallet-browser-212f9cf9452911d70643bbc18f4896d1c7442763.zip |
Merge pull request #506 from MetaMask/FixNetworkReference
Fix network name reference
Diffstat (limited to 'ui')
-rw-r--r-- | ui/app/components/drop-menu-item.js | 5 | ||||
-rw-r--r-- | ui/app/components/network.js | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/ui/app/components/drop-menu-item.js b/ui/app/components/drop-menu-item.js index 8bff3e131..1a0d6cbd5 100644 --- a/ui/app/components/drop-menu-item.js +++ b/ui/app/components/drop-menu-item.js @@ -34,14 +34,15 @@ DropMenuItem.prototype.render = function () { DropMenuItem.prototype.activeNetworkRender = function () { let activeNetwork = this.props.activeNetworkRender let { provider } = this.props + let providerType = provider ? provider.type : null if (activeNetwork === undefined) return switch (this.props.label) { case 'Main Ethereum Network': - if (provider.type === 'mainnet') return h('.check', '✓') + if (providerType === 'mainnet') return h('.check', '✓') break case 'Ethereum Classic Network': - if (provider.type === 'classic') return h('.check', '✓') + if (providerType === 'classic') return h('.check', '✓') break case 'Morden Test Network': if (activeNetwork === '2') return h('.check', '✓') diff --git a/ui/app/components/network.js b/ui/app/components/network.js index 22b11aa6c..95901fe70 100644 --- a/ui/app/components/network.js +++ b/ui/app/components/network.js @@ -13,7 +13,12 @@ function Network () { Network.prototype.render = function () { const props = this.props const networkNumber = props.network - const providerName = props.provider.type + let providerName + try { + providerName = props.provider.type + } catch (e) { + providerName = null + } let iconName, hoverText if (networkNumber === 'loading') { |