Move beta warning to app header.

2 files changed, 6 insertions, 1 deletions

diff --git a/mascara/src/app/first-time/create-password-screen.js b/mascara/src/app/first-time/create-password-screen.js
index d348eaa1a..450d6a479 100644
--- a/mascara/src/app/first-time/create-password-screen.js
+++ b/mascara/src/app/first-time/create-password-screen.js
@@ -59,7 +59,6 @@ class CreatePasswordScreen extends Component {
       ? <LoadingScreen loadingMessage="Creating your new account" />
       : (
         <div>
-          <h2 className="alpha-warning">Please be aware that this version is still in under development.</h2>
           <div className="first-view-main">
             <div className="mascara-info">
               <Mascot
diff --git a/ui/app/app.js b/ui/app/app.js
index 58e38a077..7490c63b1 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -239,6 +239,9 @@ App.prototype.renderAppBar = function () {
     showNetworkDropdown,
     hideNetworkDropdown,
     currentView,
+    isInitialized,
+    betaUI,
+    isPopup,
   } = this.props
 
   if (window.METAMASK_UI_TYPE === 'notification') {
@@ -317,6 +320,9 @@ App.prototype.renderAppBar = function () {
         ]),
       ]),
 
+      !isInitialized && !isPopup && betaUI && h('h2.alpha-warning',
+        'Please be aware that this version is still under development'),
+
     ])
   )
 }