diff options
Diffstat (limited to 'ui/app')
-rw-r--r-- | ui/app/app.js | 11 | ||||
-rw-r--r-- | ui/app/components/drop-menu-item.js | 5 | ||||
-rw-r--r-- | ui/app/components/network.js | 15 | ||||
-rw-r--r-- | ui/app/css/lib.css | 2 |
4 files changed, 30 insertions, 3 deletions
diff --git a/ui/app/app.js b/ui/app/app.js index ba0a57e02..f9694214a 100644 --- a/ui/app/app.js +++ b/ui/app/app.js @@ -233,7 +233,7 @@ App.prototype.renderNetworkDropdown = function () { }), h(DropMenuItem, { - label: 'Morden Test Network', + label: 'Ropsten Test Network', closeMenu: () => this.setState({ isNetworkMenuOpen: false }), action: () => props.dispatch(actions.setProviderType('testnet')), icon: h('.menu-icon.red-dot'), @@ -242,6 +242,15 @@ App.prototype.renderNetworkDropdown = function () { }), h(DropMenuItem, { + label: 'Morden Test Network', + closeMenu: () => this.setState({ isNetworkMenuOpen: false }), + action: () => props.dispatch(actions.setProviderType('morden')), + icon: h('.menu-icon.red-dot'), + activeNetworkRender: props.network, + provider: props.provider, + }), + + h(DropMenuItem, { label: 'Localhost 8545', closeMenu: () => this.setState({ isNetworkMenuOpen: false }), action: () => props.dispatch(actions.setRpcTarget('http://localhost:8545')), diff --git a/ui/app/components/drop-menu-item.js b/ui/app/components/drop-menu-item.js index 5c06101df..7cf686cab 100644 --- a/ui/app/components/drop-menu-item.js +++ b/ui/app/components/drop-menu-item.js @@ -41,9 +41,12 @@ DropMenuItem.prototype.activeNetworkRender = function () { case 'Main Ethereum Network': if (providerType === 'mainnet') return h('.check', '✓') break - case 'Morden Test Network': + case 'Ropsten Test Network': if (provider.type === 'testnet') return h('.check', '✓') break + case 'Morden Test Network': + if (provider.type === 'morden') return h('.check', '✓') + break case 'Localhost 8545': if (activeNetwork === 'http://localhost:8545') return h('.check', '✓') break diff --git a/ui/app/components/network.js b/ui/app/components/network.js index 8e67dd741..9cf597648 100644 --- a/ui/app/components/network.js +++ b/ui/app/components/network.js @@ -35,6 +35,12 @@ Network.prototype.render = function () { hoverText = 'Main Ethereum Network' iconName = 'ethereum-network' } else if (providerName === 'testnet') { + hoverText = 'Ropsten Test Network' + iconName = 'ropsten-test-network' + } else if (parseInt(networkNumber) === 3) { + hoverText = 'Ropsten Test Network' + iconName = 'ropsten-test-network' + } else if (parseInt(networkNumber) === 2) { hoverText = 'Morden Test Network' iconName = 'morden-test-network' } else { @@ -62,6 +68,15 @@ Network.prototype.render = function () { }}, 'Ethereum Main Net'), ]) + case 'ropsten-test-network': + return h('.network-indicator', [ + h('.menu-icon.red-dot'), + h('.network-name', { + style: { + color: '#ff6666', + }}, + 'Ropsten Test Net'), + ]) case 'morden-test-network': return h('.network-indicator', [ h('.menu-icon.red-dot'), diff --git a/ui/app/css/lib.css b/ui/app/css/lib.css index bcd6a4a67..f5f602729 100644 --- a/ui/app/css/lib.css +++ b/ui/app/css/lib.css @@ -213,7 +213,7 @@ hr.horizontal-line { background: rgb(0, 163, 68); border-radius: 20px; } -.morden-icon { +.testnet-icon { background: #2465E1; } |