From 27dc3a64d2e024381266f8a78f640515ca487b87 Mon Sep 17 00:00:00 2001
From: Ingo Wolf <me@ingowolf.au>
Date: Sun, 8 Mar 2026 15:38:05 +1100
Subject: [PATCH 1/3] fix hydration error

---
 .../components/organizer/sidebar/user.svelte   | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/lib/components/organizer/sidebar/user.svelte b/src/lib/components/organizer/sidebar/user.svelte
index 30868c7..7a7ec91 100644
--- a/src/lib/components/organizer/sidebar/user.svelte
+++ b/src/lib/components/organizer/sidebar/user.svelte
@@ -10,6 +10,8 @@
 	import { goto } from '$app/navigation';
 	import { useQuery } from 'convex-svelte';
 	import { useAuth } from '@mmailaender/convex-better-auth-svelte/svelte';
+	import { cn } from '$lib/utils';
+	import { sidebarMenuButtonVariants } from '$lib/components/ui/sidebar/sidebar-menu-button.svelte';
 
 	const {
 		data
@@ -33,14 +35,14 @@
 
 <Sidebar.MenuItem>
 	<DropdownMenu.Root>
-		<DropdownMenu.Trigger class="w-full">
-			<Sidebar.MenuButton size="lg" class="cursor-pointer border shadow-xs">
-				<Avatar.Root>
-					<Avatar.Fallback>{user.data?.name?.charAt(0) || ''}</Avatar.Fallback>
-				</Avatar.Root>
-				{user.data?.name}
-				<ChevronUpIcon class="mr-1 ml-auto transition-transform in-data-[state=open]:rotate-180" />
-			</Sidebar.MenuButton>
+		<DropdownMenu.Trigger
+			class={cn('cursor-pointer border shadow-xs' + sidebarMenuButtonVariants({ size: 'lg' }))}
+		>
+			<Avatar.Root>
+				<Avatar.Fallback>{user.data?.name?.charAt(0) || ''}</Avatar.Fallback>
+			</Avatar.Root>
+			{user.data?.name}
+			<ChevronUpIcon class="mr-1 ml-auto transition-transform in-data-[state=open]:rotate-180" />
 		</DropdownMenu.Trigger>
 		<DropdownMenu.Content align="end">
 			<DropdownMenu.Group>

From 7d4db28a60344b28fed175b9120fb9fe908a663d Mon Sep 17 00:00:00 2001
From: Ingo Wolf <me@ingowolf.au>
Date: Sun, 8 Mar 2026 15:41:27 +1100
Subject: [PATCH 2/3] fix another hydration issue

---
 src/lib/components/organizer/sidebar/sidebar-toggle.svelte | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/lib/components/organizer/sidebar/sidebar-toggle.svelte b/src/lib/components/organizer/sidebar/sidebar-toggle.svelte
index df5999a..d9a8859 100644
--- a/src/lib/components/organizer/sidebar/sidebar-toggle.svelte
+++ b/src/lib/components/organizer/sidebar/sidebar-toggle.svelte
@@ -21,7 +21,9 @@
 >
 	<Tooltip.Root>
 		<Tooltip.Trigger>
-			<Sidebar.Trigger />
+			{#snippet child({ props })}
+				<Sidebar.Trigger {...props} />
+			{/snippet}
 		</Tooltip.Trigger>
 		<Tooltip.Content collisionPadding={16}>
 			<KbdGroup>

From a4893fe9117242e6d25c57886ee2b715cbc8be53 Mon Sep 17 00:00:00 2001
From: Ingo Wolf <me@ingowolf.au>
Date: Sun, 8 Mar 2026 15:52:01 +1100
Subject: [PATCH 3/3] use a cleaner solution

---
 .../components/organizer/sidebar/user.svelte  | 25 ++++++++++++-------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/lib/components/organizer/sidebar/user.svelte b/src/lib/components/organizer/sidebar/user.svelte
index 7a7ec91..cb6e67e 100644
--- a/src/lib/components/organizer/sidebar/user.svelte
+++ b/src/lib/components/organizer/sidebar/user.svelte
@@ -11,7 +11,6 @@
 	import { useQuery } from 'convex-svelte';
 	import { useAuth } from '@mmailaender/convex-better-auth-svelte/svelte';
 	import { cn } from '$lib/utils';
-	import { sidebarMenuButtonVariants } from '$lib/components/ui/sidebar/sidebar-menu-button.svelte';
 
 	const {
 		data
@@ -35,14 +34,22 @@
 
 <Sidebar.MenuItem>
 	<DropdownMenu.Root>
-		<DropdownMenu.Trigger
-			class={cn('cursor-pointer border shadow-xs' + sidebarMenuButtonVariants({ size: 'lg' }))}
-		>
-			<Avatar.Root>
-				<Avatar.Fallback>{user.data?.name?.charAt(0) || ''}</Avatar.Fallback>
-			</Avatar.Root>
-			{user.data?.name}
-			<ChevronUpIcon class="mr-1 ml-auto transition-transform in-data-[state=open]:rotate-180" />
+		<DropdownMenu.Trigger class="w-full">
+			{#snippet child({ props })}
+				<Sidebar.MenuButton
+					size="lg"
+					{...props}
+					class={cn('cursor-pointer border shadow-xs' + props.class)}
+				>
+					<Avatar.Root>
+						<Avatar.Fallback>{user.data?.name?.charAt(0) || ''}</Avatar.Fallback>
+					</Avatar.Root>
+					{user.data?.name}
+					<ChevronUpIcon
+						class="mr-1 ml-auto transition-transform in-data-[state=open]:rotate-180"
+					/>
+				</Sidebar.MenuButton>
+			{/snippet}
 		</DropdownMenu.Trigger>
 		<DropdownMenu.Content align="end">
 			<DropdownMenu.Group>