From c708afe21636976eb4009b0f2b2e4bc3b2330e8f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 28 Jun 2021 16:03:52 +0100
Subject: [PATCH] Pull scroll_to_bottom up a level similarly to prevent it
 firing on NotifPanel/FilePanel when sending a message

---
 src/components/structures/RoomView.tsx     | 4 ++++
 src/components/structures/TimelinePanel.js | 4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/structures/RoomView.tsx b/src/components/structures/RoomView.tsx
index b92d51d8ed..3e6cfa864a 100644
--- a/src/components/structures/RoomView.tsx
+++ b/src/components/structures/RoomView.tsx
@@ -843,6 +843,10 @@ export default class RoomView extends React.Component<IProps, IState> {
                 }
                 break;
             }
+
+            case "scroll_to_bottom":
+                this.messagePanel?.jumpToLiveTimeline();
+                break;
         }
     };
 
diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index 61b7fc0555..4b51a5ecf5 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -446,10 +446,6 @@ class TimelinePanel extends React.Component {
             case "ignore_state_changed":
                 this.forceUpdate();
                 break;
-
-            case "scroll_to_bottom":
-                this.jumpToLiveTimeline();
-                break;
         }
     };