diff options
| author | Chi Kei Chan <chikeichan@gmail.com> | 2018-01-13 05:41:03 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-13 05:41:03 +0800 |
| commit | 71a308d98b541b05ffabf8f63085e3cbd8bf61b7 (patch) | |
| tree | 5f360e4a65a0768817913e99840e3705439432e2 /app | |
| parent | 0f4bfcb02e3a04f044a571e01a4977dae2afec8e (diff) | |
| parent | bdcee058dc278c46c828f376476f121417481385 (diff) | |
| download | tangerine-wallet-browser-71a308d98b541b05ffabf8f63085e3cbd8bf61b7.tar tangerine-wallet-browser-71a308d98b541b05ffabf8f63085e3cbd8bf61b7.tar.gz tangerine-wallet-browser-71a308d98b541b05ffabf8f63085e3cbd8bf61b7.tar.bz2 tangerine-wallet-browser-71a308d98b541b05ffabf8f63085e3cbd8bf61b7.tar.lz tangerine-wallet-browser-71a308d98b541b05ffabf8f63085e3cbd8bf61b7.tar.xz tangerine-wallet-browser-71a308d98b541b05ffabf8f63085e3cbd8bf61b7.tar.zst tangerine-wallet-browser-71a308d98b541b05ffabf8f63085e3cbd8bf61b7.zip | |
Merge branch 'uat' into cb-388
Diffstat (limited to 'app')
| -rw-r--r-- | app/images/coinbase logo.png | bin | 0 -> 9775 bytes | |||
| -rw-r--r-- | app/images/shapeshift logo.png | bin | 0 -> 17537 bytes | |||
| -rw-r--r-- | app/scripts/popup.js | 9 |
3 files changed, 7 insertions, 2 deletions
diff --git a/app/images/coinbase logo.png b/app/images/coinbase logo.png Binary files differnew file mode 100644 index 000000000..a23d7926d --- /dev/null +++ b/app/images/coinbase logo.png diff --git a/app/images/shapeshift logo.png b/app/images/shapeshift logo.png Binary files differnew file mode 100644 index 000000000..ac8faba5b --- /dev/null +++ b/app/images/shapeshift logo.png 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 |
