Skip to content

fix(billing): Null-guard invoice item data in checkout success #129457

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

Open
sentry wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(billing): Null-guard invoice item data in checkout success #129457

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
2 changes: 1 addition & 1 deletion static/gsApp/types/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,7 +542,7 @@ export type Invoice = InvoiceBase & {

type BaseInvoiceItem = {
amount: number;
data: {period?: any; plan?: any; quantity?: any};
data: {period?: any; plan?: any; quantity?: any} | null;
description: string;
type: InvoiceItemType;
};
Expand Down
25 changes: 25 additions & 0 deletions static/gsApp/views/amCheckout/components/checkoutSuccess.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,31 @@ describe('CheckoutSuccess', () => {
expect(screen.queryByTestId('receipt')).not.toBeInTheDocument();
});

it('renders scheduled changes when a reserved item has null data', async () => {
render(
<CheckoutSuccess
basePlan={bizPlan}
nextQueryParams={[]}
previewData={PreviewDataFixture({
effectiveAt: moment(mockDate).add(1, 'day').toISOString(),
invoiceItems: [
{
type: 'reserved_errors',
description: '50,000 reserved errors',
amount: 0,
data: null,
period_start: '2025-01-02',
period_end: '2025-02-01',
},
],
})}
/>
);

expect(await screen.findByText('Consider it done (soon)')).toBeInTheDocument();
expect(screen.getByRole('heading', {name: /^From /})).toBeInTheDocument();
});

it('renders ondemand items in receipt', async () => {
const invoiceWithOnDemand = InvoiceFixture({
items: [
Expand Down
4 changes: 2 additions & 2 deletions static/gsApp/views/amCheckout/components/checkoutSuccess.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ function ScheduledChanges({
if (!defined(category)) {
return null;
}
const quantity = item.data.quantity ?? 0;
const quantity = item.data?.quantity ?? 0;
const reserved = isByteCategory(category) ? quantity / GIGABYTE : quantity;
if (reserved <= 0) {
return null;
Expand Down Expand Up @@ -352,7 +352,7 @@ function Receipt({
if (!defined(category)) {
return null;
}
const quantity = item.data.quantity ?? 0;
const quantity = item.data?.quantity ?? 0;
const reserved = isByteCategory(category)
? quantity / GIGABYTE
: quantity;
Expand Down
2 changes: 1 addition & 1 deletion static/gsApp/views/amCheckout/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,7 +626,7 @@ function AMCheckout(props: Props) {
if (isSubmitted) {
const purchasedPlanItem = invoice?.items.find(item => item.type === 'subscription');
const basePlan = purchasedPlanItem
? getPlan(purchasedPlanItem.data.plan)
? getPlan(purchasedPlanItem.data?.plan)
: getPlan(formData.plan);

return (
Expand Down
Loading