From 257911529f9c5c5ca537f0afa33f84bdce269513 Mon Sep 17 00:00:00 2001 From: Badi Ifaoui Date: Tue, 16 Jan 2024 12:54:49 +0100 Subject: [PATCH 1/2] fix: send hello btn --- src/components/views/rooms/NewRoomIntro.tsx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/components/views/rooms/NewRoomIntro.tsx b/src/components/views/rooms/NewRoomIntro.tsx index e8eca640dc0..5c600a95e82 100644 --- a/src/components/views/rooms/NewRoomIntro.tsx +++ b/src/components/views/rooms/NewRoomIntro.tsx @@ -74,16 +74,19 @@ const NewRoomIntro: React.FC = () => { cli.sendEvent(roomId, EventType.RoomMessage, { body: "👋", msgtype: "m.text", - }); + }, (new Date()).toString()); }; - const sendHelloButton = !room.getLastActiveTimestamp() && ( + const sendHelloButton = (!room.getLastActiveTimestamp()) && ( 👋 + + Say Hello + ); From e394f621d9b9028a4203d6cf1564d2f3fc4b3d28 Mon Sep 17 00:00:00 2001 From: Badi ifaoui Date: Fri, 19 Jan 2024 10:55:40 +0100 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20start=20new=20direct=20message=20cha?= =?UTF-8?q?t,=20with=20wave=20=F0=9F=91=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/views/rooms/NewRoomIntro.tsx | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/components/views/rooms/NewRoomIntro.tsx b/src/components/views/rooms/NewRoomIntro.tsx index 5c600a95e82..7bfaeccb972 100644 --- a/src/components/views/rooms/NewRoomIntro.tsx +++ b/src/components/views/rooms/NewRoomIntro.tsx @@ -35,6 +35,7 @@ import DMRoomMap from "matrix-react-sdk/src/utils/DMRoomMap"; import { shouldEncryptRoomWithSingle3rdPartyInvite } from "matrix-react-sdk/src/utils/room/shouldEncryptRoomWithSingle3rdPartyInvite"; import { privateShouldBeEncrypted } from "matrix-react-sdk/src/utils/rooms"; import { showSpaceInvite } from "matrix-react-sdk/src/utils/space"; +import { sendMessage } from "matrix-react-sdk/src/components/views/rooms/wysiwyg_composer/utils/message"; import React, { useContext } from "react"; import { getRoomName } from "../../../hooks/useRoomName"; @@ -60,7 +61,8 @@ const determineIntroMessage = (room: Room, encryptedSingle3rdPartyInvite: boolea const NewRoomIntro: React.FC = () => { const cli = useContext(MatrixClientContext); - const { room, roomId } = useContext(RoomContext); + const roomContext = useContext(RoomContext); + const { room, roomId } = roomContext; if (!room || !roomId) { throw new Error("Unable to create a NewRoomIntro without room and roomId"); @@ -71,22 +73,20 @@ const NewRoomIntro: React.FC = () => { const onSendHelloClick = (): void => { if (!dmPartner) return; - cli.sendEvent(roomId, EventType.RoomMessage, { - body: "👋", - msgtype: "m.text", - }, (new Date()).toString()); + sendMessage("👋", false, { + mxClient: cli, + roomContext: roomContext, + }); }; - const sendHelloButton = (!room.getLastActiveTimestamp()) && ( + const sendHelloButton = !room.getLastActiveTimestamp() && ( 👋 - - Say Hello - + Say Hello );