Skip to content

[PM-26810] Remove loading dialog flicker on vault data updates #6068

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

Merged
SaintPatrck merged 1 commit into from
Oct 22, 2025
Merged

[PM-26810] Remove loading dialog flicker on vault data updates #6068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions ...in/com/x8bit/bitwarden/ui/vault/feature/exportitems/reviewexport/ReviewExportViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,15 +164,14 @@ class ReviewExportViewModel @Inject constructor(
}

private fun handleVaultDataLoading() {
showLoadingDialog()
showLoadingDialog(BitwardenString.loading_vault_data.asText())
}

private fun handleVaultDataLoaded(data: DataState.Loaded<DecryptCipherListResult>) {
updateItemTypeCounts(data = data, clearDialog = true)
}

private fun handleVaultDataPending(data: DataState.Pending<DecryptCipherListResult>) {
showLoadingDialog()
updateItemTypeCounts(data = data, clearDialog = false)
}

Expand Down
5 changes: 1 addition & 4 deletions ...om/x8bit/bitwarden/ui/vault/feature/exportitems/reviewexport/ReviewExportViewModelTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ class ReviewExportViewModelTest : BaseViewModelTest() {
}

@Test
fun `VaultDataReceive Pending should show loading dialog and update item type counts`() =
fun `VaultDataReceive Pending should update item type counts`() =
runTest {
val viewModel = createViewModel()
viewModel.trySendAction(
Expand All @@ -314,9 +314,6 @@ class ReviewExportViewModelTest : BaseViewModelTest() {
passwordCount = 1,
),
),
dialog = ReviewExportState.DialogState.Loading(
BitwardenString.loading.asText(),
),
)

assertEquals(expectedState, viewModel.stateFlow.value)
Expand Down
1 change: 1 addition & 0 deletions ui/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1140,4 +1140,5 @@ Do you want to switch to this account?</string>
<string name="enter_the_6_digit_code_that_was_emailed_to_the_address_below">Enter the 6-digit code that was emailed to the address below</string>
<string name="lock_app">Lock app</string>
<string name="use_your_devices_lock_method_to_unlock_the_app">Use your device’s lock method to unlock the app</string>
<string name="loading_vault_data">Loading vault data…</string>
</resources>
Loading