From 6e4040bcad6bc468f5a3fb4d028469127b2dc943 Mon Sep 17 00:00:00 2001 From: Ben Date: Fri, 22 Jan 2021 11:52:15 -0500 Subject: [PATCH 1/7] Bold numbers in step progress bar --- .../hub/step-progress-bar/step-1-current.svg | 9 ++++++++- .../hub/step-progress-bar/step-2-current.svg | 9 ++++++++- .../step-progress-bar/step-2-incomplete.svg | 9 ++++++++- .../hub/step-progress-bar/step-3-current.svg | 9 ++++++++- .../step-progress-bar/step-3-incomplete.svg | 2 +- .../hub/step-progress-bar/step-4-current.svg | 9 ++++++++- .../step-progress-bar/step-4-incomplete.svg | 9 ++++++++- .../hub/step-progress-bar/step-completed.svg | 18 +++++++++++++++++- 8 files changed, 66 insertions(+), 8 deletions(-) diff --git a/app/images/hub/step-progress-bar/step-1-current.svg b/app/images/hub/step-progress-bar/step-1-current.svg index f909351a2..ea7621dde 100644 --- a/app/images/hub/step-progress-bar/step-1-current.svg +++ b/app/images/hub/step-progress-bar/step-1-current.svg @@ -1 +1,8 @@ -1 + + + + + 1 + + + diff --git a/app/images/hub/step-progress-bar/step-2-current.svg b/app/images/hub/step-progress-bar/step-2-current.svg index 334222a0f..7b2b0d76f 100644 --- a/app/images/hub/step-progress-bar/step-2-current.svg +++ b/app/images/hub/step-progress-bar/step-2-current.svg @@ -1 +1,8 @@ -2 + + + + + 2 + + + diff --git a/app/images/hub/step-progress-bar/step-2-incomplete.svg b/app/images/hub/step-progress-bar/step-2-incomplete.svg index b85269220..f53cb0b71 100644 --- a/app/images/hub/step-progress-bar/step-2-incomplete.svg +++ b/app/images/hub/step-progress-bar/step-2-incomplete.svg @@ -1 +1,8 @@ -2 + + + + + 2 + + + diff --git a/app/images/hub/step-progress-bar/step-3-current.svg b/app/images/hub/step-progress-bar/step-3-current.svg index 6e8c4a48f..a1e47f728 100644 --- a/app/images/hub/step-progress-bar/step-3-current.svg +++ b/app/images/hub/step-progress-bar/step-3-current.svg @@ -1 +1,8 @@ -3 + + + + + 3 + + + diff --git a/app/images/hub/step-progress-bar/step-3-incomplete.svg b/app/images/hub/step-progress-bar/step-3-incomplete.svg index 3e5ac18a2..3b0ec21f0 100644 --- a/app/images/hub/step-progress-bar/step-3-incomplete.svg +++ b/app/images/hub/step-progress-bar/step-3-incomplete.svg @@ -3,7 +3,7 @@ - + 3 diff --git a/app/images/hub/step-progress-bar/step-4-current.svg b/app/images/hub/step-progress-bar/step-4-current.svg index e558755dc..eeed221c5 100644 --- a/app/images/hub/step-progress-bar/step-4-current.svg +++ b/app/images/hub/step-progress-bar/step-4-current.svg @@ -1 +1,8 @@ -4 + + + + + 4 + + + diff --git a/app/images/hub/step-progress-bar/step-4-incomplete.svg b/app/images/hub/step-progress-bar/step-4-incomplete.svg index ee06f911b..26322cabe 100644 --- a/app/images/hub/step-progress-bar/step-4-incomplete.svg +++ b/app/images/hub/step-progress-bar/step-4-incomplete.svg @@ -1 +1,8 @@ -4 + + + + + 4 + + + diff --git a/app/images/hub/step-progress-bar/step-completed.svg b/app/images/hub/step-progress-bar/step-completed.svg index 0ff6754ad..531837424 100644 --- a/app/images/hub/step-progress-bar/step-completed.svg +++ b/app/images/hub/step-progress-bar/step-completed.svg @@ -1 +1,17 @@ - + + + + + + + + + + + + + + + + + From 7beccd5ede703b07aa975f2fc79a9b9048866118 Mon Sep 17 00:00:00 2001 From: Ben Date: Fri, 22 Jan 2021 11:57:04 -0500 Subject: [PATCH 2/7] Align BlockSettingsView checkbox per vinny, add click handler to checkbox label --- .../Step2_BlockSettingsView/BlockSettingsView.jsx | 2 +- .../Step2_BlockSettingsView/BlockSettingsView.scss | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/ghostery-browser-hub/Views/OnboardingViews/Step2_BlockSettingsView/BlockSettingsView.jsx b/app/ghostery-browser-hub/Views/OnboardingViews/Step2_BlockSettingsView/BlockSettingsView.jsx index 330463407..0eca9aa0e 100644 --- a/app/ghostery-browser-hub/Views/OnboardingViews/Step2_BlockSettingsView/BlockSettingsView.jsx +++ b/app/ghostery-browser-hub/Views/OnboardingViews/Step2_BlockSettingsView/BlockSettingsView.jsx @@ -137,7 +137,7 @@ class BlockSettingsView extends Component { checked={recommendedChoices} onChange={() => this.toggleRecommendedChoices(!recommendedChoices)} /> -
{t('ghostery_dawn_onboarding_recommended_choices')}
+
this.toggleRecommendedChoices(!recommendedChoices)}>{t('ghostery_dawn_onboarding_recommended_choices')}
  1. {t('ghostery_dawn_onboarding_question_block_ads')}
    2. diff --git a/app/ghostery-browser-hub/Views/OnboardingViews/Step2_BlockSettingsView/BlockSettingsView.scss b/app/ghostery-browser-hub/Views/OnboardingViews/Step2_BlockSettingsView/BlockSettingsView.scss index 8a50b974a..399b6e8cd 100644 --- a/app/ghostery-browser-hub/Views/OnboardingViews/Step2_BlockSettingsView/BlockSettingsView.scss +++ b/app/ghostery-browser-hub/Views/OnboardingViews/Step2_BlockSettingsView/BlockSettingsView.scss @@ -128,7 +128,11 @@ width: 20px; height: 20px; padding: 0; - margin-right: 14px; + margin-left: -14px; +} + +.BlockSettingsView_checkboxLabel { + cursor: pointer; } .BlockSettingsView__infoIcon { From 46b3d426502cd20e6b2d5d78ded4d552ed7cbb97 Mon Sep 17 00:00:00 2001 From: Ben Date: Fri, 22 Jan 2021 12:15:39 -0500 Subject: [PATCH 3/7] Restore already have account and create an account, also get rid of console error --- .../Step1_CreateAccountView/Step1_CreateAccountView.jsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/ghostery-browser-hub/Views/OnboardingViews/Step1_CreateAccountView/Step1_CreateAccountView.jsx b/app/ghostery-browser-hub/Views/OnboardingViews/Step1_CreateAccountView/Step1_CreateAccountView.jsx index 67fa068d7..b88f53567 100644 --- a/app/ghostery-browser-hub/Views/OnboardingViews/Step1_CreateAccountView/Step1_CreateAccountView.jsx +++ b/app/ghostery-browser-hub/Views/OnboardingViews/Step1_CreateAccountView/Step1_CreateAccountView.jsx @@ -36,7 +36,7 @@ const faqList = [ ]; const renderFAQListItem = (icon, label, description) => ( -
    +
    @@ -91,10 +91,10 @@ const Step1_CreateAccountView = (props) => {
    { t('ghostery_dawn_onboarding_sync_settings') }
    {view === CREATE_ACCOUNT && ( -
    setView(SIGN_IN)}>{t('ghostery_browser_hub_onboarding_already_have_account')}
    +
    setView(SIGN_IN)}>{t('ghostery_dawn_onboarding_already_have_account')}
    )} {view === SIGN_IN && ( -
    setView(CREATE_ACCOUNT)}>{t('ghostery_browser_hub_onboarding_create_an_account')}
    +
    setView(CREATE_ACCOUNT)}>{t('ghostery_dawn_onboarding_create_an_account')}
    )}
    {view === CREATE_ACCOUNT ? ( From 2a32674c63069b3f52349893e6afe44a40a566df Mon Sep 17 00:00:00 2001 From: Ben Date: Fri, 22 Jan 2021 12:19:14 -0500 Subject: [PATCH 4/7] Close tab when clicking CTA button on Success View --- .../OnboardingViews/Step5_SuccessView/SuccessView.jsx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/ghostery-browser-hub/Views/OnboardingViews/Step5_SuccessView/SuccessView.jsx b/app/ghostery-browser-hub/Views/OnboardingViews/Step5_SuccessView/SuccessView.jsx index db0ce4475..a19c3721b 100644 --- a/app/ghostery-browser-hub/Views/OnboardingViews/Step5_SuccessView/SuccessView.jsx +++ b/app/ghostery-browser-hub/Views/OnboardingViews/Step5_SuccessView/SuccessView.jsx @@ -22,6 +22,12 @@ import { NavLink } from 'react-router-dom'; const SuccessView = (props) => { const { actions } = props; const { sendPing } = actions; + + const handleCTAButtonClick = () => { + sendPing({ type: 'gb_onboarding_success' }); + window.close(); + }; + return (
    @@ -37,7 +43,7 @@ const SuccessView = (props) => {
    {`${t('ghostery_dawn_onboarding_surf_with_ease')} Ghostery`}
    - +
    ); From b857a1b59056b1ebee0069664702d7807bc4b1c5 Mon Sep 17 00:00:00 2001 From: Ben Date: Fri, 22 Jan 2021 12:42:09 -0500 Subject: [PATCH 5/7] Fix terms and agreements label position on Create Account Form --- .../Step1_CreateAccountForm/Step1_CreateAccountForm.jsx | 6 +++--- .../Step1_CreateAccountForm/Step1_CreateAccountForm.scss | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/ghostery-browser-hub/Views/OnboardingViews/Step1_CreateAccountForm/Step1_CreateAccountForm.jsx b/app/ghostery-browser-hub/Views/OnboardingViews/Step1_CreateAccountForm/Step1_CreateAccountForm.jsx index fb5634a9d..37fb9bdea 100644 --- a/app/ghostery-browser-hub/Views/OnboardingViews/Step1_CreateAccountForm/Step1_CreateAccountForm.jsx +++ b/app/ghostery-browser-hub/Views/OnboardingViews/Step1_CreateAccountForm/Step1_CreateAccountForm.jsx @@ -188,8 +188,8 @@ export const Step1_CreateAccountForm = (props) => { )}
    -
    -
    +
    +
    { />
    -
    + {/*
    */}
    diff --git a/app/ghostery-browser-hub/Views/OnboardingViews/Step1_CreateAccountForm/Step1_CreateAccountForm.scss b/app/ghostery-browser-hub/Views/OnboardingViews/Step1_CreateAccountForm/Step1_CreateAccountForm.scss index ab27dedf5..43bea6263 100644 --- a/app/ghostery-browser-hub/Views/OnboardingViews/Step1_CreateAccountForm/Step1_CreateAccountForm.scss +++ b/app/ghostery-browser-hub/Views/OnboardingViews/Step1_CreateAccountForm/Step1_CreateAccountForm.scss @@ -53,8 +53,9 @@ } .Step1_CreateAccountForm__legalConsentCheckedLabel { font-size: 14px; + margin-top: 13px; @include breakpoint(small down) { - width: 258px; + width: 290px; } &.error { From 3f5fd2b9cecb9b92ae7b1a29d07931e1a6a75bfa Mon Sep 17 00:00:00 2001 From: Ben Date: Fri, 22 Jan 2021 12:52:44 -0500 Subject: [PATCH 6/7] Update snapshots --- .../__snapshots__/WelcomeView.test.jsx.snap | 6 +- .../Step1_CreateAccountForm.jsx | 1 - .../Step1_CreateAccountForm.test.jsx.snap | 32 +------ .../Step1_CreateAccountView.test.jsx.snap | 84 +++++++++++++++---- .../BlockSettingsView.test.jsx.snap | 27 +++--- .../ChoosePlanView.test.jsx.snap | 40 ++++----- .../__snapshots__/SuccessView.test.jsx.snap | 8 +- .../StepProgressBar.test.jsx.snap | 8 +- .../__snapshots__/AppView.test.jsx.snap | 10 ++- 9 files changed, 120 insertions(+), 96 deletions(-) diff --git a/app/ghostery-browser-hub/Views/OnboardingViews/Step0_WelcomeView/__tests__/__snapshots__/WelcomeView.test.jsx.snap b/app/ghostery-browser-hub/Views/OnboardingViews/Step0_WelcomeView/__tests__/__snapshots__/WelcomeView.test.jsx.snap index 6d26c9fcc..dbf7b51fe 100644 --- a/app/ghostery-browser-hub/Views/OnboardingViews/Step0_WelcomeView/__tests__/__snapshots__/WelcomeView.test.jsx.snap +++ b/app/ghostery-browser-hub/Views/OnboardingViews/Step0_WelcomeView/__tests__/__snapshots__/WelcomeView.test.jsx.snap @@ -7,12 +7,12 @@ exports[`app/ghostery-browser-hub/Views/OnboardingViews/Step0_WelcomeView/Welcom
    - ghostery_browser_hub_onboarding_welcome + ghostery_dawn_onboarding_welcome
    - ghostery_browser_hub_onboarding_lets_begin + ghostery_dawn_onboarding_lets_begin
    - ghostery_browser_hub_onboarding_lets_do_this + ghostery_dawn_onboarding_lets_do_this
    diff --git a/app/ghostery-browser-hub/Views/OnboardingViews/Step1_CreateAccountForm/Step1_CreateAccountForm.jsx b/app/ghostery-browser-hub/Views/OnboardingViews/Step1_CreateAccountForm/Step1_CreateAccountForm.jsx index 37fb9bdea..7a80e9b18 100644 --- a/app/ghostery-browser-hub/Views/OnboardingViews/Step1_CreateAccountForm/Step1_CreateAccountForm.jsx +++ b/app/ghostery-browser-hub/Views/OnboardingViews/Step1_CreateAccountForm/Step1_CreateAccountForm.jsx @@ -204,7 +204,6 @@ export const Step1_CreateAccountForm = (props) => { />
    - {/*
    */}
    diff --git a/app/ghostery-browser-hub/Views/OnboardingViews/Step1_CreateAccountForm/__tests__/__snapshots__/Step1_CreateAccountForm.test.jsx.snap b/app/ghostery-browser-hub/Views/OnboardingViews/Step1_CreateAccountForm/__tests__/__snapshots__/Step1_CreateAccountForm.test.jsx.snap index a03bbdbf6..65c1003cf 100644 --- a/app/ghostery-browser-hub/Views/OnboardingViews/Step1_CreateAccountForm/__tests__/__snapshots__/Step1_CreateAccountForm.test.jsx.snap +++ b/app/ghostery-browser-hub/Views/OnboardingViews/Step1_CreateAccountForm/__tests__/__snapshots__/Step1_CreateAccountForm.test.jsx.snap @@ -140,35 +140,10 @@ exports[`app/hub/Views/Step1_CreateAccountForm component Snapshot tests with rea
    -
    -
    - -
    -
    -
    -
    -
    -
    -
    - ghostery_browser_hub_onboarding_create_a_ghostery_account + ghostery_dawn_onboarding_create_a_ghostery_account
    - ghostery_browser_hub_onboarding_sync_settings + ghostery_dawn_onboarding_sync_settings
    - ghostery_browser_hub_onboarding_already_have_account + ghostery_dawn_onboarding_already_have_account
    -
    - ghostery_browser_hub_onboarding_skip + ghostery_dawn_onboarding_skip
    - ghostery_browser_hub_onboarding_we_take_your_privacy_very_seriously +
    + +
    +
    +
    + ghostery_dawn_onboarding_private_by_design +
    +
    + ghostery_dawn_onboarding_private_by_design_description +
    +
    +
    +
    +
    + +
    +
    +
    + ghostery_dawn_onboarding_can_i_remove_my_account +
    +
    + ghostery_dawn_onboarding_can_i_remove_my_account_description +
    +
    `; diff --git a/app/ghostery-browser-hub/Views/OnboardingViews/Step2_BlockSettingsView/__tests__/__snapshots__/BlockSettingsView.test.jsx.snap b/app/ghostery-browser-hub/Views/OnboardingViews/Step2_BlockSettingsView/__tests__/__snapshots__/BlockSettingsView.test.jsx.snap index e4753d50d..823005b73 100644 --- a/app/ghostery-browser-hub/Views/OnboardingViews/Step2_BlockSettingsView/__tests__/__snapshots__/BlockSettingsView.test.jsx.snap +++ b/app/ghostery-browser-hub/Views/OnboardingViews/Step2_BlockSettingsView/__tests__/__snapshots__/BlockSettingsView.test.jsx.snap @@ -21,7 +21,7 @@ Array [ - ghostery_browser_hub_onboarding_back + ghostery_dawn_onboarding_back
    @@ -32,12 +32,12 @@ Array [
    - ghostery_browser_hub_onboarding_which_privacy_plan + ghostery_dawn_onboarding_which_privacy_plan
    - ghostery_browser_hub_onboarding_tell_us_your_preferences + ghostery_dawn_onboarding_tell_us_your_preferences
    -
    - ghostery_browser_hub_onboarding_recommended_choices +
    + ghostery_dawn_onboarding_recommended_choices
    1. - ghostery_browser_hub_onboarding_question_block_ads + ghostery_dawn_onboarding_question_block_ads
      2. - ghostery_browser_hub_onboarding_question_kinds_of_trackers + ghostery_dawn_onboarding_question_kinds_of_trackers
      @@ -144,7 +147,7 @@ Array [
      - ghostery_browser_hub_onboarding_kinds_of_trackers_all + ghostery_dawn_onboarding_kinds_of_trackers_all
      - ghostery_browser_hub_onboarding_kinds_of_trackers_ad_and_analytics + ghostery_dawn_onboarding_kinds_of_trackers_ad_and_analytics
      - ghostery_browser_hub_onboarding_kinds_of_trackers_none + ghostery_dawn_onboarding_kinds_of_trackers_none
  2. - ghostery_browser_hub_onboarding_question_anti_tracking + ghostery_dawn_onboarding_question_anti_tracking
    @@ -257,7 +260,7 @@ Array [
    - ghostery_browser_hub_onboarding_question_smart_browsing + ghostery_dawn_onboarding_question_smart_browsing
    diff --git a/app/ghostery-browser-hub/Views/OnboardingViews/Step4_ChoosePlanView/__tests__/__snapshots__/ChoosePlanView.test.jsx.snap b/app/ghostery-browser-hub/Views/OnboardingViews/Step4_ChoosePlanView/__tests__/__snapshots__/ChoosePlanView.test.jsx.snap index 28e39c2ea..1f22378ab 100644 --- a/app/ghostery-browser-hub/Views/OnboardingViews/Step4_ChoosePlanView/__tests__/__snapshots__/ChoosePlanView.test.jsx.snap +++ b/app/ghostery-browser-hub/Views/OnboardingViews/Step4_ChoosePlanView/__tests__/__snapshots__/ChoosePlanView.test.jsx.snap @@ -27,7 +27,7 @@ exports[`app/ghostery-browser-hub/Views/OnboardingViews/Step4_ChoosePlanView/Cho - ghostery_browser_hub_onboarding_back + ghostery_dawn_onboarding_back
    @@ -38,12 +38,12 @@ exports[`app/ghostery-browser-hub/Views/OnboardingViews/Step4_ChoosePlanView/Cho
    - ghostery_browser_hub_onboarding_your_privacy_plan + ghostery_dawn_onboarding_your_privacy_plan
    - ghostery_browser_hub_onboarding_choose_an_option + ghostery_dawn_onboarding_choose_an_option
    - ghostery_browser_hub_onboarding_private_search + ghostery_dawn_onboarding_private_search
    - ghostery_browser_hub_onboarding_tracker_protection + ghostery_dawn_onboarding_tracker_protection
    - ghostery_browser_hub_onboarding_speedy_page_loads + ghostery_dawn_onboarding_speedy_page_loads
    - ghostery_browser_hub_onboarding_intelligence_technology + ghostery_dawn_onboarding_intelligence_technology
    @@ -204,7 +204,7 @@ exports[`app/ghostery-browser-hub/Views/OnboardingViews/Step4_ChoosePlanView/Cho - ghostery_browser_hub_onboarding_private_search + ghostery_dawn_onboarding_private_search
    - ghostery_browser_hub_onboarding_tracker_protection + ghostery_dawn_onboarding_tracker_protection
    - ghostery_browser_hub_onboarding_speedy_page_loads + ghostery_dawn_onboarding_speedy_page_loads
    - ghostery_browser_hub_onboarding_intelligence_technology + ghostery_dawn_onboarding_intelligence_technology
    - ghostery_browser_hub_onboarding_ad_free + ghostery_dawn_onboarding_ad_free
    - ghostery_browser_hub_onboarding_supports_ghosterys_mission + ghostery_dawn_onboarding_supports_ghosterys_mission
    3. @@ -316,7 +316,7 @@ exports[`app/ghostery-browser-hub/Views/OnboardingViews/Step4_ChoosePlanView/Cho - ghostery_browser_hub_onboarding_private_search + ghostery_dawn_onboarding_private_search
    - ghostery_browser_hub_onboarding_tracker_protection + ghostery_dawn_onboarding_tracker_protection
    - ghostery_browser_hub_onboarding_speedy_page_loads + ghostery_dawn_onboarding_speedy_page_loads
    - ghostery_browser_hub_onboarding_intelligence_technology + ghostery_dawn_onboarding_intelligence_technology
    - ghostery_browser_hub_onboarding_ad_free + ghostery_dawn_onboarding_ad_free
    - ghostery_browser_hub_onboarding_supports_ghosterys_mission + ghostery_dawn_onboarding_supports_ghosterys_mission
    - ghostery_browser_hub_onboarding_unlimited_bandwidth + ghostery_dawn_onboarding_unlimited_bandwidth
    diff --git a/app/ghostery-browser-hub/Views/OnboardingViews/Step5_SuccessView/__tests__/__snapshots__/SuccessView.test.jsx.snap b/app/ghostery-browser-hub/Views/OnboardingViews/Step5_SuccessView/__tests__/__snapshots__/SuccessView.test.jsx.snap index 6508140e8..2a6ff5651 100644 --- a/app/ghostery-browser-hub/Views/OnboardingViews/Step5_SuccessView/__tests__/__snapshots__/SuccessView.test.jsx.snap +++ b/app/ghostery-browser-hub/Views/OnboardingViews/Step5_SuccessView/__tests__/__snapshots__/SuccessView.test.jsx.snap @@ -19,7 +19,7 @@ Array [ - ghostery_browser_hub_onboarding_back + ghostery_dawn_onboarding_back @@ -30,12 +30,12 @@ Array [
    - ghostery_browser_hub_onboarding_youve_successfully_set_up_your_browser + ghostery_dawn_onboarding_youve_successfully_set_up_your_browser
    - ghostery_browser_hub_onboarding_surf_with_ease Ghostery + ghostery_dawn_onboarding_surf_with_ease Ghostery
    - ghostery_browser_hub_onboarding_start_browsing + ghostery_dawn_onboarding_start_browsing , ] diff --git a/app/ghostery-browser-hub/Views/OnboardingViews/StepProgressBar/__tests__/__snapshots__/StepProgressBar.test.jsx.snap b/app/ghostery-browser-hub/Views/OnboardingViews/StepProgressBar/__tests__/__snapshots__/StepProgressBar.test.jsx.snap index e389612c4..9b0463a08 100644 --- a/app/ghostery-browser-hub/Views/OnboardingViews/StepProgressBar/__tests__/__snapshots__/StepProgressBar.test.jsx.snap +++ b/app/ghostery-browser-hub/Views/OnboardingViews/StepProgressBar/__tests__/__snapshots__/StepProgressBar.test.jsx.snap @@ -4,8 +4,6 @@ exports[`app/ghostery-browser-hub/Views/OnboardingViews/StepProgressBar/StepProg exports[`app/ghostery-browser-hub/Views/OnboardingViews/StepProgressBar/StepProgressBar.test.jsx Shallow snapshot tests rendered with Enzyme StepProgressBar View step 1 1`] = `ShallowWrapper {}`; -exports[`app/ghostery-browser-hub/Views/OnboardingViews/StepProgressBar/StepProgressBar.test.jsx Shallow snapshot tests rendered with Enzyme StepProgressBar View step 2 1`] = `ShallowWrapper {}`; - exports[`app/ghostery-browser-hub/Views/OnboardingViews/StepProgressBar/StepProgressBar.test.jsx Shallow snapshot tests rendered with Enzyme StepProgressBar View step 4 1`] = `ShallowWrapper {}`; exports[`app/ghostery-browser-hub/Views/OnboardingViews/StepProgressBar/StepProgressBar.test.jsx Shallow snapshot tests rendered with Enzyme StepProgressBar View step 5 1`] = `ShallowWrapper {}`; @@ -41,7 +39,7 @@ exports[`app/ghostery-browser-hub/Views/OnboardingViews/StepProgressBar/StepProg
    - ghostery_browser_hub_onboarding_privacy + ghostery_dawn_onboarding_privacy
    - ghostery_browser_hub_onboarding_search + ghostery_dawn_onboarding_search
    - ghostery_browser_hub_onboarding_plan + ghostery_dawn_onboarding_plan
    - Example toast message +
    + Example toast message +
    Date: Fri, 22 Jan 2021 13:22:54 -0500 Subject: [PATCH 7/7] Clear toasts when clicking skip button --- .../Step1_CreateAccountView.jsx | 14 +++++++++++--- .../Step1_CreateAccountView/index.js | 2 ++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/app/ghostery-browser-hub/Views/OnboardingViews/Step1_CreateAccountView/Step1_CreateAccountView.jsx b/app/ghostery-browser-hub/Views/OnboardingViews/Step1_CreateAccountView/Step1_CreateAccountView.jsx index b88f53567..b551bd552 100644 --- a/app/ghostery-browser-hub/Views/OnboardingViews/Step1_CreateAccountView/Step1_CreateAccountView.jsx +++ b/app/ghostery-browser-hub/Views/OnboardingViews/Step1_CreateAccountView/Step1_CreateAccountView.jsx @@ -54,16 +54,24 @@ const renderFAQListItem = (icon, label, description) => ( */ const Step1_CreateAccountView = (props) => { const { user, actions } = props; - const { setSetupStep } = actions; + const { setSetupStep, setToast } = actions; const email = user && user.email; const [view, setView] = useState(CREATE_ACCOUNT); + const handleSkipButton = () => { + setSetupStep({ setup_step: LOGIN, origin: ONBOARDING }); + setToast({ + toastMessage: '', + toastClass: '' + }); + }; + const renderSkipLink = () => (
    - setSetupStep({ setup_step: LOGIN, origin: ONBOARDING })}> + handleSkipButton()}> {t('ghostery_dawn_onboarding_skip')}
    @@ -75,7 +83,7 @@ const Step1_CreateAccountView = (props) => {
    {t('ghostery_dawn_onboarding_you_are_signed_in_as')}
    {email}
    - setSetupStep({ setup_step: LOGIN, origin: ONBOARDING })}> + handleSkipButton()}> {t('next')}
    diff --git a/app/ghostery-browser-hub/Views/OnboardingViews/Step1_CreateAccountView/index.js b/app/ghostery-browser-hub/Views/OnboardingViews/Step1_CreateAccountView/index.js index 09b839fa8..0d9bbea15 100644 --- a/app/ghostery-browser-hub/Views/OnboardingViews/Step1_CreateAccountView/index.js +++ b/app/ghostery-browser-hub/Views/OnboardingViews/Step1_CreateAccountView/index.js @@ -14,9 +14,11 @@ import { buildReduxHOC } from '../../../../shared-hub/utils'; import Step1_CreateAccountView from './Step1_CreateAccountView'; import { setSetupStep } from '../../../../shared-hub/actions/SetupLifecycleActions'; +import setToast from '../../../../shared-hub/actions/ToastActions'; const actionCreators = { setSetupStep, + setToast }; export default buildReduxHOC(['account'], actionCreators, Step1_CreateAccountView);