Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: button keeps spinning when user starts a conversation and back (WPB-5862) 🍒 #3386

Merged
merged 3 commits into from
Aug 27, 2024
Merged

fix: button keeps spinning when user starts a conversation and back (WPB-5862) 🍒 #3386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
52cb528
Commit with unresolved merge conflicts outside of submodules
yamilmedina Aug 27, 2024
78e58b3
Merge branch 'release/candidate' into fix/connection-button-eternal-s…
yamilmedina Aug 27, 2024
3ef0fb8
solve conflicts
yamilmedina Aug 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions app/src/main/kotlin/com/wire/android/ui/connection/ConnectionActionButtonViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,9 +202,11 @@ class ConnectionActionButtonViewModelImpl @Inject constructor(
if (result.coreFailure is CoreFailure.MissingKeyPackages) onMissingKeyPackages()
}

is CreateConversationResult.Success -> onSuccess(result.conversation.id)
is CreateConversationResult.Success -> {
state = state.finishAction()
onSuccess(result.conversation.id)
}
}
state.finishAction()
}
}

Expand Down
3 changes: 3 additions & 0 deletions app/src/test/kotlin/com/wire/android/ui/connection/ConnectionActionButtonViewModelTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,7 @@ class ConnectionActionButtonViewModelTest {
}
verify { arrangement.onOpenConversation(any()) }
verify { arrangement.onMissingKeyPackages wasNot Called }
assertEquals(false, viewModel.actionableState().isPerformingAction)
}

@Test
Expand All @@ -294,6 +295,7 @@ class ConnectionActionButtonViewModelTest {
}
verify { arrangement.onOpenConversation wasNot Called }
verify { arrangement.onMissingKeyPackages wasNot Called }
assertEquals(false, viewModel.actionableState().isPerformingAction)
}

@Test
Expand All @@ -313,6 +315,7 @@ class ConnectionActionButtonViewModelTest {
}
verify { arrangement.onOpenConversation wasNot Called }
verify { arrangement.onMissingKeyPackages() }
assertEquals(false, viewModel.actionableState().isPerformingAction)
}

companion object {
Expand Down
Loading