@@ -154,7 +154,6 @@ class GroupConversationDetailsViewModel @Inject constructor(
154154 }
155155
156156 val shouldUseNewAppsUi = computeShouldUseNewAppsUi(groupDetails, appsAllowedResult)
157- val isAppsAllowedForConversation = computeAppsEnabledStatus(groupDetails, appsAllowedResult)
158157 val isUpdatingAppsAllowedForConversation =
159158 computeAppsAllowedStatus(canSelfPerformAdminTasks, isSelfInTeamThatOwnsConversation, groupDetails, appsAllowedResult)
160159
@@ -175,7 +174,7 @@ class GroupConversationDetailsViewModel @Inject constructor(
175174 isUpdatingNameAllowed = canSelfPerformAdminTasks && ! isSelfExternalMember,
176175 isUpdatingGuestAllowed = canSelfPerformAdminTasks && isSelfInTeamThatOwnsConversation,
177176 isUpdatingChannelAccessAllowed = canSelfPerformAdminTasks && isSelfInTeamThatOwnsConversation,
178- isAppsAllowed = isAppsAllowedForConversation ,
177+ isAppsAllowed = groupDetails.conversation.isServicesAllowed() ,
179178 shouldUseNewAppsUi = shouldUseNewAppsUi,
180179 isUpdatingAppsAllowed = isUpdatingAppsAllowedForConversation,
181180 isUpdatingReadReceiptAllowed = canSelfPerformAdminTasks && groupDetails.conversation.isTeamGroup(),
@@ -215,16 +214,6 @@ class GroupConversationDetailsViewModel @Inject constructor(
215214 isSelfInTeamThatOwnsConversation &&
216215 isServicesSupportedForConversation(groupDetails.conversation.protocol, appsAllowedResult)
217216
218- /* *
219- * Determine apps visibility based on feature flag and team settings
220- * Or just should be protocol based in case of current logic
221- */
222- private fun computeAppsEnabledStatus (
223- groupDetails : ConversationDetails .Group ,
224- appsAllowedResult : AppsAllowedResult
225- ) = groupDetails.conversation.isServicesAllowed() &&
226- isServicesSupportedForConversation(groupDetails.conversation.protocol, appsAllowedResult)
227-
228217 private fun isServicesSupportedForConversation (
229218 protocolInfo : Conversation .ProtocolInfo ,
230219 appsAllowedResult : AppsAllowedResult
0 commit comments