From 222bc44c996fe23df5dc7dd98b9b0ebe1e24cf47 Mon Sep 17 00:00:00 2001
From: David Perez <david@livefront.com>
Date: Tue, 17 Feb 2026 09:34:38 -0600
Subject: [PATCH] PM-32354: Filter out archived items from CXP (#6547)

---
 .../exportitems/reviewexport/ReviewExportViewModel.kt        | 4 ++--
 .../exportitems/reviewexport/ReviewExportViewModelTest.kt    | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

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,
                             ),
                         ),
                     ),