From 3a129b0cdbf7d62f3fbfd66dcc6641d215d041ce Mon Sep 17 00:00:00 2001
From: iamsivin <iamsivin@gmail.com>
Date: Thu, 4 Apr 2024 22:56:40 +0530
Subject: [PATCH] fix: Resolve and go next keyboard shortcuts doesn't work

---
 .../widgets/conversation/ConversationCard.vue       |  2 +-
 app/javascript/shared/mixins/eventListenerMixins.js | 13 +++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
index 712efdee0..6e922bb86 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
+++ b/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,
diff --git a/app/javascript/shared/mixins/eventListenerMixins.js b/app/javascript/shared/mixins/eventListenerMixins.js
index 9bcff3aa3..967c52767 100644
--- a/app/javascript/shared/mixins/eventListenerMixins.js
+++ b/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);