From 6393c381173e854e280025e8b89d7e0f105984fc Mon Sep 17 00:00:00 2001 From: Dan Date: Thu, 22 Mar 2018 14:29:18 -0230 Subject: [PATCH 01/12] Pop uses new ui onboarding when in beta. --- mascara/src/app/first-time/index.css | 5 ----- mascara/src/app/first-time/index.js | 4 ++-- ui/app/app.js | 6 +++--- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/mascara/src/app/first-time/index.css b/mascara/src/app/first-time/index.css index d7b146e51..2c5439cec 100644 --- a/mascara/src/app/first-time/index.css +++ b/mascara/src/app/first-time/index.css @@ -221,10 +221,6 @@ max-width: 46rem; } -.backup-phrase { - width: 100%; -} - .create-password__title, .unique-image__title, .tou__title, @@ -674,7 +670,6 @@ button.backup-phrase__confirm-seed-option:hover { } .buy-ether__action-content-wrapper { - width: 360px; display: flex; flex-flow: column nowrap; } diff --git a/mascara/src/app/first-time/index.js b/mascara/src/app/first-time/index.js index da2f6bab9..d2f444fe7 100644 --- a/mascara/src/app/first-time/index.js +++ b/mascara/src/app/first-time/index.js @@ -131,7 +131,7 @@ class FirstTimeFlow extends Component { case SCREEN_TYPE.BACK_UP_PHRASE: return ( goToBuyEtherView(address)} + next={() => openBuyEtherModal()} /> ) default: @@ -167,7 +167,7 @@ export default connect( }), dispatch => ({ leaveImportSeedScreenState: () => dispatch(unMarkPasswordForgotten()), - goToBuyEtherView: address => dispatch(onboardingBuyEthView(address)), + openBuyEtherModal: () => dispatch(showModal({ name: 'DEPOSIT_ETHER'})), }) )(FirstTimeFlow) diff --git a/ui/app/app.js b/ui/app/app.js index 6d9296131..d1b17ab5d 100644 --- a/ui/app/app.js +++ b/ui/app/app.js @@ -386,7 +386,7 @@ App.prototype.renderPrimary = function () { isUnlocked, } = props const isMascaraOnboarding = isMascara && isOnboarding - const isBetaUIOnboarding = betaUI && isOnboarding && !props.isPopup && !isRevealingSeedWords + const isBetaUIOnboarding = betaUI && isOnboarding if (!welcomeScreenSeen && betaUI && !isInitialized && !isUnlocked) { return h(WelcomeScreen) @@ -397,7 +397,7 @@ App.prototype.renderPrimary = function () { } // notices - if (!props.noActiveNotices) { + if (!props.noActiveNotices && !betaUI) { log.debug('rendering notice screen for unread notices.') return h(NoticeScreen, { notice: props.lastUnreadNotice, @@ -418,7 +418,7 @@ App.prototype.renderPrimary = function () { return h(HDRestoreVaultScreen, {key: 'HDRestoreVaultScreen'}) } else if (!props.isInitialized && !props.isUnlocked && !isRevealingSeedWords) { log.debug('rendering menu screen') - return props.isPopup + return !betaUI ? h(OldUIInitializeMenuScreen, {key: 'menuScreenInit'}) : h(InitializeMenuScreen, {key: 'menuScreenInit'}) } From d4da7c984f222a255a149425ca29e4fd8ebf297b Mon Sep 17 00:00:00 2001 From: Dan Date: Thu, 22 Mar 2018 14:49:46 -0230 Subject: [PATCH 02/12] Improve responsivensss of unique image screen. --- mascara/src/app/first-time/index.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mascara/src/app/first-time/index.css b/mascara/src/app/first-time/index.css index 2c5439cec..5f8bbd4be 100644 --- a/mascara/src/app/first-time/index.css +++ b/mascara/src/app/first-time/index.css @@ -122,6 +122,10 @@ width: calc(100vw - 80px); } + .unique-image { + width: auto; + } + .create-password__title, .unique-image__title, .tou__title, From 07dd06424741c5a43de136496d44a6f9089e837b Mon Sep 17 00:00:00 2001 From: Dan Date: Mon, 26 Mar 2018 16:27:19 -0230 Subject: [PATCH 04/12] Fix tests. --- mascara/src/app/first-time/index.js | 3 ++- test/integration/lib/mascara-first-time.js | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/mascara/src/app/first-time/index.js b/mascara/src/app/first-time/index.js index d2f444fe7..c0bba53d6 100644 --- a/mascara/src/app/first-time/index.js +++ b/mascara/src/app/first-time/index.js @@ -10,6 +10,7 @@ import ImportSeedPhraseScreen from './import-seed-phrase-screen' import { onboardingBuyEthView, unMarkPasswordForgotten, + showModal, } from '../../../../ui/app/actions' class FirstTimeFlow extends Component { @@ -80,7 +81,7 @@ class FirstTimeFlow extends Component { renderScreen () { const {SCREEN_TYPE} = FirstTimeFlow const { - goToBuyEtherView, + openBuyEtherModal, address, restoreCreatePasswordScreen, forgottenPassword, diff --git a/test/integration/lib/mascara-first-time.js b/test/integration/lib/mascara-first-time.js index bcbc94ff6..564852585 100644 --- a/test/integration/lib/mascara-first-time.js +++ b/test/integration/lib/mascara-first-time.js @@ -57,9 +57,9 @@ async function runFirstTimeUsageTest (assert, done) { ;(await findAsync(app, '.first-time-flow__button')).click() // Deposit Ether Screen - const buyEthTitle = (await findAsync(app, '.buy-ether__title'))[0] - assert.equal(buyEthTitle.textContent, 'Deposit Ether', 'deposit ether screen') - ;(await findAsync(app, '.buy-ether__do-it-later')).click() + const depositEthTitle = (await findAsync(app, '.page-container__title'))[0] + assert.equal(depositEthTitle.textContent, 'Deposit Ether', 'deposit ether screen') + ;(await findAsync(app, '.page-container__header-close')).click() const menu = (await findAsync(app, '.account-menu__icon'))[0] menu.click()