From aa08d1a09dce7324eaa3b3df568df43f8c55cc63 Mon Sep 17 00:00:00 2001
From: Alexander Tseung <alextsg@gmail.com>
Date: Tue, 16 Jan 2018 18:34:24 -0800
Subject: Fix merge conflicts

---
 old-ui/app/app.js | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

(limited to 'old-ui')

diff --git a/old-ui/app/app.js b/old-ui/app/app.js
index e5fc5b9e9..6eb1e487f 100644
--- a/old-ui/app/app.js
+++ b/old-ui/app/app.js
@@ -403,6 +403,14 @@ App.prototype.renderDropdown = function () {
       closeMenu: () => this.setState({ isMainMenuOpen: !isOpen }),
       onClick: () => { this.props.dispatch(actions.showInfoPage()) },
     }, 'Info/Help'),
+
+    h(DropdownMenuItem, {
+      closeMenu: () => this.setState({ isMainMenuOpen: !isOpen }),
+      onClick: () => {
+        this.props.dispatch(actions.setFeatureFlag('betaUI', true, 'BETA_UI_NOTIFICATION_MODAL'))
+          .then(() => this.props.dispatch(actions.setNetworkEndpoints(BETA_UI_NETWORK_TYPE)))
+      },
+    }, 'Try Beta!'),
   ])
 }
 
@@ -462,11 +470,6 @@ App.prototype.renderPrimary = function () {
     })
   }
 
-  if (props.seedWords) {
-    log.debug('rendering seed words')
-    return h(HDCreateVaultComplete, {key: 'HDCreateVaultComplete'})
-  }
-
   // show initialize screen
   if (!props.isInitialized || props.forgottenPassword) {
     // show current view
@@ -501,6 +504,12 @@ App.prototype.renderPrimary = function () {
     }
   }
 
+  // show seed words screen
+  if (props.seedWords) {
+    log.debug('rendering seed words')
+    return h(HDCreateVaultComplete, {key: 'HDCreateVaultComplete'})
+  }
+
   // show current view
   switch (props.currentView.name) {
 
-- 
cgit