Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Onboarding spreadsheet bugs #38 (GH-2259), #44 (GH-2306), and #45 (GH-2305) #675

Merged
merged 16 commits into from
Mar 17, 2021
Merged

Onboarding spreadsheet bugs #38 (GH-2259), #44 (GH-2306), and #45 (GH-2305) #675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
eb30c6a
Expand toggle and select plus plan if user is basic and selects ghost…
benstrumeyer Feb 2, 2021
6c964ec
Make ghostery glow icon bigger in select default search modal
benstrumeyer Feb 2, 2021
fe1225c
Move ghostery logo on search option selection container a little to t…
benstrumeyer Feb 2, 2021
ae11985
Remove expansion by default
benstrumeyer Feb 2, 2021
a570063
Merge branch 'develop' into misc-fixes
benstrumeyer Feb 8, 2021
31793f8
Update logo sizes on choose default search view
benstrumeyer Feb 8, 2021
2b4009f
Adjust sizing for Yahoo, Startpage, and Bing logos in search selectio…
wlycdgr Feb 9, 2021
b318fbe
Increase chance user object is available before choose plan view rend…
wlycdgr Feb 9, 2021
e253c7f
Factor out option card checkmark item rendering to a helper to reduce…
wlycdgr Feb 9, 2021
19a71d9
Merge in develop
wlycdgr Mar 15, 2021
72f1451
Update test snapshots
wlycdgr Mar 15, 2021
0bd2e3b
Refactor choose plan view plan card feature copy rendering to a helpe…
wlycdgr Mar 15, 2021
b9a1c83
Factor user status checks in select plan view out to helpers to reduc…
wlycdgr Mar 15, 2021
c00e26f
Move setting of default plan in plan select view to componentDidMount…
wlycdgr Mar 15, 2021
43ebda7
Merge in develop
wlycdgr Mar 16, 2021
7af8bc5
Revised setDefaultPlan() logic in ChoosePlanView to make sure everyth…
wlycdgr Mar 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/Account/AccountReducer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import { UPDATE_PANEL_DATA } from '../panel/constants/constants';
const initialState = {
loggedIn: false,
userID: '',
user: null,
user: null, // TODO It would be better to have a way to distinguish between 'no user' and 'user not fetched yet'
userSettings: null,
subscriptionData: null,
toastMessage: '',
Expand Down
15 changes: 13 additions & 2 deletions app/dawn-hub/Views/OnboardingViews/Step3_ChooseDefaultSearchView/ChooseDefaultSearchView.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,11 @@ class ChooseDefaultSearchView extends Component {
const selected = (chosenSearch === optionName);
const containerClasses = ClassNames('ChooseSearchView__optionContainer', { selected });
const logoFilename = `/app/images/hub/ChooseDefaultSearchView/search-engine-logo-${optionName.toLocaleLowerCase().replace(' ', '')}.svg`;
const optionDescriptionContainerClassNames = ClassNames('ChooseSearchView__optionDescriptionContainer', {
ghostery: optionName === SEARCH_GHOSTERY,
startpage: optionName === SEARCH_STARTPAGE,
yahoo: optionName === SEARCH_YAHOO,
});

return (
<div
Expand All @@ -275,7 +280,7 @@ class ChooseDefaultSearchView extends Component {
)
}
</div>
<div className="ChooseSearchView__optionDescriptionContainer">
<div className={optionDescriptionContainerClassNames}>
{(optionName !== SEARCH_OTHER) && (
<img src={logoFilename} />
)}
Expand All @@ -290,6 +295,12 @@ class ChooseDefaultSearchView extends Component {
renderConfirmationModal = () => {
const { searchBeingConsidered, otherSearchSelected } = this.state;
const logoFilename = `/app/images/hub/ChooseDefaultSearchView/search-engine-logo-${searchBeingConsidered.toLocaleLowerCase().replace(' ', '')}.svg`;
const modalOptionLogoClassNames = ClassNames('ChooseSearchView__modalOptionLogo', {
ghostery: searchBeingConsidered === SEARCH_GHOSTERY,
yahoo: searchBeingConsidered === SEARCH_YAHOO,
bing: searchBeingConsidered === SEARCH_BING,
startpage: searchBeingConsidered === SEARCH_STARTPAGE,
});

return (
<Modal show>
Expand All @@ -301,7 +312,7 @@ class ChooseDefaultSearchView extends Component {
{SEARCH_OTHER}
</div>
) :
<img className="ChooseSearchView__modalOptionLogo" src={logoFilename} />
<img className={modalOptionLogoClassNames} src={logoFilename} />
}
<div className="ChooseSearchView__modalDescription">
{searchBeingConsidered === SEARCH_STARTPAGE && t('ghostery_dawn_onboarding_startpage_warning')}
Expand Down
28 changes: 27 additions & 1 deletion ...dawn-hub/Views/OnboardingViews/Step3_ChooseDefaultSearchView/ChooseDefaultSearchView.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,16 @@
justify-content: center;
width: 75%;
padding-right: 15%;

&.ghostery {
margin-left: -14px;
}
&.startpage {
margin-left: -9px;
}
&.yahoo {
margin-left: -9px;
}
}

.ChooseSearchView__optionDescriptionHeader {
Expand Down Expand Up @@ -290,7 +300,23 @@
}

.ChooseSearchView__modalOptionLogo {
padding-bottom: 40px;
padding: 70px 0;

&.ghostery {
width: 266px;
}

&.yahoo {
width: 256px;
}

&.bing {
width: 325px;
}

&.startpage {
width: 235px;
}
}

.ChooseSearchView__modalDawnLogo {
Expand Down
180 changes: 77 additions & 103 deletions app/dawn-hub/Views/OnboardingViews/Step4_ChoosePlanView/ChoosePlanView.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,13 @@ const searchPromo = () => (
</div>
);

const cardSubCopy = copy => (
<div className="ChoosePlanView__cardSubCopy">
<span className="check blue" />
{copy}
</div>
);

const basicCard = (checked, handleClick) => {
const cardClassNames = ClassNames('ChoosePlanView__card basic', {
checked
Expand All @@ -66,22 +73,10 @@ const basicCard = (checked, handleClick) => {
</div>
<p className="card-sub-header"><strong>{t('hub_upgrade_basic_protection')}</strong></p>
<div className="ChoosePlanView__valuePropList basic">
<div className="ChoosePlanView__cardSubCopy">
<span className="check blue" />
{t('ghostery_dawn_onboarding_private_search')}
</div>
<div className="ChoosePlanView__cardSubCopy">
<span className="check blue" />
{t('ghostery_dawn_onboarding_tracker_protection')}
</div>
<div className="ChoosePlanView__cardSubCopy">
<span className="check blue" />
{t('ghostery_dawn_onboarding_speedy_page_loads')}
</div>
<div className="ChoosePlanView__cardSubCopy">
<span className="check blue" />
{t('ghostery_dawn_onboarding_intelligence_technology')}
</div>
{cardSubCopy(t('ghostery_dawn_onboarding_private_search'))}
{cardSubCopy(t('ghostery_dawn_onboarding_tracker_protection'))}
{cardSubCopy(t('ghostery_dawn_onboarding_speedy_page_loads'))}
{cardSubCopy(t('ghostery_dawn_onboarding_intelligence_technology'))}
</div>
</div>
</div>
Expand All @@ -93,26 +88,31 @@ class ChoosePlanView extends React.Component {
super(props);
this.state = {
selectedPlan: '',
expanded: false
expanded: false,
readyToRender: false, // after the component mounts, we need to setDefaultPlan()
};
// User object doesn't get populated immediately, let's delay the first render
setTimeout(this.setDefaultPlan, 200);
}

setDefaultPlan = () => {
componentDidMount() {
this.setDefaultPlan();
}

isBasicUser = () => {
const { user } = this.props;
const isPlus = (user && user.plusAccess) || false;
const isPremium = (user && user.premiumAccess) || false;

if (isPremium) {
this.selectPremiumPlan();
return;
}
if (isPlus) {
this.selectPlusPlan();
return;
}
this.selectBasicPlan();
return (!user || (user && !user.plusAccess && !user.premiumAccess));
}

isPlusUser = () => {
const { user } = this.props;

return (user && user.plusAccess && !user.premiumAccess) || false;
}

isPremiumUser = () => {
const { user } = this.props;

return (user && user.premiumAccess) || false;
}

isBasicPlanChecked = () => {
Expand All @@ -130,6 +130,28 @@ class ChoosePlanView extends React.Component {
return (selectedPlan === PREMIUM);
};

setDefaultPlan = () => {
const { defaultSearch } = this.props;

const isBasic = this.isBasicUser();
const isPlus = this.isPlusUser();
const isPremium = this.isPremiumUser();
const basicGlow = isBasic && defaultSearch === SEARCH_GHOSTERY;

if (isPremium) {
this.selectPremiumPlan();
} else if (isPlus || basicGlow) {
this.selectPlusPlan();
} else {
this.selectBasicPlan();
}

this.setState({
expanded: basicGlow,
readyToRender: true,
});
}

selectBasicPlan = () => this.setState({ selectedPlan: BASIC });

selectPlusPlan = () => this.setState({ selectedPlan: PLUS });
Expand All @@ -146,23 +168,15 @@ class ChoosePlanView extends React.Component {
};

renderTitleText = () => {
const { user } = this.props;
const isPlus = (user && user.plusAccess) || false;
const isPremium = (user && user.premiumAccess) || false;

if (isPremium) return t('ghostery_dawn_onboarding_already_premium_subscriber');
if (isPlus) return t('ghostery_dawn_onboarding_already_plus_subscriber');
if (this.isPremiumUser()) return t('ghostery_dawn_onboarding_already_premium_subscriber');
if (this.isPlusUser()) return t('ghostery_dawn_onboarding_already_plus_subscriber');
return t('ghostery_dawn_onboarding_your_privacy_plan');
};

renderSubtitleText = (selectedGhosteryGlow) => {
const { user } = this.props;
const isPlus = (user && user.plusAccess) || false;
const isPremium = (user && user.premiumAccess) || false;

if (selectedGhosteryGlow) return t('ghostery_dawn_onboarding_based_on_your_privacy_preferences');
if (isPremium) return '';
if (isPlus) return t('ghostery_dawn_onboarding_keep_your_current_plan_or_upgrade');
if (this.isPremiumUser()) return '';
if (this.isPlusUser()) return t('ghostery_dawn_onboarding_keep_your_current_plan_or_upgrade');
return t('ghostery_dawn_onboarding_choose_an_option');
};

Expand Down Expand Up @@ -198,30 +212,12 @@ class ChoosePlanView extends React.Component {
</div>
<p className="card-sub-header"><strong>{t('hub_upgrade_additional_protection')}</strong></p>
<div className="ChoosePlanView__valuePropList">
<div className="ChoosePlanView__cardSubCopy">
<span className="check blue" />
{t('ghostery_dawn_onboarding_private_search')}
</div>
<div className="ChoosePlanView__cardSubCopy">
<span className="check blue" />
{t('ghostery_dawn_onboarding_tracker_protection')}
</div>
<div className="ChoosePlanView__cardSubCopy">
<span className="check blue" />
{t('ghostery_dawn_onboarding_speedy_page_loads')}
</div>
<div className="ChoosePlanView__cardSubCopy">
<span className="check blue" />
{t('ghostery_dawn_onboarding_intelligence_technology')}
</div>
<div className="ChoosePlanView__cardSubCopy">
<span className="check blue" />
{t('ghostery_dawn_onboarding_ad_free')}
</div>
<div className="ChoosePlanView__cardSubCopy">
<span className="check blue" />
{t('ghostery_dawn_onboarding_supports_ghosterys_mission')}
</div>
{cardSubCopy(t('ghostery_dawn_onboarding_private_search'))}
{cardSubCopy(t('ghostery_dawn_onboarding_tracker_protection'))}
{cardSubCopy(t('ghostery_dawn_onboarding_speedy_page_loads'))}
{cardSubCopy(t('ghostery_dawn_onboarding_intelligence_technology'))}
{cardSubCopy(t('ghostery_dawn_onboarding_ad_free'))}
{cardSubCopy(t('ghostery_dawn_onboarding_supports_ghosterys_mission'))}
</div>
</div>
</div>
Expand Down Expand Up @@ -258,38 +254,14 @@ class ChoosePlanView extends React.Component {
</div>
<p className="card-sub-header"><strong>{t('hub_upgrade_maximum_protection')}</strong></p>
<div className="ChoosePlanView__valuePropList">
<div className="ChoosePlanView__cardSubCopy">
<span className="check blue" />
{t('ghostery_dawn_onboarding_private_search')}
</div>
<div className="ChoosePlanView__cardSubCopy">
<span className="check blue" />
{t('ghostery_dawn_onboarding_tracker_protection')}
</div>
<div className="ChoosePlanView__cardSubCopy">
<span className="check blue" />
{t('ghostery_dawn_onboarding_speedy_page_loads')}
</div>
<div className="ChoosePlanView__cardSubCopy">
<span className="check blue" />
{t('ghostery_dawn_onboarding_intelligence_technology')}
</div>
<div className="ChoosePlanView__cardSubCopy">
<span className="check blue" />
{t('ghostery_dawn_onboarding_ad_free')}
</div>
<div className="ChoosePlanView__cardSubCopy">
<span className="check blue" />
{t('ghostery_dawn_onboarding_supports_ghosterys_mission')}
</div>
<div className="ChoosePlanView__cardSubCopy">
<span className="check blue" />
VPN
</div>
<div className="ChoosePlanView__cardSubCopy">
<span className="check blue" />
{t('ghostery_dawn_onboarding_unlimited_bandwidth')}
</div>
{cardSubCopy(t('ghostery_dawn_onboarding_private_search'))}
{cardSubCopy(t('ghostery_dawn_onboarding_tracker_protection'))}
{cardSubCopy(t('ghostery_dawn_onboarding_speedy_page_loads'))}
{cardSubCopy(t('ghostery_dawn_onboarding_intelligence_technology'))}
{cardSubCopy(t('ghostery_dawn_onboarding_ad_free'))}
{cardSubCopy(t('ghostery_dawn_onboarding_supports_ghosterys_mission'))}
{cardSubCopy('VPN')}
{cardSubCopy(t('ghostery_dawn_onboarding_unlimited_bandwidth'))}
</div>
</div>
</div>
Expand All @@ -301,17 +273,19 @@ class ChoosePlanView extends React.Component {
};

render() {
const { readyToRender } = this.state;
if (!readyToRender) return null;

const {
actions,
defaultSearch,
user,
} = this.props;
const { setSetupStep } = actions;
const { expanded, selectedPlan } = this.state;

const isBasic = !user || (user && !user.plusAccess && !user.premiumAccess);
const isPlus = (user && user.plusAccess && !user.premiumAccess) || false;
const isPremium = (user && user.premiumAccess) || false;
const isBasic = this.isBasicUser();
const isPlus = this.isPlusUser();
const isPremium = this.isPremiumUser();

const arrowClassNames = ClassNames('ChoosePlanView__arrow', {
up: !expanded,
Expand Down
Loading