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

workaround for travis builds failing #45

Merged
merged 1 commit into from Apr 23, 2018

Conversation

@trickpattyFH20
Copy link
Contributor

@trickpattyFH20 trickpattyFH20 commented Apr 23, 2018

workaround for browser-core integrity check

@trickpattyFH20 trickpattyFH20 requested a review from ghostery/ghostery as a code owner Apr 23, 2018
@trickpattyFH20
Copy link
Contributor Author

@trickpattyFH20 trickpattyFH20 commented Apr 23, 2018

#40 should be synced with develop after this is merged in order for the build to pass

@jsignanini jsignanini merged commit 5fa827f into ghostery:develop Apr 23, 2018
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
christophertino pushed a commit that referenced this pull request Mar 17, 2021
…-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
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants