diff --git a/app/src/main/kotlin/com/wire/android/ui/home/newconversation/groupsearch/NewGroupConversationSearchPeopleScreen.kt b/app/src/main/kotlin/com/wire/android/ui/home/newconversation/groupsearch/NewGroupConversationSearchPeopleScreen.kt index 7dbdf2c9130..464ca116ac7 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/newconversation/groupsearch/NewGroupConversationSearchPeopleScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/newconversation/groupsearch/NewGroupConversationSearchPeopleScreen.kt @@ -48,7 +48,6 @@ fun NewGroupConversationSearchPeopleScreen( } BackHandler(true, onBackClicked) - val isSelfTeamMember = newConversationViewModel.newGroupState.isSelfTeamMember ?: false val screenTitle = if (newConversationViewModel.newGroupState.isChannel) { stringResource(id = R.string.label_new_channel) @@ -61,7 +60,7 @@ fun NewGroupConversationSearchPeopleScreen( OtherUserProfileScreenDestination(QualifiedID(contact.id, contact.domain)) .let { navigator.navigate(NavigationCommand(it)) } }, - shouldShowChannelPromotion = !isSelfTeamMember, + shouldShowChannelPromotion = false, isUserAllowedToCreateChannels = false, onContactChecked = newConversationViewModel::updateSelectedContacts, onContinue = { navigator.navigate(NavigationCommand(NewGroupNameScreenDestination)) }, diff --git a/app/src/main/kotlin/com/wire/android/ui/home/newconversation/search/NewConversationSearchPeopleScreen.kt b/app/src/main/kotlin/com/wire/android/ui/home/newconversation/search/NewConversationSearchPeopleScreen.kt index 56d12ca0133..11d7aa3b720 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/newconversation/search/NewConversationSearchPeopleScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/newconversation/search/NewConversationSearchPeopleScreen.kt @@ -45,12 +45,10 @@ fun NewConversationSearchPeopleScreen( navigator: Navigator, newConversationViewModel: NewConversationViewModel, ) { - val isSelfTeamMember = newConversationViewModel.newGroupState.isSelfTeamMember ?: false - val shouldShowChannelPromotion = !isSelfTeamMember val showCreateTeamDialog = remember { mutableStateOf(false) } SearchUsersAndAppsScreen( searchTitle = stringResource(id = R.string.label_new_conversation), - shouldShowChannelPromotion = shouldShowChannelPromotion, + shouldShowChannelPromotion = false, isUserAllowedToCreateChannels = newConversationViewModel.isChannelCreationPossible, onOpenUserProfile = { contact -> OtherUserProfileScreenDestination(QualifiedID(contact.id, contact.domain)) @@ -62,12 +60,8 @@ fun NewConversationSearchPeopleScreen( navigator.navigate(NavigationCommand(NewGroupConversationSearchPeopleScreenDestination)) }, onCreateNewChannel = { - if (!shouldShowChannelPromotion) { - newConversationViewModel.setIsChannel(true) - navigator.navigate(NavigationCommand(NewGroupConversationSearchPeopleScreenDestination)) - } else { - showCreateTeamDialog.value = true - } + newConversationViewModel.setIsChannel(true) + navigator.navigate(NavigationCommand(NewGroupConversationSearchPeopleScreenDestination)) }, isGroupSubmitVisible = newConversationViewModel.newGroupState.isGroupCreatingAllowed == true, onClose = navigator::navigateBack,