From e971069595e3ab4b67858bc50fa346899de1369c Mon Sep 17 00:00:00 2001
From: unknown <ajbura@gmail.com>
Date: Sat, 21 Aug 2021 18:39:21 +0530
Subject: [PATCH] chat scrollback performance improved

---
 src/app/molecules/message/Message.scss           | 2 +-
 src/app/organisms/channel/ChannelViewContent.jsx | 8 ++++----
 src/client/state/RoomTimeline.js                 | 1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/app/molecules/message/Message.scss b/src/app/molecules/message/Message.scss
index b9e02de8..60886ca9 100644
--- a/src/app/molecules/message/Message.scss
+++ b/src/app/molecules/message/Message.scss
@@ -170,7 +170,7 @@
   &-btns button {
     margin: var(--sp-tight) var(--sp-tight) 0 0;
     [dir=rtl] & {
-      margin: 0 0 var(--sp-tight) var(--sp-tight);
+      margin: var(--sp-tight) 0 0 var(--sp-tight);
     }
   }
 }
diff --git a/src/app/organisms/channel/ChannelViewContent.jsx b/src/app/organisms/channel/ChannelViewContent.jsx
index f01e8b2d..9f75e080 100644
--- a/src/app/organisms/channel/ChannelViewContent.jsx
+++ b/src/app/organisms/channel/ChannelViewContent.jsx
@@ -46,9 +46,9 @@ const MAX_MSG_DIFF_MINUTES = 5;
 function genPlaceholders() {
   return (
     <>
-      <PlaceholderMessage key={Math.random().toString(20).substr(2, 6)} />
-      <PlaceholderMessage key={Math.random().toString(20).substr(2, 6)} />
-      <PlaceholderMessage key={Math.random().toString(20).substr(2, 6)} />
+      <PlaceholderMessage key="placeholder-1" />
+      <PlaceholderMessage key="placeholder-2" />
+      <PlaceholderMessage key="placeholder-3" />
     </>
   );
 }
@@ -139,7 +139,7 @@ function genChannelIntro(mEvent, roomTimeline) {
   avatarSrc = isDM ? roomTimeline.room.getAvatarFallbackMember()?.getAvatarUrl(mx.baseUrl, 80, 80, 'crop') : avatarSrc;
   return (
     <ChannelIntro
-      key={mEvent ? mEvent.getId() : Math.random().toString(20).substr(2, 6)}
+      key={mEvent ? mEvent.getId() : 'channel-intro'}
       roomId={roomTimeline.roomId}
       avatarSrc={avatarSrc}
       name={roomTimeline.room.name}
diff --git a/src/client/state/RoomTimeline.js b/src/client/state/RoomTimeline.js
index 13374543..f434ee82 100644
--- a/src/client/state/RoomTimeline.js
+++ b/src/client/state/RoomTimeline.js
@@ -32,6 +32,7 @@ class RoomTimeline extends EventEmitter {
       }
 
       if (this.ongoingDecryptionCount !== 0) return;
+      if (this.isOngoingPagination) return;
       this.emit(cons.events.roomTimeline.EVENT);
     };