From a35d004059c9f2f3f44aef72463620abb621497f Mon Sep 17 00:00:00 2001
From: Alex Morask <144709477+amorask-bitwarden@users.noreply.github.com>
Date: Tue, 29 Apr 2025 12:03:33 -0400
Subject: [PATCH] Fix upgrade/change plan for free organization (#14537)

---
 .../change-plan-dialog.component.html           |  2 +-
 .../change-plan-dialog.component.ts             | 17 ++++++++++++++---
 ...organization-subscription-cloud.component.ts |  2 +-
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/apps/web/src/app/billing/organizations/change-plan-dialog.component.html b/apps/web/src/app/billing/organizations/change-plan-dialog.component.html
index 464890809f5..7d898a1307b 100644
--- a/apps/web/src/app/billing/organizations/change-plan-dialog.component.html
+++ b/apps/web/src/app/billing/organizations/change-plan-dialog.component.html
@@ -983,7 +983,7 @@
     </div>
     <ng-container bitDialogFooter>
       <button bitButton bitFormButton buttonType="primary" type="submit">
-        {{ sub.subscription.status === "canceled" ? ("restart" | i18n) : ("upgrade" | i18n) }}
+        {{ submitButtonLabel }}
       </button>
       <button bitButton buttonType="secondary" type="button" [bitDialogClose]="ResultType.Closed">
         {{ "cancel" | i18n }}
diff --git a/apps/web/src/app/billing/organizations/change-plan-dialog.component.ts b/apps/web/src/app/billing/organizations/change-plan-dialog.component.ts
index 0c5b47aeed3..8cff90edd5b 100644
--- a/apps/web/src/app/billing/organizations/change-plan-dialog.component.ts
+++ b/apps/web/src/app/billing/organizations/change-plan-dialog.component.ts
@@ -12,7 +12,7 @@ import {
 } from "@angular/core";
 import { FormBuilder, Validators } from "@angular/forms";
 import { Router } from "@angular/router";
-import { Subject, firstValueFrom, map, switchMap, takeUntil } from "rxjs";
+import { firstValueFrom, map, Subject, switchMap, takeUntil } from "rxjs";
 
 import { ManageTaxInformationComponent } from "@bitwarden/angular/billing/components";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
@@ -31,10 +31,10 @@ import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import {
   BillingApiServiceAbstraction,
   BillingInformation,
+  OrganizationBillingServiceAbstraction as OrganizationBillingService,
   OrganizationInformation,
   PaymentInformation,
   PlanInformation,
-  OrganizationBillingServiceAbstraction as OrganizationBillingService,
 } from "@bitwarden/common/billing/abstractions";
 import { TaxServiceAbstraction } from "@bitwarden/common/billing/abstractions/tax.service.abstraction";
 import {
@@ -744,7 +744,7 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
 
     const doSubmit = async (): Promise<string> => {
       let orgId: string = null;
-      if (this.sub.subscription.status === "canceled") {
+      if (this.sub?.subscription?.status === "canceled") {
         await this.restartSubscription();
         orgId = this.organizationId;
       } else {
@@ -1089,4 +1089,15 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
       this.isSubscriptionCanceled
     );
   }
+
+  get submitButtonLabel(): string {
+    if (
+      this.organization.productTierType !== ProductTierType.Free &&
+      this.sub.subscription.status === "canceled"
+    ) {
+      return this.i18nService.t("restart");
+    } else {
+      return this.i18nService.t("upgrade");
+    }
+  }
 }
diff --git a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts
index 2405dc2f221..5cbaf940695 100644
--- a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts
+++ b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts
@@ -497,7 +497,7 @@ export class OrganizationSubscriptionCloudComponent implements OnInit, OnDestroy
     return (
       !this.showChangePlan &&
       this.sub.plan.productTier !== ProductTierType.Enterprise &&
-      !this.sub.subscription.cancelled
+      !this.sub.subscription?.cancelled
     );
   }