Skip to content

fix(checkout v3): Keep customers on current tiers #99423

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 2 commits into from
Sep 15, 2025
Merged

fix(checkout v3): Keep customers on current tiers #99423

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a151e4
fix(checkout v3): Keep customers on current tiers
isabellaenriquez Sep 12, 2025
7e8d7e8
wrap in useEffect
isabellaenriquez Sep 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
11 changes: 10 additions & 1 deletion static/gsApp/views/decideCheckout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {useLocation} from 'sentry/utils/useLocation';
import {useNavigate} from 'sentry/utils/useNavigate';
import useOrganization from 'sentry/utils/useOrganization';

import useSubscription from 'getsentry/hooks/useSubscription';
import {PlanTier} from 'getsentry/types';
import {hasPartnerMigrationFeature} from 'getsentry/utils/billing';
import AMCheckout from 'getsentry/views/amCheckout';
Expand All @@ -14,12 +15,14 @@ function DecideCheckout() {
const navigate = useNavigate();
const location = useLocation();
const organization = useOrganization();
const subscription = useSubscription();
const [tier, setTier] = useState<string | null>(null);
const isNewCheckout = hasCheckoutV3(organization);

const checkoutProps = {
organization,
onToggleLegacy: setTier,
isNewCheckout: hasCheckoutV3(organization),
isNewCheckout,
Copy link
Contributor

@cursor cursor bot Sep 15, 2025

Choose a reason for hiding this comment

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

Bug: AM3 Subscription Renders Incorrect Checkout

Customers with an AM3 subscription are incorrectly shown the AM2 checkout when isNewCheckout is active, and their organization lacks the am3-billing feature or isn't a migrating partner. While the useEffect correctly sets the tier to PlanTier.AM3, the rendering logic falls through to the AM2 condition, contradicting the goal of keeping customers on their current tier.

Fix in Cursor Fix in Web

Copy link
Member Author

@isabellaenriquez isabellaenriquez Sep 15, 2025

Choose a reason for hiding this comment

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

customers with AM3 subscription inherently have the am3-billing flag

location,
navigate,
};
Expand All @@ -34,6 +37,12 @@ function DecideCheckout() {
);
}

if (isNewCheckout && tier === null) {
// if we're showing new checkout, ensure we show the checkout for
// the current plan tier (we will not toggle between tiers for legacy checkout)
setTier(subscription?.planTier ?? null);
}

if (tier !== PlanTier.AM1) {
return (
<ErrorBoundary errorTag={{checkout: PlanTier.AM2}}>
Expand Down
Loading