aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorChi Kei Chan <chikeichan@gmail.com>2018-01-18 05:48:16 +0800
committerGitHub <noreply@github.com>2018-01-18 05:48:16 +0800
commitb80ed2c451fee7b94edea9d1655baa2e908939b9 (patch)
treee9a67e289f043900a77b1bfb34088ad2e5f83864 /ui
parentccb80594be3000488b7c73f9fd5e56168e0d5042 (diff)
parentaa08d1a09dce7324eaa3b3df568df43f8c55cc63 (diff)
downloadtangerine-wallet-browser-b80ed2c451fee7b94edea9d1655baa2e908939b9.tar.gz
tangerine-wallet-browser-b80ed2c451fee7b94edea9d1655baa2e908939b9.tar.zst
tangerine-wallet-browser-b80ed2c451fee7b94edea9d1655baa2e908939b9.zip
Merge pull request #3007 from alextsg/uat-master-011618
[NewUI] Merge master into uat branch
Diffstat (limited to 'ui')
-rw-r--r--ui/app/app.js1
-rw-r--r--ui/app/info.js7
-rw-r--r--ui/app/keychains/hd/restore-vault.js4
3 files changed, 7 insertions, 5 deletions
diff --git a/ui/app/app.js b/ui/app/app.js
index 866801dd5..df9eab03c 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -302,7 +302,6 @@ App.prototype.renderAppBar = function () {
)
}
-
App.prototype.renderLoadingIndicator = function ({ isLoading, isLoadingNetwork, loadMessage }) {
const { isMascara } = this.props
diff --git a/ui/app/info.js b/ui/app/info.js
index 24c211c1f..49ff9f24a 100644
--- a/ui/app/info.js
+++ b/ui/app/info.js
@@ -103,9 +103,9 @@ InfoScreen.prototype.render = function () {
[
h('div.fa.fa-support', [
h('a.info', {
- href: 'https://support.metamask.io',
+ href: 'https://metamask.helpscoutdocs.com/',
target: '_blank',
- }, 'Visit our Support Center'),
+ }, 'Visit our Knowledge Base'),
]),
h('div', [
@@ -138,8 +138,7 @@ InfoScreen.prototype.render = function () {
h('div.fa.fa-envelope', [
h('a.info', {
target: '_blank',
- style: { width: '85vw' },
- href: 'mailto:help@metamask.io?subject=Feedback',
+ href: 'mailto:support@metamask.io?subject=MetaMask Support',
}, 'Email us!'),
]),
]),
diff --git a/ui/app/keychains/hd/restore-vault.js b/ui/app/keychains/hd/restore-vault.js
index 06e51d9b3..24b37a83d 100644
--- a/ui/app/keychains/hd/restore-vault.js
+++ b/ui/app/keychains/hd/restore-vault.js
@@ -149,4 +149,8 @@ RestoreVaultScreen.prototype.createNewVaultAndRestore = function () {
this.warning = null
this.props.dispatch(actions.displayWarning(this.warning))
this.props.dispatch(actions.createNewVaultAndRestore(password, seed))
+ .catch((err) => {
+ log.error(err.message)
+ })
+
}