Add to change log

feature/default_network_editable
Frankie 8 years ago
parent e0daea35a9
commit 0b3737edb4
  1. 2
      CHANGELOG.md
  2. 2
      ui/app/app.js
  3. 3
      ui/app/components/drop-menu-item.js
  4. 36
      ui/app/components/network.js

@ -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.

@ -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',
})
}
}

@ -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:

@ -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',
}},

Loading…
Cancel
Save