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

Fix checkForPreJoinUISI for thread roots #9803

Merged
merged 8 commits into from
Dec 21, 2022
Merged

Fix checkForPreJoinUISI for thread roots #9803

Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
86034b4
Fix blank timeline when thread root is UTD
germain-gg Dec 20, 2022
a4fb827
Merge branch 'develop' into gsouquet/blank-timeline-threads
Dec 20, 2022
65aaec4
add test for pre join uisi checks and thread roots
germain-gg Dec 21, 2022
661fdd9
ts strict fix
germain-gg Dec 21, 2022
c9fbc6c
Merge branch 'develop' into gsouquet/blank-timeline-threads
germain-gg Dec 21, 2022
be2871f
Update to timeline panel test
Dec 21, 2022
50d45bd
Fixes to TimelinePanel-test
germain-gg Dec 21, 2022
4887b01
Merge branch 'develop' into gsouquet/blank-timeline-threads
Dec 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/components/structures/TimelinePanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1637,7 +1637,9 @@ class TimelinePanel extends React.Component<IProps, IState> {
let i = events.length - 1;
let userMembership = "leave";
for (; i >= 0; i--) {
const timeline = room.getTimelineForEvent(events[i].getId());
const timeline = isThreadTimeline
? room.getTimelineForEvent(events[i].getId()!)
: room.getUnfilteredTimelineSet().getTimelineForEvent(events[i].getId()!);
richvdh marked this conversation as resolved.
Show resolved Hide resolved
if (!timeline) {
// Somehow, it seems to be possible for live events to not have
// a timeline, even though that should not happen. :(
Expand Down