From 69af99aa9f4f2c8f8ceb952e823dae308971a93a Mon Sep 17 00:00:00 2001
From: klopez4212 <klopez4212@gmail.com>
Date: Sun, 28 Jun 2026 07:53:51 +0100
Subject: [PATCH] Harden scroll E2E timing

---
 desktop/tests/e2e/scroll-history.spec.ts |  2 +-
 desktop/tests/e2e/stream.spec.ts         | 14 +++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/desktop/tests/e2e/scroll-history.spec.ts b/desktop/tests/e2e/scroll-history.spec.ts
index 84f7bd8cd..b6ca68461 100644
--- a/desktop/tests/e2e/scroll-history.spec.ts
+++ b/desktop/tests/e2e/scroll-history.spec.ts
@@ -248,7 +248,7 @@ test("preserves user scroll while older channel history loads", async ({
         return Math.abs(anchor.top - (anchorBeforeLanding?.top ?? 0));
       },
       {
-        timeout: 8_000,
+        timeout: 10_000,
       },
     )
     .toBeLessThanOrEqual(2);
diff --git a/desktop/tests/e2e/stream.spec.ts b/desktop/tests/e2e/stream.spec.ts
index 74d2fabfd..dfe02f092 100644
--- a/desktop/tests/e2e/stream.spec.ts
+++ b/desktop/tests/e2e/stream.spec.ts
@@ -28,6 +28,13 @@ async function getTimelineMetrics(page: Page) {
   });
 }
 
+async function isScrollToLatestVisible(page: Page) {
+  return page
+    .getByTestId("message-scroll-to-latest")
+    .isVisible()
+    .catch(() => false);
+}
+
 async function ensureTimelineScrollable(
   senderPage: Page,
   receiverPage: Page,
@@ -143,10 +150,12 @@ async function scrollTimelineAwayFromBottom(page: Page, minDistance = 160) {
   const timeline = page.getByTestId("message-timeline");
   await timeline.hover();
 
-  for (let attempt = 0; attempt < 8; attempt += 1) {
+  for (let attempt = 0; attempt < 12; attempt += 1) {
     await page.mouse.wheel(0, -800);
+    await page.waitForTimeout(100);
     const metrics = await getTimelineMetrics(page);
-    if (metrics.distanceFromBottom > minDistance) {
+    const scrollToLatestVisible = await isScrollToLatestVisible(page);
+    if (metrics.distanceFromBottom > minDistance && scrollToLatestVisible) {
       // The DOM scroll position is now off the bottom, but the timeline's
       // `onScroll` handler updates the React "away from bottom" anchor state
       // asynchronously. If a new message lands before that commit, the stale
@@ -154,7 +163,6 @@ async function scrollTimelineAwayFromBottom(page: Page, minDistance = 160) {
       // The scroll-to-latest pill only mounts once that state has committed,
       // so waiting for it guarantees the anchor is in the away-from-bottom
       // branch before callers send the message they expect to be counted.
-      await expect(page.getByTestId("message-scroll-to-latest")).toBeVisible();
       return;
     }
   }