diff options
| author | Kevin Serrano <kevin.serrano@consensys.net> | 2017-05-17 07:28:57 +0800 |
|---|---|---|
| committer | Kevin Serrano <kevin.serrano@consensys.net> | 2017-05-17 07:28:57 +0800 |
| commit | 90bfa3cbcdbe0ace28bb25ecb350b1080a4139d4 (patch) | |
| tree | 3739c65edfe8a7c4e7eca455d2f1a522176e3af7 /ui/app/components/network.js | |
| parent | 44f25cd93c18c57acf993ace3387a4d569d8dcca (diff) | |
| parent | 43ea223c9fe8ee593a572b153defc5ddefd72e95 (diff) | |
| download | tangerine-wallet-browser-90bfa3cbcdbe0ace28bb25ecb350b1080a4139d4.tar tangerine-wallet-browser-90bfa3cbcdbe0ace28bb25ecb350b1080a4139d4.tar.gz tangerine-wallet-browser-90bfa3cbcdbe0ace28bb25ecb350b1080a4139d4.tar.bz2 tangerine-wallet-browser-90bfa3cbcdbe0ace28bb25ecb350b1080a4139d4.tar.lz tangerine-wallet-browser-90bfa3cbcdbe0ace28bb25ecb350b1080a4139d4.tar.xz tangerine-wallet-browser-90bfa3cbcdbe0ace28bb25ecb350b1080a4139d4.tar.zst tangerine-wallet-browser-90bfa3cbcdbe0ace28bb25ecb350b1080a4139d4.zip | |
Fix merge conflicts.
Diffstat (limited to 'ui/app/components/network.js')
| -rw-r--r-- | ui/app/components/network.js | 4 |
1 files changed, 2 insertions, 2 deletions
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'), ]) |