feat(billing): remove override check when starting DS trial (#89659)

Author: vbro

static/gsAdmin/components/trialSubscriptionAction.spec.tsx

@@ -116,7 +116,6 @@ describe('TrialSubscriptionAction', function () {
             isFree: true,
           })}
           startEnterpriseTrial
-          canUseTrialOverride
           {...deps}
         />
       ),
@@ -138,32 +137,6 @@ describe('TrialSubscriptionAction', function () {
     });
   });
 
-  it('cannot use trialPlanOverride if disabled', async function () {
-    jest.mock('sentry/components/core/alert');
-
-    openAdminConfirmModal({
-      onConfirm,
-      renderModalSpecificContent: deps => (
-        <TrialSubscriptionAction
-          subscription={SubscriptionFixture({
-            organization,
-            plan: 'am3_f',
-            isFree: true,
-          })}
-          startEnterpriseTrial
-          {...deps}
-        />
-      ),
-    });
-
-    renderGlobalModal();
-
-    await userEvent.click(screen.getByTestId('trial-plan-tier-choices'));
-    const trialTierInputs = within(screen.getByRole('dialog')).getAllByRole('textbox');
-    await userEvent.click(trialTierInputs[0]!);
-    expect(screen.queryByText('am3 with Dynamic Sampling')).not.toBeInTheDocument();
-  });
-
   it('displays correct trial end date when starting trial', async function () {
     jest.mock('sentry/components/core/alert');
 

static/gsAdmin/components/trialSubscriptionAction.tsx

@@ -14,7 +14,6 @@ import {PlanTier} from 'getsentry/types';
 
 type Props = AdminConfirmRenderProps & {
   subscription: Subscription;
-  canUseTrialOverride?: boolean;
   startEnterpriseTrial?: boolean;
 };
 
@@ -76,7 +75,7 @@ class TrialSubscriptionAction extends Component<Props, State> {
   }
 
   render() {
-    const {subscription, startEnterpriseTrial, canUseTrialOverride = false} = this.props;
+    const {subscription, startEnterpriseTrial} = this.props;
     const {trialDays, trialTier, trialPlanOverride} = this.state;
     const AM3_ENTERPRISE_TRIAL_PLAN = 'am3_t_ent_ds';
 
@@ -91,11 +90,8 @@ class TrialSubscriptionAction extends Component<Props, State> {
 
     const tierChoices: Array<[string | PlanTier, string | PlanTier]> = [];
 
-    // TODO(DS Spans): remove canUseTrialOverride once we've launched
-    if (canUseTrialOverride) {
-      // TODO(DS Spans): remove this if we ever put DS on the regular AM3 enterprise trial
-      tierChoices.push([AM3_ENTERPRISE_TRIAL_PLAN, 'am3 with Dynamic Sampling']);
-    }
+    // TODO(DS Spans): remove this if we ever put DS on the regular AM3 enterprise trial
+    tierChoices.push([AM3_ENTERPRISE_TRIAL_PLAN, 'am3 with Dynamic Sampling']);
 
     tierChoices.push(
       [PlanTier.AM3, PlanTier.AM3],

static/gsAdmin/views/customerDetails.tsx

@@ -527,7 +527,6 @@ class CustomerDetails extends DeprecatedAsyncComponent<Props, State> {
                   <TrialSubscriptionAction
                     subscription={data}
                     startEnterpriseTrial
-                    canUseTrialOverride={hasAdminTestFeatures}
                     {...deps}
                   />
                 ),
@@ -651,7 +650,7 @@ class CustomerDetails extends DeprecatedAsyncComponent<Props, State> {
                   orgId,
                   subscription: data,
                   billingConfig,
-                  canProvisionDsPlan: hasAdminTestFeatures,
+                  canProvisionDsPlan: true,
                   onSuccess: () => this.reloadData(),
                 }),
             },