aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/first-time/init-menu.js
diff options
context:
space:
mode:
authorKevin Serrano <kevgagser@gmail.com>2016-11-24 07:48:13 +0800
committerGitHub <noreply@github.com>2016-11-24 07:48:13 +0800
commitb9b3ef8fedc848cbebc60eab70b90aa4f75060f2 (patch)
tree1abb0a7d44ebcf8bf81c7a0cfbb4401b45117760 /ui/app/first-time/init-menu.js
parentfeae6235cbe0cc6cfb4312cb6a02f246af39d5d1 (diff)
parent8dd298238de5de6b8c84bbefadd6db5c8af1adc6 (diff)
downloadtangerine-wallet-browser-b9b3ef8fedc848cbebc60eab70b90aa4f75060f2.tar.gz
tangerine-wallet-browser-b9b3ef8fedc848cbebc60eab70b90aa4f75060f2.tar.zst
tangerine-wallet-browser-b9b3ef8fedc848cbebc60eab70b90aa4f75060f2.zip
Merge pull request #887 from MetaMask/i865-erabe
Modify forgot password flow to go back to init screen.
Diffstat (limited to 'ui/app/first-time/init-menu.js')
-rw-r--r--ui/app/first-time/init-menu.js18
1 files changed, 17 insertions, 1 deletions
diff --git a/ui/app/first-time/init-menu.js b/ui/app/first-time/init-menu.js
index 6ceee6784..c41aecc48 100644
--- a/ui/app/first-time/init-menu.js
+++ b/ui/app/first-time/init-menu.js
@@ -21,6 +21,7 @@ function mapStateToProps (state) {
// state from plugin
currentView: state.appState.currentView,
warning: state.appState.warning,
+ forgottenPassword: state.metamask.isInitialized,
}
}
@@ -117,6 +118,17 @@ InitializeMenuScreen.prototype.renderMenu = function (state) {
},
}, 'Create'),
+ state.forgottenPassword ? h('.flex-row.flex-center.flex-grow', [
+ h('p.pointer', {
+ onClick: this.backToUnlockView.bind(this),
+ style: {
+ fontSize: '0.8em',
+ color: 'rgb(247, 134, 28)',
+ textDecoration: 'underline',
+ },
+ }, 'Return to Login'),
+ ]) : null,
+
h('.flex-row.flex-center.flex-grow', [
h('p.pointer', {
onClick: this.showRestoreVault.bind(this),
@@ -125,7 +137,7 @@ InitializeMenuScreen.prototype.renderMenu = function (state) {
color: 'rgb(247, 134, 28)',
textDecoration: 'underline',
},
- }, 'I already have a DEN that I would like to import'),
+ }, 'Import Existing DEN'),
]),
])
@@ -147,6 +159,10 @@ InitializeMenuScreen.prototype.showRestoreVault = function () {
this.props.dispatch(actions.showRestoreVault())
}
+InitializeMenuScreen.prototype.backToUnlockView = function () {
+ this.props.dispatch(actions.backToUnlockView())
+}
+
InitializeMenuScreen.prototype.createNewVaultAndKeychain = function () {
var passwordBox = document.getElementById('password-box')
var password = passwordBox.value