Skip to content

fix(ui): Factor in isDefault into isSwitchable - #8077

Merged
dstaley merged 1 commit into
mainfrom
ds.fix/isdefault-isswitchable
Mar 18, 2026
Merged

fix(ui): Factor in isDefault into isSwitchable#8077
dstaley merged 1 commit into
mainfrom
ds.fix/isdefault-isswitchable

Conversation

@dstaley

@dstaleydstaley commented Mar 13, 2026

Copy link
Copy Markdown
Member

Description

This PR fixes an issue where the Switch to annual button was being rendered for default plans.

Checklist

  • pnpm test runs as expected.
  • pnpm build runs as expected.
  • (If applicable) JSDoc comments have been added or updated for any package exports
  • (If applicable) Documentation has been updated

Type of change

  • 🐛 Bug fix
  • 🌟 New feature
  • 🔨 Breaking change
  • 📖 Refactoring / dependency upgrade / documentation
  • other:

Summary by CodeRabbit

  • Bug Fixes
    • Restricted plan switching eligibility to prevent unintended changes for default and annual plans without active fees.

@dstaley
dstaley requested a review from a teamMarch 13, 2026 19:39
@vercel

vercelBot commented Mar 13, 2026

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

ProjectDeploymentActionsUpdated (UTC)
clerk-js-sandboxReadyReadyPreview, CommentMar 13, 2026 7:40pm

Request Review

@changeset-bot

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: 93454b1

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 2 packages
NameType
@clerk/uiPatch
@clerk/chrome-extensionPatch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@pkg-pr-new

Copy link
Copy Markdown

Open in StackBlitz

@clerk/agent-toolkit

npm i https://pkg.pr.new/@clerk/agent-toolkit@8077

@clerk/astro

npm i https://pkg.pr.new/@clerk/astro@8077

@clerk/backend

npm i https://pkg.pr.new/@clerk/backend@8077

@clerk/chrome-extension

npm i https://pkg.pr.new/@clerk/chrome-extension@8077

@clerk/clerk-js

npm i https://pkg.pr.new/@clerk/clerk-js@8077

@clerk/dev-cli

npm i https://pkg.pr.new/@clerk/dev-cli@8077

@clerk/expo

npm i https://pkg.pr.new/@clerk/expo@8077

@clerk/expo-passkeys

npm i https://pkg.pr.new/@clerk/expo-passkeys@8077

@clerk/express

npm i https://pkg.pr.new/@clerk/express@8077

@clerk/fastify

npm i https://pkg.pr.new/@clerk/fastify@8077

@clerk/hono

npm i https://pkg.pr.new/@clerk/hono@8077

@clerk/localizations

npm i https://pkg.pr.new/@clerk/localizations@8077

@clerk/nextjs

npm i https://pkg.pr.new/@clerk/nextjs@8077

@clerk/nuxt

npm i https://pkg.pr.new/@clerk/nuxt@8077

@clerk/react

npm i https://pkg.pr.new/@clerk/react@8077

@clerk/react-router

npm i https://pkg.pr.new/@clerk/react-router@8077

@clerk/shared

npm i https://pkg.pr.new/@clerk/shared@8077

@clerk/tanstack-react-start

npm i https://pkg.pr.new/@clerk/tanstack-react-start@8077

@clerk/testing

npm i https://pkg.pr.new/@clerk/testing@8077

@clerk/ui

npm i https://pkg.pr.new/@clerk/ui@8077

@clerk/upgrade

npm i https://pkg.pr.new/@clerk/upgrade@8077

@clerk/vue

npm i https://pkg.pr.new/@clerk/vue@8077

commit: 93454b1

@coderabbitai

Copy link
Copy Markdown
Contributor
📝 Walkthrough

Walkthrough

This pull request adds a changeset entry for @clerk/ui with a patch version bump and modifies the SubscriptionCardActions isSwitchable logic in the SubscriptionDetails component. The changes add two guards to the switching plan eligibility criteria: a check to prevent switching for default plans (subscription.plan.isDefault must be false) and a requirement that annual plans must have a fee present (subscription.plan.fee) to be switchable. The existing month-based switch logic and past_due exclusion are preserved.

🚥 Pre-merge checks | ✅ 3
✅ Passed checks (3 passed)
Check nameStatusExplanation
Description Check✅ PassedCheck skipped - CodeRabbit’s high-level summary is enabled.
Title check✅ PassedThe title clearly and specifically summarizes the main change: adding isDefault as a factor in the isSwitchable logic to prevent switching default plans.
Docstring Coverage✅ PassedNo functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

📝 Coding Plan
  • Generate coding plan for human review comments

Comment @coderabbitai help to get the list of available commands and usage tips.

@coderabbitaicoderabbitaiBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In `@packages/ui/src/components/SubscriptionDetails/index.tsx`:
- Around line 378-380: Add unit tests for the new isSwitchable logic in
SubscriptionDetails (locate usage/definition around the isSwitchable/plan switch
guard in SubscriptionDetails/index.tsx) to cover three cases: a subscription
with plan.isDefault === true (should not be switchable), a subscription with
planPeriod === 'annual' but plan.fee falsy (should not be switchable), and a
valid non-default, non-past_due, switchable subscription (should be switchable);
place tests alongside existing SubscriptionDetails tests, asserting the
component or exported isSwitchable helper returns the expected boolean for each
scenario and include these new tests before merging.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Organization UI (inherited)

Review profile: ASSERTIVE

Plan: Pro

Run ID: 7037e44f-54f1-47e5-8093-da7b3623b21a

📥 Commits

Reviewing files that changed from the base of the PR and between 154eec9 and 93454b1.

📒 Files selected for processing (2)
  • .changeset/witty-knives-ask.md
  • packages/ui/src/components/SubscriptionDetails/index.tsx

Comment on lines +378 to +380
(subscription.planPeriod === 'annual' && Boolean(subscription.plan.fee))) &&
subscription.status !== 'past_due' &&
!subscription.plan.isDefault;

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🟠 Major

Add regression tests for the new isSwitchable guards before merge.

Line 378-Line 380 changes switch eligibility (annual fee and !isDefault) but no tests were added/updated in this PR. Please add coverage for: default plan (not switchable), annual without fee (not switchable), and valid non-default switchable cases.

As per coding guidelines, "If there are no tests added or modified as part of the PR, please suggest that tests be added to cover the changes."

🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In `@packages/ui/src/components/SubscriptionDetails/index.tsx` around lines 378 -
380, Add unit tests for the new isSwitchable logic in SubscriptionDetails
(locate usage/definition around the isSwitchable/plan switch guard in
SubscriptionDetails/index.tsx) to cover three cases: a subscription with
plan.isDefault === true (should not be switchable), a subscription with
planPeriod === 'annual' but plan.fee falsy (should not be switchable), and a
valid non-default, non-past_due, switchable subscription (should be switchable);
place tests alongside existing SubscriptionDetails tests, asserting the
component or exported isSwitchable helper returns the expected boolean for each
scenario and include these new tests before merging.

((subscription.planPeriod === 'month' && Boolean(subscription.plan.annualMonthlyFee)) ||
subscription.planPeriod === 'annual') &&
subscription.status !== 'past_due';
(subscription.planPeriod === 'annual' && Boolean(subscription.plan.fee))) &&

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

We're storing the amount for an annual plan inside of the fee?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

This is for switching between periods. That line reads "if the current subscription is an annual subscription and the plan has a monthly fee, allow switching from annual to monthly".

@dstaley
dstaley merged commit ac2f1c1 into mainMar 18, 2026
43 checks passed
@dstaley
dstaley deleted the ds.fix/isdefault-isswitchable branch March 18, 2026 21:51
This was referenced Mar 18, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@dstaley@aeliox@l-armstrong
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
fix(ui): Factor in isDefault into isSwitchable by dstaley · Pull Request #8077 · clerk/javascript · GitHub
Skip to content

