Merge branch 'main' into billing/PM-24996/implement-upgrade-from-free-dialog

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;
   }
 }
 

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">

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,