diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultDataExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultDataExtensions.kt index bfccdeed27..4ea684c783 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultDataExtensions.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultDataExtensions.kt @@ -61,7 +61,7 @@ fun VaultData.toViewState( val noFolderItems = filteredCipherViewList .filter { it.folderId.isNullOrBlank() } - return if (filteredCipherViewList.isEmpty()) { + return if (filteredCipherViewListWithDeletedItems.isEmpty()) { VaultState.ViewState.NoItems } else { val totpItems = filteredCipherViewList.filter { it.login?.totp != null } diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultDataExtensionsTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultDataExtensionsTest.kt index a6609d86b9..8e37ebfd63 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultDataExtensionsTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultDataExtensionsTest.kt @@ -611,6 +611,43 @@ class VaultDataExtensionsTest { ) } + @Test + fun `toViewState should show content with trashed items only`() { + val vaultData = VaultData( + cipherViewList = listOf( + createMockCipherView(number = 1, isDeleted = true), + createMockCipherView(number = 2, isDeleted = true), + ), + collectionViewList = listOf(), + folderViewList = listOf(), + sendViewList = listOf(), + ) + + val actual = vaultData.toViewState( + isPremium = true, + isIconLoadingDisabled = false, + baseIconUrl = Environment.Us.environmentUrlData.baseIconUrl, + vaultFilterType = VaultFilterType.AllVaults, + hasMasterPassword = true, + ) + + assertEquals( + VaultState.ViewState.Content( + loginItemsCount = 0, + cardItemsCount = 0, + identityItemsCount = 0, + secureNoteItemsCount = 0, + favoriteItems = listOf(), + folderItems = listOf(), + collectionItems = listOf(), + noFolderItems = listOf(), + trashItemsCount = 2, + totpItemsCount = 0, + ), + actual, + ) + } + @Test fun `toViewState with over 100 no folder items should show no folder option`() { mockkStatic(Uri::class)