From a5db8ef2d8eb1006604c0dfba39cc9959f0fe3b2 Mon Sep 17 00:00:00 2001
From: Conner Turnbull <133619638+cturnbull-bitwarden@users.noreply.github.com>
Date: Wed, 1 Apr 2026 13:58:56 -0400
Subject: [PATCH] Remove pm-23341-milestone-2 flagged logic from
 user-subscription component (#19867)

Remove the enableDiscountDisplay$ feature flag observable and collapse the
ngIf/else template to always show the discount badge. The badge handles
null/no-discount gracefully.
---
 .../user-subscription.component.html          | 25 ++++++-------------
 .../individual/user-subscription.component.ts |  7 ------
 2 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/apps/web/src/app/billing/individual/user-subscription.component.html b/apps/web/src/app/billing/individual/user-subscription.component.html
index 89c4c08e9ab..c8e15a25846 100644
--- a/apps/web/src/app/billing/individual/user-subscription.component.html
+++ b/apps/web/src/app/billing/individual/user-subscription.component.html
@@ -55,23 +55,14 @@
         <div class="tw-font-semibold tw-mb-2 tw-text-right">{{ "nextChargeHeader" | i18n }}</div>
         <div>
           <ng-container *ngIf="subscription">
-            <ng-container *ngIf="enableDiscountDisplay$ | async as enableDiscount; else noDiscount">
-              <div class="tw-flex tw-items-center tw-gap-2 tw-flex-wrap tw-justify-end">
-                <span [attr.aria-label]="'nextChargeDate' | i18n">
-                  {{ sub.subscription.periodEndDate | date: "MMM d, y" }}
-                </span>
-                <billing-discount-badge
-                  [discount]="getDiscount(sub?.customerDiscount)"
-                ></billing-discount-badge>
-              </div>
-            </ng-container>
-            <ng-template #noDiscount>
-              <div class="tw-flex tw-items-center tw-gap-2 tw-flex-wrap tw-justify-end">
-                <span [attr.aria-label]="'nextChargeDate' | i18n">
-                  {{ sub.subscription.periodEndDate | date: "MMM d, y" }}
-                </span>
-              </div>
-            </ng-template>
+            <div class="tw-flex tw-items-center tw-gap-2 tw-flex-wrap tw-justify-end">
+              <span [attr.aria-label]="'nextChargeDate' | i18n">
+                {{ sub.subscription.periodEndDate | date: "MMM d, y" }}
+              </span>
+              <billing-discount-badge
+                [discount]="getDiscount(sub?.customerDiscount)"
+              ></billing-discount-badge>
+            </div>
           </ng-container>
           <span
             *ngIf="!subscription"
diff --git a/apps/web/src/app/billing/individual/user-subscription.component.ts b/apps/web/src/app/billing/individual/user-subscription.component.ts
index 5034b21d03d..160d3b78f1f 100644
--- a/apps/web/src/app/billing/individual/user-subscription.component.ts
+++ b/apps/web/src/app/billing/individual/user-subscription.component.ts
@@ -9,8 +9,6 @@ import { AccountService } from "@bitwarden/common/auth/abstractions/account.serv
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
 import { BillingCustomerDiscount } from "@bitwarden/common/billing/models/response/organization-subscription.response";
 import { SubscriptionResponse } from "@bitwarden/common/billing/models/response/subscription.response";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { FileDownloadService } from "@bitwarden/common/platform/abstractions/file-download/file-download.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
@@ -47,10 +45,6 @@ export class UserSubscriptionComponent implements OnInit {
   cancelPromise: Promise<any>;
   reinstatePromise: Promise<any>;
 
-  protected enableDiscountDisplay$ = this.configService.getFeatureFlag$(
-    FeatureFlag.PM23341_Milestone_2,
-  );
-
   constructor(
     private apiService: ApiService,
     private platformUtilsService: PlatformUtilsService,
@@ -63,7 +57,6 @@ export class UserSubscriptionComponent implements OnInit {
     private billingAccountProfileStateService: BillingAccountProfileStateService,
     private toastService: ToastService,
     private accountService: AccountService,
-    private configService: ConfigService,
   ) {
     this.selfHosted = this.platformUtilsService.isSelfHost();
   }