Merge pull request #544 from MetaMask/RemoveEtc

Remove ethereum classic provider

4 files changed, 1 insertions, 26 deletions

diff --git a/ui/app/actions.js b/ui/app/actions.js
index 61f900df9..326c811af 100644
--- a/ui/app/actions.js
+++ b/ui/app/actions.js
@@ -671,8 +671,7 @@ function pairUpdate (coin) {
 }
 
 function shapeShiftSubview (network) {
-  var pair
-  network === 'classic' ? pair = 'btc_etc' : pair = 'btc_eth'
+  var pair = 'btc_eth'
 
   return (dispatch) => {
     dispatch(actions.showSubLoadingIndication())
diff --git a/ui/app/app.js b/ui/app/app.js
index 4cc32bf9b..2d8b46ce8 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -226,15 +226,6 @@ App.prototype.renderNetworkDropdown = function () {
     }),
 
     h(DropMenuItem, {
-      label: 'Ethereum Classic Network',
-      closeMenu: () => this.setState({ isNetworkMenuOpen: false }),
-      action: () => props.dispatch(actions.setProviderType('classic')),
-      icon: h('.menu-icon.hollow-diamond'),
-      activeNetworkRender: props.network,
-      provider: props.provider,
-    }),
-
-    h(DropMenuItem, {
       label: 'Morden Test Network',
       closeMenu: () => this.setState({ isNetworkMenuOpen: false }),
       action: () => props.dispatch(actions.setProviderType('testnet')),
diff --git a/ui/app/components/drop-menu-item.js b/ui/app/components/drop-menu-item.js
index 1a0d6cbd5..0ca1988c6 100644
--- a/ui/app/components/drop-menu-item.js
+++ b/ui/app/components/drop-menu-item.js
@@ -41,9 +41,6 @@ DropMenuItem.prototype.activeNetworkRender = function () {
     case 'Main Ethereum Network':
       if (providerType === 'mainnet') return h('.check', '✓')
       break
-    case 'Ethereum Classic Network':
-      if (providerType === 'classic') return h('.check', '✓')
-      break
     case 'Morden Test Network':
       if (activeNetwork === '2') return h('.check', '✓')
       break
diff --git a/ui/app/components/network.js b/ui/app/components/network.js
index 4a5449836..2f1bf639a 100644
--- a/ui/app/components/network.js
+++ b/ui/app/components/network.js
@@ -36,9 +36,6 @@ Network.prototype.render = function () {
   } else if (providerName === 'mainnet') {
     hoverText = 'Main Ethereum Network'
     iconName = 'ethereum-network'
-  } else if (providerName === 'classic') {
-    hoverText = 'Ethereum Classic Network'
-    iconName = 'classic-network'
   } else if (parseInt(networkNumber) === 2) {
     hoverText = 'Morden Test Network'
     iconName = 'morden-test-network'
@@ -66,15 +63,6 @@ Network.prototype.render = function () {
                 }},
               'Etherum Main Net'),
             ])
-          case 'classic-network':
-            return h('.network-indicator', [
-              h('.menu-icon.hollow-diamond'),
-              h('.network-name', {
-                style: {
-                  color: '#039396',
-                }},
-              'Etherum Classic'),
-            ])
           case 'morden-test-network':
             return h('.network-indicator', [
               h('.menu-icon.red-dot'),