fix(ui): Factor in isDefault into isSwitchable - #8077

Merged
dstaley merged 1 commit into
mainfrom
ds.fix/isdefault-isswitchable
Mar 18, 2026
Merged

fix(ui): Factor in isDefault into isSwitchable#8077
dstaley merged 1 commit into
mainfrom
ds.fix/isdefault-isswitchable

Conversation

@dstaley

@dstaleydstaley commented Mar 13, 2026

Copy link
Copy Markdown
Member

Description

This PR fixes an issue where the Switch to annual button was being rendered for default plans.

Checklist

  • pnpm test runs as expected.
  • pnpm build runs as expected.
  • (If applicable) JSDoc comments have been added or updated for any package exports
  • (If applicable) Documentation has been updated

Type of change

  • 🐛 Bug fix
  • 🌟 New feature
  • 🔨 Breaking change
  • 📖 Refactoring / dependency upgrade / documentation
  • other:

Summary by CodeRabbit

  • Bug Fixes
    • Restricted plan switching eligibility to prevent unintended changes for default and annual plans without active fees.

@dstaley
dstaley requested a review from a teamMarch 13, 2026 19:39
@vercel

vercelBot commented Mar 13, 2026

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

ProjectDeploymentActionsUpdated (UTC)
clerk-js-sandboxReadyReadyPreview, CommentMar 13, 2026 7:40pm

Request Review

@changeset-bot

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: 93454b1

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 2 packages
NameType
@clerk/uiPatch
@clerk/chrome-extensionPatch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@pkg-pr-new

Copy link
Copy Markdown

Open in StackBlitz

@clerk/agent-toolkit

npm i https://pkg.pr.new/@clerk/agent-toolkit@8077

@clerk/astro

npm i https://pkg.pr.new/@clerk/astro@8077

@clerk/backend

npm i https://pkg.pr.new/@clerk/backend@8077

@clerk/chrome-extension

npm i https://pkg.pr.new/@clerk/chrome-extension@8077

@clerk/clerk-js

npm i https://pkg.pr.new/@clerk/clerk-js@8077

@clerk/dev-cli

npm i https://pkg.pr.new/@clerk/dev-cli@8077

@clerk/expo

npm i https://pkg.pr.new/@clerk/expo@8077

@clerk/expo-passkeys

npm i https://pkg.pr.new/@clerk/expo-passkeys@8077

@clerk/express

npm i https://pkg.pr.new/@clerk/express@8077

@clerk/fastify

npm i https://pkg.pr.new/@clerk/fastify@8077

@clerk/hono

npm i https://pkg.pr.new/@clerk/hono@8077

@clerk/localizations

npm i https://pkg.pr.new/@clerk/localizations@8077

@clerk/nextjs

npm i https://pkg.pr.new/@clerk/nextjs@8077

@clerk/nuxt

npm i https://pkg.pr.new/@clerk/nuxt@8077

@clerk/react

npm i https://pkg.pr.new/@clerk/react@8077

@clerk/react-router

npm i https://pkg.pr.new/@clerk/react-router@8077

@clerk/shared

npm i https://pkg.pr.new/@clerk/shared@8077

@clerk/tanstack-react-start

npm i https://pkg.pr.new/@clerk/tanstack-react-start@8077

@clerk/testing

npm i https://pkg.pr.new/@clerk/testing@8077

@clerk/ui

npm i https://pkg.pr.new/@clerk/ui@8077

@clerk/upgrade

npm i https://pkg.pr.new/@clerk/upgrade@8077

@clerk/vue

npm i https://pkg.pr.new/@clerk/vue@8077

commit: 93454b1

@coderabbitai

Copy link
Copy Markdown
Contributor
📝 Walkthrough

Walkthrough

This pull request adds a changeset entry for @clerk/ui with a patch version bump and modifies the SubscriptionCardActions isSwitchable logic in the SubscriptionDetails component. The changes add two guards to the switching plan eligibility criteria: a check to prevent switching for default plans (subscription.plan.isDefault must be false) and a requirement that annual plans must have a fee present (subscription.plan.fee) to be switchable. The existing month-based switch logic and past_due exclusion are preserved.

🚥 Pre-merge checks | ✅ 3
✅ Passed checks (3 passed)
Check nameStatusExplanation
Description Check✅ PassedCheck skipped - CodeRabbit’s high-level summary is enabled.
Title check✅ PassedThe title clearly and specifically summarizes the main change: adding isDefault as a factor in the isSwitchable logic to prevent switching default plans.
Docstring Coverage✅ PassedNo functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

📝 Coding Plan
  • Generate coding plan for human review comments

Comment @coderabbitai help to get the list of available commands and usage tips.

@coderabbitaicoderabbitaiBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In `@packages/ui/src/components/SubscriptionDetails/index.tsx`:
- Around line 378-380: Add unit tests for the new isSwitchable logic in
SubscriptionDetails (locate usage/definition around the isSwitchable/plan switch
guard in SubscriptionDetails/index.tsx) to cover three cases: a subscription
with plan.isDefault === true (should not be switchable), a subscription with
planPeriod === 'annual' but plan.fee falsy (should not be switchable), and a
valid non-default, non-past_due, switchable subscription (should be switchable);
place tests alongside existing SubscriptionDetails tests, asserting the
component or exported isSwitchable helper returns the expected boolean for each
scenario and include these new tests before merging.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Organization UI (inherited)

Review profile: ASSERTIVE

Plan: Pro

Run ID: 7037e44f-54f1-47e5-8093-da7b3623b21a

📥 Commits

Reviewing files that changed from the base of the PR and between 154eec9 and 93454b1.

📒 Files selected for processing (2)
  • .changeset/witty-knives-ask.md
  • packages/ui/src/components/SubscriptionDetails/index.tsx

Comment on lines +378 to +380
(subscription.planPeriod === 'annual' && Boolean(subscription.plan.fee))) &&
subscription.status !== 'past_due' &&
!subscription.plan.isDefault;

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🟠 Major

Add regression tests for the new isSwitchable guards before merge.

Line 378-Line 380 changes switch eligibility (annual fee and !isDefault) but no tests were added/updated in this PR. Please add coverage for: default plan (not switchable), annual without fee (not switchable), and valid non-default switchable cases.

As per coding guidelines, "If there are no tests added or modified as part of the PR, please suggest that tests be added to cover the changes."

🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In `@packages/ui/src/components/SubscriptionDetails/index.tsx` around lines 378 -
380, Add unit tests for the new isSwitchable logic in SubscriptionDetails
(locate usage/definition around the isSwitchable/plan switch guard in
SubscriptionDetails/index.tsx) to cover three cases: a subscription with
plan.isDefault === true (should not be switchable), a subscription with
planPeriod === 'annual' but plan.fee falsy (should not be switchable), and a
valid non-default, non-past_due, switchable subscription (should be switchable);
place tests alongside existing SubscriptionDetails tests, asserting the
component or exported isSwitchable helper returns the expected boolean for each
scenario and include these new tests before merging.

((subscription.planPeriod === 'month' && Boolean(subscription.plan.annualMonthlyFee)) ||
subscription.planPeriod === 'annual') &&
subscription.status !== 'past_due';
(subscription.planPeriod === 'annual' && Boolean(subscription.plan.fee))) &&

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

We're storing the amount for an annual plan inside of the fee?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

This is for switching between periods. That line reads "if the current subscription is an annual subscription and the plan has a monthly fee, allow switching from annual to monthly".

@dstaley
dstaley merged commit ac2f1c1 into mainMar 18, 2026
43 checks passed
@dstaley
dstaley deleted the ds.fix/isdefault-isswitchable branch March 18, 2026 21:51
This was referenced Mar 18, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@dstaley@aeliox@l-armstrong
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix(ui): Factor in isDefault into isSwitchable by dstaley · Pull Request #8077 · clerk/javascript · GitHub
Skip to content

