From 366614537e5ab5ad8c2bfec4a6cc688a9996b89d Mon Sep 17 00:00:00 2001
From: Brendan Allan <14191578+Brendonovich@users.noreply.github.com>
Date: Wed, 29 Jul 2026 07:12:13 +0000
Subject: [PATCH] fix(app): redirect invalid server routes

---
 packages/app/src/app.tsx                     | 19 +------------------
 packages/app/src/utils/session-route.test.ts |  2 +-
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/packages/app/src/app.tsx b/packages/app/src/app.tsx
index ebc9202ae0..698114f8e3 100644
--- a/packages/app/src/app.tsx
+++ b/packages/app/src/app.tsx
@@ -132,7 +132,7 @@ function TargetServerRoute(props: ParentProps) {
     // Owns the server-identity remount. Session changes must NOT remount this
     // subtree (SessionRouteErrorBoundary resets and createSessionLineage
     // re-resolves reactively instead); both rely on this key for server changes.
-    <Show when={key()} keyed fallback={<InvalidServerRoute />}>
+    <Show when={key()} keyed fallback={<Navigate href="/" />}>
       <ServerSDKProvider server={conn}>
         <ServerSyncProvider server={conn}>{props.children}</ServerSyncProvider>
       </ServerSDKProvider>
@@ -164,23 +164,6 @@ function LegacyTargetSessionRouteContent() {
   )
 }
 
-function InvalidServerRoute() {
-  const language = useLanguage()
-  const navigate = useNavigate()
-  return (
-    <div class="flex-1 w-full min-h-0 flex flex-col items-center justify-center gap-3 text-center">
-      <div class="text-16-medium text-text-strong">Invalid server route</div>
-      <button
-        type="button"
-        class="text-13-regular text-text-interactive-base"
-        onClick={() => navigate("/", { replace: true })}
-      >
-        {language.t("home.title")}
-      </button>
-    </div>
-  )
-}
-
 function LegacyTargetSessionRedirect() {
   const params = useParams<{ id: string }>()
   const navigate = useNavigate()
diff --git a/packages/app/src/utils/session-route.test.ts b/packages/app/src/utils/session-route.test.ts
index 20d14fd82b..0cc6204ec3 100644
--- a/packages/app/src/utils/session-route.test.ts
+++ b/packages/app/src/utils/session-route.test.ts
@@ -41,7 +41,7 @@ describe("session routes", () => {
     expect(parseServerKey(href.split("/")[2])).toBe(server)
   })
 
-  test("returns an invalid state for malformed server routes", () => {
+  test("returns undefined for malformed server routes", () => {
     expect(parseServerKey("not-base64")).toBeUndefined()
   })