Skip to content

Single product: update post-purchase card#15016

Merged
gibrown merged 2 commits intoadd/search-planfrom
update/single-product-cards
Mar 24, 2020
Merged

Single product: update post-purchase card#15016
gibrown merged 2 commits intoadd/search-planfrom
update/single-product-cards

Conversation

@keoshi
Copy link
Copy Markdown
Contributor

@keoshi keoshi commented Mar 17, 2020 •
edited
Loading

Fixes issue reported in #15011 (review)

Changes proposed in this Pull Request:

  • Updates single product cards on post-purchase.

Currently, the header for the existing single product block changes format depending if pre or post-purchase. This creates an inconsistent UI when used side by side with other single products like Search on #15011.

Note: this PR was very roughly put together to reach an acceptable visual solution. Code might not be up to par, hence the In Progress label.

Before

image

After

image

Is this a new feature or does it add/remove features to an existing part of Jetpack?

  • No.

Testing instructions:

  • Fire up this branch.
  • Go to /wp-admin/admin.php?page=jetpack#/plans and ensure pre-purchase single product block looks good.
  • Purchase a Premium plan or any Backup solution.
  • Go to /wp-admin/admin.php?page=jetpack#/plans again and ensure post-purchase single product block looks good.

Proposed changelog entry for your changes:

  • None.

@keoshi keoshi added [Status] In Progress [Status] Needs Review This PR is ready for review. [Status] Needs Design Review Design has been added. Needs a review! Plans labels Mar 17, 2020
@keoshi keoshi requested review from a team, ChaosExAnima, eeeeevon13 and robertf4 March 17, 2020 15:48
@keoshi keoshi self-assigned this Mar 17, 2020
@keoshi keoshi mentioned this pull request Mar 17, 2020
Merged
@jetpackbot
Copy link
Copy Markdown
Collaborator

jetpackbot commented Mar 17, 2020

Thank you for the great PR description!

When this PR is ready for review, please apply the [Status] Needs Review label. If you are an a11n, please have someone from your team review the code if possible. The Jetpack team will also review this PR and merge it to be included in the next Jetpack release.

Scheduled Jetpack release: April 7, 2020.
Scheduled code freeze: March 31, 2020

Generated by 🚫 dangerJS against 24aeb33b543b660926496a0731183906708f956f

@folletto
Copy link
Copy Markdown
Contributor

folletto commented Mar 17, 2020

Design wise, good change. Thanks 👍

@folletto folletto removed the [Status] Needs Design Review Design has been added. Needs a review! label Mar 17, 2020
@eeeeevon13
Copy link
Copy Markdown
Contributor

eeeeevon13 commented Mar 17, 2020

Looks good to me 👍

@jsnmoon
Copy link
Copy Markdown
Contributor

jsnmoon commented Mar 17, 2020

@keoshi You might want to merge into add/search-plan instead of master so we can stage all the Plans changes in the former :)

@keoshi keoshi changed the base branch from master to add/search-plan March 17, 2020 21:18
@keoshi
Copy link
Copy Markdown
Contributor Author

keoshi commented Mar 17, 2020

@jsnmoon Changed the base but I hadn't done that before and I'm afraid I broke something because this now includes a bunch of unrelated changes. Should I revert? What the best alternative here? And apologies in advance for bugging you with this.

@jsnmoon
Copy link
Copy Markdown
Contributor

jsnmoon commented Mar 17, 2020 •
edited
Loading

Happens all the time :)

An easy way to fix this would be to create a new branch off of add/search-plan, cherry-pick the changes you've made here, and force push onto update/single-product-cards.

Let me go ahead and do this now.

EDIT: Done!

@jsnmoon jsnmoon force-pushed the update/single-product-cards branch from 24aeb33 to 5ff5793 Compare March 17, 2020 22:04
@keoshi keoshi added [Status] Needs Design Review Design has been added. Needs a review! and removed [Status] In Progress [Status] Needs Design Review Design has been added. Needs a review! labels Mar 17, 2020
gibrown
gibrown approved these changes Mar 24, 2020
View reviewed changes
Copy link
Copy Markdown
Member

@gibrown gibrown left a comment

Choose a reason for hiding this comment

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

LGTM

@gibrown gibrown merged commit 100eba6 into add/search-plan Mar 24, 2020
@gibrown gibrown deleted the update/single-product-cards branch March 24, 2020 17:54
@matticbot matticbot added [Status] Needs Changelog and removed [Status] Needs Review This PR is ready for review. labels Mar 24, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@gibrown gibrown gibrown approved these changes

@ChaosExAnima ChaosExAnima Awaiting requested review from ChaosExAnima

@robertf4 robertf4 Awaiting requested review from robertf4

@eeeeevon13 eeeeevon13 Awaiting requested review from eeeeevon13

Assignees

@keoshi keoshi

Labels

Plans

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@keoshi @jetpackbot @folletto @eeeeevon13 @jsnmoon @gibrown @jeherve @matticbot