Merge branch 'master' into i18n

1 files changed, 23 insertions, 1 deletions

diff --git a/ui/app/first-time/init-menu.js b/ui/app/first-time/init-menu.js
index 6b50bf504..370fdd5b7 100644
--- a/ui/app/first-time/init-menu.js
+++ b/ui/app/first-time/init-menu.js
@@ -8,6 +8,8 @@ const actions = require('../actions')
 const Tooltip = require('../components/tooltip')
 const t = require('../../i18n')
 const getCaretCoordinates = require('textarea-caret')
+const environmentType = require('../../../app/scripts/lib/environment-type')
+const { OLD_UI_NETWORK_TYPE } = require('../../../app/scripts/config').enums
 
 let isSubmitting = false
 
@@ -131,6 +133,18 @@ InitializeMenuScreen.prototype.renderMenu = function (state) {
         }, t('importDen')),
       ]),
 
+      h('.flex-row.flex-center.flex-grow', [
+        h('p.pointer', {
+          onClick: this.showOldUI.bind(this),
+          style: {
+            fontSize: '0.8em',
+            color: '#aeaeae',
+            textDecoration: 'underline',
+            marginTop: '32px',
+          },
+        }, 'Use classic interface'),
+      ]),
+
     ])
   )
 }
@@ -147,7 +161,15 @@ InitializeMenuScreen.prototype.componentDidMount = function () {
 }
 
 InitializeMenuScreen.prototype.showRestoreVault = function () {
-  this.props.dispatch(actions.showRestoreVault())
+  this.props.dispatch(actions.markPasswordForgotten())
+  if (environmentType() === 'popup') {
+    global.platform.openExtensionInBrowser()
+  }
+}
+
+InitializeMenuScreen.prototype.showOldUI = function () {
+  this.props.dispatch(actions.setFeatureFlag('betaUI', false, 'OLD_UI_NOTIFICATION_MODAL'))
+    .then(() => this.props.dispatch(actions.setNetworkEndpoints(OLD_UI_NETWORK_TYPE)))
 }
 
 InitializeMenuScreen.prototype.createNewVaultAndKeychain = function () {