From d05015205b9700f77245fdba4b5fd3a719fc3809 Mon Sep 17 00:00:00 2001
From: Usman Baig <mubaig@pm.me>
Date: Thu, 22 Jan 2026 01:58:17 +0100
Subject: [PATCH] fix(settings): use user context for org id instead of local
 storage token

---
 components/settings/OrganizationSettings.tsx | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/components/settings/OrganizationSettings.tsx b/components/settings/OrganizationSettings.tsx
index 0d91bc3..a0023b8 100644
--- a/components/settings/OrganizationSettings.tsx
+++ b/components/settings/OrganizationSettings.tsx
@@ -57,15 +57,7 @@ export default function OrganizationSettings() {
   const [isSaving, setIsSaving] = useState(false)
 
   const getOrgIdFromToken = () => {
-    if (typeof window === 'undefined') return null
-    const token = localStorage.getItem('token')
-    if (!token) return null
-    try {
-        const payload = JSON.parse(atob(token.split('.')[1]))
-        return payload.org_id || null
-    } catch (e) {
-        return null
-    }
+    return user?.org_id || null
   }
 
   const currentOrgId = getOrgIdFromToken()