From 4c10e2021aa0cdc4f34a22368a37c76e0e1fea22 Mon Sep 17 00:00:00 2001
From: Thomas Huang <thomas.b.huang@gmail.com>
Date: Mon, 15 May 2017 18:05:11 -0700
Subject: Change default network to rinkeby

---
 ui/app/app.js                       | 4 ++--
 ui/app/components/drop-menu-item.js | 4 ++--
 ui/app/components/network.js        | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'ui')

diff --git a/ui/app/app.js b/ui/app/app.js
index bbfd58588..d096ca531 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -249,7 +249,7 @@ App.prototype.renderNetworkDropdown = function () {
     h(DropMenuItem, {
       label: 'Ropsten Test Network',
       closeMenu: () => this.setState({ isNetworkMenuOpen: false }),
-      action: () => props.dispatch(actions.setProviderType('testnet')),
+      action: () => props.dispatch(actions.setProviderType('ropsten')),
       icon: h('.menu-icon.red-dot'),
       activeNetworkRender: props.network,
       provider: props.provider,
@@ -267,7 +267,7 @@ App.prototype.renderNetworkDropdown = function () {
     h(DropMenuItem, {
       label: 'Rinkeby Test Network',
       closeMenu: () => this.setState({ isNetworkMenuOpen: false}),
-      action: () => props.dispatch(actions.setProviderType('rinkeby')),
+      action: () => props.dispatch(actions.setProviderType('testnet')),
       icon: h('.menu-icon.golden-square'),
       activeNetworkRender: props.network,
       provider: props.provider,
diff --git a/ui/app/components/drop-menu-item.js b/ui/app/components/drop-menu-item.js
index bd9d8f597..27c2afde3 100644
--- a/ui/app/components/drop-menu-item.js
+++ b/ui/app/components/drop-menu-item.js
@@ -42,13 +42,13 @@ DropMenuItem.prototype.activeNetworkRender = function () {
       if (providerType === 'mainnet') return h('.check', '✓')
       break
     case 'Ropsten Test Network':
-      if (providerType === 'testnet') return h('.check', '✓')
+      if (providerType === 'ropsten') return h('.check', '✓')
       break
     case 'Kovan Test Network':
       if (providerType === 'kovan') return h('.check', '✓')
       break
     case 'Rinkeby Test Network':
-      if (providerType === 'rinkeby') return h('.check', '✓')
+      if (providerType === 'testnet') return h('.check', '✓')
       break
     case 'Localhost 8545':
       if (activeNetwork === 'http://localhost:8545') return h('.check', '✓')
diff --git a/ui/app/components/network.js b/ui/app/components/network.js
index f7ea8c49e..1e7c082e1 100644
--- a/ui/app/components/network.js
+++ b/ui/app/components/network.js
@@ -34,7 +34,7 @@ Network.prototype.render = function () {
   } else if (providerName === 'mainnet') {
     hoverText = 'Main Ethereum Network'
     iconName = 'ethereum-network'
-  } else if (providerName === 'testnet') {
+  } else if (providerName === 'ropsten') {
     hoverText = 'Ropsten Test Network'
     iconName = 'ropsten-test-network'
   } else if (parseInt(networkNumber) === 3) {
@@ -43,7 +43,7 @@ Network.prototype.render = function () {
   } else if (providerName === 'kovan') {
     hoverText = 'Kovan Test Network'
     iconName = 'kovan-test-network'
-  } else if (providerName === 'rinkeby') {
+  } else if (providerName === 'testnet') {
     hoverText = 'Rinkeby Test Network'
     iconName = 'rinkeby-test-network'
   } else {
@@ -90,7 +90,7 @@ Network.prototype.render = function () {
               h('.menu-icon.golden-square'),
               h('.network-name', {
                 style: {
-                  color: '#550077',
+                  color: '#e7a218',
                 }},
               'Rinkeby Test Net'),
             ])
-- 
cgit