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.

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
Changes from 1 commit
Commits
File filter
Filter file types
Jump to
Jump to file
Failed to load files.

Always

Just for now

Prev

Revised setDefaultPlan() logic in ChoosePlanView to make sure everyth…

…ing renders as expected when user is Plus or Premium
  • Loading branch information
wlycdgr committed Mar 16, 2021
commit 7af8bc569f2900160649a1234096711fa4fc8682
@@ -136,25 +136,20 @@ class ChoosePlanView extends React.Component {
const isBasic = this.isBasicUser();
const isPlus = this.isPlusUser();
const isPremium = this.isPremiumUser();
const basicGlow = isBasic && defaultSearch === SEARCH_GHOSTERY;

if (isPremium) {
this.selectPremiumPlan();
return;
}
if (isPlus) {
this.selectPlusPlan();
return;
}
if (isBasic && defaultSearch === SEARCH_GHOSTERY) {
} else if (isPlus || basicGlow) {
this.selectPlusPlan();
this.setState({
expanded: true,
readyToRender: true,
});
} else {
this.selectBasicPlan();
this.setState({ readyToRender: true });
}

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

selectBasicPlan = () => this.setState({ selectedPlan: BASIC });
@@ -1,5 +1,6 @@
{
"manifest_version": 2,
"debug": true,
"author": "Ghostery",
"name": "__MSG_name__",
"short_name": "Ghostery",
@@ -94,4 +95,4 @@
"web_accessible_resources": [
"app/images/*"
]
}
}
ProTip! Use n and p to navigate between commits in a pull request.