diff options
| author | Alexander Tseung <alextsg@gmail.com> | 2018-01-30 10:22:52 +0800 |
|---|---|---|
| committer | Alexander Tseung <alextsg@gmail.com> | 2018-01-30 10:22:52 +0800 |
| commit | ecc39c5a7abd8c8794d5565c1bc7d213d3514d61 (patch) | |
| tree | 746f0a2bada5d8cd6636789d3c498c1ef13901fb /app/scripts/popup.js | |
| parent | d905b86ba775aad888d1dfd22257958fd9415909 (diff) | |
| parent | b05d21b1ba308bdb5b758d53dd79593a7a2bf26e (diff) | |
| download | tangerine-wallet-browser-ecc39c5a7abd8c8794d5565c1bc7d213d3514d61.tar.gz tangerine-wallet-browser-ecc39c5a7abd8c8794d5565c1bc7d213d3514d61.tar.zst tangerine-wallet-browser-ecc39c5a7abd8c8794d5565c1bc7d213d3514d61.zip | |
Merge branch 'uat' of https://github.com/MetaMask/metamask-extension into cb-254
Diffstat (limited to 'app/scripts/popup.js')
| -rw-r--r-- | app/scripts/popup.js | 13 |
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 |