fix merge

frontend/src/components/ui/chat.tsx

@@ -38,35 +38,11 @@ const Chat = React.forwardRef<HTMLDivElement, ChatProps>(
   ) => {
     const messagesEndRef = React.useRef<HTMLDivElement>(null);
     const messagesContainerRef = React.useRef<HTMLDivElement>(null);
-    const [userIsScrolling, setUserIsScrolling] = React.useState(false);
-    const scrollTimeoutRef = React.useRef<number>();
 
     const scrollToBottom = () => {
-      if (messagesContainerRef.current && !userIsScrolling) {
-        messagesContainerRef.current.scrollTop =
-          messagesContainerRef.current.scrollHeight;
-      }
-    };
-
-    const handleScroll = () => {
       if (messagesContainerRef.current) {
-        const { scrollTop, scrollHeight, clientHeight } =
-          messagesContainerRef.current;
-        const isNearBottom = scrollHeight - scrollTop - clientHeight < 100;
-
-        // Only prevent auto-scroll if user is NOT near the bottom
-        setUserIsScrolling(!isNearBottom);
-
-        if (scrollTimeoutRef.current) {
-          clearTimeout(scrollTimeoutRef.current);
-        }
-
-        // Reset user scrolling state after a delay if they're not near bottom
-        if (!isNearBottom) {
-          scrollTimeoutRef.current = setTimeout(() => {
-            setUserIsScrolling(false);
-          }, 2000);
-        }
+        const element = messagesContainerRef.current;
+        element.scrollTop = element.scrollHeight;
       }
     };
 
@@ -80,13 +56,13 @@ const Chat = React.forwardRef<HTMLDivElement, ChatProps>(
           content: m.content.slice(0, 50) + "...",
         }))
       );
-      // Only auto-scroll if user isn't manually scrolling
-      if (!userIsScrolling) {
-        setTimeout(() => {
-          scrollToBottom();
-        }, 100);
-      }
-    }, [messages, userIsScrolling]);
+      // Always scroll to bottom when messages change
+      const timeoutId = setTimeout(() => {
+        scrollToBottom();
+      }, 50);
+
+      return () => clearTimeout(timeoutId);
+    }, [messages]);
 
     return (
       <div
@@ -97,8 +73,7 @@ const Chat = React.forwardRef<HTMLDivElement, ChatProps>(
         {/* Messages */}
         <div
           ref={messagesContainerRef}
-          onScroll={handleScroll}
-          className="flex-1 overflow-y-auto p-4 space-y-4 scroll-smooth"
+          className="flex-1 overflow-y-auto p-4 space-y-4"
         >
           {messages.length === 0 ? (
             <div className="flex items-center justify-center h-full text-muted-foreground">