fix(ui): Factor in isDefault into isSwitchable - #8077

Merged
dstaley merged 1 commit into
mainfrom
ds.fix/isdefault-isswitchable
Mar 18, 2026
Merged

fix(ui): Factor in isDefault into isSwitchable#8077
dstaley merged 1 commit into
mainfrom
ds.fix/isdefault-isswitchable

Conversation

@dstaley

@dstaleydstaley commented Mar 13, 2026

Copy link
Copy Markdown
Member

Description

This PR fixes an issue where the Switch to annual button was being rendered for default plans.

Checklist

  • pnpm test runs as expected.
  • pnpm build runs as expected.
  • (If applicable) JSDoc comments have been added or updated for any package exports
  • (If applicable) Documentation has been updated

Type of change

  • 🐛 Bug fix
  • 🌟 New feature
  • 🔨 Breaking change
  • 📖 Refactoring / dependency upgrade / documentation
  • other:

Summary by CodeRabbit

  • Bug Fixes
    • Restricted plan switching eligibility to prevent unintended changes for default and annual plans without active fees.

@dstaley
dstaley requested a review from a teamMarch 13, 2026 19:39
@vercel

vercelBot commented Mar 13, 2026

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

ProjectDeploymentActionsUpdated (UTC)
clerk-js-sandboxReadyReadyPreview, CommentMar 13, 2026 7:40pm

Request Review

@changeset-bot

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: 93454b1

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 2 packages
NameType
@clerk/uiPatch
@clerk/chrome-extensionPatch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@pkg-pr-new

Copy link
Copy Markdown

Open in StackBlitz

@clerk/agent-toolkit

npm i https://pkg.pr.new/@clerk/agent-toolkit@8077

@clerk/astro

npm i https://pkg.pr.new/@clerk/astro@8077

@clerk/backend

npm i https://pkg.pr.new/@clerk/backend@8077

@clerk/chrome-extension

npm i https://pkg.pr.new/@clerk/chrome-extension@8077

@clerk/clerk-js

npm i https://pkg.pr.new/@clerk/clerk-js@8077

@clerk/dev-cli

npm i https://pkg.pr.new/@clerk/dev-cli@8077

@clerk/expo

npm i https://pkg.pr.new/@clerk/expo@8077

@clerk/expo-passkeys

npm i https://pkg.pr.new/@clerk/expo-passkeys@8077

@clerk/express

npm i https://pkg.pr.new/@clerk/express@8077

@clerk/fastify

npm i https://pkg.pr.new/@clerk/fastify@8077

@clerk/hono

npm i https://pkg.pr.new/@clerk/hono@8077

@clerk/localizations

npm i https://pkg.pr.new/@clerk/localizations@8077

@clerk/nextjs

npm i https://pkg.pr.new/@clerk/nextjs@8077

@clerk/nuxt

npm i https://pkg.pr.new/@clerk/nuxt@8077

@clerk/react

npm i https://pkg.pr.new/@clerk/react@8077

@clerk/react-router

npm i https://pkg.pr.new/@clerk/react-router@8077

@clerk/shared

npm i https://pkg.pr.new/@clerk/shared@8077

@clerk/tanstack-react-start

npm i https://pkg.pr.new/@clerk/tanstack-react-start@8077

@clerk/testing

npm i https://pkg.pr.new/@clerk/testing@8077

@clerk/ui

npm i https://pkg.pr.new/@clerk/ui@8077

@clerk/upgrade

npm i https://pkg.pr.new/@clerk/upgrade@8077

@clerk/vue

npm i https://pkg.pr.new/@clerk/vue@8077

commit: 93454b1

@coderabbitai

Copy link
Copy Markdown
Contributor
📝 Walkthrough

Walkthrough

This pull request adds a changeset entry for @clerk/ui with a patch version bump and modifies the SubscriptionCardActions isSwitchable logic in the SubscriptionDetails component. The changes add two guards to the switching plan eligibility criteria: a check to prevent switching for default plans (subscription.plan.isDefault must be false) and a requirement that annual plans must have a fee present (subscription.plan.fee) to be switchable. The existing month-based switch logic and past_due exclusion are preserved.

🚥 Pre-merge checks | ✅ 3
✅ Passed checks (3 passed)
Check nameStatusExplanation
Description Check✅ PassedCheck skipped - CodeRabbit’s high-level summary is enabled.
Title check✅ PassedThe title clearly and specifically summarizes the main change: adding isDefault as a factor in the isSwitchable logic to prevent switching default plans.
Docstring Coverage✅ PassedNo functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

📝 Coding Plan
  • Generate coding plan for human review comments

Comment @coderabbitai help to get the list of available commands and usage tips.

@coderabbitaicoderabbitaiBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In `@packages/ui/src/components/SubscriptionDetails/index.tsx`:
- Around line 378-380: Add unit tests for the new isSwitchable logic in
SubscriptionDetails (locate usage/definition around the isSwitchable/plan switch
guard in SubscriptionDetails/index.tsx) to cover three cases: a subscription
with plan.isDefault === true (should not be switchable), a subscription with
planPeriod === 'annual' but plan.fee falsy (should not be switchable), and a
valid non-default, non-past_due, switchable subscription (should be switchable);
place tests alongside existing SubscriptionDetails tests, asserting the
component or exported isSwitchable helper returns the expected boolean for each
scenario and include these new tests before merging.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Organization UI (inherited)

Review profile: ASSERTIVE

Plan: Pro

Run ID: 7037e44f-54f1-47e5-8093-da7b3623b21a

📥 Commits

Reviewing files that changed from the base of the PR and between 154eec9 and 93454b1.

📒 Files selected for processing (2)
  • .changeset/witty-knives-ask.md
  • packages/ui/src/components/SubscriptionDetails/index.tsx

Comment on lines +378 to +380
(subscription.planPeriod === 'annual' && Boolean(subscription.plan.fee))) &&
subscription.status !== 'past_due' &&
!subscription.plan.isDefault;

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🟠 Major

Add regression tests for the new isSwitchable guards before merge.

Line 378-Line 380 changes switch eligibility (annual fee and !isDefault) but no tests were added/updated in this PR. Please add coverage for: default plan (not switchable), annual without fee (not switchable), and valid non-default switchable cases.

As per coding guidelines, "If there are no tests added or modified as part of the PR, please suggest that tests be added to cover the changes."

🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In `@packages/ui/src/components/SubscriptionDetails/index.tsx` around lines 378 -
380, Add unit tests for the new isSwitchable logic in SubscriptionDetails
(locate usage/definition around the isSwitchable/plan switch guard in
SubscriptionDetails/index.tsx) to cover three cases: a subscription with
plan.isDefault === true (should not be switchable), a subscription with
planPeriod === 'annual' but plan.fee falsy (should not be switchable), and a
valid non-default, non-past_due, switchable subscription (should be switchable);
place tests alongside existing SubscriptionDetails tests, asserting the
component or exported isSwitchable helper returns the expected boolean for each
scenario and include these new tests before merging.

((subscription.planPeriod === 'month' && Boolean(subscription.plan.annualMonthlyFee)) ||
subscription.planPeriod === 'annual') &&
subscription.status !== 'past_due';
(subscription.planPeriod === 'annual' && Boolean(subscription.plan.fee))) &&

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

We're storing the amount for an annual plan inside of the fee?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

This is for switching between periods. That line reads "if the current subscription is an annual subscription and the plan has a monthly fee, allow switching from annual to monthly".

@dstaley
dstaley merged commit ac2f1c1 into mainMar 18, 2026
43 checks passed
@dstaley
dstaley deleted the ds.fix/isdefault-isswitchable branch March 18, 2026 21:51
This was referenced Mar 18, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@dstaley@aeliox@l-armstrong
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix(ui): Factor in isDefault into isSwitchable by dstaley · Pull Request #8077 · clerk/javascript · GitHub
Skip to content

