diff options
| author | Frankie <frankie.diamond@gmail.com> | 2016-12-22 06:31:07 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-22 06:31:07 +0800 |
| commit | 6f7c23fd28ef37ae51478b735c1f5888c97bbaf5 (patch) | |
| tree | b927871ed00c33a66341a26de09f00cf006314b8 /ui/app/components | |
| parent | a85c691b71d5142d2412000930328fbe9161760a (diff) | |
| parent | 73cdf0bfd49470bad1f0da4d0d894278c87af54e (diff) | |
| download | tangerine-wallet-browser-6f7c23fd28ef37ae51478b735c1f5888c97bbaf5.tar.gz tangerine-wallet-browser-6f7c23fd28ef37ae51478b735c1f5888c97bbaf5.tar.zst tangerine-wallet-browser-6f7c23fd28ef37ae51478b735c1f5888c97bbaf5.zip | |
Merge branch 'dev' into TxManager
Diffstat (limited to 'ui/app/components')
| -rw-r--r-- | ui/app/components/drop-menu-item.js | 3 | ||||
| -rw-r--r-- | ui/app/components/network.js | 12 |
2 files changed, 0 insertions, 15 deletions
diff --git a/ui/app/components/drop-menu-item.js b/ui/app/components/drop-menu-item.js index 7cf686cab..9f002234e 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 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', { |