From d2405bb747ad6fb1eed672d4a7a2dd5e6b786532 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Fri, 3 Dec 2021 15:15:51 +0100 Subject: [PATCH 1/3] Fix jump to bottom on message send MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- src/components/structures/RoomView.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/structures/RoomView.tsx b/src/components/structures/RoomView.tsx index 6b50ce53700..013436c01b1 100644 --- a/src/components/structures/RoomView.tsx +++ b/src/components/structures/RoomView.tsx @@ -928,7 +928,7 @@ export class RoomView extends React.Component { } case "scroll_to_bottom": - if (payload.timelineRenderingType === this.context.timelineRenderingType) { + if (payload.timelineRenderingType === this.state.timelineRenderingType) { this.messagePanel?.jumpToLiveTimeline(); } break; From b1c9d133e8e296220900bd585b50cda4d0bd74df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Mon, 6 Dec 2021 09:54:01 +0100 Subject: [PATCH 2/3] Update src/components/structures/RoomView.tsx Co-authored-by: Germain --- src/components/structures/RoomView.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/structures/RoomView.tsx b/src/components/structures/RoomView.tsx index 013436c01b1..9d6ebf62721 100644 --- a/src/components/structures/RoomView.tsx +++ b/src/components/structures/RoomView.tsx @@ -928,7 +928,7 @@ export class RoomView extends React.Component { } case "scroll_to_bottom": - if (payload.timelineRenderingType === this.state.timelineRenderingType) { + if (payload.timelineRenderingType === TimelineRenderingType.Room { this.messagePanel?.jumpToLiveTimeline(); } break; From d79923e21939d96baa13a15ab839b70faf6199d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Mon, 6 Dec 2021 10:01:02 +0100 Subject: [PATCH 3/3] Add missing `)` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- src/components/structures/RoomView.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/structures/RoomView.tsx b/src/components/structures/RoomView.tsx index 9d6ebf62721..16353f74a7c 100644 --- a/src/components/structures/RoomView.tsx +++ b/src/components/structures/RoomView.tsx @@ -928,7 +928,7 @@ export class RoomView extends React.Component { } case "scroll_to_bottom": - if (payload.timelineRenderingType === TimelineRenderingType.Room { + if (payload.timelineRenderingType === TimelineRenderingType.Room) { this.messagePanel?.jumpToLiveTimeline(); } break;