From 2c36c17238b7641295e1ed6e51e11b2842c03fdb Mon Sep 17 00:00:00 2001
From: Frankie <frankie.pangilinan@consensys.net>
Date: Wed, 29 Jun 2016 15:04:16 -0700
Subject: =?UTF-8?q?Add=20=E2=9C=93=20charchter=20to=20indicate=20active=20?=
 =?UTF-8?q?network?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/app/app.js                       | 11 +++++++++++
 ui/app/components/drop-menu-item.js | 20 ++++++++++++++++++++
 2 files changed, 31 insertions(+)

(limited to 'ui/app')

diff --git a/ui/app/app.js b/ui/app/app.js
index 8297ed796..034e062e6 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -214,6 +214,7 @@ App.prototype.renderNetworkDropdown = function () {
       closeMenu: () => this.setState({ isNetworkMenuOpen: false }),
       action: () => props.dispatch(actions.setProviderType('mainnet')),
       icon: h('.menu-icon.diamond'),
+      activeNetworkRender: props.network,
     }),
 
     h(DropMenuItem, {
@@ -221,6 +222,7 @@ App.prototype.renderNetworkDropdown = function () {
       closeMenu: () => this.setState({ isNetworkMenuOpen: false }),
       action: () => props.dispatch(actions.setProviderType('testnet')),
       icon: h('.menu-icon.red-dot'),
+      activeNetworkRender: props.network,
     }),
 
     h(DropMenuItem, {
@@ -228,6 +230,7 @@ App.prototype.renderNetworkDropdown = function () {
       closeMenu: () => this.setState({ isNetworkMenuOpen: false }),
       action: () => props.dispatch(actions.setRpcTarget('http://localhost:8545')),
       icon: h('i.fa.fa-question-circle.fa-lg', { ariaHidden: true }),
+      activeNetworkRender: props.provider.rpcTarget,
     }),
     this.renderCustomOption(props.provider.rpcTarget),
   ])
@@ -367,12 +370,20 @@ App.prototype.renderCustomOption = function (rpcTarget) {
         action: () => this.props.dispatch(actions.showConfigPage()),
         icon: h('i.fa.fa-question-circle.fa-lg', { ariaHidden: true }),
       })
+    case 'http://localhost:8545':
+      return h(DropMenuItem, {
+        label: 'Custom RPC',
+        closeMenu: () => this.setState({ isNetworkMenuOpen: false }),
+        action: () => this.props.dispatch(actions.showConfigPage()),
+        icon: h('i.fa.fa-question-circle.fa-lg', { ariaHidden: true }),
+      })
 
     default:
       return h(DropMenuItem, {
         label: `${rpcTarget}`,
         closeMenu: () => this.setState({ isNetworkMenuOpen: false }),
         icon: h('i.fa.fa-question-circle.fa-lg', { ariaHidden: true }),
+        activeNetworkRender: 'custom'
       })
   }
 }
diff --git a/ui/app/components/drop-menu-item.js b/ui/app/components/drop-menu-item.js
index 5531ebf9f..a31c9c7c4 100644
--- a/ui/app/components/drop-menu-item.js
+++ b/ui/app/components/drop-menu-item.js
@@ -25,5 +25,25 @@ DropMenuItem.prototype.render = function () {
   }, [
     this.props.icon,
     this.props.label,
+    this.activeNetworkRender(),
   ])
 }
+
+DropMenuItem.prototype.activeNetworkRender = function () {
+  var activeNetwork = this.props.activeNetworkRender
+  if( activeNetwork === undefined) return
+
+  switch (this.props.label) {
+    case 'Main Ethereum Network':
+      if (activeNetwork === '1') return h('.check', '	✓')
+      break
+    case 'Morden Test Network':
+      if (activeNetwork === '2') return h('.check', '	✓')
+      break
+    case 'Localhost 8545':
+      if (activeNetwork > '2') return h('.check', '	✓')
+      break
+    default:
+      if (activeNetwork === 'custom') return h('.check', '	✓')
+  }
+}
-- 
cgit v1.2.3