Merge pull request #1432 from MetaMask/i1419-rinkebydefaultnetwork

I1419 rinkebydefaultnetwork

4 files changed, 5 insertions, 5 deletions

diff --git a/ui/app/app.js b/ui/app/app.js
index bbfd58588..6e5aa57cd 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,
diff --git a/ui/app/components/drop-menu-item.js b/ui/app/components/drop-menu-item.js
index bd9d8f597..e42948209 100644
--- a/ui/app/components/drop-menu-item.js
+++ b/ui/app/components/drop-menu-item.js
@@ -42,7 +42,7 @@ 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', '✓')
diff --git a/ui/app/components/network.js b/ui/app/components/network.js
index f7ea8c49e..31a8fc17c 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) {
@@ -90,7 +90,7 @@ Network.prototype.render = function () {
               h('.menu-icon.golden-square'),
               h('.network-name', {
                 style: {
-                  color: '#550077',
+                  color: '#e7a218',
                 }},
               'Rinkeby Test Net'),
             ])
diff --git a/ui/app/config.js b/ui/app/config.js
index 26cfe663f..d7be26757 100644
--- a/ui/app/config.js
+++ b/ui/app/config.js
@@ -156,7 +156,7 @@ function currentProviderDisplay (metamaskState) {
       value = 'Main Ethereum Network'
       break
 
-    case 'testnet':
+    case 'ropsten':
       title = 'Current Network'
       value = 'Ropsten Test Network'
       break