diff options
author | Alexander Tseung <alextsg@users.noreply.github.com> | 2017-12-23 03:40:20 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-23 03:40:20 +0800 |
commit | 409d1d30e9d836926e5361fb9e4b5b025b66e313 (patch) | |
tree | c7f247d1e973c50697af8b9905d9fd40d4575659 /app/scripts/popup.js | |
parent | b944a63ff89e3c45f7d7e49b2d93a5442cde4462 (diff) | |
parent | 5a58add797fcdbb023678af84a61f1d2bfdafaf1 (diff) | |
download | tangerine-wallet-browser-409d1d30e9d836926e5361fb9e4b5b025b66e313.tar.gz tangerine-wallet-browser-409d1d30e9d836926e5361fb9e4b5b025b66e313.tar.zst tangerine-wallet-browser-409d1d30e9d836926e5361fb9e4b5b025b66e313.zip |
Merge pull request #2799 from MetaMask/NewUI-flat
Update UAT to version 4.0.5
Diffstat (limited to 'app/scripts/popup.js')
-rw-r--r-- | app/scripts/popup.js | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/app/scripts/popup.js b/app/scripts/popup.js index 5f17f0651..d0952af6a 100644 --- a/app/scripts/popup.js +++ b/app/scripts/popup.js @@ -1,5 +1,6 @@ const injectCss = require('inject-css') -const MetaMaskUiCss = require('../../ui/css') +const OldMetaMaskUiCss = require('../../old-ui/css') +const NewMetaMaskUiCss = require('../../ui/css') const startPopup = require('./popup-core') const PortStream = require('./lib/port-stream.js') const isPopupOrNotification = require('./lib/is-popup-or-notification') @@ -11,10 +12,6 @@ const notificationManager = new NotificationManager() // create platform global global.platform = new ExtensionPlatform() -// inject css -const css = MetaMaskUiCss() -injectCss(css) - // identify window type (popup, notification) const windowType = isPopupOrNotification() global.METAMASK_UI_TYPE = windowType @@ -28,8 +25,21 @@ const connectionStream = new PortStream(extensionPort) 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() + let deleteInjectedCss = injectCss(css) + let newBetaUIState + store.subscribe(() => { const state = store.getState() + newBetaUIState = state.metamask.featureFlags.betaUI + if (newBetaUIState !== betaUIState) { + deleteInjectedCss() + betaUIState = newBetaUIState + css = betaUIState ? NewMetaMaskUiCss() : OldMetaMaskUiCss() + deleteInjectedCss = injectCss(css) + } if (state.appState.shouldClose) notificationManager.closePopup() }) }) |