fix: use subscription requirement flag in cloud remote config

This commit is contained in:
bymyself
2025-12-06 15:23:54 -08:00
parent 6fb677feca
commit 1ebdab9b22
3 changed files with 2 additions and 7 deletions

View File

@@ -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()

View File

@@ -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,

View File

@@ -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