fix(ui): Factor in isDefault into isSwitchable - #8077

Merged
dstaley merged 1 commit into
mainfrom
ds.fix/isdefault-isswitchable
Mar 18, 2026
Merged

fix(ui): Factor in isDefault into isSwitchable#8077
dstaley merged 1 commit into
mainfrom
ds.fix/isdefault-isswitchable

Conversation

@dstaley

@dstaleydstaley commented Mar 13, 2026

Copy link
Copy Markdown
Member

Description

This PR fixes an issue where the Switch to annual button was being rendered for default plans.

Checklist

  • pnpm test runs as expected.
  • pnpm build runs as expected.
  • (If applicable) JSDoc comments have been added or updated for any package exports
  • (If applicable) Documentation has been updated

Type of change

  • 🐛 Bug fix
  • 🌟 New feature
  • 🔨 Breaking change
  • 📖 Refactoring / dependency upgrade / documentation
  • other:

Summary by CodeRabbit

  • Bug Fixes
    • Restricted plan switching eligibility to prevent unintended changes for default and annual plans without active fees.

@dstaley
dstaley requested a review from a teamMarch 13, 2026 19:39
@vercel

vercelBot commented Mar 13, 2026

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

ProjectDeploymentActionsUpdated (UTC)
clerk-js-sandboxReadyReadyPreview, CommentMar 13, 2026 7:40pm

Request Review

@changeset-bot

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: 93454b1

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 2 packages
NameType
@clerk/uiPatch
@clerk/chrome-extensionPatch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@pkg-pr-new

Copy link
Copy Markdown

Open in StackBlitz

@clerk/agent-toolkit

npm i https://pkg.pr.new/@clerk/agent-toolkit@8077

@clerk/astro

npm i https://pkg.pr.new/@clerk/astro@8077

@clerk/backend

npm i https://pkg.pr.new/@clerk/backend@8077

@clerk/chrome-extension

npm i https://pkg.pr.new/@clerk/chrome-extension@8077

@clerk/clerk-js

npm i https://pkg.pr.new/@clerk/clerk-js@8077

@clerk/dev-cli

npm i https://pkg.pr.new/@clerk/dev-cli@8077

@clerk/expo

npm i https://pkg.pr.new/@clerk/expo@8077

@clerk/expo-passkeys

npm i https://pkg.pr.new/@clerk/expo-passkeys@8077

@clerk/express

npm i https://pkg.pr.new/@clerk/express@8077

@clerk/fastify

npm i https://pkg.pr.new/@clerk/fastify@8077

@clerk/hono

npm i https://pkg.pr.new/@clerk/hono@8077

@clerk/localizations

npm i https://pkg.pr.new/@clerk/localizations@8077

@clerk/nextjs

npm i https://pkg.pr.new/@clerk/nextjs@8077

@clerk/nuxt

npm i https://pkg.pr.new/@clerk/nuxt@8077

@clerk/react

npm i https://pkg.pr.new/@clerk/react@8077

@clerk/react-router

npm i https://pkg.pr.new/@clerk/react-router@8077

@clerk/shared

npm i https://pkg.pr.new/@clerk/shared@8077

@clerk/tanstack-react-start

npm i https://pkg.pr.new/@clerk/tanstack-react-start@8077

@clerk/testing

npm i https://pkg.pr.new/@clerk/testing@8077

@clerk/ui

npm i https://pkg.pr.new/@clerk/ui@8077

@clerk/upgrade

npm i https://pkg.pr.new/@clerk/upgrade@8077

@clerk/vue

npm i https://pkg.pr.new/@clerk/vue@8077

commit: 93454b1

@coderabbitai

Copy link
Copy Markdown
Contributor
📝 Walkthrough

Walkthrough

This pull request adds a changeset entry for @clerk/ui with a patch version bump and modifies the SubscriptionCardActions isSwitchable logic in the SubscriptionDetails component. The changes add two guards to the switching plan eligibility criteria: a check to prevent switching for default plans (subscription.plan.isDefault must be false) and a requirement that annual plans must have a fee present (subscription.plan.fee) to be switchable. The existing month-based switch logic and past_due exclusion are preserved.

🚥 Pre-merge checks | ✅ 3
✅ Passed checks (3 passed)
Check nameStatusExplanation
Description Check✅ PassedCheck skipped - CodeRabbit’s high-level summary is enabled.
Title check✅ PassedThe title clearly and specifically summarizes the main change: adding isDefault as a factor in the isSwitchable logic to prevent switching default plans.
Docstring Coverage✅ PassedNo functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

📝 Coding Plan
  • Generate coding plan for human review comments

Comment @coderabbitai help to get the list of available commands and usage tips.

@coderabbitaicoderabbitaiBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In `@packages/ui/src/components/SubscriptionDetails/index.tsx`:
- Around line 378-380: Add unit tests for the new isSwitchable logic in
SubscriptionDetails (locate usage/definition around the isSwitchable/plan switch
guard in SubscriptionDetails/index.tsx) to cover three cases: a subscription
with plan.isDefault === true (should not be switchable), a subscription with
planPeriod === 'annual' but plan.fee falsy (should not be switchable), and a
valid non-default, non-past_due, switchable subscription (should be switchable);
place tests alongside existing SubscriptionDetails tests, asserting the
component or exported isSwitchable helper returns the expected boolean for each
scenario and include these new tests before merging.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Organization UI (inherited)

Review profile: ASSERTIVE

Plan: Pro

Run ID: 7037e44f-54f1-47e5-8093-da7b3623b21a

📥 Commits

Reviewing files that changed from the base of the PR and between 154eec9 and 93454b1.

📒 Files selected for processing (2)
  • .changeset/witty-knives-ask.md
  • packages/ui/src/components/SubscriptionDetails/index.tsx

Comment on lines +378 to +380
(subscription.planPeriod === 'annual' && Boolean(subscription.plan.fee))) &&
subscription.status !== 'past_due' &&
!subscription.plan.isDefault;

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🟠 Major

Add regression tests for the new isSwitchable guards before merge.

Line 378-Line 380 changes switch eligibility (annual fee and !isDefault) but no tests were added/updated in this PR. Please add coverage for: default plan (not switchable), annual without fee (not switchable), and valid non-default switchable cases.

As per coding guidelines, "If there are no tests added or modified as part of the PR, please suggest that tests be added to cover the changes."

🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In `@packages/ui/src/components/SubscriptionDetails/index.tsx` around lines 378 -
380, Add unit tests for the new isSwitchable logic in SubscriptionDetails
(locate usage/definition around the isSwitchable/plan switch guard in
SubscriptionDetails/index.tsx) to cover three cases: a subscription with
plan.isDefault === true (should not be switchable), a subscription with
planPeriod === 'annual' but plan.fee falsy (should not be switchable), and a
valid non-default, non-past_due, switchable subscription (should be switchable);
place tests alongside existing SubscriptionDetails tests, asserting the
component or exported isSwitchable helper returns the expected boolean for each
scenario and include these new tests before merging.

((subscription.planPeriod === 'month' && Boolean(subscription.plan.annualMonthlyFee)) ||
subscription.planPeriod === 'annual') &&
subscription.status !== 'past_due';
(subscription.planPeriod === 'annual' && Boolean(subscription.plan.fee))) &&

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

We're storing the amount for an annual plan inside of the fee?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

This is for switching between periods. That line reads "if the current subscription is an annual subscription and the plan has a monthly fee, allow switching from annual to monthly".

@dstaley
dstaley merged commit ac2f1c1 into mainMar 18, 2026
43 checks passed
@dstaley
dstaley deleted the ds.fix/isdefault-isswitchable branch March 18, 2026 21:51
This was referenced Mar 18, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@dstaley@aeliox@l-armstrong
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' fix(ui): Factor in isDefault into isSwitchable by dstaley · Pull Request #8077 · clerk/javascript · GitHub
Skip to content

