Skip to content

[backport cloud/1.36] feat: local/legacy settings dialog fix #8004

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
christian-byrne merged 1 commit into from
Jan 13, 2026
Merged

[backport cloud/1.36] feat: local/legacy settings dialog fix #8004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/components/dialog/content/TopUpCreditsDialogContent.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ import Button from '@/components/ui/button/Button.vue'
import FormattedNumberStepper from '@/components/ui/stepper/FormattedNumberStepper.vue'
import { useFirebaseAuthActions } from '@/composables/auth/useFirebaseAuthActions'
import { useExternalLink } from '@/composables/useExternalLink'
import { useSubscription } from '@/platform/cloud/subscription/composables/useSubscription'
import { useTelemetry } from '@/platform/telemetry'
import { clearTopupTracking } from '@/platform/telemetry/topupTracker'
import { useDialogService } from '@/services/dialogService'
Expand All @@ -175,6 +176,7 @@ const dialogService = useDialogService()
const telemetry = useTelemetry()
const toast = useToast()
const { buildDocsUrl, docsPaths } = useExternalLink()
const { isSubscriptionEnabled } = useSubscription()

// Constants
const PRESET_AMOUNTS = [10, 25, 50, 100]
Expand Down Expand Up @@ -252,9 +254,11 @@ async function handleBuy() {
telemetry?.trackApiCreditTopupButtonPurchaseClicked(payAmount.value)
await authActions.purchaseCredits(payAmount.value)

// Close top-up dialog (keep tracking) and open subscription panel to show updated credits
// Close top-up dialog (keep tracking) and open credits panel to show updated balance
handleClose(false)
dialogService.showSettingsDialog('subscription')
dialogService.showSettingsDialog(
isSubscriptionEnabled() ? 'subscription' : 'credits'
)
} catch (error) {
console.error('Purchase failed:', error)

Expand Down
8 changes: 3 additions & 5 deletions src/platform/cloud/subscription/components/SubscriptionRequiredDialogContent.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,6 @@ import PricingTable from '@/platform/cloud/subscription/components/PricingTable.
import SubscribeButton from '@/platform/cloud/subscription/components/SubscribeButton.vue'
import SubscriptionBenefits from '@/platform/cloud/subscription/components/SubscriptionBenefits.vue'
import { useSubscription } from '@/platform/cloud/subscription/composables/useSubscription'
import { isCloud } from '@/platform/distribution/types'
import { useTelemetry } from '@/platform/telemetry'
import { useCommandStore } from '@/stores/commandStore'

Expand All @@ -140,7 +139,8 @@ const emit = defineEmits<{
close: [subscribed: boolean]
}>()

const { fetchStatus, isActiveSubscription } = useSubscription()
const { fetchStatus, isActiveSubscription, isSubscriptionEnabled } =
useSubscription()

// Legacy price for non-tier flow with locale-aware formatting
const formattedMonthlyPrice = new Intl.NumberFormat(
Expand All @@ -156,9 +156,7 @@ const commandStore = useCommandStore()
const telemetry = useTelemetry()

// Always show custom pricing table for cloud subscriptions
const showCustomPricingTable = computed(
() => isCloud && window.__CONFIG__?.subscription_required
)
const showCustomPricingTable = computed(() => isSubscriptionEnabled())

const POLL_INTERVAL_MS = 3000
const MAX_POLL_ATTEMPTS = 3
Expand Down
11 changes: 9 additions & 2 deletions src/platform/cloud/subscription/composables/useSubscription.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,11 @@ function useSubscriptionInternal() {
void showSubscriptionRequiredDialog()
}

const shouldWatchCancellation = (): boolean =>
/**
* Whether cloud subscription mode is enabled (cloud distribution with subscription_required config).
* Use to determine which UI to show (SubscriptionPanel vs LegacyCreditsPanel).
*/
const isSubscriptionEnabled = (): boolean =>
Boolean(isCloud && window.__CONFIG__?.subscription_required)

const { startCancellationWatcher, stopCancellationWatcher } =
Expand All @@ -130,7 +134,7 @@ function useSubscriptionInternal() {
isActiveSubscription: isSubscribedOrIsNotCloud,
subscriptionStatus,
telemetry,
shouldWatchCancellation
shouldWatchCancellation: isSubscriptionEnabled
})

const manageSubscription = async () => {
Expand Down Expand Up @@ -249,6 +253,9 @@ function useSubscriptionInternal() {
subscriptionTierName,
subscriptionStatus,

// Utilities
isSubscriptionEnabled,

// Actions
subscribe,
fetchStatus,
Expand Down
Loading