Skip to content

fix(sub v3): Misc feedback + bugs #101474

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

Merged
merged 3 commits into from
Oct 15, 2025
Merged

fix(sub v3): Misc feedback + bugs #101474

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
39b606a
fix(sub v3): Misc feedback + bugs
isabellaenriquez Oct 14, 2025
edcdeb0
oops fix test
isabellaenriquez Oct 14, 2025
dc15771
Merge branch 'master' into isabella/sub-v3-feedback
isabellaenriquez Oct 15, 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
13 changes: 10 additions & 3 deletions static/gsApp/views/subscriptionPage/headerCards/headerCards.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import ErrorBoundary from 'sentry/components/errorBoundary';
import type {Organization} from 'sentry/types/organization';

import type {Subscription} from 'getsentry/types';
import {hasNewBillingUI} from 'getsentry/utils/billing';
import {hasNewBillingUI, isDeveloperPlan} from 'getsentry/utils/billing';
import BillingInfoCard from 'getsentry/views/subscriptionPage/headerCards/billingInfoCard';
import LinksCard from 'getsentry/views/subscriptionPage/headerCards/linksCard';
import NextBillCard from 'getsentry/views/subscriptionPage/headerCards/nextBillCard';
Expand All @@ -22,7 +22,11 @@ function getCards(organization: Organization, subscription: Subscription) {
const hasBillingPerms = organization.access?.includes('org:billing');
const cards: React.ReactNode[] = [];

if (subscription.canSelfServe && hasBillingPerms) {
if (
subscription.canSelfServe &&
!isDeveloperPlan(subscription.planDetails) &&
hasBillingPerms
) {
cards.push(
<NextBillCard
key="next-bill"
Expand All @@ -32,7 +36,10 @@ function getCards(organization: Organization, subscription: Subscription) {
);
}

if (subscription.supportsOnDemand && hasBillingPerms) {
if (
(subscription.planDetails.allowOnDemand || subscription.onDemandInvoiced) &&
hasBillingPerms
) {
cards.push(
<PaygCard key="payg" subscription={subscription} organization={organization} />
);
Expand Down
47 changes: 45 additions & 2 deletions static/gsApp/views/subscriptionPage/subscriptionHeader.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ describe('SubscriptionHeader', () => {
}
}

it('renders new header cards for self-serve customers', async () => {
it('renders new header cards for self-serve free customers', async () => {
const organization = OrganizationFixture({
features: ['subscriptions-v3'],
access: ['org:billing'],
Expand All @@ -121,6 +121,27 @@ describe('SubscriptionHeader', () => {
render(
<SubscriptionHeader organization={organization} subscription={subscription} />
);
await assertNewHeaderCards({
organization,
hasNextBillCard: false,
hasBillingInfoCard: true,
hasPaygCard: false,
});
});

it('renders new header cards for self-serve paid customers', async () => {
const organization = OrganizationFixture({
features: ['subscriptions-v3'],
access: ['org:billing'],
});
const subscription = SubscriptionFixture({
organization,
plan: 'am3_team',
});
SubscriptionStore.set(organization.slug, subscription);
render(
<SubscriptionHeader organization={organization} subscription={subscription} />
);
await assertNewHeaderCards({
organization,
hasNextBillCard: true,
Expand All @@ -129,7 +150,7 @@ describe('SubscriptionHeader', () => {
});
});

it('renders new header cards for self-serve partner customers', async () => {
it('renders new header cards for self-serve free partner customers', async () => {
const organization = OrganizationFixture({
features: ['subscriptions-v3'],
access: ['org:billing'],
Expand All @@ -143,6 +164,28 @@ describe('SubscriptionHeader', () => {
render(
<SubscriptionHeader organization={organization} subscription={subscription} />
);
await assertNewHeaderCards({
organization,
hasNextBillCard: false,
hasBillingInfoCard: false,
hasPaygCard: false,
});
});

it('renders new header cards for self-serve paid partner customers', async () => {
const organization = OrganizationFixture({
features: ['subscriptions-v3'],
access: ['org:billing'],
});
const subscription = SubscriptionFixture({
organization,
plan: 'am3_team',
isSelfServePartner: true,
});
SubscriptionStore.set(organization.slug, subscription);
render(
<SubscriptionHeader organization={organization} subscription={subscription} />
);
await assertNewHeaderCards({
organization,
hasNextBillCard: true,
Expand Down
2 changes: 1 addition & 1 deletion static/gsApp/views/subscriptionPage/usageOverview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ function UsageOverviewTable({subscription, organization, usageData}: UsageOvervi
budget => (budget.apiName as string) === reservedBudgetCategory
)
: undefined;
const percentUsed = reservedBudget?.totalReservedSpend
const percentUsed = reservedBudget?.reservedBudget
? getPercentage(
reservedBudget?.totalReservedSpend,
reservedBudget?.reservedBudget
Expand Down
Loading