diff options
author | Dan Finlay <dan@danfinlay.com> | 2017-10-19 08:07:25 +0800 |
---|---|---|
committer | Dan Finlay <dan@danfinlay.com> | 2017-10-19 08:07:25 +0800 |
commit | bbe2c9f48dd617e0696db50a3113df920dcaa974 (patch) | |
tree | cde9e7a2cb61dcfa254a7651aa12441e5c63c0fb /ui/app | |
parent | d89394a7c9a5139ed5708ce7022fbbe2809e612a (diff) | |
parent | 6eb27389579586dc06ce840444bcdb207707e0b2 (diff) | |
download | tangerine-wallet-browser-bbe2c9f48dd617e0696db50a3113df920dcaa974.tar tangerine-wallet-browser-bbe2c9f48dd617e0696db50a3113df920dcaa974.tar.gz tangerine-wallet-browser-bbe2c9f48dd617e0696db50a3113df920dcaa974.tar.bz2 tangerine-wallet-browser-bbe2c9f48dd617e0696db50a3113df920dcaa974.tar.lz tangerine-wallet-browser-bbe2c9f48dd617e0696db50a3113df920dcaa974.tar.xz tangerine-wallet-browser-bbe2c9f48dd617e0696db50a3113df920dcaa974.tar.zst tangerine-wallet-browser-bbe2c9f48dd617e0696db50a3113df920dcaa974.zip |
Merge remote-tracking branch 'origin/master' into i2348-SelectAccountOnNewVault
Diffstat (limited to 'ui/app')
-rw-r--r-- | ui/app/account-detail.js | 1 | ||||
-rw-r--r-- | ui/app/app.js | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js index a844daf88..d4f707e0b 100644 --- a/ui/app/account-detail.js +++ b/ui/app/account-detail.js @@ -121,6 +121,7 @@ AccountDetailScreen.prototype.render = function () { overflow: 'hidden', textOverflow: 'ellipsis', padding: '5px 0px', + lineHeight: '25px', }, }, [ identity && identity.name, diff --git a/ui/app/app.js b/ui/app/app.js index 30d3766ab..613577913 100644 --- a/ui/app/app.js +++ b/ui/app/app.js @@ -319,7 +319,7 @@ App.prototype.renderNetworkDropdown = function () { [ h('i.fa.fa-question-circle.fa-lg.menu-icon'), 'Localhost 8545', - providerType === 'localhost' ? h('.check', '✓') : null, + activeNetwork === 'http://localhost:8545' ? h('.check', '✓') : null, ] ), |