From 257f09c2b442f8ad75c238f125eae641dd638a7a Mon Sep 17 00:00:00 2001
From: Jack Kingsman <jack.kingsman@gmail.com>
Date: Mon, 1 Jun 2026 19:21:02 -0700
Subject: [PATCH] Be more gentle during test runs

---
 frontend/src/test/appStartupHash.test.tsx | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/frontend/src/test/appStartupHash.test.tsx b/frontend/src/test/appStartupHash.test.tsx
index 9288273..b7a0fb3 100644
--- a/frontend/src/test/appStartupHash.test.tsx
+++ b/frontend/src/test/appStartupHash.test.tsx
@@ -331,11 +331,17 @@ describe('App startup hash resolution', () => {
 
     render(<App />);
 
-    await waitFor(() => {
-      for (const node of screen.getAllByTestId('active-conversation')) {
-        expect(node).toHaveTextContent(`channel:${publicChannel.key}:Public`);
-      }
-    });
+    // App startup triggers multiple async fetches (config, settings, channels,
+    // contacts, unreads) that must all resolve before conversation selection
+    // renders.  CI runners are slower than local, so bump the default timeout.
+    await waitFor(
+      () => {
+        for (const node of screen.getAllByTestId('active-conversation')) {
+          expect(node).toHaveTextContent(`channel:${publicChannel.key}:Public`);
+        }
+      },
+      { timeout: 3000 }
+    );
 
     expect(localStorage.getItem(LAST_VIEWED_CONVERSATION_KEY)).toContain(publicChannel.key);
   });