From cdb69b014b28a23bbe6115e8b5d4e42f2d500093 Mon Sep 17 00:00:00 2001
From: Mortezakoohjani <morteza.koohjani4045@gmail.com>
Date: Sun, 26 Jul 2026 18:31:47 +0330
Subject: [PATCH] Avoid tenant loading flash when me session is already cached.

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 frontend/hooks/useTenantId.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/hooks/useTenantId.ts b/frontend/hooks/useTenantId.ts
index e957d79..7ea27b4 100644
--- a/frontend/hooks/useTenantId.ts
+++ b/frontend/hooks/useTenantId.ts
@@ -2,12 +2,12 @@
 
 import { useMe } from "@/hooks/useMe";
 
-/** Tenant ID جاری برای هدر X-Tenant-ID سرویس حسابداری. */
+/** Tenant ID جاری برای هدر X-Tenant-ID سرویس حسابداری (از کش مشترک useMe). */
 export function useTenantId() {
   const { me, loading, error } = useMe();
   return {
     tenantId: me?.current_tenant_id ?? null,
-    loading,
+    loading: loading && !me,
     error,
     me,
   };