Pop uses new ui onboarding when in beta.

feature/default_network_editable
Dan 7 years ago
parent 04b1f8428b
commit 6393c38117
  1. 5
      mascara/src/app/first-time/index.css
  2. 4
      mascara/src/app/first-time/index.js
  3. 6
      ui/app/app.js

@ -221,10 +221,6 @@
max-width: 46rem; max-width: 46rem;
} }
.backup-phrase {
width: 100%;
}
.create-password__title, .create-password__title,
.unique-image__title, .unique-image__title,
.tou__title, .tou__title,
@ -674,7 +670,6 @@ button.backup-phrase__confirm-seed-option:hover {
} }
.buy-ether__action-content-wrapper { .buy-ether__action-content-wrapper {
width: 360px;
display: flex; display: flex;
flex-flow: column nowrap; flex-flow: column nowrap;
} }

@ -131,7 +131,7 @@ class FirstTimeFlow extends Component {
case SCREEN_TYPE.BACK_UP_PHRASE: case SCREEN_TYPE.BACK_UP_PHRASE:
return ( return (
<BackupPhraseScreen <BackupPhraseScreen
next={() => goToBuyEtherView(address)} next={() => openBuyEtherModal()}
/> />
) )
default: default:
@ -167,7 +167,7 @@ export default connect(
}), }),
dispatch => ({ dispatch => ({
leaveImportSeedScreenState: () => dispatch(unMarkPasswordForgotten()), leaveImportSeedScreenState: () => dispatch(unMarkPasswordForgotten()),
goToBuyEtherView: address => dispatch(onboardingBuyEthView(address)), openBuyEtherModal: () => dispatch(showModal({ name: 'DEPOSIT_ETHER'})),
}) })
)(FirstTimeFlow) )(FirstTimeFlow)

@ -386,7 +386,7 @@ App.prototype.renderPrimary = function () {
isUnlocked, isUnlocked,
} = props } = props
const isMascaraOnboarding = isMascara && isOnboarding const isMascaraOnboarding = isMascara && isOnboarding
const isBetaUIOnboarding = betaUI && isOnboarding && !props.isPopup && !isRevealingSeedWords const isBetaUIOnboarding = betaUI && isOnboarding
if (!welcomeScreenSeen && betaUI && !isInitialized && !isUnlocked) { if (!welcomeScreenSeen && betaUI && !isInitialized && !isUnlocked) {
return h(WelcomeScreen) return h(WelcomeScreen)
@ -397,7 +397,7 @@ App.prototype.renderPrimary = function () {
} }
// notices // notices
if (!props.noActiveNotices) { if (!props.noActiveNotices && !betaUI) {
log.debug('rendering notice screen for unread notices.') log.debug('rendering notice screen for unread notices.')
return h(NoticeScreen, { return h(NoticeScreen, {
notice: props.lastUnreadNotice, notice: props.lastUnreadNotice,
@ -418,7 +418,7 @@ App.prototype.renderPrimary = function () {
return h(HDRestoreVaultScreen, {key: 'HDRestoreVaultScreen'}) return h(HDRestoreVaultScreen, {key: 'HDRestoreVaultScreen'})
} else if (!props.isInitialized && !props.isUnlocked && !isRevealingSeedWords) { } else if (!props.isInitialized && !props.isUnlocked && !isRevealingSeedWords) {
log.debug('rendering menu screen') log.debug('rendering menu screen')
return props.isPopup return !betaUI
? h(OldUIInitializeMenuScreen, {key: 'menuScreenInit'}) ? h(OldUIInitializeMenuScreen, {key: 'menuScreenInit'})
: h(InitializeMenuScreen, {key: 'menuScreenInit'}) : h(InitializeMenuScreen, {key: 'menuScreenInit'})
} }

Loading…
Cancel
Save