aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/select-app.js
diff options
context:
space:
mode:
Diffstat (limited to 'ui/app/select-app.js')
-rw-r--r--ui/app/select-app.js9
1 files changed, 6 insertions, 3 deletions
diff --git a/ui/app/select-app.js b/ui/app/select-app.js
index a51182f47..0b837b547 100644
--- a/ui/app/select-app.js
+++ b/ui/app/select-app.js
@@ -13,6 +13,7 @@ function mapStateToProps (state) {
autoAdd: autoAddToBetaUI(state),
isUnlocked: state.metamask.isUnlocked,
isMascara: state.metamask.isMascara,
+ firstTime: Object.keys(state.metamask.identities).length === 0,
}
}
@@ -35,9 +36,10 @@ SelectedApp.prototype.componentWillReceiveProps = function (nextProps) {
setFeatureFlagWithModal,
setFeatureFlagWithoutModal,
isMascara,
+ firstTime,
} = this.props
- if (isMascara) {
+ if (isMascara || firstTime) {
setFeatureFlagWithoutModal()
} else if (!isUnlocked && nextProps.isUnlocked && (nextProps.autoAdd)) {
setFeatureFlagWithModal()
@@ -45,7 +47,8 @@ SelectedApp.prototype.componentWillReceiveProps = function (nextProps) {
}
SelectedApp.prototype.render = function () {
- const { betaUI, isMascara } = this.props
- const Selected = betaUI || isMascara ? App : OldApp
+ const { betaUI, isMascara, firstTime } = this.props
+
+ const Selected = betaUI || isMascara || firstTime ? App : OldApp
return h(Selected)
}