Skip to content

fix(sub v3): Correct header cards for sub trials #101549

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 1 commit into from
Oct 16, 2025
Merged

fix(sub v3): Correct header cards for sub trials #101549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 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, isDeveloperPlan} from 'getsentry/utils/billing';
import {hasNewBillingUI, isDeveloperPlan, isTrialPlan} 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 @@ -21,12 +21,10 @@ interface HeaderCardsProps {
function getCards(organization: Organization, subscription: Subscription) {
const hasBillingPerms = organization.access?.includes('org:billing');
const cards: React.ReactNode[] = [];
const isTrialOrFreePlan =
isTrialPlan(subscription.plan) || isDeveloperPlan(subscription.planDetails);

if (
subscription.canSelfServe &&
!isDeveloperPlan(subscription.planDetails) &&
hasBillingPerms
) {
if (subscription.canSelfServe && !isTrialOrFreePlan && hasBillingPerms) {
cards.push(
<NextBillCard
key="next-bill"
Expand All @@ -50,7 +48,9 @@ function getCards(organization: Organization, subscription: Subscription) {
if (
hasBillingPerms &&
(canUpdatePayg ||
(subscription.canSelfServe && isDeveloperPlan(subscription.planDetails))) &&
(subscription.canSelfServe &&
isTrialOrFreePlan &&
!subscription.isEnterpriseTrial)) &&
!subscription.isSelfServePartner
) {
cards.push(
Expand Down
64 changes: 64 additions & 0 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 @@ -260,6 +260,70 @@ describe('SubscriptionHeader', () => {
});
});

it('renders new header cards for self-serve customers on subscription trial', async () => {
const organization = OrganizationFixture({
features: ['subscriptions-v3'],
access: ['org:billing'],
});
const subscription = SubscriptionFixture({
organization,
plan: 'am3_t',
});
SubscriptionStore.set(organization.slug, subscription);
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 on plan trial', async () => {
const organization = OrganizationFixture({
features: ['subscriptions-v3'],
access: ['org:billing'],
});
const subscription = SubscriptionFixture({
organization,
plan: 'am3_team',
isTrial: true,
});
SubscriptionStore.set(organization.slug, subscription);
render(
<SubscriptionHeader organization={organization} subscription={subscription} />
);
await assertNewHeaderCards({
organization,
hasNextBillCard: true,
hasBillingInfoCard: true,
hasPaygCard: true,
});
});

it('renders new header cards for customers on subscription enterprise trial', async () => {
const organization = OrganizationFixture({
features: ['subscriptions-v3'],
access: ['org:billing'],
});
const subscription = SubscriptionFixture({
organization,
plan: 'am3_t_ent',
});
SubscriptionStore.set(organization.slug, subscription);
render(
<SubscriptionHeader organization={organization} subscription={subscription} />
);
await assertNewHeaderCards({
organization,
hasNextBillCard: false,
hasBillingInfoCard: false,
hasPaygCard: false,
});
});

it('does not render editable sections for YY partnership', async () => {
const organization = OrganizationFixture({
features: ['usage-log'],
Expand Down
5 changes: 3 additions & 2 deletions tests/js/getsentry-test/fixtures/subscription.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import type {Organization} from 'sentry/types/organization';
import {RESERVED_BUDGET_QUOTA} from 'getsentry/constants';
import type {Plan, Subscription as TSubscription} from 'getsentry/types';
import {AddOnCategory, BillingType} from 'getsentry/types';
import {isTrialPlan} from 'getsentry/utils/billing';
import {isEnterprise, isTrialPlan} from 'getsentry/utils/billing';

type Props = Partial<TSubscription> & {organization: Organization};

Expand Down Expand Up @@ -44,6 +44,7 @@ export function SubscriptionFixture(props: Props): TSubscription {
const safeCategories = planDetails?.planCategories || {};

const isTrial = isTrialPlan(planDetails.id);
const isEnterpriseTrial = isTrial && isEnterprise(planDetails.id);
const reservedBudgets = [];
if (hasSeer) {
if (isTrial) {
Expand Down Expand Up @@ -71,7 +72,7 @@ export function SubscriptionFixture(props: Props): TSubscription {
hadCustomDynamicSampling: false,
id: '',
isBundleEligible: false,
isEnterpriseTrial: false,
isEnterpriseTrial,
isExemptFromForcedTrial: false,
isForcedTrial: false,
isOverMemberLimit: false,
Expand Down
Loading