fix: show personal credits even when user is on teams plan #27511
+147
−78
Conversation
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
CarinaWolli
commented
Feb 2, 2026
| }); | ||
| } | ||
| } else { | ||
| //if user is part of team, don't return any credits if teamId is not given |
Member
Author
There was a problem hiding this comment.
This caused the issue, that even if the user had personal credits we still returned null
| if (isLoading && teamId) return <BillingCreditsSkeleton />; | ||
| if (!creditsData) return null; | ||
|
|
||
| // For personal billing page: hide credits section if user is part of a team and has no personal credits |
Member
Author
There was a problem hiding this comment.
fix is here, only hide when user is part of a team and has no personal credits
| onChange={(e) => setValue("quantity", Number(e.target.value))} | ||
| min={50} | ||
| addOnSuffix={<>{t("credits")}</>} | ||
| {/* Users who are part of a team cannot buy personal credits */} |
Member
Author
There was a problem hiding this comment.
make sure user can't buy more personal credits if they are part of a team
| <div className="text-subtle px-5 py-4 text-sm font-medium leading-tight"> | ||
| <ServerTrans | ||
| <div className="px-5 py-4 text-sm font-medium leading-tight text-subtle"> | ||
| <LearnMoreLink |
Member
Author
There was a problem hiding this comment.
Use existing LearnMoreLink that's already used in other places
![cubic-dev-ai[bot]](https://avatars.githubusercontent.com/in/1082092?s=60&v=4){kind=small}
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.
What does this PR do?
If a user buys credits on the free plan and later joins a team, their personal credits currently appear “lost” because they’re no longer shown in
/settings/billing.This PR ensures personal credits remain visible in billing even after joining a team. In this state, the option to buy credits is removed since only teams should be able to purchase credits. If the user is part of a team and has no personal credits, the credits section is hidden entirely.
As a follow-up, I’ll verify the backend logic and ensure we correctly fall back to personal credits when team credits run out.