Remove v1 premium component (#12580)

Co-authored-by: Daniel James Smith <djsmith85@users.noreply.github.com>

apps/browser/src/billing/popup/settings/premium-v2.component.ts

@@ -21,7 +21,6 @@ import {
   SectionComponent,
 } from "@bitwarden/components";
 
-import { CurrentAccountComponent } from "../../../auth/popup/account-switching/current-account.component";
 import { PopOutComponent } from "../../../platform/popup/components/pop-out.component";
 import { PopupHeaderComponent } from "../../../platform/popup/layout/popup-header.component";
 import { PopupPageComponent } from "../../../platform/popup/layout/popup-page.component";
@@ -34,7 +33,6 @@ import { PopupPageComponent } from "../../../platform/popup/layout/popup-page.co
     ButtonModule,
     CardComponent,
     CommonModule,
-    CurrentAccountComponent,
     ItemModule,
     JslibModule,
     PopupPageComponent,

apps/browser/src/billing/popup/settings/premium.component.html

@@ -1,72 +0,0 @@
-<header>
-  <div class="left">
-    <button type="button" (click)="goBack()">
-      <span class="header-icon"><i class="bwi bwi-angle-left" aria-hidden="true"></i></span>
-      <span>{{ "back" | i18n }}</span>
-    </button>
-  </div>
-  <h1 class="center">
-    <span class="title">{{ "premiumMembership" | i18n }}</span>
-  </h1>
-  <div class="right"></div>
-</header>
-<main tabindex="-1">
-  <div class="content">
-    <ng-container *ngIf="!(isPremium$ | async)">
-      <p class="text-center lead">{{ "premiumNotCurrentMember" | i18n }}</p>
-      <p>{{ "premiumSignUpAndGet" | i18n }}</p>
-      <ul class="bwi-ul">
-        <li>
-          <i class="bwi bwi-li bwi-check text-success" aria-hidden="true"></i>
-          {{ "ppremiumSignUpStorage" | i18n }}
-        </li>
-        <li>
-          <i class="bwi bwi-li bwi-check text-success" aria-hidden="true"></i>
-          {{ "premiumSignUpTwoStepOptions" | i18n }}
-        </li>
-        <li>
-          <i class="bwi bwi-li bwi-check text-success" aria-hidden="true"></i>
-          {{ "ppremiumSignUpReports" | i18n }}
-        </li>
-        <li>
-          <i class="bwi bwi-li bwi-check text-success" aria-hidden="true"></i>
-          {{ "ppremiumSignUpTotp" | i18n }}
-        </li>
-        <li>
-          <i class="bwi bwi-li bwi-check text-success" aria-hidden="true"></i>
-          {{ "ppremiumSignUpSupport" | i18n }}
-        </li>
-        <li>
-          <i class="bwi bwi-li bwi-check text-success" aria-hidden="true"></i>
-          {{ "ppremiumSignUpFuture" | i18n }}
-        </li>
-      </ul>
-      <p class="text-center lead">{{ priceString }}</p>
-      <button type="button" class="btn primary block" (click)="purchase()">
-        <b>{{ "premiumPurchase" | i18n }}</b>
-      </button>
-      <button
-        #refreshBtn
-        type="button"
-        (click)="refresh()"
-        [disabled]="$any(refreshBtn).loading"
-        [appApiAction]="refreshPromise"
-        class="btn link block"
-      >
-        <span [hidden]="$any(refreshBtn).loading">{{ "premiumRefresh" | i18n }}</span>
-        <i
-          class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw"
-          [hidden]="!$any(refreshBtn).loading"
-          aria-hidden="true"
-        ></i>
-      </button>
-    </ng-container>
-    <ng-container *ngIf="isPremium$ | async">
-      <p class="text-center lead">{{ "premiumCurrentMember" | i18n }}</p>
-      <p class="text-center">{{ "premiumCurrentMemberThanks" | i18n }}</p>
-      <button type="button" class="btn block primary" (click)="manage()">
-        <b>{{ "premiumManage" | i18n }}</b>
-      </button>
-    </ng-container>
-  </div>
-</main>

apps/browser/src/billing/popup/settings/premium.component.ts

@@ -1,61 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { CurrencyPipe, Location } from "@angular/common";
-import { Component } from "@angular/core";
-
-import { PremiumComponent as BasePremiumComponent } from "@bitwarden/angular/vault/components/premium.component";
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
-import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { DialogService } from "@bitwarden/components";
-
-@Component({
-  selector: "app-premium",
-  templateUrl: "premium.component.html",
-})
-export class PremiumComponent extends BasePremiumComponent {
-  priceString: string;
-
-  constructor(
-    i18nService: I18nService,
-    platformUtilsService: PlatformUtilsService,
-    apiService: ApiService,
-    configService: ConfigService,
-    logService: LogService,
-    private location: Location,
-    private currencyPipe: CurrencyPipe,
-    dialogService: DialogService,
-    environmentService: EnvironmentService,
-    billingAccountProfileStateService: BillingAccountProfileStateService,
-  ) {
-    super(
-      i18nService,
-      platformUtilsService,
-      apiService,
-      configService,
-      logService,
-      dialogService,
-      environmentService,
-      billingAccountProfileStateService,
-    );
-
-    // Support old price string. Can be removed in future once all translations are properly updated.
-    const thePrice = this.currencyPipe.transform(this.price, "$");
-    // Safari extension crashes due to $1 appearing in the price string ($10.00). Escape the $ to fix.
-    const formattedPrice = this.platformUtilsService.isSafari()
-      ? thePrice.replace("$", "$$$")
-      : thePrice;
-    this.priceString = i18nService.t("premiumPrice", formattedPrice);
-    if (this.priceString.indexOf("%price%") > -1) {
-      this.priceString = this.priceString.replace("%price%", thePrice);
-    }
-  }
-
-  goBack() {
-    this.location.back();
-  }
-}

apps/browser/src/popup/app-routing.module.ts

@@ -81,7 +81,6 @@ import { ExcludedDomainsComponent } from "../autofill/popup/settings/excluded-do
 import { NotificationsSettingsV1Component } from "../autofill/popup/settings/notifications-v1.component";
 import { NotificationsSettingsComponent } from "../autofill/popup/settings/notifications.component";
 import { PremiumV2Component } from "../billing/popup/settings/premium-v2.component";
-import { PremiumComponent } from "../billing/popup/settings/premium.component";
 import BrowserPopupUtils from "../platform/popup/browser-popup-utils";
 import { popupRouterCacheGuard } from "../platform/popup/view-cache/popup-router-cache.service";
 import { CredentialGeneratorHistoryComponent } from "../tools/popup/generator/credential-generator-history.component";
@@ -395,12 +394,12 @@ const routes: Routes = [
     canActivate: [authGuard],
     data: { elevation: 2 } satisfies RouteDataProperties,
   }),
