aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/components/network.js
diff options
context:
space:
mode:
authorkumavis <kumavis@users.noreply.github.com>2016-12-20 07:28:43 +0800
committerGitHub <noreply@github.com>2016-12-20 07:28:43 +0800
commitf7eec0b282de511d54fd50f2c75d7371ca6f399d (patch)
tree7476af4926a4e27999086ee570e46c4f74621b84 /ui/app/components/network.js
parent1b6ee56cac34cd3544fd375cad342eb8240ae8aa (diff)
parent77d2deb17654b87dfd306b7f7cef335b1b511a8f (diff)
downloadtangerine-wallet-browser-f7eec0b282de511d54fd50f2c75d7371ca6f399d.tar
tangerine-wallet-browser-f7eec0b282de511d54fd50f2c75d7371ca6f399d.tar.gz
tangerine-wallet-browser-f7eec0b282de511d54fd50f2c75d7371ca6f399d.tar.bz2
tangerine-wallet-browser-f7eec0b282de511d54fd50f2c75d7371ca6f399d.tar.lz
tangerine-wallet-browser-f7eec0b282de511d54fd50f2c75d7371ca6f399d.tar.xz
tangerine-wallet-browser-f7eec0b282de511d54fd50f2c75d7371ca6f399d.tar.zst
tangerine-wallet-browser-f7eec0b282de511d54fd50f2c75d7371ca6f399d.zip
Merge pull request #936 from MetaMask/MergeMaster
Merge master
Diffstat (limited to 'ui/app/components/network.js')
-rw-r--r--ui/app/components/network.js12
1 files changed, 0 insertions, 12 deletions
diff --git a/ui/app/components/network.js b/ui/app/components/network.js
index 9cf597648..43dc747b3 100644
--- a/ui/app/components/network.js
+++ b/ui/app/components/network.js
@@ -40,9 +40,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'
@@ -77,15 +74,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', {