Merge branch 'master' into i3076-UseStorageLocalInstead

1 files changed, 25 insertions, 2 deletions

diff --git a/ui/app/unlock.js b/ui/app/unlock.js
index 4180791c4..13c3f1274 100644
--- a/ui/app/unlock.js
+++ b/ui/app/unlock.js
@@ -5,6 +5,8 @@ const connect = require('react-redux').connect
 const actions = require('./actions')
 const getCaretCoordinates = require('textarea-caret')
 const EventEmitter = require('events').EventEmitter
+const { OLD_UI_NETWORK_TYPE } = require('../../app/scripts/config').enums
+const environmentType = require('../../app/scripts/lib/environment-type')
 
 const Mascot = require('./components/mascot')
 
@@ -50,7 +52,7 @@ UnlockScreen.prototype.render = function () {
           id: 'password-box',
           placeholder: 'enter password',
           style: {
-
+            background: 'white',
           },
           onKeyPress: this.onKeyPress.bind(this),
           onInput: this.inputChanged.bind(this),
@@ -74,7 +76,12 @@ UnlockScreen.prototype.render = function () {
 
       h('.flex-row.flex-center.flex-grow', [
         h('p.pointer', {
-          onClick: () => this.props.dispatch(actions.forgotPassword()),
+          onClick: () => {
+            this.props.dispatch(actions.markPasswordForgotten())
+            if (environmentType() === 'popup') {
+              global.platform.openExtensionInBrowser()
+            }
+          },
           style: {
             fontSize: '0.8em',
             color: 'rgb(247, 134, 28)',
@@ -82,6 +89,22 @@ UnlockScreen.prototype.render = function () {
           },
         }, 'Restore from seed phrase'),
       ]),
+
+      h('.flex-row.flex-center.flex-grow', [
+        h('p.pointer', {
+          onClick: () => {
+            this.props.dispatch(actions.setFeatureFlag('betaUI', false, 'OLD_UI_NOTIFICATION_MODAL'))
+              .then(() => this.props.dispatch(actions.setNetworkEndpoints(OLD_UI_NETWORK_TYPE)))
+          },
+          style: {
+            fontSize: '0.8em',
+            color: '#aeaeae',
+            textDecoration: 'underline',
+            marginTop: '32px',
+          },
+        }, 'Use classic interface'),
+      ]),
+      
     ])
   )
 }