Skip to content

fix(billing): Use ff for prevent notification #99489

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
Sep 15, 2025
Merged

fix(billing): Use ff for prevent notification #99489

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/app/constants/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,7 +577,7 @@ export const DATA_CATEGORY_INFO = {
titleName: t('Prevent Reviews'),
productName: t('Prevent Reviews'),
uid: 30,
isBilledCategory: true,
Copy link
Member

Choose a reason for hiding this comment

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

Do we need this above for PREVENT_USER as well?

Copy link
Member Author

Choose a reason for hiding this comment

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

No, we'll use the ff for prevent users

isBilledCategory: false,
statsInfo: {
...DEFAULT_STATS_INFO,
showExternalStats: false, // TODO(prevent): add external stats when ready
Expand Down
3 changes: 3 additions & 0 deletions static/app/views/settings/account/notifications/notificationSettingsByType.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,7 @@ describe('NotificationSettingsByType', () => {
'continuous-profiling-billing',
'seer-billing',
'logs-billing',
'prevent-billing',
],
});
renderComponent({
Expand All @@ -345,6 +346,7 @@ describe('NotificationSettingsByType', () => {
expect(screen.getByText('UI Profile Hours', {exact: true})).toBeInTheDocument();
expect(screen.getByText('Seer Budget')).toBeInTheDocument();
expect(screen.getByText('Logs')).toBeInTheDocument();
expect(screen.getByText('Prevent Users')).toBeInTheDocument();
expect(screen.queryByText('Transactions')).not.toBeInTheDocument();

const editSettingMock = MockApiClient.addMockResponse({
Expand Down Expand Up @@ -521,5 +523,6 @@ describe('NotificationSettingsByType', () => {
expect(screen.queryByText('Transactions')).not.toBeInTheDocument();
expect(screen.queryByText('Seer Budget')).not.toBeInTheDocument();
expect(screen.queryByText('Logs')).not.toBeInTheDocument();
expect(screen.queryByText('Prevent Users')).not.toBeInTheDocument();
});
});
7 changes: 7 additions & 0 deletions static/app/views/settings/account/notifications/notificationSettingsByType.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,10 @@ export function NotificationSettingsByType({notificationType}: Props) {
organization.features?.includes('logs-billing')
);

const hasPreventBilling = organizations.some(organization =>
organization.features?.includes('prevent-billing')
);

const excludeTransactions = hasOrgWithAm3 && !hasOrgWithoutAm3;
const includeSpans = hasOrgWithAm3;
const includeProfileDuration =
Expand All @@ -238,6 +242,9 @@ export function NotificationSettingsByType({notificationType}: Props) {
if (field.name.startsWith('quotaLogBytes') && !includeLogs) {
return false;
}
if (field.name.startsWith('quotaPrevent') && !hasPreventBilling) {
return false;
}
return true;
});
};
Expand Down
Loading