diff options
| author | tmashuang <thomas.b.huang@gmail.com> | 2018-05-22 06:14:47 +0800 |
|---|---|---|
| committer | tmashuang <thomas.b.huang@gmail.com> | 2018-05-22 06:14:47 +0800 |
| commit | 848f8f805b54104d57aaf15f0cc14c36aa37edd2 (patch) | |
| tree | c32d61f253d0eeb9b33eb5aea0f5b27b4132ad5a /ui/app | |
| parent | 58b9afff4f3801d6d74b5311fb95060cc0a79cc1 (diff) | |
| parent | 5e67951c1ae22f61bf2045e6a069aa02baf427ff (diff) | |
| download | tangerine-wallet-browser-848f8f805b54104d57aaf15f0cc14c36aa37edd2.tar.gz tangerine-wallet-browser-848f8f805b54104d57aaf15f0cc14c36aa37edd2.tar.zst tangerine-wallet-browser-848f8f805b54104d57aaf15f0cc14c36aa37edd2.zip | |
Merge branch 'develop' into testing
Diffstat (limited to 'ui/app')
| -rw-r--r-- | ui/app/css/itcss/components/modal.scss | 2 | ||||
| -rw-r--r-- | ui/app/css/itcss/components/request-signature.scss | 2 | ||||
| -rw-r--r-- | ui/app/token-util.js | 3 |
3 files changed, 2 insertions, 5 deletions
diff --git a/ui/app/css/itcss/components/modal.scss b/ui/app/css/itcss/components/modal.scss index f972c0f7a..74658f656 100644 --- a/ui/app/css/itcss/components/modal.scss +++ b/ui/app/css/itcss/components/modal.scss @@ -566,7 +566,6 @@ padding: 30px; font-size: 22px; color: $nile-blue; - height: 79px; } &__message { @@ -832,7 +831,6 @@ padding: 30px; font-size: 22px; color: $nile-blue; - height: 79px; } .notification-modal-message { diff --git a/ui/app/css/itcss/components/request-signature.scss b/ui/app/css/itcss/components/request-signature.scss index 8bba6c98e..e6916c418 100644 --- a/ui/app/css/itcss/components/request-signature.scss +++ b/ui/app/css/itcss/components/request-signature.scss @@ -43,8 +43,6 @@ } &__header__text { - height: 29px; - width: 179px; color: #5B5D67; font-family: Roboto; font-size: 22px; diff --git a/ui/app/token-util.js b/ui/app/token-util.js index 920442bfc..8c5b37d7b 100644 --- a/ui/app/token-util.js +++ b/ui/app/token-util.js @@ -1,3 +1,4 @@ +const log = require('loglevel') const util = require('./util') function tokenInfoGetter () { @@ -29,7 +30,7 @@ async function getSymbolAndDecimals (tokenAddress, existingTokens = []) { token.decimals(), ]) } catch (err) { - console.log(`symbol() and decimal() calls for token at address ${tokenAddress} resulted in error:`, err) + log.warn(`symbol() and decimal() calls for token at address ${tokenAddress} resulted in error:`, err) } const [ symbol = [], decimals = [] ] = result |