Change default network to rinkeby

app/scripts/config.js

@@ -1,7 +1,7 @@
 const MAINET_RPC_URL = 'https://mainnet.infura.io/metamask'
-const TESTNET_RPC_URL = 'https://ropsten.infura.io/metamask'
+const TESTNET_RPC_URL = 'https://rinkeby.infura.io/metamask'
 const KOVAN_RPC_URL = 'https://kovan.infura.io/metamask'
-const RINKEBY_RPC_URL = 'https://rinkeby.infura.io/metamask'
+const ROPSTEN_RPC_URL = 'https://ropsten.infura.io/metamask'
 const DEFAULT_RPC_URL = TESTNET_RPC_URL
 
 global.METAMASK_DEBUG = 'GULP_METAMASK_DEBUG'
@@ -13,6 +13,6 @@ module.exports = {
     testnet: TESTNET_RPC_URL,
     morden: TESTNET_RPC_URL,
     kovan: KOVAN_RPC_URL,
-    rinkeby: RINKEBY_RPC_URL,
+    ropsten: ROPSTEN_RPC_URL,
   },
 }

app/scripts/lib/config-manager.js

@@ -6,7 +6,7 @@ const TESTNET_RPC = MetamaskConfig.network.testnet
 const MAINNET_RPC = MetamaskConfig.network.mainnet
 const MORDEN_RPC = MetamaskConfig.network.morden
 const KOVAN_RPC = MetamaskConfig.network.kovan
-const RINKEBY_RPC = MetamaskConfig.network.rinkeby
+const ROPSTEN_RPC = MetamaskConfig.network.ropsten
 
 
 /* The config-manager is a convenience object
@@ -147,8 +147,8 @@ ConfigManager.prototype.getCurrentRpcAddress = function () {
     case 'mainnet':
       return MAINNET_RPC
 
-    case 'testnet':
-      return TESTNET_RPC
+    case 'ropsten':
+      return ROPSTEN_RPC
 
     case 'morden':
       return MORDEN_RPC
@@ -156,8 +156,8 @@ ConfigManager.prototype.getCurrentRpcAddress = function () {
     case 'kovan':
       return KOVAN_RPC
 
-    case 'rinkeby':
-      return RINKEBY_RPC
+    case 'testnet':
+      return TESTNET_RPC
 
     default:
       return provider && provider.rpcTarget ? provider.rpcTarget : TESTNET_RPC

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,

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', '✓')

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'),
             ])