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

Commit 21c8341

Browse files
committed
Fix missing case where event id is provided as well as via servers
1 parent 9767dea commit 21c8341

File tree

2 files changed

+24
-1
lines changed

2 files changed

+24
-1
lines changed

src/components/views/messages/RoomPredecessorTile.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ export const RoomPredecessorTile: React.FC<IProps> = ({ mxEvent, timestamp }) =>
112112

113113
const predecessorPermalink = prevRoom
114114
? createLinkWithRoom(prevRoom, predecessor.roomId, predecessor.eventId)
115-
: createLinkWithoutRoom(predecessor.roomId, predecessor.viaServers);
115+
: createLinkWithoutRoom(predecessor.roomId, predecessor.viaServers, predecessor.eventId);
116116

117117
const link = (
118118
<a href={predecessorPermalink} onClick={onLinkClicked}>

test/components/views/messages/RoomPredecessorTile-test.tsx

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,29 @@ describe("<RoomPredecessorTile />", () => {
236236
"https://matrix.to/#/old_room_id_from_predecessor?via=a.example.com&via=b.example.com",
237237
);
238238
});
239+
240+
it("Shows a tile linking to an event if there are via servers", () => {
241+
const predecessorEvent = new MatrixEvent({
242+
type: EventType.RoomPredecessor,
243+
state_key: "",
244+
sender: userId,
245+
room_id: roomId,
246+
content: {
247+
predecessor_room_id: "old_room_id_from_predecessor",
248+
last_known_event_id: "$tombstone",
249+
via_servers: ["a.example.com", "b.example.com"],
250+
},
251+
event_id: "$create",
252+
});
253+
const room = new Room(roomId, client, userId);
254+
upsertRoomStateEvents(room, [createEvent, predecessorEvent]);
255+
256+
renderTile(room);
257+
expect(screen.getByText("Click here to see older messages.")).toHaveAttribute(
258+
"href",
259+
"https://matrix.to/#/old_room_id_from_predecessor/$tombstone?via=a.example.com&via=b.example.com",
260+
);
261+
});
239262
});
240263
});
241264
});

0 commit comments

Comments
 (0)