Merge pull request #5793 from MetaMask/develop

Bring master up to date with develop

1 files changed, 5 insertions, 14 deletions

diff --git a/app/scripts/ui.js b/app/scripts/ui.js
index c4f6615db..682a4aaac 100644
--- a/app/scripts/ui.js
+++ b/app/scripts/ui.js
@@ -1,6 +1,7 @@
 const injectCss = require('inject-css')
 const OldMetaMaskUiCss = require('../../old-ui/css')
 const NewMetaMaskUiCss = require('../../ui/css')
+const {getShouldUseNewUi} = require('../../ui/app/selectors')
 const startPopup = require('./popup-core')
 const PortStream = require('extension-port-stream')
 const { getEnvironmentType } = require('./lib/util')
@@ -23,7 +24,7 @@ async function start () {
   const release = global.platform.getVersion()
   setupSentry({ release, getState })
   // provide app state to append to error logs
-  function getState() {
+  function getState () {
     // get app state
     const state = window.getCleanAppState()
     // remove unnecessary data
@@ -33,10 +34,6 @@ async function start () {
     return state
   }
 
-  // inject css
-  // const css = MetaMaskUiCss()
-  // injectCss(css)
-
   // identify window type (popup, notification)
   const windowType = getEnvironmentType(window.location.href)
   global.METAMASK_UI_TYPE = windowType
@@ -51,15 +48,9 @@ async function start () {
   startPopup({ container, connectionStream }, (err, store) => {
     if (err) return displayCriticalError(err)
 
-    // 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
+    const state = store.getState()
+    let betaUIState = Boolean(state.featureFlags && state.featureFlags.betaUI)
+    const useBetaCss = getShouldUseNewUi(state)
 
     let css = useBetaCss ? NewMetaMaskUiCss() : OldMetaMaskUiCss()
     let deleteInjectedCss = injectCss(css)