From c03ed528babbf30f3c42049d6bfa14404c9d3eb9 Mon Sep 17 00:00:00 2001
From: Doug <6060466+pixlwave@users.noreply.github.com>
Date: Tue, 7 Oct 2025 10:57:53 +0100
Subject: [PATCH] More space tweaks (#4584)

* Remove the room count everywhere.

* Remove the parent name from restricted spaces.
---
 .../Mocks/Generated/GeneratedMocks.swift        |  1 -
 ElementX/Sources/Mocks/SpaceRoomProxyMock.swift |  3 ---
 .../JoinRoomScreen/JoinRoomScreenModels.swift   |  8 ++++----
 .../Screens/Spaces/Common/SpaceHeaderView.swift |  5 ++---
 .../Screens/Spaces/Common/SpaceRoomCell.swift   |  5 ++---
 .../SpaceListScreen/SpaceListScreenModels.swift |  8 --------
 .../SpaceListScreen/View/SpaceListScreen.swift  |  2 +-
 .../SpaceScreen/View/LeaveSpaceView.swift       |  1 -
 .../Spaces/SpaceScreen/View/SpaceScreen.swift   |  1 -
 .../Services/Spaces/LeaveSpaceHandleProxy.swift |  2 +-
 .../Services/Spaces/SpaceRoomListProxy.swift    | 17 ++++++++---------
 .../Services/Spaces/SpaceRoomProxy.swift        |  8 +-------
 .../Spaces/SpaceRoomProxyProtocol.swift         | 11 ++---------
 .../Services/Spaces/SpaceServiceProxy.swift     | 15 +++++++--------
 ...nRoomScreenSpace.Banned-Space-iPad-en-GB.png |  4 ++--
 ...RoomScreenSpace.Banned-Space-iPad-pseudo.png |  4 ++--
 ...ScreenSpace.Banned-Space-iPhone-16-en-GB.png |  4 ++--
 ...creenSpace.Banned-Space-iPhone-16-pseudo.png |  4 ++--
 ...omScreenSpace.Forbidden-Space-iPad-en-GB.png |  4 ++--
 ...mScreenSpace.Forbidden-Space-iPad-pseudo.png |  4 ++--
 ...eenSpace.Forbidden-Space-iPhone-16-en-GB.png |  4 ++--
 ...enSpace.Forbidden-Space-iPhone-16-pseudo.png |  4 ++--
 ...eenSpace.InviteRequired-Space-iPad-en-GB.png |  4 ++--
 ...enSpace.InviteRequired-Space-iPad-pseudo.png |  4 ++--
 ...ace.InviteRequired-Space-iPhone-16-en-GB.png |  4 ++--
 ...ce.InviteRequired-Space-iPhone-16-pseudo.png |  4 ++--
 ...RoomScreenSpace.Invited-Space-iPad-en-GB.png |  4 ++--
 ...oomScreenSpace.Invited-Space-iPad-pseudo.png |  4 ++--
 ...creenSpace.Invited-Space-iPhone-16-en-GB.png |  4 ++--
 ...reenSpace.Invited-Space-iPhone-16-pseudo.png |  4 ++--
 ...nvitedWithHiddenAvatars-Space-iPad-en-GB.png |  4 ++--
 ...vitedWithHiddenAvatars-Space-iPad-pseudo.png |  4 ++--
 ...dWithHiddenAvatars-Space-iPhone-16-en-GB.png |  4 ++--
 ...WithHiddenAvatars-Space-iPhone-16-pseudo.png |  4 ++--
 ...oomScreenSpace.Joinable-Space-iPad-en-GB.png |  4 ++--
 ...omScreenSpace.Joinable-Space-iPad-pseudo.png |  4 ++--
 ...reenSpace.Joinable-Space-iPhone-16-en-GB.png |  4 ++--
 ...eenSpace.Joinable-Space-iPhone-16-pseudo.png |  4 ++--
 ...omScreenSpace.Knockable-Space-iPad-en-GB.png |  4 ++--
 ...mScreenSpace.Knockable-Space-iPad-pseudo.png |  4 ++--
 ...eenSpace.Knockable-Space-iPhone-16-en-GB.png |  4 ++--
 ...enSpace.Knockable-Space-iPhone-16-pseudo.png |  4 ++--
 ...mScreenSpace.Restricted-Space-iPad-en-GB.png |  4 ++--
 ...ScreenSpace.Restricted-Space-iPad-pseudo.png |  4 ++--
 ...enSpace.Restricted-Space-iPhone-16-en-GB.png |  4 ++--
 ...nSpace.Restricted-Space-iPhone-16-pseudo.png |  4 ++--
 ...pace.RestrictedJoinable-Space-iPad-en-GB.png |  4 ++--
 ...ace.RestrictedJoinable-Space-iPad-pseudo.png |  4 ++--
 ...RestrictedJoinable-Space-iPhone-16-en-GB.png |  4 ++--
 ...estrictedJoinable-Space-iPhone-16-pseudo.png |  4 ++--
 ...aveSpaceView.Only-Admin-Rooms-iPad-en-GB.png |  4 ++--
 ...veSpaceView.Only-Admin-Rooms-iPad-pseudo.png |  4 ++--
 ...aceView.Only-Admin-Rooms-iPhone-16-en-GB.png |  4 ++--
 ...ceView.Only-Admin-Rooms-iPhone-16-pseudo.png |  4 ++--
 .../spaceHeaderView.iPad-en-GB-0.png            |  4 ++--
 .../spaceHeaderView.iPad-pseudo-0.png           |  4 ++--
 .../spaceHeaderView.iPhone-16-en-GB-0.png       |  4 ++--
 .../spaceHeaderView.iPhone-16-pseudo-0.png      |  4 ++--
 .../spaceListScreen.iPad-en-GB-0.png            |  4 ++--
 .../spaceListScreen.iPad-pseudo-0.png           |  4 ++--
 .../spaceListScreen.iPhone-16-en-GB-0.png       |  4 ++--
 .../spaceListScreen.iPhone-16-pseudo-0.png      |  4 ++--
 .../PreviewTests/spaceRoomCell.iPad-en-GB-0.png |  4 ++--
 .../spaceRoomCell.iPad-pseudo-0.png             |  4 ++--
 .../spaceRoomCell.iPhone-16-en-GB-0.png         |  4 ++--
 .../spaceRoomCell.iPhone-16-pseudo-0.png        |  4 ++--
 .../PreviewTests/spaceScreen.iPad-en-GB-0.png   |  4 ++--
 .../PreviewTests/spaceScreen.iPad-pseudo-0.png  |  4 ++--
 .../spaceScreen.iPhone-16-en-GB-0.png           |  4 ++--
 .../spaceScreen.iPhone-16-pseudo-0.png          |  4 ++--
 .../Sources/SpaceListScreenViewModelTests.swift |  1 -
 71 files changed, 140 insertions(+), 172 deletions(-)

diff --git a/ElementX/Sources/Mocks/Generated/GeneratedMocks.swift b/ElementX/Sources/Mocks/Generated/GeneratedMocks.swift
index a7e79c320..aa9ae992c 100644
--- a/ElementX/Sources/Mocks/Generated/GeneratedMocks.swift
+++ b/ElementX/Sources/Mocks/Generated/GeneratedMocks.swift
@@ -16009,7 +16009,6 @@ class SpaceRoomProxyMock: SpaceRoomProxyProtocol, @unchecked Sendable {
     }
     var underlyingIsSpace: Bool!
     var isDirect: Bool?
-    var parent: SpaceRoomProxyProtocol?
     var childrenCount: Int {
         get { return underlyingChildrenCount }
         set(value) { underlyingChildrenCount = value }
diff --git a/ElementX/Sources/Mocks/SpaceRoomProxyMock.swift b/ElementX/Sources/Mocks/SpaceRoomProxyMock.swift
index 88b32abdc..84d3df2fd 100644
--- a/ElementX/Sources/Mocks/SpaceRoomProxyMock.swift
+++ b/ElementX/Sources/Mocks/SpaceRoomProxyMock.swift
@@ -16,7 +16,6 @@ extension SpaceRoomProxyMock {
         
         var isSpace: Bool
         var isDirect: Bool?
-        var parent: SpaceRoomProxyProtocol?
         var childrenCount = 0
         
         var joinedMembersCount = 0
@@ -38,7 +37,6 @@ extension SpaceRoomProxyMock {
         avatarURL = configuration.avatarURL
         isSpace = configuration.isSpace
         isDirect = configuration.isDirect
-        parent = configuration.parent
         childrenCount = configuration.childrenCount
         joinedMembersCount = configuration.joinedMembersCount
         heroes = configuration.heroes
@@ -129,7 +127,6 @@ extension [SpaceRoomProxyProtocol] {
             SpaceRoomProxyMock(.init(id: "!\(typeName.lowercased())3:matrix.org",
                                      name: "Joined \(typeName)",
                                      isSpace: isSpace,
-                                     parent: SpaceRoomProxyMock(.init(name: "Company", isSpace: true)),
                                      joinedMembersCount: 123,
                                      topic: "Discussion on specific topic goes here.",
                                      joinRule: .restricted(rules: []),
diff --git a/ElementX/Sources/Screens/JoinRoomScreen/JoinRoomScreenModels.swift b/ElementX/Sources/Screens/JoinRoomScreen/JoinRoomScreenModels.swift
index e9ea7fa8a..e002a13f8 100644
--- a/ElementX/Sources/Screens/JoinRoomScreen/JoinRoomScreenModels.swift
+++ b/ElementX/Sources/Screens/JoinRoomScreen/JoinRoomScreenModels.swift
@@ -75,8 +75,8 @@ struct JoinRoomScreenViewState: BindableState {
     }
     
     var subtitle: String? {
-        if roomDetails?.isSpace == true, let spaceVisibilityTitle, let childrenCount = roomDetails?.childrenCount {
-            return L10n.screenSpaceListDetails(spaceVisibilityTitle, L10n.commonRooms(childrenCount))
+        if roomDetails?.isSpace == true, let spaceVisibilityTitle {
+            return spaceVisibilityTitle
         } else {
             switch mode {
             case .invited(isDM: true):
@@ -98,7 +98,7 @@ struct JoinRoomScreenViewState: BindableState {
         return switch roomDetails?.spaceVisibility {
         case .public: \.public
         case .private: \.lock
-        case .restricted(let parentName): \.space
+        case .restricted: \.space
         case .none: \.lock
         }
     }
@@ -107,7 +107,7 @@ struct JoinRoomScreenViewState: BindableState {
         switch roomDetails?.spaceVisibility {
         case .public: L10n.commonPublicSpace
         case .private: L10n.commonPrivateSpace
-        case .restricted(let parentName): L10n.screenSpaceListParentSpace(parentName)
+        case .restricted: L10n.commonSharedSpace
         case .none: L10n.commonPrivateSpace
         }
     }
diff --git a/ElementX/Sources/Screens/Spaces/Common/SpaceHeaderView.swift b/ElementX/Sources/Screens/Spaces/Common/SpaceHeaderView.swift
index 73af0a9f4..10be90eb7 100644
--- a/ElementX/Sources/Screens/Spaces/Common/SpaceHeaderView.swift
+++ b/ElementX/Sources/Screens/Spaces/Common/SpaceHeaderView.swift
@@ -63,7 +63,7 @@ struct SpaceHeaderView: View {
     
     var spaceDetails: some View {
         Label {
-            Text(L10n.screenSpaceListDetails(spaceDetailsVisibilityTitle, L10n.commonRooms(spaceRoomProxy.childrenCount)))
+            Text(spaceDetailsVisibilityTitle)
                 .font(.compound.bodyLG)
                 .foregroundStyle(.compound.textSecondary)
                 .multilineTextAlignment(.center)
@@ -77,7 +77,7 @@ struct SpaceHeaderView: View {
         switch spaceRoomProxy.visibility {
         case .public: L10n.commonPublicSpace
         case .private: L10n.commonPrivateSpace
-        case .restricted(let parentName): L10n.screenSpaceListParentSpace(parentName)
+        case .restricted: L10n.commonSharedSpace
         case .none: L10n.commonPrivateSpace
         }
     }
@@ -125,7 +125,6 @@ struct SpaceHeaderView_Previews: PreviewProvider, TestablePreview {
             SpaceRoomProxyMock(.init(id: "!space3:matrix.org",
                                      name: "Subspace",
                                      isSpace: true,
-                                     parent: SpaceRoomProxyMock(.init(name: "Foundation", isSpace: true)),
                                      childrenCount: 30,
                                      joinedMembersCount: 123,
                                      heroes: [.mockDan, .mockBob, .mockCharlie, .mockVerbose],
diff --git a/ElementX/Sources/Screens/Spaces/Common/SpaceRoomCell.swift b/ElementX/Sources/Screens/Spaces/Common/SpaceRoomCell.swift
index 24390fda1..2bef3057e 100644
--- a/ElementX/Sources/Screens/Spaces/Common/SpaceRoomCell.swift
+++ b/ElementX/Sources/Screens/Spaces/Common/SpaceRoomCell.swift
@@ -28,7 +28,7 @@ struct SpaceRoomCell: View {
             switch spaceRoomProxy.visibility {
             case .public: L10n.commonPublicSpace
             case .private: L10n.commonPrivateSpace
-            case .restricted(let parentName): L10n.screenSpaceListParentSpace(parentName)
+            case .restricted: L10n.commonSharedSpace
             case .none: L10n.commonPrivateSpace
             }
         } else {
@@ -47,8 +47,7 @@ struct SpaceRoomCell: View {
     
     private var details: String {
         if spaceRoomProxy.isSpace {
-            L10n.screenSpaceListDetails(L10n.commonRooms(spaceRoomProxy.childrenCount),
-                                        L10n.commonMemberCount(spaceRoomProxy.joinedMembersCount))
+            L10n.commonMemberCount(spaceRoomProxy.joinedMembersCount)
         } else {
             spaceRoomProxy.topic ?? " " // Use a single space to reserve a consistent amount of space.
         }
diff --git a/ElementX/Sources/Screens/Spaces/SpaceListScreen/SpaceListScreenModels.swift b/ElementX/Sources/Screens/Spaces/SpaceListScreen/SpaceListScreenModels.swift
index 4abc1d54a..8b6f96f11 100644
--- a/ElementX/Sources/Screens/Spaces/SpaceListScreen/SpaceListScreenModels.swift
+++ b/ElementX/Sources/Screens/Spaces/SpaceListScreen/SpaceListScreenModels.swift
@@ -21,14 +21,6 @@ struct SpaceListScreenViewState: BindableState {
     var selectedSpaceID: String?
     
     var bindings: SpaceListScreenViewStateBindings
-    
-    var subtitle: String {
-        L10n.screenSpaceListDetails(L10n.commonSpaces(joinedSpaces.count), L10n.commonRooms(joinedRoomsCount))
-    }
-    
-    var joinedRoomsCount: Int {
-        joinedSpaces.map(\.childrenCount).reduce(0, +)
-    }
 }
 
 struct SpaceListScreenViewStateBindings {
diff --git a/ElementX/Sources/Screens/Spaces/SpaceListScreen/View/SpaceListScreen.swift b/ElementX/Sources/Screens/Spaces/SpaceListScreen/View/SpaceListScreen.swift
index 590828707..120c12082 100644
--- a/ElementX/Sources/Screens/Spaces/SpaceListScreen/View/SpaceListScreen.swift
+++ b/ElementX/Sources/Screens/Spaces/SpaceListScreen/View/SpaceListScreen.swift
@@ -39,7 +39,7 @@ struct SpaceListScreen: View {
                     .foregroundStyle(.compound.textPrimary)
                     .multilineTextAlignment(.center)
                 
-                Text(context.viewState.subtitle)
+                Text(L10n.commonSpaces(context.viewState.joinedSpaces.count))
                     .font(.compound.bodyLG)
                     .foregroundStyle(.compound.textSecondary)
                     .multilineTextAlignment(.center)
diff --git a/ElementX/Sources/Screens/Spaces/SpaceScreen/View/LeaveSpaceView.swift b/ElementX/Sources/Screens/Spaces/SpaceScreen/View/LeaveSpaceView.swift
index da07f6163..e39dee311 100644
--- a/ElementX/Sources/Screens/Spaces/SpaceScreen/View/LeaveSpaceView.swift
+++ b/ElementX/Sources/Screens/Spaces/SpaceScreen/View/LeaveSpaceView.swift
@@ -153,7 +153,6 @@ struct LeaveSpaceView_Previews: PreviewProvider, TestablePreview {
     static let spaceRoomProxy = SpaceRoomProxyMock(.init(id: "!eng-space:matrix.org",
                                                          name: "Engineering Team",
                                                          isSpace: true,
-                                                         parent: SpaceRoomProxyMock(.init(name: "MegaGroup", isSpace: true)),
                                                          childrenCount: 30,
                                                          joinedMembersCount: 76,
                                                          heroes: [.mockDan, .mockBob, .mockCharlie, .mockVerbose],
diff --git a/ElementX/Sources/Screens/Spaces/SpaceScreen/View/SpaceScreen.swift b/ElementX/Sources/Screens/Spaces/SpaceScreen/View/SpaceScreen.swift
index 68e1b52dc..bd4006c48 100644
--- a/ElementX/Sources/Screens/Spaces/SpaceScreen/View/SpaceScreen.swift
+++ b/ElementX/Sources/Screens/Spaces/SpaceScreen/View/SpaceScreen.swift
@@ -89,7 +89,6 @@ struct SpaceScreen_Previews: PreviewProvider, TestablePreview {
         let spaceRoomProxy = SpaceRoomProxyMock(.init(id: "!eng-space:matrix.org",
                                                       name: "Engineering Team",
                                                       isSpace: true,
-                                                      parent: SpaceRoomProxyMock(.init(name: "MegaGroup", isSpace: true)),
                                                       childrenCount: 30,
                                                       joinedMembersCount: 76,
                                                       heroes: [.mockDan, .mockBob, .mockCharlie, .mockVerbose],
diff --git a/ElementX/Sources/Services/Spaces/LeaveSpaceHandleProxy.swift b/ElementX/Sources/Services/Spaces/LeaveSpaceHandleProxy.swift
index 4a4e1fa1f..641002cbb 100644
--- a/ElementX/Sources/Services/Spaces/LeaveSpaceHandleProxy.swift
+++ b/ElementX/Sources/Services/Spaces/LeaveSpaceHandleProxy.swift
@@ -34,7 +34,7 @@ class LeaveSpaceHandleProxy: Identifiable {
                       room.spaceRoom.roomId != spaceID else {
                     return nil
                 }
-                return .init(spaceRoomProxy: SpaceRoomProxy(spaceRoom: room.spaceRoom, parent: nil),
+                return .init(spaceRoomProxy: SpaceRoomProxy(spaceRoom: room.spaceRoom),
                              isLastAdmin: room.isLastAdmin,
                              isSelected: !room.isLastAdmin)
             }
diff --git a/ElementX/Sources/Services/Spaces/SpaceRoomListProxy.swift b/ElementX/Sources/Services/Spaces/SpaceRoomListProxy.swift
index 2803633d4..f5e76d778 100644
--- a/ElementX/Sources/Services/Spaces/SpaceRoomListProxy.swift
+++ b/ElementX/Sources/Services/Spaces/SpaceRoomListProxy.swift
@@ -21,12 +21,11 @@ class SpaceRoomListProxy: SpaceRoomListProxyProtocol {
     private let paginationStateHandle: TaskHandle
     let paginationStatePublisher: CurrentValuePublisher<SpaceRoomListPaginationState, Never>
     
-    // Parent is temporary until we get the restricted AllowRules from the server.
-    init(_ spaceRoomList: SpaceRoomListProtocol, parent: SpaceRoomProxyProtocol?) throws {
+    init(_ spaceRoomList: SpaceRoomListProtocol) throws {
         guard let spaceRoom = spaceRoomList.space() else { throw SpaceRoomListProxyError.missingSpace }
         
         self.spaceRoomList = spaceRoomList
-        spaceRoomProxy = SpaceRoomProxy(spaceRoom: spaceRoom, parent: parent)
+        spaceRoomProxy = SpaceRoomProxy(spaceRoom: spaceRoom)
         
         let paginationStateSubject = CurrentValueSubject<SpaceRoomListPaginationState, Never>(spaceRoomList.paginationState())
         paginationStatePublisher = paginationStateSubject.asCurrentValuePublisher()
@@ -56,27 +55,27 @@ class SpaceRoomListProxy: SpaceRoomListProxyProtocol {
         for update in updates {
             switch update {
             case .append(let spaceRooms):
-                rooms.append(contentsOf: spaceRooms.map { SpaceRoomProxy(spaceRoom: $0, parent: spaceRoomProxy) })
+                rooms.append(contentsOf: spaceRooms.map(SpaceRoomProxy.init))
             case .clear:
                 rooms.removeAll()
             case .pushFront(let spaceRoom):
-                rooms.insert(SpaceRoomProxy(spaceRoom: spaceRoom, parent: spaceRoomProxy), at: 0)
+                rooms.insert(SpaceRoomProxy(spaceRoom: spaceRoom), at: 0)
             case .pushBack(let spaceRoom):
-                rooms.append(SpaceRoomProxy(spaceRoom: spaceRoom, parent: spaceRoomProxy))
+                rooms.append(SpaceRoomProxy(spaceRoom: spaceRoom))
             case .popFront:
                 rooms.removeFirst()
             case .popBack:
                 rooms.removeLast()
             case .insert(let index, let spaceRoom):
-                rooms.insert(SpaceRoomProxy(spaceRoom: spaceRoom, parent: spaceRoomProxy), at: Int(index))
+                rooms.insert(SpaceRoomProxy(spaceRoom: spaceRoom), at: Int(index))
             case .set(let index, let spaceRoom):
-                rooms[Int(index)] = SpaceRoomProxy(spaceRoom: spaceRoom, parent: spaceRoomProxy)
+                rooms[Int(index)] = SpaceRoomProxy(spaceRoom: spaceRoom)
             case .remove(let index):
                 rooms.remove(at: Int(index))
             case .truncate(let length):
                 rooms.removeSubrange(Int(length)..<rooms.count)
             case .reset(let spaceRooms):
-                rooms = spaceRooms.map { SpaceRoomProxy(spaceRoom: $0, parent: spaceRoomProxy) }
+                rooms = spaceRooms.map(SpaceRoomProxy.init)
             }
         }
         
diff --git a/ElementX/Sources/Services/Spaces/SpaceRoomProxy.swift b/ElementX/Sources/Services/Spaces/SpaceRoomProxy.swift
index cce336faf..d4511e1cd 100644
--- a/ElementX/Sources/Services/Spaces/SpaceRoomProxy.swift
+++ b/ElementX/Sources/Services/Spaces/SpaceRoomProxy.swift
@@ -10,15 +10,9 @@ import MatrixRustSDK
 
 class SpaceRoomProxy: SpaceRoomProxyProtocol {
     private let spaceRoom: SpaceRoom
-    let parent: SpaceRoomProxyProtocol?
     
-    /// Proxies a `SpaceRoom` from the Rust SDK.
-    /// - Parameters:
-    ///   - spaceRoom: The `SpaceRoom` to proxy.
-    ///   - parent: A temporary parameter until we get the `AllowRule`s from the server.
-    init(spaceRoom: SpaceRoom, parent: SpaceRoomProxyProtocol?) {
+    init(spaceRoom: SpaceRoom) {
         self.spaceRoom = spaceRoom
-        self.parent = parent
     }
     
     lazy var id = spaceRoom.roomId
diff --git a/ElementX/Sources/Services/Spaces/SpaceRoomProxyProtocol.swift b/ElementX/Sources/Services/Spaces/SpaceRoomProxyProtocol.swift
index 8c8ffce11..3cb998f9d 100644
--- a/ElementX/Sources/Services/Spaces/SpaceRoomProxyProtocol.swift
+++ b/ElementX/Sources/Services/Spaces/SpaceRoomProxyProtocol.swift
@@ -11,7 +11,7 @@ import MatrixRustSDK
 enum SpaceRoomProxyVisibility: Equatable {
     case `public`
     case `private`
-    case restricted(parentName: String)
+    case restricted
     // We can add the external case in here eventually.
 }
 
@@ -23,8 +23,6 @@ protocol SpaceRoomProxyProtocol {
     
     var isSpace: Bool { get }
     var isDirect: Bool? { get }
-    /// A temporary property until we get the `AllowRule`s from the server.
-    var parent: SpaceRoomProxyProtocol? { get }
     var childrenCount: Int { get }
     
     var joinedMembersCount: Int { get }
@@ -63,12 +61,7 @@ extension SpaceRoomProxyProtocol {
         case .public:
             .public
         case .restricted, .knockRestricted:
-            // Temporary solution until the server includes the `AllowRule` values (they're always empty right now).
-            if let parent {
-                .restricted(parentName: parent.computedName)
-            } else {
-                .private
-            }
+            .restricted
         case .invite, .knock, .private, .custom:
             .private
         case .none:
diff --git a/ElementX/Sources/Services/Spaces/SpaceServiceProxy.swift b/ElementX/Sources/Services/Spaces/SpaceServiceProxy.swift
index 24d446cd5..26f8b212e 100644
--- a/ElementX/Sources/Services/Spaces/SpaceServiceProxy.swift
+++ b/ElementX/Sources/Services/Spaces/SpaceServiceProxy.swift
@@ -30,10 +30,9 @@ class SpaceServiceProxy: SpaceServiceProxyProtocol {
         })
     }
     
-    // The parent here is temporary until we get the restricted AllowRules from the server.
     func spaceRoomList(spaceID: String, parent: SpaceRoomProxyProtocol?) async -> Result<SpaceRoomListProxyProtocol, SpaceServiceProxyError> {
         do {
-            return try await .success(SpaceRoomListProxy(spaceService.spaceRoomList(spaceId: spaceID), parent: parent))
+            return try await .success(SpaceRoomListProxy(spaceService.spaceRoomList(spaceId: spaceID)))
         } catch {
             MXLog.error("Failed creating space room list for \(spaceID): \(error)")
             return .failure(.sdkError(error))
@@ -57,27 +56,27 @@ class SpaceServiceProxy: SpaceServiceProxyProtocol {
         for update in updates {
             switch update {
             case .append(let spaceRooms):
-                spaces.append(contentsOf: spaceRooms.map { SpaceRoomProxy(spaceRoom: $0, parent: nil) })
+                spaces.append(contentsOf: spaceRooms.map(SpaceRoomProxy.init))
             case .clear:
                 spaces.removeAll()
             case .pushFront(let spaceRoom):
-                spaces.insert(SpaceRoomProxy(spaceRoom: spaceRoom, parent: nil), at: 0)
+                spaces.insert(SpaceRoomProxy(spaceRoom: spaceRoom), at: 0)
             case .pushBack(let spaceRoom):
-                spaces.append(SpaceRoomProxy(spaceRoom: spaceRoom, parent: nil))
+                spaces.append(SpaceRoomProxy(spaceRoom: spaceRoom))
             case .popFront:
                 spaces.removeFirst()
             case .popBack:
                 spaces.removeLast()
             case .insert(let index, let spaceRoom):
-                spaces.insert(SpaceRoomProxy(spaceRoom: spaceRoom, parent: nil), at: Int(index))
+                spaces.insert(SpaceRoomProxy(spaceRoom: spaceRoom), at: Int(index))
             case .set(let index, let spaceRoom):
-                spaces[Int(index)] = SpaceRoomProxy(spaceRoom: spaceRoom, parent: nil)
+                spaces[Int(index)] = SpaceRoomProxy(spaceRoom: spaceRoom)
             case .remove(let index):
                 spaces.remove(at: Int(index))
             case .truncate(let length):
                 spaces.removeSubrange(Int(length)..<spaces.count)
             case .reset(let spaceRooms):
-                spaces = spaceRooms.map { SpaceRoomProxy(spaceRoom: $0, parent: nil) }
+                spaces = spaceRooms.map(SpaceRoomProxy.init)
             }
         }
         
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Banned-Space-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Banned-Space-iPad-en-GB.png
index 6a37102dd..406098403 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Banned-Space-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Banned-Space-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:781e4c61b2bf35b1bc86902ce9401f2c0d7c094b29054ccd6f9c89baa828d376
-size 159198
+oid sha256:8c7ecdd098726a67b9aa8e3791fe5add49550aecce68a044f8936e916177a862
+size 155987
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Banned-Space-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Banned-Space-iPad-pseudo.png
index f15f9ce1c..e8b134ab0 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Banned-Space-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Banned-Space-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b5b8f3388f0a9255a2f500eb0bed0675a4f6216c52e80431d3ffc8387af44a93
-size 168187
+oid sha256:042ff14fd2e6731232a2cbeec8e675ff9442d657b8b4b704912ff844af4c3c0f
+size 159344
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Banned-Space-iPhone-16-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Banned-Space-iPhone-16-en-GB.png
index d3f760ede..3fc711ce3 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Banned-Space-iPhone-16-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Banned-Space-iPhone-16-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:402fac3e7bcfff87bdbc89eb7c6d35b869e5ab149629e4699d6e0b87b390b7bb
-size 103769
+oid sha256:db36b1acae44c462d3cdb24e4d6f70d1b70873e71b67661ba0633f0a00492027
+size 101530
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Banned-Space-iPhone-16-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Banned-Space-iPhone-16-pseudo.png
index 7767674f5..1c5d07712 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Banned-Space-iPhone-16-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Banned-Space-iPhone-16-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ec484092e0e97334665d626b863b6a47a2c176d1b5e7f3a855c3125519edaaca
-size 113735
+oid sha256:9901c21114602912448b39e77c73c14b0aa23bc2988aad88148798a042322f1d
+size 104300
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Forbidden-Space-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Forbidden-Space-iPad-en-GB.png
index bf52ebccf..e597ddeac 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Forbidden-Space-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Forbidden-Space-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6d8c772a1d8eaf7a8bac1d88a14d12430100d0f52023679e695955cdf9ebad33
-size 168628
+oid sha256:747566f597d00c4455a8564595bd789496a5ea3d941bb1874d1f948ffd51e47b
+size 165417
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Forbidden-Space-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Forbidden-Space-iPad-pseudo.png
index a6960695f..45f0d77d3 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Forbidden-Space-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Forbidden-Space-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8d01e685bc5761f29addfd833fe4d24fa1b1654f8c2b91a13c4ca7dffc235782
-size 189531
+oid sha256:1153cc719780abdf85c87e3042348ee58ba775a92cd3ba6718f0d922dfd12afc
+size 180688
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Forbidden-Space-iPhone-16-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Forbidden-Space-iPhone-16-en-GB.png
index ff62dbcd0..5d04b20f0 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Forbidden-Space-iPhone-16-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Forbidden-Space-iPhone-16-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:313b046a9c8cd7dd4475597c52a257dfb0951fc205bb6f0465ce9c462ba4208a
-size 114677
+oid sha256:3d17b79e27230a81bff775d5422ee2f8eab52e73ccdc9d18a90358910f2393a9
+size 112438
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Forbidden-Space-iPhone-16-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Forbidden-Space-iPhone-16-pseudo.png
index 88d428a7e..2087940bc 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Forbidden-Space-iPhone-16-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Forbidden-Space-iPhone-16-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3cac35642ae6f970bf4b28f8d902bb38bc21b5be099c8dd8b260e98318ef8912
-size 138280
+oid sha256:f3a3d6b60aef4c1dbbb7c1c67de55c6fa7d1c00693ec541e8d77e05ac8bb549c
+size 128845
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InviteRequired-Space-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InviteRequired-Space-iPad-en-GB.png
index f422b52cd..112b8c61f 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InviteRequired-Space-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InviteRequired-Space-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:40e4750c2b5e0f582f2be5435c0ce73b643e7f2a5a6ccafb0eb450d81ad10bdc
-size 156135
+oid sha256:e74f12af61e302954661b018141f1e3859ae16f3ffa6fccdc94a5abc3dd428a5
+size 152924
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InviteRequired-Space-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InviteRequired-Space-iPad-pseudo.png
index 9b6551699..8d35142db 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InviteRequired-Space-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InviteRequired-Space-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d6244889d82654517c52825f781b5c7525fd94c6cd3fdb7f4d5a8afc0320d46e
-size 166218
+oid sha256:6342665e8149cc8a766f3fe0c671d4c366ad6e892c7f2d419c7e172f0c812e02
+size 157375
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InviteRequired-Space-iPhone-16-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InviteRequired-Space-iPhone-16-en-GB.png
index fa4b0d952..a00895488 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InviteRequired-Space-iPhone-16-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InviteRequired-Space-iPhone-16-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7d4d6ae41a24e73c0f38dc0587a2d920225fcb58fbcbfb1482d6f2979fb08e6c
-size 101031
+oid sha256:022ff2f4a913e937afb9681b34b037c03da046388cff32d9d1725e215b6e877e
+size 98792
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InviteRequired-Space-iPhone-16-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InviteRequired-Space-iPhone-16-pseudo.png
index 876d442f4..80738f091 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InviteRequired-Space-iPhone-16-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InviteRequired-Space-iPhone-16-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2006aa0ac864d2610b38c71e081530b995873500d1a3d98f1ebcdce914a84526
-size 115550
+oid sha256:05703c21ffd2172f898403ec394a3ef553af746170cf853b340a3847f0b2e509
+size 106115
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Invited-Space-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Invited-Space-iPad-en-GB.png
index df673e661..07e081777 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Invited-Space-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Invited-Space-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0e4f55d300def18cb8bfe031be8bad6dddb45983fead425600fec938ac3506cc
-size 173122
+oid sha256:dd0b92b717a60d6164da136abdcc73e9f4f198470237eef388032d8e6f3eaf62
+size 169860
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Invited-Space-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Invited-Space-iPad-pseudo.png
index 8816b9d10..dd51e2e32 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Invited-Space-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Invited-Space-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4466aa5d18da393b14a1e78b174ee810e337741fbd46bfcb48129dc3bf341421
-size 186507
+oid sha256:e0b7a45889413d8b92a5010cb0cc1f4036099fc73f9f441516ae0f5c1da77677
+size 177675
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Invited-Space-iPhone-16-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Invited-Space-iPhone-16-en-GB.png
index bd594b9ae..a448dc62b 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Invited-Space-iPhone-16-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Invited-Space-iPhone-16-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7cb916fb72f46870cda686096d190d096ee8fa9c8f87726d53a974214265730e
-size 117750
+oid sha256:d9a192ba7ecc7ae4e827e34c0affd78f6329f0909006a6ef513a2744d0de6f7a
+size 115433
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Invited-Space-iPhone-16-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Invited-Space-iPhone-16-pseudo.png
index b2debd4bb..55947fa8c 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Invited-Space-iPhone-16-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Invited-Space-iPhone-16-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:740a2c55b515fa98f8928d4449e6a79e82455a9edbb634b9ff2770d0029d4f15
-size 130925
+oid sha256:659f50ba9fffc7946108539417926ae814d9573cd3deeafd2b708ab95e4424ec
+size 122031
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InvitedWithHiddenAvatars-Space-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InvitedWithHiddenAvatars-Space-iPad-en-GB.png
index 89776c64f..a15919b34 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InvitedWithHiddenAvatars-Space-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InvitedWithHiddenAvatars-Space-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b8a241ee0871baabbe42ad32258c3e0c33cef6dfd4f784189cef789af35ae0b5
-size 139503
+oid sha256:560f8c4deec3fbf1e69c1c1f9f317b1c6257f552c13e896c3b3826d4d1fcc1ac
+size 136588
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InvitedWithHiddenAvatars-Space-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InvitedWithHiddenAvatars-Space-iPad-pseudo.png
index 9fdee84cd..1d9a2ac41 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InvitedWithHiddenAvatars-Space-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InvitedWithHiddenAvatars-Space-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b316be924b98aafb5a74e3d159f64791fe1523ed8b178454360ad92bf205d6f2
-size 152341
+oid sha256:5b7c10c1fdec19789ff406e23e3d704c40c6507355a1b25453cf7aff6a06b9f9
+size 144192
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InvitedWithHiddenAvatars-Space-iPhone-16-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InvitedWithHiddenAvatars-Space-iPhone-16-en-GB.png
index 31a411d5a..7ce73bae6 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InvitedWithHiddenAvatars-Space-iPhone-16-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InvitedWithHiddenAvatars-Space-iPhone-16-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3b54c10c5f2c768aa766d2925f262a55ffab01ddf122f6ea7720d8f6a64789d2
-size 86214
+oid sha256:b0a1c4a336a7b91bc68db1e30f98fc4b83890341b4c2ba7430fddd1fa8c47b91
+size 83571
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InvitedWithHiddenAvatars-Space-iPhone-16-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InvitedWithHiddenAvatars-Space-iPhone-16-pseudo.png
index 096c602d7..50ee884c0 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InvitedWithHiddenAvatars-Space-iPhone-16-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InvitedWithHiddenAvatars-Space-iPhone-16-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b323cb7fdafb2a33d5cd5049e6729e03fdd1f4dd39abe85965dbc7d0fbb78fcd
-size 99217
+oid sha256:bc7cd63464452fe4ef6d3c5c206443b3bab5c2fcd44e8fbda52514cc346282b3
+size 90250
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Joinable-Space-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Joinable-Space-iPad-en-GB.png
index 6284b2c0a..97f57a74b 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Joinable-Space-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Joinable-Space-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:163d05a1a2804d19d8551ad86ecfcb0b40563e79952662effc79566c150fcc5c
-size 157210
+oid sha256:df07dd77ff1360eeba59b45845e04c31193e416b6329f5d22d7c4bbac7ed82c4
+size 153697
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Joinable-Space-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Joinable-Space-iPad-pseudo.png
index 15395fcb2..5d33e8357 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Joinable-Space-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Joinable-Space-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:68d023be4b3beb2c2c0390fee38476d4ab47598ced8c4bfeb2faac35b21233e7
-size 165798
+oid sha256:94cf9ad076fa28d60f91f13c9155e8bbd4a2cbaccce8377acf681e407938fddd
+size 158014
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Joinable-Space-iPhone-16-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Joinable-Space-iPhone-16-en-GB.png
index 35be9d420..2f814e364 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Joinable-Space-iPhone-16-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Joinable-Space-iPhone-16-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:08bb8765338a52a2414371396cf86703ff62ed918b6350eeef4111d2f479bcd4
-size 101267
+oid sha256:17839a53a772dc9ea11fe53158ab22ece5de934c43b038f585bbbcbb052428d5
+size 98605
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Joinable-Space-iPhone-16-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Joinable-Space-iPhone-16-pseudo.png
index 9dd86241e..4ce22eec8 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Joinable-Space-iPhone-16-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Joinable-Space-iPhone-16-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7eecb1e3a28b4e6362ce4e3a5fc1a08e90d3e7a439b46b1e813e221621597171
-size 111488
+oid sha256:db352a19da48dcb17ea6d9f3954fee0121c844f3679837e6d7507aa4756f5aa8
+size 102225
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Knockable-Space-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Knockable-Space-iPad-en-GB.png
index 9696686c9..d147acab4 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Knockable-Space-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Knockable-Space-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d8466754a9aa189bea4e33c2c0375d8cd6eb0133ca68281ad245c89b2ee96684
-size 171268
+oid sha256:95154e85234a006bc3d9d14fe328b08a952811a1793a63e151109bad87b349a7
+size 168021
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Knockable-Space-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Knockable-Space-iPad-pseudo.png
index 42cd58055..6f760a94b 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Knockable-Space-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Knockable-Space-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:80b0ded88cb72bff8c02c932faf83bda7b4e8c9b38722ad295c0d82f4a24768c
-size 182956
+oid sha256:7192b759ef4313b2cfc77f53a1531fce5e462edf864976c3c7cf189344addffb
+size 174386
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Knockable-Space-iPhone-16-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Knockable-Space-iPhone-16-en-GB.png
index fb84b890d..10c75b695 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Knockable-Space-iPhone-16-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Knockable-Space-iPhone-16-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c0c412fc1bc7a5c6d628bf4d6368f0dd9f4de7442841605bd4256858c735b43b
-size 113141
+oid sha256:470e52abff20aa595c570e64ff8737a2e66dadb771a4b50f1edf3cb3306d7d68
+size 110813
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Knockable-Space-iPhone-16-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Knockable-Space-iPhone-16-pseudo.png
index 5db9baa39..33e2a6d4d 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Knockable-Space-iPhone-16-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Knockable-Space-iPhone-16-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4f8307e0e1ec76ded38824b060787899d8bd03963a1e56c5fc29ff755fb7f755
-size 129626
+oid sha256:557083c24102d545756701e8173dcab066c2a3d5a36efca977b3d5ae8542777e
+size 120751
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Restricted-Space-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Restricted-Space-iPad-en-GB.png
index 6154dc213..5de72f9ce 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Restricted-Space-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Restricted-Space-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:456e6176b4b4ea0cc0339844b976f7f072974b8b917fac2d6d9b31fcf29b032c
-size 171531
+oid sha256:c4a206555031475e4d1197f1afdca06f6cfb1b635917324e0b22c19859797ef6
+size 168948
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Restricted-Space-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Restricted-Space-iPad-pseudo.png
index dc20e0dc1..a4a5fb630 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Restricted-Space-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Restricted-Space-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1d198376610c2a9710e44171f5b5cf084ce03e624b4c89cc45b758b3e80cc14a
-size 190942
+oid sha256:7b783ede0d576d450fff7f88d6f329bb804c67aa7011d4a6a547ca1441097dd7
+size 184674
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Restricted-Space-iPhone-16-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Restricted-Space-iPhone-16-en-GB.png
index 22a38a6f0..74add87d8 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Restricted-Space-iPhone-16-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Restricted-Space-iPhone-16-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6fd6c13f04ec391f2b1e6dfa574191140ee2ca024669e7a3383668bd36dcf9e1
-size 117393
+oid sha256:122a6a1f4e63ab719756f6e068e75d3641368c029a12bcc54d11b0afdb2028e9
+size 115575
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Restricted-Space-iPhone-16-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Restricted-Space-iPhone-16-pseudo.png
index 9183cc7bd..451398024 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Restricted-Space-iPhone-16-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Restricted-Space-iPhone-16-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a830646b6fa078a8b41fb97edc503853c36b1ef1e87c33468a8d2dc2cc259903
-size 139977
+oid sha256:13b819e086ff2dfb7d0a307c0076de25dbf87c5ae95ee3180eff3847220ee424
+size 132796
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.RestrictedJoinable-Space-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.RestrictedJoinable-Space-iPad-en-GB.png
index e5782a1b6..4ad6a9bc9 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.RestrictedJoinable-Space-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.RestrictedJoinable-Space-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:21d96120db7f71a4eec79d50dd0bf5cc785dcff443a909221ecff87bd395c6a9
-size 156464
+oid sha256:34d003d6e4e2f16d0db1af912a9129eb65cb0314ed020f687c18bb1acb287911
+size 153881
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.RestrictedJoinable-Space-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.RestrictedJoinable-Space-iPad-pseudo.png
index e468246c9..b217f6519 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.RestrictedJoinable-Space-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.RestrictedJoinable-Space-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:258d9c116eb0c54b60f27f16c430c932d70cda9a70c3c6fc83165dab4060aea1
-size 164393
+oid sha256:23aa5762f066e01e660cb0f299bb82b027adff03fbfc16d77d5f026c68c61c93
+size 158125
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.RestrictedJoinable-Space-iPhone-16-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.RestrictedJoinable-Space-iPhone-16-en-GB.png
index 2a158bdc5..b40c7e5aa 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.RestrictedJoinable-Space-iPhone-16-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.RestrictedJoinable-Space-iPhone-16-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:218fccd9e9cd16bdca6343dc8f0caaf721dbbbde46ee071039af8791e8f4264a
-size 100586
+oid sha256:9668f822abf59c1759b13097eb7344ed9dad8f119a89b149696a05ebfafd7873
+size 98768
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.RestrictedJoinable-Space-iPhone-16-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.RestrictedJoinable-Space-iPhone-16-pseudo.png
index 21feddd3c..a0e7f764b 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.RestrictedJoinable-Space-iPhone-16-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.RestrictedJoinable-Space-iPhone-16-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:97bdd9de56a6f0634edefe6dd6095dae022e41f280f3a86fdca770c16d269304
-size 109628
+oid sha256:42daf6c59a042bc6eaf1af8a7b7e501ad5facef1fa0af3ff65e0c451337a5fd3
+size 102447
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/leaveSpaceView.Only-Admin-Rooms-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/leaveSpaceView.Only-Admin-Rooms-iPad-en-GB.png
index ad0aba3b7..27da8e03c 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/leaveSpaceView.Only-Admin-Rooms-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/leaveSpaceView.Only-Admin-Rooms-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ec9c8975b0fa564d212ec2241804aaa287901a557ca93d5503d357073fd2a98c
-size 151507
+oid sha256:3fc79ce67766fa49b1be89a432a26123ed46d1422ebbc0340100df1df762695f
+size 151198
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/leaveSpaceView.Only-Admin-Rooms-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/leaveSpaceView.Only-Admin-Rooms-iPad-pseudo.png
index 99af50963..bb3750717 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/leaveSpaceView.Only-Admin-Rooms-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/leaveSpaceView.Only-Admin-Rooms-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:54496c03db4bc1dc6133b06c9d357e63e01871f894a8dba5e01fb155d9ad3378
-size 181927
+oid sha256:dca0726cbea6d22bd94757903e793ac31ce563cd85cc51236e3d7fad1b046022
+size 181645
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/leaveSpaceView.Only-Admin-Rooms-iPhone-16-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/leaveSpaceView.Only-Admin-Rooms-iPhone-16-en-GB.png
index 0724528a5..106f62726 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/leaveSpaceView.Only-Admin-Rooms-iPhone-16-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/leaveSpaceView.Only-Admin-Rooms-iPhone-16-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3e74a92933da47909b7fd57525936e7042b73412d269d97b162bfaf92947a847
-size 100719
+oid sha256:861d84b03ae9fa5dc6a8fe62fe107e08075eafd838858dbc1bd512fbabe0dcc2
+size 100419
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/leaveSpaceView.Only-Admin-Rooms-iPhone-16-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/leaveSpaceView.Only-Admin-Rooms-iPhone-16-pseudo.png
index dcf5c8992..4b89df592 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/leaveSpaceView.Only-Admin-Rooms-iPhone-16-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/leaveSpaceView.Only-Admin-Rooms-iPhone-16-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6a015ff1aa9f4c51efcdb10a4e923f3812c07ef56706fd0912ed4fb90400be33
-size 129184
+oid sha256:bb3231bf157a44784baae01316b8c86b633301ad7715ba64152f4185f8fce3a4
+size 129281
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceHeaderView.iPad-en-GB-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceHeaderView.iPad-en-GB-0.png
index de9dc9c0a..0cd4d84a5 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceHeaderView.iPad-en-GB-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceHeaderView.iPad-en-GB-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:59ce4b7188864938e2077fd0782205ef14b59799d049a7d5011eb7fd7ef1d193
-size 210257
+oid sha256:41a11b24dc33a848b1e92e221ebf6f7eed9da0d17883baba30b49488a8dd916d
+size 203835
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceHeaderView.iPad-pseudo-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceHeaderView.iPad-pseudo-0.png
index 917d2dc60..773294c2b 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceHeaderView.iPad-pseudo-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceHeaderView.iPad-pseudo-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ddc1c54761f5300d5d9802bdce97af8109797b98eea7b1d3cc7e6c6c90269672
-size 227006
+oid sha256:80abb6f07c275acaedb46078abfac094b304d3c799c050003e1d20dca3d745fa
+size 206909
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceHeaderView.iPhone-16-en-GB-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceHeaderView.iPhone-16-en-GB-0.png
index 6d8e1d24a..581810fa6 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceHeaderView.iPhone-16-en-GB-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceHeaderView.iPhone-16-en-GB-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fc3b96d335e53ed72611ef6d12bda47a31ebbe1da805d7900fa86343e78b5fee
-size 139915
+oid sha256:f972c103ce2c14ed5c676741f9a3f8f480702815e677749d46908abd0fa7dada
+size 132742
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceHeaderView.iPhone-16-pseudo-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceHeaderView.iPhone-16-pseudo-0.png
index 02250ecc6..64fd274a5 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceHeaderView.iPhone-16-pseudo-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceHeaderView.iPhone-16-pseudo-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:55fa4229a59e6af9aef394f04758ed1924ec2007a6227846cb9b6a0aaf6fdeb6
-size 165701
+oid sha256:430dfde8c142f7ad7474be587c0c217daa9cb9801fe0ff0eff291f8f9cbf57cf
+size 139505
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceListScreen.iPad-en-GB-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceListScreen.iPad-en-GB-0.png
index 4672d8ce1..8cc8081d4 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceListScreen.iPad-en-GB-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceListScreen.iPad-en-GB-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:df9b1899a2c6aa9afc0c859aafca8fd0a056bd0ec402552bfc832e5cd5762e01
-size 200712
+oid sha256:693d3360407832dd7d56fcb0ee0fca305b7d8fca5878950725b66b3bdb65fb9c
+size 188172
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceListScreen.iPad-pseudo-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceListScreen.iPad-pseudo-0.png
index 421bde143..0c9538f01 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceListScreen.iPad-pseudo-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceListScreen.iPad-pseudo-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d573d581801490bcdf0fa9ccfb544659d2c6e23e3996ba37b9c2ebb148a75891
-size 242784
+oid sha256:1c317151cb714464bf369bcd4e3c2d4a6da687a973a3db244189665bfead9b9f
+size 221044
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceListScreen.iPhone-16-en-GB-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceListScreen.iPhone-16-en-GB-0.png
index 511cb5a1d..10e16cf07 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceListScreen.iPhone-16-en-GB-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceListScreen.iPhone-16-en-GB-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dd252a40ef0f121da58ff5f9ad12ade1bf2c82f7693140339b63a991f8ebd339
-size 133615
+oid sha256:021b92cad12a1e6efce6f221e293b2c23616b83054b8a9182de8507d0de09e18
+size 123015
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceListScreen.iPhone-16-pseudo-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceListScreen.iPhone-16-pseudo-0.png
index 8cc707855..0732636de 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceListScreen.iPhone-16-pseudo-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceListScreen.iPhone-16-pseudo-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ffc4e7f5e44ad3f5e8db9e094fc0407f7e6100182a9ff38ce2a7401409097d54
-size 158346
+oid sha256:6bd8a07cd0fc25b535794ce56320bc83f2454cbfd4796dc2c84175143bb874af
+size 146189
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceRoomCell.iPad-en-GB-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceRoomCell.iPad-en-GB-0.png
index 5568319c7..97c4d1373 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceRoomCell.iPad-en-GB-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceRoomCell.iPad-en-GB-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c1ef649a28a0115a3536588fe9b964dc29c2d9231f4878df15960a47714a7af9
-size 239061
+oid sha256:7cf108ead7145e11272bff432caa1d66350c1f3eb0868c64a5f49668a7558a49
+size 231595
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceRoomCell.iPad-pseudo-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceRoomCell.iPad-pseudo-0.png
index ed7118ab0..06bee9df5 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceRoomCell.iPad-pseudo-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceRoomCell.iPad-pseudo-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:85ec7082e2c36ad160ba2a09aede236d735b06a6aaa8bb7299a9a4dd1077b992
-size 280962
+oid sha256:5e0652c568a9cc3ae05ab6d3ba23db1e4e9b4d0bc28f0f13ae5814acd1a2be0a
+size 265636
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceRoomCell.iPhone-16-en-GB-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceRoomCell.iPhone-16-en-GB-0.png
index 7c844a9d6..04e15f0b2 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceRoomCell.iPhone-16-en-GB-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceRoomCell.iPhone-16-en-GB-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2b8512b5e28c7d21a6c7a60ebae3be096f5a0002b1c320ae1291f07c68a7add2
-size 174090
+oid sha256:21dedad4b56e65f9b5871cb6f610d589ae68ed254c520ef4212fadc8bff06215
+size 167875
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceRoomCell.iPhone-16-pseudo-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceRoomCell.iPhone-16-pseudo-0.png
index ed422d0bb..5c89d2ba4 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceRoomCell.iPhone-16-pseudo-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceRoomCell.iPhone-16-pseudo-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f630e43e9b2d5f08c35a6298f89531689a92c347ffb52aff65b30e61305c1144
-size 198023
+oid sha256:5f3a53df912658596e6a4b9fc37a85b3b882995c15a959677bfb92f6ec16fdad
+size 196235
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceScreen.iPad-en-GB-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceScreen.iPad-en-GB-0.png
index a1372df39..8ab4d0233 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceScreen.iPad-en-GB-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceScreen.iPad-en-GB-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ee80163f9bae1cc27463ccea30fbd0a9675507790eec058fca59e73835e364bf
-size 242699
+oid sha256:f8322e07d40874c4d44f5113c223276fffde6e4d4cdd7856fbe94cc1c6057d9b
+size 234117
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceScreen.iPad-pseudo-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceScreen.iPad-pseudo-0.png
index b466ab0d2..68fd88bac 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceScreen.iPad-pseudo-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceScreen.iPad-pseudo-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:19a833a4c2fac23619ba79df3e8388e6158d251e195011e1952b61c496d70a63
-size 282290
+oid sha256:159b699170601b706b143413c6d6debb8086eaac209cd9d56800217550f382f8
+size 263905
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceScreen.iPhone-16-en-GB-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceScreen.iPhone-16-en-GB-0.png
index bc1a58e0b..7cf788659 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceScreen.iPhone-16-en-GB-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceScreen.iPhone-16-en-GB-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:61ca9539b58b7fd81b900a0433c11f433979c4441efc613014cf2860ae29fd4e
-size 182558
+oid sha256:5b2acf1f719ab9acb6887d700607a3e741ec69ae7cabbfd3fd2d00ebef7c7ced
+size 175169
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceScreen.iPhone-16-pseudo-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceScreen.iPhone-16-pseudo-0.png
index cdd4692e5..464998fc2 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceScreen.iPhone-16-pseudo-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceScreen.iPhone-16-pseudo-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a778a3e621f0bc8d9e7dc918dba87c83131128ca76a500d693097ba1dd7e26fd
-size 203353
+oid sha256:f68408d2eca92a7dec827ef79f01179ae58c4a5b55dd4d2c6de425d525d06842
+size 200045
diff --git a/UnitTests/Sources/SpaceListScreenViewModelTests.swift b/UnitTests/Sources/SpaceListScreenViewModelTests.swift
index 8d9ab4a87..469097d2d 100644
--- a/UnitTests/Sources/SpaceListScreenViewModelTests.swift
+++ b/UnitTests/Sources/SpaceListScreenViewModelTests.swift
@@ -34,7 +34,6 @@ class SpaceListScreenViewModelTests: XCTestCase {
     func testInitialState() {
         setupViewModel()
         XCTAssertEqual(context.viewState.joinedSpaces.count, 3)
-        XCTAssertEqual(context.viewState.joinedRoomsCount, 0)
     }
     
     func testJoinedSpacesSubscription() async throws {