Merge branch 'develop' into fix/CW-3183

app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue

@@ -2,7 +2,7 @@
   <div
     class="relative flex items-start flex-grow-0 flex-shrink-0 w-auto max-w-full px-4 py-0 border-t-0 border-b-0 border-l-2 border-r-0 border-transparent border-solid cursor-pointer conversation hover:bg-slate-25 dark:hover:bg-slate-800 group"
     :class="{
-      'animate-card-select bg-slate-25 dark:bg-slate-800 border-woot-500':
+      'active animate-card-select bg-slate-25 dark:bg-slate-800 border-woot-500':
         isActiveChat,
       'unread-chat': hasUnread,
       'has-inbox-name': showInboxName,

app/javascript/shared/mixins/eventListenerMixins.js

@@ -1,4 +1,8 @@
-import { isActiveElementTypeable, isEscape } from '../helpers/KeyboardHelpers';
+import {
+  isActiveElementTypeable,
+  isEscape,
+  hasPressedCommandPlusAltAndEKey,
+} from '../helpers/KeyboardHelpers';
 
 export default {
   mounted() {
@@ -15,7 +19,12 @@ export default {
         if (isEscape(e)) {
           e.target.blur();
         }
-        return;
+        // Added this to blur the input field when the user presses Command + Option + E (Mac) or Ctrl + Alt + E (Windows)
+        // Only case for Resolve conversation and open next conversation in the list
+        if (!hasPressedCommandPlusAltAndEKey(e)) {
+          return;
+        }
+        e.target.blur();
       }
 
       this.handleKeyEvents(e);