From 294fa3d8bac62515e7f173fed30bd0b034d699d1 Mon Sep 17 00:00:00 2001
From: Francesco Sansalvadore <f.sansalvadore@gmail.com>
Date: Fri, 27 Mar 2026 22:43:23 +0100
Subject: [PATCH] fix nav v2 build

---
 .../ProjectBranchSelectorTrigger.tsx          | 77 +++++++++----------
 .../layouts/NavigationV2/ProjectLayoutV2.tsx  |  2 +-
 2 files changed, 39 insertions(+), 40 deletions(-)

diff --git a/apps/studio/components/layouts/Navigation/NavigationBar/ProjectBranchSelectorTrigger.tsx b/apps/studio/components/layouts/Navigation/NavigationBar/ProjectBranchSelectorTrigger.tsx
index b2bf073ebbe..a35d8ecf8eb 100644
--- a/apps/studio/components/layouts/Navigation/NavigationBar/ProjectBranchSelectorTrigger.tsx
+++ b/apps/studio/components/layouts/Navigation/NavigationBar/ProjectBranchSelectorTrigger.tsx
@@ -1,7 +1,8 @@
 import { useIsNavigationV2Enabled } from 'components/interfaces/App/FeaturePreview/FeaturePreviewContext'
 import { ChevronsUpDown, GitBranch } from 'lucide-react'
-import { cn, SidebarMenuButton as SidebarMenuButtonComponent } from 'ui'
+import * as React from 'react'
 import { forwardRef } from 'react'
+import { cn, SidebarMenuButton as SidebarMenuButtonComponent } from 'ui'
 
 export interface ProjectBranchSelectorTriggerProps {
   displayProjectName: string
@@ -19,48 +20,46 @@ export const ProjectBranchSelectorTrigger = React.forwardRef<
       React.ComponentPropsWithoutRef<typeof SidebarMenuButtonComponent>,
       keyof ProjectBranchSelectorTriggerProps
     >
->(({ displayProjectName, selectedOrgInitial, isBranch, branchDisplayName, ...buttonProps }, ref) => {
-  const isNavigationV2 = useIsNavigationV2Enabled()
+>(
+  (
+    { displayProjectName, selectedOrgInitial, isBranch, branchDisplayName, ...buttonProps },
+    ref
+  ) => {
+    const isNavigationV2 = useIsNavigationV2Enabled()
 
-  return (
-    <SidebarMenuButtonComponent
-      ref={ref}
-      size="lg"
-      className="group py-1 gap-1.5 w-full flex h-auto text-left data-[state=open]:bg-sidebar-accent data-[state=open]:text-sidebar-accent-foreground touch-manipulation"
-      {...buttonProps}
-    >
-      <div className="relative flex h-8 aspect-square shrink-0 items-center bg-background-muted group-hover:border-stronger justify-center rounded border border-strong text-xs">
-        {selectedOrgInitial}
-      </div>
-      <div className="text-left flex-grow min-w-0">
-        <div
-          className={cn(
-            'w-full truncate text-foreground leading-tight',
-            !isNavigationV2 && 'max-w-[250px]'
-          )}
-        >
-          {displayProjectName}
+    return (
+      <SidebarMenuButtonComponent
+        ref={ref}
+        size="lg"
+        className="group py-1 gap-1.5 w-full flex h-auto text-left data-[state=open]:bg-sidebar-accent data-[state=open]:text-sidebar-accent-foreground touch-manipulation"
+        {...buttonProps}
+      >
+        <div className="relative flex h-8 aspect-square shrink-0 items-center bg-background-muted group-hover:border-stronger justify-center rounded border border-strong text-xs">
+          {selectedOrgInitial}
         </div>
         <div className="text-left flex-grow min-w-0">
-          <div className="w-full truncate text-foreground leading-tight max-w-[250px]">
-            {displayProjectName}
-          </div>
-          <div
-            className={cn(
-              'flex items-center gap-0.5',
-              isBranch ? 'text-foreground-lighter' : 'text-warning'
-            )}
-          >
-            <GitBranch className="shrink-0 size-3" strokeWidth={1.5} />
-            <span className="truncate min-w-0 leading-tight text-xs">{branchDisplayName}</span>
+          <div className="text-left flex-grow min-w-0">
+            <div className="w-full truncate text-foreground leading-tight max-w-[250px]">
+              {displayProjectName}
+            </div>
+            <div
+              className={cn(
+                'flex items-center gap-0.5',
+                isBranch ? 'text-foreground-lighter' : 'text-warning'
+              )}
+            >
+              <GitBranch className="shrink-0 size-3" strokeWidth={1.5} />
+              <span className="truncate min-w-0 leading-tight text-xs">{branchDisplayName}</span>
+            </div>
           </div>
         </div>
 
-      <ChevronsUpDown
-        strokeWidth={1.5}
-        className="ml-auto text-foreground-lighter !w-4 !h-4 md:hidden md:group-hover:flex"
-      />
-    </SidebarMenuButtonComponent>
-  )
-})
+        <ChevronsUpDown
+          strokeWidth={1.5}
+          className="ml-auto text-foreground-lighter !w-4 !h-4 md:hidden md:group-hover:flex"
+        />
+      </SidebarMenuButtonComponent>
+    )
+  }
+)
 ProjectBranchSelectorTrigger.displayName = 'ProjectBranchSelectorTrigger'
diff --git a/apps/studio/components/layouts/NavigationV2/ProjectLayoutV2.tsx b/apps/studio/components/layouts/NavigationV2/ProjectLayoutV2.tsx
index 6bf350b54c3..66d96137464 100644
--- a/apps/studio/components/layouts/NavigationV2/ProjectLayoutV2.tsx
+++ b/apps/studio/components/layouts/NavigationV2/ProjectLayoutV2.tsx
@@ -24,7 +24,7 @@ import { PausingState } from '../ProjectLayout/PausingState'
 import { ResizingState } from '../ProjectLayout/ResizingState'
 import RestartingState from '../ProjectLayout/RestartingState'
 import { RestoreFailedState } from '../ProjectLayout/RestoreFailedState'
-import RestoringState from '../ProjectLayout/RestoringState'
+import { RestoringState } from '../ProjectLayout/RestoringState'
 import { UpgradingState } from '../ProjectLayout/UpgradingState'
 
 const routesToIgnoreProjectDetailsRequest = [