Skip to content

PM-30897: Add archive and unarchive button on Edit Cipher Screen #6372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
david-livefront merged 1 commit into from
Jan 16, 2026
Merged

PM-30897: Add archive and unarchive button on Edit Cipher Screen #6372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/search/SearchViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,8 @@ class SearchViewModel @Inject constructor(

snackbarRelayManager
.getSnackbarDataFlow(
SnackbarRelay.CIPHER_ARCHIVED,
SnackbarRelay.CIPHER_UNARCHIVED,
SnackbarRelay.CIPHER_DELETED,
SnackbarRelay.CIPHER_DELETED_SOFT,
SnackbarRelay.CIPHER_RESTORED,
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/model/SnackbarRelay.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ import kotlinx.serialization.Serializable
*/
@Serializable
enum class SnackbarRelay {
CIPHER_ARCHIVED,
CIPHER_UNARCHIVED,
CIPHER_CREATED,
CIPHER_DELETED,
CIPHER_DELETED_SOFT,
Expand Down
38 changes: 38 additions & 0 deletions app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,10 @@ fun VaultAddEditScreen(
VaultAddEditEvent.NavigateToLearnMore -> {
intentManager.launchUri("https://bitwarden.com/help/uri-match-detection/".toUri())
}

is VaultAddEditEvent.NavigateToPremium -> {
intentManager.launchUri(uri = event.uri.toUri())
}
}
}

Expand All @@ -213,6 +217,14 @@ fun VaultAddEditScreen(
VaultAddEditSshKeyTypeHandlers.create(viewModel = viewModel)
}

val archiveClickAction = remember(viewModel) {
{ viewModel.trySendAction(VaultAddEditAction.Common.ArchiveClick) }
}

val unarchiveClickAction = remember(viewModel) {
{ viewModel.trySendAction(VaultAddEditAction.Common.UnarchiveClick) }
}

val confirmDeleteClickAction = remember(viewModel) {
{ viewModel.trySendAction(VaultAddEditAction.Common.ConfirmDeleteClick) }
}
Expand Down Expand Up @@ -294,6 +306,9 @@ fun VaultAddEditScreen(
)
}
},
onUpgradeToPremiumClick = {
viewModel.trySendAction(VaultAddEditAction.Common.UpgradeToPremiumClick)
},
)

if (pendingDeleteCipher) {
Expand Down Expand Up @@ -391,6 +406,16 @@ fun VaultAddEditScreen(
!state.isCipherInCollection ||
!state.canAssociateToCollections
},
OverflowMenuItemData(
text = stringResource(id = BitwardenString.archive_verb),
onClick = archiveClickAction,
)
.takeIf { state.displayArchiveButton },
OverflowMenuItemData(
text = stringResource(id = BitwardenString.unarchive),
onClick = unarchiveClickAction,
)
.takeIf { state.displayUnarchiveButton },
OverflowMenuItemData(
text = stringResource(id = BitwardenString.delete),
onClick = { pendingDeleteCipher = true },
Expand Down Expand Up @@ -476,8 +501,21 @@ private fun VaultAddEditItemDialogs(
onSubmitPinSetUpFido2Verification: (pin: String) -> Unit,
onRetryPinSetUpFido2Verification: () -> Unit,
onDismissFido2Verification: () -> Unit,
onUpgradeToPremiumClick: () -> Unit,
) {
when (dialogState) {
is VaultAddEditState.DialogState.ArchiveRequiresPremium -> {
BitwardenTwoButtonDialog(
title = stringResource(id = BitwardenString.archive_unavailable),
message = stringResource(id = BitwardenString.archiving_items_is_a_premium_feature),
confirmButtonText = stringResource(id = BitwardenString.upgrade_to_premium),
dismissButtonText = stringResource(id = BitwardenString.cancel),
onConfirmClick = onUpgradeToPremiumClick,
onDismissClick = onDismissRequest,
onDismissRequest = onDismissRequest,
)
}

is VaultAddEditState.DialogState.Loading -> {
BitwardenLoadingDialog(text = dialogState.label())
}
Expand Down
Loading
Loading