Skip to content

Conversation

@chrismccluskey
Copy link
Contributor

@chrismccluskey chrismccluskey commented Nov 19, 2025

Fixes SHILL-1308

Proposed Changes

  • Ensure the "skip" link shows when it is relevant, for all products.
  • Restore "Remove plan step" functionality if the customer has already submitted a survey (prevents the survey from being shown and instead just asks if they want to remove the plan or keep it.
  • Replace the first page that would normally show cancellation features with the remove plan page if the survey has been completed already.

Why are these changes being made?

  • The "skip" link was not appearing when expected due to the first step being the last step when only one step is present.
  • The cancel and remove flow requires going through the marketing survey twice when it was already submitted the first time.

Testing Instructions

Test "skip" functionality.

  • Visit /v2/me/billing/purchases and click "manage purchase" for an active purchase that is outside of the refund window. (Refunds will cancel and remove - we'd like to test those flows separately to make sure the preference is set and received correctly).
  • Append /cancel to the end of URL and view the resulting page.
  • After clicking the checkbox and advancing to the next page, click "skip" and make sure the purchase is cancelled and you are returned to the manage purchase page.
  • Click back into the same purchase and append /cancel to the URL as before.
  • After clicking the checkbox and advancing to the next page, ensure you are given the survey. Complete the survey and you should be returned to the manage purchase page, your purchase now removed.

Test skipping survey on remove if submitted on cancel

  • Visit /v2/me/billing/purchases and click "manage purchase" for an active WPCom plan purchase that is outside of the refund window. (Refunds will cancel and remove - we'd like to test those flows separately to make sure the preference is set and received correctly).
  • Append /cancel to the end of URL and view the resulting page.
  • After clicking the checkbox and advancing to the next page, complete the survey and confirm the purchase has been cancelled.
  • Click back into the same purchase and append /cancel to the URL as before.
  • After clicking, the remove product plan should contain only a couple sentences with two buttons asking if the user wants to "Submit" or "Keep plan". Clicking "Submit" should remove the plan without asking the user to complete a survey.

Pre-merge Checklist

  • Has the general commit checklist been followed? (PCYsg-hS-p2)
  • Have you written new tests for your changes?
  • Have you tested the feature in Simple (P9HQHe-k8-p2), Atomic (P9HQHe-jW-p2), and self-hosted Jetpack sites (PCYsg-g6b-p2)?
  • Have you checked for TypeScript, React or other console errors?
  • Have you tested accessibility for your changes? Ensure the feature remains usable with various user agents (e.g., browsers), interfaces (e.g., keyboard navigation), and assistive technologies (e.g., screen readers) (PCYsg-S3g-p2).
  • Have you used memoizing on expensive computations? More info in Memoizing with create-selector and Using memoizing selectors and Our Approach to Data
  • Have we added the "[Status] String Freeze" label as soon as any new strings were ready for translation (p4TIVU-5Jq-p2)?
    • For UI changes, have we tested the change in various languages (for example, ES, PT, FR, or DE)? The length of text and words vary significantly between languages.
  • For changes affecting Jetpack: Have we added the "[Status] Needs Privacy Updates" label if this pull request changes what data or activity we track or use (p4TIVU-aUh-p2)?

@chrismccluskey chrismccluskey marked this pull request as ready for review November 19, 2025 00:17
@chrismccluskey chrismccluskey requested review from a team as code owners November 19, 2025 00:17
@matticbot matticbot added the [Status] Needs Review The PR is ready for review. This also triggers e2e canary tests and wp-desktop tests automatically. label Nov 19, 2025
@sirbrillig sirbrillig changed the title MSD Billing: Fix cancel skip link rendering and skip survey if alread… MSD Billing: Fix cancel skip link rendering and skip survey if already sent Nov 19, 2025
@sirbrillig sirbrillig changed the title MSD Billing: Fix cancel skip link rendering and skip survey if already sent MSD Billing: Fix cancel skip link and skip survey if already sent Nov 19, 2025
Copy link
Member

@sirbrillig sirbrillig left a comment

Choose a reason for hiding this comment

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

Seems to work!

@chrismccluskey chrismccluskey merged commit 6ab2845 into trunk Nov 19, 2025
15 of 17 checks passed
@chrismccluskey chrismccluskey deleted the fix/msd-skip-link-should-appear-on-cancel-flow-for-all-products branch November 19, 2025 18:45
@github-actions github-actions bot removed the [Status] Needs Review The PR is ready for review. This also triggers e2e canary tests and wp-desktop tests automatically. label Nov 19, 2025
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.

4 participants