aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/images/coinbase logo.pngbin0 -> 9775 bytes
-rw-r--r--app/images/shapeshift logo.pngbin0 -> 17537 bytes
-rw-r--r--app/scripts/popup.js9
3 files changed, 7 insertions, 2 deletions
diff --git a/app/images/coinbase logo.png b/app/images/coinbase logo.png
new file mode 100644
index 000000000..a23d7926d
--- /dev/null
+++ b/app/images/coinbase logo.png
Binary files differ
diff --git a/app/images/shapeshift logo.png b/app/images/shapeshift logo.png
new file mode 100644
index 000000000..ac8faba5b
--- /dev/null
+++ b/app/images/shapeshift logo.png
Binary files differ
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