diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversations/details/GroupConversationDetailsViewModel.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversations/details/GroupConversationDetailsViewModel.kt index cad18a4044..dcfcdcc42b 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/conversations/details/GroupConversationDetailsViewModel.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/conversations/details/GroupConversationDetailsViewModel.kt @@ -154,7 +154,6 @@ class GroupConversationDetailsViewModel @Inject constructor( } val shouldUseNewAppsUi = computeShouldUseNewAppsUi(groupDetails, appsAllowedResult) - val isAppsAllowedForConversation = computeAppsEnabledStatus(groupDetails, appsAllowedResult) val isUpdatingAppsAllowedForConversation = computeAppsAllowedStatus(canSelfPerformAdminTasks, isSelfInTeamThatOwnsConversation, groupDetails, appsAllowedResult) @@ -175,7 +174,7 @@ class GroupConversationDetailsViewModel @Inject constructor( isUpdatingNameAllowed = canSelfPerformAdminTasks && !isSelfExternalMember, isUpdatingGuestAllowed = canSelfPerformAdminTasks && isSelfInTeamThatOwnsConversation, isUpdatingChannelAccessAllowed = canSelfPerformAdminTasks && isSelfInTeamThatOwnsConversation, - isAppsAllowed = isAppsAllowedForConversation, + isAppsAllowed = groupDetails.conversation.isServicesAllowed(), shouldUseNewAppsUi = shouldUseNewAppsUi, isUpdatingAppsAllowed = isUpdatingAppsAllowedForConversation, isUpdatingReadReceiptAllowed = canSelfPerformAdminTasks && groupDetails.conversation.isTeamGroup(), @@ -215,16 +214,6 @@ class GroupConversationDetailsViewModel @Inject constructor( isSelfInTeamThatOwnsConversation && isServicesSupportedForConversation(groupDetails.conversation.protocol, appsAllowedResult) - /** - * Determine apps visibility based on feature flag and team settings - * Or just should be protocol based in case of current logic - */ - private fun computeAppsEnabledStatus( - groupDetails: ConversationDetails.Group, - appsAllowedResult: AppsAllowedResult - ) = groupDetails.conversation.isServicesAllowed() && - isServicesSupportedForConversation(groupDetails.conversation.protocol, appsAllowedResult) - private fun isServicesSupportedForConversation( protocolInfo: Conversation.ProtocolInfo, appsAllowedResult: AppsAllowedResult diff --git a/app/src/test/kotlin/com/wire/android/ui/home/conversations/details/GroupDetailsViewModelTest.kt b/app/src/test/kotlin/com/wire/android/ui/home/conversations/details/GroupDetailsViewModelTest.kt index b7694801a0..87af658115 100644 --- a/app/src/test/kotlin/com/wire/android/ui/home/conversations/details/GroupDetailsViewModelTest.kt +++ b/app/src/test/kotlin/com/wire/android/ui/home/conversations/details/GroupDetailsViewModelTest.kt @@ -256,7 +256,7 @@ class GroupDetailsViewModelTest { .withSelfTeamUseCaseReturns(selfTeam) .arrange() - assertEquals(false, viewModel.groupOptionsState.value.isAppsAllowed) + assertEquals(true, viewModel.groupOptionsState.value.isAppsAllowed) assertEquals(false, viewModel.groupOptionsState.value.shouldUseNewAppsUi) assertEquals(false, viewModel.groupOptionsState.value.isUpdatingAppsAllowed) }