Skip to content

Plans logged in: Disable upgrade button if not the owner #106076

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.

Sign up for GitHub

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

Open
wants to merge 3 commits into
base: trunk
Choose a base branch
from
Open

Plans logged in: Disable upgrade button if not the owner #106076

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8466e0a
Disable upgrade button
escapemanuele Sep 26, 2025
b9768a3
Merge branch 'trunk' into DOTSUP-298/help-center-improve-upgrade-flow…
escapemanuele Oct 2, 2025
4f8eba9
Make the notice warning and dark
escapemanuele Oct 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions client/my-sites/plans-features-main/components/plan-notice.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,8 @@ export default function PlanNotice( props: PlanNoticeProps ) {
showDismiss
onDismissClick={ handleDismissNotice }
icon="info-outline"
status="is-success"
theme="light"
status="is-warning"
theme="dark"
>
{ translate(
'This plan was purchased by a different WordPress.com account. To manage this plan, log in to that account or contact the account owner.'
Expand Down
13 changes: 10 additions & 3 deletions client/my-sites/plans-features-main/hooks/use-generate-action-hook.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,8 @@ function getLoggedInPlansAction( {
const createLoggedInPlansAction = (
text: TranslateResult,
variant: GridAction[ 'primary' ][ 'variant' ] = 'primary',
ariaLabel?: TranslateResult
ariaLabel?: TranslateResult,
status?: GridAction[ 'primary' ][ 'status' ]
) => ( {
primary: {
callback: async () => {
Expand All @@ -428,7 +429,8 @@ function getLoggedInPlansAction( {
setIsLoading( false );
return;
},
status: ( isLoading ? 'blocked' : 'enabled' ) as GridAction[ 'primary' ][ 'status' ],
status:
status ?? ( ( isLoading ? 'blocked' : 'enabled' ) as GridAction[ 'primary' ][ 'status' ] ),
text,
ariaLabel,
variant,
Expand Down Expand Up @@ -565,5 +567,10 @@ function getLoggedInPlansAction( {
);
}

return createLoggedInPlansAction( translate( 'Upgrade', { context: 'verb' } ) );
return createLoggedInPlansAction(
translate( 'Upgrade', { context: 'verb' } ),
'primary',
undefined,
canUserManageCurrentPlan ? undefined : 'disabled'
);
}