Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Commit

Permalink
Use roon name for room intro
Browse files Browse the repository at this point in the history
  • Loading branch information
weeman1337 committed Sep 1, 2022
1 parent b2704d5 commit 29f245c
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
6 changes: 3 additions & 3 deletions src/components/views/rooms/NewRoomIntro.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ const NewRoomIntro = () => {
? room.targets[0]?.userId
: DMRoomMap.shared().getUserIdForRoomId(roomId);

let body;
let body: JSX.Element;
if (dmPartner) {
let introMessage = _t("This is the beginning of your direct message history with <displayName/>.");
let caption;
let caption: string;

if (isLocalRoom) {
introMessage = _t("Send your first message to invite <displayName/> to chat");
Expand All @@ -67,7 +67,7 @@ const NewRoomIntro = () => {
}

const member = room?.getMember(dmPartner);
const displayName = member?.rawDisplayName || dmPartner;
const displayName = room.name;
body = <React.Fragment>
<RoomAvatar
room={room}
Expand Down
9 changes: 6 additions & 3 deletions test/components/views/rooms/NewRoomIntro-test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,13 @@ describe("NewRoomIntro", () => {
describe("for a DM Room", () => {
beforeEach(() => {
jest.spyOn(DMRoomMap.shared(), "getUserIdForRoomId").mockReturnValue(userId);
renderNewRoomIntro(client, new Room(roomId, client, client.getUserId()));
const room = new Room(roomId, client, client.getUserId());
room.name = "test_room";
renderNewRoomIntro(client, room);
});

it("should render the expected intro", () => {
const expected = `This is the beginning of your direct message history with ${userId}.`;
const expected = `This is the beginning of your direct message history with test_room.`;
screen.getByText((id, element) => element.tagName === "SPAN" && element.textContent === expected);
});
});
Expand All @@ -66,12 +68,13 @@ describe("NewRoomIntro", () => {
beforeEach(() => {
jest.spyOn(DMRoomMap.shared(), "getUserIdForRoomId").mockReturnValue(userId);
const localRoom = new LocalRoom(roomId, client, client.getUserId());
localRoom.name = "test_room";
localRoom.targets.push(new DirectoryMember({ user_id: userId }));
renderNewRoomIntro(client, localRoom);
});

it("should render the expected intro", () => {
const expected = `Send your first message to invite ${userId} to chat`;
const expected = `Send your first message to invite test_room to chat`;
screen.getByText((id, element) => element.tagName === "SPAN" && element.textContent === expected);
});
});
Expand Down

0 comments on commit 29f245c

Please sign in to comment.