From 990fd692b2baed54cad731725b0b1d12db4c8ccd Mon Sep 17 00:00:00 2001
From: motatoes <moe.habib9@gmail.com>
Date: Thu, 30 Oct 2025 20:37:48 -0700
Subject: [PATCH 1/5] make create modal prettier

---
 .../_dashboard/dashboard/units.index.tsx      | 62 ++++++++++++++++++-
 1 file changed, 61 insertions(+), 1 deletion(-)

diff --git a/ui/src/routes/_authenticated/_dashboard/dashboard/units.index.tsx b/ui/src/routes/_authenticated/_dashboard/dashboard/units.index.tsx
index 5a83491b9..2d30cf698 100644
--- a/ui/src/routes/_authenticated/_dashboard/dashboard/units.index.tsx
+++ b/ui/src/routes/_authenticated/_dashboard/dashboard/units.index.tsx
@@ -1,7 +1,7 @@
 import { Button } from '@/components/ui/button'
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card"
 import { createFileRoute, Link } from '@tanstack/react-router'
-import { ArrowLeft, Plus, Database, ExternalLink, Lock, Unlock } from 'lucide-react'
+import { ArrowLeft, Plus, Database, ExternalLink, Lock, Unlock, Cloud, HardDrive } from 'lucide-react'
 import {
   Table,
   TableBody,
@@ -21,6 +21,8 @@ import {
 } from "@/components/ui/dialog"
 import { Input } from "@/components/ui/input"
 import { Label } from "@/components/ui/label"
+import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group"
+import { Badge } from "@/components/ui/badge"
 import { useState } from "react"
 import { createUnitFn } from "@/api/statesman_serverFunctions"
 import { listUnitsFn } from '@/api/statesman_serverFunctions'
@@ -59,6 +61,7 @@ function CreateUnitModal({ onUnitCreated }: { onUnitCreated: () => void }) {
   const [unitName, setUnitName] = useState("")
   const [isLoading, setIsLoading] = useState(false)
   const [error, setError] = useState<string | null>(null)
+  const [unitType, setUnitType] = useState<'local' | 'remote'>("local")
   const { user, organisationId } = Route.useLoaderData()
 
   const handleSubmit = async (e: React.FormEvent) => {
@@ -114,6 +117,63 @@ function CreateUnitModal({ onUnitCreated }: { onUnitCreated: () => void }) {
             />
             {error && <p className="text-sm text-destructive mt-2">{error}</p>}
           </div>
+          <div className="py-2">
+            <Label className="text-right">Unit Type</Label>
+            <RadioGroup
+              value={unitType}
+              onValueChange={(v) => setUnitType(v as 'local' | 'remote')}
+              className="mt-3 grid grid-cols-1 gap-3"
+            >
+              {/* Local option card */}
+              <label
+                htmlFor="unit-type-local"
+                className={
+                  `relative flex cursor-pointer items-start gap-4 rounded-lg border p-4 md:p-5 transition-colors hover:bg-muted/50 ` +
+                  (unitType === 'local' ? 'ring-2 ring-primary border-primary' : 'border-muted')
+                }
+                onClick={() => setUnitType('local')}
+              >
+                <RadioGroupItem id="unit-type-local" value="local" className="sr-only" />
+                <div className="flex h-10 w-10 items-center justify-center rounded-md bg-primary/10 text-primary">
+                  <HardDrive className="h-5 w-5" />
+                </div>
+                <div className="space-y-1">
+                  <div className="flex items-center gap-2">
+                    <span className="text-base font-semibold">Local</span>
+                  </div>
+                  <p className="text-sm text-muted-foreground">
+                    Mainly using units as states manager. Useful for teams that want full
+                    control and integrating pipelines with own CI.
+                  </p>
+                </div>
+              </label>
+
+              {/* Remote option card (disabled) */}
+              <label
+                htmlFor="unit-type-remote"
+                className={
+                  `relative flex cursor-not-allowed items-start gap-4 rounded-lg border p-4 md:p-5 opacity-60 ` +
+                  `bg-muted/30`
+                }
+              >
+                <RadioGroupItem id="unit-type-remote" value="remote" disabled className="sr-only" />
+                <div className="flex h-10 w-10 items-center justify-center rounded-md bg-muted text-muted-foreground">
+                  <Cloud className="h-5 w-5" />
+                </div>
+                <div className="space-y-1">
+                  <div className="flex items-center gap-2">
+                    <span className="text-base font-semibold">Remote</span>
+                    <Badge variant="secondary">Coming soon</Badge>
+                  </div>
+                  <p className="text-sm text-muted-foreground">
+                    Fully managed terraform runs. Run terraform locally and stream logs from
+                    remote runs. Best for teams that want seamless automation for their
+                    terraform runs without much configuration.
+                  </p>
+                </div>
+              </label>
+            </RadioGroup>
+          </div>
           <DialogFooter>
             <Button
               type="submit"

From e91e39ff5c51f06fbd4dc35ee241faad3bd9a657 Mon Sep 17 00:00:00 2001
From: motatoes <moe.habib9@gmail.com>
Date: Fri, 31 Oct 2025 11:46:34 -0700
Subject: [PATCH 2/5] ui improvements

---
 ui/src/components/WorkosOrgSwitcher.tsx       | 126 ++++++++++++++++++
 ui/src/components/WorkosSettings.tsx          |   1 +
 ui/src/lib/env.server.ts                      |   3 +
 ui/src/routes/_authenticated/_dashboard.tsx   |  22 ++-
 .../_dashboard/dashboard/repos.index.tsx      | 107 +++++++++------
 ui/src/routes/index.tsx                       |   5 +-
 ui/src/styles/global.css                      |   9 ++
 7 files changed, 223 insertions(+), 50 deletions(-)
 create mode 100644 ui/src/components/WorkosOrgSwitcher.tsx

diff --git a/ui/src/components/WorkosOrgSwitcher.tsx b/ui/src/components/WorkosOrgSwitcher.tsx
new file mode 100644
index 000000000..12ce444d2
--- /dev/null
+++ b/ui/src/components/WorkosOrgSwitcher.tsx
@@ -0,0 +1,126 @@
+import * as React from 'react'
+import { useRouter } from '@tanstack/react-router'
+import { getWidgetsAuthToken } from '@/authkit/serverFunctions'
+import { useToast } from '@/hooks/use-toast'
+import { OrganizationSwitcher, WorkOsWidgets } from '@workos-inc/widgets'
+import { DropdownMenu } from '@radix-ui/themes'
+
+import '@workos-inc/widgets/styles.css'
+import '@radix-ui/themes/styles.css'
+
+type WorkosOrgSwitcherProps = {
+  userId: string
+  organisationId: string
+  label?: string
+  redirectTo?: string
+  /**
+   * If true, wraps the switcher in WorkOsWidgets provider which applies a full-page layout.
+   * Leave false for compact embedding in headers/navs to avoid large whitespace.
+   */
+  wrapWithProvider?: boolean
+  /**
+   * When true, injects a default extra group with a Settings item in the switcher dropdown.
+   */
+  showSettingsItem?: boolean
+}
+
+export default function WorkosOrgSwitcher({
+  userId,
+  organisationId,
+  label = 'My Orgs',
+  redirectTo = '/dashboard/units',
+  wrapWithProvider = false,
+  showSettingsItem = false,
+}: WorkosOrgSwitcherProps) {
+  const router = useRouter()
+  const { toast } = useToast()
+  const [authToken, setAuthToken] = React.useState<string | null>(null)
+  const [error, setError] = React.useState<string | null>(null)
+  const [loading, setLoading] = React.useState(true)
+
+  const handleSwitchToOrganization = async (organizationId: string) => {
+    try {
+      const res = await fetch('/api/auth/workos/switch-org', {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({ organizationId, pathname: redirectTo }),
+      })
+      const data = await res.json()
+      if (!data?.redirectUrl) return
+      const url: string = data.redirectUrl
+      const isInternal = url.startsWith('/')
+      if (isInternal) {
+        await router.navigate({ to: url })
+        router.invalidate()
+      } else {
+        throw new Error('Cannot redirect to external URL')
+      }
+    } catch (e: any) {
+      toast({
+        title: 'Failed to switch organization',
+        description: e?.message ?? 'Failed to switch organization',
+        variant: 'destructive',
+      })
+      console.error('Failed to switch organization', e)
+    }
+  }
+
+  React.useEffect(() => {
+    (async () => {
+      try {
+        const token = await getWidgetsAuthToken({ data: { userId, organizationId: organisationId } })
+        setAuthToken(token)
+        setLoading(false)
+      } catch (e: any) {
+        setError(e?.message ?? 'Failed to get WorkOS token')
+        setLoading(false)
+      }
+    })()
+  }, [userId, organisationId])
+
+  if (loading) return <p>Loading WorkOS…</p>
+  if (error) return <p className="text-red-600">Error: {error}</p>
+  if (!authToken) return <p>Could not load WorkOS token.</p>
+
+  const extraMenu = showSettingsItem ? (
+    <>
+      <DropdownMenu.Separator />
+      <DropdownMenu.Group>
+        <DropdownMenu.Item onClick={() => router.navigate({ to: '/dashboard/settings/user' })}>
+          Settings
+        </DropdownMenu.Item>
+      </DropdownMenu.Group>
+    </>
+  ) : null
+
+  if (wrapWithProvider) {
+    return (
+      <WorkOsWidgets
+        // Reset WorkOS full-page layout styles so it fits inside the sidebar
+        style={{ minHeight: 'auto', height: 'auto', padding: 0, display: 'contents' } as any}
+      >
+        <div className="w-full">
+          <OrganizationSwitcher
+            authToken={authToken}
+            organizationLabel={label}
+            switchToOrganization={({ organizationId }) => handleSwitchToOrganization(organizationId)}
+          >
+            {extraMenu}
+          </OrganizationSwitcher>
+        </div>
+      </WorkOsWidgets>
+    )
+  }
+
+  return (
+    <OrganizationSwitcher
+      authToken={authToken}
+      organizationLabel={label}
+      switchToOrganization={({ organizationId }) => handleSwitchToOrganization(organizationId)}
+    >
+      {extraMenu}
+    </OrganizationSwitcher>
+  )
+}
+
+
diff --git a/ui/src/components/WorkosSettings.tsx b/ui/src/components/WorkosSettings.tsx
index e71b96094..c9ccd1777 100644
--- a/ui/src/components/WorkosSettings.tsx
+++ b/ui/src/components/WorkosSettings.tsx
@@ -13,6 +13,7 @@ import {
 import '@workos-inc/widgets/styles.css';
 import '@radix-ui/themes/styles.css';
 import CreateOrganizationBtn from './CreateOrganisationButtonWOS';
+import WorkosOrgSwitcher from './WorkosOrgSwitcher';
 
 
 type LoaderData = {
diff --git a/ui/src/lib/env.server.ts b/ui/src/lib/env.server.ts
index 999df0827..82c476143 100644
--- a/ui/src/lib/env.server.ts
+++ b/ui/src/lib/env.server.ts
@@ -4,10 +4,12 @@
 import { createServerFn } from "@tanstack/react-start"
 
 
+// !IMPORTANT: DO NOT ADD ANYTHING SENSITIVE HERE. THIS IS USED ON THE CLIENT SIDE.
 export type Env = {
   PUBLIC_URL: string
   PUBLIC_HOSTNAME: string
   STATESMAN_BACKEND_URL: string
+  WORKOS_REDIRECT_URI: string
 }
 
 export const getPublicServerConfig = createServerFn({ method: 'GET' })
@@ -16,5 +18,6 @@ export const getPublicServerConfig = createServerFn({ method: 'GET' })
       PUBLIC_URL: process.env.PUBLIC_URL ?? '',
       PUBLIC_HOSTNAME: process.env.PUBLIC_URL?.replace('https://', '').replace('http://', '') ?? '',
       STATESMAN_BACKEND_URL: process.env.STATESMAN_BACKEND_URL ?? '',
+      WORKOS_REDIRECT_URI: process.env.WORKOS_REDIRECT_URI ?? '',
     } as Env
 })
\ No newline at end of file
diff --git a/ui/src/routes/_authenticated/_dashboard.tsx b/ui/src/routes/_authenticated/_dashboard.tsx
index d0c1ec3cd..d544f48ec 100644
--- a/ui/src/routes/_authenticated/_dashboard.tsx
+++ b/ui/src/routes/_authenticated/_dashboard.tsx
@@ -3,34 +3,45 @@ import { getSignInUrl } from '../../authkit/serverFunctions';
 import { SidebarProvider, Sidebar, SidebarHeader, SidebarContent, SidebarGroup, SidebarGroupLabel, SidebarGroupContent, SidebarMenu, SidebarMenuItem, SidebarMenuButton, SidebarTrigger } from '@/components/ui/sidebar';
 import { Link } from '@tanstack/react-router';
 import { GitBranch, Folders, Waves, Settings, CreditCard, LogOut, Cuboid} from 'lucide-react';
+import WorkosOrgSwitcher from '@/components/WorkosOrgSwitcher';
+import { WorkOsWidgets } from '@workos-inc/widgets';
 
 export const Route = createFileRoute('/_authenticated/_dashboard')({
     component: DashboardComponent,
     loader: async ({ context }) => {
-        const { user, organisationName } = context;
-        return { user, organisationName };
+        const { user, organisationName, organisationId, publicServerConfig } = context;
+        return { user, organisationName, organisationId, publicServerConfig };
     },
 });
 
 function DashboardComponent() {
-    const { user, organisationName } = Route.useLoaderData();
+    const { user, organisationName, organisationId, publicServerConfig } = Route.useLoaderData();
+    const workosEnabled = publicServerConfig.WORKOS_REDIRECT_URI !== '';
     const location = useLocation(); 
     return (
         <SidebarProvider>
+        <WorkOsWidgets
+          style={{ display: 'contents', minHeight: 'auto', height: 'auto' } as any}
+          theme={{ panelBackground: 'solid', radius: 'none' } as any}
+        >
         <div className="flex h-screen w-full">
           <Sidebar>
             <SidebarHeader className="text-center">
               <h2 className="text-xl font-bold mb-2">🌮 OpenTACO</h2>
               <div className="px-4">
                 <div className="h-[1px] bg-border mb-2" />
-                <h3>
+                {!workosEnabled && <h3>
                   <Link 
                     to="/dashboard/settings/user" 
                     className="text-sm text-muted-foreground hover:text-primary transition-colors duration-200"
                   >
                     {organisationName}
                   </Link>
-                </h3>
+                  
+                </h3>}
+                <div className="mt-2" />
+                {workosEnabled && <WorkosOrgSwitcher userId={user?.id || ''} organisationId={organisationId || ''} showSettingsItem />}
+                
                 <div className="h-[1px] bg-border mt-2" />
               </div>
             </SidebarHeader>
@@ -106,6 +117,7 @@ function DashboardComponent() {
             </div>
           </main>
         </div>
+        </WorkOsWidgets>
       </SidebarProvider>    
     )
 };
diff --git a/ui/src/routes/_authenticated/_dashboard/dashboard/repos.index.tsx b/ui/src/routes/_authenticated/_dashboard/dashboard/repos.index.tsx
index 84ad58df5..3f61025b2 100644
--- a/ui/src/routes/_authenticated/_dashboard/dashboard/repos.index.tsx
+++ b/ui/src/routes/_authenticated/_dashboard/dashboard/repos.index.tsx
@@ -43,51 +43,70 @@ function RouteComponent() {
         <CardDescription>List of repositories Connected to digger and their latest runs</CardDescription>
       </CardHeader>
       <CardContent>
-        <Table>
-          <TableHeader>
-            <TableRow>
-              <TableHead>Type</TableHead>
-              <TableHead>Name</TableHead>
-              <TableHead>URL</TableHead>
-              {/* <TableHead>Latest Run</TableHead> */}
-              <TableHead>Details</TableHead>
-            </TableRow>
-          </TableHeader>
-          <TableBody>
-            {repos.map((repo : Repo) => {
-              const Icon = iconMap[repo.vcs]
-              return (
-                <TableRow key={repo.id}>
-                  <TableCell>
-                    <Icon className="h-5 w-5" />
-                  </TableCell>
-                  <TableCell>{repo.name}</TableCell>
-                  <TableCell>
-                    <a
-                      href={repo.repo_url}
-                      target="_blank"
-                      rel="noopener noreferrer"
-                      className="text-blue-500 hover:underline"
-                    >
-                      {repo.repo_url}
-                    </a>
-                  </TableCell>
-                  {/* <TableCell>{repo.latestRun}</TableCell> */}
-                  <TableCell>
-                    <Button variant="ghost" asChild>
-                      <Link to="/dashboard/repos/$repoId" params={{ repoId: String(repo.id) }}>
-                        View Details <ExternalLink className="ml-2 h-4 w-4" />
-                      </Link>
-                    </Button>
-                  </TableCell>
+        {repos.length === 0 ? (
+          <div className="text-center py-12">
+            <div className="inline-flex h-12 w-12 items-center justify-center rounded-full bg-primary/10 mb-4">
+              <Github className="h-6 w-6 text-primary" />
+            </div>
+            <h2 className="text-lg font-semibold mb-2">No Repositories Connected</h2>
+            <p className="text-muted-foreground max-w-sm mx-auto mb-6">
+              Connect your first repository to start running Terraform with Digger.
+            </p>
+            <Button asChild>
+              <Link to="/dashboard/onboarding">
+                Connect your first repository <PlusCircle className="ml-2 h-4 w-4" />
+              </Link>
+            </Button>
+          </div>
+        ) : (
+          <>
+            <Table>
+              <TableHeader>
+                <TableRow>
+                  <TableHead>Type</TableHead>
+                  <TableHead>Name</TableHead>
+                  <TableHead>URL</TableHead>
+                  {/* <TableHead>Latest Run</TableHead> */}
+                  <TableHead>Details</TableHead>
                 </TableRow>
-              )
-            })}
-          </TableBody>
-        </Table>
-        <div className="mt-4">
-          <ConnectMoreRepositoriesButton />
-        </div>
+              </TableHeader>
+              <TableBody>
+                {repos.map((repo : Repo) => {
+                  const Icon = iconMap[repo.vcs]
+                  return (
+                    <TableRow key={repo.id}>
+                      <TableCell>
+                        <Icon className="h-5 w-5" />
+                      </TableCell>
+                      <TableCell>{repo.name}</TableCell>
+                      <TableCell>
+                        <a
+                          href={repo.repo_url}
+                          target="_blank"
+                          rel="noopener noreferrer"
+                          className="text-blue-500 hover:underline"
+                        >
+                          {repo.repo_url}
+                        </a>
+                      </TableCell>
+                      {/* <TableCell>{repo.latestRun}</TableCell> */}
+                      <TableCell>
+                        <Button variant="ghost" asChild>
+                          <Link to="/dashboard/repos/$repoId" params={{ repoId: String(repo.id) }}>
+                            View Details <ExternalLink className="ml-2 h-4 w-4" />
+                          </Link>
+                        </Button>
+                      </TableCell>
+                    </TableRow>
+                  )
+                })}
+              </TableBody>
+            </Table>
+            <div className="mt-4">
+              <ConnectMoreRepositoriesButton />
+            </div>
+          </>
+        )}
       </CardContent>
     </Card>
     <Outlet />  
diff --git a/ui/src/routes/index.tsx b/ui/src/routes/index.tsx
index 902828965..c21b1395e 100644
--- a/ui/src/routes/index.tsx
+++ b/ui/src/routes/index.tsx
@@ -1,4 +1,4 @@
-import { createFileRoute } from '@tanstack/react-router';
+import { createFileRoute, redirect } from '@tanstack/react-router';
 import { getSignInUrl } from '../authkit/serverFunctions';
 import SignInButton from '../components/sign-in-button';
 import { Collapsible, CollapsibleTrigger, CollapsibleContent } from '../components/ui/collapsible';
@@ -7,6 +7,9 @@ export const Route = createFileRoute('/')({
   component: Home,
   loader: async ({ context }) => {
     const { user } = context;
+    if (user) {
+      throw redirect({ href: '/dashboard/units' });
+    }
     const url = await getSignInUrl();
     return { user, url };
   },
diff --git a/ui/src/styles/global.css b/ui/src/styles/global.css
index ac6844236..7499bd626 100644
--- a/ui/src/styles/global.css
+++ b/ui/src/styles/global.css
@@ -92,3 +92,12 @@ body {
     @apply bg-background text-foreground;
   }
 }
+
+/* Radix Themes / WorkOS widgets: ensure dropdown/poppers render above app chrome */
+[data-radix-popper-content-wrapper] {
+  z-index: 9999 !important;
+}
+.rt-PopperContent,
+.rt-DropdownMenuContent {
+  z-index: 9999 !important;
+}

From 68307e547dc89c121e4a50d02b0f0a0f5b9984e4 Mon Sep 17 00:00:00 2001
From: motatoes <moe.habib9@gmail.com>
Date: Fri, 31 Oct 2025 12:09:10 -0700
Subject: [PATCH 3/5] redirect to unit details on creation

---
 .../_authenticated/_dashboard/dashboard/units.index.tsx   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/ui/src/routes/_authenticated/_dashboard/dashboard/units.index.tsx b/ui/src/routes/_authenticated/_dashboard/dashboard/units.index.tsx
index 2d30cf698..f032319ed 100644
--- a/ui/src/routes/_authenticated/_dashboard/dashboard/units.index.tsx
+++ b/ui/src/routes/_authenticated/_dashboard/dashboard/units.index.tsx
@@ -1,6 +1,6 @@
 import { Button } from '@/components/ui/button'
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card"
-import { createFileRoute, Link } from '@tanstack/react-router'
+import { createFileRoute, Link, useRouter } from '@tanstack/react-router'
 import { ArrowLeft, Plus, Database, ExternalLink, Lock, Unlock, Cloud, HardDrive } from 'lucide-react'
 import {
   Table,
@@ -192,11 +192,15 @@ function RouteComponent() {
   const {  unitsData, organisationId, user } = Route.useLoaderData()
   const [units, setUnits] = useState(unitsData?.units || [])
   const navigate = Route.useNavigate()
-
+  const router = useRouter()
+  
   async function handleUnitCreated() {
     const unitsData = await listUnitsFn({data: {organisationId: organisationId, userId: user?.id || '', email: user?.email || ''}})
     setUnits(unitsData.units)
+    navigate({ to: '/dashboard/units/$unitId', params: { unitId: unitsData.units[0].id } })
+    router.invalidate()
   }
+  
   return (<>
     <div className="container mx-auto p-4">
       <div className="mb-6">

From 59e245d8b67d4fed4ca97a09099c4dfa0ad083c2 Mon Sep 17 00:00:00 2001
From: motatoes <moe.habib9@gmail.com>
Date: Fri, 31 Oct 2025 12:11:47 -0700
Subject: [PATCH 4/5] add last updated

---
 .../_authenticated/_dashboard/dashboard/units.$unitId.tsx       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/src/routes/_authenticated/_dashboard/dashboard/units.$unitId.tsx b/ui/src/routes/_authenticated/_dashboard/dashboard/units.$unitId.tsx
index ee533d6a0..11270810a 100644
--- a/ui/src/routes/_authenticated/_dashboard/dashboard/units.$unitId.tsx
+++ b/ui/src/routes/_authenticated/_dashboard/dashboard/units.$unitId.tsx
@@ -316,7 +316,7 @@ function RouteComponent() {
               ID: {unit.id}
             </CardDescription>
             <CardDescription>
-              Version {unit.version} • Last updated {formatDate(unit.updated)} • {formatBytes(unit.size)}
+              Last updated {formatDate(unit.updated)} • {formatBytes(unit.size)}
             </CardDescription>
           </CardHeader>
         </Card>

From 8125ec9bc8baab24013b4e293a22cbd0fa761086 Mon Sep 17 00:00:00 2001
From: motatoes <moe.habib9@gmail.com>
Date: Fri, 31 Oct 2025 14:58:05 -0700
Subject: [PATCH 5/5] actually we dont want to redirect

---
 .../routes/_authenticated/_dashboard/dashboard/units.index.tsx  | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ui/src/routes/_authenticated/_dashboard/dashboard/units.index.tsx b/ui/src/routes/_authenticated/_dashboard/dashboard/units.index.tsx
index f032319ed..f952f928d 100644
--- a/ui/src/routes/_authenticated/_dashboard/dashboard/units.index.tsx
+++ b/ui/src/routes/_authenticated/_dashboard/dashboard/units.index.tsx
@@ -197,8 +197,6 @@ function RouteComponent() {
   async function handleUnitCreated() {
     const unitsData = await listUnitsFn({data: {organisationId: organisationId, userId: user?.id || '', email: user?.email || ''}})
     setUnits(unitsData.units)
-    navigate({ to: '/dashboard/units/$unitId', params: { unitId: unitsData.units[0].id } })
-    router.invalidate()
   }
   
   return (<>