aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Serrano <kevgagser@gmail.com>2017-08-30 09:09:16 +0800
committerGitHub <noreply@github.com>2017-08-30 09:09:16 +0800
commitec286a2b338decbde6a9dec3489420fd2d31a3bc (patch)
treecdb5623fe3afb3a28037fee14c1190df0791d19f
parent71de68fc13d83934e8bc81ba43574a946bc32159 (diff)
parent725e4aae7fb8ced184314bfa5131cc43cd3a35f0 (diff)
downloadtangerine-wallet-browser-ec286a2b338decbde6a9dec3489420fd2d31a3bc.tar.gz
tangerine-wallet-browser-ec286a2b338decbde6a9dec3489420fd2d31a3bc.tar.zst
tangerine-wallet-browser-ec286a2b338decbde6a9dec3489420fd2d31a3bc.zip
Merge pull request #1992 from MetaMask/MultipleTokensText
Multiple tokens shows the amount when greater than 1
-rw-r--r--CHANGELOG.md1
-rw-r--r--ui/app/components/token-list.js2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a0fe916dd..3d5695c40 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
- Make eth_sign deprecation warning less noisy
- Fix bug with network version serialization over synchronous RPC
+- 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`