From c1a2e67c9e55b1be4f1173301069d7dee1ebae9c Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Fri, 10 Nov 2023 09:44:59 +0530
Subject: [PATCH 01/23] fix: Change the route change logic based on bus events,
 after creating a new conversation in the widget. (#8328)

---
 .../widget/constants/widgetBusEvents.js        |  1 +
 .../store/modules/conversation/actions.js      |  3 +++
 app/javascript/widget/views/PreChatForm.vue    | 18 ++++++------------
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/app/javascript/widget/constants/widgetBusEvents.js b/app/javascript/widget/constants/widgetBusEvents.js
index 769b941ee..1ffcd3d51 100644
--- a/app/javascript/widget/constants/widgetBusEvents.js
+++ b/app/javascript/widget/constants/widgetBusEvents.js
@@ -1,3 +1,4 @@
 export const ON_AGENT_MESSAGE_RECEIVED = 'ON_AGENT_MESSAGE_RECEIVED';
 export const ON_UNREAD_MESSAGE_CLICK = 'ON_UNREAD_MESSAGE_CLICK';
 export const ON_CAMPAIGN_MESSAGE_CLICK = 'ON_CAMPAIGN_MESSAGE_CLICK';
+export const ON_CONVERSATION_CREATED = 'ON_CONVERSATION_CREATED';
diff --git a/app/javascript/widget/store/modules/conversation/actions.js b/app/javascript/widget/store/modules/conversation/actions.js
index 73a0da91f..e1862ea84 100644
--- a/app/javascript/widget/store/modules/conversation/actions.js
+++ b/app/javascript/widget/store/modules/conversation/actions.js
@@ -10,6 +10,7 @@ import {
   deleteCustomAttribute,
 } from 'widget/api/conversation';
 
+import { ON_CONVERSATION_CREATED } from 'widget/constants/widgetBusEvents';
 import { createTemporaryMessage, getNonDeletedMessages } from './helpers';
 
 export const actions = {
@@ -21,6 +22,8 @@ export const actions = {
       const [message = {}] = messages;
       commit('pushMessageToConversation', message);
       dispatch('conversationAttributes/getAttributes', {}, { root: true });
+      // Emit event to notify that conversation is created and show the chat screen
+      bus.$emit(ON_CONVERSATION_CREATED);
     } catch (error) {
       // Ignore error
     } finally {
diff --git a/app/javascript/widget/views/PreChatForm.vue b/app/javascript/widget/views/PreChatForm.vue
index 58cad04b9..2f03521ba 100644
--- a/app/javascript/widget/views/PreChatForm.vue
+++ b/app/javascript/widget/views/PreChatForm.vue
@@ -4,28 +4,22 @@
   </div>
 </template>
 <script>
-import { mapGetters } from 'vuex';
 import PreChatForm from '../components/PreChat/Form.vue';
 import configMixin from '../mixins/configMixin';
 import routerMixin from '../mixins/routerMixin';
 import { isEmptyObject } from 'widget/helpers/utils';
+import { ON_CONVERSATION_CREATED } from '../constants/widgetBusEvents';
 
 export default {
   components: {
     PreChatForm,
   },
   mixins: [configMixin, routerMixin],
-  computed: {
-    ...mapGetters({
-      conversationSize: 'conversation/getConversationSize',
-    }),
-  },
-  watch: {
-    conversationSize(newSize, oldSize) {
-      if (!oldSize && newSize > oldSize) {
-        this.replaceRoute('messages');
-      }
-    },
+  mounted() {
+    bus.$on(ON_CONVERSATION_CREATED, () => {
+      // Redirect to messages page after conversation is created
+      this.replaceRoute('messages');
+    });
   },
   methods: {
     onSubmit({

From 201d47672088546f88147f9cbd3f623e6c21c88f Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Date: Fri, 10 Nov 2023 10:00:58 +0530
Subject: [PATCH 02/23] chore: Add meta viewport tag to public portal (#8335)

---
 app/views/layouts/portal.html.erb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/layouts/portal.html.erb b/app/views/layouts/portal.html.erb
index 611aab22c..b6ec6d435 100644
--- a/app/views/layouts/portal.html.erb
+++ b/app/views/layouts/portal.html.erb
@@ -18,6 +18,7 @@ By default, it renders:
     <meta charset="utf-8">
     <meta name="viewport" content="initial-scale=1">
     <meta name= "turbolinks-cache-control" content= "no-cache">
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
     <%= javascript_pack_tag 'portal' %>
     <%= stylesheet_pack_tag 'portal' %>
     <%= csrf_meta_tags %>

From 6c79642450d282cae41d2298f9f1f6e752582f3d Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Sat, 11 Nov 2023 09:38:05 -0800
Subject: [PATCH 03/23] chore: Update dashboard screenshots and the logo
 (#8342)

---
 README.md | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index ac11d649d..11ac5dc2c 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,12 @@
-<p align="center">
-  <img src="https://s3.us-west-2.amazonaws.com/gh-assets.chatwoot.com/brand.svg" alt="Woot-logo" width="240" />
+<img src="https://user-images.githubusercontent.com/2246121/282256557-1570674b-d142-4198-9740-69404cc6a339.png#gh-light-mode-only" width="100%" alt="Chat dashboard dark mode"/>
+<img src="https://user-images.githubusercontent.com/2246121/282256632-87f6a01b-6467-4e0e-8a93-7bbf66d03a17.png#gh-dark-mode-only" width="100%" alt="Chat dashboard"/>
 
-  <p align="center">Customer engagement suite, an open-source alternative to Intercom, Zendesk, Salesforce Service Cloud etc.</p>
-</p>
+___
 
-<p align="center">
+# Chatwoot 
+
+Customer engagement suite, an open-source alternative to Intercom, Zendesk, Salesforce Service Cloud etc.
+<p>
   <a href="https://heroku.com/deploy?template=https://github.com/chatwoot/chatwoot/tree/master" alt="Deploy to Heroku">
      <img width="150" alt="Deploy" src="https://www.herokucdn.com/deploy/button.svg"/>
   </a>
@@ -13,9 +15,7 @@
   </a>
 </p>
 
-___
-
-<p align="center">
+<p>
   <a href="https://codeclimate.com/github/chatwoot/chatwoot/maintainability"><img src="https://api.codeclimate.com/v1/badges/e6e3f66332c91e5a4c0c/maintainability" alt="Maintainability"></a>
   <img src="https://img.shields.io/circleci/build/github/chatwoot/chatwoot" alt="CircleCI Badge">
     <a href="https://hub.docker.com/r/chatwoot/chatwoot/"><img src="https://img.shields.io/docker/pulls/chatwoot/chatwoot" alt="Docker Pull Badge"></a>
@@ -29,9 +29,8 @@ ___
   <a href="https://artifacthub.io/packages/helm/chatwoot/chatwoot"><img src="https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/artifact-hub" alt="Artifact HUB"></a>
 </p>
 
-<img src="https://chatwoot-public-assets.s3.amazonaws.com/github/screenshot.png" width="100%" alt="Chat dashboard"/>
-
-
+<img src="https://user-images.githubusercontent.com/2246121/282255783-ee8a50c9-f42d-4752-8201-2d59965a663d.png#gh-light-mode-only" width="100%" alt="Chat dashboard dark mode"/>
+<img src="https://user-images.githubusercontent.com/2246121/282255784-3d1994ec-d895-4ff5-ac68-d819987e1869.png#gh-dark-mode-only" width="100%" alt="Chat dashboard"/>
 
 Chatwoot is an open-source, self-hosted customer engagement suite. Chatwoot lets you view and manage your customer data, communicate with them irrespective of which medium they use, and re-engage them based on their profile.
 

From cd217a3f86eb7093e0aecb9bbfc7f25772718f7f Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Mon, 13 Nov 2023 13:10:55 +0530
Subject: [PATCH 04/23] feat: allow automation rules to remove labels (#8346)

---
 app/javascript/dashboard/helper/automationHelper.js    |  1 +
 .../routes/dashboard/settings/automation/constants.js  | 10 ++++++++++
 app/models/automation_rule.rb                          |  4 ++--
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/app/javascript/dashboard/helper/automationHelper.js b/app/javascript/dashboard/helper/automationHelper.js
index f186b0e92..d1a85570b 100644
--- a/app/javascript/dashboard/helper/automationHelper.js
+++ b/app/javascript/dashboard/helper/automationHelper.js
@@ -135,6 +135,7 @@ export const getActionOptions = ({ agents, teams, labels, type }) => {
     assign_team: teams,
     send_email_to_team: teams,
     add_label: generateConditionOptions(labels, 'title'),
+    remove_label: generateConditionOptions(labels, 'title'),
     change_priority: PRIORITY_CONDITION_VALUES,
   };
   return actionsMap[type];
diff --git a/app/javascript/dashboard/routes/dashboard/settings/automation/constants.js b/app/javascript/dashboard/routes/dashboard/settings/automation/constants.js
index 9fcee3f45..e86aa5161 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/automation/constants.js
+++ b/app/javascript/dashboard/routes/dashboard/settings/automation/constants.js
@@ -67,6 +67,11 @@ export const AUTOMATIONS = {
         name: 'Add a label',
         attributeI18nKey: 'ADD_LABEL',
       },
+      {
+        key: 'remove_label',
+        name: 'Remove a label',
+        attributeI18nKey: 'REMOVE_LABEL',
+      },
       {
         key: 'send_email_to_team',
         name: 'Send an email to team',
@@ -556,6 +561,11 @@ export const AUTOMATION_ACTION_TYPES = [
     label: 'Add a label',
     inputType: 'multi_select',
   },
+  {
+    key: 'remove_label',
+    label: 'Remove a label',
+    inputType: 'multi_select',
+  },
   {
     key: 'send_email_to_team',
     label: 'Send an email to team',
diff --git a/app/models/automation_rule.rb b/app/models/automation_rule.rb
index 7a9550bd3..5f5d59814 100644
--- a/app/models/automation_rule.rb
+++ b/app/models/automation_rule.rb
@@ -32,8 +32,8 @@ class AutomationRule < ApplicationRecord
 
   CONDITIONS_ATTRS = %w[content email country_code status message_type browser_language assignee_id team_id referer city company inbox_id
                         mail_subject phone_number priority conversation_language].freeze
-  ACTIONS_ATTRS = %w[send_message add_label send_email_to_team assign_team assign_agent send_webhook_event mute_conversation send_attachment
-                     change_status resolve_conversation snooze_conversation change_priority send_email_transcript].freeze
+  ACTIONS_ATTRS = %w[send_message add_label remove_label send_email_to_team assign_team assign_agent send_webhook_event mute_conversation
+                     send_attachment change_status resolve_conversation snooze_conversation change_priority send_email_transcript].freeze
 
   def file_base_data
     files.map do |file|

From b411b6ca2151e1c57a2024756abd346869ef3b13 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Wed, 15 Nov 2023 13:05:58 +0530
Subject: [PATCH 05/23] feat: remove feature flag checks for message reply to
 (#8352)

---
 .../components/widgets/conversation/MessagesView.vue   |  9 ---------
 .../components/widgets/conversation/ReplyBox.vue       |  7 +------
 app/javascript/dashboard/featureFlags.js               |  1 -
 app/javascript/widget/components/AgentMessage.vue      |  4 ----
 app/javascript/widget/components/ChatFooter.vue        |  3 ---
 app/javascript/widget/components/UserMessage.vue       | 10 ++--------
 app/views/api/v1/widget/configs/create.json.jbuilder   |  1 -
 app/views/widgets/show.html.erb                        |  1 -
 8 files changed, 3 insertions(+), 33 deletions(-)

diff --git a/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue b/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
index 38bb24f8f..c6d492061 100644
--- a/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
@@ -114,7 +114,6 @@ import { LocalStorage } from 'shared/helpers/localStorage';
 
 // constants
 import { BUS_EVENTS } from 'shared/constants/busEvents';
-import { FEATURE_FLAGS } from 'dashboard/featureFlags';
 import { REPLY_POLICY } from 'shared/constants/links';
 import wootConstants from 'dashboard/constants/globals';
 import { LOCAL_STORAGE_KEYS } from 'dashboard/constants/localStorage';
@@ -285,14 +284,6 @@ export default {
       return this.currentChat.unread_count || 0;
     },
     inboxSupportsReplyTo() {
-      if (
-        !this.isFeatureEnabledonAccount(
-          this.accountId,
-          FEATURE_FLAGS.MESSAGE_REPLY_TO
-        )
-      ) {
-        return {};
-      }
       return {
         incoming: this.inboxHasFeature(INBOX_FEATURES.REPLY_TO),
         outgoing: this.inboxHasFeature(INBOX_FEATURES.REPLY_TO_OUTGOING),
diff --git a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
index 37c34a031..5e1f34904 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
@@ -194,7 +194,6 @@ import {
   replaceSignature,
   extractTextFromMarkdown,
 } from 'dashboard/helper/editorHelper';
-import { FEATURE_FLAGS } from 'dashboard/featureFlags';
 
 import { LOCAL_STORAGE_KEYS } from 'dashboard/constants/localStorage';
 import { LocalStorage } from 'shared/helpers/localStorage';
@@ -276,11 +275,7 @@ export default {
       return (
         this.inReplyTo?.id &&
         !this.isPrivate &&
-        this.inboxHasFeature(INBOX_FEATURES.REPLY_TO) &&
-        this.isFeatureEnabledonAccount(
-          this.accountId,
-          FEATURE_FLAGS.MESSAGE_REPLY_TO
-        )
+        this.inboxHasFeature(INBOX_FEATURES.REPLY_TO)
       );
     },
     showRichContentEditor() {
diff --git a/app/javascript/dashboard/featureFlags.js b/app/javascript/dashboard/featureFlags.js
index 143ee521d..4280e0f10 100644
--- a/app/javascript/dashboard/featureFlags.js
+++ b/app/javascript/dashboard/featureFlags.js
@@ -16,6 +16,5 @@ export const FEATURE_FLAGS = {
   TEAM_MANAGEMENT: 'team_management',
   VOICE_RECORDER: 'voice_recorder',
   AUDIT_LOGS: 'audit_logs',
-  MESSAGE_REPLY_TO: 'message_reply_to',
   INSERT_ARTICLE_IN_REPLY: 'insert_article_in_reply',
 };
diff --git a/app/javascript/widget/components/AgentMessage.vue b/app/javascript/widget/components/AgentMessage.vue
index e1d9ee7c4..6020af3dc 100755
--- a/app/javascript/widget/components/AgentMessage.vue
+++ b/app/javascript/widget/components/AgentMessage.vue
@@ -22,7 +22,6 @@
           <drag-wrapper
             class="space-y-2"
             direction="right"
-            :disabled="!allowReplyTo"
             @dragged="toggleReply"
           >
             <AgentMessageBubble
@@ -58,7 +57,6 @@
           </drag-wrapper>
           <div class="flex flex-col justify-end">
             <message-reply-button
-              v-if="allowReplyTo"
               class="transition-opacity delay-75 opacity-0 group-hover:opacity-100 sm:opacity-0"
               @click="toggleReply"
             />
@@ -127,7 +125,6 @@ export default {
   data() {
     return {
       hasImageError: false,
-      allowReplyTo: window.chatwootWebChannel.allowReplyTo || false,
     };
   },
   computed: {
@@ -217,7 +214,6 @@ export default {
       };
     },
     hasReplyTo() {
-      if (!this.allowReplyTo) return false;
       return this.replyTo && (this.replyTo.content || this.replyTo.attachments);
     },
   },
diff --git a/app/javascript/widget/components/ChatFooter.vue b/app/javascript/widget/components/ChatFooter.vue
index 33017e7c2..2a8ef36dc 100755
--- a/app/javascript/widget/components/ChatFooter.vue
+++ b/app/javascript/widget/components/ChatFooter.vue
@@ -68,7 +68,6 @@ export default {
   data() {
     return {
       inReplyTo: null,
-      allowReplyTo: window.chatwootWebChannel.allowReplyTo || false,
     };
   },
   computed: {
@@ -91,8 +90,6 @@ export default {
       return this.currentUser && this.currentUser.email;
     },
     hasReplyTo() {
-      if (!this.allowReplyTo) return false;
-
       return (
         this.inReplyTo && (this.inReplyTo.content || this.inReplyTo.attachments)
       );
diff --git a/app/javascript/widget/components/UserMessage.vue b/app/javascript/widget/components/UserMessage.vue
index 1d07156ca..812d699cb 100755
--- a/app/javascript/widget/components/UserMessage.vue
+++ b/app/javascript/widget/components/UserMessage.vue
@@ -11,16 +11,12 @@
         <div class="flex justify-end gap-1">
           <div class="flex flex-col justify-end">
             <message-reply-button
-              v-if="!isInProgress && !isFailed && allowReplyTo"
+              v-if="!isInProgress && !isFailed"
               class="transition-opacity delay-75 opacity-0 group-hover:opacity-100 sm:opacity-0"
               @click="toggleReply"
             />
           </div>
-          <drag-wrapper
-            direction="left"
-            :disabled="!allowReplyTo"
-            @dragged="toggleReply"
-          >
+          <drag-wrapper direction="left" @dragged="toggleReply">
             <user-message-bubble
               v-if="showTextBubble"
               :message="message.content"
@@ -111,7 +107,6 @@ export default {
   data() {
     return {
       hasImageError: false,
-      allowReplyTo: window.chatwootWebChannel.allowReplyTo || false,
     };
   },
   computed: {
@@ -142,7 +137,6 @@ export default {
         : this.$t('COMPONENTS.MESSAGE_BUBBLE.ERROR_MESSAGE');
     },
     hasReplyTo() {
-      if (!this.allowReplyTo) return false;
       return this.replyTo && (this.replyTo.content || this.replyTo.attachments);
     },
   },
diff --git a/app/views/api/v1/widget/configs/create.json.jbuilder b/app/views/api/v1/widget/configs/create.json.jbuilder
index 574ff0e06..51c1067de 100644
--- a/app/views/api/v1/widget/configs/create.json.jbuilder
+++ b/app/views/api/v1/widget/configs/create.json.jbuilder
@@ -1,6 +1,5 @@
 json.website_channel_config do
   json.allow_messages_after_resolved @web_widget.inbox.allow_messages_after_resolved
-  json.allow_reply_to @web_widget.inbox.account.feature_enabled?('message_reply_to')
   json.api_host ENV.fetch('FRONTEND_URL', nil)
   json.auth_token @token
   json.avatar_url @web_widget.inbox.avatar_url
diff --git a/app/views/widgets/show.html.erb b/app/views/widgets/show.html.erb
index 3fc32ac42..7e840f52f 100644
--- a/app/views/widgets/show.html.erb
+++ b/app/views/widgets/show.html.erb
@@ -28,7 +28,6 @@
         timezone: '<%= @web_widget.inbox.timezone %>',
         allowMessagesAfterResolved: <%= @web_widget.inbox.allow_messages_after_resolved %>,
         disableBranding: <%= @web_widget.inbox.account.feature_enabled?('disable_branding') %>,
-        allowReplyTo: <%= @web_widget.inbox.account.feature_enabled?('message_reply_to') %>
       }
       window.chatwootPubsubToken = '<%= @contact_inbox.pubsub_token %>'
       window.authToken = '<%= @token %>'

From bcf7c6c45abe6620f7aa71725f9119a09cb09747 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Tue, 14 Nov 2023 23:59:00 -0800
Subject: [PATCH 06/23] chore: Improve account seeding (#8357)

---
 lib/seeders/account_seeder.rb | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/seeders/account_seeder.rb b/lib/seeders/account_seeder.rb
index 0de483f9a..9793ffd1d 100644
--- a/lib/seeders/account_seeder.rb
+++ b/lib/seeders/account_seeder.rb
@@ -74,11 +74,14 @@ class Seeders::AccountSeeder
 
   def seed_contacts
     @account_data['contacts'].each do |contact_data|
-      contact = @account.contacts.create!(contact_data.slice('name', 'email'))
-      Avatar::AvatarFromUrlJob.perform_later(contact, "https://xsgames.co/randomusers/avatar.php?g=#{contact_data['gender']}")
+      contact = @account.contacts.find_or_initialize_by(email: contact_data['email'])
+      if contact.new_record?
+        contact.update!(contact_data.slice('name', 'email'))
+        Avatar::AvatarFromUrlJob.perform_later(contact, "https://xsgames.co/randomusers/avatar.php?g=#{contact_data['gender']}")
+      end
       contact_data['conversations'].each do |conversation_data|
         inbox = @account.inboxes.find_by(channel_type: conversation_data['channel'])
-        contact_inbox = inbox.contact_inboxes.create!(contact: contact, source_id: (conversation_data['source_id'] || SecureRandom.hex))
+        contact_inbox = inbox.contact_inboxes.create_or_find_by!(contact: contact, source_id: (conversation_data['source_id'] || SecureRandom.hex))
         create_conversation(contact_inbox: contact_inbox, conversation_data: conversation_data)
       end
     end

From cb1e25a487f8afffa96f5297224d3493b9950144 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Wed, 15 Nov 2023 13:51:46 +0530
Subject: [PATCH 07/23] feat: Change the highlight in article page on scrolling
 (#8330)

---
 .../portal/components/TableOfContents.vue     | 54 +++++++++++--------
 .../v1/portals/_featured_articles.html.erb    |  4 +-
 2 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/app/javascript/portal/components/TableOfContents.vue b/app/javascript/portal/components/TableOfContents.vue
index 6dbdd35b9..81a82dfbf 100644
--- a/app/javascript/portal/components/TableOfContents.vue
+++ b/app/javascript/portal/components/TableOfContents.vue
@@ -2,27 +2,21 @@
   <div class="hidden lg:block flex-1 py-6 scroll-mt-24 pl-4">
     <div v-if="rows.length > 0" class="sticky top-24 py-2 overflow-auto">
       <nav class="max-w-2xl">
-        <h2
-          id="on-this-page-title"
-          class="text-slate-800 pl-6 dark:text-slate-50 font-semibold tracking-wide py-3 leading-7 border-l-2 border-solid border-slate-100 dark:border-slate-800"
-          :class="{
-            '!border-slate-400 dark:!border-slate-100': !currentSlug,
-          }"
+        <ol
+          role="list"
+          class="flex flex-col gap-2 text-base border-l-2 border-solid border-slate-100 dark:border-slate-800"
         >
-          {{ tocHeader }}
-        </h2>
-        <ol role="list" class="text-base">
           <li
             v-for="element in rows"
             :key="element.slug"
-            class="leading-6 py-2 pl-6 border-l-2 border-solid"
+            class="leading-6 border-l-2 relative -left-0.5 border-solid"
             :class="elementBorderStyles(element)"
           >
-            <p :class="getClassName(element)">
+            <p class="py-2 px-4" :class="getClassName(element)">
               <a
                 :href="`#${element.slug}`"
                 data-turbolinks="false"
-                class="text-base cursor-pointer"
+                class="font-medium text-sm tracking-[0.28px] cursor-pointer"
                 :class="elementTextStyles(element)"
               >
                 {{ element.title }}
@@ -45,12 +39,10 @@ export default {
   data() {
     return {
       currentSlug: window.location?.hash?.substring(1) || '',
+      intersectionObserver: null,
     };
   },
   computed: {
-    tocHeader() {
-      return window.portalConfig.tocHeader;
-    },
     h1Count() {
       return this.rows.filter(el => el.tag === 'h1').length;
     },
@@ -59,10 +51,14 @@ export default {
     },
   },
   mounted() {
+    this.initializeIntersectionObserver();
     window.addEventListener('hashchange', this.onURLHashChange);
   },
   beforeDestroy() {
     window.removeEventListener('hashchange', this.onURLHashChange);
+    if (this.intersectionObserver) {
+      this.intersectionObserver.disconnect();
+    }
   },
   methods: {
     getClassName(el) {
@@ -85,18 +81,32 @@ export default {
 
       return '';
     },
+    initializeIntersectionObserver() {
+      this.intersectionObserver = new IntersectionObserver(
+        entries => {
+          const currentSection = entries.find(entry => entry.isIntersecting);
+          if (currentSection) {
+            this.currentSlug = currentSection.target.id;
+          }
+        },
+        {
+          threshold: 0.25,
+          rootMargin: '0px 0px -20% 0px',
+        }
+      );
+
+      this.rows.forEach(el => {
+        const sectionElement = document.getElementById(el.slug);
+        if (!sectionElement) return;
+        this.intersectionObserver.observe(sectionElement);
+      });
+    },
     onURLHashChange() {
       this.currentSlug = window.location?.hash?.substring(1) || '';
     },
     isElementActive(el) {
       return this.currentSlug === el.slug;
     },
-    tocHeaderBorderStyles() {
-      if (this.currentSlug === '') {
-        return 'border-slate-400 dark:border-slate-100';
-      }
-      return 'border-slate-100 dark:border-slate-800';
-    },
     elementBorderStyles(el) {
       if (this.isElementActive(el)) {
         return 'border-slate-400 dark:border-slate-50 transition-colors duration-200';
@@ -105,7 +115,7 @@ export default {
     },
     elementTextStyles(el) {
       if (this.isElementActive(el)) {
-        return 'font-semibold text-slate-900 dark:text-slate-25';
+        return 'text-slate-900 dark:text-slate-25 transition-colors duration-200';
       }
       return 'text-slate-700 dark:text-slate-100';
     },
diff --git a/app/views/public/api/v1/portals/_featured_articles.html.erb b/app/views/public/api/v1/portals/_featured_articles.html.erb
index 8d671ccfd..0bbbe02a7 100644
--- a/app/views/public/api/v1/portals/_featured_articles.html.erb
+++ b/app/views/public/api/v1/portals/_featured_articles.html.erb
@@ -14,9 +14,9 @@
       <div class="grid grid-cols-1 md:grid-cols-2 gap-x-2 gap-y-2 gap-2">
          <% featured_articles.each do |article| %>
          <a class="text-slate-700 dark:text-slate-100 leading-7" href="<%= generate_article_link(portal.slug, article.slug, @theme) %>">
-            <div class="flex justify-between items-center py-1 px-2 rounded-lg gap-3 hover:bg-slate-50 dark:hover:bg-slate-800">
+            <div class="flex justify-between items-start py-1 px-2 rounded-lg gap-3 hover:bg-slate-50 dark:hover:bg-slate-800">
                <%= article.title %>
-               <span class="flex items-center font-normal">
+               <span class="flex items-center font-normal mt-1.5">
                   <%= render partial: 'icons/chevron-right' %>
                </span>
             </div>

From a023eabf59eb056ec3d89129785b4b39650541c5 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Wed, 15 Nov 2023 14:56:21 -0800
Subject: [PATCH 08/23] chore: Add logging for facebook errors (#8360)

- Add logging for Facebook errors
---
 app/services/facebook/send_on_facebook_service.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/services/facebook/send_on_facebook_service.rb b/app/services/facebook/send_on_facebook_service.rb
index f7f05ef70..be791b38a 100644
--- a/app/services/facebook/send_on_facebook_service.rb
+++ b/app/services/facebook/send_on_facebook_service.rb
@@ -17,7 +17,10 @@ class Facebook::SendOnFacebookService < Base::SendOnChannelService
   def send_message_to_facebook(delivery_params)
     result = Facebook::Messenger::Bot.deliver(delivery_params, page_id: channel.page_id)
     parsed_result = JSON.parse(result)
-    message.update!(status: :failed, external_error: external_error(parsed_result)) if parsed_result['error'].present?
+    if parsed_result['error'].present?
+      message.update!(status: :failed, external_error: external_error(parsed_result))
+      Rails.logger.info "Facebook::SendOnFacebookService: Error sending message to Facebook : Page - #{channel.page_id} : #{result}"
+    end
     message.update!(source_id: parsed_result['message_id']) if parsed_result['message_id'].present?
   end
 

From 5f6e974531653efeda9025d78976b0d843f8aa64 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Wed, 15 Nov 2023 20:32:21 -0800
Subject: [PATCH 09/23] chore: Add website_token into request logs (#8362)

- Log website_token into request logs to identify specific widgets
---
 config/initializers/filter_parameter_logging.rb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb
index eea99edb6..4c9ecc032 100644
--- a/config/initializers/filter_parameter_logging.rb
+++ b/config/initializers/filter_parameter_logging.rb
@@ -2,5 +2,11 @@
 
 # Configure sensitive parameters which will be filtered from the log file.
 Rails.application.config.filter_parameters += [
-  :password, :secret, :token, :_key, :auth, :crypt, :salt, :certificate, :otp, :access, :private, :protected, :ssn
+  :password, :secret, :_key, :auth, :crypt, :salt, :certificate, :otp, :access, :private, :protected, :ssn
 ]
+
+# Regex to filter all occurrences of 'token' in keys except for 'website_token'
+filter_regex = /\A(?!.*\bwebsite_token\b).*token/i
+
+# Apply the regex for filtering
+Rails.application.config.filter_parameters += [filter_regex]

From 5f503b1a57076504d2075c3f74f4e78bf8949be1 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Thu, 16 Nov 2023 12:59:52 +0530
Subject: [PATCH 10/23] feat: Change slack bot and activity message appearance
 (#8349)

---
 .../slack/send_on_slack_service.rb            |  18 +++++++++++---
 public/integrations/slack/bot.png             | Bin 0 -> 2165 bytes
 public/integrations/slack/system.png          | Bin 0 -> 8123 bytes
 .../slack/send_on_slack_service_spec.rb       |  22 ++++++++++++++++--
 4 files changed, 35 insertions(+), 5 deletions(-)
 create mode 100644 public/integrations/slack/bot.png
 create mode 100644 public/integrations/slack/system.png

diff --git a/lib/integrations/slack/send_on_slack_service.rb b/lib/integrations/slack/send_on_slack_service.rb
index fc7ffe5ab..c840dd1d9 100644
--- a/lib/integrations/slack/send_on_slack_service.rb
+++ b/lib/integrations/slack/send_on_slack_service.rb
@@ -44,7 +44,7 @@ class Integrations::Slack::SendOnSlackService < Base::SendOnChannelService
 
   def message_content
     private_indicator = message.private? ? 'private: ' : ''
-    sanitized_content = ActionView::Base.full_sanitizer.sanitize(message_text)
+    sanitized_content = ActionView::Base.full_sanitizer.sanitize(format_message_content)
 
     if conversation.identifier.present?
       "#{private_indicator}#{sanitized_content}"
@@ -53,6 +53,10 @@ class Integrations::Slack::SendOnSlackService < Base::SendOnChannelService
     end
   end
 
+  def format_message_content
+    message.message_type == 'activity' ? "_#{message_text}_" : message_text
+  end
+
   def message_text
     if message.content.present?
       message.content.gsub(MENTION_REGEX, '\1')
@@ -79,7 +83,7 @@ class Integrations::Slack::SendOnSlackService < Base::SendOnChannelService
   end
 
   def avatar_url(sender)
-    sender_type = sender.instance_of?(Contact) ? 'contact' : 'user'
+    sender_type = sender_type(sender).downcase
     blob_key = sender&.avatar&.attached? ? sender.avatar.blob.key : nil
     generate_url(sender_type, blob_key)
   end
@@ -137,7 +141,15 @@ class Integrations::Slack::SendOnSlackService < Base::SendOnChannelService
   end
 
   def sender_type(sender)
-    sender.instance_of?(Contact) ? 'Contact' : 'Agent'
+    if sender.instance_of?(Contact)
+      'Contact'
+    elsif message.message_type == 'template' && sender.nil?
+      'Bot'
+    elsif message.message_type == 'activity' && sender.nil?
+      'System'
+    else
+      'Agent'
+    end
   end
 
   def update_reference_id
diff --git a/public/integrations/slack/bot.png b/public/integrations/slack/bot.png
new file mode 100644
index 0000000000000000000000000000000000000000..4b5a2d686e7f86f29e4fac5142bffac3afaecb0a
GIT binary patch
literal 2165
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

literal 0
HcmV?d00001

diff --git a/public/integrations/slack/system.png b/public/integrations/slack/system.png
new file mode 100644
index 0000000000000000000000000000000000000000..c700e55e06d7ba07142dcec7b30fa07da4d74a94
GIT binary patch
literal 8123
zcmZ{J1yoeg_wJpcn<1p7TVUuKkr+gfmLZg`0i+wL0qI6S=~8NFq$FenNfi(rkWjh?
zX+cDRH~!a)-~YY!)?MfBb<Y0Ix6irj#J+nc8tQ9Nk+YHm06?XE4{nT?n16+o82>h2
zbSJ?JLZq6W8UQq>Q~b3f!q-85##-t?!#Mj6zQW~j&sYxto(KQ{Dh2>9@J*;~00@8r
z0L~TwlyU)p$-A)22!>Y>+uzrM1K0na(%z~pd<&WPJqtg)y!T(_?&xC`0N{XY!_`cJ
z=l6<2y{)i0Refy}ZzM*aZwL;ZlgYJ9(t^3^ndPUav%Wr~j3Q<$;Iq;ek$vz=iAMdI
zzR}K(e?Wz@Y@Vth6uV<$rlc*O$iJ``P57ZDD?h)CicdqA-X-N7HJ&D|q=o(dFQ0Mi
zli^GZ@g4t)+R*(sL6L|KlV|%5dw#PAb(iL$9`7W1=H(c)Su#r*98K~{$4nrVQRAw4
zwcadHqFmBeYL)ybhK!qk^H{^Wr<PwToS(={DxWKW*cpQf>?B6i5Y)-u@R+QKF^TLt
zw}~<T#TR^;_ZEryqRtv3QjGd1WkAzvNYPuWZ|KZ{kKDdL$>93?pvrz{b1pu*VQn6}
z9_k<J!3bNX5tZePt+|NDv7c%SR^R%|rqg2-T^=o^ld21ep+6!vL?(Bmc2U1ECR|z@
zMPaYZZ2<-F58`5y5d9bqo*#qLDu`BO4*h#&A26UK$8ebTlTO!7yB1f$bzp?8!02Ie
zFnpNwg>fk|)EcH1BhAx7^;4ebxH7V*ky+oPBGgI1lg**Zj;JZjAz_^abMl~i9PyLJ
z@Ht2xc#V2;k_K+#{F>H;$cWT*l&~|La!(Trdg8OdL_sBpYHuT8c7W9e%6TWF#Ra>j
zC-_2werM7FBq*Dtdo+iyAg?DLvYjnvB`>t2r)a_3=CcN4La~@up$nC4Wz+^{Lndvy
zBpnE*`Wk(h%hfl2-rndKyWhPV`O$C|kA5-C%tz^8iLe6I5qc6nTy3wvyF*Y+B*&bo
zS1dtNr`dflKIAc*YxDx_a`2I0RXDH=-9TsxO7;%=vqA?bN1gJts6iW1aRswqN@#I9
z0LShz>A9UtqtUs7Hwm=+`@DrF!&efRz#;F1w1f!ZDFX!8FKOyewVaq+j^#&RXfJz~
z=a_441QVDG^4z({79woYR$wX^i79je`MZy-A>m0?1HXkzj6369$fZB;q3syHN;KVA
z`LpBf6=Z0*XPvj0ka17z_t)nU-(ftj!i&leAqW+!Te@zcbP3?bghQ*S5(WarCp#t^
zpEpJeWOWJ$T7%A>-ZMokn7pCs%<IS+W5-qy!o>PJG+&Wm|8B~T(y7@KPR`^BI)st8
zx86hak=79p4ST#GKs``>kpRn;tSKU5o6O2!c?l=w%AfgiL|%(Hjj;7ulv5lZ{lIga
zp~^H;!>3y?qa(Mb=xSr*_&NNW(33XAB?%&&aO-c|M|(v0d-T=Qax;mp#)7lc!A_4Z
zE?G9veAmUhdv`TV%P+Rz6c%agP4t<K$-~5TH=elpd#QgSv(+?<DyKSvJEL(Wpc2gK
zY1WwVay-xRC&N?K`C#{lR*$sXWwAsLo4F@CU5O3W1rV2#hb)CBf_X<6q{-=U@rd49
zC5x&1$gsz>#TQ*dm)(!N8K&57#!FFKYy99v#%`)zsl#W486G=5uNEMjY!3uV5uYVM
zC4)|nXGFs>ywPD4+x4-%B+V4IAzJ`g8ga^oVYM7`?xhEcc#cv1QDTo*8P(kXtrU9n
zV8SgUY&?o)&^7%fTIkRZ@@5JBc0G~1LH4OR@jLu7DcruD3b8<=?|`4L6!vA(+UB9J
zMiOq_{v4X07H~wFRx6G=Yk*0Mk510dx9TFUGhOJrUP``ELtHnvwYkov+?Q$%Lf8-@
zdUxA{Hnl_EG7L<4pf5OVJ+Y5|RBN6kjciR@<B%25Nw>gww7|c8L~73v`l4S0j$md_
z<EAEEl*o-V`eOPxu3E&Z^lTh9=Wj|}bZu97qWt}nZfrbbsF_?*ju6QA2a6x5HE3h5
zW%Kd+{of132Y;t)r=+y#@)`~e-)8rDe8_J^IO#$wtxDS)K<;Gkk&5W0!TNorxZ#_S
zH?zd<vclUe1HHozH$bMaoA&p)hmgWXtgrndhQ0Hu(AOW%Z?#oqFs8>loT)j`fr!n5
zK+h@1Pr7ULhwptA=iwx=HnzQGnmX)D3H9@iomK2}c(n-K)^Lz>HTD7BO0QIYMB*3v
zJaq%>BSZMX<diMCRXqKffT)fp(d75MVQGO1x4wJXUpKu?qGi!%$;Fa2ItJ;cx`3$M
z`p#`hR9m2|k<RN6IDZpz&hxsqz<`6qs3cEx%?MZLOHl(`vAgTeh)ZO7%Nn&-MTj2!
z>OERzk4@tj?sJu{2_M+JmO0bn>1D*$-?ZjcU&Lh`B+sedbe&2|4AtHMTfKi5(MP#R
z_lwc@%k7S8+>5~%x{ruVleG9zjBNJ_D|qC-<iN3P>}hU?WNf&xQWM9)p{eTcF7LtS
zS3PtLI_D8MR+GM@+V9KNH`k0V(FauxWaRuRZ#~w(l|d*}12-X=N34o{wKJR5a><C(
zS{|vZAd<V^8Cf%dc_or2IaIak-ky&Qnbv@>a?|`gs(n0D>{*T&>XCemkS#3o$hK^L
zUg&Vu1>S;w(s%TCP-neh!?+#jFHMN5duUcMXGDL?wDuR<NSxa5*x(Ozs-b3gOc@a#
zf=clpBq@Kg(`aeFd4yP~7umDAbn0#D@h2kU)omNw^1&{QtAnuHTa(9KkVC3qfv)L<
zp36ea-So24!m`=X<r8+N&*g_9yzUx`#^V(6;Wf%LG|<C8ba{o>iin%9-uZ>cvESs{
zd)L_tRTR{HOjjvO@xZq~=9WxVObW?c2rQ9ZrAdc7W}3gE5zzXRGw?Ls;c~3T{%53j
zw9r%47>OIi(eZw3#{P}0-@ixMDK}H)=#JZzj`eQzG!z>WQJjP6U-uW1_4jMXi3+ef
zcaYNi^>=13r`mdonJ8G9JUJPQdN8(6|J*Fi;;h(2e?8|}xN?%hcw*yNZ(d>FTwK@V
zP6^hTjUErHV*jzM>EBcG3~%Xz?$@SbM~(!XVl}g<<SpGg-I7+OeAH)NNG_OLkuC>S
ziAiw2c8{EHS*zaIM%lk?s9s|y{hPk&j*GGv{!&7<rg~uaZ8X_bm@)b>@x+P;bDjDa
z=5JzL0h0CmodJiyWbQr0)`_&r$70*u+wTsw{8myQJV(+zELNdy`4dw?tHj+y9~-LA
z6kQ_J11;RL`FR{r_aRG%C2N9Y3H+8eh@dtKTWu4GWf&mYda|f6;9%b#2&-=_g$0cq
zC-;IR*xT0$1Y?2@JLXcZD~xSDerc9tG<j8B#M(<|LA9%%SaS#2{ALTOxhDI!!;zgI
z9m2ZKV72_be^=Pke@#H$?>L6o2Vwd++dnImoqbGwiiov8tQMKD`jN=gV~IcPf{T$l
zgHuZ)VdDFysr;sPLkcT1L@L)#o*v(hB<|X%h4|Wx7z7dZL>Q}C)_6q4PuF~50<&2|
z$t|Jam>If<-K6K<i&U(lb?QS;D_+A)#m@3(-RQPpVtMyEXZ7UW7g-MbY-n~QWCLXk
z&%Mh`E^aohsZS^$#8_z|i|vI8o%jPD4$g__deB|%hCT?p8j^V-IQe_RaWi<Js?p#i
zkImRp&boTCvgVZ(leq<@x{`QP=2Z{4NoX$nPO{S8A5rg9lL0eN9lwRJ68EAy_gAp<
zWmpM`r@r4>MP@0RIZ17caOCq|45LC7Ft1F~gf_=Ms(BqF&yQnmwc0<zd~$6la>n`k
z?2Kv0Nknpe;-Cnh+T26z5<4^_da>xKh+_X8KXNW#I#<v>AzEhl_F1+1JjN<H>}nzO
zfvyKyW8%)!nYzQo#}C4OxRq3zXe40>_GNg)wjN)+Au3HOKOpc-=_bliXUsP~Y_7$F
za15VnE&{K(rEV^^2@O^?+?V9$O%;k}V+=1Tu39<3?`9-uX@V8+B9Zw#vLQ1mQ=}>h
zGf3*b@!Jt6P)S9zq&m!~^2@rUTz0{mCl}=#e}L2rMXp#~hrIw8?la%mG!zWDog-AS
z%zNM1-*RPb*jL>7FLTs2Y<Mke_CltLtwFi<7A1ur!=L?K-%SaQUGlHnV~b!*NC)<%
zW}=k*f#vqe3Q_9rUyTGzy!fx*+s_zS`pTT+8vxH{w11tlGI`+!ovGMRZZ=xHirToC
z$fd6zd1~M1M&{m@Cg{BYE>UK>2u_ux1Ro*--be~Ko&FH=KD%wiXtD*8AM`kKX(m7D
zeSetAukwbN<&gSCD~Tx6?^{JXvQzeRde!5h$fW}@P^$-}VJ%9W$a&CX&!vf6dPwU5
zD$95L_rzdl>!IN6xus;YooNa(N*qy(hkn0Udjy`ehe!%kj7ibKel^0Ui#V-TUwivL
z4Z4u%ue&iY+~}ISV`PxyWUs4}>}8f7{6VAq&nxS@Q|U6s=aaCKJB3;2+`5S1Ys&P6
z8^Nj16oLr0ose>;d!(g+uNc|>m3iz3LGs9+Nx==ztAT#fMWrR=sL3>`Rhb3XY%$9o
zC7h8nx?B_S0-V=b&o0bDa}``Rk>Zo;qg>07<=a1|sj@Z|a7Q*D?~|*2o@!PZqmlwx
z)s=SjxZb_KW4dy&6IUTkuN;<`vs)Fq7?w9n>JU{hW#JV~{k$lVu(Wi{a(S$?o{fw=
z<-XR*f}ZD?AN<wr&VZ<ib<1xw35_OB`-W_vIN0u+Gawqk0)rmk?it4Zvcmc7$pro4
zq@oaDxmwe0{NAmWW%6dMe6hJXW|WDbU!81nS9=-P2>v8&E;r#<+xzl8J$~<`Yb(|u
zA?KyD@v(Hj?NN|e6M=7pmP{Q^ylRXM#kgii^vRVDG_rgpZl@AYIa|@PBLKWK(wy1B
z{Ozn~B@?E(ns!gOT(vjzSS{FoB3FTXa@R!#Y6X(+G_sY0%6it04T^kZm#_><Ecn^T
zmt4i%;8MRU1ZB)k#VxDn;=s1S8~%?|@E=0A=A=Fq>m2s5(<jdCMQ8=dDAfhb*_JE)
z?sQ3FS1R?!-$m$cBWJ<5U)J{J>}8!)ENm(LIRpeDx(^<RliW&JDEBprWmzkqT2C93
zuGP$yFKdw2WRj8H@Vz^E!&ZNBCOa8SAxKf5cab{nGnGx(kpJw5x*d}p^`t#R9=UGH
zLcXsyi@8*V%HxYK<jGaJUBb+P)B@lKRNiD{wO6HZg0?sH4S%Gce{_@7ty>bIqetDR
z+^$gd!xKNHp7~k0=^QzfooHb<)Y-*BD*x2lEg>mEz>Niw*beJ@-_gv!t7TNGPqYm3
zOBIpU{>o5ID~6JNl9%P?Jr`Uvi-X+F$s^8X@8I89Wy_thELqa2m#nwIg#>+b)Bqz<
zVFV8>+v3sqi}+P<*C&d67t~B=y$}h1KDcOk^SV~uPp7;~=d=bj^PUWdP2nt>*kult
zy19<)NU^Wwc70H)Iy2xAQ9~z8(-NRWPMlAbk+zWJdqjDvByHpuOlNhV#P5MJSv1W~
z7EBEX+sjJ+YuW=>&<O(-o_!hl8gQKAl1LtyRP3~{a<}^C=%ZEIQb+Elml2}z1O(Zu
za^<%Ok3kITOknnxmDw;5Fle}AP>4-qedUN+tzN23q6~;iqv<4FW|kd<-$h~ijRb+=
zZDE#Wf4t56)rXr0MF9KD%~sHpwf1sL!r-;+3g#h?MBbI30>%KXChB{1GC0lX^J5gf
z&m$x8yUSluzK7ZLC<l{5DCTo#Ju?{r=!eq2=>Yr7)oMsE!M#F3i`W-wT|Ov>_vTUZ
zl>OFRKAw)KS$%Wr68*wJjyAP~rdbp_U(|y#p3e{Q*QF2GJ0)S7izHPfJ}S%Sku;so
zjpFcWV;#%CzFz=AgrYlKK^=^Y=E4#0DY(srPHBR)<_c+75+G$X!M8mh-;E|^pAhW}
z8;Aw8=6cd5k^0vWw!l}$4q0AJ#&!-;#l?deLUyO-T5mU7%zAzcSC0<3N}c;5!@_J8
z%nzdp8g6PPZLBPKZKP+I$b(T`G)>K(?4S4*!yaISk%SQwhZn!27jWeC=JTw*n*=%c
zXxtdR6em}R8-!$pC-fk!)@hrR@hT0Mvd|z*)LZ!3Iy=@$-uoW&tz_#lraw_zYwd0_
z%u$zB*@A)bo&!B=_OLtKC%NwP!yjG&A=IR+?e49A?Y%I5@s?&IKGxujtsdPZycQOS
zB!9})PrV$xIFm{Yx*(r?!|Od=o_6A68N)%$eH>m+#Gm+V)jD;d>$5%I7~Ni24g4Ju
zc(^+R5!0)I-RA)X8-9!zj6$xqHyGm$j7<FEd#klo4Vz#%S<z;x6ZZtV%r*|Ei6L{u
z46E(lt)zye<qeY*@!t}@9^D{<%xzXteXI4wu*9!va;w<@XTu&&{IpR6RXGQjj}m8}
z6p^w6KS;t?KHB#oXNeg@2)^Fz$jRxy*XnWHy>Or1-^ql%DSUExX?2e@L+@po7`Hor
zl=A!Wcu4R{(?;k7qZJzNK+ofjoqW#s=PVEEMP_@#p<+*{)@~&Dt&|(SY(^p$+0pyH
zY+9d?YAiynJrN?ew9<Dv926L(>PQnH!{#qwz(M-^>{|4=Ye9870rqsHIH>r{=Q)rf
z>Ed#qrzKX&oH0U>=WvnxgGQf7^GPnf8UZ9><OY?;XzuHS-^k0EUXiEp9UlX5U+My`
z8AI9=_VM^mq{aGm&;D^7Ys?bZAPLfC<}`jW+^wGgp)4Nlp?3d=>?i$k@ZjcEKxX8V
z=J(oW_RZhta3OiK8{hV?_WRtev$#o5ZmdYsJruK7V2+yRH^279bVOLJ=Q!L5P^#9_
z=YicI4CxNh+qAldZL!$#M052K7pE><G{Y103;tr&KFpSgwAdk4y}s9!jt84&*n9{{
z>w<LvK<&I>Q>M~GdIe5rZ|pgVME3c`1I_k5n$g*B45}J*<nHW0H~f6{LHHpI(5u0V
zfx!3QlH9oHux#P@PyVP+<oFXZ2^Km@#=Y``Hd7D=k!u_+Iw8CIZS4xPEA4B&lXEsh
zF#G=7GdDXvG^}?|b)@f7e0|>aW~9vQ+U;pd`WE%eViv0xbrKBGmv1UhIAg=#9r*nV
z1DMs|1Z+JQ>ucn6OoD{g-YuFAkT^4Yc7AafC)60{JY5isjsmX!T#FqR4BU{gz%7aL
zh%yAaD^7gl6sH9NFy8Z_1q-2^2y(n{d;`J8jbqKZ)#Ll|80Yh0tufA0#VB|}W?)q~
zZcZ%jdCIcj{>V|+R+a1063bT#8aoN}PJ7!WFe?h9{+QB@@R4R<By`bv*XnE+m~3bL
z_^02)*OU2>{OJrSqq)>FEjn!%LIo~w<wMJf+j>l4tC|FFjwoxgLsUv=W(aH&x}E+J
z02c&br)zs=*pAm#4yj}+VtibgOKv=rf{OF68!xlHqt94ZfY5Si|Jgjqi6QDd&8xc(
ztMNZ_y0Q!Bc<K=K7;%ck{OEjS_JL9}K|0bv>2BPPP}@5d$Q!+tSc=ojc;*>HagP}P
zvCt#`x2>itqCOo>&lRQB70~IJc^}v7L3L=)My*{W!lURCpfCwxH)jvh;7Id3Y$5F+
z=zcOIL$ymZus_dYAoP=@8-5;&gCgcLgTat1l_ky}Qcfu|@nWcbgkp=H3ixqU)v9Ox
zz!7yZoq2)B@e=wR%09-nsI>#uf}c}QG6f}bq^VuN&&Nx>o@-iwzxH&IIS@kTDC?5D
zvDCv{yKu+XlKq?5f!#keMrS`8wkn!UPk4^G4t*EJf@EM4$s<o^+`gYoIrVkAgJ8{5
z8nks(fk`78sw(@U%P!`}_*humJAJia`wFu&wiK7B#;s!Zp>x0r<KSaMq&0BNJn58T
zFmZc;^SpR8!K_mvFHaL;kT|lm+@+p|J84Pyn~E;(a&!)S?<Hjq`s-4&T=gKvZbvht
zk63>&T$7z@Kp1{CA6LP2>7T?Y#_@aVPqlBM+_#+mlWArfIp9vpAG88%9A}asTS|%Z
zv{j8!uaRbp>HG{e3VI*GN#vRM2d99`7t~yLz+4sE@pW6JBssoe<rV6(f!_qIlYfI1
zaW7`!>mbcv1>{cbrf}d}?dw<5aSrjv1{BA#xX$7XUO9d8<F<bdRnu|%SYG@@v<J@=
z|Na=il~uJxD`|z{?Tk^>+8{+~!F6ZXcN8N6kxqr2B0>PFSk|I${#il@?RMR<rtcSt
zBA!jP+V(H6D}Bdl99lmky-DVD5tk}Wb*yG1Mjh^qnFhk_%;VIJzAPW=i%H<?5xDIU
zel6^r%C-i{5RPC74m_G!KlF8Vr+v%E^9$5Hga)N`IlV|&L_R&_mw4fPYyS!w2eF;r
zyD6|?N6?-)f<)bRIJHRYa!5}I8zOd>7Eagecu}%0XF1e5uQ`EZx7PXEwJFg-eK%T?
z!YQq51(mSa5%9^z^VC><0@wWJgvKc6f@rTOM5-obJ()n1@g{Ml*_t0m;#vk~t7T^~
zPQ9kIKoqv-CyqA7y!6-uqL~N3R~*tdj1{iA|F76vnoRE-OSI`>Eq-B;%H`;I(XJar
z^<ppFwLZNzgI~$)RmpRieEMCM1O~qL2;8S7R&p>st4df*F5vLRh{N}bB&GjMKchlV
z?I~uNyXE44`Tcr+{c3HOkw9R*2;|?}#q$QXCy#{phF5jyxp8Ry`i2dNNN8Sn2t^hf
zirsZgM5_>n3F(KjBQ&E*l1DC0Px%cfv2RakAl(B+nQ})|wp0UkX1IH|K$9#LvgvwH
zG!);91I&wt1ocS~Waqag={oe%B=NooJi`mri)H^&oSsh$z^!<qS`odEKKFq)2R*W0
zmj8gPOQeh_#oAk16$cqhZ{5Tn(nRU@(}dSXkl#Xwe5Xd%eV>iWJyJM5@|W)<nJJIc
z$TEQ9%s(SaT{K{sdFTryMi6!6v#`MosX}okjmT?Y30&8jT?3rIcs<m1(+4zK15Tf2
zro`33PbZ=@eHPY*l8X|;tYC7sZIch2KaIN?Nn4c$O}*|S<F#I?X(;AQ9uX-Q@o%7X
z*vlg6f;(cTuYbNzPYssc{cAV?S=OCbK0&3Knb)I#t?5_SAgpg>#uIj_>SK*<uEY4$
z0l=duq@`HvJ8|+C98(mwvsta)n|zy&m&Q4@Pnt8%<jKLlc_uT6^7GqvPJDE2zS5i1
zTN>JRY@3#83@*NL-k$KYG=C|~U@tIeTyvEWILxfSWLLTMDy&lI;{S=>XR9kJg(n?v
zA3G}E;ajv*l3PEL<{6w`3ClJRUL^Ra^Q7C2ndpq7PV+pXYi@yq!KB+v;AOX;IIiF5
zzvmg2TRQj9(%-q1lD0`)c_m`efz!-hW_82?+$e6PnGMiUecNp51zGGuqJDd0ZJ;TH
z=!^`OHbRpsDG^QV^GYn8F<^(;!zx4-hV|wi)3Igzte*cthT|rviQYWDN$q_ok<5=8
z!`tHz%f*SHa4qCb0=jbPdK|eezc;V=!q2dupb0Qr%7_4sqODpty;OxF9qu8Z;a|5a
z=#;H)`;Z}=bBqJyyX<ReLYkm6@1+*3n_+_tTQF-;|MhLO04w|=juw;GTF-%DUbAR>
z9rehhjjA)zWpYu-o-~2DZ6e`+XM<+c(;{SD6+o2D|0mr<V1*u&D!&|kjhfea#D1H|
z_D+*kOg+~E?VJX4woHM;hav~F@cQSj=AgpS<2E8^U6t{&wR%@g38Ij6^cCn3w5(%G
zH=0Zh@@5ZaJg-RjE4uAP7~*&F>ig<Dhpex@2EDF5VTHiB+QLNyoL1e{$f-fZEXtb3
zlH?;vC0Nl-uwVvEfPvV`AHqibcz)2@Nfe*el;5t!^%>ZR>jML&y|s7Hu1vWCF*_J{
z6DAi1jvIg<DiK3i%5qrUqi~BBT$PwssszF(^yq>aGp#Tx*&0I~mu|72WDDagMHN6P
z8INWek5cb(Q%a$Axsu4IRgr)n;tgf4I$z4nJ1yx90iEw`PgJu_<bDd#DTW*@uMv8i
z#K@z1xk#c0Fc65oGpvu+94ol5KOC-2H+oG1!9v$<b_XQziB*1oO>=)oJAWr72VW<=
z0HmOjiei#bF-ZjzsH~EVq>>C&6be;>LZ7~!rTuRmJiHuTokRZr9gf$$>hK-z{<Glc
z<?J71=j#M$d)OhJ^z4wX4v)Fy#O1{m#1y&kCS}B+vSN}_Tt<>|TrU3p-bxY@K|w*{
zuK&>Zf=7#c`63tN_V9!N^FKxtmjDlYB_+6*Lx6{qr@xYtAs*@nNLF2U|C`r;V*bmf
zl9G#)E7HXukd>6eOd1;DF--r#^FJ|Wu8#gL{~+vP1dDhG%YQ)hTs@rpL%f}U{~DEq
zw<q#Wi>dzq#iM6}M*)(u@{-c>^3qT!jL{W=htT{7&jZ&dP5@M0J-b}x2VSN6A1Z{g
zHsI{)?u4JdgujQk1m4$kb@1}^laNw$P_&b^w^y*2agvf%u$O|$OUXfH<fZN9Wu2TI
Vpd5o4l6WpaTT>t2pl%!eKLCSC^{)T`

literal 0
HcmV?d00001

diff --git a/spec/lib/integrations/slack/send_on_slack_service_spec.rb b/spec/lib/integrations/slack/send_on_slack_service_spec.rb
index aa0f37bde..3474cbfcd 100644
--- a/spec/lib/integrations/slack/send_on_slack_service_spec.rb
+++ b/spec/lib/integrations/slack/send_on_slack_service_spec.rb
@@ -183,11 +183,11 @@ describe Integrations::Slack::SendOnSlackService do
       it 'sent a template message on slack' do
         builder = described_class.new(message: template_message, hook: hook)
         allow(builder).to receive(:slack_client).and_return(slack_client)
-
+        template_message.update!(sender: nil)
         expect(slack_client).to receive(:chat_postMessage).with(
           channel: hook.reference_id,
           text: template_message.content,
-          username: "#{template_message.sender.name} (Contact)",
+          username: 'Bot',
           thread_ts: conversation.identifier,
           icon_url: anything,
           unfurl_links: true
@@ -198,6 +198,24 @@ describe Integrations::Slack::SendOnSlackService do
         expect(template_message.external_source_id_slack).to eq 'cw-origin-6789.12345'
       end
 
+      it 'sent a activity message on slack' do
+        template_message.update!(message_type: :activity)
+        template_message.update!(sender: nil)
+        builder = described_class.new(message: template_message, hook: hook)
+        allow(builder).to receive(:slack_client).and_return(slack_client)
+        expect(slack_client).to receive(:chat_postMessage).with(
+          channel: hook.reference_id,
+          text: "_#{template_message.content}_",
+          username: 'System',
+          thread_ts: conversation.identifier,
+          icon_url: anything,
+          unfurl_links: true
+        ).and_return(slack_message)
+
+        builder.perform
+        expect(template_message.external_source_id_slack).to eq 'cw-origin-6789.12345'
+      end
+
       it 'disables hook on Slack AccountInactive error' do
         expect(slack_client).to receive(:chat_postMessage).with(
           channel: hook.reference_id,

From 04dd65687b2fb8926dfffb6c404835d529c7b1d7 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Thu, 16 Nov 2023 19:43:35 +0530
Subject: [PATCH 11/23] feat: Changes to include delivery reports for all
 channels (#8329)

---
 .../widgets/conversation/bubble/Actions.vue   | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue b/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue
index 4ee7aaa9d..416af5d06 100644
--- a/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue
@@ -192,7 +192,7 @@ export default {
       if (!this.showStatusIndicators) {
         return false;
       }
-
+      // Messages will be marked as sent for the Email channel if they have a source ID.
       if (this.isAnEmailChannel) {
         return !!this.sourceId;
       }
@@ -201,11 +201,12 @@ export default {
         this.isAWhatsAppChannel ||
         this.isATwilioChannel ||
         this.isAFacebookInbox ||
-        this.isASmsInbox
+        this.isASmsInbox ||
+        this.isATelegramChannel
       ) {
         return this.sourceId && this.isSent;
       }
-      // There is no source id for the line channel
+      // All messages will be mark as sent for the Line channel, as there is no source ID.
       if (this.isALineChannel) {
         return true;
       }
@@ -216,15 +217,15 @@ export default {
       if (!this.showStatusIndicators) {
         return false;
       }
-
       if (
         this.isAWhatsAppChannel ||
         this.isATwilioChannel ||
-        this.isASmsInbox
+        this.isASmsInbox ||
+        this.isAFacebookInbox
       ) {
         return this.sourceId && this.isDelivered;
       }
-      // We will consider messages as delivered for web widget inbox and API inbox if they are sent
+      // All messages marked as delivered for the web widget inbox and API inbox once they are sent.
       if (this.isAWebWidgetInbox || this.isAPIInbox) {
         return this.isSent;
       }
@@ -238,12 +239,6 @@ export default {
       if (!this.showStatusIndicators) {
         return false;
       }
-
-      if (this.isAWebWidgetInbox || this.isAPIInbox) {
-        const { contact_last_seen_at: contactLastSeenAt } = this.currentChat;
-        return contactLastSeenAt >= this.createdAt;
-      }
-
       if (
         this.isAWhatsAppChannel ||
         this.isATwilioChannel ||
@@ -252,6 +247,10 @@ export default {
         return this.sourceId && this.isRead;
       }
 
+      if (this.isAWebWidgetInbox || this.isAPIInbox) {
+        return this.isRead;
+      }
+
       return false;
     },
   },

From 0e19a4196baa68b3df59ee080dc6746026e2db52 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Fri, 17 Nov 2023 11:43:22 -0800
Subject: [PATCH 12/23] chore: Endpoint to purge portal logo (#8365)

---
 .../api/v1/accounts/portals_controller.rb     |  5 +++
 app/policies/portal_policy.rb                 |  4 +++
 config/routes.rb                              |  1 +
 .../v1/accounts/portals_controller_spec.rb    | 33 +++++++++++++++++++
 4 files changed, 43 insertions(+)

diff --git a/app/controllers/api/v1/accounts/portals_controller.rb b/app/controllers/api/v1/accounts/portals_controller.rb
index 6d2a181f0..bd8da5549 100644
--- a/app/controllers/api/v1/accounts/portals_controller.rb
+++ b/app/controllers/api/v1/accounts/portals_controller.rb
@@ -47,6 +47,11 @@ class Api::V1::Accounts::PortalsController < Api::V1::Accounts::BaseController
     head :ok
   end
 
+  def logo
+    @portal.logo.purge if @portal.logo.attached?
+    head :ok
+  end
+
   def process_attached_logo
     blob_id = params[:blob_id]
     blob = ActiveStorage::Blob.find_by(id: blob_id)
diff --git a/app/policies/portal_policy.rb b/app/policies/portal_policy.rb
index a27f0f92f..588fd82e8 100644
--- a/app/policies/portal_policy.rb
+++ b/app/policies/portal_policy.rb
@@ -27,6 +27,10 @@ class PortalPolicy < ApplicationPolicy
     @account_user.administrator?
   end
 
+  def logo?
+    @account_user.administrator?
+  end
+
   private
 
   def portal_member?
diff --git a/config/routes.rb b/config/routes.rb
index e2aaa2ff3..f9346eb0f 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -217,6 +217,7 @@ Rails.application.routes.draw do
             member do
               patch :archive
               put :add_members
+              delete :logo
             end
             resources :categories
             resources :articles do
diff --git a/spec/controllers/api/v1/accounts/portals_controller_spec.rb b/spec/controllers/api/v1/accounts/portals_controller_spec.rb
index ba6e91149..7da6bf52f 100644
--- a/spec/controllers/api/v1/accounts/portals_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/portals_controller_spec.rb
@@ -210,4 +210,37 @@ RSpec.describe 'Api::V1::Accounts::Portals', type: :request do
       end
     end
   end
+
+  describe 'DELETE /api/v1/accounts/{account.id}/portals/{portal.slug}/logo' do
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        delete "/api/v1/accounts/#{account.id}/portals/#{portal.slug}/logo"
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated user' do
+      before do
+        portal.logo.attach(io: Rails.root.join('spec/assets/avatar.png').open, filename: 'avatar.png', content_type: 'image/png')
+      end
+
+      it 'throw error if agent' do
+        delete "/api/v1/accounts/#{account.id}/portals/#{portal.slug}/logo",
+               headers: agent.create_new_auth_token,
+               as: :json
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+
+      it 'delete portal logo if admin' do
+        delete "/api/v1/accounts/#{account.id}/portals/#{portal.slug}/logo",
+               headers: admin.create_new_auth_token,
+               as: :json
+
+        expect { portal.logo.attachment.reload }.to raise_error(ActiveRecord::RecordNotFound)
+        expect(response).to have_http_status(:success)
+      end
+    end
+  end
 end

From decef1ad52a058aa79e97adf30c602a173065ab4 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Fri, 17 Nov 2023 13:00:35 -0800
Subject: [PATCH 13/23] chore: Add rails_panel gem for query debugging (#8370)

---
 Gemfile      | 2 ++
 Gemfile.lock | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/Gemfile b/Gemfile
index 40fd33957..cd64bb6d8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -200,6 +200,8 @@ group :development do
   # profiling
   gem 'rack-mini-profiler', '>= 3.1.1', require: false
   gem 'stackprof'
+  # Should install the associated chrome extension to view query logs
+  gem 'meta_request'
 end
 
 group :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index a6390908b..8fc324946 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -451,6 +451,9 @@ GEM
     marcel (1.0.2)
     maxminddb (0.1.22)
     memoist (0.16.2)
+    meta_request (0.7.4)
+      rack-contrib (>= 1.1, < 3)
+      railties (>= 3.0.0, < 7.1)
     method_source (1.0.0)
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
@@ -559,6 +562,8 @@ GEM
     rack (2.2.8)
     rack-attack (6.7.0)
       rack (>= 1.0, < 4)
+    rack-contrib (2.4.0)
+      rack (< 4)
     rack-cors (2.0.1)
       rack (>= 2.0.0)
     rack-mini-profiler (3.1.1)
@@ -895,6 +900,7 @@ DEPENDENCIES
   listen
   lograge (~> 0.14.0)
   maxminddb
+  meta_request
   mock_redis
   neighbor
   newrelic-sidekiq-metrics (>= 1.6.2)

From 59ace66c6feda282797ed2e2a522a363c9bf95c0 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Fri, 17 Nov 2023 15:24:00 -0800
Subject: [PATCH 14/23] chore: [Snyk] Fix for vulnerabilities (#8340)

Co-authored-by: snyk-bot <snyk-bot@snyk.io>
---
 Gemfile      |  4 ++--
 Gemfile.lock | 22 +++++++++++-----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Gemfile b/Gemfile
index cd64bb6d8..a40b0f816 100644
--- a/Gemfile
+++ b/Gemfile
@@ -109,9 +109,9 @@ gem 'elastic-apm', require: false
 gem 'newrelic_rpm', require: false
 gem 'newrelic-sidekiq-metrics', '>= 1.6.2', require: false
 gem 'scout_apm', require: false
-gem 'sentry-rails', '>= 5.12.0', require: false
+gem 'sentry-rails', '>= 5.13.0', require: false
 gem 'sentry-ruby', require: false
-gem 'sentry-sidekiq', '>= 5.12.0', require: false
+gem 'sentry-sidekiq', '>= 5.13.0', require: false
 
 ##-- background job processing --##
 gem 'sidekiq', '>= 7.1.3'
diff --git a/Gemfile.lock b/Gemfile.lock
index 8fc324946..8c782dd48 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -460,7 +460,7 @@ GEM
     mime-types-data (3.2023.0218.1)
     mini_magick (4.12.0)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.4)
+    mini_portile2 (2.8.5)
     minitest (5.20.0)
     mock_redis (0.36.0)
       ruby2_keywords
@@ -558,7 +558,7 @@ GEM
     pundit (2.3.0)
       activesupport (>= 3.0.0)
     raabro (1.4.0)
-    racc (1.7.1)
+    racc (1.7.3)
     rack (2.2.8)
     rack-attack (6.7.0)
       rack (>= 1.0, < 4)
@@ -604,7 +604,7 @@ GEM
       thor (~> 1.0)
       zeitwerk (~> 2.5)
     rainbow (3.1.1)
-    rake (13.0.6)
+    rake (13.1.0)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
@@ -709,13 +709,13 @@ GEM
       activesupport (>= 4)
     selectize-rails (0.12.6)
     semantic_range (3.0.0)
-    sentry-rails (5.12.0)
+    sentry-rails (5.13.0)
       railties (>= 5.0)
-      sentry-ruby (~> 5.12.0)
-    sentry-ruby (5.12.0)
+      sentry-ruby (~> 5.13.0)
+    sentry-ruby (5.13.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-    sentry-sidekiq (5.12.0)
-      sentry-ruby (~> 5.12.0)
+    sentry-sidekiq (5.13.0)
+      sentry-ruby (~> 5.13.0)
       sidekiq (>= 3.0)
     sexp_processor (4.17.0)
     shoulda-matchers (5.3.0)
@@ -765,7 +765,7 @@ GEM
     stripe (8.5.0)
     telephone_number (1.4.20)
     test-prof (1.2.1)
-    thor (1.2.2)
+    thor (1.3.0)
     tilt (2.2.0)
     time_diff (0.3.0)
       activesupport
@@ -935,9 +935,9 @@ DEPENDENCIES
   scout_apm
   scss_lint
   seed_dump
-  sentry-rails (>= 5.12.0)
+  sentry-rails (>= 5.13.0)
   sentry-ruby
-  sentry-sidekiq (>= 5.12.0)
+  sentry-sidekiq (>= 5.13.0)
   shoulda-matchers
   sidekiq (>= 7.1.3)
   sidekiq-cron (>= 1.11.0)

From 5588d6e3441f466854381f3973cc70d47a6a0695 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Sat, 18 Nov 2023 05:20:24 +0530
Subject: [PATCH 15/23] feat: convert `feature_flag` to `bigint` [CW-2767]
 (#8350)

Co-authored-by: Sojan <sojan@pepalo.com>
---
 app/models/account.rb                                    | 2 +-
 ...4111614_change_feature_flags_to_bigint_in_accounts.rb | 9 +++++++++
 db/schema.rb                                             | 4 ++--
 3 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 db/migrate/20231114111614_change_feature_flags_to_bigint_in_accounts.rb

diff --git a/app/models/account.rb b/app/models/account.rb
index f837776eb..c1a5773bb 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -6,7 +6,7 @@
 #  auto_resolve_duration :integer
 #  custom_attributes     :jsonb
 #  domain                :string(100)
-#  feature_flags         :integer          default(0), not null
+#  feature_flags         :bigint           default(0), not null
 #  limits                :jsonb
 #  locale                :integer          default("en")
 #  name                  :string           not null
diff --git a/db/migrate/20231114111614_change_feature_flags_to_bigint_in_accounts.rb b/db/migrate/20231114111614_change_feature_flags_to_bigint_in_accounts.rb
new file mode 100644
index 000000000..e91f5c593
--- /dev/null
+++ b/db/migrate/20231114111614_change_feature_flags_to_bigint_in_accounts.rb
@@ -0,0 +1,9 @@
+class ChangeFeatureFlagsToBigintInAccounts < ActiveRecord::Migration[7.0]
+  def up
+    change_column :accounts, :feature_flags, :bigint
+  end
+
+  def down
+    change_column :accounts, :feature_flags, :integer
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index ce15abf8f..081030b11 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.0].define(version: 2023_10_13_072802) do
+ActiveRecord::Schema[7.0].define(version: 2023_11_14_111614) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_stat_statements"
   enable_extension "pg_trgm"
@@ -49,7 +49,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_10_13_072802) do
     t.integer "locale", default: 0
     t.string "domain", limit: 100
     t.string "support_email", limit: 100
-    t.integer "feature_flags", default: 0, null: false
+    t.bigint "feature_flags", default: 0, null: false
     t.integer "auto_resolve_duration"
     t.jsonb "limits", default: {}
     t.jsonb "custom_attributes", default: {}

From f23e33c1a94f5e42cec4c3efbfc20c797db2e208 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Fri, 17 Nov 2023 16:40:40 -0800
Subject: [PATCH 16/23] perf: Remove unwanted conversation count query (#8372)

---
 app/views/api/v1/models/_contact.json.jbuilder | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/views/api/v1/models/_contact.json.jbuilder b/app/views/api/v1/models/_contact.json.jbuilder
index 406f9f4fd..6f86ad125 100644
--- a/app/views/api/v1/models/_contact.json.jbuilder
+++ b/app/views/api/v1/models/_contact.json.jbuilder
@@ -7,7 +7,6 @@ json.phone_number resource.phone_number
 json.identifier resource.identifier
 json.thumbnail resource.avatar_url
 json.custom_attributes resource.custom_attributes
-json.conversations_count resource.conversations_count if resource[:conversations_count].present?
 json.last_activity_at resource.last_activity_at.to_i if resource[:last_activity_at].present?
 json.created_at resource.created_at.to_i if resource[:created_at].present?
 # we only want to output contact inbox when its /contacts endpoints

From 2c5a0abcce1b0f9fafbe0d65d046f3895086ea05 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Fri, 17 Nov 2023 17:29:44 -0800
Subject: [PATCH 17/23] fix: Update the height of the input based on the rows
 (#8373)

---
 .../modules/widget-preview/components/WidgetFooter.vue       | 1 +
 .../routes/dashboard/helpcenter/components/ArticleEditor.vue | 2 +-
 app/javascript/shared/components/GreetingsEditor.vue         | 2 +-
 app/javascript/shared/components/ResizableTextArea.vue       | 5 +++++
 app/javascript/widget/components/ChatInputWrap.vue           | 1 +
 5 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/javascript/dashboard/modules/widget-preview/components/WidgetFooter.vue b/app/javascript/dashboard/modules/widget-preview/components/WidgetFooter.vue
index 64355b6cd..b5d4bbc28 100644
--- a/app/javascript/dashboard/modules/widget-preview/components/WidgetFooter.vue
+++ b/app/javascript/dashboard/modules/widget-preview/components/WidgetFooter.vue
@@ -12,6 +12,7 @@
     <div v-else class="chat-message-input is-focused">
       <resizable-text-area
         id="chat-input"
+        :rows="1"
         :placeholder="
           $t('INBOX_MGMT.WIDGET_BUILDER.FOOTER.CHAT_INPUT_PLACEHOLDER')
         "
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleEditor.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleEditor.vue
index 5a4a669aa..d51017703 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleEditor.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleEditor.vue
@@ -3,7 +3,7 @@
     <resizable-text-area
       v-model="articleTitle"
       type="text"
-      rows="1"
+      :rows="1"
       class="article-heading"
       :placeholder="$t('HELP_CENTER.EDIT_ARTICLE.TITLE_PLACEHOLDER')"
       @focus="onFocus"
diff --git a/app/javascript/shared/components/GreetingsEditor.vue b/app/javascript/shared/components/GreetingsEditor.vue
index 25bd9d3d6..0dc72a727 100644
--- a/app/javascript/shared/components/GreetingsEditor.vue
+++ b/app/javascript/shared/components/GreetingsEditor.vue
@@ -17,7 +17,7 @@
     <resizable-text-area
       v-else
       v-model="greetingsMessage"
-      rows="4"
+      :rows="4"
       type="text"
       class="greetings--textarea"
       :label="label"
diff --git a/app/javascript/shared/components/ResizableTextArea.vue b/app/javascript/shared/components/ResizableTextArea.vue
index 8257694f5..bb3935f57 100644
--- a/app/javascript/shared/components/ResizableTextArea.vue
+++ b/app/javascript/shared/components/ResizableTextArea.vue
@@ -2,6 +2,7 @@
   <textarea
     ref="textarea"
     :placeholder="placeholder"
+    :rows="rows"
     :value="value"
     @input="onInput"
     @focus="onFocus"
@@ -36,6 +37,10 @@ export default {
       type: String,
       default: '',
     },
+    rows: {
+      type: Number,
+      default: 2,
+    },
     // add this as a prop, so that we won't have to include uiSettingsMixin
     sendWithSignature: {
       type: Boolean,
diff --git a/app/javascript/widget/components/ChatInputWrap.vue b/app/javascript/widget/components/ChatInputWrap.vue
index 67fc4e9eb..1d68a9263 100755
--- a/app/javascript/widget/components/ChatInputWrap.vue
+++ b/app/javascript/widget/components/ChatInputWrap.vue
@@ -8,6 +8,7 @@
       id="chat-input"
       ref="chatInput"
       v-model="userInput"
+      :rows="1"
       :aria-label="$t('CHAT_PLACEHOLDER')"
       :placeholder="$t('CHAT_PLACEHOLDER')"
       class="form-input user-message-input is-focused"

From 7380f0e7ce23d5ffb6387cec2443033e0784989f Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Fri, 17 Nov 2023 19:54:15 -0800
Subject: [PATCH 18/23] chore: Making OpenAI label suggestions optional (#8374)

Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
---
 .../dashboard/assets/scss/_formulate.scss     | 20 ++++++++++++++
 .../widgets/conversation/MessagesView.vue     |  2 +-
 app/javascript/dashboard/mixins/aiMixin.js    | 20 +++++++++-----
 .../settings/integrationapps/NewHook.vue      |  2 +-
 config/integration/apps.yml                   |  9 ++++++-
 .../integrations/openai_processor_service.rb  | 27 ++++++++++++++-----
 6 files changed, 65 insertions(+), 15 deletions(-)

diff --git a/app/javascript/dashboard/assets/scss/_formulate.scss b/app/javascript/dashboard/assets/scss/_formulate.scss
index 57c43a3d6..d683ce3c7 100644
--- a/app/javascript/dashboard/assets/scss/_formulate.scss
+++ b/app/javascript/dashboard/assets/scss/_formulate.scss
@@ -16,3 +16,23 @@
     width: 100%;
   }
 }
+
+.integration-hooks {
+  .formulate-input[data-type='checkbox'] {
+    .formulate-input-wrapper {
+      @apply flex;
+
+      .formulate-input-element {
+        @apply pr-2;
+
+        input {
+          @apply mb-0;
+        }
+      }
+    }
+
+    .formulate-input-element-decorator {
+      @apply hidden;
+    }
+  }
+}
diff --git a/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue b/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
index c6d492061..10b1dce32 100644
--- a/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
@@ -340,7 +340,7 @@ export default {
       // method available in mixin, need to ensure that integrations are present
       await this.fetchIntegrationsIfRequired();
 
-      if (!this.isAIIntegrationEnabled) {
+      if (!this.isLabelSuggestionFeatureEnabled) {
         return;
       }
 
diff --git a/app/javascript/dashboard/mixins/aiMixin.js b/app/javascript/dashboard/mixins/aiMixin.js
index 3a9fc4a75..f3558a6c7 100644
--- a/app/javascript/dashboard/mixins/aiMixin.js
+++ b/app/javascript/dashboard/mixins/aiMixin.js
@@ -15,18 +15,26 @@ export default {
       currentChat: 'getSelectedChat',
       replyMode: 'draftMessages/getReplyEditorMode',
     }),
-    isAIIntegrationEnabled() {
-      return !!this.appIntegrations.find(
+    aiIntegration() {
+      return this.appIntegrations.find(
         integration => integration.id === 'openai' && !!integration.hooks.length
-      );
+      ).hooks[0];
+    },
+    isAIIntegrationEnabled() {
+      return !!this.aiIntegration;
+    },
+    isLabelSuggestionFeatureEnabled() {
+      if (this.aiIntegration) {
+        const { settings = {} } = this.aiIntegration || {};
+        return settings.label_suggestion;
+      }
+      return false;
     },
     isFetchingAppIntegrations() {
       return this.uiFlags.isFetching;
     },
     hookId() {
-      return this.appIntegrations.find(
-        integration => integration.id === 'openai' && !!integration.hooks.length
-      ).hooks[0].id;
+      return this.aiIntegration.id;
     },
     draftMessage() {
       return this.$store.getters['draftMessages/get'](this.draftKey);
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrationapps/NewHook.vue b/app/javascript/dashboard/routes/dashboard/settings/integrationapps/NewHook.vue
index 93eed8795..454f03dac 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/integrationapps/NewHook.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrationapps/NewHook.vue
@@ -1,6 +1,6 @@
 <!-- eslint-disable vue/v-slot-style -->
 <template>
-  <div class="flex flex-col h-auto overflow-auto">
+  <div class="flex flex-col h-auto overflow-auto integration-hooks">
     <woot-modal-header
       :header-title="integration.name"
       :header-content="integration.description"
diff --git a/config/integration/apps.yml b/config/integration/apps.yml
index f55fd9f56..408c56e1c 100644
--- a/config/integration/apps.yml
+++ b/config/integration/apps.yml
@@ -139,6 +139,7 @@ openai:
     "type": "object",
     "properties": {
         "api_key": { "type": "string" },
+        "label_suggestion": { "type": "boolean" },
       },
     "required": ["api_key"],
     "additionalProperties": false,
@@ -150,5 +151,11 @@ openai:
       "name": "api_key",
       "validation": "required",
     },
+    {
+      "label": "Show label suggestions",
+      "type": "checkbox",
+      "name": "label_suggestion",
+      "validation": "",
+    },
   ]
-  visible_properties: ['api_key']
+  visible_properties: ['api_key', 'label_suggestion']
diff --git a/enterprise/lib/enterprise/integrations/openai_processor_service.rb b/enterprise/lib/enterprise/integrations/openai_processor_service.rb
index 8cc481f43..bf2f4ccf3 100644
--- a/enterprise/lib/enterprise/integrations/openai_processor_service.rb
+++ b/enterprise/lib/enterprise/integrations/openai_processor_service.rb
@@ -21,11 +21,7 @@ module Enterprise::Integrations::OpenaiProcessorService
   def labels_with_messages
     conversation = find_conversation
 
-    # return nil if conversation is not present
-    return nil if conversation.nil?
-
-    # return nil if conversation has less than 3 incoming messages
-    return nil if conversation.messages.incoming.count < 3
+    return nil unless valid_conversation?(conversation)
 
     labels = hook.account.labels.pluck(:title).join(', ')
     character_count = labels.length
@@ -38,6 +34,19 @@ module Enterprise::Integrations::OpenaiProcessorService
     "Messages:\n#{messages}\nLabels:\n#{labels}"
   end
 
+  def valid_conversation?(conversation)
+    return false if conversation.nil?
+    return false if conversation.messages.incoming.count < 3
+
+    # Think Mark think, at this point the conversation is beyond saving
+    return false if conversation.messages.count > 100
+
+    # if there are more than 20 messages, only trigger this if the last message is from the client
+    return false if conversation.messages.count > 20 && !conversation.messages.last.incoming?
+
+    true
+  end
+
   def summarize_body
     {
       model: self.class::GPT_MODEL,
@@ -50,8 +59,10 @@ module Enterprise::Integrations::OpenaiProcessorService
   end
 
   def label_suggestion_body
+    return unless label_suggestions_enabled?
+
     content = labels_with_messages
-    return nil if content.blank?
+    return value_from_cache if content.blank?
 
     {
       model: self.class::GPT_MODEL,
@@ -64,4 +75,8 @@ module Enterprise::Integrations::OpenaiProcessorService
       ]
     }.to_json
   end
+
+  def label_suggestions_enabled?
+    hook.settings['label_suggestion'].present?
+  end
 end

From 0af27a2387a19b0de533aa50eb57b86110e47580 Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Date: Sat, 18 Nov 2023 09:28:27 +0530
Subject: [PATCH 19/23] feat: Adds support for logo in portal settings page
 [CW-2585] (#8354)

---
 .../dashboard/api/helpCenter/portals.js       |  4 +
 app/javascript/dashboard/helper/URLHelper.js  | 12 +++
 .../dashboard/helper/specs/URLHelper.spec.js  | 26 ++++++
 .../dashboard/i18n/locale/en/helpCenter.json  |  5 +-
 .../components/PortalSettingsBasicForm.vue    | 91 +++++++++++++++----
 .../pages/portals/EditPortalBasic.vue         | 14 +++
 .../pages/portals/PortalDetails.vue           |  3 +
 .../dashboard/settings/profile/Index.vue      |  7 +-
 .../modules/helpCenterPortals/actions.js      | 18 ++++
 9 files changed, 158 insertions(+), 22 deletions(-)

diff --git a/app/javascript/dashboard/api/helpCenter/portals.js b/app/javascript/dashboard/api/helpCenter/portals.js
index 28220b0b5..7c6210dbd 100644
--- a/app/javascript/dashboard/api/helpCenter/portals.js
+++ b/app/javascript/dashboard/api/helpCenter/portals.js
@@ -17,6 +17,10 @@ class PortalsAPI extends ApiClient {
   deletePortal(portalSlug) {
     return axios.delete(`${this.url}/${portalSlug}`);
   }
+
+  deleteLogo(portalSlug) {
+    return axios.delete(`${this.url}/${portalSlug}/logo`);
+  }
 }
 
 export default PortalsAPI;
diff --git a/app/javascript/dashboard/helper/URLHelper.js b/app/javascript/dashboard/helper/URLHelper.js
index 7ea8531d3..5464d1107 100644
--- a/app/javascript/dashboard/helper/URLHelper.js
+++ b/app/javascript/dashboard/helper/URLHelper.js
@@ -96,3 +96,15 @@ export const getArticleSearchURL = ({
 
   return `${host}/${portalSlug}/articles?${queryParams.toString()}`;
 };
+
+export const hasValidAvatarUrl = avatarUrl => {
+  try {
+    const { host: avatarUrlHost } = new URL(avatarUrl);
+    const isFromGravatar = ['www.gravatar.com', 'gravatar'].includes(
+      avatarUrlHost
+    );
+    return avatarUrl && !isFromGravatar;
+  } catch (error) {
+    return false;
+  }
+};
diff --git a/app/javascript/dashboard/helper/specs/URLHelper.spec.js b/app/javascript/dashboard/helper/specs/URLHelper.spec.js
index 1b5814556..d137c367c 100644
--- a/app/javascript/dashboard/helper/specs/URLHelper.spec.js
+++ b/app/javascript/dashboard/helper/specs/URLHelper.spec.js
@@ -4,6 +4,7 @@ import {
   isValidURL,
   conversationListPageURL,
   getArticleSearchURL,
+  hasValidAvatarUrl,
 } from '../URLHelper';
 
 describe('#URL Helpers', () => {
@@ -164,4 +165,29 @@ describe('#URL Helpers', () => {
       expect(url).toBe('myurl.com/news/articles?page=1&locale=en');
     });
   });
+
+  describe('hasValidAvatarUrl', () => {
+    test('should return true for valid non-Gravatar URL', () => {
+      expect(hasValidAvatarUrl('https://chatwoot.com/avatar.jpg')).toBe(true);
+    });
+
+    test('should return false for a Gravatar URL (www.gravatar.com)', () => {
+      expect(hasValidAvatarUrl('https://www.gravatar.com/avatar.jpg')).toBe(
+        false
+      );
+    });
+
+    test('should return false for a Gravatar URL (gravatar)', () => {
+      expect(hasValidAvatarUrl('https://gravatar/avatar.jpg')).toBe(false);
+    });
+
+    test('should handle invalid URL', () => {
+      expect(hasValidAvatarUrl('invalid-url')).toBe(false); // or expect an error, depending on function design
+    });
+
+    test('should return false for empty or undefined URL', () => {
+      expect(hasValidAvatarUrl('')).toBe(false);
+      expect(hasValidAvatarUrl()).toBe(false);
+    });
+  });
 });
diff --git a/app/javascript/dashboard/i18n/locale/en/helpCenter.json b/app/javascript/dashboard/i18n/locale/en/helpCenter.json
index 43b419328..6d4a3eb8c 100644
--- a/app/javascript/dashboard/i18n/locale/en/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/en/helpCenter.json
@@ -223,7 +223,10 @@
         "LOGO": {
           "LABEL": "Logo",
           "UPLOAD_BUTTON": "Upload logo",
-          "HELP_TEXT": "This logo will be displayed on the portal header."
+          "HELP_TEXT": "This logo will be displayed on the portal header.",
+          "IMAGE_UPLOAD_SUCCESS": "Logo uploaded successfully",
+          "IMAGE_UPLOAD_ERROR": "Logo deleted successfully",
+          "IMAGE_DELETE_ERROR": "Error while deleting logo"
         },
         "NAME": {
           "LABEL": "Name",
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/components/PortalSettingsBasicForm.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/PortalSettingsBasicForm.vue
index c3d74eaab..7653d16a9 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/components/PortalSettingsBasicForm.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/PortalSettingsBasicForm.vue
@@ -14,21 +14,24 @@
     >
       <div class="w-[65%] flex-shrink-0 flex-grow-0 max-w-[65%]">
         <div class="mb-4">
-          <label>
-            {{ $t('HELP_CENTER.PORTAL.ADD.LOGO.LABEL') }}
-          </label>
           <div class="flex items-center flex-row">
-            <thumbnail :username="name" size="56px" variant="square" />
-            <woot-button
-              v-if="false"
-              class="ml-3"
-              variant="smooth"
-              color-scheme="secondary"
-              icon="upload"
-              size="small"
-            >
-              {{ $t('HELP_CENTER.PORTAL.ADD.LOGO.UPLOAD_BUTTON') }}
-            </woot-button>
+            <woot-avatar-uploader
+              ref="imageUpload"
+              :label="$t('HELP_CENTER.PORTAL.ADD.LOGO.LABEL')"
+              :src="logoUrl"
+              @change="onFileChange"
+            />
+            <div v-if="showDeleteButton" class="avatar-delete-btn">
+              <woot-button
+                type="button"
+                color-scheme="alert"
+                variant="hollow"
+                size="small"
+                @click="deleteAvatar"
+              >
+                {{ $t('PROFILE_SETTINGS.DELETE_AVATAR') }}
+              </woot-button>
+            </div>
           </div>
           <p
             class="mt-1 mb-0 text-xs text-slate-600 dark:text-slate-400 not-italic"
@@ -87,17 +90,20 @@
 <script>
 import { required, minLength } from 'vuelidate/lib/validators';
 import { isDomain } from 'shared/helpers/Validators';
-import thumbnail from 'dashboard/components/widgets/Thumbnail.vue';
+
+import alertMixin from 'shared/mixins/alertMixin';
 import { convertToCategorySlug } from 'dashboard/helper/commons.js';
 import { buildPortalURL } from 'dashboard/helper/portalHelper';
 import wootConstants from 'dashboard/constants/globals';
+import { hasValidAvatarUrl } from 'dashboard/helper/URLHelper';
+import { checkFileSizeLimit } from 'shared/helpers/FileHelper';
+import { uploadFile } from 'dashboard/helper/uploadHelper';
 
 const { EXAMPLE_URL } = wootConstants;
+const MAXIMUM_FILE_UPLOAD_SIZE = 4; // in MB
 
 export default {
-  components: {
-    thumbnail,
-  },
+  mixins: [alertMixin],
   props: {
     portal: {
       type: Object,
@@ -118,6 +124,10 @@ export default {
       slug: '',
       domain: '',
       alertMessage: '',
+
+      // Logouploader keys
+      avatarBlobId: '',
+      logoUrl: '',
     };
   },
   validations: {
@@ -159,6 +169,9 @@ export default {
         exampleURL: EXAMPLE_URL,
       });
     },
+    showDeleteButton() {
+      return hasValidAvatarUrl(this.logoUrl);
+    },
   },
   mounted() {
     const portal = this.portal || {};
@@ -166,6 +179,13 @@ export default {
     this.slug = portal.slug || '';
     this.domain = portal.custom_domain || '';
     this.alertMessage = '';
+    if (portal.logo) {
+      const {
+        logo: { file_url: logoURL, blob_id: blobId },
+      } = portal;
+      this.logoUrl = logoURL;
+      this.avatarBlobId = blobId;
+    }
   },
   methods: {
     onNameChange() {
@@ -181,9 +201,44 @@ export default {
         name: this.name,
         slug: this.slug,
         custom_domain: this.domain,
+        blob_id: this.avatarBlobId || null,
       };
       this.$emit('submit', portal);
     },
+    async deleteAvatar() {
+      this.logoUrl = '';
+      this.avatarBlobId = '';
+      this.$emit('delete-logo');
+    },
+    onFileChange({ file }) {
+      if (checkFileSizeLimit(file, MAXIMUM_FILE_UPLOAD_SIZE)) {
+        this.uploadLogoToStorage(file);
+      } else {
+        this.showAlert(
+          this.$t(
+            'PROFILE_SETTINGS.FORM.MESSAGE_SIGNATURE_SECTION.IMAGE_UPLOAD_SIZE_ERROR',
+            {
+              size: MAXIMUM_FILE_UPLOAD_SIZE,
+            }
+          )
+        );
+      }
+
+      this.$refs.imageUpload.value = '';
+    },
+    async uploadLogoToStorage(file) {
+      try {
+        const { fileUrl, blobId } = await uploadFile(file);
+        if (fileUrl) {
+          this.logoUrl = fileUrl;
+          this.avatarBlobId = blobId;
+        }
+      } catch (error) {
+        this.showAlert(
+          this.$t('HELP_CENTER.PORTAL.ADD.LOGO.IMAGE_DELETE_ERROR')
+        );
+      }
+    },
   },
 };
 </script>
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/EditPortalBasic.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/EditPortalBasic.vue
index c6d9f8b15..8e3579f02 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/EditPortalBasic.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/EditPortalBasic.vue
@@ -7,6 +7,7 @@
       $t('HELP_CENTER.PORTAL.EDIT.EDIT_BASIC_INFO.BUTTON_TEXT')
     "
     @submit="updatePortalSettings"
+    @delete-logo="deleteLogo"
   />
 </template>
 
@@ -70,6 +71,19 @@ export default {
         this.showAlert(this.alertMessage);
       }
     },
+    async deleteLogo() {
+      try {
+        const portalSlug = this.lastPortalSlug;
+        await this.$store.dispatch('portals/deleteLogo', {
+          portalSlug,
+        });
+      } catch (error) {
+        this.alertMessage =
+          error?.message ||
+          this.$t('HELP_CENTER.PORTAL.ADD.LOGO.IMAGE_DELETE_ERROR');
+        this.showAlert(this.alertMessage);
+      }
+    },
   },
 };
 </script>
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/PortalDetails.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/PortalDetails.vue
index 98aaf544f..2857867bb 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/PortalDetails.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/PortalDetails.vue
@@ -40,9 +40,12 @@ export default {
   methods: {
     async createPortal(portal) {
       try {
+        const { blob_id: blobId } = portal;
         await this.$store.dispatch('portals/create', {
           portal,
+          blob_id: blobId,
         });
+
         this.alertMessage = this.$t(
           'HELP_CENTER.PORTAL.ADD.API.SUCCESS_MESSAGE_FOR_BASIC'
         );
diff --git a/app/javascript/dashboard/routes/dashboard/settings/profile/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/profile/Index.vue
index f44ceedfb..4a1c81bda 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/profile/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/profile/Index.vue
@@ -128,6 +128,7 @@
 import { required, minLength, email } from 'vuelidate/lib/validators';
 import { mapGetters } from 'vuex';
 import { clearCookiesOnLogout } from '../../../../store/utils/api';
+import { hasValidAvatarUrl } from 'dashboard/helper/URLHelper';
 import NotificationSettings from './NotificationSettings.vue';
 import alertMixin from 'shared/mixins/alertMixin';
 import ChangePassword from './ChangePassword.vue';
@@ -198,6 +199,9 @@ export default {
       currentUserId: 'getCurrentUserID',
       globalConfig: 'globalConfig/get',
     }),
+    showDeleteButton() {
+      return hasValidAvatarUrl(this.avatarUrl);
+    },
   },
   watch: {
     currentUserId(newCurrentUserId, prevCurrentUserId) {
@@ -265,9 +269,6 @@ export default {
         this.showAlert(this.$t('PROFILE_SETTINGS.AVATAR_DELETE_FAILED'));
       }
     },
-    showDeleteButton() {
-      return this.avatarUrl && !this.avatarUrl.includes('www.gravatar.com');
-    },
     toggleEditorMessageKey(key) {
       this.updateUISettings({ editor_message_key: key });
       this.showAlert(
diff --git a/app/javascript/dashboard/store/modules/helpCenterPortals/actions.js b/app/javascript/dashboard/store/modules/helpCenterPortals/actions.js
index bfae85d27..60ccf9d25 100644
--- a/app/javascript/dashboard/store/modules/helpCenterPortals/actions.js
+++ b/app/javascript/dashboard/store/modules/helpCenterPortals/actions.js
@@ -2,6 +2,7 @@ import PortalAPI from 'dashboard/api/helpCenter/portals';
 import { throwErrorMessage } from 'dashboard/store/utils/api';
 import { types } from './mutations';
 const portalAPIs = new PortalAPI();
+
 export const actions = {
   index: async ({ commit }) => {
     try {
@@ -89,6 +90,23 @@ export const actions = {
     }
   },
 
+  deleteLogo: async ({ commit }, { portalSlug }) => {
+    commit(types.SET_HELP_PORTAL_UI_FLAG, {
+      uiFlags: { isUpdating: true },
+      portalSlug,
+    });
+    try {
+      await portalAPIs.deleteLogo(portalSlug);
+    } catch (error) {
+      throwErrorMessage(error);
+    } finally {
+      commit(types.SET_HELP_PORTAL_UI_FLAG, {
+        uiFlags: { isUpdating: false },
+        portalSlug,
+      });
+    }
+  },
+
   updatePortal: async ({ commit }, portal) => {
     commit(types.UPDATE_PORTAL_ENTRY, portal);
   },

From 146e46d79f46768d53fb0faa49f46331e82ccfd9 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Fri, 17 Nov 2023 20:10:46 -0800
Subject: [PATCH 20/23] fix: Disable AI Assist CTA if not required (#8375)

- Show CTAs only on production
---
 .../dashboard/components/widgets/AIAssistanceButton.vue       | 4 +++-
 app/javascript/shared/store/globalConfig.js                   | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/javascript/dashboard/components/widgets/AIAssistanceButton.vue b/app/javascript/dashboard/components/widgets/AIAssistanceButton.vue
index ab4047a1e..2d7951b05 100644
--- a/app/javascript/dashboard/components/widgets/AIAssistanceButton.vue
+++ b/app/javascript/dashboard/components/widgets/AIAssistanceButton.vue
@@ -61,6 +61,7 @@ export default {
   computed: {
     ...mapGetters({
       currentChat: 'getSelectedChat',
+      isAChatwootInstance: 'globalConfig/isAChatwootInstance',
     }),
     isAICTAModalDismissed() {
       return this.uiSettings.is_open_ai_cta_modal_dismissed;
@@ -70,7 +71,8 @@ export default {
       return (
         this.isAdmin &&
         !this.isAIIntegrationEnabled &&
-        !this.isAICTAModalDismissed
+        !this.isAICTAModalDismissed &&
+        this.isAChatwootInstance
       );
     },
     // Display a AI CTA button for agents and other admins who have not yet opened the AI assistance modal.
diff --git a/app/javascript/shared/store/globalConfig.js b/app/javascript/shared/store/globalConfig.js
index 60326dce5..5a266bd21 100644
--- a/app/javascript/shared/store/globalConfig.js
+++ b/app/javascript/shared/store/globalConfig.js
@@ -50,6 +50,7 @@ export const getters = {
   get: $state => $state,
   isOnChatwootCloud: $state => $state.deploymentEnv === 'cloud',
   isACustomBrandedInstance: $state => $state.installationName !== 'Chatwoot',
+  isAChatwootInstance: $state => $state.installationName === 'Chatwoot',
 };
 
 export const actions = {};

From 6e22695b8597eb3e562d75191447197a887d608f Mon Sep 17 00:00:00 2001
From: Sojan <sojan@pepalo.com>
Date: Fri, 17 Nov 2023 20:34:39 -0800
Subject: [PATCH 21/23]  Bump version to 3.3.0

---
 config/app.yml | 2 +-
 package.json   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/app.yml b/config/app.yml
index 6e03f1355..60f5cd50a 100644
--- a/config/app.yml
+++ b/config/app.yml
@@ -1,5 +1,5 @@
 shared: &shared
-  version: '3.2.0'
+  version: '3.3.0'
 
 development:
   <<: *shared
diff --git a/package.json b/package.json
index af05f3db0..1e778b206 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@chatwoot/chatwoot",
-  "version": "3.2.0",
+  "version": "3.3.0",
   "license": "MIT",
   "scripts": {
     "eslint": "eslint app/**/*.{js,vue}",

From 17725e4dd051471d14425b8fff264ecee92cc4fb Mon Sep 17 00:00:00 2001
From: Clairton Rodrigo Heinzen <clairton.rodrigo@gmail.com>
Date: Sat, 18 Nov 2023 15:18:55 -0300
Subject: [PATCH 22/23] fix: Breakage of message pane when Openai integration
 isn't enabled (#8381)

Error when the Openai integration isn't enabled

fixes: https://github.com/chatwoot/chatwoot/issues/8379
---
 app/javascript/dashboard/mixins/aiMixin.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/dashboard/mixins/aiMixin.js b/app/javascript/dashboard/mixins/aiMixin.js
index f3558a6c7..54bde3ffb 100644
--- a/app/javascript/dashboard/mixins/aiMixin.js
+++ b/app/javascript/dashboard/mixins/aiMixin.js
@@ -18,7 +18,7 @@ export default {
     aiIntegration() {
       return this.appIntegrations.find(
         integration => integration.id === 'openai' && !!integration.hooks.length
-      ).hooks[0];
+      )?.hooks[0];
     },
     isAIIntegrationEnabled() {
       return !!this.aiIntegration;

From 4244945e7b6bbedd02c756cb44f829f6749ec7c3 Mon Sep 17 00:00:00 2001
From: Sojan <sojan@pepalo.com>
Date: Sat, 18 Nov 2023 10:23:18 -0800
Subject: [PATCH 23/23]  Bump version to 3.3.1

---
 config/app.yml | 2 +-
 package.json   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/app.yml b/config/app.yml
index 60f5cd50a..93e0bcbed 100644
--- a/config/app.yml
+++ b/config/app.yml
@@ -1,5 +1,5 @@
 shared: &shared
-  version: '3.3.0'
+  version: '3.3.1'
 
 development:
   <<: *shared
diff --git a/package.json b/package.json
index 1e778b206..f2efcdc3c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@chatwoot/chatwoot",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "license": "MIT",
   "scripts": {
     "eslint": "eslint app/**/*.{js,vue}",