Merge pull request #833 from MetaMask/i831-AddRopsten-Dev

Begin adding Ropsten support to dev

2 files changed, 19 insertions, 1 deletions

diff --git a/ui/app/components/drop-menu-item.js b/ui/app/components/drop-menu-item.js
index 5c06101df..7cf686cab 100644
--- a/ui/app/components/drop-menu-item.js
+++ b/ui/app/components/drop-menu-item.js
@@ -41,9 +41,12 @@ DropMenuItem.prototype.activeNetworkRender = function () {
     case 'Main Ethereum Network':
       if (providerType === 'mainnet') return h('.check', '✓')
       break
-    case 'Morden Test Network':
+    case 'Ropsten Test Network':
       if (provider.type === 'testnet') return h('.check', '✓')
       break
+    case 'Morden Test Network':
+      if (provider.type === 'morden') return h('.check', '✓')
+      break
     case 'Localhost 8545':
       if (activeNetwork === 'http://localhost:8545') return h('.check', '✓')
       break
diff --git a/ui/app/components/network.js b/ui/app/components/network.js
index 8e67dd741..9cf597648 100644
--- a/ui/app/components/network.js
+++ b/ui/app/components/network.js
@@ -35,6 +35,12 @@ Network.prototype.render = function () {
     hoverText = 'Main Ethereum Network'
     iconName = 'ethereum-network'
   } else if (providerName === 'testnet') {
+    hoverText = 'Ropsten Test Network'
+    iconName = 'ropsten-test-network'
+  } else if (parseInt(networkNumber) === 3) {
+    hoverText = 'Ropsten Test Network'
+    iconName = 'ropsten-test-network'
+  } else if (parseInt(networkNumber) === 2) {
     hoverText = 'Morden Test Network'
     iconName = 'morden-test-network'
   } else {
@@ -62,6 +68,15 @@ Network.prototype.render = function () {
                 }},
               'Ethereum Main Net'),
             ])
+          case 'ropsten-test-network':
+            return h('.network-indicator', [
+              h('.menu-icon.red-dot'),
+              h('.network-name', {
+                style: {
+                  color: '#ff6666',
+                }},
+              'Ropsten Test Net'),
+            ])
           case 'morden-test-network':
             return h('.network-indicator', [
               h('.menu-icon.red-dot'),