aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app
diff options
context:
space:
mode:
authorKevin Serrano <kevin.serrano@consensys.net>2017-09-06 00:01:05 +0800
committerKevin Serrano <kevin.serrano@consensys.net>2017-09-06 00:01:05 +0800
commit162aedb30b94890935658921b0dd399f43d6cd65 (patch)
tree98393ff9909339169a81e04767a004283382a9aa /ui/app
parentae8486d5cfa2c1d173e0c675408cc6bc00729bd3 (diff)
parent2885a9547187ce1ad0fb3bed1935387d901942a8 (diff)
downloadtangerine-wallet-browser-162aedb30b94890935658921b0dd399f43d6cd65.tar.gz
tangerine-wallet-browser-162aedb30b94890935658921b0dd399f43d6cd65.tar.zst
tangerine-wallet-browser-162aedb30b94890935658921b0dd399f43d6cd65.zip
Merge branch 'master' into new-currency-test
Diffstat (limited to 'ui/app')
-rw-r--r--ui/app/components/token-list.js2
-rw-r--r--ui/app/info.js2
-rw-r--r--ui/app/reducers.js5
3 files changed, 6 insertions, 3 deletions
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`
diff --git a/ui/app/info.js b/ui/app/info.js
index 899841c83..c69d83715 100644
--- a/ui/app/info.js
+++ b/ui/app/info.js
@@ -103,7 +103,7 @@ InfoScreen.prototype.render = function () {
[
h('div.fa.fa-support', [
h('a.info', {
- href: 'http://metamask.consensyssupport.happyfox.com',
+ href: 'https://support.metamask.com',
target: '_blank',
}, 'Visit our Support Center'),
]),
diff --git a/ui/app/reducers.js b/ui/app/reducers.js
index 36045772f..6a2f44534 100644
--- a/ui/app/reducers.js
+++ b/ui/app/reducers.js
@@ -42,7 +42,10 @@ function rootReducer (state, action) {
}
window.logState = function () {
- var stateString = JSON.stringify(window.METAMASK_CACHED_LOG_STATE, removeSeedWords, 2)
+ let state = window.METAMASK_CACHED_LOG_STATE
+ const version = global.platform.getVersion()
+ state.version = version
+ let stateString = JSON.stringify(state, removeSeedWords, 2)
return stateString
}