diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/exportitems/reviewexport/ReviewExportViewModel.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/exportitems/reviewexport/ReviewExportViewModel.kt index d8004f2208..16a4ae0b12 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/exportitems/reviewexport/ReviewExportViewModel.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/exportitems/reviewexport/ReviewExportViewModel.kt @@ -94,7 +94,7 @@ class ReviewExportViewModel @Inject constructor( .value .data ?.successes - ?.filter { it.deletedDate == null } + ?.filter { it.deletedDate == null && it.archivedDate == null } .filterRestrictedItemsIfNecessary(), ) .fold( @@ -241,7 +241,7 @@ class ReviewExportViewModel @Inject constructor( var secureNoteItemCount = 0 this@toItemTypeCounts ?.successes - ?.filter { it.deletedDate == null } + ?.filter { it.deletedDate == null && it.archivedDate == null } .orEmpty() .forEach { when { diff --git a/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/exportitems/reviewexport/ReviewExportViewModelTest.kt b/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/exportitems/reviewexport/ReviewExportViewModelTest.kt index 2a3e1b686b..af9341e9e2 100644 --- a/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/exportitems/reviewexport/ReviewExportViewModelTest.kt +++ b/app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/exportitems/reviewexport/ReviewExportViewModelTest.kt @@ -120,6 +120,10 @@ class ReviewExportViewModelTest : BaseViewModelTest() { number = 1, isDeleted = true, ) + val mockArchivedCipherListView = createMockCipherListView( + number = 1, + isArchived = true, + ) decryptCipherListResultFlow.tryEmit( DataState.Loaded( createMockDecryptCipherListResult( @@ -128,6 +132,7 @@ class ReviewExportViewModelTest : BaseViewModelTest() { mockActiveLoginCipherListView, mockActiveCardCipherListView, mockDeletedCipherListView, + mockArchivedCipherListView, ), ), ),