Updated

src/pages/dashboard/categories.astro

@@ -7,12 +7,20 @@ import { eq } from 'drizzle-orm';
 const user = Astro.locals.user;
 if (!user) return Astro.redirect('/login');
 
-const userMembership = await db.select()
+// Get current team from cookie
+const currentTeamId = Astro.cookies.get('currentTeamId')?.value;
+
+const userMemberships = await db.select()
   .from(members)
   .where(eq(members.userId, user.id))
-  .get();
+  .all();
 
-if (!userMembership) return Astro.redirect('/dashboard');
+if (userMemberships.length === 0) return Astro.redirect('/dashboard');
+
+// Use current team or fallback to first membership
+const userMembership = currentTeamId 
+  ? userMemberships.find(m => m.organizationId === currentTeamId) || userMemberships[0]
+  : userMemberships[0];
 
 const allCategories = await db.select()
   .from(categories)
@@ -20,7 +28,7 @@ const allCategories = await db.select()
   .all();
 ---
 
-<DashboardLayout title="Categories - Zamaan">
+<DashboardLayout title="Categories - Chronus">
   <div class="flex justify-between items-center mb-6">
     <h1 class="text-3xl font-bold">Categories</h1>
     <a href="/dashboard/categories/new" class="btn btn-primary">Add Category</a>