fix(ui): Factor in isDefault into isSwitchable - #8077

Merged
dstaley merged 1 commit into
mainfrom
ds.fix/isdefault-isswitchable
Mar 18, 2026
Merged

fix(ui): Factor in isDefault into isSwitchable#8077
dstaley merged 1 commit into
mainfrom
ds.fix/isdefault-isswitchable

Conversation

@dstaley

@dstaleydstaley commented Mar 13, 2026

Copy link
Copy Markdown
Member

Description

This PR fixes an issue where the Switch to annual button was being rendered for default plans.

Checklist

  • pnpm test runs as expected.
  • pnpm build runs as expected.
  • (If applicable) JSDoc comments have been added or updated for any package exports
  • (If applicable) Documentation has been updated

Type of change

  • 🐛 Bug fix
  • 🌟 New feature
  • 🔨 Breaking change
  • 📖 Refactoring / dependency upgrade / documentation
  • other:

Summary by CodeRabbit

  • Bug Fixes
    • Restricted plan switching eligibility to prevent unintended changes for default and annual plans without active fees.

@dstaley
dstaley requested a review from a teamMarch 13, 2026 19:39
@vercel

vercelBot commented Mar 13, 2026

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

ProjectDeploymentActionsUpdated (UTC)
clerk-js-sandboxReadyReadyPreview, CommentMar 13, 2026 7:40pm

Request Review

@changeset-bot

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: 93454b1

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 2 packages
NameType
@clerk/uiPatch
@clerk/chrome-extensionPatch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@pkg-pr-new

Copy link
Copy Markdown

Open in StackBlitz

@clerk/agent-toolkit

npm i https://pkg.pr.new/@clerk/agent-toolkit@8077

@clerk/astro

npm i https://pkg.pr.new/@clerk/astro@8077

@clerk/backend

npm i https://pkg.pr.new/@clerk/backend@8077

@clerk/chrome-extension

npm i https://pkg.pr.new/@clerk/chrome-extension@8077

@clerk/clerk-js

npm i https://pkg.pr.new/@clerk/clerk-js@8077

@clerk/dev-cli

npm i https://pkg.pr.new/@clerk/dev-cli@8077

@clerk/expo

npm i https://pkg.pr.new/@clerk/expo@8077

@clerk/expo-passkeys

npm i https://pkg.pr.new/@clerk/expo-passkeys@8077

@clerk/express

npm i https://pkg.pr.new/@clerk/express@8077

@clerk/fastify

npm i https://pkg.pr.new/@clerk/fastify@8077

@clerk/hono

npm i https://pkg.pr.new/@clerk/hono@8077

@clerk/localizations

npm i https://pkg.pr.new/@clerk/localizations@8077

@clerk/nextjs

npm i https://pkg.pr.new/@clerk/nextjs@8077

@clerk/nuxt

npm i https://pkg.pr.new/@clerk/nuxt@8077

@clerk/react

npm i https://pkg.pr.new/@clerk/react@8077

@clerk/react-router

npm i https://pkg.pr.new/@clerk/react-router@8077

@clerk/shared

npm i https://pkg.pr.new/@clerk/shared@8077

@clerk/tanstack-react-start

npm i https://pkg.pr.new/@clerk/tanstack-react-start@8077

@clerk/testing

npm i https://pkg.pr.new/@clerk/testing@8077

@clerk/ui

npm i https://pkg.pr.new/@clerk/ui@8077

@clerk/upgrade

npm i https://pkg.pr.new/@clerk/upgrade@8077

@clerk/vue

npm i https://pkg.pr.new/@clerk/vue@8077

commit: 93454b1

@coderabbitai

Copy link
Copy Markdown
Contributor
📝 Walkthrough

Walkthrough

This pull request adds a changeset entry for @clerk/ui with a patch version bump and modifies the SubscriptionCardActions isSwitchable logic in the SubscriptionDetails component. The changes add two guards to the switching plan eligibility criteria: a check to prevent switching for default plans (subscription.plan.isDefault must be false) and a requirement that annual plans must have a fee present (subscription.plan.fee) to be switchable. The existing month-based switch logic and past_due exclusion are preserved.

🚥 Pre-merge checks | ✅ 3
✅ Passed checks (3 passed)
Check nameStatusExplanation
Description Check✅ PassedCheck skipped - CodeRabbit’s high-level summary is enabled.
Title check✅ PassedThe title clearly and specifically summarizes the main change: adding isDefault as a factor in the isSwitchable logic to prevent switching default plans.
Docstring Coverage✅ PassedNo functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

📝 Coding Plan
  • Generate coding plan for human review comments

Comment @coderabbitai help to get the list of available commands and usage tips.

@coderabbitaicoderabbitaiBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In `@packages/ui/src/components/SubscriptionDetails/index.tsx`:
- Around line 378-380: Add unit tests for the new isSwitchable logic in
SubscriptionDetails (locate usage/definition around the isSwitchable/plan switch
guard in SubscriptionDetails/index.tsx) to cover three cases: a subscription
with plan.isDefault === true (should not be switchable), a subscription with
planPeriod === 'annual' but plan.fee falsy (should not be switchable), and a
valid non-default, non-past_due, switchable subscription (should be switchable);
place tests alongside existing SubscriptionDetails tests, asserting the
component or exported isSwitchable helper returns the expected boolean for each
scenario and include these new tests before merging.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Organization UI (inherited)

Review profile: ASSERTIVE

Plan: Pro

Run ID: 7037e44f-54f1-47e5-8093-da7b3623b21a

📥 Commits

Reviewing files that changed from the base of the PR and between 154eec9 and 93454b1.

📒 Files selected for processing (2)
  • .changeset/witty-knives-ask.md
  • packages/ui/src/components/SubscriptionDetails/index.tsx

Comment on lines +378 to +380
(subscription.planPeriod === 'annual' && Boolean(subscription.plan.fee))) &&
subscription.status !== 'past_due' &&
!subscription.plan.isDefault;

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🟠 Major

Add regression tests for the new isSwitchable guards before merge.

Line 378-Line 380 changes switch eligibility (annual fee and !isDefault) but no tests were added/updated in this PR. Please add coverage for: default plan (not switchable), annual without fee (not switchable), and valid non-default switchable cases.

As per coding guidelines, "If there are no tests added or modified as part of the PR, please suggest that tests be added to cover the changes."

🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In `@packages/ui/src/components/SubscriptionDetails/index.tsx` around lines 378 -
380, Add unit tests for the new isSwitchable logic in SubscriptionDetails
(locate usage/definition around the isSwitchable/plan switch guard in
SubscriptionDetails/index.tsx) to cover three cases: a subscription with
plan.isDefault === true (should not be switchable), a subscription with
planPeriod === 'annual' but plan.fee falsy (should not be switchable), and a
valid non-default, non-past_due, switchable subscription (should be switchable);
place tests alongside existing SubscriptionDetails tests, asserting the
component or exported isSwitchable helper returns the expected boolean for each
scenario and include these new tests before merging.

((subscription.planPeriod === 'month' && Boolean(subscription.plan.annualMonthlyFee)) ||
subscription.planPeriod === 'annual') &&
subscription.status !== 'past_due';
(subscription.planPeriod === 'annual' && Boolean(subscription.plan.fee))) &&

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

We're storing the amount for an annual plan inside of the fee?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

This is for switching between periods. That line reads "if the current subscription is an annual subscription and the plan has a monthly fee, allow switching from annual to monthly".

@dstaley
dstaley merged commit ac2f1c1 into mainMar 18, 2026
43 checks passed
@dstaley
dstaley deleted the ds.fix/isdefault-isswitchable branch March 18, 2026 21:51
This was referenced Mar 18, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@dstaley@aeliox@l-armstrong
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix(ui): Factor in isDefault into isSwitchable by dstaley · Pull Request #8077 · clerk/javascript · GitHub
Skip to content

