Skip to content

Conversation

dsas
Copy link
Contributor

@dsas dsas commented Oct 17, 2025

Part of DOTCOM-14978

Proposed Changes

This change updates the new billing dashboard as well as the overview plan card for free sites to point to /setup/plan-upgrade

Why are these changes being made?

So that the user can choose the plan on the distraction-less plans-grid rather than the old grid presented in the site context.

Testing Instructions

Billing Dashboard

  1. Use the calypso live link in the comment below
  2. Go to /v2/sites/
  3. Choose a site on a paid plan
  4. Click on the Plan card at the right of the site overview
  5. You should find yourself on the billing dashboard for that purchase
  6. Click on the two upgrade links, you should find yourself at the distraction-less plans-grid.
Screen.Recording.2025-10-17.at.15.37.59.mov

Site overview

  1. Use the calypso live link in the comment below
  2. Go to /v2/sites/
  3. Choose a site on the free plan
  4. Click on the Plan card at the right of the site overview
  5. You should find yourself at the distraction-less plans-grid
Screen.Recording.2025-10-17.at.15.35.54.mov

To be thorough, test also with other sites/purchases e.g. a Jetpack plan.

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)?

This change updates the new billing dashboard as well as the overview
plan card for free sites to point to /setup/plan-upgrade so that the
user can choose the plan on the distraction-less plans-grid.
@dsas dsas self-assigned this Oct 17, 2025
Copy link

github-actions bot commented Oct 17, 2025

@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

  • help-center
  • notifications
  • wpcom-block-editor

To test WordPress.com changes, run install-plugin.sh $pluginSlug dotcom-14978-point-upgrade-billing-links-to-distraction-free-plans-flow on your sandbox.

Comment on lines +133 to +135
if ( purchase.is_plan ) {
return getWpcomPlanGridUrl( purchase.site_slug );
}
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm not 100% sure that this is the best way to detect "This is a wpcom plan". Any tips @brandonpayton ?

@dsas dsas marked this pull request as ready for review October 17, 2025 18:39
@dsas dsas requested a review from a team as a code owner October 17, 2025 18:39
@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 Oct 17, 2025

return `/plans/${ purchase.site_slug }`;
if ( purchase.is_jetpack_plan_or_product ) {
return `/plans/${ purchase.site_slug }`;
Copy link
Contributor Author

@dsas dsas Oct 17, 2025

Choose a reason for hiding this comment

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

I think this is a separate issue that I'll open on Monday, but mentioning here for now because I came across it while testing.

I don't think we should be linking to /plans for Jetpack sites. It looks ugly to the point of brokenness:
Screenshot 2025-10-17 at 19 48 56

Currently we don't link to this page from anywhere - it's not in the navigation, it's not in /sites and it's not on the existing purchase page.

The existing purchase page seems to link to different things for different Jetpack plans e.g. Jetpack Growth links to checkout for Jetpack Complete, and Jetpack Security links to /plans/storage/:siteSlug. I guess we need to use the same logic here for Jetpack plans.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

[Status] Needs Review The PR is ready for review. This also triggers e2e canary tests and wp-desktop tests automatically.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants