From a308a5418323f9529986791a59e27e37ce2eebae Mon Sep 17 00:00:00 2001
From: Germain Souquet <germain@souquet.com>
Date: Wed, 31 Mar 2021 12:28:24 +0100
Subject: [PATCH] Clicking jump to bottom resets room hash

---
 res/css/views/rooms/_JumpToBottomButton.scss     | 1 +
 src/components/structures/RoomView.tsx           | 1 +
 src/components/views/rooms/JumpToBottomButton.js | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/res/css/views/rooms/_JumpToBottomButton.scss b/res/css/views/rooms/_JumpToBottomButton.scss
index 6cb3b6bce9..a8dc2ce11c 100644
--- a/res/css/views/rooms/_JumpToBottomButton.scss
+++ b/res/css/views/rooms/_JumpToBottomButton.scss
@@ -52,6 +52,7 @@ limitations under the License.
 
 .mx_JumpToBottomButton_scrollDown {
     position: relative;
+    display: block;
     height: 38px;
     border-radius: 19px;
     box-sizing: border-box;
diff --git a/src/components/structures/RoomView.tsx b/src/components/structures/RoomView.tsx
index a180afba29..e08461b511 100644
--- a/src/components/structures/RoomView.tsx
+++ b/src/components/structures/RoomView.tsx
@@ -2037,6 +2037,7 @@ export default class RoomView extends React.Component<IProps, IState> {
                 highlight={this.state.room.getUnreadNotificationCount('highlight') > 0}
                 numUnreadMessages={this.state.numUnreadMessages}
                 onScrollToBottomClick={this.jumpToLiveTimeline}
+                roomId={this.state.roomId}
             />);
         }
 
diff --git a/src/components/views/rooms/JumpToBottomButton.js b/src/components/views/rooms/JumpToBottomButton.js
index b6cefc1231..2c62877dc3 100644
--- a/src/components/views/rooms/JumpToBottomButton.js
+++ b/src/components/views/rooms/JumpToBottomButton.js
@@ -29,6 +29,8 @@ export default (props) => {
     }
     return (<div className={className}>
         <AccessibleButton className="mx_JumpToBottomButton_scrollDown"
+            element="a"
+            href={`#/room/${props.roomId}`}
             title={_t("Scroll to most recent messages")}
             onClick={props.onScrollToBottomClick}>
         </AccessibleButton>