Fail to open a sub space #5965

- Update after review
element-hq · Apr 28, 2022 · 80ea20b · 80ea20b
1 parent 5f67a5a
commit 80ea20b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/Riot/Modules/Spaces/SpaceList/SpaceListViewModel.swift b/Riot/Modules/Spaces/SpaceList/SpaceListViewModel.swift
@@ -119,15 +119,8 @@ final class SpaceListViewModel: SpaceListViewModelType {
         var foundIndexPath: IndexPath?
 
         if let spaceService = self.userSessionsService.mainUserSession?.matrixSession.spaceService,
-           let ancestorIds = spaceService.ancestorsPerRoomId[spaceId] {
-            for ancestorId in ancestorIds {
-                if spaceService.ancestorsPerRoomId[ancestorId] == nil {
-                    if let indexPath = indexPathOf(spaceWithId: ancestorId) {
-                        foundIndexPath = indexPath
-                        break
-                    }
-                }
-            }
+           let firstRootAncestor = spaceService.firstRootAncestorForRoom(withId: spaceId) {
+            foundIndexPath = indexPathOf(spaceWithId: firstRootAncestor.spaceId)
         } else {
             foundIndexPath = indexPathOf(spaceWithId: spaceId)
         }

diff --git a/Riot/Modules/TabBar/MasterTabBarController.m b/Riot/Modules/TabBar/MasterTabBarController.m
@@ -732,7 +732,7 @@ - (void)filterRoomsWithParentId:(NSString*)roomParentId
         if (firstRootAncestor)
         {
             rootName = [mxSession roomSummaryWithRoomId:firstRootAncestor.spaceId].displayname;
-            [breadcrumbs addObject:rootName];
+            [breadcrumbs insertObject:rootName atIndex:0];
         }
         titleView.breadcrumbView.breadcrumbs = breadcrumbs;
     }