From c31bd8c647493ab2fc349b7abc3d80c5d1a30258 Mon Sep 17 00:00:00 2001
From: Dariusz Niemczyk <3636685+Palid@users.noreply.github.com>
Date: Thu, 14 Oct 2021 16:42:54 +0200
Subject: [PATCH 1/2] Remove unnecessary adapter in ThreadPanel-test.tsx
 (#6946)

---
 test/components/structures/ThreadPanel-test.tsx | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/test/components/structures/ThreadPanel-test.tsx b/test/components/structures/ThreadPanel-test.tsx
index d6de2ebde6..a59e9aa6cd 100644
--- a/test/components/structures/ThreadPanel-test.tsx
+++ b/test/components/structures/ThreadPanel-test.tsx
@@ -15,9 +15,8 @@ limitations under the License.
 */
 
 import React from 'react';
-import { shallow, mount, configure } from "enzyme";
+import { shallow, mount } from "enzyme";
 import '../../skinned-sdk';
-import Adapter from "@wojtekmaj/enzyme-adapter-react-17";
 
 import {
     ThreadFilterType,
@@ -28,8 +27,6 @@ import { ContextMenuButton } from '../../../src/accessibility/context_menu/Conte
 import ContextMenu from '../../../src/components/structures/ContextMenu';
 import { _t } from '../../../src/languageHandler';
 
-configure({ adapter: new Adapter() });
-
 describe('ThreadPanel', () => {
     describe('Header', () => {
         it('expect that All filter for ThreadPanelHeader properly renders Show: All threads', () => {

From 2dd6dddc676d6d1dd32ef6909443b1da1e212ae2 Mon Sep 17 00:00:00 2001
From: Dariusz Niemczyk <3636685+Palid@users.noreply.github.com>
Date: Thu, 14 Oct 2021 17:37:56 +0200
Subject: [PATCH 2/2] Fix incorrect liveTimeline reference (#6948)

Fixes https://github.com/vector-im/element-web/issues/19400
---
 src/components/views/rooms/SendMessageComposer.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/views/rooms/SendMessageComposer.tsx b/src/components/views/rooms/SendMessageComposer.tsx
index 35a028aadc..1a8315be7b 100644
--- a/src/components/views/rooms/SendMessageComposer.tsx
+++ b/src/components/views/rooms/SendMessageComposer.tsx
@@ -143,6 +143,8 @@ interface ISendMessageComposerProps extends MatrixClientProps {
 @replaceableComponent("views.rooms.SendMessageComposer")
 export class SendMessageComposer extends React.Component<ISendMessageComposerProps> {
     static contextType = RoomContext;
+    public context!: React.ContextType<typeof RoomContext>;
+
     private readonly prepareToEncrypt?: DebouncedFunc<() => void>;
     private readonly editorRef = createRef<BasicMessageComposer>();
     private model: EditorModel = null;
@@ -279,7 +281,7 @@ export class SendMessageComposer extends React.Component<ISendMessageComposerPro
     }
 
     private sendQuickReaction(): void {
-        const timeline = this.context.liveTimeline();
+        const timeline = this.context.liveTimeline;
         const events = timeline.getEvents();
         const reaction = this.model.parts[1].text;
         for (let i = events.length - 1; i >= 0; i--) {