-  ...extensionRefreshSwap(PremiumComponent, PremiumV2Component, {
+  {
     path: "premium",
-    component: PremiumComponent,
+    component: PremiumV2Component,
     canActivate: [authGuard],
     data: { elevation: 1 } satisfies RouteDataProperties,
-  }),
+  },
   ...extensionRefreshSwap(AppearanceComponent, AppearanceV2Component, {
     path: "appearance",
     canActivate: [authGuard],

apps/browser/src/popup/app.module.ts

@@ -48,7 +48,6 @@ import { ExcludedDomainsV1Component } from "../autofill/popup/settings/excluded-
 import { ExcludedDomainsComponent } from "../autofill/popup/settings/excluded-domains.component";
 import { NotificationsSettingsV1Component } from "../autofill/popup/settings/notifications-v1.component";
 import { NotificationsSettingsComponent } from "../autofill/popup/settings/notifications.component";
-import { PremiumComponent } from "../billing/popup/settings/premium.component";
 import { PopOutComponent } from "../platform/popup/components/pop-out.component";
 import { HeaderComponent } from "../platform/popup/header.component";
 import { PopupFooterComponent } from "../platform/popup/layout/popup-footer.component";
@@ -155,7 +154,6 @@ import "../platform/popup/locales";
     NotificationsSettingsV1Component,
     AppearanceComponent,
     PasswordHistoryComponent,
-    PremiumComponent,
     RegisterComponent,
     SetPasswordComponent,
     VaultSettingsComponent,