From 9e99becb430f14521b102842e4ac2943f5756bbf Mon Sep 17 00:00:00 2001
From: Matt Aitken <matt@mattaitken.com>
Date: Tue, 17 Jun 2025 11:00:36 +0100
Subject: [PATCH 1/2] Remove unused hook

---
 apps/webapp/app/components/navigation/SideMenu.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/apps/webapp/app/components/navigation/SideMenu.tsx b/apps/webapp/app/components/navigation/SideMenu.tsx
index 5ee7badc35..efa43603dc 100644
--- a/apps/webapp/app/components/navigation/SideMenu.tsx
+++ b/apps/webapp/app/components/navigation/SideMenu.tsx
@@ -584,8 +584,6 @@ function SelectorDivider() {
 }
 
 function HelpAndAI() {
-  const features = useFeatures();
-
   return (
     <>
       <ShortcutsAutoOpen />

From b4e9187baa816d417d2378ee7460a8377dc42e33 Mon Sep 17 00:00:00 2001
From: Matt Aitken <matt@mattaitken.com>
Date: Tue, 17 Jun 2025 11:00:55 +0100
Subject: [PATCH 2/2] The Impersonation button was causing DOM hydration issues

---
 apps/webapp/app/components/ImpersonationBanner.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/webapp/app/components/ImpersonationBanner.tsx b/apps/webapp/app/components/ImpersonationBanner.tsx
index 1ef5bff641..a459f78a05 100644
--- a/apps/webapp/app/components/ImpersonationBanner.tsx
+++ b/apps/webapp/app/components/ImpersonationBanner.tsx
@@ -9,7 +9,7 @@ export function ImpersonationBanner() {
       <Form action="/resources/impersonation" method="delete" reloadDocument>
         <TooltipProvider disableHoverableContent={true}>
           <Tooltip>
-            <TooltipTrigger>
+            <TooltipTrigger asChild>
               <Button
                 type="submit"
                 variant="small-menu-item"