Updated

src/pages/dashboard/team.astro

@@ -8,12 +8,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 teamMembers = await db.select({
   member: members,
@@ -28,7 +36,7 @@ const currentUserMember = teamMembers.find(m => m.user.id === user.id);
 const isAdmin = currentUserMember?.member.role === 'owner' || currentUserMember?.member.role === 'admin';
 ---
 
-<DashboardLayout title="Team - Zamaan">
+<DashboardLayout title="Team - Chronus">
   <div class="flex justify-between items-center mb-6">
     <h1 class="text-3xl font-bold">Team Members</h1>
     <div class="flex gap-2">