From 6a93f97cd4674cb8d5f881d6a02d02cbb9b11c82 Mon Sep 17 00:00:00 2001
From: Koen Oostveen <koen@koenoostveen.nl>
Date: Sun, 19 Jul 2026 12:52:17 +0200
Subject: [PATCH] Add account switcher to "homeserver down" screen to prevent
 being locked out from all accounts at once

---
 .changeset/show-account-switcher-hs-down.md  |  5 +++++
 src/app/pages/client/SpecVersions.tsx        |  4 ++++
 src/app/pages/client/sidebar/UserMenuTab.tsx | 12 ++++++++++--
 3 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/show-account-switcher-hs-down.md

diff --git a/.changeset/show-account-switcher-hs-down.md b/.changeset/show-account-switcher-hs-down.md
new file mode 100644
index 0000000000..1d73323189
--- /dev/null
+++ b/.changeset/show-account-switcher-hs-down.md
@@ -0,0 +1,5 @@
+---
+default: patch
+---
+
+Add account switcher to "homeserver down" screen to prevent being locked out from all accounts at once
diff --git a/src/app/pages/client/SpecVersions.tsx b/src/app/pages/client/SpecVersions.tsx
index 39b44a6dd8..d20cd4d04f 100644
--- a/src/app/pages/client/SpecVersions.tsx
+++ b/src/app/pages/client/SpecVersions.tsx
@@ -6,6 +6,7 @@ import { SpecVersionsProvider } from '$hooks/useSpecVersions';
 import { SplashScreen } from '$components/splash-screen';
 import { useMatrixClient } from '$hooks/useMatrixClient';
 import type { SpecVersions } from '../../cs-api';
+import { AccountMenuOption } from './sidebar/UserMenuTab';
 
 const EMPTY_VERSIONS: SpecVersions = { versions: [] };
 
@@ -25,6 +26,9 @@ function HomeserverOfflineError({ baseUrl, onRetry }: HomeserverOfflineErrorProp
                 We can&apos;t reach <strong>{baseUrl}</strong>. The homeserver may be down, or you
                 may have a connection issue. Please try again.
               </Text>
+              <div style={{ position: 'relative' }}>
+                <AccountMenuOption isMobile={true} showSeparator={false} />
+              </div>
             </Box>
             <Button variant="Critical" onClick={onRetry} fill="Soft">
               <Text as="span" size="B400">
diff --git a/src/app/pages/client/sidebar/UserMenuTab.tsx b/src/app/pages/client/sidebar/UserMenuTab.tsx
index 7bb62c3228..6d89767fd7 100644
--- a/src/app/pages/client/sidebar/UserMenuTab.tsx
+++ b/src/app/pages/client/sidebar/UserMenuTab.tsx
@@ -161,7 +161,15 @@ function AccountRow({
   );
 }
 
-export function AccountMenuOption({ isMobile, isRight }: { isMobile: boolean; isRight?: boolean }) {
+export function AccountMenuOption({
+  isMobile,
+  isRight,
+  showSeparator,
+}: {
+  isMobile: boolean;
+  isRight?: boolean;
+  showSeparator?: boolean;
+}) {
   const mx = useMatrixClient();
   const navigate = useNavigate();
   const sessions = useAtomValue(sessionsAtom);
@@ -265,7 +273,7 @@ export function AccountMenuOption({ isMobile, isRight }: { isMobile: boolean; is
 
   return (
     <>
-      <Line variant="Surface" size="300" />
+      {(showSeparator ?? true) && <Line variant="Surface" size="300" />}
       <Box direction="Column" gap="100" style={{ padding: config.space.S100 }}>
         <MenuItem
           size="300"