Stop tracking threads if threads support is disabled (#8308)

src/components/structures/RoomView.tsx

@@ -1395,6 +1395,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
                 return b.length - a.length;
             });
 
+            if (this.context.supportsExperimentalThreads()) {
                 // Process all thread roots returned in this batch of search results
                 // XXX: This won't work for results coming from Seshat which won't include the bundled relationship
                 for (const result of results.results) {
@@ -1406,6 +1407,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
                         event.setThread(room.findThreadForEvent(event) ?? room.createThread(event, [], true));
                     }
                 }
+            }
 
             this.setState({
                 searchHighlights: highlights,

src/utils/EventUtils.ts

@@ -217,7 +217,7 @@ export async function fetchInitialEvent(
         initialEvent = null;
     }
 
-    if (initialEvent?.isThreadRelation) {
+    if (initialEvent?.isThreadRelation && client.supportsExperimentalThreads()) {
         try {
             const rootEventData = await client.fetchRoomEvent(roomId, initialEvent.threadRootId);
             const rootEvent = new MatrixEvent(rootEventData);