diff options
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | app/scripts/config.js | 2 | ||||
| -rw-r--r-- | app/scripts/lib/config-manager.js | 6 | ||||
| -rw-r--r-- | ui/app/actions.js | 3 | ||||
| -rw-r--r-- | ui/app/app.js | 9 | ||||
| -rw-r--r-- | ui/app/components/drop-menu-item.js | 3 | ||||
| -rw-r--r-- | ui/app/components/network.js | 12 |
7 files changed, 4 insertions, 33 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index c251be48e..8aebb5b25 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,12 @@ # Changelog ## Current Master + - Integrate ShapeShift - Add a for for Coinbase to specify amount to buy - Fix various typos. - Make dapp-metamask connection more reliable +- Remove Ethereum Classic from provider menu. ## 2.7.3 2016-07-29 diff --git a/app/scripts/config.js b/app/scripts/config.js index 7a1d54a3b..04e2907d4 100644 --- a/app/scripts/config.js +++ b/app/scripts/config.js @@ -1,7 +1,6 @@ const MAINET_RPC_URL = 'https://mainnet.infura.io/' const TESTNET_RPC_URL = 'https://morden.infura.io/' const DEFAULT_RPC_URL = TESTNET_RPC_URL -const CLASSIC_RPC_URL = 'https://mainnet-nf.infura.io/' global.METAMASK_DEBUG = false @@ -10,6 +9,5 @@ module.exports = { default: DEFAULT_RPC_URL, mainnet: MAINET_RPC_URL, testnet: TESTNET_RPC_URL, - classic: CLASSIC_RPC_URL, }, } diff --git a/app/scripts/lib/config-manager.js b/app/scripts/lib/config-manager.js index 3d84edfd0..d14d3afc3 100644 --- a/app/scripts/lib/config-manager.js +++ b/app/scripts/lib/config-manager.js @@ -4,7 +4,6 @@ const migrations = require('./migrations') const TESTNET_RPC = MetamaskConfig.network.testnet const MAINNET_RPC = MetamaskConfig.network.mainnet -const CLASSIC_RPC = MetamaskConfig.network.classic /* The config-manager is a convenience object * wrapping a pojo-migrator. @@ -145,9 +144,6 @@ ConfigManager.prototype.getCurrentRpcAddress = function () { case 'testnet': return TESTNET_RPC - case 'classic': - return CLASSIC_RPC - default: return provider && provider.rpcTarget ? provider.rpcTarget : TESTNET_RPC } @@ -279,7 +275,7 @@ ConfigManager.prototype.setShouldntShowWarning = function () { if (data.isEthConfirmed) { data.isEthConfirmed = !data.isEthConfirmed } else { - data.isEthConfirmed = true + data.isEthConfirmed = true } this.setData(data) } 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'), |