fix(ui): Factor in isDefault into isSwitchable - #8077

Merged
dstaley merged 1 commit into
mainfrom
ds.fix/isdefault-isswitchable
Mar 18, 2026
Merged

fix(ui): Factor in isDefault into isSwitchable#8077
dstaley merged 1 commit into
mainfrom
ds.fix/isdefault-isswitchable

Conversation

@dstaley

@dstaleydstaley commented Mar 13, 2026

Copy link
Copy Markdown
Member

Description

This PR fixes an issue where the Switch to annual button was being rendered for default plans.

Checklist

  • pnpm test runs as expected.
  • pnpm build runs as expected.
  • (If applicable) JSDoc comments have been added or updated for any package exports
  • (If applicable) Documentation has been updated

Type of change

  • 🐛 Bug fix
  • 🌟 New feature
  • 🔨 Breaking change
  • 📖 Refactoring / dependency upgrade / documentation
  • other:

Summary by CodeRabbit

  • Bug Fixes
    • Restricted plan switching eligibility to prevent unintended changes for default and annual plans without active fees.

@dstaley
dstaley requested a review from a teamMarch 13, 2026 19:39
@vercel

vercelBot commented Mar 13, 2026

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

ProjectDeploymentActionsUpdated (UTC)
clerk-js-sandboxReadyReadyPreview, CommentMar 13, 2026 7:40pm

Request Review

@changeset-bot

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: 93454b1

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 2 packages
NameType
@clerk/uiPatch
@clerk/chrome-extensionPatch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@pkg-pr-new

Copy link
Copy Markdown

Open in StackBlitz

@clerk/agent-toolkit

npm i https://pkg.pr.new/@clerk/agent-toolkit@8077

@clerk/astro

npm i https://pkg.pr.new/@clerk/astro@8077

@clerk/backend

npm i https://pkg.pr.new/@clerk/backend@8077

@clerk/chrome-extension

npm i https://pkg.pr.new/@clerk/chrome-extension@8077

@clerk/clerk-js

npm i https://pkg.pr.new/@clerk/clerk-js@8077

@clerk/dev-cli

npm i https://pkg.pr.new/@clerk/dev-cli@8077

@clerk/expo

npm i https://pkg.pr.new/@clerk/expo@8077

@clerk/expo-passkeys

npm i https://pkg.pr.new/@clerk/expo-passkeys@8077

@clerk/express

npm i https://pkg.pr.new/@clerk/express@8077

@clerk/fastify

npm i https://pkg.pr.new/@clerk/fastify@8077

@clerk/hono

npm i https://pkg.pr.new/@clerk/hono@8077

@clerk/localizations

npm i https://pkg.pr.new/@clerk/localizations@8077

@clerk/nextjs

npm i https://pkg.pr.new/@clerk/nextjs@8077

@clerk/nuxt

npm i https://pkg.pr.new/@clerk/nuxt@8077

@clerk/react

npm i https://pkg.pr.new/@clerk/react@8077

@clerk/react-router

npm i https://pkg.pr.new/@clerk/react-router@8077

@clerk/shared

npm i https://pkg.pr.new/@clerk/shared@8077

@clerk/tanstack-react-start

npm i https://pkg.pr.new/@clerk/tanstack-react-start@8077

@clerk/testing

npm i https://pkg.pr.new/@clerk/testing@8077

@clerk/ui

npm i https://pkg.pr.new/@clerk/ui@8077

@clerk/upgrade

npm i https://pkg.pr.new/@clerk/upgrade@8077

@clerk/vue

npm i https://pkg.pr.new/@clerk/vue@8077

commit: 93454b1

@coderabbitai

Copy link
Copy Markdown
Contributor
📝 Walkthrough

Walkthrough

This pull request adds a changeset entry for @clerk/ui with a patch version bump and modifies the SubscriptionCardActions isSwitchable logic in the SubscriptionDetails component. The changes add two guards to the switching plan eligibility criteria: a check to prevent switching for default plans (subscription.plan.isDefault must be false) and a requirement that annual plans must have a fee present (subscription.plan.fee) to be switchable. The existing month-based switch logic and past_due exclusion are preserved.

🚥 Pre-merge checks | ✅ 3
✅ Passed checks (3 passed)
Check nameStatusExplanation
Description Check✅ PassedCheck skipped - CodeRabbit’s high-level summary is enabled.
Title check✅ PassedThe title clearly and specifically summarizes the main change: adding isDefault as a factor in the isSwitchable logic to prevent switching default plans.
Docstring Coverage✅ PassedNo functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

📝 Coding Plan
  • Generate coding plan for human review comments

Comment @coderabbitai help to get the list of available commands and usage tips.

@coderabbitaicoderabbitaiBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In `@packages/ui/src/components/SubscriptionDetails/index.tsx`:
- Around line 378-380: Add unit tests for the new isSwitchable logic in
SubscriptionDetails (locate usage/definition around the isSwitchable/plan switch
guard in SubscriptionDetails/index.tsx) to cover three cases: a subscription
with plan.isDefault === true (should not be switchable), a subscription with
planPeriod === 'annual' but plan.fee falsy (should not be switchable), and a
valid non-default, non-past_due, switchable subscription (should be switchable);
place tests alongside existing SubscriptionDetails tests, asserting the
component or exported isSwitchable helper returns the expected boolean for each
scenario and include these new tests before merging.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Organization UI (inherited)

Review profile: ASSERTIVE

Plan: Pro

Run ID: 7037e44f-54f1-47e5-8093-da7b3623b21a

📥 Commits

Reviewing files that changed from the base of the PR and between 154eec9 and 93454b1.

📒 Files selected for processing (2)
  • .changeset/witty-knives-ask.md
  • packages/ui/src/components/SubscriptionDetails/index.tsx

Comment on lines +378 to +380
(subscription.planPeriod === 'annual' && Boolean(subscription.plan.fee))) &&
subscription.status !== 'past_due' &&
!subscription.plan.isDefault;

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🟠 Major

Add regression tests for the new isSwitchable guards before merge.

Line 378-Line 380 changes switch eligibility (annual fee and !isDefault) but no tests were added/updated in this PR. Please add coverage for: default plan (not switchable), annual without fee (not switchable), and valid non-default switchable cases.

As per coding guidelines, "If there are no tests added or modified as part of the PR, please suggest that tests be added to cover the changes."

🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In `@packages/ui/src/components/SubscriptionDetails/index.tsx` around lines 378 -
380, Add unit tests for the new isSwitchable logic in SubscriptionDetails
(locate usage/definition around the isSwitchable/plan switch guard in
SubscriptionDetails/index.tsx) to cover three cases: a subscription with
plan.isDefault === true (should not be switchable), a subscription with
planPeriod === 'annual' but plan.fee falsy (should not be switchable), and a
valid non-default, non-past_due, switchable subscription (should be switchable);
place tests alongside existing SubscriptionDetails tests, asserting the
component or exported isSwitchable helper returns the expected boolean for each
scenario and include these new tests before merging.

((subscription.planPeriod === 'month' && Boolean(subscription.plan.annualMonthlyFee)) ||
subscription.planPeriod === 'annual') &&
subscription.status !== 'past_due';
(subscription.planPeriod === 'annual' && Boolean(subscription.plan.fee))) &&

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

We're storing the amount for an annual plan inside of the fee?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

This is for switching between periods. That line reads "if the current subscription is an annual subscription and the plan has a monthly fee, allow switching from annual to monthly".

@dstaley
dstaley merged commit ac2f1c1 into mainMar 18, 2026
43 checks passed
@dstaley
dstaley deleted the ds.fix/isdefault-isswitchable branch March 18, 2026 21:51
This was referenced Mar 18, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@dstaley@aeliox@l-armstrong
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix(ui): Factor in isDefault into isSwitchable by dstaley · Pull Request #8077 · clerk/javascript · GitHub
Skip to content

