From 11dac68579405ae8505a84af5cf6749924e69369 Mon Sep 17 00:00:00 2001
From: Maksim Sukharev <antreesy.web@gmail.com>
Date: Sun, 9 Feb 2025 17:36:49 +0100
Subject: [PATCH 1/2] fix(MessagesList): do not replace container when
 switching conversations

Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
---
 src/components/MessagesList/MessagesList.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/MessagesList/MessagesList.vue b/src/components/MessagesList/MessagesList.vue
index 46160c7dad3..fffb6a28cf8 100644
--- a/src/components/MessagesList/MessagesList.vue
+++ b/src/components/MessagesList/MessagesList.vue
@@ -7,7 +7,6 @@
 	<!-- size and remain refer to the amount and initial height of the items that
 	are outside of the viewport -->
 	<div ref="scroller"
-		:key="token"
 		class="scroller messages-list__scroller"
 		:class="{'scroller--chatScrolledToBottom': isChatScrolledToBottom,
 			'scroller--isScrolling': isScrolling}"

From 785fdeac321ca5ebceb46686c67dfef4ce345fa1 Mon Sep 17 00:00:00 2001
From: Maksim Sukharev <antreesy.web@gmail.com>
Date: Sun, 9 Feb 2025 18:01:51 +0100
Subject: [PATCH 2/2] fix(MessagesList): do not reset scrolledToBottom for
 non-scrollable chats

Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
---
 src/components/MessagesList/MessagesList.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/components/MessagesList/MessagesList.vue b/src/components/MessagesList/MessagesList.vue
index fffb6a28cf8..1d0f1584f74 100644
--- a/src/components/MessagesList/MessagesList.vue
+++ b/src/components/MessagesList/MessagesList.vue
@@ -386,6 +386,9 @@ export default {
 				this.$refs.scroller.scrollTo({
 					top: this.$refs.scroller.scrollHeight,
 				})
+			} else if (this.$refs.scroller.clientHeight === this.$refs.scroller.scrollHeight) {
+				// chat is not scrollable
+				this.setChatScrolledToBottom(true)
 			}
 		},
 
@@ -930,10 +933,10 @@ export default {
 				this.displayMessagesLoader = false
 				this.debounceUpdateReadMarkerPosition()
 				return
+			} else if (scrollHeight > clientHeight) {
+				this.setChatScrolledToBottom(false)
 			}
 
-			this.setChatScrolledToBottom(false)
-
 			if ((scrollHeight > clientHeight && scrollTop < 800 && this.isScrolling === 'up')
 				|| skipHeightCheck) {
 				if (this.loadingOldMessages || this.isChatBeginningReached) {