From 4af5daa298682d41812a3918fb9c19c9b84411b5 Mon Sep 17 00:00:00 2001
From: Usman Baig <mubaig@pm.me>
Date: Wed, 25 Mar 2026 23:01:58 +0100
Subject: [PATCH] =?UTF-8?q?fix:=20wait=20for=20integration=20status=20to?=
 =?UTF-8?q?=20load=20before=20rendering=20cards=20=E2=80=94=20prevents=20f?=
 =?UTF-8?q?lash?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../settings/unified/tabs/SiteIntegrationsTab.tsx    | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/components/settings/unified/tabs/SiteIntegrationsTab.tsx b/components/settings/unified/tabs/SiteIntegrationsTab.tsx
index 178f399..4f56c93 100644
--- a/components/settings/unified/tabs/SiteIntegrationsTab.tsx
+++ b/components/settings/unified/tabs/SiteIntegrationsTab.tsx
@@ -262,10 +262,18 @@ function BunnySetupForm({ siteId, onConnected }: { siteId: string; onConnected:
 }
 
 export default function SiteIntegrationsTab({ siteId }: { siteId: string }) {
-  const { data: gscStatus, mutate: mutateGSC } = useGSCStatus(siteId)
-  const { data: bunnyStatus, mutate: mutateBunny } = useBunnyStatus(siteId)
+  const { data: gscStatus, isLoading: gscLoading, mutate: mutateGSC } = useGSCStatus(siteId)
+  const { data: bunnyStatus, isLoading: bunnyLoading, mutate: mutateBunny } = useBunnyStatus(siteId)
   const [showBunnySetup, setShowBunnySetup] = useState(false)
 
+  if (gscLoading || bunnyLoading) {
+    return (
+      <div className="flex items-center justify-center py-12">
+        <Spinner className="w-6 h-6 text-neutral-500" />
+      </div>
+    )
+  }
+
   const handleConnectGSC = async () => {
     try {
       const data = await getGSCAuthURL(siteId)