Merge branch 'master' into develop

2022-01-31 14:57:13 +00:00
parent 085ecc7f5f bdcdd745ba
commit a25fea9f96
4 changed files with 193 additions and 10 deletions
--- a/src/components/views/rooms/EventTile.tsx
+++ b/src/components/views/rooms/EventTile.tsx
@@ -633,7 +633,7 @@ export default class EventTile extends React.Component<IProps, IState> {
         * We currently have no reliable way to discover than an event is a thread
         * when we are at the sync stage
         */
-        const room = this.context.getRoom(this.props.mxEvent.getRoomId());
+        const room = MatrixClientPeg.get().getRoom(this.props.mxEvent.getRoomId());
        const thread = room?.threads.get(this.props.mxEvent.getId());

        if (!thread || thread.length === 0) {