From cac6a3627511204c0855c2a2dfbddb466b3a73ba Mon Sep 17 00:00:00 2001
From: Daniel Riera <driera@livefront.com>
Date: Thu, 2 Oct 2025 14:21:01 -0400
Subject: [PATCH 1/2] [PM-26449] Add mouse cursor hover on the Edit Shortcut
 link (#16708)

* PM-26449 add hover and focus styling for edit shortcut link, add tab support to the link

* reduce styling scope, switch from span to appropriate a tag
---
 apps/desktop/src/app/accounts/settings.component.html | 6 ++++--
 apps/desktop/src/scss/misc.scss                       | 9 +++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/apps/desktop/src/app/accounts/settings.component.html b/apps/desktop/src/app/accounts/settings.component.html
index a0380a8b5ce..7fdca9ff29b 100644
--- a/apps/desktop/src/app/accounts/settings.component.html
+++ b/apps/desktop/src/app/accounts/settings.component.html
@@ -351,13 +351,15 @@
                 <small class="help-block" *ngIf="form.value.enableAutotype">
                   <b>{{ "important" | i18n }}</b>
                   {{ "enableAutotypeDescriptionTransitionKey" | i18n }}
-                  <span
+                  <a
                     class="settings-link"
+                    tabindex="0"
                     *ngIf="this.form.value.enableAutotype"
                     (click)="saveAutotypeShortcut()"
+                    (keydown.enter)="saveAutotypeShortcut(); $event.preventDefault()"
                   >
                     {{ "editShortcut" | i18n }}
-                  </span></small
+                  </a></small
                 >
               </div>
               <div class="form-group">
diff --git a/apps/desktop/src/scss/misc.scss b/apps/desktop/src/scss/misc.scss
index b64bdd92120..c70eb823213 100644
--- a/apps/desktop/src/scss/misc.scss
+++ b/apps/desktop/src/scss/misc.scss
@@ -360,11 +360,16 @@ form,
   }
 }
 
-.settings-link {
+.help-block a.settings-link {
+  text-decoration: none;
   @include themify($themes) {
     color: themed("primaryColor");
+
+    &:hover,
+    &:focus {
+      color: darken(themed("primaryColor"), 6%);
+    }
   }
-  font-weight: bold;
 }
 
 app-root > #loading,

From bbbc10f233778f780eeb2441653de9c154b7af9d Mon Sep 17 00:00:00 2001
From: Nick Krantz <125900171+nick-livefront@users.noreply.github.com>
Date: Thu, 2 Oct 2025 14:34:15 -0500
Subject: [PATCH 2/2] Fix logic for list filtering for trash and archived items
 (#16702)

---
 apps/cli/src/commands/list.command.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/cli/src/commands/list.command.ts b/apps/cli/src/commands/list.command.ts
index 49527f6bf78..e5174f67913 100644
--- a/apps/cli/src/commands/list.command.ts
+++ b/apps/cli/src/commands/list.command.ts
@@ -304,14 +304,14 @@ export class ListCommand {
   }
 
   /**
-   * Checks if the cipher passes either the trash or the archive options.
-   * @returns true if the cipher passes *any* of the filters
+   * Checks if the cipher passes the state filter options.
+   * @returns true if the cipher matches the requested state
    */
   private matchesStateOptions(c: CipherView, options: Options): boolean {
-    const passesTrashFilter = options.trash && c.isDeleted;
-    const passesArchivedFilter = options.archived && c.isArchived;
+    const passesTrashFilter = options.trash === c.isDeleted;
+    const passesArchivedFilter = options.archived === c.isArchived;
 
-    return passesTrashFilter || passesArchivedFilter;
+    return passesTrashFilter && passesArchivedFilter;
   }
 }