diff options
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | ui/app/app.js | 2 | ||||
| -rw-r--r-- | ui/app/components/drop-menu-item.js | 3 | ||||
| -rw-r--r-- | ui/app/components/network.js | 36 |
4 files changed, 22 insertions, 21 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 93a455248..621d9b7ff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Current Master +- Added a network indicator mark in dropdown menu +- Added network name next to network indicator - Fixed bug where MetaMask interfered with PDF loading. - Moved switch account icon into menu bar. - Changed status shapes to be a yellow warning sign for failure and ellipsis for pending transactions. diff --git a/ui/app/app.js b/ui/app/app.js index 5846cb11e..a79666f58 100644 --- a/ui/app/app.js +++ b/ui/app/app.js @@ -383,7 +383,7 @@ App.prototype.renderCustomOption = function (rpcTarget) { label: `${rpcTarget}`, closeMenu: () => this.setState({ isNetworkMenuOpen: false }), icon: h('i.fa.fa-question-circle.fa-lg', { ariaHidden: true }), - activeNetworkRender: 'custom' + activeNetworkRender: 'custom', }) } } diff --git a/ui/app/components/drop-menu-item.js b/ui/app/components/drop-menu-item.js index 00bb16868..69294c94d 100644 --- a/ui/app/components/drop-menu-item.js +++ b/ui/app/components/drop-menu-item.js @@ -31,7 +31,7 @@ DropMenuItem.prototype.render = function () { DropMenuItem.prototype.activeNetworkRender = function () { var activeNetwork = this.props.activeNetworkRender - if( activeNetwork === undefined) return + if (activeNetwork === undefined) return switch (this.props.label) { case 'Main Ethereum Network': @@ -41,7 +41,6 @@ DropMenuItem.prototype.activeNetworkRender = function () { if (activeNetwork === '2') return h('.check', ' ✓') break case 'Localhost 8545': - debugger if (activeNetwork === 'http://localhost:8545') return h('.check', ' ✓') break default: diff --git a/ui/app/components/network.js b/ui/app/components/network.js index 25488f6b7..032e71699 100644 --- a/ui/app/components/network.js +++ b/ui/app/components/network.js @@ -47,25 +47,25 @@ Network.prototype.render = function () { (function () { switch (iconName) { case 'ethereum-network': - return h('.network-indicator',[ - h('.menu-icon.diamond'), - h('.network-name',{ - style: { - color: '#039396', - }}, - 'Etherum Main Net') - ]) + return h('.network-indicator', [ + h('.menu-icon.diamond'), + h('.network-name', { + style: { + color: '#039396', + }}, + 'Etherum Main Net'), + ]) case 'morden-test-network': - return h('.network-indicator',[ - h('.menu-icon.red-dot'), - h('.network-name',{ - style: { - color: '#ff6666', - }}, - 'Morden Test Net') - ]) + return h('.network-indicator', [ + h('.menu-icon.red-dot'), + h('.network-name', { + style: { + color: '#ff6666', + }}, + 'Morden Test Net'), + ]) default: - return h('.network-indicator',[ + return h('.network-indicator', [ h('i.fa.fa-question-circle.fa-lg', { ariaHidden: true, style: { @@ -74,7 +74,7 @@ Network.prototype.render = function () { }, }), - h('.network-name',{ + h('.network-name', { style: { color: '#AEAEAE', }}, |