aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/components
diff options
context:
space:
mode:
authorkumavis <kumavis@users.noreply.github.com>2017-05-16 13:58:36 +0800
committerGitHub <noreply@github.com>2017-05-16 13:58:36 +0800
commit687dfc87bdfbdbde58a247a6ae8ab49b2a324da8 (patch)
treeebcc8771da1e34491e3687035c754effe0c5beaa /ui/app/components
parent85ca8b4539782fca143602afb4216dd3d2338b28 (diff)
parent3367363b1234a076695758762d7f1220fe4a7f8c (diff)
downloadtangerine-wallet-browser-687dfc87bdfbdbde58a247a6ae8ab49b2a324da8.tar
tangerine-wallet-browser-687dfc87bdfbdbde58a247a6ae8ab49b2a324da8.tar.gz
tangerine-wallet-browser-687dfc87bdfbdbde58a247a6ae8ab49b2a324da8.tar.bz2
tangerine-wallet-browser-687dfc87bdfbdbde58a247a6ae8ab49b2a324da8.tar.lz
tangerine-wallet-browser-687dfc87bdfbdbde58a247a6ae8ab49b2a324da8.tar.xz
tangerine-wallet-browser-687dfc87bdfbdbde58a247a6ae8ab49b2a324da8.tar.zst
tangerine-wallet-browser-687dfc87bdfbdbde58a247a6ae8ab49b2a324da8.zip
Merge pull request #1432 from MetaMask/i1419-rinkebydefaultnetwork
I1419 rinkebydefaultnetwork
Diffstat (limited to 'ui/app/components')
-rw-r--r--ui/app/components/drop-menu-item.js2
-rw-r--r--ui/app/components/network.js4
2 files changed, 3 insertions, 3 deletions
diff --git a/ui/app/components/drop-menu-item.js b/ui/app/components/drop-menu-item.js
index bd9d8f597..e42948209 100644
--- a/ui/app/components/drop-menu-item.js
+++ b/ui/app/components/drop-menu-item.js
@@ -42,7 +42,7 @@ DropMenuItem.prototype.activeNetworkRender = function () {
if (providerType === 'mainnet') return h('.check', '✓')
break
case 'Ropsten Test Network':
- if (providerType === 'testnet') return h('.check', '✓')
+ if (providerType === 'ropsten') return h('.check', '✓')
break
case 'Kovan Test Network':
if (providerType === 'kovan') return h('.check', '✓')
diff --git a/ui/app/components/network.js b/ui/app/components/network.js
index f7ea8c49e..31a8fc17c 100644
--- a/ui/app/components/network.js
+++ b/ui/app/components/network.js
@@ -34,7 +34,7 @@ Network.prototype.render = function () {
} else if (providerName === 'mainnet') {
hoverText = 'Main Ethereum Network'
iconName = 'ethereum-network'
- } else if (providerName === 'testnet') {
+ } else if (providerName === 'ropsten') {
hoverText = 'Ropsten Test Network'
iconName = 'ropsten-test-network'
} else if (parseInt(networkNumber) === 3) {
@@ -90,7 +90,7 @@ Network.prototype.render = function () {
h('.menu-icon.golden-square'),
h('.network-name', {
style: {
- color: '#550077',
+ color: '#e7a218',
}},
'Rinkeby Test Net'),
])