From 40d7f7955c930fffe4243715695bd7fca82a254a Mon Sep 17 00:00:00 2001
From: gabriellsh <40830821+gabriellsh@users.noreply.github.com>
Date: Mon, 12 Jun 2023 22:35:59 -0300
Subject: [PATCH] fix(meteor): Scroll position is lost when loading older
 messages (#29454)

---
 .changeset/honest-mails-try.md                            | 5 +++++
 apps/meteor/app/ui-utils/client/lib/RoomHistoryManager.ts | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/honest-mails-try.md

diff --git a/.changeset/honest-mails-try.md b/.changeset/honest-mails-try.md
new file mode 100644
index 00000000000..23af3a246af
--- /dev/null
+++ b/.changeset/honest-mails-try.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+fix(meteor): Scroll position is lost when loading older messages
diff --git a/apps/meteor/app/ui-utils/client/lib/RoomHistoryManager.ts b/apps/meteor/app/ui-utils/client/lib/RoomHistoryManager.ts
index 2cbe01bafb9..c9adbad5cbb 100644
--- a/apps/meteor/app/ui-utils/client/lib/RoomHistoryManager.ts
+++ b/apps/meteor/app/ui-utils/client/lib/RoomHistoryManager.ts
@@ -164,7 +164,7 @@ class RoomHistoryManagerClass extends Emitter {
 		room.unreadNotLoaded.set(result.unreadNotLoaded);
 		room.firstUnread.set(result.firstUnread);
 
-		const wrapper = await waitForElement('.messages-box .wrapper');
+		const wrapper = await waitForElement('.messages-box .wrapper .rc-scrollbars-view');
 
 		if (wrapper) {
 			previousHeight = wrapper.scrollHeight;