Modify forgot password flow to go back to init screen.

2 files changed, 1 insertions, 36 deletions

diff --git a/ui/app/app.js b/ui/app/app.js
index 94e8adc34..9538a6b93 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -90,7 +90,6 @@ App.prototype.render = function () {
           transitionLeaveTimeout: 300,
         }, [
           this.renderPrimary(),
-          this.renderBackToInitButton(),
         ]),
       ]),
     ])
@@ -337,39 +336,6 @@ App.prototype.renderBackButton = function (style, justArrow = false) {
   )
 }
 
-App.prototype.renderBackToInitButton = function () {
-  var props = this.props
-  var button = null
-  if (!props.isDisclaimerConfirmed) return button
-
-  if (!props.isUnlocked) {
-    if (props.currentView.name === 'InitMenu') {
-      button = props.forgottenPassword ? h('.flex-row', {
-        key: 'rightArrow',
-        style: {
-          position: 'absolute',
-          bottom: '10px',
-          right: '15px',
-          fontSize: '21px',
-          fontFamily: 'Montserrat Light',
-          color: '#7F8082',
-          width: '77.578px',
-          alignItems: 'flex-end',
-        },
-      }, [
-        h('div.cursor-pointer', {
-          style: {
-            marginRight: '3px',
-          },
-          onClick: () => props.dispatch(actions.backToUnlockView()),
-        }, 'LOGIN'),
-        h('i.fa.fa-arrow-right.cursor-pointer'),
-      ]) : null
-    }
-  }
-  return button
-}
-
 App.prototype.renderPrimary = function () {
   var props = this.props
 
diff --git a/ui/app/unlock.js b/ui/app/unlock.js
index ec467f483..17416766d 100644
--- a/ui/app/unlock.js
+++ b/ui/app/unlock.js
@@ -70,7 +70,7 @@ UnlockScreen.prototype.render = function () {
 
       h('.flex-row.flex-center.flex-grow', [
         h('p.pointer', {
-          onClick: () => this.props.dispatch(actions.showRestoreVault()),
+          onClick: () => this.props.dispatch(actions.goBackToInitView()),
           style: {
             fontSize: '0.8em',
             color: 'rgb(247, 134, 28)',
@@ -116,4 +116,3 @@ UnlockScreen.prototype.inputChanged = function (event) {
     y: boundingRect.top + coordinates.top - element.scrollTop,
   })
 }
-