From 2586c8e7e5a304da46a69ff67477fc805d7e1fa4 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Thu, 17 Feb 2022 18:58:53 +0530
Subject: [PATCH] fix: Lock icon colour issue in private messages (#4009)

* fix: Lock icon colour issue in private messages

* minor fixes
---
 .../widgets/conversation/bubble/Actions.vue        | 14 ++++++++++----
 .../settings/automation/EditAutomationRule.vue     |  9 ++++-----
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue b/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue
index 04149a7e2..957402f78 100644
--- a/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue
@@ -19,14 +19,16 @@
       v-if="isPrivate"
       v-tooltip.top-start="$t('CONVERSATION.VISIBLE_TO_AGENTS')"
       icon="lock-closed"
-      class="action--icon"
+      class="action--icon lock--icon--private"
       size="16"
       @mouseenter="isHovered = true"
       @mouseleave="isHovered = false"
     />
-    <button @click="onTweetReply">
+    <button
+      v-if="isATweet && (isIncoming || isOutgoing) && sourceId"
+      @click="onTweetReply"
+    >
       <fluent-icon
-        v-if="isATweet && (isIncoming || isOutgoing) && sourceId"
         v-tooltip.top-start="$t('CHAT_LIST.REPLY_TO_TWEET')"
         icon="arrow-reply"
         class="action--icon cursor-pointer"
@@ -141,6 +143,10 @@ export default {
     .action--icon {
       color: var(--white);
     }
+
+    .lock--icon--private {
+      color: var(--s-400);
+    }
   }
 }
 
@@ -205,7 +211,7 @@ export default {
 
 .is-private {
   .message-text--metadata {
-    align-items: flex-end;
+    align-items: center;
 
     .time {
       color: var(--s-400);
diff --git a/app/javascript/dashboard/routes/dashboard/settings/automation/EditAutomationRule.vue b/app/javascript/dashboard/routes/dashboard/settings/automation/EditAutomationRule.vue
index fd8d0a492..d55ce419b 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/automation/EditAutomationRule.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/automation/EditAutomationRule.vue
@@ -352,8 +352,8 @@ export default {
       switch (type) {
         case 'assign_team':
         case 'send_email_to_team':
-        return this.$store.getters['teams/getTeams'];
-         case 'add_label':
+          return this.$store.getters['teams/getTeams'];
+        case 'add_label':
           return this.$store.getters['labels/getLabels'].map(i => {
             return {
               id: i.title,
@@ -441,9 +441,8 @@ export default {
       const formattedConditions = automation.conditions.map(condition => {
         const inputType = this.automationTypes[
           automation.event_name
-        ].conditions.find(
-          item => item.key === condition.attribute_key
-        ).inputType;
+        ].conditions.find(item => item.key === condition.attribute_key)
+          .inputType;
         if (inputType === 'plain_text') {
           return {
             ...condition,