From d2fb30a2116313c70943eb0e7bc37e644c2a7e7f Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 30 Jun 2020 23:52:13 +0100
Subject: [PATCH 1/2] Hide scrollbar without pixel jumping

---
 src/components/structures/LeftPanel2.tsx | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/LeftPanel2.tsx b/src/components/structures/LeftPanel2.tsx
index 0f614435e5..d34986f981 100644
--- a/src/components/structures/LeftPanel2.tsx
+++ b/src/components/structures/LeftPanel2.tsx
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import * as React from "react";
+import classnames from 'classnames';
 import { createRef } from "react";
 import TagPanel from "./TagPanel";
 import classNames from "classnames";
@@ -205,6 +206,11 @@ export default class LeftPanel2 extends React.Component<IProps, IState> {
             "mx_LeftPanel2_minimized": this.props.isMinimized,
         });
 
+        const className = classnames(
+            "mx_LeftPanel2_actualRoomListContainer",
+            "mx_AutoHideScrollbar",
+        );
+
         return (
             <div className={containerClasses}>
                 {tagPanel}
@@ -212,7 +218,7 @@ export default class LeftPanel2 extends React.Component<IProps, IState> {
                     {this.renderHeader()}
                     {this.renderSearchExplore()}
                     <div
-                        className="mx_LeftPanel2_actualRoomListContainer"
+                        className={className}
                         onScroll={this.onScroll}
                         ref={this.listContainerRef}
                     >{roomList}</div>

From ad27dbbfab6e7d2c3cdc07fc48bbad237a9b0465 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Wed, 1 Jul 2020 15:15:18 +0100
Subject: [PATCH 2/2] Clean up classnames

---
 src/components/structures/LeftPanel2.tsx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/components/structures/LeftPanel2.tsx b/src/components/structures/LeftPanel2.tsx
index d34986f981..ab117d55ed 100644
--- a/src/components/structures/LeftPanel2.tsx
+++ b/src/components/structures/LeftPanel2.tsx
@@ -15,7 +15,6 @@ limitations under the License.
 */
 
 import * as React from "react";
-import classnames from 'classnames';
 import { createRef } from "react";
 import TagPanel from "./TagPanel";
 import classNames from "classnames";
@@ -206,7 +205,7 @@ export default class LeftPanel2 extends React.Component<IProps, IState> {
             "mx_LeftPanel2_minimized": this.props.isMinimized,
         });
 
-        const className = classnames(
+        const roomListClasses = classNames(
             "mx_LeftPanel2_actualRoomListContainer",
             "mx_AutoHideScrollbar",
         );
@@ -218,7 +217,7 @@ export default class LeftPanel2 extends React.Component<IProps, IState> {
                     {this.renderHeader()}
                     {this.renderSearchExplore()}
                     <div
-                        className={className}
+                        className={roomListClasses}
                         onScroll={this.onScroll}
                         ref={this.listContainerRef}
                     >{roomList}</div>