From c1963f1bc302e0f45f64abcbdd7426bf7721ce67 Mon Sep 17 00:00:00 2001
From: Conner Turnbull <133619638+cturnbull-bitwarden@users.noreply.github.com>
Date: Mon, 4 Dec 2023 08:16:43 -0500
Subject: [PATCH] Cleaned up feature flag logic now that it's released (#7030)

---
 .../organizations/organization-plans.component.html |  6 +-----
 .../organizations/organization-plans.component.ts   | 13 ++-----------
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/apps/web/src/app/billing/organizations/organization-plans.component.html b/apps/web/src/app/billing/organizations/organization-plans.component.html
index 7b061a6fb5f..a77d42a3594 100644
--- a/apps/web/src/app/billing/organizations/organization-plans.component.html
+++ b/apps/web/src/app/billing/organizations/organization-plans.component.html
@@ -68,11 +68,7 @@
       </ng-container>
       <ng-template #nonEnterprisePlans>
         <ng-container
-          *ngIf="
-            teamsStarterPlanFeatureFlagIsEnabled &&
-              selectableProduct.product === productTypes.Teams;
-            else fullFeatureList
-          "
+          *ngIf="selectableProduct.product === productTypes.Teams; else fullFeatureList"
         >
           <small>• {{ "includeAllTeamsStarterFeatures" | i18n }}</small>
           <small>• {{ "chooseMonthlyOrAnnualBilling" | i18n }}</small>
diff --git a/apps/web/src/app/billing/organizations/organization-plans.component.ts b/apps/web/src/app/billing/organizations/organization-plans.component.ts
index 839bca4473a..b8dd447100d 100644
--- a/apps/web/src/app/billing/organizations/organization-plans.component.ts
+++ b/apps/web/src/app/billing/organizations/organization-plans.component.ts
@@ -255,10 +255,6 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
     return result;
   }
 
-  get teamsStarterPlanFeatureFlagIsEnabled(): boolean {
-    return this.passwordManagerPlans.some((plan) => plan.product === ProductType.TeamsStarter);
-  }
-
   get hasProvider() {
     return this.providerId != null;
   }
@@ -420,13 +416,8 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
     if (!this.formGroup.controls.businessOwned.value || this.selectedPlan.canBeUsedByBusiness) {
       return;
     }
-    if (this.teamsStarterPlanFeatureFlagIsEnabled) {
-      this.formGroup.controls.product.setValue(ProductType.TeamsStarter);
-      this.formGroup.controls.plan.setValue(PlanType.TeamsStarter);
-    } else {
-      this.formGroup.controls.product.setValue(ProductType.Teams);
-      this.formGroup.controls.plan.setValue(PlanType.TeamsAnnually);
-    }
+    this.formGroup.controls.product.setValue(ProductType.TeamsStarter);
+    this.formGroup.controls.plan.setValue(PlanType.TeamsStarter);
     this.changedProduct();
   }