Dashboard: Show expired plan banner and disable Manage store for CIAB sites#109632
Open
valterlorran wants to merge 4 commits intotrunkfrom
Open
Dashboard: Show expired plan banner and disable Manage store for CIAB sites#109632valterlorran wants to merge 4 commits intotrunkfrom
valterlorran wants to merge 4 commits intotrunkfrom
Conversation
Jetpack Cloud Live (direct link)
Automattic for Agencies Live (direct link)
Dashboard Live (dotcom) (direct link)
|
Contributor
|
This PR modifies the release build for the following Calypso Apps: For info about this notification, see here: PCYsg-OT6-p2
To test WordPress.com changes, run |
atanas-dev
reviewed
Mar 27, 2026
Member
atanas-dev
left a comment
There was a problem hiding this comment.
Looks good, but there's a small case that's not handled
fushar
reviewed
Mar 30, 2026
| dashboard: getCurrentDashboard(), | ||
| } ); | ||
|
|
||
| const gracePeriodDate = purchase?.expiry_date |
Contributor
There was a problem hiding this comment.
It seems dangerous to hardcode the grace period logic here 🤔 I feel this should use / be consolidated with the logic in
cc: @Automattic/shilling ?
Contributor
Author
There was a problem hiding this comment.
Yep, I was planning to improve this in a next iteration, but I will check the file you mentioned.
fushar
reviewed
Mar 30, 2026
…or CIAB sites When a CIAB site's plan expires, show a warning banner in the site overview with the grace period deadline (expiry + 30 days) and a Get a plan CTA. The Manage store button is also disabled.
da70136 to
18ace01
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Proposed Changes
Why are these changes being made?
When a CIAB site's plan expires, users need a clear indication that their store is no longer active and a path to reactivate it before permanent deletion. The disabled button prevents navigating to a non-functional store admin.
Testing Instructions
/sites/<slug>)./setup/woo-hosted-plans.Pre-merge Checklist