fix: incorrect scroll position when switching DMs (RocketChat#36524)

Author: MartinSchoeler

.changeset/strong-files-work.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixes scroll issue when moving between channels or DMs

apps/meteor/client/views/room/body/hooks/useRestoreScrollPosition.ts

@@ -14,7 +14,7 @@ export function useRestoreScrollPosition(rid: string, wait = 100) {
 					return;
 				}
 				const store = RoomManager.getStore(rid);
-				if (!jumpToRef.current && store?.scroll !== undefined && !store.atBottom) {
+				if (store?.scroll !== undefined && (!jumpToRef.current || !store.atBottom)) {
 					node.scrollTop = store.scroll;
 					node.scrollLeft = 30;
 				}