aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
Diffstat (limited to 'ui')
-rw-r--r--ui/app/add-token.js2
-rw-r--r--ui/app/components/pending-tx.js2
-rw-r--r--ui/app/info.js10
-rw-r--r--ui/lib/tx-helper.js6
4 files changed, 15 insertions, 5 deletions
diff --git a/ui/app/add-token.js b/ui/app/add-token.js
index b303b5c0d..15ef7a852 100644
--- a/ui/app/add-token.js
+++ b/ui/app/add-token.js
@@ -86,7 +86,7 @@ AddTokenScreen.prototype.render = function () {
h('div', [
h('span', {
style: { fontWeight: 'bold', paddingRight: '10px'},
- }, 'Token Sybmol'),
+ }, 'Token Symbol'),
]),
h('div', { style: {display: 'flex'} }, [
diff --git a/ui/app/components/pending-tx.js b/ui/app/components/pending-tx.js
index d7d602f31..5324ccd64 100644
--- a/ui/app/components/pending-tx.js
+++ b/ui/app/components/pending-tx.js
@@ -15,7 +15,7 @@ const addressSummary = util.addressSummary
const nameForAddress = require('../../lib/contract-namer')
const BNInput = require('./bn-as-decimal-input')
-const MIN_GAS_PRICE_GWEI_BN = new BN(2)
+const MIN_GAS_PRICE_GWEI_BN = new BN(1)
const GWEI_FACTOR = new BN(1e9)
const MIN_GAS_PRICE_BN = MIN_GAS_PRICE_GWEI_BN.mul(GWEI_FACTOR)
const MIN_GAS_LIMIT_BN = new BN(21000)
diff --git a/ui/app/info.js b/ui/app/info.js
index e8470de97..cb2e41f5b 100644
--- a/ui/app/info.js
+++ b/ui/app/info.js
@@ -97,11 +97,17 @@ InfoScreen.prototype.render = function () {
paddingLeft: '30px',
}},
[
+ h('div.fa.fa-support', [
+ h('a.info', {
+ href: 'http://metamask.consensyssupport.happyfox.com',
+ target: '_blank',
+ }, 'Visit our Support Center'),
+ ]),
h('div.fa.fa-github', [
h('a.info', {
- href: 'https://github.com/MetaMask/faq',
+ href: 'https://github.com/MetaMask/metamask-extension/issues/new',
target: '_blank',
- }, 'Need Help? Read our FAQ!'),
+ }, 'Found a bug? Report it!'),
]),
h('div', [
h('a', {
diff --git a/ui/lib/tx-helper.js b/ui/lib/tx-helper.js
index ec19daf64..afc62e7b6 100644
--- a/ui/lib/tx-helper.js
+++ b/ui/lib/tx-helper.js
@@ -12,6 +12,10 @@ module.exports = function (unapprovedTxs, unapprovedMsgs, personalMsgs, network)
const personalValues = valuesFor(personalMsgs)
log.debug(`tx helper found ${personalValues.length} unsigned personal messages`)
allValues = allValues.concat(personalValues)
+ allValues = allValues.sort((a, b) => {
+ return a.time > b.time
+ })
- return allValues.sort(txMeta => txMeta.time)
+ return allValues
}
+