fix: button keeps spinning when user starts a conversation and back (…

…WPB-5862) (#3372)
wireapp · Aug 27, 2024 · ac07dd4 · ac07dd4
1 parent 97f6b70
commit ac07dd4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/app/src/main/kotlin/com/wire/android/ui/connection/ConnectionActionButtonViewModel.kt b/app/src/main/kotlin/com/wire/android/ui/connection/ConnectionActionButtonViewModel.kt
@@ -206,9 +206,11 @@ class ConnectionActionButtonViewModelImpl @Inject constructor(
                     onFailure(result.coreFailure)
                 }
 
-                is CreateConversationResult.Success -> onSuccess(result.conversation.id)
+                is CreateConversationResult.Success -> {
+                    state = state.finishAction()
+                    onSuccess(result.conversation.id)
+                }
             }
-            state.finishAction()
         }
     }
 }
diff --git a/app/src/test/kotlin/com/wire/android/ui/connection/ConnectionActionButtonViewModelTest.kt b/app/src/test/kotlin/com/wire/android/ui/connection/ConnectionActionButtonViewModelTest.kt
@@ -256,6 +256,7 @@ class ConnectionActionButtonViewModelTest {
             }
             verify { arrangement.onOpenConversation(any()) }
             verify { arrangement.onStartConversationError wasNot Called }
+            assertEquals(false, viewModel.actionableState().isPerformingAction)
         }
 
     @Test
@@ -275,6 +276,7 @@ class ConnectionActionButtonViewModelTest {
             }
             verify { arrangement.onOpenConversation wasNot Called }
             verify { arrangement.onStartConversationError(eq(failure)) }
+            assertEquals(false, viewModel.actionableState().isPerformingAction)
         }
 
     @Test
@@ -295,6 +297,7 @@ class ConnectionActionButtonViewModelTest {
             }
             verify { arrangement.onOpenConversation wasNot Called }
             verify { arrangement.onStartConversationError(eq(errorResult)) }
+            assertEquals(false, viewModel.actionableState().isPerformingAction)
         }
 
     companion object {