Skip to content

Commit 76b6853

Browse files
authored
[PM-15113] Disable add button in SSH Keys screen (#4364)
1 parent 89935ac commit 76b6853

File tree

4 files changed

+34
-1
lines changed

4 files changed

+34
-1
lines changed

app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2084,7 +2084,7 @@ data class VaultItemListingState(
20842084
*/
20852085
data object SshKey : Vault() {
20862086
override val titleText: Text get() = R.string.ssh_keys.asText()
2087-
override val hasFab: Boolean get() = true
2087+
override val hasFab: Boolean get() = false
20882088
}
20892089

20902090
/**

app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingDataExtensions.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,7 @@ fun VaultData.toViewState(
200200
val shouldShowAddButton = when (itemListingType) {
201201
is VaultItemListingState.ItemListingType.Vault.Folder,
202202
VaultItemListingState.ItemListingType.Vault.Trash,
203+
VaultItemListingState.ItemListingType.Vault.SshKey,
203204
-> false
204205

205206
else -> true

app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingScreenTest.kt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -648,6 +648,16 @@ class VaultItemListingScreenTest : BaseComposeTest() {
648648
)
649649
}
650650

651+
composeTestRule
652+
.onNodeWithContentDescription("Add item")
653+
.assertDoesNotExist()
654+
655+
mutableStateFlow.update {
656+
it.copy(
657+
itemListingType = VaultItemListingState.ItemListingType.Vault.SshKey,
658+
)
659+
}
660+
651661
composeTestRule
652662
.onNodeWithContentDescription("Add item")
653663
.assertDoesNotExist()

app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingDataExtensionsTest.kt

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -729,6 +729,28 @@ class VaultItemListingDataExtensionsTest {
729729
),
730730
)
731731

732+
// SSH keys
733+
assertEquals(
734+
VaultItemListingState.ViewState.NoItems(
735+
header = R.string.save_and_protect_your_data.asText(),
736+
message = R.string.no_items.asText(),
737+
shouldShowAddButton = false,
738+
buttonText = R.string.add_an_item.asText(),
739+
),
740+
vaultData.toViewState(
741+
itemListingType = VaultItemListingState.ItemListingType.Vault.SshKey,
742+
vaultFilterType = VaultFilterType.AllVaults,
743+
hasMasterPassword = true,
744+
baseIconUrl = Environment.Us.environmentUrlData.baseIconUrl,
745+
isIconLoadingDisabled = false,
746+
autofillSelectionData = null,
747+
fido2CreationData = null,
748+
fido2CredentialAutofillViews = null,
749+
totpData = null,
750+
isPremiumUser = true,
751+
),
752+
)
753+
732754
// Other ciphers
733755
assertEquals(
734756
VaultItemListingState.ViewState.NoItems(

0 commit comments

Comments
 (0)