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

Conversation

benstrumeyer
Copy link
Contributor

@benstrumeyer benstrumeyer commented Feb 2, 2021

  • Have you followed the guidelines in CONTRIBUTING.md?
  • Have you checked to ensure there aren't other open Pull Requests for the same update/change?
  • Have you added an explanation of what your changes do?
  • Does your submission pass tests?
  • Did you lint your code prior to submission?
  • Bug 38, Make Glow logo larger in search selection modal
  • Bug 44, Center align ghostery glow icon with the box
  • Bug 45, Select plus plan and expand selection if user is basic and has chosen ghostery search

@benstrumeyer benstrumeyer added the Bug Something isn't working label Feb 2, 2021
@benstrumeyer benstrumeyer requested a review from wlycdgr February 2, 2021 18:31
@benstrumeyer benstrumeyer self-assigned this Feb 2, 2021
@benstrumeyer benstrumeyer changed the title Miscellaneous fixes for #47, #40, and #46 Miscellaneous fixes for #40, #46 and #47 Feb 2, 2021
@benstrumeyer benstrumeyer changed the title Miscellaneous fixes for #40, #46 and #47 Miscellaneous fixes for #29 #44, and #45 Feb 2, 2021
@benstrumeyer benstrumeyer changed the title Miscellaneous fixes for #29 #44, and #45 Miscellaneous fixes for #38 #44, and #45 Feb 2, 2021
@wlycdgr wlycdgr changed the title Miscellaneous fixes for #38 #44, and #45 (DEFER until after 8.5.5) Miscellaneous fixes for #38 #44, and #45 Feb 3, 2021
@christophertino christophertino added this to the 8.5.6 milestone Feb 5, 2021
@wlycdgr wlycdgr changed the title (DEFER until after 8.5.5) Miscellaneous fixes for #38 #44, and #45 (DEFER until after 8.5.5) Onboarding spreadsheet bugs #38 (GH-2259), #44, and #45 Feb 8, 2021
@benstrumeyer benstrumeyer requested a review from a team February 8, 2021 22:43
@wlycdgr wlycdgr changed the title (DEFER until after 8.5.5) Onboarding spreadsheet bugs #38 (GH-2259), #44, and #45 (8.5.6) Onboarding spreadsheet bugs #38 (GH-2259), #44, and #45 Feb 9, 2021
…er. Show expanded view if user picked Glow to match expected UX. Add TODOs so we remember to update AccountReducer to help distinguish between no user present and user not fetched yet
Copy link
Contributor

