matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-12-05 15:22:09 +03:00
Code Activity

Opt out from check for pre-join UISI for threads (#7834)

Browse Source
This commit is contained in:
Germain
2022-02-17 17:34:20 +00:00
committed by GitHub
parent 9fc1f75fe5
commit e997676ae2
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/structures/TimelinePanel.tsx
View File

@@ -1331,8 +1331,12 @@ class TimelinePanel extends React.Component<IProps, IState> {
private checkForPreJoinUISI(events: MatrixEvent[]): number { private checkForPreJoinUISI(events: MatrixEvent[]): number {
const room = this.props.timelineSet.room; const room = this.props.timelineSet.room;
if (events.length === 0 || !room || const isThreadTimeline = [TimelineRenderingType.Thread, TimelineRenderingType.ThreadsList]
!MatrixClientPeg.get().isRoomEncrypted(room.roomId)) { .includes(this.context.timelineRenderingType);
if (events.length === 0
|| !room
|| !MatrixClientPeg.get().isRoomEncrypted(room.roomId)
|| isThreadTimeline) {
return 0; return 0;
} }