Fix message list not scrolling to newest message with long text (#958)

* Fix message list not scrolling to newest message with long text

* Update CHANGELOG.md

* Fix not scrolling to bottom when sending a new message

* Improve name of the variable

* Fix tests

Author: nuno-vieira

CHANGELOG.md

@@ -11,6 +11,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Fix swipe to reply enabled when quoting a message is disabled  [#977](https://github.com/GetStream/stream-chat-swiftui/pull/957)
 - Fix composer not showing images in the composer when editing signed attachments [#956](https://github.com/GetStream/stream-chat-swiftui/pull/956)
 - Fix replacing an image while editing a message not showing the new image in the message list [#956](https://github.com/GetStream/stream-chat-swiftui/pull/956)
+- Improve precision when scrolling to the newest message with long text #958
 
 # [4.88.0](https://github.com/GetStream/stream-chat-swiftui/releases/tag/4.88.0)
 _September 10, 2025_

Sources/StreamChatSwiftUI/ChatChannel/ChatChannelViewModel.swift

@@ -36,7 +36,8 @@ open class ChatChannelViewModel: ObservableObject, MessagesDataSource {
     private var readsString = ""
     private var canMarkRead = false
     private var hasSetInitialCanMarkRead = false
-    
+    private var currentUserSentNewMessage = false
+
     private let messageListDateOverlay: DateFormatter = DateFormatter.messageListDateOverlay
 
     private lazy var messagesDateFormatter = utils.dateFormatter
@@ -266,10 +267,7 @@ open class ChatChannelViewModel: ObservableObject, MessagesDataSource {
 
     /// The user tapped on the message sent button.
     public func messageSentTapped() {
-        // only scroll if the message is not being edited
-        if editedMessage == nil {
-            scrollToLastMessage()
-        }
+        currentUserSentNewMessage = true
     }
 
     public func jumpToMessage(messageId: String) -> Bool {
@@ -448,6 +446,9 @@ open class ChatChannelViewModel: ObservableObject, MessagesDataSource {
 
         if !showScrollToLatestButton && scrolledId == nil && !loadingNextMessages {
             updateScrolledIdToNewestMessage()
+        } else if changes.first?.isInsertion == true && currentUserSentNewMessage {
+            updateScrolledIdToNewestMessage()
+            currentUserSentNewMessage = false
         }
     }
 

Sources/StreamChatSwiftUI/ChatChannel/MessageList/MessageListView.swift

@@ -251,13 +251,19 @@ public struct MessageListView<Factory: ViewFactory>: View, KeyboardReadable {
                 .frame(maxWidth: .infinity)
                 .clipped()
                 .onChange(of: scrolledId) { scrolledId in
-                    if let scrolledId = scrolledId {
-                        let shouldJump = onJumpToMessage?(scrolledId) ?? false
-                        if !shouldJump {
-                            return
-                        }
-                        withAnimation {
-                            scrollView.scrollTo(scrolledId, anchor: messageListConfig.scrollingAnchor)
+                    DispatchQueue.main.async {
+                        if let scrolledId = scrolledId {
+                            let shouldJump = onJumpToMessage?(scrolledId) ?? false
+                            if !shouldJump {
+                                return
+                            }
+                            withAnimation {
+                                if messages.first?.id == scrolledId {
+                                    scrollView.scrollTo(scrolledId, anchor: .top)
+                                } else {
+                                    scrollView.scrollTo(scrolledId, anchor: messageListConfig.scrollingAnchor)
+                                }
+                            }
                         }
                     }
                 }

StreamChatSwiftUITests/Tests/ChatChannel/ChatChannelViewModel_Tests.swift

@@ -94,25 +94,6 @@ class ChatChannelViewModel_Tests: StreamChatTestCase {
         XCTAssert(viewModel.scrolledId!.contains(messageId))
     }
 
-    func test_chatChannelVM_messageSentTapped() {
-        // Given
-        let messageId: String = .unique
-        let message = ChatMessage.mock(
-            id: messageId,
-            cid: .unique,
-            text: "Test message",
-            author: ChatUser.mock(id: chatClient.currentUserId!)
-        )
-        let channelController = makeChannelController(messages: [message])
-        let viewModel = ChatChannelViewModel(channelController: channelController)
-
-        // When
-        viewModel.messageSentTapped()
-
-        // Then
-        XCTAssert(viewModel.scrolledId!.contains(messageId))
-    }
-
     func test_chatChannelVM_messageSentTapped_whenEditingMessage_shouldNotScroll() {
         // Given
         let messageId: String = .unique
@@ -209,6 +190,37 @@ class ChatChannelViewModel_Tests: StreamChatTestCase {
         XCTAssert(initialListId == newListId)
     }
 
+    func test_chatChannelVM_newMessageSentScrollsToNewestMessage() {
+        // Given
+        var messages = [ChatMessage]()
+        for i in 0..<5 {
+            let message = ChatMessage.mock(
+                id: .unique,
+                cid: .unique,
+                text: "Test Message \(i)",
+                author: ChatUser.mock(id: chatClient.currentUserId!)
+            )
+            messages.append(message)
+        }
+        let channelController = makeChannelController(messages: messages)
+        let viewModel = ChatChannelViewModel(channelController: channelController)
+
+        // When
+        viewModel.showScrollToLatestButton = true
+        viewModel.messageSentTapped()
+        viewModel.dataSource(
+            channelDataSource: ChatChannelDataSource(controller: channelController),
+            didUpdateMessages: LazyCachedMapCollection(elements: messages),
+            changes: [
+                .insert(messages[0], index: .init(item: 0, section: 0)),
+                .update(messages[1], index: .init(item: 1, section: 0))
+            ]
+        )
+
+        // Then
+        XCTAssertEqual(viewModel.scrolledId, messages[0].id)
+    }
+
     func test_chatChannelVM_messageThread() {
         // Given
         let channelController = makeChannelController()