From ff846d2fab12ae6c6425fafef4e7a5fc473a55af Mon Sep 17 00:00:00 2001
From: Alex Morask <144709477+amorask-bitwarden@users.noreply.github.com>
Date: Mon, 28 Apr 2025 14:38:48 -0400
Subject: [PATCH] [PM-20300] Fix self-serve resubscribe bugs (#14296)

* Address bugs

* Cy's feedback

* Cy's feedback
---
 .../billing/organizations/change-plan-dialog.component.html | 2 +-
 .../billing/organizations/change-plan-dialog.component.ts   | 2 +-
 .../organization-subscription-cloud.component.ts            | 6 +++++-
 apps/web/src/locales/en/messages.json                       | 3 +++
 4 files changed, 10 insertions(+), 3 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 64a694cdef0..464890809f5 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">
-        {{ "upgrade" | i18n }}
+        {{ sub.subscription.status === "canceled" ? ("restart" | i18n) : ("upgrade" | i18n) }}
       </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 589b96463a1..0c5b47aeed3 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
@@ -744,7 +744,7 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
 
     const doSubmit = async (): Promise<string> => {
       let orgId: string = null;
-      if (this.isSubscriptionCanceled) {
+      if (this.sub.subscription.status === "canceled") {
         await this.restartSubscription();
         orgId = this.organizationId;
       } else {
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 f20d447b093..2405dc2f221 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
@@ -494,7 +494,11 @@ export class OrganizationSubscriptionCloudComponent implements OnInit, OnDestroy
   };
 
   get showChangePlanButton() {
-    return this.sub.plan.productTier !== ProductTierType.Enterprise && !this.showChangePlan;
+    return (
+      !this.showChangePlan &&
+      this.sub.plan.productTier !== ProductTierType.Enterprise &&
+      !this.sub.subscription.cancelled
+    );
   }
 
   get canUseBillingSync() {
diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index bc87ec05fbd..dc6a877a535 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -10628,5 +10628,8 @@
   },
   "newBusinessUnit": {
     "message": "New business unit"
+  },
+  "restart": {
+    "message": "Restart"
   }
 }