Opt out from check for pre-join UISI for threads (#7834)
This commit is contained in:
parent
9fc1f75fe5
commit
e997676ae2
1 changed files with 6 additions and 2 deletions
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue