From 1349165156eeaa1a33331438ad03d276deecb738 Mon Sep 17 00:00:00 2001
From: Dave Severns <149429124+dseverns-livefront@users.noreply.github.com>
Date: Wed, 19 Feb 2025 12:55:54 -0500
Subject: [PATCH] PM-18421 Remove adding a folder option from within folder
 view. (#4747)

---
 .../vault/feature/itemlisting/VaultItemListingViewModel.kt   | 5 ++++-
 .../vault/feature/itemlisting/VaultItemListingScreenTest.kt  | 5 ++++-
 .../feature/itemlisting/VaultItemListingViewModelTest.kt     | 5 ++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModel.kt
index f3380d98c9..d9afd7cac4 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModel.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModel.kt
@@ -610,7 +610,10 @@ class VaultItemListingViewModel @Inject constructor(
                 mutableStateFlow.update {
                     it.copy(
                         dialogState = VaultItemListingState.DialogState.VaultItemTypeSelection(
-                            excludedOptions = persistentListOfNotNull(CreateVaultItemType.SSH_KEY),
+                            excludedOptions = persistentListOfNotNull(
+                                CreateVaultItemType.SSH_KEY,
+                                CreateVaultItemType.FOLDER,
+                            ),
                         ),
                     )
                 }
diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingScreenTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingScreenTest.kt
index 64a372d36e..5224aaa0d8 100644
--- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingScreenTest.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingScreenTest.kt
@@ -2160,7 +2160,10 @@ class VaultItemListingScreenTest : BaseComposeTest() {
         mutableStateFlow.update {
             it.copy(
                 dialogState = VaultItemListingState.DialogState.VaultItemTypeSelection(
-                    excludedOptions = persistentListOf(CreateVaultItemType.SSH_KEY),
+                    excludedOptions = persistentListOf(
+                        CreateVaultItemType.SSH_KEY,
+                        CreateVaultItemType.FOLDER,
+                    ),
                 ),
             )
         }
diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModelTest.kt
index 4d74614263..a508c24357 100644
--- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModelTest.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModelTest.kt
@@ -979,7 +979,10 @@ class VaultItemListingViewModelTest : BaseViewModelTest() {
                     folderId = "id",
                 ),
                 dialogState = VaultItemListingState.DialogState.VaultItemTypeSelection(
-                    excludedOptions = persistentListOf(CreateVaultItemType.SSH_KEY),
+                    excludedOptions = persistentListOf(
+                        CreateVaultItemType.SSH_KEY,
+                        CreateVaultItemType.FOLDER,
+                    ),
                 ),
             ),
             viewModel.stateFlow.value,