From f41b30b485c511abda58b5d3aa2238068edf256f Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Mon, 4 Oct 2021 17:12:47 +0530
Subject: [PATCH] Reorder, remove snooze, delete, sso_auth_token

---
 .../devise_overrides/sessions_controller.rb   |  2 +-
 .../components/buttons/ResolveAction.vue      |  4 +--
 .../widgets/conversation/Message.vue          |  4 +--
 .../dashboard/conversation/ContactPanel.vue   | 25 +++++++++----------
 4 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/app/controllers/devise_overrides/sessions_controller.rb b/app/controllers/devise_overrides/sessions_controller.rb
index 289684f17..9b349012b 100644
--- a/app/controllers/devise_overrides/sessions_controller.rb
+++ b/app/controllers/devise_overrides/sessions_controller.rb
@@ -27,7 +27,7 @@ class DeviseOverrides::SessionsController < ::DeviseTokenAuth::SessionsControlle
 
     sign_in(:user, @resource, store: false, bypass: false)
     # invalidate the token after the user is signed in
-    @resource.invalidate_sso_auth_token(params[:sso_auth_token])
+    # @resource.invalidate_sso_auth_token(params[:sso_auth_token])
   end
 
   def process_sso_auth_token
diff --git a/app/javascript/dashboard/components/buttons/ResolveAction.vue b/app/javascript/dashboard/components/buttons/ResolveAction.vue
index 637424815..43f1e92d1 100644
--- a/app/javascript/dashboard/components/buttons/ResolveAction.vue
+++ b/app/javascript/dashboard/components/buttons/ResolveAction.vue
@@ -33,7 +33,7 @@
       >
         {{ this.$t('CONVERSATION.HEADER.OPEN_ACTION') }}
       </woot-button>
-      <woot-button
+      <!-- <woot-button
         v-if="showAdditionalActions"
         ref="arrowDownButton"
         :color-scheme="buttonClass"
@@ -41,7 +41,7 @@
         icon="ion-arrow-down-b"
         emoji="🔽"
         @click="openDropdown"
-      />
+      /> -->
     </div>
     <div
       v-if="showActionsDropdown"
diff --git a/app/javascript/dashboard/components/widgets/conversation/Message.vue b/app/javascript/dashboard/components/widgets/conversation/Message.vue
index e5de1b040..65fd30a18 100644
--- a/app/javascript/dashboard/components/widgets/conversation/Message.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/Message.vue
@@ -68,7 +68,7 @@
       </a>
     </div>
     <div class="context-menu-wrap">
-      <context-menu
+      <!-- <context-menu
         v-if="isBubble && !isMessageDeleted"
         :is-open="showContextMenu"
         :show-copy="hasText"
@@ -76,7 +76,7 @@
         @toggle="handleContextMenuClick"
         @delete="handleDelete"
         @copy="handleCopy"
-      />
+      /> -->
     </div>
   </li>
 </template>
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/ContactPanel.vue b/app/javascript/dashboard/routes/dashboard/conversation/ContactPanel.vue
index 075b6de39..3e1123752 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/ContactPanel.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/ContactPanel.vue
@@ -70,7 +70,18 @@
         </div>
       </accordion-item>
     </div>
-
+    <accordion-item
+      v-if="hasContactAttributes"
+      :title="$t('CONVERSATION_SIDEBAR.ACCORDION.CONTACT_ATTRIBUTES')"
+      :is-open="isContactSidebarItemOpen('is_contact_attributes_open')"
+      @click="
+        value => toggleSidebarUIState('is_contact_attributes_open', value)
+      "
+    >
+      <contact-custom-attributes
+        :custom-attributes="contact.custom_attributes"
+      />
+    </accordion-item>
     <accordion-item
       v-if="browser.browser_name"
       :title="$t('CONVERSATION_SIDEBAR.ACCORDION.CONVERSATION_INFO')"
@@ -126,18 +137,6 @@
         />
       </div>
     </accordion-item>
-    <accordion-item
-      v-if="hasContactAttributes"
-      :title="$t('CONVERSATION_SIDEBAR.ACCORDION.CONTACT_ATTRIBUTES')"
-      :is-open="isContactSidebarItemOpen('is_contact_attributes_open')"
-      @click="
-        value => toggleSidebarUIState('is_contact_attributes_open', value)
-      "
-    >
-      <contact-custom-attributes
-        :custom-attributes="contact.custom_attributes"
-      />
-    </accordion-item>
     <accordion-item
       v-if="contact.id"
       :title="$t('CONVERSATION_SIDEBAR.ACCORDION.PREVIOUS_CONVERSATION')"