From 1ebdab9b227ce6eb0d3023fe3157fc37888b4946 Mon Sep 17 00:00:00 2001
From: bymyself <cbyrne@comfy.org>
Date: Sat, 6 Dec 2025 15:23:54 -0800
Subject: [PATCH] fix: use subscription requirement flag in cloud remote config

---
 src/extensions/core/cloudRemoteConfig.ts                      | 4 ++--
 .../cloud/subscription/composables/useSubscription.ts         | 4 ----
 .../composables/useSubscriptionCancellationWatcher.ts         | 1 -
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/extensions/core/cloudRemoteConfig.ts b/src/extensions/core/cloudRemoteConfig.ts
index 0628800d8..fa7b67012 100644
--- a/src/extensions/core/cloudRemoteConfig.ts
+++ b/src/extensions/core/cloudRemoteConfig.ts
@@ -15,10 +15,10 @@ useExtensionService().registerExtension({
 
   setup: async () => {
     const { isLoggedIn } = useCurrentUser()
-    const { isActiveSubscription } = useSubscription()
+    const { isSubscriptionRequirementMet } = useSubscription()
 
     watchDebounced(
-      [isLoggedIn, isActiveSubscription],
+      [isLoggedIn, isSubscriptionRequirementMet],
       () => {
         if (!isLoggedIn.value) return
         void refreshRemoteConfig()
diff --git a/src/platform/cloud/subscription/composables/useSubscription.ts b/src/platform/cloud/subscription/composables/useSubscription.ts
index e1153d48a..fd3a652fe 100644
--- a/src/platform/cloud/subscription/composables/useSubscription.ts
+++ b/src/platform/cloud/subscription/composables/useSubscription.ts
@@ -36,7 +36,6 @@ function useSubscriptionInternal() {
 
     return subscriptionStatus.value?.is_active ?? false
   })
-  const isActiveSubscription = isSubscriptionRequirementMet
   const { reportError, accessBillingPortal } = useFirebaseAuthActions()
   const dialogService = useDialogService()
 
@@ -113,7 +112,6 @@ function useSubscriptionInternal() {
     useSubscriptionCancellationWatcher({
       fetchStatus,
       isSubscriptionRequirementMet,
-      legacyIsActiveSubscription: isActiveSubscription,
       subscriptionStatus,
       telemetry,
       shouldWatchCancellation
@@ -226,8 +224,6 @@ function useSubscriptionInternal() {
   return {
     // State
     isSubscriptionRequirementMet,
-    // Deprecated alias for older call sites
-    isActiveSubscription,
     isCancelled,
     formattedRenewalDate,
     formattedEndDate,
diff --git a/src/platform/cloud/subscription/composables/useSubscriptionCancellationWatcher.ts b/src/platform/cloud/subscription/composables/useSubscriptionCancellationWatcher.ts
index eef5ed250..83b886d26 100644
--- a/src/platform/cloud/subscription/composables/useSubscriptionCancellationWatcher.ts
+++ b/src/platform/cloud/subscription/composables/useSubscriptionCancellationWatcher.ts
@@ -13,7 +13,6 @@ const CANCELLATION_BACKOFF_MULTIPLIER = 3 // 5s, 15s, 45s, 135s intervals
 type CancellationWatcherOptions = {
   fetchStatus: () => Promise<CloudSubscriptionStatusResponse | null | void>
   isSubscriptionRequirementMet: ComputedRef<boolean>
-  legacyIsActiveSubscription?: ComputedRef<boolean>
   subscriptionStatus: Ref<CloudSubscriptionStatusResponse | null>
   telemetry: Pick<TelemetryProvider, 'trackMonthlySubscriptionCancelled'> | null
   shouldWatchCancellation: () => boolean