From 7f151b861cc3a565d3feefc50b3be25ab4490ac8 Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Wed, 7 Feb 2018 21:08:55 -0330
Subject: [NewUI] Opens to full screen when restoring from seed. (#3201)

* Opens to full screen when restoring from seed.

* Remove redundant parameter in actions.markPasswordForgotten call.
---
 ui/app/unlock.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'ui/app/unlock.js')

diff --git a/ui/app/unlock.js b/ui/app/unlock.js
index ec97b03bf..e77d17d7b 100644
--- a/ui/app/unlock.js
+++ b/ui/app/unlock.js
@@ -74,7 +74,10 @@ 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())
+            global.platform.openExtensionInBrowser()
+          },
           style: {
             fontSize: '0.8em',
             color: 'rgb(247, 134, 28)',
-- 
cgit v1.2.3


From bb79fb354b4618e3090cd1c1a232f318b86ebf88 Mon Sep 17 00:00:00 2001
From: Dan <danjm.com@gmail.com>
Date: Thu, 8 Feb 2018 20:03:23 -0330
Subject: Try beta link on unlock and privacy screens.

---
 ui/app/unlock.js | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'ui/app/unlock.js')

diff --git a/ui/app/unlock.js b/ui/app/unlock.js
index e77d17d7b..4b39bd3e2 100644
--- a/ui/app/unlock.js
+++ b/ui/app/unlock.js
@@ -5,6 +5,7 @@ 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 Mascot = require('./components/mascot')
 
@@ -85,6 +86,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'),
+      ]),
+      
     ])
   )
 }
-- 
cgit v1.2.3


From b5b16e4ce09b5fa27ce4775b30a44bacea7ee329 Mon Sep 17 00:00:00 2001
From: Dan <danjm.com@gmail.com>
Date: Mon, 12 Feb 2018 13:25:00 -0330
Subject: Only open a new window on restore from seed if in extension view.

---
 ui/app/unlock.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'ui/app/unlock.js')

diff --git a/ui/app/unlock.js b/ui/app/unlock.js
index 4b39bd3e2..db88fa9d0 100644
--- a/ui/app/unlock.js
+++ b/ui/app/unlock.js
@@ -77,7 +77,12 @@ UnlockScreen.prototype.render = function () {
         h('p.pointer', {
           onClick: () => {
             this.props.dispatch(actions.markPasswordForgotten())
-            global.platform.openExtensionInBrowser()
+            global.platform.isInBrowser()
+              .then((isInBrowser) => {
+                if (!isInBrowser) {
+                  global.platform.openExtensionInBrowser()
+                }
+              })
           },
           style: {
             fontSize: '0.8em',
-- 
cgit v1.2.3


From 5e9dc74a59d2507f36e1cb5796f97982f5f4993d Mon Sep 17 00:00:00 2001
From: Dan <danjm.com@gmail.com>
Date: Tue, 13 Feb 2018 14:29:43 -0330
Subject: Remove isInBrowser method and use environment-type.js

---
 ui/app/unlock.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'ui/app/unlock.js')

diff --git a/ui/app/unlock.js b/ui/app/unlock.js
index db88fa9d0..13c3f1274 100644
--- a/ui/app/unlock.js
+++ b/ui/app/unlock.js
@@ -6,6 +6,7 @@ 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')
 
@@ -77,12 +78,9 @@ UnlockScreen.prototype.render = function () {
         h('p.pointer', {
           onClick: () => {
             this.props.dispatch(actions.markPasswordForgotten())
-            global.platform.isInBrowser()
-              .then((isInBrowser) => {
-                if (!isInBrowser) {
-                  global.platform.openExtensionInBrowser()
-                }
-              })
+            if (environmentType() === 'popup') {
+              global.platform.openExtensionInBrowser()
+            }
           },
           style: {
             fontSize: '0.8em',
-- 
cgit v1.2.3