Merge pull request #5822 from vector-im/ismail/5441_thread_timeline_fixes

Thread Timeline Fixes

Riot/Modules/Room/DataSources/RoomDataSource.m

@@ -968,11 +968,6 @@ const CGFloat kTypingCellHeight = 24;
 
 - (void)threadingService:(MXThreadingService *)service didCreateNewThread:(MXThread *)thread direction:(MXTimelineDirection)direction
 {
-    if (self.threadId)
-    {
-        //  no need to reload the thread screen
-        return;
-    }
     if (direction == MXTimelineDirectionBackwards)
     {
         //  no need to reload when paginating back

Riot/Modules/Threads/ThreadsCoordinator.swift

@@ -68,6 +68,10 @@ final class ThreadsCoordinator: NSObject, ThreadsCoordinatorProtocol {
         // Detect when view controller has been dismissed by gesture when presented modally (not in full screen).
         self.navigationRouter.toPresentable().presentationController?.delegate = self
         
+        guard parameters.threadId == nil else {
+            return
+        }
+        
         if self.navigationRouter.modules.isEmpty == false {
             self.navigationRouter.push(rootCoordinator, animated: true, popCompletion: { [weak self] in
                 self?.remove(childCoordinator: rootCoordinator)