From 83880a5c92df6024e3420ecf19d55585f5d2b185 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Thu, 15 Dec 2016 16:09:39 -0800
Subject: Remove morden testnet provider

Instances configured to point at Morden will now point at Ropsten.
---
 app/scripts/config.js               |  3 +--
 ui/app/app.js                       |  9 ---------
 ui/app/components/drop-menu-item.js |  3 ---
 ui/app/components/network.js        | 12 ------------
 ui/app/config.js                    |  2 +-
 5 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/app/scripts/config.js b/app/scripts/config.js
index 9a0f2a50b..e09206c5f 100644
--- a/app/scripts/config.js
+++ b/app/scripts/config.js
@@ -1,6 +1,5 @@
 const MAINET_RPC_URL = 'https://mainnet.infura.io/metamask'
 const TESTNET_RPC_URL = 'https://ropsten.infura.io/metamask'
-const MORDEN_RPC_URL = 'https://morden.infura.io/metamask'
 const DEFAULT_RPC_URL = TESTNET_RPC_URL
 
 global.METAMASK_DEBUG = 'GULP_METAMASK_DEBUG'
@@ -11,6 +10,6 @@ module.exports = {
     default: DEFAULT_RPC_URL,
     mainnet: MAINET_RPC_URL,
     testnet: TESTNET_RPC_URL,
-    morden: MORDEN_RPC_URL,
+    morden: TESTNET_RPC_URL,
   },
 }
diff --git a/ui/app/app.js b/ui/app/app.js
index 3a3b234cc..0646e3165 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -243,15 +243,6 @@ App.prototype.renderNetworkDropdown = function () {
       provider: props.provider,
     }),
 
-    h(DropMenuItem, {
-      label: 'Morden Test Network',
-      closeMenu: () => this.setState({ isNetworkMenuOpen: false }),
-      action: () => props.dispatch(actions.setProviderType('morden')),
-      icon: h('.menu-icon.red-dot'),
-      activeNetworkRender: props.network,
-      provider: props.provider,
-    }),
-
     h(DropMenuItem, {
       label: 'Localhost 8545',
       closeMenu: () => this.setState({ isNetworkMenuOpen: false }),
diff --git a/ui/app/components/drop-menu-item.js b/ui/app/components/drop-menu-item.js
index b82114f03..ac0aecadd 100644
--- a/ui/app/components/drop-menu-item.js
+++ b/ui/app/components/drop-menu-item.js
@@ -44,9 +44,6 @@ DropMenuItem.prototype.activeNetworkRender = function () {
     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 b7d3cdbf5..1f61ef73f 100644
--- a/ui/app/components/network.js
+++ b/ui/app/components/network.js
@@ -42,9 +42,6 @@ Network.prototype.render = function () {
   } 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 {
     hoverText = 'Unknown Private Network'
     iconName = 'unknown-private-network'
@@ -79,15 +76,6 @@ Network.prototype.render = function () {
                 }},
               'Ropsten Test Net'),
             ])
-          case 'morden-test-network':
-            return h('.network-indicator', [
-              h('.menu-icon.red-dot'),
-              h('.network-name', {
-                style: {
-                  color: '#ff6666',
-                }},
-              'Morden Test Net'),
-            ])
           default:
             return h('.network-indicator', [
               h('i.fa.fa-question-circle.fa-lg', {
diff --git a/ui/app/config.js b/ui/app/config.js
index e09a38cd8..8824c6bec 100644
--- a/ui/app/config.js
+++ b/ui/app/config.js
@@ -133,7 +133,7 @@ function currentProviderDisplay (metamaskState) {
 
     case 'testnet':
       title = 'Current Network'
-      value = 'Morden Test Network'
+      value = 'Ropsten Test Network'
       break
 
     default:
-- 
cgit 


From 4f3ba6e0b8c685f79d46da30c88e22434e220bd9 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Thu, 15 Dec 2016 16:10:47 -0800
Subject: Bump changelog for removing morden

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 05e481779..760f2b178 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 - Fix broken reload detection.
 - Fix transaction forever cached-as-pending bug.
+- Removed Morden testnet provider from provider menu.
 
 ## 2.13.11 2016-11-23
 
-- 
cgit