From c7f912529de66d66213c98c1444a590a2a6a5b16 Mon Sep 17 00:00:00 2001
From: Florian Duros <florianduros@element.io>
Date: Fri, 7 Oct 2022 11:02:22 +0200
Subject: [PATCH] Move mxClient to object in sendMessage

---
 .../views/rooms/wysiwyg_composer/WysiwygComposer.tsx        | 2 +-
 src/components/views/rooms/wysiwyg_composer/message.ts      | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/views/rooms/wysiwyg_composer/WysiwygComposer.tsx b/src/components/views/rooms/wysiwyg_composer/WysiwygComposer.tsx
index d5a9706989..f22963e4e7 100644
--- a/src/components/views/rooms/wysiwyg_composer/WysiwygComposer.tsx
+++ b/src/components/views/rooms/wysiwyg_composer/WysiwygComposer.tsx
@@ -46,7 +46,7 @@ export function WysiwygComposer(
     } });
 
     const memoizedSendMessage = useCallback(() => {
-        sendMessage(content, mxClient, { roomContext, ...props });
+        sendMessage(content, { mxClient, roomContext, ...props });
         wysiwyg.clear();
         ref.current?.focus();
     }, [content, mxClient, roomContext, wysiwyg, props, ref]);
diff --git a/src/components/views/rooms/wysiwyg_composer/message.ts b/src/components/views/rooms/wysiwyg_composer/message.ts
index 61300b8611..e39f6b48c8 100644
--- a/src/components/views/rooms/wysiwyg_composer/message.ts
+++ b/src/components/views/rooms/wysiwyg_composer/message.ts
@@ -32,6 +32,7 @@ import { IRoomState } from "../../../structures/RoomView";
 import dis from '../../../../dispatcher/dispatcher';
 
 interface SendMessageParams {
+    mxClient: MatrixClient;
     relation: IEventRelation;
     replyToEvent?: MatrixEvent;
     roomContext: IRoomState;
@@ -43,7 +44,7 @@ interface SendMessageParams {
 export function createMessageContent(
     message: string,
     { relation, replyToEvent, permalinkCreator, includeReplyLegacyFallback = true }:
-    Omit<SendMessageParams, 'roomContext'>,
+    Omit<SendMessageParams, 'roomContext' | 'mxClient'>,
 ): IContent {
     const isEmote = false;
 
@@ -92,8 +93,7 @@ export function createMessageContent(
 
 export function sendMessage(
     message: string,
-    mxClient: MatrixClient,
-    { roomContext, ...params }: SendMessageParams,
+    { roomContext, mxClient, ...params }: SendMessageParams,
 ) {
     const { relation, replyToEvent } = params;
     const { room } = roomContext;