From 085340588ac87d14e8cad7c5a8bd620e0c8826da Mon Sep 17 00:00:00 2001
From: Vakhtang Vakhtangishvili <125814234+vaeho@users.noreply.github.com>
Date: Fri, 3 Apr 2026 03:04:47 +0400
Subject: [PATCH] Fix scroll to bottom button flickering near bottom of the
 chat (#1692)

---
 apps/web/src/components/ChatView.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/web/src/components/ChatView.tsx b/apps/web/src/components/ChatView.tsx
index cf97a7667cb422ba788b707d5c0c4abf570af418..fd2f371005f8787d37553e5d60dac322bf9233a1 100644
--- a/apps/web/src/components/ChatView.tsx
+++ b/apps/web/src/components/ChatView.tsx
@@ -2166,13 +2166,13 @@ export default function ChatView({ threadId }: ChatViewProps) {
       pendingUserScrollUpIntentRef.current = false;
     } else if (shouldAutoScrollRef.current && pendingUserScrollUpIntentRef.current) {
       const scrolledUp = currentScrollTop < lastKnownScrollTopRef.current - 1;
-      if (scrolledUp) {
+      if (scrolledUp && !isNearBottom) {
         shouldAutoScrollRef.current = false;
       }
       pendingUserScrollUpIntentRef.current = false;
     } else if (shouldAutoScrollRef.current && isPointerScrollActiveRef.current) {
       const scrolledUp = currentScrollTop < lastKnownScrollTopRef.current - 1;
-      if (scrolledUp) {
+      if (scrolledUp && !isNearBottom) {
         shouldAutoScrollRef.current = false;
       }
     } else if (shouldAutoScrollRef.current && !isNearBottom) {
-- 
2.54.0