fix: before revoking guest users, wait for removing guest link [AR-3310] (#1694)

* fix: before revoking guest users, wait for removing guest link

* moved logic to use case

---------

Co-authored-by: Tommaso Piazza <196761+tmspzz@users.noreply.github.com>

Author: Garzas

app/src/main/kotlin/com/wire/android/ui/home/conversations/details/editguestaccess/EditGuestAccessScreen.kt

@@ -165,7 +165,7 @@ fun EditGuestAccessScreen(
         }
         if (editGuestAccessState.shouldShowRevokeLinkConfirmationDialog) {
             RevokeGuestConfirmationDialog(
-                onConfirm = ::onRevokeDialogConfirm, onDialogDismiss = ::onRevokeDialogDismiss
+                onConfirm = ::removeGuestLink, onDialogDismiss = ::onRevokeDialogDismiss
             )
         }
         if (editGuestAccessState.isFailedToGenerateGuestRoomLink) {

app/src/main/kotlin/com/wire/android/ui/home/conversations/details/editguestaccess/EditGuestAccessViewModel.kt

@@ -156,15 +156,12 @@ class EditGuestAccessViewModel @Inject constructor(
                 guestAllowed = shouldEnableGuestAccess,
                 servicesAllowed = editGuestAccessState.isServicesAccessAllowed,
                 nonTeamMembersAllowed = shouldEnableGuestAccess // Guest access controls non-team member access
-                )
+            )
         val newAccess = Conversation
             .accessFor(shouldEnableGuestAccess)
 
         viewModelScope.launch {
             withContext(dispatcher.io()) {
-                if (!shouldEnableGuestAccess) {
-                    removeGuestLink()
-                }
                 updateConversationAccessRole(
                     conversationId = conversationId,
                     accessRoles = newAccessRoles,
@@ -223,13 +220,9 @@ class EditGuestAccessViewModel @Inject constructor(
         editGuestAccessState = editGuestAccessState.copy(shouldShowRevokeLinkConfirmationDialog = false)
     }
 
-    fun onRevokeDialogConfirm() {
-        removeGuestLink()
-    }
-
-    private fun removeGuestLink() {
-        updateState(editGuestAccessState.copy(shouldShowRevokeLinkConfirmationDialog = false, isRevokingLink = true))
+    fun removeGuestLink() {
         viewModelScope.launch {
+            updateState(editGuestAccessState.copy(shouldShowRevokeLinkConfirmationDialog = false, isRevokingLink = true))
             revokeGuestRoomLink(conversationId).also {
                 if (it is RevokeGuestRoomLinkResult.Failure) {
                     updateState(editGuestAccessState.copy(isFailedToRevokeGuestRoomLink = true))

app/src/test/kotlin/com/wire/android/ui/home/conversations/details/editguestaccess/EditGuestAccessViewModelTest.kt

@@ -190,7 +190,7 @@ class EditGuestAccessViewModelTest {
             revokeGuestRoomLink(any())
         } returns RevokeGuestRoomLinkResult.Success
 
-        editGuestAccessViewModel.onRevokeDialogConfirm()
+        editGuestAccessViewModel.removeGuestLink()
 
         coVerify(exactly = 1) {
             revokeGuestRoomLink(any())
@@ -204,7 +204,7 @@ class EditGuestAccessViewModelTest {
             revokeGuestRoomLink(any())
         } returns RevokeGuestRoomLinkResult.Failure(CoreFailure.MissingClientRegistration)
 
-        editGuestAccessViewModel.onRevokeDialogConfirm()
+        editGuestAccessViewModel.removeGuestLink()
 
         coVerify(exactly = 1) {
             revokeGuestRoomLink(any())