@wlycdgr wlycdgr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes look good ~ Couple more things:

  • I made a render helper for the checkmark items in the option cards and started refactoring the code to use it - if you could finish that up that would be great
  • Let's factor the isBasic, isPlus, and isPremium checks out to helpers. First cos they're duplicated in render and setDefaultPlan, but also we reduce chance of error nicely with the logic for these checks being a bit convoluted.
  • Speaking of setDefaultPlan - as far as I can tell from a combination of memory and double-checking just now, setTimeout is non-blocking, so with the code as it was, render would run before setDefaultPlan anyway (you can see this in action by setting readyToRender to true from the get-go and throwing in a couple consologs). To make sure we actually don't render until after setDefaultPlan has run after the timeout period, I added this readyToRender state variable that defaults to false and short-circuits render until it's set to true at the end of setDefaultPlan. Nothing to do here at the moment really, just wanted to point this out (ultimately though it'd be good to update the AccountReducer so that we have a way of distinguishing between 'no user' and 'user data not fetched yet').
  • I took the liberty of making some additional adjustments to search selection modal logo sizes to better match the Zeplins, since that was on me to begin with. Let me know if you see that I screwed anything up and I'll fix.

Thank you!

@wlycdgr wlycdgr changed the title (8.5.6) Onboarding spreadsheet bugs #38 (GH-2259), #44, and #45 (8.5.6) (REVIEWED, COMMENTS BEING ADDRESSED) Onboarding spreadsheet bugs #38 (GH-2259), #44, and #45 Feb 9, 2021
@wlycdgr wlycdgr changed the title (8.5.6) (REVIEWED, COMMENTS BEING ADDRESSED) Onboarding spreadsheet bugs #38 (GH-2259), #44, and #45 (8.5.6) (COMMENTS TO BE ADDRESSED) Onboarding spreadsheet bugs #38 (GH-2259), #44, and #45 Feb 9, 2021
@wlycdgr wlycdgr changed the title (8.5.6) (COMMENTS TO BE ADDRESSED) Onboarding spreadsheet bugs #38 (GH-2259), #44, and #45 (8.5.6) (REVIEWED; COMMENTS TO BE ADDRESSED) Onboarding spreadsheet bugs #38 (GH-2259), #44, and #45 Feb 9, 2021
@wlycdgr wlycdgr changed the title (8.5.6) (REVIEWED; COMMENTS TO BE ADDRESSED) Onboarding spreadsheet bugs #38 (GH-2259), #44, and #45 (8.5.6) (COMMENTS TO BE ADDRESSED) Onboarding spreadsheet bugs #38 (GH-2259), #44, and #45 Mar 9, 2021
@wlycdgr wlycdgr changed the title (8.5.6) (COMMENTS TO BE ADDRESSED) Onboarding spreadsheet bugs #38 (GH-2259), #44, and #45 (8.5.6) (COMMENTS) Onboarding spreadsheet bugs #38 (GH-2259), #44, and #45 Mar 9, 2021
@wlycdgr wlycdgr changed the title (8.5.6) (COMMENTS) Onboarding spreadsheet bugs #38 (GH-2259), #44, and #45 (CHANGES SUGGESTED) Onboarding spreadsheet bugs #38 (GH-2259), #44, and #45 Mar 9, 2021
@wlycdgr wlycdgr changed the title (CHANGES SUGGESTED) Onboarding spreadsheet bugs #38 (GH-2259), #44, and #45 Onboarding spreadsheet bugs #38 (GH-2259), #44, and #45 Mar 10, 2021
@wlycdgr
Copy link
Contributor

wlycdgr commented Mar 15, 2021

  • I made a render helper for the checkmark items in the option cards and started refactoring the code to use it - if you could finish that up that would be great

Done

@wlycdgr
Copy link
Contributor

wlycdgr commented Mar 15, 2021

  • Let's factor the isBasic, isPlus, and isPremium checks out to helpers. First cos they're duplicated in render and setDefaultPlan, but also we reduce chance of error nicely with the logic for these checks being a bit convoluted.

Done

… to avoid using setTimeout to setState in constructor
@wlycdgr
Copy link
Contributor

wlycdgr commented Mar 15, 2021

  • Speaking of setDefaultPlan - as far as I can tell from a combination of memory and double-checking just now, setTimeout is non-blocking, so with the code as it was, render would run before setDefaultPlan anyway (you can see this in action by setting readyToRender to true from the get-go and throwing in a couple consologs). To make sure we actually don't render until after setDefaultPlan has run after the timeout period, I added this readyToRender state variable that defaults to false and short-circuits render until it's set to true at the end of setDefaultPlan. Nothing to do here at the moment really, just wanted to point this out (ultimately though it'd be good to update the AccountReducer so that we have a way of distinguishing between 'no user' and 'user data not fetched yet').

Reworked to call setDefaultPlan() in componentDidMount() to avoid the hack of using setTimeout() to setState() "in" the constructor()

@wlycdgr
Copy link
Contributor

wlycdgr commented Mar 15, 2021

  • I took the liberty of making some additional adjustments to search selection modal logo sizes to better match the Zeplins, since that was on me to begin with. Let me know if you see that I screwed anything up and I'll fix.

Double checked that this looks ok, but a fresh pair of eyes would be appreciated

Copy link
Contributor

@leuryr leuryr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@wlycdgr wlycdgr changed the title Onboarding spreadsheet bugs #38 (GH-2259), #44, and #45 Onboarding spreadsheet bugs #38 (GH-2259), #44, and #45 (GH-2305) Mar 17, 2021
@wlycdgr wlycdgr changed the title Onboarding spreadsheet bugs #38 (GH-2259), #44, and #45 (GH-2305) Onboarding spreadsheet bugs #38 (GH-2259), #44 (GH-2306), and #45 (GH-2305) Mar 17, 2021
@christophertino christophertino merged commit d91b8fc into develop Mar 17, 2021
@christophertino christophertino deleted the misc-fixes branch March 17, 2021 18:00
chrmod pushed a commit that referenced this pull request Jul 28, 2022
…-2305) (#675)

* Expand toggle and select plus plan if user is basic and selects ghostery search

* Make ghostery glow icon bigger in select default search modal

* Move ghostery logo on search option selection container a little to the left

* Remove expansion by default

* Update logo sizes on choose default search view

* Adjust sizing for Yahoo, Startpage, and Bing logos in search selection modals to better match Zeplins

* Increase chance user object is available before choose plan view render. Show expanded view if user picked Glow to match expected UX. Add TODOs so we remember to update AccountReducer to help distinguish between no user present and user not fetched yet

* Factor out option card checkmark item rendering to a helper to reduce duplication.

* Update test snapshots

* Refactor choose plan view plan card feature copy rendering to a helper to reduce duplication

* Factor user status checks in select plan view out to helpers to reduce duplication and bug surface

* Move setting of default plan in plan select view to componentDidMount to avoid using setTimeout to setState in constructor

* Revised setDefaultPlan() logic in ChoosePlanView to make sure everything renders as expected when user is Plus or Premium

Co-authored-by: wlycdgr <ilya.zarembsky@gmail.com>
chrmod pushed a commit that referenced this pull request Jul 29, 2022
…-2305) (#675)

* Expand toggle and select plus plan if user is basic and selects ghostery search

* Make ghostery glow icon bigger in select default search modal

* Move ghostery logo on search option selection container a little to the left

* Remove expansion by default

* Update logo sizes on choose default search view

* Adjust sizing for Yahoo, Startpage, and Bing logos in search selection modals to better match Zeplins

* Increase chance user object is available before choose plan view render. Show expanded view if user picked Glow to match expected UX. Add TODOs so we remember to update AccountReducer to help distinguish between no user present and user not fetched yet

* Factor out option card checkmark item rendering to a helper to reduce duplication.

* Update test snapshots

* Refactor choose plan view plan card feature copy rendering to a helper to reduce duplication

* Factor user status checks in select plan view out to helpers to reduce duplication and bug surface

* Move setting of default plan in plan select view to componentDidMount to avoid using setTimeout to setState in constructor

* Revised setDefaultPlan() logic in ChoosePlanView to make sure everything renders as expected when user is Plus or Premium

Co-authored-by: wlycdgr <ilya.zarembsky@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants