From 8e5d9e94a99bf20710e48f8e0547821feb4f66b3 Mon Sep 17 00:00:00 2001
From: Owen <owen@txv.io>
Date: Fri, 5 Jun 2026 14:37:44 -0700
Subject: [PATCH] Fix delete site only working on newt site

---
 server/routers/site/deleteSite.ts |  3 +--
 src/components/SitesTable.tsx     | 10 ++++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/server/routers/site/deleteSite.ts b/server/routers/site/deleteSite.ts
index 47efba910..bac56c6ba 100644
--- a/server/routers/site/deleteSite.ts
+++ b/server/routers/site/deleteSite.ts
@@ -93,10 +93,9 @@ export async function deleteSite(
                 // Clean up all client associations and send peer/proxy removal
                 // messages in a single efficient pass before deleting the row.
                 await cleanupSiteAssociations(site, trx);
-
-                await trx.delete(sites).where(eq(sites.siteId, siteId));
             }
 
+            await trx.delete(sites).where(eq(sites.siteId, siteId));
             await usageService.add(site.orgId, FeatureId.SITES, -1, trx);
         });
 
diff --git a/src/components/SitesTable.tsx b/src/components/SitesTable.tsx
index 3e234bf79..8c3036c4a 100644
--- a/src/components/SitesTable.tsx
+++ b/src/components/SitesTable.tsx
@@ -514,6 +514,16 @@ export default function SitesTable({
                                             )}
                                         </DropdownMenuItem>
                                     </Link>
+                                    <DropdownMenuItem
+                                        onClick={() => {
+                                            setSelectedSite(siteRow);
+                                            setIsDeleteModalOpen(true);
+                                        }}
+                                    >
+                                        <span className="text-red-500">
+                                            {t("delete")}
+                                        </span>
+                                    </DropdownMenuItem>
                                 </DropdownMenuContent>
                             </DropdownMenu>
                             <Link