From bdcee058dc278c46c828f376476f121417481385 Mon Sep 17 00:00:00 2001
From: Alexander Tseung <alextsg@gmail.com>
Date: Tue, 9 Jan 2018 16:45:39 -0800
Subject: Fix styling in initialization

---
 app/scripts/popup.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'app/scripts/popup.js')

diff --git a/app/scripts/popup.js b/app/scripts/popup.js
index d0952af6a..97a29fb1a 100644
--- a/app/scripts/popup.js
+++ b/app/scripts/popup.js
@@ -26,8 +26,13 @@ const container = document.getElementById('app-content')
 startPopup({ container, connectionStream }, (err, store) => {
   if (err) return displayCriticalError(err)
 
-  let betaUIState = store.getState().metamask.featureFlags.betaUI
-  let css = betaUIState ? NewMetaMaskUiCss() : OldMetaMaskUiCss()
+  const { isMascara, identities = {}, featureFlags = {} } = store.getState().metamask
+  const firstTime = Object.keys(identities).length === 0
+  let betaUIState = featureFlags.betaUI
+
+  const useBetaCss = isMascara || firstTime || betaUIState
+
+  let css = useBetaCss ? NewMetaMaskUiCss() : OldMetaMaskUiCss()
   let deleteInjectedCss = injectCss(css)
   let newBetaUIState
 
-- 
cgit