mirror of
https://github.com/kremalicious/metamask-extension.git
synced 2024-12-23 01:39:44 +01:00
Merge branch 'master' into nonce-tracker
This commit is contained in:
commit
abbbe1156c
@ -4,6 +4,8 @@
|
||||
|
||||
- Add a warning to JSON file import.
|
||||
- Fix bug where slowly mined txs would sometimes be incorrectly marked as failed.
|
||||
- Fix bug where badge count did not reflect personal_sign pending messages.
|
||||
- Seed word confirmation wording is now scarier.
|
||||
|
||||
## 3.7.8 2017-6-12
|
||||
|
||||
|
@ -116,13 +116,15 @@ function setupController (initState) {
|
||||
updateBadge()
|
||||
controller.txController.on('updateBadge', updateBadge)
|
||||
controller.messageManager.on('updateBadge', updateBadge)
|
||||
controller.personalMessageManager.on('updateBadge', updateBadge)
|
||||
|
||||
// plugin badge text
|
||||
function updateBadge () {
|
||||
var label = ''
|
||||
var unapprovedTxCount = controller.txController.unapprovedTxCount
|
||||
var unapprovedMsgCount = controller.messageManager.unapprovedMsgCount
|
||||
var count = unapprovedTxCount + unapprovedMsgCount
|
||||
var unapprovedPersonalMsgs = controller.personalMessageManager.unapprovedPersonalMsgCount
|
||||
var count = unapprovedTxCount + unapprovedMsgCount + unapprovedPersonalMsgs
|
||||
if (count) {
|
||||
label = String(count)
|
||||
}
|
||||
|
@ -1,9 +0,0 @@
|
||||
// LINTING:
|
||||
const lint = require('mocha-eslint')
|
||||
const lintPaths = ['app/**/*.js', 'ui/**/*.js', 'test/**/*.js', '!node_modules/**', '!dist/**', '!docs/**', '!app/scripts/chromereload.js']
|
||||
|
||||
const lintOptions = {
|
||||
strict: false,
|
||||
}
|
||||
|
||||
lint(lintPaths, lintOptions)
|
@ -101,14 +101,12 @@ InfoScreen.prototype.render = function () {
|
||||
h('a.info', {
|
||||
href: 'https://github.com/MetaMask/faq',
|
||||
target: '_blank',
|
||||
onClick (event) { this.navigateTo(event.target.href) },
|
||||
}, 'Need Help? Read our FAQ!'),
|
||||
]),
|
||||
h('div', [
|
||||
h('a', {
|
||||
href: 'https://metamask.io/',
|
||||
target: '_blank',
|
||||
onClick (event) { this.navigateTo(event.target.href) },
|
||||
}, [
|
||||
h('img.icon-size', {
|
||||
src: 'images/icon-128.png',
|
||||
@ -126,7 +124,6 @@ InfoScreen.prototype.render = function () {
|
||||
h('a.info', {
|
||||
href: 'http://slack.metamask.io',
|
||||
target: '_blank',
|
||||
onClick (event) { this.navigateTo(event.target.href) },
|
||||
}, 'Join the conversation on Slack'),
|
||||
]),
|
||||
|
||||
@ -134,7 +131,6 @@ InfoScreen.prototype.render = function () {
|
||||
h('a.info', {
|
||||
href: 'https://twitter.com/metamask_io',
|
||||
target: '_blank',
|
||||
onClick (event) { this.navigateTo(event.target.href) },
|
||||
}, 'Follow us on Twitter'),
|
||||
]),
|
||||
|
||||
@ -142,7 +138,7 @@ InfoScreen.prototype.render = function () {
|
||||
h('a.info', {
|
||||
target: '_blank',
|
||||
style: { width: '85vw' },
|
||||
onClick () { this.navigateTo('mailto:help@metamask.io?subject=Feedback') },
|
||||
href: 'mailto:help@metamask.io?subject=Feedback',
|
||||
}, 'Email us!'),
|
||||
]),
|
||||
]),
|
||||
|
@ -54,7 +54,7 @@ CreateVaultCompleteScreen.prototype.render = function () {
|
||||
textAlign: 'center',
|
||||
},
|
||||
}, [
|
||||
h('span.error', 'These 12 words can restore all of your MetaMask accounts for this vault.\nSave them somewhere safe and secret.'),
|
||||
h('span.error', 'These 12 words are the only way to restore your MetaMask accounts.\nSave them somewhere safe and secret.'),
|
||||
]),
|
||||
|
||||
h('textarea.twelve-word-phrase', {
|
||||
|
Loading…
Reference in New Issue
Block a user