From 04c874fe35d9959ce60839218194283eef6c5524 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Wed, 18 Oct 2023 10:11:13 +0530
Subject: [PATCH 01/94] feat: Add delivery reports for API channel (#8116)

---
 .../public/api/v1/inboxes/conversations_controller.rb         | 1 +
 .../components/widgets/conversation/bubble/Actions.vue        | 4 ++--
 .../public/api/v1/inbox/conversations_controller_spec.rb      | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/controllers/public/api/v1/inboxes/conversations_controller.rb b/app/controllers/public/api/v1/inboxes/conversations_controller.rb
index c79952372..1e20b2a1d 100644
--- a/app/controllers/public/api/v1/inboxes/conversations_controller.rb
+++ b/app/controllers/public/api/v1/inboxes/conversations_controller.rb
@@ -23,6 +23,7 @@ class Public::Api::V1::Inboxes::ConversationsController < Public::Api::V1::Inbox
   def update_last_seen
     @conversation.contact_last_seen_at = DateTime.now.utc
     @conversation.save!
+    ::Conversations::MarkMessagesAsReadJob.perform_later(@conversation)
     head :ok
   end
 
diff --git a/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue b/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue
index e03cc74ed..f3c7e4f3c 100644
--- a/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue
@@ -214,8 +214,8 @@ export default {
       if (this.isAWhatsAppChannel || this.isATwilioChannel) {
         return this.sourceId && this.isDelivered;
       }
-      // We will consider messages as delivered for web widget inbox if they are sent
-      if (this.isAWebWidgetInbox) {
+      // We will consider messages as delivered for web widget inbox and API inbox if they are sent
+      if (this.isAWebWidgetInbox || this.isAPIInbox) {
         return this.isSent;
       }
 
diff --git a/spec/controllers/public/api/v1/inbox/conversations_controller_spec.rb b/spec/controllers/public/api/v1/inbox/conversations_controller_spec.rb
index 0bd8cbfd0..3001263bf 100644
--- a/spec/controllers/public/api/v1/inbox/conversations_controller_spec.rb
+++ b/spec/controllers/public/api/v1/inbox/conversations_controller_spec.rb
@@ -81,6 +81,7 @@ RSpec.describe 'Public Inbox Contact Conversations API', type: :request do
 
     it 'updates the last seen of the conversation contact' do
       contact_last_seen_at = conversation.contact_last_seen_at
+      expect(Conversations::MarkMessagesAsReadJob).to receive(:perform_later).with(conversation)
       post update_last_seen_path
 
       expect(response).to have_http_status(:success)

From 78ce8a4652449b6ca65a8fcda32cf04f35296b8c Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Thu, 19 Oct 2023 12:12:34 +0530
Subject: [PATCH 02/94] feat: Add support for Instagram delivery reports
 (#8125)

---
 .../widgets/conversation/bubble/Actions.vue   |  6 ++-
 app/jobs/webhooks/instagram_events_job.rb     |  6 ++-
 app/services/instagram/read_status_service.rb | 28 +++++++++++
 .../instagram_message_create_event.rb         | 26 ++++++++++
 .../webhooks/instagram_events_job_spec.rb     |  6 +++
 .../instagram/read_status_service_spec.rb     | 48 +++++++++++++++++++
 6 files changed, 118 insertions(+), 2 deletions(-)
 create mode 100644 app/services/instagram/read_status_service.rb
 create mode 100644 spec/services/instagram/read_status_service_spec.rb

diff --git a/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue b/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue
index f3c7e4f3c..27eecdc4b 100644
--- a/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue
@@ -231,7 +231,11 @@ export default {
         return contactLastSeenAt >= this.createdAt;
       }
 
-      if (this.isAWhatsAppChannel || this.isATwilioChannel) {
+      if (
+        this.isAWhatsAppChannel ||
+        this.isATwilioChannel ||
+        this.isAFacebookInbox
+      ) {
         return this.sourceId && this.isRead;
       }
 
diff --git a/app/jobs/webhooks/instagram_events_job.rb b/app/jobs/webhooks/instagram_events_job.rb
index ad1114036..024ba4a23 100644
--- a/app/jobs/webhooks/instagram_events_job.rb
+++ b/app/jobs/webhooks/instagram_events_job.rb
@@ -7,7 +7,7 @@ class Webhooks::InstagramEventsJob < MutexApplicationJob
   base_uri 'https://graph.facebook.com/v11.0/me'
 
   # @return [Array] We will support further events like reaction or seen in future
-  SUPPORTED_EVENTS = [:message].freeze
+  SUPPORTED_EVENTS = [:message, :read].freeze
 
   def perform(entries)
     @entries = entries
@@ -45,6 +45,10 @@ class Webhooks::InstagramEventsJob < MutexApplicationJob
     ::Instagram::MessageText.new(messaging).perform
   end
 
+  def read(messaging)
+    ::Instagram::ReadStatusService.new(params: messaging).perform
+  end
+
   def messages(entry)
     (entry[:messaging].presence || entry[:standby] || [])
   end
diff --git a/app/services/instagram/read_status_service.rb b/app/services/instagram/read_status_service.rb
new file mode 100644
index 000000000..80f67d680
--- /dev/null
+++ b/app/services/instagram/read_status_service.rb
@@ -0,0 +1,28 @@
+class Instagram::ReadStatusService
+  pattr_initialize [:params!]
+
+  def perform
+    return if instagram_channel.blank?
+
+    process_status if message.present?
+  end
+
+  def process_status
+    @message.status = 'read'
+    @message.save!
+  end
+
+  def instagram_id
+    params[:recipient][:id]
+  end
+
+  def instagram_channel
+    @instagram_channel ||= Channel::FacebookPage.find_by(instagram_id: instagram_id)
+  end
+
+  def message
+    return unless params[:read][:mid]
+
+    @message ||= @instagram_channel.inbox.messages.find_by(source_id: params[:read][:mid])
+  end
+end
diff --git a/spec/factories/instagram/instagram_message_create_event.rb b/spec/factories/instagram/instagram_message_create_event.rb
index 6b66c29a7..4cc8b7f67 100644
--- a/spec/factories/instagram/instagram_message_create_event.rb
+++ b/spec/factories/instagram/instagram_message_create_event.rb
@@ -242,4 +242,30 @@ FactoryBot.define do
     end
     initialize_with { attributes }
   end
+
+  factory :messaging_seen_event, class: Hash do
+    entry do
+      [
+        {
+          'id': 'instagram-message-id-123',
+          'time': '2021-09-08T06:34:04+0000',
+          'messaging': [
+            {
+              'sender': {
+                'id': 'Sender-id-1'
+              },
+              'recipient': {
+                'id': 'chatwoot-app-user-id-1'
+              },
+              'timestamp': '2021-09-08T06:34:04+0000',
+              'read': {
+                'mid': 'message-id-1'
+              }
+            }
+          ]
+        }
+      ]
+    end
+    initialize_with { attributes }
+  end
 end
diff --git a/spec/jobs/webhooks/instagram_events_job_spec.rb b/spec/jobs/webhooks/instagram_events_job_spec.rb
index b5e73e2f5..905810512 100644
--- a/spec/jobs/webhooks/instagram_events_job_spec.rb
+++ b/spec/jobs/webhooks/instagram_events_job_spec.rb
@@ -27,6 +27,7 @@ describe Webhooks::InstagramEventsJob do
   let!(:attachment_params) { build(:instagram_message_attachment_event).with_indifferent_access }
   let!(:story_mention_params) { build(:instagram_story_mention_event).with_indifferent_access }
   let!(:story_mention_echo_params) { build(:instagram_story_mention_event_with_echo).with_indifferent_access }
+  let!(:messaging_seen_event) { build(:messaging_seen_event).with_indifferent_access }
   let(:fb_object) { double }
 
   describe '#perform' do
@@ -151,6 +152,11 @@ describe Webhooks::InstagramEventsJob do
         expect(instagram_inbox.contact_inboxes.count).to be 0
         expect(instagram_inbox.messages.count).to be 0
       end
+
+      it 'handle messaging_seen callback' do
+        expect(Instagram::ReadStatusService).to receive(:new).with(params: messaging_seen_event[:entry][0][:messaging][0]).and_call_original
+        instagram_webhook.perform_now(messaging_seen_event[:entry])
+      end
     end
   end
 end
diff --git a/spec/services/instagram/read_status_service_spec.rb b/spec/services/instagram/read_status_service_spec.rb
new file mode 100644
index 000000000..db5dc73b3
--- /dev/null
+++ b/spec/services/instagram/read_status_service_spec.rb
@@ -0,0 +1,48 @@
+require 'rails_helper'
+
+describe Instagram::ReadStatusService do
+  before do
+    create(:message, message_type: :incoming, inbox: instagram_inbox, account: account, conversation: conversation,
+                     source_id: 'chatwoot-app-user-id-1')
+  end
+
+  let!(:account) { create(:account) }
+  let!(:instagram_channel) { create(:channel_instagram_fb_page, account: account, instagram_id: 'chatwoot-app-user-id-1') }
+  let!(:instagram_inbox) { create(:inbox, channel: instagram_channel, account: account, greeting_enabled: false) }
+  let!(:contact) { create(:contact, account: account) }
+  let(:contact_inbox) { create(:contact_inbox, contact: contact, inbox: instagram_inbox) }
+  let(:conversation) { create(:conversation, contact: contact, inbox: instagram_inbox, contact_inbox: contact_inbox) }
+
+  describe '#perform' do
+    context 'when messaging_seen callback is fired' do
+      let(:message) { conversation.messages.last }
+
+      it 'updates the message status to read if the status is delivered' do
+        params = {
+          recipient: {
+            id: 'chatwoot-app-user-id-1'
+          },
+          read: {
+            mid: message.source_id
+          }
+        }
+        described_class.new(params: params).perform
+        expect(conversation.reload.messages.last.status).to eq('read')
+      end
+
+      it 'does not update the status if message is not found' do
+        params = {
+          recipient: {
+            id: 'chatwoot-app-user-id-1'
+          },
+          read: {
+            mid: 'random-message-id'
+          }
+        }
+
+        described_class.new(params: params).perform
+        expect(conversation.reload.messages.last.status).not_to eq('read')
+      end
+    end
+  end
+end

From b94c89ebf1be7ae4a97700dc591915d958d060f8 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Thu, 19 Oct 2023 13:22:19 +0530
Subject: [PATCH 03/94] fix: Show sent status for messenger channel (#8145)

---
 .../components/widgets/conversation/bubble/Actions.vue      | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue b/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue
index 27eecdc4b..2e58bce10 100644
--- a/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue
@@ -201,7 +201,11 @@ export default {
         return !!this.sourceId;
       }
 
-      if (this.isAWhatsAppChannel || this.isATwilioChannel) {
+      if (
+        this.isAWhatsAppChannel ||
+        this.isATwilioChannel ||
+        this.isAFacebookInbox
+      ) {
         return this.sourceId && this.isSent;
       }
       return false;

From 7416bbb25eb74bae537888e590321a6507445771 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Fri, 20 Oct 2023 01:54:46 +0530
Subject: [PATCH 04/94] feat: support reply to for outgoing message in WhatsApp
 (#8107)

- This PR enables replies to WhatsApp.
---
 .../widgets/conversation/ReplyBox.vue         | 31 +++++++++++++------
 .../widgets/conversation/bubble/ReplyTo.vue   |  3 +-
 app/models/message.rb                         | 12 +++----
 .../messages/in_reply_to_message_builder.rb   | 24 ++++++++++++++
 .../whatsapp/incoming_message_base_service.rb |  3 +-
 .../incoming_message_service_helpers.rb       | 10 +-----
 .../providers/whatsapp_cloud_service.rb       | 11 +++++++
 .../providers/whatsapp_cloud_service_spec.rb  | 30 +++++++++++++++++-
 8 files changed, 95 insertions(+), 29 deletions(-)
 create mode 100644 app/services/messages/in_reply_to_message_builder.rb

diff --git a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
index 5ad5f66a4..23f339f46 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
@@ -964,6 +964,19 @@ export default {
         (item, index) => itemIndex !== index
       );
     },
+    setReplyToInPayload(payload) {
+      if (this.inReplyTo?.id) {
+        return {
+          ...payload,
+          contentAttributes: {
+            ...payload.contentAttributes,
+            in_reply_to: this.inReplyTo.id,
+          },
+        };
+      }
+
+      return payload;
+    },
     getMessagePayloadForWhatsapp(message) {
       const multipleMessagePayload = [];
 
@@ -973,41 +986,41 @@ export default {
           const attachedFile = this.globalConfig.directUploadsEnabled
             ? attachment.blobSignedId
             : attachment.resource.file;
-          const attachmentPayload = {
+          let attachmentPayload = {
             conversationId: this.currentChat.id,
             files: [attachedFile],
             private: false,
             message: caption,
             sender: this.sender,
           };
+
+          attachmentPayload = this.setReplyToInPayload(attachmentPayload);
           multipleMessagePayload.push(attachmentPayload);
           caption = '';
         });
       } else {
-        const messagePayload = {
+        let messagePayload = {
           conversationId: this.currentChat.id,
           message,
           private: false,
           sender: this.sender,
         };
+
+        messagePayload = this.setReplyToInPayload(messagePayload);
+
         multipleMessagePayload.push(messagePayload);
       }
 
       return multipleMessagePayload;
     },
     getMessagePayload(message) {
-      const messagePayload = {
+      let messagePayload = {
         conversationId: this.currentChat.id,
         message,
         private: this.isPrivate,
         sender: this.sender,
       };
-
-      if (this.inReplyTo?.id) {
-        messagePayload.contentAttributes = {
-          in_reply_to: this.inReplyTo.id,
-        };
-      }
+      messagePayload = this.setReplyToInPayload(messagePayload);
 
       if (this.attachedFiles && this.attachedFiles.length) {
         messagePayload.files = [];
diff --git a/app/javascript/dashboard/components/widgets/conversation/bubble/ReplyTo.vue b/app/javascript/dashboard/components/widgets/conversation/bubble/ReplyTo.vue
index 06b6f0445..fb557293b 100644
--- a/app/javascript/dashboard/components/widgets/conversation/bubble/ReplyTo.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/bubble/ReplyTo.vue
@@ -1,10 +1,11 @@
 <template>
   <div
-    class="px-2 py-1.5 -mx-2 rounded-sm min-w-[15rem] mb-2"
+    class="px-2 py-1.5 rounded-sm min-w-[10rem] mb-2"
     :class="{
       'bg-slate-100 dark:bg-slate-600 dark:text-slate-50':
         messageType === MESSAGE_TYPE.INCOMING,
       'bg-woot-600 text-woot-50': messageType === MESSAGE_TYPE.OUTGOING,
+      '-mx-2': message.content,
     }"
   >
     <message-preview
diff --git a/app/models/message.rb b/app/models/message.rb
index 702c1193e..93258da5a 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -239,13 +239,11 @@ class Message < ApplicationRecord
     in_reply_to = content_attributes[:in_reply_to]
     in_reply_to_external_id = content_attributes[:in_reply_to_external_id]
 
-    if in_reply_to.present? && in_reply_to_external_id.blank?
-      message = conversation.messages.find_by(id: in_reply_to)
-      content_attributes[:in_reply_to_external_id] = message.try(:source_id)
-    elsif in_reply_to_external_id.present? && in_reply_to.blank?
-      message = conversation.messages.find_by(source_id: in_reply_to_external_id)
-      content_attributes[:in_reply_to] = message.try(:id)
-    end
+    Messages::InReplyToMessageBuilder.new(
+      message: self,
+      in_reply_to: in_reply_to,
+      in_reply_to_external_id: in_reply_to_external_id
+    ).perform
   end
 
   def ensure_content_type
diff --git a/app/services/messages/in_reply_to_message_builder.rb b/app/services/messages/in_reply_to_message_builder.rb
new file mode 100644
index 000000000..be4724694
--- /dev/null
+++ b/app/services/messages/in_reply_to_message_builder.rb
@@ -0,0 +1,24 @@
+class Messages::InReplyToMessageBuilder
+  pattr_initialize [:message!, :in_reply_to!, :in_reply_to_external_id!]
+
+  delegate :conversation, to: :message
+
+  def perform
+    set_in_reply_to_attribute if @in_reply_to.present? || @in_reply_to_external_id.present?
+  end
+
+  private
+
+  def set_in_reply_to_attribute
+    @message.content_attributes[:in_reply_to_external_id] = in_reply_to_message.try(:source_id)
+    @message.content_attributes[:in_reply_to] = in_reply_to_message.try(:id)
+  end
+
+  def in_reply_to_message
+    return conversation.messages.find_by(id: @in_reply_to) if @in_reply_to.present?
+
+    return conversation.messages.find_by(source_id: @in_reply_to_external_id) if @in_reply_to_external_id
+
+    nil
+  end
+end
diff --git a/app/services/whatsapp/incoming_message_base_service.rb b/app/services/whatsapp/incoming_message_base_service.rb
index 0fd758979..2d3b4efd3 100644
--- a/app/services/whatsapp/incoming_message_base_service.rb
+++ b/app/services/whatsapp/incoming_message_base_service.rb
@@ -144,8 +144,7 @@ class Whatsapp::IncomingMessageBaseService
       message_type: :incoming,
       sender: @contact,
       source_id: message[:id].to_s,
-      in_reply_to_external_id: @in_reply_to_external_id,
-      in_reply_to: @in_reply_to
+      in_reply_to_external_id: @in_reply_to_external_id
     )
   end
 
diff --git a/app/services/whatsapp/incoming_message_service_helpers.rb b/app/services/whatsapp/incoming_message_service_helpers.rb
index ad2fccd03..76a31576e 100644
--- a/app/services/whatsapp/incoming_message_service_helpers.rb
+++ b/app/services/whatsapp/incoming_message_service_helpers.rb
@@ -88,15 +88,7 @@ module Whatsapp::IncomingMessageServiceHelpers
   end
 
   def process_in_reply_to(message)
-    return if message['context'].blank?
-
-    @in_reply_to_external_id = message['context']['id']
-
-    return if @in_reply_to_external_id.blank?
-
-    in_reply_to_message = Message.find_by(source_id: @in_reply_to_external_id)
-
-    @in_reply_to = in_reply_to_message.id if in_reply_to_message.present?
+    @in_reply_to_external_id = message['context']&.[]('id')
   end
 
   def find_message_by_source_id(source_id)
diff --git a/app/services/whatsapp/providers/whatsapp_cloud_service.rb b/app/services/whatsapp/providers/whatsapp_cloud_service.rb
index d1092e2ff..f1af38e36 100644
--- a/app/services/whatsapp/providers/whatsapp_cloud_service.rb
+++ b/app/services/whatsapp/providers/whatsapp_cloud_service.rb
@@ -78,6 +78,7 @@ class Whatsapp::Providers::WhatsappCloudService < Whatsapp::Providers::BaseServi
       headers: api_headers,
       body: {
         messaging_product: 'whatsapp',
+        context: whatsapp_reply_context(message),
         to: phone_number,
         text: { body: message.content },
         type: 'text'
@@ -100,6 +101,7 @@ class Whatsapp::Providers::WhatsappCloudService < Whatsapp::Providers::BaseServi
       headers: api_headers,
       body: {
         :messaging_product => 'whatsapp',
+        :context => whatsapp_reply_context(message),
         'to' => phone_number,
         'type' => type,
         type.to_s => type_content
@@ -132,6 +134,15 @@ class Whatsapp::Providers::WhatsappCloudService < Whatsapp::Providers::BaseServi
     }
   end
 
+  def whatsapp_reply_context(message)
+    reply_to = message.content_attributes[:in_reply_to_external_id]
+    return nil if reply_to.blank?
+
+    {
+      message_id: reply_to
+    }
+  end
+
   def send_interactive_text_message(phone_number, message)
     payload = create_payload_based_on_items(message)
 
diff --git a/spec/services/whatsapp/providers/whatsapp_cloud_service_spec.rb b/spec/services/whatsapp/providers/whatsapp_cloud_service_spec.rb
index 1bf115476..7c2b79b8d 100644
--- a/spec/services/whatsapp/providers/whatsapp_cloud_service_spec.rb
+++ b/spec/services/whatsapp/providers/whatsapp_cloud_service_spec.rb
@@ -3,8 +3,18 @@ require 'rails_helper'
 describe Whatsapp::Providers::WhatsappCloudService do
   subject(:service) { described_class.new(whatsapp_channel: whatsapp_channel) }
 
+  let(:conversation) { create(:conversation, inbox: whatsapp_channel.inbox) }
   let(:whatsapp_channel) { create(:channel_whatsapp, provider: 'whatsapp_cloud', validate_provider_config: false, sync_templates: false) }
-  let(:message) { create(:message, message_type: :outgoing, content: 'test', inbox: whatsapp_channel.inbox) }
+
+  let(:message) do
+    create(:message, conversation: conversation, message_type: :outgoing, content: 'test', inbox: whatsapp_channel.inbox, source_id: 'external_id')
+  end
+
+  let(:message_with_reply) do
+    create(:message, conversation: conversation, message_type: :outgoing, content: 'reply', inbox: whatsapp_channel.inbox,
+                     content_attributes: { in_reply_to: message.id })
+  end
+
   let(:response_headers) { { 'Content-Type' => 'application/json' } }
   let(:whatsapp_response) { { messages: [{ id: 'message_id' }] } }
 
@@ -19,6 +29,7 @@ describe Whatsapp::Providers::WhatsappCloudService do
           .with(
             body: {
               messaging_product: 'whatsapp',
+              context: nil,
               to: '+123456789',
               text: { body: message.content },
               type: 'text'
@@ -28,6 +39,23 @@ describe Whatsapp::Providers::WhatsappCloudService do
         expect(service.send_message('+123456789', message)).to eq 'message_id'
       end
 
+      it 'calls message endpoints for a reply to messages' do
+        stub_request(:post, 'https://graph.facebook.com/v13.0/123456789/messages')
+          .with(
+            body: {
+              messaging_product: 'whatsapp',
+              context: {
+                message_id: message.source_id
+              },
+              to: '+123456789',
+              text: { body: message_with_reply.content },
+              type: 'text'
+            }.to_json
+          )
+          .to_return(status: 200, body: whatsapp_response.to_json, headers: response_headers)
+        expect(service.send_message('+123456789', message_with_reply)).to eq 'message_id'
+      end
+
       it 'calls message endpoints for image attachment message messages' do
         attachment = message.attachments.new(account_id: message.account_id, file_type: :image)
         attachment.file.attach(io: Rails.root.join('spec/assets/avatar.png').open, filename: 'avatar.png', content_type: 'image/png')

From b9694a0818f23b2b35175f131dcea305607600df Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Fri, 20 Oct 2023 13:14:20 +0530
Subject: [PATCH 05/94] feat: support reply to for Telegram (#8105)

Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
---
 app/builders/messages/message_builder.rb      | 38 +++++++++-
 app/javascript/dashboard/api/inbox/message.js |  4 ++
 .../dashboard/api/specs/inbox/message.spec.js |  5 ++
 .../widgets/conversation/Message.vue          |  1 +
 .../widgets/conversation/bubble/ReplyTo.vue   |  6 +-
 app/models/channel/telegram.rb                | 22 ++++--
 .../telegram/incoming_message_service.rb      |  1 +
 app/services/telegram/param_helpers.rb        |  7 ++
 .../builders/messages/message_builder_spec.rb | 70 +++++++++++++++++++
 spec/models/channel/telegram_spec.rb          |  4 +-
 10 files changed, 146 insertions(+), 12 deletions(-)

diff --git a/app/builders/messages/message_builder.rb b/app/builders/messages/message_builder.rb
index af312bf2e..0ec73edc3 100644
--- a/app/builders/messages/message_builder.rb
+++ b/app/builders/messages/message_builder.rb
@@ -9,11 +9,11 @@ class Messages::MessageBuilder
     @user = user
     @message_type = params[:message_type] || 'outgoing'
     @attachments = params[:attachments]
-    @automation_rule = @params&.dig(:content_attributes, :automation_rule_id)
+    @automation_rule = content_attributes&.dig(:automation_rule_id)
     return unless params.instance_of?(ActionController::Parameters)
 
-    @in_reply_to = params.to_unsafe_h&.dig(:content_attributes, :in_reply_to)
-    @items = params.to_unsafe_h&.dig(:content_attributes, :items)
+    @in_reply_to = content_attributes&.dig(:in_reply_to)
+    @items = content_attributes&.dig(:items)
   end
 
   def perform
@@ -26,6 +26,38 @@ class Messages::MessageBuilder
 
   private
 
+  # Extracts content attributes from the given params.
+  # - Converts ActionController::Parameters to a regular hash if needed.
+  # - Attempts to parse a JSON string if content is a string.
+  # - Returns an empty hash if content is not present, if there's a parsing error, or if it's an unexpected type.
+  def content_attributes
+    params = convert_to_hash(@params)
+    content_attributes = params.fetch(:content_attributes, {})
+
+    return parse_json(content_attributes) if content_attributes.is_a?(String)
+    return content_attributes if content_attributes.is_a?(Hash)
+
+    {}
+  end
+
+  # Converts the given object to a hash.
+  # If it's an instance of ActionController::Parameters, converts it to an unsafe hash.
+  # Otherwise, returns the object as-is.
+  def convert_to_hash(obj)
+    return obj.to_unsafe_h if obj.instance_of?(ActionController::Parameters)
+
+    obj
+  end
+
+  # Attempts to parse a string as JSON.
+  # If successful, returns the parsed hash with symbolized names.
+  # If unsuccessful, returns nil.
+  def parse_json(content)
+    JSON.parse(content, symbolize_names: true)
+  rescue JSON::ParserError
+    {}
+  end
+
   def process_attachments
     return if @attachments.blank?
 
diff --git a/app/javascript/dashboard/api/inbox/message.js b/app/javascript/dashboard/api/inbox/message.js
index fc77b24f5..6cb885e3d 100644
--- a/app/javascript/dashboard/api/inbox/message.js
+++ b/app/javascript/dashboard/api/inbox/message.js
@@ -26,9 +26,13 @@ export const buildCreatePayload = ({
     payload.append('echo_id', echoId);
     payload.append('cc_emails', ccEmails);
     payload.append('bcc_emails', bccEmails);
+
     if (toEmails) {
       payload.append('to_emails', toEmails);
     }
+    if (contentAttributes) {
+      payload.append('content_attributes', JSON.stringify(contentAttributes));
+    }
   } else {
     payload = {
       content: message,
diff --git a/app/javascript/dashboard/api/specs/inbox/message.spec.js b/app/javascript/dashboard/api/specs/inbox/message.spec.js
index e75bf34b0..0d45b2157 100644
--- a/app/javascript/dashboard/api/specs/inbox/message.spec.js
+++ b/app/javascript/dashboard/api/specs/inbox/message.spec.js
@@ -50,6 +50,7 @@ describe('#ConversationAPI', () => {
         message: 'test content',
         echoId: 12,
         isPrivate: true,
+        contentAttributes: { in_reply_to: 12 },
         files: [new Blob(['test-content'], { type: 'application/pdf' })],
       });
       expect(formPayload).toBeInstanceOf(FormData);
@@ -57,6 +58,10 @@ describe('#ConversationAPI', () => {
       expect(formPayload.get('echo_id')).toEqual('12');
       expect(formPayload.get('private')).toEqual('true');
       expect(formPayload.get('cc_emails')).toEqual('');
+      expect(formPayload.get('bcc_emails')).toEqual('');
+      expect(formPayload.get('content_attributes')).toEqual(
+        '{"in_reply_to":12}'
+      );
     });
 
     it('builds object payload if file is not available', () => {
diff --git a/app/javascript/dashboard/components/widgets/conversation/Message.vue b/app/javascript/dashboard/components/widgets/conversation/Message.vue
index 920d115b5..363003982 100644
--- a/app/javascript/dashboard/components/widgets/conversation/Message.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/Message.vue
@@ -38,6 +38,7 @@
           v-if="inReplyToMessageId && inboxSupportsReplyTo"
           :message="inReplyTo"
           :message-type="data.message_type"
+          :parent-has-attachments="hasAttachments"
         />
         <bubble-text
           v-if="data.content"
diff --git a/app/javascript/dashboard/components/widgets/conversation/bubble/ReplyTo.vue b/app/javascript/dashboard/components/widgets/conversation/bubble/ReplyTo.vue
index fb557293b..7bc4d5156 100644
--- a/app/javascript/dashboard/components/widgets/conversation/bubble/ReplyTo.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/bubble/ReplyTo.vue
@@ -5,7 +5,7 @@
       'bg-slate-100 dark:bg-slate-600 dark:text-slate-50':
         messageType === MESSAGE_TYPE.INCOMING,
       'bg-woot-600 text-woot-50': messageType === MESSAGE_TYPE.OUTGOING,
-      '-mx-2': message.content,
+      '-mx-2': !parentHasAttachments,
     }"
   >
     <message-preview
@@ -34,6 +34,10 @@ export default {
       type: Number,
       required: true,
     },
+    parentHasAttachments: {
+      type: Boolean,
+      required: true,
+    },
   },
   data() {
     return { MESSAGE_TYPE };
diff --git a/app/models/channel/telegram.rb b/app/models/channel/telegram.rb
index ffc6433b2..ac2f4b9be 100644
--- a/app/models/channel/telegram.rb
+++ b/app/models/channel/telegram.rb
@@ -77,8 +77,16 @@ class Channel::Telegram < ApplicationRecord
     errors.add(:bot_token, 'error setting up the webook') unless response.success?
   end
 
+  def chat_id(message)
+    message.conversation[:additional_attributes]['chat_id']
+  end
+
+  def reply_to_message_id(message)
+    message.content_attributes['in_reply_to_external_id']
+  end
+
   def send_message(message)
-    response = message_request(message.conversation[:additional_attributes]['chat_id'], message.content, reply_markup(message))
+    response = message_request(chat_id(message), message.content, reply_markup(message), reply_to_message_id(message))
     response.parsed_response['result']['message_id'] if response.success?
   end
 
@@ -115,24 +123,26 @@ class Channel::Telegram < ApplicationRecord
       telegram_attachments << telegram_attachment
     end
 
-    response = attachments_request(message.conversation[:additional_attributes]['chat_id'], telegram_attachments)
+    response = attachments_request(chat_id(message), telegram_attachments, reply_to_message_id(message))
     response.parsed_response['result'].first['message_id'] if response.success?
   end
 
-  def attachments_request(chat_id, attachments)
+  def attachments_request(chat_id, attachments, reply_to_message_id)
     HTTParty.post("#{telegram_api_url}/sendMediaGroup",
                   body: {
                     chat_id: chat_id,
-                    media: attachments.to_json
+                    media: attachments.to_json,
+                    reply_to_message_id: reply_to_message_id
                   })
   end
 
-  def message_request(chat_id, text, reply_markup = nil)
+  def message_request(chat_id, text, reply_markup = nil, reply_to_message_id = nil)
     HTTParty.post("#{telegram_api_url}/sendMessage",
                   body: {
                     chat_id: chat_id,
                     text: text,
-                    reply_markup: reply_markup
+                    reply_markup: reply_markup,
+                    reply_to_message_id: reply_to_message_id
                   })
   end
 end
diff --git a/app/services/telegram/incoming_message_service.rb b/app/services/telegram/incoming_message_service.rb
index 51a99b4fb..7b0c9faec 100644
--- a/app/services/telegram/incoming_message_service.rb
+++ b/app/services/telegram/incoming_message_service.rb
@@ -19,6 +19,7 @@ class Telegram::IncomingMessageService
       inbox_id: @inbox.id,
       message_type: :incoming,
       sender: @contact,
+      content_attributes: telegram_params_content_attributes,
       source_id: telegram_params_message_id.to_s
     )
 
diff --git a/app/services/telegram/param_helpers.rb b/app/services/telegram/param_helpers.rb
index 5accae1f1..6201fa0f3 100644
--- a/app/services/telegram/param_helpers.rb
+++ b/app/services/telegram/param_helpers.rb
@@ -6,6 +6,13 @@ module Telegram::ParamHelpers
     params.dig(:message, :chat, :type) == 'private'
   end
 
+  def telegram_params_content_attributes
+    reply_to = params.dig(:message, :reply_to_message, :message_id)
+    return { 'in_reply_to_external_id' => reply_to } if reply_to
+
+    {}
+  end
+
   def message_params?
     params[:message].present?
   end
diff --git a/spec/builders/messages/message_builder_spec.rb b/spec/builders/messages/message_builder_spec.rb
index 728cb8cf1..891f8eb02 100644
--- a/spec/builders/messages/message_builder_spec.rb
+++ b/spec/builders/messages/message_builder_spec.rb
@@ -8,6 +8,7 @@ describe Messages::MessageBuilder do
   let(:inbox) { create(:inbox, account: account) }
   let(:inbox_member) { create(:inbox_member, inbox: inbox, account: account) }
   let(:conversation) { create(:conversation, inbox: inbox, account: account) }
+  let(:message_for_reply) { create(:message, conversation: conversation) }
   let(:params) do
     ActionController::Parameters.new({
                                        content: 'test'
@@ -21,6 +22,75 @@ describe Messages::MessageBuilder do
     end
   end
 
+  describe '#content_attributes' do
+    context 'when content_attributes is a JSON string' do
+      let(:params) do
+        ActionController::Parameters.new({
+                                           content: 'test',
+                                           content_attributes: "{\"in_reply_to\":#{message_for_reply.id}}"
+                                         })
+      end
+
+      it 'parses content_attributes from JSON string' do
+        message = described_class.new(user, conversation, params).perform
+        expect(message.content_attributes).to include(in_reply_to: message_for_reply.id)
+      end
+    end
+
+    context 'when content_attributes is a hash' do
+      let(:params) do
+        ActionController::Parameters.new({
+                                           content: 'test',
+                                           content_attributes: { in_reply_to: message_for_reply.id }
+                                         })
+      end
+
+      it 'uses content_attributes as provided' do
+        message = described_class.new(user, conversation, params).perform
+        expect(message.content_attributes).to include(in_reply_to: message_for_reply.id)
+      end
+    end
+
+    context 'when content_attributes is absent' do
+      let(:params) do
+        ActionController::Parameters.new({ content: 'test' })
+      end
+
+      it 'defaults to an empty hash' do
+        message = message_builder
+        expect(message.content_attributes).to eq({})
+      end
+    end
+
+    context 'when content_attributes is nil' do
+      let(:params) do
+        ActionController::Parameters.new({
+                                           content: 'test',
+                                           content_attributes: nil
+                                         })
+      end
+
+      it 'defaults to an empty hash' do
+        message = message_builder
+        expect(message.content_attributes).to eq({})
+      end
+    end
+
+    context 'when content_attributes is an invalid JSON string' do
+      let(:params) do
+        ActionController::Parameters.new({
+                                           content: 'test',
+                                           content_attributes: 'invalid_json'
+                                         })
+      end
+
+      it 'defaults to an empty hash' do
+        message = message_builder
+        expect(message.content_attributes).to eq({})
+      end
+    end
+  end
+
   describe '#perform when message_type is incoming' do
     context 'when channel is not api' do
       let(:params) do
diff --git a/spec/models/channel/telegram_spec.rb b/spec/models/channel/telegram_spec.rb
index 4fe49f844..0fa5515fb 100644
--- a/spec/models/channel/telegram_spec.rb
+++ b/spec/models/channel/telegram_spec.rb
@@ -10,7 +10,7 @@ RSpec.describe Channel::Telegram do
 
       stub_request(:post, "https://api.telegram.org/bot#{telegram_channel.bot_token}/sendMessage")
         .with(
-          body: 'chat_id=123&text=test&reply_markup='
+          body: 'chat_id=123&text=test&reply_markup=&reply_to_message_id='
         )
         .to_return(
           status: 200,
@@ -32,7 +32,7 @@ RSpec.describe Channel::Telegram do
         .with(
           body: 'chat_id=123&text=test' \
                 '&reply_markup=%7B%22one_time_keyboard%22%3Atrue%2C%22inline_keyboard%22%3A%5B%5B%7B%22text%22%3A%22test%22%2C%22' \
-                'callback_data%22%3A%22test%22%7D%5D%5D%7D'
+                'callback_data%22%3A%22test%22%7D%5D%5D%7D&reply_to_message_id='
         )
         .to_return(
           status: 200,

From 35a9acf099f5a56b77fd904ef80aa0ce27722a33 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Fri, 20 Oct 2023 13:52:30 +0530
Subject: [PATCH 06/94] feat: Adds the ability to set an emoji for help center
 category (#8111)

---
 .../api/v1/accounts/categories_controller.rb  |   2 +-
 .../dashboard/i18n/locale/en/emoji.json       |   3 +-
 .../dashboard/i18n/locale/en/helpCenter.json  |   4 +-
 .../components/HelpCenterLayout.vue           |   4 +-
 .../pages/categories/AddCategory.vue          |  29 +++--
 .../pages/categories/CategoryListItem.vue     |   2 +-
 .../pages/categories/EditCategory.vue         |  32 +++--
 .../pages/categories/NameEmojiInput.vue       | 123 ++++++++++++++++++
 .../FluentIcon/dashboard-icons.json           |   2 +
 .../shared/components/emoji/EmojiInput.vue    |  28 +++-
 app/models/category.rb                        |   1 +
 .../categories/_category.json.jbuilder        |   1 +
 .../20231013072802_add_icon_to_categories.rb  |   5 +
 db/schema.rb                                  |   3 +-
 14 files changed, 197 insertions(+), 42 deletions(-)
 create mode 100644 app/javascript/dashboard/routes/dashboard/helpcenter/pages/categories/NameEmojiInput.vue
 create mode 100644 db/migrate/20231013072802_add_icon_to_categories.rb

diff --git a/app/controllers/api/v1/accounts/categories_controller.rb b/app/controllers/api/v1/accounts/categories_controller.rb
index 73fc5d885..834b19ed9 100644
--- a/app/controllers/api/v1/accounts/categories_controller.rb
+++ b/app/controllers/api/v1/accounts/categories_controller.rb
@@ -48,7 +48,7 @@ class Api::V1::Accounts::CategoriesController < Api::V1::Accounts::BaseControlle
 
   def category_params
     params.require(:category).permit(
-      :name, :description, :position, :slug, :locale, :parent_category_id, :associated_category_id
+      :name, :description, :position, :slug, :locale, :icon, :parent_category_id, :associated_category_id
     )
   end
 
diff --git a/app/javascript/dashboard/i18n/locale/en/emoji.json b/app/javascript/dashboard/i18n/locale/en/emoji.json
index fd81268fb..d5b96f0f9 100644
--- a/app/javascript/dashboard/i18n/locale/en/emoji.json
+++ b/app/javascript/dashboard/i18n/locale/en/emoji.json
@@ -1,6 +1,7 @@
 {
   "EMOJI": {
     "PLACEHOLDER": "Search emojis",
-    "NOT_FOUND": "No emoji match your search"
+    "NOT_FOUND": "No emoji match your search",
+    "REMOVE": "Remove"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/en/helpCenter.json b/app/javascript/dashboard/i18n/locale/en/helpCenter.json
index 72f642584..af692a27e 100644
--- a/app/javascript/dashboard/i18n/locale/en/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/en/helpCenter.json
@@ -365,7 +365,7 @@
         "NAME": {
           "LABEL": "Name",
           "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Name is required"
         },
         "SLUG": {
@@ -396,7 +396,7 @@
         "NAME": {
           "LABEL": "Name",
           "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Name is required"
         },
         "SLUG": {
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/components/HelpCenterLayout.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/HelpCenterLayout.vue
index 1c7c9a84c..86c6bbd82 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/components/HelpCenterLayout.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/HelpCenterLayout.vue
@@ -224,7 +224,9 @@ export default {
           key: 'category',
           children: this.categories.map(category => ({
             id: category.id,
-            label: category.name,
+            label: category.icon
+              ? `${category.icon} ${category.name}`
+              : category.name,
             count: category.meta.articles_count,
             truncateLabel: true,
             toState: frontendURL(
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/categories/AddCategory.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/categories/AddCategory.vue
index 5c794254c..1a332510a 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/categories/AddCategory.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/categories/AddCategory.vue
@@ -21,15 +21,14 @@
             </label>
           </div>
         </div>
-        <woot-input
-          v-model.trim="name"
-          :class="{ error: $v.name.$error }"
-          class="w-full"
-          :error="nameError"
+        <category-name-icon-input
           :label="$t('HELP_CENTER.CATEGORY.ADD.NAME.LABEL')"
           :placeholder="$t('HELP_CENTER.CATEGORY.ADD.NAME.PLACEHOLDER')"
           :help-text="$t('HELP_CENTER.CATEGORY.ADD.NAME.HELP_TEXT')"
-          @input="onNameChange"
+          :has-error="$v.name.$error"
+          :error-message="$t('HELP_CENTER.CATEGORY.ADD.NAME.ERROR')"
+          @name-change="onNameChange"
+          @icon-change="onClickInsertEmoji"
         />
         <woot-input
           v-model.trim="slug"
@@ -72,8 +71,10 @@ import alertMixin from 'shared/mixins/alertMixin';
 import { required, minLength } from 'vuelidate/lib/validators';
 import { convertToCategorySlug } from 'dashboard/helper/commons.js';
 import { PORTALS_EVENTS } from '../../../../../helper/AnalyticsHelper/events';
+import CategoryNameIconInput from './NameEmojiInput.vue';
 
 export default {
+  components: { CategoryNameIconInput },
   mixins: [alertMixin],
   props: {
     show: {
@@ -96,6 +97,7 @@ export default {
   data() {
     return {
       name: '',
+      icon: '',
       slug: '',
       description: '',
     };
@@ -115,12 +117,6 @@ export default {
         ? this.$route.params.portalSlug
         : this.portalSlug;
     },
-    nameError() {
-      if (this.$v.name.$error) {
-        return this.$t('HELP_CENTER.CATEGORY.ADD.NAME.ERROR');
-      }
-      return '';
-    },
     slugError() {
       if (this.$v.slug.$error) {
         return this.$t('HELP_CENTER.CATEGORY.ADD.SLUG.ERROR');
@@ -129,7 +125,8 @@ export default {
     },
   },
   methods: {
-    onNameChange() {
+    onNameChange(name) {
+      this.name = name;
       this.slug = convertToCategorySlug(this.name);
     },
     onCreate() {
@@ -138,11 +135,15 @@ export default {
     onClose() {
       this.$emit('cancel');
     },
+    onClickInsertEmoji(emoji) {
+      this.icon = emoji;
+    },
 
     async addCategory() {
-      const { name, slug, description, locale } = this;
+      const { name, slug, description, locale, icon } = this;
       const data = {
         name,
+        icon,
         slug,
         description,
         locale,
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/categories/CategoryListItem.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/categories/CategoryListItem.vue
index b50f5a3ba..1e9886510 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/categories/CategoryListItem.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/categories/CategoryListItem.vue
@@ -24,7 +24,7 @@
       <tbody>
         <tr v-for="category in categories" :key="category.id">
           <td>
-            <span>{{ category.name }}</span>
+            <span>{{ category.icon }} {{ category.name }}</span>
           </td>
           <td>
             <span>{{ category.description }}</span>
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/categories/EditCategory.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/categories/EditCategory.vue
index 275c36774..56887f206 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/categories/EditCategory.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/categories/EditCategory.vue
@@ -21,15 +21,16 @@
             </label>
           </div>
         </div>
-        <woot-input
-          v-model.trim="name"
-          :class="{ error: $v.name.$error }"
-          class="w-full"
-          :error="nameError"
+        <category-name-icon-input
           :label="$t('HELP_CENTER.CATEGORY.EDIT.NAME.LABEL')"
           :placeholder="$t('HELP_CENTER.CATEGORY.EDIT.NAME.PLACEHOLDER')"
           :help-text="$t('HELP_CENTER.CATEGORY.EDIT.NAME.HELP_TEXT')"
-          @input="onNameChange"
+          :has-error="$v.name.$error"
+          :error-message="$t('HELP_CENTER.CATEGORY.ADD.NAME.ERROR')"
+          :existing-name="category.name"
+          :saved-icon="category.icon"
+          @name-change="changeName"
+          @icon-change="onClickInsertEmoji"
         />
         <woot-input
           v-model.trim="slug"
@@ -72,8 +73,10 @@ import alertMixin from 'shared/mixins/alertMixin';
 import { required, minLength } from 'vuelidate/lib/validators';
 import { convertToCategorySlug } from 'dashboard/helper/commons.js';
 import { PORTALS_EVENTS } from '../../../../../helper/AnalyticsHelper/events';
+import CategoryNameIconInput from './NameEmojiInput.vue';
 
 export default {
+  components: { CategoryNameIconInput },
   mixins: [alertMixin],
   props: {
     show: {
@@ -101,6 +104,7 @@ export default {
     return {
       id: this.category.id,
       name: '',
+      icon: '',
       slug: '',
       description: '',
     };
@@ -115,12 +119,6 @@ export default {
     },
   },
   computed: {
-    nameError() {
-      if (this.$v.name.$error) {
-        return this.$t('HELP_CENTER.CATEGORY.ADD.NAME.ERROR');
-      }
-      return '';
-    },
     slugError() {
       if (this.$v.slug.$error) {
         return this.$t('HELP_CENTER.CATEGORY.ADD.SLUG.ERROR');
@@ -135,12 +133,17 @@ export default {
     updateDataFromStore() {
       const { category } = this;
       this.name = category.name;
+      this.icon = category.icon;
       this.slug = category.slug;
       this.description = category.description;
     },
-    onNameChange() {
+    changeName(name) {
+      this.name = name;
       this.slug = convertToCategorySlug(this.name);
     },
+    onClickInsertEmoji(emoji) {
+      this.icon = emoji;
+    },
     onUpdate() {
       this.$emit('update');
     },
@@ -148,10 +151,11 @@ export default {
       this.$emit('cancel');
     },
     async editCategory() {
-      const { id, name, slug, description } = this;
+      const { id, name, slug, icon, description } = this;
       const data = {
         id,
         name,
+        icon,
         slug,
         description,
       };
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/categories/NameEmojiInput.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/categories/NameEmojiInput.vue
new file mode 100644
index 000000000..1d5da8b98
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/categories/NameEmojiInput.vue
@@ -0,0 +1,123 @@
+<template>
+  <div class="flex items-center relative">
+    <woot-button
+      variant="hollow"
+      class="absolute [&>span]:flex [&>span]:items-center [&>span]:justify-center z-10 top-[25px] h-[2.45rem] w-[2.45rem] !text-slate-400 dark:!text-slate-600 dark:!bg-slate-900 !p-0"
+      color-scheme="secondary"
+      @click="toggleEmojiPicker"
+    >
+      <span v-if="icon" v-dompurify-html="icon" class="text-lg" />
+      <fluent-icon
+        v-else
+        size="18"
+        icon="emoji-add"
+        type="outline"
+        class="text-slate-400 dark:text-slate-600"
+      />
+    </woot-button>
+    <woot-input
+      v-model="name"
+      :class="{ error: hasError }"
+      class="!mt-0 !mb-4 !mx-0 [&>input]:!mb-0 ltr:[&>input]:ml-12 rtl:[&>input]:mr-12 relative w-[calc(100%-3rem)] [&>p]:w-max"
+      :error="nameErrorMessage"
+      :label="label"
+      :placeholder="placeholder"
+      :help-text="helpText"
+      @input="onNameChange"
+    />
+    <emoji-input
+      v-if="showEmojiPicker"
+      v-on-clickaway="hideEmojiPicker"
+      class="left-0 top-16"
+      :show-remove-button="true"
+      :on-click="onClickInsertEmoji"
+    />
+  </div>
+</template>
+
+<script>
+import { mixin as clickaway } from 'vue-clickaway';
+
+const EmojiInput = () => import('shared/components/emoji/EmojiInput');
+
+export default {
+  components: { EmojiInput },
+  mixins: [clickaway],
+  props: {
+    label: {
+      type: String,
+      default: '',
+    },
+    placeholder: {
+      type: String,
+      default: '',
+    },
+    helpText: {
+      type: String,
+      default: '',
+    },
+    hasError: {
+      type: Boolean,
+      default: false,
+    },
+    errorMessage: {
+      type: String,
+      default: '',
+    },
+    existingName: {
+      type: String,
+      default: '',
+    },
+    savedIcon: {
+      type: String,
+      default: '',
+    },
+  },
+  data() {
+    return {
+      name: '',
+      icon: '',
+      showEmojiPicker: false,
+    };
+  },
+  computed: {
+    nameErrorMessage() {
+      if (this.hasError) {
+        return this.errorMessage;
+      }
+      return '';
+    },
+  },
+  mounted() {
+    this.updateDataFromStore();
+  },
+  methods: {
+    updateDataFromStore() {
+      this.name = this.existingName;
+      this.icon = this.savedIcon;
+    },
+    toggleEmojiPicker() {
+      this.showEmojiPicker = !this.showEmojiPicker;
+    },
+    onClickInsertEmoji(emoji = '') {
+      this.icon = emoji;
+      this.$emit('icon-change', emoji);
+      this.showEmojiPicker = false;
+    },
+    onNameChange() {
+      this.$emit('name-change', this.name);
+    },
+    hideEmojiPicker() {
+      if (this.showEmojiPicker) {
+        this.showEmojiPicker = false;
+      }
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.emoji-dialog::before {
+  @apply hidden;
+}
+</style>
diff --git a/app/javascript/shared/components/FluentIcon/dashboard-icons.json b/app/javascript/shared/components/FluentIcon/dashboard-icons.json
index 07d49eb48..5221a5d0e 100644
--- a/app/javascript/shared/components/FluentIcon/dashboard-icons.json
+++ b/app/javascript/shared/components/FluentIcon/dashboard-icons.json
@@ -92,6 +92,7 @@
   "credit-card-person-outline": "M2 7.25A3.25 3.25 0 0 1 5.25 4h13.5A3.25 3.25 0 0 1 22 7.25V10h-.258A3.74 3.74 0 0 0 20.5 7.455V7.25a1.75 1.75 0 0 0-1.75-1.75H5.25A1.75 1.75 0 0 0 3.5 7.25v.25h11.95c-.44.409-.782.922-.987 1.5H3.5v5.75c0 .966.784 1.75 1.75 1.75h6.78c.06.522.217 1.028.458 1.5H5.25A3.25 3.25 0 0 1 2 14.75v-7.5Zm21 8.25a1.5 1.5 0 0 0-1.5-1.5h-7a1.5 1.5 0 0 0-1.5 1.5v.5c0 1.971 1.86 4 5 4 3.14 0 5-2.029 5-4v-.5Zm-2.25-5.25a2.75 2.75 0 1 0-5.5 0 2.75 2.75 0 0 0 5.5 0Z",
   "delete-outline": "M12 1.75a3.25 3.25 0 0 1 3.245 3.066L15.25 5h5.25a.75.75 0 0 1 .102 1.493L20.5 6.5h-.796l-1.28 13.02a2.75 2.75 0 0 1-2.561 2.474l-.176.006H8.313a2.75 2.75 0 0 1-2.714-2.307l-.023-.174L4.295 6.5H3.5a.75.75 0 0 1-.743-.648L2.75 5.75a.75.75 0 0 1 .648-.743L3.5 5h5.25A3.25 3.25 0 0 1 12 1.75Zm6.197 4.75H5.802l1.267 12.872a1.25 1.25 0 0 0 1.117 1.122l.127.006h7.374c.6 0 1.109-.425 1.225-1.002l.02-.126L18.196 6.5ZM13.75 9.25a.75.75 0 0 1 .743.648L14.5 10v7a.75.75 0 0 1-1.493.102L13 17v-7a.75.75 0 0 1 .75-.75Zm-3.5 0a.75.75 0 0 1 .743.648L11 10v7a.75.75 0 0 1-1.493.102L9.5 17v-7a.75.75 0 0 1 .75-.75Zm1.75-6a1.75 1.75 0 0 0-1.744 1.606L10.25 5h3.5A1.75 1.75 0 0 0 12 3.25Z",
   "dismiss-circle-outline": "M12 2c5.523 0 10 4.477 10 10s-4.477 10-10 10S2 17.523 2 12 6.477 2 12 2Zm0 1.5a8.5 8.5 0 1 0 0 17 8.5 8.5 0 0 0 0-17Zm3.446 4.897.084.073a.75.75 0 0 1 .073.976l-.073.084L13.061 12l2.47 2.47a.75.75 0 0 1 .072.976l-.073.084a.75.75 0 0 1-.976.073l-.084-.073L12 13.061l-2.47 2.47a.75.75 0 0 1-.976.072l-.084-.073a.75.75 0 0 1-.073-.976l.073-.084L10.939 12l-2.47-2.47a.75.75 0 0 1-.072-.976l.073-.084a.75.75 0 0 1 .976-.073l.084.073L12 10.939l2.47-2.47a.75.75 0 0 1 .976-.072Z",
+  "dismiss-circle-filled": "M12 2c5.523 0 10 4.477 10 10s-4.477 10-10 10S2 17.523 2 12S6.477 2 12 2Zm3.53 6.47l-.084-.073a.75.75 0 0 0-.882-.007l-.094.08L12 10.939l-2.47-2.47l-.084-.072a.75.75 0 0 0-.882-.007l-.094.08l-.073.084a.75.75 0 0 0-.007.882l.08.094L10.939 12l-2.47 2.47l-.072.084a.75.75 0 0 0-.007.882l.08.094l.084.073a.75.75 0 0 0 .882.007l.094-.08L12 13.061l2.47 2.47l.084.072a.75.75 0 0 0 .882.007l.094-.08l.073-.084a.75.75 0 0 0 .007-.882l-.08-.094L13.061 12l2.47-2.47l.072-.084a.75.75 0 0 0 .007-.882l-.08-.094l-.084-.073l.084.073Z",
   "dismiss-outline": "m4.397 4.554.073-.084a.75.75 0 0 1 .976-.073l.084.073L12 10.939l6.47-6.47a.75.75 0 1 1 1.06 1.061L13.061 12l6.47 6.47a.75.75 0 0 1 .072.976l-.073.084a.75.75 0 0 1-.976.073l-.084-.073L12 13.061l-6.47 6.47a.75.75 0 0 1-1.06-1.061L10.939 12l-6.47-6.47a.75.75 0 0 1-.072-.976l.073-.084-.073.084Z",
   "document-outline": "M18.5 20a.5.5 0 0 1-.5.5H6a.5.5 0 0 1-.5-.5V4a.5.5 0 0 1 .5-.5h6V8a2 2 0 0 0 2 2h4.5v10Zm-5-15.379L17.378 8.5H14a.5.5 0 0 1-.5-.5V4.621Zm5.914 3.793-5.829-5.828c-.026-.026-.058-.046-.085-.07a2.072 2.072 0 0 0-.219-.18c-.04-.027-.086-.045-.128-.068-.071-.04-.141-.084-.216-.116a1.977 1.977 0 0 0-.624-.138C12.266 2.011 12.22 2 12.172 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V9.828a2 2 0 0 0-.586-1.414Z",
   "document-error-outline": "M6 2a2 2 0 0 0-2 2v5.207a5.48 5.48 0 0 1 1-.185V4a1 1 0 0 1 1-1h4v3.5A1.5 1.5 0 0 0 11.5 8H15v8a1 1 0 0 1-1 1h-3.6a5.507 5.507 0 0 1-.657 1H14a2 2 0 0 0 2-2V7.414a1.5 1.5 0 0 0-.44-1.06l-3.914-3.915A1.5 1.5 0 0 0 10.586 2H6Zm8.793 5H11.5a.5.5 0 0 1-.5-.5V3.207L14.793 7ZM10 14.5a4.5 4.5 0 1 1-9 0a4.5 4.5 0 0 1 9 0ZM5.5 12a.5.5 0 0 0-.5.5v2a.5.5 0 0 0 1 0v-2a.5.5 0 0 0-.5-.5Zm0 5.125a.625.625 0 1 0 0-1.25a.625.625 0 0 0 0 1.25Z",
@@ -100,6 +101,7 @@
   "dual-screen-clock-outline": "M10.019 6.002a6.632 6.632 0 0 0 .058 1.5H3.75a.25.25 0 0 0-.25.25v12.494c0 .138.112.25.25.25h7.498l-.001-10.167c.416.57.924 1.07 1.5 1.479v8.69h7.498a.25.25 0 0 0 .25-.25v-8.62a6.535 6.535 0 0 0 1.501-1.656V20.25a1.75 1.75 0 0 1-1.75 1.75h-8.998l-.001-.003H3.75A1.75 1.75 0 0 1 2 20.246V7.751c0-.966.784-1.75 1.75-1.75h6.269Zm6.22 11.498a.75.75 0 0 1 .101 1.493L16.24 19h-1.5a.75.75 0 0 1-.102-1.493l.102-.007h1.5Zm-6.996 0a.75.75 0 0 1 .102 1.493L9.243 19H7.74a.75.75 0 0 1-.102-1.493l.102-.007h1.502ZM16.498 1a5.5 5.5 0 1 1 0 11 5.5 5.5 0 0 1 0-11Zm-1 2a.5.5 0 0 0-.5.5v4a.5.5 0 0 0 .5.5h3.001a.5.5 0 0 0 0-1h-2.501V3.5a.5.5 0 0 0-.5-.5Z",
   "edit-outline": "M21.03 2.97a3.578 3.578 0 0 1 0 5.06L9.062 20a2.25 2.25 0 0 1-.999.58l-5.116 1.395a.75.75 0 0 1-.92-.921l1.395-5.116a2.25 2.25 0 0 1 .58-.999L15.97 2.97a3.578 3.578 0 0 1 5.06 0ZM15 6.06 5.062 16a.75.75 0 0 0-.193.333l-1.05 3.85 3.85-1.05A.75.75 0 0 0 8 18.938L17.94 9 15 6.06Zm2.03-2.03-.97.97L19 7.94l.97-.97a2.079 2.079 0 0 0-2.94-2.94Z",
   "emoji-outline": "M12 1.999c5.524 0 10.002 4.478 10.002 10.002 0 5.523-4.478 10.001-10.002 10.001-5.524 0-10.002-4.478-10.002-10.001C1.998 6.477 6.476 1.999 12 1.999Zm0 1.5a8.502 8.502 0 1 0 0 17.003A8.502 8.502 0 0 0 12 3.5ZM8.462 14.784A4.491 4.491 0 0 0 12 16.502a4.492 4.492 0 0 0 3.535-1.714.75.75 0 1 1 1.177.93A5.991 5.991 0 0 1 12 18.002a5.991 5.991 0 0 1-4.716-2.29.75.75 0 0 1 1.178-.928ZM9 8.75a1.25 1.25 0 1 1 0 2.499A1.25 1.25 0 0 1 9 8.75Zm6 0a1.25 1.25 0 1 1 0 2.499 1.25 1.25 0 0 1 0-2.499Z",
+  "emoji-add-outline": "M17.5 12a5.5 5.5 0 1 1 0 10.999a5.5 5.5 0 0 1 0-11ZM12 1.997c5.524 0 10.002 4.478 10.002 10.002c0 .263-.01.524-.03.782a6.503 6.503 0 0 0-1.475-1.052a8.501 8.501 0 1 0-8.765 8.767c.28.54.635 1.036 1.05 1.474c-.257.02-.518.03-.782.03c-5.524 0-10.002-4.478-10.002-10.001S6.476 1.998 12 1.998Zm5.5 12l-.09.008a.5.5 0 0 0-.402.402l-.008.09v2.5L14.498 17l-.09.008a.5.5 0 0 0-.402.402l-.008.09l.008.09a.5.5 0 0 0 .402.402l.09.008H17v2.504l.008.09a.5.5 0 0 0 .402.401l.09.009l.09-.009a.5.5 0 0 0 .402-.402l.008-.09v-2.504l2.504.001l.09-.008a.5.5 0 0 0 .402-.402l.008-.09l-.008-.09a.5.5 0 0 0-.402-.402l-.09-.008H18v-2.5l-.008-.09a.5.5 0 0 0-.402-.403l-.09-.008Zm-9.038.785a4.494 4.494 0 0 0 2.63 1.626a6.449 6.449 0 0 0-.079 1.51a5.982 5.982 0 0 1-3.73-2.208a.75.75 0 1 1 1.179-.928ZM9 8.75a1.25 1.25 0 1 1 0 2.499A1.25 1.25 0 0 1 9 8.75Zm6 0a1.25 1.25 0 1 1 0 2.499a1.25 1.25 0 0 1 0-2.499Z",
   "error-circle-outline": "M12 2c5.523 0 10 4.478 10 10s-4.477 10-10 10S2 17.522 2 12 6.477 2 12 2Zm0 1.667c-4.595 0-8.333 3.738-8.333 8.333 0 4.595 3.738 8.333 8.333 8.333 4.595 0 8.333-3.738 8.333-8.333 0-4.595-3.738-8.333-8.333-8.333Zm-.001 10.835a.999.999 0 1 1 0 1.998.999.999 0 0 1 0-1.998ZM11.994 7a.75.75 0 0 1 .744.648l.007.101.004 4.502a.75.75 0 0 1-1.493.103l-.007-.102-.004-4.501a.75.75 0 0 1 .75-.751Z",
   "file-upload-outline": "M6 2a2 2 0 0 0-2 2v5.207a5.48 5.48 0 0 1 1-.185V4a1 1 0 0 1 1-1h4v3.5A1.5 1.5 0 0 0 11.5 8H15v8a1 1 0 0 1-1 1h-3.6a5.507 5.507 0 0 1-.657 1H14a2 2 0 0 0 2-2V7.414a1.5 1.5 0 0 0-.44-1.06l-3.914-3.915A1.5 1.5 0 0 0 10.586 2H6Zm8.793 5H11.5a.5.5 0 0 1-.5-.5V3.207L14.793 7ZM5.5 19a4.5 4.5 0 1 0 0-9a4.5 4.5 0 0 0 0 9Zm2.354-4.854a.5.5 0 1 1-.708.708L6 13.707V16.5a.5.5 0 0 1-1 0v-2.793l-1.146 1.147a.5.5 0 1 1-.708-.707l2-2A.5.5 0 0 1 5.497 12h.006a.498.498 0 0 1 .348.144l.003.003l2 2Z",
   "filter-outline": "M13.5 16a.75.75 0 0 1 0 1.5h-3a.75.75 0 0 1 0-1.5h3Zm3-5a.75.75 0 0 1 0 1.5h-9a.75.75 0 0 1 0-1.5h9Zm3-5a.75.75 0 0 1 0 1.5h-15a.75.75 0 0 1 0-1.5h15Z",
diff --git a/app/javascript/shared/components/emoji/EmojiInput.vue b/app/javascript/shared/components/emoji/EmojiInput.vue
index 2c2e440aa..b225d1035 100644
--- a/app/javascript/shared/components/emoji/EmojiInput.vue
+++ b/app/javascript/shared/components/emoji/EmojiInput.vue
@@ -4,14 +4,24 @@
     class="emoji-dialog bg-white shadow-lg dark:bg-slate-900 rounded-md border border-solid border-slate-75 dark:border-slate-800/50 box-content h-[300px] absolute right-0 -top-[95px] w-80 z-20"
   >
     <div class="flex flex-col">
-      <div class="emoji-search--wrap">
+      <div class="emoji-search--wrap flex gap-2">
         <input
           ref="searchbar"
           v-model="search"
           type="text"
-          class="emoji-search--input focus:box-shadow-blue dark:focus:box-shadow-blue-dark"
+          class="emoji-search--input focus:box-shadow-blue dark:focus:box-shadow-dark"
           :placeholder="$t('EMOJI.PLACEHOLDER')"
         />
+        <woot-button
+          v-if="showRemoveButton"
+          size="small"
+          variant="smooth"
+          class="dark:!bg-slate-800 dark:!hover:bg-slate-700"
+          color-scheme="secondary"
+          @click="onClick('')"
+        >
+          {{ $t('EMOJI.REMOVE') }}
+        </woot-button>
       </div>
       <div v-if="hasNoSearch" ref="emojiItem" class="emoji-item">
         <h5 class="emoji-category--title">
@@ -99,6 +109,10 @@ export default {
       type: Function,
       default: () => {},
     },
+    showRemoveButton: {
+      type: Boolean,
+      default: false,
+    },
   },
   data() {
     return {
@@ -171,13 +185,13 @@ export default {
   .box-shadow-blue {
     box-shadow:
       0 0 0 1px #1f93ff,
-      0 0 2px 3px #c7e3ff;
+      0 0 1px 2px #c7e3ff;
   }
 
-  .box-shadow-blue-dark {
+  .box-shadow-dark {
     box-shadow:
-      0 0 0 1px #1f93ff,
-      0 0 2px 3px #4c5155;
+      0 0 0 1px #212222,
+      0 0 1px 2px #4c5155;
   }
 }
 </style>
@@ -217,7 +231,7 @@ export default {
   @apply m-2 sticky top-2;
 
   .emoji-search--input {
-    @apply text-sm focus-visible:border-transparent text-slate-800 dark:text-slate-100 h-8 m-0 p-2 w-full rounded-md bg-slate-75 dark:bg-slate-800 border border-solid border-transparent dark:border-slate-800/50;
+    @apply text-sm focus-visible:border-transparent text-slate-800 dark:text-slate-100 h-8 m-0 p-2 w-full rounded-md bg-slate-50 dark:bg-slate-800 border border-solid border-transparent dark:border-slate-800/50;
   }
 }
 
diff --git a/app/models/category.rb b/app/models/category.rb
index d0db67b94..a020533a9 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -4,6 +4,7 @@
 #
 #  id                     :bigint           not null, primary key
 #  description            :text
+#  icon                   :string           default("")
 #  locale                 :string           default("en")
 #  name                   :string
 #  position               :integer
diff --git a/app/views/api/v1/accounts/categories/_category.json.jbuilder b/app/views/api/v1/accounts/categories/_category.json.jbuilder
index 825b9c2d7..c3674b7fa 100644
--- a/app/views/api/v1/accounts/categories/_category.json.jbuilder
+++ b/app/views/api/v1/accounts/categories/_category.json.jbuilder
@@ -5,6 +5,7 @@ json.locale category.locale
 json.description category.description
 json.position category.position
 json.account_id category.account_id
+json.icon category.icon
 
 json.related_categories do
   if category.related_categories.any?
diff --git a/db/migrate/20231013072802_add_icon_to_categories.rb b/db/migrate/20231013072802_add_icon_to_categories.rb
new file mode 100644
index 000000000..195d405e7
--- /dev/null
+++ b/db/migrate/20231013072802_add_icon_to_categories.rb
@@ -0,0 +1,5 @@
+class AddIconToCategories < ActiveRecord::Migration[7.0]
+  def change
+    add_column :categories, :icon, :string, default: ''
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 15a0b6abd..ce15abf8f 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_11_041615) do
+ActiveRecord::Schema[7.0].define(version: 2023_10_13_072802) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_stat_statements"
   enable_extension "pg_trgm"
@@ -231,6 +231,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_10_11_041615) do
     t.string "slug", null: false
     t.bigint "parent_category_id"
     t.bigint "associated_category_id"
+    t.string "icon", default: ""
     t.index ["associated_category_id"], name: "index_categories_on_associated_category_id"
     t.index ["locale", "account_id"], name: "index_categories_on_locale_and_account_id"
     t.index ["locale"], name: "index_categories_on_locale"

From 6d9b2a6b3376c927aa1fd1c3f39d80896f2b94ef Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Fri, 20 Oct 2023 14:19:19 +0530
Subject: [PATCH 07/94] refactor: UI flags for Reply To (#8147)

---
 .../components/widgets/conversation/MessagesView.vue   |  2 +-
 app/javascript/shared/mixins/inboxMixin.js             | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue b/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
index 5370b27f6..10d28d108 100644
--- a/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
@@ -292,7 +292,7 @@ export default {
     },
     inboxSupportsReplyTo() {
       return (
-        this.inboxHasFeature(INBOX_FEATURES.REPLY_TO) &&
+        this.inboxHasFeature(INBOX_FEATURES.REPLY_TO_OUTGOING) &&
         this.isFeatureEnabledonAccount(
           this.accountId,
           FEATURE_FLAGS.MESSAGE_REPLY_TO
diff --git a/app/javascript/shared/mixins/inboxMixin.js b/app/javascript/shared/mixins/inboxMixin.js
index 35819d7ae..8266a5d37 100644
--- a/app/javascript/shared/mixins/inboxMixin.js
+++ b/app/javascript/shared/mixins/inboxMixin.js
@@ -13,16 +13,24 @@ export const INBOX_TYPES = {
 
 export const INBOX_FEATURES = {
   REPLY_TO: 'replyTo',
+  REPLY_TO_OUTGOING: 'replyToOutgoing',
 };
 
 // This is a single source of truth for inbox features
 // This is used to check if a feature is available for a particular inbox or not
 export const INBOX_FEATURE_MAP = {
   [INBOX_FEATURES.REPLY_TO]: [
+    INBOX_TYPES.FB,
+    INBOX_TYPES.WEB,
+    INBOX_TYPES.TWITTER,
+    INBOX_TYPES.WHATSAPP,
+    INBOX_TYPES.TELEGRAM,
+    INBOX_TYPES.API,
+  ],
+  [INBOX_FEATURES.REPLY_TO_OUTGOING]: [
     INBOX_TYPES.WEB,
     INBOX_TYPES.TWITTER,
     INBOX_TYPES.WHATSAPP,
-    INBOX_TYPES.LINE,
     INBOX_TYPES.TELEGRAM,
     INBOX_TYPES.API,
   ],

From 2e54f4a67cc491604339d53bfe4eeb127b84d9b9 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Tue, 24 Oct 2023 15:34:51 +0530
Subject: [PATCH 08/94] feat: Adds an event for the Google Translate usage
 (#8175)

---
 app/javascript/dashboard/helper/AnalyticsHelper/events.js   | 1 +
 .../modules/conversations/components/MessageContextMenu.vue | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/javascript/dashboard/helper/AnalyticsHelper/events.js b/app/javascript/dashboard/helper/AnalyticsHelper/events.js
index 8ece9f648..53e0a82ca 100644
--- a/app/javascript/dashboard/helper/AnalyticsHelper/events.js
+++ b/app/javascript/dashboard/helper/AnalyticsHelper/events.js
@@ -3,6 +3,7 @@ export const CONVERSATION_EVENTS = Object.freeze({
   SENT_MESSAGE: 'Sent a message',
   SENT_PRIVATE_NOTE: 'Sent a private note',
   INSERTED_A_CANNED_RESPONSE: 'Inserted a canned response',
+  TRANSLATE_A_MESSAGE: 'Translated a message',
   INSERTED_A_VARIABLE: 'Inserted a variable',
   USED_MENTIONS: 'Used mentions',
   SEARCH_CONVERSATION: 'Searched conversations',
diff --git a/app/javascript/dashboard/modules/conversations/components/MessageContextMenu.vue b/app/javascript/dashboard/modules/conversations/components/MessageContextMenu.vue
index 51e5e6a59..9adb9b2eb 100644
--- a/app/javascript/dashboard/modules/conversations/components/MessageContextMenu.vue
+++ b/app/javascript/dashboard/modules/conversations/components/MessageContextMenu.vue
@@ -111,7 +111,10 @@ import messageFormatterMixin from 'shared/mixins/messageFormatterMixin';
 import AddCannedModal from 'dashboard/routes/dashboard/settings/canned/AddCanned.vue';
 import { copyTextToClipboard } from 'shared/helpers/clipboard';
 import { conversationUrl, frontendURL } from '../../../helper/URLHelper';
-import { ACCOUNT_EVENTS } from '../../../helper/AnalyticsHelper/events';
+import {
+  ACCOUNT_EVENTS,
+  CONVERSATION_EVENTS,
+} from '../../../helper/AnalyticsHelper/events';
 import TranslateModal from 'dashboard/components/widgets/conversation/bubble/TranslateModal.vue';
 import MenuItem from '../../../components/widgets/conversation/contextMenu/menuItem.vue';
 
@@ -210,6 +213,7 @@ export default {
         messageId: this.messageId,
         targetLanguage: locale || 'en',
       });
+      this.$track(CONVERSATION_EVENTS.TRANSLATE_A_MESSAGE);
       this.handleClose();
       this.showTranslateModal = true;
     },

From 9551dbc25fe4ff292fd2ba75f324ae1ca6e209b4 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 24 Oct 2023 15:51:21 +0530
Subject: [PATCH 09/94] feat: add gtm to vueapp (#8154)

---
 .env.example                      | 3 +++
 app/views/layouts/vueapp.html.erb | 9 +++++++++
 2 files changed, 12 insertions(+)

diff --git a/.env.example b/.env.example
index a97679f7e..f85607fb9 100644
--- a/.env.example
+++ b/.env.example
@@ -176,6 +176,9 @@ ANDROID_SHA256_CERT_FINGERPRINT=AC:73:8E:DE:EB:56:EA:CC:10:87:02:A7:65:37:7B:38:
 # MICROSOFT CLARITY
 # MS_CLARITY_TOKEN=xxxxxxxxx
 
+# GOOGLE_TAG_MANAGER
+# GOOGLE_TAG = GTM-XXXXXXX
+
 ## Scout
 ## https://scoutapm.com/docs/ruby/configuration
 # SCOUT_KEY=YOURKEY
diff --git a/app/views/layouts/vueapp.html.erb b/app/views/layouts/vueapp.html.erb
index c7d1120f6..d81387687 100644
--- a/app/views/layouts/vueapp.html.erb
+++ b/app/views/layouts/vueapp.html.erb
@@ -93,5 +93,14 @@
           })(window, document, 'clarity', 'script', '<%= ENV.fetch('MS_CLARITY_TOKEN', '') %>');
       </script>
     <% end %>
+    <% if ENV.fetch('GOOGLE_TAG', nil).present? %>
+    <script>
+    (function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
+        new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
+        j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
+        'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
+        })(window,document,'script','dataLayer', '<%= ENV.fetch('GOOGLE_TAG', '') %>');
+    </script>
+    <% end %>
   </body>
 </html>

From 7438f3b157da834351a756744d6e86ab5f8e5d22 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Wed, 25 Oct 2023 13:53:30 +0530
Subject: [PATCH 10/94] fix: Rescue slack `ChannelNotFound` error (#8196)

---
 lib/integrations/slack/send_on_slack_service.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/integrations/slack/send_on_slack_service.rb b/lib/integrations/slack/send_on_slack_service.rb
index 7892ea92e..fc7ffe5ab 100644
--- a/lib/integrations/slack/send_on_slack_service.rb
+++ b/lib/integrations/slack/send_on_slack_service.rb
@@ -92,7 +92,8 @@ class Integrations::Slack::SendOnSlackService < Base::SendOnChannelService
   def send_message
     post_message if message_content.present?
     upload_file if message.attachments.any?
-  rescue Slack::Web::Api::Errors::AccountInactive, Slack::Web::Api::Errors::MissingScope, Slack::Web::Api::Errors::InvalidAuth => e
+  rescue Slack::Web::Api::Errors::AccountInactive, Slack::Web::Api::Errors::MissingScope, Slack::Web::Api::Errors::InvalidAuth,
+         Slack::Web::Api::Errors::ChannelNotFound => e
     Rails.logger.error e
     hook.prompt_reauthorization!
     hook.disable

From 4a89bab23a99b87116a9268972f5ac53921476cd Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Wed, 25 Oct 2023 21:06:31 +0530
Subject: [PATCH 11/94] feat: Handle Telegram send message/attachments errors
 (#8173)

Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
---
 app/models/channel/telegram.rb       | 31 +++++++++++++++++-------
 spec/models/channel/telegram_spec.rb | 36 ++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 9 deletions(-)

diff --git a/app/models/channel/telegram.rb b/app/models/channel/telegram.rb
index ac2f4b9be..94780cce4 100644
--- a/app/models/channel/telegram.rb
+++ b/app/models/channel/telegram.rb
@@ -87,9 +87,19 @@ class Channel::Telegram < ApplicationRecord
 
   def send_message(message)
     response = message_request(chat_id(message), message.content, reply_markup(message), reply_to_message_id(message))
+    process_error(message, response)
     response.parsed_response['result']['message_id'] if response.success?
   end
 
+  def process_error(message, response)
+    return unless response.parsed_response['ok'] == false
+
+    # https://github.com/TelegramBotAPI/errors/tree/master/json
+    message.external_error = "#{response.parsed_response['error_code']}, #{response.parsed_response['description']}"
+    message.status = :failed
+    message.save!
+  end
+
   def reply_markup(message)
     return unless message.content_type == 'input_select'
 
@@ -110,23 +120,26 @@ class Channel::Telegram < ApplicationRecord
     telegram_attachments = []
     message.attachments.each do |attachment|
       telegram_attachment = {}
-
-      case attachment[:file_type]
-      when 'audio'
-        telegram_attachment[:type] = 'audio'
-      when 'image'
-        telegram_attachment[:type] = 'photo'
-      when 'file'
-        telegram_attachment[:type] = 'document'
-      end
+      telegram_attachment[:type] = attachment_type(attachment[:file_type])
       telegram_attachment[:media] = attachment.download_url
       telegram_attachments << telegram_attachment
     end
 
     response = attachments_request(chat_id(message), telegram_attachments, reply_to_message_id(message))
+    process_error(message, response)
     response.parsed_response['result'].first['message_id'] if response.success?
   end
 
+  def attachment_type(file_type)
+    file_type_mappings = {
+      'audio' => 'audio',
+      'image' => 'photo',
+      'file' => 'document',
+      'video' => 'video'
+    }
+    file_type_mappings[file_type]
+  end
+
   def attachments_request(chat_id, attachments, reply_to_message_id)
     HTTParty.post("#{telegram_api_url}/sendMediaGroup",
                   body: {
diff --git a/spec/models/channel/telegram_spec.rb b/spec/models/channel/telegram_spec.rb
index 0fa5515fb..cda0b03d7 100644
--- a/spec/models/channel/telegram_spec.rb
+++ b/spec/models/channel/telegram_spec.rb
@@ -42,6 +42,28 @@ RSpec.describe Channel::Telegram do
 
       expect(telegram_channel.send_message_on_telegram(message)).to eq('telegram_123')
     end
+
+    it 'send text message failed' do
+      message = create(:message, message_type: :outgoing, content: 'test',
+                                 conversation: create(:conversation, inbox: telegram_channel.inbox, additional_attributes: { 'chat_id' => '123' }))
+
+      stub_request(:post, "https://api.telegram.org/bot#{telegram_channel.bot_token}/sendMessage")
+        .with(
+          body: 'chat_id=123&text=test&reply_markup=&reply_to_message_id='
+        )
+        .to_return(
+          status: 403,
+          headers: { 'Content-Type' => 'application/json' },
+          body: {
+            ok: false,
+            error_code: '403',
+            description: 'Forbidden: bot was blocked by the user'
+          }.to_json
+        )
+      telegram_channel.send_message_on_telegram(message)
+      expect(message.reload.status).to eq('failed')
+      expect(message.reload.external_error).to eq('403: Forbidden: bot was blocked by the user')
+    end
   end
 
   context 'when a empty message and valid attachments' do
@@ -72,6 +94,20 @@ RSpec.describe Channel::Telegram do
       allow(telegram_channel).to receive(:attachments_request).and_return(telegram_attachment_response)
       expect(telegram_channel.send_message_on_telegram(message)).to eq('telegram_456')
     end
+
+    it 'send image failed' do
+      telegram_attachment_response = double
+      attachment = message.attachments.new(account_id: message.account_id, file_type: :image)
+      attachment.file.attach(io: Rails.root.join('spec/assets/avatar.png').open, filename: 'avatar.png', content_type: 'image/png')
+
+      allow(telegram_attachment_response).to receive(:success?).and_return(false)
+      allow(telegram_attachment_response).to receive(:parsed_response).and_return({ 'ok' => false, 'error_code' => '400',
+                                                                                    'description' => 'Bad Request: invalid file id' })
+      allow(telegram_channel).to receive(:attachments_request).and_return(telegram_attachment_response)
+      telegram_channel.send_message_on_telegram(message)
+      expect(message.reload.status).to eq('failed')
+      expect(message.reload.external_error).to eq('400: Bad Request: invalid file id')
+    end
   end
 
   context 'when a valid message and valid attachment' do

From 4fc62ed9ae91108bab698f8d67d4404dd1c98bf2 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Wed, 25 Oct 2023 21:26:09 +0530
Subject: [PATCH 12/94] feat: Handle Instagram send message/attachments errors
 (#8174)

Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
---
 .../instagram/send_on_instagram_service.rb    | 18 ++++++++++++++++--
 .../send_on_instagram_service_spec.rb         | 19 +++++++++++++++++++
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/app/services/instagram/send_on_instagram_service.rb b/app/services/instagram/send_on_instagram_service.rb
index e7a061330..df24c1c25 100644
--- a/app/services/instagram/send_on_instagram_service.rb
+++ b/app/services/instagram/send_on_instagram_service.rb
@@ -66,12 +66,26 @@ class Instagram::SendOnInstagramService < Base::SendOnChannelService
       query: query
     )
 
-    Rails.logger.error("Instagram response: #{response['error']} : #{message_content}") if response['error']
-    message.update!(source_id: response['message_id']) if response['message_id'].present?
+    if response[:error].present?
+      Rails.logger.error("Instagram response: #{response['error']} : #{message_content}")
+      message.status = :failed
+      message.external_error = external_error(response)
+    end
+
+    message.source_id = response['message_id'] if response['message_id'].present?
+    message.save!
 
     response
   end
 
+  def external_error(response)
+    # https://developers.facebook.com/docs/instagram-api/reference/error-codes/
+    error_message = response[:error][:message]
+    error_code = response[:error][:code]
+
+    "#{error_code} - #{error_message}"
+  end
+
   def calculate_app_secret_proof(app_secret, access_token)
     Facebook::Messenger::Configuration::AppSecretProofCalculator.call(
       app_secret, access_token
diff --git a/spec/services/instagram/send_on_instagram_service_spec.rb b/spec/services/instagram/send_on_instagram_service_spec.rb
index ee553a7d8..f95d452eb 100644
--- a/spec/services/instagram/send_on_instagram_service_spec.rb
+++ b/spec/services/instagram/send_on_instagram_service_spec.rb
@@ -62,6 +62,25 @@ describe Instagram::SendOnInstagramService do
 
           expect(response).to eq({ message_id: 'anyrandommessageid1234567890' })
         end
+
+        it 'if message sent from chatwoot is failed' do
+          message = create(:message, message_type: 'outgoing', inbox: instagram_inbox, account: account, conversation: conversation)
+
+          allow(HTTParty).to receive(:post).and_return(
+            {
+              'error': {
+                'message': 'The Instagram account is restricted.',
+                'type': 'OAuthException',
+                'code': 400,
+                'fbtrace_id': 'anyrandomfbtraceid1234567890'
+              }
+            }
+          )
+          described_class.new(message: message).perform
+          expect(HTTParty).to have_received(:post)
+          expect(message.reload.status).to eq('failed')
+          expect(message.reload.external_error).to eq('400 - The Instagram account is restricted.')
+        end
       end
 
       context 'with message_tag HUMAN_AGENT' do

From 58f47eb02c8221d29a6ba2b4ae2510eafe107db5 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Wed, 25 Oct 2023 21:29:25 +0530
Subject: [PATCH 13/94] feat: Handle Facebook send message/attachments errors
 (#8197)

---
 app/services/facebook/send_on_facebook_service.rb    | 12 +++++++++++-
 .../facebook/send_on_facebook_service_spec.rb        |  9 +++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/app/services/facebook/send_on_facebook_service.rb b/app/services/facebook/send_on_facebook_service.rb
index 621bf57d5..776e8f5e8 100644
--- a/app/services/facebook/send_on_facebook_service.rb
+++ b/app/services/facebook/send_on_facebook_service.rb
@@ -15,7 +15,9 @@ class Facebook::SendOnFacebookService < Base::SendOnChannelService
 
   def send_message_to_facebook(delivery_params)
     result = Facebook::Messenger::Bot.deliver(delivery_params, page_id: channel.page_id)
-    message.update!(source_id: JSON.parse(result)['message_id'])
+    parsed_result = JSON.parse(result)
+    message.update!(status: :failed, external_error: external_error(parsed_result)) if parsed_result['error'].present?
+    message.update!(source_id: parsed_result['message_id']) if parsed_result['message_id'].present?
   end
 
   def fb_text_message_params
@@ -27,6 +29,14 @@ class Facebook::SendOnFacebookService < Base::SendOnChannelService
     }
   end
 
+  def external_error(response)
+    # https://developers.facebook.com/docs/graph-api/guides/error-handling/
+    error_message = response['error']['message']
+    error_code = response['error']['code']
+
+    "#{error_code} - #{error_message}"
+  end
+
   def fb_attachment_message_params
     attachment = message.attachments.first
     {
diff --git a/spec/services/facebook/send_on_facebook_service_spec.rb b/spec/services/facebook/send_on_facebook_service_spec.rb
index 39a194ca4..38d33e6d7 100644
--- a/spec/services/facebook/send_on_facebook_service_spec.rb
+++ b/spec/services/facebook/send_on_facebook_service_spec.rb
@@ -87,6 +87,15 @@ describe Facebook::SendOnFacebookService do
                                                       tag: 'ACCOUNT_UPDATE'
                                                     }, { page_id: facebook_channel.page_id })
       end
+
+      it 'if message sent from chatwoot is failed' do
+        message = create(:message, message_type: 'outgoing', inbox: facebook_inbox, account: account, conversation: conversation)
+        allow(bot).to receive(:deliver).and_return({ error: { message: 'Invalid OAuth access token.', type: 'OAuthException', code: 190,
+                                                              fbtrace_id: 'BLBz/WZt8dN' } }.to_json)
+        described_class.new(message: message).perform
+        expect(bot).to have_received(:deliver)
+        expect(message.reload.status).to eq('failed')
+      end
     end
   end
 end

From 54bc4c23dfa7f0012072b56822b6b06cd6c17d95 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Thu, 26 Oct 2023 00:14:09 +0530
Subject: [PATCH 14/94] fix: Telegram model specs (#8207)

---
 spec/models/channel/telegram_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/models/channel/telegram_spec.rb b/spec/models/channel/telegram_spec.rb
index cda0b03d7..6ed932de7 100644
--- a/spec/models/channel/telegram_spec.rb
+++ b/spec/models/channel/telegram_spec.rb
@@ -62,7 +62,7 @@ RSpec.describe Channel::Telegram do
         )
       telegram_channel.send_message_on_telegram(message)
       expect(message.reload.status).to eq('failed')
-      expect(message.reload.external_error).to eq('403: Forbidden: bot was blocked by the user')
+      expect(message.reload.external_error).to eq('403, Forbidden: bot was blocked by the user')
     end
   end
 
@@ -106,7 +106,7 @@ RSpec.describe Channel::Telegram do
       allow(telegram_channel).to receive(:attachments_request).and_return(telegram_attachment_response)
       telegram_channel.send_message_on_telegram(message)
       expect(message.reload.status).to eq('failed')
-      expect(message.reload.external_error).to eq('400: Bad Request: invalid file id')
+      expect(message.reload.external_error).to eq('400, Bad Request: invalid file id')
     end
   end
 

From 8c67ea56e7def6ffd18ffc17530258272b36d1e9 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Wed, 25 Oct 2023 13:03:08 -0700
Subject: [PATCH 15/94] chore: Campaign conversations should be created in open
 state (#8209)

- Ensure that conversations originating from campaigns are created in the open state.
---
 app/models/conversation.rb       | 4 ++++
 spec/models/conversation_spec.rb | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/app/models/conversation.rb b/app/models/conversation.rb
index d764f84a0..88a837c26 100644
--- a/app/models/conversation.rb
+++ b/app/models/conversation.rb
@@ -226,6 +226,10 @@ class Conversation < ApplicationRecord
   end
 
   def mark_conversation_pending_if_bot
+    # Message template hooks aren't executed for conversations from campaigns
+    # So making these conversations open for agent visibility
+    return if campaign.present?
+
     # TODO: make this an inbox config instead of assuming bot conversations should start as pending
     self.status = :pending if inbox.active_bot?
   end
diff --git a/spec/models/conversation_spec.rb b/spec/models/conversation_spec.rb
index 70d33b71c..0a04cd73b 100644
--- a/spec/models/conversation_spec.rb
+++ b/spec/models/conversation_spec.rb
@@ -556,6 +556,11 @@ RSpec.describe Conversation do
     it 'returns conversation status as pending' do
       expect(conversation.status).to eq('pending')
     end
+
+    it 'returns conversation as open if campaign is present' do
+      conversation = create(:conversation, inbox: bot_inbox.inbox, campaign: create(:campaign))
+      expect(conversation.status).to eq('open')
+    end
   end
 
   describe '#botintegration: when conversation created in inbox with dialogflow integration' do

From b6831d464e6b20ff6bf69e8ceafecd1e8077ed85 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Wed, 25 Oct 2023 17:06:58 -0700
Subject: [PATCH 16/94] chore: Update API documentation for whatsapp templates
 (#8211)

- Update API documentation for whatsapp templates
---
 .../request/conversation/create_message.yml   | 21 ++++++
 .../paths/application/conversation/index.yml  | 33 ++++++++-
 swagger/swagger.json                          | 73 +++++++++++++++++++
 3 files changed, 126 insertions(+), 1 deletion(-)

diff --git a/swagger/definitions/request/conversation/create_message.yml b/swagger/definitions/request/conversation/create_message.yml
index 9082f1318..c8f4efc7f 100644
--- a/swagger/definitions/request/conversation/create_message.yml
+++ b/swagger/definitions/request/conversation/create_message.yml
@@ -19,3 +19,24 @@ properties:
   content_attributes:
     type: object
     description: attributes based on your content type
+  template_params:
+    type: object
+    description: The template params for the message in case of whatsapp Channel
+    properties:
+      name:
+        type: string
+        description: Name of the template
+        example: 'sample_issue_resolution'
+      category:
+        type: string
+        description: Category of the template
+        example: UTILITY
+      language:
+        type: string
+        description: Language of the template
+        example: en_US
+      processed_params: 
+        type: object
+        description: The processed param values for template variables in template
+        example: 
+          1: "Chatwoot"
diff --git a/swagger/paths/application/conversation/index.yml b/swagger/paths/application/conversation/index.yml
index 4c9241464..c1cb199b0 100644
--- a/swagger/paths/application/conversation/index.yml
+++ b/swagger/paths/application/conversation/index.yml
@@ -66,6 +66,9 @@ post:
       required: true
       schema:
         type: object
+        required:
+          - source_id
+          - inbox_id
         properties:
           source_id:
             type: string
@@ -93,7 +96,35 @@ post:
           team_id:
             type: string
             description: Team Id for assigning a conversation to a team
-
+          message:
+            type: object
+            description: The initial message to be sent to the conversation
+            required: ['content']
+            properties:
+              content:
+                type: string
+                description: The content of the message
+              template_params:
+                type: object
+                description: The template params for the message in case of whatsapp Channel
+                properties:
+                  name:
+                    type: string
+                    description: Name of the template
+                    example: 'sample_issue_resolution'
+                  category:
+                    type: string
+                    description: Category of the template
+                    example: UTILITY
+                  language:
+                    type: string
+                    description: Language of the template
+                    example: en_US
+                  processed_params: 
+                    type: object
+                    description: The processed param values for template variables in template
+                    example: 
+                      1: "Chatwoot"
   responses:
     200:
       description: Success
diff --git a/swagger/swagger.json b/swagger/swagger.json
index cd8f3e7d3..9c6093fcf 100644
--- a/swagger/swagger.json
+++ b/swagger/swagger.json
@@ -2840,6 +2840,10 @@
             "required": true,
             "schema": {
               "type": "object",
+              "required": [
+                "source_id",
+                "inbox_id"
+              ],
               "properties": {
                 "source_id": {
                   "type": "string",
@@ -2881,6 +2885,47 @@
                 "team_id": {
                   "type": "string",
                   "description": "Team Id for assigning a conversation to a team"
+                },
+                "message": {
+                  "type": "object",
+                  "description": "The initial message to be sent to the conversation",
+                  "required": [
+                    "content"
+                  ],
+                  "properties": {
+                    "content": {
+                      "type": "string",
+                      "description": "The content of the message"
+                    },
+                    "template_params": {
+                      "type": "object",
+                      "description": "The template params for the message in case of whatsapp Channel",
+                      "properties": {
+                        "name": {
+                          "type": "string",
+                          "description": "Name of the template",
+                          "example": "sample_issue_resolution"
+                        },
+                        "category": {
+                          "type": "string",
+                          "description": "Category of the template",
+                          "example": "UTILITY"
+                        },
+                        "language": {
+                          "type": "string",
+                          "description": "Language of the template",
+                          "example": "en_US"
+                        },
+                        "processed_params": {
+                          "type": "object",
+                          "description": "The processed param values for template variables in template",
+                          "example": {
+                            "1": "Chatwoot"
+                          }
+                        }
+                      }
+                    }
+                  }
                 }
               }
             }
@@ -6246,6 +6291,34 @@
         "content_attributes": {
           "type": "object",
           "description": "attributes based on your content type"
+        },
+        "template_params": {
+          "type": "object",
+          "description": "The template params for the message in case of whatsapp Channel",
+          "properties": {
+            "name": {
+              "type": "string",
+              "description": "Name of the template",
+              "example": "sample_issue_resolution"
+            },
+            "category": {
+              "type": "string",
+              "description": "Category of the template",
+              "example": "UTILITY"
+            },
+            "language": {
+              "type": "string",
+              "description": "Language of the template",
+              "example": "en_US"
+            },
+            "processed_params": {
+              "type": "object",
+              "description": "The processed param values for template variables in template",
+              "example": {
+                "1": "Chatwoot"
+              }
+            }
+          }
         }
       }
     },

From 3e54d3654b0ddf6531874c2005cde78fdc51d849 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Thu, 26 Oct 2023 07:46:49 +0530
Subject: [PATCH 17/94] feat: Updated the search result fly-out menu design
 (#8203)

Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
---
 .../search/components/MessageContent.vue      |  17 +-
 .../conversation/search/PopOverSearch.vue     |  80 --------
 .../conversation/search/ResultItem.stories.js |  41 ----
 .../conversation/search/ResultItem.vue        | 185 ------------------
 .../search/SearchMessageItem.stories.js       |  47 -----
 .../conversation/search/SearchMessageItem.vue | 163 ---------------
 .../conversation/search/SwitchLayout.vue      |  36 ----
 .../helpcenter/pages/portals/EditPortal.vue   |   8 +-
 app/javascript/packs/portal.js                |   5 +
 .../portal/components/PublicArticleSearch.vue |   5 +-
 .../portal/components/PublicSearchInput.vue   |   2 +-
 .../portal/components/SearchSuggestions.vue   |  55 ++++--
 .../shared/mixins/messageFormatterMixin.js    |  15 ++
 13 files changed, 67 insertions(+), 592 deletions(-)
 delete mode 100644 app/javascript/dashboard/routes/dashboard/conversation/search/PopOverSearch.vue
 delete mode 100644 app/javascript/dashboard/routes/dashboard/conversation/search/ResultItem.stories.js
 delete mode 100644 app/javascript/dashboard/routes/dashboard/conversation/search/ResultItem.vue
 delete mode 100644 app/javascript/dashboard/routes/dashboard/conversation/search/SearchMessageItem.stories.js
 delete mode 100644 app/javascript/dashboard/routes/dashboard/conversation/search/SearchMessageItem.vue
 delete mode 100644 app/javascript/dashboard/routes/dashboard/conversation/search/SwitchLayout.vue

diff --git a/app/javascript/dashboard/modules/search/components/MessageContent.vue b/app/javascript/dashboard/modules/search/components/MessageContent.vue
index 74d85ec87..4c86862f5 100644
--- a/app/javascript/dashboard/modules/search/components/MessageContent.vue
+++ b/app/javascript/dashboard/modules/search/components/MessageContent.vue
@@ -71,18 +71,11 @@ export default {
     },
     prepareContent(content = '') {
       const escapedText = this.escapeHtml(content);
-      const plainTextContent = this.getPlainText(escapedText);
-      const escapedSearchTerm = this.escapeRegExp(this.searchTerm);
-      return plainTextContent
-        .replace(
-          new RegExp(`(${escapedSearchTerm})`, 'ig'),
-          '<span class="searchkey--highlight">$1</span>'
-        )
-        .replace(/\s{2,}|\n|\r/g, ' ');
-    },
-    // from https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions#escaping
-    escapeRegExp(string) {
-      return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+      return this.highlightContent(
+        escapedText,
+        this.searchTerm,
+        'searchkey--highlight'
+      );
     },
   },
 };
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/search/PopOverSearch.vue b/app/javascript/dashboard/routes/dashboard/conversation/search/PopOverSearch.vue
deleted file mode 100644
index 639b694e8..000000000
--- a/app/javascript/dashboard/routes/dashboard/conversation/search/PopOverSearch.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<template>
-  <div class="relative">
-    <div
-      class="flex px-4 pb-1 flex-row gap-1 pt-2.5 border-b border-transparent"
-    >
-      <woot-sidemenu-icon
-        size="tiny"
-        class="relative top-0 ltr:-ml-1.5 rtl:-mr-1.5"
-      />
-      <router-link
-        :to="searchUrl"
-        class="search-link flex-1 items-center gap-1 text-left h-6 rtl:mr-3 rtl:text-right rounded-md px-2 py-0 bg-slate-25 dark:bg-slate-800 inline-flex"
-      >
-        <div class="flex">
-          <fluent-icon
-            icon="search"
-            class="search--icon text-slate-800 dark:text-slate-200"
-            size="16"
-          />
-        </div>
-        <p
-          class="search--label mb-0 overflow-hidden whitespace-nowrap text-ellipsis text-sm text-slate-800 dark:text-slate-200"
-        >
-          {{ $t('CONVERSATION.SEARCH_MESSAGES') }}
-        </p>
-      </router-link>
-      <switch-layout
-        :is-on-expanded-layout="isOnExpandedLayout"
-        @toggle="$emit('toggle-conversation-layout')"
-      />
-    </div>
-  </div>
-</template>
-
-<script>
-import { mixin as clickaway } from 'vue-clickaway';
-import { mapGetters } from 'vuex';
-import timeMixin from '../../../../mixins/time';
-import messageFormatterMixin from 'shared/mixins/messageFormatterMixin';
-import SwitchLayout from './SwitchLayout.vue';
-import { frontendURL } from 'dashboard/helper/URLHelper';
-export default {
-  components: {
-    SwitchLayout,
-  },
-  directives: {
-    focus: {
-      inserted(el) {
-        el.focus();
-      },
-    },
-  },
-  mixins: [timeMixin, messageFormatterMixin, clickaway],
-  props: {
-    isOnExpandedLayout: {
-      type: Boolean,
-      required: true,
-    },
-  },
-
-  computed: {
-    ...mapGetters({
-      accountId: 'getCurrentAccountId',
-    }),
-    searchUrl() {
-      return frontendURL(`accounts/${this.accountId}/search`);
-    },
-  },
-};
-</script>
-<style lang="scss" scoped>
-.search-link {
-  &:hover {
-    .search--icon,
-    .search--label {
-      @apply hover:text-woot-500 dark:hover:text-woot-500;
-    }
-  }
-}
-</style>
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/search/ResultItem.stories.js b/app/javascript/dashboard/routes/dashboard/conversation/search/ResultItem.stories.js
deleted file mode 100644
index b0652e538..000000000
--- a/app/javascript/dashboard/routes/dashboard/conversation/search/ResultItem.stories.js
+++ /dev/null
@@ -1,41 +0,0 @@
-import ResultItem from './ResultItem';
-
-export default {
-  title: 'Components/Search/Result Items',
-  component: ResultItem,
-  argTypes: {
-    conversationId: {
-      defaultValue: '1',
-      control: {
-        type: 'number',
-      },
-    },
-    userName: {
-      defaultValue: 'John davies',
-      control: {
-        type: 'text',
-      },
-    },
-    inboxName: {
-      defaultValue: 'Support',
-      control: {
-        type: 'text',
-      },
-    },
-    timestamp: {
-      defaultValue: '1618046084',
-      control: {
-        type: 'number',
-      },
-    },
-  },
-};
-
-const Template = (args, { argTypes }) => ({
-  props: Object.keys(argTypes),
-  components: { ResultItem },
-  template: '<result-item v-bind="$props"></result-item>',
-});
-
-export const ResultItems = Template.bind({});
-ResultItems.args = {};
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/search/ResultItem.vue b/app/javascript/dashboard/routes/dashboard/conversation/search/ResultItem.vue
deleted file mode 100644
index 2fece6f33..000000000
--- a/app/javascript/dashboard/routes/dashboard/conversation/search/ResultItem.vue
+++ /dev/null
@@ -1,185 +0,0 @@
-<template>
-  <div class="search-result" @click="onClick">
-    <div class="result-header">
-      <div class="conversation--block">
-        <fluent-icon icon="chat" class="icon--conversation-search-item" />
-        <div class="conversation">
-          <div class="user-wrap">
-            <div class="name-wrap">
-              <span class="sub-block-title">{{ userName }}</span>
-            </div>
-            <woot-label
-              :title="conversationsId"
-              :small="true"
-              color-scheme="secondary"
-            />
-          </div>
-          <span class="inbox-name">{{ inboxName }}</span>
-        </div>
-      </div>
-      <span class="timestamp">{{ readableTime }} </span>
-    </div>
-    <search-message-item
-      v-for="message in messages"
-      :key="message.created_at"
-      :user-name="message.sender_name"
-      :timestamp="message.created_at"
-      :message-type="message.message_type"
-      :content="message.content"
-      :search-term="searchTerm"
-    />
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import { frontendURL, conversationUrl } from 'dashboard/helper/URLHelper';
-import timeMixin from 'dashboard/mixins/time';
-import messageFormatterMixin from 'shared/mixins/messageFormatterMixin';
-import SearchMessageItem from './SearchMessageItem.vue';
-
-export default {
-  components: { SearchMessageItem },
-  mixins: [timeMixin, messageFormatterMixin],
-
-  props: {
-    conversationId: {
-      type: Number,
-      default: 0,
-    },
-    userName: {
-      type: String,
-      default: '',
-    },
-    inboxName: {
-      type: String,
-      default: '',
-    },
-    timestamp: {
-      type: Number,
-      default: 0,
-    },
-    messages: {
-      type: Array,
-      default: () => [],
-    },
-    searchTerm: {
-      type: String,
-      default: '',
-    },
-  },
-
-  computed: {
-    ...mapGetters({
-      accountId: 'getCurrentAccountId',
-    }),
-    conversationsId() {
-      return `# ${this.conversationId}`;
-    },
-    readableTime() {
-      if (!this.timestamp) {
-        return '';
-      }
-
-      return this.dynamicTime(this.timestamp);
-    },
-  },
-
-  methods: {
-    onClick() {
-      const path = conversationUrl({
-        accountId: this.accountId,
-        id: this.conversationId,
-      });
-      window.location = frontendURL(path);
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.search-result {
-  display: block;
-  align-items: center;
-  cursor: pointer;
-  color: var(--color-body);
-  padding: var(--space-smaller) var(--space-two) 0 var(--space-normal);
-
-  &:last-child {
-    border-bottom: none;
-    padding-bottom: var(--space-normal);
-  }
-}
-
-.result-header {
-  display: flex;
-  justify-content: space-between;
-  background: var(--color-background);
-  padding: var(--space-smaller) var(--space-slab);
-  margin-bottom: var(--space-small);
-  border-radius: var(--border-radius-medium);
-
-  &:hover {
-    background: var(--w-400);
-    color: var(--white);
-    .inbox-name {
-      color: var(--white);
-    }
-    .timestamp {
-      color: var(--white);
-    }
-    .icon--conversation-search-item {
-      color: var(--white);
-    }
-  }
-}
-
-.conversation--block {
-  align-items: center;
-  display: flex;
-}
-
-.icon--conversation-search-item {
-  align-items: center;
-  display: flex;
-  color: var(--w-500);
-}
-
-.conversation {
-  align-items: flex-start;
-  display: flex;
-  flex-direction: column;
-  padding: var(--space-smaller) var(--space-one);
-}
-
-.user-wrap {
-  display: flex;
-
-  .name-wrap {
-    max-width: 12.5rem;
-    text-overflow: ellipsis;
-    overflow: hidden;
-    white-space: nowrap;
-
-    .sub-block-title {
-      font-weight: var(--font-weight-bold);
-      margin-right: var(--space-micro);
-    }
-  }
-}
-
-.inbox-name {
-  border-radius: var(--border-radius-normal);
-  color: var(--s-500);
-  font-size: var(--font-size-mini);
-  font-weight: var(--font-weight-medium);
-}
-
-.timestamp {
-  color: var(--s-500);
-  font-weight: var(--font-weight-medium);
-  font-size: var(--font-size-mini);
-  margin-top: var(--space-smaller);
-  text-align: right;
-}
-</style>
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/search/SearchMessageItem.stories.js b/app/javascript/dashboard/routes/dashboard/conversation/search/SearchMessageItem.stories.js
deleted file mode 100644
index 78f0d0deb..000000000
--- a/app/javascript/dashboard/routes/dashboard/conversation/search/SearchMessageItem.stories.js
+++ /dev/null
@@ -1,47 +0,0 @@
-import SearchMessage from './SearchMessageItem';
-
-export default {
-  title: 'Components/Search/Messages',
-  component: SearchMessage,
-  argTypes: {
-    userName: {
-      defaultValue: 'John davies',
-      control: {
-        type: 'text',
-      },
-    },
-    timestamp: {
-      defaultValue: '1618046084',
-      control: {
-        type: 'number',
-      },
-    },
-    messageType: {
-      control: {
-        type: 'number',
-      },
-    },
-    content: {
-      defaultValue:
-        'some designers and developers around the web know this and have put together a bunch of text generators',
-      control: {
-        type: 'text',
-      },
-    },
-    searchTerm: {
-      defaultValue: 'developers',
-      control: {
-        type: 'text',
-      },
-    },
-  },
-};
-
-const Template = (args, { argTypes }) => ({
-  props: Object.keys(argTypes),
-  components: { SearchMessage },
-  template: '<search-message v-bind="$props"></-item>',
-});
-
-export const Messages = Template.bind({});
-Messages.args = {};
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/search/SearchMessageItem.vue b/app/javascript/dashboard/routes/dashboard/conversation/search/SearchMessageItem.vue
deleted file mode 100644
index 35f208341..000000000
--- a/app/javascript/dashboard/routes/dashboard/conversation/search/SearchMessageItem.vue
+++ /dev/null
@@ -1,163 +0,0 @@
-<template>
-  <div class="message-item">
-    <div class="search-message">
-      <div class="user-wrap">
-        <div class="name-wrap">
-          <span class="text-block-title">{{ userName }}</span>
-          <div>
-            <fluent-icon
-              v-if="isOutgoingMessage"
-              icon="arrow-reply"
-              class="icon-outgoing"
-            />
-          </div>
-        </div>
-        <span class="timestamp">{{ readableTime }} </span>
-      </div>
-      <p v-dompurify-html="prepareContent(content)" class="message-content" />
-    </div>
-  </div>
-</template>
-
-<script>
-import { MESSAGE_TYPE } from 'shared/constants/messages';
-import timeMixin from 'dashboard/mixins/time';
-import messageFormatterMixin from 'shared/mixins/messageFormatterMixin';
-
-export default {
-  mixins: [timeMixin, messageFormatterMixin],
-
-  props: {
-    userName: {
-      type: String,
-      default: '',
-    },
-    timestamp: {
-      type: Number,
-      default: 0,
-    },
-    messageType: {
-      type: Number,
-      default: 0,
-    },
-    content: {
-      type: String,
-      default: '',
-    },
-    searchTerm: {
-      type: String,
-      default: '',
-    },
-  },
-
-  computed: {
-    isOutgoingMessage() {
-      return this.messageType === MESSAGE_TYPE.OUTGOING;
-    },
-    readableTime() {
-      if (!this.timestamp) {
-        return '';
-      }
-      return this.dynamicTime(this.timestamp);
-    },
-  },
-  methods: {
-    prepareContent(content = '') {
-      const plainTextContent = this.getPlainText(content);
-      const escapedSearchTerm = this.escapeRegExp(this.searchTerm);
-      return plainTextContent.replace(
-        new RegExp(`(${escapedSearchTerm})`, 'ig'),
-        '<span class="searchkey--highlight">$1</span>'
-      );
-    },
-    // from https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions#escaping
-    escapeRegExp(string) {
-      return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-    },
-  },
-};
-</script>
-<style lang="scss" scoped>
-.message-item {
-  background: var(--color-background-light);
-  border-radius: var(--border-radius-medium);
-  color: var(--color-body);
-  margin-bottom: var(--space-small);
-  margin-left: var(--space-one);
-  padding: 0 var(--space-small);
-
-  &:hover {
-    background: var(--w-400);
-    color: var(--white);
-    .message-content::v-deep .searchkey--highlight {
-      color: var(--white);
-      text-decoration: underline;
-    }
-    .icon-outgoing {
-      color: var(--white);
-    }
-  }
-  &:last-child {
-    .search-message {
-      border-bottom: none;
-    }
-  }
-}
-
-.search-message {
-  padding: var(--space-smaller) var(--space-smaller);
-  &:hover {
-    color: var(--white);
-  }
-}
-
-.user-wrap {
-  display: flex;
-  justify-content: space-between;
-}
-
-.name-wrap {
-  display: flex;
-  max-width: 13.75rem;
-
-  .text-block-title {
-    font-weight: var(--font-weight-bold);
-    text-overflow: ellipsis;
-    overflow: hidden;
-    white-space: nowrap;
-  }
-}
-
-.icon-outgoing {
-  color: var(--w-500);
-  padding: var(--space-micro);
-  padding-right: var(--space-smaller);
-}
-
-.timestamp {
-  font-size: var(--font-size-mini);
-  top: var(--space-micro);
-  position: relative;
-  text-align: right;
-}
-
-p {
-  max-width: 100%;
-}
-
-.message-content {
-  font-size: var(--font-size-small);
-  margin-bottom: var(--space-micro);
-  margin-top: var(--space-micro);
-  padding: 0;
-  line-height: 1.35;
-  overflow-wrap: break-word;
-}
-
-.message-content::v-deep .searchkey--highlight {
-  color: var(--w-600);
-  font-weight: var(--font-weight-bold);
-  font-size: var(--font-size-small);
-  padding: (var(--space-zero) var(--space-zero));
-}
-</style>
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/search/SwitchLayout.vue b/app/javascript/dashboard/routes/dashboard/conversation/search/SwitchLayout.vue
deleted file mode 100644
index 1988e9974..000000000
--- a/app/javascript/dashboard/routes/dashboard/conversation/search/SwitchLayout.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-<template>
-  <woot-button
-    v-tooltip.left="$t('CONVERSATION.SWITCH_VIEW_LAYOUT')"
-    icon="arrow-right-import"
-    size="tiny"
-    variant="smooth"
-    color-scheme="secondary"
-    class="layout-switch__container"
-    :class="{ expanded: isOnExpandedLayout }"
-    @click="toggle"
-  />
-</template>
-
-<script>
-export default {
-  props: {
-    isOnExpandedLayout: {
-      type: Boolean,
-      default: false,
-    },
-  },
-  methods: {
-    toggle() {
-      this.$emit('toggle');
-    },
-  },
-};
-</script>
-
-<style lang="scss" soped>
-.layout-switch__container {
-  &.expanded .icon {
-    transform: rotate(180deg);
-  }
-}
-</style>
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/EditPortal.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/EditPortal.vue
index 53cc83c44..53a8bdf40 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/EditPortal.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/EditPortal.vue
@@ -9,7 +9,7 @@
       "
       :show-new-button="false"
     />
-    <div>
+    <div class="overflow-auto max-h-[96%]">
       <setting-intro-banner :header-title="portalName">
         <woot-tabs
           :index="activeTabIndex"
@@ -24,9 +24,9 @@
           />
         </woot-tabs>
       </setting-intro-banner>
-    </div>
-    <div class="overflow-auto p-4 max-w-full my-auto flex flex-wrap">
-      <router-view />
+      <div class="p-4 max-w-full my-auto flex flex-wrap">
+        <router-view />
+      </div>
     </div>
   </div>
 </template>
diff --git a/app/javascript/packs/portal.js b/app/javascript/packs/portal.js
index 42493615d..874d3488d 100644
--- a/app/javascript/packs/portal.js
+++ b/app/javascript/packs/portal.js
@@ -1,7 +1,12 @@
 import Rails from '@rails/ujs';
 import Turbolinks from 'turbolinks';
 import '../portal/application.scss';
+import Vue from 'vue';
 import { InitializationHelpers } from '../portal/portalHelpers';
+import VueDOMPurifyHTML from 'vue-dompurify-html';
+import { domPurifyConfig } from '../shared/helpers/HTMLSanitizer';
+
+Vue.use(VueDOMPurifyHTML, domPurifyConfig);
 
 Rails.start();
 Turbolinks.start();
diff --git a/app/javascript/portal/components/PublicArticleSearch.vue b/app/javascript/portal/components/PublicArticleSearch.vue
index b06ce112f..f2afeb4ce 100644
--- a/app/javascript/portal/components/PublicArticleSearch.vue
+++ b/app/javascript/portal/components/PublicArticleSearch.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-on-clickaway="closeSearch" class="max-w-2xl w-full relative my-4">
+  <div v-on-clickaway="closeSearch" class="max-w-6xl w-full relative my-4">
     <public-search-input
       v-model="searchTerm"
       :search-placeholder="searchTranslations.searchPlaceholder"
@@ -7,12 +7,13 @@
     />
     <div
       v-if="shouldShowSearchBox"
-      class="absolute top-16 w-full"
+      class="absolute top-14 w-full"
       @mouseover="openSearch"
     >
       <search-suggestions
         :items="searchResults"
         :is-loading="isLoading"
+        :search-term="searchTerm"
         :empty-placeholder="searchTranslations.emptyPlaceholder"
         :results-title="searchTranslations.resultsTitle"
         :loading-placeholder="searchTranslations.loadingPlaceholder"
diff --git a/app/javascript/portal/components/PublicSearchInput.vue b/app/javascript/portal/components/PublicSearchInput.vue
index 53099a08e..ffa0f99a7 100644
--- a/app/javascript/portal/components/PublicSearchInput.vue
+++ b/app/javascript/portal/components/PublicSearchInput.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    class="w-full flex items-center rounded-md border-solid border-2 h-16 bg-white dark:bg-slate-900 px-4 py-2 text-slate-600 dark:text-slate-200"
+    class="w-full flex items-center rounded-lg border-solid border h-12 bg-white dark:bg-slate-900 px-5 py-2 text-slate-600 dark:text-slate-200"
     :class="{
       'shadow border-woot-100 dark:border-woot-700': isFocused,
       'border-slate-50 dark:border-slate-800 shadow-sm': !isFocused,
diff --git a/app/javascript/portal/components/SearchSuggestions.vue b/app/javascript/portal/components/SearchSuggestions.vue
index 701c75205..97f462e1a 100644
--- a/app/javascript/portal/components/SearchSuggestions.vue
+++ b/app/javascript/portal/components/SearchSuggestions.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    class="shadow-md bg-white dark:bg-slate-900 mt-2 max-h-72 scroll-py-2 p-4 rounded overflow-y-auto text-sm text-slate-700 dark:text-slate-100"
+    class="shadow-xl hover:shadow-lg bg-white dark:bg-slate-900 mt-2 max-h-96 scroll-py-2 p-5 overflow-y-auto text-sm text-slate-700 dark:text-slate-100 border border-solid border-slate-50 dark:border-slate-800 rounded-lg"
   >
     <div
       v-if="isLoading"
@@ -8,32 +8,34 @@
     >
       {{ loadingPlaceholder }}
     </div>
-    <h3
-      v-if="shouldShowResults"
-      class="font-medium text-sm text-slate-400 dark:text-slate-700"
-    >
-      {{ resultsTitle }}
-    </h3>
     <ul
       v-if="shouldShowResults"
-      class="bg-white dark:bg-slate-900 mt-2 max-h-72 scroll-py-2 overflow-y-auto text-sm text-slate-700 dark:text-slate-100"
+      class="bg-white dark:bg-slate-900 gap-4 flex flex-col text-sm text-slate-700 dark:text-slate-100"
       role="listbox"
     >
       <li
         v-for="(article, index) in items"
         :id="article.id"
         :key="article.id"
-        class="group flex cursor-default select-none items-center rounded-md p-2 mb-1"
-        :class="{ 'bg-slate-25 dark:bg-slate-800': index === selectedIndex }"
+        class="group flex border border-solid hover:bg-slate-25 dark:hover:bg-slate-800 border-slate-100 dark:border-slate-800 rounded-lg cursor-pointer select-none items-center p-4"
+        :class="isSearchItemActive(index)"
         role="option"
         tabindex="-1"
-        @mouseover="onHover(index)"
+        @mouse-enter="onHover(index)"
+        @mouse-leave="onHover(-1)"
       >
         <a
+          class="flex flex-col gap-1 overflow-y-hidden"
           :href="generateArticleUrl(article)"
-          class="flex-auto truncate text-base font-medium leading-6 w-full hover:underline"
         >
-          {{ article.title }}
+          <span
+            v-dompurify-html="prepareContent(article.title)"
+            class="flex-auto truncate text-base font-semibold leading-6 w-full overflow-hidden text-ellipsis whitespace-nowrap"
+          />
+          <div
+            v-dompurify-html="prepareContent(article.content)"
+            class="line-clamp-2 text-ellipsis text-slate-600 dark:text-slate-300 text-sm"
+          />
         </a>
       </li>
     </ul>
@@ -49,9 +51,10 @@
 
 <script>
 import mentionSelectionKeyboardMixin from 'dashboard/components/widgets/mentions/mentionSelectionKeyboardMixin.js';
+import messageFormatterMixin from 'shared/mixins/messageFormatterMixin';
 
 export default {
-  mixins: [mentionSelectionKeyboardMixin],
+  mixins: [mentionSelectionKeyboardMixin, messageFormatterMixin],
   props: {
     items: {
       type: Array,
@@ -77,10 +80,14 @@ export default {
       type: String,
       default: '',
     },
+    searchTerm: {
+      type: String,
+      default: '',
+    },
   },
   data() {
     return {
-      selectedIndex: 0,
+      selectedIndex: -1,
     };
   },
 
@@ -94,18 +101,24 @@ export default {
   },
 
   methods: {
+    isSearchItemActive(index) {
+      return index === this.selectedIndex
+        ? 'bg-slate-25 dark:bg-slate-800'
+        : 'bg-white dark:bg-slate-900';
+    },
     generateArticleUrl(article) {
       return `/hc/${article.portal.slug}/articles/${article.slug}`;
     },
     handleKeyboardEvent(e) {
       this.processKeyDownEvent(e);
-      this.$el.scrollTop = 40 * this.selectedIndex;
+      this.$el.scrollTop = 102 * this.selectedIndex;
     },
-    onHover(index) {
-      this.selectedIndex = index;
-    },
-    onSelect() {
-      window.location = this.generateArticleUrl(this.items[this.selectedIndex]);
+    prepareContent(content) {
+      return this.highlightContent(
+        content,
+        this.searchTerm,
+        'bg-slate-100 dark:bg-slate-700 font-semibold text-slate-600 dark:text-slate-200'
+      );
     },
   },
 };
diff --git a/app/javascript/shared/mixins/messageFormatterMixin.js b/app/javascript/shared/mixins/messageFormatterMixin.js
index 36ff7bd75..01e2bef9e 100644
--- a/app/javascript/shared/mixins/messageFormatterMixin.js
+++ b/app/javascript/shared/mixins/messageFormatterMixin.js
@@ -21,5 +21,20 @@ export default {
 
       return `${description.slice(0, 97)}...`;
     },
+
+    highlightContent(content = '', searchTerm = '', highlightClass = '') {
+      const plainTextContent = this.getPlainText(content);
+
+      // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions#escaping
+      const escapedSearchTerm = searchTerm.replace(
+        /[.*+?^${}()|[\]\\]/g,
+        '\\$&'
+      );
+
+      return plainTextContent.replace(
+        new RegExp(`(${escapedSearchTerm})`, 'ig'),
+        `<span class="${highlightClass}">$1</span>`
+      );
+    },
   },
 };

From 483d55df91cfecafa56b260648cbfacd0b9d9bb2 Mon Sep 17 00:00:00 2001
From: Chatwoot Bot <92152627+chatwoot-bot@users.noreply.github.com>
Date: Thu, 26 Oct 2023 07:50:30 +0530
Subject: [PATCH 18/94] chore: Update translations (#8161)

---
 .../dashboard/i18n/locale/am/emoji.json       |  3 +-
 .../dashboard/i18n/locale/am/helpCenter.json  |  4 +--
 .../dashboard/i18n/locale/ar/emoji.json       |  3 +-
 .../dashboard/i18n/locale/ar/helpCenter.json  |  4 +--
 .../dashboard/i18n/locale/bg/emoji.json       |  3 +-
 .../dashboard/i18n/locale/bg/helpCenter.json  |  4 +--
 .../dashboard/i18n/locale/ca/emoji.json       |  3 +-
 .../dashboard/i18n/locale/ca/helpCenter.json  |  4 +--
 .../dashboard/i18n/locale/cs/emoji.json       |  3 +-
 .../dashboard/i18n/locale/cs/helpCenter.json  |  4 +--
 .../dashboard/i18n/locale/da/emoji.json       |  3 +-
 .../dashboard/i18n/locale/da/helpCenter.json  |  4 +--
 .../dashboard/i18n/locale/de/emoji.json       |  3 +-
 .../dashboard/i18n/locale/de/helpCenter.json  |  4 +--
 .../dashboard/i18n/locale/el/emoji.json       |  3 +-
 .../dashboard/i18n/locale/el/helpCenter.json  |  4 +--
 .../i18n/locale/es/conversation.json          |  6 ++--
 .../dashboard/i18n/locale/es/emoji.json       |  3 +-
 .../dashboard/i18n/locale/es/helpCenter.json  | 26 +++++++-------
 .../dashboard/i18n/locale/fa/chatlist.json    |  4 +--
 .../dashboard/i18n/locale/fa/contact.json     |  8 ++---
 .../i18n/locale/fa/conversation.json          | 36 +++++++++----------
 .../dashboard/i18n/locale/fa/emoji.json       |  3 +-
 .../i18n/locale/fa/generalSettings.json       | 12 +++----
 .../dashboard/i18n/locale/fa/helpCenter.json  |  4 +--
 .../dashboard/i18n/locale/fa/inboxMgmt.json   | 22 ++++++------
 .../i18n/locale/fa/integrations.json          |  2 +-
 .../dashboard/i18n/locale/fa/labelsMgmt.json  |  2 +-
 .../dashboard/i18n/locale/fi/emoji.json       |  3 +-
 .../dashboard/i18n/locale/fi/helpCenter.json  |  4 +--
 .../dashboard/i18n/locale/fr/emoji.json       |  3 +-
 .../dashboard/i18n/locale/fr/helpCenter.json  |  4 +--
 .../dashboard/i18n/locale/he/emoji.json       |  3 +-
 .../dashboard/i18n/locale/he/helpCenter.json  |  4 +--
 .../dashboard/i18n/locale/hi/emoji.json       |  3 +-
 .../dashboard/i18n/locale/hi/helpCenter.json  |  4 +--
 .../dashboard/i18n/locale/hr/emoji.json       |  3 +-
 .../dashboard/i18n/locale/hr/helpCenter.json  |  4 +--
 .../dashboard/i18n/locale/hu/emoji.json       |  3 +-
 .../dashboard/i18n/locale/hu/helpCenter.json  |  4 +--
 .../dashboard/i18n/locale/hy/emoji.json       |  3 +-
 .../dashboard/i18n/locale/hy/helpCenter.json  |  4 +--
 .../dashboard/i18n/locale/id/emoji.json       |  3 +-
 .../dashboard/i18n/locale/id/helpCenter.json  |  4 +--
 .../dashboard/i18n/locale/is/emoji.json       |  3 +-
 .../dashboard/i18n/locale/is/helpCenter.json  |  4 +--
 .../dashboard/i18n/locale/it/emoji.json       |  3 +-
 .../dashboard/i18n/locale/it/helpCenter.json  |  4 +--
 .../dashboard/i18n/locale/ja/emoji.json       |  3 +-
 .../dashboard/i18n/locale/ja/helpCenter.json  |  4 +--
 .../dashboard/i18n/locale/ka/emoji.json       |  3 +-
 .../dashboard/i18n/locale/ka/helpCenter.json  |  4 +--
 .../dashboard/i18n/locale/ko/emoji.json       |  3 +-
 .../dashboard/i18n/locale/ko/helpCenter.json  |  4 +--
 .../dashboard/i18n/locale/lt/emoji.json       |  3 +-
 .../dashboard/i18n/locale/lt/helpCenter.json  |  4 +--
 .../dashboard/i18n/locale/lv/emoji.json       |  3 +-
 .../dashboard/i18n/locale/lv/helpCenter.json  |  4 +--
 .../dashboard/i18n/locale/ml/emoji.json       |  3 +-
 .../dashboard/i18n/locale/ml/helpCenter.json  |  4 +--
 .../dashboard/i18n/locale/ms/emoji.json       |  3 +-
 .../dashboard/i18n/locale/ms/helpCenter.json  |  4 +--
 .../dashboard/i18n/locale/ne/emoji.json       |  3 +-
 .../dashboard/i18n/locale/ne/helpCenter.json  |  4 +--
 .../dashboard/i18n/locale/nl/emoji.json       |  3 +-
 .../dashboard/i18n/locale/nl/helpCenter.json  |  4 +--
 .../dashboard/i18n/locale/no/emoji.json       |  3 +-
 .../dashboard/i18n/locale/no/helpCenter.json  |  4 +--
 .../dashboard/i18n/locale/pl/emoji.json       |  3 +-
 .../dashboard/i18n/locale/pl/helpCenter.json  |  4 +--
 .../i18n/locale/pt/conversation.json          |  2 +-
 .../dashboard/i18n/locale/pt/emoji.json       |  3 +-
 .../dashboard/i18n/locale/pt/helpCenter.json  |  4 +--
 .../dashboard/i18n/locale/pt_BR/emoji.json    |  3 +-
 .../i18n/locale/pt_BR/helpCenter.json         |  4 +--
 .../dashboard/i18n/locale/ro/emoji.json       |  3 +-
 .../dashboard/i18n/locale/ro/helpCenter.json  |  4 +--
 .../dashboard/i18n/locale/ru/emoji.json       |  3 +-
 .../dashboard/i18n/locale/ru/helpCenter.json  |  4 +--
 .../dashboard/i18n/locale/sh/emoji.json       |  3 +-
 .../dashboard/i18n/locale/sh/helpCenter.json  |  4 +--
 .../dashboard/i18n/locale/sk/emoji.json       |  3 +-
 .../dashboard/i18n/locale/sk/helpCenter.json  |  4 +--
 .../dashboard/i18n/locale/sl/emoji.json       |  3 +-
 .../dashboard/i18n/locale/sl/helpCenter.json  |  4 +--
 .../dashboard/i18n/locale/sq/emoji.json       |  3 +-
 .../dashboard/i18n/locale/sq/helpCenter.json  |  4 +--
 .../dashboard/i18n/locale/sr/emoji.json       |  3 +-
 .../dashboard/i18n/locale/sr/helpCenter.json  |  4 +--
 .../dashboard/i18n/locale/sv/emoji.json       |  3 +-
 .../dashboard/i18n/locale/sv/helpCenter.json  |  4 +--
 .../dashboard/i18n/locale/ta/emoji.json       |  3 +-
 .../dashboard/i18n/locale/ta/helpCenter.json  |  4 +--
 .../dashboard/i18n/locale/th/emoji.json       |  3 +-
 .../dashboard/i18n/locale/th/helpCenter.json  |  4 +--
 .../dashboard/i18n/locale/tr/emoji.json       |  3 +-
 .../dashboard/i18n/locale/tr/helpCenter.json  |  4 +--
 .../dashboard/i18n/locale/uk/emoji.json       |  3 +-
 .../dashboard/i18n/locale/uk/helpCenter.json  |  4 +--
 .../dashboard/i18n/locale/ur/emoji.json       |  3 +-
 .../dashboard/i18n/locale/ur/helpCenter.json  |  4 +--
 .../dashboard/i18n/locale/ur_IN/emoji.json    |  3 +-
 .../i18n/locale/ur_IN/helpCenter.json         |  4 +--
 .../dashboard/i18n/locale/vi/emoji.json       |  3 +-
 .../dashboard/i18n/locale/vi/helpCenter.json  |  4 +--
 .../dashboard/i18n/locale/zh_CN/emoji.json    |  3 +-
 .../i18n/locale/zh_CN/helpCenter.json         |  4 +--
 .../dashboard/i18n/locale/zh_TW/emoji.json    |  3 +-
 .../i18n/locale/zh_TW/helpCenter.json         |  4 +--
 app/javascript/widget/i18n/locale/fa.json     | 18 +++++-----
 config/locales/es.yml                         |  2 +-
 config/locales/fa.yml                         | 12 +++----
 config/locales/pt.yml                         |  2 +-
 113 files changed, 275 insertions(+), 225 deletions(-)

diff --git a/app/javascript/dashboard/i18n/locale/am/emoji.json b/app/javascript/dashboard/i18n/locale/am/emoji.json
index fd81268fb..d5b96f0f9 100644
--- a/app/javascript/dashboard/i18n/locale/am/emoji.json
+++ b/app/javascript/dashboard/i18n/locale/am/emoji.json
@@ -1,6 +1,7 @@
 {
   "EMOJI": {
     "PLACEHOLDER": "Search emojis",
-    "NOT_FOUND": "No emoji match your search"
+    "NOT_FOUND": "No emoji match your search",
+    "REMOVE": "Remove"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/am/helpCenter.json b/app/javascript/dashboard/i18n/locale/am/helpCenter.json
index 72f642584..af692a27e 100644
--- a/app/javascript/dashboard/i18n/locale/am/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/am/helpCenter.json
@@ -365,7 +365,7 @@
         "NAME": {
           "LABEL": "Name",
           "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Name is required"
         },
         "SLUG": {
@@ -396,7 +396,7 @@
         "NAME": {
           "LABEL": "Name",
           "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Name is required"
         },
         "SLUG": {
diff --git a/app/javascript/dashboard/i18n/locale/ar/emoji.json b/app/javascript/dashboard/i18n/locale/ar/emoji.json
index 61be07788..d3fbd9848 100644
--- a/app/javascript/dashboard/i18n/locale/ar/emoji.json
+++ b/app/javascript/dashboard/i18n/locale/ar/emoji.json
@@ -1,6 +1,7 @@
 {
   "EMOJI": {
     "PLACEHOLDER": "ابحث في الايموجي",
-    "NOT_FOUND": "لا يوجد إيموجي يطابق بحثك"
+    "NOT_FOUND": "لا يوجد إيموجي يطابق بحثك",
+    "REMOVE": "حذف"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ar/helpCenter.json b/app/javascript/dashboard/i18n/locale/ar/helpCenter.json
index 8a1686529..e492ee8ee 100644
--- a/app/javascript/dashboard/i18n/locale/ar/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ar/helpCenter.json
@@ -365,7 +365,7 @@
         "NAME": {
           "LABEL": "الاسم",
           "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "الاسم مطلوب"
         },
         "SLUG": {
@@ -396,7 +396,7 @@
         "NAME": {
           "LABEL": "الاسم",
           "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "الاسم مطلوب"
         },
         "SLUG": {
diff --git a/app/javascript/dashboard/i18n/locale/bg/emoji.json b/app/javascript/dashboard/i18n/locale/bg/emoji.json
index fd81268fb..d5b96f0f9 100644
--- a/app/javascript/dashboard/i18n/locale/bg/emoji.json
+++ b/app/javascript/dashboard/i18n/locale/bg/emoji.json
@@ -1,6 +1,7 @@
 {
   "EMOJI": {
     "PLACEHOLDER": "Search emojis",
-    "NOT_FOUND": "No emoji match your search"
+    "NOT_FOUND": "No emoji match your search",
+    "REMOVE": "Remove"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/bg/helpCenter.json b/app/javascript/dashboard/i18n/locale/bg/helpCenter.json
index 0609db287..4d79683ff 100644
--- a/app/javascript/dashboard/i18n/locale/bg/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/bg/helpCenter.json
@@ -365,7 +365,7 @@
         "NAME": {
           "LABEL": "Име",
           "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Name is required"
         },
         "SLUG": {
@@ -396,7 +396,7 @@
         "NAME": {
           "LABEL": "Име",
           "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Name is required"
         },
         "SLUG": {
diff --git a/app/javascript/dashboard/i18n/locale/ca/emoji.json b/app/javascript/dashboard/i18n/locale/ca/emoji.json
index fd81268fb..f89f088b6 100644
--- a/app/javascript/dashboard/i18n/locale/ca/emoji.json
+++ b/app/javascript/dashboard/i18n/locale/ca/emoji.json
@@ -1,6 +1,7 @@
 {
   "EMOJI": {
     "PLACEHOLDER": "Search emojis",
-    "NOT_FOUND": "No emoji match your search"
+    "NOT_FOUND": "No emoji match your search",
+    "REMOVE": "Suprimeix"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ca/helpCenter.json b/app/javascript/dashboard/i18n/locale/ca/helpCenter.json
index 2938c57d7..34e9dc594 100644
--- a/app/javascript/dashboard/i18n/locale/ca/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ca/helpCenter.json
@@ -365,7 +365,7 @@
         "NAME": {
           "LABEL": "Nom",
           "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Name is required"
         },
         "SLUG": {
@@ -396,7 +396,7 @@
         "NAME": {
           "LABEL": "Nom",
           "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Name is required"
         },
         "SLUG": {
diff --git a/app/javascript/dashboard/i18n/locale/cs/emoji.json b/app/javascript/dashboard/i18n/locale/cs/emoji.json
index fd81268fb..1212069f2 100644
--- a/app/javascript/dashboard/i18n/locale/cs/emoji.json
+++ b/app/javascript/dashboard/i18n/locale/cs/emoji.json
@@ -1,6 +1,7 @@
 {
   "EMOJI": {
     "PLACEHOLDER": "Search emojis",
-    "NOT_FOUND": "No emoji match your search"
+    "NOT_FOUND": "No emoji match your search",
+    "REMOVE": "Odebrat"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/cs/helpCenter.json b/app/javascript/dashboard/i18n/locale/cs/helpCenter.json
index f83ca01e4..ea579414e 100644
--- a/app/javascript/dashboard/i18n/locale/cs/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/cs/helpCenter.json
@@ -365,7 +365,7 @@
         "NAME": {
           "LABEL": "Název",
           "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Name is required"
         },
         "SLUG": {
@@ -396,7 +396,7 @@
         "NAME": {
           "LABEL": "Název",
           "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Name is required"
         },
         "SLUG": {
diff --git a/app/javascript/dashboard/i18n/locale/da/emoji.json b/app/javascript/dashboard/i18n/locale/da/emoji.json
index aa1364831..27607b4b4 100644
--- a/app/javascript/dashboard/i18n/locale/da/emoji.json
+++ b/app/javascript/dashboard/i18n/locale/da/emoji.json
@@ -1,6 +1,7 @@
 {
   "EMOJI": {
     "PLACEHOLDER": "Søg emojis",
-    "NOT_FOUND": "Ingen emoji matcher din søgning"
+    "NOT_FOUND": "Ingen emoji matcher din søgning",
+    "REMOVE": "Fjern"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/da/helpCenter.json b/app/javascript/dashboard/i18n/locale/da/helpCenter.json
index f2a5f9ca2..86d781075 100644
--- a/app/javascript/dashboard/i18n/locale/da/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/da/helpCenter.json
@@ -365,7 +365,7 @@
         "NAME": {
           "LABEL": "Navn",
           "PLACEHOLDER": "Kategori navn",
-          "HELP_TEXT": "Kategorinavnet vil blive brugt i den offentlige vendende portal til at kategorisere artikler.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Navn er påkrævet"
         },
         "SLUG": {
@@ -396,7 +396,7 @@
         "NAME": {
           "LABEL": "Navn",
           "PLACEHOLDER": "Kategori navn",
-          "HELP_TEXT": "Kategorinavnet vil blive brugt i den offentlige vendende portal til at kategorisere artikler.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Navn er påkrævet"
         },
         "SLUG": {
diff --git a/app/javascript/dashboard/i18n/locale/de/emoji.json b/app/javascript/dashboard/i18n/locale/de/emoji.json
index 9a4a6ee9b..c80d5d659 100644
--- a/app/javascript/dashboard/i18n/locale/de/emoji.json
+++ b/app/javascript/dashboard/i18n/locale/de/emoji.json
@@ -1,6 +1,7 @@
 {
   "EMOJI": {
     "PLACEHOLDER": "Emojis durchsuchen",
-    "NOT_FOUND": "Kein Emoji entspricht deiner Suche"
+    "NOT_FOUND": "Kein Emoji entspricht deiner Suche",
+    "REMOVE": "Entfernen"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/de/helpCenter.json b/app/javascript/dashboard/i18n/locale/de/helpCenter.json
index 893d35e43..959f1384f 100644
--- a/app/javascript/dashboard/i18n/locale/de/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/de/helpCenter.json
@@ -365,7 +365,7 @@
         "NAME": {
           "LABEL": "Name",
           "PLACEHOLDER": "Kategoriename",
-          "HELP_TEXT": "Der Kategoriename wird im öffentlich zugänglichen Portal verwendet, um Artikel zu kategorisieren.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Name wird benötigt"
         },
         "SLUG": {
@@ -396,7 +396,7 @@
         "NAME": {
           "LABEL": "Name",
           "PLACEHOLDER": "Kategoriename",
-          "HELP_TEXT": "Der Kategoriename wird im öffentlich zugänglichen Portal verwendet, um Artikel zu kategorisieren.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Name wird benötigt"
         },
         "SLUG": {
diff --git a/app/javascript/dashboard/i18n/locale/el/emoji.json b/app/javascript/dashboard/i18n/locale/el/emoji.json
index 09a12fdce..7db617212 100644
--- a/app/javascript/dashboard/i18n/locale/el/emoji.json
+++ b/app/javascript/dashboard/i18n/locale/el/emoji.json
@@ -1,6 +1,7 @@
 {
   "EMOJI": {
     "PLACEHOLDER": "Αναζήτηση emojis",
-    "NOT_FOUND": "Κανένα emoji δεν ταιριάζει με την αναζήτησή σας"
+    "NOT_FOUND": "Κανένα emoji δεν ταιριάζει με την αναζήτησή σας",
+    "REMOVE": "Διαγραφή"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/el/helpCenter.json b/app/javascript/dashboard/i18n/locale/el/helpCenter.json
index 4a7f12c49..7a4d24c1f 100644
--- a/app/javascript/dashboard/i18n/locale/el/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/el/helpCenter.json
@@ -365,7 +365,7 @@
         "NAME": {
           "LABEL": "Όνομα",
           "PLACEHOLDER": "Όνομα κατηγορίας",
-          "HELP_TEXT": "Η κατηγορία θα χρησιμοποιηθεί στην πύλη που βλέπει το κοινό για την κατηγοριοποίηση των άρθρων.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Απαιτείται όνομα"
         },
         "SLUG": {
@@ -396,7 +396,7 @@
         "NAME": {
           "LABEL": "Όνομα",
           "PLACEHOLDER": "Όνομα κατηγορίας",
-          "HELP_TEXT": "Η κατηγορία θα χρησιμοποιηθεί στην πύλη που βλέπει το κοινό για την κατηγοριοποίηση των άρθρων.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Απαιτείται όνομα"
         },
         "SLUG": {
diff --git a/app/javascript/dashboard/i18n/locale/es/conversation.json b/app/javascript/dashboard/i18n/locale/es/conversation.json
index d0c86391d..3e55251e2 100644
--- a/app/javascript/dashboard/i18n/locale/es/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/es/conversation.json
@@ -139,8 +139,8 @@
       "PRIVATE_NOTE": "Nota privada",
       "SEND": "Enviar",
       "CREATE": "Añadir nota",
-      "DISMISS_REPLY": "Dismiss reply",
-      "REPLYING_TO": "Replying to:",
+      "DISMISS_REPLY": "Descartar respuesta",
+      "REPLYING_TO": "Respondiendo a:",
       "TIP_FORMAT_ICON": "Mostrar editor de textos",
       "TIP_EMOJI_ICON": "Mostrar selector de emoji",
       "TIP_ATTACH_ICON": "Adjuntar archivos",
@@ -195,7 +195,7 @@
     },
     "CONTEXT_MENU": {
       "COPY": "Copiar",
-      "REPLY_TO": "Reply to this message",
+      "REPLY_TO": "Responder a este mensaje",
       "DELETE": "Eliminar",
       "CREATE_A_CANNED_RESPONSE": "Añadir a respuestas predefinidas",
       "TRANSLATE": "Traducir",
diff --git a/app/javascript/dashboard/i18n/locale/es/emoji.json b/app/javascript/dashboard/i18n/locale/es/emoji.json
index c0493214b..c1cedd25e 100644
--- a/app/javascript/dashboard/i18n/locale/es/emoji.json
+++ b/app/javascript/dashboard/i18n/locale/es/emoji.json
@@ -1,6 +1,7 @@
 {
   "EMOJI": {
     "PLACEHOLDER": "Buscar emojis",
-    "NOT_FOUND": "Ningún emoji coincide con tu búsqueda"
+    "NOT_FOUND": "Ningún emoji coincide con tu búsqueda",
+    "REMOVE": "Eliminar"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/es/helpCenter.json b/app/javascript/dashboard/i18n/locale/es/helpCenter.json
index 642af96a8..474b6d5d8 100644
--- a/app/javascript/dashboard/i18n/locale/es/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/es/helpCenter.json
@@ -365,7 +365,7 @@
         "NAME": {
           "LABEL": "Nombre",
           "PLACEHOLDER": "Nombre de categoría",
-          "HELP_TEXT": "El nombre de la categoría se utilizará en el portal público orientado a categorizar los artículos.",
+          "HELP_TEXT": "El nombre de la categoría y el icono se utilizarán en el portal público para categorizar los artículos.",
           "ERROR": "El nombre es requerido"
         },
         "SLUG": {
@@ -396,7 +396,7 @@
         "NAME": {
           "LABEL": "Nombre",
           "PLACEHOLDER": "Nombre de categoría",
-          "HELP_TEXT": "El nombre de la categoría se utilizará en el portal público orientado a categorizar los artículos.",
+          "HELP_TEXT": "El nombre de la categoría y el icono se utilizarán en el portal público para categorizar los artículos.",
           "ERROR": "El nombre es requerido"
         },
         "SLUG": {
@@ -428,28 +428,28 @@
     },
     "UPGRADE_PAGE": {
       "TITLE": "Centro de ayuda",
-      "DESCRIPTION": "Create user-friendly self-service portals. Help your users to access the articles and get support 24/7. Upgrade your subscription to enable this feature.",
-      "SELF_HOSTED_DESCRIPTION": "Create user-friendly self-service portals. Help your users to access the articles and get support 24/7. Please contact your administrator to enable this feature.",
+      "DESCRIPTION": "Crear portales de autoservicio amigables. Ayuda a tus usuarios a acceder a los artículos y obtener soporte 24/7. Actualiza tu suscripción para activar esta característica.",
+      "SELF_HOSTED_DESCRIPTION": "Crear portales de autoservicio amigables. Ayuda a tus usuarios a acceder a los artículos y obtener soporte 24/7. Póngase en contacto con su administrador para habilitar esta característica.",
       "BUTTON": {
         "LEARN_MORE": "Más información",
-        "UPGRADE": "Upgrade"
+        "UPGRADE": "Mejorar"
       },
       "FEATURES": {
         "PORTALS": {
-          "TITLE": "Multiple portals",
-          "DESCRIPTION": "Create multiple help center portals for different products using the same account."
+          "TITLE": "Múltiples portales",
+          "DESCRIPTION": "Crear múltiples portales de centro de ayuda para diferentes productos usando la misma cuenta."
         },
         "LOCALES": {
-          "TITLE": "Full support for locales",
-          "DESCRIPTION": "Localize the portal in your language. We support all locales and allow translations for every article."
+          "TITLE": "Soporte completo para locales",
+          "DESCRIPTION": "Localiza el portal en tu idioma. Apoyamos todas las localizaciones y permitimos traducciones para cada artículo."
         },
         "SEO": {
-          "TITLE": "SEO-friendly design",
-          "DESCRIPTION": "Customize your meta tags to improve your visibility on search engines with our SEO-friendly pages."
+          "TITLE": "Diseño amigable con SEO",
+          "DESCRIPTION": "Personalice sus meta-etiquetas para mejorar su visibilidad en los motores de búsqueda con nuestras páginas amigables con SEO."
         },
         "API": {
-          "TITLE": "Full API support",
-          "DESCRIPTION": "Use the portal as a headless CMS with third party front-end frameworks using our APIs."
+          "TITLE": "Soporte completo de API",
+          "DESCRIPTION": "Utilice el portal como un CMS sin cabeceras con frameworks front-end de terceros usando nuestras APIs."
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/fa/chatlist.json b/app/javascript/dashboard/i18n/locale/fa/chatlist.json
index cdb8d6586..a816db440 100644
--- a/app/javascript/dashboard/i18n/locale/fa/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/fa/chatlist.json
@@ -39,7 +39,7 @@
     "SORT_TOOLTIP_LABEL": "مرتب‌سازی گفتگوها",
     "CHAT_SORT": {
       "STATUS": "وضعیت",
-      "ORDER_BY": "سفارش توسط"
+      "ORDER_BY": "مرتب بر اساس"
     },
     "CHAT_TIME_STAMP": {
       "CREATED": {
@@ -62,7 +62,7 @@
         "TEXT": "اولویت"
       },
       "sort_on_waiting_since": {
-        "TEXT": "پاسخ در انتظار"
+        "TEXT": "در انتظار پاسخ"
       }
     },
     "ATTACHMENTS": {
diff --git a/app/javascript/dashboard/i18n/locale/fa/contact.json b/app/javascript/dashboard/i18n/locale/fa/contact.json
index 283175920..6d2055cb8 100644
--- a/app/javascript/dashboard/i18n/locale/fa/contact.json
+++ b/app/javascript/dashboard/i18n/locale/fa/contact.json
@@ -9,7 +9,7 @@
     "LOCATION": "مکان",
     "BROWSER_LANGUAGE": "مرور زبان",
     "CONVERSATION_TITLE": "جزئیات مکالمه",
-    "VIEW_PROFILE": "نمایش مشخصات",
+    "VIEW_PROFILE": "نمایش پروفایل",
     "BROWSER": "مرورگر",
     "OS": "سیستم عامل",
     "INITIATED_FROM": "شروع شده از",
@@ -62,13 +62,13 @@
     "DESC": "اطلاعات اولیه درباره مخاطب را اضافه کنید."
   },
   "IMPORT_CONTACTS": {
-    "BUTTON_LABEL": "وارد كردن",
-    "TITLE": "وارد کردن مخاطبین",
+    "BUTTON_LABEL": "تزریق کردن",
+    "TITLE": "تزریق مخاطبین",
     "DESC": "مخاطبین را از طریق یک فایل CSV وارد کنید.",
     "DOWNLOAD_LABEL": "نمونه csv را بارگیری کنید.",
     "FORM": {
       "LABEL": "پرونده CSV",
-      "SUBMIT": "وارد كردن",
+      "SUBMIT": "تزریق کردن",
       "CANCEL": "انصراف"
     },
     "SUCCESS_MESSAGE": "You will be notified via email when the import is complete.",
diff --git a/app/javascript/dashboard/i18n/locale/fa/conversation.json b/app/javascript/dashboard/i18n/locale/fa/conversation.json
index 31a82262d..540b6aeb0 100644
--- a/app/javascript/dashboard/i18n/locale/fa/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/fa/conversation.json
@@ -1,7 +1,7 @@
 {
   "CONVERSATION": {
     "SELECT_A_CONVERSATION": "لطفا یک گفتگو را از پنجره گفتگوها انتخاب کنید",
-    "CSAT_REPLY_MESSAGE": "لطفاً به مکالمه امتیاز دهید",
+    "CSAT_REPLY_MESSAGE": "لطفاً به گفتگو امتیاز دهید",
     "404": "با عرض پوزش، ما نمی‌توانیم گفتگو را پیدا کنیم. لطفا دوباره تلاش کنید",
     "SWITCH_VIEW_LAYOUT": "تغییر طرح‌بندی",
     "DASHBOARD_APP_TAB_MESSAGES": "پیام‌ها",
@@ -37,7 +37,7 @@
     "REPLYING_TO": "شما در حال پاسخ دادن به:",
     "REMOVE_SELECTION": "حذف انتخاب‌شده‌ها",
     "DOWNLOAD": "دانلود",
-    "UNKNOWN_FILE_TYPE": "پرونده ناشناخته",
+    "UNKNOWN_FILE_TYPE": "فایل ناشناخته",
     "SAVE_CONTACT": "ذخیره",
     "UPLOADING_ATTACHMENTS": "در حال بارگذاری پیوست‌ها...",
     "REPLIED_TO_STORY": "Replied to your story",
@@ -46,7 +46,7 @@
     "NO_RESPONSE": "بدون پاسخ",
     "RATING_TITLE": "رتبه",
     "FEEDBACK_TITLE": "بازخورد",
-    "REPLY_MESSAGE_NOT_FOUND": "Message not available",
+    "REPLY_MESSAGE_NOT_FOUND": "پیام در دسترس نیست",
     "CARD": {
       "SHOW_LABELS": "مشاهده کردن برچسب‌ها",
       "HIDE_LABELS": "پنهان کردن برچسب‌ها"
@@ -58,7 +58,7 @@
       "OPEN": "بیشتر",
       "CLOSE": "بستن",
       "DETAILS": "جزئیات",
-      "SNOOZED_UNTIL": "Snoozed until",
+      "SNOOZED_UNTIL": "به تعویق افتاده تا",
       "SNOOZED_UNTIL_TOMORROW": "تا فردا به تعویق افتاد",
       "SNOOZED_UNTIL_NEXT_WEEK": "تا هفته آینده به تعویق افتاد",
       "SNOOZED_UNTIL_NEXT_REPLY": "تا پاسخ بعدی به تعویق افتاد"
@@ -76,23 +76,23 @@
     "CUSTOM_SNOOZE": {
       "TITLE": "به تعویق انداختن تا",
       "APPLY": "به تعویق انداختن",
-      "CANCEL": "انصراف"
+      "CANCEL": "لغو"
     },
     "PRIORITY": {
       "TITLE": "اولویت",
       "OPTIONS": {
         "NONE": "هیچکدام",
         "URGENT": "Urgent",
-        "HIGH": "High",
-        "MEDIUM": "Medium",
-        "LOW": "Low"
+        "HIGH": "بالا",
+        "MEDIUM": "متوسط",
+        "LOW": "پایین"
       },
       "CHANGE_PRIORITY": {
         "SELECT_PLACEHOLDER": "هیچکدام",
-        "INPUT_PLACEHOLDER": "Select priority",
+        "INPUT_PLACEHOLDER": "انتخاب اولویت",
         "NO_RESULTS": "نتیجه‌ای یافت نشد",
-        "SUCCESSFUL": "Changed priority of conversation id %{conversationId} to %{priority}",
-        "FAILED": "Couldn't change priority. Please try again."
+        "SUCCESSFUL": "تغییر اولویت گفتگوی با شناسه %{conversationId} به %{priority}",
+        "FAILED": "تغییر اولویت گفتگو با موفقیت انجام نشد. لطفا دوباره تلاش نمایید."
       }
     },
     "CARD_CONTEXT_MENU": {
@@ -139,8 +139,8 @@
       "PRIVATE_NOTE": "یادداشت خصوصی",
       "SEND": "ارسال",
       "CREATE": "افزودن یادداشت",
-      "DISMISS_REPLY": "Dismiss reply",
-      "REPLYING_TO": "Replying to:",
+      "DISMISS_REPLY": "رد پاسخ",
+      "REPLYING_TO": "در حال پاسخ دهی به:",
       "TIP_FORMAT_ICON": "نمایش ویرایشگر متنی پیشرفته",
       "TIP_EMOJI_ICON": "انتخاب ایموجی",
       "TIP_ATTACH_ICON": "ضمیمه فایل",
@@ -152,10 +152,10 @@
       "STOP_AUDIO_RECORDING": "در حال توقف ضبط صدا",
       "": "",
       "EMAIL_HEAD": {
-        "TO": "TO",
-        "ADD_BCC": "افزودن bcc",
+        "TO": "به",
+        "ADD_BCC": "افزودن رونوشت",
         "CC": {
-          "LABEL": "CC",
+          "LABEL": "رونوشت",
           "PLACEHOLDER": "ایمیل‌ها با کاما از هم جدا می‌شوند",
           "ERROR": "لطفا آدرس‌ ایمیل معتبر وارد کنید"
         },
@@ -195,7 +195,7 @@
     },
     "CONTEXT_MENU": {
       "COPY": "کپی",
-      "REPLY_TO": "Reply to this message",
+      "REPLY_TO": "پاسخ به این پیام",
       "DELETE": "حذف",
       "CREATE_A_CANNED_RESPONSE": "اضافه کردن به پاسخ‌های آماده",
       "TRANSLATE": "ترجمه",
@@ -296,7 +296,7 @@
     "SUBJECT": "موضوع"
   },
   "CONVERSATION_PARTICIPANTS": {
-    "SIDEBAR_MENU_TITLE": "شرکت کننده",
+    "SIDEBAR_MENU_TITLE": "شرکت کنندگان",
     "SIDEBAR_TITLE": "شرکت کنندگان در گفتگو",
     "NO_RECORDS_FOUND": "نتیجه‌ای یافت نشد",
     "ADD_PARTICIPANTS": "شرکت کنندگان را انتخاب کنید",
diff --git a/app/javascript/dashboard/i18n/locale/fa/emoji.json b/app/javascript/dashboard/i18n/locale/fa/emoji.json
index 6cc528b89..4e6cb0926 100644
--- a/app/javascript/dashboard/i18n/locale/fa/emoji.json
+++ b/app/javascript/dashboard/i18n/locale/fa/emoji.json
@@ -1,6 +1,7 @@
 {
   "EMOJI": {
     "PLACEHOLDER": "جستجوی ایموجی",
-    "NOT_FOUND": "هیچ ایموجی با جستجوی شما مطابقت ندارد"
+    "NOT_FOUND": "هیچ ایموجی با جستجوی شما مطابقت ندارد",
+    "REMOVE": "حذف"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fa/generalSettings.json b/app/javascript/dashboard/i18n/locale/fa/generalSettings.json
index 0230a2b71..548fdf15c 100644
--- a/app/javascript/dashboard/i18n/locale/fa/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/fa/generalSettings.json
@@ -3,7 +3,7 @@
     "TITLE": "تنظیمات حساب",
     "SUBMIT": "به‌روزرسانی تنظیمات",
     "BACK": "بازگشت",
-    "DISMISS": "Dismiss",
+    "DISMISS": "نادیده بگیر",
     "UPDATE": {
       "ERROR": "تنظیمات به‌روزرسانی نشد، دوباره امتحان کنید!",
       "SUCCESS": "تنظیمات با موفقیت اعمال شد"
@@ -92,7 +92,7 @@
   },
   "NETWORK": {
     "NOTIFICATION": {
-      "TEXT": "قطع کردن Chatwoot"
+      "TEXT": "ارتباط با سیستم چت قطع شده است"
     },
     "BUTTON": {
       "REFRESH": "تازه کردن"
@@ -112,7 +112,7 @@
       "REMOVE_LABEL": "برچسب را از مکالمه حذف کنید",
       "SETTINGS": "تنظیمات",
       "AI_ASSIST": "AI Assist",
-      "APPEARANCE": "Appearance"
+      "APPEARANCE": "ظاهری"
     },
     "COMMANDS": {
       "GO_TO_CONVERSATION_DASHBOARD": "به داشبورد مکالمه بروید",
@@ -135,7 +135,7 @@
       "ADD_LABELS_TO_CONVERSATION": "برچسب را به مکالمه اضافه کنید",
       "ASSIGN_AN_AGENT": "یک ایجنت تعیین کنید",
       "AI_ASSIST": "AI Assist",
-      "ASSIGN_PRIORITY": "Assign priority",
+      "ASSIGN_PRIORITY": "انتساب اولویت",
       "ASSIGN_A_TEAM": "یک تیم را تعیین کنید",
       "MUTE_CONVERSATION": "صدای گفتگو را قطع کن",
       "UNMUTE_CONVERSATION": "مکالمه را باصدا کنید",
@@ -147,8 +147,8 @@
       "UNTIL_NEXT_REPLY": "تا پاسخ بعدی",
       "UNTIL_NEXT_WEEK": "تا هفته بعد",
       "UNTIL_TOMORROW": "تا فردا",
-      "UNTIL_NEXT_MONTH": "Until next month",
-      "AN_HOUR_FROM_NOW": "Until an hour from now",
+      "UNTIL_NEXT_MONTH": "تا ماه آینده",
+      "AN_HOUR_FROM_NOW": "از حالا تا یک ساعت دیگر",
       "CUSTOM": "سفارشی...",
       "CHANGE_APPEARANCE": "تغییر ظاهر",
       "LIGHT_MODE": "روشن",
diff --git a/app/javascript/dashboard/i18n/locale/fa/helpCenter.json b/app/javascript/dashboard/i18n/locale/fa/helpCenter.json
index 83ca68566..f10607ffd 100644
--- a/app/javascript/dashboard/i18n/locale/fa/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/fa/helpCenter.json
@@ -365,7 +365,7 @@
         "NAME": {
           "LABEL": "نام",
           "PLACEHOLDER": "نام دسته‌بندی",
-          "HELP_TEXT": "از نام دسته در پرتال عمومی برای دسته بندی مقالات استفاده می شود.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "نام الزامی است"
         },
         "SLUG": {
@@ -396,7 +396,7 @@
         "NAME": {
           "LABEL": "نام",
           "PLACEHOLDER": "نام دسته‌بندی",
-          "HELP_TEXT": "از نام دسته در پرتال عمومی برای دسته بندی مقالات استفاده می شود.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "نام الزامی است"
         },
         "SLUG": {
diff --git a/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json
index 838808ec5..80c08d99a 100644
--- a/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json
@@ -162,7 +162,7 @@
         "PROVIDERS": {
           "LABEL": "ارائه دهنده API",
           "TWILIO": "Twilio",
-          "BANDWIDTH": "Bandwidth"
+          "BANDWIDTH": "پهنای باند"
         },
         "API": {
           "ERROR_MESSAGE": "ما نتوانستیم کانال پیامک را ذخیره کنیم"
@@ -405,21 +405,21 @@
         "DISABLED": "غیرفعال"
       },
       "SENDER_NAME_SECTION": {
-        "TITLE": "Sender name",
+        "TITLE": "نام ارسال کننده",
         "SUB_TEXT": "Select the name shown to the your customer when they receive emails from your agents.",
         "FOR_EG": "For eg:",
         "FRIENDLY": {
-          "TITLE": "Friendly",
+          "TITLE": "دوستانه",
           "FROM": "از",
           "SUBTITLE": "Add the name of the agent who sent the reply in the sender name to make it friendly."
         },
         "PROFESSIONAL": {
-          "TITLE": "Professional",
+          "TITLE": "حرفه ای",
           "SUBTITLE": "Use only the configured business name as the sender name in the email header."
         },
         "BUSINESS_NAME": {
           "BUTTON_TEXT": "+ Configure your business name",
-          "PLACEHOLDER": "Enter your business name",
+          "PLACEHOLDER": "نام کسب و کار خود را وارد کنید",
           "SAVE_BUTTON_TEXT": "ذخیره"
         }
       },
@@ -486,7 +486,7 @@
       "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "فعال یا غیرفعال کردن فرم دریافت ایمیل از کاربر",
       "AUTO_ASSIGNMENT": "فعال کردن واگذاری خودکار گفتگو به ایجنت ها",
       "ENABLE_CSAT": "فعال کردن رضایت مشتری",
-      "SENDER_NAME_SECTION": "Enable Agent Name in Email",
+      "SENDER_NAME_SECTION": "فعال سازی نام اپراتور در ایمیل",
       "ENABLE_CSAT_SUB_TEXT": "پس از پایان گفتگو ، نظرسنجی CSAT (رضایت مشتری) را فعال/غیرفعال کنید",
       "SENDER_NAME_SECTION_TEXT": "Enable/Disable showing Agent's name in email, if disabled it will show business name",
       "ENABLE_CONTINUITY_VIA_EMAIL": "ادامه مکالمه را از طریق ایمیل فعال کنید",
@@ -498,7 +498,7 @@
       "AUTO_ASSIGNMENT_SUB_TEXT": "فعال کردن یا غیرفعال کردن واگذاری خودکار گفتگوها به ایجنت های عضو این صندوق ورودی.",
       "HMAC_VERIFICATION": "اعتبار سنجی کاربر",
       "HMAC_DESCRIPTION": "به منظور اعتبارسنجی هویت کاربر، می‌توانید یک «شناسه_هش» برای هر کاربر ارسال کنید. می‌توانید با استفاده از «شناسه» با کلید نشان داده شده در اینجا یک هش HMAC sha256 ایجاد کنید.",
-      "HMAC_LINK_TO_DOCS": "You can read more here.",
+      "HMAC_LINK_TO_DOCS": "از اینجا می توانید بیشتر بخوانید.",
       "HMAC_MANDATORY_VERIFICATION": "مجبور کردن تأیید اعتبار هویت کاربر",
       "HMAC_MANDATORY_DESCRIPTION": "اگر فعال باشد، درخواست‌هایی که «identifier_hash» را ندارند رد می‌شوند.",
       "INBOX_IDENTIFIER": "شناسه صندوق ورودی",
@@ -674,7 +674,7 @@
           "PLACE_HOLDER": "دسترسی به ما ساده است. هر سوالی پیش آمد همینجا از ما بپرسید."
         },
         "REPLY_TIME": {
-          "LABEL": "زمان پاسخ",
+          "LABEL": "زمان پاسخ دهی",
           "IN_A_FEW_MINUTES": "در چند دقیقه",
           "IN_A_FEW_HOURS": "در چند ساعت",
           "IN_A_DAY": "در یک روز"
@@ -712,12 +712,12 @@
         "CHAT": "گفتگو"
       },
       "REPLY_TIME": {
-        "IN_A_FEW_MINUTES": "معمولاً در عرض چند دقیقه پاسخ می دهند",
+        "IN_A_FEW_MINUTES": "معمولاً در عرض چند دقیقه پاسخ دهی انجام می شود",
         "IN_A_FEW_HOURS": "معمولاً در عرض چند ساعت پاسخ می دهند",
-        "IN_A_DAY": "به طور معمول در یک روز پاسخ می دهند"
+        "IN_A_DAY": "به طور معمول در یک روز پاسخ دهی انجام می شود"
       },
       "FOOTER": {
-        "START_CONVERSATION_BUTTON_TEXT": "شروع گفتگو",
+        "START_CONVERSATION_BUTTON_TEXT": "گفتگو را شروع کنید",
         "CHAT_INPUT_PLACEHOLDER": "پیام خود را وارد کنید"
       },
       "BODY": {
diff --git a/app/javascript/dashboard/i18n/locale/fa/integrations.json b/app/javascript/dashboard/i18n/locale/fa/integrations.json
index 1960d27d3..14254c4bb 100644
--- a/app/javascript/dashboard/i18n/locale/fa/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/fa/integrations.json
@@ -131,7 +131,7 @@
         "KEY_PLACEHOLDER": "Enter your OpenAI API key",
         "BUTTONS": {
           "NEED_HELP": "به کمک احتياج داری؟",
-          "DISMISS": "Dismiss",
+          "DISMISS": "نادیده بگیر",
           "FINISH": "Finish Setup"
         },
         "DISMISS_MESSAGE": "You can setup OpenAI integration later Whenever you want.",
diff --git a/app/javascript/dashboard/i18n/locale/fa/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/fa/labelsMgmt.json
index 040553112..2230e35bc 100644
--- a/app/javascript/dashboard/i18n/locale/fa/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fa/labelsMgmt.json
@@ -46,7 +46,7 @@
         "DISMISS": "Dismiss suggestion"
       },
       "POWERED_BY": "Chatwoot AI",
-      "DISMISS": "Dismiss",
+      "DISMISS": "نادیده بگیر",
       "ADD_SELECTED_LABELS": "Add selected labels",
       "ADD_SELECTED_LABEL": "Add selected label",
       "ADD_ALL_LABELS": "Add all labels"
diff --git a/app/javascript/dashboard/i18n/locale/fi/emoji.json b/app/javascript/dashboard/i18n/locale/fi/emoji.json
index fd81268fb..813862946 100644
--- a/app/javascript/dashboard/i18n/locale/fi/emoji.json
+++ b/app/javascript/dashboard/i18n/locale/fi/emoji.json
@@ -1,6 +1,7 @@
 {
   "EMOJI": {
     "PLACEHOLDER": "Search emojis",
-    "NOT_FOUND": "No emoji match your search"
+    "NOT_FOUND": "No emoji match your search",
+    "REMOVE": "Poista"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fi/helpCenter.json b/app/javascript/dashboard/i18n/locale/fi/helpCenter.json
index 189a4718c..f2129e52f 100644
--- a/app/javascript/dashboard/i18n/locale/fi/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/fi/helpCenter.json
@@ -365,7 +365,7 @@
         "NAME": {
           "LABEL": "Nimi",
           "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Name is required"
         },
         "SLUG": {
@@ -396,7 +396,7 @@
         "NAME": {
           "LABEL": "Nimi",
           "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Name is required"
         },
         "SLUG": {
diff --git a/app/javascript/dashboard/i18n/locale/fr/emoji.json b/app/javascript/dashboard/i18n/locale/fr/emoji.json
index c67e48faf..4917bf08f 100644
--- a/app/javascript/dashboard/i18n/locale/fr/emoji.json
+++ b/app/javascript/dashboard/i18n/locale/fr/emoji.json
@@ -1,6 +1,7 @@
 {
   "EMOJI": {
     "PLACEHOLDER": "Rechercher des émojis",
-    "NOT_FOUND": "Aucun émoji ne correspond à votre recherche"
+    "NOT_FOUND": "Aucun émoji ne correspond à votre recherche",
+    "REMOVE": "Supprimer"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fr/helpCenter.json b/app/javascript/dashboard/i18n/locale/fr/helpCenter.json
index 6cc23c33b..a9adeafe6 100644
--- a/app/javascript/dashboard/i18n/locale/fr/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/fr/helpCenter.json
@@ -365,7 +365,7 @@
         "NAME": {
           "LABEL": "Nom",
           "PLACEHOLDER": "Nom de la catégorie",
-          "HELP_TEXT": "Le nom de la catégorie sera utilisé dans le portail public pour classer les articles.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Le nom est requis"
         },
         "SLUG": {
@@ -396,7 +396,7 @@
         "NAME": {
           "LABEL": "Nom",
           "PLACEHOLDER": "Nom de la catégorie",
-          "HELP_TEXT": "Le nom de la catégorie sera utilisé dans le portail public pour classer les articles.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Le nom est requis"
         },
         "SLUG": {
diff --git a/app/javascript/dashboard/i18n/locale/he/emoji.json b/app/javascript/dashboard/i18n/locale/he/emoji.json
index 7eb8f230d..da67df544 100644
--- a/app/javascript/dashboard/i18n/locale/he/emoji.json
+++ b/app/javascript/dashboard/i18n/locale/he/emoji.json
@@ -1,6 +1,7 @@
 {
   "EMOJI": {
     "PLACEHOLDER": "חפש אימוג'י",
-    "NOT_FOUND": "אין אמוג'י שתואם את החיפוש שלך"
+    "NOT_FOUND": "אין אמוג'י שתואם את החיפוש שלך",
+    "REMOVE": "הסר"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/he/helpCenter.json b/app/javascript/dashboard/i18n/locale/he/helpCenter.json
index 28e428c8b..083d8462f 100644
--- a/app/javascript/dashboard/i18n/locale/he/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/he/helpCenter.json
@@ -365,7 +365,7 @@
         "NAME": {
           "LABEL": "שם",
           "PLACEHOLDER": "שם קטגוריה",
-          "HELP_TEXT": "שם הקטגוריה ישמש בפורטל הפונה לציבור כדי לסווג מאמרים.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "שם שדה חובה"
         },
         "SLUG": {
@@ -396,7 +396,7 @@
         "NAME": {
           "LABEL": "שם",
           "PLACEHOLDER": "שם קטגוריה",
-          "HELP_TEXT": "שם הקטגוריה ישמש בפורטל הפונה לציבור כדי לסווג מאמרים.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "שם שדה חובה"
         },
         "SLUG": {
diff --git a/app/javascript/dashboard/i18n/locale/hi/emoji.json b/app/javascript/dashboard/i18n/locale/hi/emoji.json
index fd81268fb..d5b96f0f9 100644
--- a/app/javascript/dashboard/i18n/locale/hi/emoji.json
+++ b/app/javascript/dashboard/i18n/locale/hi/emoji.json
@@ -1,6 +1,7 @@
 {
   "EMOJI": {
     "PLACEHOLDER": "Search emojis",
-    "NOT_FOUND": "No emoji match your search"
+    "NOT_FOUND": "No emoji match your search",
+    "REMOVE": "Remove"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hi/helpCenter.json b/app/javascript/dashboard/i18n/locale/hi/helpCenter.json
index deacd1bff..4354004a0 100644
--- a/app/javascript/dashboard/i18n/locale/hi/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/hi/helpCenter.json
@@ -365,7 +365,7 @@
         "NAME": {
           "LABEL": "Name",
           "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Name is required"
         },
         "SLUG": {
@@ -396,7 +396,7 @@
         "NAME": {
           "LABEL": "Name",
           "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Name is required"
         },
         "SLUG": {
diff --git a/app/javascript/dashboard/i18n/locale/hr/emoji.json b/app/javascript/dashboard/i18n/locale/hr/emoji.json
index fd81268fb..cec8c96d4 100644
--- a/app/javascript/dashboard/i18n/locale/hr/emoji.json
+++ b/app/javascript/dashboard/i18n/locale/hr/emoji.json
@@ -1,6 +1,7 @@
 {
   "EMOJI": {
     "PLACEHOLDER": "Search emojis",
-    "NOT_FOUND": "No emoji match your search"
+    "NOT_FOUND": "No emoji match your search",
+    "REMOVE": "Izbaci"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hr/helpCenter.json b/app/javascript/dashboard/i18n/locale/hr/helpCenter.json
index 44ebf5291..d8a8dda8e 100644
--- a/app/javascript/dashboard/i18n/locale/hr/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/hr/helpCenter.json
@@ -365,7 +365,7 @@
         "NAME": {
           "LABEL": "Name",
           "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Name is required"
         },
         "SLUG": {
@@ -396,7 +396,7 @@
         "NAME": {
           "LABEL": "Name",
           "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Name is required"
         },
         "SLUG": {
diff --git a/app/javascript/dashboard/i18n/locale/hu/emoji.json b/app/javascript/dashboard/i18n/locale/hu/emoji.json
index a782413ef..a723075d9 100644
--- a/app/javascript/dashboard/i18n/locale/hu/emoji.json
+++ b/app/javascript/dashboard/i18n/locale/hu/emoji.json
@@ -1,6 +1,7 @@
 {
   "EMOJI": {
     "PLACEHOLDER": "Emoji keresése",
-    "NOT_FOUND": "Nem található emoji"
+    "NOT_FOUND": "Nem található emoji",
+    "REMOVE": "Eltávolítás"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hu/helpCenter.json b/app/javascript/dashboard/i18n/locale/hu/helpCenter.json
index 2ac4b2d66..df89d9cb9 100644
--- a/app/javascript/dashboard/i18n/locale/hu/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/hu/helpCenter.json
@@ -365,7 +365,7 @@
         "NAME": {
           "LABEL": "Név",
           "PLACEHOLDER": "Kategória neve",
-          "HELP_TEXT": "A kategória nevét a nyilvános portálon a cikkek kategorizálására használjuk.",
+          "HELP_TEXT": "A kategória neve és ikonja a nyilvános portálon a cikkek kategorizálására szolgál.",
           "ERROR": "Név kötelező"
         },
         "SLUG": {
@@ -396,7 +396,7 @@
         "NAME": {
           "LABEL": "Név",
           "PLACEHOLDER": "Kategória neve",
-          "HELP_TEXT": "A kategória nevét a nyilvános portálon a cikkek kategorizálására használjuk.",
+          "HELP_TEXT": "A kategória neve és ikonja a nyilvános portálon a cikkek kategorizálására szolgál.",
           "ERROR": "Név kötelező"
         },
         "SLUG": {
diff --git a/app/javascript/dashboard/i18n/locale/hy/emoji.json b/app/javascript/dashboard/i18n/locale/hy/emoji.json
index fd81268fb..d5b96f0f9 100644
--- a/app/javascript/dashboard/i18n/locale/hy/emoji.json
+++ b/app/javascript/dashboard/i18n/locale/hy/emoji.json
@@ -1,6 +1,7 @@
 {
   "EMOJI": {
     "PLACEHOLDER": "Search emojis",
-    "NOT_FOUND": "No emoji match your search"
+    "NOT_FOUND": "No emoji match your search",
+    "REMOVE": "Remove"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hy/helpCenter.json b/app/javascript/dashboard/i18n/locale/hy/helpCenter.json
index deacd1bff..4354004a0 100644
--- a/app/javascript/dashboard/i18n/locale/hy/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/hy/helpCenter.json
@@ -365,7 +365,7 @@
         "NAME": {
           "LABEL": "Name",
           "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Name is required"
         },
         "SLUG": {
@@ -396,7 +396,7 @@
         "NAME": {
           "LABEL": "Name",
           "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Name is required"
         },
         "SLUG": {
diff --git a/app/javascript/dashboard/i18n/locale/id/emoji.json b/app/javascript/dashboard/i18n/locale/id/emoji.json
index b1bcd42d7..0f84caedc 100644
--- a/app/javascript/dashboard/i18n/locale/id/emoji.json
+++ b/app/javascript/dashboard/i18n/locale/id/emoji.json
@@ -1,6 +1,7 @@
 {
   "EMOJI": {
     "PLACEHOLDER": "Cari emoji",
-    "NOT_FOUND": "Tidak ditemukan emoji yang sesuai dengan pencarian Anda"
+    "NOT_FOUND": "Tidak ditemukan emoji yang sesuai dengan pencarian Anda",
+    "REMOVE": "Hapus"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/id/helpCenter.json b/app/javascript/dashboard/i18n/locale/id/helpCenter.json
index eca29c3af..d4f0926d0 100644
--- a/app/javascript/dashboard/i18n/locale/id/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/id/helpCenter.json
@@ -365,7 +365,7 @@
         "NAME": {
           "LABEL": "Nama",
           "PLACEHOLDER": "Nama kategori",
-          "HELP_TEXT": "Nama kategori akan digunakan di portal menghadap publik untuk mengkategorikan artikel.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Nama dibutuhkan"
         },
         "SLUG": {
@@ -396,7 +396,7 @@
         "NAME": {
           "LABEL": "Nama",
           "PLACEHOLDER": "Nama kategori",
-          "HELP_TEXT": "Nama kategori akan digunakan di portal menghadap publik untuk mengkategorikan artikel.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Nama dibutuhkan"
         },
         "SLUG": {
diff --git a/app/javascript/dashboard/i18n/locale/is/emoji.json b/app/javascript/dashboard/i18n/locale/is/emoji.json
index fd81268fb..6ef642c6c 100644
--- a/app/javascript/dashboard/i18n/locale/is/emoji.json
+++ b/app/javascript/dashboard/i18n/locale/is/emoji.json
@@ -1,6 +1,7 @@
 {
   "EMOJI": {
     "PLACEHOLDER": "Search emojis",
-    "NOT_FOUND": "No emoji match your search"
+    "NOT_FOUND": "No emoji match your search",
+    "REMOVE": "Fjarlægja"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/is/helpCenter.json b/app/javascript/dashboard/i18n/locale/is/helpCenter.json
index 863378d32..c856683a0 100644
--- a/app/javascript/dashboard/i18n/locale/is/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/is/helpCenter.json
@@ -365,7 +365,7 @@
         "NAME": {
           "LABEL": "Nafn",
           "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "Flokksheitið verður notað í gáttinni sem snýr að almenningi til að flokka greinar.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Name is required"
         },
         "SLUG": {
@@ -396,7 +396,7 @@
         "NAME": {
           "LABEL": "Nafn",
           "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "Flokksheitið verður notað í gáttinni sem snýr að almenningi til að flokka greinar.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Name is required"
         },
         "SLUG": {
diff --git a/app/javascript/dashboard/i18n/locale/it/emoji.json b/app/javascript/dashboard/i18n/locale/it/emoji.json
index fd81268fb..4b6fa58ca 100644
--- a/app/javascript/dashboard/i18n/locale/it/emoji.json
+++ b/app/javascript/dashboard/i18n/locale/it/emoji.json
@@ -1,6 +1,7 @@
 {
   "EMOJI": {
     "PLACEHOLDER": "Search emojis",
-    "NOT_FOUND": "No emoji match your search"
+    "NOT_FOUND": "No emoji match your search",
+    "REMOVE": "Rimuovi"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/it/helpCenter.json b/app/javascript/dashboard/i18n/locale/it/helpCenter.json
index e7bcbe963..71a925b52 100644
--- a/app/javascript/dashboard/i18n/locale/it/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/it/helpCenter.json
@@ -365,7 +365,7 @@
         "NAME": {
           "LABEL": "Nome",
           "PLACEHOLDER": "Nome categoria",
-          "HELP_TEXT": "Il nome della categoria verrà utilizzato nel portale pubblico per categorizzare gli articoli.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Il nome è obbligatorio"
         },
         "SLUG": {
@@ -396,7 +396,7 @@
         "NAME": {
           "LABEL": "Nome",
           "PLACEHOLDER": "Nome categoria",
-          "HELP_TEXT": "Il nome della categoria verrà utilizzato nel portale pubblico per categorizzare gli articoli.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Il nome è obbligatorio"
         },
         "SLUG": {
diff --git a/app/javascript/dashboard/i18n/locale/ja/emoji.json b/app/javascript/dashboard/i18n/locale/ja/emoji.json
index fd81268fb..d0f2965ea 100644
--- a/app/javascript/dashboard/i18n/locale/ja/emoji.json
+++ b/app/javascript/dashboard/i18n/locale/ja/emoji.json
@@ -1,6 +1,7 @@
 {
   "EMOJI": {
     "PLACEHOLDER": "Search emojis",
-    "NOT_FOUND": "No emoji match your search"
+    "NOT_FOUND": "No emoji match your search",
+    "REMOVE": "削除"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ja/helpCenter.json b/app/javascript/dashboard/i18n/locale/ja/helpCenter.json
index dc2545406..11edaece1 100644
--- a/app/javascript/dashboard/i18n/locale/ja/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ja/helpCenter.json
@@ -365,7 +365,7 @@
         "NAME": {
           "LABEL": "名前",
           "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "名前が必須です"
         },
         "SLUG": {
@@ -396,7 +396,7 @@
         "NAME": {
           "LABEL": "名前",
           "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "名前が必須です"
         },
         "SLUG": {
diff --git a/app/javascript/dashboard/i18n/locale/ka/emoji.json b/app/javascript/dashboard/i18n/locale/ka/emoji.json
index fd81268fb..d5b96f0f9 100644
--- a/app/javascript/dashboard/i18n/locale/ka/emoji.json
+++ b/app/javascript/dashboard/i18n/locale/ka/emoji.json
@@ -1,6 +1,7 @@
 {
   "EMOJI": {
     "PLACEHOLDER": "Search emojis",
-    "NOT_FOUND": "No emoji match your search"
+    "NOT_FOUND": "No emoji match your search",
+    "REMOVE": "Remove"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ka/helpCenter.json b/app/javascript/dashboard/i18n/locale/ka/helpCenter.json
index deacd1bff..4354004a0 100644
--- a/app/javascript/dashboard/i18n/locale/ka/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ka/helpCenter.json
@@ -365,7 +365,7 @@
         "NAME": {
           "LABEL": "Name",
           "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Name is required"
         },
         "SLUG": {
@@ -396,7 +396,7 @@
         "NAME": {
           "LABEL": "Name",
           "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Name is required"
         },
         "SLUG": {
diff --git a/app/javascript/dashboard/i18n/locale/ko/emoji.json b/app/javascript/dashboard/i18n/locale/ko/emoji.json
index fd81268fb..252031c46 100644
--- a/app/javascript/dashboard/i18n/locale/ko/emoji.json
+++ b/app/javascript/dashboard/i18n/locale/ko/emoji.json
@@ -1,6 +1,7 @@
 {
   "EMOJI": {
     "PLACEHOLDER": "Search emojis",
-    "NOT_FOUND": "No emoji match your search"
+    "NOT_FOUND": "No emoji match your search",
+    "REMOVE": "제거"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ko/helpCenter.json b/app/javascript/dashboard/i18n/locale/ko/helpCenter.json
index 1c48a1f3c..d52254401 100644
--- a/app/javascript/dashboard/i18n/locale/ko/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ko/helpCenter.json
@@ -365,7 +365,7 @@
         "NAME": {
           "LABEL": "이름",
           "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "이름이 필요합니다"
         },
         "SLUG": {
@@ -396,7 +396,7 @@
         "NAME": {
           "LABEL": "이름",
           "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "이름이 필요합니다"
         },
         "SLUG": {
diff --git a/app/javascript/dashboard/i18n/locale/lt/emoji.json b/app/javascript/dashboard/i18n/locale/lt/emoji.json
index 8759ebc53..76adca935 100644
--- a/app/javascript/dashboard/i18n/locale/lt/emoji.json
+++ b/app/javascript/dashboard/i18n/locale/lt/emoji.json
@@ -1,6 +1,7 @@
 {
   "EMOJI": {
     "PLACEHOLDER": "Ieškoti emodžių",
-    "NOT_FOUND": "Jūsų paieška neatitinka jokių emodži"
+    "NOT_FOUND": "Jūsų paieška neatitinka jokių emodži",
+    "REMOVE": "Pašalinti"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/lt/helpCenter.json b/app/javascript/dashboard/i18n/locale/lt/helpCenter.json
index b9b24be5c..cfe66ab01 100644
--- a/app/javascript/dashboard/i18n/locale/lt/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/lt/helpCenter.json
@@ -365,7 +365,7 @@
         "NAME": {
           "LABEL": "Vardas",
           "PLACEHOLDER": "Kategorijos pavadinimas",
-          "HELP_TEXT": "Kategorijos pavadinimas bus naudojamas viešajame portale straipsniams skirstyti į kategorijas.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Yra reikalingas vardas"
         },
         "SLUG": {
@@ -396,7 +396,7 @@
         "NAME": {
           "LABEL": "Vardas",
           "PLACEHOLDER": "Kategorijos pavadinimas",
-          "HELP_TEXT": "Kategorijos pavadinimas bus naudojamas viešajame portale straipsniams skirstyti į kategorijas.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Yra reikalingas vardas"
         },
         "SLUG": {
diff --git a/app/javascript/dashboard/i18n/locale/lv/emoji.json b/app/javascript/dashboard/i18n/locale/lv/emoji.json
index 3d1bef854..c4c00066f 100644
--- a/app/javascript/dashboard/i18n/locale/lv/emoji.json
+++ b/app/javascript/dashboard/i18n/locale/lv/emoji.json
@@ -1,6 +1,7 @@
 {
   "EMOJI": {
     "PLACEHOLDER": "Meklēt emocijzīmes",
-    "NOT_FOUND": "Neviena emocijzīme neatbilst jūsu meklēšanas vaicājumam"
+    "NOT_FOUND": "Neviena emocijzīme neatbilst jūsu meklēšanas vaicājumam",
+    "REMOVE": "Noņemt"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/lv/helpCenter.json b/app/javascript/dashboard/i18n/locale/lv/helpCenter.json
index 42ce6917a..ee0ae76b9 100644
--- a/app/javascript/dashboard/i18n/locale/lv/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/lv/helpCenter.json
@@ -365,7 +365,7 @@
         "NAME": {
           "LABEL": "Nosaukums",
           "PLACEHOLDER": "Kategorijas nosaukums",
-          "HELP_TEXT": "Kategorijas nosaukums tiks izmantots publiskajā portālā, lai klasificētu rakstus.",
+          "HELP_TEXT": "Kategorijas nosaukums un ikona tiks izmantota publiskajā portālā, lai klasificētu rakstus.",
           "ERROR": "Nepieciešams nosaukums"
         },
         "SLUG": {
@@ -396,7 +396,7 @@
         "NAME": {
           "LABEL": "Nosaukums",
           "PLACEHOLDER": "Kategorijas nosaukums",
-          "HELP_TEXT": "Kategorijas nosaukums tiks izmantots publiskajā portālā, lai klasificētu rakstus.",
+          "HELP_TEXT": "Kategorijas nosaukums un ikona tiks izmantota publiskajā portālā, lai klasificētu rakstus.",
           "ERROR": "Nepieciešams nosaukums"
         },
         "SLUG": {
diff --git a/app/javascript/dashboard/i18n/locale/ml/emoji.json b/app/javascript/dashboard/i18n/locale/ml/emoji.json
index fd81268fb..d0fdc5a5e 100644
--- a/app/javascript/dashboard/i18n/locale/ml/emoji.json
+++ b/app/javascript/dashboard/i18n/locale/ml/emoji.json
@@ -1,6 +1,7 @@
 {
   "EMOJI": {
     "PLACEHOLDER": "Search emojis",
-    "NOT_FOUND": "No emoji match your search"
+    "NOT_FOUND": "No emoji match your search",
+    "REMOVE": "നീക്കം ചെയ്യുക"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ml/helpCenter.json b/app/javascript/dashboard/i18n/locale/ml/helpCenter.json
index 9289607f9..842d64978 100644
--- a/app/javascript/dashboard/i18n/locale/ml/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ml/helpCenter.json
@@ -365,7 +365,7 @@
         "NAME": {
           "LABEL": "പേര്",
           "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "നാമം ആവശ്യമാണ്"
         },
         "SLUG": {
@@ -396,7 +396,7 @@
         "NAME": {
           "LABEL": "പേര്",
           "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "നാമം ആവശ്യമാണ്"
         },
         "SLUG": {
diff --git a/app/javascript/dashboard/i18n/locale/ms/emoji.json b/app/javascript/dashboard/i18n/locale/ms/emoji.json
index fd81268fb..d5b96f0f9 100644
--- a/app/javascript/dashboard/i18n/locale/ms/emoji.json
+++ b/app/javascript/dashboard/i18n/locale/ms/emoji.json
@@ -1,6 +1,7 @@
 {
   "EMOJI": {
     "PLACEHOLDER": "Search emojis",
-    "NOT_FOUND": "No emoji match your search"
+    "NOT_FOUND": "No emoji match your search",
+    "REMOVE": "Remove"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ms/helpCenter.json b/app/javascript/dashboard/i18n/locale/ms/helpCenter.json
index d40f41012..a41b5c90c 100644
--- a/app/javascript/dashboard/i18n/locale/ms/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ms/helpCenter.json
@@ -365,7 +365,7 @@
         "NAME": {
           "LABEL": "Nama",
           "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Name is required"
         },
         "SLUG": {
@@ -396,7 +396,7 @@
         "NAME": {
           "LABEL": "Nama",
           "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Name is required"
         },
         "SLUG": {
diff --git a/app/javascript/dashboard/i18n/locale/ne/emoji.json b/app/javascript/dashboard/i18n/locale/ne/emoji.json
index fd81268fb..d5b96f0f9 100644
--- a/app/javascript/dashboard/i18n/locale/ne/emoji.json
+++ b/app/javascript/dashboard/i18n/locale/ne/emoji.json
@@ -1,6 +1,7 @@
 {
   "EMOJI": {
     "PLACEHOLDER": "Search emojis",
-    "NOT_FOUND": "No emoji match your search"
+    "NOT_FOUND": "No emoji match your search",
+    "REMOVE": "Remove"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ne/helpCenter.json b/app/javascript/dashboard/i18n/locale/ne/helpCenter.json
index 4b98c593c..29bef3d34 100644
--- a/app/javascript/dashboard/i18n/locale/ne/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ne/helpCenter.json
@@ -365,7 +365,7 @@
         "NAME": {
           "LABEL": "Name",
           "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Name is required"
         },
         "SLUG": {
@@ -396,7 +396,7 @@
         "NAME": {
           "LABEL": "Name",
           "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Name is required"
         },
         "SLUG": {
diff --git a/app/javascript/dashboard/i18n/locale/nl/emoji.json b/app/javascript/dashboard/i18n/locale/nl/emoji.json
index a4d551940..d364fd390 100644
--- a/app/javascript/dashboard/i18n/locale/nl/emoji.json
+++ b/app/javascript/dashboard/i18n/locale/nl/emoji.json
@@ -1,6 +1,7 @@
 {
   "EMOJI": {
     "PLACEHOLDER": "Zoek emojis",
-    "NOT_FOUND": "Er zijn geen overeenkomende emoji's gevonden"
+    "NOT_FOUND": "Er zijn geen overeenkomende emoji's gevonden",
+    "REMOVE": "Verwijderen"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/nl/helpCenter.json b/app/javascript/dashboard/i18n/locale/nl/helpCenter.json
index 531e1b5c7..899f2a362 100644
--- a/app/javascript/dashboard/i18n/locale/nl/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/nl/helpCenter.json
@@ -365,7 +365,7 @@
         "NAME": {
           "LABEL": "Naam",
           "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Naam is vereist"
         },
         "SLUG": {
@@ -396,7 +396,7 @@
         "NAME": {
           "LABEL": "Naam",
           "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Naam is vereist"
         },
         "SLUG": {
diff --git a/app/javascript/dashboard/i18n/locale/no/emoji.json b/app/javascript/dashboard/i18n/locale/no/emoji.json
index fd81268fb..08481a53f 100644
--- a/app/javascript/dashboard/i18n/locale/no/emoji.json
+++ b/app/javascript/dashboard/i18n/locale/no/emoji.json
@@ -1,6 +1,7 @@
 {
   "EMOJI": {
     "PLACEHOLDER": "Search emojis",
-    "NOT_FOUND": "No emoji match your search"
+    "NOT_FOUND": "No emoji match your search",
+    "REMOVE": "Fjern"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/no/helpCenter.json b/app/javascript/dashboard/i18n/locale/no/helpCenter.json
index 02731ea56..0fe8f562d 100644
--- a/app/javascript/dashboard/i18n/locale/no/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/no/helpCenter.json
@@ -365,7 +365,7 @@
         "NAME": {
           "LABEL": "Navn",
           "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Name is required"
         },
         "SLUG": {
@@ -396,7 +396,7 @@
         "NAME": {
           "LABEL": "Navn",
           "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Name is required"
         },
         "SLUG": {
diff --git a/app/javascript/dashboard/i18n/locale/pl/emoji.json b/app/javascript/dashboard/i18n/locale/pl/emoji.json
index ea6c28cba..b0be4426b 100644
--- a/app/javascript/dashboard/i18n/locale/pl/emoji.json
+++ b/app/javascript/dashboard/i18n/locale/pl/emoji.json
@@ -1,6 +1,7 @@
 {
   "EMOJI": {
     "PLACEHOLDER": "Wyszukaj emoji",
-    "NOT_FOUND": "Nie znaleziono emoji pasującego do wyszukiwania"
+    "NOT_FOUND": "Nie znaleziono emoji pasującego do wyszukiwania",
+    "REMOVE": "Usuń"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pl/helpCenter.json b/app/javascript/dashboard/i18n/locale/pl/helpCenter.json
index e1a2117a9..5bd99ea03 100644
--- a/app/javascript/dashboard/i18n/locale/pl/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/pl/helpCenter.json
@@ -365,7 +365,7 @@
         "NAME": {
           "LABEL": "Nazwa",
           "PLACEHOLDER": "Nazwa kategorii",
-          "HELP_TEXT": "Nazwa kategorii będzie używana w publicznym portalu do kategoryzacji artykułów.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Nazwa jest wymagana"
         },
         "SLUG": {
@@ -396,7 +396,7 @@
         "NAME": {
           "LABEL": "Nazwa",
           "PLACEHOLDER": "Nazwa kategorii",
-          "HELP_TEXT": "Nazwa kategorii będzie używana w publicznym portalu do kategoryzacji artykułów.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Nazwa jest wymagana"
         },
         "SLUG": {
diff --git a/app/javascript/dashboard/i18n/locale/pt/conversation.json b/app/javascript/dashboard/i18n/locale/pt/conversation.json
index b049760ae..452f5d2e2 100644
--- a/app/javascript/dashboard/i18n/locale/pt/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/pt/conversation.json
@@ -46,7 +46,7 @@
     "NO_RESPONSE": "Sem resposta",
     "RATING_TITLE": "Avaliar",
     "FEEDBACK_TITLE": "Opiniões",
-    "REPLY_MESSAGE_NOT_FOUND": "Message not available",
+    "REPLY_MESSAGE_NOT_FOUND": "Mensagem indisponível",
     "CARD": {
       "SHOW_LABELS": "Mostrar etiquetas",
       "HIDE_LABELS": "Ocultar os etiquetas"
diff --git a/app/javascript/dashboard/i18n/locale/pt/emoji.json b/app/javascript/dashboard/i18n/locale/pt/emoji.json
index dda8ac92f..58578b6df 100644
--- a/app/javascript/dashboard/i18n/locale/pt/emoji.json
+++ b/app/javascript/dashboard/i18n/locale/pt/emoji.json
@@ -1,6 +1,7 @@
 {
   "EMOJI": {
     "PLACEHOLDER": "Pesquisar emojis",
-    "NOT_FOUND": "Nenhum emoji corresponde à sua pesquisa"
+    "NOT_FOUND": "Nenhum emoji corresponde à sua pesquisa",
+    "REMOVE": "Excluir"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt/helpCenter.json b/app/javascript/dashboard/i18n/locale/pt/helpCenter.json
index 0368d7ce5..202deff03 100644
--- a/app/javascript/dashboard/i18n/locale/pt/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/pt/helpCenter.json
@@ -365,7 +365,7 @@
         "NAME": {
           "LABEL": "Nome:",
           "PLACEHOLDER": "Nome da categoria",
-          "HELP_TEXT": "O nome da categoria será usado no portal público para categorizar artigos.",
+          "HELP_TEXT": "O ícone e o nome da categoria serão usados no portal público para categorizar artigos.",
           "ERROR": "Nome é obrigatório"
         },
         "SLUG": {
@@ -396,7 +396,7 @@
         "NAME": {
           "LABEL": "Nome:",
           "PLACEHOLDER": "Nome da categoria",
-          "HELP_TEXT": "O nome da categoria será usado no portal público para categorizar artigos.",
+          "HELP_TEXT": "O ícone e o nome da categoria serão usados no portal público para categorizar artigos.",
           "ERROR": "Nome é obrigatório"
         },
         "SLUG": {
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/emoji.json b/app/javascript/dashboard/i18n/locale/pt_BR/emoji.json
index dda8ac92f..58578b6df 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/emoji.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/emoji.json
@@ -1,6 +1,7 @@
 {
   "EMOJI": {
     "PLACEHOLDER": "Pesquisar emojis",
-    "NOT_FOUND": "Nenhum emoji corresponde à sua pesquisa"
+    "NOT_FOUND": "Nenhum emoji corresponde à sua pesquisa",
+    "REMOVE": "Excluir"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/helpCenter.json b/app/javascript/dashboard/i18n/locale/pt_BR/helpCenter.json
index 35e4a56c9..79ebaa2a9 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/helpCenter.json
@@ -365,7 +365,7 @@
         "NAME": {
           "LABEL": "Nome",
           "PLACEHOLDER": "Nome da categoria",
-          "HELP_TEXT": "O nome da categoria será utilizada no portal voltado ao público para categorizar artigos.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "O nome é obrigatório"
         },
         "SLUG": {
@@ -396,7 +396,7 @@
         "NAME": {
           "LABEL": "Nome",
           "PLACEHOLDER": "Nome da categoria",
-          "HELP_TEXT": "O nome da categoria será utilizada no portal voltado ao público para categorizar artigos.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "O nome é obrigatório"
         },
         "SLUG": {
diff --git a/app/javascript/dashboard/i18n/locale/ro/emoji.json b/app/javascript/dashboard/i18n/locale/ro/emoji.json
index aa23d7157..61df28b26 100644
--- a/app/javascript/dashboard/i18n/locale/ro/emoji.json
+++ b/app/javascript/dashboard/i18n/locale/ro/emoji.json
@@ -1,6 +1,7 @@
 {
   "EMOJI": {
     "PLACEHOLDER": "Caută emoji-uri",
-    "NOT_FOUND": "Niciun emoji nu corespunde căutării tale"
+    "NOT_FOUND": "Niciun emoji nu corespunde căutării tale",
+    "REMOVE": "Elimină"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ro/helpCenter.json b/app/javascript/dashboard/i18n/locale/ro/helpCenter.json
index 1a9fd32d7..a179151d2 100644
--- a/app/javascript/dashboard/i18n/locale/ro/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ro/helpCenter.json
@@ -365,7 +365,7 @@
         "NAME": {
           "LABEL": "Nume",
           "PLACEHOLDER": "Nume categorie",
-          "HELP_TEXT": "Numele categoriei va fi folosit în portalul public pentru a clasifica articolele.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Numele este obligatoriu"
         },
         "SLUG": {
@@ -396,7 +396,7 @@
         "NAME": {
           "LABEL": "Nume",
           "PLACEHOLDER": "Nume categorie",
-          "HELP_TEXT": "Numele categoriei va fi folosit în portalul public pentru a clasifica articolele.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Numele este obligatoriu"
         },
         "SLUG": {
diff --git a/app/javascript/dashboard/i18n/locale/ru/emoji.json b/app/javascript/dashboard/i18n/locale/ru/emoji.json
index cb7dd8e47..eada5b4b2 100644
--- a/app/javascript/dashboard/i18n/locale/ru/emoji.json
+++ b/app/javascript/dashboard/i18n/locale/ru/emoji.json
@@ -1,6 +1,7 @@
 {
   "EMOJI": {
     "PLACEHOLDER": "Поиск эмодзи",
-    "NOT_FOUND": "Эмодзи не соответствуют вашему запросу"
+    "NOT_FOUND": "Эмодзи не соответствуют вашему запросу",
+    "REMOVE": "Удалить"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ru/helpCenter.json b/app/javascript/dashboard/i18n/locale/ru/helpCenter.json
index b5e7ed70b..443dcf26e 100644
--- a/app/javascript/dashboard/i18n/locale/ru/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ru/helpCenter.json
@@ -365,7 +365,7 @@
         "NAME": {
           "LABEL": "Имя",
           "PLACEHOLDER": "Имя категории",
-          "HELP_TEXT": "Название категории будет использоваться на портале общего доступа для классификации статей.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Необходимо указать имя"
         },
         "SLUG": {
@@ -396,7 +396,7 @@
         "NAME": {
           "LABEL": "Имя",
           "PLACEHOLDER": "Имя категории",
-          "HELP_TEXT": "Название категории будет использоваться на портале общего доступа для классификации статей.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Необходимо указать имя"
         },
         "SLUG": {
diff --git a/app/javascript/dashboard/i18n/locale/sh/emoji.json b/app/javascript/dashboard/i18n/locale/sh/emoji.json
index fd81268fb..d5b96f0f9 100644
--- a/app/javascript/dashboard/i18n/locale/sh/emoji.json
+++ b/app/javascript/dashboard/i18n/locale/sh/emoji.json
@@ -1,6 +1,7 @@
 {
   "EMOJI": {
     "PLACEHOLDER": "Search emojis",
-    "NOT_FOUND": "No emoji match your search"
+    "NOT_FOUND": "No emoji match your search",
+    "REMOVE": "Remove"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sh/helpCenter.json b/app/javascript/dashboard/i18n/locale/sh/helpCenter.json
index deacd1bff..4354004a0 100644
--- a/app/javascript/dashboard/i18n/locale/sh/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/sh/helpCenter.json
@@ -365,7 +365,7 @@
         "NAME": {
           "LABEL": "Name",
           "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Name is required"
         },
         "SLUG": {
@@ -396,7 +396,7 @@
         "NAME": {
           "LABEL": "Name",
           "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Name is required"
         },
         "SLUG": {
diff --git a/app/javascript/dashboard/i18n/locale/sk/emoji.json b/app/javascript/dashboard/i18n/locale/sk/emoji.json
index fd81268fb..d5b96f0f9 100644
--- a/app/javascript/dashboard/i18n/locale/sk/emoji.json
+++ b/app/javascript/dashboard/i18n/locale/sk/emoji.json
@@ -1,6 +1,7 @@
 {
   "EMOJI": {
     "PLACEHOLDER": "Search emojis",
-    "NOT_FOUND": "No emoji match your search"
+    "NOT_FOUND": "No emoji match your search",
+    "REMOVE": "Remove"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sk/helpCenter.json b/app/javascript/dashboard/i18n/locale/sk/helpCenter.json
index d5f507920..5bced2ae4 100644
--- a/app/javascript/dashboard/i18n/locale/sk/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/sk/helpCenter.json
@@ -365,7 +365,7 @@
         "NAME": {
           "LABEL": "Meno",
           "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Name is required"
         },
         "SLUG": {
@@ -396,7 +396,7 @@
         "NAME": {
           "LABEL": "Meno",
           "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Name is required"
         },
         "SLUG": {
diff --git a/app/javascript/dashboard/i18n/locale/sl/emoji.json b/app/javascript/dashboard/i18n/locale/sl/emoji.json
index fd81268fb..d5b96f0f9 100644
--- a/app/javascript/dashboard/i18n/locale/sl/emoji.json
+++ b/app/javascript/dashboard/i18n/locale/sl/emoji.json
@@ -1,6 +1,7 @@
 {
   "EMOJI": {
     "PLACEHOLDER": "Search emojis",
-    "NOT_FOUND": "No emoji match your search"
+    "NOT_FOUND": "No emoji match your search",
+    "REMOVE": "Remove"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sl/helpCenter.json b/app/javascript/dashboard/i18n/locale/sl/helpCenter.json
index 72f642584..af692a27e 100644
--- a/app/javascript/dashboard/i18n/locale/sl/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/sl/helpCenter.json
@@ -365,7 +365,7 @@
         "NAME": {
           "LABEL": "Name",
           "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Name is required"
         },
         "SLUG": {
@@ -396,7 +396,7 @@
         "NAME": {
           "LABEL": "Name",
           "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Name is required"
         },
         "SLUG": {
diff --git a/app/javascript/dashboard/i18n/locale/sq/emoji.json b/app/javascript/dashboard/i18n/locale/sq/emoji.json
index fd81268fb..d5b96f0f9 100644
--- a/app/javascript/dashboard/i18n/locale/sq/emoji.json
+++ b/app/javascript/dashboard/i18n/locale/sq/emoji.json
@@ -1,6 +1,7 @@
 {
   "EMOJI": {
     "PLACEHOLDER": "Search emojis",
-    "NOT_FOUND": "No emoji match your search"
+    "NOT_FOUND": "No emoji match your search",
+    "REMOVE": "Remove"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sq/helpCenter.json b/app/javascript/dashboard/i18n/locale/sq/helpCenter.json
index 72f642584..af692a27e 100644
--- a/app/javascript/dashboard/i18n/locale/sq/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/sq/helpCenter.json
@@ -365,7 +365,7 @@
         "NAME": {
           "LABEL": "Name",
           "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Name is required"
         },
         "SLUG": {
@@ -396,7 +396,7 @@
         "NAME": {
           "LABEL": "Name",
           "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Name is required"
         },
         "SLUG": {
diff --git a/app/javascript/dashboard/i18n/locale/sr/emoji.json b/app/javascript/dashboard/i18n/locale/sr/emoji.json
index fd81268fb..dbc02dbd8 100644
--- a/app/javascript/dashboard/i18n/locale/sr/emoji.json
+++ b/app/javascript/dashboard/i18n/locale/sr/emoji.json
@@ -1,6 +1,7 @@
 {
   "EMOJI": {
     "PLACEHOLDER": "Search emojis",
-    "NOT_FOUND": "No emoji match your search"
+    "NOT_FOUND": "No emoji match your search",
+    "REMOVE": "Ukloni"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sr/helpCenter.json b/app/javascript/dashboard/i18n/locale/sr/helpCenter.json
index 9b50b5f8f..96c4dfd88 100644
--- a/app/javascript/dashboard/i18n/locale/sr/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/sr/helpCenter.json
@@ -365,7 +365,7 @@
         "NAME": {
           "LABEL": "Ime",
           "PLACEHOLDER": "Naziv kategorije",
-          "HELP_TEXT": "Naziv kategorije će se koristiti u javno dostupnim portalima da bi se članci kategorizovali.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Ime je neophodno"
         },
         "SLUG": {
@@ -396,7 +396,7 @@
         "NAME": {
           "LABEL": "Ime",
           "PLACEHOLDER": "Naziv kategorije",
-          "HELP_TEXT": "Naziv kategorije će se koristiti u javno dostupnim portalima da bi se članci kategorizovali.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Ime je neophodno"
         },
         "SLUG": {
diff --git a/app/javascript/dashboard/i18n/locale/sv/emoji.json b/app/javascript/dashboard/i18n/locale/sv/emoji.json
index ccfb8d4ab..c60f1c424 100644
--- a/app/javascript/dashboard/i18n/locale/sv/emoji.json
+++ b/app/javascript/dashboard/i18n/locale/sv/emoji.json
@@ -1,6 +1,7 @@
 {
   "EMOJI": {
     "PLACEHOLDER": "Sök emoji",
-    "NOT_FOUND": "Ingen emoji matchar din sökning"
+    "NOT_FOUND": "Ingen emoji matchar din sökning",
+    "REMOVE": "Radera"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sv/helpCenter.json b/app/javascript/dashboard/i18n/locale/sv/helpCenter.json
index 339d52295..afa6b7ebe 100644
--- a/app/javascript/dashboard/i18n/locale/sv/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/sv/helpCenter.json
@@ -365,7 +365,7 @@
         "NAME": {
           "LABEL": "Namn",
           "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "Kategorinamnet och ikonen kommer att användas i den publika portalen för att kategorisera artiklar.",
           "ERROR": "Name is required"
         },
         "SLUG": {
@@ -396,7 +396,7 @@
         "NAME": {
           "LABEL": "Namn",
           "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "Kategorinamnet och ikonen kommer att användas i den publika portalen för att kategorisera artiklar.",
           "ERROR": "Name is required"
         },
         "SLUG": {
diff --git a/app/javascript/dashboard/i18n/locale/ta/emoji.json b/app/javascript/dashboard/i18n/locale/ta/emoji.json
index fd81268fb..2869c27f2 100644
--- a/app/javascript/dashboard/i18n/locale/ta/emoji.json
+++ b/app/javascript/dashboard/i18n/locale/ta/emoji.json
@@ -1,6 +1,7 @@
 {
   "EMOJI": {
     "PLACEHOLDER": "Search emojis",
-    "NOT_FOUND": "No emoji match your search"
+    "NOT_FOUND": "No emoji match your search",
+    "REMOVE": "நீக்கு"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ta/helpCenter.json b/app/javascript/dashboard/i18n/locale/ta/helpCenter.json
index 79cfc5edd..bee2303a0 100644
--- a/app/javascript/dashboard/i18n/locale/ta/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ta/helpCenter.json
@@ -365,7 +365,7 @@
         "NAME": {
           "LABEL": "பெயர்",
           "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Name is required"
         },
         "SLUG": {
@@ -396,7 +396,7 @@
         "NAME": {
           "LABEL": "பெயர்",
           "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Name is required"
         },
         "SLUG": {
diff --git a/app/javascript/dashboard/i18n/locale/th/emoji.json b/app/javascript/dashboard/i18n/locale/th/emoji.json
index fd81268fb..f9204a276 100644
--- a/app/javascript/dashboard/i18n/locale/th/emoji.json
+++ b/app/javascript/dashboard/i18n/locale/th/emoji.json
@@ -1,6 +1,7 @@
 {
   "EMOJI": {
     "PLACEHOLDER": "Search emojis",
-    "NOT_FOUND": "No emoji match your search"
+    "NOT_FOUND": "No emoji match your search",
+    "REMOVE": "ลบรูปภาพ"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/th/helpCenter.json b/app/javascript/dashboard/i18n/locale/th/helpCenter.json
index 6b440f118..f05877c15 100644
--- a/app/javascript/dashboard/i18n/locale/th/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/th/helpCenter.json
@@ -365,7 +365,7 @@
         "NAME": {
           "LABEL": "ชื่อ",
           "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "โปรดระบุชื่อ"
         },
         "SLUG": {
@@ -396,7 +396,7 @@
         "NAME": {
           "LABEL": "ชื่อ",
           "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "โปรดระบุชื่อ"
         },
         "SLUG": {
diff --git a/app/javascript/dashboard/i18n/locale/tr/emoji.json b/app/javascript/dashboard/i18n/locale/tr/emoji.json
index fd81268fb..a0eae7ff8 100644
--- a/app/javascript/dashboard/i18n/locale/tr/emoji.json
+++ b/app/javascript/dashboard/i18n/locale/tr/emoji.json
@@ -1,6 +1,7 @@
 {
   "EMOJI": {
     "PLACEHOLDER": "Search emojis",
-    "NOT_FOUND": "No emoji match your search"
+    "NOT_FOUND": "No emoji match your search",
+    "REMOVE": "Kaldır"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/tr/helpCenter.json b/app/javascript/dashboard/i18n/locale/tr/helpCenter.json
index 2a9b5e5c6..2060cedf2 100644
--- a/app/javascript/dashboard/i18n/locale/tr/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/tr/helpCenter.json
@@ -365,7 +365,7 @@
         "NAME": {
           "LABEL": "İsim",
           "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "İsim gereklidir"
         },
         "SLUG": {
@@ -396,7 +396,7 @@
         "NAME": {
           "LABEL": "İsim",
           "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "İsim gereklidir"
         },
         "SLUG": {
diff --git a/app/javascript/dashboard/i18n/locale/uk/emoji.json b/app/javascript/dashboard/i18n/locale/uk/emoji.json
index f5c2297d8..672a59acb 100644
--- a/app/javascript/dashboard/i18n/locale/uk/emoji.json
+++ b/app/javascript/dashboard/i18n/locale/uk/emoji.json
@@ -1,6 +1,7 @@
 {
   "EMOJI": {
     "PLACEHOLDER": "Пошук смайлів",
-    "NOT_FOUND": "Немає смайликів, які відповідають вашому запиту"
+    "NOT_FOUND": "Немає смайликів, які відповідають вашому запиту",
+    "REMOVE": "Видалити"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/uk/helpCenter.json b/app/javascript/dashboard/i18n/locale/uk/helpCenter.json
index 19baf0cc2..72d01b784 100644
--- a/app/javascript/dashboard/i18n/locale/uk/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/uk/helpCenter.json
@@ -365,7 +365,7 @@
         "NAME": {
           "LABEL": "Ім'я",
           "PLACEHOLDER": "Назва категорії",
-          "HELP_TEXT": "Назва категорії буде використовуватися в публічному інтерфейсі порталу для категоризації статей.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Назва обов'язкова"
         },
         "SLUG": {
@@ -396,7 +396,7 @@
         "NAME": {
           "LABEL": "Ім'я",
           "PLACEHOLDER": "Назва категорії",
-          "HELP_TEXT": "Назва категорії буде використовуватися в публічному інтерфейсі порталу для категоризації статей.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Назва обов'язкова"
         },
         "SLUG": {
diff --git a/app/javascript/dashboard/i18n/locale/ur/emoji.json b/app/javascript/dashboard/i18n/locale/ur/emoji.json
index fd81268fb..d5b96f0f9 100644
--- a/app/javascript/dashboard/i18n/locale/ur/emoji.json
+++ b/app/javascript/dashboard/i18n/locale/ur/emoji.json
@@ -1,6 +1,7 @@
 {
   "EMOJI": {
     "PLACEHOLDER": "Search emojis",
-    "NOT_FOUND": "No emoji match your search"
+    "NOT_FOUND": "No emoji match your search",
+    "REMOVE": "Remove"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ur/helpCenter.json b/app/javascript/dashboard/i18n/locale/ur/helpCenter.json
index 48a29e589..caeb6e44b 100644
--- a/app/javascript/dashboard/i18n/locale/ur/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ur/helpCenter.json
@@ -365,7 +365,7 @@
         "NAME": {
           "LABEL": "نام",
           "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Name is required"
         },
         "SLUG": {
@@ -396,7 +396,7 @@
         "NAME": {
           "LABEL": "نام",
           "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Name is required"
         },
         "SLUG": {
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/emoji.json b/app/javascript/dashboard/i18n/locale/ur_IN/emoji.json
index fd81268fb..d5b96f0f9 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/emoji.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/emoji.json
@@ -1,6 +1,7 @@
 {
   "EMOJI": {
     "PLACEHOLDER": "Search emojis",
-    "NOT_FOUND": "No emoji match your search"
+    "NOT_FOUND": "No emoji match your search",
+    "REMOVE": "Remove"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/helpCenter.json b/app/javascript/dashboard/i18n/locale/ur_IN/helpCenter.json
index deacd1bff..4354004a0 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/helpCenter.json
@@ -365,7 +365,7 @@
         "NAME": {
           "LABEL": "Name",
           "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Name is required"
         },
         "SLUG": {
@@ -396,7 +396,7 @@
         "NAME": {
           "LABEL": "Name",
           "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Name is required"
         },
         "SLUG": {
diff --git a/app/javascript/dashboard/i18n/locale/vi/emoji.json b/app/javascript/dashboard/i18n/locale/vi/emoji.json
index fd81268fb..6311baec1 100644
--- a/app/javascript/dashboard/i18n/locale/vi/emoji.json
+++ b/app/javascript/dashboard/i18n/locale/vi/emoji.json
@@ -1,6 +1,7 @@
 {
   "EMOJI": {
     "PLACEHOLDER": "Search emojis",
-    "NOT_FOUND": "No emoji match your search"
+    "NOT_FOUND": "No emoji match your search",
+    "REMOVE": "Xoá"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/vi/helpCenter.json b/app/javascript/dashboard/i18n/locale/vi/helpCenter.json
index 2954f8b00..543beb5eb 100644
--- a/app/javascript/dashboard/i18n/locale/vi/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/vi/helpCenter.json
@@ -365,7 +365,7 @@
         "NAME": {
           "LABEL": "Tên",
           "PLACEHOLDER": "Tên danh mục",
-          "HELP_TEXT": "Tên danh mục sẽ được sử dụng trong cổng thông tin công khai để phân loại các bài.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Tên bắt buộc có"
         },
         "SLUG": {
@@ -396,7 +396,7 @@
         "NAME": {
           "LABEL": "Tên",
           "PLACEHOLDER": "Tên danh mục",
-          "HELP_TEXT": "Tên danh mục sẽ được sử dụng trong cổng thông tin công khai để phân loại các bài.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "Tên bắt buộc có"
         },
         "SLUG": {
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/emoji.json b/app/javascript/dashboard/i18n/locale/zh_CN/emoji.json
index b9130bf97..7cea49648 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/emoji.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/emoji.json
@@ -1,6 +1,7 @@
 {
   "EMOJI": {
     "PLACEHOLDER": "搜索表情符号",
-    "NOT_FOUND": "没有适合你的搜索结果"
+    "NOT_FOUND": "没有适合你的搜索结果",
+    "REMOVE": "删除"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/helpCenter.json b/app/javascript/dashboard/i18n/locale/zh_CN/helpCenter.json
index 0aa0f0a59..97294f53d 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/helpCenter.json
@@ -365,7 +365,7 @@
         "NAME": {
           "LABEL": "姓名：",
           "PLACEHOLDER": "类别名称",
-          "HELP_TEXT": "类别名称将用于公共门户来对文章进行归类。",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "名字必填"
         },
         "SLUG": {
@@ -396,7 +396,7 @@
         "NAME": {
           "LABEL": "姓名：",
           "PLACEHOLDER": "类别名称",
-          "HELP_TEXT": "类别名称将用于公共门户来对文章进行归类。",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "名字必填"
         },
         "SLUG": {
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/emoji.json b/app/javascript/dashboard/i18n/locale/zh_TW/emoji.json
index fd81268fb..7c5efc5f8 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/emoji.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/emoji.json
@@ -1,6 +1,7 @@
 {
   "EMOJI": {
     "PLACEHOLDER": "Search emojis",
-    "NOT_FOUND": "No emoji match your search"
+    "NOT_FOUND": "No emoji match your search",
+    "REMOVE": "刪除"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/helpCenter.json b/app/javascript/dashboard/i18n/locale/zh_TW/helpCenter.json
index 42b3fdb3a..20d4e005d 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/helpCenter.json
@@ -365,7 +365,7 @@
         "NAME": {
           "LABEL": "姓名",
           "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "名稱為必填"
         },
         "SLUG": {
@@ -396,7 +396,7 @@
         "NAME": {
           "LABEL": "姓名",
           "PLACEHOLDER": "Category name",
-          "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
           "ERROR": "名稱為必填"
         },
         "SLUG": {
diff --git a/app/javascript/widget/i18n/locale/fa.json b/app/javascript/widget/i18n/locale/fa.json
index 00189a16d..00194038e 100644
--- a/app/javascript/widget/i18n/locale/fa.json
+++ b/app/javascript/widget/i18n/locale/fa.json
@@ -20,7 +20,7 @@
     "IN_A_FEW_MINUTES": "معمولاً در عرض چند دقیقه پاسخ می دهند",
     "IN_A_FEW_HOURS": "معمولاً در عرض چند ساعت پاسخ می دهند",
     "IN_A_DAY": "به طور معمول در یک روز پاسخ می دهند",
-    "BACK_IN": "We will be back online"
+    "BACK_IN": "دوباره آنلاین خواهیم بود"
   },
   "DAY_NAMES": [
     "یک‌شنبه",
@@ -65,11 +65,11 @@
         "VALID_ERROR": "لطفا ایمیل خود را به شکل صحیح وارد کنید"
       },
       "PHONE_NUMBER": {
-        "LABEL": "شماره تلفن",
+        "LABEL": "شماره موبایل",
         "PLACEHOLDER": "لطفا شماره تلفن خود را وارد کنید",
         "REQUIRED_ERROR": "شماره تلفن مورد نیاز است",
-        "DIAL_CODE_VALID_ERROR": "Please select a country code",
-        "VALID_ERROR": "Please enter a valid phone number",
+        "DIAL_CODE_VALID_ERROR": "لطفا\" یک کد کشور انتخاب کنید",
+        "VALID_ERROR": "لطفا\" یک شماره موبایل معتبر وارد نمایید",
         "DROPDOWN_EMPTY": "نتیجه‌ای یافت نشد"
       },
       "MESSAGE": {
@@ -104,14 +104,14 @@
   },
   "INTEGRATIONS": {
     "DYTE": {
-      "CLICK_HERE_TO_JOIN": "برای عضویت اینجا را کلیک کنید",
+      "CLICK_HERE_TO_JOIN": "برای ملحق شدن اینجا را کلیک کنید",
       "LEAVE_THE_ROOM": "تماس را ترک کنید"
     }
   },
   "PORTAL": {
-    "POPULAR_ARTICLES": "Popular Articles",
+    "POPULAR_ARTICLES": "مقالات محبوب",
     "VIEW_ALL_ARTICLES": "مشاهده همه مقالات",
-    "IFRAME_LOAD_ERROR": "There was an error loading the article, please refresh the page and try again."
+    "IFRAME_LOAD_ERROR": "در لود مقاله خطایی رخ داده است، لطفا\" صفحه را رفرش و دوباره تلاش نمایید."
   },
   "ATTACHMENTS": {
     "image": {
@@ -124,10 +124,10 @@
       "CONTENT": "پیام ویدیویی"
     },
     "file": {
-      "CONTENT": "فایل الصاقی"
+      "CONTENT": "ضمیمه فایل"
     },
     "location": {
-      "CONTENT": "مکان"
+      "CONTENT": "موقعیت جغرافیایی"
     },
     "fallback": {
       "CONTENT": "یک آدرس URL به اشتراک گذاشته شده"
diff --git a/config/locales/es.yml b/config/locales/es.yml
index ebbb81870..b1bae44db 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -111,7 +111,7 @@ es:
       instagram_deleted_story_content: Esta historia ya no está disponible.
       deleted: Este mensaje se ha eliminado
       delivery_status:
-        error_code: "Error code: %{error_code}"
+        error_code: "Código de error: %{error_code}"
     activity:
       status:
         resolved: "La conversación fue marcada por %{user_name}"
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index b32195bc1..aa6169239 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -39,7 +39,7 @@ fa:
       import:
         failed: پرونده خالی است
       export:
-        success: We will notify you once contacts export file is ready to view.
+        success: هر زمان فایل خروجی مخاطبین برای مشاهده آماده شود به شما اطلاع خواهیم داد.
       email:
         invalid: ایمیل نامعتبر است
       phone_number:
@@ -61,7 +61,7 @@ fa:
       validations:
         name: نباید با نمادها شروع یا ختم شود و نباید دارای کاراکترهای < > / \ @ باشد.
     custom_filters:
-      number_of_records: Limit reached. The maximum number of allowed custom filters for a user per account is 50.
+      number_of_records: سررسید محدودیت. حداکثر تعداد قابل قبول فیلترها برای یک کاربر در هر اکانت 50 می باشند.
   reports:
     period: زمان گزارش از %{since} تا %{until}
     utc_warning: گزارش تولید شده در منطقه زمانی UTC است
@@ -111,7 +111,7 @@ fa:
       instagram_deleted_story_content: این داستان دیگر در دسترس نیست.
       deleted: این پیام حذف شد
       delivery_status:
-        error_code: "Error code: %{error_code}"
+        error_code: "کد خطا \" %{error_code}"
     activity:
       status:
         resolved: "مکالمه توسط ایجنت %{user_name} حل شده، اعلام شده بود"
@@ -190,7 +190,7 @@ fa:
       empty_placeholder: نتیجه‌ای یافت نشد.
       loading_placeholder: در حال جستجو...
       results_title: نتایج جستجو
-    toc_header: 'On this page'
+    toc_header: 'در این صفحه'
     hero:
       sub_title: مقالات را در اینجا جستجو کنید یا دسته‌بندی‌های زیر را مرور کنید.
     common:
@@ -208,8 +208,8 @@ fa:
     fields:
       name: نام
       email: ایمیل
-      phone_number: Phone
+      phone_number: موبایل
       company_name: شرکت
       inbox_name: صندوق ورودی
-      inbox_type: Inbox Type
+      inbox_type: نوع صندوق ورودی
     button: باز کردن گفتگو
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 9e8f66473..3f79ad4d0 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -111,7 +111,7 @@ pt:
       instagram_deleted_story_content: Esta história já não está disponível.
       deleted: Esta mensagem foi apagada
       delivery_status:
-        error_code: "Error code: %{error_code}"
+        error_code: "Código de erro: %{error_code}"
     activity:
       status:
         resolved: "Conversa foi marcada como resolvida por %{user_name}"

From 232fa6fd1888ec7a4505b0fc907f4b1b752f10f5 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Thu, 26 Oct 2023 09:08:28 +0530
Subject: [PATCH 19/94] fix: Revert missing files for search (#8215)

---
 .../conversation/search/PopOverSearch.vue     | 79 +++++++++++++++++++
 .../conversation/search/SwitchLayout.vue      | 36 +++++++++
 2 files changed, 115 insertions(+)
 create mode 100644 app/javascript/dashboard/routes/dashboard/conversation/search/PopOverSearch.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/conversation/search/SwitchLayout.vue

diff --git a/app/javascript/dashboard/routes/dashboard/conversation/search/PopOverSearch.vue b/app/javascript/dashboard/routes/dashboard/conversation/search/PopOverSearch.vue
new file mode 100644
index 000000000..2e94c7112
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/conversation/search/PopOverSearch.vue
@@ -0,0 +1,79 @@
+<template>
+  <div class="relative">
+    <div
+      class="flex px-4 pb-1 flex-row gap-1 pt-2.5 border-b border-transparent"
+    >
+      <woot-sidemenu-icon
+        size="tiny"
+        class="relative top-0 ltr:-ml-1.5 rtl:-mr-1.5"
+      />
+      <router-link
+        :to="searchUrl"
+        class="search-link flex-1 items-center gap-1 text-left h-6 rtl:mr-3 rtl:text-right rounded-md px-2 py-0 bg-slate-25 dark:bg-slate-800 inline-flex"
+      >
+        <div class="flex">
+          <fluent-icon
+            icon="search"
+            class="search--icon text-slate-800 dark:text-slate-200"
+            size="16"
+          />
+        </div>
+        <p
+          class="search--label mb-0 overflow-hidden whitespace-nowrap text-ellipsis text-sm text-slate-800 dark:text-slate-200"
+        >
+          {{ $t('CONVERSATION.SEARCH_MESSAGES') }}
+        </p>
+      </router-link>
+      <switch-layout
+        :is-on-expanded-layout="isOnExpandedLayout"
+        @toggle="$emit('toggle-conversation-layout')"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import { mixin as clickaway } from 'vue-clickaway';
+import { mapGetters } from 'vuex';
+import timeMixin from '../../../../mixins/time';
+import messageFormatterMixin from 'shared/mixins/messageFormatterMixin';
+import SwitchLayout from './SwitchLayout.vue';
+import { frontendURL } from 'dashboard/helper/URLHelper';
+export default {
+  components: {
+    SwitchLayout,
+  },
+  directives: {
+    focus: {
+      inserted(el) {
+        el.focus();
+      },
+    },
+  },
+  mixins: [timeMixin, messageFormatterMixin, clickaway],
+  props: {
+    isOnExpandedLayout: {
+      type: Boolean,
+      required: true,
+    },
+  },
+  computed: {
+    ...mapGetters({
+      accountId: 'getCurrentAccountId',
+    }),
+    searchUrl() {
+      return frontendURL(`accounts/${this.accountId}/search`);
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.search-link {
+  &:hover {
+    .search--icon,
+    .search--label {
+      @apply hover:text-woot-500 dark:hover:text-woot-500;
+    }
+  }
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/search/SwitchLayout.vue b/app/javascript/dashboard/routes/dashboard/conversation/search/SwitchLayout.vue
new file mode 100644
index 000000000..1988e9974
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/conversation/search/SwitchLayout.vue
@@ -0,0 +1,36 @@
+<template>
+  <woot-button
+    v-tooltip.left="$t('CONVERSATION.SWITCH_VIEW_LAYOUT')"
+    icon="arrow-right-import"
+    size="tiny"
+    variant="smooth"
+    color-scheme="secondary"
+    class="layout-switch__container"
+    :class="{ expanded: isOnExpandedLayout }"
+    @click="toggle"
+  />
+</template>
+
+<script>
+export default {
+  props: {
+    isOnExpandedLayout: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  methods: {
+    toggle() {
+      this.$emit('toggle');
+    },
+  },
+};
+</script>
+
+<style lang="scss" soped>
+.layout-switch__container {
+  &.expanded .icon {
+    transform: rotate(180deg);
+  }
+}
+</style>

From b067acfd4a9f56047f7b7a2d3eea335e1ace8d56 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Wed, 25 Oct 2023 21:30:14 -0700
Subject: [PATCH 20/94] fix: Update the alignment of the info icon on contact
 info panel (#8216)

---
 .../routes/dashboard/conversation/contact/ContactInfo.vue   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue b/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue
index a7cdfc0cf..0133ceed6 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue
@@ -18,13 +18,13 @@
       </div>
 
       <div class="mt-2 w-full">
-        <div v-if="showAvatar" class="flex items-center mb-2 gap-1.5">
+        <div v-if="showAvatar" class="flex items-start mb-2 gap-1.5">
           <h3
             class="text-base text-slate-800 dark:text-slate-100 capitalize whitespace-normal my-0"
           >
             {{ contact.name }}
           </h3>
-          <div class="flex flex-row items-start gap-1">
+          <div class="flex flex-row items-center gap-1">
             <fluent-icon
               v-if="contact.created_at"
               v-tooltip.left="
@@ -55,7 +55,6 @@
         <p v-if="additionalAttributes.description" class="break-words">
           {{ additionalAttributes.description }}
         </p>
-        <social-icons :social-profiles="socialProfiles" />
         <div class="mb-3">
           <contact-info-row
             :href="contact.email ? `mailto:${contact.email}` : ''"
@@ -93,6 +92,7 @@
             emoji="🌍"
             :title="$t('CONTACT_PANEL.LOCATION')"
           />
+          <social-icons :social-profiles="socialProfiles" />
         </div>
       </div>
       <div class="flex items-center w-full mt-2 gap-2">

From 736f269c49dddc6bf249e02c5afa48ab6c8ef638 Mon Sep 17 00:00:00 2001
From: Robert Coker <intelekshual@users.noreply.github.com>
Date: Thu, 26 Oct 2023 00:42:36 -0400
Subject: [PATCH 21/94] fix: Always reset CC/BCC emails when switching
 conversations (#8157)

---
 .../dashboard/components/widgets/conversation/ReplyBox.vue     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
index 23f339f46..c0692b576 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
@@ -511,6 +511,8 @@ export default {
     currentChat(conversation) {
       const { can_reply: canReply } = conversation;
 
+      this.setCCAndToEmailsFromLastChat();
+
       if (this.isOnPrivateNote) {
         return;
       }
@@ -521,7 +523,6 @@ export default {
         this.replyType = REPLY_EDITOR_MODES.NOTE;
       }
 
-      this.setCCAndToEmailsFromLastChat();
       this.fetchAndSetReplyTo();
     },
     conversationIdByRoute(conversationId, oldConversationId) {

From d02cfff4cc58240a37ff106f7c6ef75587cb0414 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Thu, 26 Oct 2023 11:35:46 +0530
Subject: [PATCH 22/94] fix: canned responses not working when signature is
 present (#8176)

Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
---
 .../widgets/conversation/ReplyBox.vue         | 38 +++++++++++++------
 1 file changed, 27 insertions(+), 11 deletions(-)

diff --git a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
index c0692b576..d72c8dff6 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
@@ -532,17 +532,25 @@ export default {
       }
     },
     message(updatedMessage) {
-      this.hasSlashCommand =
-        updatedMessage[0] === '/' && !this.showRichContentEditor;
-      const hasNextWord = updatedMessage.includes(' ');
-      const isShortCodeActive = this.hasSlashCommand && !hasNextWord;
-      if (isShortCodeActive) {
-        this.mentionSearchKey = updatedMessage.substring(1);
-        this.showMentions = true;
-      } else {
-        this.mentionSearchKey = '';
-        this.showMentions = false;
-      }
+      // Check if the message starts with a slash.
+      const bodyWithoutSignature = removeSignature(
+        updatedMessage,
+        this.signatureToApply
+      );
+      const startsWithSlash = bodyWithoutSignature.startsWith('/');
+
+      // Determine if the user is potentially typing a slash command.
+      // This is true if the message starts with a slash and the rich content editor is not active.
+      this.hasSlashCommand = startsWithSlash && !this.showRichContentEditor;
+      this.showMentions = this.hasSlashCommand;
+
+      // If a slash command is active, extract the command text after the slash.
+      // If not, reset the mentionSearchKey.
+      this.mentionSearchKey = this.hasSlashCommand
+        ? bodyWithoutSignature.substring(1)
+        : '';
+
+      // Autosave the current message draft.
       this.doAutoSaveDraft();
     },
     replyType(updatedReplyType, oldReplyType) {
@@ -820,10 +828,18 @@ export default {
       this.hideWhatsappTemplatesModal();
     },
     replaceText(message) {
+      if (this.sendWithSignature && !this.private) {
+        // if signature is enabled, append it to the message
+        // appendSignature ensures that the signature is not duplicated
+        // so we don't need to check if the signature is already present
+        message = appendSignature(message, this.signatureToApply);
+      }
+
       const updatedMessage = replaceVariablesInMessage({
         message,
         variables: this.messageVariables,
       });
+
       setTimeout(() => {
         this.$track(CONVERSATION_EVENTS.INSERTED_A_CANNED_RESPONSE);
         this.message = updatedMessage;

From ab872beb1ddbdd9cbafd75417a2d2d486f40a257 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Thu, 26 Oct 2023 12:59:51 +0530
Subject: [PATCH 23/94] feat: Helper to support dynamic system theme in public
 portal (#8206)

Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
---
 app/javascript/portal/portalHelpers.js     |  72 +++++++-
 app/javascript/portal/specs/portal.spec.js | 205 ++++++++++++++++++++-
 app/views/layouts/portal.html.erb          |   2 +
 3 files changed, 274 insertions(+), 5 deletions(-)

diff --git a/app/javascript/portal/portalHelpers.js b/app/javascript/portal/portalHelpers.js
index 6c0a87ffc..8b36e63f9 100644
--- a/app/javascript/portal/portalHelpers.js
+++ b/app/javascript/portal/portalHelpers.js
@@ -4,7 +4,7 @@ import Vue from 'vue';
 import PublicArticleSearch from './components/PublicArticleSearch.vue';
 import TableOfContents from './components/TableOfContents.vue';
 
-export const getHeadingsfromTheArticle = () => {
+export const getHeadingsFromTheArticle = () => {
   const rows = [];
   const articleElement = document.getElementById('cw-article-content');
   articleElement.querySelectorAll('h1, h2, h3').forEach(element => {
@@ -21,6 +21,53 @@ export const getHeadingsfromTheArticle = () => {
   return rows;
 };
 
+export const generatePortalBgColor = (portalColor, theme) => {
+  const baseColor = theme === 'dark' ? 'black' : 'white';
+  return `color-mix(in srgb, ${portalColor} 20%, ${baseColor})`;
+};
+
+export const generatePortalBg = (portalColor, theme) => {
+  const bgImage = theme === 'dark' ? 'hexagon-dark.svg' : 'hexagon-light.svg';
+  return `background: url(/assets/images/hc/${bgImage}) ${generatePortalBgColor(
+    portalColor,
+    theme
+  )}`;
+};
+
+export const generateGradientToBottom = theme => {
+  return `background-image: linear-gradient(to bottom, transparent, ${
+    theme === 'dark' ? '#151718' : 'white'
+  })`;
+};
+
+export const setPortalStyles = theme => {
+  const portalColor = window.portalConfig.portalColor;
+  const portalBgDiv = document.querySelector('#portal-bg');
+  const portalBgGradientDiv = document.querySelector('#portal-bg-gradient');
+
+  if (portalBgDiv) {
+    // Set background for #portal-bg
+    portalBgDiv.setAttribute('style', generatePortalBg(portalColor, theme));
+  }
+
+  if (portalBgGradientDiv) {
+    // Set gradient background for #portal-bg-gradient
+    portalBgGradientDiv.setAttribute('style', generateGradientToBottom(theme));
+  }
+};
+
+export const setPortalClass = theme => {
+  const portalDiv = document.querySelector('#portal');
+  portalDiv.classList.remove('light', 'dark');
+  if (!portalDiv) return;
+  portalDiv.classList.add(theme);
+};
+
+export const updateThemeStyles = theme => {
+  setPortalStyles(theme);
+  setPortalClass(theme);
+};
+
 export const InitializationHelpers = {
   navigateToLocalePage: () => {
     const allLocaleSwitcher = document.querySelector('.locale-switcher');
@@ -36,7 +83,7 @@ export const InitializationHelpers = {
     return false;
   },
 
-  initalizeSearch: () => {
+  initializeSearch: () => {
     const isSearchContainerAvailable = document.querySelector('#search-wrap');
     if (isSearchContainerAvailable) {
       new Vue({
@@ -51,7 +98,7 @@ export const InitializationHelpers = {
     if (isOnArticlePage) {
       new Vue({
         components: { TableOfContents },
-        data: { rows: getHeadingsfromTheArticle() },
+        data: { rows: getHeadingsFromTheArticle() },
         template: '<table-of-contents :rows="rows" />',
       }).$mount('#cw-hc-toc');
     }
@@ -68,13 +115,30 @@ export const InitializationHelpers = {
     });
   },
 
+  initializeTheme: () => {
+    const mediaQueryList = window.matchMedia('(prefers-color-scheme: dark)');
+    const getThemePreference = () =>
+      mediaQueryList.matches ? 'dark' : 'light';
+    const themeFromServer = window.portalConfig.theme;
+    if (themeFromServer === 'system') {
+      // Handle dynamic theme changes for system theme
+      mediaQueryList.addEventListener('change', event => {
+        const newTheme = event.matches ? 'dark' : 'light';
+        updateThemeStyles(newTheme);
+      });
+      const themePreference = getThemePreference();
+      updateThemeStyles(themePreference);
+    }
+  },
+
   initialize: () => {
     if (window.portalConfig.isPlainLayoutEnabled === 'true') {
       InitializationHelpers.appendPlainParamToURLs();
     } else {
       InitializationHelpers.navigateToLocalePage();
-      InitializationHelpers.initalizeSearch();
+      InitializationHelpers.initializeSearch();
       InitializationHelpers.initializeTableOfContents();
+      // InitializationHelpers.initializeTheme();
     }
   },
 
diff --git a/app/javascript/portal/specs/portal.spec.js b/app/javascript/portal/specs/portal.spec.js
index cd4347bad..69e1e81f0 100644
--- a/app/javascript/portal/specs/portal.spec.js
+++ b/app/javascript/portal/specs/portal.spec.js
@@ -1,4 +1,12 @@
-import { InitializationHelpers } from '../portalHelpers';
+import {
+  InitializationHelpers,
+  generatePortalBgColor,
+  generatePortalBg,
+  generateGradientToBottom,
+  setPortalStyles,
+  setPortalClass,
+  updateThemeStyles,
+} from '../portalHelpers';
 
 describe('#navigateToLocalePage', () => {
   it('returns correct cookie name', () => {
@@ -21,3 +29,198 @@ describe('#navigateToLocalePage', () => {
     );
   });
 });
+
+describe('Theme Functions', () => {
+  describe('#generatePortalBgColor', () => {
+    it('returns mixed color for dark theme', () => {
+      const result = generatePortalBgColor('#FF5733', 'dark');
+      expect(result).toBe('color-mix(in srgb, #FF5733 20%, black)');
+    });
+
+    it('returns mixed color for light theme', () => {
+      const result = generatePortalBgColor('#FF5733', 'light');
+      expect(result).toBe('color-mix(in srgb, #FF5733 20%, white)');
+    });
+  });
+
+  describe('#generatePortalBg', () => {
+    it('returns background for dark theme', () => {
+      const result = generatePortalBg('#FF5733', 'dark');
+      expect(result).toBe(
+        'background: url(/assets/images/hc/hexagon-dark.svg) color-mix(in srgb, #FF5733 20%, black)'
+      );
+    });
+
+    it('returns background for light theme', () => {
+      const result = generatePortalBg('#FF5733', 'light');
+      expect(result).toBe(
+        'background: url(/assets/images/hc/hexagon-light.svg) color-mix(in srgb, #FF5733 20%, white)'
+      );
+    });
+  });
+
+  describe('#generateGradientToBottom', () => {
+    it('returns gradient for dark theme', () => {
+      const result = generateGradientToBottom('dark');
+      expect(result).toBe(
+        'background-image: linear-gradient(to bottom, transparent, #151718)'
+      );
+    });
+
+    it('returns gradient for light theme', () => {
+      const result = generateGradientToBottom('light');
+      expect(result).toBe(
+        'background-image: linear-gradient(to bottom, transparent, white)'
+      );
+    });
+  });
+
+  describe('#setPortalStyles', () => {
+    let mockPortalBgDiv;
+    let mockPortalBgGradientDiv;
+
+    beforeEach(() => {
+      // Mocking portal background div
+      mockPortalBgDiv = document.createElement('div');
+      mockPortalBgDiv.id = 'portal-bg';
+      document.body.appendChild(mockPortalBgDiv);
+
+      // Mocking portal background gradient div
+      mockPortalBgGradientDiv = document.createElement('div');
+      mockPortalBgGradientDiv.id = 'portal-bg-gradient';
+      document.body.appendChild(mockPortalBgGradientDiv);
+    });
+
+    afterEach(() => {
+      document.body.innerHTML = '';
+    });
+
+    it('sets styles for portal background based on theme', () => {
+      window.portalConfig = { portalColor: '#FF5733' };
+
+      setPortalStyles('dark');
+      const expectedPortalBgStyle =
+        'background: url(/assets/images/hc/hexagon-dark.svg) color-mix(in srgb, #FF5733 20%, black)';
+      const expectedGradientStyle =
+        'background-image: linear-gradient(to bottom, transparent, #151718)';
+
+      expect(mockPortalBgDiv.getAttribute('style')).toBe(expectedPortalBgStyle);
+      expect(mockPortalBgGradientDiv.getAttribute('style')).toBe(
+        expectedGradientStyle
+      );
+    });
+  });
+
+  describe('#setPortalClass', () => {
+    let mockPortalDiv;
+
+    beforeEach(() => {
+      // Mocking portal div
+      mockPortalDiv = document.createElement('div');
+      mockPortalDiv.id = 'portal';
+      mockPortalDiv.classList.add('light');
+      document.body.appendChild(mockPortalDiv);
+    });
+
+    afterEach(() => {
+      document.body.innerHTML = '';
+    });
+
+    it('sets portal class based on theme', () => {
+      setPortalClass('dark');
+
+      expect(mockPortalDiv.classList.contains('dark')).toBe(true);
+      expect(mockPortalDiv.classList.contains('light')).toBe(false);
+    });
+  });
+
+  describe('#updateThemeStyles', () => {
+    let mockPortalDiv;
+    let mockPortalBgDiv;
+    let mockPortalBgGradientDiv;
+
+    beforeEach(() => {
+      // Mocking portal div
+      mockPortalDiv = document.createElement('div');
+      mockPortalDiv.id = 'portal';
+      document.body.appendChild(mockPortalDiv);
+
+      // Mocking portal background div
+      mockPortalBgDiv = document.createElement('div');
+      mockPortalBgDiv.id = 'portal-bg';
+      document.body.appendChild(mockPortalBgDiv);
+
+      // Mocking portal background gradient div
+      mockPortalBgGradientDiv = document.createElement('div');
+      mockPortalBgGradientDiv.id = 'portal-bg-gradient';
+      document.body.appendChild(mockPortalBgGradientDiv);
+    });
+
+    afterEach(() => {
+      document.body.innerHTML = '';
+    });
+
+    it('updates theme styles based on theme', () => {
+      window.portalConfig = { portalColor: '#FF5733' };
+
+      updateThemeStyles('dark');
+
+      const expectedPortalBgStyle =
+        'background: url(/assets/images/hc/hexagon-dark.svg) color-mix(in srgb, #FF5733 20%, black)';
+      const expectedGradientStyle =
+        'background-image: linear-gradient(to bottom, transparent, #151718)';
+
+      expect(mockPortalDiv.classList.contains('dark')).toBe(true);
+      expect(mockPortalBgDiv.getAttribute('style')).toBe(expectedPortalBgStyle);
+      expect(mockPortalBgGradientDiv.getAttribute('style')).toBe(
+        expectedGradientStyle
+      );
+    });
+  });
+
+  describe('#initializeTheme', () => {
+    let mockPortalDiv;
+
+    beforeEach(() => {
+      mockPortalDiv = document.createElement('div');
+      mockPortalDiv.id = 'portal';
+      document.body.appendChild(mockPortalDiv);
+    });
+
+    afterEach(() => {
+      document.body.innerHTML = '';
+    });
+
+    it('updates theme based on system preferences', () => {
+      const mediaQueryList = {
+        matches: true,
+        addEventListener: jest.fn(),
+      };
+      window.matchMedia = jest.fn().mockReturnValue(mediaQueryList);
+      window.portalConfig = { theme: 'system' };
+
+      InitializationHelpers.initializeTheme();
+
+      expect(mediaQueryList.addEventListener).toBeCalledWith(
+        'change',
+        expect.any(Function)
+      );
+      expect(mockPortalDiv.classList.contains('dark')).toBe(true);
+    });
+
+    it('does not update theme if themeFromServer is not "system"', () => {
+      const mediaQueryList = {
+        matches: true,
+        addEventListener: jest.fn(),
+      };
+      window.matchMedia = jest.fn().mockReturnValue(mediaQueryList);
+      window.portalConfig = { theme: 'dark' };
+
+      InitializationHelpers.initializeTheme();
+
+      expect(mediaQueryList.addEventListener).not.toBeCalled();
+      expect(mockPortalDiv.classList.contains('dark')).toBe(false);
+      expect(mockPortalDiv.classList.contains('light')).toBe(false);
+    });
+  });
+});
diff --git a/app/views/layouts/portal.html.erb b/app/views/layouts/portal.html.erb
index d446e2e6f..2ae188fc3 100644
--- a/app/views/layouts/portal.html.erb
+++ b/app/views/layouts/portal.html.erb
@@ -48,6 +48,8 @@ By default, it renders:
   <script>
     window.portalConfig = {
       portalSlug: '<%= @portal.slug %>',
+      portalColor: '<%= @portal.color %>',
+      theme: '<%= @theme %>',
       localeCode: '<%= @locale %>',
       searchTranslations: {
         searchPlaceholder: '<%= I18n.t('public_portal.search.search_placeholder') %>',

From d94108bf3fc20454236250e84dda1d1c4a988857 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Fri, 27 Oct 2023 13:35:02 +0530
Subject: [PATCH 24/94] feat: show ReplyTo in widget UI (#8094)

Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
---
 .../api/v1/widget/base_controller.rb          |  3 +
 .../api/v1/widget/messages_controller.rb      |  2 +-
 .../widgets/conversation/bubble/ReplyTo.vue   |  2 +-
 .../shared/components/FluentIcon/icons.json   |  1 +
 app/javascript/widget/api/conversation.js     |  8 +-
 app/javascript/widget/api/endPoints.js        |  6 +-
 .../widget/components/AgentMessage.vue        | 91 ++++++++++++------
 .../widget/components/ChatFooter.vue          | 44 ++++++++-
 .../widget/components/ChatInputWrap.vue       |  4 +-
 .../widget/components/ChatMessage.vue         | 22 ++++-
 .../widget/components/DragWrapper.vue         | 55 +++++++++++
 .../widget/components/FooterReplyTo.vue       | 41 ++++++++
 .../widget/components/MessageReplyButton.vue  | 17 ++++
 .../widget/components/ReplyToChip.vue         | 51 ++++++++++
 .../widget/components/UserMessage.vue         | 93 +++++++++++++------
 .../store/modules/conversation/actions.js     | 10 +-
 .../store/modules/conversation/helpers.js     |  3 +-
 .../specs/conversation/actions.spec.js        | 12 ++-
 .../specs/conversation/helpers.spec.js        |  9 ++
 app/javascript/widget/views/Messages.vue      |  4 +-
 .../v1/widget/messages/create.json.jbuilder   |  1 +
 .../api/v1/widget/messages_controller_spec.rb | 29 ++++++
 22 files changed, 426 insertions(+), 82 deletions(-)
 create mode 100644 app/javascript/widget/components/DragWrapper.vue
 create mode 100644 app/javascript/widget/components/FooterReplyTo.vue
 create mode 100644 app/javascript/widget/components/MessageReplyButton.vue
 create mode 100644 app/javascript/widget/components/ReplyToChip.vue

diff --git a/app/controllers/api/v1/widget/base_controller.rb b/app/controllers/api/v1/widget/base_controller.rb
index 229cf27e9..5b87e2d1a 100644
--- a/app/controllers/api/v1/widget/base_controller.rb
+++ b/app/controllers/api/v1/widget/base_controller.rb
@@ -79,6 +79,9 @@ class Api::V1::Widget::BaseController < ApplicationController
       sender: @contact,
       content: permitted_params[:message][:content],
       inbox_id: conversation.inbox_id,
+      content_attributes: {
+        in_reply_to: permitted_params[:message][:reply_to]
+      },
       echo_id: permitted_params[:message][:echo_id],
       message_type: :incoming
     }
diff --git a/app/controllers/api/v1/widget/messages_controller.rb b/app/controllers/api/v1/widget/messages_controller.rb
index 306a5f46f..a51b4c2d6 100644
--- a/app/controllers/api/v1/widget/messages_controller.rb
+++ b/app/controllers/api/v1/widget/messages_controller.rb
@@ -64,7 +64,7 @@ class Api::V1::Widget::MessagesController < Api::V1::Widget::BaseController
 
   def permitted_params
     # timestamp parameter is used in create conversation method
-    params.permit(:id, :before, :after, :website_token, contact: [:name, :email], message: [:content, :referer_url, :timestamp, :echo_id])
+    params.permit(:id, :before, :after, :website_token, contact: [:name, :email], message: [:content, :referer_url, :timestamp, :echo_id, :reply_to])
   end
 
   def set_message
diff --git a/app/javascript/dashboard/components/widgets/conversation/bubble/ReplyTo.vue b/app/javascript/dashboard/components/widgets/conversation/bubble/ReplyTo.vue
index 7bc4d5156..754c79954 100644
--- a/app/javascript/dashboard/components/widgets/conversation/bubble/ReplyTo.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/bubble/ReplyTo.vue
@@ -2,7 +2,7 @@
   <div
     class="px-2 py-1.5 rounded-sm min-w-[10rem] mb-2"
     :class="{
-      'bg-slate-100 dark:bg-slate-600 dark:text-slate-50':
+      'bg-slate-50 dark:bg-slate-600 dark:text-slate-50':
         messageType === MESSAGE_TYPE.INCOMING,
       'bg-woot-600 text-woot-50': messageType === MESSAGE_TYPE.OUTGOING,
       '-mx-2': !parentHasAttachments,
diff --git a/app/javascript/shared/components/FluentIcon/icons.json b/app/javascript/shared/components/FluentIcon/icons.json
index 45c70071c..441989c15 100644
--- a/app/javascript/shared/components/FluentIcon/icons.json
+++ b/app/javascript/shared/components/FluentIcon/icons.json
@@ -1,6 +1,7 @@
 {
   "arrow-clockwise-outline": "M12 4.75a7.25 7.25 0 1 0 7.201 6.406c-.068-.588.358-1.156.95-1.156.515 0 .968.358 1.03.87a9.25 9.25 0 1 1-3.432-6.116V4.25a1 1 0 1 1 2.001 0v2.698l.034.052h-.034v.25a1 1 0 0 1-1 1h-3a1 1 0 1 1 0-2h.666A7.219 7.219 0 0 0 12 4.75Z",
   "arrow-right-outline": "M13.267 4.209a.75.75 0 0 0-1.034 1.086l6.251 5.955H3.75a.75.75 0 0 0 0 1.5h14.734l-6.251 5.954a.75.75 0 0 0 1.034 1.087l7.42-7.067a.996.996 0 0 0 .3-.58.758.758 0 0 0-.001-.29.995.995 0 0 0-.3-.578l-7.419-7.067Z",
+  "arrow-reply-outline": "M9.277 16.221a.75.75 0 0 1-1.061 1.06l-4.997-5.003a.75.75 0 0 1 0-1.06L8.217 6.22a.75.75 0 0 1 1.061 1.06L5.557 11h7.842c1.595 0 2.81.242 3.889.764l.246.126a6.203 6.203 0 0 1 2.576 2.576c.61 1.14.89 2.418.89 4.135a.75.75 0 0 1-1.5 0c0-1.484-.228-2.52-.713-3.428a4.702 4.702 0 0 0-1.96-1.96c-.838-.448-1.786-.676-3.094-.709L13.4 12.5H5.562l3.715 3.721Z",
   "attach-outline": "M11.772 3.743a6 6 0 0 1 8.66 8.302l-.19.197-8.8 8.798-.036.03a3.723 3.723 0 0 1-5.489-4.973.764.764 0 0 1 .085-.13l.054-.06.086-.088.142-.148.002.003 7.436-7.454a.75.75 0 0 1 .977-.074l.084.073a.75.75 0 0 1 .074.976l-.073.084-7.594 7.613a2.23 2.23 0 0 0 3.174 3.106l8.832-8.83A4.502 4.502 0 0 0 13 4.644l-.168.16-.013.014-9.536 9.536a.75.75 0 0 1-1.133-.977l.072-.084 9.549-9.55h.002Z",
   "chat-outline": "M12 2c5.523 0 10 4.477 10 10s-4.477 10-10 10a9.96 9.96 0 0 1-4.587-1.112l-3.826 1.067a1.25 1.25 0 0 1-1.54-1.54l1.068-3.823A9.96 9.96 0 0 1 2 12C2 6.477 6.477 2 12 2Zm0 1.5A8.5 8.5 0 0 0 3.5 12c0 1.47.373 2.883 1.073 4.137l.15.27-1.112 3.984 3.987-1.112.27.15A8.5 8.5 0 1 0 12 3.5ZM8.75 13h4.498a.75.75 0 0 1 .102 1.493l-.102.007H8.75a.75.75 0 0 1-.102-1.493L8.75 13h4.498H8.75Zm0-3.5h6.505a.75.75 0 0 1 .101 1.493l-.101.007H8.75a.75.75 0 0 1-.102-1.493L8.75 9.5h6.505H8.75Z",
   "checkmark-outline": "M4.53 12.97a.75.75 0 0 0-1.06 1.06l4.5 4.5a.75.75 0 0 0 1.06 0l11-11a.75.75 0 0 0-1.06-1.06L8.5 16.94l-3.97-3.97Z",
diff --git a/app/javascript/widget/api/conversation.js b/app/javascript/widget/api/conversation.js
index ded771316..5cae5bc13 100755
--- a/app/javascript/widget/api/conversation.js
+++ b/app/javascript/widget/api/conversation.js
@@ -6,13 +6,13 @@ const createConversationAPI = async content => {
   return API.post(urlData.url, urlData.params);
 };
 
-const sendMessageAPI = async content => {
-  const urlData = endPoints.sendMessage(content);
+const sendMessageAPI = async (content, replyTo = null) => {
+  const urlData = endPoints.sendMessage(content, replyTo);
   return API.post(urlData.url, urlData.params);
 };
 
-const sendAttachmentAPI = async attachment => {
-  const urlData = endPoints.sendAttachment(attachment);
+const sendAttachmentAPI = async (attachment, replyTo = null) => {
+  const urlData = endPoints.sendAttachment(attachment, replyTo);
   return API.post(urlData.url, urlData.params);
 };
 
diff --git a/app/javascript/widget/api/endPoints.js b/app/javascript/widget/api/endPoints.js
index 646370c05..8ede38056 100755
--- a/app/javascript/widget/api/endPoints.js
+++ b/app/javascript/widget/api/endPoints.js
@@ -22,7 +22,7 @@ const createConversation = params => {
   };
 };
 
-const sendMessage = content => {
+const sendMessage = (content, replyTo) => {
   const referrerURL = window.referrerURL || '';
   const search = buildSearchParamsWithLocale(window.location.search);
   return {
@@ -30,6 +30,7 @@ const sendMessage = content => {
     params: {
       message: {
         content,
+        reply_to: replyTo,
         timestamp: new Date().toString(),
         referer_url: referrerURL,
       },
@@ -37,7 +38,7 @@ const sendMessage = content => {
   };
 };
 
-const sendAttachment = ({ attachment }) => {
+const sendAttachment = ({ attachment, replyTo = null }) => {
   const { referrerURL = '' } = window;
   const timestamp = new Date().toString();
   const { file } = attachment;
@@ -51,6 +52,7 @@ const sendAttachment = ({ attachment }) => {
 
   formData.append('message[referer_url]', referrerURL);
   formData.append('message[timestamp]', timestamp);
+  formData.append('message[reply_to]', replyTo);
   return {
     url: `/api/v1/widget/messages${window.location.search}`,
     params: formData,
diff --git a/app/javascript/widget/components/AgentMessage.vue b/app/javascript/widget/components/AgentMessage.vue
index 6b9609a6b..6020af3dc 100755
--- a/app/javascript/widget/components/AgentMessage.vue
+++ b/app/javascript/widget/components/AgentMessage.vue
@@ -1,7 +1,9 @@
 <template>
   <div
-    class="agent-message-wrap"
-    :class="{ 'has-response': hasRecordedResponse || isASubmittedForm }"
+    class="agent-message-wrap group"
+    :class="{
+      'has-response': hasRecordedResponse || isASubmittedForm,
+    }"
   >
     <div v-if="!isASubmittedForm" class="agent-message">
       <div class="avatar-wrap">
@@ -13,31 +15,51 @@
         />
       </div>
       <div class="message-wrap">
-        <AgentMessageBubble
-          v-if="shouldDisplayAgentMessage"
-          :content-type="contentType"
-          :message-content-attributes="messageContentAttributes"
-          :message-id="message.id"
-          :message-type="messageType"
-          :message="message.content"
-        />
-        <div
-          v-if="hasAttachments"
-          class="chat-bubble has-attachment agent"
-          :class="(wrapClass, $dm('bg-white', 'dark:bg-slate-700'))"
-        >
-          <div v-for="attachment in message.attachments" :key="attachment.id">
-            <image-bubble
-              v-if="attachment.file_type === 'image' && !hasImageError"
-              :url="attachment.data_url"
-              :thumb="attachment.data_url"
-              :readable-time="readableTime"
-              @error="onImageLoadError"
+        <div v-if="hasReplyTo" class="flex mt-2 mb-1 text-xs">
+          <reply-to-chip :reply-to="replyTo" />
+        </div>
+        <div class="flex gap-1">
+          <drag-wrapper
+            class="space-y-2"
+            direction="right"
+            @dragged="toggleReply"
+          >
+            <AgentMessageBubble
+              v-if="shouldDisplayAgentMessage"
+              :content-type="contentType"
+              :message-content-attributes="messageContentAttributes"
+              :message-id="message.id"
+              :message-type="messageType"
+              :message="message.content"
+            />
+            <div
+              v-if="hasAttachments"
+              class="chat-bubble has-attachment agent"
+              :class="(wrapClass, $dm('bg-white', 'dark:bg-slate-700'))"
+            >
+              <div
+                v-for="attachment in message.attachments"
+                :key="attachment.id"
+              >
+                <image-bubble
+                  v-if="attachment.file_type === 'image' && !hasImageError"
+                  :url="attachment.data_url"
+                  :thumb="attachment.data_url"
+                  :readable-time="readableTime"
+                  @error="onImageLoadError"
+                />
+                <audio v-else-if="attachment.file_type === 'audio'" controls>
+                  <source :src="attachment.data_url" />
+                </audio>
+                <file-bubble v-else :url="attachment.data_url" />
+              </div>
+            </div>
+          </drag-wrapper>
+          <div class="flex flex-col justify-end">
+            <message-reply-button
+              class="transition-opacity delay-75 opacity-0 group-hover:opacity-100 sm:opacity-0"
+              @click="toggleReply"
             />
-            <audio v-else-if="attachment.file_type === 'audio'" controls>
-              <source :src="attachment.data_url" />
-            </audio>
-            <file-bubble v-else :url="attachment.data_url" />
           </div>
         </div>
         <p
@@ -63,6 +85,7 @@
 <script>
 import UserMessage from 'widget/components/UserMessage.vue';
 import AgentMessageBubble from 'widget/components/AgentMessageBubble.vue';
+import MessageReplyButton from 'widget/components/MessageReplyButton.vue';
 import timeMixin from 'dashboard/mixins/time';
 import ImageBubble from 'widget/components/ImageBubble.vue';
 import FileBubble from 'widget/components/FileBubble.vue';
@@ -72,6 +95,9 @@ import configMixin from '../mixins/configMixin';
 import messageMixin from '../mixins/messageMixin';
 import { isASubmittedFormMessage } from 'shared/helpers/MessageTypeHelper';
 import darkModeMixin from 'widget/mixins/darkModeMixin.js';
+import ReplyToChip from 'widget/components/ReplyToChip.vue';
+import DragWrapper from 'widget/components/DragWrapper.vue';
+import { BUS_EVENTS } from 'shared/constants/busEvents';
 
 export default {
   name: 'AgentMessage',
@@ -81,6 +107,9 @@ export default {
     Thumbnail,
     UserMessage,
     FileBubble,
+    MessageReplyButton,
+    ReplyToChip,
+    DragWrapper,
   },
   mixins: [timeMixin, configMixin, messageMixin, darkModeMixin],
   props: {
@@ -88,6 +117,10 @@ export default {
       type: Object,
       default: () => {},
     },
+    replyTo: {
+      type: Object,
+      default: () => {},
+    },
   },
   data() {
     return {
@@ -180,6 +213,9 @@ export default {
         'has-text': this.shouldDisplayAgentMessage,
       };
     },
+    hasReplyTo() {
+      return this.replyTo && (this.replyTo.content || this.replyTo.attachments);
+    },
   },
   watch: {
     message() {
@@ -193,6 +229,9 @@ export default {
     onImageLoadError() {
       this.hasImageError = true;
     },
+    toggleReply() {
+      bus.$emit(BUS_EVENTS.TOGGLE_REPLY_TO_MESSAGE, this.message);
+    },
   },
 };
 </script>
diff --git a/app/javascript/widget/components/ChatFooter.vue b/app/javascript/widget/components/ChatFooter.vue
index 9de6d4275..2a8ef36dc 100755
--- a/app/javascript/widget/components/ChatFooter.vue
+++ b/app/javascript/widget/components/ChatFooter.vue
@@ -1,10 +1,20 @@
 <template>
   <footer
     v-if="!hideReplyBox"
-    class="shadow-sm bg-white mb-1 z-50 relative"
-    :class="{ 'rounded-lg': !isWidgetStyleFlat }"
+    class="relative z-50 mb-1"
+    :class="{
+      'rounded-lg': !isWidgetStyleFlat,
+      'pt-2.5 shadow-[0px_-20px_20px_1px_rgba(0,_0,_0,_0.05)] dark:shadow-[0px_-20px_20px_1px_rgba(0,_0,_0,_0.15)] rounded-t-none':
+        hasReplyTo,
+    }"
   >
+    <footer-reply-to
+      v-if="hasReplyTo"
+      :in-reply-to="inReplyTo"
+      @dismiss="inReplyTo = null"
+    />
     <chat-input-wrap
+      class="shadow-sm"
       :on-send-message="handleSendMessage"
       :on-send-attachment="handleSendAttachment"
     />
@@ -34,16 +44,19 @@
 import { mapActions, mapGetters } from 'vuex';
 import { getContrastingTextColor } from '@chatwoot/utils';
 import CustomButton from 'shared/components/Button.vue';
+import FooterReplyTo from 'widget/components/FooterReplyTo.vue';
 import ChatInputWrap from 'widget/components/ChatInputWrap.vue';
 import { BUS_EVENTS } from 'shared/constants/busEvents';
 import { sendEmailTranscript } from 'widget/api/conversation';
 import routerMixin from 'widget/mixins/routerMixin';
 import { IFrameHelper } from '../helpers/utils';
 import { CHATWOOT_ON_START_CONVERSATION } from '../constants/sdkEvents';
+
 export default {
   components: {
     ChatInputWrap,
     CustomButton,
+    FooterReplyTo,
   },
   mixins: [routerMixin],
   props: {
@@ -52,6 +65,11 @@ export default {
       default: '',
     },
   },
+  data() {
+    return {
+      inReplyTo: null,
+    };
+  },
   computed: {
     ...mapGetters({
       conversationAttributes: 'conversationAttributes/getConversationParams',
@@ -71,6 +89,14 @@ export default {
     showEmailTranscriptButton() {
       return this.currentUser && this.currentUser.email;
     },
+    hasReplyTo() {
+      return (
+        this.inReplyTo && (this.inReplyTo.content || this.inReplyTo.attachments)
+      );
+    },
+  },
+  mounted() {
+    bus.$on(BUS_EVENTS.TOGGLE_REPLY_TO_MESSAGE, this.toggleReplyTo);
   },
   methods: {
     ...mapActions('conversation', [
@@ -85,14 +111,21 @@ export default {
     async handleSendMessage(content) {
       await this.sendMessage({
         content,
+        replyTo: this.inReplyTo ? this.inReplyTo.id : null,
       });
+      // reset replyTo message after sending
+      this.inReplyTo = null;
       // Update conversation attributes on new conversation
       if (this.conversationSize === 0) {
         this.getAttributes();
       }
     },
-    handleSendAttachment(attachment) {
-      this.sendAttachment({ attachment });
+    async handleSendAttachment(attachment) {
+      await this.sendAttachment({
+        attachment,
+        replyTo: this.inReplyTo ? this.inReplyTo.id : null,
+      });
+      this.inReplyTo = null;
     },
     startNewConversation() {
       this.clearConversations();
@@ -104,6 +137,9 @@ export default {
         data: { hasConversation: true },
       });
     },
+    toggleReplyTo(message) {
+      this.inReplyTo = message;
+    },
     async sendTranscript() {
       const { email } = this.currentUser;
       if (email) {
diff --git a/app/javascript/widget/components/ChatInputWrap.vue b/app/javascript/widget/components/ChatInputWrap.vue
index ac9552a58..67fc4e9eb 100755
--- a/app/javascript/widget/components/ChatInputWrap.vue
+++ b/app/javascript/widget/components/ChatInputWrap.vue
@@ -25,7 +25,7 @@
       />
       <button
         v-if="hasEmojiPickerEnabled"
-        class="icon-button flex justify-center items-center"
+        class="flex items-center justify-center icon-button"
         aria-label="Emoji picker"
         @click="toggleEmojiPicker"
       >
@@ -192,7 +192,7 @@ export default {
 }
 
 .emoji-dialog {
-  right: 0;
+  right: 20px;
   top: -302px;
   max-width: 100%;
 
diff --git a/app/javascript/widget/components/ChatMessage.vue b/app/javascript/widget/components/ChatMessage.vue
index b70c3b2c2..c3a586f23 100755
--- a/app/javascript/widget/components/ChatMessage.vue
+++ b/app/javascript/widget/components/ChatMessage.vue
@@ -1,11 +1,22 @@
 <template>
-  <UserMessage v-if="isUserMessage" :message="message" />
-  <AgentMessage v-else :message="message" />
+  <UserMessage
+    v-if="isUserMessage"
+    :id="`cwmsg-${message.id}`"
+    :message="message"
+    :reply-to="replyTo"
+  />
+  <AgentMessage
+    v-else
+    :id="`cwmsg-${message.id}`"
+    :message="message"
+    :reply-to="replyTo"
+  />
 </template>
 
 <script>
 import AgentMessage from 'widget/components/AgentMessage.vue';
 import UserMessage from 'widget/components/UserMessage.vue';
+import { mapGetters } from 'vuex';
 import { MESSAGE_TYPE } from 'widget/helpers/constants';
 
 export default {
@@ -20,9 +31,16 @@ export default {
     },
   },
   computed: {
+    ...mapGetters({
+      allMessages: 'conversation/getConversation',
+    }),
     isUserMessage() {
       return this.message.message_type === MESSAGE_TYPE.INCOMING;
     },
+    replyTo() {
+      const replyTo = this.message?.content_attributes?.in_reply_to;
+      return replyTo ? this.allMessages[replyTo] : null;
+    },
   },
 };
 </script>
diff --git a/app/javascript/widget/components/DragWrapper.vue b/app/javascript/widget/components/DragWrapper.vue
new file mode 100644
index 000000000..41037f434
--- /dev/null
+++ b/app/javascript/widget/components/DragWrapper.vue
@@ -0,0 +1,55 @@
+<template>
+  <div
+    :style="{ transform: `translateX(${dragDistance}px)` }"
+    class="will-change-transform"
+    @touchstart="handleTouchStart"
+    @touchmove="handleTouchMove"
+    @touchend="resetPosition"
+  >
+    <slot />
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'DragWrapper',
+  props: {
+    direction: {
+      type: String,
+      required: true,
+      validator: value => ['left', 'right'].includes(value),
+    },
+  },
+  data() {
+    return {
+      startX: null,
+      dragDistance: 0,
+      threshold: 50, // Threshold value in pixels
+    };
+  },
+  methods: {
+    handleTouchStart(event) {
+      this.startX = event.touches[0].clientX;
+    },
+    handleTouchMove(event) {
+      const touchX = event.touches[0].clientX;
+      let deltaX = touchX - this.startX;
+
+      if (this.direction === 'right') {
+        this.dragDistance = Math.min(this.threshold, deltaX);
+      } else if (this.direction === 'left') {
+        this.dragDistance = Math.max(-this.threshold, deltaX);
+      }
+    },
+    resetPosition() {
+      if (
+        (this.dragDistance >= this.threshold && this.direction === 'right') ||
+        (this.dragDistance <= -this.threshold && this.direction === 'left')
+      ) {
+        this.$emit('dragged', this.direction);
+      }
+      this.dragDistance = 0; // Reset the position after releasing the touch
+    },
+  },
+};
+</script>
diff --git a/app/javascript/widget/components/FooterReplyTo.vue b/app/javascript/widget/components/FooterReplyTo.vue
new file mode 100644
index 000000000..ca65e15c2
--- /dev/null
+++ b/app/javascript/widget/components/FooterReplyTo.vue
@@ -0,0 +1,41 @@
+<template>
+  <div
+    class="mb-2.5 rounded-[7px] dark:bg-slate-900 dark:text-slate-100 bg-slate-100 px-2 py-1.5 text-sm text-slate-700 flex items-center gap-2"
+  >
+    <div class="items-center flex-grow truncate">
+      <strong>Replying to:</strong>
+      {{ inReplyTo.content || replyToAttachment }}
+    </div>
+    <button
+      class="items-end flex-shrink-0 p-1 rounded-md hover:bg-slate-200 dark:hover:bg-slate-800"
+      @click="$emit('dismiss')"
+    >
+      <fluent-icon icon="dismiss" size="12" />
+    </button>
+  </div>
+</template>
+
+<script>
+import FluentIcon from 'shared/components/FluentIcon/Index.vue';
+
+export default {
+  name: 'FooterReplyTo',
+  components: { FluentIcon },
+  props: {
+    inReplyTo: {
+      type: Object,
+      default: () => {},
+    },
+  },
+  computed: {
+    replyToAttachment() {
+      if (!this.inReplyTo?.attachments.length) {
+        return '';
+      }
+
+      const [{ file_type: fileType } = {}] = this.inReplyTo.attachments;
+      return this.$t(`ATTACHMENTS.${fileType}.CONTENT`);
+    },
+  },
+};
+</script>
diff --git a/app/javascript/widget/components/MessageReplyButton.vue b/app/javascript/widget/components/MessageReplyButton.vue
new file mode 100644
index 000000000..4f8bf4a25
--- /dev/null
+++ b/app/javascript/widget/components/MessageReplyButton.vue
@@ -0,0 +1,17 @@
+<template>
+  <button
+    class="p-1 mb-1 rounded-full dark:text-slate-500 dark:bg-slate-900 text-slate-600 bg-slate-100 hover:text-slate-800"
+    @click="$emit('click')"
+  >
+    <FluentIcon icon="arrow-reply" size="11" class="flex-shrink-0" />
+  </button>
+</template>
+
+<script>
+import FluentIcon from 'shared/components/FluentIcon/Index.vue';
+
+export default {
+  name: 'MessageReplyButton',
+  components: { FluentIcon },
+};
+</script>
diff --git a/app/javascript/widget/components/ReplyToChip.vue b/app/javascript/widget/components/ReplyToChip.vue
new file mode 100644
index 000000000..047092a6f
--- /dev/null
+++ b/app/javascript/widget/components/ReplyToChip.vue
@@ -0,0 +1,51 @@
+<template>
+  <button
+    class="px-1.5 py-0.5 rounded-md text-slate-500 bg-slate-50 dark:bg-slate-900 opacity-60 hover:opacity-100 cursor-pointer flex items-center gap-1.5"
+    @click="navigateTo(replyTo.id)"
+  >
+    <fluent-icon icon="arrow-reply" size="12" class="flex-shrink-0" />
+    <div class="truncate max-w-[8rem]">
+      {{ replyTo.content || replyToAttachment }}
+    </div>
+  </button>
+</template>
+
+<script>
+import FluentIcon from 'shared/components/FluentIcon/Index.vue';
+
+export default {
+  name: 'AgentMessage',
+  components: {
+    FluentIcon,
+  },
+  props: {
+    replyTo: {
+      type: Object,
+      default: () => {},
+    },
+  },
+  computed: {
+    replyToAttachment() {
+      if (!this.replyTo?.attachments.length) {
+        return '';
+      }
+
+      const [{ file_type: fileType } = {}] = this.replyTo.attachments;
+      return this.$t(`ATTACHMENTS.${fileType}.CONTENT`);
+    },
+  },
+  methods: {
+    navigateTo(id) {
+      const elementId = `cwmsg-${id}`;
+      this.$nextTick(() => {
+        const el = document.getElementById(elementId);
+        el.scrollIntoView();
+        el.classList.add('bg-slate-100', 'dark:bg-slate-900');
+        setTimeout(() => {
+          el.classList.remove('bg-slate-100', 'dark:bg-slate-900');
+        }, 500);
+      });
+    },
+  },
+};
+</script>
diff --git a/app/javascript/widget/components/UserMessage.vue b/app/javascript/widget/components/UserMessage.vue
index 3b5115fe8..812d699cb 100755
--- a/app/javascript/widget/components/UserMessage.vue
+++ b/app/javascript/widget/components/UserMessage.vue
@@ -1,46 +1,63 @@
 <template>
-  <div class="user-message-wrap">
-    <div class="user-message">
+  <div class="user-message-wrap group">
+    <div class="flex gap-1 user-message">
       <div
         class="message-wrap"
         :class="{ 'in-progress': isInProgress, 'is-failed': isFailed }"
       >
-        <user-message-bubble
-          v-if="showTextBubble"
-          :message="message.content"
-          :status="message.status"
-          :widget-color="widgetColor"
-        />
-        <div
-          v-if="hasAttachments"
-          class="chat-bubble has-attachment user"
-          :style="{ backgroundColor: widgetColor }"
-        >
-          <div v-for="attachment in message.attachments" :key="attachment.id">
-            <image-bubble
-              v-if="attachment.file_type === 'image' && !hasImageError"
-              :url="attachment.data_url"
-              :thumb="attachment.data_url"
-              :readable-time="readableTime"
-              @error="onImageLoadError"
-            />
-            <file-bubble
-              v-else
-              :url="attachment.data_url"
-              :is-in-progress="isInProgress"
-              :widget-color="widgetColor"
-              is-user-bubble
+        <div v-if="hasReplyTo" class="flex justify-end mt-2 mb-1 text-xs">
+          <reply-to-chip :reply-to="replyTo" />
+        </div>
+        <div class="flex justify-end gap-1">
+          <div class="flex flex-col justify-end">
+            <message-reply-button
+              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" @dragged="toggleReply">
+            <user-message-bubble
+              v-if="showTextBubble"
+              :message="message.content"
+              :status="message.status"
+              :widget-color="widgetColor"
+            />
+            <div
+              v-if="hasAttachments"
+              class="chat-bubble has-attachment user"
+              :style="{ backgroundColor: widgetColor }"
+            >
+              <div
+                v-for="attachment in message.attachments"
+                :key="attachment.id"
+              >
+                <image-bubble
+                  v-if="attachment.file_type === 'image' && !hasImageError"
+                  :url="attachment.data_url"
+                  :thumb="attachment.data_url"
+                  :readable-time="readableTime"
+                  @error="onImageLoadError"
+                />
+                <file-bubble
+                  v-else
+                  :url="attachment.data_url"
+                  :is-in-progress="isInProgress"
+                  :widget-color="widgetColor"
+                  is-user-bubble
+                />
+              </div>
+            </div>
+          </drag-wrapper>
         </div>
         <div
           v-if="isFailed"
-          class="flex justify-end align-middle px-4 py-2 text-red-700"
+          class="flex justify-end px-4 py-2 text-red-700 align-middle"
         >
           <button
             v-if="!hasAttachments"
             :title="$t('COMPONENTS.MESSAGE_BUBBLE.RETRY')"
-            class="inline-flex justify-center items-center ml-2"
+            class="inline-flex items-center justify-center ml-2"
             @click="retrySendMessage"
           >
             <fluent-icon icon="arrow-clockwise" size="14" />
@@ -53,20 +70,28 @@
 
 <script>
 import UserMessageBubble from 'widget/components/UserMessageBubble.vue';
+import MessageReplyButton from 'widget/components/MessageReplyButton.vue';
 import ImageBubble from 'widget/components/ImageBubble.vue';
 import FluentIcon from 'shared/components/FluentIcon/Index.vue';
 import FileBubble from 'widget/components/FileBubble.vue';
 import timeMixin from 'dashboard/mixins/time';
 import messageMixin from '../mixins/messageMixin';
+import ReplyToChip from 'widget/components/ReplyToChip.vue';
+import DragWrapper from 'widget/components/DragWrapper.vue';
+import { BUS_EVENTS } from 'shared/constants/busEvents';
+
 import { mapGetters } from 'vuex';
 
 export default {
   name: 'UserMessage',
   components: {
     UserMessageBubble,
+    MessageReplyButton,
     ImageBubble,
     FileBubble,
     FluentIcon,
+    ReplyToChip,
+    DragWrapper,
   },
   mixins: [timeMixin, messageMixin],
   props: {
@@ -74,6 +99,10 @@ export default {
       type: Object,
       default: () => {},
     },
+    replyTo: {
+      type: Object,
+      default: () => {},
+    },
   },
   data() {
     return {
@@ -107,6 +136,9 @@ export default {
         ? meta.error
         : this.$t('COMPONENTS.MESSAGE_BUBBLE.ERROR_MESSAGE');
     },
+    hasReplyTo() {
+      return this.replyTo && (this.replyTo.content || this.replyTo.attachments);
+    },
   },
   watch: {
     message() {
@@ -126,6 +158,9 @@ export default {
     onImageLoadError() {
       this.hasImageError = true;
     },
+    toggleReply() {
+      bus.$emit(BUS_EVENTS.TOGGLE_REPLY_TO_MESSAGE, this.message);
+    },
   },
 };
 </script>
diff --git a/app/javascript/widget/store/modules/conversation/actions.js b/app/javascript/widget/store/modules/conversation/actions.js
index 526e1d5aa..73a0da91f 100644
--- a/app/javascript/widget/store/modules/conversation/actions.js
+++ b/app/javascript/widget/store/modules/conversation/actions.js
@@ -28,18 +28,17 @@ export const actions = {
     }
   },
   sendMessage: async ({ dispatch }, params) => {
-    const { content } = params;
-    const message = createTemporaryMessage({ content });
-
+    const { content, replyTo } = params;
+    const message = createTemporaryMessage({ content, replyTo });
     dispatch('sendMessageWithData', message);
   },
   sendMessageWithData: async ({ commit }, message) => {
-    const { id, content, meta = {} } = message;
+    const { id, content, replyTo, meta = {} } = message;
 
     commit('pushMessageToConversation', message);
     commit('updateMessageMeta', { id, meta: { ...meta, error: '' } });
     try {
-      const { data } = await sendMessageAPI(content);
+      const { data } = await sendMessageAPI(content, replyTo);
 
       commit('deleteMessage', message.id);
       commit('pushMessageToConversation', { ...data, status: 'sent' });
@@ -69,6 +68,7 @@ export const actions = {
     };
     const tempMessage = createTemporaryMessage({
       attachments: [attachment],
+      replyTo: params.replyTo,
     });
     commit('pushMessageToConversation', tempMessage);
     try {
diff --git a/app/javascript/widget/store/modules/conversation/helpers.js b/app/javascript/widget/store/modules/conversation/helpers.js
index 2ebac5242..61cbc9a6d 100644
--- a/app/javascript/widget/store/modules/conversation/helpers.js
+++ b/app/javascript/widget/store/modules/conversation/helpers.js
@@ -2,13 +2,14 @@ import { MESSAGE_TYPE } from 'widget/helpers/constants';
 import { isASubmittedFormMessage } from 'shared/helpers/MessageTypeHelper';
 
 import getUuid from '../../../helpers/uuid';
-export const createTemporaryMessage = ({ attachments, content }) => {
+export const createTemporaryMessage = ({ attachments, content, replyTo }) => {
   const timestamp = new Date().getTime() / 1000;
   return {
     id: getUuid(),
     content,
     attachments,
     status: 'in_progress',
+    replyTo,
     created_at: timestamp,
     message_type: MESSAGE_TYPE.INCOMING,
   };
diff --git a/app/javascript/widget/store/modules/specs/conversation/actions.spec.js b/app/javascript/widget/store/modules/specs/conversation/actions.spec.js
index 4b2d8dc1e..39587f6fa 100644
--- a/app/javascript/widget/store/modules/specs/conversation/actions.spec.js
+++ b/app/javascript/widget/store/modules/specs/conversation/actions.spec.js
@@ -110,7 +110,10 @@ describe('#actions', () => {
           search: '?param=1',
         },
       }));
-      await actions.sendMessage({ commit, dispatch }, { content: 'hello' });
+      await actions.sendMessage(
+        { commit, dispatch },
+        { content: 'hello', replyTo: 124 }
+      );
       spy.mockRestore();
       windowSpy.mockRestore();
       expect(dispatch).toBeCalledWith('sendMessageWithData', {
@@ -119,6 +122,7 @@ describe('#actions', () => {
         created_at: 1466424490,
         id: '1111',
         message_type: 0,
+        replyTo: 124,
         status: 'in_progress',
       });
     });
@@ -132,7 +136,10 @@ describe('#actions', () => {
       const thumbUrl = '';
       const attachment = { thumbUrl, fileType: 'file' };
 
-      actions.sendAttachment({ commit, dispatch }, { attachment });
+      actions.sendAttachment(
+        { commit, dispatch },
+        { attachment, replyTo: 135 }
+      );
       spy.mockRestore();
       expect(commit).toBeCalledWith('pushMessageToConversation', {
         id: '1111',
@@ -140,6 +147,7 @@ describe('#actions', () => {
         status: 'in_progress',
         created_at: 1466424490,
         message_type: 0,
+        replyTo: 135,
         attachments: [
           {
             thumb_url: '',
diff --git a/app/javascript/widget/store/modules/specs/conversation/helpers.spec.js b/app/javascript/widget/store/modules/specs/conversation/helpers.spec.js
index d2d7943b1..7ba77f3b5 100644
--- a/app/javascript/widget/store/modules/specs/conversation/helpers.spec.js
+++ b/app/javascript/widget/store/modules/specs/conversation/helpers.spec.js
@@ -35,6 +35,15 @@ describe('#createTemporaryMessage', () => {
     expect(message.content).toBe('hello');
     expect(message.status).toBe('in_progress');
   });
+  it('returns message object with reply to', () => {
+    const message = createTemporaryMessage({
+      content: 'hello',
+      replyTo: 124,
+    });
+    expect(message.content).toBe('hello');
+    expect(message.status).toBe('in_progress');
+    expect(message.replyTo).toBe(124);
+  });
 });
 
 describe('#getNonDeletedMessages', () => {
diff --git a/app/javascript/widget/views/Messages.vue b/app/javascript/widget/views/Messages.vue
index 008ba862e..ce473b521 100644
--- a/app/javascript/widget/views/Messages.vue
+++ b/app/javascript/widget/views/Messages.vue
@@ -5,9 +5,7 @@
     <div class="flex flex-1 overflow-auto">
       <conversation-wrap :grouped-messages="groupedMessages" />
     </div>
-    <div class="px-5">
-      <chat-footer />
-    </div>
+    <chat-footer class="px-5" />
   </div>
 </template>
 <script>
diff --git a/app/views/api/v1/widget/messages/create.json.jbuilder b/app/views/api/v1/widget/messages/create.json.jbuilder
index 57276bdf1..fbd6ab5e5 100644
--- a/app/views/api/v1/widget/messages/create.json.jbuilder
+++ b/app/views/api/v1/widget/messages/create.json.jbuilder
@@ -6,5 +6,6 @@ json.message_type @message.message_type_before_type_cast
 json.created_at @message.created_at.to_i
 json.private @message.private
 json.source_id @message.source_id
+json.content_attributes @message.content_attributes
 json.attachments @message.attachments.map(&:push_event_data) if @message.attachments.present?
 json.sender @message.sender.push_event_data if @message.sender
diff --git a/spec/controllers/api/v1/widget/messages_controller_spec.rb b/spec/controllers/api/v1/widget/messages_controller_spec.rb
index f138b5738..11c916514 100644
--- a/spec/controllers/api/v1/widget/messages_controller_spec.rb
+++ b/spec/controllers/api/v1/widget/messages_controller_spec.rb
@@ -71,6 +71,35 @@ RSpec.describe '/api/v1/widget/messages', type: :request do
         expect(json_response['message']).to eq('Content is too long (maximum is 150000 characters)')
       end
 
+      it 'creates message in conversation with a valid reply to' do
+        message_params = { content: 'hello world reply', timestamp: Time.current, reply_to: conversation.messages.first.id }
+        post api_v1_widget_messages_url,
+             params: { website_token: web_widget.website_token, message: message_params },
+             headers: { 'X-Auth-Token' => token },
+             as: :json
+
+        expect(response).to have_http_status(:success)
+        json_response = response.parsed_body
+        expect(json_response['content']).to eq(message_params[:content])
+        expect(json_response['content_attributes']['in_reply_to']).to eq(conversation.messages.first.id)
+        # check nil for external id since this is a web widget conversation
+        expect(json_response['content_attributes']['in_reply_to_external_id']).to be_nil
+      end
+
+      it 'creates message in conversation with an in-valid reply to' do
+        message_params = { content: 'hello world reply', timestamp: Time.current, reply_to: conversation.messages.first.id + 300 }
+        post api_v1_widget_messages_url,
+             params: { website_token: web_widget.website_token, message: message_params },
+             headers: { 'X-Auth-Token' => token },
+             as: :json
+
+        expect(response).to have_http_status(:success)
+        json_response = response.parsed_body
+        expect(json_response['content']).to eq(message_params[:content])
+        expect(json_response['content_attributes']['in_reply_to']).to be_nil
+        expect(json_response['content_attributes']['in_reply_to_external_id']).to be_nil
+      end
+
       it 'creates attachment message in conversation' do
         file = fixture_file_upload(Rails.root.join('spec/assets/avatar.png'), 'image/png')
         message_params = { content: 'hello world', timestamp: Time.current, attachments: [file] }

From dd05482cb0f728918f9c11186db67704c966c913 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Fri, 27 Oct 2023 16:05:42 +0530
Subject: [PATCH 25/94] chore: update UI copy (#8229)

Co-authored-by: Hricha Shandily <hrichashandily@gmail.com>
---
 .../i18n/locale/en/advancedFilters.json       | 62 +++++++++----------
 .../dashboard/i18n/locale/en/agentBots.json   | 62 +++++++++----------
 .../dashboard/i18n/locale/en/bulkActions.json | 32 +++++-----
 .../dashboard/i18n/locale/en/cannedMgmt.json  | 60 +++++++++---------
 4 files changed, 108 insertions(+), 108 deletions(-)

diff --git a/app/javascript/dashboard/i18n/locale/en/advancedFilters.json b/app/javascript/dashboard/i18n/locale/en/advancedFilters.json
index eae814131..170f01d7f 100644
--- a/app/javascript/dashboard/i18n/locale/en/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/en/advancedFilters.json
@@ -1,18 +1,18 @@
 {
   "FILTER": {
-    "TITLE": "Filter Conversations",
-    "SUBTITLE": "Add filters below and hit 'Apply filters' to filter conversations.",
+    "TITLE": "Filter conversations",
+    "SUBTITLE": "Add your filters below and hit 'Apply filters' to cut through the chat clutter.",
     "EDIT_CUSTOM_FILTER": "Edit Folder",
     "CUSTOM_VIEWS_SUBTITLE": "Add or remove filters and update your folder.",
-    "ADD_NEW_FILTER": "Add Filter",
-    "FILTER_DELETE_ERROR": "You should have atleast one filter to save",
+    "ADD_NEW_FILTER": "Add filter",
+    "FILTER_DELETE_ERROR": "Oops, looks like we can't save nothing! Please add at least one filter to save it.",
     "SUBMIT_BUTTON_LABEL": "Apply filters",
     "UPDATE_BUTTON_LABEL": "Update folder",
     "CANCEL_BUTTON_LABEL": "Cancel",
-    "CLEAR_BUTTON_LABEL": "Clear Filters",
-    "EMPTY_VALUE_ERROR": "Value is required",
+    "CLEAR_BUTTON_LABEL": "Clear filters",
     "FOLDER_LABEL": "Folder Name",
     "FOLDER_QUERY_LABEL": "Folder Query",
+    "EMPTY_VALUE_ERROR": "Value is required.",
     "TOOLTIP_LABEL": "Filter conversations",
     "QUERY_DROPDOWN_LABELS": {
       "AND": "AND",
@@ -36,44 +36,44 @@
     },
     "ATTRIBUTES": {
       "STATUS": "Status",
-      "ASSIGNEE_NAME": "Assignee Name",
-      "INBOX_NAME": "Inbox Name",
-      "TEAM_NAME": "Team Name",
-      "CONVERSATION_IDENTIFIER": "Conversation Identifier",
-      "CAMPAIGN_NAME": "Campaign Name",
+      "ASSIGNEE_NAME": "Assignee name",
+      "INBOX_NAME": "Inbox name",
+      "TEAM_NAME": "Team name",
+      "CONVERSATION_IDENTIFIER": "Conversation identifier",
+      "CAMPAIGN_NAME": "Campaign name",
       "LABELS": "Labels",
-      "BROWSER_LANGUAGE": "Browser Language",
+      "BROWSER_LANGUAGE": "Browser language",
       "PRIORITY": "Priority",
-      "COUNTRY_NAME": "Country Name",
+      "COUNTRY_NAME": "Country name",
       "REFERER_LINK": "Referer link",
       "CUSTOM_ATTRIBUTE_LIST": "List",
       "CUSTOM_ATTRIBUTE_TEXT": "Text",
       "CUSTOM_ATTRIBUTE_NUMBER": "Number",
       "CUSTOM_ATTRIBUTE_LINK": "Link",
       "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox",
-      "CREATED_AT": "Created At",
-      "LAST_ACTIVITY": "Last Activity"
+      "CREATED_AT": "Created at",
+      "LAST_ACTIVITY": "Last activity"
     },
     "GROUPS": {
-      "STANDARD_FILTERS": "Standard Filters",
-      "ADDITIONAL_FILTERS": "Additional Filters",
-      "CUSTOM_ATTRIBUTES": "Custom Attributes"
+      "STANDARD_FILTERS": "Standard filters",
+      "ADDITIONAL_FILTERS": "Additional filters",
+      "CUSTOM_ATTRIBUTES": "Custom attributes"
     },
     "CUSTOM_VIEWS": {
       "ADD": {
         "TITLE": "Do you want to save this filter?",
         "LABEL": "Name this filter",
-        "PLACEHOLDER": "Enter a name for this filter",
-        "ERROR_MESSAGE": "Name is required",
+        "PLACEHOLDER": "Name your filter to refer it later.",
+        "ERROR_MESSAGE": "Name is required.",
         "SAVE_BUTTON": "Save filter",
         "CANCEL_BUTTON": "Cancel",
         "API_FOLDERS": {
-          "SUCCESS_MESSAGE": "Folder created successfully",
-          "ERROR_MESSAGE": "Error while creating folder"
+          "SUCCESS_MESSAGE": "Folder created successfully.",
+          "ERROR_MESSAGE": "Error while creating folder."
         },
         "API_SEGMENTS": {
-          "SUCCESS_MESSAGE": "Segment created successfully",
-          "ERROR_MESSAGE": "Error while creating segment"
+          "SUCCESS_MESSAGE": "Segment created successfully.",
+          "ERROR_MESSAGE": "Error while creating segment."
         }
       },
       "EDIT": {
@@ -83,19 +83,19 @@
         "DELETE_BUTTON": "Delete filter",
         "MODAL": {
           "CONFIRM": {
-            "TITLE": "Confirm Deletion",
+            "TITLE": "Confirm deletion",
             "MESSAGE": "Are you sure to delete the filter ",
-            "YES": "Yes, Delete",
-            "NO": "No, Keep it"
+            "YES": "Yes, delete",
+            "NO": "No, keep it"
           }
         },
         "API_FOLDERS": {
-          "SUCCESS_MESSAGE": "Folder deleted successfully",
-          "ERROR_MESSAGE": "Error while deleting folder"
+          "SUCCESS_MESSAGE": "Folder deleted successfully.",
+          "ERROR_MESSAGE": "Error while deleting folder."
         },
         "API_SEGMENTS": {
-          "SUCCESS_MESSAGE": "Segment deleted successfully",
-          "ERROR_MESSAGE": "Error while deleting segment"
+          "SUCCESS_MESSAGE": "Segment deleted successfully.",
+          "ERROR_MESSAGE": "Error while deleting segment."
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/en/agentBots.json b/app/javascript/dashboard/i18n/locale/en/agentBots.json
index 5403bb18c..fb744b4a9 100644
--- a/app/javascript/dashboard/i18n/locale/en/agentBots.json
+++ b/app/javascript/dashboard/i18n/locale/en/agentBots.json
@@ -1,73 +1,73 @@
 {
   "AGENT_BOTS": {
     "HEADER": "Bots",
-    "LOADING_EDITOR": "Loading Editor...",
-    "HEADER_BTN_TXT": "Add Bot Configuration",
-    "SIDEBAR_TXT": "<p><b>Agent Bots</b> <p>Agent bots allows you to automate the conversations</p>",
+    "LOADING_EDITOR": "Loading editor...",
+    "HEADER_BTN_TXT": "Add bot configuration",
+    "SIDEBAR_TXT": "<p><b>Agent Bots</b> <p>Agent Bots are like the most fabulous members of your team. They can handle the small stuff, so you can focus on the stuff that matters. Give them a try.</p> <p> You can manage your bots from this page or create new ones using the 'Add bot configuraton' button.</p> <p> Open the <a href=\"https://www.chatwoot.com/hc/chatwoot-user-guide-cloud-version/articles/1677497472-how-to-use-agent-bots\" target=\"blank\">Agent bots handbook</a> in another tab for a helping hand.</p>",
     "CSML_BOT_EDITOR": {
       "NAME": {
-        "LABEL": "Bot Name",
-        "PLACEHOLDER": "Give your bot a name",
-        "ERROR": "Bot name is required"
+        "LABEL": "Bot name",
+        "PLACEHOLDER": "Name your bot.",
+        "ERROR": "Bot name is required."
       },
       "DESCRIPTION": {
-        "LABEL": "Bot Description",
+        "LABEL": "Bot description",
         "PLACEHOLDER": "What does this bot do?"
       },
       "BOT_CONFIG": {
-        "ERROR": "Please enter your CSML bot configuration above",
-        "API_ERROR": "Your CSML configuration is invalid, please fix it and try again."
+        "ERROR": "Please enter your CSML bot configuration above.",
+        "API_ERROR": "Your CSML configuration is invalid. Please fix it and try again."
       },
       "SUBMIT": "Validate and save"
     },
     "BOT_CONFIGURATION": {
       "TITLE": "Select an agent bot",
-      "DESC": "You can set an agent bot from the list to this inbox. The bot can initially handle the conversation and transfer it to an agent when needed.",
+      "DESC": "Assign an Agent Bot to your inbox. They can handle initial conversations and transfer them to a live agent when necessary.",
       "SUBMIT": "Update",
-      "DISCONNECT": "Disconnect Bot",
-      "SUCCESS_MESSAGE": "Successfully updated the agent bot",
-      "DISCONNECTED_SUCCESS_MESSAGE": "Successfully disconnected the agent bot",
-      "ERROR_MESSAGE": "Could not update the agent bot, please try again later",
-      "DISCONNECTED_ERROR_MESSAGE": "Could not disconnect the agent bot, please try again later",
-      "SELECT_PLACEHOLDER": "Select Bot"
+      "DISCONNECT": "Disconnect bot",
+      "SUCCESS_MESSAGE": "Successfully updated the agent bot.",
+      "DISCONNECTED_SUCCESS_MESSAGE": "Successfully disconnected the agent bot.",
+      "ERROR_MESSAGE": "Could not update the agent bot. Please try again.",
+      "DISCONNECTED_ERROR_MESSAGE": "Could not disconnect the agent bot. Please try again.",
+      "SELECT_PLACEHOLDER": "Select bot"
     },
     "ADD": {
       "TITLE": "Configure new bot",
       "CANCEL_BUTTON_TEXT": "Cancel",
       "API": {
-        "SUCCESS_MESSAGE": "Bot added successfully",
-        "ERROR_MESSAGE": "Could not add bot, Please try again later"
+        "SUCCESS_MESSAGE": "Bot added successfully.",
+        "ERROR_MESSAGE": "Could not add bot. Please try again later."
       }
     },
     "LIST": {
-      "404": "No Bots found, you can create a bot by clicking the 'Configure new bot' Button ↗",
-      "LOADING": "Fetching Bots...",
-      "TYPE": "Bot Type"
+      "404": "No bots found. You can create a bot by clicking the 'Configure new bot' button ↗",
+      "LOADING": "Fetching bots...",
+      "TYPE": "Bot type"
     },
     "DELETE": {
       "BUTTON_TEXT": "Delete",
-      "TITLE": "Delete Bot",
+      "TITLE": "Delete bot",
       "SUBMIT": "Delete",
       "CANCEL_BUTTON_TEXT": "Cancel",
-      "DESCRIPTION": "Are you sure you want to delete this bot? This action is irreversible",
+      "DESCRIPTION": "Are you sure you want to delete this bot? This action is irreversible.",
       "API": {
-        "SUCCESS_MESSAGE": "Bot deleted successfully",
-        "ERROR_MESSAGE": "Could not able to delete bot, Please try again later"
+        "SUCCESS_MESSAGE": "Bot deleted successfully.",
+        "ERROR_MESSAGE": "Could not delete bot. Please try again."
       }
     },
     "EDIT": {
       "BUTTON_TEXT": "Edit",
-      "LOADING": "Fetching Bots...",
-      "TITLE": "Edit Bot",
+      "LOADING": "Fetching bots...",
+      "TITLE": "Edit bot",
       "CANCEL_BUTTON_TEXT": "Cancel",
       "API": {
-        "SUCCESS_MESSAGE": "Bot updated successfully",
-        "ERROR_MESSAGE": "Could not update bot, Please try again later"
+        "SUCCESS_MESSAGE": "Bot updated successfully.",
+        "ERROR_MESSAGE": "Could not update bot. Please try again."
       }
     },
     "TYPES": {
-      "WEBHOOK": "Webhook Bot",
-      "CSML": "CSML Bot"
+      "WEBHOOK": "Webhook bot",
+      "CSML": "CSML bot"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/en/bulkActions.json b/app/javascript/dashboard/i18n/locale/en/bulkActions.json
index d5145f1bb..6af8316e9 100644
--- a/app/javascript/dashboard/i18n/locale/en/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/en/bulkActions.json
@@ -1,40 +1,40 @@
 {
   "BULK_ACTION": {
     "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
-    "AGENT_SELECT_LABEL": "Select Agent",
+    "AGENT_SELECT_LABEL": "Select agent",
     "ASSIGN_CONFIRMATION_LABEL": "Are you sure to assign %{conversationCount} %{conversationLabel} to",
     "UNASSIGN_CONFIRMATION_LABEL": "Are you sure to unassign %{conversationCount} %{conversationLabel}?",
     "GO_BACK_LABEL": "Go back",
     "ASSIGN_LABEL": "Assign",
     "YES": "Yes",
-    "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
+    "ASSIGN_AGENT_TOOLTIP": "Assign agent",
     "ASSIGN_TEAM_TOOLTIP": "Assign team",
-    "ASSIGN_SUCCESFUL": "Conversations assigned successfully",
-    "ASSIGN_FAILED": "Failed to assign conversations, please try again",
-    "RESOLVE_SUCCESFUL": "Conversations resolved successfully",
-    "RESOLVE_FAILED": "Failed to resolve conversations, please try again",
+    "ASSIGN_SUCCESFUL": "Conversations assigned successfully.",
+    "ASSIGN_FAILED": "Failed to assign conversations. Please try again.",
+    "RESOLVE_SUCCESFUL": "Conversations resolved successfully.",
+    "RESOLVE_FAILED": "Failed to resolve conversations. Please try again.",
     "ALL_CONVERSATIONS_SELECTED_ALERT": "Conversations visible on this page are only selected.",
-    "AGENT_LIST_LOADING": "Loading Agents",
+    "AGENT_LIST_LOADING": "Loading agents",
     "UPDATE": {
       "CHANGE_STATUS": "Change status",
-      "SNOOZE_UNTIL_NEXT_REPLY": "Snooze until next reply",
+      "SNOOZE_UNTIL_NEXT_REPLY": "Snooze until next reply.",
       "UPDATE_SUCCESFUL": "Conversation status updated successfully.",
-      "UPDATE_FAILED": "Failed to update conversations, please try again"
+      "UPDATE_FAILED": "Failed to update conversations. Please try again."
     },
     "LABELS": {
-      "ASSIGN_LABELS": "Assign Labels",
+      "ASSIGN_LABELS": "Assign labels",
       "NO_LABELS_FOUND": "No labels found for",
       "ASSIGN_SELECTED_LABELS": "Assign selected labels",
-      "ASSIGN_SUCCESFUL": "Labels assigned successfully",
-      "ASSIGN_FAILED": "Failed to assign labels, please try again"
+      "ASSIGN_SUCCESFUL": "Labels assigned successfully.",
+      "ASSIGN_FAILED": "Failed to assign labels. Please try again."
     },
     "TEAMS": {
-      "TEAM_SELECT_LABEL": "Select Team",
+      "TEAM_SELECT_LABEL": "Select team",
       "NONE": "None",
       "NO_TEAMS_AVAILABLE": "There are no teams added to this account yet.",
-      "ASSIGN_SELECTED_TEAMS": "Assign selected team",
-      "ASSIGN_SUCCESFUL": "Teams assiged successfully",
-      "ASSIGN_FAILED": "Failed to assign team, please try again"
+      "ASSIGN_SELECTED_TEAMS": "Assign selected team.",
+      "ASSIGN_SUCCESFUL": "Teams assiged successfully.",
+      "ASSIGN_FAILED": "Failed to assign team. Please try again."
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/en/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/en/cannedMgmt.json
index 0cd52986e..71a334d87 100644
--- a/app/javascript/dashboard/i18n/locale/en/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/en/cannedMgmt.json
@@ -1,71 +1,71 @@
 {
   "CANNED_MGMT": {
     "HEADER": "Canned Responses",
-    "HEADER_BTN_TXT": "Add Canned Response",
-    "LOADING": "Fetching Canned Responses",
-    "SEARCH_404": "There are no items matching this query",
-    "SIDEBAR_TXT": "<p><b>Canned Responses</b> </p><p> Canned Responses are saved reply templates which can be used to quickly send out a reply to a conversation. </p><p> For creating a Canned Response, just click on the <b>Add Canned Response</b>. You can also edit or delete an existing Canned Response by clicking on the Edit or Delete button </p><p> Canned responses are used with the help of <b>Short Codes</b>. Agents can access canned responses while on a chat by typing <b>'/'</b> followed by the short code. </p>",
+    "HEADER_BTN_TXT": "Add canned response",
+    "LOADING": "Fetching canned responses...",
+    "SEARCH_404": "There are no items matching this query.",
+    "SIDEBAR_TXT": "<p><b>Canned Responses</b> </p><p> Canned Responses are pre-written reply templates that help you quickly respond to a conversation. To insert a canned response during a chat, agents can type a short code preceded by a '/' character. </p><p> You can manage your canned responses from this page or create new ones using the \"Add canned response\" button.</p><p>Open the <a target=\"_blank\" href=\"https://www.chatwoot.com/hc/chatwoot-user-guide-cloud-version/articles/1677501325-how-to-create-saved-reply-templates-with-canned-responses\">Canned Responses handbook</a> in another tab for a helping hand.</p><p>Also, check out the all-new <a href=\"https://www.chatwoot.com/tools/canned-responses-library\" target=\"_blank\">Canned Responses Library</a>.</p>",
     "LIST": {
       "404": "There are no canned responses available in this account.",
       "TITLE": "Manage canned responses",
-      "DESC": "Canned Responses are predefined reply templates which can be used to quickly send out replies to tickets.",
-      "TABLE_HEADER": ["Short Code", "Content", "Actions"]
+      "DESC": "Canned Responses are predefined reply templates which can be used to quickly send out replies to conversations.",
+      "TABLE_HEADER": ["Short code", "Content", "Actions"]
     },
     "ADD": {
-      "TITLE": "Add Canned Response",
-      "DESC": "Canned Responses are saved reply templates which can be used to quickly send out reply to conversation.",
+      "TITLE": "Add canned response",
+      "DESC": "Canned Responses are predefined reply templates which can be used to quickly send out replies to conversations.",
       "CANCEL_BUTTON_TEXT": "Cancel",
       "FORM": {
         "SHORT_CODE": {
-          "LABEL": "Short Code",
-          "PLACEHOLDER": "Please enter a short code",
-          "ERROR": "Short Code is required"
+          "LABEL": "Short code",
+          "PLACEHOLDER": "Please enter a short code.",
+          "ERROR": "Short Code is required."
         },
         "CONTENT": {
-          "LABEL": "Content",
-          "PLACEHOLDER": "Please enter a content",
-          "ERROR": "Content is required"
+          "LABEL": "Message",
+          "PLACEHOLDER": "Please write the message you want to save as a template to use later.",
+          "ERROR": "Message is required."
         },
         "SUBMIT": "Submit"
       },
       "API": {
-        "SUCCESS_MESSAGE": "Canned Response added successfully",
-        "ERROR_MESSAGE": "Could not create canned response. Please try again later."
+        "SUCCESS_MESSAGE": "Canned response added successfully.",
+        "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
       }
     },
     "EDIT": {
-      "TITLE": "Edit Canned Response",
+      "TITLE": "Edit canned response",
       "CANCEL_BUTTON_TEXT": "Cancel",
       "FORM": {
         "SHORT_CODE": {
-          "LABEL": "Short Code",
-          "PLACEHOLDER": "Please enter a shortcode",
-          "ERROR": "Short Code is required"
+          "LABEL": "Short code",
+          "PLACEHOLDER": "Please enter a shortcode.",
+          "ERROR": "Short code is required."
         },
         "CONTENT": {
-          "LABEL": "Content",
-          "PLACEHOLDER": "Please enter a content",
-          "ERROR": "Content is required"
+          "LABEL": "Message",
+          "PLACEHOLDER": "Please write the message you want to save as a template to use later.",
+          "ERROR": "Message is required."
         },
         "SUBMIT": "Submit"
       },
       "BUTTON_TEXT": "Edit",
       "API": {
-        "SUCCESS_MESSAGE": "Canned Response updated successfully",
-        "ERROR_MESSAGE": "Could not update canned response. Please try again later."
+        "SUCCESS_MESSAGE": "Canned response is updated successfully.",
+        "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
       }
     },
     "DELETE": {
       "BUTTON_TEXT": "Delete",
       "API": {
-        "SUCCESS_MESSAGE": "Canned response deleted successfully",
-        "ERROR_MESSAGE": "Could not delete canned response. Please try again later."
+        "SUCCESS_MESSAGE": "Canned response deleted successfully.",
+        "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
       },
       "CONFIRM": {
-        "TITLE": "Confirm Deletion",
+        "TITLE": "Confirm deletion",
         "MESSAGE": "Are you sure to delete ",
-        "YES": "Yes, Delete ",
-        "NO": "No, Keep "
+        "YES": "Yes, delete ",
+        "NO": "No, keep "
       }
     }
   }

From f023325b0e806fa41c6683b7b1731f582ec14229 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 27 Oct 2023 07:39:48 -0700
Subject: [PATCH 26/94] chore(deps): bump browserify-sign from 4.2.1 to 4.2.2
 (#8233)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 yarn.lock | 42 ++++++++++++++++++++++++++++--------------
 1 file changed, 28 insertions(+), 14 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 3eb71efbd..d37d0a0c4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8129,11 +8129,16 @@ bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.9:
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88"
   integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==
 
-bn.js@^5.0.0, bn.js@^5.1.1:
+bn.js@^5.0.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.0.tgz#358860674396c6997771a9d051fcc1b57d4ae002"
   integrity sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==
 
+bn.js@^5.2.1:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.1.tgz#0bc527a6a0d18d0aa8d5b0538ce4a77dccfa7b70"
+  integrity sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==
+
 body-parser@1.20.1:
   version "1.20.1"
   resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.1.tgz#b1812a8912c195cd371a3ee5e66faa2338a5c668"
@@ -8264,7 +8269,7 @@ browserify-des@^1.0.0:
     inherits "^2.0.1"
     safe-buffer "^5.1.2"
 
-browserify-rsa@^4.0.0, browserify-rsa@^4.0.1:
+browserify-rsa@^4.0.0, browserify-rsa@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.1.0.tgz#b2fd06b5b75ae297f7ce2dc651f918f5be158c8d"
   integrity sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==
@@ -8273,19 +8278,19 @@ browserify-rsa@^4.0.0, browserify-rsa@^4.0.1:
     randombytes "^2.0.1"
 
 browserify-sign@^4.0.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.1.tgz#eaf4add46dd54be3bb3b36c0cf15abbeba7956c3"
-  integrity sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.2.tgz#e78d4b69816d6e3dd1c747e64e9947f9ad79bc7e"
+  integrity sha512-1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg==
   dependencies:
-    bn.js "^5.1.1"
-    browserify-rsa "^4.0.1"
+    bn.js "^5.2.1"
+    browserify-rsa "^4.1.0"
     create-hash "^1.2.0"
     create-hmac "^1.1.7"
-    elliptic "^6.5.3"
+    elliptic "^6.5.4"
     inherits "^2.0.4"
-    parse-asn1 "^5.1.5"
-    readable-stream "^3.6.0"
-    safe-buffer "^5.2.0"
+    parse-asn1 "^5.1.6"
+    readable-stream "^3.6.2"
+    safe-buffer "^5.2.1"
 
 browserify-zlib@^0.2.0:
   version "0.2.0"
@@ -10290,7 +10295,7 @@ elegant-spinner@^1.0.1:
   resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e"
   integrity sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=
 
-elliptic@^6.5.3:
+elliptic@^6.5.3, elliptic@^6.5.4:
   version "6.5.4"
   resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb"
   integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==
@@ -15784,7 +15789,7 @@ parent-module@^1.0.0:
   dependencies:
     callsites "^3.0.0"
 
-parse-asn1@^5.0.0, parse-asn1@^5.1.5:
+parse-asn1@^5.0.0, parse-asn1@^5.1.6:
   version "5.1.6"
   resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.6.tgz#385080a3ec13cb62a62d39409cb3e88844cdaed4"
   integrity sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==
@@ -17801,6 +17806,15 @@ readable-stream@^3.0.6, readable-stream@^3.6.0:
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
+readable-stream@^3.6.2:
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967"
+  integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==
+  dependencies:
+    inherits "^2.0.3"
+    string_decoder "^1.1.1"
+    util-deprecate "^1.0.1"
+
 readdirp@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
@@ -18379,7 +18393,7 @@ safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
-safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0:
+safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@^5.2.1, safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==

From 6c4b92f7f6bd2799b6b2c4864a8d6ea0bec4ee82 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Fri, 27 Oct 2023 10:45:48 -0700
Subject: [PATCH 27/94] fix: Revert the changes for SyncCustomFilterCountJob
 (#8238)

---
 ...custom_filters_records_count_update_job.rb |  9 --------
 app/jobs/sync_custom_filter_count_job.rb      |  9 --------
 app/models/custom_filter.rb                   | 23 -------------------
 .../v1/models/_custom_filter.json.jbuilder    |  1 -
 lib/redis/redis_keys.rb                       |  1 -
 .../custom_filters_controller_spec.rb         | 16 -------------
 6 files changed, 59 deletions(-)
 delete mode 100644 app/jobs/custom_filters_records_count_update_job.rb
 delete mode 100644 app/jobs/sync_custom_filter_count_job.rb

diff --git a/app/jobs/custom_filters_records_count_update_job.rb b/app/jobs/custom_filters_records_count_update_job.rb
deleted file mode 100644
index 49b26a396..000000000
--- a/app/jobs/custom_filters_records_count_update_job.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class CustomFiltersRecordsCountUpdateJob < ApplicationJob
-  queue_as :low
-
-  def perform
-    CustomFilter.find_each(batch_size: 25) do |filter|
-      SyncCustomFilterCountJob.perform_later(filter)
-    end
-  end
-end
diff --git a/app/jobs/sync_custom_filter_count_job.rb b/app/jobs/sync_custom_filter_count_job.rb
deleted file mode 100644
index f89c196d6..000000000
--- a/app/jobs/sync_custom_filter_count_job.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class SyncCustomFilterCountJob < ApplicationJob
-  queue_as :low
-
-  def perform(filter)
-    Redis::Alfred.set(filter.filter_count_key, 0) if filter.filter_records.nil?
-
-    filter.set_record_count_in_redis
-  end
-end
diff --git a/app/models/custom_filter.rb b/app/models/custom_filter.rb
index 2089d42c3..b3d58fd17 100644
--- a/app/models/custom_filter.rb
+++ b/app/models/custom_filter.rb
@@ -24,29 +24,6 @@ class CustomFilter < ApplicationRecord
   enum filter_type: { conversation: 0, contact: 1, report: 2 }
   validate :validate_number_of_filters
 
-  def records_count
-    fetch_record_count_from_redis
-  end
-
-  def filter_records
-    Conversations::FilterService.new(query.with_indifferent_access, user, account).perform
-  end
-
-  def set_record_count_in_redis
-    records = filter_records
-    Redis::Alfred.set(filter_count_key, records[:count][:all_count])
-  end
-
-  def fetch_record_count_from_redis
-    number_of_records = Redis::Alfred.get(filter_count_key)
-    SyncCustomFilterCountJob.perform_later(self) if number_of_records.nil?
-    number_of_records.to_i
-  end
-
-  def filter_count_key
-    format(::Redis::Alfred::CUSTOM_FILTER_RECORDS_COUNT_KEY, account_id: account_id, filter_id: id, user_id: user_id)
-  end
-
   def validate_number_of_filters
     return true if account.custom_filters.where(user_id: user_id).size < MAX_FILTER_PER_USER
 
diff --git a/app/views/api/v1/models/_custom_filter.json.jbuilder b/app/views/api/v1/models/_custom_filter.json.jbuilder
index c1c032e85..473f2d2c2 100644
--- a/app/views/api/v1/models/_custom_filter.json.jbuilder
+++ b/app/views/api/v1/models/_custom_filter.json.jbuilder
@@ -4,4 +4,3 @@ json.filter_type resource.filter_type
 json.query resource.query
 json.created_at resource.created_at
 json.updated_at resource.updated_at
-json.count resource.records_count
diff --git a/lib/redis/redis_keys.rb b/lib/redis/redis_keys.rb
index 8c5b92548..01c1fc0b5 100644
--- a/lib/redis/redis_keys.rb
+++ b/lib/redis/redis_keys.rb
@@ -31,7 +31,6 @@ module Redis::RedisKeys
   LATEST_CHATWOOT_VERSION = 'LATEST_CHATWOOT_VERSION'.freeze
   # Check if a message create with same source-id is in progress?
   MESSAGE_SOURCE_KEY = 'MESSAGE_SOURCE_KEY::%<id>s'.freeze
-  CUSTOM_FILTER_RECORDS_COUNT_KEY = 'CUSTOM_FILTER::%<account_id>d::%<user_id>d::%<filter_id>d'.freeze
   OPENAI_CONVERSATION_KEY = 'OPEN_AI_CONVERSATION_KEY::%<event_name>s::%<conversation_id>d::%<updated_at>d'.freeze
 
   ## Sempahores / Locks
diff --git a/spec/controllers/api/v1/accounts/custom_filters_controller_spec.rb b/spec/controllers/api/v1/accounts/custom_filters_controller_spec.rb
index 0f40cd789..760100cf3 100644
--- a/spec/controllers/api/v1/accounts/custom_filters_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/custom_filters_controller_spec.rb
@@ -41,17 +41,6 @@ RSpec.describe 'Custom Filters API', type: :request do
         expect(response_body.first['name']).to eq(custom_filter.name)
         expect(response_body.first['query']).to eq(custom_filter.query)
       end
-
-      it 'returns custom_filter conversations count when set in redis' do
-        get "/api/v1/accounts/#{account.id}/custom_filters",
-            headers: user.create_new_auth_token,
-            as: :json
-
-        expect(response).to have_http_status(:success)
-        response_body = response.parsed_body
-        expect(response_body.first['name']).to eq(custom_filter.name)
-        expect(response_body.first['count']).to eq(custom_filter.fetch_record_count_from_redis)
-      end
     end
   end
 
@@ -66,16 +55,12 @@ RSpec.describe 'Custom Filters API', type: :request do
 
     context 'when it is an authenticated user' do
       it 'shows the custom filter' do
-        custom_filter.set_record_count_in_redis
-
         get "/api/v1/accounts/#{account.id}/custom_filters/#{custom_filter.id}",
             headers: user.create_new_auth_token,
             as: :json
 
         expect(response).to have_http_status(:success)
         expect(response.body).to include(custom_filter.name)
-        json_response = response.parsed_body
-        expect(json_response['count']).to eq 1
       end
     end
   end
@@ -106,7 +91,6 @@ RSpec.describe 'Custom Filters API', type: :request do
         expect(response).to have_http_status(:success)
         json_response = response.parsed_body
         expect(json_response['name']).to eq 'vip-customers'
-        expect(json_response['count']).to be_zero
       end
 
       it 'gives the error for 51st record' do

From 61e03fa33aa6c892329ca8898ebc3929f0e53dfa Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Sat, 28 Oct 2023 02:37:15 +0530
Subject: [PATCH 28/94] feat: Bandwidth sms channel delivery reports (#8198)

Fixes: https://linear.app/chatwoot/issue/CW-2566/delivery-report-for-bandwidth-sms
---
 .../widgets/conversation/bubble/Actions.vue   |  9 +-
 app/jobs/webhooks/sms_events_job.rb           | 21 ++++-
 app/services/sms/delivery_status_service.rb   | 52 ++++++++++++
 spec/jobs/webhooks/sms_events_job_spec.rb     | 31 ++++++-
 .../sms/delivery_status_service_spec.rb       | 83 +++++++++++++++++++
 5 files changed, 190 insertions(+), 6 deletions(-)
 create mode 100644 app/services/sms/delivery_status_service.rb
 create mode 100644 spec/services/sms/delivery_status_service_spec.rb

diff --git a/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue b/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue
index 2e58bce10..e0a63d81a 100644
--- a/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue
@@ -204,7 +204,8 @@ export default {
       if (
         this.isAWhatsAppChannel ||
         this.isATwilioChannel ||
-        this.isAFacebookInbox
+        this.isAFacebookInbox ||
+        this.isASmsInbox
       ) {
         return this.sourceId && this.isSent;
       }
@@ -215,7 +216,11 @@ export default {
         return false;
       }
 
-      if (this.isAWhatsAppChannel || this.isATwilioChannel) {
+      if (
+        this.isAWhatsAppChannel ||
+        this.isATwilioChannel ||
+        this.isASmsInbox
+      ) {
         return this.sourceId && this.isDelivered;
       }
       // We will consider messages as delivered for web widget inbox and API inbox if they are sent
diff --git a/app/jobs/webhooks/sms_events_job.rb b/app/jobs/webhooks/sms_events_job.rb
index c982e0da1..21318f766 100644
--- a/app/jobs/webhooks/sms_events_job.rb
+++ b/app/jobs/webhooks/sms_events_job.rb
@@ -1,13 +1,28 @@
 class Webhooks::SmsEventsJob < ApplicationJob
   queue_as :default
 
+  SUPPORTED_EVENTS = %w[message-received message-delivered message-failed].freeze
+
   def perform(params = {})
-    return unless params[:type] == 'message-received'
+    return unless SUPPORTED_EVENTS.include?(params[:type])
 
     channel = Channel::Sms.find_by(phone_number: params[:to])
     return unless channel
 
-    # TODO: pass to appropriate provider service from here
-    Sms::IncomingMessageService.new(inbox: channel.inbox, params: params[:message].with_indifferent_access).perform
+    process_event_params(channel, params)
+  end
+
+  private
+
+  def process_event_params(channel, params)
+    if delivery_event?(params)
+      Sms::DeliveryStatusService.new(channel: channel, params: params[:message].with_indifferent_access).perform
+    else
+      Sms::IncomingMessageService.new(inbox: channel.inbox, params: params[:message].with_indifferent_access).perform
+    end
+  end
+
+  def delivery_event?(params)
+    params[:type] == 'message-delivered' || params[:type] == 'message-failed'
   end
 end
diff --git a/app/services/sms/delivery_status_service.rb b/app/services/sms/delivery_status_service.rb
new file mode 100644
index 000000000..dd071e242
--- /dev/null
+++ b/app/services/sms/delivery_status_service.rb
@@ -0,0 +1,52 @@
+class Sms::DeliveryStatusService
+  pattr_initialize [:inbox!, :params!]
+
+  def perform
+    return unless supported_status?
+
+    process_status if message.present?
+  end
+
+  private
+
+  def process_status
+    @message.status = status
+    @message.external_error = external_error if error_occurred?
+    @message.save!
+  end
+
+  def supported_status?
+    %w[message-delivered message-failed].include?(params[:type])
+  end
+
+  # Relevant documentation:
+  # https://dev.bandwidth.com/docs/mfa/webhooks/international/message-delivered
+  # https://dev.bandwidth.com/docs/mfa/webhooks/international/message-failed
+  def status
+    type_mapping = {
+      'message-delivered' => 'delivered',
+      'message-failed' => 'failed'
+    }
+
+    type_mapping[params[:type]]
+  end
+
+  def external_error
+    return nil unless error_occurred?
+
+    error_message = params[:description]
+    error_code = params[:errorCode]
+
+    "#{error_code} - #{error_message}"
+  end
+
+  def error_occurred?
+    params[:errorCode] && params[:type] == 'message-failed'
+  end
+
+  def message
+    return unless params[:message][:id]
+
+    @message ||= inbox.messages.find_by(source_id: params[:message][:id])
+  end
+end
diff --git a/spec/jobs/webhooks/sms_events_job_spec.rb b/spec/jobs/webhooks/sms_events_job_spec.rb
index 3874ba24d..305601176 100644
--- a/spec/jobs/webhooks/sms_events_job_spec.rb
+++ b/spec/jobs/webhooks/sms_events_job_spec.rb
@@ -43,7 +43,7 @@ RSpec.describe Webhooks::SmsEventsJob do
   end
 
   context 'when valid params' do
-    it 'calls Sms::IncomingMessageService' do
+    it 'calls Sms::IncomingMessageService if the message type is message-received' do
       process_service = double
       allow(Sms::IncomingMessageService).to receive(:new).and_return(process_service)
       allow(process_service).to receive(:perform)
@@ -52,5 +52,34 @@ RSpec.describe Webhooks::SmsEventsJob do
       expect(process_service).to receive(:perform)
       described_class.perform_now(params)
     end
+
+    it 'calls Sms::DeliveryStatusService if the message type is message-delivered' do
+      params[:type] = 'message-delivered'
+      process_service = double
+      allow(Sms::DeliveryStatusService).to receive(:new).and_return(process_service)
+      allow(process_service).to receive(:perform)
+      expect(Sms::DeliveryStatusService).to receive(:new).with(channel: sms_channel,
+                                                               params: params[:message].with_indifferent_access)
+      expect(process_service).to receive(:perform)
+      described_class.perform_now(params)
+    end
+
+    it 'calls Sms::DeliveryStatusService if the message type is message-failed' do
+      params[:type] = 'message-failed'
+      process_service = double
+      allow(Sms::DeliveryStatusService).to receive(:new).and_return(process_service)
+      allow(process_service).to receive(:perform)
+      expect(Sms::DeliveryStatusService).to receive(:new).with(channel: sms_channel,
+                                                               params: params[:message].with_indifferent_access)
+      expect(process_service).to receive(:perform)
+      described_class.perform_now(params)
+    end
+
+    it 'does not call any service if the message type is not supported' do
+      params[:type] = 'message-sent'
+      expect(Sms::IncomingMessageService).not_to receive(:new)
+      expect(Sms::DeliveryStatusService).not_to receive(:new)
+      described_class.perform_now(params)
+    end
   end
 end
diff --git a/spec/services/sms/delivery_status_service_spec.rb b/spec/services/sms/delivery_status_service_spec.rb
new file mode 100644
index 000000000..c60f0146a
--- /dev/null
+++ b/spec/services/sms/delivery_status_service_spec.rb
@@ -0,0 +1,83 @@
+require 'rails_helper'
+
+describe Sms::DeliveryStatusService do
+  describe '#perform' do
+    let!(:account) { create(:account) }
+    let!(:sms_channel) { create(:channel_sms) }
+    let!(:contact) { create(:contact, account: account, phone_number: '+12345') }
+    let(:contact_inbox) { create(:contact_inbox, source_id: '+12345', contact: contact, inbox: sms_channel.inbox) }
+    let!(:conversation) { create(:conversation, contact: contact, inbox: sms_channel.inbox, contact_inbox: contact_inbox) }
+
+    describe '#perform' do
+      context 'when message delivery status is fired' do
+        before do
+          create(:message, account: account, inbox: sms_channel.inbox, conversation: conversation, status: :sent,
+                           source_id: 'SMd560ac79e4a4d36b3ce59f1f50471986')
+        end
+
+        it 'updates the message if the message status is delivered' do
+          params = {
+            time: '2022-02-02T23:14:05.309Z',
+            type: 'message-delivered',
+            to: sms_channel.phone_number,
+            description: 'ok',
+            message: {
+              'id': conversation.messages.last.source_id
+            }
+          }
+
+          described_class.new(params: params, inbox: sms_channel.inbox).perform
+          expect(conversation.reload.messages.last.status).to eq('delivered')
+        end
+
+        it 'updates the message if the message status is failed' do
+          params = {
+            time: '2022-02-02T23:14:05.309Z',
+            type: 'message-failed',
+            to: sms_channel.phone_number,
+            description: 'Undeliverable',
+            errorCode: 995,
+            message: {
+              'id': conversation.messages.last.source_id
+            }
+          }
+
+          described_class.new(params: params, inbox: sms_channel.inbox).perform
+          expect(conversation.reload.messages.last.status).to eq('failed')
+
+          expect(conversation.reload.messages.last.external_error).to eq('995 - Undeliverable')
+        end
+
+        it 'does not update the message if the status is not a support status' do
+          params = {
+            time: '2022-02-02T23:14:05.309Z',
+            type: 'queued',
+            to: sms_channel.phone_number,
+            description: 'ok',
+            message: {
+              'id': conversation.messages.last.source_id
+            }
+          }
+
+          described_class.new(params: params, inbox: sms_channel.inbox).perform
+          expect(conversation.reload.messages.last.status).to eq('sent')
+        end
+
+        it 'does not update the message if the message is not present' do
+          params = {
+            time: '2022-02-02T23:14:05.309Z',
+            type: 'message-delivered',
+            to: sms_channel.phone_number,
+            description: 'ok',
+            message: {
+              'id': '123'
+            }
+          }
+
+          described_class.new(params: params, inbox: sms_channel.inbox).perform
+          expect(conversation.reload.messages.last.status).to eq('sent')
+        end
+      end
+    end
+  end
+end

From 24fbab94c37dc168556f82949cec8545ada5b17f Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Sat, 28 Oct 2023 03:51:39 +0530
Subject: [PATCH 29/94] chore: Refactor `MarkMessagesAsReadJob` based on
 conversation id and time stamp (#8217)

- Mark all messages as read by providing the conversation ID and timestamp.
- For Instagram, ensure all previous messages that weren't marked as failed are now marked as read. This is because the read events are only triggered for the most recent message and not for any previous ones.
---
 .../api/v1/widget/conversations_controller.rb  |  2 +-
 .../api/v1/inboxes/conversations_controller.rb |  2 +-
 .../conversations/mark_messages_as_read_job.rb |  9 ++++++---
 app/services/instagram/read_status_service.rb  |  7 +------
 .../v1/widget/conversations_controller_spec.rb |  5 ++++-
 .../v1/inbox/conversations_controller_spec.rb  |  4 +++-
 .../mark_messages_as_read_job_spec.rb          | 18 ++++++++++++------
 .../instagram/read_status_service_spec.rb      | 13 ++++++++-----
 8 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/app/controllers/api/v1/widget/conversations_controller.rb b/app/controllers/api/v1/widget/conversations_controller.rb
index df0ef64ff..69b85797c 100644
--- a/app/controllers/api/v1/widget/conversations_controller.rb
+++ b/app/controllers/api/v1/widget/conversations_controller.rb
@@ -28,7 +28,7 @@ class Api::V1::Widget::ConversationsController < Api::V1::Widget::BaseController
 
     conversation.contact_last_seen_at = DateTime.now.utc
     conversation.save!
-    ::Conversations::MarkMessagesAsReadJob.perform_later(conversation)
+    ::Conversations::MarkMessagesAsReadJob.perform_later(conversation.id, conversation.contact_last_seen_at)
     head :ok
   end
 
diff --git a/app/controllers/public/api/v1/inboxes/conversations_controller.rb b/app/controllers/public/api/v1/inboxes/conversations_controller.rb
index 1e20b2a1d..3242942f4 100644
--- a/app/controllers/public/api/v1/inboxes/conversations_controller.rb
+++ b/app/controllers/public/api/v1/inboxes/conversations_controller.rb
@@ -23,7 +23,7 @@ class Public::Api::V1::Inboxes::ConversationsController < Public::Api::V1::Inbox
   def update_last_seen
     @conversation.contact_last_seen_at = DateTime.now.utc
     @conversation.save!
-    ::Conversations::MarkMessagesAsReadJob.perform_later(@conversation)
+    ::Conversations::MarkMessagesAsReadJob.perform_later(@conversation.id, @conversation.contact_last_seen_at)
     head :ok
   end
 
diff --git a/app/jobs/conversations/mark_messages_as_read_job.rb b/app/jobs/conversations/mark_messages_as_read_job.rb
index ce828521f..212b8569f 100644
--- a/app/jobs/conversations/mark_messages_as_read_job.rb
+++ b/app/jobs/conversations/mark_messages_as_read_job.rb
@@ -1,12 +1,15 @@
 class Conversations::MarkMessagesAsReadJob < ApplicationJob
   queue_as :low
 
-  def perform(conversation)
+  def perform(conversation_id, timestamp)
+    conversation = Conversation.find_by(id: conversation_id)
+
+    return unless conversation
+
     # Mark every message created before the user's viewing time as read.
     conversation.messages.where(status: %w[sent delivered])
                 .where.not(message_type: 'incoming')
-                .where('created_at <= ?',
-                       conversation.contact_last_seen_at).find_each do |message|
+                .where('messages.created_at <= ?', timestamp).find_each do |message|
       message.update!(status: 'read')
     end
   end
diff --git a/app/services/instagram/read_status_service.rb b/app/services/instagram/read_status_service.rb
index 80f67d680..41ef7246a 100644
--- a/app/services/instagram/read_status_service.rb
+++ b/app/services/instagram/read_status_service.rb
@@ -4,12 +4,7 @@ class Instagram::ReadStatusService
   def perform
     return if instagram_channel.blank?
 
-    process_status if message.present?
-  end
-
-  def process_status
-    @message.status = 'read'
-    @message.save!
+    ::Conversations::MarkMessagesAsReadJob.perform_later(message.conversation.id, message.created_at) if message.present?
   end
 
   def instagram_id
diff --git a/spec/controllers/api/v1/widget/conversations_controller_spec.rb b/spec/controllers/api/v1/widget/conversations_controller_spec.rb
index 26e525d3a..15bfb6855 100644
--- a/spec/controllers/api/v1/widget/conversations_controller_spec.rb
+++ b/spec/controllers/api/v1/widget/conversations_controller_spec.rb
@@ -168,9 +168,12 @@ RSpec.describe '/api/v1/widget/conversations/toggle_typing', type: :request do
   describe 'POST /api/v1/widget/conversations/update_last_seen' do
     context 'with a conversation' do
       it 'returns the correct conversation params' do
+        current_time = DateTime.now.utc
+        allow(DateTime).to receive(:now).and_return(current_time)
+
         allow(Rails.configuration.dispatcher).to receive(:dispatch)
         expect(conversation.contact_last_seen_at).to be_nil
-        expect(Conversations::MarkMessagesAsReadJob).to receive(:perform_later).with(conversation)
+        expect(Conversations::MarkMessagesAsReadJob).to receive(:perform_later).with(conversation.id, current_time)
 
         post '/api/v1/widget/conversations/update_last_seen',
              headers: { 'X-Auth-Token' => token },
diff --git a/spec/controllers/public/api/v1/inbox/conversations_controller_spec.rb b/spec/controllers/public/api/v1/inbox/conversations_controller_spec.rb
index 3001263bf..7e1779b4a 100644
--- a/spec/controllers/public/api/v1/inbox/conversations_controller_spec.rb
+++ b/spec/controllers/public/api/v1/inbox/conversations_controller_spec.rb
@@ -80,8 +80,10 @@ RSpec.describe 'Public Inbox Contact Conversations API', type: :request do
     end
 
     it 'updates the last seen of the conversation contact' do
+      current_time = DateTime.now.utc
+      allow(DateTime).to receive(:now).and_return(current_time)
       contact_last_seen_at = conversation.contact_last_seen_at
-      expect(Conversations::MarkMessagesAsReadJob).to receive(:perform_later).with(conversation)
+      expect(Conversations::MarkMessagesAsReadJob).to receive(:perform_later).with(conversation.id, current_time)
       post update_last_seen_path
 
       expect(response).to have_http_status(:success)
diff --git a/spec/jobs/conversations/mark_messages_as_read_job_spec.rb b/spec/jobs/conversations/mark_messages_as_read_job_spec.rb
index 18ddb41f5..e4eff0f0a 100644
--- a/spec/jobs/conversations/mark_messages_as_read_job_spec.rb
+++ b/spec/jobs/conversations/mark_messages_as_read_job_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Conversations::MarkMessagesAsReadJob do
   context 'when called' do
     it 'marks all sent messages in a conversation as read' do
       expect do
-        described_class.perform_now(conversation)
+        described_class.perform_now(conversation.id, conversation.contact_last_seen_at)
         message.reload
       end.to change(message, :status).from('sent').to('read')
     end
@@ -24,7 +24,7 @@ RSpec.describe Conversations::MarkMessagesAsReadJob do
     it 'marks all delivered messages in a conversation as read' do
       message.update!(status: 'delivered')
       expect do
-        described_class.perform_now(conversation)
+        described_class.perform_now(conversation.id, conversation.contact_last_seen_at)
         message.reload
       end.to change(message, :status).from('delivered').to('read')
     end
@@ -32,7 +32,7 @@ RSpec.describe Conversations::MarkMessagesAsReadJob do
     it 'marks all templates messages in a conversation as read' do
       message.update!(status: 'delivered', message_type: 'template')
       expect do
-        described_class.perform_now(conversation)
+        described_class.perform_now(conversation.id, conversation.contact_last_seen_at)
         message.reload
       end.to change(message, :status).from('delivered').to('read')
     end
@@ -40,21 +40,27 @@ RSpec.describe Conversations::MarkMessagesAsReadJob do
     it 'does not mark failed messages as read' do
       message.update!(status: 'failed')
       expect do
-        described_class.perform_now(conversation)
+        described_class.perform_now(conversation.id, conversation.contact_last_seen_at)
       end.not_to change(message.reload, :status)
     end
 
     it 'does not mark incoming messages as read' do
       message.update!(message_type: 'incoming')
       expect do
-        described_class.perform_now(conversation)
+        described_class.perform_now(conversation.id, conversation.contact_last_seen_at)
       end.not_to change(message.reload, :status)
     end
 
     it 'does not mark messages created after the contact last seen time as read' do
       message.update!(created_at: DateTime.now.utc)
       expect do
-        described_class.perform_now(conversation)
+        described_class.perform_now(conversation.id, conversation.contact_last_seen_at)
+      end.not_to change(message.reload, :status)
+    end
+
+    it 'does not run the job if the conversation does not exist' do
+      expect do
+        described_class.perform_now(1212, conversation.contact_last_seen_at)
       end.not_to change(message.reload, :status)
     end
   end
diff --git a/spec/services/instagram/read_status_service_spec.rb b/spec/services/instagram/read_status_service_spec.rb
index db5dc73b3..669fcd4f9 100644
--- a/spec/services/instagram/read_status_service_spec.rb
+++ b/spec/services/instagram/read_status_service_spec.rb
@@ -17,7 +17,11 @@ describe Instagram::ReadStatusService do
     context 'when messaging_seen callback is fired' do
       let(:message) { conversation.messages.last }
 
-      it 'updates the message status to read if the status is delivered' do
+      before do
+        allow(Conversations::MarkMessagesAsReadJob).to receive(:perform_later)
+      end
+
+      it 'enqueues the MarkMessagesAsReadJob with correct parameters if the message is found' do
         params = {
           recipient: {
             id: 'chatwoot-app-user-id-1'
@@ -27,10 +31,10 @@ describe Instagram::ReadStatusService do
           }
         }
         described_class.new(params: params).perform
-        expect(conversation.reload.messages.last.status).to eq('read')
+        expect(Conversations::MarkMessagesAsReadJob).to have_received(:perform_later).with(conversation.id, message.created_at)
       end
 
-      it 'does not update the status if message is not found' do
+      it 'does not enqueue the MarkMessagesAsReadJob if the message is not found' do
         params = {
           recipient: {
             id: 'chatwoot-app-user-id-1'
@@ -39,9 +43,8 @@ describe Instagram::ReadStatusService do
             mid: 'random-message-id'
           }
         }
-
         described_class.new(params: params).perform
-        expect(conversation.reload.messages.last.status).not_to eq('read')
+        expect(Conversations::MarkMessagesAsReadJob).not_to have_received(:perform_later)
       end
     end
   end

From 394fece84685a8f3caea76c14b3219c22ddf65ce Mon Sep 17 00:00:00 2001
From: Will Kramer <will@openfail.dev>
Date: Fri, 27 Oct 2023 19:06:27 -0400
Subject: [PATCH 30/94] docs: Update .env.example for clearer inbound Postmark
 instructions (#8235)

Updated the .env.example file to provide clearer instructions for setting up the Postmark inbound webhook. Many users, including myself, found the initial instructions ambiguous, leading to difficulties during setup. This change aims to simplify the process for future users by providing clearer instructions and examples.

Fixes: #8234
---
 .env.example | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/.env.example b/.env.example
index f85607fb9..27d41685e 100644
--- a/.env.example
+++ b/.env.example
@@ -81,7 +81,7 @@ SMTP_OPENSSL_VERIFY_MODE=peer
 # Mail Incoming
 # This is the domain set for the reply emails when conversation continuity is enabled
 MAILER_INBOUND_EMAIL_DOMAIN=
-# Set this to appropriate ingress channel with regards to incoming emails
+# Set this to the appropriate ingress channel with regards to incoming emails
 # Possible values are :
 # relay for Exim, Postfix, Qmail
 # mailgun for Mailgun
@@ -91,10 +91,20 @@ MAILER_INBOUND_EMAIL_DOMAIN=
 RAILS_INBOUND_EMAIL_SERVICE=
 # Use one of the following based on the email ingress service
 # Ref: https://edgeguides.rubyonrails.org/action_mailbox_basics.html
+# Set this to a password of your choice and use it in the Inbound webhook
 RAILS_INBOUND_EMAIL_PASSWORD=
+
 MAILGUN_INGRESS_SIGNING_KEY=
 MANDRILL_INGRESS_API_KEY=
 
+# Creating Your Inbound Webhook Instructions for Postmark and Sendgrid:
+# Inbound webhook URL format:
+#    https://actionmailbox:[YOUR_RAILS_INBOUND_EMAIL_PASSWORD]@[YOUR_CHATWOOT_DOMAIN.COM]/rails/action_mailbox/[RAILS_INBOUND_EMAIL_SERVICE]/inbound_emails
+# Note: Replace the values inside the brackets; do not include the brackets themselves.
+# Example: https://actionmailbox:mYRandomPassword3@chatwoot.example.com/rails/action_mailbox/postmark/inbound_emails
+# For Postmark
+# Ensure the 'Include raw email content in JSON payload' checkbox is selected in the inbound webhook section.
+
 # Storage
 ACTIVE_STORAGE_SERVICE=local
 

From 63e702ca1251d9cc8479e61a29970abe3d00e43d Mon Sep 17 00:00:00 2001
From: Liam <43280985+LiamAshdown@users.noreply.github.com>
Date: Mon, 30 Oct 2023 07:22:26 +0000
Subject: [PATCH 31/94] =?UTF-8?q?fix:=20Fix=20an=20issue=20where=20Chat=20?=
 =?UTF-8?q?Widget=20Unread=20Message=20is=20not=20correctly=20d=E2=80=A6?=
 =?UTF-8?q?=20(#8245)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/javascript/widget/components/UnreadMessage.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/widget/components/UnreadMessage.vue b/app/javascript/widget/components/UnreadMessage.vue
index 0d9219562..19e757973 100644
--- a/app/javascript/widget/components/UnreadMessage.vue
+++ b/app/javascript/widget/components/UnreadMessage.vue
@@ -12,8 +12,8 @@
           :username="agentName"
           :status="availabilityStatus"
         />
-        <span class="agent--name">{{ agentName }}</span>
-        <span class="company--name"> {{ companyName }}</span>
+        <span v-dompurify-html="agentName" class="agent--name" />
+        <span v-dompurify-html="companyName" class="company--name" />
       </div>
       <div
         v-dompurify-html="formatMessage(message, false)"

From dfba4770bdcc151ac960fc92a490ee6b42cb3f70 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Mon, 30 Oct 2023 15:25:21 +0530
Subject: [PATCH 32/94] feat: Save sort Conversations filter (#8237)

---
 .../dashboard/components/ChatList.vue          | 11 +++++++++++
 .../conversation/ConversationBasicFilter.vue   | 18 ++++++++++++++----
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/app/javascript/dashboard/components/ChatList.vue b/app/javascript/dashboard/components/ChatList.vue
index b90ee30f6..a77e68465 100644
--- a/app/javascript/dashboard/components/ChatList.vue
+++ b/app/javascript/dashboard/components/ChatList.vue
@@ -207,6 +207,7 @@ import DeleteCustomViews from 'dashboard/routes/dashboard/customviews/DeleteCust
 import ConversationBulkActions from './widgets/conversation/conversationBulkActions/Index.vue';
 import alertMixin from 'shared/mixins/alertMixin';
 import filterMixin from 'shared/mixins/filterMixin';
+import uiSettingsMixin from 'dashboard/mixins/uiSettings';
 import languages from 'dashboard/components/widgets/conversation/advancedFilterItems/languages';
 import countries from 'shared/constants/countries';
 import { generateValuesForEditCustomViews } from 'dashboard/helper/customViewsHelper';
@@ -238,6 +239,7 @@ export default {
     eventListenerMixins,
     alertMixin,
     filterMixin,
+    uiSettingsMixin,
   ],
   props: {
     conversationInbox: {
@@ -514,6 +516,9 @@ export default {
       this.chatsOnView = this.conversationList;
     },
   },
+  created() {
+    this.setFiltersFromUISettings();
+  },
   mounted() {
     this.$store.dispatch('setChatStatusFilter', this.activeStatus);
     this.$store.dispatch('setChatSortFilter', this.activeSortBy);
@@ -544,6 +549,12 @@ export default {
       this.$store.dispatch('customViews/update', payloadData);
       this.closeAdvanceFiltersModal();
     },
+    setFiltersFromUISettings() {
+      const { status, order_by: orderBy } =
+        this.uiSettings.conversations_filter_by;
+      this.activeStatus = status || wootConstants.STATUS_TYPE.OPEN;
+      this.activeSortBy = orderBy || wootConstants.SORT_BY_TYPE.LATEST;
+    },
     onClickOpenAddFoldersModal() {
       this.showAddFoldersModal = true;
     },
diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationBasicFilter.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationBasicFilter.vue
index ab7d577ac..01a6bb442 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationBasicFilter.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationBasicFilter.vue
@@ -32,7 +32,7 @@
         }}</span>
         <filter-item
           type="sort"
-          :selected-value="chatSortFilter"
+          :selected-value="sortFilter"
           :items="chatSortItems"
           path-prefix="CHAT_LIST.CHAT_SORT_FILTER_ITEMS"
           @onChangeFilter="onChangeFilter"
@@ -47,12 +47,13 @@ import wootConstants from 'dashboard/constants/globals';
 import { mapGetters } from 'vuex';
 import { mixin as clickaway } from 'vue-clickaway';
 import FilterItem from './FilterItem.vue';
+import uiSettingsMixin from 'dashboard/mixins/uiSettings';
 
 export default {
   components: {
     FilterItem,
   },
-  mixins: [clickaway],
+  mixins: [clickaway, uiSettingsMixin],
   data() {
     return {
       showActionsDropdown: false,
@@ -83,8 +84,17 @@ export default {
     closeDropdown() {
       this.showActionsDropdown = false;
     },
-    onChangeFilter(type, value) {
-      this.$emit('changeFilter', type, value);
+    onChangeFilter(value, type) {
+      this.$emit('changeFilter', value, type);
+      this.saveSelectedFilter(type, value);
+    },
+    saveSelectedFilter(type, value) {
+      this.updateUISettings({
+        conversations_filter_by: {
+          status: type === 'status' ? value : this.chatStatus,
+          order_by: type === 'sort' ? value : this.sortFilter,
+        },
+      });
     },
   },
 };

From 2ba81830f327061abf2122264c077ed81648f95a Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Mon, 30 Oct 2023 11:16:14 -0700
Subject: [PATCH 33/94] fix: Update Instagram story rendering (#8240)

---
 .../widgets/conversation/Message.vue          | 84 +++++++------------
 .../widgets/conversation/MessagesView.vue     |  6 --
 .../widgets/conversation/bubble/Actions.vue   |  4 -
 .../widgets/conversation/bubble/Image.vue     |  5 +-
 .../conversation/bubble/ImageAudioVideo.vue   |  5 +-
 .../conversation/bubble/InstagramStory.vue    | 51 +++++++++++
 .../bubble/InstagramStoryErrorPlaceHolder.vue | 14 ++++
 .../bubble/InstagramStoryReply.vue            | 35 ++++++++
 .../widgets/conversation/bubble/Video.vue     |  9 +-
 .../instagramImageErrorPlaceholder.vue        | 26 ------
 10 files changed, 140 insertions(+), 99 deletions(-)
 create mode 100644 app/javascript/dashboard/components/widgets/conversation/bubble/InstagramStory.vue
 create mode 100644 app/javascript/dashboard/components/widgets/conversation/bubble/InstagramStoryErrorPlaceHolder.vue
 create mode 100644 app/javascript/dashboard/components/widgets/conversation/bubble/InstagramStoryReply.vue
 delete mode 100644 app/javascript/dashboard/components/widgets/conversation/instagramImageErrorPlaceholder.vue

diff --git a/app/javascript/dashboard/components/widgets/conversation/Message.vue b/app/javascript/dashboard/components/widgets/conversation/Message.vue
index 363003982..e0027850b 100644
--- a/app/javascript/dashboard/components/widgets/conversation/Message.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/Message.vue
@@ -22,18 +22,7 @@
           :bcc="emailHeadAttributes.bcc"
           :is-incoming="isIncoming"
         />
-        <blockquote v-if="storyReply" class="story-reply-quote">
-          <span>{{ $t('CONVERSATION.REPLIED_TO_STORY') }}</span>
-          <bubble-image
-            v-if="!hasImgStoryError && storyUrl"
-            :url="storyUrl"
-            @error="onStoryLoadError"
-          />
-          <bubble-video
-            v-else-if="hasImgStoryError && storyUrl"
-            :url="storyUrl"
-          />
-        </blockquote>
+        <instagram-story-reply v-if="storyUrl" :story-url="storyUrl" />
         <bubble-reply-to
           v-if="inReplyToMessageId && inboxSupportsReplyTo"
           :message="inReplyTo"
@@ -59,10 +48,15 @@
         </span>
         <div v-if="!isPending && hasAttachments">
           <div v-for="attachment in attachments" :key="attachment.id">
+            <instagram-story
+              v-if="isAnInstagramStory"
+              :story-url="attachment.data_url"
+              @error="onMediaLoadError"
+            />
             <bubble-image-audio-video
-              v-if="isAttachmentImageVideoAudio(attachment.file_type)"
+              v-else-if="isAttachmentImageVideoAudio(attachment.file_type)"
               :attachment="attachment"
-              @error="onImageLoadError"
+              @error="onMediaLoadError"
             />
             <bubble-location
               v-else-if="attachment.file_type === 'location'"
@@ -75,9 +69,6 @@
               :name="data.content"
               :phone-number="attachment.fallback_title"
             />
-            <instagram-image-error-placeholder
-              v-else-if="hasImageError && hasInstagramStory"
-            />
             <bubble-file v-else :url="attachment.data_url" />
           </div>
         </div>
@@ -89,7 +80,6 @@
           :story-id="`${storyId}`"
           :is-a-tweet="isATweet"
           :is-a-whatsapp-channel="isAWhatsAppChannel"
-          :has-instagram-story="hasInstagramStory"
           :is-email="isEmailContentType"
           :is-private="data.private"
           :message-type="data.message_type"
@@ -138,19 +128,18 @@
 <script>
 import messageFormatterMixin from 'shared/mixins/messageFormatterMixin';
 import BubbleActions from './bubble/Actions.vue';
+import BubbleContact from './bubble/Contact.vue';
 import BubbleFile from './bubble/File.vue';
-import BubbleImage from './bubble/Image.vue';
-import BubbleVideo from './bubble/Video.vue';
 import BubbleImageAudioVideo from './bubble/ImageAudioVideo.vue';
 import BubbleIntegration from './bubble/Integration.vue';
 import BubbleLocation from './bubble/Location.vue';
 import BubbleMailHead from './bubble/MailHead.vue';
-import BubbleText from './bubble/Text.vue';
-import BubbleContact from './bubble/Contact.vue';
 import BubbleReplyTo from './bubble/ReplyTo.vue';
-import Spinner from 'shared/components/Spinner.vue';
+import BubbleText from './bubble/Text.vue';
 import ContextMenu from 'dashboard/modules/conversations/components/MessageContextMenu.vue';
-import instagramImageErrorPlaceholder from './instagramImageErrorPlaceholder.vue';
+import InstagramStory from './bubble/InstagramStory.vue';
+import InstagramStoryReply from './bubble/InstagramStoryReply.vue';
+import Spinner from 'shared/components/Spinner.vue';
 import alertMixin from 'shared/mixins/alertMixin';
 import contentTypeMixin from 'shared/mixins/contentTypeMixin';
 import { MESSAGE_TYPE, MESSAGE_STATUS } from 'shared/constants/messages';
@@ -163,19 +152,18 @@ import { LocalStorage } from 'shared/helpers/localStorage';
 export default {
   components: {
     BubbleActions,
+    BubbleContact,
     BubbleFile,
-    BubbleImage,
-    BubbleVideo,
     BubbleImageAudioVideo,
     BubbleIntegration,
     BubbleLocation,
     BubbleMailHead,
-    BubbleText,
-    BubbleContact,
     BubbleReplyTo,
+    BubbleText,
     ContextMenu,
+    InstagramStory,
+    InstagramStoryReply,
     Spinner,
-    instagramImageErrorPlaceholder,
   },
   mixins: [alertMixin, messageFormatterMixin, contentTypeMixin],
   props: {
@@ -191,10 +179,6 @@ export default {
       type: Boolean,
       default: false,
     },
-    hasInstagramStory: {
-      type: Boolean,
-      default: false,
-    },
     isWebWidgetInbox: {
       type: Boolean,
       default: false,
@@ -211,10 +195,9 @@ export default {
   data() {
     return {
       showContextMenu: false,
-      hasImageError: false,
+      hasMediaLoadError: false,
       contextMenuPosition: {},
       showBackgroundHighlight: false,
-      hasImgStoryError: false,
     };
   },
   computed: {
@@ -290,6 +273,9 @@ export default {
       // since old messages are only loaded when the user scrolls up
       return this.data.content_attributes?.in_reply_to;
     },
+    isAnInstagramStory() {
+      return this.contentAttributes.image_type === 'story_mention';
+    },
     contextMenuEnabledOptions() {
       return {
         copy: this.hasText,
@@ -302,7 +288,7 @@ export default {
       return this.data.content_attributes || {};
     },
     externalError() {
-      return this.contentAttributes.external_error || null;
+      return this.contentAttributes.external_error || '';
     },
     sender() {
       return this.data.sender || {};
@@ -319,9 +305,6 @@ export default {
     storyUrl() {
       return this.contentAttributes.story_url || null;
     },
-    storyReply() {
-      return this.storyUrl && this.hasInstagramStory;
-    },
     contentType() {
       const {
         data: { content_type: contentType },
@@ -402,7 +385,7 @@ export default {
         return false;
       }
       if (this.isFailed) {
-        return this.externalError ? '' : this.$t(`CONVERSATION.SEND_FAILED`);
+        return this.externalError || this.$t(`CONVERSATION.SEND_FAILED`);
       }
       return false;
     },
@@ -460,13 +443,11 @@ export default {
   },
   watch: {
     data() {
-      this.hasImageError = false;
-      this.hasImgStoryError = false;
+      this.hasMediaLoadError = false;
     },
   },
   mounted() {
-    this.hasImageError = false;
-    this.hasImgStoryError = false;
+    this.hasMediaLoadError = false;
     bus.$on(BUS_EVENTS.ON_MESSAGE_LIST_SCROLL, this.closeContextMenu);
     this.setupHighlightTimer();
   },
@@ -476,13 +457,13 @@ export default {
   },
   methods: {
     isAttachmentImageVideoAudio(fileType) {
-      return ['image', 'audio', 'video'].includes(fileType);
+      return ['image', 'audio', 'video', 'story_mention'].includes(fileType);
     },
     hasMediaAttachment(type) {
       if (this.hasAttachments && this.data.attachments.length > 0) {
         const { attachments = [{}] } = this.data;
         const { file_type: fileType } = attachments[0];
-        return fileType === type && !this.hasImageError;
+        return fileType === type && !this.hasMediaLoadError;
       }
       if (this.storyReply) {
         return true;
@@ -495,11 +476,8 @@ export default {
     async retrySendMessage() {
       await this.$store.dispatch('sendMessageWithData', this.data);
     },
-    onImageLoadError() {
-      this.hasImageError = true;
-    },
-    onStoryLoadError() {
-      this.hasImgStoryError = true;
+    onMediaLoadError() {
+      this.hasMediaLoadError = true;
     },
     openContextMenu(e) {
       const shouldSkipContextMenu =
@@ -731,8 +709,4 @@ li.right {
     }
   }
 }
-
-.story-reply-quote {
-  @apply mt-2 mx-4 mb-0 px-2 pb-0 pt-2 border-l-4 border-solid border-slate-75 dark:border-slate-600 text-slate-600 dark:text-slate-200;
-}
 </style>
diff --git a/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue b/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
index 10d28d108..a1dc9b814 100644
--- a/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
@@ -31,7 +31,6 @@
         :data="message"
         :is-a-tweet="isATweet"
         :is-a-whatsapp-channel="isAWhatsAppChannel"
-        :has-instagram-story="hasInstagramStory"
         :is-web-widget-inbox="isAWebWidgetInbox"
         :inbox-supports-reply-to="inboxSupportsReplyTo"
         :in-reply-to="getInReplyToMessage(message)"
@@ -54,7 +53,6 @@
         :data="message"
         :is-a-tweet="isATweet"
         :is-a-whatsapp-channel="isAWhatsAppChannel"
-        :has-instagram-story="hasInstagramStory"
         :is-web-widget-inbox="isAWebWidgetInbox"
         :inbox-supports-reply-to="inboxSupportsReplyTo"
         :in-reply-to="getInReplyToMessage(message)"
@@ -238,10 +236,6 @@ export default {
     isATweet() {
       return this.conversationType === 'tweet';
     },
-
-    hasInstagramStory() {
-      return this.conversationType === 'instagram_direct_message';
-    },
     isRightOrLeftIcon() {
       if (this.isContactPanelOpen) {
         return 'arrow-chevron-right';
diff --git a/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue b/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue
index e0a63d81a..f41bff005 100644
--- a/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue
@@ -114,10 +114,6 @@ export default {
       type: Boolean,
       default: true,
     },
-    hasInstagramStory: {
-      type: Boolean,
-      default: true,
-    },
     messageType: {
       type: Number,
       default: 1,
diff --git a/app/javascript/dashboard/components/widgets/conversation/bubble/Image.vue b/app/javascript/dashboard/components/widgets/conversation/bubble/Image.vue
index 75042298a..d763d6bec 100644
--- a/app/javascript/dashboard/components/widgets/conversation/bubble/Image.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/bubble/Image.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="image message-text__wrap">
-    <img :src="url" @click="onClick" @error="onImgError()" />
+    <img :src="url" @click="onClick" @error="$emit('error')" />
     <woot-modal :full-width="true" :show.sync="show" :on-close="onClose">
       <img :src="url" class="modal-image skip-context-menu" />
     </woot-modal>
@@ -28,9 +28,6 @@ export default {
     onClick() {
       this.show = true;
     },
-    onImgError() {
-      this.$emit('error');
-    },
   },
 };
 </script>
diff --git a/app/javascript/dashboard/components/widgets/conversation/bubble/ImageAudioVideo.vue b/app/javascript/dashboard/components/widgets/conversation/bubble/ImageAudioVideo.vue
index 921d83b2c..22ea61405 100644
--- a/app/javascript/dashboard/components/widgets/conversation/bubble/ImageAudioVideo.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/bubble/ImageAudioVideo.vue
@@ -4,13 +4,14 @@
       v-if="isImage && !isImageError"
       :src="attachment.data_url"
       @click="onClick"
-      @error="onImgError()"
+      @error="onImgError"
     />
     <video
       v-if="isVideo"
       :src="attachment.data_url"
       muted
       playsInline
+      @error="onImgError"
       @click="onClick"
     />
     <audio v-else-if="isAudio" controls class="skip-context-menu">
@@ -21,7 +22,7 @@
       :show.sync="show"
       :attachment="attachment"
       :all-attachments="filteredCurrentChatAttachments"
-      @error="onImgError()"
+      @error="onImgError"
       @close="onClose"
     />
   </div>
diff --git a/app/javascript/dashboard/components/widgets/conversation/bubble/InstagramStory.vue b/app/javascript/dashboard/components/widgets/conversation/bubble/InstagramStory.vue
new file mode 100644
index 000000000..8716d9ac9
--- /dev/null
+++ b/app/javascript/dashboard/components/widgets/conversation/bubble/InstagramStory.vue
@@ -0,0 +1,51 @@
+<template>
+  <bubble-image
+    v-if="!hasImgStoryError"
+    :url="storyUrl"
+    @error="onImageLoadError"
+  />
+  <bubble-video
+    v-else-if="!hasVideoStoryError"
+    :url="storyUrl"
+    @error="onVideoLoadError"
+  />
+  <instagram-story-error-place-holder v-else />
+</template>
+<script>
+import BubbleImage from './Image.vue';
+import BubbleVideo from './Video.vue';
+import InstagramStoryErrorPlaceHolder from './InstagramStoryErrorPlaceHolder.vue';
+
+export default {
+  components: {
+    BubbleImage,
+    BubbleVideo,
+    InstagramStoryErrorPlaceHolder,
+  },
+  props: {
+    storyUrl: {
+      type: String,
+      default: '',
+    },
+  },
+  data() {
+    return {
+      hasImgStoryError: false,
+      hasVideoStoryError: false,
+    };
+  },
+  methods: {
+    onImageLoadError() {
+      this.hasImgStoryError = true;
+      this.emitError();
+    },
+    onVideoLoadError() {
+      this.hasVideoStoryError = true;
+      this.emitError();
+    },
+    emitError() {
+      this.$emit('error');
+    },
+  },
+};
+</script>
diff --git a/app/javascript/dashboard/components/widgets/conversation/bubble/InstagramStoryErrorPlaceHolder.vue b/app/javascript/dashboard/components/widgets/conversation/bubble/InstagramStoryErrorPlaceHolder.vue
new file mode 100644
index 000000000..db70afac5
--- /dev/null
+++ b/app/javascript/dashboard/components/widgets/conversation/bubble/InstagramStoryErrorPlaceHolder.vue
@@ -0,0 +1,14 @@
+<template>
+  <div
+    class="flex items-center justify-center px-8 h-28 w-full bg-slate-100 text-slate-700 dark:bg-slate-500 dark:text-slate-75"
+  >
+    <fluent-icon icon="document-error" size="32" />
+    <p class="mb-0 text-slate-700 dark:text-slate-75">
+      {{ $t('COMPONENTS.FILE_BUBBLE.INSTAGRAM_STORY_UNAVAILABLE') }}
+    </p>
+  </div>
+</template>
+
+<script>
+export default {};
+</script>
diff --git a/app/javascript/dashboard/components/widgets/conversation/bubble/InstagramStoryReply.vue b/app/javascript/dashboard/components/widgets/conversation/bubble/InstagramStoryReply.vue
new file mode 100644
index 000000000..baa41d81c
--- /dev/null
+++ b/app/javascript/dashboard/components/widgets/conversation/bubble/InstagramStoryReply.vue
@@ -0,0 +1,35 @@
+<template>
+  <blockquote
+    class="my-0 px-2 pb-0 pt-0 border-l-4 border-solid border-slate-75 dark:border-slate-600 text-slate-600 dark:text-slate-200"
+  >
+    <span>{{ $t('CONVERSATION.REPLIED_TO_STORY') }}</span>
+    <instagram-story :story-url="storyUrl" class="mt-3 rounded-md" />
+  </blockquote>
+</template>
+<script>
+import InstagramStory from './InstagramStory.vue';
+
+export default {
+  components: { InstagramStory },
+  props: {
+    storyUrl: {
+      type: String,
+      default: '',
+    },
+  },
+  data() {
+    return {
+      hasImgStoryError: false,
+      hasVideoStoryError: false,
+    };
+  },
+  methods: {
+    onImageLoadError() {
+      this.hasImgStoryError = true;
+    },
+    onVideoLoadError() {
+      this.hasVideoStoryError = true;
+    },
+  },
+};
+</script>
diff --git a/app/javascript/dashboard/components/widgets/conversation/bubble/Video.vue b/app/javascript/dashboard/components/widgets/conversation/bubble/Video.vue
index 84b068215..6ff96bb5b 100644
--- a/app/javascript/dashboard/components/widgets/conversation/bubble/Video.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/bubble/Video.vue
@@ -1,12 +1,12 @@
 <template>
   <div class="video message-text__wrap">
-    <video :src="url" muted playsInline @click="onClick" />
+    <video ref="videoElement" :src="url" muted playsInline @click="onClick" />
     <woot-modal :show.sync="show" :on-close="onClose">
       <video
         :src="url"
         controls
         playsInline
-        class="modal-video skip-context-menu"
+        class="modal-video skip-context-menu mx-auto"
       />
     </woot-modal>
   </div>
@@ -25,6 +25,11 @@ export default {
       show: false,
     };
   },
+  mounted() {
+    this.$refs.videoElement.onerror = () => {
+      this.$emit('error');
+    };
+  },
   methods: {
     onClose() {
       this.show = false;
diff --git a/app/javascript/dashboard/components/widgets/conversation/instagramImageErrorPlaceholder.vue b/app/javascript/dashboard/components/widgets/conversation/instagramImageErrorPlaceholder.vue
deleted file mode 100644
index 0a809cd21..000000000
--- a/app/javascript/dashboard/components/widgets/conversation/instagramImageErrorPlaceholder.vue
+++ /dev/null
@@ -1,26 +0,0 @@
-<template>
-  <div class="image-placeholder">
-    <fluent-icon icon="document-error" size="32" />
-    <p>{{ $t('COMPONENTS.FILE_BUBBLE.INSTAGRAM_STORY_UNAVAILABLE') }}</p>
-  </div>
-</template>
-
-<script>
-export default {};
-</script>
-
-<style scoped>
-.image-placeholder {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  flex-direction: column;
-  padding: var(--space-slab);
-  height: calc(var(--space-large) * 10);
-  margin-top: var(--space-one);
-  width: 100%;
-  background-color: var(--s-75);
-  color: var(--s-800);
-  border-radius: var(--border-radius-normal);
-}
-</style>

From 013dab7da6f3b3df33ba6ebd0b77659c82780600 Mon Sep 17 00:00:00 2001
From: Liam <43280985+LiamAshdown@users.noreply.github.com>
Date: Mon, 30 Oct 2023 18:48:16 +0000
Subject: [PATCH 34/94] fix: Add support for dark mode for the calendars (date
 and time picker). (#8250)

Co-authored-by: Liam Ashdown <liam.ashdown@debbiesvillas.co.uk>
---
 .../dashboard/assets/scss/_date-picker.scss   | 70 ++++++++++++-------
 1 file changed, 44 insertions(+), 26 deletions(-)

diff --git a/app/javascript/dashboard/assets/scss/_date-picker.scss b/app/javascript/dashboard/assets/scss/_date-picker.scss
index 920fb8fa2..2132d5fd5 100644
--- a/app/javascript/dashboard/assets/scss/_date-picker.scss
+++ b/app/javascript/dashboard/assets/scss/_date-picker.scss
@@ -1,9 +1,5 @@
 @import '~vue2-datepicker/scss/index';
 
-.mx-datepicker-popup {
-  @apply z-[99999];
-}
-
 .date-picker {
   &.no-margin {
     .mx-input {
@@ -29,10 +25,52 @@
   .mx-input[readonly] {
     @apply bg-white dark:bg-slate-900 cursor-pointer;
   }
+
+  .mx-icon-calendar {
+    @apply dark:text-slate-500;
+  }
 }
 
-.mx-calendar-content .cell:hover {
-  @apply bg-slate-75 dark:bg-slate-700 text-slate-900 dark:text-slate-100;
+.mx-datepicker-main {
+  @apply border-0 bg-white dark:bg-slate-800;
+
+  .cell {
+    &.disabled {
+      @apply bg-slate-25 dark:bg-slate-900 text-slate-200 dark:text-slate-300;
+    }
+
+    &:hover,
+    &.hover-in-range,
+    &.in-range {
+      @apply bg-slate-75 dark:bg-slate-700 text-slate-900 dark:text-slate-100;
+    }
+  }
+
+  .mx-time {
+    @apply border-0 bg-white dark:bg-slate-800;
+
+    .mx-time-header {
+      @apply border-0;
+    }
+
+    .mx-time-item {
+      &.disabled {
+        @apply bg-slate-25 dark:bg-slate-900;
+      }
+
+      &:hover {
+        @apply bg-slate-75 dark:bg-slate-700;
+      }
+    }
+  }
+
+  .today {
+    @apply font-semibold;
+  }
+}
+
+.mx-datepicker-popup {
+  @apply z-[99999];
 }
 
 .mx-datepicker-inline {
@@ -41,24 +79,4 @@
   .mx-calendar {
     @apply w-full;
   }
-
-  .cell.disabled {
-    @apply bg-slate-25 dark:bg-slate-900 text-slate-200 dark:text-slate-300;
-  }
-
-  .mx-time-item.disabled {
-    @apply bg-slate-25 dark:bg-slate-900;
-  }
-
-  .today {
-    @apply font-semibold;
-  }
-
-  .mx-datepicker-main {
-    @apply border-0 bg-white dark:bg-slate-800;
-  }
-
-  .mx-time-header {
-    @apply border-0;
-  }
 }

From 653e0335c07000f58f8b09799c09bc1f426dd7b9 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Mon, 30 Oct 2023 13:24:03 -0700
Subject: [PATCH 35/94] fix: Handle PermissionDeniedError for Dialogflow
 processor (#8252)

---
 .../channel_notifications_mailer.rb           |  7 +++
 app/models/concerns/reauthorizable.rb         | 18 ++++++--
 app/models/inbox.rb                           |  2 +-
 app/models/integrations/hook.rb               |  4 ++
 .../dialogflow_disconnect.liquid              |  3 ++
 .../dialogflow/processor_service.rb           | 43 +++++++++++++------
 .../dialogflow/processor_service_spec.rb      |  9 +++-
 .../channel_notifications_mailer_spec.rb      | 16 +++++++
 8 files changed, 82 insertions(+), 20 deletions(-)
 create mode 100644 app/views/mailers/administrator_notifications/channel_notifications_mailer/dialogflow_disconnect.liquid

diff --git a/app/mailers/administrator_notifications/channel_notifications_mailer.rb b/app/mailers/administrator_notifications/channel_notifications_mailer.rb
index 00a3830b1..b25a6d66b 100644
--- a/app/mailers/administrator_notifications/channel_notifications_mailer.rb
+++ b/app/mailers/administrator_notifications/channel_notifications_mailer.rb
@@ -7,6 +7,13 @@ class AdministratorNotifications::ChannelNotificationsMailer < ApplicationMailer
     send_mail_with_liquid(to: admin_emails, subject: subject) and return
   end
 
+  def dialogflow_disconnect
+    return unless smtp_config_set_or_development?
+
+    subject = 'Your Dialogflow integration was disconnected'
+    send_mail_with_liquid(to: admin_emails, subject: subject) and return
+  end
+
   def facebook_disconnect(inbox)
     return unless smtp_config_set_or_development?
 
diff --git a/app/models/concerns/reauthorizable.rb b/app/models/concerns/reauthorizable.rb
index 6186dcc15..fa46d0060 100644
--- a/app/models/concerns/reauthorizable.rb
+++ b/app/models/concerns/reauthorizable.rb
@@ -39,15 +39,25 @@ module Reauthorizable
   def prompt_reauthorization!
     ::Redis::Alfred.set(reauthorization_required_key, true)
 
+    mailer = AdministratorNotifications::ChannelNotificationsMailer.with(account: account)
+
     case self.class.name
     when 'Integrations::Hook'
-      AdministratorNotifications::ChannelNotificationsMailer.with(account: account).slack_disconnect.deliver_later if slack?
+      process_integration_hook_reauthorization_emails(mailer)
     when 'Channel::FacebookPage'
-      AdministratorNotifications::ChannelNotificationsMailer.with(account: account).facebook_disconnect(inbox).deliver_later
+      mailer.facebook_disconnect(inbox).deliver_later
     when 'Channel::Whatsapp'
-      AdministratorNotifications::ChannelNotificationsMailer.with(account: account).whatsapp_disconnect(inbox).deliver_later
+      mailer.whatsapp_disconnect(inbox).deliver_later
     when 'Channel::Email'
-      AdministratorNotifications::ChannelNotificationsMailer.with(account: account).email_disconnect(inbox).deliver_later
+      mailer.email_disconnect(inbox).deliver_later
+    end
+  end
+
+  def process_integration_hook_reauthorization_emails(mailer)
+    if slack?
+      mailer.slack_disconnect.deliver_later
+    elsif dialogflow?
+      mailer.dialogflow_disconnect.deliver_later
     end
   end
 
diff --git a/app/models/inbox.rb b/app/models/inbox.rb
index 5a13b114f..311d7369b 100644
--- a/app/models/inbox.rb
+++ b/app/models/inbox.rb
@@ -129,7 +129,7 @@ class Inbox < ApplicationRecord
   end
 
   def active_bot?
-    agent_bot_inbox&.active? || hooks.pluck(:app_id).include?('dialogflow')
+    agent_bot_inbox&.active? || hooks.where(app_id: 'dialogflow', status: 'enabled').count.positive?
   end
 
   def inbox_type
diff --git a/app/models/integrations/hook.rb b/app/models/integrations/hook.rb
index 9d80b245b..076a5fce9 100644
--- a/app/models/integrations/hook.rb
+++ b/app/models/integrations/hook.rb
@@ -43,6 +43,10 @@ class Integrations::Hook < ApplicationRecord
     app_id == 'slack'
   end
 
+  def dialogflow?
+    app_id == 'dialogflow'
+  end
+
   def disable
     update(status: 'disabled')
   end
diff --git a/app/views/mailers/administrator_notifications/channel_notifications_mailer/dialogflow_disconnect.liquid b/app/views/mailers/administrator_notifications/channel_notifications_mailer/dialogflow_disconnect.liquid
new file mode 100644
index 000000000..b60db35c1
--- /dev/null
+++ b/app/views/mailers/administrator_notifications/channel_notifications_mailer/dialogflow_disconnect.liquid
@@ -0,0 +1,3 @@
+<p>Hello there,</p>
+
+<p>Your Dialogflow integration was disconnected because of permission issues. To resolve this, please delete the integration from the admin dashboard and reconnect it using new credentials.</p>
diff --git a/lib/integrations/dialogflow/processor_service.rb b/lib/integrations/dialogflow/processor_service.rb
index 3e7f1cdf6..103ef05c5 100644
--- a/lib/integrations/dialogflow/processor_service.rb
+++ b/lib/integrations/dialogflow/processor_service.rb
@@ -19,15 +19,12 @@ class Integrations::Dialogflow::ProcessorService < Integrations::BotProcessorSer
       Rails.logger.warn "Account: #{hook.try(:account_id)} Hook: #{hook.id} credentials are not present." && return
     end
 
-    ::Google::Cloud::Dialogflow::V2::Sessions::Client.configure do |config|
-      config.timeout = 10.0
-      config.credentials = hook.settings['credentials']
-    end
-
-    client = ::Google::Cloud::Dialogflow::V2::Sessions::Client.new
-    session = "projects/#{hook.settings['project_id']}/agent/sessions/#{session_id}"
-    query_input = { text: { text: message, language_code: 'en-US' } }
-    client.detect_intent session: session, query_input: query_input
+    configure_dialogflow_client_defaults
+    detect_intent(session_id, message)
+  rescue Google::Cloud::PermissionDeniedError => e
+    Rails.logger.warn "DialogFlow Error: (account-#{hook.try(:account_id)}, hook-#{hook.id}) #{e.message}"
+    hook.prompt_reauthorization!
+    hook.disable
   end
 
   def process_response(message, response)
@@ -53,10 +50,28 @@ class Integrations::Dialogflow::ProcessorService < Integrations::BotProcessorSer
     return if content_params.blank?
 
     conversation = message.conversation
-    conversation.messages.create!(content_params.merge({
-                                                         message_type: :outgoing,
-                                                         account_id: conversation.account_id,
-                                                         inbox_id: conversation.inbox_id
-                                                       }))
+    conversation.messages.create!(
+      content_params.merge(
+        {
+          message_type: :outgoing,
+          account_id: conversation.account_id,
+          inbox_id: conversation.inbox_id
+        }
+      )
+    )
+  end
+
+  def configure_dialogflow_client_defaults
+    ::Google::Cloud::Dialogflow::V2::Sessions::Client.configure do |config|
+      config.timeout = 10.0
+      config.credentials = hook.settings['credentials']
+    end
+  end
+
+  def detect_intent(session_id, message)
+    client = ::Google::Cloud::Dialogflow::V2::Sessions::Client.new
+    session = "projects/#{hook.settings['project_id']}/agent/sessions/#{session_id}"
+    query_input = { text: { text: message, language_code: 'en-US' } }
+    client.detect_intent session: session, query_input: query_input
   end
 end
diff --git a/spec/lib/integrations/dialogflow/processor_service_spec.rb b/spec/lib/integrations/dialogflow/processor_service_spec.rb
index 9f7535f5f..2b5f36c5a 100644
--- a/spec/lib/integrations/dialogflow/processor_service_spec.rb
+++ b/spec/lib/integrations/dialogflow/processor_service_spec.rb
@@ -162,10 +162,17 @@ describe Integrations::Dialogflow::ProcessorService do
       allow(session_client).to receive(:detect_intent).and_return({ session: session, query_input: query_input })
     end
 
-    it 'returns indented response' do
+    it 'returns intended response' do
       response = processor.send(:get_response, conversation.contact_inbox.source_id, message.content)
       expect(response[:query_input][:text][:text]).to eq(message)
       expect(response[:query_input][:text][:language_code]).to eq('en-US')
     end
+
+    it 'disables the hook if permission errors are thrown' do
+      allow(session_client).to receive(:detect_intent).and_raise(Google::Cloud::PermissionDeniedError)
+
+      expect { processor.send(:get_response, conversation.contact_inbox.source_id, message.content) }
+        .to change(hook, :status).from('enabled').to('disabled')
+    end
   end
 end
diff --git a/spec/mailers/administrator_notifications/channel_notifications_mailer_spec.rb b/spec/mailers/administrator_notifications/channel_notifications_mailer_spec.rb
index 676d2afaf..f67b8300c 100644
--- a/spec/mailers/administrator_notifications/channel_notifications_mailer_spec.rb
+++ b/spec/mailers/administrator_notifications/channel_notifications_mailer_spec.rb
@@ -25,6 +25,22 @@ RSpec.describe AdministratorNotifications::ChannelNotificationsMailer do
     end
   end
 
+  describe 'dialogflow disconnect' do
+    let(:mail) { described_class.with(account: account).dialogflow_disconnect.deliver_now }
+
+    it 'renders the subject' do
+      expect(mail.subject).to eq('Your Dialogflow integration was disconnected')
+    end
+
+    it 'renders the content' do
+      expect(mail.body).to include('Your Dialogflow integration was disconnected because of permission issues.')
+    end
+
+    it 'renders the receiver email' do
+      expect(mail.to).to eq([administrator.email])
+    end
+  end
+
   describe 'facebook_disconnect' do
     before do
       stub_request(:post, /graph.facebook.com/)

From 11b27f98057c1fbc21a61d7c416d33c7f85fc227 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Tue, 31 Oct 2023 07:42:30 +0530
Subject: [PATCH 36/94] feat: Handle Line send message/attachments errors
 (#8200)

---
 .../widgets/conversation/bubble/Actions.vue   |  8 ++
 app/services/line/send_on_line_service.rb     | 26 +++++-
 .../line/send_on_line_service_spec.rb         | 90 +++++++++++++++++--
 3 files changed, 117 insertions(+), 7 deletions(-)

diff --git a/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue b/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue
index f41bff005..4ee7aaa9d 100644
--- a/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue
@@ -205,6 +205,11 @@ export default {
       ) {
         return this.sourceId && this.isSent;
       }
+      // There is no source id for the line channel
+      if (this.isALineChannel) {
+        return true;
+      }
+
       return false;
     },
     showDeliveredIndicator() {
@@ -223,6 +228,9 @@ export default {
       if (this.isAWebWidgetInbox || this.isAPIInbox) {
         return this.isSent;
       }
+      if (this.isALineChannel) {
+        return this.isDelivered;
+      }
 
       return false;
     },
diff --git a/app/services/line/send_on_line_service.rb b/app/services/line/send_on_line_service.rb
index 6ac3024fc..a30de4ab4 100644
--- a/app/services/line/send_on_line_service.rb
+++ b/app/services/line/send_on_line_service.rb
@@ -6,6 +6,30 @@ class Line::SendOnLineService < Base::SendOnChannelService
   end
 
   def perform_reply
-    channel.client.push_message(message.conversation.contact_inbox.source_id, [{ type: 'text', text: message.content }])
+    response = channel.client.push_message(message.conversation.contact_inbox.source_id, [{ type: 'text', text: message.content }])
+    return if response.blank?
+
+    parsed_json = JSON.parse(response.body)
+
+    if response.code == '200'
+      # If the request is successful, update the message status to delivered
+      message.update!(status: :delivered)
+    else
+      # If the request is not successful, update the message status to failed and save the external error
+      message.update!(status: :failed, external_error: external_error(parsed_json))
+    end
+  end
+
+  # https://developers.line.biz/en/reference/messaging-api/#error-responses
+  def external_error(error)
+    # Message containing information about the error. See https://developers.line.biz/en/reference/messaging-api/#error-messages
+    message = error['message']
+    # An array of error details. If the array is empty, this property will not be included in the response.
+    details = error['details']
+
+    return message if details.blank?
+
+    detail_messages = details.map { |detail| "#{detail['property']}: #{detail['message']}" }
+    [message, detail_messages].join(', ')
   end
 end
diff --git a/spec/services/line/send_on_line_service_spec.rb b/spec/services/line/send_on_line_service_spec.rb
index 117353de1..2320f8679 100644
--- a/spec/services/line/send_on_line_service_spec.rb
+++ b/spec/services/line/send_on_line_service_spec.rb
@@ -2,17 +2,95 @@ require 'rails_helper'
 
 describe Line::SendOnLineService do
   describe '#perform' do
-    context 'when a valid message' do
+    let(:line_client) { double }
+    let(:line_channel) { create(:channel_line) }
+    let(:message) do
+      create(:message, message_type: :outgoing, content: 'test',
+                       conversation: create(:conversation, inbox: line_channel.inbox))
+    end
+
+    before do
+      allow(Line::Bot::Client).to receive(:new).and_return(line_client)
+    end
+
+    context 'when message send' do
       it 'calls @channel.client.push_message' do
-        line_client = double
-        line_channel = create(:channel_line)
-        message = create(:message, message_type: :outgoing, content: 'test',
-                                   conversation: create(:conversation, inbox: line_channel.inbox))
         allow(line_client).to receive(:push_message)
-        allow(Line::Bot::Client).to receive(:new).and_return(line_client)
         expect(line_client).to receive(:push_message)
         described_class.new(message: message).perform
       end
     end
+
+    context 'when message send fails without details' do
+      let(:error_response) do
+        {
+          'message' => 'The request was invalid'
+        }.to_json
+      end
+
+      before do
+        allow(line_client).to receive(:push_message).and_return(OpenStruct.new(code: '400', body: error_response))
+      end
+
+      it 'updates the message status to failed' do
+        described_class.new(message: message).perform
+        message.reload
+        expect(message.status).to eq('failed')
+      end
+
+      it 'updates the external error without details' do
+        described_class.new(message: message).perform
+        message.reload
+        expect(message.external_error).to eq('The request was invalid')
+      end
+    end
+
+    context 'when message send fails with details' do
+      let(:error_response) do
+        {
+          'message' => 'The request was invalid',
+          'details' => [
+            {
+              'property' => 'messages[0].text',
+              'message' => 'May not be empty'
+            }
+          ]
+        }.to_json
+      end
+
+      before do
+        allow(line_client).to receive(:push_message).and_return(OpenStruct.new(code: '400', body: error_response))
+      end
+
+      it 'updates the message status to failed' do
+        described_class.new(message: message).perform
+        message.reload
+        expect(message.status).to eq('failed')
+      end
+
+      it 'updates the external error with details' do
+        described_class.new(message: message).perform
+        message.reload
+        expect(message.external_error).to eq('The request was invalid, messages[0].text: May not be empty')
+      end
+    end
+
+    context 'when message send succeeds' do
+      let(:success_response) do
+        {
+          'message' => 'ok'
+        }.to_json
+      end
+
+      before do
+        allow(line_client).to receive(:push_message).and_return(OpenStruct.new(code: '200', body: success_response))
+      end
+
+      it 'updates the message status to delivered' do
+        described_class.new(message: message).perform
+        message.reload
+        expect(message.status).to eq('delivered')
+      end
+    end
   end
 end

From 29f18c7f1897aadfd03154d85d3affd108bca5f2 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Tue, 31 Oct 2023 16:23:34 +0530
Subject: [PATCH 37/94] fix: Handle `Twilio::REST::RestError` (#8257)

---
 app/services/twilio/send_on_twilio_service.rb       |  3 ++-
 spec/services/twilio/send_on_twilio_service_spec.rb | 10 ++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/services/twilio/send_on_twilio_service.rb b/app/services/twilio/send_on_twilio_service.rb
index 0a76dac66..8ebd0178f 100644
--- a/app/services/twilio/send_on_twilio_service.rb
+++ b/app/services/twilio/send_on_twilio_service.rb
@@ -8,8 +8,9 @@ class Twilio::SendOnTwilioService < Base::SendOnChannelService
   def perform_reply
     begin
       twilio_message = channel.send_message(**message_params)
-    rescue Twilio::REST::TwilioError => e
+    rescue Twilio::REST::TwilioError, Twilio::REST::RestError => e
       ChatwootExceptionTracker.new(e, user: message.sender, account: message.account).capture_exception
+      message.update!(status: :failed, external_error: e.message)
     end
     message.update!(source_id: twilio_message.sid) if twilio_message
   end
diff --git a/spec/services/twilio/send_on_twilio_service_spec.rb b/spec/services/twilio/send_on_twilio_service_spec.rb
index 9579dd840..beae54b57 100644
--- a/spec/services/twilio/send_on_twilio_service_spec.rb
+++ b/spec/services/twilio/send_on_twilio_service_spec.rb
@@ -96,5 +96,15 @@ describe Twilio::SendOnTwilioService do
       described_class.new(message: message).perform
       expect(messages_double).to have_received(:create).with(hash_including(media_url: [anything]))
     end
+
+    it 'if message is sent from chatwoot fails' do
+      allow(messages_double).to receive(:create).and_raise(Twilio::REST::TwilioError)
+
+      outgoing_message = create(
+        :message, message_type: 'outgoing', inbox: twilio_inbox, account: account, conversation: conversation
+      )
+      described_class.new(message: outgoing_message).perform
+      expect(outgoing_message.reload.status).to eq('failed')
+    end
   end
 end

From b6584ec68b0f9657a70e189ec5bbf6da673092b1 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 31 Oct 2023 21:33:14 +0530
Subject: [PATCH 38/94] feat: toggle reply to on widget based on feature flag
 (#8261)

Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
---
 app/javascript/widget/components/AgentMessage.vue  |  4 ++++
 app/javascript/widget/components/ChatFooter.vue    |  3 +++
 app/javascript/widget/components/DragWrapper.vue   |  6 ++++++
 app/javascript/widget/components/FooterReplyTo.vue |  2 +-
 app/javascript/widget/components/ReplyToChip.vue   |  2 +-
 app/javascript/widget/components/UserMessage.vue   | 10 ++++++++--
 app/views/widgets/show.html.erb                    |  3 ++-
 7 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/app/javascript/widget/components/AgentMessage.vue b/app/javascript/widget/components/AgentMessage.vue
index 6020af3dc..e1d9ee7c4 100755
--- a/app/javascript/widget/components/AgentMessage.vue
+++ b/app/javascript/widget/components/AgentMessage.vue
@@ -22,6 +22,7 @@
           <drag-wrapper
             class="space-y-2"
             direction="right"
+            :disabled="!allowReplyTo"
             @dragged="toggleReply"
           >
             <AgentMessageBubble
@@ -57,6 +58,7 @@
           </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"
             />
@@ -125,6 +127,7 @@ export default {
   data() {
     return {
       hasImageError: false,
+      allowReplyTo: window.chatwootWebChannel.allowReplyTo || false,
     };
   },
   computed: {
@@ -214,6 +217,7 @@ 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 2a8ef36dc..33017e7c2 100755
--- a/app/javascript/widget/components/ChatFooter.vue
+++ b/app/javascript/widget/components/ChatFooter.vue
@@ -68,6 +68,7 @@ export default {
   data() {
     return {
       inReplyTo: null,
+      allowReplyTo: window.chatwootWebChannel.allowReplyTo || false,
     };
   },
   computed: {
@@ -90,6 +91,8 @@ 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/DragWrapper.vue b/app/javascript/widget/components/DragWrapper.vue
index 41037f434..873622a7c 100644
--- a/app/javascript/widget/components/DragWrapper.vue
+++ b/app/javascript/widget/components/DragWrapper.vue
@@ -19,6 +19,10 @@ export default {
       required: true,
       validator: value => ['left', 'right'].includes(value),
     },
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
   },
   data() {
     return {
@@ -29,9 +33,11 @@ export default {
   },
   methods: {
     handleTouchStart(event) {
+      if (this.disabled) return;
       this.startX = event.touches[0].clientX;
     },
     handleTouchMove(event) {
+      if (this.disabled) return;
       const touchX = event.touches[0].clientX;
       let deltaX = touchX - this.startX;
 
diff --git a/app/javascript/widget/components/FooterReplyTo.vue b/app/javascript/widget/components/FooterReplyTo.vue
index ca65e15c2..e0124196d 100644
--- a/app/javascript/widget/components/FooterReplyTo.vue
+++ b/app/javascript/widget/components/FooterReplyTo.vue
@@ -29,7 +29,7 @@ export default {
   },
   computed: {
     replyToAttachment() {
-      if (!this.inReplyTo?.attachments.length) {
+      if (!this.inReplyTo?.attachments?.length) {
         return '';
       }
 
diff --git a/app/javascript/widget/components/ReplyToChip.vue b/app/javascript/widget/components/ReplyToChip.vue
index 047092a6f..76c250ea0 100644
--- a/app/javascript/widget/components/ReplyToChip.vue
+++ b/app/javascript/widget/components/ReplyToChip.vue
@@ -26,7 +26,7 @@ export default {
   },
   computed: {
     replyToAttachment() {
-      if (!this.replyTo?.attachments.length) {
+      if (!this.replyTo?.attachments?.length) {
         return '';
       }
 
diff --git a/app/javascript/widget/components/UserMessage.vue b/app/javascript/widget/components/UserMessage.vue
index 812d699cb..1d07156ca 100755
--- a/app/javascript/widget/components/UserMessage.vue
+++ b/app/javascript/widget/components/UserMessage.vue
@@ -11,12 +11,16 @@
         <div class="flex justify-end gap-1">
           <div class="flex flex-col justify-end">
             <message-reply-button
-              v-if="!isInProgress && !isFailed"
+              v-if="!isInProgress && !isFailed && allowReplyTo"
               class="transition-opacity delay-75 opacity-0 group-hover:opacity-100 sm:opacity-0"
               @click="toggleReply"
             />
           </div>
-          <drag-wrapper direction="left" @dragged="toggleReply">
+          <drag-wrapper
+            direction="left"
+            :disabled="!allowReplyTo"
+            @dragged="toggleReply"
+          >
             <user-message-bubble
               v-if="showTextBubble"
               :message="message.content"
@@ -107,6 +111,7 @@ export default {
   data() {
     return {
       hasImageError: false,
+      allowReplyTo: window.chatwootWebChannel.allowReplyTo || false,
     };
   },
   computed: {
@@ -137,6 +142,7 @@ 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/widgets/show.html.erb b/app/views/widgets/show.html.erb
index 28c4ed901..3fc32ac42 100644
--- a/app/views/widgets/show.html.erb
+++ b/app/views/widgets/show.html.erb
@@ -27,7 +27,8 @@
         utcOffset: '<%= ActiveSupport::TimeZone[@web_widget.inbox.timezone].now.formatted_offset %>',
         timezone: '<%= @web_widget.inbox.timezone %>',
         allowMessagesAfterResolved: <%= @web_widget.inbox.allow_messages_after_resolved %>,
-        disableBranding: <%= @web_widget.inbox.account.feature_enabled?('disable_branding') %>
+        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 8455186e9f6404a63a040e6449e15a8efd4c4eba Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Wed, 1 Nov 2023 06:01:12 +0530
Subject: [PATCH 39/94] feat: allow instagram reply_to [CW-2609] (#8248)

Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
---
 .../messages/instagram/message_builder.rb     |  9 +++++-
 .../widgets/conversation/Message.vue          |  8 ++---
 .../widgets/conversation/MessagesView.vue     | 13 +++++---
 .../instagram/message_builder_spec.rb         | 29 ++++++++++++++++++
 .../instagram_message_create_event.rb         | 30 +++++++++++++++++++
 5 files changed, 80 insertions(+), 9 deletions(-)

diff --git a/app/builders/messages/instagram/message_builder.rb b/app/builders/messages/instagram/message_builder.rb
index e2c594376..5b2243906 100644
--- a/app/builders/messages/instagram/message_builder.rb
+++ b/app/builders/messages/instagram/message_builder.rb
@@ -76,6 +76,10 @@ class Messages::Instagram::MessageBuilder < Messages::Messenger::MessageBuilder
     message[:reply_to][:story] if message[:reply_to].present? && message[:reply_to][:story].present?
   end
 
+  def message_reply_attributes
+    message[:reply_to][:mid] if message[:reply_to].present? && message[:reply_to][:mid].present?
+  end
+
   def build_message
     return if @outgoing_echo && already_sent_from_chatwoot?
     return if message_content.blank? && all_unsupported_files?
@@ -118,7 +122,10 @@ class Messages::Instagram::MessageBuilder < Messages::Messenger::MessageBuilder
       message_type: message_type,
       source_id: message_identifier,
       content: message_content,
-      sender: @outgoing_echo ? nil : contact
+      sender: @outgoing_echo ? nil : contact,
+      content_attributes: {
+        in_reply_to_external_id: message_reply_attributes
+      }
     }
   end
 
diff --git a/app/javascript/dashboard/components/widgets/conversation/Message.vue b/app/javascript/dashboard/components/widgets/conversation/Message.vue
index e0027850b..d7c9742ae 100644
--- a/app/javascript/dashboard/components/widgets/conversation/Message.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/Message.vue
@@ -24,7 +24,7 @@
         />
         <instagram-story-reply v-if="storyUrl" :story-url="storyUrl" />
         <bubble-reply-to
-          v-if="inReplyToMessageId && inboxSupportsReplyTo"
+          v-if="inReplyToMessageId && inboxSupportsReplyTo.incoming"
           :message="inReplyTo"
           :message-type="data.message_type"
           :parent-has-attachments="hasAttachments"
@@ -184,8 +184,8 @@ export default {
       default: false,
     },
     inboxSupportsReplyTo: {
-      type: Boolean,
-      default: false,
+      type: Object,
+      default: () => ({}),
     },
     inReplyTo: {
       type: Object,
@@ -281,7 +281,7 @@ export default {
         copy: this.hasText,
         delete: this.hasText || this.hasAttachments,
         cannedResponse: this.isOutgoing && this.hasText,
-        replyTo: !this.data.private && this.inboxSupportsReplyTo,
+        replyTo: !this.data.private && this.inboxSupportsReplyTo.outgoing,
       };
     },
     contentAttributes() {
diff --git a/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue b/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
index a1dc9b814..38bb24f8f 100644
--- a/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
@@ -285,13 +285,18 @@ export default {
       return this.currentChat.unread_count || 0;
     },
     inboxSupportsReplyTo() {
-      return (
-        this.inboxHasFeature(INBOX_FEATURES.REPLY_TO_OUTGOING) &&
-        this.isFeatureEnabledonAccount(
+      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/spec/builders/messages/instagram/message_builder_spec.rb b/spec/builders/messages/instagram/message_builder_spec.rb
index b7dfddc8e..618b8bdd6 100644
--- a/spec/builders/messages/instagram/message_builder_spec.rb
+++ b/spec/builders/messages/instagram/message_builder_spec.rb
@@ -14,6 +14,7 @@ describe Messages::Instagram::MessageBuilder do
   let!(:dm_params) { build(:instagram_message_create_event).with_indifferent_access }
   let!(:story_mention_params) { build(:instagram_story_mention_event).with_indifferent_access }
   let!(:instagram_story_reply_event) { build(:instagram_story_reply_event).with_indifferent_access }
+  let!(:instagram_message_reply_event) { build(:instagram_message_reply_event).with_indifferent_access }
   let(:fb_object) { double }
   let(:contact) { create(:contact, id: 'Sender-id-1', name: 'Jane Dae') }
   let(:contact_inbox) { create(:contact_inbox, contact_id: contact.id, inbox_id: instagram_inbox.id, source_id: 'Sender-id-1') }
@@ -101,6 +102,34 @@ describe Messages::Instagram::MessageBuilder do
       expect(message.content_attributes[:story_url]).to eq('https://chatwoot-assets.local/sample.png')
     end
 
+    it 'creates message with for reply with mid' do
+      allow(Koala::Facebook::API).to receive(:new).and_return(fb_object)
+      allow(fb_object).to receive(:get_object).and_return(
+        {
+          name: 'Jane',
+          id: 'Sender-id-1',
+          account_id: instagram_inbox.account_id,
+          profile_pic: 'https://chatwoot-assets.local/sample.png'
+        }.with_indifferent_access
+      )
+      # create first message to ensure reply to is valid
+      first_message = dm_params[:entry][0]['messaging'][0]
+      contact_inbox
+      described_class.new(first_message, instagram_inbox).perform
+
+      # create the second message with the reply to mid set
+      messaging = instagram_message_reply_event[:entry][0]['messaging'][0]
+      contact_inbox
+
+      described_class.new(messaging, instagram_inbox).perform
+      first_message = instagram_channel.inbox.messages.first
+      message = instagram_channel.inbox.messages.last
+
+      expect(message.content).to eq('This is message with replyto mid')
+      expect(message.content_attributes[:in_reply_to_external_id]).to eq(first_message.source_id)
+      expect(message.content_attributes[:in_reply_to]).to eq(first_message.id)
+    end
+
     it 'raises exception on deleted story' do
       allow(Koala::Facebook::API).to receive(:new).and_return(fb_object)
       allow(fb_object).to receive(:get_object).and_raise(Koala::Facebook::ClientError.new(
diff --git a/spec/factories/instagram/instagram_message_create_event.rb b/spec/factories/instagram/instagram_message_create_event.rb
index 4cc8b7f67..7729c1d7a 100644
--- a/spec/factories/instagram/instagram_message_create_event.rb
+++ b/spec/factories/instagram/instagram_message_create_event.rb
@@ -86,6 +86,36 @@ FactoryBot.define do
     initialize_with { attributes }
   end
 
+  factory :instagram_message_reply_event, class: Hash do
+    entry do
+      [
+        {
+          'id': 'instagram-message-id-123',
+          'time': '2021-09-08T06:35:04+0000',
+          'messaging': [
+            {
+              'sender': {
+                'id': 'Sender-id-1'
+              },
+              'recipient': {
+                'id': 'chatwoot-app-user-id-1'
+              },
+              'timestamp': '2021-09-08T06:34:04+0000',
+              'message': {
+                'mid': 'message-id-2',
+                'text': 'This is message with replyto mid',
+                'reply_to': {
+                  'mid': 'message-id-1'
+                }
+              }
+            }
+          ]
+        }
+      ]
+    end
+    initialize_with { attributes }
+  end
+
   factory :instagram_test_text_event, class: Hash do
     entry do
       [

From d876419b27764f03e160e9171ed55c6fe3a9a627 Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Date: Wed, 1 Nov 2023 06:09:25 +0530
Subject: [PATCH 40/94] fix: Update text area height while typing [CW-2438]
 (#8268)

---
 app/javascript/shared/components/ResizableTextArea.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/javascript/shared/components/ResizableTextArea.vue b/app/javascript/shared/components/ResizableTextArea.vue
index c86e4069e..8257694f5 100644
--- a/app/javascript/shared/components/ResizableTextArea.vue
+++ b/app/javascript/shared/components/ResizableTextArea.vue
@@ -91,6 +91,7 @@ export default {
   },
   methods: {
     resizeTextarea() {
+      this.$el.style.height = 'auto';
       if (!this.value) {
         this.$el.style.height = `${this.minHeight}rem`;
       } else {

From 68b8d721a7cb169f3a037d164999f9baa5f62b1b Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Wed, 1 Nov 2023 06:10:17 +0530
Subject: [PATCH 41/94] fix: Update the message status to `failed` if the
 outgoing Facebook message fails. (#8258)

---
 app/services/facebook/send_on_facebook_service.rb       | 1 +
 spec/services/facebook/send_on_facebook_service_spec.rb | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/app/services/facebook/send_on_facebook_service.rb b/app/services/facebook/send_on_facebook_service.rb
index 776e8f5e8..1f60ff7a5 100644
--- a/app/services/facebook/send_on_facebook_service.rb
+++ b/app/services/facebook/send_on_facebook_service.rb
@@ -11,6 +11,7 @@ class Facebook::SendOnFacebookService < Base::SendOnChannelService
   rescue Facebook::Messenger::FacebookError => e
     # TODO : handle specific errors or else page will get disconnected
     handle_facebook_error(e)
+    message.update!(status: :failed, external_error: e.message)
   end
 
   def send_message_to_facebook(delivery_params)
diff --git a/spec/services/facebook/send_on_facebook_service_spec.rb b/spec/services/facebook/send_on_facebook_service_spec.rb
index 38d33e6d7..59a9bfea8 100644
--- a/spec/services/facebook/send_on_facebook_service_spec.rb
+++ b/spec/services/facebook/send_on_facebook_service_spec.rb
@@ -58,6 +58,8 @@ describe Facebook::SendOnFacebookService do
         described_class.new(message: message).perform
 
         expect(facebook_channel.authorization_error_count).to eq(1)
+        expect(message.reload.status).to eq('failed')
+        expect(message.reload.external_error).to eq('Error validating access token')
       end
 
       it 'if message with attachment is sent from chatwoot and is outgoing' do

From f34cd3ea61613277a758a118684bdff239ab1731 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Tue, 31 Oct 2023 18:24:18 -0700
Subject: [PATCH 42/94] chore: [Snyk] Security upgrade newrelic-sidekiq-metrics
 from 1.6.1 to 1.6.2 (#8254)

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

diff --git a/Gemfile b/Gemfile
index d68bbd8de..ca352f2f6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -107,7 +107,7 @@ gem 'google-cloud-translate-v3'
 gem 'ddtrace', require: false
 gem 'elastic-apm', require: false
 gem 'newrelic_rpm', require: false
-gem 'newrelic-sidekiq-metrics', 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-ruby', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index a47f351c4..eea8387ee 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -148,6 +148,7 @@ GEM
     barnes (0.0.9)
       multi_json (~> 1)
       statsd-ruby (~> 1.1)
+    base64 (0.1.1)
     bcrypt (3.1.19)
     bindex (0.8.1)
     blingfire (0.1.8)
@@ -478,10 +479,11 @@ GEM
     net-smtp (0.3.3)
       net-protocol
     netrc (0.11.0)
-    newrelic-sidekiq-metrics (1.6.1)
-      newrelic_rpm (~> 8)
+    newrelic-sidekiq-metrics (1.6.2)
+      newrelic_rpm (>= 8.0.0)
       sidekiq
-    newrelic_rpm (8.16.0)
+    newrelic_rpm (9.6.0)
+      base64
     nio4r (2.5.9)
     nokogiri (1.15.4)
       mini_portile2 (~> 2.8.2)
@@ -603,7 +605,7 @@ GEM
       ffi (~> 1.0)
     redis (5.0.6)
       redis-client (>= 0.9.0)
-    redis-client (0.17.0)
+    redis-client (0.18.0)
       connection_pool
     redis-namespace (1.10.0)
       redis (>= 4)
@@ -895,7 +897,7 @@ DEPENDENCIES
   maxminddb
   mock_redis
   neighbor
-  newrelic-sidekiq-metrics
+  newrelic-sidekiq-metrics (>= 1.6.2)
   newrelic_rpm
   omniauth
   omniauth-google-oauth2

From 1e70223ed716408abb4586133f53bad4c76398ff Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Tue, 31 Oct 2023 19:39:34 -0700
Subject: [PATCH 43/94] chore: Upgrade Cypress to 13.4.0 (#8271)

---
 .eslintrc.js                                  |   1 +
 Gemfile.lock                                  |   2 +-
 Procfile.test                                 |   4 +-
 .../layout/sidebarComponents/Secondary.vue    |   1 +
 .../sidebarComponents/SecondaryNavItem.vue    |   1 +
 app/javascript/v3/components/Form/Input.vue   |   5 +
 config/webpacker.yml                          |  21 +
 package.json                                  |   6 +-
 spec/cypress.config.js                        |  10 +
 spec/cypress.json                             |   6 -
 .../admin_dashboard_authentication.cy.js      |  17 +
 .../admin_dashboard_create_label.cy.js        |  28 +
 .../admin_dashboard_authentication.js         |  20 -
 .../admin_dashboard_create_label.js           |  21 -
 spec/cypress/plugins/index.js                 |  21 -
 spec/cypress/support/{index.js => e2e.js}     |   0
 yarn.lock                                     | 800 ++++++++----------
 17 files changed, 423 insertions(+), 541 deletions(-)
 create mode 100644 spec/cypress.config.js
 delete mode 100644 spec/cypress.json
 create mode 100644 spec/cypress/e2e/happy_paths/admin_dashboard_authentication.cy.js
 create mode 100644 spec/cypress/e2e/happy_paths/admin_dashboard_create_label.cy.js
 delete mode 100644 spec/cypress/integration/happy_paths/admin_dashboard_authentication.js
 delete mode 100644 spec/cypress/integration/happy_paths/admin_dashboard_create_label.js
 delete mode 100644 spec/cypress/plugins/index.js
 rename spec/cypress/support/{index.js => e2e.js} (100%)

diff --git a/.eslintrc.js b/.eslintrc.js
index a58c77e98..03e7e995b 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -4,6 +4,7 @@ module.exports = {
     'prettier',
     'plugin:vue/recommended',
     'plugin:storybook/recommended',
+    'plugin:cypress/recommended',
   ],
   parserOptions: {
     parser: '@babel/eslint-parser',
diff --git a/Gemfile.lock b/Gemfile.lock
index eea8387ee..4add61498 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -175,7 +175,7 @@ GEM
       rexml
     crass (1.0.6)
     csv-safe (3.2.1)
-    cypress-on-rails (1.13.1)
+    cypress-on-rails (1.16.0)
       rack
     database_cleaner (2.0.2)
       database_cleaner-active_record (>= 2, < 3)
diff --git a/Procfile.test b/Procfile.test
index 32792c245..1770cdbc6 100644
--- a/Procfile.test
+++ b/Procfile.test
@@ -1,3 +1,3 @@
 backend: RAILS_ENV=test bin/rails s -p 5050
-frontend: bin/webpack-dev-server
-worker: dotenv RAILS_ENV=test bundle exec sidekiq -C config/sidekiq.yml
+frontend: export NODE_OPTIONS=--openssl-legacy-provider && bin/webpack-dev-server
+worker: RAILS_ENV=test dotenv bundle exec sidekiq -C config/sidekiq.yml
diff --git a/app/javascript/dashboard/components/layout/sidebarComponents/Secondary.vue b/app/javascript/dashboard/components/layout/sidebarComponents/Secondary.vue
index fe615ad3a..f291d221e 100644
--- a/app/javascript/dashboard/components/layout/sidebarComponents/Secondary.vue
+++ b/app/javascript/dashboard/components/layout/sidebarComponents/Secondary.vue
@@ -136,6 +136,7 @@ export default {
         toStateName: 'labels_list',
         showModalForNewItem: true,
         modalName: 'AddLabel',
+        dataTestid: 'sidebar-new-label-button',
         children: this.labels.map(label => ({
           id: label.id,
           label: label.title,
diff --git a/app/javascript/dashboard/components/layout/sidebarComponents/SecondaryNavItem.vue b/app/javascript/dashboard/components/layout/sidebarComponents/SecondaryNavItem.vue
index 112ce9ab2..05f6ebfe1 100644
--- a/app/javascript/dashboard/components/layout/sidebarComponents/SecondaryNavItem.vue
+++ b/app/javascript/dashboard/components/layout/sidebarComponents/SecondaryNavItem.vue
@@ -78,6 +78,7 @@
               variant="clear"
               color-scheme="secondary"
               icon="add"
+              :data-testid="menuItem.dataTestid"
               @click="e => newLinkClick(e, navigate)"
             >
               {{ $t(`SIDEBAR.${menuItem.newLinkTag}`) }}
diff --git a/app/javascript/v3/components/Form/Input.vue b/app/javascript/v3/components/Form/Input.vue
index 5d0ded32a..f105e1137 100644
--- a/app/javascript/v3/components/Form/Input.vue
+++ b/app/javascript/v3/components/Form/Input.vue
@@ -17,6 +17,7 @@
         autocomplete="off"
         :required="required"
         :placeholder="placeholder"
+        :data-testid="dataTestid"
         :value="value"
         :class="{
           'focus:ring-red-600 ring-red-600': hasError,
@@ -71,6 +72,10 @@ export default {
       type: String,
       default: '',
     },
+    dataTestid: {
+      type: String,
+      default: '',
+    },
   },
   methods: {
     onInput(e) {
diff --git a/config/webpacker.yml b/config/webpacker.yml
index ad894074e..bfcc8be94 100644
--- a/config/webpacker.yml
+++ b/config/webpacker.yml
@@ -85,6 +85,27 @@ test:
   # Compile test packs to a separate directory
   public_output_path: packs-test
 
+  dev_server:
+    https: false
+    host: 0.0.0.0
+    port: 3035
+    public: 0.0.0.0:3035
+    hmr: true
+    # Inline should be set to true if using HMR
+    inline: true
+    overlay: true
+    compress: true
+    disable_host_check: true
+    use_local_ip: false
+    quiet: false
+    headers:
+      'Access-Control-Allow-Origin': '*'
+      'Access-Control-Allow-Methods': 'GET, POST, PUT, DELETE, PATCH, OPTIONS'
+      'Access-Control-Allow-Headers': 'X-Requested-With, content-type, Authorization'
+    watch_options:
+      ignored: '**/node_modules/**'
+
+
 production:
   <<: *default
 
diff --git a/package.json b/package.json
index dc0c19896..af05f3db0 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,7 @@
     "test:coverage": "jest -w 1 --no-cache --collectCoverage",
     "webpacker-start": "webpack-dev-server -d --config webpack.dev.config.js --content-base public/ --progress --colors",
     "start:dev": "foreman start -f ./Procfile.dev",
+    "start:test": "RAILS_ENV=test foreman start -f ./Procfile.test",
     "start:dev-overmind": "overmind start -f ./Procfile.dev",
     "storybook": "start-storybook -p 6006",
     "build-storybook": "build-storybook",
@@ -69,7 +70,7 @@
     "opus-recorder": "^8.0.5",
     "postcss": "^8.4.31",
     "postcss-loader": "^4.2.0",
-    "semver": "7.5.2",
+    "semver": "7.5.3",
     "tailwindcss": "^3.3.2",
     "turbolinks": "^5.2.0",
     "url-loader": "^2.0.0",
@@ -120,12 +121,13 @@
     "babel-jest": "29",
     "babel-loader": "8.2.2",
     "babel-preset-vue": "^2.0.2",
-    "cypress": "4.12.1",
+    "cypress": "^13.4.0",
     "eslint": "^8.49.0",
     "eslint-config-airbnb-base": "15.0.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-import-resolver-webpack": "^0.13.7",
     "eslint-plugin-babel": "5.3.1",
+    "eslint-plugin-cypress": "^2.15.1",
     "eslint-plugin-html": "7.1.0",
     "eslint-plugin-import": "2.28.1",
     "eslint-plugin-jsx-a11y": "6.7.1",
diff --git a/spec/cypress.config.js b/spec/cypress.config.js
new file mode 100644
index 000000000..f9d813aa2
--- /dev/null
+++ b/spec/cypress.config.js
@@ -0,0 +1,10 @@
+const { defineConfig } = require('cypress');
+
+module.exports = defineConfig({
+  defaultCommandTimeout: 10000,
+  viewportWidth: 1250,
+  viewportHeight: 800,
+  e2e: {
+    baseUrl: 'http://localhost:5050',
+  },
+});
diff --git a/spec/cypress.json b/spec/cypress.json
deleted file mode 100644
index dff0b2b58..000000000
--- a/spec/cypress.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "baseUrl": "http://localhost:5050",
-  "defaultCommandTimeout": 10000,
-  "viewportWidth": 1250,
-  "viewportHeight": 800
-}
diff --git a/spec/cypress/e2e/happy_paths/admin_dashboard_authentication.cy.js b/spec/cypress/e2e/happy_paths/admin_dashboard_authentication.cy.js
new file mode 100644
index 000000000..cb6882ce2
--- /dev/null
+++ b/spec/cypress/e2e/happy_paths/admin_dashboard_authentication.cy.js
@@ -0,0 +1,17 @@
+describe('AdminDashboardAuthentication', () => {
+  before(() => {
+    cy.app('clean');
+    cy.appScenario('default');
+  });
+
+  it('authenticates an admin ', () => {
+    cy.visit('/');
+
+    cy.get("[data-testid='email_input']").clear();
+    cy.get("[data-testid='email_input']").type('john@acme.inc');
+    cy.get("[data-testid='password_input']").clear();
+    cy.get("[data-testid='password_input']").type('Password1!');
+
+    cy.get("[data-testid='submit_button']").click();
+  });
+});
diff --git a/spec/cypress/e2e/happy_paths/admin_dashboard_create_label.cy.js b/spec/cypress/e2e/happy_paths/admin_dashboard_create_label.cy.js
new file mode 100644
index 000000000..2f185fe0b
--- /dev/null
+++ b/spec/cypress/e2e/happy_paths/admin_dashboard_create_label.cy.js
@@ -0,0 +1,28 @@
+describe('AdminCreateLabel', () => {
+  before(() => {
+    cy.visit('/');
+
+    cy.get("[data-testid='email_input']").clear();
+    cy.get("[data-testid='email_input']").type('john@acme.inc');
+    cy.get("[data-testid='password_input']").clear();
+    cy.get("[data-testid='password_input']").type('Password1!');
+
+    cy.get("[data-testid='submit_button']").click();
+  });
+
+  it('open add label modal and create a label', () => {
+    cy.get("[data-testid='sidebar-new-label-button']").click();
+
+    cy.get("[data-testid='label-title'] > input").clear();
+    cy.get("[data-testid='label-title'] > input").type(
+      `show_stopper_${new Date().getTime()}`
+    );
+
+    cy.get("[data-testid='label-description'] > input").clear();
+    cy.get("[data-testid='label-description'] > input").type(
+      'denote it with show show stopper cases'
+    );
+
+    cy.get("[data-testid='label-submit']").click();
+  });
+});
diff --git a/spec/cypress/integration/happy_paths/admin_dashboard_authentication.js b/spec/cypress/integration/happy_paths/admin_dashboard_authentication.js
deleted file mode 100644
index fc7f35f1f..000000000
--- a/spec/cypress/integration/happy_paths/admin_dashboard_authentication.js
+++ /dev/null
@@ -1,20 +0,0 @@
-describe('AdminDashboardAuthentication', function () {
-  before(() => {
-    cy.app('clean');
-    cy.appScenario('default');
-  });
-
-  it('authenticates an admin ', function () {
-    cy.visit('/');
-
-    cy.get("[data-testid='email_input']")
-      .clear()
-      .type('john@acme.inc');
-    cy.get("[data-testid='password_input']")
-      .clear()
-      .type('Password1!');
-
-    cy.get("[data-testid='submit_button']").click();
-  });
-
-});
diff --git a/spec/cypress/integration/happy_paths/admin_dashboard_create_label.js b/spec/cypress/integration/happy_paths/admin_dashboard_create_label.js
deleted file mode 100644
index c219a760a..000000000
--- a/spec/cypress/integration/happy_paths/admin_dashboard_create_label.js
+++ /dev/null
@@ -1,21 +0,0 @@
-describe('AdminCreateLabel', () => {
-  before(() => {
-    cy.wait(3000);
-  });
-
-  it('open add label modal', () => {
-    cy.get(
-      'ul.menu.vertical > li:last-child > a.sub-menu-title.side-menu > span.child-icon.ion-android-add-circle'
-    ).click();
-  });
-  it('create a label', () => {
-    cy.get("[data-testid='label-title'] > input")
-      .clear()
-      .type(`show_stopper_${new Date().getTime()}`);
-    cy.get("[data-testid='label-description'] > input")
-      .clear()
-      .type('denote it with show show stopper cases');
-
-    cy.get("[data-testid='label-submit']").click();
-  });
-});
diff --git a/spec/cypress/plugins/index.js b/spec/cypress/plugins/index.js
deleted file mode 100644
index aa9918d21..000000000
--- a/spec/cypress/plugins/index.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/// <reference types="cypress" />
-// ***********************************************************
-// This example plugins/index.js can be used to load plugins
-//
-// You can change the location of this file or turn off loading
-// the plugins file with the 'pluginsFile' configuration option.
-//
-// You can read more here:
-// https://on.cypress.io/plugins-guide
-// ***********************************************************
-
-// This function is called when a project is opened or re-opened (e.g. due to
-// the project's config changing)
-
-/**
- * @type {Cypress.PluginConfig}
- */
-module.exports = (on, config) => {
-  // `on` is used to hook into various events Cypress emits
-  // `config` is the resolved Cypress config
-}
diff --git a/spec/cypress/support/index.js b/spec/cypress/support/e2e.js
similarity index 100%
rename from spec/cypress/support/index.js
rename to spec/cypress/support/e2e.js
diff --git a/yarn.lock b/yarn.lock
index d37d0a0c4..59ad6c1d3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3432,20 +3432,10 @@
   resolved "https://registry.yarnpkg.com/@csstools/selector-specificity/-/selector-specificity-2.2.0.tgz#2cbcf822bf3764c9658c4d2e568bd0c0cb748016"
   integrity sha512-+OJ9konv95ClSTOJCmMZqpd5+YGsB2S+x6w3E1oaM8UuR5j8nTNHYSz8c9BEPGDOCMQYIEEGlVPj/VY64iTbGw==
 
-"@cypress/listr-verbose-renderer@^0.4.1":
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/@cypress/listr-verbose-renderer/-/listr-verbose-renderer-0.4.1.tgz#a77492f4b11dcc7c446a34b3e28721afd33c642a"
-  integrity sha1-p3SS9LEdzHxEajSz4ochr9M8ZCo=
-  dependencies:
-    chalk "^1.1.3"
-    cli-cursor "^1.0.2"
-    date-fns "^1.27.2"
-    figures "^1.7.0"
-
-"@cypress/request@^2.88.5":
-  version "2.88.5"
-  resolved "https://registry.yarnpkg.com/@cypress/request/-/request-2.88.5.tgz#8d7ecd17b53a849cfd5ab06d5abe7d84976375d7"
-  integrity sha512-TzEC1XMi1hJkywWpRfD2clreTa/Z+lOrXDCxxBTBPEcY5azdPi56A6Xw+O4tWJnaJH3iIE7G5aDXZC6JgRZLcA==
+"@cypress/request@^3.0.0":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@cypress/request/-/request-3.0.1.tgz#72d7d5425236a2413bd3d8bb66d02d9dc3168960"
+  integrity sha512-TWivJlJi8ZDx2wGOw1dbLuHJKUYX7bWySw377nlnGOW3hP9/MUKIsEdXT/YngWxVdgNCHRBmFlBipE+5/2ZZlQ==
   dependencies:
     aws-sign2 "~0.7.0"
     aws4 "^1.8.0"
@@ -3454,19 +3444,17 @@
     extend "~3.0.2"
     forever-agent "~0.6.1"
     form-data "~2.3.2"
-    har-validator "~5.1.3"
-    http-signature "~1.2.0"
+    http-signature "~1.3.6"
     is-typedarray "~1.0.0"
     isstream "~0.1.2"
     json-stringify-safe "~5.0.1"
     mime-types "~2.1.19"
-    oauth-sign "~0.9.0"
     performance-now "^2.1.0"
-    qs "~6.5.2"
+    qs "6.10.4"
     safe-buffer "^5.1.2"
-    tough-cookie "~2.5.0"
+    tough-cookie "^4.1.3"
     tunnel-agent "^0.6.0"
-    uuid "^3.3.2"
+    uuid "^8.3.2"
 
 "@cypress/xvfb@^1.2.4":
   version "1.2.4"
@@ -4075,13 +4063,6 @@
     webpack-cli "^3.3.12"
     webpack-sources "^1.4.3"
 
-"@samverschueren/stream-to-observable@^0.3.0":
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.1.tgz#a21117b19ee9be70c379ec1877537ef2e1c63301"
-  integrity sha512-c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ==
-  dependencies:
-    any-observable "^0.3.0"
-
 "@scmmishra/pico-search@0.5.1":
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/@scmmishra/pico-search/-/pico-search-0.5.1.tgz#fe10a5615259623bff0095ad9af26e15d84379cb"
@@ -6421,6 +6402,13 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.36.tgz#0db5d7efc4760d36d0d1d22c85d1a53accd5dc27"
   integrity sha512-8egDX8dE50XyXWH6C6PRCNkTP106DuUrvdrednFouDSmCi7IOvrqr0frznfZaHifHH/3aq/7a7v9N4wdXMqhBQ==
 
+"@types/node@^18.17.5":
+  version "18.18.8"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.18.8.tgz#2b285361f2357c8c8578ec86b5d097c7f464cfd6"
+  integrity sha512-OLGBaaK5V3VRBS1bAkMVP2/W9B+H8meUfl866OrMNQqt7wDgdpWPp5o6gmIc9pB+lIQHSq4ZL8ypeH1vPxcPaQ==
+  dependencies:
+    undici-types "~5.26.4"
+
 "@types/normalize-package-data@^2.4.0":
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e"
@@ -6487,10 +6475,10 @@
   resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.3.tgz#9a726e116beb26c24f1ccd6850201e1246122e04"
   integrity sha512-OxepLK9EuNEIPxWNME+C6WwbRAOOI2o2BaQEGzz5Lu2e4Z5eDnEo+/aVEDMIXywoJitJ7xWd641wrGLZdtwRyw==
 
-"@types/sinonjs__fake-timers@^6.0.1":
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-6.0.2.tgz#3a84cf5ec3249439015e14049bd3161419bf9eae"
-  integrity sha512-dIPoZ3g5gcx9zZEszaxLSVTvMReD3xxyyDnQUjA6IYDG9Ba2AV0otMPs+77sG9ojB4Qr2N2Vk5RnKeuA0X/0bg==
+"@types/sinonjs__fake-timers@8.1.1":
+  version "8.1.1"
+  resolved "https://registry.yarnpkg.com/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.1.tgz#b49c2c70150141a15e0fa7e79cf1f92a72934ce3"
+  integrity sha512-0kSuKjAS0TrGLJ0M/+8MaFkGsQhZpB6pxOmvS3K8FYI72K//YmdfoW9X2qPsAKh1mkwxGD5zib9s1FIFed6E8g==
 
 "@types/sizzle@^2.3.2":
   version "2.3.3"
@@ -6596,6 +6584,13 @@
   dependencies:
     "@types/yargs-parser" "*"
 
+"@types/yauzl@^2.9.1":
+  version "2.10.2"
+  resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.10.2.tgz#dab926ef9b41a898bc943f11bca6b0bad6d4b729"
+  integrity sha512-Km7XAtUIduROw7QPgvcft0lIupeG8a8rdKL8RiSyKvlE7dYY31fEn41HVuQsRFDuROA8tA4K2UVL+WdfFmErBA==
+  dependencies:
+    "@types/node" "*"
+
 "@typescript-eslint/scope-manager@5.62.0":
   version "5.62.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz#d9457ccc6a0b8d6b37d0eb252a23022478c5460c"
@@ -7206,7 +7201,7 @@ ajv-keywords@^3.1.0, ajv-keywords@^3.4.1, ajv-keywords@^3.5.2:
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
   integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
 
-ajv@^6.1.0, ajv@^6.10.2, ajv@^6.12.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5:
+ajv@^6.1.0, ajv@^6.10.2, ajv@^6.12.2, ajv@^6.12.4, ajv@^6.12.5:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -7233,12 +7228,12 @@ ansi-colors@^3.0.0:
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf"
   integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==
 
-ansi-escapes@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
-  integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
+ansi-colors@^4.1.1:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.3.tgz#37611340eb2243e70cc604cad35d63270d48781b"
+  integrity sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==
 
-ansi-escapes@^4.2.1:
+ansi-escapes@^4.2.1, ansi-escapes@^4.3.0:
   version "4.3.2"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
   integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==
@@ -7262,11 +7257,6 @@ ansi-regex@^2.0.0:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
   integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
 
-ansi-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
-  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
-
 ansi-regex@^4.0.0, ansi-regex@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
@@ -7287,11 +7277,6 @@ ansi-regex@^6.0.1:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a"
   integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==
 
-ansi-styles@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
-  integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
-
 ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
@@ -7323,11 +7308,6 @@ ansi-to-html@^0.6.11:
   dependencies:
     entities "^2.0.0"
 
-any-observable@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/any-observable/-/any-observable-0.3.0.tgz#af933475e5806a67d0d7df090dd5e8bef65d119b"
-  integrity sha512-/FQM1EDkTsf63Ub2C6O7GuYFDsSXUwsaZDurV0np41ocwq0jthUAYCmhBX9f+KwlaCgIuWyr/4WlUQUBfKfZog==
-
 any-promise@^1.0.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
@@ -7372,7 +7352,7 @@ aproba@^1.1.1:
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
   integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
 
-arch@^2.1.2:
+arch@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/arch/-/arch-2.2.0.tgz#1bc47818f305764f23ab3306b0bfc086c5a29d11"
   integrity sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==
@@ -7666,6 +7646,11 @@ ast-types@^0.16.1:
   dependencies:
     tslib "^2.0.1"
 
+astral-regex@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
+  integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
+
 async-each@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf"
@@ -8055,7 +8040,7 @@ base64-arraybuffer-es6@^0.7.0:
   resolved "https://registry.yarnpkg.com/base64-arraybuffer-es6/-/base64-arraybuffer-es6-0.7.0.tgz#dbe1e6c87b1bf1ca2875904461a7de40f21abc86"
   integrity sha512-ESyU/U1CFZDJUdr+neHRhNozeCv72Y7Vm0m1DCbjX3KBjT6eYocvAJlSk6+8+HkVwXlT1FNxhGW6q3UKAlCvvw==
 
-base64-js@^1.0.2:
+base64-js@^1.0.2, base64-js@^1.3.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
   integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
@@ -8119,6 +8104,11 @@ bindings@^1.5.0:
   dependencies:
     file-uri-to-path "1.0.0"
 
+blob-util@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/blob-util/-/blob-util-2.0.2.tgz#3b4e3c281111bb7f11128518006cdc60b403a1eb"
+  integrity sha512-T7JQa+zsXXEa6/8ZhHcQEW1UFfVM49Ts65uBkFL6fz2QmrElqmbajIDJvuA0tEhRe5eIjpV9ZF+0RfZR9voJFQ==
+
 bluebird@^3.1.1, bluebird@^3.5.5, bluebird@^3.7.2:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
@@ -8376,6 +8366,14 @@ buffer@^4.3.0:
     ieee754 "^1.1.4"
     isarray "^1.0.0"
 
+buffer@^5.6.0:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
+  integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
+  dependencies:
+    base64-js "^1.3.1"
+    ieee754 "^1.1.13"
+
 builtin-status-codes@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
@@ -8601,17 +8599,6 @@ chalk@5.3.0:
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.3.0.tgz#67c20a7ebef70e7f3970a01f90fa210cb6860385"
   integrity sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==
 
-chalk@^1.0.0, chalk@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
-  integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
-  dependencies:
-    ansi-styles "^2.2.1"
-    escape-string-regexp "^1.0.2"
-    has-ansi "^2.0.0"
-    strip-ansi "^3.0.0"
-    supports-color "^2.0.0"
-
 chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
@@ -8799,19 +8786,12 @@ cli-boxes@^2.2.1:
   resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f"
   integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==
 
-cli-cursor@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz#64da3f7d56a54412e59794bd62dc35295e8f2987"
-  integrity sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=
+cli-cursor@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
+  integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
   dependencies:
-    restore-cursor "^1.0.1"
-
-cli-cursor@^2.0.0, cli-cursor@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
-  integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=
-  dependencies:
-    restore-cursor "^2.0.0"
+    restore-cursor "^3.1.0"
 
 cli-cursor@^4.0.0:
   version "4.0.0"
@@ -8820,7 +8800,7 @@ cli-cursor@^4.0.0:
   dependencies:
     restore-cursor "^4.0.0"
 
-cli-table3@^0.6.1:
+cli-table3@^0.6.1, cli-table3@~0.6.1:
   version "0.6.3"
   resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.3.tgz#61ab765aac156b52f222954ffc607a6f01dbeeb2"
   integrity sha512-w5Jac5SykAeZJKntOxJCrm63Eg5/4dhMWIcuTbo9rpE+brgaSZo0RuNJZeOyMgsUdhDeojvgyQLmjI+K50ZGyg==
@@ -8829,23 +8809,13 @@ cli-table3@^0.6.1:
   optionalDependencies:
     "@colors/colors" "1.5.0"
 
-cli-table3@~0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.5.1.tgz#0252372d94dfc40dbd8df06005f48f31f656f202"
-  integrity sha512-7Qg2Jrep1S/+Q3EceiZtQcDPWxhAvBw+ERf1162v4sikJrvojMHFqXt8QIVha8UlH9rgU0BeWPytZ9/TzYqlUw==
+cli-truncate@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz#c39e28bf05edcde5be3b98992a22deed5a2b93c7"
+  integrity sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==
   dependencies:
-    object-assign "^4.1.0"
-    string-width "^2.1.1"
-  optionalDependencies:
-    colors "^1.1.2"
-
-cli-truncate@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-0.2.1.tgz#9f15cfbb0705005369216c626ac7d05ab90dd574"
-  integrity sha1-nxXPuwcFAFNpIWxiasfQWrkN1XQ=
-  dependencies:
-    slice-ansi "0.0.4"
-    string-width "^1.0.1"
+    slice-ansi "^3.0.0"
+    string-width "^4.2.0"
 
 cli-truncate@^3.1.0:
   version "3.1.0"
@@ -8901,11 +8871,6 @@ coa@^2.0.2:
     chalk "^2.4.1"
     q "^1.1.2"
 
-code-point-at@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
-  integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
-
 collapse-white-space@^1.0.2:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/collapse-white-space/-/collapse-white-space-1.0.6.tgz#e63629c0016665792060dbbeb79c42239d2c5287"
@@ -8974,16 +8939,11 @@ colorette@^1.2.1, colorette@^1.2.2:
   resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"
   integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==
 
-colorette@^2.0.20:
+colorette@^2.0.16, colorette@^2.0.20:
   version "2.0.20"
   resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a"
   integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==
 
-colors@^1.1.2:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
-  integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
-
 combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
@@ -9074,7 +9034,7 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
 
-concat-stream@^1.5.0, concat-stream@^1.6.2:
+concat-stream@^1.5.0:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
   integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
@@ -9351,7 +9311,7 @@ cross-spawn@^6.0.0, cross-spawn@^6.0.5:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
-cross-spawn@^7.0.2, cross-spawn@^7.0.3:
+cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
   integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
@@ -9646,47 +9606,53 @@ cyclist@^1.0.1:
   resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9"
   integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=
 
-cypress@4.12.1:
-  version "4.12.1"
-  resolved "https://registry.yarnpkg.com/cypress/-/cypress-4.12.1.tgz#0ead1b9f4c0917d69d8b57f996b6e01fe693b6ec"
-  integrity sha512-9SGIPEmqU8vuRA6xst2CMTYd9sCFCxKSzrHt0wr+w2iAQMCIIsXsQ5Gplns1sT6LDbZcmLv6uehabAOl3fhc9Q==
+cypress@^13.4.0:
+  version "13.4.0"
+  resolved "https://registry.yarnpkg.com/cypress/-/cypress-13.4.0.tgz#7d91069983ba7c664c505abde84d3e3e20484344"
+  integrity sha512-KeWNC9xSHG/ewZURVbaQsBQg2mOKw4XhjJZFKjWbEjgZCdxpPXLpJnfq5Jns1Gvnjp6AlnIfpZfWFlDgVKXdWQ==
   dependencies:
-    "@cypress/listr-verbose-renderer" "^0.4.1"
-    "@cypress/request" "^2.88.5"
+    "@cypress/request" "^3.0.0"
     "@cypress/xvfb" "^1.2.4"
-    "@types/sinonjs__fake-timers" "^6.0.1"
+    "@types/node" "^18.17.5"
+    "@types/sinonjs__fake-timers" "8.1.1"
     "@types/sizzle" "^2.3.2"
-    arch "^2.1.2"
+    arch "^2.2.0"
+    blob-util "^2.0.2"
     bluebird "^3.7.2"
+    buffer "^5.6.0"
     cachedir "^2.3.0"
-    chalk "^2.4.2"
+    chalk "^4.1.0"
     check-more-types "^2.24.0"
-    cli-table3 "~0.5.1"
-    commander "^4.1.1"
+    cli-cursor "^3.1.0"
+    cli-table3 "~0.6.1"
+    commander "^6.2.1"
     common-tags "^1.8.0"
-    debug "^4.1.1"
-    eventemitter2 "^6.4.2"
-    execa "^1.0.0"
+    dayjs "^1.10.4"
+    debug "^4.3.4"
+    enquirer "^2.3.6"
+    eventemitter2 "6.4.7"
+    execa "4.1.0"
     executable "^4.1.1"
-    extract-zip "^1.7.0"
-    fs-extra "^8.1.0"
+    extract-zip "2.0.1"
+    figures "^3.2.0"
+    fs-extra "^9.1.0"
     getos "^3.2.1"
-    is-ci "^2.0.0"
-    is-installed-globally "^0.3.2"
+    is-ci "^3.0.0"
+    is-installed-globally "~0.4.0"
     lazy-ass "^1.6.0"
-    listr "^0.14.3"
-    lodash "^4.17.19"
-    log-symbols "^3.0.0"
-    minimist "^1.2.5"
-    moment "^2.27.0"
+    listr2 "^3.8.3"
+    lodash "^4.17.21"
+    log-symbols "^4.0.0"
+    minimist "^1.2.8"
     ospath "^1.2.2"
-    pretty-bytes "^5.3.0"
-    ramda "~0.26.1"
+    pretty-bytes "^5.6.0"
+    process "^0.11.10"
+    proxy-from-env "1.0.0"
     request-progress "^3.0.0"
-    supports-color "^7.1.0"
-    tmp "~0.1.0"
+    semver "^7.5.3"
+    supports-color "^8.1.1"
+    tmp "~0.2.1"
     untildify "^4.0.0"
-    url "^0.11.0"
     yauzl "^2.10.0"
 
 damerau-levenshtein@^1.0.8:
@@ -9720,11 +9686,6 @@ date-fns@2.21.1:
   resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.21.1.tgz#679a4ccaa584c0706ea70b3fa92262ac3009d2b0"
   integrity sha512-m1WR0xGiC6j6jNFAyW4Nvh4WxAi4JF4w9jRJwSI8nBmNcyZXPcP9VUQG+6gHQXAmqaGEKDKhOqAtENDC941UkA==
 
-date-fns@^1.27.2:
-  version "1.30.1"
-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.30.1.tgz#2e71bf0b119153dbb4cc4e88d9ea5acfb50dc05c"
-  integrity sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==
-
 date-fns@^2.29.1:
   version "2.29.3"
   resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.29.3.tgz#27402d2fc67eb442b511b70bbdf98e6411cd68a8"
@@ -9735,6 +9696,11 @@ date-format-parse@^0.2.6:
   resolved "https://registry.yarnpkg.com/date-format-parse/-/date-format-parse-0.2.6.tgz#7ed42817efb6ec39532169eada9670ae3c627aa7"
   integrity sha512-sdxnYAWmLopeb+6Hmw+vo3or4OCJOnh4+YoJ9p+Id3o2EnNP0INpTqx7wr8UregfMpgaSZAH473R/ytiaB3gVg==
 
+dayjs@^1.10.4:
+  version "1.11.10"
+  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.10.tgz#68acea85317a6e164457d6d6947564029a6a16a0"
+  integrity sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ==
+
 de-indent@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"
@@ -10290,11 +10256,6 @@ electron-to-chromium@^1.4.431:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.440.tgz#d3b1eeb36b717eb479a240c0406ac1fa67901762"
   integrity sha512-r6dCgNpRhPwiWlxbHzZQ/d9swfPaEJGi8ekqRBwQYaR3WmA5VkqQfBWSDDjuJU1ntO+W9tHx8OHV/96Q8e0dVw==
 
-elegant-spinner@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e"
-  integrity sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=
-
 elliptic@^6.5.3, elliptic@^6.5.4:
   version "6.5.4"
   resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb"
@@ -10383,6 +10344,14 @@ enhanced-resolve@^5.15.0:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
 
+enquirer@^2.3.6:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.4.1.tgz#93334b3fbd74fc7097b224ab4a8fb7e40bf4ae56"
+  integrity sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==
+  dependencies:
+    ansi-colors "^4.1.1"
+    strip-ansi "^6.0.1"
+
 entities@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
@@ -10599,7 +10568,7 @@ escape-html@~1.0.3:
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
   integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==
 
-escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
+escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
@@ -10680,6 +10649,13 @@ eslint-plugin-babel@5.3.1:
   dependencies:
     eslint-rule-composer "^0.3.0"
 
+eslint-plugin-cypress@^2.15.1:
+  version "2.15.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-cypress/-/eslint-plugin-cypress-2.15.1.tgz#336afa7e8e27451afaf65aa359c9509e0a4f3a7b"
+  integrity sha512-eLHLWP5Q+I4j2AWepYq0PgFEei9/s5LvjuSqWrxurkg1YZ8ltxdvMNmdSf0drnsNo57CTgYY/NIHHLRSWejR7w==
+  dependencies:
+    globals "^13.20.0"
+
 eslint-plugin-html@7.1.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/eslint-plugin-html/-/eslint-plugin-html-7.1.0.tgz#aec2a3772b40ccf51a5be4f972f07600539d3b3e"
@@ -10908,10 +10884,10 @@ etag@~1.8.1:
   resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
   integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==
 
-eventemitter2@^6.4.2:
-  version "6.4.4"
-  resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-6.4.4.tgz#aa96e8275c4dbeb017a5d0e03780c65612a1202b"
-  integrity sha512-HLU3NDY6wARrLCEwyGKRBvuWYyvW6mHYv72SJJAH3iJN3a6eVUvkjFkcxah1bcTgGVBBrFdIopBJPhCQFMLyXw==
+eventemitter2@6.4.7:
+  version "6.4.7"
+  resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-6.4.7.tgz#a7f6c4d7abf28a14c1ef3442f21cb306a054271d"
+  integrity sha512-tYUSVOGeQPKt/eC1ABfhHy5Xd96N3oIijJvN3O9+TsC28T5V9yX9oEfEK5faP0EFSNVOG97qtAS68GBrQB2hDg==
 
 eventemitter3@^4.0.0:
   version "4.0.7"
@@ -10948,6 +10924,21 @@ exec-sh@^0.3.2:
   resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.6.tgz#ff264f9e325519a60cb5e273692943483cca63bc"
   integrity sha512-nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w==
 
+execa@4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a"
+  integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==
+  dependencies:
+    cross-spawn "^7.0.0"
+    get-stream "^5.0.0"
+    human-signals "^1.1.1"
+    is-stream "^2.0.0"
+    merge-stream "^2.0.0"
+    npm-run-path "^4.0.0"
+    onetime "^5.1.0"
+    signal-exit "^3.0.2"
+    strip-final-newline "^2.0.0"
+
 execa@7.2.0, execa@^7.1.1:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-7.2.0.tgz#657e75ba984f42a70f38928cedc87d6f2d4fe4e9"
@@ -10998,11 +10989,6 @@ executable@^4.1.1:
   dependencies:
     pify "^2.2.0"
 
-exit-hook@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8"
-  integrity sha1-8FyiM7SMBdVP/wd2XfhQfpXAL/g=
-
 exit@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
@@ -11124,15 +11110,16 @@ extglob@^2.0.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-extract-zip@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.7.0.tgz#556cc3ae9df7f452c493a0cfb51cc30277940927"
-  integrity sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==
+extract-zip@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a"
+  integrity sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==
   dependencies:
-    concat-stream "^1.6.2"
-    debug "^2.6.9"
-    mkdirp "^0.5.4"
+    debug "^4.1.1"
+    get-stream "^5.1.0"
     yauzl "^2.10.0"
+  optionalDependencies:
+    "@types/yauzl" "^2.9.1"
 
 extsprintf@1.3.0:
   version "1.3.0"
@@ -11239,18 +11226,10 @@ figgy-pudding@^3.5.1:
   resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e"
   integrity sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==
 
-figures@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"
-  integrity sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=
-  dependencies:
-    escape-string-regexp "^1.0.5"
-    object-assign "^4.1.0"
-
-figures@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
-  integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=
+figures@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
+  integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==
   dependencies:
     escape-string-regexp "^1.0.5"
 
@@ -11543,16 +11522,7 @@ fs-extra@^10.1.0:
     jsonfile "^6.0.1"
     universalify "^2.0.0"
 
-fs-extra@^8.1.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
-  integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
-  dependencies:
-    graceful-fs "^4.2.0"
-    jsonfile "^4.0.0"
-    universalify "^0.1.0"
-
-fs-extra@^9.0.0, fs-extra@^9.0.1:
+fs-extra@^9.0.0, fs-extra@^9.0.1, fs-extra@^9.1.0:
   version "9.1.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
   integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==
@@ -11707,6 +11677,13 @@ get-stream@^4.0.0:
   dependencies:
     pump "^3.0.0"
 
+get-stream@^5.0.0, get-stream@^5.1.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
+  integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==
+  dependencies:
+    pump "^3.0.0"
+
 get-stream@^6.0.0, get-stream@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
@@ -11807,12 +11784,12 @@ glob@^7.1.6, glob@^7.1.7:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-global-dirs@^2.0.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-2.1.0.tgz#e9046a49c806ff04d6c1825e196c8f0091e8df4d"
-  integrity sha512-MG6kdOUh/xBnyo9cJFeIKkLEc1AyFq42QTU4XiX51i2NEdxLxLWXIjEjmqKeSuKR7pAZjTqUVoT2b2huxVLgYQ==
+global-dirs@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.1.tgz#0c488971f066baceda21447aecb1a8b911d22485"
+  integrity sha512-NBcGGFbBA9s1VzD41QXDG+3++t9Mn5t1FpLdhESY6oKY4gYTFpX4wO3sqGUa0Srjtbfj3szX0RnemmrVRUdULA==
   dependencies:
-    ini "1.3.7"
+    ini "2.0.0"
 
 global-modules@^1.0.0:
   version "1.0.0"
@@ -11870,6 +11847,13 @@ globals@^13.19.0:
   dependencies:
     type-fest "^0.20.2"
 
+globals@^13.20.0:
+  version "13.23.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-13.23.0.tgz#ef31673c926a0976e1f61dab4dca57e0c0a8af02"
+  integrity sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==
+  dependencies:
+    type-fest "^0.20.2"
+
 globalthis@^1.0.0, globalthis@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf"
@@ -11953,26 +11937,6 @@ handlebars@^4.7.7:
   optionalDependencies:
     uglify-js "^3.1.4"
 
-har-schema@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
-  integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
-
-har-validator@~5.1.3:
-  version "5.1.5"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"
-  integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==
-  dependencies:
-    ajv "^6.12.3"
-    har-schema "^2.0.0"
-
-has-ansi@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
-  integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
-  dependencies:
-    ansi-regex "^2.0.0"
-
 has-bigints@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113"
@@ -12372,14 +12336,14 @@ http-proxy@^1.17.0:
     follow-redirects "^1.0.0"
     requires-port "^1.0.0"
 
-http-signature@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
-  integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=
+http-signature@~1.3.6:
+  version "1.3.6"
+  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.3.6.tgz#cb6fbfdf86d1c974f343be94e87f7fc128662cf9"
+  integrity sha512-3adrsD6zqo4GsTqtO7FyrejHNv+NgiIfAfv68+jVlFmSr9OGy7zrxONceFRLKvnnZA5jbxQBX1u9PpB6Wi32Gw==
   dependencies:
     assert-plus "^1.0.0"
-    jsprim "^1.2.2"
-    sshpk "^1.7.0"
+    jsprim "^2.0.2"
+    sshpk "^1.14.1"
 
 https-browserify@^1.0.0:
   version "1.0.0"
@@ -12394,6 +12358,11 @@ https-proxy-agent@^5.0.1:
     agent-base "6"
     debug "4"
 
+human-signals@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
+  integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
+
 human-signals@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
@@ -12435,7 +12404,7 @@ idb@^7.1.1:
   resolved "https://registry.yarnpkg.com/idb/-/idb-7.1.1.tgz#d910ded866d32c7ced9befc5bfdf36f572ced72b"
   integrity sha512-gchesWBzyvGHRO9W8tzUWFDycow5gwjvFKfyV9FF32Y7F50yZMp7mP+T2mJIWFx49zicqyC4uefHM17o6xKIVQ==
 
-ieee754@^1.1.4:
+ieee754@^1.1.13, ieee754@^1.1.4:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
   integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
@@ -12518,11 +12487,6 @@ indent-string@^2.1.0:
   dependencies:
     repeating "^2.0.0"
 
-indent-string@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289"
-  integrity sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=
-
 indent-string@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
@@ -12566,10 +12530,10 @@ inherits@2.0.3:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
   integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 
-ini@1.3.7:
-  version "1.3.7"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.7.tgz#a09363e1911972ea16d7a8851005d84cf09a9a84"
-  integrity sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ==
+ini@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5"
+  integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==
 
 ini@^1.3.4, ini@^1.3.5:
   version "1.3.8"
@@ -12757,6 +12721,13 @@ is-ci@^2.0.0:
   dependencies:
     ci-info "^2.0.0"
 
+is-ci@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.1.tgz#db6ecbed1bd659c43dac0f45661e7674103d1867"
+  integrity sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==
+  dependencies:
+    ci-info "^3.2.0"
+
 is-color-stop@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-color-stop/-/is-color-stop-1.1.0.tgz#cfff471aee4dd5c9e158598fbe12967b5cdad345"
@@ -12871,13 +12842,6 @@ is-finite@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.1.0.tgz#904135c77fb42c0641d6aa1bcdbc4daa8da082f3"
   integrity sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==
 
-is-fullwidth-code-point@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
-  integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
-  dependencies:
-    number-is-nan "^1.0.0"
-
 is-fullwidth-code-point@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
@@ -12943,13 +12907,13 @@ is-inside-container@^1.0.0:
   dependencies:
     is-docker "^3.0.0"
 
-is-installed-globally@^0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.3.2.tgz#fd3efa79ee670d1187233182d5b0a1dd00313141"
-  integrity sha512-wZ8x1js7Ia0kecP/CHM/3ABkAmujX7WPvQk6uu3Fly/Mk44pySulQpnHG46OMjHGXApINnV4QhY3SWnECO2z5g==
+is-installed-globally@~0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.4.0.tgz#9a0fd407949c30f86eb6959ef1b7994ed0b7b520"
+  integrity sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==
   dependencies:
-    global-dirs "^2.0.1"
-    is-path-inside "^3.0.1"
+    global-dirs "^3.0.0"
+    is-path-inside "^3.0.2"
 
 is-map@^2.0.2:
   version "2.0.2"
@@ -13001,13 +12965,6 @@ is-object@^1.0.1:
   resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.2.tgz#a56552e1c665c9e950b4a025461da87e72f86fcf"
   integrity sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA==
 
-is-observable@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-observable/-/is-observable-1.1.0.tgz#b3e986c8f44de950867cab5403f5a3465005975e"
-  integrity sha512-NqCa4Sa2d+u7BWc6CukaObG3Fh+CU9bvixbpcXYhy2VvYS7vVGIdAgnIS5Ks3A/cqk4rebLJ9s8zBstT2aKnIA==
-  dependencies:
-    symbol-observable "^1.1.0"
-
 is-path-cwd@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz#67d43b82664a7b5191fd9119127eb300048a9fdb"
@@ -13027,7 +12984,7 @@ is-path-inside@^2.1.0:
   dependencies:
     path-is-inside "^1.0.2"
 
-is-path-inside@^3.0.1, is-path-inside@^3.0.3:
+is-path-inside@^3.0.2, is-path-inside@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
   integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
@@ -13059,7 +13016,7 @@ is-potential-custom-element-name@^1.0.1:
   resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5"
   integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==
 
-is-promise@^2.0.0, is-promise@^2.1.0:
+is-promise@^2.0.0:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1"
   integrity sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==
@@ -13154,6 +13111,11 @@ is-typedarray@^1.0.0, is-typedarray@~1.0.0:
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
   integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
 
+is-unicode-supported@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7"
+  integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==
+
 is-utf8@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
@@ -13945,10 +13907,10 @@ json-schema-traverse@^0.4.1:
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
   integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
 
-json-schema@0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
-  integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
+json-schema@0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.4.0.tgz#f7de4cf6efab838ebaeb3236474cbba5a1930ab5"
+  integrity sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==
 
 json-stable-stringify-without-jsonify@^1.0.1:
   version "1.0.1"
@@ -13984,13 +13946,6 @@ json5@^2.1.3, json5@^2.2.2, json5@^2.2.3:
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
   integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
 
-jsonfile@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
-  integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
-  optionalDependencies:
-    graceful-fs "^4.1.6"
-
 jsonfile@^6.0.1:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
@@ -14000,14 +13955,14 @@ jsonfile@^6.0.1:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
-jsprim@^1.2.2:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
-  integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=
+jsprim@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-2.0.2.tgz#77ca23dbcd4135cd364800d22ff82c2185803d4d"
+  integrity sha512-gqXddjPqQ6G40VdnI6T6yObEC+pDNvyP95wdQhkWkg7crHH3km5qP1FsOXEkzEQwnz6gz5qGTn1c2Y52wP3OyQ==
   dependencies:
     assert-plus "1.0.0"
     extsprintf "1.3.0"
-    json-schema "0.2.3"
+    json-schema "0.4.0"
     verror "1.10.0"
 
 jstransformer@1.0.0:
@@ -14188,35 +14143,6 @@ lint-staged@14.0.1:
     string-argv "0.3.2"
     yaml "2.3.1"
 
-listr-silent-renderer@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz#924b5a3757153770bf1a8e3fbf74b8bbf3f9242e"
-  integrity sha1-kktaN1cVN3C/Go4/v3S4u/P5JC4=
-
-listr-update-renderer@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/listr-update-renderer/-/listr-update-renderer-0.5.0.tgz#4ea8368548a7b8aecb7e06d8c95cb45ae2ede6a2"
-  integrity sha512-tKRsZpKz8GSGqoI/+caPmfrypiaq+OQCbd+CovEC24uk1h952lVj5sC7SqyFUm+OaJ5HN/a1YLt5cit2FMNsFA==
-  dependencies:
-    chalk "^1.1.3"
-    cli-truncate "^0.2.1"
-    elegant-spinner "^1.0.1"
-    figures "^1.7.0"
-    indent-string "^3.0.0"
-    log-symbols "^1.0.2"
-    log-update "^2.3.0"
-    strip-ansi "^3.0.1"
-
-listr-verbose-renderer@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/listr-verbose-renderer/-/listr-verbose-renderer-0.5.0.tgz#f1132167535ea4c1261102b9f28dac7cba1e03db"
-  integrity sha512-04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw==
-  dependencies:
-    chalk "^2.4.1"
-    cli-cursor "^2.1.0"
-    date-fns "^1.27.2"
-    figures "^2.0.0"
-
 listr2@6.6.1:
   version "6.6.1"
   resolved "https://registry.yarnpkg.com/listr2/-/listr2-6.6.1.tgz#08b2329e7e8ba6298481464937099f4a2cd7f95d"
@@ -14229,20 +14155,19 @@ listr2@6.6.1:
     rfdc "^1.3.0"
     wrap-ansi "^8.1.0"
 
-listr@^0.14.3:
-  version "0.14.3"
-  resolved "https://registry.yarnpkg.com/listr/-/listr-0.14.3.tgz#2fea909604e434be464c50bddba0d496928fa586"
-  integrity sha512-RmAl7su35BFd/xoMamRjpIE4j3v+L28o8CT5YhAXQJm1fD+1l9ngXY8JAQRJ+tFK2i5njvi0iRUKV09vPwA0iA==
+listr2@^3.8.3:
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/listr2/-/listr2-3.14.0.tgz#23101cc62e1375fd5836b248276d1d2b51fdbe9e"
+  integrity sha512-TyWI8G99GX9GjE54cJ+RrNMcIFBfwMPxc3XTFiAYGN4s10hWROGtOg7+O6u6LE3mNkyld7RSLE6nrKBvTfcs3g==
   dependencies:
-    "@samverschueren/stream-to-observable" "^0.3.0"
-    is-observable "^1.1.0"
-    is-promise "^2.1.0"
-    is-stream "^1.1.0"
-    listr-silent-renderer "^1.1.1"
-    listr-update-renderer "^0.5.0"
-    listr-verbose-renderer "^0.5.0"
-    p-map "^2.0.0"
-    rxjs "^6.3.3"
+    cli-truncate "^2.1.0"
+    colorette "^2.0.16"
+    log-update "^4.0.0"
+    p-map "^4.0.0"
+    rfdc "^1.3.0"
+    rxjs "^7.5.1"
+    through "^2.3.8"
+    wrap-ansi "^7.0.0"
 
 lit-element@^3.1.0:
   version "3.1.1"
@@ -14423,28 +14348,23 @@ lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
-log-symbols@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18"
-  integrity sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=
+log-symbols@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503"
+  integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==
   dependencies:
-    chalk "^1.0.0"
+    chalk "^4.1.0"
+    is-unicode-supported "^0.1.0"
 
-log-symbols@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-3.0.0.tgz#f3a08516a5dea893336a7dee14d18a1cfdab77c4"
-  integrity sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==
+log-update@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/log-update/-/log-update-4.0.0.tgz#589ecd352471f2a1c0c570287543a64dfd20e0a1"
+  integrity sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==
   dependencies:
-    chalk "^2.4.2"
-
-log-update@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/log-update/-/log-update-2.3.0.tgz#88328fd7d1ce7938b29283746f0b1bc126b24708"
-  integrity sha1-iDKP19HOeTiykoN0bwsbwSayRwg=
-  dependencies:
-    ansi-escapes "^3.0.0"
-    cli-cursor "^2.0.0"
-    wrap-ansi "^3.0.1"
+    ansi-escapes "^4.3.0"
+    cli-cursor "^3.1.0"
+    slice-ansi "^4.0.0"
+    wrap-ansi "^6.2.0"
 
 log-update@^5.0.1:
   version "5.0.1"
@@ -14874,11 +14794,6 @@ mime@^2.4.4:
   resolved "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz#6e3dc6cc2b9510643830e5f19d5cb753da5eeabe"
   integrity sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==
 
-mimic-fn@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
-  integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
-
 mimic-fn@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
@@ -14928,7 +14843,7 @@ minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18"
   integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==
 
-minimist@^1.1.3, minimist@^1.2.6:
+minimist@^1.1.3, minimist@^1.2.6, minimist@^1.2.8:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
   integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
@@ -14993,7 +14908,7 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-mkdirp@^0.5, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.4, mkdirp@^0.5.5, mkdirp@~0.5.1:
+mkdirp@^0.5, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5, mkdirp@~0.5.1:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
   integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
@@ -15005,7 +14920,7 @@ mkdirp@^1.0.3, mkdirp@^1.0.4:
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
 
-moment@^2.10.2, moment@^2.27.0:
+moment@^2.10.2:
   version "2.29.4"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108"
   integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==
@@ -15296,7 +15211,7 @@ npm-run-path@^2.0.0:
   dependencies:
     path-key "^2.0.0"
 
-npm-run-path@^4.0.1:
+npm-run-path@^4.0.0, npm-run-path@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
   integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==
@@ -15339,21 +15254,11 @@ num2fraction@^1.2.2:
   resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
   integrity sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=
 
-number-is-nan@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
-  integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
-
 nwsapi@^2.2.2:
   version "2.2.7"
   resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.7.tgz#738e0707d3128cb750dddcfe90e4610482df0f30"
   integrity sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==
 
-oauth-sign@~0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
-  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
-
 obj-case@0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/obj-case/-/obj-case-0.2.1.tgz#13a554d04e5ca32dfd9d566451fd2b0e11007f1a"
@@ -15544,18 +15449,6 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0:
   dependencies:
     wrappy "1"
 
-onetime@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"
-  integrity sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=
-
-onetime@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
-  integrity sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=
-  dependencies:
-    mimic-fn "^1.0.0"
-
 onetime@^5.1.0, onetime@^5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
@@ -17092,7 +16985,7 @@ prettier@^3.0.3:
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.0.3.tgz#432a51f7ba422d1469096c0fdc28e235db8f9643"
   integrity sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==
 
-pretty-bytes@^5.3.0:
+pretty-bytes@^5.6.0:
   version "5.6.0"
   resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.6.0.tgz#356256f643804773c82f64723fe78c92c62beaeb"
   integrity sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==
@@ -17402,6 +17295,11 @@ proxy-addr@~2.0.7:
     forwarded "0.2.0"
     ipaddr.js "1.9.1"
 
+proxy-from-env@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.0.0.tgz#33c50398f70ea7eb96d21f7b817630a55791c7ee"
+  integrity sha512-F2JHgJQ1iqwnHDcQjVBsq3n/uoaFL+iPW/eAeL7kVxy/2RrWaN4WroKjjvbsoRtv0ftelNyC01bjRhn/bhcf4A==
+
 prr@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
@@ -17412,11 +17310,6 @@ pseudomap@^1.0.2:
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
   integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
 
-psl@^1.1.28:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
-  integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
-
 psl@^1.1.33:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7"
@@ -17592,6 +17485,13 @@ q@^1.1.2:
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
   integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
 
+qs@6.10.4:
+  version "6.10.4"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.4.tgz#6a3003755add91c0ec9eacdc5f878b034e73f9e7"
+  integrity sha512-OQiU+C+Ds5qiH91qh/mg0w+8nwQuLjM4F4M/PbmhDOoYehPh+Fb0bDjtR1sOvy7YKxvj28Y/M0PhP5uVX0kB+g==
+  dependencies:
+    side-channel "^1.0.4"
+
 qs@6.11.0:
   version "6.11.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a"
@@ -17606,11 +17506,6 @@ qs@^6.10.0:
   dependencies:
     side-channel "^1.0.4"
 
-qs@~6.5.2:
-  version "6.5.3"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad"
-  integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==
-
 query-string@^4.1.0:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb"
@@ -17649,11 +17544,6 @@ ramda@^0.28.0:
   resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.28.0.tgz#acd785690100337e8b063cab3470019be427cc97"
   integrity sha512-9QnLuG/kPVgWvMQ4aODhsBUFKOUmnbUnsSXACv+NCQZcHbeb+v8Lodp8OVxtRULN1/xOyYLLaL6npE6dMq5QTA==
 
-ramda@~0.26.1:
-  version "0.26.1"
-  resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.26.1.tgz#8d41351eb8111c55353617fc3bbffad8e4d35d06"
-  integrity sha512-hLWjpy7EnsDBb0p+Z3B7rPi3GDeRG5ZtiI33kJhTt+ORCd38AbAIjB/9zRIUoeTbE/AVX5ZkU7m6bznsvrf8eQ==
-
 randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5, randombytes@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
@@ -18235,20 +18125,12 @@ resolve@^2.0.0-next.4:
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
-restore-cursor@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541"
-  integrity sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=
+restore-cursor@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
+  integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==
   dependencies:
-    exit-hook "^1.0.0"
-    onetime "^1.0.0"
-
-restore-cursor@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
-  integrity sha1-n37ih/gv0ybU/RYpI9YhKe7g368=
-  dependencies:
-    onetime "^2.0.0"
+    onetime "^5.1.0"
     signal-exit "^3.0.2"
 
 restore-cursor@^4.0.0:
@@ -18356,12 +18238,12 @@ rust-result@^1.0.0:
   dependencies:
     individual "^2.0.0"
 
-rxjs@^6.3.3:
-  version "6.6.7"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9"
-  integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==
+rxjs@^7.5.1:
+  version "7.8.1"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543"
+  integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==
   dependencies:
-    tslib "^1.9.0"
+    tslib "^2.1.0"
 
 safe-array-concat@^1.0.0:
   version "1.0.0"
@@ -18553,13 +18435,6 @@ semver@7.0.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
   integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
 
-semver@7.5.2, semver@^7.3.2, semver@^7.3.4, semver@^7.3.7:
-  version "7.5.2"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.2.tgz#5b851e66d1be07c1cdaf37dfc856f543325a2beb"
-  integrity sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==
-  dependencies:
-    lru-cache "^6.0.0"
-
 semver@7.5.3:
   version "7.5.3"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.3.tgz#161ce8c2c6b4b3bdca6caadc9fa3317a4c4fe88e"
@@ -18582,6 +18457,13 @@ semver@^6.3.1:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
+semver@^7.3.2, semver@^7.3.4, semver@^7.3.7:
+  version "7.5.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.2.tgz#5b851e66d1be07c1cdaf37dfc856f543325a2beb"
+  integrity sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==
+  dependencies:
+    lru-cache "^6.0.0"
+
 semver@^7.3.6, semver@^7.5.3, semver@^7.5.4:
   version "7.5.4"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
@@ -18799,10 +18681,23 @@ slash@^3.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
   integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
-slice-ansi@0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"
-  integrity sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=
+slice-ansi@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz#31ddc10930a1b7e0b67b08c96c2f49b77a789787"
+  integrity sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==
+  dependencies:
+    ansi-styles "^4.0.0"
+    astral-regex "^2.0.0"
+    is-fullwidth-code-point "^3.0.0"
+
+slice-ansi@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b"
+  integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==
+  dependencies:
+    ansi-styles "^4.0.0"
+    astral-regex "^2.0.0"
+    is-fullwidth-code-point "^3.0.0"
 
 slice-ansi@^5.0.0:
   version "5.0.0"
@@ -19008,10 +18903,10 @@ sprintf-js@~1.0.2:
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
   integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
 
-sshpk@^1.7.0:
-  version "1.16.1"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
-  integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==
+sshpk@^1.14.1:
+  version "1.18.0"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.18.0.tgz#1663e55cddf4d688b86a46b77f0d5fe363aba028"
+  integrity sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==
   dependencies:
     asn1 "~0.2.3"
     assert-plus "^1.0.0"
@@ -19134,15 +19029,6 @@ string-length@^4.0.1:
     char-regex "^1.0.2"
     strip-ansi "^6.0.0"
 
-string-width@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
-  integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
-  dependencies:
-    code-point-at "^1.0.0"
-    is-fullwidth-code-point "^1.0.0"
-    strip-ansi "^3.0.0"
-
 "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.2.2, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
@@ -19152,14 +19038,6 @@ string-width@^1.0.1:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.1"
 
-string-width@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
-  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
-  dependencies:
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^4.0.0"
-
 string-width@^3.0.0, string-width@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
@@ -19303,20 +19181,13 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-strip-ansi@^3.0.0, strip-ansi@^3.0.1:
+strip-ansi@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
   integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
   dependencies:
     ansi-regex "^2.0.0"
 
-strip-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
-  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
-  dependencies:
-    ansi-regex "^3.0.0"
-
 strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
@@ -19431,11 +19302,6 @@ sucrase@^3.32.0:
     pirates "^4.0.1"
     ts-interface-checker "^0.1.9"
 
-supports-color@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
-  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
-
 supports-color@^5.3.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
@@ -19457,7 +19323,7 @@ supports-color@^7.0.0, supports-color@^7.1.0:
   dependencies:
     has-flag "^4.0.0"
 
-supports-color@^8.0.0:
+supports-color@^8.0.0, supports-color@^8.1.1:
   version "8.1.1"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"
   integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
@@ -19493,11 +19359,6 @@ svgo@^1.0.0:
     unquote "~1.1.1"
     util.promisify "~1.0.0"
 
-symbol-observable@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
-  integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==
-
 symbol-tree@^3.2.4:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
@@ -19713,6 +19574,11 @@ through2@^2.0.0:
     readable-stream "~2.3.6"
     xtend "~4.0.1"
 
+through@^2.3.8:
+  version "2.3.8"
+  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+  integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==
+
 thunky@^1.0.2:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d"
@@ -19745,12 +19611,12 @@ titleize@^3.0.0:
   resolved "https://registry.yarnpkg.com/titleize/-/titleize-3.0.0.tgz#71c12eb7fdd2558aa8a44b0be83b8a76694acd53"
   integrity sha512-KxVu8EYHDPBdUYdKZdKtU2aj2XfEx9AfjXxE/Aj0vT06w2icA09Vus1rh6eSu1y01akYg6BjIK/hxyLJINoMLQ==
 
-tmp@~0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.1.0.tgz#ee434a4e22543082e294ba6201dcc6eafefa2877"
-  integrity sha512-J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw==
+tmp@~0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14"
+  integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==
   dependencies:
-    rimraf "^2.6.3"
+    rimraf "^3.0.0"
 
 tmpl@1.0.5, tmpl@1.0.x:
   version "1.0.5"
@@ -19809,7 +19675,7 @@ token-stream@1.0.0:
   resolved "https://registry.yarnpkg.com/token-stream/-/token-stream-1.0.0.tgz#cc200eab2613f4166d27ff9afc7ca56d49df6eb4"
   integrity sha512-VSsyNPPW74RpHwR8Fc21uubwHY7wMDeJLys2IX5zJNih+OnAnaifKHo+1LHT7DAdloQ7apeaaWg8l7qnf/TnEg==
 
-tough-cookie@^4.1.2:
+tough-cookie@^4.1.2, tough-cookie@^4.1.3:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.3.tgz#97b9adb0728b42280aa3d814b6b999b2ff0318bf"
   integrity sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==
@@ -19819,14 +19685,6 @@ tough-cookie@^4.1.2:
     universalify "^0.2.0"
     url-parse "^1.5.3"
 
-tough-cookie@~2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
-  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
-  dependencies:
-    psl "^1.1.28"
-    punycode "^2.1.1"
-
 tr46@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.1.0.tgz#fa87aa81ca5d5941da8cbf1f9b749dc969a4e240"
@@ -19917,7 +19775,7 @@ tsconfig@^7.0.0:
     strip-bom "^3.0.0"
     strip-json-comments "^2.0.0"
 
-tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
+tslib@^1.8.1, tslib@^1.9.3:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
@@ -20111,6 +19969,11 @@ unbox-primitive@^1.0.2:
     has-symbols "^1.0.3"
     which-boxed-primitive "^1.0.2"
 
+undici-types@~5.26.4:
+  version "5.26.5"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
+  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
+
 unfetch@^3.1.1:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/unfetch/-/unfetch-3.1.2.tgz#dc271ef77a2800768f7b459673c5604b5101ef77"
@@ -20279,11 +20142,6 @@ unist-util-visit@2.0.3, unist-util-visit@^2.0.0:
     unist-util-is "^4.0.0"
     unist-util-visit-parents "^3.0.0"
 
-universalify@^0.1.0:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
-  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
-
 universalify@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0"
@@ -20476,6 +20334,11 @@ uuid@^3.3.2, uuid@^3.4.0:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
   integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
 
+uuid@^8.3.2:
+  version "8.3.2"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
+  integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
+
 v-tooltip@~2.1.3:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/v-tooltip/-/v-tooltip-2.1.3.tgz#281c2015d1e73787f13c8956aa295b8c3a73f261"
@@ -21240,14 +21103,6 @@ worker-rpc@^0.1.0:
   dependencies:
     microevent.ts "~0.1.1"
 
-wrap-ansi@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-3.0.1.tgz#288a04d87eda5c286e060dfe8f135ce8d007f8ba"
-  integrity sha1-KIoE2H7aXChuBg3+jxNc6NAH+Lo=
-  dependencies:
-    string-width "^2.1.1"
-    strip-ansi "^4.0.0"
-
 wrap-ansi@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"
@@ -21257,6 +21112,15 @@ wrap-ansi@^5.1.0:
     string-width "^3.0.0"
     strip-ansi "^5.0.0"
 
+wrap-ansi@^6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
+  integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrap-ansi@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"

From 3c7854ccdff9b23ee267208bee3d9a86045cb093 Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Date: Thu, 2 Nov 2023 03:23:29 +0530
Subject: [PATCH 44/94] fix: Fixes error in ChatList component (#8266)

Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
---
 app/javascript/dashboard/components/ChatList.vue | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/javascript/dashboard/components/ChatList.vue b/app/javascript/dashboard/components/ChatList.vue
index a77e68465..194bf5e5d 100644
--- a/app/javascript/dashboard/components/ChatList.vue
+++ b/app/javascript/dashboard/components/ChatList.vue
@@ -410,8 +410,12 @@ export default {
     },
     conversationListPagination() {
       const conversationsPerPage = 25;
+      const hasChatsOnView =
+        this.chatsOnView &&
+        Array.isArray(this.chatsOnView) &&
+        !this.chatsOnView.length;
       const isNoFiltersOrFoldersAndChatListNotEmpty =
-        !this.hasAppliedFiltersOrActiveFolders && this.chatsOnView !== [];
+        !this.hasAppliedFiltersOrActiveFolders && hasChatsOnView;
       const isUnderPerPage =
         this.chatsOnView.length < conversationsPerPage &&
         this.activeAssigneeTabCount < conversationsPerPage &&
@@ -516,10 +520,8 @@ export default {
       this.chatsOnView = this.conversationList;
     },
   },
-  created() {
-    this.setFiltersFromUISettings();
-  },
   mounted() {
+    this.setFiltersFromUISettings();
     this.$store.dispatch('setChatStatusFilter', this.activeStatus);
     this.$store.dispatch('setChatSortFilter', this.activeSortBy);
     this.resetAndFetchData();
@@ -550,8 +552,8 @@ export default {
       this.closeAdvanceFiltersModal();
     },
     setFiltersFromUISettings() {
-      const { status, order_by: orderBy } =
-        this.uiSettings.conversations_filter_by;
+      const { conversations_filter_by: filterBy = {} } = this.uiSettings;
+      const { status, order_by: orderBy } = filterBy;
       this.activeStatus = status || wootConstants.STATUS_TYPE.OPEN;
       this.activeSortBy = orderBy || wootConstants.SORT_BY_TYPE.LATEST;
     },

From e8f4ac632f5544e4fef5deef25add835ced983f9 Mon Sep 17 00:00:00 2001
From: Chatwoot Bot <92152627+chatwoot-bot@users.noreply.github.com>
Date: Thu, 2 Nov 2023 03:43:32 +0530
Subject: [PATCH 45/94] chore: Update translations (#8255)

---
 .../dashboard/i18n/locale/fi/campaign.json    |  4 +-
 .../dashboard/i18n/locale/fi/cannedMgmt.json  | 54 ++++++------
 .../dashboard/i18n/locale/fi/contact.json     | 26 +++---
 .../i18n/locale/fi/conversation.json          | 12 +--
 .../dashboard/i18n/locale/fi/inboxMgmt.json   |  2 +-
 .../dashboard/i18n/locale/fi/search.json      |  2 +-
 .../i18n/locale/hu/advancedFilters.json       | 44 +++++-----
 .../dashboard/i18n/locale/hu/agentBots.json   | 48 +++++------
 .../dashboard/i18n/locale/hu/bulkActions.json | 24 +++---
 .../dashboard/i18n/locale/hu/cannedMgmt.json  | 52 ++++++------
 .../dashboard/i18n/locale/sv/helpCenter.json  |  2 +-
 app/javascript/widget/i18n/locale/fi.json     | 82 +++++++++----------
 config/locales/sv.yml                         |  6 +-
 13 files changed, 179 insertions(+), 179 deletions(-)

diff --git a/app/javascript/dashboard/i18n/locale/fi/campaign.json b/app/javascript/dashboard/i18n/locale/fi/campaign.json
index 7e9cf4e93..cb2f5f8d5 100644
--- a/app/javascript/dashboard/i18n/locale/fi/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/fi/campaign.json
@@ -34,7 +34,7 @@
           "ERROR": "Inbox is required"
         },
         "MESSAGE": {
-          "LABEL": "Message",
+          "LABEL": "Viesti",
           "PLACEHOLDER": "Please enter the message of campaign",
           "ERROR": "Message is required"
         },
@@ -88,7 +88,7 @@
       "404": "There are no campaigns created for this inbox.",
       "TABLE_HEADER": {
         "TITLE": "Title",
-        "MESSAGE": "Message",
+        "MESSAGE": "Viesti",
         "INBOX": "Inbox",
         "STATUS": "Tila",
         "SENDER": "Sender",
diff --git a/app/javascript/dashboard/i18n/locale/fi/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/fi/cannedMgmt.json
index d9bb78ed3..9bc26933a 100644
--- a/app/javascript/dashboard/i18n/locale/fi/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fi/cannedMgmt.json
@@ -1,75 +1,75 @@
 {
   "CANNED_MGMT": {
     "HEADER": "Tallennetut vastaukset",
-    "HEADER_BTN_TXT": "Lisää tallennettu vastaus",
-    "LOADING": "Haetaan tallennettuja vastauksia",
-    "SEARCH_404": "Tätä hakua vastaavia kohteita ei löydy",
-    "SIDEBAR_TXT": "<p><b>Canned Responses</b> </p><p> Canned Responses are saved reply templates which can be used to quickly send out a reply to a conversation. </p><p> For creating a Canned Response, just click on the <b>Add Canned Response</b>. You can also edit or delete an existing Canned Response by clicking on the Edit or Delete button </p><p> Canned responses are used with the help of <b>Short Codes</b>. Agents can access canned responses while on a chat by typing <b>'/'</b> followed by the short code. </p>",
+    "HEADER_BTN_TXT": "Add canned response",
+    "LOADING": "Fetching canned responses...",
+    "SEARCH_404": "Tätä hakua vastaavia kohteita ei löydy.",
+    "SIDEBAR_TXT": "<p><b>Canned Responses</b> </p><p> Canned Responses are pre-written reply templates that help you quickly respond to a conversation. To insert a canned response during a chat, agents can type a short code preceded by a '/' character. </p><p> You can manage your canned responses from this page or create new ones using the \"Add canned response\" button.</p><p>Open the <a target=\"_blank\" href=\"https://www.chatwoot.com/hc/chatwoot-user-guide-cloud-version/articles/1677501325-how-to-create-saved-reply-templates-with-canned-responses\">Canned Responses handbook</a> in another tab for a helping hand.</p><p>Also, check out the all-new <a href=\"https://www.chatwoot.com/tools/canned-responses-library\" target=\"_blank\">Canned Responses Library</a>.</p>",
     "LIST": {
       "404": "Tällä tilillä ei ole tallennettuja vastauksia.",
       "TITLE": "Hallitse tallennettuja vastauksia",
-      "DESC": "Tallennetut vastaukset ovat ennalta valmisteltuja vastausmalleja, joita voidaan käyttää nopeasti lähettää vastaukset tukipyyntöihin.",
+      "DESC": "Canned Responses are predefined reply templates which can be used to quickly send out replies to conversations.",
       "TABLE_HEADER": [
-        "Oikotie",
+        "Short code",
         "Sisältö",
         "Toiminnot"
       ]
     },
     "ADD": {
-      "TITLE": "Lisää tallennettu vastaus",
-      "DESC": "Canned Responses are saved reply templates which can be used to quickly send out reply to conversation.",
+      "TITLE": "Add canned response",
+      "DESC": "Canned Responses are predefined reply templates which can be used to quickly send out replies to conversations.",
       "CANCEL_BUTTON_TEXT": "Peruuta",
       "FORM": {
         "SHORT_CODE": {
-          "LABEL": "Oikotie",
-          "PLACEHOLDER": "Please enter a short code",
-          "ERROR": "Oikotie on vaadittu"
+          "LABEL": "Short code",
+          "PLACEHOLDER": "Please enter a short code.",
+          "ERROR": "Short Code is required."
         },
         "CONTENT": {
-          "LABEL": "Sisältö",
-          "PLACEHOLDER": "Ole hyvä ja syötä sisältö",
-          "ERROR": "Sisältö on vaadittu"
+          "LABEL": "Viesti",
+          "PLACEHOLDER": "Please write the message you want to save as a template to use later.",
+          "ERROR": "Message is required."
         },
         "SUBMIT": "Lähetä"
       },
       "API": {
-        "SUCCESS_MESSAGE": "Tallennettu vastaus lisätty onnistuneesti",
+        "SUCCESS_MESSAGE": "Canned response added successfully.",
         "ERROR_MESSAGE": "Yhteyden muodostaminen Woot-palvelimelle ei onnistunut, yritä myöhemmin uudelleen"
       }
     },
     "EDIT": {
-      "TITLE": "Muokkaa tallennettua vastausta",
+      "TITLE": "Edit canned response",
       "CANCEL_BUTTON_TEXT": "Peruuta",
       "FORM": {
         "SHORT_CODE": {
-          "LABEL": "Oikotie",
-          "PLACEHOLDER": "Ole hyvä ja syötä oikotie",
-          "ERROR": "Oikotie on vaadittu"
+          "LABEL": "Short code",
+          "PLACEHOLDER": "Please enter a shortcode.",
+          "ERROR": "Short code is required."
         },
         "CONTENT": {
-          "LABEL": "Sisältö",
-          "PLACEHOLDER": "Ole hyvä ja syötä sisältö",
-          "ERROR": "Sisältö on vaadittu"
+          "LABEL": "Viesti",
+          "PLACEHOLDER": "Please write the message you want to save as a template to use later.",
+          "ERROR": "Message is required."
         },
         "SUBMIT": "Lähetä"
       },
       "BUTTON_TEXT": "Muokkaa",
       "API": {
-        "SUCCESS_MESSAGE": "Tallennettu vastaus päivitetty onnistuneesti",
+        "SUCCESS_MESSAGE": "Canned response is updated successfully.",
         "ERROR_MESSAGE": "Yhteyden muodostaminen Woot-palvelimelle ei onnistunut, yritä myöhemmin uudelleen"
       }
     },
     "DELETE": {
       "BUTTON_TEXT": "Poista",
       "API": {
-        "SUCCESS_MESSAGE": "Tallennettu vastaus poistettu onnistuneesti",
+        "SUCCESS_MESSAGE": "Canned response deleted successfully.",
         "ERROR_MESSAGE": "Yhteyden muodostaminen Woot-palvelimelle ei onnistunut, yritä myöhemmin uudelleen"
       },
       "CONFIRM": {
-        "TITLE": "Vahvista poistaminen",
+        "TITLE": "Confirm deletion",
         "MESSAGE": "Oletko varma että haluat poistaa ",
-        "YES": "Kyllä, poista ",
-        "NO": "Ei, säilytä "
+        "YES": "Yes, delete ",
+        "NO": "No, keep "
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/fi/contact.json b/app/javascript/dashboard/i18n/locale/fi/contact.json
index 544015dbd..8afed55d0 100644
--- a/app/javascript/dashboard/i18n/locale/fi/contact.json
+++ b/app/javascript/dashboard/i18n/locale/fi/contact.json
@@ -200,7 +200,7 @@
         "ERROR": "Subject can't be empty"
       },
       "MESSAGE": {
-        "LABEL": "Message",
+        "LABEL": "Viesti",
         "PLACEHOLDER": "Write your message here",
         "ERROR": "Message can't be empty"
       },
@@ -309,20 +309,20 @@
       },
       "VALUE": {
         "LABEL": "Attribute value",
-        "PLACEHOLDER": "Eg: 11901 "
+        "PLACEHOLDER": "Esim: 11901 "
       },
       "ADD": {
         "TITLE": "Luo uusi määrite ",
-        "SUCCESS": "Attribute added successfully",
-        "ERROR": "Unable to add attribute. Please try again later"
+        "SUCCESS": "Attribuutin lisäys onnistui",
+        "ERROR": "Attribuuttia ei voitu lisätä. Yritä myöhemmin uudelleen"
       },
       "UPDATE": {
-        "SUCCESS": "Attribute updated successfully",
-        "ERROR": "Unable to update attribute. Please try again later"
+        "SUCCESS": "Tunniste päivitetty onnistuneesti",
+        "ERROR": "Attribuuttia ei voida päivittää. Yritä myöhemmin uudelleen"
       },
       "DELETE": {
-        "SUCCESS": "Attribute deleted successfully",
-        "ERROR": "Unable to delete attribute. Please try again later"
+        "SUCCESS": "Attribuutin poisto onnistui",
+        "ERROR": "Attribuuttia ei voida poistaa. Yritä uudelleen myöhemmin"
       },
       "ATTRIBUTE_SELECT": {
         "TITLE": "Lisää määritteitä",
@@ -331,15 +331,15 @@
       },
       "ATTRIBUTE_TYPE": {
         "LIST": {
-          "PLACEHOLDER": "Select value",
-          "SEARCH_INPUT_PLACEHOLDER": "Search value",
+          "PLACEHOLDER": "Valitse arvo",
+          "SEARCH_INPUT_PLACEHOLDER": "Etsi arvo",
           "NO_RESULT": "Tuloksia ei löytynyt"
         }
       }
     },
     "VALIDATIONS": {
-      "REQUIRED": "Valid value is required",
-      "INVALID_URL": "Invalid URL"
+      "REQUIRED": "Kelvollinen arvo vaaditaan",
+      "INVALID_URL": "Virheellinen URL"
     }
   },
   "MERGE_CONTACTS": {
@@ -355,7 +355,7 @@
       "HELP_LABEL": "Säilytetään"
     },
     "SUMMARY": {
-      "TITLE": "Summary",
+      "TITLE": "Yhteenveto",
       "DELETE_WARNING": "Contact of <strong>%{primaryContactName}</strong> will be deleted.",
       "ATTRIBUTE_WARNING": "Contact details of <strong>%{primaryContactName}</strong> will be copied to <strong>%{parentContactName}</strong>."
     },
diff --git a/app/javascript/dashboard/i18n/locale/fi/conversation.json b/app/javascript/dashboard/i18n/locale/fi/conversation.json
index 319c53def..8a9af526d 100644
--- a/app/javascript/dashboard/i18n/locale/fi/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/fi/conversation.json
@@ -270,17 +270,17 @@
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
     "ADD_BUTTON_TEXT": "Create attribute",
     "UPDATE": {
-      "SUCCESS": "Attribute updated successfully",
-      "ERROR": "Unable to update attribute. Please try again later"
+      "SUCCESS": "Tunniste päivitetty onnistuneesti",
+      "ERROR": "Attribuuttia ei voida päivittää. Yritä myöhemmin uudelleen"
     },
     "ADD": {
       "TITLE": "Add",
-      "SUCCESS": "Attribute added successfully",
-      "ERROR": "Unable to add attribute. Please try again later"
+      "SUCCESS": "Attribuutin lisäys onnistui",
+      "ERROR": "Attribuuttia ei voitu lisätä. Yritä myöhemmin uudelleen"
     },
     "DELETE": {
-      "SUCCESS": "Attribute deleted successfully",
-      "ERROR": "Unable to delete attribute. Please try again later"
+      "SUCCESS": "Attribuutin poisto onnistui",
+      "ERROR": "Attribuuttia ei voida poistaa. Yritä uudelleen myöhemmin"
     },
     "ATTRIBUTE_SELECT": {
       "TITLE": "Lisää määritteitä",
diff --git a/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json
index 96420e8a7..029ec4a8f 100644
--- a/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json
@@ -410,7 +410,7 @@
         "FOR_EG": "For eg:",
         "FRIENDLY": {
           "TITLE": "Friendly",
-          "FROM": "from",
+          "FROM": "lähettäjä",
           "SUBTITLE": "Add the name of the agent who sent the reply in the sender name to make it friendly."
         },
         "PROFESSIONAL": {
diff --git a/app/javascript/dashboard/i18n/locale/fi/search.json b/app/javascript/dashboard/i18n/locale/fi/search.json
index 8c59027b3..8e8487378 100644
--- a/app/javascript/dashboard/i18n/locale/fi/search.json
+++ b/app/javascript/dashboard/i18n/locale/fi/search.json
@@ -19,7 +19,7 @@
     "BOT_LABEL": "Botti",
     "READ_MORE": "Read more",
     "WROTE": "wrote:",
-    "FROM": "from",
+    "FROM": "lähettäjä",
     "EMAIL": "sähköposti"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hu/advancedFilters.json b/app/javascript/dashboard/i18n/locale/hu/advancedFilters.json
index 740ddb6fe..22a26ac68 100644
--- a/app/javascript/dashboard/i18n/locale/hu/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/hu/advancedFilters.json
@@ -1,18 +1,18 @@
 {
   "FILTER": {
     "TITLE": "Beszélgetések szűrése",
-    "SUBTITLE": "Adj meg szűrőket alább, majd kattints a \"Szűrők alkalmazása\" gombra a szűréshez.",
+    "SUBTITLE": "Adja hozzá a szűrőket az alábbiakban, és nyomja meg a \"Szűrők alkalmazása\" gombot.",
     "EDIT_CUSTOM_FILTER": "Mappa szerkesztése",
     "CUSTOM_VIEWS_SUBTITLE": "Adj hozzá vagy törölj szűrőket, és frissítsd a mappát.",
     "ADD_NEW_FILTER": "Szűrő hozzáadása",
-    "FILTER_DELETE_ERROR": "Kötelező legalább egy szűrőt megadni a mentéshez",
+    "FILTER_DELETE_ERROR": "Hoppá, úgy tűnik, semmit sem tudunk elmenteni! Kérjük, adjon hozzá legalább egy szűrőt a mentéshez.",
     "SUBMIT_BUTTON_LABEL": "Szűrők alkalmazása",
     "UPDATE_BUTTON_LABEL": "Mappa frissítése",
     "CANCEL_BUTTON_LABEL": "Mégse",
     "CLEAR_BUTTON_LABEL": "Szűrők törlése",
-    "EMPTY_VALUE_ERROR": "Kötelező megadni",
     "FOLDER_LABEL": "Mappa neve",
     "FOLDER_QUERY_LABEL": "Mappa lekérdezés",
+    "EMPTY_VALUE_ERROR": "Kötelező megadni.",
     "TOOLTIP_LABEL": "Beszélgetések szűrése",
     "QUERY_DROPDOWN_LABELS": {
       "AND": "ÉS",
@@ -36,11 +36,11 @@
     },
     "ATTRIBUTES": {
       "STATUS": "Státusz",
-      "ASSIGNEE_NAME": "Felelős neve",
+      "ASSIGNEE_NAME": "Jogosult neve",
       "INBOX_NAME": "Fiók név",
-      "TEAM_NAME": "Csapat neve",
-      "CONVERSATION_IDENTIFIER": "Beszélgetés azonosító",
-      "CAMPAIGN_NAME": "Kampány neve",
+      "TEAM_NAME": "Csapatnév",
+      "CONVERSATION_IDENTIFIER": "Beszélgetés azonosítója",
+      "CAMPAIGN_NAME": "Vállalkozás neve",
       "LABELS": "Cimkék",
       "BROWSER_LANGUAGE": "Böngésző nyelve",
       "PRIORITY": "Prioritás",
@@ -55,25 +55,25 @@
       "LAST_ACTIVITY": "Utolsó aktivitás"
     },
     "GROUPS": {
-      "STANDARD_FILTERS": "Alap szűrők",
-      "ADDITIONAL_FILTERS": "Extra szűrők",
-      "CUSTOM_ATTRIBUTES": "Egyedi atribútumok"
+      "STANDARD_FILTERS": "Standard szűrők",
+      "ADDITIONAL_FILTERS": "További szűrők",
+      "CUSTOM_ATTRIBUTES": "Egyéni tulajdonságok"
     },
     "CUSTOM_VIEWS": {
       "ADD": {
         "TITLE": "El akarod menteni ezt a szűrőt?",
         "LABEL": "Nevezd el a szűrőt",
-        "PLACEHOLDER": "Adj nevet a szűrőnek",
-        "ERROR_MESSAGE": "Név kötelező",
+        "PLACEHOLDER": "Nevezze el a szűrőt, hogy később hivatkozhasson rá.",
+        "ERROR_MESSAGE": "Név kötelező.",
         "SAVE_BUTTON": "Szűrő mentése",
         "CANCEL_BUTTON": "Mégse",
         "API_FOLDERS": {
-          "SUCCESS_MESSAGE": "Mappa sikeresen létrehozva",
-          "ERROR_MESSAGE": "Hiba történt a mappa létrehozása során"
+          "SUCCESS_MESSAGE": "Mappa sikeresen létrehozva.",
+          "ERROR_MESSAGE": "Hiba történt a mappa létrehozása során."
         },
         "API_SEGMENTS": {
-          "SUCCESS_MESSAGE": "Szegmens sikeresen létrehozva",
-          "ERROR_MESSAGE": "Hiba történt a szegmens törlésekor"
+          "SUCCESS_MESSAGE": "Szegmens sikeresen létrehozva.",
+          "ERROR_MESSAGE": "Hiba történt a szegmens törlésekor."
         }
       },
       "EDIT": {
@@ -85,17 +85,17 @@
           "CONFIRM": {
             "TITLE": "Törlés megerősítése",
             "MESSAGE": "Biztosan törölni akarod a szűrőt ",
-            "YES": "Igen, Törlés",
-            "NO": "Nem, tartsa meg"
+            "YES": "Igen, törlés",
+            "NO": "Nem, tartsd meg"
           }
         },
         "API_FOLDERS": {
-          "SUCCESS_MESSAGE": "Mappa sikeresen törölve",
-          "ERROR_MESSAGE": "Hiba történt a mappa törlése során"
+          "SUCCESS_MESSAGE": "Mappa sikeresen törölve.",
+          "ERROR_MESSAGE": "Hiba történt a mappa törlése során."
         },
         "API_SEGMENTS": {
-          "SUCCESS_MESSAGE": "Szegmens törölve",
-          "ERROR_MESSAGE": "Hiba történt a szegmens törlése során"
+          "SUCCESS_MESSAGE": "Szegmens törölve.",
+          "ERROR_MESSAGE": "Hiba történt a szegmens törlése során."
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/hu/agentBots.json b/app/javascript/dashboard/i18n/locale/hu/agentBots.json
index fdf2efdc0..7d1d30f13 100644
--- a/app/javascript/dashboard/i18n/locale/hu/agentBots.json
+++ b/app/javascript/dashboard/i18n/locale/hu/agentBots.json
@@ -3,66 +3,66 @@
     "HEADER": "Botok",
     "LOADING_EDITOR": "Szerkesztő betöltése...",
     "HEADER_BTN_TXT": "Bot konfiguráció hozzáadása",
-    "SIDEBAR_TXT": "<p><b>Ügynökök</b> <p>Az ügynökök lehetővé teszik a beszélgetés automatizálását</p>",
+    "SIDEBAR_TXT": "<p><b>Agent Bots</b> <p>Agent Bots are like the most fabulous members of your team. They can handle the small stuff, so you can focus on the stuff that matters. Give them a try.</p> <p> You can manage your bots from this page or create new ones using the 'Add bot configuraton' button.</p> <p> Open the <a href=\"https://www.chatwoot.com/hc/chatwoot-user-guide-cloud-version/articles/1677497472-how-to-use-agent-bots\" target=\"blank\">Agent bots handbook</a> in another tab for a helping hand.</p>",
     "CSML_BOT_EDITOR": {
       "NAME": {
         "LABEL": "Bot neve",
-        "PLACEHOLDER": "Adj nevet a botodnak",
-        "ERROR": "Bot név megadása kötelező"
+        "PLACEHOLDER": "Nevezd el a botodat.",
+        "ERROR": "Bot név megadása kötelező."
       },
       "DESCRIPTION": {
-        "LABEL": "Bot leírása",
+        "LABEL": "Bot leírás",
         "PLACEHOLDER": "Mit csinál ez a bot?"
       },
       "BOT_CONFIG": {
-        "ERROR": "Add meg a CSML bot konfigurációt feljebb",
-        "API_ERROR": "A CSML konfigurációd invalid, javítsd, majd próbáld újra."
+        "ERROR": "Add meg a CSML bot konfigurációt feljebb.",
+        "API_ERROR": "A CSML konfigurációja érvénytelen. Kérjük, javítsa ki és próbálja meg újra."
       },
       "SUBMIT": "Validáció és mentés"
     },
     "BOT_CONFIGURATION": {
       "TITLE": "Válassz ügynököt",
-      "DESC": "Beemelhet egy ügynök botot a listából ebbe a postafiókba. A bot kezdetben képes kezelni a beszélgetést és továbbítani tudja egy ügynöknek, ha az szükséges.",
+      "DESC": "Rendeljen egy Agent Botot a postaládájához. Ők képesek kezelni a kezdeti beszélgetéseket, és szükség esetén átirányítani őket egy emberhez.",
       "SUBMIT": "Frissítés",
-      "DISCONNECT": "Bot leválasztása",
-      "SUCCESS_MESSAGE": "Ügynök frissítve",
-      "DISCONNECTED_SUCCESS_MESSAGE": "Ügynök leválasztva",
-      "ERROR_MESSAGE": "Nem sikerült frissíteni az ügynököt, próbáld újra később",
-      "DISCONNECTED_ERROR_MESSAGE": "Nem sikerült leválasztani az ügynököt, próbáld újra később",
-      "SELECT_PLACEHOLDER": "Válasssz botot"
+      "DISCONNECT": "Bot lekapcsolása",
+      "SUCCESS_MESSAGE": "Ügynök frissítve.",
+      "DISCONNECTED_SUCCESS_MESSAGE": "Ügynök leválasztva.",
+      "ERROR_MESSAGE": "Nem sikerült frissíteni a botot. Kérjük, próbálja meg újra.",
+      "DISCONNECTED_ERROR_MESSAGE": "Nem sikerült leválasztani az botot. Kérjük, próbálja meg újra.",
+      "SELECT_PLACEHOLDER": "Válassza ki a botot"
     },
     "ADD": {
       "TITLE": "Új bot beállítása",
       "CANCEL_BUTTON_TEXT": "Mégse",
       "API": {
-        "SUCCESS_MESSAGE": "Bot hozzáadva",
-        "ERROR_MESSAGE": "Sikertelen bot hozzáadás"
+        "SUCCESS_MESSAGE": "Bot hozzáadva.",
+        "ERROR_MESSAGE": "Nem tudott botot hozzáadni. Kérjük, próbálja meg később újra."
       }
     },
     "LIST": {
-      "404": "Nem található Bot, létrehozhatsz egyet az 'Új Bot létrehozása' gomb megnyomásával",
-      "LOADING": "Botok keresése...",
-      "TYPE": "Bot típusa"
+      "404": "Nem találtunk botokat. A 'Új bot konfigurálása' gombra kattintva hozhat létre botot ↗",
+      "LOADING": "Botok hívása...",
+      "TYPE": "Bot típus"
     },
     "DELETE": {
       "BUTTON_TEXT": "Törlés",
       "TITLE": "Bot törlése",
       "SUBMIT": "Törlés",
       "CANCEL_BUTTON_TEXT": "Mégse",
-      "DESCRIPTION": "Biztosan törölni szeretnéd ezt a botot? Ez a művelet visszafordíthatatlan",
+      "DESCRIPTION": "Biztosan törölni szeretnéd ezt a botot? Ez a művelet visszafordíthatatlan.",
       "API": {
-        "SUCCESS_MESSAGE": "Bot törölve",
-        "ERROR_MESSAGE": "Nem sikerült frissíteni a botot, kérlek próbáld újra később"
+        "SUCCESS_MESSAGE": "Bot törölve.",
+        "ERROR_MESSAGE": "Nem sikerült törölni a botot. Kérjük, próbálja újra."
       }
     },
     "EDIT": {
       "BUTTON_TEXT": "Szerkesztés",
-      "LOADING": "Botok keresése...",
+      "LOADING": "Botok hívása...",
       "TITLE": "Bot szerkesztése",
       "CANCEL_BUTTON_TEXT": "Mégse",
       "API": {
-        "SUCCESS_MESSAGE": "Bot frissítve",
-        "ERROR_MESSAGE": "Nem sikerült frissíteni a botot"
+        "SUCCESS_MESSAGE": "Bot frissítve.",
+        "ERROR_MESSAGE": "Nem tudta frissíteni a botot. Kérjük, próbálja újra."
       }
     },
     "TYPES": {
diff --git a/app/javascript/dashboard/i18n/locale/hu/bulkActions.json b/app/javascript/dashboard/i18n/locale/hu/bulkActions.json
index 711a29e82..c57da4956 100644
--- a/app/javascript/dashboard/i18n/locale/hu/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/hu/bulkActions.json
@@ -9,32 +9,32 @@
     "YES": "Igen",
     "ASSIGN_AGENT_TOOLTIP": "Ügynök hozzárendelése",
     "ASSIGN_TEAM_TOOLTIP": "Csapat hozzárendelése",
-    "ASSIGN_SUCCESFUL": "Beszélgetés sikeresen hozzá lett rendelve",
-    "ASSIGN_FAILED": "Sikertelen hozzárendelni beszégetéseket, kérlek, próbáld újra",
-    "RESOLVE_SUCCESFUL": "Beszélgetés sikeresen megoldva",
-    "RESOLVE_FAILED": "Sikertelen megoldani a beszélgetéseket, kérlek, próbáld újra",
+    "ASSIGN_SUCCESFUL": "Beszélgetés sikeresen hozzá lett rendelve.",
+    "ASSIGN_FAILED": "Nem sikerült beszélgetéseket hozzárendelni. Kérjük, próbálja újra.",
+    "RESOLVE_SUCCESFUL": "Beszélgetés sikeresen megoldva.",
+    "RESOLVE_FAILED": "Nem sikerült megoldani a beszélgetéseket. Kérjük, próbálja újra.",
     "ALL_CONVERSATIONS_SELECTED_ALERT": "Csak a kiválasztott beszélgetések láthatóak ezen az oldalon.",
     "AGENT_LIST_LOADING": "Ügynökök betöltése",
     "UPDATE": {
       "CHANGE_STATUS": "Státusz változtatása",
-      "SNOOZE_UNTIL_NEXT_REPLY": "Alvómód a következő válaszig",
+      "SNOOZE_UNTIL_NEXT_REPLY": "Alvómód a következő válaszig.",
       "UPDATE_SUCCESFUL": "Beszélgetés státusza sikeresen frissítve ",
-      "UPDATE_FAILED": "A beszélgetés frissítése sikertelen, kérlek, próbáld újra"
+      "UPDATE_FAILED": "Nem sikerült frissíteni a beszélgetéseket. Kérjük, próbálja újra."
     },
     "LABELS": {
-      "ASSIGN_LABELS": "Cimke hozzáadása",
+      "ASSIGN_LABELS": "Címkék hozzárendelése",
       "NO_LABELS_FOUND": "Nem található cimke erre:",
       "ASSIGN_SELECTED_LABELS": "Válogatott címkék hozzárendelése",
-      "ASSIGN_SUCCESFUL": "Címkék hozzárendelése sikeres",
-      "ASSIGN_FAILED": "Címkék hozzárendelése sikertelne, kérlek, próbáld újra"
+      "ASSIGN_SUCCESFUL": "Címkék hozzárendelése sikeres.",
+      "ASSIGN_FAILED": "Nem sikerült címkéket hozzárendelni. Kérjük, próbálja újra."
     },
     "TEAMS": {
       "TEAM_SELECT_LABEL": "Csapat kiválasztása",
       "NONE": "Nincs",
       "NO_TEAMS_AVAILABLE": "Ebben a fiókban még nincs csapat létrehozva.",
-      "ASSIGN_SELECTED_TEAMS": "Válogatott csapatok hozzárendelése",
-      "ASSIGN_SUCCESFUL": "Csapatok hozzárendelése sikeres",
-      "ASSIGN_FAILED": "Csapatok hozzárendelése sikertelen, kérlek, próbáld újra"
+      "ASSIGN_SELECTED_TEAMS": "Válogatott csapatok hozzárendelése.",
+      "ASSIGN_SUCCESFUL": "Csapatok hozzárendelése sikeres.",
+      "ASSIGN_FAILED": "Nem sikerült csapatot kijelölni. Kérjük, próbálja újra."
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hu/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/hu/cannedMgmt.json
index 64482a806..f0d0d0916 100644
--- a/app/javascript/dashboard/i18n/locale/hu/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hu/cannedMgmt.json
@@ -1,75 +1,75 @@
 {
   "CANNED_MGMT": {
     "HEADER": "Mentett válaszok",
-    "HEADER_BTN_TXT": "Mentett válasz hozzáadása",
-    "LOADING": "Mentett válaszok letöltése",
-    "SEARCH_404": "Nincs megfelelő elem",
-    "SIDEBAR_TXT": "<p><b>Mentett válaszok</b> </p><p> A mentett válaszok sablonok, melyeket gyors válaszok kiküldésére használhatsz. </p><p> Mentett válasz létrehozásához kattints a <b>Mentett válasz létrehozása</b>-ra. Szerkesztheted vagy törölheted is a mentett válaszokat a Szerkesztés és Törlés gombokkal. A mentett válaszokat <b>rövidkódok</b> segítéségével használhatod. Az ügynökök a <b>'/'</b> jel begépelésével és a megfelelő rövidkód begépelésével férhetnek hozzá a válaszokhoz.</p>",
+    "HEADER_BTN_TXT": "Sablon válasz hozzáadása",
+    "LOADING": "Sablon válaszok lekérése...",
+    "SEARCH_404": "Nincs megfelelő elem.",
+    "SIDEBAR_TXT": "<p><b>Canned Responses</b> </p><p> Canned Responses are pre-written reply templates that help you quickly respond to a conversation. To insert a canned response during a chat, agents can type a short code preceded by a '/' character. </p><p> You can manage your canned responses from this page or create new ones using the \"Add canned response\" button.</p><p>Open the <a target=\"_blank\" href=\"https://www.chatwoot.com/hc/chatwoot-user-guide-cloud-version/articles/1677501325-how-to-create-saved-reply-templates-with-canned-responses\">Canned Responses handbook</a> in another tab for a helping hand.</p><p>Also, check out the all-new <a href=\"https://www.chatwoot.com/tools/canned-responses-library\" target=\"_blank\">Canned Responses Library</a>.</p>",
     "LIST": {
       "404": "Nincs megfelelő mentett válasz ebben a fiókban.",
       "TITLE": "Mentett válaszok kezelése",
-      "DESC": "A mentett válaszok előre meghatározott sablonok, melyeket gyors válaszok kiküldésére használhatsz.",
+      "DESC": "A sablon válaszok előre definiáltak, amelyek segítségével gyorsan küldhet válaszokat a beszélgetésekre.",
       "TABLE_HEADER": [
-        "Rövidkód",
+        "Rövid kód",
         "Tartalom",
         "Műveletek"
       ]
     },
     "ADD": {
-      "TITLE": "Mentett válasz hozzáadása",
-      "DESC": "A mentett válaszok előre meghatározott sablonok, melyeket gyors válaszok kiküldésére használhatsz.",
+      "TITLE": "Sablon válasz hozzáadása",
+      "DESC": "A sablon válaszok előre definiáltak, amelyek segítségével gyorsan küldhet válaszokat a beszélgetésekre.",
       "CANCEL_BUTTON_TEXT": "Mégse",
       "FORM": {
         "SHORT_CODE": {
-          "LABEL": "Rövidkód",
-          "PLACEHOLDER": "Add meg a shortcode-ot",
-          "ERROR": "Rövidkód szükséges"
+          "LABEL": "Rövid kód",
+          "PLACEHOLDER": "Kérjük, adjon meg egy rövid kódot.",
+          "ERROR": "Rövid kód szükséges."
         },
         "CONTENT": {
-          "LABEL": "Tartalom",
-          "PLACEHOLDER": "Kérjük adj meg tartalmat",
-          "ERROR": "Tartalom szükséges"
+          "LABEL": "Üzenet",
+          "PLACEHOLDER": "Kérjük, írja meg az üzenetet, amelyet sablonként szeretne elmenteni, hogy később felhasználhassa.",
+          "ERROR": "Üzenetre van szükség."
         },
         "SUBMIT": "Elküldés"
       },
       "API": {
-        "SUCCESS_MESSAGE": "A mentett válasz sikeresen hozzáadva",
+        "SUCCESS_MESSAGE": "Sikeresen hozzáadva a sablon válasz.",
         "ERROR_MESSAGE": "Nem sikerült csatlakozni a Woot szerverhez, kérjük próbáld később"
       }
     },
     "EDIT": {
-      "TITLE": "Mentett válasz szerkesztése",
+      "TITLE": "Sablon válasz szerkesztése",
       "CANCEL_BUTTON_TEXT": "Mégse",
       "FORM": {
         "SHORT_CODE": {
-          "LABEL": "Rövidkód",
-          "PLACEHOLDER": "Kérjük adj meg egy Rövidkódot",
-          "ERROR": "Rövidkód szükséges"
+          "LABEL": "Rövid kód",
+          "PLACEHOLDER": "Kérjük, adjon meg egy rövidkódot.",
+          "ERROR": "Rövid kód szükséges."
         },
         "CONTENT": {
-          "LABEL": "Tartalom",
-          "PLACEHOLDER": "Kérjük adj meg tartalmat",
-          "ERROR": "Tartalom szükséges"
+          "LABEL": "Üzenet",
+          "PLACEHOLDER": "Kérjük, írja meg az üzenetet, amelyet sablonként szeretne elmenteni, hogy később felhasználhassa.",
+          "ERROR": "Üzenet kötelező."
         },
         "SUBMIT": "Elküldés"
       },
       "BUTTON_TEXT": "Szerkesztés",
       "API": {
-        "SUCCESS_MESSAGE": "A mentett válasz sikeresen frissítve",
+        "SUCCESS_MESSAGE": "A sablon válasz sikeresen frissült.",
         "ERROR_MESSAGE": "Nem sikerült csatlakozni a Woot szerverhez, kérjük próbáld később"
       }
     },
     "DELETE": {
       "BUTTON_TEXT": "Törlés",
       "API": {
-        "SUCCESS_MESSAGE": "A mentett válasz sikeresen törölve",
+        "SUCCESS_MESSAGE": "A sablon válasz sikeresen törölve.",
         "ERROR_MESSAGE": "Nem sikerült csatlakozni a Woot szerverhez, kérjük próbáld később"
       },
       "CONFIRM": {
         "TITLE": "Törlés megerősítése",
         "MESSAGE": "Biztos abban, hogy törli ",
-        "YES": "Igen, Törlés ",
-        "NO": "Nem, Mégse "
+        "YES": "Igen, törlés ",
+        "NO": "Nem, mégse "
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/sv/helpCenter.json b/app/javascript/dashboard/i18n/locale/sv/helpCenter.json
index afa6b7ebe..fe2e8cd26 100644
--- a/app/javascript/dashboard/i18n/locale/sv/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/sv/helpCenter.json
@@ -240,7 +240,7 @@
           "ERROR": "Enter a valid domain URL"
         },
         "HOME_PAGE_LINK": {
-          "LABEL": "Home Page Link",
+          "LABEL": "Länk till startsida",
           "PLACEHOLDER": "Portal home page link",
           "HELP_TEXT": "The link used to return from the portal to the home page. Eg: https://example.com",
           "ERROR": "Enter a valid home page URL"
diff --git a/app/javascript/widget/i18n/locale/fi.json b/app/javascript/widget/i18n/locale/fi.json
index 8e522cda6..3354d042d 100644
--- a/app/javascript/widget/i18n/locale/fi.json
+++ b/app/javascript/widget/i18n/locale/fi.json
@@ -8,8 +8,8 @@
       "SUBMIT": "Lähetä"
     },
     "MESSAGE_BUBBLE": {
-      "RETRY": "Send message again",
-      "ERROR_MESSAGE": "Couldn't send, try again"
+      "RETRY": "Lähetä viesti uudelleen",
+      "ERROR_MESSAGE": "Ei voitu lähettää, yritä uudestaan"
     }
   },
   "TEAM_AVAILABILITY": {
@@ -20,27 +20,27 @@
     "IN_A_FEW_MINUTES": "Vastaa tyypillisesti muutamassa minuutissa",
     "IN_A_FEW_HOURS": "Tyypillisesti vastaa muutaman tunnin kuluessa",
     "IN_A_DAY": "Vastaa tyypillisesti päivässä",
-    "BACK_IN": "We will be back online"
+    "BACK_IN": "Tulemme olemaan takaisin linjoilla"
   },
   "DAY_NAMES": [
-    "Sunday",
-    "Monday",
-    "Tuesday",
-    "Wednesday",
-    "Thursday",
-    "Friday",
-    "Saturday"
+    "Sunnuntai",
+    "Maanantai",
+    "Tiistai",
+    "Keskiviikko",
+    "Torstai",
+    "Perjantai",
+    "Lauantai"
   ],
   "START_CONVERSATION": "Aloita keskustelu",
-  "END_CONVERSATION": "End Conversation",
-  "CONTINUE_CONVERSATION": "Continue conversation",
-  "YOU": "You",
-  "START_NEW_CONVERSATION": "Start a new conversation",
-  "VIEW_UNREAD_MESSAGES": "You have unread messages",
+  "END_CONVERSATION": "Lopeta keskustelu",
+  "CONTINUE_CONVERSATION": "Jatka keskustelua",
+  "YOU": "Sinä",
+  "START_NEW_CONVERSATION": "Aloita uusi keskustelu",
+  "VIEW_UNREAD_MESSAGES": "Sinulla on lukemattomia viestejä",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Näytä uudet viestit",
     "CLOSE_MESSAGES_BUTTON": "Sulje",
-    "COMPANY_FROM": "from",
+    "COMPANY_FROM": "lähettäjä",
     "BOT": "Botti"
   },
   "BUBBLE": {
@@ -56,62 +56,62 @@
       "FULL_NAME": {
         "LABEL": "Koko nimi",
         "PLACEHOLDER": "Syötä koko nimesi",
-        "REQUIRED_ERROR": "Full Name is required"
+        "REQUIRED_ERROR": "Koko nimi vaaditaan"
       },
       "EMAIL_ADDRESS": {
         "LABEL": "Sähköpostiosoite",
-        "PLACEHOLDER": "Please enter your email address",
-        "REQUIRED_ERROR": "Email Address is required",
+        "PLACEHOLDER": "Ole hyvä ja syötä sähköpostiosoitteesi",
+        "REQUIRED_ERROR": "Sähköpostiosoite on pakollinen",
         "VALID_ERROR": "Ole hyvä ja syötä validi sähköposti"
       },
       "PHONE_NUMBER": {
         "LABEL": "Puhelinnumero",
-        "PLACEHOLDER": "Please enter your phone number",
-        "REQUIRED_ERROR": "Phone Number is required",
-        "DIAL_CODE_VALID_ERROR": "Please select a country code",
-        "VALID_ERROR": "Please enter a valid phone number",
-        "DROPDOWN_EMPTY": "No results found"
+        "PLACEHOLDER": "Ole hyvä ja syötä puhelinnumero",
+        "REQUIRED_ERROR": "Puhelinnumero vaaditaan",
+        "DIAL_CODE_VALID_ERROR": "Ole hyvä ja valitse maakoodi",
+        "VALID_ERROR": "Anna kelvollinen puhelinnumero",
+        "DROPDOWN_EMPTY": "Tuloksia ei löytynyt"
       },
       "MESSAGE": {
-        "LABEL": "Message",
-        "PLACEHOLDER": "Please enter your message",
-        "ERROR": "Message too short"
+        "LABEL": "Viesti",
+        "PLACEHOLDER": "Ole hyvä ja syötä viesti",
+        "ERROR": "Viesti on liian lyhyt"
       }
     },
-    "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation",
-    "IS_REQUIRED": "is required",
-    "REQUIRED": "Required"
+    "CAMPAIGN_HEADER": "Ole hyvä ja anna nimesi ja sähköpostisi ennen keskustelun aloittamista",
+    "IS_REQUIRED": "on vaadittu",
+    "REQUIRED": "Pakollinen"
   },
-  "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
+  "FILE_SIZE_LIMIT": "Tiedosto ylittää sallitun {MAXIMUM_FILE_UPLOAD_SIZE} liitteen rajan",
   "CHAT_FORM": {
     "INVALID": {
-      "FIELD": "Invalid field"
+      "FIELD": "Virheellinen kenttä"
     }
   },
   "EMOJI": {
-    "PLACEHOLDER": "Search emojis",
-    "NOT_FOUND": "No emoji match your search"
+    "PLACEHOLDER": "Etsi emojeista",
+    "NOT_FOUND": "Yksikään emoji ei vastaa hakuasi"
   },
   "CSAT": {
     "TITLE": "Anna arvio palvelusta",
     "SUBMITTED_TITLE": "Kiitos, että lähetit arvion",
-    "PLACEHOLDER": "Tell us more..."
+    "PLACEHOLDER": "Kerro meille lisää..."
   },
   "EMAIL_TRANSCRIPT": {
-    "BUTTON_TEXT": "Request a conversation transcript",
+    "BUTTON_TEXT": "Lähetä keskustelun tallenne",
     "SEND_EMAIL_SUCCESS": "Chat-keskustelu on lähetetty onnistuneesti",
     "SEND_EMAIL_ERROR": "Tapahtui virhe, yritä uudelleen"
   },
   "INTEGRATIONS": {
     "DYTE": {
-      "CLICK_HERE_TO_JOIN": "Click here to join",
-      "LEAVE_THE_ROOM": "Leave the call"
+      "CLICK_HERE_TO_JOIN": "Klikkaa tästä liittyäksesi",
+      "LEAVE_THE_ROOM": "Poistu puhelusta"
     }
   },
   "PORTAL": {
-    "POPULAR_ARTICLES": "Popular Articles",
-    "VIEW_ALL_ARTICLES": "View all articles",
-    "IFRAME_LOAD_ERROR": "There was an error loading the article, please refresh the page and try again."
+    "POPULAR_ARTICLES": "Suosittuja artikkeleita",
+    "VIEW_ALL_ARTICLES": "Näytä kaikki artikkelit",
+    "IFRAME_LOAD_ERROR": "Artikkelin lataamisessa tapahtui virhe. Ole hyvä ja päivitä sivu ja yritä uudelleen."
   },
   "ATTACHMENTS": {
     "image": {
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 3bff2a796..2fab43f9e 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -190,7 +190,7 @@ sv:
       empty_placeholder: Inga resultat hittades.
       loading_placeholder: Searching...
       results_title: Search results
-    toc_header: 'On this page'
+    toc_header: 'På denna sida'
     hero:
       sub_title: Sök efter artiklarna här eller bläddra i kategorierna nedan.
     common:
@@ -201,9 +201,9 @@ sv:
       articles: artiklar
       no_articles: Det finns inga artiklar här
     footer:
-      made_with: Made with
+      made_with: Gjord med
     header:
-      go_to_homepage: Go to the main site
+      go_to_homepage: Gå till hemsidan
   slack_unfurl:
     fields:
       name: Namn

From 4999f7ed234566e7af2ba2eb73722d1bc6bef5d8 Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Date: Thu, 2 Nov 2023 15:19:19 +0530
Subject: [PATCH 46/94] fix: Fixes wrong page size in category filter in
 articles page  (#8270)

---
 app/controllers/api/v1/accounts/articles_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/api/v1/accounts/articles_controller.rb b/app/controllers/api/v1/accounts/articles_controller.rb
index 7762cc476..d164778ac 100644
--- a/app/controllers/api/v1/accounts/articles_controller.rb
+++ b/app/controllers/api/v1/accounts/articles_controller.rb
@@ -10,7 +10,7 @@ class Api::V1::Accounts::ArticlesController < Api::V1::Accounts::BaseController
     @articles_count = @all_articles.count
 
     @articles = if list_params[:category_slug].present?
-                  @all_articles.order_by_position.page(@current_page).per(50)
+                  @all_articles.order_by_position.page(@current_page)
                 else
                   @all_articles.order_by_updated_at.page(@current_page)
                 end

From 16c36a78f0fed1e61e2f000e8298b0caec5fadc8 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Fri, 3 Nov 2023 00:30:22 +0530
Subject: [PATCH 47/94] chore: Remove sentry exceptions for the message status
 failed errors (#8285)

- Remove sending exceptions to Sentry after capturing the message failed errors.
---
 app/services/facebook/send_on_facebook_service.rb | 8 +++-----
 app/services/twilio/send_on_twilio_service.rb     | 1 -
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/services/facebook/send_on_facebook_service.rb b/app/services/facebook/send_on_facebook_service.rb
index 1f60ff7a5..f7f05ef70 100644
--- a/app/services/facebook/send_on_facebook_service.rb
+++ b/app/services/facebook/send_on_facebook_service.rb
@@ -76,10 +76,8 @@ class Facebook::SendOnFacebookService < Base::SendOnChannelService
 
   def handle_facebook_error(exception)
     # Refer: https://github.com/jgorset/facebook-messenger/blob/64fe1f5cef4c1e3fca295b205037f64dfebdbcab/lib/facebook/messenger/error.rb
-    if exception.to_s.include?('The session has been invalidated') || exception.to_s.include?('Error validating access token')
-      channel.authorization_error!
-    else
-      ChatwootExceptionTracker.new(exception, account: message.account, user: message.sender).capture_exception
-    end
+    return unless exception.to_s.include?('The session has been invalidated') || exception.to_s.include?('Error validating access token')
+
+    channel.authorization_error!
   end
 end
diff --git a/app/services/twilio/send_on_twilio_service.rb b/app/services/twilio/send_on_twilio_service.rb
index 8ebd0178f..3fc420bb2 100644
--- a/app/services/twilio/send_on_twilio_service.rb
+++ b/app/services/twilio/send_on_twilio_service.rb
@@ -9,7 +9,6 @@ class Twilio::SendOnTwilioService < Base::SendOnChannelService
     begin
       twilio_message = channel.send_message(**message_params)
     rescue Twilio::REST::TwilioError, Twilio::REST::RestError => e
-      ChatwootExceptionTracker.new(e, user: message.sender, account: message.account).capture_exception
       message.update!(status: :failed, external_error: e.message)
     end
     message.update!(source_id: twilio_message.sid) if twilio_message

From 36b6c0cb9caad8240e6190c6bc3c8ba59296bdb5 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Fri, 3 Nov 2023 02:21:54 +0530
Subject: [PATCH 48/94] feat: support image height in markdown rendering of
 messages (#8177)

- This PR adds BaseMarkdownRenderer, it takes all the required attributes from the image node, parses the cw_image_height query and renders it.
---
 lib/base_markdown_renderer.rb               | 39 +++++++++++++++++++++
 lib/chatwoot_markdown_renderer.rb           |  4 ++-
 spec/lib/base_markdown_renderer_spec.rb     | 33 +++++++++++++++++
 spec/lib/chatwoot_markdown_renderer_spec.rb |  3 ++
 4 files changed, 78 insertions(+), 1 deletion(-)
 create mode 100644 lib/base_markdown_renderer.rb
 create mode 100644 spec/lib/base_markdown_renderer_spec.rb

diff --git a/lib/base_markdown_renderer.rb b/lib/base_markdown_renderer.rb
new file mode 100644
index 000000000..df49918b3
--- /dev/null
+++ b/lib/base_markdown_renderer.rb
@@ -0,0 +1,39 @@
+class BaseMarkdownRenderer < CommonMarker::HtmlRenderer
+  def image(node)
+    src, title = extract_img_attributes(node)
+    height = extract_image_height(src)
+
+    render_img_tag(src, title, height)
+  end
+
+  private
+
+  def extract_img_attributes(node)
+    [
+      escape_href(node.url),
+      escape_html(node.title)
+    ]
+  end
+
+  def extract_image_height(src)
+    query_params = parse_query_params(src)
+    query_params['cw_image_height']&.first
+  end
+
+  def parse_query_params(url)
+    parsed_url = URI.parse(url)
+    CGI.parse(parsed_url.query || '')
+  rescue URI::InvalidURIError
+    {}
+  end
+
+  def render_img_tag(src, title, height = nil)
+    title_attribute = title.present? ? " title=\"#{title}\"" : ''
+    height_attribute = height ? " height=\"#{height}\" width=\"auto\"" : ''
+
+    plain do
+      # plain ensures that the content is not wrapped in a paragraph tag
+      out("<img src=\"#{src}\"#{title_attribute}#{height_attribute} />")
+    end
+  end
+end
diff --git a/lib/chatwoot_markdown_renderer.rb b/lib/chatwoot_markdown_renderer.rb
index 2d837f8b7..73b52e1d6 100644
--- a/lib/chatwoot_markdown_renderer.rb
+++ b/lib/chatwoot_markdown_renderer.rb
@@ -4,7 +4,9 @@ class ChatwootMarkdownRenderer
   end
 
   def render_message
-    html = CommonMarker.render_html(@content)
+    markdown_renderer = BaseMarkdownRenderer.new
+    doc = CommonMarker.render_doc(@content, :DEFAULT)
+    html = markdown_renderer.render(doc)
     render_as_html_safe(html)
   end
 
diff --git a/spec/lib/base_markdown_renderer_spec.rb b/spec/lib/base_markdown_renderer_spec.rb
new file mode 100644
index 000000000..262e78daf
--- /dev/null
+++ b/spec/lib/base_markdown_renderer_spec.rb
@@ -0,0 +1,33 @@
+require 'rails_helper'
+
+describe BaseMarkdownRenderer do
+  let(:renderer) { described_class.new }
+
+  def render_markdown(markdown)
+    doc = CommonMarker.render_doc(markdown, :DEFAULT)
+    renderer.render(doc)
+  end
+
+  describe '#image' do
+    context 'when image has a height' do
+      it 'renders the img tag with the correct attributes' do
+        markdown = '![Sample Title](https://example.com/image.jpg?cw_image_height=100)'
+        expect(render_markdown(markdown)).to include('<img src="https://example.com/image.jpg?cw_image_height=100" height="100" width="auto" />')
+      end
+    end
+
+    context 'when image does not have a height' do
+      it 'renders the img tag without the height attribute' do
+        markdown = '![Sample Title](https://example.com/image.jpg)'
+        expect(render_markdown(markdown)).to include('<img src="https://example.com/image.jpg" />')
+      end
+    end
+
+    context 'when image has an invalid URL' do
+      it 'renders the img tag without crashing' do
+        markdown = '![Sample Title](invalid_url)'
+        expect { render_markdown(markdown) }.not_to raise_error
+      end
+    end
+  end
+end
diff --git a/spec/lib/chatwoot_markdown_renderer_spec.rb b/spec/lib/chatwoot_markdown_renderer_spec.rb
index dbe9b8245..a3109a7f2 100644
--- a/spec/lib/chatwoot_markdown_renderer_spec.rb
+++ b/spec/lib/chatwoot_markdown_renderer_spec.rb
@@ -5,6 +5,7 @@ RSpec.describe ChatwootMarkdownRenderer do
   let(:doc) { instance_double(CommonMarker::Node) }
   let(:renderer) { described_class.new(markdown_content) }
   let(:markdown_renderer) { instance_double(CustomMarkdownRenderer) }
+  let(:base_markdown_renderer) { instance_double(BaseMarkdownRenderer) }
   let(:html_content) { '<p>This is a <em>test</em> content with <sup>markdown</sup></p>' }
 
   before do
@@ -31,6 +32,8 @@ RSpec.describe ChatwootMarkdownRenderer do
 
     before do
       allow(CommonMarker).to receive(:render_html).with(markdown_content).and_return(message_html_content)
+      allow(BaseMarkdownRenderer).to receive(:new).and_return(base_markdown_renderer)
+      allow(base_markdown_renderer).to receive(:render).with(doc).and_return(message_html_content)
     end
 
     it 'renders the markdown message to html' do

From ebe9daea0025eefc469639e5b9852afa6f0bec8d Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Fri, 3 Nov 2023 15:09:12 +0530
Subject: [PATCH 49/94] chore: Swagger documentation for contact labels APIs
 (#8279)

Co-authored-by: Sojan Jose <sojan@pepalo.com>
---
 swagger/definitions/index.yml                 |  2 +
 .../resource/extension/contact/labels.yml     |  7 ++
 swagger/index.yml                             |  3 +-
 .../application/contacts/labels/create.yml    | 26 ++++++
 .../application/contacts/labels/index.yml     | 14 +++
 swagger/paths/index.yml                       |  8 ++
 swagger/swagger.json                          | 86 +++++++++++++++++++
 7 files changed, 145 insertions(+), 1 deletion(-)
 create mode 100644 swagger/definitions/resource/extension/contact/labels.yml
 create mode 100644 swagger/paths/application/contacts/labels/create.yml
 create mode 100644 swagger/paths/application/contacts/labels/index.yml

diff --git a/swagger/definitions/index.yml b/swagger/definitions/index.yml
index ef9213d2a..d11ec7988 100644
--- a/swagger/definitions/index.yml
+++ b/swagger/definitions/index.yml
@@ -168,6 +168,8 @@ contact_conversations:
       - $ref: '#/definitions/conversation'
       - $ref: ./resource/extension/contact/conversation.yml
       - $ref: ./resource/extension/conversation/with_display_id.yml
+contact_labels:
+  $ref: ./resource/extension/contact/labels.yml
 
 ## conversation
 conversation_list:
diff --git a/swagger/definitions/resource/extension/contact/labels.yml b/swagger/definitions/resource/extension/contact/labels.yml
new file mode 100644
index 000000000..2922d9b4b
--- /dev/null
+++ b/swagger/definitions/resource/extension/contact/labels.yml
@@ -0,0 +1,7 @@
+type: object
+properties:
+  payload:
+    type: array
+    description: Array of labels
+    items:
+      type: string
diff --git a/swagger/index.yml b/swagger/index.yml
index 3cf8dd708..41f78dbc4 100644
--- a/swagger/index.yml
+++ b/swagger/index.yml
@@ -56,6 +56,7 @@ x-tagGroups:
       - Agents
       - Canned Responses
       - Contacts
+      - Contact Labels
       - Conversation Assignment
       - Conversation Labels
       - Conversations
@@ -77,4 +78,4 @@ x-tagGroups:
       - Messages API
   - name: Others
     tags:
-      - CSAT Survey Page
\ No newline at end of file
+      - CSAT Survey Page
diff --git a/swagger/paths/application/contacts/labels/create.yml b/swagger/paths/application/contacts/labels/create.yml
new file mode 100644
index 000000000..01821d688
--- /dev/null
+++ b/swagger/paths/application/contacts/labels/create.yml
@@ -0,0 +1,26 @@
+tags:
+  - Contact Labels
+operationId: contact-add-labels
+summary: Add Labels
+description: Add labels to a contact. Note that this API would overwrite the existing list of labels associated to the conversation.
+parameters:
+  - name: data
+    in: body
+    required: true
+    schema:
+      type: object
+      properties:
+        labels:
+          type: array
+          description: Array of labels (comma-separated strings)
+          items:
+            type: string
+responses:
+  200:
+    description: Success
+    schema:
+      $ref: '#/definitions/contact_labels'
+  404:
+    description: Contact not found
+  401:
+    description: Unauthorized
diff --git a/swagger/paths/application/contacts/labels/index.yml b/swagger/paths/application/contacts/labels/index.yml
new file mode 100644
index 000000000..ad3c7ff81
--- /dev/null
+++ b/swagger/paths/application/contacts/labels/index.yml
@@ -0,0 +1,14 @@
+tags:
+  - Contact Labels
+operationId: list-all-labels-of-a-contact
+summary: List Labels
+description: Lists all the labels of a contact
+responses:
+  200:
+    description: Success
+    schema:
+      $ref: '#/definitions/contact_labels'
+  404:
+    description: Contact not found
+  401:
+    description: Unauthorized
diff --git a/swagger/paths/index.yml b/swagger/paths/index.yml
index bad24b218..d58439647 100644
--- a/swagger/paths/index.yml
+++ b/swagger/paths/index.yml
@@ -121,6 +121,14 @@
     - $ref: '#/parameters/message_id'
   patch:
     $ref: ./public/inboxes/messages/update.yml
+/api/v1/accounts/{account_id}/contacts/{contact_identifier}/labels:
+  parameters:
+    - $ref: '#/parameters/account_id'
+    - $ref: '#/parameters/public_contact_identifier'
+  get:
+    $ref: ./application/contacts/labels/index.yml
+  post:
+    $ref: ./application/contacts/labels/create.yml
 
 # ---------------- end of public api routes-----------#
 
diff --git a/swagger/swagger.json b/swagger/swagger.json
index 9c6093fcf..e42a43efe 100644
--- a/swagger/swagger.json
+++ b/swagger/swagger.json
@@ -1010,6 +1010,79 @@
         }
       }
     },
+    "/api/v1/accounts/{account_id}/contacts/{contact_identifier}/labels": {
+      "parameters": [
+        {
+          "$ref": "#/parameters/account_id"
+        },
+        {
+          "$ref": "#/parameters/public_contact_identifier"
+        }
+      ],
+      "get": {
+        "tags": [
+          "Contact Labels"
+        ],
+        "operationId": "list-all-labels-of-a-contact",
+        "summary": "List Labels",
+        "description": "Lists all the labels of a contact",
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "$ref": "#/definitions/contact_labels"
+            }
+          },
+          "404": {
+            "description": "Contact not found"
+          },
+          "401": {
+            "description": "Unauthorized"
+          }
+        }
+      },
+      "post": {
+        "tags": [
+          "Contact Labels"
+        ],
+        "operationId": "contact-add-labels",
+        "summary": "Add Labels",
+        "description": "Add labels to a contact. Note that this API would overwrite the existing list of labels associated to the conversation.",
+        "parameters": [
+          {
+            "name": "data",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "type": "object",
+              "properties": {
+                "labels": {
+                  "type": "array",
+                  "description": "Array of labels (comma-separated strings)",
+                  "items": {
+                    "type": "string"
+                  }
+                }
+              }
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "$ref": "#/definitions/contact_labels"
+            }
+          },
+          "404": {
+            "description": "Contact not found"
+          },
+          "401": {
+            "description": "Unauthorized"
+          }
+        }
+      }
+    },
     "/survey/responses/{conversation_uuid}": {
       "parameters": [
         {
@@ -6810,6 +6883,18 @@
         ]
       }
     },
+    "contact_labels": {
+      "type": "object",
+      "properties": {
+        "payload": {
+          "type": "array",
+          "description": "Array of labels",
+          "items": {
+            "type": "string"
+          }
+        }
+      }
+    },
     "conversation_list": {
       "type": "object",
       "properties": {
@@ -7214,6 +7299,7 @@
         "Agents",
         "Canned Responses",
         "Contacts",
+        "Contact Labels",
         "Conversation Assignment",
         "Conversation Labels",
         "Conversations",

From 23ea8295104ee8dd5f965d1ba7c92e2a8af2daf0 Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Date: Sat, 4 Nov 2023 04:18:34 +0530
Subject: [PATCH 50/94] chore: Refactors help center article url helper (#8269)

---
 .../dashboard/api/helpCenter/articles.js      | 32 +++++--
 .../dashboard/api/specs/article.spec.js       | 29 +++++-
 app/javascript/dashboard/helper/URLHelper.js  | 32 +++++++
 .../dashboard/helper/specs/URLHelper.spec.js  | 89 +++++++++++++++++++
 .../pages/articles/ListAllArticles.vue        |  4 +-
 .../modules/helpCenterArticles/actions.js     |  6 +-
 6 files changed, 179 insertions(+), 13 deletions(-)

diff --git a/app/javascript/dashboard/api/helpCenter/articles.js b/app/javascript/dashboard/api/helpCenter/articles.js
index fb21a0847..e5847dc1b 100644
--- a/app/javascript/dashboard/api/helpCenter/articles.js
+++ b/app/javascript/dashboard/api/helpCenter/articles.js
@@ -1,6 +1,7 @@
 /* global axios */
 
 import PortalsAPI from './portals';
+import { getArticleSearchURL } from 'dashboard/helper/URLHelper.js';
 
 class ArticlesAPI extends PortalsAPI {
   constructor() {
@@ -12,14 +13,31 @@ class ArticlesAPI extends PortalsAPI {
     portalSlug,
     locale,
     status,
-    author_id,
-    category_slug,
+    authorId,
+    categorySlug,
+    sort,
   }) {
-    let baseUrl = `${this.url}/${portalSlug}/articles?page=${pageNumber}&locale=${locale}`;
-    if (status !== undefined) baseUrl += `&status=${status}`;
-    if (author_id) baseUrl += `&author_id=${author_id}`;
-    if (category_slug) baseUrl += `&category_slug=${category_slug}`;
-    return axios.get(baseUrl);
+    const url = getArticleSearchURL({
+      pageNumber,
+      portalSlug,
+      locale,
+      status,
+      authorId,
+      categorySlug,
+      sort,
+      host: this.url,
+    });
+
+    return axios.get(url);
+  }
+
+  searchArticles({ portalSlug, query }) {
+    const url = getArticleSearchURL({
+      portalSlug,
+      query,
+      host: this.url,
+    });
+    return axios.get(url);
   }
 
   getArticle({ id, portalSlug }) {
diff --git a/app/javascript/dashboard/api/specs/article.spec.js b/app/javascript/dashboard/api/specs/article.spec.js
index b8886b4f8..02c0f82d8 100644
--- a/app/javascript/dashboard/api/specs/article.spec.js
+++ b/app/javascript/dashboard/api/specs/article.spec.js
@@ -34,7 +34,7 @@ describe('#PortalAPI', () => {
         portalSlug: 'room-rental',
         locale: 'en-US',
         status: 'published',
-        author_id: '1',
+        authorId: '1',
       });
       expect(axiosMock.get).toHaveBeenCalledWith(
         '/api/v1/portals/room-rental/articles?page=1&locale=en-US&status=published&author_id=1'
@@ -85,6 +85,33 @@ describe('#PortalAPI', () => {
       window.axios = originalAxios;
     });
 
+    it('#searchArticles', () => {
+      articlesAPI.searchArticles({
+        query: 'test',
+        portalSlug: 'room-rental',
+      });
+      expect(axiosMock.get).toHaveBeenCalledWith(
+        '/api/v1/portals/room-rental/articles?query=test'
+      );
+    });
+  });
+  describe('API calls', () => {
+    const originalAxios = window.axios;
+    const axiosMock = {
+      post: jest.fn(() => Promise.resolve()),
+      get: jest.fn(() => Promise.resolve()),
+      patch: jest.fn(() => Promise.resolve()),
+      delete: jest.fn(() => Promise.resolve()),
+    };
+
+    beforeEach(() => {
+      window.axios = axiosMock;
+    });
+
+    afterEach(() => {
+      window.axios = originalAxios;
+    });
+
     it('#updateArticle', () => {
       articlesAPI.updateArticle({
         articleId: 1,
diff --git a/app/javascript/dashboard/helper/URLHelper.js b/app/javascript/dashboard/helper/URLHelper.js
index 9ae1f57de..7ea8531d3 100644
--- a/app/javascript/dashboard/helper/URLHelper.js
+++ b/app/javascript/dashboard/helper/URLHelper.js
@@ -64,3 +64,35 @@ export const isValidURL = value => {
     /^https?:\/\/(?:www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&//=]*)$/gm;
   return URL_REGEX.test(value);
 };
+
+export const getArticleSearchURL = ({
+  host,
+  portalSlug,
+  pageNumber,
+  locale,
+  status,
+  authorId,
+  categorySlug,
+  sort,
+  query,
+}) => {
+  const queryParams = new URLSearchParams({});
+
+  const params = {
+    page: pageNumber,
+    locale,
+    status,
+    author_id: authorId,
+    category_slug: categorySlug,
+    sort,
+    query,
+  };
+
+  Object.entries(params).forEach(([key, value]) => {
+    if (value !== null && value !== undefined) {
+      queryParams.set(key, value);
+    }
+  });
+
+  return `${host}/${portalSlug}/articles?${queryParams.toString()}`;
+};
diff --git a/app/javascript/dashboard/helper/specs/URLHelper.spec.js b/app/javascript/dashboard/helper/specs/URLHelper.spec.js
index 204d3384f..1b5814556 100644
--- a/app/javascript/dashboard/helper/specs/URLHelper.spec.js
+++ b/app/javascript/dashboard/helper/specs/URLHelper.spec.js
@@ -3,6 +3,7 @@ import {
   conversationUrl,
   isValidURL,
   conversationListPageURL,
+  getArticleSearchURL,
 } from '../URLHelper';
 
 describe('#URL Helpers', () => {
@@ -75,4 +76,92 @@ describe('#URL Helpers', () => {
       expect(isValidURL('alert.window')).toBe(false);
     });
   });
+
+  describe('getArticleSearchURL', () => {
+    it('should generate a basic URL without optional parameters', () => {
+      const url = getArticleSearchURL({
+        portalSlug: 'news',
+        pageNumber: 1,
+        locale: 'en',
+        host: 'myurl.com',
+      });
+      expect(url).toBe('myurl.com/news/articles?page=1&locale=en');
+    });
+
+    it('should include status parameter if provided', () => {
+      const url = getArticleSearchURL({
+        portalSlug: 'news',
+        pageNumber: 1,
+        locale: 'en',
+        status: 'published',
+        host: 'myurl.com',
+      });
+      expect(url).toBe(
+        'myurl.com/news/articles?page=1&locale=en&status=published'
+      );
+    });
+
+    it('should include author_id parameter if provided', () => {
+      const url = getArticleSearchURL({
+        portalSlug: 'news',
+        pageNumber: 1,
+        locale: 'en',
+        authorId: 123,
+        host: 'myurl.com',
+      });
+      expect(url).toBe(
+        'myurl.com/news/articles?page=1&locale=en&author_id=123'
+      );
+    });
+
+    it('should include category_slug parameter if provided', () => {
+      const url = getArticleSearchURL({
+        portalSlug: 'news',
+        pageNumber: 1,
+        locale: 'en',
+        categorySlug: 'technology',
+        host: 'myurl.com',
+      });
+      expect(url).toBe(
+        'myurl.com/news/articles?page=1&locale=en&category_slug=technology'
+      );
+    });
+
+    it('should include sort parameter if provided', () => {
+      const url = getArticleSearchURL({
+        portalSlug: 'news',
+        pageNumber: 1,
+        locale: 'en',
+        sort: 'views',
+        host: 'myurl.com',
+      });
+      expect(url).toBe('myurl.com/news/articles?page=1&locale=en&sort=views');
+    });
+
+    it('should handle multiple optional parameters', () => {
+      const url = getArticleSearchURL({
+        portalSlug: 'news',
+        pageNumber: 1,
+        locale: 'en',
+        status: 'draft',
+        authorId: 456,
+        categorySlug: 'science',
+        sort: 'views',
+        host: 'myurl.com',
+      });
+      expect(url).toBe(
+        'myurl.com/news/articles?page=1&locale=en&status=draft&author_id=456&category_slug=science&sort=views'
+      );
+    });
+
+    it('should handle missing optional parameters gracefully', () => {
+      const url = getArticleSearchURL({
+        portalSlug: 'news',
+        pageNumber: 1,
+        locale: 'en',
+        host: 'myurl.com',
+      });
+      expect(url).toBe('myurl.com/news/articles?page=1&locale=en');
+    });
+  });
 });
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/articles/ListAllArticles.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/articles/ListAllArticles.vue
index 1a1a16561..b895db0e2 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/articles/ListAllArticles.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/articles/ListAllArticles.vue
@@ -139,8 +139,8 @@ export default {
         portalSlug: this.$route.params.portalSlug,
         locale: this.$route.params.locale,
         status: this.status,
-        author_id: this.author,
-        category_slug: this.selectedCategorySlug,
+        authorId: this.author,
+        categorySlug: this.selectedCategorySlug,
       });
     },
     onPageChange(pageNumber) {
diff --git a/app/javascript/dashboard/store/modules/helpCenterArticles/actions.js b/app/javascript/dashboard/store/modules/helpCenterArticles/actions.js
index 39aefafc0..aa9e5242b 100644
--- a/app/javascript/dashboard/store/modules/helpCenterArticles/actions.js
+++ b/app/javascript/dashboard/store/modules/helpCenterArticles/actions.js
@@ -6,7 +6,7 @@ import types from '../../mutation-types';
 export const actions = {
   index: async (
     { commit },
-    { pageNumber, portalSlug, locale, status, author_id, category_slug }
+    { pageNumber, portalSlug, locale, status, authorId, categorySlug }
   ) => {
     try {
       commit(types.SET_UI_FLAG, { isFetching: true });
@@ -17,8 +17,8 @@ export const actions = {
         portalSlug,
         locale,
         status,
-        author_id,
-        category_slug,
+        authorId,
+        categorySlug,
       });
       const articleIds = payload.map(article => article.id);
       commit(types.CLEAR_ARTICLES);

From 3b84b0fc47e4a0dbe9e456f518c5e3a8f0741728 Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Date: Sat, 4 Nov 2023 04:59:44 +0530
Subject: [PATCH 51/94] feat: Creates 404 page for public portal [CW-2727]
 (#8293)

Co-authored-by: Sojan Jose <sojan@pepalo.com>
---
 .../public/api/v1/portals/articles_controller.rb     |  4 ----
 .../public/api/v1/portals/base_controller.rb         | 11 +++++++++++
 .../public/api/v1/portals/categories_controller.rb   |  7 +++----
 app/views/public/api/v1/portals/error/404.html.erb   | 12 ++++++++++++
 config/locales/en.yml                                |  4 ++++
 5 files changed, 30 insertions(+), 8 deletions(-)
 create mode 100644 app/views/public/api/v1/portals/error/404.html.erb

diff --git a/app/controllers/public/api/v1/portals/articles_controller.rb b/app/controllers/public/api/v1/portals/articles_controller.rb
index bc5f6c0fd..4e967cfbb 100644
--- a/app/controllers/public/api/v1/portals/articles_controller.rb
+++ b/app/controllers/public/api/v1/portals/articles_controller.rb
@@ -39,10 +39,6 @@ class Public::Api::V1::Portals::ArticlesController < Public::Api::V1::Portals::B
     )
   end
 
-  def portal
-    @portal ||= Portal.find_by!(slug: permitted_params[:slug], archived: false)
-  end
-
   def list_params
     params.permit(:query, :locale, :sort, :status)
   end
diff --git a/app/controllers/public/api/v1/portals/base_controller.rb b/app/controllers/public/api/v1/portals/base_controller.rb
index d9fec27b1..70aa1e92e 100644
--- a/app/controllers/public/api/v1/portals/base_controller.rb
+++ b/app/controllers/public/api/v1/portals/base_controller.rb
@@ -18,6 +18,10 @@ class Public::Api::V1::Portals::BaseController < PublicController
              end
   end
 
+  def portal
+    @portal ||= Portal.find_by!(slug: params[:slug], archived: false)
+  end
+
   def set_locale(&)
     switch_locale_with_portal(&) if params[:locale].present?
     switch_locale_with_article(&) if params[:article_slug].present?
@@ -40,6 +44,8 @@ class Public::Api::V1::Portals::BaseController < PublicController
 
   def switch_locale_with_article(&)
     article = Article.find_by(slug: params[:article_slug])
+    Rails.logger.info "Article: not found for slug: #{params[:article_slug]}"
+    render_404 && return if article.blank?
 
     @locale = if article.category.present?
                 article.category.locale
@@ -53,4 +59,9 @@ class Public::Api::V1::Portals::BaseController < PublicController
   def allow_iframe_requests
     response.headers.delete('X-Frame-Options') if @is_plain_layout_enabled
   end
+
+  def render_404
+    portal
+    render 'public/api/v1/portals/error/404', status: :not_found
+  end
 end
diff --git a/app/controllers/public/api/v1/portals/categories_controller.rb b/app/controllers/public/api/v1/portals/categories_controller.rb
index 7326f383b..c3a7b59e9 100644
--- a/app/controllers/public/api/v1/portals/categories_controller.rb
+++ b/app/controllers/public/api/v1/portals/categories_controller.rb
@@ -13,10 +13,9 @@ class Public::Api::V1::Portals::CategoriesController < Public::Api::V1::Portals:
   private
 
   def set_category
-    @category = @portal.categories.find_by!(locale: params[:locale], slug: params[:category_slug])
-  end
+    @category = @portal.categories.find_by(locale: params[:locale], slug: params[:category_slug])
 
-  def portal
-    @portal ||= Portal.find_by!(slug: params[:slug], archived: false)
+    Rails.logger.info "Category: not found for slug: #{params[:category_slug]}"
+    render_404 && return if @category.blank?
   end
 end
diff --git a/app/views/public/api/v1/portals/error/404.html.erb b/app/views/public/api/v1/portals/error/404.html.erb
new file mode 100644
index 000000000..5262e817e
--- /dev/null
+++ b/app/views/public/api/v1/portals/error/404.html.erb
@@ -0,0 +1,12 @@
+<div class="max-w-6xl h-full w-full flex-grow flex flex-col items-center justify-center mx-auto py-16 px-4 relative">
+    <div class="text-center mb-12">
+        <span class="text-8xl">🔍</span>
+    </div>
+    <h1 class="text-6xl text-center font-semibold text-slate-800 dark:text-slate-100 leading-relaxed"><%= I18n.t('public_portal.404.title') %></h1>
+    <p class="text-center text-slate-700 dark:text-slate-300 my-1"><%= I18n.t('public_portal.404.description') %></p>
+    <div class="text-center my-8">
+        <a href="/hc/<%= @portal.slug %>/<%= @portal.config['default_locale'] || params[:locale] %>/<%= @theme.present? ? '?theme='+@theme : ''  %>" class="text-woot-500 font-semibold underline">
+            <%= I18n.t('public_portal.404.back_to_home') %>
+        </a>
+    </div>
+</div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8bb388897..e08681c22 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -220,6 +220,10 @@ en:
       made_with: Made with
     header:
       go_to_homepage: Go to the main site
+    404:
+      title: Page not found
+      description: We couldn't find the page you were looking for.
+      back_to_home: Go to home page
   slack_unfurl:
     fields:
      name: Name

From b4d20689b7c2971ca8c68f9d15f0e165dd1c8b71 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Sat, 4 Nov 2023 12:26:28 +0530
Subject: [PATCH 52/94] feat: Mark the messages as failed if the API channel
 webhooks fail for any reason. (#8277)

---
 app/jobs/webhook_job.rb                  |  6 +--
 app/listeners/webhook_listener.rb        |  2 +-
 lib/webhooks/trigger.rb                  | 56 +++++++++++++++++++++---
 spec/jobs/agent_bots/webhook_job_spec.rb |  7 +--
 spec/jobs/webhook_job_spec.rb            | 18 ++++++--
 spec/lib/webhooks/trigger_spec.rb        | 55 ++++++++++++++++++++++-
 spec/listeners/webhook_listener_spec.rb  |  6 ++-
 7 files changed, 129 insertions(+), 21 deletions(-)

diff --git a/app/jobs/webhook_job.rb b/app/jobs/webhook_job.rb
index 61b5e8daf..57d3739b7 100644
--- a/app/jobs/webhook_job.rb
+++ b/app/jobs/webhook_job.rb
@@ -1,7 +1,7 @@
 class WebhookJob < ApplicationJob
   queue_as :medium
-
-  def perform(url, payload)
-    Webhooks::Trigger.execute(url, payload)
+  #  There are 3 types of webhooks, account, inbox and agent_bot
+  def perform(url, payload, webhook_type = :account_webhook)
+    Webhooks::Trigger.execute(url, payload, webhook_type)
   end
 end
diff --git a/app/listeners/webhook_listener.rb b/app/listeners/webhook_listener.rb
index 45c04629f..3fdd823b8 100644
--- a/app/listeners/webhook_listener.rb
+++ b/app/listeners/webhook_listener.rb
@@ -97,7 +97,7 @@ class WebhookListener < BaseListener
     return unless inbox.channel_type == 'Channel::Api'
     return if inbox.channel.webhook_url.blank?
 
-    WebhookJob.perform_later(inbox.channel.webhook_url, payload)
+    WebhookJob.perform_later(inbox.channel.webhook_url, payload, :api_inbox_webhook)
   end
 
   def deliver_webhook_payloads(payload, inbox)
diff --git a/lib/webhooks/trigger.rb b/lib/webhooks/trigger.rb
index 228d34b7f..42ec29717 100644
--- a/lib/webhooks/trigger.rb
+++ b/lib/webhooks/trigger.rb
@@ -1,13 +1,57 @@
 class Webhooks::Trigger
-  def self.execute(url, payload)
-    response = RestClient::Request.execute(
+  SUPPORTED_ERROR_HANDLE_EVENTS = %w[message_created message_updated].freeze
+
+  def initialize(url, payload, webhook_type)
+    @url = url
+    @payload = payload
+    @webhook_type = webhook_type
+  end
+
+  def self.execute(url, payload, webhook_type)
+    new(url, payload, webhook_type).execute
+  end
+
+  def execute
+    perform_request
+  rescue RestClient::Exceptions::Timeout, RestClient::ExceptionWithResponse => e
+    handle_error(e)
+    Rails.logger.warn "Exception: Invalid webhook URL #{@url} : #{e.message}"
+  end
+
+  private
+
+  def perform_request
+    RestClient::Request.execute(
       method: :post,
-      url: url, payload: payload.to_json,
+      url: @url,
+      payload: @payload.to_json,
       headers: { content_type: :json, accept: :json },
       timeout: 5
     )
-    Rails.logger.info "Performed Request:  Code - #{response.code}"
-  rescue StandardError => e
-    Rails.logger.warn "Exception: invalid webhook url #{url} : #{e.message}"
+  end
+
+  def handle_error(error)
+    return unless should_handle_error?
+    return unless message
+
+    update_message_status(error)
+  end
+
+  def should_handle_error?
+    @webhook_type == :api_inbox_webhook && SUPPORTED_ERROR_HANDLE_EVENTS.include?(@payload[:event])
+  end
+
+  def update_message_status(error)
+    message.update!(status: :failed, external_error: error.message)
+  end
+
+  def message
+    return if message_id.blank?
+
+    @message ||= Message.find_by(id: message_id)
+  end
+
+  def message_id
+    @payload[:id]
   end
 end
diff --git a/spec/jobs/agent_bots/webhook_job_spec.rb b/spec/jobs/agent_bots/webhook_job_spec.rb
index f4c78c953..a8117d84e 100644
--- a/spec/jobs/agent_bots/webhook_job_spec.rb
+++ b/spec/jobs/agent_bots/webhook_job_spec.rb
@@ -3,19 +3,20 @@ require 'rails_helper'
 RSpec.describe AgentBots::WebhookJob do
   include ActiveJob::TestHelper
 
-  subject(:job) { described_class.perform_later(url, payload) }
+  subject(:job) { described_class.perform_later(url, payload, webhook_type) }
 
   let(:url) { 'https://test.com' }
   let(:payload) { { name: 'test' } }
+  let(:webhook_type) { :agent_bot_webhook }
 
   it 'queues the job' do
     expect { job }.to have_enqueued_job(described_class)
-      .with(url, payload)
+      .with(url, payload, webhook_type)
       .on_queue('high')
   end
 
   it 'executes perform' do
-    expect(Webhooks::Trigger).to receive(:execute).with(url, payload)
+    expect(Webhooks::Trigger).to receive(:execute).with(url, payload, webhook_type)
     perform_enqueued_jobs { job }
   end
 end
diff --git a/spec/jobs/webhook_job_spec.rb b/spec/jobs/webhook_job_spec.rb
index 23ddb6cf1..81802a3c0 100644
--- a/spec/jobs/webhook_job_spec.rb
+++ b/spec/jobs/webhook_job_spec.rb
@@ -3,19 +3,29 @@ require 'rails_helper'
 RSpec.describe WebhookJob do
   include ActiveJob::TestHelper
 
-  subject(:job) { described_class.perform_later(url, payload) }
+  subject(:job) { described_class.perform_later(url, payload, webhook_type) }
 
   let(:url) { 'https://test.chatwoot.com' }
   let(:payload) { { name: 'test' } }
+  let(:webhook_type) { :account_webhook }
 
   it 'queues the job' do
     expect { job }.to have_enqueued_job(described_class)
-      .with(url, payload)
+      .with(url, payload, webhook_type)
       .on_queue('medium')
   end
 
-  it 'executes perform' do
-    expect(Webhooks::Trigger).to receive(:execute).with(url, payload)
+  it 'executes perform with default webhook type' do
+    expect(Webhooks::Trigger).to receive(:execute).with(url, payload, webhook_type)
     perform_enqueued_jobs { job }
   end
+
+  context 'with custom webhook type' do
+    let(:webhook_type) { :api_inbox_webhook }
+
+    it 'executes perform with inbox webhook type' do
+      expect(Webhooks::Trigger).to receive(:execute).with(url, payload, webhook_type)
+      perform_enqueued_jobs { job }
+    end
+  end
 end
diff --git a/spec/lib/webhooks/trigger_spec.rb b/spec/lib/webhooks/trigger_spec.rb
index b5a2dcbd2..8ff2a21a5 100644
--- a/spec/lib/webhooks/trigger_spec.rb
+++ b/spec/lib/webhooks/trigger_spec.rb
@@ -3,10 +3,17 @@ require 'rails_helper'
 describe Webhooks::Trigger do
   subject(:trigger) { described_class }
 
+  let!(:account) { create(:account) }
+  let!(:inbox) { create(:inbox, account: account) }
+  let!(:conversation) { create(:conversation, inbox: inbox) }
+  let!(:message) { create(:message, account: account, inbox: inbox, conversation: conversation) }
+
+  let!(:webhook_type) { :api_inbox_webhook }
+  let!(:url) { 'https://test.com' }
+
   describe '#execute' do
     it 'triggers webhook' do
       payload = { hello: :hello }
-      url = 'https://test.com'
 
       expect(RestClient::Request).to receive(:execute)
         .with(
@@ -16,7 +23,51 @@ describe Webhooks::Trigger do
           headers: { content_type: :json, accept: :json },
           timeout: 5
         ).once
-      trigger.execute(url, payload)
+      trigger.execute(url, payload, webhook_type)
+    end
+
+    it 'updates message status if webhook fails for message-created event' do
+      payload = { event: 'message_created', conversation: { id: conversation.id }, id: message.id }
+
+      expect(RestClient::Request).to receive(:execute)
+        .with(
+          method: :post,
+          url: url,
+          payload: payload.to_json,
+          headers: { content_type: :json, accept: :json },
+          timeout: 5
+        ).and_raise(RestClient::ExceptionWithResponse.new('error', 500)).once
+
+      expect { trigger.execute(url, payload, webhook_type) }.to change { message.reload.status }.from('sent').to('failed')
+    end
+
+    it 'updates message status if webhook fails for message-updated event' do
+      payload = { event: 'message_updated', conversation: { id: conversation.id }, id: message.id }
+
+      expect(RestClient::Request).to receive(:execute)
+        .with(
+          method: :post,
+          url: url,
+          payload: payload.to_json,
+          headers: { content_type: :json, accept: :json },
+          timeout: 5
+        ).and_raise(RestClient::ExceptionWithResponse.new('error', 500)).once
+      expect { trigger.execute(url, payload, webhook_type) }.to change { message.reload.status }.from('sent').to('failed')
     end
   end
+
+  it 'does not update message status if webhook fails for other events' do
+    payload = { event: 'conversation_created', conversation: { id: conversation.id }, id: message.id }
+
+    expect(RestClient::Request).to receive(:execute)
+      .with(
+        method: :post,
+        url: url,
+        payload: payload.to_json,
+        headers: { content_type: :json, accept: :json },
+        timeout: 5
+      ).and_raise(RestClient::ExceptionWithResponse.new('error', 500)).once
+
+    expect { trigger.execute(url, payload, webhook_type) }.not_to(change { message.reload.status })
+  end
 end
diff --git a/spec/listeners/webhook_listener_spec.rb b/spec/listeners/webhook_listener_spec.rb
index 332cde731..736db07d0 100644
--- a/spec/listeners/webhook_listener_spec.rb
+++ b/spec/listeners/webhook_listener_spec.rb
@@ -54,7 +54,8 @@ describe WebhookListener do
           conversation: api_conversation
         )
         api_event = Events::Base.new(event_name, Time.zone.now, message: api_message)
-        expect(WebhookJob).to receive(:perform_later).with(channel_api.webhook_url, api_message.webhook_data.merge(event: 'message_created')).once
+        expect(WebhookJob).to receive(:perform_later).with(channel_api.webhook_url, api_message.webhook_data.merge(event: 'message_created'),
+                                                           :api_inbox_webhook).once
         listener.message_created(api_event)
       end
 
@@ -101,7 +102,8 @@ describe WebhookListener do
         api_conversation = create(:conversation, account: account, inbox: api_inbox, assignee: user)
         api_event = Events::Base.new(event_name, Time.zone.now, conversation: api_conversation)
         expect(WebhookJob).to receive(:perform_later).with(channel_api.webhook_url,
-                                                           api_conversation.webhook_data.merge(event: 'conversation_created')).once
+                                                           api_conversation.webhook_data.merge(event: 'conversation_created'),
+                                                           :api_inbox_webhook).once
         listener.conversation_created(api_event)
       end
 

From 39d0748a5b5a596f1f0486182ca9c7dcf3a12666 Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Date: Sat, 4 Nov 2023 15:27:25 +0530
Subject: [PATCH 53/94] feat: Lets users insert connected portal article into
 replies [CW-2282] (#8117)

- Lets users insert connected portal articles into replies

https://linear.app/chatwoot/issue/CW-2282/list-all-the-top-articles-from-the-connected-help-center
https://linear.app/chatwoot/issue/CW-1453/container-view-for-showing-search-input-and-result-items
---
 .../widgets/WootWriter/ReplyBottomPanel.vue   |  24 +++
 .../widgets/conversation/ReplyBox.vue         |  53 +++++-
 app/javascript/dashboard/featureFlags.js      |   1 +
 .../i18n/locale/en/conversation.json          |   1 +
 .../dashboard/i18n/locale/en/helpCenter.json  |  18 ++
 .../ArticleSearch/ArticleSearchResultItem.vue |  54 +++---
 .../components/ArticleSearch/ArticleView.vue  |  14 +-
 .../components/ArticleSearch/Header.vue       |  30 +++-
 .../ArticleSearch/SearchPopover.vue           | 169 ++++++++++++++++++
 .../ArticleSearch/SearchResults.vue           |  11 +-
 .../FluentIcon/dashboard-icons.json           |   1 +
 .../shared/components/IframeLoader.vue        |   2 +-
 app/javascript/shared/constants/busEvents.js  |   1 +
 config/features.yml                           |   2 +
 14 files changed, 327 insertions(+), 54 deletions(-)
 create mode 100644 app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleSearch/SearchPopover.vue

diff --git a/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue b/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue
index 8477accc2..77355977f 100644
--- a/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue
+++ b/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue
@@ -109,6 +109,16 @@
           </h4>
         </div>
       </transition>
+      <woot-button
+        v-if="enableInsertArticleInReply"
+        v-tooltip.top-end="$t('HELP_CENTER.ARTICLE_SEARCH.OPEN_ARTICLE_SEARCH')"
+        icon="document-text-link"
+        color-scheme="secondary"
+        variant="smooth"
+        size="small"
+        :title="$t('HELP_CENTER.ARTICLE_SEARCH.OPEN_ARTICLE_SEARCH')"
+        @click="toggleInsertArticle"
+      />
     </div>
     <div class="right-wrap">
       <woot-button
@@ -233,6 +243,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    portalSlug: {
+      type: String,
+      required: true,
+    },
   },
   computed: {
     ...mapGetters({
@@ -307,6 +321,13 @@ export default {
         ? this.$t('CONVERSATION.FOOTER.DISABLE_SIGN_TOOLTIP')
         : this.$t('CONVERSATION.FOOTER.ENABLE_SIGN_TOOLTIP');
     },
+    enableInsertArticleInReply() {
+      const isFeatEnabled = this.isFeatureEnabledonAccount(
+        this.accountId,
+        FEATURE_FLAGS.INSERT_ARTICLE_IN_REPLY
+      );
+      return isFeatEnabled && this.portalSlug;
+    },
   },
   mounted() {
     ActiveStorage.start();
@@ -325,6 +346,9 @@ export default {
     replaceText(text) {
       this.$emit('replace-text', text);
     },
+    toggleInsertArticle() {
+      this.$emit('toggle-insert-article');
+    },
   },
 };
 </script>
diff --git a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
index d72c8dff6..da47bd556 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
@@ -18,6 +18,12 @@
       :popout-reply-box="popoutReplyBox"
       @click="$emit('click')"
     />
+    <article-search-popover
+      v-if="showArticleSearchPopover && connectedPortalSlug"
+      :selected-portal-slug="connectedPortalSlug"
+      @insert="handleInsert"
+      @close="onSearchPopoverClose"
+    />
     <div class="reply-box__top">
       <reply-to-message
         v-if="shouldShowReplyToMessage"
@@ -35,7 +41,7 @@
         v-if="showEmojiPicker"
         v-on-clickaway="hideEmojiPicker"
         :class="emojiDialogClassOnExpandedLayoutAndRTLView"
-        :on-click="emojiOnClick"
+        :on-click="addIntoEditor"
       />
       <reply-email-head
         v-if="showReplyHead"
@@ -121,10 +127,12 @@
       :toggle-audio-recorder="toggleAudioRecorder"
       :toggle-emoji-picker="toggleEmojiPicker"
       :message="message"
+      :portal-slug="connectedPortalSlug"
       :new-conversation-modal-active="newConversationModalActive"
       @selectWhatsappTemplate="openWhatsappTemplateModal"
       @toggle-editor="toggleRichContentEditor"
       @replace-text="replaceText"
+      @toggle-insert-article="toggleInsertArticle"
     />
     <whatsapp-templates
       :inbox-id="inbox.id"
@@ -154,6 +162,7 @@ import AttachmentPreview from 'dashboard/components/widgets/AttachmentsPreview.v
 import ReplyTopPanel from 'dashboard/components/widgets/WootWriter/ReplyTopPanel.vue';
 import ReplyEmailHead from './ReplyEmailHead.vue';
 import ReplyBottomPanel from 'dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue';
+import ArticleSearchPopover from 'dashboard/routes/dashboard/helpcenter/components/ArticleSearch/SearchPopover.vue';
 import MessageSignatureMissingAlert from './MessageSignatureMissingAlert';
 import Banner from 'dashboard/components/ui/Banner.vue';
 import { REPLY_EDITOR_MODES } from 'dashboard/components/widgets/WootWriter/constants';
@@ -206,6 +215,7 @@ export default {
     Banner,
     WhatsappTemplates,
     MessageSignatureMissingAlert,
+    ArticleSearchPopover,
   },
   mixins: [
     clickaway,
@@ -248,6 +258,7 @@ export default {
       showCannedMenu: false,
       showVariablesMenu: false,
       newConversationModalActive: false,
+      showArticleSearchPopover: false,
     };
   },
   computed: {
@@ -506,6 +517,11 @@ export default {
         ? this.messageSignature
         : extractTextFromMarkdown(this.messageSignature);
     },
+    connectedPortalSlug() {
+      const { help_center: portal = {} } = this.inbox;
+      const { slug = '' } = portal;
+      return slug;
+    },
   },
   watch: {
     currentChat(conversation) {
@@ -597,6 +613,23 @@ export default {
     );
   },
   methods: {
+    handleInsert(article) {
+      const { url, title } = article;
+      if (this.isRichEditorEnabled) {
+        // Removing empty lines from the title
+        const lines = title.split('\n');
+        const nonEmptyLines = lines.filter(line => line.trim() !== '');
+        const filteredMarkdown = nonEmptyLines.join(' ');
+        bus.$emit(
+          BUS_EVENTS.INSERT_INTO_RICH_EDITOR,
+          `[${filteredMarkdown}](${url})`
+        );
+      } else {
+        this.addIntoEditor(
+          `${this.$t('CONVERSATION.REPLYBOX.INSERT_READ_MORE')} ${url}`
+        );
+      }
+    },
     toggleRichContentEditor() {
       this.updateUISettings({
         display_rich_content_editor: !this.showRichContentEditor,
@@ -862,22 +895,22 @@ export default {
     clearEditorSelection() {
       this.updateEditorSelectionWith = '';
     },
-    insertEmoji(emoji, selectionStart, selectionEnd) {
+    insertIntoTextEditor(text, selectionStart, selectionEnd) {
       const { message } = this;
       const newMessage =
         message.slice(0, selectionStart) +
-        emoji +
+        text +
         message.slice(selectionEnd, message.length);
       this.message = newMessage;
     },
-    emojiOnClick(emoji) {
+    addIntoEditor(content) {
       if (this.showRichContentEditor) {
-        this.updateEditorSelectionWith = emoji;
+        this.updateEditorSelectionWith = content;
         this.onFocus();
       }
       if (!this.showRichContentEditor) {
         const { selectionStart, selectionEnd } = this.$refs.messageInput.$el;
-        this.insertEmoji(emoji, selectionStart, selectionEnd);
+        this.insertIntoTextEditor(content, selectionStart, selectionEnd);
       }
     },
     clearMessage() {
@@ -1136,6 +1169,12 @@ export default {
       // When new conversation modal is open
       this.newConversationModalActive = isActive;
     },
+    onSearchPopoverClose() {
+      this.showArticleSearchPopover = false;
+    },
+    toggleInsertArticle() {
+      this.showArticleSearchPopover = !this.showArticleSearchPopover;
+    },
   },
 };
 </script>
@@ -1154,7 +1193,7 @@ export default {
 }
 
 .reply-box {
-  @apply border-t border-slate-50 dark:border-slate-700 bg-white dark:bg-slate-900;
+  @apply relative border-t border-slate-50 dark:border-slate-700 bg-white dark:bg-slate-900;
 
   &.is-private {
     @apply bg-yellow-50 dark:bg-yellow-200;
diff --git a/app/javascript/dashboard/featureFlags.js b/app/javascript/dashboard/featureFlags.js
index 0da932e30..143ee521d 100644
--- a/app/javascript/dashboard/featureFlags.js
+++ b/app/javascript/dashboard/featureFlags.js
@@ -17,4 +17,5 @@ export const FEATURE_FLAGS = {
   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/dashboard/i18n/locale/en/conversation.json b/app/javascript/dashboard/i18n/locale/en/conversation.json
index 65b55b732..19012abed 100644
--- a/app/javascript/dashboard/i18n/locale/en/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/en/conversation.json
@@ -139,6 +139,7 @@
       "PRIVATE_NOTE": "Private Note",
       "SEND": "Send",
       "CREATE": "Add Note",
+      "INSERT_READ_MORE": "Read more",
       "DISMISS_REPLY": "Dismiss reply",
       "REPLYING_TO": "Replying to:",
       "TIP_FORMAT_ICON": "Show rich text editor",
diff --git a/app/javascript/dashboard/i18n/locale/en/helpCenter.json b/app/javascript/dashboard/i18n/locale/en/helpCenter.json
index af692a27e..43b419328 100644
--- a/app/javascript/dashboard/i18n/locale/en/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/en/helpCenter.json
@@ -76,6 +76,9 @@
     },
     "ARTICLE_SEARCH_RESULT": {
       "UNCATEGORIZED": "Uncategorized",
+      "SEARCH_RESULTS": "Search results for %{query}",
+      "EMPTY_TEXT": "Search for articles to insert into replies.",
+      "SEARCH_LOADER": "Searching...",
       "INSERT_ARTICLE": "Insert",
       "NO_RESULT": "No articles found",
       "COPY_LINK": "Copy article link to clipboard",
@@ -426,6 +429,21 @@
         }
       }
     },
+    "ARTICLE_SEARCH": {
+      "TITLE": "Search articles",
+      "PLACEHOLDER": "Search articles",
+      "NO_RESULT": "No articles found",
+      "SEARCHING": "Searching...",
+      "SEARCH_BUTTON": "Search",
+      "INSERT_ARTICLE": "Insert link",
+      "IFRAME_ERROR": "URL is empty or invalid. Unable to display content.",
+      "OPEN_ARTICLE_SEARCH": "Insert article from Help Center",
+      "SUCCESS_ARTICLE_INSERTED": "Article inserted successfully",
+      "PREVIEW_LINK": "Preview article",
+      "CANCEL": "Close",
+      "BACK": "Back",
+      "BACK_RESULTS": "Back to results"
+    },
     "UPGRADE_PAGE": {
       "TITLE": "Help Center",
       "DESCRIPTION": "Create user-friendly self-service portals. Help your users to access the articles and get support 24/7. Upgrade your subscription to enable this feature.",
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleSearch/ArticleSearchResultItem.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleSearch/ArticleSearchResultItem.vue
index 728a2886d..e603ec917 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleSearch/ArticleSearchResultItem.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleSearch/ArticleSearchResultItem.vue
@@ -1,17 +1,18 @@
 <template>
-  <div
-    class="flex flex-col gap-1 bg-white dark:bg-slate-900 hover:bg-slate-25 hover:dark:bg-slate-800 rounded-md py-1 px-2 w-full group"
+  <button
+    class="flex flex-col gap-1 bg-white dark:bg-slate-900 hover:bg-slate-25 hover:dark:bg-slate-800 rounded-md py-1 px-2 w-full group border border-transparent border-solid focus:outline-none focus:bg-slate-25 focus:border-slate-500 dark:focus:border-slate-400 dark:focus:bg-slate-800 cursor-pointer"
+    @click="handlePreview"
   >
-    <button @click="handlePreview">
-      <h4
-        class="text-block-title text-left mb-0 text-slate-900 dark:text-slate-25 px-1 -mx-1 rounded-sm hover:underline cursor-pointer width-auto"
-      >
-        {{ title }}
-      </h4>
-    </button>
+    <h4
+      class="text-block-title text-left mb-0 text-slate-900 dark:text-slate-25 px-1 -mx-1 rounded-sm width-auto hover:underline group-hover:underline"
+    >
+      {{ title }}
+    </h4>
 
     <div class="flex content-between items-center gap-0.5 w-full">
-      <p class="text-sm text-slate-600 dark:text-slate-300 mb-0 w-full">
+      <p
+        class="text-sm text-left text-slate-600 dark:text-slate-300 mb-0 w-full"
+      >
         {{ locale }}
         {{ ` / ` }}
         {{ category || $t('HELP_CENTER.ARTICLE_SEARCH_RESULT.UNCATEGORIZED') }}
@@ -26,26 +27,6 @@
           class="invisible group-hover:visible"
           @click="handleCopy"
         />
-
-        <a
-          :href="url"
-          class="button hollow button--only-icon tiny secondary invisible group-hover:visible"
-          rel="noopener noreferrer nofollow"
-          target="_blank"
-          :title="$t('HELP_CENTER.ARTICLE_SEARCH_RESULT.OPEN_LINK')"
-        >
-          <fluent-icon size="12" icon="arrow-up-right" />
-          <span class="show-for-sr">{{ url }}</span>
-        </a>
-        <woot-button
-          variant="hollow"
-          color-scheme="secondary"
-          size="tiny"
-          icon="preview-link"
-          class="invisible group-hover:visible"
-          :title="$t('HELP_CENTER.ARTICLE_SEARCH_RESULT.PREVIEW_LINK')"
-          @click="handlePreview"
-        />
         <woot-button
           class="insert-button"
           variant="smooth"
@@ -57,14 +38,16 @@
         </woot-button>
       </div>
     </div>
-  </div>
+  </button>
 </template>
 
 <script>
 import { copyTextToClipboard } from 'shared/helpers/clipboard';
+import alertMixin from 'shared/mixins/alertMixin';
 
 export default {
   name: 'ArticleSearchResultItem',
+  mixins: [alertMixin],
   props: {
     id: {
       type: Number,
@@ -92,13 +75,16 @@ export default {
     },
   },
   methods: {
-    handleInsert() {
+    handleInsert(e) {
+      e.stopPropagation();
       this.$emit('insert', this.id);
     },
-    handlePreview() {
+    handlePreview(e) {
+      e.stopPropagation();
       this.$emit('preview', this.id);
     },
-    async handleCopy() {
+    async handleCopy(e) {
+      e.stopPropagation();
       await copyTextToClipboard(this.url);
       this.showAlert(this.$t('CONTACT_PANEL.COPY_SUCCESSFUL'));
     },
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleSearch/ArticleView.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleSearch/ArticleView.vue
index 9b7d2bcaa..168ac792c 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleSearch/ArticleView.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleSearch/ArticleView.vue
@@ -10,8 +10,10 @@
         {{ $t('HELP_CENTER.ARTICLE_SEARCH.BACK_RESULTS') }}
       </woot-button>
     </div>
-    <div class="w-full h-full overflow-auto min-h-0">
-      <iframe-loader :url="url" />
+    <div class="-ml-4 h-full overflow-y-auto">
+      <div class="w-full h-full min-h-0">
+        <iframe-loader :url="url" />
+      </div>
     </div>
 
     <div class="flex justify-end gap-2 py-2">
@@ -41,7 +43,7 @@
 import IframeLoader from 'shared/components/IframeLoader.vue';
 
 export default {
-  name: 'ChatwootSearch',
+  name: 'ArticleView',
   components: {
     IframeLoader,
   },
@@ -52,10 +54,12 @@ export default {
     },
   },
   methods: {
-    onBack() {
+    onBack(e) {
+      e.stopPropagation();
       this.$emit('back');
     },
-    onInsert() {
+    onInsert(e) {
+      e.stopPropagation();
       this.$emit('insert');
     },
   },
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleSearch/Header.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleSearch/Header.vue
index c5d25baa9..26923bfdf 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleSearch/Header.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleSearch/Header.vue
@@ -18,10 +18,13 @@
         <fluent-icon icon="search" class="" size="16" />
       </div>
       <input
+        ref="searchInput"
         type="text"
         :placeholder="$t('HELP_CENTER.ARTICLE_SEARCH.PLACEHOLDER')"
-        class="block w-full pl-8 h-8 text-sm dark:bg-slate-700 bg-slate-25 rounded-md leading-8 py-1 text-slate-700 shadow-sm ring-2 ring-transparent ring-slate-300 border border-solid border-slate-300 placeholder:text-slate-400 focus:border-woot-600 focus:ring-2 focus:ring-woot-100 mb-0 focus:bg-slate-25 dark:focus:bg-slate-700"
+        class="block w-full pl-8 h-8 text-sm dark:bg-slate-700 bg-slate-25 rounded-md leading-8 py-1 text-slate-700 shadow-sm ring-2 ring-transparent ring-slate-300 border border-solid border-slate-300 placeholder:text-slate-400 focus:border-woot-600 focus:ring-woot-200 mb-0 focus:bg-slate-25 dark:focus:bg-slate-700 dark:focus:ring-woot-700"
         :value="searchQuery"
+        @focus="onFocus"
+        @blur="onBlur"
         @input="onInput"
       />
     </div>
@@ -29,8 +32,15 @@
 </template>
 
 <script>
+import eventListenerMixins from 'shared/mixins/eventListenerMixins';
+import {
+  buildHotKeys,
+  isActiveElementTypeable,
+} from 'shared/helpers/KeyboardHelpers';
+
 export default {
   name: 'ChatwootSearch',
+  mixins: [eventListenerMixins],
   props: {
     title: {
       type: String,
@@ -40,8 +50,12 @@ export default {
   data() {
     return {
       searchQuery: '',
+      isInputFocused: false,
     };
   },
+  mounted() {
+    this.$refs.searchInput.focus();
+  },
   methods: {
     onInput(e) {
       this.$emit('search', e.target.value);
@@ -49,6 +63,20 @@ export default {
     onClose() {
       this.$emit('close');
     },
+    onFocus() {
+      this.isInputFocused = true;
+    },
+    onBlur() {
+      this.isInputFocused = false;
+    },
+    handleKeyEvents(e) {
+      const keyPattern = buildHotKeys(e);
+
+      if (keyPattern === '/' && !isActiveElementTypeable(e)) {
+        e.preventDefault();
+        this.$refs.searchInput.focus();
+      }
+    },
   },
 };
 </script>
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleSearch/SearchPopover.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleSearch/SearchPopover.vue
new file mode 100644
index 000000000..1c221d3be
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleSearch/SearchPopover.vue
@@ -0,0 +1,169 @@
+<template>
+  <div
+    class="fixed flex items-center justify-center w-screen h-screen bg-white/70 top-0 left-0 z-50"
+  >
+    <div
+      v-on-clickaway="onClose"
+      class="flex flex-col px-4 pb-4 rounded-md shadow-md border border-solid border-slate-50 dark:border-slate-800 bg-white dark:bg-slate-900 z-[1000] max-w-[720px] md:w-[20rem] lg:w-[24rem] xl:w-[28rem] 2xl:w-[32rem] h-[calc(100vh-20rem)] max-h-[40rem]"
+    >
+      <search-header
+        :title="$t('HELP_CENTER.ARTICLE_SEARCH.TITLE')"
+        class="w-full sticky top-0 bg-[inherit]"
+        @close="onClose"
+        @search="onSearch"
+      />
+
+      <article-view
+        v-if="activeId"
+        :url="articleViewerUrl"
+        @back="onBack"
+        @insert="onInsert"
+      />
+      <search-results
+        v-else
+        :search-query="searchQuery"
+        :is-loading="isLoading"
+        :portal-slug="selectedPortalSlug"
+        :articles="searchResultsWithUrl"
+        @preview="handlePreview"
+        @insert="onInsert"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import { debounce } from '@chatwoot/utils';
+import { mixin as clickaway } from 'vue-clickaway';
+import {
+  isEscape,
+  isActiveElementTypeable,
+} from 'shared/helpers/KeyboardHelpers';
+
+import SearchHeader from './Header.vue';
+import SearchResults from './SearchResults.vue';
+import ArticleView from './ArticleView.vue';
+import ArticlesAPI from 'dashboard/api/helpCenter/articles';
+import { buildPortalArticleURL } from 'dashboard/helper/portalHelper';
+import portalMixin from '../../mixins/portalMixin';
+import alertMixin from 'shared/mixins/alertMixin';
+
+export default {
+  name: 'ArticleSearchPopover',
+  components: {
+    SearchHeader,
+    SearchResults,
+    ArticleView,
+  },
+  mixins: [clickaway, portalMixin, alertMixin],
+  props: {
+    selectedPortalSlug: {
+      type: String,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      searchQuery: '',
+      isLoading: false,
+      searchResults: [],
+      activeId: '',
+      debounceSearch: () => {},
+    };
+  },
+  computed: {
+    articleViewerUrl() {
+      const article = this.activeArticle(this.activeId);
+      if (!article) return '';
+      const isDark = document.body.classList.contains('dark');
+
+      const url = new URL(article.url);
+      url.searchParams.set('show_plain_layout', 'true');
+
+      if (isDark) {
+        url.searchParams.set('theme', 'dark');
+      }
+
+      return `${url}`;
+    },
+    searchResultsWithUrl() {
+      return this.searchResults.map(article => ({
+        ...article,
+        localeName: this.localeName(article.category.locale || 'en'),
+        url: this.generateArticleUrl(article),
+      }));
+    },
+  },
+  mounted() {
+    this.fetchArticlesByQuery(this.searchQuery);
+    this.debounceSearch = debounce(this.fetchArticlesByQuery, 500, false);
+    document.body.addEventListener('keydown', this.closeOnEsc);
+  },
+  beforeDestroy() {
+    document.body.removeEventListener('keydown', this.closeOnEsc);
+  },
+  methods: {
+    generateArticleUrl(article) {
+      return buildPortalArticleURL(
+        this.selectedPortalSlug,
+        '',
+        '',
+        article.slug
+      );
+    },
+    activeArticle(id) {
+      return this.searchResultsWithUrl.find(article => article.id === id);
+    },
+    onSearch(query) {
+      this.searchQuery = query;
+      this.activeId = '';
+      this.debounceSearch(query);
+    },
+    onClose() {
+      this.$emit('close');
+      this.searchQuery = '';
+      this.activeId = '';
+      this.searchResults = [];
+    },
+    async fetchArticlesByQuery(query) {
+      try {
+        const sort = query ? '' : 'views';
+        this.isLoading = true;
+        this.searchResults = [];
+        const { data } = await ArticlesAPI.searchArticles({
+          portalSlug: this.selectedPortalSlug,
+          query,
+          sort,
+        });
+        this.searchResults = data.payload;
+        this.isLoading = true;
+      } catch (error) {
+        // Show something wrong message
+      } finally {
+        this.isLoading = false;
+      }
+    },
+    handlePreview(id) {
+      this.activeId = id;
+    },
+    onBack() {
+      this.activeId = '';
+    },
+    onInsert(id) {
+      const article = this.activeArticle(id || this.activeId);
+
+      this.$emit('insert', article);
+      this.showAlert(
+        this.$t('HELP_CENTER.ARTICLE_SEARCH.SUCCESS_ARTICLE_INSERTED')
+      );
+      this.onClose();
+    },
+    closeOnEsc(e) {
+      if (isEscape(e) && !isActiveElementTypeable(e)) {
+        e.preventDefault();
+        this.onClose();
+      }
+    },
+  },
+};
+</script>
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleSearch/SearchResults.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleSearch/SearchResults.vue
index 343d6108e..4a6eb5b8b 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleSearch/SearchResults.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleSearch/SearchResults.vue
@@ -1,8 +1,9 @@
 <template>
-  <div class="flex justify-end gap-1 py-4 bg-white dark:bg-slate-900">
+  <div
+    class="flex justify-end gap-1 py-4 bg-white dark:bg-slate-900 h-full overflow-y-auto"
+  >
     <div class="flex flex-col gap-1 w-full">
       <div v-if="isLoading" class="empty-state-message">
-        <spinner />
         {{ $t('HELP_CENTER.ARTICLE_SEARCH_RESULT.SEARCH_LOADER') }}
       </div>
       <div v-else-if="showNoResults" class="empty-state-message">
@@ -17,7 +18,7 @@
         :body="article.content"
         :url="article.url"
         :category="article.category.name"
-        :locale="article.category.locale"
+        :locale="article.localeName"
         @preview="handlePreview"
         @insert="handleInsert"
       />
@@ -26,13 +27,11 @@
 </template>
 
 <script>
-import Spinner from 'shared/components/Spinner.vue';
-import SearchResultItem from 'dashboard/routes/dashboard/helpcenter/components/ArticleSearch/ArticleSearchResultItem.vue';
+import SearchResultItem from './ArticleSearchResultItem.vue';
 
 export default {
   name: 'SearchResults',
   components: {
-    Spinner,
     SearchResultItem,
   },
   props: {
diff --git a/app/javascript/shared/components/FluentIcon/dashboard-icons.json b/app/javascript/shared/components/FluentIcon/dashboard-icons.json
index 5221a5d0e..d89805856 100644
--- a/app/javascript/shared/components/FluentIcon/dashboard-icons.json
+++ b/app/javascript/shared/components/FluentIcon/dashboard-icons.json
@@ -96,6 +96,7 @@
   "dismiss-outline": "m4.397 4.554.073-.084a.75.75 0 0 1 .976-.073l.084.073L12 10.939l6.47-6.47a.75.75 0 1 1 1.06 1.061L13.061 12l6.47 6.47a.75.75 0 0 1 .072.976l-.073.084a.75.75 0 0 1-.976.073l-.084-.073L12 13.061l-6.47 6.47a.75.75 0 0 1-1.06-1.061L10.939 12l-6.47-6.47a.75.75 0 0 1-.072-.976l.073-.084-.073.084Z",
   "document-outline": "M18.5 20a.5.5 0 0 1-.5.5H6a.5.5 0 0 1-.5-.5V4a.5.5 0 0 1 .5-.5h6V8a2 2 0 0 0 2 2h4.5v10Zm-5-15.379L17.378 8.5H14a.5.5 0 0 1-.5-.5V4.621Zm5.914 3.793-5.829-5.828c-.026-.026-.058-.046-.085-.07a2.072 2.072 0 0 0-.219-.18c-.04-.027-.086-.045-.128-.068-.071-.04-.141-.084-.216-.116a1.977 1.977 0 0 0-.624-.138C12.266 2.011 12.22 2 12.172 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V9.828a2 2 0 0 0-.586-1.414Z",
   "document-error-outline": "M6 2a2 2 0 0 0-2 2v5.207a5.48 5.48 0 0 1 1-.185V4a1 1 0 0 1 1-1h4v3.5A1.5 1.5 0 0 0 11.5 8H15v8a1 1 0 0 1-1 1h-3.6a5.507 5.507 0 0 1-.657 1H14a2 2 0 0 0 2-2V7.414a1.5 1.5 0 0 0-.44-1.06l-3.914-3.915A1.5 1.5 0 0 0 10.586 2H6Zm8.793 5H11.5a.5.5 0 0 1-.5-.5V3.207L14.793 7ZM10 14.5a4.5 4.5 0 1 1-9 0a4.5 4.5 0 0 1 9 0ZM5.5 12a.5.5 0 0 0-.5.5v2a.5.5 0 0 0 1 0v-2a.5.5 0 0 0-.5-.5Zm0 5.125a.625.625 0 1 0 0-1.25a.625.625 0 0 0 0 1.25Z",
+  "document-text-link-outline": "M18 20.5a.5.5 0 0 0 .5-.5V10H14a2 2 0 0 1-2-2V3.5H6a.5.5 0 0 0-.5.5v10h-.75c-.255 0-.506.02-.75.059V4a2 2 0 0 1 2-2h6.172c.028 0 .055.004.082.007.02.003.04.006.059.007.215.015.427.056.624.138.057.024.112.056.166.087l.05.029.047.024a.652.652 0 0 1 .081.044c.078.053.148.116.219.18a.63.63 0 0 0 .036.03.491.491 0 0 1 .049.04l5.829 5.828A2 2 0 0 1 20 9.828V20a2 2 0 0 1-2 2h-6.286c.406-.432.731-.94.953-1.5H18Zm-.622-12L13.5 4.621V8a.5.5 0 0 0 .5.5h3.378Zm-7.603 5.75c.854.29 1.6.815 2.158 1.5h3.317a.75.75 0 0 0 0-1.5H9.775ZM12.667 17c.186.468.3.973.326 1.5h2.257a.75.75 0 0 0 0-1.5h-2.583ZM8.75 11.5a.75.75 0 0 0 0 1.5h6.5a.75.75 0 0 0 0-1.5h-6.5ZM12 18.75A3.75 3.75 0 0 0 8.25 15l-.102.007A.75.75 0 0 0 8.25 16.5l.154.005A2.25 2.25 0 0 1 8.25 21l-.003.005-.102.007a.75.75 0 0 0 .108 1.493V22.5l.2-.005A3.75 3.75 0 0 0 12 18.75Zm-6.5-3a.75.75 0 0 0-.75-.75l-.2.005a3.75 3.75 0 0 0 .2 7.495l.102-.007A.75.75 0 0 0 4.75 21l-.154-.005A2.25 2.25 0 0 1 4.75 16.5l.102-.007a.75.75 0 0 0 .648-.743Zm3.5 3a.75.75 0 0 0-.75-.75h-3.5l-.102.007A.75.75 0 0 0 4.75 19.5h3.5l.102-.007A.75.75 0 0 0 9 18.75Z",
   "draft-outline": "m20.877 2.826.153.144.145.153a3.579 3.579 0 0 1-.145 4.908L9.062 19.999a2.25 2.25 0 0 1-1 .58l-5.115 1.395a.75.75 0 0 1-.92-.921l1.394-5.116a2.25 2.25 0 0 1 .58-.999L15.97 2.97a3.579 3.579 0 0 1 4.908-.144ZM15 6.06l-9.938 9.938a.75.75 0 0 0-.193.333l-1.05 3.85 3.85-1.05A.75.75 0 0 0 8 18.938L17.94 9 15 6.06ZM6.525 11l-1.5 1.5H2.75a.75.75 0 0 1 0-1.5h3.775Zm4-4-1.5 1.5H2.75a.75.75 0 1 1 0-1.5h7.775Zm6.505-2.97-.97.97 2.939 2.94.97-.97a2.078 2.078 0 1 0-2.939-2.94ZM14.525 3l-1.5 1.5H2.75a.75.75 0 1 1 0-1.5h11.775Z",
   "drag-outline": "M15 3.707V8.5a.5.5 0 0 0 1 0V3.707l1.146 1.147a.5.5 0 0 0 .708-.708l-2-2a.499.499 0 0 0-.708 0l-2 2a.5.5 0 0 0 .708.708L15 3.707ZM2 4.5a.5.5 0 0 1 .5-.5h6a.5.5 0 0 1 0 1h-6a.5.5 0 0 1-.5-.5Zm0 5a.5.5 0 0 1 .5-.5h9a.5.5 0 0 1 0 1h-9a.5.5 0 0 1-.5-.5Zm.5 4.5a.5.5 0 0 0 0 1h6a.5.5 0 0 0 0-1h-6ZM15 16.293V11.5a.5.5 0 0 1 1 0v4.793l1.146-1.147a.5.5 0 0 1 .708.708l-2 2a.5.5 0 0 1-.708 0l-2-2a.5.5 0 0 1 .708-.708L15 16.293Z",
   "dual-screen-clock-outline": "M10.019 6.002a6.632 6.632 0 0 0 .058 1.5H3.75a.25.25 0 0 0-.25.25v12.494c0 .138.112.25.25.25h7.498l-.001-10.167c.416.57.924 1.07 1.5 1.479v8.69h7.498a.25.25 0 0 0 .25-.25v-8.62a6.535 6.535 0 0 0 1.501-1.656V20.25a1.75 1.75 0 0 1-1.75 1.75h-8.998l-.001-.003H3.75A1.75 1.75 0 0 1 2 20.246V7.751c0-.966.784-1.75 1.75-1.75h6.269Zm6.22 11.498a.75.75 0 0 1 .101 1.493L16.24 19h-1.5a.75.75 0 0 1-.102-1.493l.102-.007h1.5Zm-6.996 0a.75.75 0 0 1 .102 1.493L9.243 19H7.74a.75.75 0 0 1-.102-1.493l.102-.007h1.502ZM16.498 1a5.5 5.5 0 1 1 0 11 5.5 5.5 0 0 1 0-11Zm-1 2a.5.5 0 0 0-.5.5v4a.5.5 0 0 0 .5.5h3.001a.5.5 0 0 0 0-1h-2.501V3.5a.5.5 0 0 0-.5-.5Z",
diff --git a/app/javascript/shared/components/IframeLoader.vue b/app/javascript/shared/components/IframeLoader.vue
index 5a0a15db4..16fc3b91e 100644
--- a/app/javascript/shared/components/IframeLoader.vue
+++ b/app/javascript/shared/components/IframeLoader.vue
@@ -24,7 +24,7 @@
 import ArticleSkeletonLoader from 'shared/components/ArticleSkeletonLoader.vue';
 
 export default {
-  name: 'IframeRenderer',
+  name: 'IframeLoader',
   components: {
     ArticleSkeletonLoader,
   },
diff --git a/app/javascript/shared/constants/busEvents.js b/app/javascript/shared/constants/busEvents.js
index c883542f8..dc6892e26 100644
--- a/app/javascript/shared/constants/busEvents.js
+++ b/app/javascript/shared/constants/busEvents.js
@@ -11,4 +11,5 @@ export const BUS_EVENTS = {
   TOGGLE_REPLY_TO_MESSAGE: 'TOGGLE_REPLY_TO_MESSAGE',
   SHOW_TOAST: 'newToastMessage',
   NEW_CONVERSATION_MODAL: 'newConversationModal',
+  INSERT_INTO_RICH_EDITOR: 'insertIntoRichEditor',
 };
diff --git a/config/features.yml b/config/features.yml
index 39b15538e..1bb355fc8 100644
--- a/config/features.yml
+++ b/config/features.yml
@@ -59,3 +59,5 @@
   enabled: false
 - name: message_reply_to
   enabled: false
+- name: insert_article_in_reply
+  enabled: false

From b579ff832e71f8724405b46c0689069037f98060 Mon Sep 17 00:00:00 2001
From: Emanuel <emanuel-caue@hotmail.com>
Date: Mon, 6 Nov 2023 13:01:54 -0300
Subject: [PATCH 54/94] chore: Update the case in the translation files (#8298)

---
 app/javascript/dashboard/i18n/locale/pt_BR/login.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/login.json b/app/javascript/dashboard/i18n/locale/pt_BR/login.json
index 02e0065e5..1a779ee9c 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/login.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/login.json
@@ -2,7 +2,7 @@
   "LOGIN": {
     "TITLE": "Entrar no Chatwoot",
     "EMAIL": {
-      "LABEL": "e-mail",
+      "LABEL": "E-mail",
       "PLACEHOLDER": "exemplo@nomedaempresa.com",
       "ERROR": "Por favor, insira um endereço de e-mail válido"
     },

From d1cbc56d67a8250496fa994de57183181859997f Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Mon, 6 Nov 2023 15:27:29 -0800
Subject: [PATCH 55/94] chore: Update widget config API to migrate the widget
 (#8303)

- Update the keys in the widget config API to support loading the widget separately from the Rails App.
---
 .../v1/widget/configs/create.json.jbuilder    | 40 +++++++++++--------
 .../api/v1/widget/configs_controller_spec.rb  |  2 +-
 2 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/app/views/api/v1/widget/configs/create.json.jbuilder b/app/views/api/v1/widget/configs/create.json.jbuilder
index 273a3f975..574ff0e06 100644
--- a/app/views/api/v1/widget/configs/create.json.jbuilder
+++ b/app/views/api/v1/widget/configs/create.json.jbuilder
@@ -1,29 +1,37 @@
-json.chatwoot_website_channel do
+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
-  json.has_a_connected_agent_bot @web_widget.inbox.agent_bot&.name
+  json.csat_survey_enabled @web_widget.inbox.csat_survey_enabled
+  json.disable_branding @web_widget.inbox.account.feature_enabled?('disable_branding')
+  json.enabled_features @web_widget.selected_feature_flags
+  json.enabled_languages available_locales_with_name
   json.locale @web_widget.account.locale
+  json.out_of_office_message @web_widget.inbox.out_of_office_message
+  json.portal @web_widget.inbox.portal
+  json.pre_chat_form_enabled @web_widget.pre_chat_form_enabled
+  json.pre_chat_form_options @web_widget.pre_chat_form_options
+  json.reply_time @web_widget.reply_time
+  json.timezone @web_widget.inbox.timezone
+  json.utc_off_set ActiveSupport::TimeZone[@web_widget.inbox.timezone].now.formatted_offset
   json.website_name @web_widget.inbox.name
   json.website_token @web_widget.website_token
   json.welcome_tagline @web_widget.welcome_tagline
   json.welcome_title @web_widget.welcome_title
   json.widget_color @web_widget.widget_color
-  json.enabled_features @web_widget.selected_feature_flags
-  json.enabled_languages available_locales_with_name
-  json.reply_time @web_widget.reply_time
-  json.pre_chat_form_enabled @web_widget.pre_chat_form_enabled
-  json.pre_chat_form_options @web_widget.pre_chat_form_options
-  json.working_hours_enabled @web_widget.inbox.working_hours_enabled
-  json.csat_survey_enabled @web_widget.inbox.csat_survey_enabled
   json.working_hours @web_widget.inbox.working_hours
-  json.out_of_office_message @web_widget.inbox.out_of_office_message
-  json.utc_off_set ActiveSupport::TimeZone[@web_widget.inbox.timezone].now.formatted_offset
-end
-# Remove the following defaults by June 2023 as it would be covered by the feature flags
-json.chatwoot_widget_defaults do
-  json.use_inbox_avatar_for_bot @web_widget.use_inbox_avatar_for_bot
+  json.working_hours_enabled @web_widget.inbox.working_hours_enabled
 end
+
 json.contact do
+  json.email @contact.email
+  json.id @contact.id
+  json.identifier @contact.identifier
+  json.name @contact.name
+  json.phone_number @contact.phone_number
   json.pubsub_token @contact_inbox.pubsub_token
 end
-json.auth_token @token
+
 json.global_config @global_config
diff --git a/spec/controllers/api/v1/widget/configs_controller_spec.rb b/spec/controllers/api/v1/widget/configs_controller_spec.rb
index 6946af3f1..cea2e55fa 100644
--- a/spec/controllers/api/v1/widget/configs_controller_spec.rb
+++ b/spec/controllers/api/v1/widget/configs_controller_spec.rb
@@ -10,7 +10,7 @@ RSpec.describe '/api/v1/widget/config', type: :request do
 
   describe 'POST /api/v1/widget/config' do
     let(:params) { { website_token: web_widget.website_token } }
-    let(:response_keys) { %w[chatwoot_website_channel chatwoot_widget_defaults contact auth_token global_config] }
+    let(:response_keys) { %w[website_channel_config contact global_config] }
 
     context 'with invalid website token' do
       it 'returns not found' do

From abbb4180ea9fb1da007a659ef8cb28188321c641 Mon Sep 17 00:00:00 2001
From: Shivam Kumar <76581658+shivamkb17@users.noreply.github.com>
Date: Tue, 7 Nov 2023 08:07:41 +0530
Subject: [PATCH 56/94] chore: Add facebook `business_management` scope (#8004)

Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
---
 .../routes/dashboard/settings/inbox/channels/Facebook.vue       | 2 +-
 .../routes/dashboard/settings/inbox/facebook/Reauthorize.vue    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Facebook.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Facebook.vue
index 6f55c3801..8dafb3389 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Facebook.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Facebook.vue
@@ -232,7 +232,7 @@ export default {
         },
         {
           scope:
-            'pages_manage_metadata,pages_messaging,instagram_basic,pages_show_list,pages_read_engagement,instagram_manage_messages',
+            'pages_manage_metadata,business_management,pages_messaging,instagram_basic,pages_show_list,pages_read_engagement,instagram_manage_messages',
         }
       );
     },
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/facebook/Reauthorize.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/facebook/Reauthorize.vue
index addb4ca8f..e94f8748c 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/facebook/Reauthorize.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/facebook/Reauthorize.vue
@@ -80,7 +80,7 @@ export default {
         },
         {
           scope:
-            'pages_manage_metadata,pages_messaging,instagram_basic,pages_show_list,pages_read_engagement,instagram_manage_messages',
+            'pages_manage_metadata,business_management,pages_messaging,instagram_basic,pages_show_list,pages_read_engagement,instagram_manage_messages',
           auth_type: 'reauthorize',
         }
       );

From 677888bcde1c2071d05fbecc53d73178a31a27dd Mon Sep 17 00:00:00 2001
From: Vishnu Narayanan <vishnu@chatwoot.com>
Date: Tue, 7 Nov 2023 09:54:30 +0530
Subject: [PATCH 57/94] feat: Add job to remove stale contact inboxes (#8096)

---
 .env.example                                  |  6 +++
 .../remove_stale_contact_inboxes_job.rb       | 11 +++++
 app/models/contact_inbox.rb                   |  7 +++
 .../remove_stale_contact_inboxes_service.rb   | 43 +++++++++++++++++++
 config/schedule.yml                           |  7 +++
 ...move_stale_contact_inboxes_service_spec.rb | 32 ++++++++++++++
 6 files changed, 106 insertions(+)
 create mode 100644 app/jobs/internal/remove_stale_contact_inboxes_job.rb
 create mode 100644 app/services/internal/remove_stale_contact_inboxes_service.rb
 create mode 100644 spec/services/internal/remove_stale_contact_inboxes_service_spec.rb

diff --git a/.env.example b/.env.example
index 27d41685e..d76338e28 100644
--- a/.env.example
+++ b/.env.example
@@ -253,3 +253,9 @@ AZURE_APP_SECRET=
 
 # Sentiment analysis model file path
 SENTIMENT_FILE_PATH=
+
+
+# Housekeeping/Performance related configurations
+# Set to true if you want to remove stale contact inboxes
+# contact_inboxes with no conversation older than 90 days will be removed
+# REMOVE_STALE_CONTACT_INBOX_JOB_STATUS=false
diff --git a/app/jobs/internal/remove_stale_contact_inboxes_job.rb b/app/jobs/internal/remove_stale_contact_inboxes_job.rb
new file mode 100644
index 000000000..e96e5f068
--- /dev/null
+++ b/app/jobs/internal/remove_stale_contact_inboxes_job.rb
@@ -0,0 +1,11 @@
+# housekeeping
+# remove contact inboxes that does not have any conversations
+# and are older than 3 months
+
+class Internal::RemoveStaleContactInboxesJob < ApplicationJob
+  queue_as :scheduled_jobs
+
+  def perform
+    Internal::RemoveStaleContactInboxesService.new.perform
+  end
+end
diff --git a/app/models/contact_inbox.rb b/app/models/contact_inbox.rb
index 5e592af1a..6d034880e 100644
--- a/app/models/contact_inbox.rb
+++ b/app/models/contact_inbox.rb
@@ -33,6 +33,13 @@ class ContactInbox < ApplicationRecord
 
   has_many :conversations, dependent: :destroy_async
 
+  # contact_inboxes that are not associated with any conversation
+  scope :stale_without_conversations, lambda { |time_period|
+    left_joins(:conversations)
+      .where('contact_inboxes.created_at < ?', time_period)
+      .where(conversations: { contact_id: nil })
+  }
+
   def webhook_data
     {
       id: id,
diff --git a/app/services/internal/remove_stale_contact_inboxes_service.rb b/app/services/internal/remove_stale_contact_inboxes_service.rb
new file mode 100644
index 000000000..b619a7011
--- /dev/null
+++ b/app/services/internal/remove_stale_contact_inboxes_service.rb
@@ -0,0 +1,43 @@
+class Internal::RemoveStaleContactInboxesService
+  def perform
+    return unless remove_stale_contact_inbox_job_enabled?
+
+    time_period = 90.days.ago
+    contact_inboxes_to_delete = stale_contact_inboxes(time_period)
+
+    log_stale_contact_inboxes_deletion(contact_inboxes_to_delete, time_period)
+
+    # Since the number of records to delete is very high,
+    # delete_all would be faster than destroy_all since it operates at database level
+    # and avoid loading all the records in memory
+    # Transaction and batching is used to avoid deadlock and memory issues
+    ContactInbox.transaction do
+      contact_inboxes_to_delete
+        .find_in_batches(batch_size: 10_000) do |group|
+          ContactInbox.where(id: group.map(&:id)).delete_all
+        end
+    end
+  end
+
+  private
+
+  def remove_stale_contact_inbox_job_enabled?
+    job_status = ENV.fetch('REMOVE_STALE_CONTACT_INBOX_JOB_STATUS', false)
+    return false unless ActiveModel::Type::Boolean.new.cast(job_status)
+
+    true
+  end
+
+  def stale_contact_inboxes(time_period)
+    ContactInbox.stale_without_conversations(time_period)
+  end
+
+  def log_stale_contact_inboxes_deletion(contact_inboxes, time_period)
+    count = contact_inboxes.count
+    Rails.logger.info "Deleting #{count} stale contact inboxes older than #{time_period}"
+
+    # Log the SQL query without executing it
+    sql_query = contact_inboxes.to_sql
+    Rails.logger.info("SQL Query: #{sql_query}")
+  end
+end
diff --git a/config/schedule.yml b/config/schedule.yml
index 5f8a0f97f..7a0d2faeb 100644
--- a/config/schedule.yml
+++ b/config/schedule.yml
@@ -19,3 +19,10 @@ trigger_imap_email_inboxes_job:
   cron: '*/1 * * * *'
   class: 'Inboxes::FetchImapEmailInboxesJob'
   queue: scheduled_jobs
+
+# executed daily at 2230 UTC
+# which is our lowest traffic time
+remove_stale_contact_inboxes_job.rb:
+  cron: '30 22 * * *'
+  class: 'Internal::RemoveStaleContactInboxesJob'
+  queue: scheduled_jobs
diff --git a/spec/services/internal/remove_stale_contact_inboxes_service_spec.rb b/spec/services/internal/remove_stale_contact_inboxes_service_spec.rb
new file mode 100644
index 000000000..da873b541
--- /dev/null
+++ b/spec/services/internal/remove_stale_contact_inboxes_service_spec.rb
@@ -0,0 +1,32 @@
+# spec/services/remove_stale_contact_inboxes_service_spec.rb
+
+require 'rails_helper'
+
+RSpec.describe Internal::RemoveStaleContactInboxesService do
+  describe '#perform' do
+    it 'does not delete stale contact inboxes if REMOVE_STALE_CONTACT_INBOX_JOB_STATUS is false' do
+      # default value of REMOVE_STALE_CONTACT_INBOX_JOB_STATUS is false
+      create(:contact_inbox, created_at: 3.days.ago)
+      create(:contact_inbox, created_at: 91.days.ago)
+      create(:contact_inbox, created_at: 92.days.ago)
+      create(:contact_inbox, created_at: 93.days.ago)
+      create(:contact_inbox, created_at: 94.days.ago)
+
+      service = described_class.new
+      expect { service.perform }.not_to change(ContactInbox, :count)
+    end
+
+    it 'deletes stale contact inboxes' do
+      with_modified_env REMOVE_STALE_CONTACT_INBOX_JOB_STATUS: 'true' do
+        create(:contact_inbox, created_at: 3.days.ago)
+        create(:contact_inbox, created_at: 91.days.ago)
+        create(:contact_inbox, created_at: 92.days.ago)
+        create(:contact_inbox, created_at: 93.days.ago)
+        create(:contact_inbox, created_at: 94.days.ago)
+
+        service = described_class.new
+        expect { service.perform }.to change(ContactInbox, :count).by(-4)
+      end
+    end
+  end
+end

From 3eb1d495774f5e5d6f3948d4709e96284988085b Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Tue, 7 Nov 2023 12:54:49 +0530
Subject: [PATCH 58/94] fix: Handle all types of errors in API channel webhooks
 (#8307)

---
 lib/webhooks/trigger.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/webhooks/trigger.rb b/lib/webhooks/trigger.rb
index 42ec29717..f2e66f997 100644
--- a/lib/webhooks/trigger.rb
+++ b/lib/webhooks/trigger.rb
@@ -13,7 +13,7 @@ class Webhooks::Trigger
 
   def execute
     perform_request
-  rescue RestClient::Exceptions::Timeout, RestClient::ExceptionWithResponse => e
+  rescue StandardError => e
     handle_error(e)
     Rails.logger.warn "Exception: Invalid webhook URL #{@url} : #{e.message}"
   end

From 66229b0d6be55a14ba53d121ad7c948d0838e93c Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Tue, 7 Nov 2023 17:45:32 -0800
Subject: [PATCH 59/94] chore: [Snyk] Security upgrade audited from 5.4.0 to
 5.4.1 (#8305)

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

diff --git a/Gemfile b/Gemfile
index ca352f2f6..54b63c139 100644
--- a/Gemfile
+++ b/Gemfile
@@ -159,7 +159,7 @@ gem 'lograge', '~> 0.14.0', require: false
 # worked with microsoft refresh token
 gem 'omniauth-oauth2'
 
-gem 'audited', '~> 5.4', '>= 5.4.0'
+gem 'audited', '~> 5.4', '>= 5.4.1'
 
 # need for google auth
 gem 'omniauth'
diff --git a/Gemfile.lock b/Gemfile.lock
index 4add61498..a2ba40678 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -126,9 +126,9 @@ GEM
       rake (>= 10.4, < 14.0)
     ast (2.4.2)
     attr_extras (7.1.0)
-    audited (5.4.0)
-      activerecord (>= 5.0, < 7.2)
-      request_store (~> 1.2)
+    audited (5.4.1)
+      activerecord (>= 5.0, < 7.7)
+      activesupport (>= 5.0, < 7.7)
     aws-eventstream (1.2.0)
     aws-partitions (1.760.0)
     aws-sdk-core (3.171.1)
@@ -840,7 +840,7 @@ DEPENDENCIES
   administrate-field-belongs_to_search
   annotate
   attr_extras
-  audited (~> 5.4, >= 5.4.0)
+  audited (~> 5.4, >= 5.4.1)
   aws-sdk-s3
   azure-storage-blob!
   barnes

From e54c8a857d3b2cbf5027a78d6456ec1a83010e8d Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Tue, 7 Nov 2023 20:07:29 -0800
Subject: [PATCH 60/94] chore: Debug ChatGpt response (#8316)

- Add loggers to debug ChatGPT requests and responses
---
 enterprise/lib/chat_gpt.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/enterprise/lib/chat_gpt.rb b/enterprise/lib/chat_gpt.rb
index 0ad4ac1b0..4065d3686 100644
--- a/enterprise/lib/chat_gpt.rb
+++ b/enterprise/lib/chat_gpt.rb
@@ -54,7 +54,9 @@ class ChatGpt
   def request_gpt
     headers = { 'Content-Type' => 'application/json', 'Authorization' => "Bearer #{ENV.fetch('OPENAI_API_KEY')}" }
     body = { model: @model, messages: @messages }.to_json
+    Rails.logger.info "Requesting Chat GPT with body: #{body}"
     response = HTTParty.post("#{self.class.base_uri}/v1/chat/completions", headers: headers, body: body)
+    Rails.logger.info "Chat GPT response: #{response.body}"
     JSON.parse(response.body)
   end
 end

From f891cfbf47429055d1ec1a10d1893e241dfc0a9e Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Tue, 7 Nov 2023 21:02:04 -0800
Subject: [PATCH 61/94] chore: [Snyk] Security upgrade sidekiq-cron from 1.10.1
 to 1.11.0 (#8294)

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

diff --git a/Gemfile b/Gemfile
index 54b63c139..40fd33957 100644
--- a/Gemfile
+++ b/Gemfile
@@ -116,7 +116,7 @@ gem 'sentry-sidekiq', '>= 5.12.0', require: false
 ##-- background job processing --##
 gem 'sidekiq', '>= 7.1.3'
 # We want cron jobs
-gem 'sidekiq-cron', '>= 1.10.1'
+gem 'sidekiq-cron', '>= 1.11.0'
 
 ##-- Push notification service --##
 gem 'fcm'
diff --git a/Gemfile.lock b/Gemfile.lock
index a2ba40678..a6390908b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -262,7 +262,7 @@ GEM
       rake
     flag_shih_tzu (0.3.23)
     foreman (0.87.2)
-    fugit (1.8.1)
+    fugit (1.9.0)
       et-orbi (~> 1, >= 1.2.7)
       raabro (~> 1.4)
     gapic-common (0.18.0)
@@ -715,12 +715,12 @@ GEM
     sexp_processor (4.17.0)
     shoulda-matchers (5.3.0)
       activesupport (>= 5.2.0)
-    sidekiq (7.1.6)
+    sidekiq (7.2.0)
       concurrent-ruby (< 2)
       connection_pool (>= 2.3.0)
       rack (>= 2.2.4)
       redis-client (>= 0.14.0)
-    sidekiq-cron (1.10.1)
+    sidekiq-cron (1.11.0)
       fugit (~> 1.8)
       globalid (>= 1.0.1)
       sidekiq (>= 6)
@@ -934,7 +934,7 @@ DEPENDENCIES
   sentry-sidekiq (>= 5.12.0)
   shoulda-matchers
   sidekiq (>= 7.1.3)
-  sidekiq-cron (>= 1.10.1)
+  sidekiq-cron (>= 1.11.0)
   simplecov (= 0.17.1)
   slack-ruby-client (~> 2.2.0)
   spring

From 4cb981d81baee831527f91b1d7a23f184bba6054 Mon Sep 17 00:00:00 2001
From: Gabriel Quina <68925625+gabriel-quina@users.noreply.github.com>
Date: Wed, 8 Nov 2023 02:12:57 -0300
Subject: [PATCH 62/94] fix: Semantics across portuguese translations (#8291)

---
 app/javascript/dashboard/i18n/locale/pt/integrationApps.json    | 2 +-
 app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json       | 2 +-
 app/javascript/dashboard/i18n/locale/pt_BR/integrationApps.json | 2 +-
 app/javascript/dashboard/i18n/locale/pt_BR/macros.json          | 2 +-
 config/locales/pt_BR.yml                                        | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/javascript/dashboard/i18n/locale/pt/integrationApps.json b/app/javascript/dashboard/i18n/locale/pt/integrationApps.json
index d3fd14bd1..aa9f1667a 100644
--- a/app/javascript/dashboard/i18n/locale/pt/integrationApps.json
+++ b/app/javascript/dashboard/i18n/locale/pt/integrationApps.json
@@ -56,7 +56,7 @@
       "BUTTON_TEXT": "Desligar"
     },
     "SIDEBAR_DESCRIPTION": {
-      "DIALOGFLOW": "Dialogflow é uma plataforma que facilita o planeamento e integração através de interface de conversação de utilizador numa aplicação móvel, web, bot, sistema de resposta de voz interativo, etc. <br /> <br /> A integração do fluxo de diálogo com o %{installationName} permite-lhe configurar um bot de Dialogflow nas suas caixas de entrada, para que ele trate inicialmente das consultas dos seus contactos e só depois as entregue aos seus agentes se for necessário. O fluxo de diálogo pode ser utilizado para qualificar os pedidos de contacto, reduzir a carga de trabalho dos agentes, oferecer respostas frequentes, etc. <br /> <br /> Para adicionar uma conta do Dialogflow à sua conta Chatwoot só precisa de ter o serviço ativo no Google e partilhar as suas credenciais. Por favor, consulte a documentação do Dialogflow para obter mais informações."
+      "DIALOGFLOW": "Dialogflow é uma plataforma que facilita o planeamento e integração através de interface de conversação de utilizador numa aplicação móvel, web, bot, sistema de resposta de voz interativo, etc. <br /> <br /> A integração do Dialogflow com o %{installationName} permite-lhe configurar um bot de Dialogflow nas suas caixas de entrada, para que ele trate inicialmente das consultas dos seus contactos e só depois as entregue aos seus agentes se for necessário. O Dialogflow pode ser utilizado para qualificar os pedidos de contacto, reduzir a carga de trabalho dos agentes, oferecer respostas frequentes, etc. <br /> <br /> Para adicionar uma conta do Dialogflow à sua conta Chatwoot só precisa de ter o serviço ativo no Google e partilhar as suas credenciais. Por favor, consulte a documentação do Dialogflow para obter mais informações."
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
index 029226416..f527ef9f5 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
@@ -577,7 +577,7 @@
         "VALIDATION_ERROR": "Hora inicial deve ser antes de hora de fechamento.",
         "CHOOSE": "Selecione"
       },
-      "ALL_DAY": "Todos os Dias"
+      "ALL_DAY": "O dia todo"
     },
     "IMAP": {
       "TITLE": "IMAP",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/integrationApps.json b/app/javascript/dashboard/i18n/locale/pt_BR/integrationApps.json
index 759019ae2..e7a931c3b 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/integrationApps.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/integrationApps.json
@@ -56,7 +56,7 @@
       "BUTTON_TEXT": "Desconectado"
     },
     "SIDEBAR_DESCRIPTION": {
-      "DIALOGFLOW": "Dialogflow é uma plataforma natural de entendimento em linguagem que torna fácil projetar e integrar uma interface de usuário conversacional em seu aplicativo móvel, aplicativo web, dispositivo, bot, sistema de resposta de voz interativo, etc. <br /> <br /> A integração do fluxo de diálogo com o %{installationName} permite que você configure um bot de Dialogflow com suas caixas de entrada, o que permite que o bot lide inicialmente as consultas e entregue-as a um agente quando necessário. O fluxo de diálogo pode ser usado para qualificar as chumbas, reduzir a carga de trabalho dos agentes, fornecendo perguntas frequentes, etc. <br /> <br /> Para adicionar um fluxo de diálogo, você precisa criar uma Conta de Serviço no seu console do projeto Google e compartilhar as credenciais. Por favor, consulte a documentação do fluxo de diálogo para obter mais informações."
+      "DIALOGFLOW": "Dialogflow é uma plataforma natural de entendimento em linguagem que torna fácil projetar e integrar uma interface de usuário conversacional em seu aplicativo móvel, aplicativo web, dispositivo, bot, sistema de resposta de voz interativo, etc. <br /> <br /> A integração do Dialogflow com o %{installationName} permite que você configure um bot de Dialogflow com suas caixas de entrada, o que permite que o bot lide inicialmente as consultas e entregue-as a um agente quando necessário. O Dialogflow pode ser usado para qualificar clientes em potencial, reduzir a carga de trabalho dos agentes, fornecendo perguntas frequentes, etc. <br /> <br /> Para adicionar o Dialogflow, você precisa criar uma Conta de Serviço no seu console do projeto Google e compartilhar as credenciais. Por favor, consulte a documentação do Dialogflow para obter mais informações."
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/macros.json b/app/javascript/dashboard/i18n/locale/pt_BR/macros.json
index bab2f7fea..4c7ba9f20 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/macros.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/macros.json
@@ -4,7 +4,7 @@
     "HEADER_BTN_TXT": "Adicionar uma nova macro",
     "HEADER_BTN_TXT_SAVE": "Salvar macro",
     "LOADING": "Obtendo macros",
-    "SIDEBAR_TXT": "<p><b>Macros</b><p>Uma macro é um conjunto de ações salvas que ajudam os agentes de serviço ao cliente a concluírem facilmente as tarefas. Os agentes podem definir um conjunto de ações como marcar uma conversa com um rótulo, enviar uma transcrição de e-mail, atualizando um atributo personalizado, etc. e eles podem executar essas ações com um único clique. Quando os agentes executam a macro, as ações seriam executadas sequencialmente na ordem em que são definidas. Macros melhoram a produtividade e aumentam a consistência em ações. </p><p>Uma macro pode ser útil de 2 maneiras. </p><p><b>Como assistente de agente:</b> Se um agente executa um conjunto de ações várias vezes, eles podem salvá-lo como uma macro e executar todas as ações juntas usando um único clique.</p><p><b>Como opção para integrar um membro da equipe:</b> Todos os agentes devem realizar verificações/ações diferentes durante cada conversa. Integrar um novo membro da equipe de suporte será fácil se macros predefinidos estiverem disponíveis na conta. Em vez de descrever cada passo em detalhe, o chumbo do gerente/equipe pode apontar para as macros usadas em diferentes cenários.</p>",
+    "SIDEBAR_TXT": "<p><b>Macros</b><p>Uma macro é um conjunto de ações salvas que ajudam os agentes de serviço ao cliente a concluírem facilmente as tarefas. Os agentes podem definir um conjunto de ações como marcar uma conversa com um rótulo, enviar uma transcrição de e-mail, atualizando um atributo personalizado, etc. e eles podem executar essas ações com um único clique. Quando os agentes executam a macro, as ações seriam executadas sequencialmente na ordem em que são definidas. Macros melhoram a produtividade e aumentam a consistência em ações. </p><p>Uma macro pode ser útil de 2 maneiras. </p><p><b>Como assistente de agente:</b> Se um agente executa um conjunto de ações várias vezes, eles podem salvá-lo como uma macro e executar todas as ações juntas usando um único clique.</p><p><b>Como opção para integrar um membro da equipe:</b> Todos os agentes devem realizar verificações/ações diferentes durante cada conversa. Integrar um novo membro da equipe de suporte será fácil se macros predefinidos estiverem disponíveis na conta. Em vez de descrever cada passo em detalhe, o gerente/líder da equipe pode apontar para as macros usadas em diferentes cenários.</p>",
     "ERROR": "Algo deu errado. Por favor, tente novamente",
     "ORDER_INFO": "As macros serão executadas na ordem que você adicionar suas ações. Você pode reorganizá-las arrastando-as pelo identificador ao lado de cada nó.",
     "ADD": {
diff --git a/config/locales/pt_BR.yml b/config/locales/pt_BR.yml
index a3fe784a3..857f9b46d 100644
--- a/config/locales/pt_BR.yml
+++ b/config/locales/pt_BR.yml
@@ -173,7 +173,7 @@ pt_BR:
       name: "Webhooks"
       description: "Webhooks fornecem informações em tempo real sobre o que está acontecendo em sua conta. Você pode usar os webhooks para comunicar eventos com seus aplicativos favoritos como Slack ou Github. Clique em Configurar para configurar seus webhooks."
     dialogflow:
-      name: "Fluxo de diálogo"
+      name: "Dialogflow"
       description: "Construa chatbots usando Dialogflow e conecte-os à sua caixa de entrada rapidamente. Deixe os bots lidarem com as consultas antes de entregá-los a um agente de atendimento ao cliente."
     fullcontact:
       name: "Contato completo"

From 5d224f2e04a0a8463866583910cdb5094111b04b Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Wed, 8 Nov 2023 10:47:22 +0530
Subject: [PATCH 63/94] feat: allow inbox specific flags for signature toggle
 (#8280)

Co-authored-by: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
---
 .../components/widgets/WootWriter/Editor.vue     |  8 ++++++--
 .../widgets/WootWriter/ReplyBottomPanel.vue      | 10 ++++------
 .../components/widgets/conversation/ReplyBox.vue |  4 ++--
 app/javascript/dashboard/mixins/uiSettings.js    | 16 ++++++++++++++++
 .../conversation/contact/ConversationForm.vue    | 11 ++++++-----
 5 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue b/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue
index 864f8ac35..2a9fb98d3 100644
--- a/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue
+++ b/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue
@@ -135,6 +135,7 @@ export default {
     // allowSignature is a kill switch, ensuring no signature methods
     // are triggered except when this flag is true
     allowSignature: { type: Boolean, default: false },
+    channelType: { type: String, default: '' },
     showImageResizeToolbar: { type: Boolean, default: false }, // A kill switch to show or hide the image toolbar
   },
   data() {
@@ -266,8 +267,11 @@ export default {
     sendWithSignature() {
       // this is considered the source of truth, we watch this property
       // on change, we toggle the signature in the editor
-      const { send_with_signature: isEnabled } = this.uiSettings;
-      return isEnabled && this.allowSignature && !this.isPrivate;
+      if (this.allowSignature && !this.isPrivate && this.channelType) {
+        return this.fetchSignatureFlagFromUiSettings(this.channelType);
+      }
+
+      return false;
     },
   },
   watch: {
diff --git a/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue b/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue
index 77355977f..eb9b26f30 100644
--- a/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue
+++ b/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue
@@ -101,7 +101,7 @@
       <transition name="modal-fade">
         <div
           v-show="$refs.upload && $refs.upload.dropActive"
-          class="flex items-center justify-center gap-2 fixed left-0 right-0 top-0 bottom-0 w-full h-full z-20 text-slate-600 dark:text-slate-200 bg-white_transparent dark:bg-black_transparent flex-col"
+          class="fixed top-0 bottom-0 left-0 right-0 z-20 flex flex-col items-center justify-center w-full h-full gap-2 text-slate-600 dark:text-slate-200 bg-white_transparent dark:bg-black_transparent"
         >
           <fluent-icon icon="cloud-backup" size="40" />
           <h4 class="page-sub-title text-slate-600 dark:text-slate-200">
@@ -313,8 +313,8 @@ export default {
       return !this.isOnPrivateNote;
     },
     sendWithSignature() {
-      const { send_with_signature: isEnabled } = this.uiSettings;
-      return isEnabled;
+      // channelType is sourced from inboxMixin
+      return this.fetchSignatureFlagFromUiSettings(this.channelType);
     },
     signatureToggleTooltip() {
       return this.sendWithSignature
@@ -339,9 +339,7 @@ export default {
       }
     },
     toggleMessageSignature() {
-      this.updateUISettings({
-        send_with_signature: !this.sendWithSignature,
-      });
+      this.setSignatureFlagForInbox(this.channelType, !this.sendWithSignature);
     },
     replaceText(text) {
       this.$emit('replace-text', text);
diff --git a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
index da47bd556..37c34a031 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
@@ -85,6 +85,7 @@
         :variables="messageVariables"
         :signature="signatureToApply"
         :allow-signature="true"
+        :channel-type="channelType"
         @typing-off="onTypingOff"
         @typing-on="onTypingOn"
         @focus="onFocus"
@@ -477,8 +478,7 @@ export default {
       return !!this.signatureToApply;
     },
     sendWithSignature() {
-      const { send_with_signature: isEnabled } = this.uiSettings;
-      return isEnabled;
+      return this.fetchSignatureFlagFromUiSettings(this.channelType);
     },
     editorMessageKey() {
       const { editor_message_key: isEnabled } = this.uiSettings;
diff --git a/app/javascript/dashboard/mixins/uiSettings.js b/app/javascript/dashboard/mixins/uiSettings.js
index 08a46c5c1..2c60db3cb 100644
--- a/app/javascript/dashboard/mixins/uiSettings.js
+++ b/app/javascript/dashboard/mixins/uiSettings.js
@@ -1,4 +1,5 @@
 import { mapGetters } from 'vuex';
+
 export const DEFAULT_CONVERSATION_SIDEBAR_ITEMS_ORDER = [
   { name: 'conversation_actions' },
   { name: 'macros' },
@@ -13,6 +14,9 @@ export const DEFAULT_CONTACT_SIDEBAR_ITEMS_ORDER = [
   { name: 'previous_conversation' },
 ];
 
+const slugifyChannel = name =>
+  name.toLowerCase().replace(' ', '_').replace('-', '_').replace('::', '_');
+
 export const isEditorHotKeyEnabled = (uiSettings, key) => {
   const {
     editor_message_key: editorMessageKey,
@@ -65,5 +69,17 @@ export default {
     toggleSidebarUIState(key) {
       this.updateUISettings({ [key]: !this.isContactSidebarItemOpen(key) });
     },
+    setSignatureFlagForInbox(channelType, value) {
+      channelType = slugifyChannel(channelType);
+      this.updateUISettings({
+        [`${channelType}_signature_enabled`]: value,
+      });
+    },
+    fetchSignatureFlagFromUiSettings(channelType) {
+      if (!channelType) return false;
+
+      channelType = slugifyChannel(channelType);
+      return this.uiSettings[`${channelType}_signature_enabled`];
+    },
   },
 };
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/contact/ConversationForm.vue b/app/javascript/dashboard/routes/dashboard/conversation/contact/ConversationForm.vue
index 4a5180570..695670455 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/contact/ConversationForm.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/contact/ConversationForm.vue
@@ -281,6 +281,10 @@ export default {
       type: Function,
       default: () => {},
     },
+    channelType: {
+      type: String,
+      default: '',
+    },
   },
   data() {
     return {
@@ -316,8 +320,7 @@ export default {
       messageSignature: 'getMessageSignature',
     }),
     sendWithSignature() {
-      const { send_with_signature: isEnabled } = this.uiSettings;
-      return isEnabled;
+      return this.fetchSignatureFlagFromUiSettings(this.channelType);
     },
     signatureToApply() {
       return this.messageSignature;
@@ -543,9 +546,7 @@ export default {
       return classByType;
     },
     toggleMessageSignature() {
-      this.updateUISettings({
-        send_with_signature: !this.sendWithSignature,
-      });
+      this.setSignatureFlagForInbox(this.channelType, !this.sendWithSignature);
       this.setSignature();
     },
   },

From e0f33e62af09739c5c273f40a94309c23bd102f7 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Wed, 8 Nov 2023 14:11:47 +0530
Subject: [PATCH 64/94] feat: Adds support for image resize in the message
 bubble (#8182)

---
 .../components/widgets/WootWriter/Editor.vue  |  4 +--
 .../shared/helpers/MessageFormatter.js        | 31 +++++++++++++++++++
 .../helpers/specs/MessageFormatter.spec.js    | 26 ++++++++++++++++
 3 files changed, 59 insertions(+), 2 deletions(-)

diff --git a/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue b/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue
index 2a9fb98d3..33bca2e68 100644
--- a/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue
+++ b/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue
@@ -446,7 +446,7 @@ export default {
             this.onFocus();
           },
           click: () => {
-            // this.isEditorMouseFocusedOnAnImage(); Enable it when the backend supports for message resize is done.
+            this.isEditorMouseFocusedOnAnImage();
           },
           blur: () => {
             this.onBlur();
@@ -674,7 +674,7 @@ export default {
         () => this.resetTyping(),
         TYPING_INDICATOR_IDLE_TIME
       );
-      // this.updateImgToolbarOnDelete(); Enable it when the backend supports for message resize is done.
+      this.updateImgToolbarOnDelete();
     },
     onKeydown(event) {
       if (this.isEnterToSendEnabled()) {
diff --git a/app/javascript/shared/helpers/MessageFormatter.js b/app/javascript/shared/helpers/MessageFormatter.js
index 59e1173ac..6e4ade3ff 100644
--- a/app/javascript/shared/helpers/MessageFormatter.js
+++ b/app/javascript/shared/helpers/MessageFormatter.js
@@ -1,5 +1,35 @@
 import mila from 'markdown-it-link-attributes';
 import mentionPlugin from './markdownIt/link';
+
+const setImageHeight = inlineToken => {
+  const imgSrc = inlineToken.attrGet('src');
+  if (!imgSrc) return;
+  const url = new URL(imgSrc);
+  const height = url.searchParams.get('cw_image_height');
+  if (!height) return;
+  inlineToken.attrSet('style', `height: ${height};`);
+};
+
+const processInlineToken = blockToken => {
+  blockToken.children.forEach(inlineToken => {
+    if (inlineToken.type === 'image') {
+      setImageHeight(inlineToken);
+    }
+  });
+};
+
+const imgResizeManager = md => {
+  // Custom rule for image resize in markdown
+  // If the image url has a query param cw_image_height, then add a style attribute to the image
+  md.core.ruler.after('inline', 'add-image-height', state => {
+    state.tokens.forEach(blockToken => {
+      if (blockToken.type === 'inline') {
+        processInlineToken(blockToken);
+      }
+    });
+  });
+};
+
 const md = require('markdown-it')({
   html: false,
   xhtmlOut: true,
@@ -11,6 +41,7 @@ const md = require('markdown-it')({
   maxNesting: 20,
 })
   .use(mentionPlugin)
+  .use(imgResizeManager)
   .use(mila, {
     attrs: {
       class: 'link',
diff --git a/app/javascript/shared/helpers/specs/MessageFormatter.spec.js b/app/javascript/shared/helpers/specs/MessageFormatter.spec.js
index 60c875c8a..47760f7a8 100644
--- a/app/javascript/shared/helpers/specs/MessageFormatter.spec.js
+++ b/app/javascript/shared/helpers/specs/MessageFormatter.spec.js
@@ -28,6 +28,32 @@ describe('#MessageFormatter', () => {
     });
   });
 
+  describe('content with image and has "cw_image_height" query at the end of URL', () => {
+    it('should set image height correctly', () => {
+      const message =
+        'Chatwoot is an opensource tool. ![](http://chatwoot.com/chatwoot.png?cw_image_height=24px)';
+      expect(new MessageFormatter(message).formattedMessage).toMatch(
+        '<p>Chatwoot is an opensource tool. <img src="http://chatwoot.com/chatwoot.png?cw_image_height=24px" alt="" style="height: 24px;" /></p>'
+      );
+    });
+
+    it('should set image height correctly if its original size', () => {
+      const message =
+        'Chatwoot is an opensource tool. ![](http://chatwoot.com/chatwoot.png?cw_image_height=auto)';
+      expect(new MessageFormatter(message).formattedMessage).toMatch(
+        '<p>Chatwoot is an opensource tool. <img src="http://chatwoot.com/chatwoot.png?cw_image_height=auto" alt="" style="height: auto;" /></p>'
+      );
+    });
+
+    it('should not set height', () => {
+      const message =
+        'Chatwoot is an opensource tool. ![](http://chatwoot.com/chatwoot.png)';
+      expect(new MessageFormatter(message).formattedMessage).toMatch(
+        '<p>Chatwoot is an opensource tool. <img src="http://chatwoot.com/chatwoot.png" alt="" /></p>'
+      );
+    });
+  });
+
   describe('tweets', () => {
     it('should return the same string if not tags or @mentions', () => {
       const message = 'Chatwoot is an opensource tool';

From af7631d9f1f957dc5508d2e47d01231dd585b5a4 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Thu, 9 Nov 2023 03:14:57 +0530
Subject: [PATCH 65/94] chore: Update `MarkMessagesAsReadJob` to accept
 `delivered` status (#8319)

---
 .../api/v1/widget/conversations_controller.rb |  2 +-
 .../v1/inboxes/conversations_controller.rb    |  2 +-
 .../mark_messages_as_read_job.rb              | 16 --------------
 .../update_message_status_job.rb              | 21 +++++++++++++++++++
 app/services/instagram/read_status_service.rb |  2 +-
 .../widget/conversations_controller_spec.rb   |  2 +-
 .../v1/inbox/conversations_controller_spec.rb |  2 +-
 ...c.rb => update_message_status_job_spec.rb} | 15 ++++++++++++-
 .../instagram/read_status_service_spec.rb     | 10 ++++-----
 9 files changed, 45 insertions(+), 27 deletions(-)
 delete mode 100644 app/jobs/conversations/mark_messages_as_read_job.rb
 create mode 100644 app/jobs/conversations/update_message_status_job.rb
 rename spec/jobs/conversations/{mark_messages_as_read_job_spec.rb => update_message_status_job_spec.rb} (81%)

diff --git a/app/controllers/api/v1/widget/conversations_controller.rb b/app/controllers/api/v1/widget/conversations_controller.rb
index 69b85797c..1d1ba8a7e 100644
--- a/app/controllers/api/v1/widget/conversations_controller.rb
+++ b/app/controllers/api/v1/widget/conversations_controller.rb
@@ -28,7 +28,7 @@ class Api::V1::Widget::ConversationsController < Api::V1::Widget::BaseController
 
     conversation.contact_last_seen_at = DateTime.now.utc
     conversation.save!
-    ::Conversations::MarkMessagesAsReadJob.perform_later(conversation.id, conversation.contact_last_seen_at)
+    ::Conversations::UpdateMessageStatusJob.perform_later(conversation.id, conversation.contact_last_seen_at)
     head :ok
   end
 
diff --git a/app/controllers/public/api/v1/inboxes/conversations_controller.rb b/app/controllers/public/api/v1/inboxes/conversations_controller.rb
index 3242942f4..671863bdc 100644
--- a/app/controllers/public/api/v1/inboxes/conversations_controller.rb
+++ b/app/controllers/public/api/v1/inboxes/conversations_controller.rb
@@ -23,7 +23,7 @@ class Public::Api::V1::Inboxes::ConversationsController < Public::Api::V1::Inbox
   def update_last_seen
     @conversation.contact_last_seen_at = DateTime.now.utc
     @conversation.save!
-    ::Conversations::MarkMessagesAsReadJob.perform_later(@conversation.id, @conversation.contact_last_seen_at)
+    ::Conversations::UpdateMessageStatusJob.perform_later(@conversation.id, @conversation.contact_last_seen_at)
     head :ok
   end
 
diff --git a/app/jobs/conversations/mark_messages_as_read_job.rb b/app/jobs/conversations/mark_messages_as_read_job.rb
deleted file mode 100644
index 212b8569f..000000000
--- a/app/jobs/conversations/mark_messages_as_read_job.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-class Conversations::MarkMessagesAsReadJob < ApplicationJob
-  queue_as :low
-
-  def perform(conversation_id, timestamp)
-    conversation = Conversation.find_by(id: conversation_id)
-
-    return unless conversation
-
-    # Mark every message created before the user's viewing time as read.
-    conversation.messages.where(status: %w[sent delivered])
-                .where.not(message_type: 'incoming')
-                .where('messages.created_at <= ?', timestamp).find_each do |message|
-      message.update!(status: 'read')
-    end
-  end
-end
diff --git a/app/jobs/conversations/update_message_status_job.rb b/app/jobs/conversations/update_message_status_job.rb
new file mode 100644
index 000000000..1e6333b41
--- /dev/null
+++ b/app/jobs/conversations/update_message_status_job.rb
@@ -0,0 +1,21 @@
+class Conversations::UpdateMessageStatusJob < ApplicationJob
+  queue_as :low
+
+  # This job only support marking messages as read or delivered, update this array if we want to support more statuses
+  VALID_STATUSES = %w[read delivered].freeze
+
+  def perform(conversation_id, timestamp, status = :read)
+    return unless VALID_STATUSES.include?(status.to_s)
+
+    conversation = Conversation.find_by(id: conversation_id)
+
+    return unless conversation
+
+    # Mark every message created before the user's viewing time read or delivered
+    conversation.messages.where(status: %w[sent delivered])
+                .where.not(message_type: 'incoming')
+                .where('messages.created_at <= ?', timestamp).find_each do |message|
+      message.update!(status: status)
+    end
+  end
+end
diff --git a/app/services/instagram/read_status_service.rb b/app/services/instagram/read_status_service.rb
index 41ef7246a..c96d369ea 100644
--- a/app/services/instagram/read_status_service.rb
+++ b/app/services/instagram/read_status_service.rb
@@ -4,7 +4,7 @@ class Instagram::ReadStatusService
   def perform
     return if instagram_channel.blank?
 
-    ::Conversations::MarkMessagesAsReadJob.perform_later(message.conversation.id, message.created_at) if message.present?
+    ::Conversations::UpdateMessageStatusJob.perform_later(message.conversation.id, message.created_at) if message.present?
   end
 
   def instagram_id
diff --git a/spec/controllers/api/v1/widget/conversations_controller_spec.rb b/spec/controllers/api/v1/widget/conversations_controller_spec.rb
index 15bfb6855..c3fd7ff26 100644
--- a/spec/controllers/api/v1/widget/conversations_controller_spec.rb
+++ b/spec/controllers/api/v1/widget/conversations_controller_spec.rb
@@ -173,7 +173,7 @@ RSpec.describe '/api/v1/widget/conversations/toggle_typing', type: :request do
 
         allow(Rails.configuration.dispatcher).to receive(:dispatch)
         expect(conversation.contact_last_seen_at).to be_nil
-        expect(Conversations::MarkMessagesAsReadJob).to receive(:perform_later).with(conversation.id, current_time)
+        expect(Conversations::UpdateMessageStatusJob).to receive(:perform_later).with(conversation.id, current_time)
 
         post '/api/v1/widget/conversations/update_last_seen',
              headers: { 'X-Auth-Token' => token },
diff --git a/spec/controllers/public/api/v1/inbox/conversations_controller_spec.rb b/spec/controllers/public/api/v1/inbox/conversations_controller_spec.rb
index 7e1779b4a..d54f26272 100644
--- a/spec/controllers/public/api/v1/inbox/conversations_controller_spec.rb
+++ b/spec/controllers/public/api/v1/inbox/conversations_controller_spec.rb
@@ -83,7 +83,7 @@ RSpec.describe 'Public Inbox Contact Conversations API', type: :request do
       current_time = DateTime.now.utc
       allow(DateTime).to receive(:now).and_return(current_time)
       contact_last_seen_at = conversation.contact_last_seen_at
-      expect(Conversations::MarkMessagesAsReadJob).to receive(:perform_later).with(conversation.id, current_time)
+      expect(Conversations::UpdateMessageStatusJob).to receive(:perform_later).with(conversation.id, current_time)
       post update_last_seen_path
 
       expect(response).to have_http_status(:success)
diff --git a/spec/jobs/conversations/mark_messages_as_read_job_spec.rb b/spec/jobs/conversations/update_message_status_job_spec.rb
similarity index 81%
rename from spec/jobs/conversations/mark_messages_as_read_job_spec.rb
rename to spec/jobs/conversations/update_message_status_job_spec.rb
index e4eff0f0a..0cdfb867d 100644
--- a/spec/jobs/conversations/mark_messages_as_read_job_spec.rb
+++ b/spec/jobs/conversations/update_message_status_job_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe Conversations::MarkMessagesAsReadJob do
+RSpec.describe Conversations::UpdateMessageStatusJob do
   subject(:job) { described_class.perform_later(account) }
 
   let!(:account) { create(:account) }
@@ -21,6 +21,13 @@ RSpec.describe Conversations::MarkMessagesAsReadJob do
       end.to change(message, :status).from('sent').to('read')
     end
 
+    it 'marks all sent messages in a conversation as delivered if specified' do
+      expect do
+        described_class.perform_now(conversation.id, conversation.contact_last_seen_at, :delivered)
+        message.reload
+      end.to change(message, :status).from('sent').to('delivered')
+    end
+
     it 'marks all delivered messages in a conversation as read' do
       message.update!(status: 'delivered')
       expect do
@@ -63,5 +70,11 @@ RSpec.describe Conversations::MarkMessagesAsReadJob do
         described_class.perform_now(1212, conversation.contact_last_seen_at)
       end.not_to change(message.reload, :status)
     end
+
+    it 'does not run the job if the status is failed' do
+      expect do
+        described_class.perform_now(conversation.id, conversation.contact_last_seen_at, :failed)
+      end.not_to change(message.reload, :status)
+    end
   end
 end
diff --git a/spec/services/instagram/read_status_service_spec.rb b/spec/services/instagram/read_status_service_spec.rb
index 669fcd4f9..535c481c7 100644
--- a/spec/services/instagram/read_status_service_spec.rb
+++ b/spec/services/instagram/read_status_service_spec.rb
@@ -18,10 +18,10 @@ describe Instagram::ReadStatusService do
       let(:message) { conversation.messages.last }
 
       before do
-        allow(Conversations::MarkMessagesAsReadJob).to receive(:perform_later)
+        allow(Conversations::UpdateMessageStatusJob).to receive(:perform_later)
       end
 
-      it 'enqueues the MarkMessagesAsReadJob with correct parameters if the message is found' do
+      it 'enqueues the UpdateMessageStatusJob with correct parameters if the message is found' do
         params = {
           recipient: {
             id: 'chatwoot-app-user-id-1'
@@ -31,10 +31,10 @@ describe Instagram::ReadStatusService do
           }
         }
         described_class.new(params: params).perform
-        expect(Conversations::MarkMessagesAsReadJob).to have_received(:perform_later).with(conversation.id, message.created_at)
+        expect(Conversations::UpdateMessageStatusJob).to have_received(:perform_later).with(conversation.id, message.created_at)
       end
 
-      it 'does not enqueue the MarkMessagesAsReadJob if the message is not found' do
+      it 'does not enqueue the UpdateMessageStatusJob if the message is not found' do
         params = {
           recipient: {
             id: 'chatwoot-app-user-id-1'
@@ -44,7 +44,7 @@ describe Instagram::ReadStatusService do
           }
         }
         described_class.new(params: params).perform
-        expect(Conversations::MarkMessagesAsReadJob).not_to have_received(:perform_later)
+        expect(Conversations::UpdateMessageStatusJob).not_to have_received(:perform_later)
       end
     end
   end

From 7b09b027371d921643d4a732a5932a8d7ae44336 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Wed, 8 Nov 2023 17:02:48 -0800
Subject: [PATCH 66/94] chore: Fix trigger message for response Bot (#8322)

- Fix the bug where wrong messages was used to search response sources
---
 .../enterprise/message_templates/response_bot_service.rb       | 2 +-
 .../enterprise/message_templates/response_bot_service_spec.rb  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/enterprise/app/services/enterprise/message_templates/response_bot_service.rb b/enterprise/app/services/enterprise/message_templates/response_bot_service.rb
index 0c1bcc220..214b33788 100644
--- a/enterprise/app/services/enterprise/message_templates/response_bot_service.rb
+++ b/enterprise/app/services/enterprise/message_templates/response_bot_service.rb
@@ -3,7 +3,7 @@ class Enterprise::MessageTemplates::ResponseBotService
 
   def perform
     ActiveRecord::Base.transaction do
-      @response = get_response(conversation.messages.last.content)
+      @response = get_response(conversation.messages.incoming.last.content)
       process_response
     end
   rescue StandardError => e
diff --git a/spec/enterprise/services/enterprise/message_templates/response_bot_service_spec.rb b/spec/enterprise/services/enterprise/message_templates/response_bot_service_spec.rb
index 180fa4cef..42c62bc62 100644
--- a/spec/enterprise/services/enterprise/message_templates/response_bot_service_spec.rb
+++ b/spec/enterprise/services/enterprise/message_templates/response_bot_service_spec.rb
@@ -14,10 +14,11 @@ RSpec.describe Enterprise::MessageTemplates::ResponseBotService, type: :service
     stub_request(:post, 'https://api.openai.com/v1/embeddings').to_return(status: 200, body: {}.to_json,
                                                                           headers: { Content_Type: 'application/json' })
     create(:message, message_type: :incoming, conversation: conversation, content: 'Hi')
+    create(:message, message_type: :outgoing, conversation: conversation, content: 'Hello')
     4.times { create(:response, response_source: response_source) }
     allow(ChatGpt).to receive(:new).and_return(chat_gpt_double)
     allow(chat_gpt_double).to receive(:generate_response).and_return({ 'response' => 'some_response', 'context_ids' => Response.all.map(&:id) })
-    allow(conversation.inbox).to receive(:get_responses).and_return([response_object])
+    allow(conversation.inbox).to receive(:get_responses).with('Hi').and_return([response_object])
   end
 
   describe '#perform' do

From 78398ee800d28a067ce696e5d536b50349404b23 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Thu, 9 Nov 2023 07:26:59 +0530
Subject: [PATCH 67/94] feat: Updated public portal header design (#8089)

Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
---
 .../public/api/v1/portals/base_controller.rb  |   2 +-
 app/helpers/portal_helper.rb                  |  25 +
 app/javascript/portal/portalHelpers.js        |  59 +-
 app/javascript/portal/specs/portal.spec.js    | 112 +++-
 app/views/icons/_check-mark.html.erb          |   3 +
 app/views/icons/_chevron-down.html.erb        |   3 +
 app/views/icons/_chevron-right.html.erb       |   3 +
 app/views/icons/_globe.html.erb               |   5 +
 app/views/icons/_monitor.html.erb             |   5 +
 app/views/icons/_moon.html.erb                |   3 +
 app/views/icons/_palette.html.erb             |   7 +
 app/views/icons/_redirect.html.erb            |   5 +
 app/views/icons/_sun.html.erb                 |  11 +
 app/views/layouts/portal.html.erb             |   4 +-
 .../public/api/v1/portals/_header.html.erb    | 100 +++-
 .../public/api/v1/portals/_hero.html.erb      |   4 +-
 config/languages/language_map.yml             | 563 ++++++++++++++++++
 config/locales/en.yml                         |   6 +-
 spec/helpers/portal_helper_spec.rb            |  28 +
 19 files changed, 909 insertions(+), 39 deletions(-)
 create mode 100644 app/views/icons/_check-mark.html.erb
 create mode 100644 app/views/icons/_chevron-down.html.erb
 create mode 100644 app/views/icons/_chevron-right.html.erb
 create mode 100644 app/views/icons/_globe.html.erb
 create mode 100644 app/views/icons/_monitor.html.erb
 create mode 100644 app/views/icons/_moon.html.erb
 create mode 100644 app/views/icons/_palette.html.erb
 create mode 100644 app/views/icons/_redirect.html.erb
 create mode 100644 app/views/icons/_sun.html.erb
 create mode 100644 config/languages/language_map.yml

diff --git a/app/controllers/public/api/v1/portals/base_controller.rb b/app/controllers/public/api/v1/portals/base_controller.rb
index 70aa1e92e..df9526a69 100644
--- a/app/controllers/public/api/v1/portals/base_controller.rb
+++ b/app/controllers/public/api/v1/portals/base_controller.rb
@@ -14,7 +14,7 @@ class Public::Api::V1::Portals::BaseController < PublicController
     @theme = if %w[dark light].include?(params[:theme])
                params[:theme]
              else
-               ''
+               'system'
              end
   end
 
diff --git a/app/helpers/portal_helper.rb b/app/helpers/portal_helper.rb
index 3551b5ac6..2011bb525 100644
--- a/app/helpers/portal_helper.rb
+++ b/app/helpers/portal_helper.rb
@@ -8,4 +8,29 @@ module PortalHelper
     bg_image = theme == 'dark' ? 'grid_dark.svg' : 'grid.svg'
     "background: url(/assets/images/hc/#{bg_image}) #{generate_portal_bg_color(portal_color, theme)}"
   end
+
+  def language_name(locale)
+    language_map = YAML.load_file(Rails.root.join('config/languages/language_map.yml'))
+    language_map[locale] || locale
+  end
+
+  def get_theme_names(theme)
+    if theme == 'light'
+      I18n.t('public_portal.header.appearance.light')
+    elsif theme == 'dark'
+      I18n.t('public_portal.header.appearance.dark')
+    else
+      I18n.t('public_portal.header.appearance.system')
+    end
+  end
+
+  def get_theme_icon(theme)
+    if theme == 'light'
+      'icons/sun'
+    elsif theme == 'dark'
+      'icons/moon'
+    else
+      'icons/monitor'
+    end
+  end
 end
diff --git a/app/javascript/portal/portalHelpers.js b/app/javascript/portal/portalHelpers.js
index 8b36e63f9..de1a36548 100644
--- a/app/javascript/portal/portalHelpers.js
+++ b/app/javascript/portal/portalHelpers.js
@@ -4,7 +4,7 @@ import Vue from 'vue';
 import PublicArticleSearch from './components/PublicArticleSearch.vue';
 import TableOfContents from './components/TableOfContents.vue';
 
-export const getHeadingsFromTheArticle = () => {
+export const getHeadingsfromTheArticle = () => {
   const rows = [];
   const articleElement = document.getElementById('cw-article-content');
   articleElement.querySelectorAll('h1, h2, h3').forEach(element => {
@@ -68,6 +68,37 @@ export const updateThemeStyles = theme => {
   setPortalClass(theme);
 };
 
+export const toggleAppearanceDropdown = () => {
+  const dropdown = document.getElementById('appearance-dropdown');
+  if (!dropdown) return;
+  dropdown.style.display =
+    dropdown.style.display === 'none' || !dropdown.style.display
+      ? 'flex'
+      : 'none';
+};
+
+export const updateURLParameter = (param, paramVal) => {
+  const urlObj = new URL(window.location);
+  urlObj.searchParams.set(param, paramVal);
+  return urlObj.toString();
+};
+
+export const removeURLParameter = parameter => {
+  const urlObj = new URL(window.location);
+  urlObj.searchParams.delete(parameter);
+  return urlObj.toString();
+};
+
+export const switchTheme = theme => {
+  updateThemeStyles(theme);
+  const newUrl =
+    theme !== 'system'
+      ? updateURLParameter('theme', theme)
+      : removeURLParameter('theme');
+  window.location.href = newUrl;
+  toggleAppearanceDropdown();
+};
+
 export const InitializationHelpers = {
   navigateToLocalePage: () => {
     const allLocaleSwitcher = document.querySelector('.locale-switcher');
@@ -98,7 +129,7 @@ export const InitializationHelpers = {
     if (isOnArticlePage) {
       new Vue({
         components: { TableOfContents },
-        data: { rows: getHeadingsFromTheArticle() },
+        data: { rows: getHeadingsfromTheArticle() },
         template: '<table-of-contents :rows="rows" />',
       }).$mount('#cw-hc-toc');
     }
@@ -131,6 +162,26 @@ export const InitializationHelpers = {
     }
   },
 
+  initializeToggleButton: () => {
+    const toggleButton = document.getElementById('toggle-appearance');
+    if (toggleButton) {
+      toggleButton.addEventListener('click', toggleAppearanceDropdown);
+    }
+  },
+
+  initializeThemeSwitchButtons: () => {
+    const appearanceDropdown = document.getElementById('appearance-dropdown');
+    if (!appearanceDropdown) return;
+    appearanceDropdown.addEventListener('click', event => {
+      const target = event.target.closest('button[data-theme]');
+
+      if (target) {
+        const theme = target.getAttribute('data-theme');
+        switchTheme(theme);
+      }
+    });
+  },
+
   initialize: () => {
     if (window.portalConfig.isPlainLayoutEnabled === 'true') {
       InitializationHelpers.appendPlainParamToURLs();
@@ -138,7 +189,9 @@ export const InitializationHelpers = {
       InitializationHelpers.navigateToLocalePage();
       InitializationHelpers.initializeSearch();
       InitializationHelpers.initializeTableOfContents();
-      // InitializationHelpers.initializeTheme();
+      InitializationHelpers.initializeTheme();
+      InitializationHelpers.initializeToggleButton();
+      InitializationHelpers.initializeThemeSwitchButtons();
     }
   },
 
diff --git a/app/javascript/portal/specs/portal.spec.js b/app/javascript/portal/specs/portal.spec.js
index 69e1e81f0..e203fdd53 100644
--- a/app/javascript/portal/specs/portal.spec.js
+++ b/app/javascript/portal/specs/portal.spec.js
@@ -6,6 +6,9 @@ import {
   setPortalStyles,
   setPortalClass,
   updateThemeStyles,
+  toggleAppearanceDropdown,
+  updateURLParameter,
+  removeURLParameter,
 } from '../portalHelpers';
 
 describe('#navigateToLocalePage', () => {
@@ -126,12 +129,78 @@ describe('Theme Functions', () => {
       document.body.innerHTML = '';
     });
 
-    it('sets portal class based on theme', () => {
+    it('sets portal class to "dark" based on theme', () => {
       setPortalClass('dark');
-
       expect(mockPortalDiv.classList.contains('dark')).toBe(true);
       expect(mockPortalDiv.classList.contains('light')).toBe(false);
     });
+
+    it('sets portal class to "light" based on theme', () => {
+      setPortalClass('light');
+      expect(mockPortalDiv.classList.contains('light')).toBe(true);
+      expect(mockPortalDiv.classList.contains('dark')).toBe(false);
+    });
+  });
+
+  describe('toggleAppearanceDropdown', () => {
+    it('sets dropdown display to flex if initially none', () => {
+      document.body.innerHTML = `<div id="appearance-dropdown" style="display: none;"></div>`;
+      toggleAppearanceDropdown();
+      const dropdown = document.getElementById('appearance-dropdown');
+      expect(dropdown.style.display).toBe('flex');
+    });
+
+    it('sets dropdown display to none if initially flex', () => {
+      document.body.innerHTML = `<div id="appearance-dropdown" style="display: flex;"></div>`;
+      toggleAppearanceDropdown();
+      const dropdown = document.getElementById('appearance-dropdown');
+      expect(dropdown.style.display).toBe('none');
+    });
+
+    it('does nothing if dropdown element does not exist', () => {
+      document.body.innerHTML = ``;
+      expect(() => toggleAppearanceDropdown()).not.toThrow();
+    });
+  });
+
+  describe('updateURLParameter', () => {
+    it('updates a given parameter with a new value', () => {
+      const originalUrl = 'http://example.com?param=oldValue';
+      delete window.location;
+      window.location = new URL(originalUrl);
+
+      const updatedUrl = updateURLParameter('param', 'newValue');
+      expect(updatedUrl).toContain('param=newValue');
+    });
+
+    it('adds a new parameter if it does not exist', () => {
+      const originalUrl = 'http://example.com';
+      delete window.location;
+      window.location = new URL(originalUrl);
+
+      const updatedUrl = updateURLParameter('newParam', 'value');
+      expect(updatedUrl).toContain('newParam=value');
+    });
+  });
+
+  describe('removeURLParameter', () => {
+    it('removes an existing parameter', () => {
+      const originalUrl = 'http://example.com?param=value';
+      delete window.location;
+      window.location = new URL(originalUrl);
+
+      const updatedUrl = removeURLParameter('param');
+      expect(updatedUrl).not.toContain('param=value');
+    });
+
+    it('does nothing if the parameter does not exist', () => {
+      const originalUrl = 'http://example.com/';
+      delete window.location;
+      window.location = new URL(originalUrl);
+
+      const updatedUrl = removeURLParameter('param');
+      expect(updatedUrl).toBe(originalUrl);
+    });
   });
 
   describe('#updateThemeStyles', () => {
@@ -223,4 +292,43 @@ describe('Theme Functions', () => {
       expect(mockPortalDiv.classList.contains('light')).toBe(false);
     });
   });
+
+  describe('initializeToggleButton', () => {
+    it('adds a click listener to the toggle button', () => {
+      document.body.innerHTML = `<button id="toggle-appearance"></button>`;
+      InitializationHelpers.initializeToggleButton();
+      const toggleButton = document.getElementById('toggle-appearance');
+      expect(toggleButton.onclick).toBeDefined();
+    });
+
+    it('does nothing if the toggle button is not present', () => {
+      document.body.innerHTML = ``;
+      expect(() =>
+        InitializationHelpers.initializeToggleButton()
+      ).not.toThrow();
+    });
+  });
+
+  describe('initializeThemeSwitchButtons', () => {
+    it('adds click listeners to theme switch buttons', () => {
+      document.body.innerHTML = `<div id="appearance-dropdown"><button data-theme="dark"></button><button data-theme="light"></button></div>`;
+      InitializationHelpers.initializeThemeSwitchButtons();
+      const buttons = document.querySelectorAll('button[data-theme]');
+      buttons.forEach(button => expect(button.onclick).toBeDefined());
+    });
+
+    it('does nothing if theme switch buttons are not present', () => {
+      document.body.innerHTML = ``;
+      expect(() =>
+        InitializationHelpers.initializeThemeSwitchButtons()
+      ).not.toThrow();
+    });
+
+    it('does nothing if appearance-dropdown is not present', () => {
+      document.body.innerHTML = ``;
+      expect(() =>
+        InitializationHelpers.initializeThemeSwitchButtons()
+      ).not.toThrow();
+    });
+  });
 });
diff --git a/app/views/icons/_check-mark.html.erb b/app/views/icons/_check-mark.html.erb
new file mode 100644
index 000000000..19020de8c
--- /dev/null
+++ b/app/views/icons/_check-mark.html.erb
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path d="M12.2121 5L5.87879 11.3333L3 8.45455" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/app/views/icons/_chevron-down.html.erb b/app/views/icons/_chevron-down.html.erb
new file mode 100644
index 000000000..12b05bd0e
--- /dev/null
+++ b/app/views/icons/_chevron-down.html.erb
@@ -0,0 +1,3 @@
+<svg width="12" height="12" viewBox="0 0 12 12" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path d="M3 4.5L6 7.5L9 4.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/app/views/icons/_chevron-right.html.erb b/app/views/icons/_chevron-right.html.erb
new file mode 100644
index 000000000..ea10fc633
--- /dev/null
+++ b/app/views/icons/_chevron-right.html.erb
@@ -0,0 +1,3 @@
+<svg width="6" height="10" viewBox="0 0 6 10" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M1 9L5 5L1 1" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/app/views/icons/_globe.html.erb b/app/views/icons/_globe.html.erb
new file mode 100644
index 000000000..63aeab697
--- /dev/null
+++ b/app/views/icons/_globe.html.erb
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.00062 13.5557C11.0689 13.5557 13.5562 11.0684 13.5562 8.00014C13.5562 4.93189 11.0689 2.44458 8.00062 2.44458C4.93237 2.44458 2.44507 4.93189 2.44507 8.00014C2.44507 11.0684 4.93237 13.5557 8.00062 13.5557Z" stroke-width="1.11111" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M2.44507 8H13.5562" stroke-width="1.11111" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8.00054 2.44458C9.39014 3.96589 10.1798 5.94015 10.2228 8.00014C10.1798 10.0601 9.39014 12.0344 8.00054 13.5557C6.61094 12.0344 5.82124 10.0601 5.77832 8.00014C5.82124 5.94015 6.61094 3.96589 8.00054 2.44458Z" stroke-width="1.11111" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/app/views/icons/_monitor.html.erb b/app/views/icons/_monitor.html.erb
new file mode 100644
index 000000000..cf338480c
--- /dev/null
+++ b/app/views/icons/_monitor.html.erb
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12 4H4C3.44772 4 3 4.44773 3 5.00002V10.0001C3 10.5524 3.44772 11.0002 4 11.0002H12C12.5523 11.0002 13 10.5524 13 10.0001V5.00002C13 4.44773 12.5523 4 12 4Z" stroke-width="1.00001" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6 13H10" stroke-width="1.00001" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8 11V13" stroke-width="1.00001" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/app/views/icons/_moon.html.erb b/app/views/icons/_moon.html.erb
new file mode 100644
index 000000000..7db34b908
--- /dev/null
+++ b/app/views/icons/_moon.html.erb
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 3C7.33696 3.66304 6.96447 4.56232 6.96447 5.5C6.96447 6.43768 7.33696 7.33696 8 8C8.66304 8.66304 9.56232 9.03553 10.5 9.03553C11.4377 9.03553 12.337 8.66304 13 8C13 8.9889 12.7068 9.9556 12.1573 10.7778C11.6079 11.6001 10.827 12.241 9.91342 12.6194C8.99979 12.9978 7.99446 13.0969 7.02455 12.9039C6.05465 12.711 5.16373 12.2348 4.46447 11.5355C3.76521 10.8363 3.289 9.94535 3.09608 8.97545C2.90315 8.00555 3.00217 7.00021 3.3806 6.08658C3.75904 5.17295 4.39991 4.39206 5.22215 3.84265C6.0444 3.29324 7.01109 3 8 3Z" stroke-width="1.11111" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/app/views/icons/_palette.html.erb b/app/views/icons/_palette.html.erb
new file mode 100644
index 000000000..996c92330
--- /dev/null
+++ b/app/views/icons/_palette.html.erb
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.90217 5.00111C9.06792 5.00111 9.20229 4.86675 9.20229 4.701C9.20229 4.53525 9.06792 4.40088 8.90217 4.40088C8.73642 4.40088 8.60205 4.53525 8.60205 4.701C8.60205 4.86675 8.73642 5.00111 8.90217 5.00111Z" stroke-width="1.20047" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M11.3035 7.40199C11.4693 7.40199 11.6037 7.26763 11.6037 7.10188C11.6037 6.93612 11.4693 6.80176 11.3035 6.80176C11.1378 6.80176 11.0034 6.93612 11.0034 7.10188C11.0034 7.26763 11.1378 7.40199 11.3035 7.40199Z" stroke-width="1.20047" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M5.90119 5.60121C6.06694 5.60121 6.20131 5.46684 6.20131 5.30109C6.20131 5.13534 6.06694 5.00098 5.90119 5.00098C5.73544 5.00098 5.60107 5.13534 5.60107 5.30109C5.60107 5.46684 5.73544 5.60121 5.90119 5.60121Z" stroke-width="1.20047" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M4.701 8.60268C4.86675 8.60268 5.00111 8.46831 5.00111 8.30256C5.00111 8.13681 4.86675 8.00244 4.701 8.00244C4.53525 8.00244 4.40088 8.13681 4.40088 8.30256C4.40088 8.46831 4.53525 8.60268 4.701 8.60268Z" stroke-width="1.20047" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8.00235 2C4.70106 2 2 4.70106 2 8.00234C2 11.3036 4.70106 14.0047 8.00235 14.0047C8.55816 14.0047 8.99153 13.5569 8.99153 12.9915C8.99153 12.7292 8.88349 12.4903 8.72923 12.3162C8.55516 12.1428 8.46633 11.9249 8.46633 11.641C8.46405 11.5089 8.48839 11.3776 8.5379 11.2552C8.58741 11.1327 8.66107 11.0214 8.7545 10.9279C8.84793 10.8345 8.9592 10.7609 9.0817 10.7114C9.2042 10.6618 9.33541 10.6375 9.46752 10.6398H10.6656C12.4969 10.6398 13.9999 9.13739 13.9999 7.30607C13.9837 4.40814 11.2802 2 8.00235 2Z" stroke-width="1.20047" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/app/views/icons/_redirect.html.erb b/app/views/icons/_redirect.html.erb
new file mode 100644
index 000000000..eb47e0f2b
--- /dev/null
+++ b/app/views/icons/_redirect.html.erb
@@ -0,0 +1,5 @@
+<svg width="15" height="16" viewBox="0 0 15 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6.5 3H3.5C2.94772 3 2.5 3.44772 2.5 4V12C2.5 12.5523 2.94772 13 3.5 13H11.5C12.0523 13 12.5 12.5523 12.5 12V9" stroke-width="1.2" stroke-linecap="round"/>
+<path d="M9.5 3H12.3C12.4105 3 12.5 3.08954 12.5 3.2V6" stroke-linecap="round"/>
+<path d="M12 3.5L6 9.5" stroke-width="1.2" stroke-linecap="round"/>
+</svg>
diff --git a/app/views/icons/_sun.html.erb b/app/views/icons/_sun.html.erb
new file mode 100644
index 000000000..a53942349
--- /dev/null
+++ b/app/views/icons/_sun.html.erb
@@ -0,0 +1,11 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.0001 10.3998C9.32559 10.3998 10.4001 9.32529 10.4001 7.99982C10.4001 6.67436 9.32559 5.59985 8.0001 5.59985C6.67462 5.59985 5.6001 6.67436 5.6001 7.99982C5.6001 9.32529 6.67462 10.3998 8.0001 10.3998Z" stroke-width="1.19999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8 2V3.19998" stroke-width="1.19999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8 12.8V14" stroke-width="1.19999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M3.75806 3.75781L4.60406 4.6038" stroke-width="1.19999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M11.396 11.3958L12.242 12.2417" stroke-width="1.19999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M2 7.99976H3.2" stroke-width="1.19999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12.8 7.99976H14.0001" stroke-width="1.19999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M4.60406 11.3958L3.75806 12.2417" stroke-width="1.19999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12.242 3.75781L11.396 4.6038" stroke-width="1.19999" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/app/views/layouts/portal.html.erb b/app/views/layouts/portal.html.erb
index 2ae188fc3..611aab22c 100644
--- a/app/views/layouts/portal.html.erb
+++ b/app/views/layouts/portal.html.erb
@@ -28,7 +28,7 @@ By default, it renders:
     <% end %>
   </head>
   <body>
-    <div class="antialiased <%= @theme %>">
+    <div id="portal" class="antialiased <%= @theme unless @theme == 'system' %>">
       <main class="main-content min-h-screen flex flex-col bg-white dark:bg-slate-900" role="main">
         <% if !@is_plain_layout_enabled %>
           <%= render "public/api/v1/portals/header", portal: @portal %>
@@ -42,7 +42,7 @@ By default, it renders:
   </body>
   <style>
   :root {
-    color-scheme: '<%= @theme %>';
+    color-scheme: <% if @theme == 'system' %>light dark<% else %><%= @theme %><% end %>;
   }
   </style>
   <script>
diff --git a/app/views/public/api/v1/portals/_header.html.erb b/app/views/public/api/v1/portals/_header.html.erb
index 0c32684fc..6387802db 100644
--- a/app/views/public/api/v1/portals/_header.html.erb
+++ b/app/views/public/api/v1/portals/_header.html.erb
@@ -1,41 +1,85 @@
-
 <header class="bg-white dark:bg-slate-900 w-full shadow-sm sticky top-0 z-50">
-  <nav class=" flex mx-auto max-w-6xl px-8" aria-label="Top">
+  <nav class=" flex mx-auto max-w-5xl px-8" aria-label="Top">
     <div class="w-full py-5 flex items-center">
-      <a href="/hc/<%= @portal.slug %>/<%= @portal.config['default_locale'] || params[:locale] %>/<%= @theme.present? ? '?theme='+@theme : ''  %>" class="h-10 text-lg flex items-center text-slate-900 dark:text-white font-semibold">
+      <a href="/hc/<%= @portal.slug %>/<%= @portal.config['default_locale'] || params[:locale] %>/<%= @theme.present? && @theme != 'system' ? '?theme='+@theme : ''  %>" class="h-10 text-lg flex items-center text-slate-900 dark:text-white font-semibold">
         <% if @portal.logo.present? %>
           <img src="<%= url_for(@portal.logo) %>" class="h-10 w-auto mr-2" />
         <% end %>
         <%= @portal.name %>
       </a>
+    </div>
+
+    <%# Go to homepage link section %>
+    <div class="flex items-center justify-between gap-5">
       <% if @portal.homepage_link %>
-      <div class="ml-8 border-l-1 border-slate-50 dark:border-slate-800 hidden md:block">
-        <div class="flex-grow flex-shrink-0">
-          <a target="_blank" rel="noopener noreferrer nofollow" href="<%= @portal.homepage_link %>" class="flex flex-row items-center text-sm font-medium text-slate-700 dark:text-slate-200 hover:text-slate-800 dark:hover:text-slate-300  hover:underline"> <%= I18n.t('public_portal.header.go_to_homepage') %>
-            <span class="ml-2">
-              <svg class="w-4 h-4 fill-current text-slate-600 dark:text-slate-200" width="24" height="24" fill="none" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M13.267 4.209a.75.75 0 0 0-1.034 1.086l6.251 5.955H3.75a.75.75 0 0 0 0 1.5h14.734l-6.251 5.954a.75.75 0 0 0 1.034 1.087l7.42-7.067a.996.996 0 0 0 .3-.58.758.758 0 0 0-.001-.29.995.995 0 0 0-.3-.578l-7.419-7.067Z" /></svg>
-            </span>
-          </a>
+        <div class="ml-8 border-l-1 border-slate-50 dark:border-slate-800 hidden md:block cursor-pointer px-1 py-2">
+          <div class="flex-grow flex-shrink-0">
+            <a target="_blank" rel="noopener noreferrer nofollow" href="<%= @portal.homepage_link %>" class="flex flex-row items-center gap-1 text-sm font-medium text-slate-800 dark:text-slate-100 hover:text-woot-500 dark:hover:text-woot-500 stroke-slate-700 dark:stroke-slate-200 hover:stroke-woot-500 dark:hover:stroke-woot-500">
+              <%= render partial: 'icons/redirect' %>
+              <%= I18n.t('public_portal.header.go_to_homepage') %>
+            </a>
+          </div>
+        </div>
+      <% end %>
+
+      <%# Appearance toggle section %>
+      <div class="flex-grow flex-shrink-0 relative cursor-pointer px-1 py-2">
+        <button id="toggle-appearance" class="toggle-appearance flex flex-row items-center stroke-slate-700 dark:stroke-slate-200 hover:stroke-woot-500 dark:hover:stroke-woot-500 text-slate-800 dark:text-slate-100 hover:text-woot-500 dark:hover:text-woot-500 gap-1" type="button">
+          <%= render partial: get_theme_icon(@theme) %>
+          <span class="text-sm font-medium"><%= get_theme_names(@theme) %></span>
+          <div class="pointer-events-none flex items-center px-1">
+            <%= render partial: 'icons/chevron-down' %>
+          </div>
+        </button>
+        <%# Appearance dropdown section %>
+        <div id="appearance-dropdown" class="hidden absolute flex-col h-auto w-32 bg-white dark:bg-slate-900 border border-solid rounded top-9 border-slate-100 dark:border-slate-800" aria-hidden="true" data-dropdown="appearance-dropdown">
+          <button data-theme="system" class="flex flex-row items-center justify-between px-2 py-2 border-b border-solid border-slate-100 dark:border-slate-800 gap-1 stroke-slate-700 dark:stroke-slate-200 hover:stroke-woot-500 dark:hover:stroke-woot-500 text-slate-800 dark:text-slate-100 hover:text-woot-500 dark:hover:text-woot-500">
+            <div class="flex flex-row items-center gap-1">
+              <%= render partial: 'icons/monitor' %>
+              <span class="text-xs font-medium"><%= I18n.t('public_portal.header.appearance.system') %></span>
+            </div>
+            <% if @theme.present? && @theme == 'system' %>
+              <%= render partial: 'icons/check-mark' %>
+            <% end %>
+          </button>
+          <button data-theme="light" class="flex flex-row items-center justify-between px-2 py-2 border-b border-solid border-slate-100 dark:border-slate-800 gap-1 stroke-slate-700 dark:stroke-slate-200 hover:stroke-woot-500 dark:hover:stroke-woot-500 text-slate-800 dark:text-slate-100 hover:text-woot-500 dark:hover:text-woot-500">
+            <div class="flex flex-row items-center gap-1">
+              <%= render partial: 'icons/sun' %>
+              <span class="text-xs font-medium"><%= I18n.t('public_portal.header.appearance.light') %></span>
+            </div>
+            <% if @theme.present? && @theme == 'light' %>
+              <%= render partial: 'icons/check-mark' %>
+            <% end %>
+          </button>
+          <button data-theme="dark" class="flex flex-row items-center justify-between px-2 py-2 gap-1 stroke-slate-700 dark:stroke-slate-200 hover:stroke-woot-500 dark:hover:stroke-woot-500 text-slate-800 dark:text-slate-100 hover:text-woot-500 dark:hover:text-woot-500">
+            <div class="flex flex-row items-center gap-1">
+              <%= render partial: 'icons/moon' %>
+              <span class="text-xs font-medium"><%= I18n.t('public_portal.header.appearance.dark') %></span>
+            </div>
+            <% if @theme.present? && @theme == 'dark' %>
+              <%= render partial: 'icons/check-mark' %>
+            <% end %>
+          </button>
         </div>
       </div>
+
+      <%# Locale switcher section %>
+      <% if @portal.config["allowed_locales"].length > 1 %>
+        <div class="flex items-center stroke-slate-700 dark:stroke-slate-200 hover:stroke-woot-500 dark:hover:stroke-woot-500 text-slate-800 dark:text-slate-100 hover:text-woot-500 dark:hover:text-woot-500">
+          <div class="flex items-center gap-1 px-1 py-2 cursor-pointer">
+            <%= render partial: 'icons/globe' %>
+            <select
+              data-portal-slug="<%= @portal.slug %>"
+              class="bg-white dark:bg-slate-900 appearance-none w-24 overflow-hidden text-ellipsis whitespace-nowrap leading-tight font-medium focus:outline-none text-sm focus:shadow-outline locale-switcher cursor-pointer"
+            >
+              <% @portal.config["allowed_locales"].each do |locale| %>
+                <option <%= locale == params[:locale] ? 'selected': '' %> value="<%= locale %>"><%= "#{language_name(locale)} (#{locale})" %></option>
+              <% end %>
+            </select>
+            <%= render partial: 'icons/chevron-down' %>
+          </div>
+        </div>
       <% end %>
     </div>
-    <% if @portal.config["allowed_locales"].length > 1 %>
-    <div class="flex items-center">
-      <div class="inline-flex relative w-24">
-        <select
-          data-portal-slug="<%= @portal.slug %>"
-          class="appearance-none w-full bg-white dark:bg-slate-900 dark:text-slate-100 px-3 py-2 pr-8 rounded leading-tight focus:outline-none focus:shadow-outline locale-switcher hover:bg-slate-75 dark:hover:bg-slate-800 cursor-pointer"
-        >
-          <% @portal.config["allowed_locales"].each do |locale| %>
-            <option <%= locale == params[:locale] ? 'selected': '' %> value="<%= locale %>"><%= locale %></option>
-          <% end %>
-        </select>
-        <div class="pointer-events-none absolute inset-y-0 right-0 flex items-center px-2 text-slate-700 dark:text-slate-200">
-          <svg class="fill-current h-4 w-4" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><path d="M9.293 12.95l.707.707L15.657 8l-1.414-1.414L10 10.828 5.757 6.586 4.343 8z"/></svg>
-        </div>
-      </div>
-    </div>
-    <% end %>
   </nav>
-</header>
+</header>
\ No newline at end of file
diff --git a/app/views/public/api/v1/portals/_hero.html.erb b/app/views/public/api/v1/portals/_hero.html.erb
index b9abdfbd7..f2f6f61e6 100644
--- a/app/views/public/api/v1/portals/_hero.html.erb
+++ b/app/views/public/api/v1/portals/_hero.html.erb
@@ -1,5 +1,5 @@
-<% if !@is_plain_layout_enabled %>
-<section class="pt-8 pb-16 md:py-20 w-full bg-woot-50 dark:bg-woot-900 shadow-inner" style="<%= generate_portal_bg(@portal.color, @theme) %>">
+<% if !@is_plain_layout_enabled %> 
+<section id="portal-bg" class="pt-8 pb-16 md:py-20 w-full bg-woot-50 dark:bg-woot-900 shadow-inner" style="<%= generate_portal_bg(@portal.color, @theme) %>">
   <div class="mx-auto max-w-6xl px-8 flex flex-col items-center sm:items-start">
     <h1 class="text-2xl md:text-4xl text-slate-900 dark:text-white font-semibold leading-normal">
       <%= portal.header_text %>
diff --git a/config/languages/language_map.yml b/config/languages/language_map.yml
new file mode 100644
index 000000000..806d1e60f
--- /dev/null
+++ b/config/languages/language_map.yml
@@ -0,0 +1,563 @@
+  af: 'Afrikaans'
+  af_NA: 'Afrikaans (Namibia)'
+  af_ZA: 'Afrikaans (South Africa)'
+  ak: 'Akan'
+  ak_GH: 'Akan (Ghana)'
+  sq: 'Albanian'
+  sq_AL: 'Albanian (Albania)'
+  sq_XK: 'Albanian (Kosovo)'
+  sq_MK: 'Albanian (Macedonia)'
+  am: 'Amharic'
+  am_ET: 'Amharic (Ethiopia)'
+  ar: 'Arabic'
+  ar_DZ: 'Arabic (Algeria)'
+  ar_BH: 'Arabic (Bahrain)'
+  ar_TD: 'Arabic (Chad)'
+  ar_KM: 'Arabic (Comoros)'
+  ar_DJ: 'Arabic (Djibouti)'
+  ar_EG: 'Arabic (Egypt)'
+  ar_ER: 'Arabic (Eritrea)'
+  ar_IQ: 'Arabic (Iraq)'
+  ar_IL: 'Arabic (Israel)'
+  ar_JO: 'Arabic (Jordan)'
+  ar_KW: 'Arabic (Kuwait)'
+  ar_LB: 'Arabic (Lebanon)'
+  ar_LY: 'Arabic (Libya)'
+  ar_MR: 'Arabic (Mauritania)'
+  ar_MA: 'Arabic (Morocco)'
+  ar_OM: 'Arabic (Oman)'
+  ar_PS: 'Arabic (Palestinian Territories)'
+  ar_QA: 'Arabic (Qatar)'
+  ar_SA: 'Arabic (Saudi Arabia)'
+  ar_SO: 'Arabic (Somalia)'
+  ar_SS: 'Arabic (South Sudan)'
+  ar_SD: 'Arabic (Sudan)'
+  ar_SY: 'Arabic (Syria)'
+  ar_TN: 'Arabic (Tunisia)'
+  ar_AE: 'Arabic (United Arab Emirates)'
+  ar_EH: 'Arabic (Western Sahara)'
+  ar_YE: 'Arabic (Yemen)'
+  hy: 'Armenian'
+  hy_AM: 'Armenian (Armenia)'
+  as: 'Assamese'
+  as_IN: 'Assamese (India)'
+  az: 'Azerbaijani'
+  az_AZ: 'Azerbaijani (Azerbaijan)'
+  az_Cyrl_AZ: 'Azerbaijani (Cyrillic, Azerbaijan)'
+  az_Cyrl: 'Azerbaijani (Cyrillic)'
+  az_Latn_AZ: 'Azerbaijani (Latin, Azerbaijan)'
+  az_Latn: 'Azerbaijani (Latin)'
+  bm: 'Bambara'
+  bm_Latn_ML: 'Bambara (Latin, Mali)'
+  bm_Latn: 'Bambara (Latin)'
+  eu: 'Basque'
+  eu_ES: 'Basque (Spain)'
+  be: 'Belarusian'
+  be_BY: 'Belarusian (Belarus)'
+  bn: 'Bengali'
+  bn_BD: 'Bengali (Bangladesh)'
+  bn_IN: 'Bengali (India)'
+  bs: 'Bosnian'
+  bs_BA: 'Bosnian (Bosnia & Herzegovina)'
+  bs_Cyrl_BA: 'Bosnian (Cyrillic, Bosnia & Herzegovina)'
+  bs_Cyrl: 'Bosnian (Cyrillic)'
+  bs_Latn_BA: 'Bosnian (Latin, Bosnia & Herzegovina)'
+  bs_Latn: 'Bosnian (Latin)'
+  br: 'Breton'
+  br_FR: 'Breton (France)'
+  bg: 'Bulgarian'
+  bg_BG: 'Bulgarian (Bulgaria)'
+  my: 'Burmese'
+  my_MM: 'Burmese (Myanmar (Burma))'
+  ca: 'Catalan'
+  ca_AD: 'Catalan (Andorra)'
+  ca_FR: 'Catalan (France)'
+  ca_IT: 'Catalan (Italy)'
+  ca_ES: 'Catalan (Spain)'
+  zh: 'Chinese'
+  zh_CN: 'Chinese (China)'
+  zh_HK: 'Chinese (Hong Kong SAR China)'
+  zh_MO: 'Chinese (Macau SAR China)'
+  zh_Hans_CN: 'Chinese (Simplified, China)'
+  zh_Hans_HK: 'Chinese (Simplified, Hong Kong SAR China)'
+  zh_Hans_MO: 'Chinese (Simplified, Macau SAR China)'
+  zh_Hans_SG: 'Chinese (Simplified, Singapore)'
+  zh_Hans: 'Chinese (Simplified)'
+  zh_SG: 'Chinese (Singapore)'
+  zh_TW: 'Chinese (Taiwan)'
+  zh_Hant_HK: 'Chinese (Traditional, Hong Kong SAR China)'
+  zh_Hant_MO: 'Chinese (Traditional, Macau SAR China)'
+  zh_Hant_TW: 'Chinese (Traditional, Taiwan)'
+  zh_Hant: 'Chinese (Traditional)'
+  kw: 'Cornish'
+  kw_GB: 'Cornish (United Kingdom)'
+  hr: 'Croatian'
+  hr_BA: 'Croatian (Bosnia & Herzegovina)'
+  hr_HR: 'Croatian (Croatia)'
+  cs: 'Czech'
+  cs_CZ: 'Czech (Czech Republic)'
+  da: 'Danish'
+  da_DK: 'Danish (Denmark)'
+  da_GL: 'Danish (Greenland)'
+  nl: 'Dutch'
+  nl_AW: 'Dutch (Aruba)'
+  nl_BE: 'Dutch (Belgium)'
+  nl_BQ: 'Dutch (Caribbean Netherlands)'
+  nl_CW: 'Dutch (Curaçao)'
+  nl_NL: 'Dutch (Netherlands)'
+  nl_SX: 'Dutch (Sint Maarten)'
+  nl_SR: 'Dutch (Suriname)'
+  dz: 'Dzongkha'
+  dz_BT: 'Dzongkha (Bhutan)'
+  en: 'English'
+  en_AS: 'English (American Samoa)'
+  en_AI: 'English (Anguilla)'
+  en_AG: 'English (Antigua & Barbuda)'
+  en_AU: 'English (Australia)'
+  en_BS: 'English (Bahamas)'
+  en_BB: 'English (Barbados)'
+  en_BE: 'English (Belgium)'
+  en_BZ: 'English (Belize)'
+  en_BM: 'English (Bermuda)'
+  en_BW: 'English (Botswana)'
+  en_IO: 'English (British Indian Ocean Territory)'
+  en_VG: 'English (British Virgin Islands)'
+  en_CM: 'English (Cameroon)'
+  en_CA: 'English (Canada)'
+  en_KY: 'English (Cayman Islands)'
+  en_CX: 'English (Christmas Island)'
+  en_CC: 'English (Cocos (Keeling) Islands)'
+  en_CK: 'English (Cook Islands)'
+  en_DG: 'English (Diego Garcia)'
+  en_DM: 'English (Dominica)'
+  en_ER: 'English (Eritrea)'
+  en_FK: 'English (Falkland Islands)'
+  en_FJ: 'English (Fiji)'
+  en_GM: 'English (Gambia)'
+  en_GH: 'English (Ghana)'
+  en_GI: 'English (Gibraltar)'
+  en_GD: 'English (Grenada)'
+  en_GU: 'English (Guam)'
+  en_GG: 'English (Guernsey)'
+  en_GY: 'English (Guyana)'
+  en_HK: 'English (Hong Kong SAR China)'
+  en_IN: 'English (India)'
+  en_IE: 'English (Ireland)'
+  en_IM: 'English (Isle of Man)'
+  en_JM: 'English (Jamaica)'
+  en_JE: 'English (Jersey)'
+  en_KE: 'English (Kenya)'
+  en_KI: 'English (Kiribati)'
+  en_LS: 'English (Lesotho)'
+  en_LR: 'English (Liberia)'
+  en_MO: 'English (Macau SAR China)'
+  en_MG: 'English (Madagascar)'
+  en_MW: 'English (Malawi)'
+  en_MY: 'English (Malaysia)'
+  en_MT: 'English (Malta)'
+  en_MH: 'English (Marshall Islands)'
+  en_MU: 'English (Mauritius)'
+  en_FM: 'English (Micronesia)'
+  en_MS: 'English (Montserrat)'
+  en_NA: 'English (Namibia)'
+  en_NR: 'English (Nauru)'
+  en_NZ: 'English (New Zealand)'
+  en_NG: 'English (Nigeria)'
+  en_NU: 'English (Niue)'
+  en_NF: 'English (Norfolk Island)'
+  en_MP: 'English (Northern Mariana Islands)'
+  en_PK: 'English (Pakistan)'
+  en_PW: 'English (Palau)'
+  en_PG: 'English (Papua New Guinea)'
+  en_PH: 'English (Philippines)'
+  en_PN: 'English (Pitcairn Islands)'
+  en_PR: 'English (Puerto Rico)'
+  en_RW: 'English (Rwanda)'
+  en_WS: 'English (Samoa)'
+  en_SC: 'English (Seychelles)'
+  en_SL: 'English (Sierra Leone)'
+  en_SG: 'English (Singapore)'
+  en_SX: 'English (Sint Maarten)'
+  en_SB: 'English (Solomon Islands)'
+  en_ZA: 'English (South Africa)'
+  en_SS: 'English (South Sudan)'
+  en_SH: 'English (St. Helena)'
+  en_KN: 'English (St. Kitts & Nevis)'
+  en_LC: 'English (St. Lucia)'
+  en_VC: 'English (St. Vincent & Grenadines)'
+  en_SD: 'English (Sudan)'
+  en_SZ: 'English (Swaziland)'
+  en_TZ: 'English (Tanzania)'
+  en_TK: 'English (Tokelau)'
+  en_TO: 'English (Tonga)'
+  en_TT: 'English (Trinidad & Tobago)'
+  en_TC: 'English (Turks & Caicos Islands)'
+  en_TV: 'English (Tuvalu)'
+  en_UM: 'English (U.S. Outlying Islands)'
+  en_VI: 'English (U.S. Virgin Islands)'
+  en_UG: 'English (Uganda)'
+  en_GB: 'English (United Kingdom)'
+  en_US: 'English (United States)'
+  en_VU: 'English (Vanuatu)'
+  en_ZM: 'English (Zambia)'
+  en_ZW: 'English (Zimbabwe)'
+  eo: 'Esperanto'
+  et: 'Estonian'
+  et_EE: 'Estonian (Estonia)'
+  ee: 'Ewe'
+  ee_GH: 'Ewe (Ghana)'
+  ee_TG: 'Ewe (Togo)'
+  fo: 'Faroese'
+  fo_FO: 'Faroese (Faroe Islands)'
+  fi: 'Finnish'
+  fi_FI: 'Finnish (Finland)'
+  fr: 'French'
+  fr_DZ: 'French (Algeria)'
+  fr_BE: 'French (Belgium)'
+  fr_BJ: 'French (Benin)'
+  fr_BF: 'French (Burkina Faso)'
+  fr_BI: 'French (Burundi)'
+  fr_CM: 'French (Cameroon)'
+  fr_CA: 'French (Canada)'
+  fr_CF: 'French (Central African Republic)'
+  fr_TD: 'French (Chad)'
+  fr_KM: 'French (Comoros)'
+  fr_CG: 'French (Congo - Brazzaville)'
+  fr_CD: 'French (Congo - Kinshasa)'
+  fr_CI: 'French (Côte d’Ivoire)'
+  fr_DJ: 'French (Djibouti)'
+  fr_GQ: 'French (Equatorial Guinea)'
+  fr_FR: 'French (France)'
+  fr_GF: 'French (French Guiana)'
+  fr_PF: 'French (French Polynesia)'
+  fr_GA: 'French (Gabon)'
+  fr_GP: 'French (Guadeloupe)'
+  fr_GN: 'French (Guinea)'
+  fr_HT: 'French (Haiti)'
+  fr_LU: 'French (Luxembourg)'
+  fr_MG: 'French (Madagascar)'
+  fr_ML: 'French (Mali)'
+  fr_MQ: 'French (Martinique)'
+  fr_MR: 'French (Mauritania)'
+  fr_MU: 'French (Mauritius)'
+  fr_YT: 'French (Mayotte)'
+  fr_MC: 'French (Monaco)'
+  fr_MA: 'French (Morocco)'
+  fr_NC: 'French (New Caledonia)'
+  fr_NE: 'French (Niger)'
+  fr_RE: 'French (Réunion)'
+  fr_RW: 'French (Rwanda)'
+  fr_SN: 'French (Senegal)'
+  fr_SC: 'French (Seychelles)'
+  fr_BL: 'French (St. Barthélemy)'
+  fr_MF: 'French (St. Martin)'
+  fr_PM: 'French (St. Pierre & Miquelon)'
+  fr_CH: 'French (Switzerland)'
+  fr_SY: 'French (Syria)'
+  fr_TG: 'French (Togo)'
+  fr_TN: 'French (Tunisia)'
+  fr_VU: 'French (Vanuatu)'
+  fr_WF: 'French (Wallis & Futuna)'
+  ff: 'Fulah'
+  ff_CM: 'Fulah (Cameroon)'
+  ff_GN: 'Fulah (Guinea)'
+  ff_MR: 'Fulah (Mauritania)'
+  ff_SN: 'Fulah (Senegal)'
+  gl: 'Galician'
+  gl_ES: 'Galician (Spain)'
+  lg: 'Ganda'
+  lg_UG: 'Ganda (Uganda)'
+  ka: 'Georgian'
+  ka_GE: 'Georgian (Georgia)'
+  de: 'German'
+  de_AT: 'German (Austria)'
+  de_BE: 'German (Belgium)'
+  de_DE: 'German (Germany)'
+  de_LI: 'German (Liechtenstein)'
+  de_LU: 'German (Luxembourg)'
+  de_CH: 'German (Switzerland)'
+  el: 'Greek'
+  el_CY: 'Greek (Cyprus)'
+  el_GR: 'Greek (Greece)'
+  gu: 'Gujarati'
+  gu_IN: 'Gujarati (India)'
+  ha: 'Hausa'
+  ha_GH: 'Hausa (Ghana)'
+  ha_Latn_GH: 'Hausa (Latin, Ghana)'
+  ha_Latn_NE: 'Hausa (Latin, Niger)'
+  ha_Latn_NG: 'Hausa (Latin, Nigeria)'
+  ha_Latn: 'Hausa (Latin)'
+  ha_NE: 'Hausa (Niger)'
+  ha_NG: 'Hausa (Nigeria)'
+  he: 'Hebrew'
+  he_IL: 'Hebrew (Israel)'
+  hi: 'Hindi'
+  hi_IN: 'Hindi (India)'
+  hu: 'Hungarian'
+  hu_HU: 'Hungarian (Hungary)'
+  is: 'Icelandic'
+  is_IS: 'Icelandic (Iceland)'
+  ig: 'Igbo'
+  ig_NG: 'Igbo (Nigeria)'
+  id: 'Indonesian'
+  id_ID: 'Indonesian (Indonesia)'
+  ga: 'Irish'
+  ga_IE: 'Irish (Ireland)'
+  it: 'Italian'
+  it_IT: 'Italian (Italy)'
+  it_SM: 'Italian (San Marino)'
+  it_CH: 'Italian (Switzerland)'
+  ja: 'Japanese'
+  ja_JP: 'Japanese (Japan)'
+  kl: 'Kalaallisut'
+  kl_GL: 'Kalaallisut (Greenland)'
+  kn: 'Kannada'
+  kn_IN: 'Kannada (India)'
+  ks: 'Kashmiri'
+  ks_Arab_IN: 'Kashmiri (Arabic, India)'
+  ks_Arab: 'Kashmiri (Arabic)'
+  ks_IN: 'Kashmiri (India)'
+  kk: 'Kazakh'
+  kk_Cyrl_KZ: 'Kazakh (Cyrillic, Kazakhstan)'
+  kk_Cyrl: 'Kazakh (Cyrillic)'
+  kk_KZ: 'Kazakh (Kazakhstan)'
+  km: 'Khmer'
+  km_KH: 'Khmer (Cambodia)'
+  ki: 'Kikuyu'
+  ki_KE: 'Kikuyu (Kenya)'
+  rw: 'Kinyarwanda'
+  rw_RW: 'Kinyarwanda (Rwanda)'
+  ko: 'Korean'
+  ko_KP: 'Korean (North Korea)'
+  ko_KR: 'Korean (South Korea)'
+  ky: 'Kyrgyz'
+  ky_Cyrl_KG: 'Kyrgyz (Cyrillic, Kyrgyzstan)'
+  ky_Cyrl: 'Kyrgyz (Cyrillic)'
+  ky_KG: 'Kyrgyz (Kyrgyzstan)'
+  lo: 'Lao'
+  lo_LA: 'Lao (Laos)'
+  lv: 'Latvian'
+  lv_LV: 'Latvian (Latvia)'
+  ln: 'Lingala'
+  ln_AO: 'Lingala (Angola)'
+  ln_CF: 'Lingala (Central African Republic)'
+  ln_CG: 'Lingala (Congo - Brazzaville)'
+  ln_CD: 'Lingala (Congo - Kinshasa)'
+  lt: 'Lithuanian'
+  lt_LT: 'Lithuanian (Lithuania)'
+  lu: 'Luba-Katanga'
+  lu_CD: 'Luba-Katanga (Congo - Kinshasa)'
+  lb: 'Luxembourgish'
+  lb_LU: 'Luxembourgish (Luxembourg)'
+  mk: 'Macedonian'
+  mk_MK: 'Macedonian (Macedonia)'
+  mg: 'Malagasy'
+  mg_MG: 'Malagasy (Madagascar)'
+  ms: 'Malay'
+  ms_BN: 'Malay (Brunei)'
+  ms_Latn_BN: 'Malay (Latin, Brunei)'
+  ms_Latn_MY: 'Malay (Latin, Malaysia)'
+  ms_Latn_SG: 'Malay (Latin, Singapore)'
+  ms_Latn: 'Malay (Latin)'
+  ms_MY: 'Malay (Malaysia)'
+  ms_SG: 'Malay (Singapore)'
+  ml: 'Malayalam'
+  ml_IN: 'Malayalam (India)'
+  mt: 'Maltese'
+  mt_MT: 'Maltese (Malta)'
+  gv: 'Manx'
+  gv_IM: 'Manx (Isle of Man)'
+  mr: 'Marathi'
+  mr_IN: 'Marathi (India)'
+  mn: 'Mongolian'
+  mn_Cyrl_MN: 'Mongolian (Cyrillic, Mongolia)'
+  mn_Cyrl: 'Mongolian (Cyrillic)'
+  mn_MN: 'Mongolian (Mongolia)'
+  ne: 'Nepali'
+  ne_IN: 'Nepali (India)'
+  ne_NP: 'Nepali (Nepal)'
+  nd: 'North Ndebele'
+  nd_ZW: 'North Ndebele (Zimbabwe)'
+  se: 'Northern Sami'
+  se_FI: 'Northern Sami (Finland)'
+  se_NO: 'Northern Sami (Norway)'
+  se_SE: 'Northern Sami (Sweden)'
+  no: 'Norwegian'
+  no_NO: 'Norwegian (Norway)'
+  nb: 'Norwegian Bokmål'
+  nb_NO: 'Norwegian Bokmål (Norway)'
+  nb_SJ: 'Norwegian Bokmål (Svalbard & Jan Mayen)'
+  nn: 'Norwegian Nynorsk'
+  nn_NO: 'Norwegian Nynorsk (Norway)'
+  or: 'Oriya'
+  or_IN: 'Oriya (India)'
+  om: 'Oromo'
+  om_ET: 'Oromo (Ethiopia)'
+  om_KE: 'Oromo (Kenya)'
+  os: 'Ossetic'
+  os_GE: 'Ossetic (Georgia)'
+  os_RU: 'Ossetic (Russia)'
+  ps: 'Pashto'
+  ps_AF: 'Pashto (Afghanistan)'
+  fa: 'Persian'
+  fa_AF: 'Persian (Afghanistan)'
+  fa_IR: 'Persian (Iran)'
+  pl: 'Polish'
+  pl_PL: 'Polish (Poland)'
+  pt: 'Portuguese'
+  pt_AO: 'Portuguese (Angola)'
+  pt_BR: 'Portuguese (Brazil)'
+  pt_CV: 'Portuguese (Cape Verde)'
+  pt_GW: 'Portuguese (Guinea-Bissau)'
+  pt_MO: 'Portuguese (Macau SAR China)'
+  pt_MZ: 'Portuguese (Mozambique)'
+  pt_PT: 'Portuguese (Portugal)'
+  pt_ST: 'Portuguese (São Tomé & Príncipe)'
+  pt_TL: 'Portuguese (Timor-Leste)'
+  pa: 'Punjabi'
+  pa_Arab_PK: 'Punjabi (Arabic, Pakistan)'
+  pa_Arab: 'Punjabi (Arabic)'
+  pa_Guru_IN: 'Punjabi (Gurmukhi, India)'
+  pa_Guru: 'Punjabi (Gurmukhi)'
+  pa_IN: 'Punjabi (India)'
+  pa_PK: 'Punjabi (Pakistan)'
+  qu: 'Quechua'
+  qu_BO: 'Quechua (Bolivia)'
+  qu_EC: 'Quechua (Ecuador)'
+  qu_PE: 'Quechua (Peru)'
+  ro: 'Romanian'
+  ro_MD: 'Romanian (Moldova)'
+  ro_RO: 'Romanian (Romania)'
+  rm: 'Romansh'
+  rm_CH: 'Romansh (Switzerland)'
+  rn: 'Rundi'
+  rn_BI: 'Rundi (Burundi)'
+  ru: 'Russian'
+  ru_BY: 'Russian (Belarus)'
+  ru_KZ: 'Russian (Kazakhstan)'
+  ru_KG: 'Russian (Kyrgyzstan)'
+  ru_MD: 'Russian (Moldova)'
+  ru_RU: 'Russian (Russia)'
+  ru_UA: 'Russian (Ukraine)'
+  sg: 'Sango'
+  sg_CF: 'Sango (Central African Republic)'
+  gd: 'Scottish Gaelic'
+  gd_GB: 'Scottish Gaelic (United Kingdom)'
+  sr: 'Serbian'
+  sr_BA: 'Serbian (Bosnia & Herzegovina)'
+  sr_Cyrl_BA: 'Serbian (Cyrillic, Bosnia & Herzegovina)'
+  sr_Cyrl_XK: 'Serbian (Cyrillic, Kosovo)'
+  sr_Cyrl_ME: 'Serbian (Cyrillic, Montenegro)'
+  sr_Cyrl_RS: 'Serbian (Cyrillic, Serbia)'
+  sr_Cyrl: 'Serbian (Cyrillic)'
+  sr_XK: 'Serbian (Kosovo)'
+  sr_Latn_BA: 'Serbian (Latin, Bosnia & Herzegovina)'
+  sr_Latn_XK: 'Serbian (Latin, Kosovo)'
+  sr_Latn_ME: 'Serbian (Latin, Montenegro)'
+  sr_Latn_RS: 'Serbian (Latin, Serbia)'
+  sr_Latn: 'Serbian (Latin)'
+  sr_ME: 'Serbian (Montenegro)'
+  sr_RS: 'Serbian (Serbia)'
+  sh: 'Serbo-Croatian'
+  sh_BA: 'Serbo-Croatian (Bosnia & Herzegovina)'
+  sn: 'Shona'
+  sn_ZW: 'Shona (Zimbabwe)'
+  ii: 'Sichuan Yi'
+  ii_CN: 'Sichuan Yi (China)'
+  si: 'Sinhala'
+  si_LK: 'Sinhala (Sri Lanka)'
+  sk: 'Slovak'
+  sk_SK: 'Slovak (Slovakia)'
+  sl: 'Slovenian'
+  sl_SI: 'Slovenian (Slovenia)'
+  so: 'Somali'
+  so_DJ: 'Somali (Djibouti)'
+  so_ET: 'Somali (Ethiopia)'
+  so_KE: 'Somali (Kenya)'
+  so_SO: 'Somali (Somalia)'
+  es: 'Spanish'
+  es_AR: 'Spanish (Argentina)'
+  es_BO: 'Spanish (Bolivia)'
+  es_IC: 'Spanish (Canary Islands)'
+  es_EA: 'Spanish (Ceuta & Melilla)'
+  es_CL: 'Spanish (Chile)'
+  es_CO: 'Spanish (Colombia)'
+  es_CR: 'Spanish (Costa Rica)'
+  es_CU: 'Spanish (Cuba)'
+  es_DO: 'Spanish (Dominican Republic)'
+  es_EC: 'Spanish (Ecuador)'
+  es_SV: 'Spanish (El Salvador)'
+  es_GQ: 'Spanish (Equatorial Guinea)'
+  es_GT: 'Spanish (Guatemala)'
+  es_HN: 'Spanish (Honduras)'
+  es_MX: 'Spanish (Mexico)'
+  es_NI: 'Spanish (Nicaragua)'
+  es_PA: 'Spanish (Panama)'
+  es_PY: 'Spanish (Paraguay)'
+  es_PE: 'Spanish (Peru)'
+  es_PH: 'Spanish (Philippines)'
+  es_PR: 'Spanish (Puerto Rico)'
+  es_ES: 'Spanish (Spain)'
+  es_US: 'Spanish (United States)'
+  es_UY: 'Spanish (Uruguay)'
+  es_VE: 'Spanish (Venezuela)'
+  sw: 'Swahili'
+  sw_KE: 'Swahili (Kenya)'
+  sw_TZ: 'Swahili (Tanzania)'
+  sw_UG: 'Swahili (Uganda)'
+  sv: 'Swedish'
+  sv_AX: 'Swedish (Åland Islands)'
+  sv_FI: 'Swedish (Finland)'
+  sv_SE: 'Swedish (Sweden)'
+  tl: 'Tagalog'
+  tl_PH: 'Tagalog (Philippines)'
+  ta: 'Tamil'
+  ta_IN: 'Tamil (India)'
+  ta_MY: 'Tamil (Malaysia)'
+  ta_SG: 'Tamil (Singapore)'
+  ta_LK: 'Tamil (Sri Lanka)'
+  te: 'Telugu'
+  te_IN: 'Telugu (India)'
+  th: 'Thai'
+  th_TH: 'Thai (Thailand)'
+  bo: 'Tibetan'
+  bo_CN: 'Tibetan (China)'
+  bo_IN: 'Tibetan (India)'
+  ti: 'Tigrinya'
+  ti_ER: 'Tigrinya (Eritrea)'
+  ti_ET: 'Tigrinya (Ethiopia)'
+  to: 'Tongan'
+  to_TO: 'Tongan (Tonga)'
+  tr: 'Turkish'
+  tr_CY: 'Turkish (Cyprus)'
+  tr_TR: 'Turkish (Turkey)'
+  uk: 'Ukrainian'
+  uk_UA: 'Ukrainian (Ukraine)'
+  ur: 'Urdu'
+  ur_IN: 'Urdu (India)'
+  ur_PK: 'Urdu (Pakistan)'
+  ug: 'Uyghur'
+  ug_Arab_CN: 'Uyghur (Arabic, China)'
+  ug_Arab: 'Uyghur (Arabic)'
+  ug_CN: 'Uyghur (China)'
+  uz: 'Uzbek'
+  uz_AF: 'Uzbek (Afghanistan)'
+  uz_Arab_AF: 'Uzbek (Arabic, Afghanistan)'
+  uz_Arab: 'Uzbek (Arabic)'
+  uz_Cyrl_UZ: 'Uzbek (Cyrillic, Uzbekistan)'
+  uz_Cyrl: 'Uzbek (Cyrillic)'
+  uz_Latn_UZ: 'Uzbek (Latin, Uzbekistan)'
+  uz_Latn: 'Uzbek (Latin)'
+  uz_UZ: 'Uzbek (Uzbekistan)'
+  vi: 'Vietnamese'
+  vi_VN: 'Vietnamese (Vietnam)'
+  cy: 'Welsh'
+  cy_GB: 'Welsh (United Kingdom)'
+  fy: 'Western Frisian'
+  fy_NL: 'Western Frisian (Netherlands)'
+  yi: 'Yiddish'
+  yo: 'Yoruba'
+  yo_BJ: 'Yoruba (Benin)'
+  yo_NG: 'Yoruba (Nigeria)'
+  zu: 'Zulu'
+  zu_ZA: 'Zulu (South Africa)'
diff --git a/config/locales/en.yml b/config/locales/en.yml
index e08681c22..ccd744dbe 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -219,7 +219,11 @@ en:
     footer:
       made_with: Made with
     header:
-      go_to_homepage: Go to the main site
+      go_to_homepage: Website
+      appearance:
+        system: System
+        light: Light
+        dark: Dark
     404:
       title: Page not found
       description: We couldn't find the page you were looking for.
diff --git a/spec/helpers/portal_helper_spec.rb b/spec/helpers/portal_helper_spec.rb
index 3f689b238..732be24f8 100644
--- a/spec/helpers/portal_helper_spec.rb
+++ b/spec/helpers/portal_helper_spec.rb
@@ -57,4 +57,32 @@ describe PortalHelper do
       end
     end
   end
+
+  describe '#get_theme_names' do
+    it 'returns the light theme name' do
+      expect(helper.get_theme_names('light')).to eq(I18n.t('public_portal.header.appearance.light'))
+    end
+
+    it 'returns the dark theme name' do
+      expect(helper.get_theme_names('dark')).to eq(I18n.t('public_portal.header.appearance.dark'))
+    end
+
+    it 'returns the system theme name for any other value' do
+      expect(helper.get_theme_names('any_other_value')).to eq(I18n.t('public_portal.header.appearance.system'))
+    end
+  end
+
+  describe '#get_theme_icon' do
+    it 'returns the light theme icon' do
+      expect(helper.get_theme_icon('light')).to eq('icons/sun')
+    end
+
+    it 'returns the dark theme icon' do
+      expect(helper.get_theme_icon('dark')).to eq('icons/moon')
+    end
+
+    it 'returns the system theme icon for any other value' do
+      expect(helper.get_theme_icon('any_other_value')).to eq('icons/monitor')
+    end
+  end
 end

From 7041d86e4d821e8fbe20e1420bb1dd894bf073a4 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Thu, 9 Nov 2023 07:29:03 +0530
Subject: [PATCH 68/94] feat: Updated home page design (#8106)

Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
---
 app/helpers/portal_helper.rb                  |   8 +-
 .../portal/components/PublicArticleSearch.vue |   2 +-
 app/views/icons/_chevron-right.html.erb       |  12 +-
 .../api/v1/portals/_category-block.html.erb   | 114 ++++++++----------
 .../public/api/v1/portals/_hero.html.erb      |  18 +--
 .../api/v1/portals/articles/show.html.erb     |  36 +++---
 .../api/v1/portals/categories/show.html.erb   |   6 +-
 app/views/public/api/v1/portals/show.html.erb |   6 +-
 config/locales/en.yml                         |   2 +-
 public/assets/images/hc/hexagon-dark.svg      |   3 +
 public/assets/images/hc/hexagon-light.svg     |   3 +
 spec/helpers/portal_helper_spec.rb            |  32 +++--
 12 files changed, 132 insertions(+), 110 deletions(-)
 create mode 100644 public/assets/images/hc/hexagon-dark.svg
 create mode 100644 public/assets/images/hc/hexagon-light.svg

diff --git a/app/helpers/portal_helper.rb b/app/helpers/portal_helper.rb
index 2011bb525..4f8014ac3 100644
--- a/app/helpers/portal_helper.rb
+++ b/app/helpers/portal_helper.rb
@@ -1,11 +1,11 @@
 module PortalHelper
   def generate_portal_bg_color(portal_color, theme)
     base_color = theme == 'dark' ? 'black' : 'white'
-    "color-mix(in srgb, #{portal_color} 10%, #{base_color})"
+    "color-mix(in srgb, #{portal_color} 20%, #{base_color})"
   end
 
   def generate_portal_bg(portal_color, theme)
-    bg_image = theme == 'dark' ? 'grid_dark.svg' : 'grid.svg'
+    bg_image = theme == 'dark' ? 'hexagon-dark.svg' : 'hexagon-light.svg'
     "background: url(/assets/images/hc/#{bg_image}) #{generate_portal_bg_color(portal_color, theme)}"
   end
 
@@ -33,4 +33,8 @@ module PortalHelper
       'icons/monitor'
     end
   end
+
+  def generate_gradient_to_bottom(theme)
+    "background-image: linear-gradient(to bottom, transparent, #{theme == 'dark' ? '#151718' : 'white'})"
+  end
 end
diff --git a/app/javascript/portal/components/PublicArticleSearch.vue b/app/javascript/portal/components/PublicArticleSearch.vue
index f2afeb4ce..59dc94cf0 100644
--- a/app/javascript/portal/components/PublicArticleSearch.vue
+++ b/app/javascript/portal/components/PublicArticleSearch.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-on-clickaway="closeSearch" class="max-w-6xl w-full relative my-4">
+  <div v-on-clickaway="closeSearch" class="max-w-5xl w-full relative my-4">
     <public-search-input
       v-model="searchTerm"
       :search-placeholder="searchTranslations.searchPlaceholder"
diff --git a/app/views/icons/_chevron-right.html.erb b/app/views/icons/_chevron-right.html.erb
index ea10fc633..4ed459d47 100644
--- a/app/views/icons/_chevron-right.html.erb
+++ b/app/views/icons/_chevron-right.html.erb
@@ -1,3 +1,11 @@
-<svg width="6" height="10" viewBox="0 0 6 10" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M1 9L5 5L1 1" stroke-linecap="round" stroke-linejoin="round"/>
+<svg
+  class="w-4 h-4 fill-current text-slate-500 dark:text-slate-400"
+  width="24"
+  height="24"
+  fill="none"
+  viewBox="0 0 24 24"
+  xmlns="http://www.w3.org/2000/svg">
+    <path
+      d="M8.47 4.22a.75.75 0 0 0 0 1.06L15.19 12l-6.72 6.72a.75.75 0 1 0 1.06 1.06l7.25-7.25a.75.75 0 0 0 0-1.06L9.53 4.22a.75.75 0 0 0-1.06 0Z"
+    />
 </svg>
diff --git a/app/views/public/api/v1/portals/_category-block.html.erb b/app/views/public/api/v1/portals/_category-block.html.erb
index f64ddc467..99f5ccce1 100644
--- a/app/views/public/api/v1/portals/_category-block.html.erb
+++ b/app/views/public/api/v1/portals/_category-block.html.erb
@@ -1,67 +1,49 @@
-<section class="lg:container w-full py-6 px-4 flex flex-col h-full">
-  <div class="flex justify-between items-center w-full">
-    <h3 class="text-xl text-slate-800 dark:text-slate-50 font-medium leading-relaxed hover:underline">
-      <a href="/hc/<%= portal.slug %>/<%= category.locale %>/categories/<%= category.slug %><%= @theme.present? ? '?theme='+@theme : ''  %>">
-        <%= category.name %>
-      </a>
-    </h3>
-    <span class="text-slate-500">
-      <%= render 'public/api/v1/portals/article_count', article_count: category.articles.published.order(position: :asc).size %>
-    </span>
-  </div>
-  <div class="py-4 w-full mt-2 flex-grow">
-    <% if category.articles.published.size == 0 %>
-    <div class="h-full flex items-center justify-center bg-slate-50 dark:bg-slate-800 rounded-xl mb-4">
-      <p class="text-sm text-slate-500"><%= I18n.t('public_portal.common.no_articles') %></p>
-    </div>
-    <% else %>
-      <% category.articles.published.order(position: :asc).take(5).each do |article| %>
-      <a
-        class="text-slate-800 dark:text-slate-50 hover:underline leading-8"
-        href="/hc/<%= portal.slug %>/articles/<%= article.slug %><%= @theme.present? ? '?theme='+@theme : ''  %>"
-      >
-        <div class="flex justify-between content-center my-1 -mx-1 p-1 rounded-lg hover:bg-slate-25 dark:hover:bg-slate-800">
-          <%= article.title %>
-          <span class="flex items-center">
-            <svg
-              class="w-4 h-4 fill-current text-slate-700 dark:text-slate-200"
-              width="24"
-              height="24"
-              fill="none"
-              viewBox="0 0 24 24"
-              xmlns="http://www.w3.org/2000/svg">
-              <path
-                d="M8.47 4.22a.75.75 0 0 0 0 1.06L15.19 12l-6.72 6.72a.75.75 0 1 0 1.06 1.06l7.25-7.25a.75.75 0 0 0 0-1.06L9.53 4.22a.75.75 0 0 0-1.06 0Z"
-              />
-            </svg>
-          </span>
-        </div>
-      </a>
-      <% end %>
-    <% end %>
-  </div>
-  <div>
-    <a
-      href="/hc/<%= portal.slug %>/<%= category.locale %>/categories/<%= category.slug %><%= @theme.present? ? '?theme='+@theme : ''  %>"
-      class="flex flex-row items-center text-base font-medium text-woot-500 hover:underline mt-4"
-      style="color: <%= portal.color %>"
-    >
-      <%= I18n.t('public_portal.common.view_all_articles') %>
-      <span class="ml-2">
-        <svg
-          class="w-4 h-4 fill-current text-woot-500"
-          width="24"
-          height="24"
-          fill="none"
-          style="color: <%= portal.color %>"
-          viewBox="0 0 24 24"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            d="M13.267 4.209a.75.75 0 0 0-1.034 1.086l6.251 5.955H3.75a.75.75 0 0 0 0 1.5h14.734l-6.251 5.954a.75.75 0 0 0 1.034 1.087l7.42-7.067a.996.996 0 0 0 .3-.58.758.758 0 0 0-.001-.29.995.995 0 0 0-.3-.578l-7.419-7.067Z"
-          />
-        </svg>
-      </span>
-    </a>
-  </div>
+<section class="lg:container w-full flex flex-col h-full">
+   <div class="flex flex-col gap-8 h-full group <%= !@is_plain_layout_enabled ? 'border border-solid border-slate-100 dark:border-slate-800 hover:border-woot-600 dark:hover:border-woot-600 py-5 px-3 rounded-lg' : '' %>">
+      <div class="flex justify-between items-center w-full">
+         <div class="flex items-start flex-col gap-1">
+            <div class="flex flex-row items-center gap-2 <%= !@is_plain_layout_enabled && 'px-1' %>">
+               <% if category.icon.present? %>
+               <span class="text-lg rounded-md cursor-pointer <%= !@is_plain_layout_enabled && 'pl-1' %>"><%= category.icon %></span>
+               <% end %>
+               <h3 class="text-xl text-slate-800 dark:text-slate-50 font-semibold leading-relaxed hover:cursor-pointer <%= @is_plain_layout_enabled ? 'hover:underline' : 'group-hover:text-woot-600 dark:group-hover:text-woot-600' %> <%= category.icon.blank? && !@is_plain_layout_enabled ? 'pl-1' : '' %>">
+                  <a href="/hc/<%= portal.slug %>/<%= category.locale %>/categories/<%= category.slug %><%= @theme.present? && @theme != 'system' ? '?theme='+@theme : ''  %>">
+                  <%= category.name %>
+                  </a>
+               </h3>
+            </div>
+            <% if category.description.present? %>
+            <span class="text-base text-slate-600 dark:text-slate-400 <%= !@is_plain_layout_enabled && 'px-2' %>"><%= category.description %></span>
+            <% end %>
+         </div>
+      </div>
+      <div class="flex flex-col gap-2 flex-grow <%= category.description.blank? && '-mt-4' %>">
+         <% if category.articles.published.size==0 %>
+         <div class="h-full flex items-center justify-center bg-slate-50 dark:bg-slate-800 rounded-xl mb-4">
+            <p class="text-sm text-slate-500"><%= I18n.t('public_portal.common.no_articles') %></p>
+         </div>
+         <% else %>
+         <% category.articles.published.order(position: :asc).take(5).each do |article| %>
+         <a class="text-slate-700 dark:text-slate-100 leading-7" href="/hc/<%= portal.slug %>/articles/<%= article.slug %><%= @theme.present? && @theme != 'system' ? '?theme='+@theme : ''  %>">
+            <div class="flex justify-between hover:cursor-pointer items-center py-1 rounded-lg gap-3  <%= !@is_plain_layout_enabled ? 'px-2 hover:bg-slate-50 dark:hover:bg-slate-800' : 'hover:underline' %>">
+               <%= article.title %>
+               <span class="flex items-center font-normal">
+                  <%= render partial: 'icons/chevron-right' %>
+               </span>
+            </div>
+         </a>
+         <% end %>
+         <% end %>
+      </div>
+      <div class="flex justify-between flex-row items-center <%= !@is_plain_layout_enabled && 'px-2' %>">
+         <div>
+           <span class="text-sm font-medium text-slate-600 dark:text-slate-400"><%= render 'public/api/v1/portals/article_count', article_count: category.articles.published.order(position: :asc).size %></span>
+         </div>
+         <div>
+            <a href="/hc/<%= portal.slug %>/<%= category.locale %>/categories/<%= category.slug %><%= @theme.present? ? '?theme='+@theme : ''  %>" class="flex flex-row items-center text-sm font-medium text-slate-600 dark:text-slate-400 hover:text-slate-700 dark:hover:text-slate-100">
+            <%= I18n.t('public_portal.common.view_all_articles') %>
+            </a>
+         </div>
+      </div>
+   </div>
 </section>
diff --git a/app/views/public/api/v1/portals/_hero.html.erb b/app/views/public/api/v1/portals/_hero.html.erb
index f2f6f61e6..7f944e6c8 100644
--- a/app/views/public/api/v1/portals/_hero.html.erb
+++ b/app/views/public/api/v1/portals/_hero.html.erb
@@ -1,11 +1,13 @@
-<% if !@is_plain_layout_enabled %> 
-<section id="portal-bg" class="pt-8 pb-16 md:py-20 w-full bg-woot-50 dark:bg-woot-900 shadow-inner" style="<%= generate_portal_bg(@portal.color, @theme) %>">
-  <div class="mx-auto max-w-6xl px-8 flex flex-col items-center sm:items-start">
-    <h1 class="text-2xl md:text-4xl text-slate-900 dark:text-white font-semibold leading-normal">
-      <%= portal.header_text %>
-    </h1>
-    <p class="text-slate-600 dark:text-slate-200 text-center text-lg leading-normal pt-4 pb-4"><%= I18n.t('public_portal.hero.sub_title') %></p>
-    <div id="search-wrap"></div>
+<% if !@is_plain_layout_enabled %>
+<section id="portal-bg" class="w-full bg-woot-50 dark:bg-woot-900 shadow-inner" style="<%= generate_portal_bg(@portal.color, @theme)  %>">
+  <div id="portal-bg-gradient" class="pt-8 pb-12 md:py-14" style="<%= generate_gradient_to_bottom(@theme) %>">
+    <div class="mx-auto max-w-5xl px-8 flex flex-col items-center sm:items-start">
+      <h1 class="text-2xl md:text-4xl text-slate-900 dark:text-white font-semibold leading-normal">
+        <%= portal.header_text %>
+      </h1>
+      <p class="text-slate-600 dark:text-slate-200 text-center text-lg leading-normal pt-4 pb-4"><%= I18n.t('public_portal.hero.sub_title') %></p>
+      <div id="search-wrap"></div>
+    </div>
   </div>
 </section>
 <% end %>
diff --git a/app/views/public/api/v1/portals/articles/show.html.erb b/app/views/public/api/v1/portals/articles/show.html.erb
index 50b619b2d..88deccc9d 100644
--- a/app/views/public/api/v1/portals/articles/show.html.erb
+++ b/app/views/public/api/v1/portals/articles/show.html.erb
@@ -12,28 +12,30 @@
 <% end %>
 
 <% if !@is_plain_layout_enabled %>
-<div class="bg-woot-50 dark:bg-woot-900 py-8 shadow-inner" style="<%= generate_portal_bg(@portal.color, @theme) %>">
-  <div class="max-w-6xl px-8 pt-8 pb-16 mx-auto space-y-4 w-full">
-    <div>
-      <a
-        class="text-slate-700 dark:text-slate-100 hover:underline leading-8 text-sm font-semibold"
-        href="/hc/<%= @portal.slug %>/<%= @article.category&.locale %><%= @theme.present? ? '?theme='+@theme : ''  %>"
-      >
-        Home
-      </a>
-      <span class="text-xs text-slate-600 dark:text-slate-200  px-1">/</span>
-      <% if @article.category %>
+<div class="bg-woot-50 dark:bg-woot-900 shadow-inner" style="<%= generate_portal_bg(@portal.color, @theme) %>">
+  <div class="py-8" style="<%= generate_gradient_to_bottom(@theme) %>">
+    <div class="max-w-6xl px-8 pt-8 pb-16 mx-auto space-y-4 w-full">
+      <div>
         <a
           class="text-slate-700 dark:text-slate-100 hover:underline leading-8 text-sm font-semibold"
-          href="/hc/<%= @portal.slug %>/<%= @article.category.locale %>/categories/<%= @article.category.slug %><%= @theme.present? ? '?theme='+@theme : ''  %>"
+          href="/hc/<%= @portal.slug %>/<%= @article.category&.locale %><%= @theme.present? ? '?theme='+@theme : ''  %>"
         >
-          <%= @article.category&.name %>
+          Home
         </a>
-      <% else %>
-        <span class="text-slate-700 dark:text-slate-100 leading-8 text-sm font-semibold" > Uncategorized </span>
-      <% end %>
+        <span class="text-xs text-slate-600 dark:text-slate-200  px-1">/</span>
+        <% if @article.category %>
+          <a
+            class="text-slate-700 dark:text-slate-100 hover:underline leading-8 text-sm font-semibold"
+            href="/hc/<%= @portal.slug %>/<%= @article.category.locale %>/categories/<%= @article.category.slug %><%= @theme.present? ? '?theme='+@theme : ''  %>"
+          >
+            <%= @article.category&.name %>
+          </a>
+        <% else %>
+          <span class="text-slate-700 dark:text-slate-100 leading-8 text-sm font-semibold" > Uncategorized </span>
+        <% end %>
+      </div>
+      <%= render "public/api/v1/portals/articles/article_header", article: @article %>
     </div>
-    <%= render "public/api/v1/portals/articles/article_header", article: @article %>
   </div>
 </div>
 <% else %>
diff --git a/app/views/public/api/v1/portals/categories/show.html.erb b/app/views/public/api/v1/portals/categories/show.html.erb
index b127cb96e..66203d74f 100644
--- a/app/views/public/api/v1/portals/categories/show.html.erb
+++ b/app/views/public/api/v1/portals/categories/show.html.erb
@@ -6,8 +6,10 @@
 <% end %>
 
 <% if !@is_plain_layout_enabled %>
-<div class="bg-woot-50 dark:bg-woot-900 pt-16 pb-20" style="<%= generate_portal_bg(@portal.color, @theme) %>">
-  <%= render 'public/api/v1/portals/categories/category-hero', category: @category, portal: @portal %>
+<div class="bg-woot-50 dark:bg-woot-900" style="<%= generate_portal_bg(@portal.color, @theme) %>">
+  <div class="pt-16 pb-20" style="<%= generate_gradient_to_bottom(@theme) %>">
+    <%= render 'public/api/v1/portals/categories/category-hero', category: @category, portal: @portal %>
+  </div>
 </div>
 <% else %>
   <%= render 'public/api/v1/portals/categories/category-hero', category: @category, portal: @portal %>
diff --git a/app/views/public/api/v1/portals/show.html.erb b/app/views/public/api/v1/portals/show.html.erb
index 339610045..c3c3005b1 100644
--- a/app/views/public/api/v1/portals/show.html.erb
+++ b/app/views/public/api/v1/portals/show.html.erb
@@ -1,12 +1,12 @@
 <%= render "public/api/v1/portals/hero", portal: @portal %>
-<div class="max-w-6xl w-full flex-grow mx-auto py-8 px-4">
-  <div class="grid grid-cols-1 lg:grid-cols-2 gap-x-32 gap-y-0 lg:gap-y-12">
+<div class="max-w-5xl w-full flex-grow mx-auto py-8 px-8">
+  <div class="grid grid-cols-1 lg:grid-cols-2 gap-x-6 gap-y-6">
     <% @portal.categories.where(locale: @locale).joins(:articles).where(articles:{ status: :published }).order(position: :asc).group('categories.id').each do |category| %>
       <%= render "public/api/v1/portals/category-block", category: category, portal: @portal %>
     <% end %>
   </div>
 
-  <div class="grid grid-cols-1 lg:grid-cols-2 gap-x-32 gap-y-0 lg:gap-y-12">
+  <div class="grid grid-cols-1 lg:grid-cols-2 gap-x-6 gap-y-6">
     <% if @portal.articles.where(status: :published, category_id: nil).count > 0 %>
       <%= render "public/api/v1/portals/uncategorized-block", category: "Uncategorized", portal: @portal %>
     <% end %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index ccd744dbe..af26aa8f5 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -212,7 +212,7 @@ en:
     common:
       home: Home
       last_updated_on: Last updated on %{last_updated_on}
-      view_all_articles: View all articles
+      view_all_articles: View all
       article: article
       articles: articles
       no_articles: There are no articles here
diff --git a/public/assets/images/hc/hexagon-dark.svg b/public/assets/images/hc/hexagon-dark.svg
new file mode 100644
index 000000000..47b07ad0d
--- /dev/null
+++ b/public/assets/images/hc/hexagon-dark.svg
@@ -0,0 +1,3 @@
+<svg width="44" height="77" viewBox="0 0 44 77" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M20.9846 15.1129C21.6033 14.7557 22.3654 14.7556 22.9841 15.1125L41.4123 25.7442C42.0314 26.1014 42.4129 26.7618 42.4129 27.4766V48.7377C42.4129 49.4525 42.0314 50.1129 41.4123 50.4701L22.9841 61.1017C22.3654 61.4587 21.6033 61.4586 20.9846 61.1014L2.57141 50.4702C1.95262 50.1129 1.57143 49.4527 1.57143 48.7382V27.4761C1.57143 26.7616 1.95262 26.1013 2.57141 25.7441L20.9846 15.1129ZM5.71489 27.5513C5.09575 27.9085 4.71429 28.569 4.71429 29.2837V46.9306C4.71429 47.6453 5.09575 48.3058 5.71489 48.6629L20.9846 57.4718C21.6032 57.8287 22.3653 57.8286 22.9839 57.4715L38.2699 48.6473C38.8888 48.2901 39.27 47.6298 39.27 46.9152V29.2843C39.27 28.5692 38.8882 27.9085 38.2687 27.5515L22.9835 18.7416C22.3651 18.3852 21.6036 18.3853 20.9853 18.742L5.71489 27.5513ZM0 23.5557C0 23.5627 0.00756041 23.5671 0.0136066 23.5636L19.3977 12.3632C20.0162 12.0058 20.3971 11.3458 20.3971 10.6315V1.57143C20.3971 0.703554 19.6936 0 18.8257 0C17.9578 0 17.2543 0.703553 17.2543 1.57143V8.82393C17.2543 9.53843 16.8731 10.1987 16.2544 10.5559L0.999919 19.3641C0.381163 19.7213 0 20.3816 0 21.0961V23.5557ZM0 52.6586C0 52.6516 0.00755897 52.6472 0.013604 52.6507L19.3977 63.8511C20.0162 64.2085 20.3971 64.8685 20.3971 65.5828V75.4286C20.3971 76.2964 19.6936 77 18.8257 77C17.9578 77 17.2543 76.2964 17.2543 75.4286V67.3904C17.2543 66.6759 16.8731 66.0156 16.2544 65.6583L0.999919 56.8502C0.381163 56.4929 0 55.8327 0 55.1182V52.6586ZM25.1429 0C24.275 0 23.5714 0.703553 23.5714 1.57143V10.631C23.5714 11.3456 23.9526 12.0058 24.5714 12.3631L43.9814 23.5698C43.9833 23.5709 43.9854 23.5714 43.9876 23.5714C43.9944 23.5714 44 23.5659 44 23.559V19.9538C44 19.947 43.9944 19.9414 43.9876 19.9414C43.9854 19.9414 43.9833 19.9409 43.9814 19.9398L27.7149 10.5558C27.0957 10.1986 26.7143 9.53819 26.7143 8.82341V1.57143C26.7143 0.703552 26.0107 0 25.1429 0ZM25.1429 77C24.275 77 23.5714 76.2964 23.5714 75.4286V65.5833C23.5714 64.8687 23.9526 64.2085 24.5714 63.8512L43.9814 52.6445C43.9833 52.6434 43.9854 52.6429 43.9876 52.6429C43.9944 52.6429 44 52.6484 44 52.6553V56.2605C44 56.2673 43.9944 56.2729 43.9876 56.2729C43.9854 56.2729 43.9833 56.2734 43.9814 56.2745L27.7149 65.6585C27.0957 66.0157 26.7143 66.6761 26.7143 67.3909V75.4286C26.7143 76.2964 26.0107 77 25.1429 77Z" fill="white" fill-opacity="0.04"/>
+</svg>
diff --git a/public/assets/images/hc/hexagon-light.svg b/public/assets/images/hc/hexagon-light.svg
new file mode 100644
index 000000000..e496934e6
--- /dev/null
+++ b/public/assets/images/hc/hexagon-light.svg
@@ -0,0 +1,3 @@
+<svg width="44" height="77" viewBox="0 0 44 77" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21.9843 14.5357L42.4129 26.3214V49.8929L21.9843 61.6786L1.57143 49.8929V26.3214L21.9843 14.5357ZM4.71429 28.1286V48.0857L21.9843 58.0486L39.27 48.07V28.1286L21.9843 18.1657L4.71429 28.1286ZM0 23.5714L20.3971 11.7857V0H17.2543V9.97857L0 19.9414V23.5557V23.5714ZM0 52.6429L20.3971 64.4286V77H17.2543V66.2357L0 56.2729V52.6586V52.6429ZM23.5714 0V11.7857L43.9843 23.5714H44V19.9414H43.9843L26.7143 9.97857V0H23.5714ZM23.5714 77V64.4286L43.9843 52.6429H44V56.2729H43.9843L26.7143 66.2357V77H23.5714Z" fill="black" fill-opacity="0.024"/>
+</svg>
diff --git a/spec/helpers/portal_helper_spec.rb b/spec/helpers/portal_helper_spec.rb
index 732be24f8..338a9260b 100644
--- a/spec/helpers/portal_helper_spec.rb
+++ b/spec/helpers/portal_helper_spec.rb
@@ -5,7 +5,7 @@ describe PortalHelper do
     context 'when theme is dark' do
       it 'returns the correct color mix with black' do
         expect(helper.generate_portal_bg_color('#ff0000', 'dark')).to eq(
-          'color-mix(in srgb, #ff0000 10%, black)'
+          'color-mix(in srgb, #ff0000 20%, black)'
         )
       end
     end
@@ -13,7 +13,7 @@ describe PortalHelper do
     context 'when theme is not dark' do
       it 'returns the correct color mix with white' do
         expect(helper.generate_portal_bg_color('#ff0000', 'light')).to eq(
-          'color-mix(in srgb, #ff0000 10%, white)'
+          'color-mix(in srgb, #ff0000 20%, white)'
         )
       end
     end
@@ -21,10 +21,10 @@ describe PortalHelper do
     context 'when provided with various colors' do
       it 'adjusts the color mix appropriately' do
         expect(helper.generate_portal_bg_color('#00ff00', 'dark')).to eq(
-          'color-mix(in srgb, #00ff00 10%, black)'
+          'color-mix(in srgb, #00ff00 20%, black)'
         )
         expect(helper.generate_portal_bg_color('#0000ff', 'light')).to eq(
-          'color-mix(in srgb, #0000ff 10%, white)'
+          'color-mix(in srgb, #0000ff 20%, white)'
         )
       end
     end
@@ -33,26 +33,26 @@ describe PortalHelper do
   describe '#generate_portal_bg' do
     context 'when theme is dark' do
       it 'returns the correct background with dark grid image and color mix with black' do
-        expected_bg = 'background: url(/assets/images/hc/grid_dark.svg) color-mix(in srgb, #ff0000 10%, black)'
+        expected_bg = 'background: url(/assets/images/hc/hexagon-dark.svg) color-mix(in srgb, #ff0000 20%, black)'
         expect(helper.generate_portal_bg('#ff0000', 'dark')).to eq(expected_bg)
       end
     end
 
     context 'when theme is not dark' do
       it 'returns the correct background with light grid image and color mix with white' do
-        expected_bg = 'background: url(/assets/images/hc/grid.svg) color-mix(in srgb, #ff0000 10%, white)'
+        expected_bg = 'background: url(/assets/images/hc/hexagon-light.svg) color-mix(in srgb, #ff0000 20%, white)'
         expect(helper.generate_portal_bg('#ff0000', 'light')).to eq(expected_bg)
       end
     end
 
     context 'when provided with various colors' do
       it 'adjusts the background appropriately for dark theme' do
-        expected_bg = 'background: url(/assets/images/hc/grid_dark.svg) color-mix(in srgb, #00ff00 10%, black)'
+        expected_bg = 'background: url(/assets/images/hc/hexagon-dark.svg) color-mix(in srgb, #00ff00 20%, black)'
         expect(helper.generate_portal_bg('#00ff00', 'dark')).to eq(expected_bg)
       end
 
       it 'adjusts the background appropriately for light theme' do
-        expected_bg = 'background: url(/assets/images/hc/grid.svg) color-mix(in srgb, #0000ff 10%, white)'
+        expected_bg = 'background: url(/assets/images/hc/hexagon-light.svg) color-mix(in srgb, #0000ff 20%, white)'
         expect(helper.generate_portal_bg('#0000ff', 'light')).to eq(expected_bg)
       end
     end
@@ -85,4 +85,20 @@ describe PortalHelper do
       expect(helper.get_theme_icon('any_other_value')).to eq('icons/monitor')
     end
   end
+
+  describe '#generate_gradient_to_bottom' do
+    context 'when theme is dark' do
+      it 'returns the correct background gradient' do
+        expected_gradient = 'background-image: linear-gradient(to bottom, transparent, #151718)'
+        expect(helper.generate_gradient_to_bottom('dark')).to eq(expected_gradient)
+      end
+    end
+
+    context 'when theme is not dark' do
+      it 'returns the correct background gradient' do
+        expected_gradient = 'background-image: linear-gradient(to bottom, transparent, white)'
+        expect(helper.generate_gradient_to_bottom('light')).to eq(expected_gradient)
+      end
+    end
+  end
 end

From 268e26625b4c0efd934d0331ebebca6a13a7fef8 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Thu, 9 Nov 2023 07:31:07 +0530
Subject: [PATCH 69/94] feat: Adds the ability to see the popular articles
 (#8152)

Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
---
 app/helpers/portal_helper.rb                  |  4 +++
 .../api/v1/portals/_category-block.html.erb   |  2 +-
 .../v1/portals/_featured_articles.html.erb    | 28 +++++++++++++++++++
 .../public/api/v1/portals/_hero.html.erb      |  2 +-
 app/views/public/api/v1/portals/show.html.erb | 11 ++++++--
 config/locales/en.yml                         |  1 +
 spec/helpers/portal_helper_spec.rb            | 18 ++++++++++++
 7 files changed, 61 insertions(+), 5 deletions(-)
 create mode 100644 app/views/public/api/v1/portals/_featured_articles.html.erb

diff --git a/app/helpers/portal_helper.rb b/app/helpers/portal_helper.rb
index 4f8014ac3..12ba41f95 100644
--- a/app/helpers/portal_helper.rb
+++ b/app/helpers/portal_helper.rb
@@ -37,4 +37,8 @@ module PortalHelper
   def generate_gradient_to_bottom(theme)
     "background-image: linear-gradient(to bottom, transparent, #{theme == 'dark' ? '#151718' : 'white'})"
   end
+
+  def generate_article_link(portal_slug, article_slug, theme)
+    "/hc/#{portal_slug}/articles/#{article_slug}#{theme.present? && theme != 'system' ? "?theme=#{theme}" : ''}"
+  end
 end
diff --git a/app/views/public/api/v1/portals/_category-block.html.erb b/app/views/public/api/v1/portals/_category-block.html.erb
index 99f5ccce1..bcf9aebe3 100644
--- a/app/views/public/api/v1/portals/_category-block.html.erb
+++ b/app/views/public/api/v1/portals/_category-block.html.erb
@@ -24,7 +24,7 @@
          </div>
          <% else %>
          <% category.articles.published.order(position: :asc).take(5).each do |article| %>
-         <a class="text-slate-700 dark:text-slate-100 leading-7" href="/hc/<%= portal.slug %>/articles/<%= article.slug %><%= @theme.present? && @theme != 'system' ? '?theme='+@theme : ''  %>">
+         <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 hover:cursor-pointer items-center py-1 rounded-lg gap-3  <%= !@is_plain_layout_enabled ? 'px-2 hover:bg-slate-50 dark:hover:bg-slate-800' : 'hover:underline' %>">
                <%= article.title %>
                <span class="flex items-center font-normal">
diff --git a/app/views/public/api/v1/portals/_featured_articles.html.erb b/app/views/public/api/v1/portals/_featured_articles.html.erb
new file mode 100644
index 000000000..8d671ccfd
--- /dev/null
+++ b/app/views/public/api/v1/portals/_featured_articles.html.erb
@@ -0,0 +1,28 @@
+<% featured_articles = articles.where(category_id: categories).search_by_status(:published).order_by_views.limit(6) %>
+<% if featured_articles.count >= 6 %>
+<section class="lg:container w-full flex flex-col h-full">
+   <div class="flex flex-col gap-5 border border-solid border-slate-100 dark:border-slate-800 rounded-lg py-5 px-3">
+      <div class="flex justify-between items-center w-full"> 
+         <div class="flex items-start flex-col gap-1">
+            <div class="flex flex-row items-center gap-2 px-2">
+               <h3 class="text-xl text-slate-800 dark:text-slate-50 font-semibold leading-relaxed">
+                  <%= I18n.t('public_portal.header.featured_articles') %>
+               </h3>
+            </div>
+         </div>
+      </div>
+      <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">
+               <%= article.title %>
+               <span class="flex items-center font-normal">
+                  <%= render partial: 'icons/chevron-right' %>
+               </span>
+            </div>
+         </a>
+         <% end %>
+      </div>
+   </div>
+</section>
+<% end %>
diff --git a/app/views/public/api/v1/portals/_hero.html.erb b/app/views/public/api/v1/portals/_hero.html.erb
index 7f944e6c8..a96edcf5b 100644
--- a/app/views/public/api/v1/portals/_hero.html.erb
+++ b/app/views/public/api/v1/portals/_hero.html.erb
@@ -1,6 +1,6 @@
 <% if !@is_plain_layout_enabled %>
 <section id="portal-bg" class="w-full bg-woot-50 dark:bg-woot-900 shadow-inner" style="<%= generate_portal_bg(@portal.color, @theme)  %>">
-  <div id="portal-bg-gradient" class="pt-8 pb-12 md:py-14" style="<%= generate_gradient_to_bottom(@theme) %>">
+  <div id="portal-bg-gradient" class="pt-8 pb-8 md:pt-14 md:pb-6" style="<%= generate_gradient_to_bottom(@theme) %>">
     <div class="mx-auto max-w-5xl px-8 flex flex-col items-center sm:items-start">
       <h1 class="text-2xl md:text-4xl text-slate-900 dark:text-white font-semibold leading-normal">
         <%= portal.header_text %>
diff --git a/app/views/public/api/v1/portals/show.html.erb b/app/views/public/api/v1/portals/show.html.erb
index c3c3005b1..a6af2931e 100644
--- a/app/views/public/api/v1/portals/show.html.erb
+++ b/app/views/public/api/v1/portals/show.html.erb
@@ -1,11 +1,16 @@
 <%= render "public/api/v1/portals/hero", portal: @portal %>
-<div class="max-w-5xl w-full flex-grow mx-auto py-8 px-8">
-  <div class="grid grid-cols-1 lg:grid-cols-2 gap-x-6 gap-y-6">
+<div class="max-w-5xl w-full flex flex-col flex-grow mx-auto py-8 px-8 gap-6">
+  <%# Featured Articles %>
+  <% if !@is_plain_layout_enabled %>
+    <div><%= render "public/api/v1/portals/featured_articles", articles: @portal.articles, categories: @portal.categories.where(locale: @locale), portal: @portal %></div>
+  <% end %>
+  <%# Categories with articles %>
+  <div class="grid grid-cols-1 md:grid-cols-2 gap-x-6 gap-y-6">
     <% @portal.categories.where(locale: @locale).joins(:articles).where(articles:{ status: :published }).order(position: :asc).group('categories.id').each do |category| %>
       <%= render "public/api/v1/portals/category-block", category: category, portal: @portal %>
     <% end %>
   </div>
-
+  <%# Uncategorized articles %>
   <div class="grid grid-cols-1 lg:grid-cols-2 gap-x-6 gap-y-6">
     <% if @portal.articles.where(status: :published, category_id: nil).count > 0 %>
       <%= render "public/api/v1/portals/uncategorized-block", category: "Uncategorized", portal: @portal %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index af26aa8f5..69c87b3e8 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -224,6 +224,7 @@ en:
         system: System
         light: Light
         dark: Dark
+      featured_articles: Featured Articles
     404:
       title: Page not found
       description: We couldn't find the page you were looking for.
diff --git a/spec/helpers/portal_helper_spec.rb b/spec/helpers/portal_helper_spec.rb
index 338a9260b..0f131a279 100644
--- a/spec/helpers/portal_helper_spec.rb
+++ b/spec/helpers/portal_helper_spec.rb
@@ -101,4 +101,22 @@ describe PortalHelper do
       end
     end
   end
+
+  describe '#generate_article_link' do
+    context 'when theme is not present' do
+      it 'returns the correct link' do
+        expect(helper.generate_article_link('portal_slug', 'article_slug', nil)).to eq(
+          '/hc/portal_slug/articles/article_slug'
+        )
+      end
+    end
+
+    context 'when theme is present' do
+      it 'returns the correct link' do
+        expect(helper.generate_article_link('portal_slug', 'article_slug', 'dark')).to eq(
+          '/hc/portal_slug/articles/article_slug?theme=dark'
+        )
+      end
+    end
+  end
 end

From 950f085e800a5a08fcfce8c1a5505f32c9537f63 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Thu, 9 Nov 2023 07:33:16 +0530
Subject: [PATCH 70/94] feat: Updated the design of the category page (#8165)

Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
---
 app/helpers/portal_helper.rb                  |  4 ++
 .../v1/portals/_uncategorized-block.html.erb  |  2 +-
 .../categories/_category-block.html.erb       |  6 +--
 .../categories/_category-hero.html.erb        | 37 ++++++++++-------
 .../api/v1/portals/categories/show.html.erb   | 40 +++++++------------
 lib/chatwoot_markdown_renderer.rb             |  4 ++
 spec/helpers/portal_helper_spec.rb            | 15 +++++++
 spec/lib/chatwoot_markdown_renderer_spec.rb   | 13 ++++++
 8 files changed, 77 insertions(+), 44 deletions(-)

diff --git a/app/helpers/portal_helper.rb b/app/helpers/portal_helper.rb
index 12ba41f95..72d4eeda1 100644
--- a/app/helpers/portal_helper.rb
+++ b/app/helpers/portal_helper.rb
@@ -41,4 +41,8 @@ module PortalHelper
   def generate_article_link(portal_slug, article_slug, theme)
     "/hc/#{portal_slug}/articles/#{article_slug}#{theme.present? && theme != 'system' ? "?theme=#{theme}" : ''}"
   end
+
+  def render_category_content(content)
+    ChatwootMarkdownRenderer.new(content).render_markdown_to_plain_text
+  end
 end
diff --git a/app/views/public/api/v1/portals/_uncategorized-block.html.erb b/app/views/public/api/v1/portals/_uncategorized-block.html.erb
index f96584427..0fb3ab591 100644
--- a/app/views/public/api/v1/portals/_uncategorized-block.html.erb
+++ b/app/views/public/api/v1/portals/_uncategorized-block.html.erb
@@ -11,7 +11,7 @@
     <% portal.articles.published.where(category_id: nil).order(position: :asc).take(5).each do |article| %>
     <a
       class="text-slate-800 dark:text-slate-100 hover:underline leading-8"
-      href="/hc/<%= portal.slug %>/articles/<%= article.slug %><%= @theme.present? ? '?theme='+@theme : ''  %>"
+      href="<%= generate_article_link(portal.slug, article.slug, @theme) %>"
     >
       <div class="flex justify-between content-center my-1 -mx-1 p-1 rounded-lg hover:bg-slate-25 dark:hover:bg-slate-800">
         <%= article.title %>
diff --git a/app/views/public/api/v1/portals/categories/_category-block.html.erb b/app/views/public/api/v1/portals/categories/_category-block.html.erb
index eddb18ab1..f2cf547fe 100644
--- a/app/views/public/api/v1/portals/categories/_category-block.html.erb
+++ b/app/views/public/api/v1/portals/categories/_category-block.html.erb
@@ -2,7 +2,7 @@
 <section class="lg:container w-full py-6 px-4 flex flex-col h-full">
   <div class="flex justify-between items-center w-full">
     <h3 class="text-xl text-slate-900 dark:text-white font-semibold leading-relaxed hover:underline">
-     <a href="/hc/<%= portal.slug %>/<%= category.locale %>/categories/<%= category.slug %><%= @theme.present? ? '?theme='+@theme : ''  %>">
+     <a href="/hc/<%= portal.slug %>/<%= category.locale %>/categories/<%= category.slug %><%= @theme.present? && @theme != 'system' ? '?theme='+@theme : ''  %>">
       <%= category.name %>
     </a>
     </h3>
@@ -20,7 +20,7 @@
         <div class="flex justify-between content-center h-8 my-1">
           <a
             class="text-slate-800 dark:text-slate-50 hover:underline leading-8"
-            href="/hc/<%= portal.slug %>/articles/<%= article.slug %><%= @theme.present? ? '?theme='+@theme : ''  %>"
+            href="/hc/<%= portal.slug %>/articles/<%= article.slug %><%= @theme.present? && @theme != 'system' ? '?theme='+@theme : ''  %>"
           >
             <%= article.title %>
           </a>
@@ -45,7 +45,7 @@
   </div>
   <div>
     <a
-      href="/hc/<%= portal.slug %>/<%= category.locale %>/categories/<%= category.slug %><%= @theme.present? ? '?theme='+@theme : ''  %>"
+      href="/hc/<%= portal.slug %>/<%= category.locale %>/categories/<%= category.slug %><%= @theme.present? && @theme != 'system' ? '?theme='+@theme : ''  %>"
       class="flex flex-row items-center text-base font-medium text-woot-600 dark:text-woot-500 hover:text-slate-900 dark:hover:text-white hover:underline mt-4"
     >
       <%= I18n.t('public_portal.common.view_all_articles') %>
diff --git a/app/views/public/api/v1/portals/categories/_category-hero.html.erb b/app/views/public/api/v1/portals/categories/_category-hero.html.erb
index 3cc474742..5b0d85fa2 100644
--- a/app/views/public/api/v1/portals/categories/_category-hero.html.erb
+++ b/app/views/public/api/v1/portals/categories/_category-hero.html.erb
@@ -1,17 +1,26 @@
-<div class="px-8 max-w-6xl w-full mx-auto">
-  <a
-    class="text-slate-700 dark:text-slate-100 text-sm hover:underline leading-8 font-semibold"
-    href="/hc/<%= portal.slug %>/<%= category.locale %><%= @theme.present? ? '?theme='+@theme : ''  %>"
-  >
-    <%= I18n.t('public_portal.common.home') %>
-  </a>
-  <span class="text-xs text-slate-600 dark:text-slate-200 px-1">/</span>
-  <div class="flex justify-start items-center w-full">
-    <h1 class="text-3xl font-semibold leading-snug md:tracking-normal text-slate-900 dark:text-white">
-      <%= category.name %>
-    </h1>
-    <div class="text-slate-500 px-8 mt-2">
-      <%= render 'public/api/v1/portals/article_count', article_count: category.articles.published.size %>
+<div class="flex flex-col px-8 max-w-5xl w-full mx-auto gap-6 <%= @is_plain_layout_enabled && 'py-4' %>">
+  <div class="flex items-center flex-row">
+    <a
+      class="text-slate-500 dark:text-slate-200 text-sm gap-1 <%= @is_plain_layout_enabled && 'hover:underline' %> hover:cursor-pointer leading-8 font-semibold"
+      href="/hc/<%= portal.slug %>/<%= category.locale %><%= @theme.present? && @theme != 'system' ? '?theme='+@theme : ''  %>"
+    >
+      <%= I18n.t('public_portal.common.home') %>
+    </a>
+    <span class="w-4 h-4 [&>svg]:w-3 [&>svg]:h-3 flex items-center justify-center text-xs text-slate-500 dark:text-slate-300"><%= render partial: 'icons/chevron-right' %></span>
+    <span class="text-sm text-slate-800 dark:text-slate-100 font-semibold"><%= category.name %></span>
+  </div>
+  <div class="flex justify-start flex-col items-start w-full gap-2">
+    <div class="flex flex-col gap-2">
+      <% if category.icon.present? %>
+      <span class="text-4xl"><%= category.icon %></span>
+      <% end %>
+      <h1 class="text-3xl font-semibold leading-[52.5px] text-slate-900 dark:text-white">
+        <%= category.name %>
+      </h1>
+      <% if category.description.present? %>
+      <span class="font-medium text-slate-800 dark:text-slate-75 text-base leading-5"><%= category.description %></span>
+      <% end %>
     </div>
+    <span class="flex items-center text-base text-slate-600 dark:text-slate-400 font-medium"><%= render 'public/api/v1/portals/article_count', article_count: category.articles.published.size %></span>
   </div>
 </div>
diff --git a/app/views/public/api/v1/portals/categories/show.html.erb b/app/views/public/api/v1/portals/categories/show.html.erb
index 66203d74f..27ae0dd08 100644
--- a/app/views/public/api/v1/portals/categories/show.html.erb
+++ b/app/views/public/api/v1/portals/categories/show.html.erb
@@ -6,48 +6,36 @@
 <% end %>
 
 <% if !@is_plain_layout_enabled %>
-<div class="bg-woot-50 dark:bg-woot-900" style="<%= generate_portal_bg(@portal.color, @theme) %>">
-  <div class="pt-16 pb-20" style="<%= generate_gradient_to_bottom(@theme) %>">
+<div id="portal-bg" class="bg-woot-50 dark:bg-woot-900" style="<%= generate_portal_bg(@portal.color, @theme) %>">
+  <div id="portal-bg-gradient" class="pt-8 pb-8 md:pt-14 md:pb-6" style="<%= generate_gradient_to_bottom(@theme) %>">
     <%= render 'public/api/v1/portals/categories/category-hero', category: @category, portal: @portal %>
   </div>
 </div>
 <% else %>
   <%= render 'public/api/v1/portals/categories/category-hero', category: @category, portal: @portal %>
 <% end %>
-<section class="max-w-6xl w-full mx-auto py-6 px-8 flex flex-col items-center justify-center flex-grow">
-  <div class="py-4 w-full mt-2 flex-grow">
+<section class="max-w-5xl w-full mx-auto px-8 py-6 flex flex-col items-center justify-center flex-grow">
+  <div class="w-full flex flex-col gap-6 flex-grow">
     <% if @category.articles.published.size == 0 %>
     <div class="h-full flex items-center justify-center bg-slate-50 dark:bg-slate-800 rounded-xl py-6">
       <p class="text-sm text-slate-500"><%= I18n.t('public_portal.common.no_articles') %></p>
     </div>
     <% else %>
     <% @category.articles.published.order(:position).each do |article| %>
+    <div class="<%= !@is_plain_layout_enabled ? 'group border border-solid border-slate-100 dark:border-slate-800 hover:border-woot-600 dark:hover:border-woot-600 rounded-lg' : '' %>">
       <a
-        class="text-slate-800 dark:text-slate-50 flex justify-between content-center mb-4 py-2"
-        href="/hc/<%= @portal.slug %>/articles/<%= article.slug %><%= @theme.present? ? '?theme='+@theme : ''  %>"
+        class="<%= !@is_plain_layout_enabled ? 'p-4' : 'px-0 py-1' %> text-slate-800 dark:text-slate-50 flex justify-between content-center hover:cursor-pointer"
+        href="/hc/<%= @portal.slug %>/articles/<%= article.slug %><%= @theme.present? && @theme != 'system' ? '?theme='+@theme : ''  %>"
       >
-        <div>
-          <p class="mb-2 hover:underline font-semibold"><%= article.title %></p>
-          <p class="text-sm">
-            <%= I18n.t('public_portal.common.last_updated_on', last_updated_on: article.updated_at.strftime("%b %d, %Y")) %>
-          </p>
+        <div class="flex flex-col gap-5">
+          <div class="flex flex-col gap-1">
+            <h3 class="text-lg text-slate-900 dark:text-slate-50 font-semibold <%= @is_plain_layout_enabled ? 'hover:underline' : 'group-hover:text-woot-600 dark:group-hover:text-woot-600' %>"><%= article.title %></h3>
+            <p class="text-base font-normal text-slate-500 dark:text-slate-200 line-clamp-1 break-all"><%= render_category_content(article.content) %></p>
+          </div>
+          <span class="text-sm text-slate-600 dark:text-slate-400 font-medium flex items-center"><%= I18n.t('public_portal.common.last_updated_on', last_updated_on: article.updated_at.strftime("%b %d, %Y")) %></span>
         </div>
-
-        <span>
-          <svg
-            class="w-4 h-4 fill-current text-slate-700 dark:text-slate-200"
-            width="24"
-            height="24"
-            fill="none"
-            viewBox="0 0 24 24"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M8.47 4.22a.75.75 0 0 0 0 1.06L15.19 12l-6.72 6.72a.75.75 0 1 0 1.06 1.06l7.25-7.25a.75.75 0 0 0 0-1.06L9.53 4.22a.75.75 0 0 0-1.06 0Z"
-            />
-          </svg>
-        </span>
       </a>
+    </div>  
     <% end %>
     <% end %>
   </div>
diff --git a/lib/chatwoot_markdown_renderer.rb b/lib/chatwoot_markdown_renderer.rb
index 73b52e1d6..2177f8b8f 100644
--- a/lib/chatwoot_markdown_renderer.rb
+++ b/lib/chatwoot_markdown_renderer.rb
@@ -18,6 +18,10 @@ class ChatwootMarkdownRenderer
     render_as_html_safe(html)
   end
 
+  def render_markdown_to_plain_text
+    CommonMarker.render_doc(@content, :DEFAULT).to_plaintext
+  end
+
   private
 
   def render_as_html_safe(html)
diff --git a/spec/helpers/portal_helper_spec.rb b/spec/helpers/portal_helper_spec.rb
index 0f131a279..3294e6cb6 100644
--- a/spec/helpers/portal_helper_spec.rb
+++ b/spec/helpers/portal_helper_spec.rb
@@ -119,4 +119,19 @@ describe PortalHelper do
       end
     end
   end
+ 
+  describe '#render_category_content' do
+    let(:markdown_content) { 'This is a *test* markdown content' }
+    let(:plain_text_content) { 'This is a test markdown content' }
+    let(:renderer) { instance_double(ChatwootMarkdownRenderer) }
+
+    before do
+      allow(ChatwootMarkdownRenderer).to receive(:new).with(markdown_content).and_return(renderer)
+      allow(renderer).to receive(:render_markdown_to_plain_text).and_return(plain_text_content)
+    end
+
+    it 'converts markdown to plain text' do
+      expect(helper.render_category_content(markdown_content)).to eq(plain_text_content)
+    end
+  end
 end
diff --git a/spec/lib/chatwoot_markdown_renderer_spec.rb b/spec/lib/chatwoot_markdown_renderer_spec.rb
index a3109a7f2..cbfc4c6fe 100644
--- a/spec/lib/chatwoot_markdown_renderer_spec.rb
+++ b/spec/lib/chatwoot_markdown_renderer_spec.rb
@@ -2,6 +2,7 @@ require 'rails_helper'
 
 RSpec.describe ChatwootMarkdownRenderer do
   let(:markdown_content) { 'This is a *test* content with ^markdown^' }
+  let(:plain_text_content) { 'This is a test content with markdown' }
   let(:doc) { instance_double(CommonMarker::Node) }
   let(:renderer) { described_class.new(markdown_content) }
   let(:markdown_renderer) { instance_double(CustomMarkdownRenderer) }
@@ -44,4 +45,16 @@ RSpec.describe ChatwootMarkdownRenderer do
       expect(rendered_message).to be_html_safe
     end
   end
+
+  describe '#render_markdown_to_plain_text' do
+    let(:rendered_content) { renderer.render_markdown_to_plain_text }
+
+    before do
+      allow(doc).to receive(:to_plaintext).and_return(plain_text_content)
+    end
+
+    it 'renders the markdown content to plain text' do
+      expect(rendered_content).to eq(plain_text_content)
+    end
+  end
 end

From f018b0013caf91706e232ed18c4038693514f531 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Thu, 9 Nov 2023 07:35:13 +0530
Subject: [PATCH 71/94] feat: Updated the design of the article page (#8166)

Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
---
 .../portal/components/TableOfContents.vue     | 56 +++++++++++++++++--
 app/views/icons/_chatwoot-logo.html.erb       |  9 +++
 .../public/api/v1/portals/_footer.html.erb    | 11 ++--
 .../public/api/v1/portals/_header.html.erb    |  6 +-
 .../public/api/v1/portals/_hero.html.erb      |  2 +-
 .../v1/portals/_uncategorized-block.html.erb  |  6 +-
 .../portals/articles/_article_header.html.erb | 34 +++++++----
 .../api/v1/portals/articles/index.html.erb    |  2 +-
 .../api/v1/portals/articles/show.html.erb     | 36 ++++--------
 .../categories/_category-hero.html.erb        |  2 +-
 .../api/v1/portals/categories/index.html.erb  |  2 +-
 .../api/v1/portals/categories/show.html.erb   |  2 +-
 app/views/public/api/v1/portals/show.html.erb |  2 +-
 config/locales/en.yml                         |  1 +
 spec/helpers/portal_helper_spec.rb            |  2 +-
 15 files changed, 115 insertions(+), 58 deletions(-)
 create mode 100644 app/views/icons/_chatwoot-logo.html.erb

diff --git a/app/javascript/portal/components/TableOfContents.vue b/app/javascript/portal/components/TableOfContents.vue
index bb5430a38..6dbdd35b9 100644
--- a/app/javascript/portal/components/TableOfContents.vue
+++ b/app/javascript/portal/components/TableOfContents.vue
@@ -1,20 +1,29 @@
 <template>
-  <div class="hidden lg:block flex-1 scroll-mt-24 pl-4">
-    <div v-if="rows.length > 0" class="sticky top-24 py-12 overflow-auto">
+  <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 dark:text-slate-50 font-semibold tracking-wide border-b mb-3 leading-7"
+          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,
+          }"
         >
           {{ tocHeader }}
         </h2>
-        <ol role="list" class="mt-4 space-y-3 text-base">
-          <li v-for="element in rows" :key="element.slug" class="leading-6">
+        <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="elementBorderStyles(element)"
+          >
             <p :class="getClassName(element)">
               <a
                 :href="`#${element.slug}`"
                 data-turbolinks="false"
-                class="text-base text-slate-800 dark:text-slate-50 cursor-pointer"
+                class="text-base cursor-pointer"
+                :class="elementTextStyles(element)"
               >
                 {{ element.title }}
               </a>
@@ -33,6 +42,11 @@ export default {
       default: () => [],
     },
   },
+  data() {
+    return {
+      currentSlug: window.location?.hash?.substring(1) || '',
+    };
+  },
   computed: {
     tocHeader() {
       return window.portalConfig.tocHeader;
@@ -44,6 +58,12 @@ export default {
       return this.rows.filter(el => el.tag === 'h2').length;
     },
   },
+  mounted() {
+    window.addEventListener('hashchange', this.onURLHashChange);
+  },
+  beforeDestroy() {
+    window.removeEventListener('hashchange', this.onURLHashChange);
+  },
   methods: {
     getClassName(el) {
       if (el.tag === 'h1') {
@@ -65,6 +85,30 @@ export default {
 
       return '';
     },
+    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';
+      }
+      return 'border-slate-100 dark:border-slate-800';
+    },
+    elementTextStyles(el) {
+      if (this.isElementActive(el)) {
+        return 'font-semibold text-slate-900 dark:text-slate-25';
+      }
+      return 'text-slate-700 dark:text-slate-100';
+    },
   },
 };
 </script>
diff --git a/app/views/icons/_chatwoot-logo.html.erb b/app/views/icons/_chatwoot-logo.html.erb
new file mode 100644
index 000000000..16059f9ae
--- /dev/null
+++ b/app/views/icons/_chatwoot-logo.html.erb
@@ -0,0 +1,9 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<rect width="16" height="16" fill="url(#pattern0)"/>
+<defs>
+<pattern id="pattern0" patternContentUnits="objectBoundingBox" width="1" height="1">
+<use xlink:href="#image0_161_38989" transform="scale(0.00175747)"/>
+</pattern>
+<image id="image0_161_38989" width="2525" height="569" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAACd0AAAI5CAYAAABewwEiAAABdWlDQ1BrQ0dDb2xvclNwYWNlRGlzcGxheVAzAAAokXWQvUvDUBTFT6tS0DqIDh0cMolD1NIKdnFoKxRFMFQFq1OafgltfCQpUnETVyn4H1jBWXCwiFRwcXAQRAcR3Zw6KbhoeN6XVNoi3sfl/Ticc7lcwBtQGSv2AijplpFMxKS11Lrke4OHnlOqZrKooiwK/v276/PR9d5PiFlNu3YQ2U9cl84ul3aeAlN//V3Vn8maGv3f1EGNGRbgkYmVbYsJ3iUeMWgp4qrgvMvHgtMunzuelWSc+JZY0gpqhrhJLKc79HwHl4plrbWD2N6f1VeXxRzqUcxhEyYYilBRgQQF4X/8044/ji1yV2BQLo8CLMpESRETssTz0KFhEjJxCEHqkLhz634PrfvJbW3vFZhtcM4v2tpCAzidoZPV29p4BBgaAG7qTDVUR+qh9uZywPsJMJgChu8os2HmwiF3e38M6Hvh/GMM8B0CdpXzryPO7RqFn4Er/QcXKWq8UwZBywAAADhlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAAqACAAQAAAABAAAJ3aADAAQAAAABAAACOQAAAACb86pVAABAAElEQVR4AezdCZxkVX0o/nNq6dkYmBkGEEFgEERAEBiVRdFhH5bZkEGMJmrcfZrEPPf/JybRLPpeNCZxiy9GX4xGGVlnBkZcIGo0yQPXaExMQDQaY1RElpnu6qrzP7dnhs1hprq7tlv1Lejp6qp7z/n9vufeulW3f31uDG4ECBB4gMDFW9KBMYQlKU7uG0NcUmmFfUNIS/Ii+bE09VhIYXH+eU6IoZ6fq+Wf6/l+LT+Wf87fU6yn/Fxup5byc8X3/Py8/Nz2WwpbUwiTMYbG1PcUGiGmRn5yMn81cnuTefn8XGzE4n4I4/nnO1JIP40p/iT//NNWZfv37Y/VfpLb+emVK+N/5ufcCBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECHRNINfCuBEgMAoCq29IjxxLk4eFEJfFkA5LKR2Wi+oOzUVz+6cUc2FdWJKL4OYPgcU9Oaef5jxycV7871yUd3uM8Tu5EPC2XDT4nYlY+86158YfDEGeUiBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIEOiDgKK7PqDrkkDHBXLV3OpPh/1rE41llVjJxXTpsFx4tizPFDd1P38/NBfUzel4vyVtMM++N56Nbs8u38mFebfl+98p7qdK67ZGtf6da88KPwoxz7HnRoAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQOAhAoruHgLiRwKDLnDuJ9KCvcPk43Oh2ONTqhyfi+uOz5djPS4X1S0c9NjLEl8uyrsrX87263kmwK+2QutrlRS/emel9rUbzot5Fj03AgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgACBURZQdDfKoy/3wRbIs9etvT4cXo/N4/MlUnORXZj6nmdgy5eHzSVhbj0VyNPe5avTplsz/ddSJXw1z4z31VCtfu2Ks8JtZsXr6VDojAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECDQVwGFO33l1zmB+wWeviUdG0Pz1PzICXkWu5Py9+Py1173L+HegArcneP6ei7C+1L+/pUUql+8YmX8xoDGKiwCBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAIFZCii6myWg1QnMRGD9J9M+KU2enC8Le2pshVNTDCfnnXHRTNqyzuAJ5FnxfhZT+Ic8I94X87h+YXxB7e+vfUq8a/AiFREBAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgMB0BRTdTVfM8gRmILDuk+no2mTztBBaxUx2ucguHp13PvvfDCxLuUoKrXyJ4H8KofLFPOpfSJU8G9658dulzEXQBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAIERF1D0M+IbgPQ7L7D682nhnHsmn5hbPjW0wmm5yOqUfH9J53vSYskFfprjL4rwvlh83zZR+/uNq+K9Jc9J+AQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgACBoRdQdDf0QyzBXgisvyGdEJqTK3NfK3MRVZ7RLtR70a8+hkqgkS83/IWc0ZbJWLv+qpXxq0OVnWQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAkMioOhuSAZSGr0VuHBTWjy/3jwrtFq50C4WhXYH9TYCvQ29QArfDyFtacXK9dsmq5/Z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BAgQIECAAAECBAgQIECAAAECsxFQdDcbvSFc9/zr0px5YfKNecN4dU6vPoQpSokAgeETaKQU3ro11n7v+gvi+PClJyMCBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIEBgkAQU3Q3SaPQ5lku2NE5PzfT+EOORfQ5F9wQIEJi+QErfjtX4/I+vrH9u+itbgwABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECDQnoCiu/achnqp9Z9M+zQbjf+VQnxh3iBsE0M92pIjMNwCKYQUU3xfdaz62g3nxDuHO1vZESBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAv0QUGDVD/UB6nPtdZNrY0jvzhvCgQMUllAIECAwK4FcfPefuZD4ZVdfULt6Vg1ZmQABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECDwEAFFdw8BGZUfL96SDgytiXfnie3WjkrO8iRAYBQF0tWhMvayK1fG/xzF7OVMgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIdF5A0V3nTQe+xXXXj18WWvE9MYZFAx+sAAkQIDBLgZTCz0IlvfSq8+d8dJZNWZ0AAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgEBTdjdBGsPbGtChubbwnD/plI5S2VAkQIDAlkC85+9HavPoLN5wR70ZCgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIEJipgKK7mcqVbL01mxqnVWPr8hDjQSULXbgECBDonEBKtzZT5Zevuaj+hc41qiUCBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIEBglAQU3Q35aC+/OdUP+dHE78QUX5vnNawOebrSI0CAwJ4FUmi2YvqD7+0/9uZbnhAbe17BEgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgACB+wUU3d1vMXT31m1KR8dK48M5sROHLjkJESBAYPYCX06t+rOuuij+8+yb0gIBAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECAwKgKK7oZxpFOKa69r/FolhLfk9OYOY4pyIkCAQIcEtrViePXVF4y9s0PtaYYAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAYcgFFd0M2wOs+kfYPjcZHYgxnDVlq0iFAgEAXBdLGVBt7wVXnxR91sRNNEyBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAkMgkCdDcxsWgTXXTa4Kk42vK7gblhGVBwECvROIU6+fU6+jvetUTwQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgEAJBcx0V8JBe2jI6y9PY835jT8KMbzioc/5mQABAgSmJ5BC+JPaPfXXbLg0TkxvTUsTIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECoyCg6K7ko7x+c3rEZGpck2e3e1LJUxE+AQIEBkYgpfCPtVhfs+HC+MOBCUogBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAwEAIuLzsQAzDzIJYd13jac0w8WUFdzPzsxYBAgQeTqB4XS1eX4vX2YdbxuMECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIDAaAoouivjuKcUL97ceH1spU+HEB9RxhTETIAAgcEXiI8oXmfXbW68LuTX3cGPV4QECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIBALwQUEfRCuYN9rN+SljSaE38dQzy/g81qigABAgR2I5BCur5eHXv2hpXxp7tZzFMECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIDACAgouivRIK/dOPGkENOGGOMhJQpbqAQIEBgKgZTSd0OK669eNfaPQ5GQJAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAIEZCbi87IzYer/S2k0Tr4gxfE7BXe/t9UiAAIFCoHj9LV6H126eeC4RAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAYHQFzHQ34GO/+pq0sFqd+Mtc7XHJgIcqPAIECIyMQArhg/XF9ZdtOC1uHZmkJUqAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAhMCSi6G+AN4ekb05GtOLE5F9wdOcBhCo0AAQIjKZAL775ebdWffsWq+O2RBJA0AQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAYUQFFdwM68OuubzwlNdNV+VKGSwc0RGERIEBg5AVSCj+O1bjuqvPrnx95DAAECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQGBEBCojkmep0ly3afLi0EyfVnBXqmETLAECIygw9TqdX6+nXrdHMH8pEyBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgACBURRQdDdgo75mU+O1KbY+HmIYG7DQhEOAAAECuxLIr9fF6/a6zY1X7+ppjxEgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQLDJeDysgMynusvT9XJBY2/zOH8yoCEJAwCBAgQmL7AX9Xuqf/qhktjc/qrWoMAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAog4CiuwEYpfWfTPs0xic+FmM8bwDCEQIBAgQIzEIgpfSJ+pyxZ2w4J945i2asSoAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECAyogKK7Pg/M0zelw5txYmMM8Zg+h6J7AgQIEOiQQArpm5OtsXM3rYrf71CTmiFAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQGREDRXR8HYu2mieUhhS0xhqV9DEPXBAgQINAVgfT9FOKaqy8au6UrzWuUAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQ6ItApS+96jSs2zR5cS64+6yCOxsDAQIEhlUgHlS8zq/Z1HDp8GEdYnkRIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAwEgKKLrrw7Cv3Tjx8hRaH88Fd/P70L0uCRAgQKBHAsXrfCWlzcXrfo+61A0BAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECDQZQFFd10Gfmjz6zaO/2EuwvizfF1fl/Z9KI6fCRAgMIwCMVSL1/21G8ffPIzpyYkAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECIyagMKvXo14SnHt5sa7cncv7VWX+iFAgACBgRN459UXjb1i4KISEAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQINC2gKK7tqlmsWAuuFuzufGhjP2sWbRiVQIECBAYDoF3Xn1h/ddCjGk40pEFAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAYLQFFd10e7xU3pto+9zQ+qOCuy9CaJ0CAQIkEUgp/dede9effdEacLFHYQiVAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgSygKK7Lm4G51+X5sxpTXwsM6/pYjeaJkCAAIESCqSQrrpzwdilCu9KOHhCJkCAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAIGRFlB016Xhnyq4azY257LGs7rUhWYJECBAoOQCReHdRGXsmddfEMdLnorwCRAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIDAyAhURibTHiZ67ifSgjkK7noorisCBAiUUyCGuG5Oq7Fx/Y1pr3JmIGoCBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIDB6Ama66/CYr70qLUq1xvUxhlM63LTmCBAgQGBIBVIIX5gM9Ys2XxTvGNIUpUWAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBIZGQNFdB4dy3SfS/q2Jxidzwd3xHWxWUwQIECAwGgJfaYT6mQrvRmOwZUmAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAEC5RVQdNehsSsK7tLExOdDjEd2qEnNECBAgMDoCXyl1ayvvHZN/K/RS13GBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECgHAKVcoQ52FGetyUtSY3GdQruBnucREeAAIESCJxQqTQ2rr4mLSxBrEIkQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIjKaDobpbDvv7GtNe8ycYNuZnls2zK6gQIECBAIIQYnlipNq5VeGdjIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECgymg6G4W47LixjR34p7G5tyEgrtZOFqVAAECBH5BYEVReFccZ37hGQ8QIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECfRVQdDdD/lwIUdvn7okrYghPnWETViNAgAABArsTWLHo7okNxfFmdwt5jgABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIEOitgKK7GXhvL7hr/HWM8YIZrG4VAgQIECDQnkCMFy26p/FXISXH6/bELEWAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBLoukCdqc5uWQC58WLOp8ZEM94xprWdhAgQIECAwQ4EUwnuvuaj+P0KMrRk2YTUCBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECgQwKK7qYJuXrjxPsy2gunuZrFCRAgQIDArASKwrtrV429dFaNWJkAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBCYtYDL1U2DcM21429RcDcNMIsSIECAQMcE8vHnJcVxqGMNaogAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBCYkYCiuzbZVm8c/518Wb/Xtrm4xQgQIECAQOcF8nFozcbG6zrfsBYJECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgACBdgVcXrYNqdWbJp4TU/hgG4tahAABAgQI9ELgV69ZNfaBXnSkDwIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQODBAoruHuzxCz+t2dQ4O6R0XX6i/gtPeoAAAQIECPRHoJFa8cJr19Q/2Z/u9UqAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBEZXQNHdbsZ+zebx41IrfD4j7b2bxTxFgAABAgR6LpBC+HkrpCdsWjX32z3vXIcECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQGCEBSojnPtuU1+1MS1NrXS9grvdMnmSAAECBPokUByfKiFuLo5XfQpBtwQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAYCQFFN3tYtjXX57mxTSxMYZ40C6e9hABAgQIEBgIgVx4d2QlTFxbHLcGIiBBECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgACBERBQdPfQQU6pMjFv4sMxhlMe+pSfCRAgQIDAAAqcOjF34kMhH78GMDYhESBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgACBoRPwC/qHDOnqTY2354fWPeRhPxIgQIAAgcEViOHpazZO/MHgBigyAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECAwPAL5ynRuOwVWb5x4SQzpPTt/9p0AAQIECJRLIP7qNavGPlCumEVLgAABAoMksPz0iw8Mc2o/GKSYZhpLaoU//tJnLv/Nma5vPQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIDAwwmY6W6HzJpNjbNzwd2fPhyUxwkQIECAwOALpD9ffU3jnMGPU4QECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQKC8Aoru8tit2Tx+XEqtK/LdenmHUuQECBAgQCAfxyqtj6++Zvx4FgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgEB3BEa+6O6ijemg1ErX5+vs7t0dYq0SIECAAIHeCRTHs1hJm1dtTEt716ueCBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIDA6AiMdNHd8ptTvRImro0hHjQ6Qy5TAgQIEBh+gXhwPr5tKY5zw5+rDAkQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAQG8Far3tbrB6e+QPxv8sxHhSGqywREOAAAECBDohsLw4zt0Swks60Zg2CBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAge0CIzvT3aprJ54bY3yxDYEAAQIECAyrQHGcK453w5qfvAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAQD8ERnKmu1UbJ04KKb0rmOKuH9ucPgkQIECgpwLpXRdumvj65ovG8qR3bgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgMBsBUZupruzP5n2Cal1VQxh/mzxrE+AAAECBAZdoDjeVVqtK9ZelRYNeqziI0CAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECZRAYraK7lCrz7534cAzxkDIMjhgJECBAgEAnBPJx79BmdeKv8iyvo3Xc7wSeNggQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAwEMERuqX76uvnXhjiOHChxj4kQABAgQIDL1AnvFu1dRxcOgzlSABAgQI9EIgpdSLbnbZRz/73mVAHiRAgAABAgQIECBAgAABAgQIECBAgAABAgRGTmBkiu5WX7OtKLb7rZEbYQkTIECAAIH7BX7roo2NFff/6B4BAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECAwXYGRKLpbtTHly8nGD+dZ7kYi3+luBJYnQIAAgRERyMfBmJofvWBzOnREMpYmAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBDouMDQF6Hlgrv5IU1clQvu9um4ngYJECBAgEDJBGKIB9SaE1csvznVSxa6cAkQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAwEAIDH3RXWxNvDuGcNJAaAuCAAECBAgMhsDyR/5g/M8GIxRRECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgACBcgkMddHd6mvGL8sz3D2nXEMiWgIECBAg0H2BPOPdi6eOk93vSg8ECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQGCoBIa26O7CTenwFMO7h2q0JEOAAAECBDooUBwnz9uSDuxgk5oiQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQJDLzCcRXcpVSqtiQ/ny8ouHvoRlCABAgQIEJihQHGcnDM+/oGQj5szbMJqBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIEBg5ASG8pfsqzZNvCYXEpwycqMpYQIECBAgMF2BGM8rjpvTXc3yBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIEBgVAWGruhuzdXjx8VW+N1RHVB5EyBAgACB6QoUx83V14wfP931LE+AAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBEZRoDZMSa+/PI1tixMfDjGMDVNeciFAgAABAl0V2H7c/FA+jj5xw6Vxoqt9aZwAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECJRcYKhmuts6p/G/csHdcSUfE+ETIECAAIF+CBy/be7Em/rRsT4JECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgECZBIam6G7Vxsa5MaZfLxO+WAkQIECAwEAJpPDqCzc1zhuomARDgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQGTGAoiu4u3JQWh1bzgwNmKxwCBAgQIFAugRgqlWbzA1PH1XJFLloCBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQINAzgVrPeupiR3Fy4j0hxgND6mInmiZAgAABAiMhEA+cOq6GcNlIpCtJAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECAwTYHSz3R34TXjl8UYnjHNvC1OgAABAgQIPIxAcVwtjq8P87SHCRAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIDASAuUuuguX/7u8BjCu0d6BCVPgAABAgS6IFAcX8+7Ih3YhaY1SYAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIESi1Q6qK7SnPi7bkoYHGpR0DwBAgQIEBgAAWK4+tYLV++3Y0AAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBB4kEBpi+5WbRxfmzNZ86Bs/ECAAAECBAh0UmDNjuNtJ9vUFgECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQKLVAKYvuVlye9kqt9M5SywueAAECBAiUQCA1058Vx90ShCpEAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECDQE4FSFt0tHBv/oxjiQT0R0gkBAgQIEBhhgRjjwXvNafzeCBNInQABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIPEigdEV3F1zTeGqI8cUPysIPBAgQIECAQNcEYkovv+iqxoqudaBhAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBQIoFSFd2tvzyNVULrL0rkK1QCBAgQIFB+gRiqsdJ67/nXpTnlT0YGBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIEBgdgKlKrrbOmfiDTGEI2eXsrUJECBAgACBGQgcVW1MvH4G61mFAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgMlUBpiu4u2rjtyJiCX/YP1eYnGQIECBAomcDrVl+z7aiSxSxcAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECDQUYFaR1vrYmOpFf4ixDDWxS40TYAAAQIECOxeYE4rhffmRc7Y/WKeJUCAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECwytQipnuLrh24rkxxKcO7zDIjAABAgQIlEQgxhXFcbkk0QqTAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAh0XGDgi+4u2pgOqrTSH3U8cw0SIECAAAECMxIojstnXZn2ndHKViJAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAiUXGPiiu9Qc/618WVm/2C/5hiZ8AgQIEBgigXxcnlsZ//0hykgq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bC3sPdadtrVKoAsCc9I9207tQruaJECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECbQu0XXQXWq2VbbdqQQK7EHjB8fUwvx538YyHCBDol0CxTz7/OJd87pe/fqcvkCrR+5Hps1mDAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBDoo0HbRXQx+yd1B95Fr6uglMZz5KJexHLmBl3ApBM49tBqOXKQgthSDJcgs4I8AbAYECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAg0F+BtoruVl619bAUw1Epx+qLwXS3gaKU55XLzaTV311d7wR2L/AbeR+d7r5teceD/mwD8fizL996yO63aM8SIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAIHuCbRVdNdshRXdC0HLwy6w9ohaeNTCtja1YaeQH4GBFTh8n0pY/WizUQ7sAAnsPoFcyB1jNZx53wPuECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgACBHgu0VQmVf8G9ssdx6W5IBBbPCeHZRyvkGZLhlMaQCzz3mFrYe2zIk5TeUAh4XzIUwygJAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIlFagtsfIU76w7Me3rQzFNULdCExT4EXH18P8uo1nmmwWJ9AXgWJffcFx9fD2mxt96V+nBNoXSOeF4v1JjMUVbt0IECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgEBPBfY4093ZV249OcawT0+j0tlQCByyMIYzHmWWu6EYTEmMjMA5h1TCQXsplB2ZAS9pornabtE5GxqPL2n4wiZAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgACBkgvsseiukuKKkuco/D4JPCtfqtKNAIFyCcRcZf1LR9t3yzVqoxltrDRXjmbmsiZAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgACBfgvssbIipnRKvnxbv+PUf8kE9p8fwukH7bGms2RZCZfAaAisOLgS3v/1EH66bTTylWU5Baben5QzdFETKI3ACSsuOyxWWofE2No7xEp+d9daEFpxQYhpfgpxQSV/hRgW5ITmp1R8Twvyx4a5+ed78vP3hBTuzj/fkx+/J7XC3aGS8v3K9vsp36+FO1OjevtX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7Hs437eu5+tCc7Av389uXQvyD88X5B+e56K85qPv833tmGrN1rUgF9E9ck1o3cfOW/bkH4U/HFM9F+Dma0R/faqWrxHbvnbNOGICBAgcLFDqortWIudt3HNR/mXDpw9OymsCBAgQIEBgbgJ5No83bl4+/Jm5teJsAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBQPYFa2VNqFQTkKTw/W/Y8xE+AAAECBIoi0PpeVXBXlNEQBwECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgUTaCvaAEdTzxTAyNvGdw3cU6M8fTjOd85BAgQIECAwKMCKaR7Wt+rPAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAIHDC5R+prtWWrdfHHeFGC5OKTQPn6atBAgQIECAwBMJtL5HYwpvfOR79YkOtp8AAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECPSoQCWK7lpjt3n56HdSDH/Ro+MobQIECBAgMGeB1vfod1aMbp5zQxogQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIVFqhM0V1rjCYXDP9Jfrq9wuMlNQIECBAg0BGBPMvd5se+RzvSvkYJECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgEBVBGJVEjmQx5KND51ZD42bYogLDmzzTIAAAQIECBxZIIU0GeoDZ9586Yn3HPkoewgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAIGWQKVmumsltG35UJ7prvbu1msPAgQIECBA4FgEau9WcHcsTo4hQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIhVG6muwODeu7G8evybHevOPDeMwECBAgQIHAYgZS+tnnF6G8cZo9NBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAwGEEKjfT3YEcG319l4WQdh1475kAAQIECBA4VCCF8EAz1i85dKt3BAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAwNEEKlt0t+2SBfenUFtztOTtI0CAAAECvSyQUu2SLcuHHuhlA7kTIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAIHZClS26K4FcfPy4WvyCrpXzBbF8QQIECBAoPoC8YotK4a+Vv08ZUiAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBNorUOmiuxbVzP6h389PN7ReexAgQIAAAQJ58fUQvvnY9yMOAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAYJYCcZbHl/Lw89Y99Cuh3rwtxPArpUxA0AQIECBAoH0CP9tbj2fuuHT4Z+1rUksECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQKB3BCo/011rKDevHvrnRowXpRSavTO0MiVAgAABAocK5O/B6WaMFyq4O9TFOwIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgMBuBnii6a4FsXT58Q4rhj2aD41gCBAgQIFAlgRjTe7ZcNvzNKuUkFwIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgMN8CPbG87MGo526c+F856dccvM1rAgQIECBQdYEUwpduXj7yW1XPU34ECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQKDTAj0z090ByP1h+NKQwl0H3nsmQIAAAQI9IPAPjf3DF/dAnlIkQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIdF+i5ortbl8fdsS++LqU01XFdHRAgQIAAgS4LtL7vZkL4nW1r4niXQ9E9AQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBCohEDPLS97YNTOWT9xWS2GjQfeeyZAgAABAlUUSLF28c3Lh/6uirnJiQABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIdEOg52a6O4C8ZeXIx1MIaw+890yAAAECBKonEK9QcFe9UZURAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECHRXoK+73Xe398b08Nvq/RNLQ4hLuhuJ3gkQIECAQHsFUgrfbM4M/X57W9UaAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAg0LPLyx4Y+vPWTZ2WajM3hRhOO7DNMwECBAgQKLnAffvqfefd9qbB+0qeh/AJECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgEDhBHp2edkDI7F59eC9M321V4eQJg5s80yAAAECBMorkCYasfYqBXflHUGREyBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgECxBXq+6K41PLe8aWhHM9Zfn5fimy72cImOAAECBAgcWaD1PZZC/XXblg/dfuSj7CFAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgTmIqDo7jG9rcuHvhpDfPtcMJ1LgAABAgS6KRBjWL1lxdDXuhmDvgkQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAQNUFFN0dNMI3rxz+WArxioM2eUmAAAECBEohkEL44M0rRj5RimAFSYAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIESiyg6O5xg7flJ0PvzMvz/c/HbfaWAAECBAgUViAX3F275SfDf1jYAAVGgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQqJBArlEvbUnnBpnTizJ491+dl+l7QtkY1RIAAAQIEOiPwnfrQ8EtvWhb3dqZ5rRIgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIHC5jp7mCNx163CheaM+G389sfHGa3TQQIECBAoBgCKf2wMR1eo+CuGMMhCgIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBDoDQEz3R1lnM/bOP6cvNTs1hDiyFEOs4sAAQIECMy7QP5+erCR0gtuWTX6w3nvXIcECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQKCHBRTdPcHgL924+zdiM34pLzXb/wSH2k2AAAECBOZJIO2NMb508/LR78xTh7ohQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIEHhOwvOwTfBS2Lh/7aohxzRMcZjcBAgQIEJg/gVS7WMHd/HHriQABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIHCyg6O5gjSO83rJiZGNK6X1H2G0zAQIECBCYN4HW99HNK0eunbcOdUSAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgcIqDo7hCOI7/ZsnLsAymkDx75CHsIECBAgECHBVL409b3UYd70TwBAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBwFIF4lH12HUbgnA27PxBD/IPD7LKJAAECBAh0TKBV+L1lxdh7O9aBhgkQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAIFjElB0d0xMhx60dP34lTGG63NA4AAAHcJJREFUNx+61TsCBAgQINAhgZTW5RnuLu9Q65olQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIEZiHQN4tjHfqYwNZ/Gnnr0qdPjOaKxTdCIUCAAAECnRRIKXx2672jCr07iaxtAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECAwCwEz3c0C6+BDX/L11Dd598S1edtvHbzdawIECBAg0C6BXHD3v4eePfLaG349zrSrTe0QIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECcxNQdDcHv2duTE96cmP8yzHGl8yhGacSIECAAIF/IdAquHuwPvK6Hy2PD/+LnTYQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECXRNQdDdH+ueuT8MjYeL63Mw5c2zK6QQIECBA4FGBlL758/roKxXc+UAQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAIHiCdSKF1K5Ivreyrgn9sVX5ai3lCty0RIgQIBAIQVS2ja1b/TVCu4KOTqCIkCAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECwUx3bfoQnPuJiVPSdPpGFl3YpiY1Q4AAAQI9JpCXlL1rbwgvvnPV6M4eS126BAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECgNAKK7to4VGd9cs+/Gtjf+GqM8aw2NqspAgQIEOgBgZTSjpn66Pm3Lo+7eyBdKRIgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAgdIKWF62jUO349Lhn7UKJkIK32ljs5oiQIAAgaoL5O8NBXdVH2T5ESBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgEBVBBTdtXkkWzMU7RsYeXlI6fo2N605AgQIEKiiQP6+aH1vmOGuioMrJwIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBCoooCiuw6M6o5L4+SuqdFXpxS+2IHmNUmAAAECFRFofU+0vi9a3xsVSUkaBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECg8gKx8hl2McGXfD31PfSPE5+LMby2i2HomgABAgSKKfCpBaePXHbDr8eZYoYnKgIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQOBwAoruDqfSxm2twrvJuyc+npu8uI3NaooAAQIEyi3wqS0rRi4JMaZypyF6AgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECDQewKK7uZjzFOK56yf+EiI4S3z0Z0+CBAgQKDAAilcuWXlyFsV3BV4jIRGgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgSOIlA7yj672iWQZzLasmr0d0OIH2hXk9ohQIAAgTIKxA888n1ghrsyDp6YCRAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIDAIwJmupvnD8KS9bvfG0P883nuVncECBAg0GWBFNL7tq0cU3zd5XHQPQECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQmKuAoru5Ch7H+UuvnlgRYroqn1o/jtOdQoAAAQLlEmjkcFdsXTn6yXKFLVoCBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIEDgcAKK7g6nMg/blq4ff1VK6dMxxtF56E4XBAgQINAFgXydH0+1+IZbVoxe14XudUmAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAh0QEDRXQdQj7XJRVftWdhfa/yfEONpx3qO4wgQIECgHAJ5Odn7mrH+iu0rhr9bjohFSYAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECByLgKK7Y1Hq4DFnrZs6bSBOX5u7WNrBbjRNgAABAvMokGe42zYzMPDa2940eN88dqsrAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAYB4EavPQhy6OIrBj9eC9qTFyfj7ky0c5zC4CBAgQKIlASuG60Bz99wruSjJgwiRAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABArMUMNPdLME6dvimVF86MX5VCHFFx/rQMAECBAh0WuDDW0dG3hGWxUanO9I+AQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAg0B0BRXfdcT9ir0vWTbwrxPQXeWCMzRGV7CBAgECxBFIIKV+037511eiHixWZaAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAIF2CyjsardoG9pbcvXuC3P5xt/EGE5oQ3OaIECAAIEOCqSUplKoX3LL6uHPd7AbTRMgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIFEVB0V5CBeHwY52zYc36z2bwmD9BTHr/PewIECBAohkBK4cEU0m/esnpsWzEiEgUBAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECDQaQFFd50WnkP7S9bufnaoxevyjHfPnkMzTiVAgACBDgjkJWW/W6ul12xZMXZ3B5rXJAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIFBQAUV3BR2YA2E9d30aHmqOb4gxvv7ANs8ECBAg0F2BvKTs5wZGRy+9aVnc291I9E6AAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAjMt4Ciu/kWP87+ll498Z4Q0p/l0+vH2YTTCBAgQGCOAnl2u/15Sdl33rJ69CNzbMrpBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAQEkFFN2VaODO2bDn/NRsfiaH/NQShS1UAgQIVEXggZzIa7euGr25KgnJgwABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIEJi9QG32pzijWwJbVgx/I9bri0NK3+hWDPolQIBATwrk627r+qvgridHX9IECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQOAQATPdHcJRkjebUv354xMfijG8oyQRC5MAAQKlFchLyl5xy8jIu8Ky2ChtEgInQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIE2iag6K5tlPPf0OJ1e15fi40NIcTh+e9djwQIEKi6QNrTTPUV21cPf67qmcqPAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQOHYBRXfHblXII8/eOP6cWiN8KQ/kcwoZoKAIECBQQoE8u90PmvXw6luXj/6ghOELmQABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIEOigQK2DbWt6HgRaBSGTcWRJSMlMTPPgrQsCBHpAIF9PW9dVBXc9MNZSJECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECxyFgprvjQCvkKSnFJev3rEyp+ZcxxqFCxigoAgQIFFggpfRQqNXeecvKkXUFDlNoBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAQJcFFN11eQDa3f2ZG3af3t+IfxNjeGG729YeAQIEqiqQUrhxup4uuX3F2N1VzVFeBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAQHsEFN21x7FYrWxK9eePj/9BDPH9IYb+YgUnGgIECBRIIIXpFNKf3jI6+oGwLDYKFJlQCBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAgYIKKLor6MC0I6xFV08urqeZT+VBfl472tMGAQIEqiSQQrirEfsuvm3Vgu1VyksuBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAQGcFap1tXuvdFGgVkuzsG3l+Xjbxilxckv/nQYAAAQKPXQ//qnV9VHDn80CAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAjMVsBMd7MVK+nxi69+6GWxOfOJGOOvljQFYRMgQGDOAiml+1Kt703bVw1dP+fGNECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAj0pICiux4a9rM3prHa9MSVMYaLeihtqRIgQOARgTzr52ea/SNvuXV53I2EAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIHC8AorujleuxOctvmr8ohjTlTHEsRKnIXQCBAgck0AKaXdK8S3bLx/9zDGd4CACBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAwFEEFN0dBafKu5asnTw1xOmPhhgvqHKeciNAoMcFUvpCSP2/u23Ngvt7XEL6BAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAQJsEFN21CbKszSy5etcFecnF/5FnvXtGWXMQNwECBB4vkGe3+3FeSvsd21ad9IXH7/OeAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIDAXAUV3c9GryLlnfTIt6Ht4938NIb4tF6nUKpKWNAgQ6EGBXETczMtnf3j6hLE/3HFpnOxBAikTIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECHRZQdNdh4DI1v3j97qWxkTbkJWfPLFPcYiVAgMAjAindnupxxfaVY1uJECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQ6JWBWs07JlrDdVqFKTGNLUop/nGeL2lfCFIRMgEAPCuSlZCfz37tb1y8Fdz34AZAyAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBCYZwEz3c0zeFm6O3vj+HNq0+nDIYZXlCVmcRIg0IMCKXwl1U64fPuqE3/cg9lLmQABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIEOiCgKK7LqCXqcvFV41fEkP677n47sllilusBAhUXCCFB5u12rtvXTXyiYpnKj0CBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECgYAKK7go2IEUMZ+HV4ycPNNOf5dhWxxgsSVzEQRITgR4RyEtfN/MX1/p9tfjeO1eN7uyRtKVJgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIFEhA0V2BBqPooSxe/9Ci0Ji+IsZ4ftFjFR8BAtUTSCl9I9T7/+P2lUO3VS87GREgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQJlEVB0V5aRKlCci67avawe04dCiE8vUFhCIUCgogIppHtDqL1n++rRT1c0RWkRIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECJRJQdFeiwSpSqEvWpsFmnHhnDM33hRgHixSbWAgQqIhASlMp1D5YSyMf2rYmTlUkK2kQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECJRdQdFfyAex2+GetmzqtHvb/Zf4gvb7bseifAIFqCKQQUgzpUzPhhPftWD2YZ7nzIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgUR0DRXXHGotSRLL5qz/khzVwRY1xU6kQET4BAVwVSSrc1Qm3NjjWjm7saiM4JECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAkcQUHR3BBibj0Pg/am2+NTxNSGG/5I/WCcfRwtOIUCgRwXy7Hb/nK8df7T9vtGN4f2x2aMM0iZAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgRKIKDorgSDVLYQF149fvIJjfDHeYXI38tFNH1li1+8BAjMo0AKMymkj071jf2n762Me+axZ10RIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBI5LQNHdcbE56VgElqydPDXX07wnhGae/S6eeCznOIYAgR4RSGlvCLW1uS73v21bs+D+HslamgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgEAFBBTdVWAQi56C4ruij5D4CMyjgGK7ecTWFQECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQINAJAUV3nVDV5mEFFN8dlsVGAr0hoNiuN8ZZlgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAoAcEFN31wCAXLcXn5WVnnxSn/ySFsCJ/AAeKFp94CBBoo0Autkt5Gdl9eRnZuywj20ZYTREgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQLdElB01y15/YaFa/f+2kDc9z7Fdz4MBCoooNiugoMqJQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQKAloOjO56DrAorvuj4EAiDQNoFcRLs/f7FseDj1/2cz27WNVUMECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIBAgQQU3RVoMHo9lIUbH3pq//6Zt+VS0NX5g/mUXveQP4EyCeRiu5+HFNZND/T99Z3Lhx4oU+xiJUCAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAjMRkDR3Wy0HDsvAv/6r9IJCwYmLoy19Lb8AT13XjrVCQECxyWQi+1uTiF+ePLhkU0/fHvcd1yNOIkAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgUCIBRXclGqxeDHXxx3YvDbXwrjyD1uvyDHj9vWggZwJFE0gp7IsxfTY0419vf/PY1qLFJx4CBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAQCcFFN11UlfbbRNoLT07MN24PKTmm0OMp7atYQ0RIHDsAindn2q1tfVm/Mi2NSMPHvuJjiRAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIVEdA0V11xrInMlmyNvXPpIk3WHq2J4ZbkoURSN9q5iVk+9LotdvWxOnChCUQAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgEAXBBTddQFdl+0RaC09m2L6vRDiRTGGE9rTqlYIEGgJHFhCdib1f+j2NUO3UyFAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIEHhUQNGdT0LpBU7blE58yvjEBaGZVqYYXpo/1D7XpR9VCXRDIOVau5jC/00hbnjwpJFr710W93YjDn0SIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBIosoDipyKMjtlkLLL567zNS2rc6F+BdFmP81Vk34AQCPSiQUrov16p+ItZPuGr7qhN/3IMEUiZAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIHLOAortjpnJgqQQ2pfqiXeMvy8vOrsxxX5A/6AOlil+wBDoskGe12x9S+GIzxQ07Th75algWGx3uUvMECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAgUoIKLqrxDBK4mgCC68eP3lgpnlZXnp2RQxx4dGOtY9A1QVSCttTjBtm6uHv7lw1urPq+cqPAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQINBuAUV37RbVXqEFFl25a3EtxjfkArxl+cP/rEIHKzgCbRLIs9rdE1PY1Ihh0441Y7e0qVnNECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgR6UkDRXU8Ou6RbAouuHD+3FkMuwGvmArx4GhUCVRJIId0bQu2aZgif3bFmdHOVcpMLAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQKCbAoruuqmv72IIpBTP/tieF6Za46KQ4utjDE8tRmCiIDA7gbx07AMhps+FUP/sbZcPfzvEPL+dBwECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAQFsFFN21lVNjpRd4f6otOnX3+SHEN+R/OF6X83ly6XOSQNUFHsyVdZ9PtTyj3X2jN4T3xzy5nQcBAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgECnBBTddUpWu+UX2JTqi3aNvywn8oaQwu/kGfBOKn9SMqiIwP8vtBsd/UZYFhsVyUsaBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAIHCCyi6K/wQCbAQAnkJ2sVrJ89KceaVeQnPV4YYXpz/4RkoRGyCqLxAnslufy78/Puc6FdiLV136+qx2ywdW/lhlyABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBQUAFFdwUdGGEVW2DJ2jTYSBMvSbH5ypDiK/MseM8tdsSiK5tALu78XojpuhhqX6mHka9vWxOnypaDeAkQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECVRRQdFfFUZXTvAuctW7qtNDc/5u1R2fBe3kOYGzeg9Bh2QV25xntro/NcF2zb+DLO1YP3lv2hMRPgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIEKiigKK7Ko6qnLorsCnVF++cPCOFxotSaL4whviivBztM7sblN4LJ5DCj1JI384z2d0Yas0bbx0buz0si43CxSkgAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgACBQwQU3R3C4Q2Bzggs/MhDT63XZ14cY3xhSOlFeTnaxbmn/s70ptUCCkzn5WK35/G/sZnStxuNvr+/861DDxQwTiERIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAg8gYCiuycAsptAJwSeuTE9aXjfQ+fWYuPRIrwQX5BnwzulE31pswsCKfwiz2J3UwrxxhTq395zwtDNP1oeH+5CJLokQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBBos4CiuzaDao7A8QqcsW7P82qNxgtjTItDCmfn2fDOCCGOHm97zpsvgTSeZ7G7IxdN3ppS3N6s12+8Y/XwXfPVu34IECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgTmV0DR3fx6643ArAQWr598WnNm+oy8JO0ZMdTODCGdEWL6t7kYb3BWDTm4DQJpKqT43Wx/R4rNXGRXu6NW77t9+8oFP21D45ogQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAoiYCiu5IMlDAJ/FIgT6d25pXjz4p9tTNqqXlmCnlGvFZRXozPzcf0//I4L45XYDql9L0Q4x35AnlHSLU7ZnKR3R2Xj96dt2VuDwIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAgV4WUHTXy6Mv90oJLNyUBvp3Tjwj1cLpuWjs9FrKzyGcnpepPT0X5Z2eC8ZGKpXwXJJJaSJ73J2Xhb07XwTvbsb8nN/nWezu6UvD92xbE6fn0rxzCRAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIEqiug6K66YyszAocInPnR3SflefBOrzdbRXm5EC8X4+V5256Vn5+Si/ROyc8nxxAXHHJSCd+kkCZDCjtzEd0v8vPPUwz35DTuCc1wdyMX16W+ePedq0Z3ljA1IRMgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBRAQNFdAQZBCASKJPC8tZOnDsTmyc1mOKUeZ07ORWsnxxRPybPm5edwSut9LmY7KYR0Qp4tri/Hnpe0Tf25YO/R1yn05cK3vC3250K+vC3vy9vysSf+Ms+U9uZ2ZvIx07mt/Jym8/nT+fj8Okzn8w/Zl4/bl/ftyu3szOf9Il+4djbz61pMv2ikvp21WvjF/lTbedeaBff/sg8vCBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECHRA4P8BqCI0bxdnbeIAAAAASUVORK5CYII="/>
+</defs>
+</svg>
diff --git a/app/views/public/api/v1/portals/_footer.html.erb b/app/views/public/api/v1/portals/_footer.html.erb
index 63dccfb09..162f0d9b6 100644
--- a/app/views/public/api/v1/portals/_footer.html.erb
+++ b/app/views/public/api/v1/portals/_footer.html.erb
@@ -1,8 +1,11 @@
 
 <footer class="pt-16 pb-8 flex flex-col items-center justify-center">
-  <div class="mx-auto max-w-2xl">
-    <p class="text-slate-700 dark:text-slate-100 py-2 text-center">
-      <%= I18n.t('public_portal.footer.made_with') %> <a class="hover:underline" href="https://www.chatwoot.com" target="_blank" rel="noopener noreferrer nofoll/ow">Chatwoot</a> 💙
-    </p>
+  <div class="mx-auto max-w-2xl text-center py-2">
+    <div class="flex items-center gap-2">
+      <%= render partial: 'icons/chatwoot-logo' %>
+      <p class="text-slate-700 dark:text-slate-300 text-sm font-medium text-center">
+        <%= I18n.t('public_portal.footer.made_with') %> <a class="hover:underline" href="https://www.chatwoot.com" target="_blank" rel="noopener noreferrer nofoll/ow">Chatwoot</a>
+      </p>
+    </div>
   </div>
 </footer>
diff --git a/app/views/public/api/v1/portals/_header.html.erb b/app/views/public/api/v1/portals/_header.html.erb
index 6387802db..d3a9cde91 100644
--- a/app/views/public/api/v1/portals/_header.html.erb
+++ b/app/views/public/api/v1/portals/_header.html.erb
@@ -1,6 +1,6 @@
 <header class="bg-white dark:bg-slate-900 w-full shadow-sm sticky top-0 z-50">
-  <nav class=" flex mx-auto max-w-5xl px-8" aria-label="Top">
-    <div class="w-full py-5 flex items-center">
+  <nav class=" flex mx-auto max-w-5xl px-4 md:px-8" aria-label="Top">
+    <div class="w-full py-5 flex items-center overflow-hidden">
       <a href="/hc/<%= @portal.slug %>/<%= @portal.config['default_locale'] || params[:locale] %>/<%= @theme.present? && @theme != 'system' ? '?theme='+@theme : ''  %>" class="h-10 text-lg flex items-center text-slate-900 dark:text-white font-semibold">
         <% if @portal.logo.present? %>
           <img src="<%= url_for(@portal.logo) %>" class="h-10 w-auto mr-2" />
@@ -10,7 +10,7 @@
     </div>
 
     <%# Go to homepage link section %>
-    <div class="flex items-center justify-between gap-5">
+    <div class="flex items-center justify-between gap-2 sm:gap-5">
       <% if @portal.homepage_link %>
         <div class="ml-8 border-l-1 border-slate-50 dark:border-slate-800 hidden md:block cursor-pointer px-1 py-2">
           <div class="flex-grow flex-shrink-0">
diff --git a/app/views/public/api/v1/portals/_hero.html.erb b/app/views/public/api/v1/portals/_hero.html.erb
index a96edcf5b..43f09eaa5 100644
--- a/app/views/public/api/v1/portals/_hero.html.erb
+++ b/app/views/public/api/v1/portals/_hero.html.erb
@@ -1,7 +1,7 @@
 <% if !@is_plain_layout_enabled %>
 <section id="portal-bg" class="w-full bg-woot-50 dark:bg-woot-900 shadow-inner" style="<%= generate_portal_bg(@portal.color, @theme)  %>">
   <div id="portal-bg-gradient" class="pt-8 pb-8 md:pt-14 md:pb-6" style="<%= generate_gradient_to_bottom(@theme) %>">
-    <div class="mx-auto max-w-5xl px-8 flex flex-col items-center sm:items-start">
+    <div class="mx-auto max-w-5xl px-4 md:px-8 flex flex-col items-center sm:items-start">
       <h1 class="text-2xl md:text-4xl text-slate-900 dark:text-white font-semibold leading-normal">
         <%= portal.header_text %>
       </h1>
diff --git a/app/views/public/api/v1/portals/_uncategorized-block.html.erb b/app/views/public/api/v1/portals/_uncategorized-block.html.erb
index 0fb3ab591..df3605122 100644
--- a/app/views/public/api/v1/portals/_uncategorized-block.html.erb
+++ b/app/views/public/api/v1/portals/_uncategorized-block.html.erb
@@ -1,7 +1,7 @@
-<section class="lg:container w-full py-6 px-4 flex flex-col h-full">
+<section class="lg:container w-full flex flex-col h-full">
   <div class="flex justify-between items-center w-full">
     <h3 class="text-xl text-slate-900 dark:text-white font-semibold leading-relaxed hover:underline">
-      <%= category %>
+      <%= I18n.t('public_portal.header.uncategorized') %>
     </h3>
     <span class="text-slate-500">
       <%= render 'public/api/v1/portals/article_count', article_count: portal.articles.published.where(category_id: nil).size %>
@@ -31,5 +31,5 @@
       </div>
     </a>
     <% end %>
-  </div>
+   </div>
 </section>
diff --git a/app/views/public/api/v1/portals/articles/_article_header.html.erb b/app/views/public/api/v1/portals/articles/_article_header.html.erb
index 030ba27b9..ffedb117a 100644
--- a/app/views/public/api/v1/portals/articles/_article_header.html.erb
+++ b/app/views/public/api/v1/portals/articles/_article_header.html.erb
@@ -1,17 +1,31 @@
-<h1 class="text-3xl font-semibold md:tracking-normal leading-snug md:text-4xl text-slate-900 dark:text-white">
+<div class="flex items-center flex-row mb-6 gap-px">
+  <a
+    class="text-slate-500 dark:text-slate-200 text-sm gap-1 hover:cursor-pointer <%= @is_plain_layout_enabled && 'hover:underline' %> leading-8 font-semibold"
+    href="/hc/<%= @portal.slug %>/<%= @article.category&.locale %><%= @theme.present? && @theme != 'system' ? '?theme='+@theme : ''  %>"
+  >
+    <%= I18n.t('public_portal.common.home') %>
+  </a>
+  <span class="w-4 h-4 [&>svg]:w-3 [&>svg]:h-3 flex items-center justify-center text-xs text-slate-500 dark:text-slate-300"><%= render partial: 'icons/chevron-right' %></span>
+  <% if @article.category %>
+    <a class="text-slate-500 dark:text-slate-200 text-sm gap-1 whitespace-nowrap hover:cursor-pointer <%= @is_plain_layout_enabled && 'hover:underline' %> leading-8 font-semibold" href="/hc/<%= @portal.slug %>/<%= @article.category.locale %>/categories/<%= @article.category.slug %><%= @theme.present? && @theme != 'system' ? '?theme='+@theme : ''  %>">
+    <%= @article.category&.name %>
+    </a>
+    <span class="w-4 h-4 [&>svg]:w-3 [&>svg]:h-3 flex items-center justify-center text-xs text-slate-500 dark:text-slate-300"><%= render partial: 'icons/chevron-right' %></span>
+    <span class="text-sm text-slate-800 dark:text-slate-100 font-semibold overflow-hidden text-ellipsis min-w-0 whitespace-nowrap"><%= @article.title %></span>
+  <% else %>
+    <span class="text-slate-700 dark:text-slate-100 leading-8 text-sm font-semibold" ><%= I18n.t('public_portal.header.uncategorized') %></span>
+  <% end %>
+</div>
+<h1 class="text-3xl font-semibold leading-normal md:tracking-normal md:text-4xl text-slate-900 dark:text-white">
   <%= article.title %>
 </h1>
-<div class="flex flex-col items-start justify-between w-full md:flex-row md:items-center pt-2">
-  <div class="flex items-center space-x-2">
+<div class="flex flex-col items-start justify-between w-full md:flex-row md:items-center pt-6">
+  <div class="flex items-start space-x-1">
     <% if article.author&.avatar_url&.present? %>
-      <div class="pr-1">
-        <img src="<%= article.author.avatar_url %>" alt="<%= article.author.display_name %>" class="w-12 h-12 border rounded-full">
+      <div class="pr-px mt-0.5 min-w-[20px] min-h-[20px]">
+        <img src="<%= article.author.avatar_url %>" alt="<%= article.author.display_name %>" class="w-5 h-5 border rounded-full">
       </div>
     <% end %>
-    <div>
-      <h5 class="text-base font-medium text-slate-900 dark:text-white mb-2"><%= article.author.available_name %></h5>
-      <p class="text-sm font-normal text-slate-700 dark:text-slate-100">
-      <%= I18n.t('public_portal.common.last_updated_on', last_updated_on: article.updated_at.strftime("%b %d, %Y")) %>
-    </div>
+    <span class="flex items-center text-base text-slate-600 dark:text-slate-400 font-medium">By <%= article.author.available_name %> • <%= I18n.t('public_portal.common.last_updated_on', last_updated_on: article.updated_at.strftime("%b %d, %Y")) %></span>
   </div>
 </div>
diff --git a/app/views/public/api/v1/portals/articles/index.html.erb b/app/views/public/api/v1/portals/articles/index.html.erb
index ca91711f2..1cc0511ae 100644
--- a/app/views/public/api/v1/portals/articles/index.html.erb
+++ b/app/views/public/api/v1/portals/articles/index.html.erb
@@ -4,7 +4,7 @@
 		<div>
 			<a
 				class="text-slate-800 hover:underline leading-8"
-        href="/hc/<%= @portal.slug %>/<%= @category.present? ? @category.slug : '' %><%= @theme.present? ? '?theme='+@theme : ''  %>"
+        href="/hc/<%= @portal.slug %>/<%= @category.present? ? @category.slug : '' %><%= @theme.present? && @theme != 'system' ? '?theme='+@theme : ''  %>"
 			>
 				<%= @portal.name %> <%= I18n.t('public_portal.common.home') %>
 			</a>
diff --git a/app/views/public/api/v1/portals/articles/show.html.erb b/app/views/public/api/v1/portals/articles/show.html.erb
index 88deccc9d..5ac1535aa 100644
--- a/app/views/public/api/v1/portals/articles/show.html.erb
+++ b/app/views/public/api/v1/portals/articles/show.html.erb
@@ -12,41 +12,27 @@
 <% end %>
 
 <% if !@is_plain_layout_enabled %>
-<div class="bg-woot-50 dark:bg-woot-900 shadow-inner" style="<%= generate_portal_bg(@portal.color, @theme) %>">
-  <div class="py-8" style="<%= generate_gradient_to_bottom(@theme) %>">
-    <div class="max-w-6xl px-8 pt-8 pb-16 mx-auto space-y-4 w-full">
-      <div>
-        <a
-          class="text-slate-700 dark:text-slate-100 hover:underline leading-8 text-sm font-semibold"
-          href="/hc/<%= @portal.slug %>/<%= @article.category&.locale %><%= @theme.present? ? '?theme='+@theme : ''  %>"
-        >
-          Home
-        </a>
-        <span class="text-xs text-slate-600 dark:text-slate-200  px-1">/</span>
-        <% if @article.category %>
-          <a
-            class="text-slate-700 dark:text-slate-100 hover:underline leading-8 text-sm font-semibold"
-            href="/hc/<%= @portal.slug %>/<%= @article.category.locale %>/categories/<%= @article.category.slug %><%= @theme.present? ? '?theme='+@theme : ''  %>"
-          >
-            <%= @article.category&.name %>
-          </a>
-        <% else %>
-          <span class="text-slate-700 dark:text-slate-100 leading-8 text-sm font-semibold" > Uncategorized </span>
-        <% end %>
-      </div>
+<div id="portal-bg" class="bg-woot-50 dark:bg-woot-900 shadow-inner" style="<%= generate_portal_bg(@portal.color, @theme) %>">
+  <div id="portal-bg-gradient" class="pt-8 pb-8 md:pt-14 md:pb-6" style="<%= generate_gradient_to_bottom(@theme) %>">
+    <div class="max-w-5xl px-4 md:px-8 mx-auto flex flex-col">
       <%= render "public/api/v1/portals/articles/article_header", article: @article %>
     </div>
   </div>
 </div>
 <% else %>
-<div class="max-w-6xl p-8 mx-auto space-y-4 w-full <%= @is_plain_layout_enabled ? 'px-8 py-4' : 'p-8' %>">
+<div class="max-w-5xl mx-auto space-y-4 w-full px-4 md:px-8 <%= @is_plain_layout_enabled ? 'py-4' : 'py-8' %>">
   <%= render "public/api/v1/portals/articles/article_header", article: @article %>
 </div>
 <% end %>
 
-<div class="flex max-w-6xl w-full px-8 mx-auto">
-  <article id="cw-article-content" class="flex-grow flex-2 mx-auto text-slate-800 dark:text-slate-50 text-lg max-w-3xl prose dark:prose-invert break-words w-full <%= @is_plain_layout_enabled ? 'py-4' : 'py-12' %>">
+<div class="flex max-w-5xl w-full px-4 md:px-8 mx-auto">
+  <article id="cw-article-content" class="article-content flex-grow flex-2 mx-auto text-slate-800 dark:text-slate-50 text-lg max-w-3xl prose-h1:text-2xl prose-h2:text-xl prose-h2:mt-0 prose-h3:text-lg prose-code:[&>p]:p-1 prose-code:[&>p]:rounded-sm prose-code:[&>p]:bg-black-100 dark:prose-code:[&>p]:bg-black-600 prose-code:after:content-none prose-code:before:content-none prose dark:prose-invert break-words w-full <%= @is_plain_layout_enabled ? 'py-4' : 'pt-8 pb-12' %>">
     <%= @parsed_content %>
   </article>
   <div class="flex-1" id="cw-hc-toc"></div>
 </div>
+<style>
+  .article-content li > p {
+    margin: 0;
+  }
+</style>
diff --git a/app/views/public/api/v1/portals/categories/_category-hero.html.erb b/app/views/public/api/v1/portals/categories/_category-hero.html.erb
index 5b0d85fa2..0fac18055 100644
--- a/app/views/public/api/v1/portals/categories/_category-hero.html.erb
+++ b/app/views/public/api/v1/portals/categories/_category-hero.html.erb
@@ -1,4 +1,4 @@
-<div class="flex flex-col px-8 max-w-5xl w-full mx-auto gap-6 <%= @is_plain_layout_enabled && 'py-4' %>">
+<div class="flex flex-col px-4 md:px-8 max-w-5xl w-full mx-auto gap-6 <%= @is_plain_layout_enabled && 'py-4' %>">
   <div class="flex items-center flex-row">
     <a
       class="text-slate-500 dark:text-slate-200 text-sm gap-1 <%= @is_plain_layout_enabled && 'hover:underline' %> hover:cursor-pointer leading-8 font-semibold"
diff --git a/app/views/public/api/v1/portals/categories/index.html.erb b/app/views/public/api/v1/portals/categories/index.html.erb
index d27f5f1a7..9e40510eb 100644
--- a/app/views/public/api/v1/portals/categories/index.html.erb
+++ b/app/views/public/api/v1/portals/categories/index.html.erb
@@ -1,6 +1,6 @@
 <%= render "hero", portal: @portal %>
 
-<div class="max-w-6xl w-full flex-grow mx-auto py-16">
+<div class="max-w-5xl w-full flex-grow mx-auto py-16">
   <div class="grid grid-cols-2 gap-x-32 gap-y-12">
     <% @categories.each do |category| %>
       <%= render "category-block", category: category, portal: @portal %>
diff --git a/app/views/public/api/v1/portals/categories/show.html.erb b/app/views/public/api/v1/portals/categories/show.html.erb
index 27ae0dd08..83380e3f7 100644
--- a/app/views/public/api/v1/portals/categories/show.html.erb
+++ b/app/views/public/api/v1/portals/categories/show.html.erb
@@ -14,7 +14,7 @@
 <% else %>
   <%= render 'public/api/v1/portals/categories/category-hero', category: @category, portal: @portal %>
 <% end %>
-<section class="max-w-5xl w-full mx-auto px-8 py-6 flex flex-col items-center justify-center flex-grow">
+<section class="max-w-5xl w-full mx-auto px-4 md:px-8 py-6 flex flex-col items-center justify-center flex-grow">
   <div class="w-full flex flex-col gap-6 flex-grow">
     <% if @category.articles.published.size == 0 %>
     <div class="h-full flex items-center justify-center bg-slate-50 dark:bg-slate-800 rounded-xl py-6">
diff --git a/app/views/public/api/v1/portals/show.html.erb b/app/views/public/api/v1/portals/show.html.erb
index a6af2931e..958848108 100644
--- a/app/views/public/api/v1/portals/show.html.erb
+++ b/app/views/public/api/v1/portals/show.html.erb
@@ -1,5 +1,5 @@
 <%= render "public/api/v1/portals/hero", portal: @portal %>
-<div class="max-w-5xl w-full flex flex-col flex-grow mx-auto py-8 px-8 gap-6">
+<div class="max-w-5xl w-full flex flex-col flex-grow mx-auto py-8 px-4 md:px-8 gap-6">
   <%# Featured Articles %>
   <% if !@is_plain_layout_enabled %>
     <div><%= render "public/api/v1/portals/featured_articles", articles: @portal.articles, categories: @portal.categories.where(locale: @locale), portal: @portal %></div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 69c87b3e8..14175b263 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -225,6 +225,7 @@ en:
         light: Light
         dark: Dark
       featured_articles: Featured Articles
+      uncategorized: Uncategorized
     404:
       title: Page not found
       description: We couldn't find the page you were looking for.
diff --git a/spec/helpers/portal_helper_spec.rb b/spec/helpers/portal_helper_spec.rb
index 3294e6cb6..4611e4a6f 100644
--- a/spec/helpers/portal_helper_spec.rb
+++ b/spec/helpers/portal_helper_spec.rb
@@ -119,7 +119,7 @@ describe PortalHelper do
       end
     end
   end
- 
+
   describe '#render_category_content' do
     let(:markdown_content) { 'This is a *test* markdown content' }
     let(:plain_text_content) { 'This is a test markdown content' }

From 5486f39f7e6c3ca75b31c82d430a85d2d11f468e Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Thu, 9 Nov 2023 08:47:38 +0530
Subject: [PATCH 72/94] feat: Update uncategorized block design (#8324)

---
 .../v1/portals/_uncategorized-block.html.erb  | 56 ++++++++-----------
 1 file changed, 24 insertions(+), 32 deletions(-)

diff --git a/app/views/public/api/v1/portals/_uncategorized-block.html.erb b/app/views/public/api/v1/portals/_uncategorized-block.html.erb
index df3605122..0a86e1931 100644
--- a/app/views/public/api/v1/portals/_uncategorized-block.html.erb
+++ b/app/views/public/api/v1/portals/_uncategorized-block.html.erb
@@ -1,35 +1,27 @@
 <section class="lg:container w-full flex flex-col h-full">
-  <div class="flex justify-between items-center w-full">
-    <h3 class="text-xl text-slate-900 dark:text-white font-semibold leading-relaxed hover:underline">
-      <%= I18n.t('public_portal.header.uncategorized') %>
-    </h3>
-    <span class="text-slate-500">
-      <%= render 'public/api/v1/portals/article_count', article_count: portal.articles.published.where(category_id: nil).size %>
-    </span>
+  <div class="flex flex-col gap-8 h-full group <%= !@is_plain_layout_enabled ? 'border border-solid border-slate-100 dark:border-slate-800 hover:border-woot-600 dark:hover:border-woot-600 py-5 px-3 rounded-lg' : '' %>">
+    <div class="flex justify-between items-center w-full <%= !@is_plain_layout_enabled ?  'px-1' : '' %>">
+      <h3 class="text-xl text-slate-800 dark:text-slate-50 font-semibold leading-relaxed hover:cursor-pointer <%= @is_plain_layout_enabled ? 'hover:underline' : 'pl-1 group-hover:text-woot-600 dark:group-hover:text-woot-600' %>">
+        <%= I18n.t('public_portal.header.uncategorized') %>
+      </h3>
+    </div>
+    <div class="-mt-4">
+      <% portal.articles.published.where(category_id: nil).order(position: :asc).take(5).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 hover:cursor-pointer items-center py-1 rounded-lg gap-3  <%= !@is_plain_layout_enabled ? 'px-2 hover:bg-slate-50 dark:hover:bg-slate-800' : 'hover:underline' %>">
+          <%= article.title %>
+          <span class="flex items-center font-normal">
+            <%= render partial: 'icons/chevron-right' %>
+          </span>
+        </div>
+      </a>
+      <% end %>
+    </div>
+    <div class="flex justify-between flex-row items-center <%= !@is_plain_layout_enabled && 'px-2' %>">
+      <span class="text-sm font-medium text-slate-600 dark:text-slate-400"><%= render 'public/api/v1/portals/article_count', article_count: portal.articles.published.where(category_id: nil).size %></span>
+    </div>
   </div>
-  <div class="py-4 w-full mt-2 flex-grow">
-    <% portal.articles.published.where(category_id: nil).order(position: :asc).take(5).each do |article| %>
-    <a
-      class="text-slate-800 dark:text-slate-100 hover:underline leading-8"
-      href="<%= generate_article_link(portal.slug, article.slug, @theme) %>"
-    >
-      <div class="flex justify-between content-center my-1 -mx-1 p-1 rounded-lg hover:bg-slate-25 dark:hover:bg-slate-800">
-        <%= article.title %>
-        <span class="flex items-center">
-          <svg
-            class="w-4 h-4 fill-current text-slate-700 dark:text-slate-200"
-            width="24"
-            height="24"
-            fill="none"
-            viewBox="0 0 24 24"
-            xmlns="http://www.w3.org/2000/svg">
-            <path
-              d="M8.47 4.22a.75.75 0 0 0 0 1.06L15.19 12l-6.72 6.72a.75.75 0 1 0 1.06 1.06l7.25-7.25a.75.75 0 0 0 0-1.06L9.53 4.22a.75.75 0 0 0-1.06 0Z"
-            />
-          </svg>
-        </span>
-      </div>
-    </a>
-    <% end %>
-   </div>
 </section>

From 1948bef9acfe81f1bfafc31b4eb9a86aa9390efb Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Date: Thu, 9 Nov 2023 10:08:38 +0530
Subject: [PATCH 73/94] fix: Fix line break issue with link in portal header
 (#8323)

Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
---
 app/views/public/api/v1/portals/_header.html.erb | 2 +-
 config/locales/es.yml                            | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/views/public/api/v1/portals/_header.html.erb b/app/views/public/api/v1/portals/_header.html.erb
index d3a9cde91..6e4d69701 100644
--- a/app/views/public/api/v1/portals/_header.html.erb
+++ b/app/views/public/api/v1/portals/_header.html.erb
@@ -14,7 +14,7 @@
       <% if @portal.homepage_link %>
         <div class="ml-8 border-l-1 border-slate-50 dark:border-slate-800 hidden md:block cursor-pointer px-1 py-2">
           <div class="flex-grow flex-shrink-0">
-            <a target="_blank" rel="noopener noreferrer nofollow" href="<%= @portal.homepage_link %>" class="flex flex-row items-center gap-1 text-sm font-medium text-slate-800 dark:text-slate-100 hover:text-woot-500 dark:hover:text-woot-500 stroke-slate-700 dark:stroke-slate-200 hover:stroke-woot-500 dark:hover:stroke-woot-500">
+            <a target="_blank" rel="noopener noreferrer nofollow" href="<%= @portal.homepage_link %>" class="flex flex-row items-center gap-1 text-sm font-medium whitespace-nowrap text-slate-800 dark:text-slate-100 hover:text-woot-500 dark:hover:text-woot-500 stroke-slate-700 dark:stroke-slate-200 hover:stroke-woot-500 dark:hover:stroke-woot-500">
               <%= render partial: 'icons/redirect' %>
               <%= I18n.t('public_portal.header.go_to_homepage') %>
             </a>
diff --git a/config/locales/es.yml b/config/locales/es.yml
index b1bae44db..02f758ab7 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -204,6 +204,12 @@ es:
       made_with: Hecho con
     header:
       go_to_homepage: Ir al sitio principal
+      appearance:
+        system: Sistema
+        light: Claro
+        dark: Oscuro
+      featured_articles: Artículos Destacados
+      uncategorized: Sin Categoría
   slack_unfurl:
     fields:
       name: Nombre

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 74/94] 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 75/94] 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 76/94] 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 77/94] 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 78/94] 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 79/94] 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 80/94] 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 81/94] 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 82/94] 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 83/94] 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
zcmV-*2#WWKP)<h;3K|Lk000e1NJLTq001)p001)x1^@s6I-xKs00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91GoS+i1ONa40RR91GXMYp0M89gSO5SA-$_J4RA>dw8e41>RrK81M|VpL
z6jBAH3RI{xJfb0}5ik&Ax`s-8&@M_*5;S~if>DD3T|+SR#~A-4#G0V6R1gt@B`PRr
zC4_*Y;blQu-cS@MbRXTF>p8QXb#``U=iZ@EPtwkPoO>SkaUS<BgFb>+_HkdwiTFc2
z4bvHeYT&#I7z_u_O7S~@bBHs>y8zfF4*VE?k1)nsOIgvbFY4I!z7T`m3=vY`)bT_O
zSJnBz*pr;|VrhDer5J}@IBt!<II!{S*$fqS2d<QfaIWlWjyK?JFUJ+AaK}1-6a#jR
z12p<e0v~RvW!?E0g<GVR2}R=}&efI3bYfxBH`RMqQCOse1wO$om=>iZtjtrJ`JKsF
z{4?B2kBbt&X*|Xb`@l1IYuNvr2rVIHLK~6~sHybkzT8qG!ewyS4aSuDE#aasoyI6m
z2sP2}IXspAsecq9>G%K+>V{A>_73iff|Fmc6BT)b18YP@3gS6UNT2mHw)T<wKtqHv
z)rzL=%4jQc8x--`N?;)_=g;q1A75e7qcvI1IGqvNS|Wa<$OABMycep5D)8$C6{3ey
zprWaBf*}Eb$n+u@J4As~*Hnn?PQsZkfq_U^VQk(v;o#?H9(nUZR*Me1h$2Mn#fd(c
zGtLJS@9@C<2|jqb%4_CfS+B45X^K#1#XtoXARSS_$yz<DIXT6QpQj9&Uzx*RIXHK5
z&2=+Fz3#^qHG<T310G1FQyXiy<VGAh%48g(oFCcI{+~}%F(mlGP&W!|E;k=eL02Mk
zj=Os}toftIj8d?U8*)TXcYLuCDXUBbLlpAt#!iv)_7iD1jeDM;<#-DAp0hMGd8E!=
z=WwVqb4GsbNJHB{V&^4?5QjHI&AeQ1%WiNj)^Zu5#8Me@mt#6vfT2Nv%E1Z@2{IT|
z#Got5;c|?_$*UYL+{g&7i;oNH3h-Q)f*M<fgI^^AnlcpqwztKXyP{|q<i&M<?tU*!
zzsCb($}nuiT)+xWUQuE9sWf=4yRC-UwxJ7LRI@JjLCf6WNllrK6N!+_p|_(vd#o3V
zea;e&#1*5zRId%U(b<lTsh#^cV+*kH-OQOus|_X$;VN07VFNM>h$vzt>{T-3CJ$F|
z5{x}^Wz2`>QK-YT46!YKMbxht*^nZQGyG6pZnCpRB*Aj~RTW<UE&<o&j9QjD^LZvI
zTB_?NLqsx*r}+9r5t8WMK?=P6s2{z1Rz9f$OYxZs<?K?UdXZ~Jdtk=MtTA*$B5%xt
z!#ohKc1IH<>uDI~;N^oPP&`JV%dLRAab76HxJ?%D$W$w6#j0cn){gON{zG=02z~(V
zHN|=^pi)79b(icw@*`Go@S+MkF`W4e9b+NrMCVFj&o5_Gu)>^HVNJgfO-$l^I1j7@
z@39Kw8G6aHlS4E^0z<U7b|!J5ISemRplMc-86{g^bs!15FoYra=!pPE&$;x<i<!pb
zPstERp$ob!7l8tWC{~`G{2wVo(BqKM^knqVaCOJ2RSf?s%Q7y|(BxS3BL6sI2`fag
zmK6li2)%?k$;ECC<I4*R@+^itWk@H8`@&9WJ3dyt^)@eEnW93%%23c~2cl+`lyy>g
zZ~;Dc{Ba7|CA&_mc8Y#)2gvflv#+8xqf2aYpfLV+fHWTl9k|ok5j?uW^0hmdU7gSY
zyxdr_Goe?r-=$NFVCsm%XNr(1?~wsKDn~E^V68HP&SPRl`G^zHZB41gzQ4P~{><q#
zuf#bV?sVp%<M)1B6?z{*Ticr}n!0VOlvp`IF|PSC3>-(HDfeLXI1m-1o19Um3lJ+h
zt*6rxdnH3bQTPsRnlMxQ9?#B9E5cT7B^Yfq)drx{?>x&^;|sO*q&Y0ymdK{og>dyg
zl%n(DVL{A_GO$MP5cyKhL6?2E0=BfJr4%6<@bWksnZZ(;GW23a4?Qx%Z91BQednCF
zn+(lkf2;86K{wf%w~6>@%Fxpr+KxsU#uTx<-<kx<5c>i;F>-iscLI`<^MhM#)Aq1`
zKgpnPGoYt8te=$;tQ#khQr-RMB_%L1p%r=U+c;iDnL3=RWVk%a5*;n)1c%ngURG7U
zO79f?QmRX#3?){SkB9;tb~+=pwPaU>c%WPPxFsB1r1Q(+Jg1p^uBq|gG5j5;BglLy
zL!`ut@(~K-?ST9UncwwzMXO&3+Tq%_vl|{y;J$5j?7WVX$8lCPIjM)Ie?}W29DM4;
zj9<!mC?cllmx4y)jV3unIsa~?oGD|vKer`Z95wdjDMOt#(Zn<K^oA>B*>5D!FJ;D7
zY!3&Qnt5jpfU$!fL$M=bZ2RAo8GO}JA6RB3kEJq%xUD|098cI<t3mzMhFfd@Kqc6K
z2j6m++A2c>=rI((EBj0M9KN_BrAqLzLcg;SIurP8{Q^44)o2vZUiAau8KJFZw<5Yk
zLdp;_y&=-m8?NsNeekXS(hnN=LbKJf<7>Ok%mcR8`S<!tf>lgmG()a`d1R(*S*Kq*
zp+h7;BB}_{5ndT1Q+j&i_+mv5J-GE;T|XM>8OtcpCJIqn>H<fN?ILAY%IJhK4;qP{
zXo2=V0(`XI?&5nHr*$1Z<TdF*qYE1DR>sVT9(qC>lN0D!fo|jJ5*u+UtyYb0QIKl~
r<?M*lN*Q8BWpMAR$;?gcpCih@6jIHZ%*42700000NkvXXu0mjf=-S|S

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
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
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 84/94] 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 85/94] 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 86/94] 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 87/94] 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 88/94] 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 89/94] 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 90/94] 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 91/94] 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 92/94] 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 93/94] 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 94/94]  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}",