Merge branch 'uat' of https://github.com/MetaMask/metamask-extension into cb-254

1 files changed, 11 insertions, 2 deletions

diff --git a/app/scripts/popup.js b/app/scripts/popup.js
index d0952af6a..1a2e425dc 100644
--- a/app/scripts/popup.js
+++ b/app/scripts/popup.js
@@ -26,8 +26,17 @@ 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()
+  // Code commented out until we begin auto adding users to NewUI
+  // const { isMascara, identities = {}, featureFlags = {} } = store.getState().metamask
+  // const firstTime = Object.keys(identities).length === 0
+  const { isMascara, featureFlags = {} } = store.getState().metamask
+  let betaUIState = featureFlags.betaUI
+
+  // Code commented out until we begin auto adding users to NewUI
+  // const useBetaCss = isMascara || firstTime || betaUIState
+  const useBetaCss = isMascara || betaUIState
+
+  let css = useBetaCss ? NewMetaMaskUiCss() : OldMetaMaskUiCss()
   let deleteInjectedCss = injectCss(css)
   let newBetaUIState