fix(ui): Factor in isDefault into isSwitchable - #8077

Merged
dstaley merged 1 commit into
mainfrom
ds.fix/isdefault-isswitchable
Mar 18, 2026
Merged

fix(ui): Factor in isDefault into isSwitchable#8077
dstaley merged 1 commit into
mainfrom
ds.fix/isdefault-isswitchable

Conversation

@dstaley

@dstaleydstaley commented Mar 13, 2026

Copy link
Copy Markdown
Member

Description

This PR fixes an issue where the Switch to annual button was being rendered for default plans.

Checklist

  • pnpm test runs as expected.
  • pnpm build runs as expected.
  • (If applicable) JSDoc comments have been added or updated for any package exports
  • (If applicable) Documentation has been updated

Type of change

  • 🐛 Bug fix
  • 🌟 New feature
  • 🔨 Breaking change
  • 📖 Refactoring / dependency upgrade / documentation
  • other:

Summary by CodeRabbit

  • Bug Fixes
    • Restricted plan switching eligibility to prevent unintended changes for default and annual plans without active fees.

@dstaley
dstaley requested a review from a teamMarch 13, 2026 19:39
@vercel

vercelBot commented Mar 13, 2026

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

ProjectDeploymentActionsUpdated (UTC)
clerk-js-sandboxReadyReadyPreview, CommentMar 13, 2026 7:40pm

Request Review

@changeset-bot

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: 93454b1

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 2 packages
NameType
@clerk/uiPatch
@clerk/chrome-extensionPatch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@pkg-pr-new

Copy link
Copy Markdown

Open in StackBlitz

@clerk/agent-toolkit

npm i https://pkg.pr.new/@clerk/agent-toolkit@8077

@clerk/astro

npm i https://pkg.pr.new/@clerk/astro@8077

@clerk/backend

npm i https://pkg.pr.new/@clerk/backend@8077

@clerk/chrome-extension

npm i https://pkg.pr.new/@clerk/chrome-extension@8077

@clerk/clerk-js

npm i https://pkg.pr.new/@clerk/clerk-js@8077

@clerk/dev-cli

npm i https://pkg.pr.new/@clerk/dev-cli@8077

@clerk/expo

npm i https://pkg.pr.new/@clerk/expo@8077

@clerk/expo-passkeys

npm i https://pkg.pr.new/@clerk/expo-passkeys@8077

@clerk/express

npm i https://pkg.pr.new/@clerk/express@8077

@clerk/fastify

npm i https://pkg.pr.new/@clerk/fastify@8077

@clerk/hono

npm i https://pkg.pr.new/@clerk/hono@8077

@clerk/localizations

npm i https://pkg.pr.new/@clerk/localizations@8077

@clerk/nextjs

npm i https://pkg.pr.new/@clerk/nextjs@8077

@clerk/nuxt

npm i https://pkg.pr.new/@clerk/nuxt@8077

@clerk/react

npm i https://pkg.pr.new/@clerk/react@8077

@clerk/react-router

npm i https://pkg.pr.new/@clerk/react-router@8077

@clerk/shared

npm i https://pkg.pr.new/@clerk/shared@8077

@clerk/tanstack-react-start

npm i https://pkg.pr.new/@clerk/tanstack-react-start@8077

@clerk/testing

npm i https://pkg.pr.new/@clerk/testing@8077

@clerk/ui

npm i https://pkg.pr.new/@clerk/ui@8077

@clerk/upgrade

npm i https://pkg.pr.new/@clerk/upgrade@8077

@clerk/vue

npm i https://pkg.pr.new/@clerk/vue@8077

commit: 93454b1

@coderabbitai

Copy link
Copy Markdown
Contributor
📝 Walkthrough

Walkthrough

This pull request adds a changeset entry for @clerk/ui with a patch version bump and modifies the SubscriptionCardActions isSwitchable logic in the SubscriptionDetails component. The changes add two guards to the switching plan eligibility criteria: a check to prevent switching for default plans (subscription.plan.isDefault must be false) and a requirement that annual plans must have a fee present (subscription.plan.fee) to be switchable. The existing month-based switch logic and past_due exclusion are preserved.

🚥 Pre-merge checks | ✅ 3
✅ Passed checks (3 passed)
Check nameStatusExplanation
Description Check✅ PassedCheck skipped - CodeRabbit’s high-level summary is enabled.
Title check✅ PassedThe title clearly and specifically summarizes the main change: adding isDefault as a factor in the isSwitchable logic to prevent switching default plans.
Docstring Coverage✅ PassedNo functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

📝 Coding Plan
  • Generate coding plan for human review comments

Comment @coderabbitai help to get the list of available commands and usage tips.

@coderabbitaicoderabbitaiBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In `@packages/ui/src/components/SubscriptionDetails/index.tsx`:
- Around line 378-380: Add unit tests for the new isSwitchable logic in
SubscriptionDetails (locate usage/definition around the isSwitchable/plan switch
guard in SubscriptionDetails/index.tsx) to cover three cases: a subscription
with plan.isDefault === true (should not be switchable), a subscription with
planPeriod === 'annual' but plan.fee falsy (should not be switchable), and a
valid non-default, non-past_due, switchable subscription (should be switchable);
place tests alongside existing SubscriptionDetails tests, asserting the
component or exported isSwitchable helper returns the expected boolean for each
scenario and include these new tests before merging.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Organization UI (inherited)

Review profile: ASSERTIVE

Plan: Pro

Run ID: 7037e44f-54f1-47e5-8093-da7b3623b21a

📥 Commits

Reviewing files that changed from the base of the PR and between 154eec9 and 93454b1.

📒 Files selected for processing (2)
  • .changeset/witty-knives-ask.md
  • packages/ui/src/components/SubscriptionDetails/index.tsx

Comment on lines +378 to +380
(subscription.planPeriod === 'annual' && Boolean(subscription.plan.fee))) &&
subscription.status !== 'past_due' &&
!subscription.plan.isDefault;

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🟠 Major

Add regression tests for the new isSwitchable guards before merge.

Line 378-Line 380 changes switch eligibility (annual fee and !isDefault) but no tests were added/updated in this PR. Please add coverage for: default plan (not switchable), annual without fee (not switchable), and valid non-default switchable cases.

As per coding guidelines, "If there are no tests added or modified as part of the PR, please suggest that tests be added to cover the changes."

🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In `@packages/ui/src/components/SubscriptionDetails/index.tsx` around lines 378 -
380, Add unit tests for the new isSwitchable logic in SubscriptionDetails
(locate usage/definition around the isSwitchable/plan switch guard in
SubscriptionDetails/index.tsx) to cover three cases: a subscription with
plan.isDefault === true (should not be switchable), a subscription with
planPeriod === 'annual' but plan.fee falsy (should not be switchable), and a
valid non-default, non-past_due, switchable subscription (should be switchable);
place tests alongside existing SubscriptionDetails tests, asserting the
component or exported isSwitchable helper returns the expected boolean for each
scenario and include these new tests before merging.

((subscription.planPeriod === 'month' && Boolean(subscription.plan.annualMonthlyFee)) ||
subscription.planPeriod === 'annual') &&
subscription.status !== 'past_due';
(subscription.planPeriod === 'annual' && Boolean(subscription.plan.fee))) &&

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

We're storing the amount for an annual plan inside of the fee?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

This is for switching between periods. That line reads "if the current subscription is an annual subscription and the plan has a monthly fee, allow switching from annual to monthly".

@dstaley
dstaley merged commit ac2f1c1 into mainMar 18, 2026
43 checks passed
@dstaley
dstaley deleted the ds.fix/isdefault-isswitchable branch March 18, 2026 21:51
This was referenced Mar 18, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@dstaley@aeliox@l-armstrong
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); fix(ui): Factor in isDefault into isSwitchable by dstaley · Pull Request #8077 · clerk/javascript · GitHub
Skip to content

