fix: revisit conditions to display channel creation option - WPB-18788

wire-ios/Wire-iOS Tests/StartUIViewControllerSnapshotTests.swift

@@ -123,4 +123,66 @@ final class StartUIViewControllerSnapshotTests: CoreDataSnapshotTestCase {
                 .verify(matching: navigationController.view)
         }
     }
+
+    func testStartUIViewControllerShowNewChannelOptionForPersonalUser() {
+        // Given, channels are supported and user is a personal user
+        BackendInfo.apiVersion = .v8
+        BackendInfo.isMLSEnabled = true
+
+        nonTeamTest {
+            let navigationController = setupNavigationController()
+            snapshotHelper
+                .withUserInterfaceStyle(.dark)
+                .verify(matching: navigationController.view)
+        }
+    }
+
+    func testStartUIViewControllerShowNewChannelOptionForTeamUser() {
+        // Given, channels are supported
+        BackendInfo.apiVersion = .v8
+        BackendInfo.isMLSEnabled = true
+        // channels are enabled
+        userSession.channelsFeature = Feature.Channels(
+            status: .enabled,
+            config: .init(
+                allowedToCreateChannels: .teamMembers,
+                allowedToOpenChannels: .admins
+            )
+        )
+        // user is in a team and is allowed to create a channel
+        let mockUserType = MockUserType()
+        mockUserType.hasTeam = true
+        mockUserType.teamRole = .member
+        userSession.selfUser = mockUserType
+
+        let navigationController = setupNavigationController()
+        snapshotHelper
+            .withUserInterfaceStyle(.dark)
+            .verify(matching: navigationController.view)
+    }
+
+    func testStartUIViewControllerHideNewChannelOptionForTeamUser() {
+        // Given, channels are supported
+        BackendInfo.apiVersion = .v8
+        BackendInfo.isMLSEnabled = true
+
+        // user is in a team
+        let mockUserType = MockUserType()
+        mockUserType.hasTeam = true
+        userSession.selfUser = mockUserType
+
+        // but channels are disabled
+        userSession.channelsFeature = Feature.Channels(
+            status: .disabled,
+            config: .init(
+                allowedToCreateChannels: .teamMembers,
+                allowedToOpenChannels: .admins
+            )
+        )
+
+        let navigationController = setupNavigationController()
+        snapshotHelper
+            .withUserInterfaceStyle(.dark)
+            .verify(matching: navigationController.view)
+    }
 }

wire-ios/Wire-iOS/Sources/UserInterface/StartUI/StartUI/StartUIViewController.swift

@@ -44,7 +44,15 @@ final class StartUIViewController: UIViewController {
     let groupSelector = SearchGroupSelector()
 
     lazy var conversationTypePicker: UIViewController = {
-        let availableConversationTypes: Set<WireMultiParticipantConversationType> = if areChannelsSupported {
+        let canCreateChannels = userSession.channelsFeature.canCreateChannels(
+            role: userSession.selfUser.teamRole
+        )
+
+        let isTeamUser = userSession.selfUser.hasTeam
+
+        let availableConversationTypes: Set<WireMultiParticipantConversationType> = if areChannelsSupported,
+                                                                                       canCreateChannels ||
+                                                                                       !isTeamUser {
             [.channel, .group]
         } else {
             [.group]
@@ -62,7 +70,7 @@ final class StartUIViewController: UIViewController {
                 case .channel:
                     Task { @MainActor [weak self] in
                         guard let self else { return }
-                        if userSession.channelsFeature.canCreateChannels(role: userSession.selfUser.teamRole) {
+                        if canCreateChannels {
                             navigateToChannelCreation()
                         } else {
                             presentCreateTeamBanner()
@@ -331,6 +339,7 @@ final class StartUIViewController: UIViewController {
         guard backendInfoApiVersion >= .v8 else {
             return false
         }
+
         return true
     }