element-hq/element-meta/issues/2213 - Automatically pop the invites l…

…ist when acting on the last one. Coming back from the room will go directly back to the room list
element-hq · Nov 24, 2023 · 59eb253 · 59eb253
1 parent 07eccbe
commit 59eb253
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/ElementX/Sources/FlowCoordinators/UserSessionFlowCoordinator.swift b/ElementX/Sources/FlowCoordinators/UserSessionFlowCoordinator.swift
@@ -97,6 +97,12 @@ class UserSessionFlowCoordinator: FlowCoordinatorProtocol {
             switch action {
             case .presentedRoom(let roomID):
                 analytics.signpost.beginRoomFlow(roomID)
+
+                let availableInvitesCount = userSession.clientProxy.inviteSummaryProvider?.roomListPublisher.value.count ?? 0
+                if case .invitesScreen = stateMachine.state, availableInvitesCount == 1 {
+                    dismissInvitesList(animated: true)
+                }
+
                 stateMachine.processEvent(.selectRoom(roomID: roomID))
             case .dismissedRoom:
                 stateMachine.processEvent(.deselectRoom)
@@ -521,6 +527,14 @@ class UserSessionFlowCoordinator: FlowCoordinatorProtocol {
         }
     }
 
+    private func dismissInvitesList(animated: Bool) {
+        guard case .invitesScreen = stateMachine.state else {
+            fatalError()
+        }
+
+        sidebarNavigationStackCoordinator.pop(animated: animated)
+    }
+
     // MARK: Calls
 
     private func presentCallScreen(roomProxy: RoomProxyProtocol) {

diff --git a/changelog.d/pr-2213.change b/changelog.d/pr-2213.change
@@ -0,0 +1 @@
+Automatically pop the invites list when acting on the last one. Coming back from the room will go directly back to the room list
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Automatically pop the invites list when acting on the last one. Coming back from the room will go directly back to the room list