aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app
diff options
context:
space:
mode:
authorKevin Serrano <kevin.serrano@consensys.net>2017-04-26 05:39:01 +0800
committerKevin Serrano <kevin.serrano@consensys.net>2017-04-26 05:39:01 +0800
commit242dc1e99f1dd53e2bec9deefb5da0c8329b5f00 (patch)
treed6a943349a6b86fab61558d59179435b4ddbeb2b /ui/app
parentd764e46a500d0dc156a1da86498b751d23c94747 (diff)
downloadtangerine-wallet-browser-242dc1e99f1dd53e2bec9deefb5da0c8329b5f00.tar
tangerine-wallet-browser-242dc1e99f1dd53e2bec9deefb5da0c8329b5f00.tar.gz
tangerine-wallet-browser-242dc1e99f1dd53e2bec9deefb5da0c8329b5f00.tar.bz2
tangerine-wallet-browser-242dc1e99f1dd53e2bec9deefb5da0c8329b5f00.tar.lz
tangerine-wallet-browser-242dc1e99f1dd53e2bec9deefb5da0c8329b5f00.tar.xz
tangerine-wallet-browser-242dc1e99f1dd53e2bec9deefb5da0c8329b5f00.tar.zst
tangerine-wallet-browser-242dc1e99f1dd53e2bec9deefb5da0c8329b5f00.zip
Add missing changes. Create unique style for rinkeby icon.
Diffstat (limited to 'ui/app')
-rw-r--r--ui/app/app.js2
-rw-r--r--ui/app/components/buy-button-subview.js8
-rw-r--r--ui/app/components/network.js2
-rw-r--r--ui/app/components/transaction-list-item.js2
-rw-r--r--ui/app/css/lib.css4
5 files changed, 14 insertions, 4 deletions
diff --git a/ui/app/app.js b/ui/app/app.js
index 4ae40b659..156490914 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -268,7 +268,7 @@ App.prototype.renderNetworkDropdown = function () {
label: 'Rinkeby Test Network',
closeMenu: () => this.setState({ isNetworkMenuOpen: false}),
action: () => props.dispatch(actions.setProviderType('rinkeby')),
- icon: h('.menu-icon.hollow-diamond'),
+ icon: h('.menu-icon.golden-square'),
activeNetworkRender: props.network,
provider: props.provider,
}),
diff --git a/ui/app/components/buy-button-subview.js b/ui/app/components/buy-button-subview.js
index 191f46319..87084f92d 100644
--- a/ui/app/components/buy-button-subview.js
+++ b/ui/app/components/buy-button-subview.js
@@ -152,13 +152,19 @@ BuyButtonSubview.prototype.formVersionSubview = function () {
marginBottom: '15px',
},
}, 'In order to access this feature, please switch to the Main Network'),
- ((network === '3') || (network === '42')) ? h('h3.text-transform-uppercase', 'or go to the') : null,
+ ((network === '3') || (network === '4') || (network === '42')) ? h('h3.text-transform-uppercase', 'or go to the') : null,
(network === '3') ? h('button.text-transform-uppercase', {
onClick: () => this.props.dispatch(actions.buyEth({ network })),
style: {
marginTop: '15px',
},
}, 'Ropsten Test Faucet') : null,
+ (network === '4') ? h('button.text-transform-uppercase', {
+ onClick: () => this.props.dispatch(actions.buyEth({ network })),
+ style: {
+ marginTop: '15px',
+ },
+ }, 'Rinkeby Test Faucet') : null,
(network === '42') ? h('button.text-transform-uppercase', {
onClick: () => this.props.dispatch(actions.buyEth({ network })),
style: {
diff --git a/ui/app/components/network.js b/ui/app/components/network.js
index 94704b1bc..e8065cf00 100644
--- a/ui/app/components/network.js
+++ b/ui/app/components/network.js
@@ -87,7 +87,7 @@ Network.prototype.render = function () {
])
case 'rinkeby-test-network':
return h('.network-indicator', [
- h('.menu-icon.hollow-diamond'),
+ h('.menu-icon.golden-square'),
h('.network-name', {
style: {
color: '#550077',
diff --git a/ui/app/components/transaction-list-item.js b/ui/app/components/transaction-list-item.js
index 9fef52355..6f4dfae2d 100644
--- a/ui/app/components/transaction-list-item.js
+++ b/ui/app/components/transaction-list-item.js
@@ -27,7 +27,7 @@ TransactionListItem.prototype.render = function () {
let isLinkable = false
const numericNet = parseInt(network)
- isLinkable = numericNet === 1 || numericNet === 3 || numericNet === 42
+ isLinkable = numericNet === 1 || numericNet === 3 || numericNet === 4 || numericNet === 42
var isMsg = ('msgParams' in transaction)
var isTx = ('txParams' in transaction)
diff --git a/ui/app/css/lib.css b/ui/app/css/lib.css
index 670dc9fd0..910a24ee2 100644
--- a/ui/app/css/lib.css
+++ b/ui/app/css/lib.css
@@ -191,6 +191,10 @@ hr.horizontal-line {
border: 3px solid #690496;
}
+.golden-square {
+ background: #EBB33F;
+}
+
.pending-dot {
background: red;
left: 14px;