fix(ui): Factor in isDefault into isSwitchable - #8077

Merged
dstaley merged 1 commit into
mainfrom
ds.fix/isdefault-isswitchable
Mar 18, 2026
Merged

fix(ui): Factor in isDefault into isSwitchable#8077
dstaley merged 1 commit into
mainfrom
ds.fix/isdefault-isswitchable

Conversation

@dstaley

@dstaleydstaley commented Mar 13, 2026

Copy link
Copy Markdown
Member

Description

This PR fixes an issue where the Switch to annual button was being rendered for default plans.

Checklist

  • pnpm test runs as expected.
  • pnpm build runs as expected.
  • (If applicable) JSDoc comments have been added or updated for any package exports
  • (If applicable) Documentation has been updated

Type of change

  • 🐛 Bug fix
  • 🌟 New feature
  • 🔨 Breaking change
  • 📖 Refactoring / dependency upgrade / documentation
  • other:

Summary by CodeRabbit

  • Bug Fixes
    • Restricted plan switching eligibility to prevent unintended changes for default and annual plans without active fees.

@dstaley
dstaley requested a review from a teamMarch 13, 2026 19:39
@vercel

vercelBot commented Mar 13, 2026

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

ProjectDeploymentActionsUpdated (UTC)
clerk-js-sandboxReadyReadyPreview, CommentMar 13, 2026 7:40pm

Request Review

@changeset-bot

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: 93454b1

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 2 packages
NameType
@clerk/uiPatch
@clerk/chrome-extensionPatch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@pkg-pr-new

Copy link
Copy Markdown

Open in StackBlitz

@clerk/agent-toolkit

npm i https://pkg.pr.new/@clerk/agent-toolkit@8077

@clerk/astro

npm i https://pkg.pr.new/@clerk/astro@8077

@clerk/backend

npm i https://pkg.pr.new/@clerk/backend@8077

@clerk/chrome-extension

npm i https://pkg.pr.new/@clerk/chrome-extension@8077

@clerk/clerk-js

npm i https://pkg.pr.new/@clerk/clerk-js@8077

@clerk/dev-cli

npm i https://pkg.pr.new/@clerk/dev-cli@8077

@clerk/expo

npm i https://pkg.pr.new/@clerk/expo@8077

@clerk/expo-passkeys

npm i https://pkg.pr.new/@clerk/expo-passkeys@8077

@clerk/express

npm i https://pkg.pr.new/@clerk/express@8077

@clerk/fastify

npm i https://pkg.pr.new/@clerk/fastify@8077

@clerk/hono

npm i https://pkg.pr.new/@clerk/hono@8077

@clerk/localizations

npm i https://pkg.pr.new/@clerk/localizations@8077

@clerk/nextjs

npm i https://pkg.pr.new/@clerk/nextjs@8077

@clerk/nuxt

npm i https://pkg.pr.new/@clerk/nuxt@8077

@clerk/react

npm i https://pkg.pr.new/@clerk/react@8077

@clerk/react-router

npm i https://pkg.pr.new/@clerk/react-router@8077

@clerk/shared

npm i https://pkg.pr.new/@clerk/shared@8077

@clerk/tanstack-react-start

npm i https://pkg.pr.new/@clerk/tanstack-react-start@8077

@clerk/testing

npm i https://pkg.pr.new/@clerk/testing@8077

@clerk/ui

npm i https://pkg.pr.new/@clerk/ui@8077

@clerk/upgrade

npm i https://pkg.pr.new/@clerk/upgrade@8077

@clerk/vue

npm i https://pkg.pr.new/@clerk/vue@8077

commit: 93454b1

@coderabbitai

Copy link
Copy Markdown
Contributor
📝 Walkthrough

Walkthrough

This pull request adds a changeset entry for @clerk/ui with a patch version bump and modifies the SubscriptionCardActions isSwitchable logic in the SubscriptionDetails component. The changes add two guards to the switching plan eligibility criteria: a check to prevent switching for default plans (subscription.plan.isDefault must be false) and a requirement that annual plans must have a fee present (subscription.plan.fee) to be switchable. The existing month-based switch logic and past_due exclusion are preserved.

🚥 Pre-merge checks | ✅ 3
✅ Passed checks (3 passed)
Check nameStatusExplanation
Description Check✅ PassedCheck skipped - CodeRabbit’s high-level summary is enabled.
Title check✅ PassedThe title clearly and specifically summarizes the main change: adding isDefault as a factor in the isSwitchable logic to prevent switching default plans.
Docstring Coverage✅ PassedNo functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

📝 Coding Plan
  • Generate coding plan for human review comments

Comment @coderabbitai help to get the list of available commands and usage tips.

@coderabbitaicoderabbitaiBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In `@packages/ui/src/components/SubscriptionDetails/index.tsx`:
- Around line 378-380: Add unit tests for the new isSwitchable logic in
SubscriptionDetails (locate usage/definition around the isSwitchable/plan switch
guard in SubscriptionDetails/index.tsx) to cover three cases: a subscription
with plan.isDefault === true (should not be switchable), a subscription with
planPeriod === 'annual' but plan.fee falsy (should not be switchable), and a
valid non-default, non-past_due, switchable subscription (should be switchable);
place tests alongside existing SubscriptionDetails tests, asserting the
component or exported isSwitchable helper returns the expected boolean for each
scenario and include these new tests before merging.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Organization UI (inherited)

Review profile: ASSERTIVE

Plan: Pro

Run ID: 7037e44f-54f1-47e5-8093-da7b3623b21a

📥 Commits

Reviewing files that changed from the base of the PR and between 154eec9 and 93454b1.

📒 Files selected for processing (2)
  • .changeset/witty-knives-ask.md
  • packages/ui/src/components/SubscriptionDetails/index.tsx

Comment on lines +378 to +380
(subscription.planPeriod === 'annual' && Boolean(subscription.plan.fee))) &&
subscription.status !== 'past_due' &&
!subscription.plan.isDefault;

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🟠 Major

Add regression tests for the new isSwitchable guards before merge.

Line 378-Line 380 changes switch eligibility (annual fee and !isDefault) but no tests were added/updated in this PR. Please add coverage for: default plan (not switchable), annual without fee (not switchable), and valid non-default switchable cases.

As per coding guidelines, "If there are no tests added or modified as part of the PR, please suggest that tests be added to cover the changes."

🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In `@packages/ui/src/components/SubscriptionDetails/index.tsx` around lines 378 -
380, Add unit tests for the new isSwitchable logic in SubscriptionDetails
(locate usage/definition around the isSwitchable/plan switch guard in
SubscriptionDetails/index.tsx) to cover three cases: a subscription with
plan.isDefault === true (should not be switchable), a subscription with
planPeriod === 'annual' but plan.fee falsy (should not be switchable), and a
valid non-default, non-past_due, switchable subscription (should be switchable);
place tests alongside existing SubscriptionDetails tests, asserting the
component or exported isSwitchable helper returns the expected boolean for each
scenario and include these new tests before merging.

((subscription.planPeriod === 'month' && Boolean(subscription.plan.annualMonthlyFee)) ||
subscription.planPeriod === 'annual') &&
subscription.status !== 'past_due';
(subscription.planPeriod === 'annual' && Boolean(subscription.plan.fee))) &&

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

We're storing the amount for an annual plan inside of the fee?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

This is for switching between periods. That line reads "if the current subscription is an annual subscription and the plan has a monthly fee, allow switching from annual to monthly".

@dstaley
dstaley merged commit ac2f1c1 into mainMar 18, 2026
43 checks passed
@dstaley
dstaley deleted the ds.fix/isdefault-isswitchable branch March 18, 2026 21:51
This was referenced Mar 18, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@dstaley@aeliox@l-armstrong