aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/components
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2016-11-22 02:58:49 +0800
committerDan Finlay <dan@danfinlay.com>2016-11-22 02:58:49 +0800
commite8a83026248e6e27e6d801cf1713551eb740137a (patch)
tree528f87b75425d172db7f3d4b9b563a348535042b /ui/app/components
parent37d836fa72c75945d436bd94feadb65aa95d7e5f (diff)
downloadtangerine-wallet-browser-e8a83026248e6e27e6d801cf1713551eb740137a.tar.gz
tangerine-wallet-browser-e8a83026248e6e27e6d801cf1713551eb740137a.tar.zst
tangerine-wallet-browser-e8a83026248e6e27e6d801cf1713551eb740137a.zip
Begin adding Ropsten support
Ropsten links will still not work until Etherscan publishes their ropsten link format. At that time we will need to update ui/lib/account-link.js Otherwise, fixes #831
Diffstat (limited to 'ui/app/components')
-rw-r--r--ui/app/components/drop-menu-item.js5
-rw-r--r--ui/app/components/network.js16
2 files changed, 20 insertions, 1 deletions
diff --git a/ui/app/components/drop-menu-item.js b/ui/app/components/drop-menu-item.js
index 8088680c0..b82114f03 100644
--- a/ui/app/components/drop-menu-item.js
+++ b/ui/app/components/drop-menu-item.js
@@ -41,9 +41,12 @@ DropMenuItem.prototype.activeNetworkRender = function () {
case 'Main Ethereum Network':
if (providerType === 'mainnet') return h('.check', '✓')
break
- case 'Morden Test Network':
+ 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 845861396..b7d3cdbf5 100644
--- a/ui/app/components/network.js
+++ b/ui/app/components/network.js
@@ -36,6 +36,12 @@ Network.prototype.render = function () {
} else if (providerName === 'mainnet') {
hoverText = 'Main Ethereum Network'
iconName = 'ethereum-network'
+ } else if (providerName === 'testnet') {
+ hoverText = 'Ropsten Test Network'
+ iconName = 'ropsten-test-network'
+ } 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'
@@ -43,6 +49,7 @@ Network.prototype.render = function () {
hoverText = 'Unknown Private Network'
iconName = 'unknown-private-network'
}
+
return (
h('#network_component.flex-center.pointer', {
style: {
@@ -63,6 +70,15 @@ Network.prototype.render = function () {
}},
'Ethereum Main Net'),
])
+ case 'ropsten-test-network':
+ return h('.network-indicator', [
+ h('.menu-icon.red-dot'),
+ h('.network-name', {
+ style: {
+ color: '#ff6666',
+ }},
+ 'Ropsten Test Net'),
+ ])
case 'morden-test-network':
return h('.network-indicator', [
h('.menu-icon.red-dot'),