From 8c3b1b6c7d0252f3f8ab8f75375e700e2ebe8c3d Mon Sep 17 00:00:00 2001
From: Harsh Mahajan <127186841+HarshMN2345@users.noreply.github.com>
Date: Tue, 14 Oct 2025 14:48:44 +0530
Subject: [PATCH] use page currentPlan for limits to refresh button state on
 org switch

---
 .../(console)/organization-[organization]/+page.svelte     | 7 ++++---
 .../(console)/organization-[organization]/header.svelte    | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/routes/(console)/organization-[organization]/+page.svelte b/src/routes/(console)/organization-[organization]/+page.svelte
index cd2417f29..947d507d1 100644
--- a/src/routes/(console)/organization-[organization]/+page.svelte
+++ b/src/routes/(console)/organization-[organization]/+page.svelte
@@ -83,12 +83,13 @@
     }
 
     $: projectCreationDisabled =
-        (isCloud && getServiceLimit('projects') <= data.projects.total) ||
+        (isCloud && getServiceLimit('projects', null, data.currentPlan) <= data.projects.total) ||
         (isCloud && $readOnly && !GRACE_PERIOD_OVERRIDE) ||
         !$canWriteProjects;
 
-    $: reachedProjectLimit = isCloud && getServiceLimit('projects') <= data.projects.total;
-    $: projectsLimit = getServiceLimit('projects');
+    $: reachedProjectLimit =
+        isCloud && getServiceLimit('projects', null, data.currentPlan) <= data.projects.total;
+    $: projectsLimit = getServiceLimit('projects', null, data.currentPlan);
 
     $: $registerCommands([
         {
diff --git a/src/routes/(console)/organization-[organization]/header.svelte b/src/routes/(console)/organization-[organization]/header.svelte
index 1a81ae48c..38ec2a743 100644
--- a/src/routes/(console)/organization-[organization]/header.svelte
+++ b/src/routes/(console)/organization-[organization]/header.svelte
@@ -29,7 +29,7 @@
     let areMembersLimited: boolean = $state(false);
 
     $effect(() => {
-        const limit = getServiceLimit('members') || Infinity;
+        const limit = getServiceLimit('members', null, page.data.currentPlan) || Infinity;
         const isLimited = limit !== 0 && limit < Infinity;
         areMembersLimited =
             isCloud &&