From e4c4b73b814288ba29a3f95605a6eb4830721d07 Mon Sep 17 00:00:00 2001
From: Michael Weimann <michaelw@matrix.org>
Date: Thu, 1 Sep 2022 15:21:55 +0200
Subject: [PATCH] Fix types

---
 src/components/views/rooms/NewRoomIntro.tsx       | 10 ++++++----
 test/components/views/rooms/NewRoomIntro-test.tsx |  4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/components/views/rooms/NewRoomIntro.tsx b/src/components/views/rooms/NewRoomIntro.tsx
index 83e0a5eee84..adadc218310 100644
--- a/src/components/views/rooms/NewRoomIntro.tsx
+++ b/src/components/views/rooms/NewRoomIntro.tsx
@@ -58,16 +58,18 @@ const NewRoomIntro = () => {
     let body: JSX.Element;
     if (dmPartner) {
         let introMessage = _t("This is the beginning of your direct message history with <displayName/>.");
-        let caption: string;
+        let captionElement: JSX.Element = <></>;
 
         if (isLocalRoom) {
             introMessage = _t("Send your first message to invite <displayName/> to chat");
         } else if ((room.getJoinedMemberCount() + room.getInvitedMemberCount()) === 2) {
-            caption = _t("Only the two of you are in this conversation, unless either of you invites anyone to join.");
+            captionElement = <p>
+                { _t("Only the two of you are in this conversation, unless either of you invites anyone to join.") }
+            </p>;
         }
 
         const member = room?.getMember(dmPartner);
-        const displayName = room.name;
+        const displayName = room?.name || member?.rawDisplayName || dmPartner;
         body = <React.Fragment>
             <RoomAvatar
                 room={room}
@@ -87,7 +89,7 @@ const NewRoomIntro = () => {
             <p>{ _t(introMessage, {}, {
                 displayName: () => <b>{ displayName }</b>,
             }) }</p>
-            { caption && <p>{ caption }</p> }
+            { captionElement }
         </React.Fragment>;
     } else {
         const inRoom = room && room.getMyMembership() === "join";
diff --git a/test/components/views/rooms/NewRoomIntro-test.tsx b/test/components/views/rooms/NewRoomIntro-test.tsx
index a1ea8f43b74..fc3b9c2b1fc 100644
--- a/test/components/views/rooms/NewRoomIntro-test.tsx
+++ b/test/components/views/rooms/NewRoomIntro-test.tsx
@@ -60,7 +60,7 @@ describe("NewRoomIntro", () => {
 
         it("should render the expected intro", () => {
             const expected = `This is the beginning of your direct message history with test_room.`;
-            screen.getByText((id, element) => element.tagName === "SPAN" && element.textContent === expected);
+            screen.getByText((id, element) => element?.tagName === "SPAN" && element?.textContent === expected);
         });
     });
 
@@ -75,7 +75,7 @@ describe("NewRoomIntro", () => {
 
         it("should render the expected intro", () => {
             const expected = `Send your first message to invite test_room to chat`;
-            screen.getByText((id, element) => element.tagName === "SPAN" && element.textContent === expected);
+            screen.getByText((id, element) => element?.tagName === "SPAN" && element?.textContent === expected);
         });
     });
 });