From 5216049d334191f75c0a7734853944aab96edbab Mon Sep 17 00:00:00 2001 From: Vikhyath Mondreti Date: Sat, 25 Oct 2025 09:59:57 -1000 Subject: [PATCH] fix(billing): should allow restoring subscription (#1728) * fix(already-cancelled-sub): UI should allow restoring subscription * restore functionality fixed * fix --- .../cancel-subscription/cancel-subscription.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/subscription/components/cancel-subscription/cancel-subscription.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/subscription/components/cancel-subscription/cancel-subscription.tsx index c11b6b5d684..99f6bef1054 100644 --- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/subscription/components/cancel-subscription/cancel-subscription.tsx +++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/subscription/components/cancel-subscription/cancel-subscription.tsx @@ -139,8 +139,9 @@ export function CancelSubscription({ subscription, subscriptionData }: CancelSub let subscriptionId: string | undefined if ((subscriptionStatus.isTeam || subscriptionStatus.isEnterprise) && activeOrgId) { + const orgSubscription = useOrganizationStore.getState().subscriptionData referenceId = activeOrgId - subscriptionId = subData?.data?.id + subscriptionId = orgSubscription?.id } else { // For personal subscriptions, use user ID and let better-auth find the subscription referenceId = session.user.id @@ -160,8 +161,7 @@ export function CancelSubscription({ subscription, subscriptionData }: CancelSub logger.info('Subscription restored successfully', result) } - // Invalidate queries to refresh data - await queryClient.invalidateQueries({ queryKey: subscriptionKeys.user() }) + await refresh() if (activeOrgId) { await queryClient.invalidateQueries({ queryKey: organizationKeys.detail(activeOrgId) }) await queryClient.invalidateQueries({ queryKey: organizationKeys.billing(activeOrgId) }) @@ -282,7 +282,7 @@ export function CancelSubscription({ subscription, subscriptionData }: CancelSub {(() => { - const subscriptionStatus = currentSubscriptionStatus + const subscriptionStatus = getSubscriptionStatus() if (subscriptionStatus.isPaid && isCancelAtPeriodEnd) { return (