diff options
| author | Kevin Serrano <kevgagser@gmail.com> | 2017-08-30 09:09:39 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-30 09:09:39 +0800 |
| commit | 4b058bc7eb0a82a71e7c9c2b691bd3c94071270f (patch) | |
| tree | 055326680aab59989405f64c301447f3a3c19555 | |
| parent | 54ce267a9f804b1733d2627ac7568d5eb6fe6518 (diff) | |
| parent | ec286a2b338decbde6a9dec3489420fd2d31a3bc (diff) | |
| download | tangerine-wallet-browser-4b058bc7eb0a82a71e7c9c2b691bd3c94071270f.tar tangerine-wallet-browser-4b058bc7eb0a82a71e7c9c2b691bd3c94071270f.tar.gz tangerine-wallet-browser-4b058bc7eb0a82a71e7c9c2b691bd3c94071270f.tar.bz2 tangerine-wallet-browser-4b058bc7eb0a82a71e7c9c2b691bd3c94071270f.tar.lz tangerine-wallet-browser-4b058bc7eb0a82a71e7c9c2b691bd3c94071270f.tar.xz tangerine-wallet-browser-4b058bc7eb0a82a71e7c9c2b691bd3c94071270f.tar.zst tangerine-wallet-browser-4b058bc7eb0a82a71e7c9c2b691bd3c94071270f.zip | |
Merge branch 'master' into i1986-AddVersionToStateLogs
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | ui/app/components/token-list.js | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index dc5e7629a..43b52e5fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - Make eth_sign deprecation warning less noisy - Fix bug with network version serialization over synchronous RPC - Add MetaMask version to state logs. +- Add the total amount of tokens when multiple tokens are added under the token list ## 3.9.11 2017-8-24 diff --git a/ui/app/components/token-list.js b/ui/app/components/token-list.js index 2346568bc..998ec901d 100644 --- a/ui/app/components/token-list.js +++ b/ui/app/components/token-list.js @@ -95,7 +95,7 @@ TokenList.prototype.renderTokenStatusBar = function () { let msg if (tokens.length === 1) { msg = `You own 1 token` - } else if (tokens.length === 1) { + } else if (tokens.length > 1) { msg = `You own ${tokens.length} tokens` } else { msg = `No tokens found` |