diff options
author | frankiebee <frankie.diamond@gmail.com> | 2017-06-22 10:52:28 +0800 |
---|---|---|
committer | frankiebee <frankie.diamond@gmail.com> | 2017-06-22 10:52:28 +0800 |
commit | abbbe1156c03700c4476d0618e65aa2eed2c264e (patch) | |
tree | d3f45aec5842a5f86e514c01196de543ce4df6aa /ui/app | |
parent | 92df9965ebd4a833817c32fd32f7e4533ec7fe19 (diff) | |
parent | 2a429253994a0df2aae27234a7ac11c870bdc713 (diff) | |
download | tangerine-wallet-browser-abbbe1156c03700c4476d0618e65aa2eed2c264e.tar tangerine-wallet-browser-abbbe1156c03700c4476d0618e65aa2eed2c264e.tar.gz tangerine-wallet-browser-abbbe1156c03700c4476d0618e65aa2eed2c264e.tar.bz2 tangerine-wallet-browser-abbbe1156c03700c4476d0618e65aa2eed2c264e.tar.lz tangerine-wallet-browser-abbbe1156c03700c4476d0618e65aa2eed2c264e.tar.xz tangerine-wallet-browser-abbbe1156c03700c4476d0618e65aa2eed2c264e.tar.zst tangerine-wallet-browser-abbbe1156c03700c4476d0618e65aa2eed2c264e.zip |
Merge branch 'master' into nonce-tracker
Diffstat (limited to 'ui/app')
-rw-r--r-- | ui/app/info.js | 6 | ||||
-rw-r--r-- | ui/app/keychains/hd/create-vault-complete.js | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/ui/app/info.js b/ui/app/info.js index aa4503b62..89cb7854d 100644 --- a/ui/app/info.js +++ b/ui/app/info.js @@ -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!'), ]), ]), diff --git a/ui/app/keychains/hd/create-vault-complete.js b/ui/app/keychains/hd/create-vault-complete.js index 5230797ad..9741155f7 100644 --- a/ui/app/keychains/hd/create-vault-complete.js +++ b/ui/app/keychains/hd/create-vault-complete.js @@ -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', { |