1 files changed, 19 insertions, 3 deletions

diff --git a/ui/app/app.js b/ui/app/app.js
index 58e38a077..bfa8d8aa7 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -89,6 +89,7 @@ function mapStateToProps (state) {
     currentCurrency: state.metamask.currentCurrency,
     isMouseUser: state.appState.isMouseUser,
     betaUI: state.metamask.featureFlags.betaUI,
+    isRevealingSeedWords: state.metamask.isRevealingSeedWords,
 
     // state needed to get account dropdown temporarily rendering from app bar
     identities,
@@ -239,6 +240,9 @@ App.prototype.renderAppBar = function () {
     showNetworkDropdown,
     hideNetworkDropdown,
     currentView,
+    isInitialized,
+    betaUI,
+    isPopup,
   } = this.props
 
   if (window.METAMASK_UI_TYPE === 'notification') {
@@ -285,6 +289,8 @@ App.prototype.renderAppBar = function () {
             // metamask name
             h('h1', 'MetaMask'),
 
+            h('div.beta-label', 'BETA'),
+
           ]),
 
           h('div.header__right-actions', [
@@ -317,6 +323,9 @@ App.prototype.renderAppBar = function () {
         ]),
       ]),
 
+      !isInitialized && !isPopup && betaUI && h('h2.alpha-warning',
+        'Please be aware that this version is still under development'),
+
     ])
   )
 }
@@ -354,9 +363,16 @@ App.prototype.renderBackButton = function (style, justArrow = false) {
 App.prototype.renderPrimary = function () {
   log.debug('rendering primary')
   var props = this.props
-  const {isMascara, isOnboarding, betaUI} = props
+  const {
+    isMascara,
+    isOnboarding,
+    betaUI,
+    isRevealingSeedWords,
+  } = props
+  const isMascaraOnboarding = isMascara && isOnboarding
+  const isBetaUIOnboarding = betaUI && isOnboarding && !props.isPopup && !isRevealingSeedWords
 
-  if ((isMascara || betaUI) && isOnboarding && !props.isPopup) {
+  if (isMascaraOnboarding || isBetaUIOnboarding) {
     return h(MascaraFirstTime)
   }
 
@@ -380,7 +396,7 @@ App.prototype.renderPrimary = function () {
   if (props.isInitialized && props.forgottenPassword) {
     log.debug('rendering restore vault screen')
     return h(HDRestoreVaultScreen, {key: 'HDRestoreVaultScreen'})
-  } else if (!props.isInitialized && !props.isUnlocked) {
+  } else if (!props.isInitialized && !props.isUnlocked && !isRevealingSeedWords) {
     log.debug('rendering menu screen')
     return props.isPopup
       ? h(OldUIInitializeMenuScreen, {key: 'menuScreenInit'})