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

Purchases: Revamp Cancellation Flow, take 1 (originally 93211) #94864

Closed
wants to merge 2 commits into from

Conversation

sirbrillig
Copy link
Member

@sirbrillig sirbrillig commented Sep 24, 2024

Proposed Changes

This PR refactors the purchase cancellation flow.

All the work was done originally by @Aurorum in #93211. This PR is just to move the branch to the calypso repo so that its strings can be translated (see #93211 (comment)).

However, because the other PR contained a merge commit, somehow that seems to have hidden large conflicts with #94213. I've tried my best to resolve them here but I'm not certain about some things.

Unresolved questions from the conflict:

I've started converting some of the files to TypeScript to help gain some confidence in the conflict resolution.

Copy link

github-actions bot commented Sep 24, 2024

Link to live branch is being generated...
Please wait a few minutes and refresh this page.

@sirbrillig sirbrillig force-pushed the update/cancel-purchase-page-93211 branch from bfa4815 to b66fff4 Compare September 24, 2024 22:45
@sirbrillig
Copy link
Member Author

@jjchrisdiehl I could use your help with some of the questions I ran into with the merge conflict.

@matticbot
Copy link
Contributor

This PR modifies the release build for the following Calypso Apps:

For info about this notification, see here: PCYsg-OT6-p2

  • blaze-dashboard
  • command-palette-wp-admin
  • happy-blocks
  • help-center
  • notifications
  • odyssey-stats
  • whats-new

To test WordPress.com changes, run install-plugin.sh $pluginSlug update/cancel-purchase-page-93211 on your sandbox.

@sirbrillig
Copy link
Member Author

From Slack discussions, @jjchrisdiehl and I have determined that:

  • siteUrl does not exist on the purchase object, so we should remove it entirely.
  • showSupportLink should remain and be false when the purchase is for a Jetpack (or I think any non-wpcom) product.

@sirbrillig sirbrillig changed the title Purchases: Revamp Cancellation Flow (originally 93211) Purchases: Revamp Cancellation Flow, take 1 (originally 93211) Oct 1, 2024
@sirbrillig
Copy link
Member Author

There may have been some errors getting the original branch right. I'm trying again in #95065

@sirbrillig sirbrillig closed this Oct 1, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants