Styling fixes to welcome; hide network component on create password; shown welcoem in popup.

4 files changed, 8 insertions, 9 deletions

diff --git a/mascara/src/app/first-time/create-password-screen.js b/mascara/src/app/first-time/create-password-screen.js
index b56c183e6..37294b9b5 100644
--- a/mascara/src/app/first-time/create-password-screen.js
+++ b/mascara/src/app/first-time/create-password-screen.js
@@ -56,7 +56,7 @@ class CreatePasswordScreen extends Component {
 
   render () {
     const { isLoading, goToImportWithSeedPhrase, isMascara } = this.props
-    //
+
     return isLoading
       ? <LoadingScreen loadingMessage="Creating your new account" />
       : (
diff --git a/ui/app/app.js b/ui/app/app.js
index 11b761639..50514bd3b 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -298,7 +298,7 @@ App.prototype.renderAppBar = function () {
             ]),
           ]),
 
-          h('div.header__right-actions', [
+          betaUI && isInitialized && h('div.header__right-actions', [
             h('div.network-component-wrapper', {
               style: {},
             }, [
@@ -385,7 +385,7 @@ App.prototype.renderPrimary = function () {
   const isMascaraOnboarding = isMascara && isOnboarding
   const isBetaUIOnboarding = betaUI && isOnboarding && !props.isPopup && !isRevealingSeedWords
 
-  if (!welcomeScreenSeen && isBetaUIOnboarding && !isInitialized && !isUnlocked) {
+  if (!welcomeScreenSeen && betaUI && !isInitialized && !isUnlocked) {
     return h(WelcomeScreen)
   }
 
diff --git a/ui/app/css/itcss/components/welcome-screen.scss b/ui/app/css/itcss/components/welcome-screen.scss
index dc8b38399..86fc7d04d 100644
--- a/ui/app/css/itcss/components/welcome-screen.scss
+++ b/ui/app/css/itcss/components/welcome-screen.scss
@@ -6,7 +6,7 @@
     font-family: Roboto;
     font-weight: 400;
     width: 100%;
-    height: 100%;
+    flex: 1 0 auto;
     padding: 70px 0;
     background: $white;
 
@@ -44,4 +44,4 @@
       transition: 200ms ease-in-out;
       background-color: rgba(247, 134, 28, 0.9);
     }
-}
\ No newline at end of file
+}
diff --git a/ui/app/welcome-screen.js b/ui/app/welcome-screen.js
index 0c1aced8c..cdbb6dba8 100644
--- a/ui/app/welcome-screen.js
+++ b/ui/app/welcome-screen.js
@@ -11,8 +11,8 @@ class WelcomeScreen extends Component {
     closeWelcomeScreen: PropTypes.func.isRequired,
   }
 
-  constructor () {
-    super()
+  constructor(props) {
+    super(props)
     this.animationEventEmitter = new EventEmitter()
   }
 
@@ -21,7 +21,6 @@ class WelcomeScreen extends Component {
   }
 
   render () {
-    // t
     return h('div.welcome-screen', [
 
         h('div.welcome-screen__info', [
@@ -32,7 +31,7 @@ class WelcomeScreen extends Component {
             height: '225',
           }),
 
-          h('div.welcome-screen__info__header', 'Welcome to MetaMask Beta.'),
+          h('div.welcome-screen__info__header', 'Welcome to MetaMask Beta'),
 
           h('div.welcome-screen__info__copy', 'MetaMask is a secure identity vault for Ethereum.'),