From 026e03c3073284be4e5d02b71d7027be95f9f8b2 Mon Sep 17 00:00:00 2001
From: Jordan Brough <jordan-brough@users.noreply.github.com>
Date: Tue, 18 Apr 2023 07:48:23 -0600
Subject: [PATCH 001/101] fix: Handle spaces in CC/BCC email lists (#6788)

When the CC field is generated in the UI, the email values are joined together
with ", " but when they are parsed, we currently split by just ",".

This causes an error on the backend and on the frontend.

It seems reasonable to update the code to allow whitespace in the input and to
split by `\s*,\s` and also to trim leading and trailing whitespace from the CC
list.

---------

Co-authored-by: Sojan <sojan@pepalo.com>
---
 app/builders/messages/message_builder.rb              |  4 ++--
 .../widgets/conversation/helpers/emailHeadHelper.js   |  2 +-
 .../helpers/specs/emailHeadHelper.spec.js             |  3 +++
 spec/builders/messages/message_builder_spec.rb        | 11 +++++++++++
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/app/builders/messages/message_builder.rb b/app/builders/messages/message_builder.rb
index ba5861859..aca06cd04 100644
--- a/app/builders/messages/message_builder.rb
+++ b/app/builders/messages/message_builder.rb
@@ -49,10 +49,10 @@ class Messages::MessageBuilder
     return unless @conversation.inbox&.inbox_type == 'Email'
 
     cc_emails = []
-    cc_emails = @params[:cc_emails].split(',') if @params[:cc_emails].present?
+    cc_emails = @params[:cc_emails].gsub(/\s+/, '').split(',') if @params[:cc_emails].present?
 
     bcc_emails = []
-    bcc_emails = @params[:bcc_emails].split(',') if @params[:bcc_emails].present?
+    bcc_emails = @params[:bcc_emails].gsub(/\s+/, '').split(',') if @params[:bcc_emails].present?
 
     all_email_addresses = cc_emails + bcc_emails
     validate_email_addresses(all_email_addresses)
diff --git a/app/javascript/dashboard/components/widgets/conversation/helpers/emailHeadHelper.js b/app/javascript/dashboard/components/widgets/conversation/helpers/emailHeadHelper.js
index ad36393a7..5304627c4 100644
--- a/app/javascript/dashboard/components/widgets/conversation/helpers/emailHeadHelper.js
+++ b/app/javascript/dashboard/components/widgets/conversation/helpers/emailHeadHelper.js
@@ -2,6 +2,6 @@ import emailValidator from 'vuelidate/lib/validators/email';
 
 export const validEmailsByComma = value => {
   if (!value.length) return true;
-  const emails = value.split(',');
+  const emails = value.replace(/\s+/g, '').split(',');
   return emails.every(email => emailValidator(email));
 };
diff --git a/app/javascript/dashboard/components/widgets/conversation/helpers/specs/emailHeadHelper.spec.js b/app/javascript/dashboard/components/widgets/conversation/helpers/specs/emailHeadHelper.spec.js
index 2275a810b..7c9142ee4 100644
--- a/app/javascript/dashboard/components/widgets/conversation/helpers/specs/emailHeadHelper.spec.js
+++ b/app/javascript/dashboard/components/widgets/conversation/helpers/specs/emailHeadHelper.spec.js
@@ -10,4 +10,7 @@ describe('#validEmailsByComma', () => {
   it('returns false when one of the email passed is invalid', () => {
     expect(validEmailsByComma('ni@njan.com,pova.da')).toEqual(false);
   });
+  it('strips spaces between emails before validating', () => {
+    expect(validEmailsByComma('1@test.com  , 2@test.com')).toEqual(true);
+  });
 });
diff --git a/spec/builders/messages/message_builder_spec.rb b/spec/builders/messages/message_builder_spec.rb
index 845c1ab99..be5d60834 100644
--- a/spec/builders/messages/message_builder_spec.rb
+++ b/spec/builders/messages/message_builder_spec.rb
@@ -98,6 +98,17 @@ describe ::Messages::MessageBuilder do
         params = ActionController::Parameters.new({ cc_emails: 'test.com', bcc_emails: 'test_bcc.com' })
         expect { described_class.new(user, conversation, params).perform }.to raise_error 'Invalid email address'
       end
+
+      it 'strips off whitespace before saving cc_emails and bcc_emails' do
+        cc_emails = ' test1@test.com , test2@test.com, test3@test.com'
+        bcc_emails = 'test1@test.com,test2@test.com, test3@test.com '
+        params = ActionController::Parameters.new({ cc_emails: cc_emails, bcc_emails: bcc_emails })
+
+        message = described_class.new(user, conversation, params).perform
+
+        expect(message.content_attributes[:cc_emails]).to eq ['test1@test.com', 'test2@test.com', 'test3@test.com']
+        expect(message.content_attributes[:bcc_emails]).to eq ['test1@test.com', 'test2@test.com', 'test3@test.com']
+      end
     end
   end
 end

From c5c36af5291d532b78bfe15a006b4c14ec4a057f Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Tue, 18 Apr 2023 18:30:01 -0700
Subject: [PATCH 002/101] fix: Remove fallback phone_number search in WhatsApp
 event processing (#6904)

---
 app/jobs/webhooks/whatsapp_events_job.rb      |  8 ++---
 spec/factories/channel/channel_whatsapp.rb    |  2 +-
 .../jobs/webhooks/whatsapp_events_job_spec.rb | 33 ++++++++++++++++++-
 3 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/app/jobs/webhooks/whatsapp_events_job.rb b/app/jobs/webhooks/whatsapp_events_job.rb
index 4a2c50065..b84e9cde5 100644
--- a/app/jobs/webhooks/whatsapp_events_job.rb
+++ b/app/jobs/webhooks/whatsapp_events_job.rb
@@ -2,7 +2,7 @@ class Webhooks::WhatsappEventsJob < ApplicationJob
   queue_as :low
 
   def perform(params = {})
-    channel = find_channel_from_whatsapp_business_payload(params) || find_channel(params)
+    channel = find_channel_from_whatsapp_business_payload(params)
     return if channel_is_inactive?(channel)
 
     case channel.provider
@@ -23,7 +23,7 @@ class Webhooks::WhatsappEventsJob < ApplicationJob
     false
   end
 
-  def find_channel(params)
+  def find_channel_by_url_param(params)
     return unless params[:phone_number]
 
     Channel::Whatsapp.find_by(phone_number: params[:phone_number])
@@ -33,9 +33,9 @@ class Webhooks::WhatsappEventsJob < ApplicationJob
     # for the case where facebook cloud api support multiple numbers for a single app
     # https://github.com/chatwoot/chatwoot/issues/4712#issuecomment-1173838350
     # we will give priority to the phone_number in the payload
-    return unless params[:object] == 'whatsapp_business_account'
+    return get_channel_from_wb_payload(params) if params[:object] == 'whatsapp_business_account'
 
-    get_channel_from_wb_payload(params)
+    find_channel_by_url_param(params)
   end
 
   def get_channel_from_wb_payload(wb_params)
diff --git a/spec/factories/channel/channel_whatsapp.rb b/spec/factories/channel/channel_whatsapp.rb
index 58f569ba3..b2d482e1d 100644
--- a/spec/factories/channel/channel_whatsapp.rb
+++ b/spec/factories/channel/channel_whatsapp.rb
@@ -2,7 +2,7 @@ FactoryBot.define do
   factory :channel_whatsapp, class: 'Channel::Whatsapp' do
     sequence(:phone_number) { |n| "+123456789#{n}1" }
     account
-    provider_config { { 'api_key' => 'test_key' } }
+    provider_config { { 'api_key' => 'test_key', 'phone_number_id' => 'random_id' } }
     message_templates do
       [{ 'name' => 'sample_shipping_confirmation',
          'status' => 'approved',
diff --git a/spec/jobs/webhooks/whatsapp_events_job_spec.rb b/spec/jobs/webhooks/whatsapp_events_job_spec.rb
index d98005427..187d4c62c 100644
--- a/spec/jobs/webhooks/whatsapp_events_job_spec.rb
+++ b/spec/jobs/webhooks/whatsapp_events_job_spec.rb
@@ -4,7 +4,24 @@ RSpec.describe Webhooks::WhatsappEventsJob, type: :job do
   subject(:job) { described_class }
 
   let(:channel) { create(:channel_whatsapp, provider: 'whatsapp_cloud', sync_templates: false, validate_provider_config: false) }
-  let(:params)  { { phone_number: channel.phone_number } }
+  let(:params)  do
+    {
+      object: 'whatsapp_business_account',
+      phone_number: channel.phone_number,
+      entry: [{
+        changes: [
+          {
+            value: {
+              metadata: {
+                phone_number_id: channel.provider_config['phone_number_id'],
+                display_phone_number: channel.phone_number.delete('+')
+              }
+            }
+          }
+        ]
+      }]
+    }
+  end
   let(:process_service) { double }
 
   before do
@@ -24,6 +41,20 @@ RSpec.describe Webhooks::WhatsappEventsJob, type: :job do
       job.perform_now(params)
     end
 
+    it 'will not enqueue message jobs based on phone number in the URL if the entry payload is not present' do
+      params = {
+        object: 'whatsapp_business_account',
+        phone_number: channel.phone_number,
+        entry: [{ changes: [{}] }]
+      }
+      allow(Whatsapp::IncomingMessageWhatsappCloudService).to receive(:new)
+      allow(Whatsapp::IncomingMessageService).to receive(:new)
+
+      expect(Whatsapp::IncomingMessageWhatsappCloudService).not_to receive(:new)
+      expect(Whatsapp::IncomingMessageService).not_to receive(:new)
+      job.perform_now(params)
+    end
+
     it 'will not enqueue Whatsapp::IncomingMessageWhatsappCloudService if channel reauthorization required' do
       channel.prompt_reauthorization!
       allow(Whatsapp::IncomingMessageWhatsappCloudService).to receive(:new).and_return(process_service)

From e6505fc7a42ca9f3de1735939b488a18a979adcb Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Tue, 18 Apr 2023 19:44:57 -0700
Subject: [PATCH 003/101] chore: Cache the dashboard app on the first load
 (#6774)

---
 .../components/widgets/DashboardApp/Frame.vue      | 14 +++++++++++++-
 .../widgets/conversation/ConversationBox.vue       | 10 ++++++----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/app/javascript/dashboard/components/widgets/DashboardApp/Frame.vue b/app/javascript/dashboard/components/widgets/DashboardApp/Frame.vue
index c1db1ad4d..395006704 100644
--- a/app/javascript/dashboard/components/widgets/DashboardApp/Frame.vue
+++ b/app/javascript/dashboard/components/widgets/DashboardApp/Frame.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="dashboard-app--container">
+  <div v-if="hasOpenedAtleastOnce" class="dashboard-app--container">
     <div
       v-for="(configItem, index) in config"
       :key="index"
@@ -35,9 +35,14 @@ export default {
       type: Object,
       default: () => ({}),
     },
+    isVisible: {
+      type: Boolean,
+      default: false,
+    },
   },
   data() {
     return {
+      hasOpenedAtleastOnce: false,
       iframeLoading: true,
     };
   },
@@ -57,6 +62,13 @@ export default {
       return { id, name, email };
     },
   },
+  watch: {
+    isVisible() {
+      if (this.isVisible) {
+        this.hasOpenedAtleastOnce = true;
+      }
+    },
+  },
 
   mounted() {
     window.onmessage = e => {
diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationBox.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationBox.vue
index c4e4a80c4..189b0e67c 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationBox.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationBox.vue
@@ -23,7 +23,7 @@
         :show-badge="false"
       />
     </woot-tabs>
-    <div v-if="!activeIndex" class="messages-and-sidebar">
+    <div v-show="!activeIndex" class="messages-and-sidebar">
       <messages-view
         v-if="currentChat.id"
         :inbox-id="inboxId"
@@ -41,9 +41,11 @@
       </div>
     </div>
     <dashboard-app-frame
-      v-else
-      :key="currentChat.id + '-' + activeIndex"
-      :config="dashboardApps[activeIndex - 1].content"
+      v-for="(dashboardApp, index) in dashboardApps"
+      v-show="activeIndex - 1 === index"
+      :key="currentChat.id + '-' + dashboardApp.id"
+      :is-visible="activeIndex - 1 === index"
+      :config="dashboardApps[index].content"
       :current-chat="currentChat"
     />
   </div>

From b93b8cdab62679936af10cd8f41878a6c8f4da22 Mon Sep 17 00:00:00 2001
From: Volodymyr Makukh <makova83@gmail.com>
Date: Wed, 19 Apr 2023 08:12:45 +0300
Subject: [PATCH 004/101] Fix flaky reporting_event_listener_spec (#6923)

---
 spec/listeners/reporting_event_listener_spec.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/spec/listeners/reporting_event_listener_spec.rb b/spec/listeners/reporting_event_listener_spec.rb
index 2f0fc24bd..3151b714c 100644
--- a/spec/listeners/reporting_event_listener_spec.rb
+++ b/spec/listeners/reporting_event_listener_spec.rb
@@ -63,8 +63,9 @@ describe ReportingEventListener do
 
     # this ensures last_non_human_activity method accurately accounts for handoff events
     context 'when last handoff event exists' do
-      let(:conversation_updated_at) { 20.seconds.from_now }
-      let(:human_message_created_at) { 62.seconds.from_now }
+      let(:now) { Time.zone.now }
+      let(:conversation_updated_at) { now + 20.seconds }
+      let(:human_message_created_at) { now + 62.seconds }
       let(:new_conversation) { create(:conversation, account: account, inbox: inbox, assignee: user, updated_at: conversation_updated_at) }
       let(:new_message) do
         create(:message, message_type: 'outgoing', created_at: human_message_created_at, account: account, inbox: inbox,

From ea2c4423288087d2a007b1988291ee55da9a2aaa Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Tue, 18 Apr 2023 22:35:11 -0700
Subject: [PATCH 005/101] chore: Add account_id as custom_attribute for cloud
 users (#6926)

---
 .../components/widgets/conversation/ConversationBox.vue          | 1 +
 app/javascript/dashboard/helper/scriptHelpers.js                 | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationBox.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationBox.vue
index 189b0e67c..dc4a3bca4 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationBox.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationBox.vue
@@ -114,6 +114,7 @@ export default {
     },
     'currentChat.id'() {
       this.fetchLabels();
+      this.activeIndex = 0;
     },
   },
   mounted() {
diff --git a/app/javascript/dashboard/helper/scriptHelpers.js b/app/javascript/dashboard/helper/scriptHelpers.js
index 90b872363..7807f2b45 100644
--- a/app/javascript/dashboard/helper/scriptHelpers.js
+++ b/app/javascript/dashboard/helper/scriptHelpers.js
@@ -57,6 +57,7 @@ export const initializeChatwootEvents = () => {
       window.$chatwoot.setCustomAttributes({
         signedUpAt: user.created_at,
         cloudCustomer: 'true',
+        account_id: user.account_id,
       });
     }
 

From 9c0259da6ba278b720ca0f1f57be3ddd13551d81 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Wed, 19 Apr 2023 13:23:14 +0530
Subject: [PATCH 006/101] feat: add priority field to conversation (#6921)
 (#6927)

* feat: add priority

* feat: add indexes
---
 app/models/conversation.rb                                | 4 ++++
 db/migrate/20230418100944_add_priority_to_conversation.rb | 7 +++++++
 db/schema.rb                                              | 5 ++++-
 3 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 db/migrate/20230418100944_add_priority_to_conversation.rb

diff --git a/app/models/conversation.rb b/app/models/conversation.rb
index ddefe7da9..9230fac61 100644
--- a/app/models/conversation.rb
+++ b/app/models/conversation.rb
@@ -11,6 +11,7 @@
 #  first_reply_created_at :datetime
 #  identifier             :string
 #  last_activity_at       :datetime         not null
+#  priority               :integer
 #  snoozed_until          :datetime
 #  status                 :integer          default("open"), not null
 #  uuid                   :uuid             not null
@@ -38,7 +39,9 @@
 #  index_conversations_on_id_and_account_id           (account_id,id)
 #  index_conversations_on_inbox_id                    (inbox_id)
 #  index_conversations_on_last_activity_at            (last_activity_at)
+#  index_conversations_on_priority                    (priority)
 #  index_conversations_on_status_and_account_id       (status,account_id)
+#  index_conversations_on_status_and_priority         (status,priority)
 #  index_conversations_on_team_id                     (team_id)
 #  index_conversations_on_uuid                        (uuid) UNIQUE
 #
@@ -61,6 +64,7 @@ class Conversation < ApplicationRecord
   validate :validate_referer_url
 
   enum status: { open: 0, resolved: 1, pending: 2, snoozed: 3 }
+  enum priority: { low: 0, medium: 1, high: 2, urgent: 3 }
 
   scope :unassigned, -> { where(assignee_id: nil) }
   scope :assigned, -> { where.not(assignee_id: nil) }
diff --git a/db/migrate/20230418100944_add_priority_to_conversation.rb b/db/migrate/20230418100944_add_priority_to_conversation.rb
new file mode 100644
index 000000000..5f1ec286c
--- /dev/null
+++ b/db/migrate/20230418100944_add_priority_to_conversation.rb
@@ -0,0 +1,7 @@
+class AddPriorityToConversation < ActiveRecord::Migration[6.1]
+  def change
+    add_column :conversations, :priority, :integer
+    add_index :conversations, :priority
+    add_index :conversations, [:status, :priority]
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 63339b2c6..f89f9662b 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.define(version: 2023_04_07_191457) do
+ActiveRecord::Schema.define(version: 2023_04_18_100944) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_stat_statements"
@@ -446,6 +446,7 @@ ActiveRecord::Schema.define(version: 2023_04_07_191457) do
     t.jsonb "custom_attributes", default: {}
     t.datetime "assignee_last_seen_at"
     t.datetime "first_reply_created_at"
+    t.integer "priority"
     t.index ["account_id", "display_id"], name: "index_conversations_on_account_id_and_display_id", unique: true
     t.index ["account_id", "id"], name: "index_conversations_on_id_and_account_id"
     t.index ["account_id", "inbox_id", "status", "assignee_id"], name: "conv_acid_inbid_stat_asgnid_idx"
@@ -457,7 +458,9 @@ ActiveRecord::Schema.define(version: 2023_04_07_191457) do
     t.index ["first_reply_created_at"], name: "index_conversations_on_first_reply_created_at"
     t.index ["inbox_id"], name: "index_conversations_on_inbox_id"
     t.index ["last_activity_at"], name: "index_conversations_on_last_activity_at"
+    t.index ["priority"], name: "index_conversations_on_priority"
     t.index ["status", "account_id"], name: "index_conversations_on_status_and_account_id"
+    t.index ["status", "priority"], name: "index_conversations_on_status_and_priority"
     t.index ["team_id"], name: "index_conversations_on_team_id"
     t.index ["uuid"], name: "index_conversations_on_uuid", unique: true
   end

From 821d49943aead284881d7eb988c54b94383c221a Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Wed, 19 Apr 2023 16:43:51 +0530
Subject: [PATCH 007/101] Delete inbox api doc update (#6930)

---
 swagger/paths/index.yml |   4 +-
 swagger/swagger.json    | 112 ++++++++++++++++++++--------------------
 2 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/swagger/paths/index.yml b/swagger/paths/index.yml
index e4aa9faee..daa311528 100644
--- a/swagger/paths/index.yml
+++ b/swagger/paths/index.yml
@@ -310,8 +310,6 @@
     - $ref: '#/parameters/inbox_id'
   get:
     $ref: ./application/inboxes/inbox_members/show.yml
-  delete:
-    $ref: ./application/inboxes/inbox_members/delete.yml
 
 /api/v1/accounts/{account_id}/inbox_members:
   parameters:
@@ -320,6 +318,8 @@
     $ref: ./application/inboxes/inbox_members/create.yml
   patch:
     $ref: ./application/inboxes/inbox_members/update.yml
+  delete:
+    $ref: ./application/inboxes/inbox_members/delete.yml
 
 
 
diff --git a/swagger/swagger.json b/swagger/swagger.json
index f11f922ab..705195f1c 100644
--- a/swagger/swagger.json
+++ b/swagger/swagger.json
@@ -3369,62 +3369,6 @@
             "description": "Access denied"
           }
         }
-      },
-      "delete": {
-        "tags": [
-          "Inboxes"
-        ],
-        "operationId": "delete-agent-in-inbox",
-        "summary": "Remove an Agent from Inbox",
-        "description": "Remove an Agent from Inbox",
-        "security": [
-          {
-            "userApiKey": [
-
-            ]
-          }
-        ],
-        "parameters": [
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "type": "object",
-              "required": [
-                "inbox_id",
-                "user_ids"
-              ],
-              "properties": {
-                "inbox_id": {
-                  "type": "string",
-                  "description": "The ID of the inbox"
-                },
-                "user_ids": {
-                  "type": "array",
-                  "items": {
-                    "type": "integer"
-                  },
-                  "description": "IDs of users to be deleted from the inbox"
-                }
-              }
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success"
-          },
-          "404": {
-            "description": "Inbox not found"
-          },
-          "403": {
-            "description": "Access denied"
-          },
-          "422": {
-            "description": "User must exist"
-          }
-        }
       }
     },
     "/api/v1/accounts/{account_id}/inbox_members": {
@@ -3558,6 +3502,62 @@
             "description": "User must exist"
           }
         }
+      },
+      "delete": {
+        "tags": [
+          "Inboxes"
+        ],
+        "operationId": "delete-agent-in-inbox",
+        "summary": "Remove an Agent from Inbox",
+        "description": "Remove an Agent from Inbox",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
+        "parameters": [
+          {
+            "name": "data",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "type": "object",
+              "required": [
+                "inbox_id",
+                "user_ids"
+              ],
+              "properties": {
+                "inbox_id": {
+                  "type": "string",
+                  "description": "The ID of the inbox"
+                },
+                "user_ids": {
+                  "type": "array",
+                  "items": {
+                    "type": "integer"
+                  },
+                  "description": "IDs of users to be deleted from the inbox"
+                }
+              }
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success"
+          },
+          "404": {
+            "description": "Inbox not found"
+          },
+          "403": {
+            "description": "Access denied"
+          },
+          "422": {
+            "description": "User must exist"
+          }
+        }
       }
     },
     "/api/v1/accounts/{account_id}/conversations/{conversation_id}/messages": {

From 5cdc7d654a461d9b20d583e19ed01e33a31f202d Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Wed, 19 Apr 2023 16:55:25 +0530
Subject: [PATCH 008/101] feat: Support multiple emails in email transcript
 automation (#6924)

---
 app/services/action_service.rb                |  2 +
 .../automation_rule_listener_old_spec.rb      | 71 -------------------
 .../automation_rules/action_service_spec.rb   | 16 +++++
 3 files changed, 18 insertions(+), 71 deletions(-)

diff --git a/app/services/action_service.rb b/app/services/action_service.rb
index 927d0ed1b..77f3c6b9a 100644
--- a/app/services/action_service.rb
+++ b/app/services/action_service.rb
@@ -52,6 +52,8 @@ class ActionService
   end
 
   def send_email_transcript(emails)
+    emails = emails[0].gsub(/\s+/, '').split(',')
+
     emails.each do |email|
       ConversationReplyMailer.with(account: @conversation.account).conversation_transcript(@conversation, email)&.deliver_later
     end
diff --git a/spec/listeners/automation_rule_listener_old_spec.rb b/spec/listeners/automation_rule_listener_old_spec.rb
index 69154c592..68507ea76 100644
--- a/spec/listeners/automation_rule_listener_old_spec.rb
+++ b/spec/listeners/automation_rule_listener_old_spec.rb
@@ -121,18 +121,6 @@ describe AutomationRuleListener do
         expect(conversation.assignee).to eq(user_1)
       end
 
-      it 'triggers automation rule send email transcript to the mentioned email' do
-        mailer = double
-
-        expect(TeamNotifications::AutomationNotificationMailer).to receive(:conversation_creation)
-
-        listener.conversation_updated(event)
-
-        conversation.reload
-
-        allow(mailer).to receive(:conversation_transcript)
-      end
-
       it 'triggers automation rule send message to the contacts' do
         expect(conversation.messages).to be_empty
 
@@ -253,15 +241,6 @@ describe AutomationRuleListener do
         expect(conversation.assignee).to eq(user_1)
       end
 
-      it 'triggers automation rule send email transcript to the mentioned email' do
-        mailer = double
-        expect(TeamNotifications::AutomationNotificationMailer).to receive(:conversation_creation)
-        listener.conversation_updated(event)
-        conversation.reload
-
-        allow(mailer).to receive(:conversation_transcript)
-      end
-
       it 'triggers automation rule send email to the team' do
         message_delivery = instance_double(ActionMailer::MessageDelivery)
 
@@ -457,15 +436,6 @@ describe AutomationRuleListener do
         expect(conversation.assignee).to eq(user_1)
       end
 
-      it 'triggers automation rule send email transcript to the mentioned email' do
-        mailer = double
-        expect(TeamNotifications::AutomationNotificationMailer).to receive(:conversation_creation)
-        listener.conversation_opened(event)
-        conversation.reload
-
-        allow(mailer).to receive(:conversation_transcript)
-      end
-
       it 'triggers automation rule send email to the team' do
         message_delivery = instance_double(ActionMailer::MessageDelivery)
 
@@ -577,15 +547,6 @@ describe AutomationRuleListener do
 
         expect(conversation.assignee).to eq(user_1)
       end
-
-      it 'triggers automation rule send email transcript to the mentioned email' do
-        mailer = double
-        expect(TeamNotifications::AutomationNotificationMailer).to receive(:conversation_creation)
-        listener.message_created(event)
-        conversation.reload
-
-        allow(mailer).to receive(:conversation_transcript)
-      end
     end
   end
 
@@ -616,17 +577,6 @@ describe AutomationRuleListener do
     end
 
     context 'when rule matches' do
-      it 'triggers automation rule send email transcript to the mentioned email' do
-        mailer = double
-        allow(ConversationReplyMailer).to receive(:with).and_return(mailer)
-        allow(mailer).to receive(:conversation_transcript)
-
-        listener.message_created(event)
-        conversation.reload
-
-        expect(mailer).to have_received(:conversation_transcript).with(conversation, 'new_agent@example.com')
-      end
-
       it 'triggers automation rule send message to the contacts' do
         expect(conversation.messages.count).to eq(1)
         listener.message_created(event)
@@ -710,18 +660,6 @@ describe AutomationRuleListener do
     end
 
     context 'when rule matches' do
-      it 'triggers automation rule send email transcript to the mentioned email' do
-        mailer = double
-        allow(ConversationReplyMailer).to receive(:with).and_return(mailer)
-        allow(mailer).to receive(:conversation_transcript)
-
-        listener.conversation_created(event)
-
-        conversation.reload
-
-        expect(mailer).to have_received(:conversation_transcript).with(conversation, 'new_agent@example.com')
-      end
-
       it 'triggers automation rule send message to the contacts' do
         expect(conversation.messages.count).to eq(1)
 
@@ -781,15 +719,6 @@ describe AutomationRuleListener do
       let(:event) { Events::Base.new('message_created', Time.zone.now, { conversation: tweet, message: message }) }
       let!(:message) { create(:message, account: account, conversation: tweet, message_type: 'incoming') }
 
-      it 'triggers automation rule except send_message and send_attachment' do
-        mailer = double
-        allow(ConversationReplyMailer).to receive(:with).and_return(mailer)
-        allow(mailer).to receive(:conversation_transcript)
-
-        listener.message_created(event)
-        expect(mailer).to have_received(:conversation_transcript).with(tweet, 'new_agent@example.com')
-      end
-
       it 'does not triggers automation rule send message or send attachment' do
         expect(tweet.messages.count).to eq(1)
 
diff --git a/spec/services/automation_rules/action_service_spec.rb b/spec/services/automation_rules/action_service_spec.rb
index cb54c36b6..c95789399 100644
--- a/spec/services/automation_rules/action_service_spec.rb
+++ b/spec/services/automation_rules/action_service_spec.rb
@@ -87,5 +87,21 @@ RSpec.describe AutomationRules::ActionService do
         described_class.new(rule, account, conversation).perform
       end
     end
+
+    describe '#perform with send_email_transcript action' do
+      before do
+        rule.actions << { action_name: 'send_email_transcript', action_params: ['contact@example.com, agent@example.com,agent1@example.com'] }
+      end
+
+      it 'will send email to transcript to action params emails' do
+        mailer = double
+        allow(ConversationReplyMailer).to receive(:with).and_return(mailer)
+        allow(mailer).to receive(:conversation_transcript).with(conversation, 'contact@example.com')
+        allow(mailer).to receive(:conversation_transcript).with(conversation, 'agent@example.com')
+        allow(mailer).to receive(:conversation_transcript).with(conversation, 'agent1@example.com')
+
+        described_class.new(rule, account, conversation).perform
+      end
+    end
   end
 end

From 76d4c22c2d22f2c88ce59bec6611d016360456a2 Mon Sep 17 00:00:00 2001
From: Vishnu Narayanan <vishnu@chatwoot.com>
Date: Wed, 19 Apr 2023 21:39:10 +0530
Subject: [PATCH 009/101] fix: build_id in heroku installations (#6932)

---
 config/initializers/git_sha.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/config/initializers/git_sha.rb b/config/initializers/git_sha.rb
index c93cc504d..a11e38215 100644
--- a/config/initializers/git_sha.rb
+++ b/config/initializers/git_sha.rb
@@ -5,6 +5,9 @@ def fetch_git_sha
     sha.strip
   elsif File.exist?('.git_sha')
     File.read('.git_sha').strip
+  # This is for Heroku. Ensure heroku labs:enable runtime-dyno-metadata is turned on.
+  elsif ENV.fetch('HEROKU_SLUG_COMMIT', nil).present?
+    ENV.fetch('HEROKU_SLUG_COMMIT', nil)
   else
     'unknown'
   end

From bd1e69e4b446d725298bbd8f4bdccc520733fd3c Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Date: Wed, 19 Apr 2023 23:02:50 +0530
Subject: [PATCH 010/101] feat: Adds new inbox selector with more info for new
 message modal [cw-1358] (#6823)

---
 .../assets/scss/plugins/_multiselect.scss     |  10 +-
 .../widgets/InboxDropdownItem.stories.js      |  37 ++++++
 .../components/widgets/InboxDropdownItem.vue  | 102 ++++++++++++++++
 app/javascript/dashboard/helper/inbox.js      |  50 ++++++++
 .../dashboard/i18n/locale/en/contact.json     |   3 +-
 .../conversation/contact/ConversationForm.vue | 112 ++++++++++++++----
 6 files changed, 282 insertions(+), 32 deletions(-)
 create mode 100644 app/javascript/dashboard/components/widgets/InboxDropdownItem.stories.js
 create mode 100644 app/javascript/dashboard/components/widgets/InboxDropdownItem.vue

diff --git a/app/javascript/dashboard/assets/scss/plugins/_multiselect.scss b/app/javascript/dashboard/assets/scss/plugins/_multiselect.scss
index 4e534bc99..3167b2085 100644
--- a/app/javascript/dashboard/assets/scss/plugins/_multiselect.scss
+++ b/app/javascript/dashboard/assets/scss/plugins/_multiselect.scss
@@ -21,7 +21,7 @@
 
   .multiselect--active {
     >.multiselect__tags {
-      border-color: $color-woot;
+      border-color: var(--w-500);
     }
   }
 
@@ -75,16 +75,13 @@
       }
 
       &.multiselect__option--selected {
-        background: var(--w-400);
-        color: var(--white);
+        background: var(--w-75);
 
         &.multiselect__option--highlight:hover {
-          background: var(--w-600);
-          color: var(--white);
+          background: var(--w-75);
 
           &::after {
             background: transparent;
-            color: var(--white);
           }
 
           &::after:hover {
@@ -196,6 +193,7 @@
     display: flex;
     font-size: var(--font-size-small);
     margin: 0;
+    max-height: 3.8rem;
     padding: var(--space-smaller) var(--space-micro);
   }
 
diff --git a/app/javascript/dashboard/components/widgets/InboxDropdownItem.stories.js b/app/javascript/dashboard/components/widgets/InboxDropdownItem.stories.js
new file mode 100644
index 000000000..b5bce1e41
--- /dev/null
+++ b/app/javascript/dashboard/components/widgets/InboxDropdownItem.stories.js
@@ -0,0 +1,37 @@
+import InboxDropdownItem from './InboxDropdownItem';
+
+export default {
+  title: 'Components/DropDowns/InboxDropdownItem',
+  component: InboxDropdownItem,
+  argTypes: {
+    name: {
+      defaultValue: 'My new inbox',
+      control: {
+        type: 'text',
+      },
+    },
+
+    inboxIdentifier: {
+      defaultValue: 'nithin@mail.com',
+      control: {
+        type: 'text',
+      },
+    },
+
+    channelType: {
+      defaultValue: 'email',
+      control: {
+        type: 'text',
+      },
+    },
+  },
+};
+
+const Template = (args, { argTypes }) => ({
+  props: Object.keys(argTypes),
+  components: { InboxDropdownItem },
+  template: '<inbox-dropdown-item v-bind="$props" ></inbox-dropdown-item>',
+});
+
+export const Banner = Template.bind({});
+Banner.args = {};
diff --git a/app/javascript/dashboard/components/widgets/InboxDropdownItem.vue b/app/javascript/dashboard/components/widgets/InboxDropdownItem.vue
new file mode 100644
index 000000000..e0bb102b2
--- /dev/null
+++ b/app/javascript/dashboard/components/widgets/InboxDropdownItem.vue
@@ -0,0 +1,102 @@
+<template>
+  <div class="option-item--inbox">
+    <span class="badge--icon">
+      <fluent-icon :icon="computedInboxIcon" size="14" />
+    </span>
+    <div class="option__user-data">
+      <h5 class="option__title">
+        {{ name }}
+      </h5>
+      <p class="option__body text-truncate" :title="inboxIdentifier">
+        {{ inboxIdentifier || computedInboxType }}
+      </p>
+    </div>
+  </div>
+</template>
+
+<script>
+import {
+  getInboxClassByType,
+  getReadableInboxByType,
+} from 'dashboard/helper/inbox';
+
+export default {
+  components: {},
+  props: {
+    name: {
+      type: String,
+      default: '',
+    },
+    inboxIdentifier: {
+      type: String,
+      default: '',
+    },
+    channelType: {
+      type: String,
+      default: '',
+    },
+  },
+  computed: {
+    computedInboxIcon() {
+      if (!this.channelType) return 'chat';
+      const classByType = getInboxClassByType(
+        this.channelType,
+        this.inboxIdentifier
+      );
+      return classByType;
+    },
+    computedInboxType() {
+      if (!this.channelType) return 'chat';
+      const classByType = getReadableInboxByType(
+        this.channelType,
+        this.inboxIdentifier
+      );
+      return classByType;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.option-item--inbox {
+  display: flex;
+  align-items: center;
+  height: 3.8rem;
+  min-width: 0;
+  padding: 0 var(--space-smaller);
+}
+.badge--icon {
+  display: inline-flex;
+  border-radius: var(--border-radius-small);
+  margin-right: var(--space-smaller);
+  background: var(--s-25);
+  padding: var(--space-micro);
+  align-items: center;
+  flex-shrink: 0;
+  justify-content: center;
+  width: var(--space-medium);
+  height: var(--space-medium);
+}
+
+.option__user-data {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  min-width: 0;
+  margin-left: var(--space-smaller);
+  margin-right: var(--space-smaller);
+}
+.option__body {
+  display: inline-block;
+  color: var(--s-600);
+  font-size: var(--font-size-small);
+  line-height: 1.3;
+  min-width: 0;
+  margin: 0;
+}
+.option__title {
+  line-height: 1.1;
+  font-size: var(--font-size-mini);
+  margin: 0;
+}
+</style>
diff --git a/app/javascript/dashboard/helper/inbox.js b/app/javascript/dashboard/helper/inbox.js
index e2ff2ec41..1174fd45a 100644
--- a/app/javascript/dashboard/helper/inbox.js
+++ b/app/javascript/dashboard/helper/inbox.js
@@ -1,5 +1,55 @@
 import { INBOX_TYPES } from 'shared/mixins/inboxMixin';
 
+export const getInboxSource = (type, phoneNumber, inbox) => {
+  switch (type) {
+    case INBOX_TYPES.WEB:
+      return inbox.website_url || '';
+
+    case INBOX_TYPES.TWILIO:
+    case INBOX_TYPES.WHATSAPP:
+      return phoneNumber || '';
+
+    case INBOX_TYPES.EMAIL:
+      return inbox.email || '';
+
+    default:
+      return '';
+  }
+};
+export const getReadableInboxByType = (type, phoneNumber) => {
+  switch (type) {
+    case INBOX_TYPES.WEB:
+      return 'livechat';
+
+    case INBOX_TYPES.FB:
+      return 'facebook';
+
+    case INBOX_TYPES.TWITTER:
+      return 'twitter';
+
+    case INBOX_TYPES.TWILIO:
+      return phoneNumber?.startsWith('whatsapp') ? 'whatsapp' : 'sms';
+
+    case INBOX_TYPES.WHATSAPP:
+      return 'whatsapp';
+
+    case INBOX_TYPES.API:
+      return 'api';
+
+    case INBOX_TYPES.EMAIL:
+      return 'email';
+
+    case INBOX_TYPES.TELEGRAM:
+      return 'telegram';
+
+    case INBOX_TYPES.LINE:
+      return 'line';
+
+    default:
+      return 'chat';
+  }
+};
+
 export const getInboxClassByType = (type, phoneNumber) => {
   switch (type) {
     case INBOX_TYPES.WEB:
diff --git a/app/javascript/dashboard/i18n/locale/en/contact.json b/app/javascript/dashboard/i18n/locale/en/contact.json
index bfeb2c4a9..4d1736ed0 100644
--- a/app/javascript/dashboard/i18n/locale/en/contact.json
+++ b/app/javascript/dashboard/i18n/locale/en/contact.json
@@ -182,7 +182,8 @@
         "LABEL": "To"
       },
       "INBOX": {
-        "LABEL": "Inbox",
+        "LABEL": "Via Inbox",
+        "PLACEHOLDER": "Choose source inbox",
         "ERROR": "Select an inbox"
       },
       "SUBJECT": {
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/contact/ConversationForm.vue b/app/javascript/dashboard/routes/dashboard/conversation/contact/ConversationForm.vue
index 51862294e..562ed9b38 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/contact/ConversationForm.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/contact/ConversationForm.vue
@@ -8,17 +8,43 @@
     <div v-else>
       <div class="row gutter-small">
         <div class="columns">
-          <label :class="{ error: $v.targetInbox.$error }">
+          <label>
             {{ $t('NEW_CONVERSATION.FORM.INBOX.LABEL') }}
-            <select v-model="targetInbox">
-              <option
-                v-for="contactableInbox in inboxes"
-                :key="contactableInbox.inbox.id"
-                :value="contactableInbox"
-              >
-                {{ contactableInbox.inbox.name }}
-              </option>
-            </select>
+          </label>
+          <div class="multiselect-wrap--small">
+            <multiselect
+              v-model="targetInbox"
+              track-by="id"
+              label="name"
+              :placeholder="$t('FORMS.MULTISELECT.SELECT')"
+              selected-label=""
+              select-label=""
+              deselect-label=""
+              :max-height="160"
+              :close-on-select="true"
+              :options="[...inboxes, ...inboxes]"
+            >
+              <template slot="singleLabel" slot-scope="{ option }">
+                <inbox-dropdown-item
+                  v-if="option.name"
+                  :name="option.name"
+                  :inbox-identifier="computedInboxSource(option)"
+                  :channel-type="option.channel_type"
+                />
+                <span v-else>
+                  {{ $t('NEW_CONVERSATION.FORM.INBOX.PLACEHOLDER') }}
+                </span>
+              </template>
+              <template slot="option" slot-scope="{ option }">
+                <inbox-dropdown-item
+                  :name="option.name"
+                  :inbox-identifier="computedInboxSource(option)"
+                  :channel-type="option.channel_type"
+                />
+              </template>
+            </multiselect>
+          </div>
+          <label :class="{ error: $v.targetInbox.$error }">
             <span v-if="$v.targetInbox.$error" class="message">
               {{ $t('NEW_CONVERSATION.FORM.INBOX.ERROR') }}
             </span>
@@ -129,10 +155,12 @@ import Thumbnail from 'dashboard/components/widgets/Thumbnail';
 import WootMessageEditor from 'dashboard/components/widgets/WootWriter/Editor';
 import ReplyEmailHead from 'dashboard/components/widgets/conversation/ReplyEmailHead';
 import CannedResponse from 'dashboard/components/widgets/conversation/CannedResponse.vue';
+import InboxDropdownItem from 'dashboard/components/widgets/InboxDropdownItem.vue';
 import WhatsappTemplates from './WhatsappTemplates.vue';
 import alertMixin from 'shared/mixins/alertMixin';
 import { INBOX_TYPES } from 'shared/mixins/inboxMixin';
 import { ExceptionWithMessage } from 'shared/helpers/CustomErrors';
+import { getInboxSource } from 'dashboard/helper/inbox';
 import { required, requiredIf } from 'vuelidate/lib/validators';
 
 export default {
@@ -142,6 +170,7 @@ export default {
     ReplyEmailHead,
     CannedResponse,
     WhatsappTemplates,
+    InboxDropdownItem,
   },
   mixins: [alertMixin],
   props: {
@@ -161,9 +190,9 @@ export default {
       message: '',
       showCannedResponseMenu: false,
       cannedResponseSearchKey: '',
-      selectedInbox: '',
       bccEmails: '',
       ccEmails: '',
+      targetInbox: {},
       whatsappTemplateSelected: false,
     };
   },
@@ -186,8 +215,8 @@ export default {
     }),
     emailMessagePayload() {
       const payload = {
-        inboxId: this.targetInbox.inbox.id,
-        sourceId: this.targetInbox.source_id,
+        inboxId: this.targetInbox.id,
+        sourceId: this.targetInbox.sourceId,
         contactId: this.contact.id,
         message: { content: this.message },
         mailSubject: this.subject,
@@ -202,12 +231,17 @@ export default {
       }
       return payload;
     },
-    targetInbox: {
+    selectedInbox: {
       get() {
-        return this.selectedInbox || {};
+        const inboxList = this.contact.contactableInboxes || [];
+        return (
+          inboxList.find(inbox => inbox.inbox.id === this.targetInbox.id) || {
+            inbox: {},
+          }
+        );
       },
       set(value) {
-        this.selectedInbox = value;
+        this.targetInbox = value.inbox;
       },
     },
     showNoInboxAlert() {
@@ -217,7 +251,11 @@ export default {
       return this.inboxes.length === 0 && !this.uiFlags.isFetchingInboxes;
     },
     inboxes() {
-      return this.contact.contactableInboxes || [];
+      const inboxList = this.contact.contactableInboxes || [];
+      return inboxList.map(inbox => ({
+        ...inbox.inbox,
+        sourceId: inbox.source_id,
+      }));
     },
     isAnEmailInbox() {
       return (
@@ -267,8 +305,8 @@ export default {
     },
     prepareWhatsAppMessagePayload({ message: content, templateParams }) {
       const payload = {
-        inboxId: this.targetInbox.inbox.id,
-        sourceId: this.targetInbox.source_id,
+        inboxId: this.targetInbox.id,
+        sourceId: this.targetInbox.sourceId,
         contactId: this.contact.id,
         message: { content, template_params: templateParams },
         assigneeId: this.currentUser.id,
@@ -311,6 +349,18 @@ export default {
       const payload = this.prepareWhatsAppMessagePayload(messagePayload);
       await this.createConversation(payload);
     },
+    inboxReadableIdentifier(inbox) {
+      return `${inbox.name} (${inbox.channel_type})`;
+    },
+    computedInboxSource(inbox) {
+      if (!inbox.channel_type) return '';
+      const classByType = getInboxSource(
+        inbox.channel_type,
+        inbox.phone_number,
+        inbox
+      );
+      return classByType;
+    },
   },
 };
 </script>
@@ -352,11 +402,23 @@ export default {
   gap: var(--space-small);
 }
 
-::v-deep .mention--box {
-  left: 0;
-  margin: auto;
-  right: 0;
-  top: unset;
-  height: fit-content;
+::v-deep {
+  .mention--box {
+    left: 0;
+    margin: auto;
+    right: 0;
+    top: unset;
+    height: fit-content;
+  }
+
+  /* TODO: Remove when have standardized a component out of multiselect  */
+  .multiselect .multiselect__content .multiselect__option span {
+    display: inline-flex;
+    width: var(--space-medium);
+    color: var(--s-600);
+  }
+  .multiselect .multiselect__content .multiselect__option {
+    padding: var(--space-micro) var(--space-smaller);
+  }
 }
 </style>

From 527042afd1ca917f37e4cdcdbeef4cf7d6e5055c Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Wed, 19 Apr 2023 23:09:37 +0530
Subject: [PATCH 011/101] fix: Code fix from PR #6823 (#6934)

---
 .../dashboard/conversation/contact/ConversationForm.vue       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/dashboard/routes/dashboard/conversation/contact/ConversationForm.vue b/app/javascript/dashboard/routes/dashboard/conversation/contact/ConversationForm.vue
index 562ed9b38..808eb4320 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/contact/ConversationForm.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/contact/ConversationForm.vue
@@ -22,7 +22,7 @@
               deselect-label=""
               :max-height="160"
               :close-on-select="true"
-              :options="[...inboxes, ...inboxes]"
+              :options="[...inboxes]"
             >
               <template slot="singleLabel" slot-scope="{ option }">
                 <inbox-dropdown-item
@@ -155,7 +155,7 @@ import Thumbnail from 'dashboard/components/widgets/Thumbnail';
 import WootMessageEditor from 'dashboard/components/widgets/WootWriter/Editor';
 import ReplyEmailHead from 'dashboard/components/widgets/conversation/ReplyEmailHead';
 import CannedResponse from 'dashboard/components/widgets/conversation/CannedResponse.vue';
-import InboxDropdownItem from 'dashboard/components/widgets/InboxDropdownItem.vue';
+import InboxDropdownItem from 'dashboard/components/widgets/InboxDropdownItem';
 import WhatsappTemplates from './WhatsappTemplates.vue';
 import alertMixin from 'shared/mixins/alertMixin';
 import { INBOX_TYPES } from 'shared/mixins/inboxMixin';

From d1584eea729479c147f97f5189e5cd4064f9f55a Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Thu, 20 Apr 2023 11:31:33 +0530
Subject: [PATCH 012/101] feat: Add an action on automation to change the
 priority (#6925)

---
 .../dashboard/helper/automationHelper.js      | 24 +++++++++++++++++++
 .../settings/automation/constants.js          |  5 ++++
 app/models/automation_rule.rb                 |  2 +-
 app/services/action_service.rb                |  4 ++++
 spec/services/action_service_spec.rb          | 16 +++++++++++++
 5 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/app/javascript/dashboard/helper/automationHelper.js b/app/javascript/dashboard/helper/automationHelper.js
index 581d539bc..dc26177ff 100644
--- a/app/javascript/dashboard/helper/automationHelper.js
+++ b/app/javascript/dashboard/helper/automationHelper.js
@@ -16,6 +16,29 @@ const MESSAGE_CONDITION_VALUES = [
   },
 ];
 
+export const PRIORITY_CONDITION_VALUES = [
+  {
+    id: 'nil',
+    name: 'None',
+  },
+  {
+    id: 'low',
+    name: 'Low',
+  },
+  {
+    id: 'medium',
+    name: 'Medium',
+  },
+  {
+    id: 'high',
+    name: 'High',
+  },
+  {
+    id: 'urgent',
+    name: 'Urgent',
+  },
+];
+
 export const getCustomAttributeInputType = key => {
   const customAttributeMap = {
     date: 'date',
@@ -103,6 +126,7 @@ export const getActionOptions = ({ agents, teams, labels, type }) => {
     assign_team: teams,
     send_email_to_team: teams,
     add_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 f052be66d..4c19970d8 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/automation/constants.js
+++ b/app/javascript/dashboard/routes/dashboard/settings/automation/constants.js
@@ -575,4 +575,9 @@ export const AUTOMATION_ACTION_TYPES = [
     label: 'Send a message',
     inputType: 'textarea',
   },
+  {
+    key: 'change_priority',
+    label: 'Change Priority',
+    inputType: 'search_select',
+  },
 ];
diff --git a/app/models/automation_rule.rb b/app/models/automation_rule.rb
index 9342bc883..0628a8b7e 100644
--- a/app/models/automation_rule.rb
+++ b/app/models/automation_rule.rb
@@ -33,7 +33,7 @@ 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 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 send_email_transcript].freeze
+                     change_status resolve_conversation snooze_conversation change_priority send_email_transcript].freeze
 
   def file_base_data
     files.map do |file|
diff --git a/app/services/action_service.rb b/app/services/action_service.rb
index 77f3c6b9a..6e8a3b8ca 100644
--- a/app/services/action_service.rb
+++ b/app/services/action_service.rb
@@ -19,6 +19,10 @@ class ActionService
     @conversation.update!(status: status[0])
   end
 
+  def change_priority(priority)
+    @conversation.update!(priority: (priority[0] == 'nil' ? nil : priority[0]))
+  end
+
   def add_label(labels)
     return if labels.empty?
 
diff --git a/spec/services/action_service_spec.rb b/spec/services/action_service_spec.rb
index 490873592..8cade58a6 100644
--- a/spec/services/action_service_spec.rb
+++ b/spec/services/action_service_spec.rb
@@ -11,5 +11,21 @@ describe ::ActionService do
       expect(conversation.reload.status).to eq('resolved')
     end
   end
+
+  describe '#change_priority' do
+    let(:conversation) { create(:conversation) }
+    let(:action_service) { described_class.new(conversation) }
+
+    it 'changes the priority of the conversation to medium' do
+      action_service.change_priority(['medium'])
+      expect(conversation.reload.priority).to eq('medium')
+    end
+
+    it 'changes the priority of the conversation to nil' do
+      action_service.change_priority(['nil'])
+      expect(conversation.reload.priority).to be_nil
+    end
+  end
+
   # TODO: Expand this test suite
 end

From 6b2736aa63cfc49be998910d205716f7e525fae9 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Thu, 20 Apr 2023 12:55:04 +0530
Subject: [PATCH 013/101] fix: inconsistency in report and summary for metric
 counts (#6817)

* feat: include timezone offset in summary calculation

* fix: exlcude end in date range

* test: explicit end of day

* fix: test for report builder

* fix: reports.spec.js

---------

Co-authored-by: Tejaswini Chile <tejaswini@chatwoot.com>
---
 .../api/v2/accounts/reports_controller.rb     |  6 +++--
 app/helpers/date_range_helper.rb              |  2 +-
 app/javascript/dashboard/api/reports.js       |  1 +
 .../dashboard/api/specs/reports.spec.js       |  6 ++++-
 spec/builders/v2/report_builder_spec.rb       | 24 +++++++++---------
 .../api/v2/accounts/report_controller_spec.rb | 25 ++++++++++---------
 6 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/app/controllers/api/v2/accounts/reports_controller.rb b/app/controllers/api/v2/accounts/reports_controller.rb
index 8e95ea594..260400feb 100644
--- a/app/controllers/api/v2/accounts/reports_controller.rb
+++ b/app/controllers/api/v2/accounts/reports_controller.rb
@@ -72,14 +72,16 @@ class Api::V2::Accounts::ReportsController < Api::V1::Accounts::BaseController
   def current_summary_params
     common_params.merge({
                           since: range[:current][:since],
-                          until: range[:current][:until]
+                          until: range[:current][:until],
+                          timezone_offset: params[:timezone_offset]
                         })
   end
 
   def previous_summary_params
     common_params.merge({
                           since: range[:previous][:since],
-                          until: range[:previous][:until]
+                          until: range[:previous][:until],
+                          timezone_offset: params[:timezone_offset]
                         })
   end
 
diff --git a/app/helpers/date_range_helper.rb b/app/helpers/date_range_helper.rb
index 175d6c72b..090512c4f 100644
--- a/app/helpers/date_range_helper.rb
+++ b/app/helpers/date_range_helper.rb
@@ -7,7 +7,7 @@ module DateRangeHelper
   def range
     return if params[:since].blank? || params[:until].blank?
 
-    parse_date_time(params[:since])..parse_date_time(params[:until])
+    parse_date_time(params[:since])...parse_date_time(params[:until])
   end
 
   def parse_date_time(datetime)
diff --git a/app/javascript/dashboard/api/reports.js b/app/javascript/dashboard/api/reports.js
index 89b8554a5..7bc07b565 100644
--- a/app/javascript/dashboard/api/reports.js
+++ b/app/javascript/dashboard/api/reports.js
@@ -40,6 +40,7 @@ class ReportsAPI extends ApiClient {
         id,
         group_by: groupBy,
         business_hours: businessHours,
+        timezone_offset: getTimeOffset(),
       },
     });
   }
diff --git a/app/javascript/dashboard/api/specs/reports.spec.js b/app/javascript/dashboard/api/specs/reports.spec.js
index b59a23ad5..368997859 100644
--- a/app/javascript/dashboard/api/specs/reports.spec.js
+++ b/app/javascript/dashboard/api/specs/reports.spec.js
@@ -42,9 +42,13 @@ describe('#Reports API', () => {
         '/api/v2/reports/summary',
         {
           params: {
+            business_hours: undefined,
+            group_by: undefined,
+            id: undefined,
             since: 1621103400,
-            until: 1621621800,
+            timezone_offset: -0,
             type: 'account',
+            until: 1621621800,
           },
         }
       );
diff --git a/spec/builders/v2/report_builder_spec.rb b/spec/builders/v2/report_builder_spec.rb
index 714e5fda1..7c6c78179 100644
--- a/spec/builders/v2/report_builder_spec.rb
+++ b/spec/builders/v2/report_builder_spec.rb
@@ -57,7 +57,7 @@ describe ::V2::ReportBuilder do
           metric: 'conversations_count',
           type: :account,
           since: (Time.zone.today - 3.days).to_time.to_i.to_s,
-          until: Time.zone.today.to_time.to_i.to_s
+          until: Time.zone.today.end_of_day.to_time.to_i.to_s
         }
 
         builder = V2::ReportBuilder.new(account, params)
@@ -72,7 +72,7 @@ describe ::V2::ReportBuilder do
           metric: 'incoming_messages_count',
           type: :account,
           since: (Time.zone.today - 3.days).to_time.to_i.to_s,
-          until: Time.zone.today.to_time.to_i.to_s
+          until: Time.zone.today.end_of_day.to_time.to_i.to_s
         }
 
         builder = V2::ReportBuilder.new(account, params)
@@ -87,7 +87,7 @@ describe ::V2::ReportBuilder do
           metric: 'outgoing_messages_count',
           type: :account,
           since: (Time.zone.today - 3.days).to_time.to_i.to_s,
-          until: Time.zone.today.to_time.to_i.to_s
+          until: Time.zone.today.end_of_day.to_time.to_i.to_s
         }
 
         builder = V2::ReportBuilder.new(account, params)
@@ -102,7 +102,7 @@ describe ::V2::ReportBuilder do
           metric: 'resolutions_count',
           type: :account,
           since: (Time.zone.today - 3.days).to_time.to_i.to_s,
-          until: Time.zone.today.to_time.to_i.to_s
+          until: Time.zone.today.end_of_day.to_time.to_i.to_s
         }
 
         conversations = account.conversations.where('created_at < ?', 1.day.ago)
@@ -119,7 +119,7 @@ describe ::V2::ReportBuilder do
           metric: 'avg_first_response_time',
           type: :account,
           since: (Time.zone.today - 3.days).to_time.to_i.to_s,
-          until: Time.zone.today.to_time.to_i.to_s
+          until: Time.zone.today.end_of_day.to_time.to_i.to_s
         }
 
         builder = V2::ReportBuilder.new(account, params)
@@ -132,7 +132,7 @@ describe ::V2::ReportBuilder do
         params = {
           type: :account,
           since: (Time.zone.today - 3.days).to_time.to_i.to_s,
-          until: Time.zone.today.to_time.to_i.to_s
+          until: Time.zone.today.end_of_day.to_time.to_i.to_s
         }
 
         builder = V2::ReportBuilder.new(account, params)
@@ -149,7 +149,7 @@ describe ::V2::ReportBuilder do
         params = {
           type: :account,
           since: (Time.zone.today - 3.days).to_time.to_i.to_s,
-          until: Time.zone.today.to_time.to_i.to_s,
+          until: Time.zone.today.end_of_day.to_time.to_i.to_s,
           group_by: 'test'.to_s
         }
 
@@ -165,7 +165,7 @@ describe ::V2::ReportBuilder do
           type: :label,
           id: label_2.id,
           since: (Time.zone.today - 3.days).to_time.to_i.to_s,
-          until: Time.zone.today.to_time.to_i.to_s
+          until: Time.zone.today.end_of_day.to_time.to_i.to_s
         }
 
         builder = V2::ReportBuilder.new(account, params)
@@ -231,7 +231,7 @@ describe ::V2::ReportBuilder do
           type: :label,
           id: label_2.id,
           since: (Time.zone.today - 3.days).to_time.to_i.to_s,
-          until: Time.zone.today.to_time.to_i.to_s
+          until: Time.zone.today.end_of_day.to_time.to_i.to_s
         }
 
         builder = V2::ReportBuilder.new(account, params)
@@ -244,7 +244,7 @@ describe ::V2::ReportBuilder do
           type: :label,
           id: label_2.id,
           since: (Time.zone.today - 3.days).to_time.to_i.to_s,
-          until: Time.zone.today.to_time.to_i.to_s
+          until: Time.zone.today.end_of_day.to_time.to_i.to_s
         }
 
         builder = V2::ReportBuilder.new(account, params)
@@ -262,7 +262,7 @@ describe ::V2::ReportBuilder do
           type: :label,
           id: label_2.id,
           since: (Time.zone.today - 3.days).to_time.to_i.to_s,
-          until: Time.zone.today.to_time.to_i.to_s,
+          until: Time.zone.today.end_of_day.to_time.to_i.to_s,
           group_by: 'week'.to_s
         }
 
@@ -281,7 +281,7 @@ describe ::V2::ReportBuilder do
           type: :label,
           id: label_2.id,
           since: (Time.zone.today - 3.days).to_time.to_i.to_s,
-          until: Time.zone.today.to_time.to_i.to_s,
+          until: Time.zone.today.end_of_day.to_time.to_i.to_s,
           group_by: 'test'.to_s
         }
 
diff --git a/spec/controllers/api/v2/accounts/report_controller_spec.rb b/spec/controllers/api/v2/accounts/report_controller_spec.rb
index 6087b426a..8b2c51450 100644
--- a/spec/controllers/api/v2/accounts/report_controller_spec.rb
+++ b/spec/controllers/api/v2/accounts/report_controller_spec.rb
@@ -8,7 +8,8 @@ RSpec.describe 'Reports API', type: :request do
   let!(:inbox) { create(:inbox, account: account) }
   let(:inbox_member) { create(:inbox_member, user: user, inbox: inbox) }
   let(:default_timezone) { ActiveSupport::TimeZone[0]&.name }
-  let(:date_timestamp) { Time.current.in_time_zone(default_timezone).beginning_of_day.to_i }
+  let(:start_of_today) { Time.current.in_time_zone(default_timezone).beginning_of_day.to_i }
+  let(:end_of_today) { Time.current.in_time_zone(default_timezone).end_of_day.to_i }
   let(:params) { { timezone_offset: Time.zone.utc_offset } }
   let(:new_account) { create(:account) }
 
@@ -31,8 +32,8 @@ RSpec.describe 'Reports API', type: :request do
         super().merge(
           metric: 'conversations_count',
           type: :account,
-          since: date_timestamp.to_s,
-          until: date_timestamp.to_s
+          since: start_of_today.to_s,
+          until: end_of_today.to_s
         )
       end
 
@@ -54,7 +55,7 @@ RSpec.describe 'Reports API', type: :request do
         expect(response).to have_http_status(:success)
         json_response = JSON.parse(response.body)
 
-        current_day_metric = json_response.select { |x| x['timestamp'] == date_timestamp }
+        current_day_metric = json_response.select { |x| x['timestamp'] == start_of_today }
         expect(current_day_metric.length).to eq(1)
         expect(current_day_metric[0]['value']).to eq(10)
       end
@@ -162,8 +163,8 @@ RSpec.describe 'Reports API', type: :request do
       let(:params) do
         super().merge(
           type: :account,
-          since: date_timestamp.to_s,
-          until: date_timestamp.to_s
+          since: start_of_today.to_s,
+          until: end_of_today.to_s
         )
       end
 
@@ -203,7 +204,7 @@ RSpec.describe 'Reports API', type: :request do
       let(:params) do
         super().merge(
           since: 30.days.ago.to_i.to_s,
-          until: date_timestamp.to_s
+          until: end_of_today.to_s
         )
       end
 
@@ -232,7 +233,7 @@ RSpec.describe 'Reports API', type: :request do
         super().merge(
           type: :agent,
           since: 30.days.ago.to_i.to_s,
-          until: date_timestamp.to_s
+          until: end_of_today.to_s
         )
       end
 
@@ -272,7 +273,7 @@ RSpec.describe 'Reports API', type: :request do
       let(:params) do
         super().merge(
           since: 30.days.ago.to_i.to_s,
-          until: date_timestamp.to_s
+          until: end_of_today.to_s
         )
       end
 
@@ -307,7 +308,7 @@ RSpec.describe 'Reports API', type: :request do
       let(:params) do
         super().merge(
           since: 30.days.ago.to_i.to_s,
-          until: date_timestamp.to_s
+          until: end_of_today.to_s
         )
       end
 
@@ -342,7 +343,7 @@ RSpec.describe 'Reports API', type: :request do
       let(:params) do
         super().merge(
           since: 30.days.ago.to_i.to_s,
-          until: date_timestamp.to_s
+          until: end_of_today.to_s
         )
       end
 
@@ -377,7 +378,7 @@ RSpec.describe 'Reports API', type: :request do
       let(:params) do
         super().merge(
           since: 7.days.ago.to_i.to_s,
-          until: date_timestamp.to_s
+          until: end_of_today.to_s
         )
       end
 

From a34729c153fa665917fe0c56f3277191ac48164c Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Thu, 20 Apr 2023 16:41:53 +0530
Subject: [PATCH 014/101] feat: add activity message for priority change
 (#6933)

* feat: add priority const

* feat: add toggle priority method

* feat: update controller route and specs

* refactor: status change method

* refactor: abstract label change and mute activity

* feat: add priority change_activity

* fix: interpolation for previous_changes

* refactor: reduce cognitive complexity of priority_change_activity

* refactor: move priority activity message handler to a separate module

* refactor: move typing logic to a service

* refactor: tests to reduce complexity

* fix: typo

* fix: constants

* fix: priority conditions

* fix: add a response

* fix: argument destructuring in I18n.t

---------

Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
---
 .../v1/accounts/conversations_controller.rb   | 18 ++--
 .../dashboard/api/inbox/conversation.js       |  6 ++
 app/javascript/shared/constants/messages.js   |  8 ++
 .../concerns/activity_message_handler.rb      | 83 +++++++++----------
 .../priority_activity_message_handler.rb      | 33 ++++++++
 app/models/conversation.rb                    |  5 ++
 .../conversations/typing_status_manager.rb    | 26 ++++++
 config/locales/en.yml                         |  4 +
 config/routes.rb                              |  1 +
 .../accounts/conversations_controller_spec.rb | 46 ++++++++++
 spec/models/conversation_spec.rb              | 41 +++++++++
 11 files changed, 217 insertions(+), 54 deletions(-)
 create mode 100644 app/models/concerns/priority_activity_message_handler.rb
 create mode 100644 app/services/conversations/typing_status_manager.rb

diff --git a/app/controllers/api/v1/accounts/conversations_controller.rb b/app/controllers/api/v1/accounts/conversations_controller.rb
index 10a676738..6e580a497 100644
--- a/app/controllers/api/v1/accounts/conversations_controller.rb
+++ b/app/controllers/api/v1/accounts/conversations_controller.rb
@@ -64,13 +64,14 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
     assign_conversation if @conversation.status == 'open' && Current.user.is_a?(User) && Current.user&.agent?
   end
 
+  def toggle_priority
+    @conversation.toggle_priority(params[:priority])
+    head :ok
+  end
+
   def toggle_typing_status
-    case params[:typing_status]
-    when 'on'
-      trigger_typing_event(CONVERSATION_TYPING_ON, params[:is_private])
-    when 'off'
-      trigger_typing_event(CONVERSATION_TYPING_OFF, params[:is_private])
-    end
+    typing_status_manager = ::Conversations::TypingStatusManager.new(@conversation, current_user, params)
+    typing_status_manager.toggle_typing_status
     head :ok
   end
 
@@ -111,11 +112,6 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
     @conversation.update_assignee(@agent)
   end
 
-  def trigger_typing_event(event, is_private)
-    user = current_user.presence || @resource
-    Rails.configuration.dispatcher.dispatch(event, Time.zone.now, conversation: @conversation, user: user, is_private: is_private)
-  end
-
   def conversation
     @conversation ||= Current.account.conversations.find_by!(display_id: params[:id])
     authorize @conversation.inbox, :show?
diff --git a/app/javascript/dashboard/api/inbox/conversation.js b/app/javascript/dashboard/api/inbox/conversation.js
index 8d5f5b82c..93dc884f9 100644
--- a/app/javascript/dashboard/api/inbox/conversation.js
+++ b/app/javascript/dashboard/api/inbox/conversation.js
@@ -52,6 +52,12 @@ class ConversationApi extends ApiClient {
     });
   }
 
+  togglePriority({ conversationId, priority }) {
+    return axios.post(`${this.url}/${conversationId}/toggle_priority`, {
+      priority,
+    });
+  }
+
   assignAgent({ conversationId, agentId }) {
     return axios.post(
       `${this.url}/${conversationId}/assignments?assignee_id=${agentId}`,
diff --git a/app/javascript/shared/constants/messages.js b/app/javascript/shared/constants/messages.js
index c7a1873ab..63ca99afc 100644
--- a/app/javascript/shared/constants/messages.js
+++ b/app/javascript/shared/constants/messages.js
@@ -19,6 +19,14 @@ export const CONVERSATION_STATUS = {
   PENDING: 'pending',
   SNOOZED: 'snoozed',
 };
+
+export const CONVERSATION_PRIORITY = {
+  URGENT: 'urgent',
+  HIGH: 'high',
+  LOW: 'low',
+  MEDIUM: 'medium',
+};
+
 // Size in mega bytes
 export const MAXIMUM_FILE_UPLOAD_SIZE = 40;
 export const MAXIMUM_FILE_UPLOAD_SIZE_TWILIO_SMS_CHANNEL = 5;
diff --git a/app/models/concerns/activity_message_handler.rb b/app/models/concerns/activity_message_handler.rb
index 067bccbc1..3c53b6798 100644
--- a/app/models/concerns/activity_message_handler.rb
+++ b/app/models/concerns/activity_message_handler.rb
@@ -1,80 +1,77 @@
 module ActivityMessageHandler
   extend ActiveSupport::Concern
 
+  include PriorityActivityMessageHandler
+
   private
 
   def create_activity
     user_name = Current.user.name if Current.user.present?
     status_change_activity(user_name) if saved_change_to_status?
+    priority_change_activity(user_name) if saved_change_to_priority?
     create_label_change(activity_message_ownner(user_name)) if saved_change_to_label_list?
   end
 
   def status_change_activity(user_name)
-    return send_automation_activity if Current.executed_by.present?
+    content = if Current.executed_by.present?
+                automation_status_change_activity_content
+              else
+                user_status_change_activity_content(user_name)
+              end
 
-    create_status_change_message(user_name)
+    ::Conversations::ActivityMessageJob.perform_later(self, activity_message_params(content)) if content
+  end
+
+  def user_status_change_activity_content(user_name)
+    if user_name
+      I18n.t("conversations.activity.status.#{status}", user_name: user_name)
+    elsif Current.contact.present? && resolved?
+      I18n.t('conversations.activity.status.contact_resolved', contact_name: Current.contact.name.capitalize)
+    elsif resolved?
+      I18n.t('conversations.activity.status.auto_resolved', duration: auto_resolve_duration)
+    end
+  end
+
+  def automation_status_change_activity_content
+    if Current.executed_by.instance_of?(AutomationRule)
+      I18n.t("conversations.activity.status.#{status}", user_name: 'Automation System')
+    elsif Current.executed_by.instance_of?(Contact)
+      Current.executed_by = nil
+      I18n.t('conversations.activity.status.system_auto_open')
+    end
   end
 
   def activity_message_params(content)
     { account_id: account_id, inbox_id: inbox_id, message_type: :activity, content: content }
   end
 
-  def create_status_change_message(user_name)
-    content = if user_name
-                I18n.t("conversations.activity.status.#{status}", user_name: user_name)
-              elsif Current.contact.present? && resolved?
-                I18n.t('conversations.activity.status.contact_resolved', contact_name: Current.contact.name.capitalize)
-              elsif resolved?
-                I18n.t('conversations.activity.status.auto_resolved', duration: auto_resolve_duration)
-              end
-
-    ::Conversations::ActivityMessageJob.perform_later(self, activity_message_params(content)) if content
-  end
-
-  def send_automation_activity
-    content = if Current.executed_by.instance_of?(AutomationRule)
-                I18n.t("conversations.activity.status.#{status}", user_name: 'Automation System')
-              elsif Current.executed_by.instance_of?(Contact)
-                Current.executed_by = nil
-                I18n.t('conversations.activity.status.system_auto_open')
-              end
-
-    ::Conversations::ActivityMessageJob.perform_later(self, activity_message_params(content)) if content
-  end
-
   def create_label_added(user_name, labels = [])
-    return unless labels.size.positive?
-
-    params = { user_name: user_name, labels: labels.join(', ') }
-    content = I18n.t('conversations.activity.labels.added', **params)
-
-    ::Conversations::ActivityMessageJob.perform_later(self, activity_message_params(content)) if content
+    create_label_change_activity('added', user_name, labels)
   end
 
   def create_label_removed(user_name, labels = [])
+    create_label_change_activity('removed', user_name, labels)
+  end
+
+  def create_label_change_activity(change_type, user_name, labels = [])
     return unless labels.size.positive?
 
-    params = { user_name: user_name, labels: labels.join(', ') }
-    content = I18n.t('conversations.activity.labels.removed', **params)
-
+    content = I18n.t("conversations.activity.labels.#{change_type}", user_name: user_name, labels: labels.join(', '))
     ::Conversations::ActivityMessageJob.perform_later(self, activity_message_params(content)) if content
   end
 
   def create_muted_message
-    return unless Current.user
-
-    params = { user_name: Current.user.name }
-    content = I18n.t('conversations.activity.muted', **params)
-
-    ::Conversations::ActivityMessageJob.perform_later(self, activity_message_params(content)) if content
+    create_mute_change_activity('muted')
   end
 
   def create_unmuted_message
+    create_mute_change_activity('unmuted')
+  end
+
+  def create_mute_change_activity(change_type)
     return unless Current.user
 
-    params = { user_name: Current.user.name }
-    content = I18n.t('conversations.activity.unmuted', **params)
-
+    content = I18n.t("conversations.activity.#{change_type}", user_name: Current.user.name)
     ::Conversations::ActivityMessageJob.perform_later(self, activity_message_params(content)) if content
   end
 
diff --git a/app/models/concerns/priority_activity_message_handler.rb b/app/models/concerns/priority_activity_message_handler.rb
new file mode 100644
index 000000000..748c41bdc
--- /dev/null
+++ b/app/models/concerns/priority_activity_message_handler.rb
@@ -0,0 +1,33 @@
+module PriorityActivityMessageHandler
+  extend ActiveSupport::Concern
+
+  private
+
+  def priority_change_activity(user_name)
+    old_priority, new_priority = previous_changes.values_at('priority')[0]
+    return unless priority_change?(old_priority, new_priority)
+
+    user = Current.executed_by.instance_of?(AutomationRule) ? 'Automation System' : user_name
+    content = build_priority_change_content(user, old_priority, new_priority)
+
+    ::Conversations::ActivityMessageJob.perform_later(self, activity_message_params(content)) if content
+  end
+
+  def priority_change?(old_priority, new_priority)
+    old_priority.present? || new_priority.present?
+  end
+
+  def build_priority_change_content(user_name, old_priority = nil, new_priority = nil)
+    change_type = get_priority_change_type(old_priority, new_priority)
+
+    I18n.t("conversations.activity.priority.#{change_type}", user_name: user_name, new_priority: new_priority, old_priority: old_priority)
+  end
+
+  def get_priority_change_type(old_priority, new_priority)
+    case [old_priority.present?, new_priority.present?]
+    when [true, true] then 'updated'
+    when [false, true] then 'added'
+    when [true, false] then 'removed'
+    end
+  end
+end
diff --git a/app/models/conversation.rb b/app/models/conversation.rb
index 9230fac61..299a7f2a5 100644
--- a/app/models/conversation.rb
+++ b/app/models/conversation.rb
@@ -149,6 +149,11 @@ class Conversation < ApplicationRecord
     save
   end
 
+  def toggle_priority(priority = nil)
+    self.priority = priority.presence
+    save
+  end
+
   def bot_handoff!
     open!
     dispatcher_dispatch(CONVERSATION_BOT_HANDOFF)
diff --git a/app/services/conversations/typing_status_manager.rb b/app/services/conversations/typing_status_manager.rb
new file mode 100644
index 000000000..e3e9cebc6
--- /dev/null
+++ b/app/services/conversations/typing_status_manager.rb
@@ -0,0 +1,26 @@
+class Conversations::TypingStatusManager
+  include Events::Types
+
+  attr_reader :conversation, :user, :params
+
+  def initialize(conversation, user, params)
+    @conversation = conversation
+    @user = user
+    @params = params
+  end
+
+  def trigger_typing_event(event, is_private)
+    user = @user.presence || @resource
+    Rails.configuration.dispatcher.dispatch(event, Time.zone.now, conversation: @conversation, user: user, is_private: is_private)
+  end
+
+  def toggle_typing_status
+    case params[:typing_status]
+    when 'on'
+      trigger_typing_event(CONVERSATION_TYPING_ON, params[:is_private])
+    when 'off'
+      trigger_typing_event(CONVERSATION_TYPING_OFF, params[:is_private])
+    end
+    # Return the head :ok response from the controller
+  end
+end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 97aa64976..189d04102 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -129,6 +129,10 @@ en:
         snoozed: "Conversation was snoozed by %{user_name}"
         auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
         system_auto_open: System reopened the conversation due to a new incoming message.
+      priority:
+        added: '%{user_name} set the priority to %{new_priority}'
+        updated: '%{user_name} changed the priority from %{old_priority} to %{new_priority}'
+        removed: '%{user_name} removed the priority'
       assignee:
         self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "Assigned to %{assignee_name} by %{user_name}"
diff --git a/config/routes.rb b/config/routes.rb
index 327f991c9..c28dfd41c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -91,6 +91,7 @@ Rails.application.routes.draw do
               post :unmute
               post :transcript
               post :toggle_status
+              post :toggle_priority
               post :toggle_typing_status
               post :update_last_seen
               post :unread
diff --git a/spec/controllers/api/v1/accounts/conversations_controller_spec.rb b/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
index f38d9c1bf..9689bdd4d 100644
--- a/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
@@ -434,6 +434,52 @@ RSpec.describe 'Conversations API', type: :request do
     end
   end
 
+  describe 'POST /api/v1/accounts/{account.id}/conversations/:id/toggle_priority' do
+    let(:conversation) { create(:conversation, account: account) }
+
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        post "/api/v1/accounts/#{account.id}/conversations/#{conversation.display_id}/toggle_priority"
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated user' do
+      let(:agent) { create(:user, account: account, role: :agent) }
+      let(:administrator) { create(:user, account: account, role: :administrator) }
+
+      before do
+        create(:inbox_member, user: agent, inbox: conversation.inbox)
+      end
+
+      it 'toggles the conversation priority to nil if no value is passed' do
+        expect(conversation.priority).to be_nil
+
+        post "/api/v1/accounts/#{account.id}/conversations/#{conversation.display_id}/toggle_priority",
+             headers: agent.create_new_auth_token,
+             params: { priority: 'low' },
+             as: :json
+
+        expect(response).to have_http_status(:success)
+        expect(conversation.reload.priority).to eq('low')
+      end
+
+      it 'toggles the conversation priority' do
+        conversation.priority = 'low'
+        conversation.save!
+        expect(conversation.reload.priority).to eq('low')
+
+        post "/api/v1/accounts/#{account.id}/conversations/#{conversation.display_id}/toggle_priority",
+             headers: agent.create_new_auth_token,
+             as: :json
+
+        expect(response).to have_http_status(:success)
+        expect(conversation.reload.priority).to be_nil
+      end
+    end
+  end
+
   describe 'POST /api/v1/accounts/{account.id}/conversations/:id/toggle_typing_status' do
     let(:conversation) { create(:conversation, account: account) }
 
diff --git a/spec/models/conversation_spec.rb b/spec/models/conversation_spec.rb
index 2da0af0ca..163c27452 100644
--- a/spec/models/conversation_spec.rb
+++ b/spec/models/conversation_spec.rb
@@ -292,6 +292,47 @@ RSpec.describe Conversation, type: :model do
     end
   end
 
+  describe '#toggle_priority' do
+    it 'defaults priority to nil when created' do
+      conversation = create(:conversation, status: 'open')
+      expect(conversation.priority).to be_nil
+    end
+
+    it 'toggles the priority to nil if nothing is passed' do
+      conversation = create(:conversation, status: 'open', priority: 'high')
+      expect(conversation.toggle_priority).to be(true)
+      expect(conversation.reload.priority).to be_nil
+    end
+
+    it 'sets the priority to low' do
+      conversation = create(:conversation, status: 'open')
+
+      expect(conversation.toggle_priority('low')).to be(true)
+      expect(conversation.reload.priority).to eq('low')
+    end
+
+    it 'sets the priority to medium' do
+      conversation = create(:conversation, status: 'open')
+
+      expect(conversation.toggle_priority('medium')).to be(true)
+      expect(conversation.reload.priority).to eq('medium')
+    end
+
+    it 'sets the priority to high' do
+      conversation = create(:conversation, status: 'open')
+
+      expect(conversation.toggle_priority('high')).to be(true)
+      expect(conversation.reload.priority).to eq('high')
+    end
+
+    it 'sets the priority to urgent' do
+      conversation = create(:conversation, status: 'open')
+
+      expect(conversation.toggle_priority('urgent')).to be(true)
+      expect(conversation.reload.priority).to eq('urgent')
+    end
+  end
+
   describe '#ensure_snooze_until_reset' do
     it 'resets the snoozed_until when status is toggled' do
       conversation = create(:conversation, status: 'snoozed', snoozed_until: 2.days.from_now)

From ac6de50b4d49c0bfbed7b733261f833b7e87ce88 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Thu, 20 Apr 2023 18:10:05 +0530
Subject: [PATCH 015/101] feat: Add a condition for filters based on the
 priority of automation (#6939)

---
 .../dashboard/helper/automationHelper.js      |  1 +
 .../i18n/locale/en/advancedFilters.json       |  1 +
 .../settings/automation/constants.js          | 21 +++++++++++++++++++
 app/models/automation_rule.rb                 |  2 +-
 4 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/app/javascript/dashboard/helper/automationHelper.js b/app/javascript/dashboard/helper/automationHelper.js
index dc26177ff..cb68cbd43 100644
--- a/app/javascript/dashboard/helper/automationHelper.js
+++ b/app/javascript/dashboard/helper/automationHelper.js
@@ -163,6 +163,7 @@ export const getConditionOptions = ({
     conversation_language: languages,
     country_code: countries,
     message_type: MESSAGE_CONDITION_VALUES,
+    priority: PRIORITY_CONDITION_VALUES,
   };
 
   return conditionFilterMaps[type];
diff --git a/app/javascript/dashboard/i18n/locale/en/advancedFilters.json b/app/javascript/dashboard/i18n/locale/en/advancedFilters.json
index a32c1bd9d..361c0c8ae 100644
--- a/app/javascript/dashboard/i18n/locale/en/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/en/advancedFilters.json
@@ -38,6 +38,7 @@
       "CAMPAIGN_NAME": "Campaign Name",
       "LABELS": "Labels",
       "BROWSER_LANGUAGE": "Browser Language",
+      "PRIORITY": "Priority",
       "COUNTRY_NAME": "Country Name",
       "REFERER_LINK": "Referer link",
       "CUSTOM_ATTRIBUTE_LIST": "List",
diff --git a/app/javascript/dashboard/routes/dashboard/settings/automation/constants.js b/app/javascript/dashboard/routes/dashboard/settings/automation/constants.js
index 4c19970d8..fc98e315a 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/automation/constants.js
+++ b/app/javascript/dashboard/routes/dashboard/settings/automation/constants.js
@@ -175,6 +175,13 @@ export const AUTOMATIONS = {
         inputType: 'multi_select',
         filterOperators: OPERATOR_TYPES_1,
       },
+      {
+        key: 'priority',
+        name: 'Priority',
+        attributeI18nKey: 'PRIORITY',
+        inputType: 'multi_select',
+        filterOperators: OPERATOR_TYPES_1,
+      },
     ],
     actions: [
       {
@@ -313,6 +320,13 @@ export const AUTOMATIONS = {
         inputType: 'multi_select',
         filterOperators: OPERATOR_TYPES_1,
       },
+      {
+        key: 'priority',
+        name: 'Priority',
+        attributeI18nKey: 'PRIORITY',
+        inputType: 'multi_select',
+        filterOperators: OPERATOR_TYPES_1,
+      },
     ],
     actions: [
       {
@@ -444,6 +458,13 @@ export const AUTOMATIONS = {
         inputType: 'multi_select',
         filterOperators: OPERATOR_TYPES_1,
       },
+      {
+        key: 'priority',
+        name: 'Priority',
+        attributeI18nKey: 'PRIORITY',
+        inputType: 'multi_select',
+        filterOperators: OPERATOR_TYPES_1,
+      },
     ],
     actions: [
       {
diff --git a/app/models/automation_rule.rb b/app/models/automation_rule.rb
index 0628a8b7e..0159ff846 100644
--- a/app/models/automation_rule.rb
+++ b/app/models/automation_rule.rb
@@ -31,7 +31,7 @@ class AutomationRule < ApplicationRecord
   scope :active, -> { where(active: true) }
 
   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 conversation_language].freeze
+                        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
 

From 3a35281b3f325fbaaa518df29572e8efb7fdf6d0 Mon Sep 17 00:00:00 2001
From: Chatwoot Bot <92152627+chatwoot-bot@users.noreply.github.com>
Date: Fri, 21 Apr 2023 02:58:56 -0700
Subject: [PATCH 016/101] chore: Update translations  (#6941)

Co-authored-by: Sojan Jose <sojan@pepalo.com>
---
 .../dashboard/i18n/locale/ar/auditLogs.json   | 24 ++++++
 .../dashboard/i18n/locale/ar/contact.json     |  6 +-
 .../dashboard/i18n/locale/ar/inboxMgmt.json   |  2 +
 .../dashboard/i18n/locale/ar/settings.json    |  1 +
 .../dashboard/i18n/locale/bg/auditLogs.json   | 24 ++++++
 .../dashboard/i18n/locale/bg/contact.json     |  6 +-
 .../dashboard/i18n/locale/bg/inboxMgmt.json   |  2 +
 .../dashboard/i18n/locale/bg/settings.json    |  1 +
 .../dashboard/i18n/locale/ca/auditLogs.json   | 24 ++++++
 .../dashboard/i18n/locale/ca/contact.json     |  6 +-
 .../dashboard/i18n/locale/ca/inboxMgmt.json   |  2 +
 .../dashboard/i18n/locale/ca/settings.json    |  1 +
 .../dashboard/i18n/locale/cs/auditLogs.json   | 24 ++++++
 .../dashboard/i18n/locale/cs/contact.json     |  6 +-
 .../dashboard/i18n/locale/cs/inboxMgmt.json   |  2 +
 .../dashboard/i18n/locale/cs/settings.json    |  1 +
 .../dashboard/i18n/locale/da/auditLogs.json   | 24 ++++++
 .../dashboard/i18n/locale/da/contact.json     |  6 +-
 .../dashboard/i18n/locale/da/inboxMgmt.json   |  2 +
 .../dashboard/i18n/locale/da/settings.json    |  1 +
 .../dashboard/i18n/locale/de/auditLogs.json   | 24 ++++++
 .../dashboard/i18n/locale/de/contact.json     |  6 +-
 .../dashboard/i18n/locale/de/inboxMgmt.json   |  2 +
 .../dashboard/i18n/locale/de/settings.json    |  1 +
 .../dashboard/i18n/locale/el/auditLogs.json   | 24 ++++++
 .../dashboard/i18n/locale/el/contact.json     |  6 +-
 .../dashboard/i18n/locale/el/inboxMgmt.json   |  2 +
 .../dashboard/i18n/locale/el/settings.json    |  1 +
 .../dashboard/i18n/locale/es/auditLogs.json   | 24 ++++++
 .../dashboard/i18n/locale/es/contact.json     |  6 +-
 .../dashboard/i18n/locale/es/inboxMgmt.json   |  2 +
 .../dashboard/i18n/locale/es/settings.json    |  1 +
 .../dashboard/i18n/locale/fa/auditLogs.json   | 24 ++++++
 .../dashboard/i18n/locale/fa/contact.json     |  6 +-
 .../dashboard/i18n/locale/fa/inboxMgmt.json   |  2 +
 .../dashboard/i18n/locale/fa/settings.json    |  1 +
 .../dashboard/i18n/locale/fi/auditLogs.json   | 24 ++++++
 .../dashboard/i18n/locale/fi/contact.json     |  6 +-
 .../dashboard/i18n/locale/fi/inboxMgmt.json   |  2 +
 .../dashboard/i18n/locale/fi/settings.json    |  1 +
 .../dashboard/i18n/locale/fr/auditLogs.json   | 24 ++++++
 .../dashboard/i18n/locale/fr/contact.json     |  6 +-
 .../dashboard/i18n/locale/fr/inboxMgmt.json   |  2 +
 .../dashboard/i18n/locale/fr/settings.json    |  1 +
 .../dashboard/i18n/locale/he/auditLogs.json   | 24 ++++++
 .../dashboard/i18n/locale/he/contact.json     |  6 +-
 .../dashboard/i18n/locale/he/inboxMgmt.json   |  2 +
 .../dashboard/i18n/locale/he/settings.json    |  1 +
 .../dashboard/i18n/locale/hi/auditLogs.json   | 24 ++++++
 .../dashboard/i18n/locale/hi/contact.json     |  6 +-
 .../dashboard/i18n/locale/hi/inboxMgmt.json   |  2 +
 .../dashboard/i18n/locale/hi/settings.json    |  1 +
 .../dashboard/i18n/locale/hr/auditLogs.json   | 24 ++++++
 .../dashboard/i18n/locale/hr/contact.json     |  6 +-
 .../dashboard/i18n/locale/hr/inboxMgmt.json   |  2 +
 .../dashboard/i18n/locale/hr/settings.json    |  1 +
 .../dashboard/i18n/locale/hu/auditLogs.json   | 24 ++++++
 .../dashboard/i18n/locale/hu/contact.json     |  6 +-
 .../dashboard/i18n/locale/hu/inboxMgmt.json   |  2 +
 .../dashboard/i18n/locale/hu/settings.json    |  1 +
 .../dashboard/i18n/locale/hy/auditLogs.json   | 24 ++++++
 .../dashboard/i18n/locale/hy/contact.json     |  6 +-
 .../dashboard/i18n/locale/hy/inboxMgmt.json   |  2 +
 .../dashboard/i18n/locale/hy/settings.json    |  1 +
 .../dashboard/i18n/locale/id/auditLogs.json   | 24 ++++++
 .../dashboard/i18n/locale/id/contact.json     |  6 +-
 .../dashboard/i18n/locale/id/inboxMgmt.json   |  2 +
 .../dashboard/i18n/locale/id/settings.json    |  1 +
 .../i18n/locale/is/advancedFilters.json       |  2 +-
 .../dashboard/i18n/locale/is/agentMgmt.json   |  2 +-
 .../dashboard/i18n/locale/is/auditLogs.json   | 24 ++++++
 .../dashboard/i18n/locale/is/campaign.json    |  2 +-
 .../dashboard/i18n/locale/is/contact.json     | 86 ++++++++++---------
 .../i18n/locale/is/contactFilters.json        |  6 +-
 .../dashboard/i18n/locale/is/inboxMgmt.json   | 12 +--
 .../i18n/locale/is/integrationApps.json       |  2 +-
 .../i18n/locale/is/resetPassword.json         |  4 +-
 .../dashboard/i18n/locale/is/search.json      |  4 +-
 .../dashboard/i18n/locale/is/settings.json    | 21 ++---
 .../dashboard/i18n/locale/it/auditLogs.json   | 24 ++++++
 .../dashboard/i18n/locale/it/contact.json     |  6 +-
 .../dashboard/i18n/locale/it/inboxMgmt.json   |  2 +
 .../dashboard/i18n/locale/it/settings.json    |  1 +
 .../dashboard/i18n/locale/ja/auditLogs.json   | 24 ++++++
 .../dashboard/i18n/locale/ja/contact.json     |  6 +-
 .../dashboard/i18n/locale/ja/inboxMgmt.json   |  2 +
 .../dashboard/i18n/locale/ja/settings.json    |  1 +
 .../dashboard/i18n/locale/ka/auditLogs.json   | 24 ++++++
 .../dashboard/i18n/locale/ka/contact.json     |  6 +-
 .../dashboard/i18n/locale/ka/inboxMgmt.json   |  2 +
 .../dashboard/i18n/locale/ka/settings.json    |  1 +
 .../dashboard/i18n/locale/ko/auditLogs.json   | 24 ++++++
 .../dashboard/i18n/locale/ko/contact.json     |  6 +-
 .../dashboard/i18n/locale/ko/inboxMgmt.json   |  2 +
 .../dashboard/i18n/locale/ko/settings.json    |  1 +
 .../dashboard/i18n/locale/lt/auditLogs.json   | 24 ++++++
 .../dashboard/i18n/locale/lt/contact.json     |  6 +-
 .../dashboard/i18n/locale/lt/inboxMgmt.json   |  2 +
 .../dashboard/i18n/locale/lt/settings.json    |  1 +
 .../dashboard/i18n/locale/lv/auditLogs.json   | 24 ++++++
 .../dashboard/i18n/locale/lv/contact.json     |  6 +-
 .../dashboard/i18n/locale/lv/inboxMgmt.json   |  2 +
 .../dashboard/i18n/locale/lv/settings.json    |  1 +
 .../dashboard/i18n/locale/ml/auditLogs.json   | 24 ++++++
 .../dashboard/i18n/locale/ml/contact.json     |  6 +-
 .../dashboard/i18n/locale/ml/inboxMgmt.json   |  2 +
 .../dashboard/i18n/locale/ml/settings.json    |  1 +
 .../dashboard/i18n/locale/ms/auditLogs.json   | 24 ++++++
 .../dashboard/i18n/locale/ms/contact.json     |  6 +-
 .../dashboard/i18n/locale/ms/inboxMgmt.json   |  2 +
 .../dashboard/i18n/locale/ms/settings.json    |  1 +
 .../dashboard/i18n/locale/ne/auditLogs.json   | 24 ++++++
 .../dashboard/i18n/locale/ne/contact.json     |  6 +-
 .../dashboard/i18n/locale/ne/inboxMgmt.json   |  2 +
 .../dashboard/i18n/locale/ne/settings.json    |  1 +
 .../dashboard/i18n/locale/nl/auditLogs.json   | 24 ++++++
 .../dashboard/i18n/locale/nl/contact.json     |  6 +-
 .../dashboard/i18n/locale/nl/inboxMgmt.json   |  2 +
 .../dashboard/i18n/locale/nl/settings.json    |  1 +
 .../dashboard/i18n/locale/no/auditLogs.json   | 24 ++++++
 .../dashboard/i18n/locale/no/contact.json     |  6 +-
 .../dashboard/i18n/locale/no/inboxMgmt.json   |  2 +
 .../dashboard/i18n/locale/no/settings.json    |  1 +
 .../dashboard/i18n/locale/pl/auditLogs.json   | 24 ++++++
 .../dashboard/i18n/locale/pl/contact.json     |  6 +-
 .../dashboard/i18n/locale/pl/inboxMgmt.json   |  2 +
 .../dashboard/i18n/locale/pl/settings.json    |  1 +
 .../dashboard/i18n/locale/pt/auditLogs.json   | 24 ++++++
 .../dashboard/i18n/locale/pt/contact.json     |  6 +-
 .../dashboard/i18n/locale/pt/inboxMgmt.json   |  2 +
 .../dashboard/i18n/locale/pt/settings.json    |  1 +
 .../i18n/locale/pt_BR/auditLogs.json          | 24 ++++++
 .../dashboard/i18n/locale/pt_BR/contact.json  |  6 +-
 .../i18n/locale/pt_BR/inboxMgmt.json          |  2 +
 .../dashboard/i18n/locale/pt_BR/settings.json |  1 +
 .../dashboard/i18n/locale/ro/agentMgmt.json   |  4 +-
 .../dashboard/i18n/locale/ro/auditLogs.json   | 24 ++++++
 .../dashboard/i18n/locale/ro/cannedMgmt.json  |  2 +-
 .../dashboard/i18n/locale/ro/chatlist.json    |  6 +-
 .../dashboard/i18n/locale/ro/contact.json     | 18 ++--
 .../i18n/locale/ro/conversation.json          | 60 ++++++-------
 .../dashboard/i18n/locale/ro/inboxMgmt.json   |  2 +
 .../dashboard/i18n/locale/ro/settings.json    |  3 +-
 .../dashboard/i18n/locale/ru/auditLogs.json   | 24 ++++++
 .../dashboard/i18n/locale/ru/contact.json     |  6 +-
 .../dashboard/i18n/locale/ru/inboxMgmt.json   |  2 +
 .../dashboard/i18n/locale/ru/settings.json    |  1 +
 .../dashboard/i18n/locale/sh/auditLogs.json   | 24 ++++++
 .../dashboard/i18n/locale/sh/contact.json     |  6 +-
 .../dashboard/i18n/locale/sh/inboxMgmt.json   |  2 +
 .../dashboard/i18n/locale/sh/settings.json    |  1 +
 .../dashboard/i18n/locale/sk/auditLogs.json   | 24 ++++++
 .../dashboard/i18n/locale/sk/contact.json     |  6 +-
 .../dashboard/i18n/locale/sk/inboxMgmt.json   |  2 +
 .../dashboard/i18n/locale/sk/settings.json    |  1 +
 .../dashboard/i18n/locale/sr/auditLogs.json   | 24 ++++++
 .../dashboard/i18n/locale/sr/contact.json     |  6 +-
 .../dashboard/i18n/locale/sr/inboxMgmt.json   |  2 +
 .../dashboard/i18n/locale/sr/settings.json    |  1 +
 .../dashboard/i18n/locale/sv/auditLogs.json   | 24 ++++++
 .../dashboard/i18n/locale/sv/contact.json     |  6 +-
 .../dashboard/i18n/locale/sv/inboxMgmt.json   |  2 +
 .../dashboard/i18n/locale/sv/settings.json    |  1 +
 .../dashboard/i18n/locale/ta/auditLogs.json   | 24 ++++++
 .../dashboard/i18n/locale/ta/contact.json     |  6 +-
 .../dashboard/i18n/locale/ta/inboxMgmt.json   |  2 +
 .../dashboard/i18n/locale/ta/settings.json    |  1 +
 .../dashboard/i18n/locale/th/auditLogs.json   | 24 ++++++
 .../dashboard/i18n/locale/th/contact.json     |  6 +-
 .../dashboard/i18n/locale/th/inboxMgmt.json   |  2 +
 .../dashboard/i18n/locale/th/settings.json    |  1 +
 .../dashboard/i18n/locale/tr/auditLogs.json   | 24 ++++++
 .../dashboard/i18n/locale/tr/contact.json     |  6 +-
 .../dashboard/i18n/locale/tr/inboxMgmt.json   |  2 +
 .../dashboard/i18n/locale/tr/settings.json    |  1 +
 .../dashboard/i18n/locale/uk/agentMgmt.json   |  4 +-
 .../dashboard/i18n/locale/uk/auditLogs.json   | 24 ++++++
 .../dashboard/i18n/locale/uk/contact.json     |  6 +-
 .../dashboard/i18n/locale/uk/inboxMgmt.json   |  4 +-
 .../dashboard/i18n/locale/uk/settings.json    |  3 +-
 .../dashboard/i18n/locale/ur/auditLogs.json   | 24 ++++++
 .../dashboard/i18n/locale/ur/contact.json     |  6 +-
 .../dashboard/i18n/locale/ur/inboxMgmt.json   |  2 +
 .../dashboard/i18n/locale/ur/settings.json    |  1 +
 .../i18n/locale/ur_IN/auditLogs.json          | 24 ++++++
 .../dashboard/i18n/locale/ur_IN/contact.json  |  6 +-
 .../i18n/locale/ur_IN/inboxMgmt.json          |  2 +
 .../dashboard/i18n/locale/ur_IN/settings.json |  1 +
 .../dashboard/i18n/locale/vi/auditLogs.json   | 24 ++++++
 .../dashboard/i18n/locale/vi/contact.json     |  6 +-
 .../dashboard/i18n/locale/vi/inboxMgmt.json   |  2 +
 .../dashboard/i18n/locale/vi/settings.json    |  1 +
 .../i18n/locale/zh_CN/auditLogs.json          | 24 ++++++
 .../dashboard/i18n/locale/zh_CN/contact.json  |  6 +-
 .../i18n/locale/zh_CN/inboxMgmt.json          |  2 +
 .../dashboard/i18n/locale/zh_CN/settings.json |  1 +
 .../i18n/locale/zh_TW/auditLogs.json          | 24 ++++++
 .../dashboard/i18n/locale/zh_TW/contact.json  |  6 +-
 .../i18n/locale/zh_TW/inboxMgmt.json          |  2 +
 .../dashboard/i18n/locale/zh_TW/settings.json |  1 +
 app/javascript/widget/i18n/locale/is.json     |  4 +-
 config/locales/uk.yml                         |  2 +-
 .../inbox_round_robin_service_spec.rb         |  6 +-
 203 files changed, 1576 insertions(+), 213 deletions(-)
 create mode 100644 app/javascript/dashboard/i18n/locale/ar/auditLogs.json
 create mode 100644 app/javascript/dashboard/i18n/locale/bg/auditLogs.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ca/auditLogs.json
 create mode 100644 app/javascript/dashboard/i18n/locale/cs/auditLogs.json
 create mode 100644 app/javascript/dashboard/i18n/locale/da/auditLogs.json
 create mode 100644 app/javascript/dashboard/i18n/locale/de/auditLogs.json
 create mode 100644 app/javascript/dashboard/i18n/locale/el/auditLogs.json
 create mode 100644 app/javascript/dashboard/i18n/locale/es/auditLogs.json
 create mode 100644 app/javascript/dashboard/i18n/locale/fa/auditLogs.json
 create mode 100644 app/javascript/dashboard/i18n/locale/fi/auditLogs.json
 create mode 100644 app/javascript/dashboard/i18n/locale/fr/auditLogs.json
 create mode 100644 app/javascript/dashboard/i18n/locale/he/auditLogs.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hi/auditLogs.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hr/auditLogs.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hu/auditLogs.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hy/auditLogs.json
 create mode 100644 app/javascript/dashboard/i18n/locale/id/auditLogs.json
 create mode 100644 app/javascript/dashboard/i18n/locale/is/auditLogs.json
 create mode 100644 app/javascript/dashboard/i18n/locale/it/auditLogs.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ja/auditLogs.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ka/auditLogs.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ko/auditLogs.json
 create mode 100644 app/javascript/dashboard/i18n/locale/lt/auditLogs.json
 create mode 100644 app/javascript/dashboard/i18n/locale/lv/auditLogs.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ml/auditLogs.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ms/auditLogs.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ne/auditLogs.json
 create mode 100644 app/javascript/dashboard/i18n/locale/nl/auditLogs.json
 create mode 100644 app/javascript/dashboard/i18n/locale/no/auditLogs.json
 create mode 100644 app/javascript/dashboard/i18n/locale/pl/auditLogs.json
 create mode 100644 app/javascript/dashboard/i18n/locale/pt/auditLogs.json
 create mode 100644 app/javascript/dashboard/i18n/locale/pt_BR/auditLogs.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ro/auditLogs.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ru/auditLogs.json
 create mode 100644 app/javascript/dashboard/i18n/locale/sh/auditLogs.json
 create mode 100644 app/javascript/dashboard/i18n/locale/sk/auditLogs.json
 create mode 100644 app/javascript/dashboard/i18n/locale/sr/auditLogs.json
 create mode 100644 app/javascript/dashboard/i18n/locale/sv/auditLogs.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ta/auditLogs.json
 create mode 100644 app/javascript/dashboard/i18n/locale/th/auditLogs.json
 create mode 100644 app/javascript/dashboard/i18n/locale/tr/auditLogs.json
 create mode 100644 app/javascript/dashboard/i18n/locale/uk/auditLogs.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ur/auditLogs.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ur_IN/auditLogs.json
 create mode 100644 app/javascript/dashboard/i18n/locale/vi/auditLogs.json
 create mode 100644 app/javascript/dashboard/i18n/locale/zh_CN/auditLogs.json
 create mode 100644 app/javascript/dashboard/i18n/locale/zh_TW/auditLogs.json

diff --git a/app/javascript/dashboard/i18n/locale/ar/auditLogs.json b/app/javascript/dashboard/i18n/locale/ar/auditLogs.json
new file mode 100644
index 000000000..a45169dd5
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ar/auditLogs.json
@@ -0,0 +1,24 @@
+{
+  "AUDIT_LOGS": {
+    "HEADER": "Audit Logs",
+    "HEADER_BTN_TXT": "Add Audit Logs",
+    "LOADING": "Fetching Audit Logs",
+    "SEARCH_404": "لا توجد عناصر مطابقة لهذا الاستعلام",
+    "SIDEBAR_TXT": "<p><b>Audit Logs</b> </p><p> Audit Logs are trails for events and actions in a Chatwoot System. </p>",
+    "LIST": {
+      "404": "There are no Audit Logs available in this account.",
+      "TITLE": "Manage Audit Logs",
+      "DESC": "Audit Logs are trails for events and actions in a Chatwoot System.",
+      "TABLE_HEADER": [
+        "User",
+        "Action",
+        "عنوان IP",
+        "Time"
+      ]
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "AuditLogs retrieved successfully",
+      "ERROR_MESSAGE": "تعذر الاتصال بالخادم، الرجاء المحاولة مرة أخرى لاحقاً"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ar/contact.json b/app/javascript/dashboard/i18n/locale/ar/contact.json
index b1d4b73a4..c2932796e 100644
--- a/app/javascript/dashboard/i18n/locale/ar/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ar/contact.json
@@ -120,8 +120,9 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "أدخل رقم الهاتف الخاص بجهة الاتصال",
         "LABEL": "رقم الهاتف",
-        "HELP": "يجب ان يحتوى رقم الهاتف على كود دولتك تسبقها علامة +\nمثال: +20101243567",
+        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
         "ERROR": "يجب ان تكون خانة رقم الهاتف إما فارغة او مكتملة مع رمز الدولة",
+        "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "رقم الهاتف هذا مستخدم لجهة اتصال أخرى."
       },
       "LOCATION": {
@@ -181,7 +182,8 @@
         "LABEL": "إلى"
       },
       "INBOX": {
-        "LABEL": "صندوق الوارد",
+        "LABEL": "Via Inbox",
+        "PLACEHOLDER": "Choose source inbox",
         "ERROR": "حدد صندوق الوارد"
       },
       "SUBJECT": {
diff --git a/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json
index ab5aeb194..9976d603d 100644
--- a/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json
@@ -478,6 +478,8 @@
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "تحديث",
+      "WHATSAPP_WEBHOOK_TITLE": "رمز التحقق من Webhook",
+      "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
diff --git a/app/javascript/dashboard/i18n/locale/ar/settings.json b/app/javascript/dashboard/i18n/locale/ar/settings.json
index e09322682..cb49813c1 100644
--- a/app/javascript/dashboard/i18n/locale/ar/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ar/settings.json
@@ -203,6 +203,7 @@
     "HOME": "الرئيسية",
     "AGENTS": "موظف الدعم",
     "AGENT_BOTS": "البوتات",
+    "AUDIT_LOGS": "Audit Logs",
     "INBOXES": "قنوات التواصل",
     "NOTIFICATIONS": "الإشعارات",
     "CANNED_RESPONSES": "الردود السريعة",
diff --git a/app/javascript/dashboard/i18n/locale/bg/auditLogs.json b/app/javascript/dashboard/i18n/locale/bg/auditLogs.json
new file mode 100644
index 000000000..4371b1d1b
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/bg/auditLogs.json
@@ -0,0 +1,24 @@
+{
+  "AUDIT_LOGS": {
+    "HEADER": "Audit Logs",
+    "HEADER_BTN_TXT": "Add Audit Logs",
+    "LOADING": "Fetching Audit Logs",
+    "SEARCH_404": "Няма резултати отговарящи на тази заявка",
+    "SIDEBAR_TXT": "<p><b>Audit Logs</b> </p><p> Audit Logs are trails for events and actions in a Chatwoot System. </p>",
+    "LIST": {
+      "404": "There are no Audit Logs available in this account.",
+      "TITLE": "Manage Audit Logs",
+      "DESC": "Audit Logs are trails for events and actions in a Chatwoot System.",
+      "TABLE_HEADER": [
+        "User",
+        "Action",
+        "IP адрес",
+        "Time"
+      ]
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "AuditLogs retrieved successfully",
+      "ERROR_MESSAGE": "Не можа да се свърже с Woot сървър. Моля, опитайте отново по-късно"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/bg/contact.json b/app/javascript/dashboard/i18n/locale/bg/contact.json
index 301552ca7..f614055c6 100644
--- a/app/javascript/dashboard/i18n/locale/bg/contact.json
+++ b/app/javascript/dashboard/i18n/locale/bg/contact.json
@@ -120,8 +120,9 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Добавете телефона на контакта",
         "LABEL": "Телефон",
-        "HELP": "Телефона трябва да е във E.164 формат, например: +35955555555 [+][код на държавата][телефонен номер]",
+        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
         "ERROR": "Телефона трябва да е празен или във E.164 формат",
+        "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "Телефона се използва от друг контакт."
       },
       "LOCATION": {
@@ -181,7 +182,8 @@
         "LABEL": "До"
       },
       "INBOX": {
-        "LABEL": "Входяща кутия",
+        "LABEL": "Via Inbox",
+        "PLACEHOLDER": "Choose source inbox",
         "ERROR": "Изберете входяща кутия"
       },
       "SUBJECT": {
diff --git a/app/javascript/dashboard/i18n/locale/bg/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/bg/inboxMgmt.json
index 0b229ae70..0f68b49a8 100644
--- a/app/javascript/dashboard/i18n/locale/bg/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/bg/inboxMgmt.json
@@ -478,6 +478,8 @@
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Обновяване",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
+      "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
diff --git a/app/javascript/dashboard/i18n/locale/bg/settings.json b/app/javascript/dashboard/i18n/locale/bg/settings.json
index ce40bd7ed..8a70c6507 100644
--- a/app/javascript/dashboard/i18n/locale/bg/settings.json
+++ b/app/javascript/dashboard/i18n/locale/bg/settings.json
@@ -203,6 +203,7 @@
     "HOME": "Home",
     "AGENTS": "Агенти",
     "AGENT_BOTS": "Bots",
+    "AUDIT_LOGS": "Audit Logs",
     "INBOXES": "Inboxes",
     "NOTIFICATIONS": "Notifications",
     "CANNED_RESPONSES": "Готови отговори",
diff --git a/app/javascript/dashboard/i18n/locale/ca/auditLogs.json b/app/javascript/dashboard/i18n/locale/ca/auditLogs.json
new file mode 100644
index 000000000..5972ebcb4
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ca/auditLogs.json
@@ -0,0 +1,24 @@
+{
+  "AUDIT_LOGS": {
+    "HEADER": "Audit Logs",
+    "HEADER_BTN_TXT": "Add Audit Logs",
+    "LOADING": "Fetching Audit Logs",
+    "SEARCH_404": "No hi ha cap resposta que coincideixi amb aquesta consulta",
+    "SIDEBAR_TXT": "<p><b>Audit Logs</b> </p><p> Audit Logs are trails for events and actions in a Chatwoot System. </p>",
+    "LIST": {
+      "404": "There are no Audit Logs available in this account.",
+      "TITLE": "Manage Audit Logs",
+      "DESC": "Audit Logs are trails for events and actions in a Chatwoot System.",
+      "TABLE_HEADER": [
+        "User",
+        "Action",
+        "Adreça IP",
+        "Time"
+      ]
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "AuditLogs retrieved successfully",
+      "ERROR_MESSAGE": "No s'ha pogut connectar amb el servidor Woot. Torna-ho a provar més endavant"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ca/contact.json b/app/javascript/dashboard/i18n/locale/ca/contact.json
index f65bd82f5..69f64b6c0 100644
--- a/app/javascript/dashboard/i18n/locale/ca/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ca/contact.json
@@ -120,8 +120,9 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Introdueix el número de telèfon del contacte",
         "LABEL": "Número de telèfon",
-        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]",
+        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
         "ERROR": "Phone number should be either empty or of E.164 format",
+        "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "This phone number is in use for another contact."
       },
       "LOCATION": {
@@ -181,7 +182,8 @@
         "LABEL": "To"
       },
       "INBOX": {
-        "LABEL": "Inbox",
+        "LABEL": "Via Inbox",
+        "PLACEHOLDER": "Choose source inbox",
         "ERROR": "Select an inbox"
       },
       "SUBJECT": {
diff --git a/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json
index 973d88068..28b7d8d70 100644
--- a/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json
@@ -478,6 +478,8 @@
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Actualitza",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
+      "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
diff --git a/app/javascript/dashboard/i18n/locale/ca/settings.json b/app/javascript/dashboard/i18n/locale/ca/settings.json
index 8a082637b..aaa7b1d41 100644
--- a/app/javascript/dashboard/i18n/locale/ca/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ca/settings.json
@@ -203,6 +203,7 @@
     "HOME": "Inici",
     "AGENTS": "Agents",
     "AGENT_BOTS": "Bots",
+    "AUDIT_LOGS": "Audit Logs",
     "INBOXES": "Safates d'entrada",
     "NOTIFICATIONS": "Notificacions",
     "CANNED_RESPONSES": "Respostes predeterminades",
diff --git a/app/javascript/dashboard/i18n/locale/cs/auditLogs.json b/app/javascript/dashboard/i18n/locale/cs/auditLogs.json
new file mode 100644
index 000000000..2273e3d5c
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/cs/auditLogs.json
@@ -0,0 +1,24 @@
+{
+  "AUDIT_LOGS": {
+    "HEADER": "Audit Logs",
+    "HEADER_BTN_TXT": "Add Audit Logs",
+    "LOADING": "Fetching Audit Logs",
+    "SEARCH_404": "Neexistují žádné položky odpovídající tomuto dotazu",
+    "SIDEBAR_TXT": "<p><b>Audit Logs</b> </p><p> Audit Logs are trails for events and actions in a Chatwoot System. </p>",
+    "LIST": {
+      "404": "There are no Audit Logs available in this account.",
+      "TITLE": "Manage Audit Logs",
+      "DESC": "Audit Logs are trails for events and actions in a Chatwoot System.",
+      "TABLE_HEADER": [
+        "User",
+        "Action",
+        "IP adresa",
+        "Time"
+      ]
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "AuditLogs retrieved successfully",
+      "ERROR_MESSAGE": "Nelze se připojit k Woot serveru, opakujte akci později"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/cs/contact.json b/app/javascript/dashboard/i18n/locale/cs/contact.json
index 9b84c4b04..941890c18 100644
--- a/app/javascript/dashboard/i18n/locale/cs/contact.json
+++ b/app/javascript/dashboard/i18n/locale/cs/contact.json
@@ -120,8 +120,9 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Zadejte telefonní číslo kontaktu",
         "LABEL": "Telefonní číslo",
-        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]",
+        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
         "ERROR": "Phone number should be either empty or of E.164 format",
+        "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "This phone number is in use for another contact."
       },
       "LOCATION": {
@@ -181,7 +182,8 @@
         "LABEL": "To"
       },
       "INBOX": {
-        "LABEL": "Inbox",
+        "LABEL": "Via Inbox",
+        "PLACEHOLDER": "Choose source inbox",
         "ERROR": "Select an inbox"
       },
       "SUBJECT": {
diff --git a/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json
index 07ad8139c..59aa1ce2d 100644
--- a/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json
@@ -478,6 +478,8 @@
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Aktualizovat",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
+      "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
diff --git a/app/javascript/dashboard/i18n/locale/cs/settings.json b/app/javascript/dashboard/i18n/locale/cs/settings.json
index da7a9529f..59e322bd0 100644
--- a/app/javascript/dashboard/i18n/locale/cs/settings.json
+++ b/app/javascript/dashboard/i18n/locale/cs/settings.json
@@ -203,6 +203,7 @@
     "HOME": "Domů",
     "AGENTS": "Agenti",
     "AGENT_BOTS": "Bots",
+    "AUDIT_LOGS": "Audit Logs",
     "INBOXES": "Schránky",
     "NOTIFICATIONS": "Oznámení",
     "CANNED_RESPONSES": "Konzervované odpovědi",
diff --git a/app/javascript/dashboard/i18n/locale/da/auditLogs.json b/app/javascript/dashboard/i18n/locale/da/auditLogs.json
new file mode 100644
index 000000000..5bfc99850
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/da/auditLogs.json
@@ -0,0 +1,24 @@
+{
+  "AUDIT_LOGS": {
+    "HEADER": "Audit Logs",
+    "HEADER_BTN_TXT": "Add Audit Logs",
+    "LOADING": "Fetching Audit Logs",
+    "SEARCH_404": "Der er ingen elementer, der matcher denne forespørgsel",
+    "SIDEBAR_TXT": "<p><b>Audit Logs</b> </p><p> Audit Logs are trails for events and actions in a Chatwoot System. </p>",
+    "LIST": {
+      "404": "There are no Audit Logs available in this account.",
+      "TITLE": "Manage Audit Logs",
+      "DESC": "Audit Logs are trails for events and actions in a Chatwoot System.",
+      "TABLE_HEADER": [
+        "User",
+        "Action",
+        "Ip Adresse",
+        "Time"
+      ]
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "AuditLogs retrieved successfully",
+      "ERROR_MESSAGE": "Kunne ikke oprette forbindelse til Woot Server, Prøv igen senere"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/da/contact.json b/app/javascript/dashboard/i18n/locale/da/contact.json
index bd97d70ab..102650de4 100644
--- a/app/javascript/dashboard/i18n/locale/da/contact.json
+++ b/app/javascript/dashboard/i18n/locale/da/contact.json
@@ -120,8 +120,9 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Indtast telefonnummeret på kontaktpersonen",
         "LABEL": "Telefonnummer",
-        "HELP": "Telefonnummer skal være af E.164 format fx: +1415555555 [+] [landekode] [områdekode] [lokalt telefonnummer]",
+        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
         "ERROR": "Telefonnummer skal være enten tomt eller i E.164-format",
+        "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "Dette telefonnummer er i brug for en anden kontakt."
       },
       "LOCATION": {
@@ -181,7 +182,8 @@
         "LABEL": "Til"
       },
       "INBOX": {
-        "LABEL": "Indbakke",
+        "LABEL": "Via Inbox",
+        "PLACEHOLDER": "Choose source inbox",
         "ERROR": "Vælg en indbakke"
       },
       "SUBJECT": {
diff --git a/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json
index 2cb1d5943..bb5c71699 100644
--- a/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json
@@ -478,6 +478,8 @@
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Opdater",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verificér Token",
+      "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
diff --git a/app/javascript/dashboard/i18n/locale/da/settings.json b/app/javascript/dashboard/i18n/locale/da/settings.json
index 8903887d7..7f52c6080 100644
--- a/app/javascript/dashboard/i18n/locale/da/settings.json
+++ b/app/javascript/dashboard/i18n/locale/da/settings.json
@@ -203,6 +203,7 @@
     "HOME": "Hjem",
     "AGENTS": "Agenter",
     "AGENT_BOTS": "Bots",
+    "AUDIT_LOGS": "Audit Logs",
     "INBOXES": "Indbakker",
     "NOTIFICATIONS": "Notifikationer",
     "CANNED_RESPONSES": "Standardsvar Svar",
diff --git a/app/javascript/dashboard/i18n/locale/de/auditLogs.json b/app/javascript/dashboard/i18n/locale/de/auditLogs.json
new file mode 100644
index 000000000..cc2c79f06
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/de/auditLogs.json
@@ -0,0 +1,24 @@
+{
+  "AUDIT_LOGS": {
+    "HEADER": "Audit Logs",
+    "HEADER_BTN_TXT": "Add Audit Logs",
+    "LOADING": "Fetching Audit Logs",
+    "SEARCH_404": "Es gibt keine Elemente, die dieser Abfrage entsprechen",
+    "SIDEBAR_TXT": "<p><b>Audit Logs</b> </p><p> Audit Logs are trails for events and actions in a Chatwoot System. </p>",
+    "LIST": {
+      "404": "There are no Audit Logs available in this account.",
+      "TITLE": "Manage Audit Logs",
+      "DESC": "Audit Logs are trails for events and actions in a Chatwoot System.",
+      "TABLE_HEADER": [
+        "User",
+        "Action",
+        "IP-Adresse",
+        "Time"
+      ]
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "AuditLogs retrieved successfully",
+      "ERROR_MESSAGE": "Es konnte keine Verbindung zum Woot Server hergestellt werden. Bitte versuchen Sie es später erneut"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/de/contact.json b/app/javascript/dashboard/i18n/locale/de/contact.json
index a5b039f59..f532a3546 100644
--- a/app/javascript/dashboard/i18n/locale/de/contact.json
+++ b/app/javascript/dashboard/i18n/locale/de/contact.json
@@ -120,8 +120,9 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Geben Sie die Telefonnummer des Kontakts ein",
         "LABEL": "Telefonnummer",
-        "HELP": "Telefonnummer sollte im E.164-Format sein, z. B.: +1415555555 [+][Landesvorwahl][Landesvorwahl][Ortsvorwahl]",
+        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
         "ERROR": "Telefonnummer muss leer sein oder im E.164-Format",
+        "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "Diese Telefonnummer wird für einen anderen Kontakt verwendet."
       },
       "LOCATION": {
@@ -181,7 +182,8 @@
         "LABEL": "An"
       },
       "INBOX": {
-        "LABEL": "Posteingang",
+        "LABEL": "Via Inbox",
+        "PLACEHOLDER": "Choose source inbox",
         "ERROR": "Posteingang auswählen"
       },
       "SUBJECT": {
diff --git a/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
index d6f05f2ad..f4d04fe87 100644
--- a/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
@@ -478,6 +478,8 @@
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Aktualisieren",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook-Verifizierungstoken",
+      "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
diff --git a/app/javascript/dashboard/i18n/locale/de/settings.json b/app/javascript/dashboard/i18n/locale/de/settings.json
index f7f7c9d57..b69568622 100644
--- a/app/javascript/dashboard/i18n/locale/de/settings.json
+++ b/app/javascript/dashboard/i18n/locale/de/settings.json
@@ -203,6 +203,7 @@
     "HOME": "Hauptseite",
     "AGENTS": "Agenten",
     "AGENT_BOTS": "Bots",
+    "AUDIT_LOGS": "Audit Logs",
     "INBOXES": "Posteingänge",
     "NOTIFICATIONS": "Push-Benachrichtigungen",
     "CANNED_RESPONSES": "Vorgefertigte Antworten",
diff --git a/app/javascript/dashboard/i18n/locale/el/auditLogs.json b/app/javascript/dashboard/i18n/locale/el/auditLogs.json
new file mode 100644
index 000000000..eeefa4afd
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/el/auditLogs.json
@@ -0,0 +1,24 @@
+{
+  "AUDIT_LOGS": {
+    "HEADER": "Audit Logs",
+    "HEADER_BTN_TXT": "Add Audit Logs",
+    "LOADING": "Fetching Audit Logs",
+    "SEARCH_404": "Δεν υπάρχουν αντικείμενα να ταιριάζουν με αυτό το ερώτημα",
+    "SIDEBAR_TXT": "<p><b>Audit Logs</b> </p><p> Audit Logs are trails for events and actions in a Chatwoot System. </p>",
+    "LIST": {
+      "404": "There are no Audit Logs available in this account.",
+      "TITLE": "Manage Audit Logs",
+      "DESC": "Audit Logs are trails for events and actions in a Chatwoot System.",
+      "TABLE_HEADER": [
+        "User",
+        "Action",
+        "Διεύθυνση IP",
+        "Time"
+      ]
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "AuditLogs retrieved successfully",
+      "ERROR_MESSAGE": "Αδυναμία σύνδεσης με τον Woot Server, Παρακαλώ προσπαθήστε αργότερα"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/el/contact.json b/app/javascript/dashboard/i18n/locale/el/contact.json
index 977988851..f25a2b5a9 100644
--- a/app/javascript/dashboard/i18n/locale/el/contact.json
+++ b/app/javascript/dashboard/i18n/locale/el/contact.json
@@ -120,8 +120,9 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Εισάγετε τον αριθμό τηλεφώνου της επαφής",
         "LABEL": "Αριθμός Τηλεφώνου",
-        "HELP": "Ο αριθμός τηλεφώνου πρέπει να έχει μορφή E.164 π.χ.: +14155555 [+][κωδικός χώρας][κωδικός περιοχής][αριθμός τοπικού τηλεφώνου]",
+        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
         "ERROR": "Ο αριθμός τηλεφώνου πρέπει να είναι είτε άδειος είτε με μορφή E.164",
+        "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "Αυτός ο αριθμός τηλεφώνου χρησιμοποιείται σε άλλη επαφή."
       },
       "LOCATION": {
@@ -181,7 +182,8 @@
         "LABEL": "Προς"
       },
       "INBOX": {
-        "LABEL": "Εισερχόμενα",
+        "LABEL": "Via Inbox",
+        "PLACEHOLDER": "Choose source inbox",
         "ERROR": "Επιλέξτε ένα κιβώτιο εισερχόμενων"
       },
       "SUBJECT": {
diff --git a/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json
index b1d938756..8e630f1a4 100644
--- a/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json
@@ -478,6 +478,8 @@
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Ενημέρωση",
+      "WHATSAPP_WEBHOOK_TITLE": "Token Επαλήθευσης Webhook",
+      "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
diff --git a/app/javascript/dashboard/i18n/locale/el/settings.json b/app/javascript/dashboard/i18n/locale/el/settings.json
index b1f4b16bf..7b074ae80 100644
--- a/app/javascript/dashboard/i18n/locale/el/settings.json
+++ b/app/javascript/dashboard/i18n/locale/el/settings.json
@@ -203,6 +203,7 @@
     "HOME": "Αρχική",
     "AGENTS": "Πράκτορες",
     "AGENT_BOTS": "Bots",
+    "AUDIT_LOGS": "Audit Logs",
     "INBOXES": "Κιβώτια Εισερχομένων",
     "NOTIFICATIONS": "Ειδοποιήσεις",
     "CANNED_RESPONSES": "Έτοιμες Απαντήσεις",
diff --git a/app/javascript/dashboard/i18n/locale/es/auditLogs.json b/app/javascript/dashboard/i18n/locale/es/auditLogs.json
new file mode 100644
index 000000000..4ce446a69
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/es/auditLogs.json
@@ -0,0 +1,24 @@
+{
+  "AUDIT_LOGS": {
+    "HEADER": "Audit Logs",
+    "HEADER_BTN_TXT": "Add Audit Logs",
+    "LOADING": "Fetching Audit Logs",
+    "SEARCH_404": "No hay elementos que coincidan con esta consulta",
+    "SIDEBAR_TXT": "<p><b>Audit Logs</b> </p><p> Audit Logs are trails for events and actions in a Chatwoot System. </p>",
+    "LIST": {
+      "404": "There are no Audit Logs available in this account.",
+      "TITLE": "Manage Audit Logs",
+      "DESC": "Audit Logs are trails for events and actions in a Chatwoot System.",
+      "TABLE_HEADER": [
+        "User",
+        "Action",
+        "Dirección IP",
+        "Time"
+      ]
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "AuditLogs retrieved successfully",
+      "ERROR_MESSAGE": "No se pudo conectar al servidor Woot, por favor inténtalo de nuevo más tarde"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/es/contact.json b/app/javascript/dashboard/i18n/locale/es/contact.json
index 215b96386..5aa83991b 100644
--- a/app/javascript/dashboard/i18n/locale/es/contact.json
+++ b/app/javascript/dashboard/i18n/locale/es/contact.json
@@ -120,8 +120,9 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Escriba el número de teléfono del contacto",
         "LABEL": "Número telefónico",
-        "HELP": "El número telefónico debe tener el formato E.164, por ejemplo: +753001234567 [+][código del país][código de área][número teléfonico]",
+        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
         "ERROR": "El número telefónico debe estar vacío o en formato E.164",
+        "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "Este número de teléfono está en uso para otro contacto."
       },
       "LOCATION": {
@@ -181,7 +182,8 @@
         "LABEL": "Para"
       },
       "INBOX": {
-        "LABEL": "Bandeja de entrada",
+        "LABEL": "Via Inbox",
+        "PLACEHOLDER": "Choose source inbox",
         "ERROR": "Seleccione una bandeja de entrada"
       },
       "SUBJECT": {
diff --git a/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json
index fed3a0a1e..2164c374a 100644
--- a/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json
@@ -478,6 +478,8 @@
       "WHATSAPP_SECTION_UPDATE_TITLE": "Actualizar Clave API",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Introduzca aquí la nueva Clave API",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Actualizar",
+      "WHATSAPP_WEBHOOK_TITLE": "Token de verificación del Webhook",
+      "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Actualizar configuración de Formulario de Chat"
     },
     "AUTO_ASSIGNMENT": {
diff --git a/app/javascript/dashboard/i18n/locale/es/settings.json b/app/javascript/dashboard/i18n/locale/es/settings.json
index ecfa80ec7..5a502a5f2 100644
--- a/app/javascript/dashboard/i18n/locale/es/settings.json
+++ b/app/javascript/dashboard/i18n/locale/es/settings.json
@@ -203,6 +203,7 @@
     "HOME": "Inicio",
     "AGENTS": "Agentes",
     "AGENT_BOTS": "Bots",
+    "AUDIT_LOGS": "Audit Logs",
     "INBOXES": "Entradas",
     "NOTIFICATIONS": "Notificaciones",
     "CANNED_RESPONSES": "Respuestas predefinidas",
diff --git a/app/javascript/dashboard/i18n/locale/fa/auditLogs.json b/app/javascript/dashboard/i18n/locale/fa/auditLogs.json
new file mode 100644
index 000000000..0714f7395
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/fa/auditLogs.json
@@ -0,0 +1,24 @@
+{
+  "AUDIT_LOGS": {
+    "HEADER": "Audit Logs",
+    "HEADER_BTN_TXT": "Add Audit Logs",
+    "LOADING": "Fetching Audit Logs",
+    "SEARCH_404": "هیچ آیتمی با این مشخصات یافت نشد",
+    "SIDEBAR_TXT": "<p><b>Audit Logs</b> </p><p> Audit Logs are trails for events and actions in a Chatwoot System. </p>",
+    "LIST": {
+      "404": "There are no Audit Logs available in this account.",
+      "TITLE": "Manage Audit Logs",
+      "DESC": "Audit Logs are trails for events and actions in a Chatwoot System.",
+      "TABLE_HEADER": [
+        "کاربر",
+        "اقدام",
+        "آدرس آی‌پی",
+        "زمان"
+      ]
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "AuditLogs retrieved successfully",
+      "ERROR_MESSAGE": "متاسفانه ارتباط با سرور برقرار نشد، مجددا امتحان کنید"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/fa/contact.json b/app/javascript/dashboard/i18n/locale/fa/contact.json
index 846270653..de04de6d1 100644
--- a/app/javascript/dashboard/i18n/locale/fa/contact.json
+++ b/app/javascript/dashboard/i18n/locale/fa/contact.json
@@ -120,8 +120,9 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "شماره تلفن مخاطب را وارد کنید",
         "LABEL": "شماره تلفن",
-        "HELP": "شماره تلفن باید با فرمت E.164 باشد به عنوان مثال: +98415555555 [+] [کد کشور] [کد منطقه] [شماره تلفن محلی]",
+        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
         "ERROR": "شماره تلفن باید یا خالی باشد و یا با فرمت E.164",
+        "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "این شماره تلفن برای مخاطب دیگری در حال استفاده است."
       },
       "LOCATION": {
@@ -181,7 +182,8 @@
         "LABEL": "به"
       },
       "INBOX": {
-        "LABEL": "صندوق ورودی",
+        "LABEL": "از طریق صندوق ورودی",
+        "PLACEHOLDER": "صندوق ورودی منبع را انتخاب کنید",
         "ERROR": "انتخاب صندوق ورودی"
       },
       "SUBJECT": {
diff --git a/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json
index 565e92108..26e480817 100644
--- a/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json
@@ -478,6 +478,8 @@
       "WHATSAPP_SECTION_UPDATE_TITLE": "کلید API را به روز کنید",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "کلید API جدید را در اینجا وارد کنید",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "اعمال شود",
+      "WHATSAPP_WEBHOOK_TITLE": "رمز تأیید وب هوک",
+      "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "به‌روزرسانی تنظیمات فرم قبل از گفتگو"
     },
     "AUTO_ASSIGNMENT": {
diff --git a/app/javascript/dashboard/i18n/locale/fa/settings.json b/app/javascript/dashboard/i18n/locale/fa/settings.json
index 0893945b9..0d2945f22 100644
--- a/app/javascript/dashboard/i18n/locale/fa/settings.json
+++ b/app/javascript/dashboard/i18n/locale/fa/settings.json
@@ -203,6 +203,7 @@
     "HOME": "صفحه اصلی",
     "AGENTS": "ایجنت ها",
     "AGENT_BOTS": "ربات‌ها",
+    "AUDIT_LOGS": "Audit Logs",
     "INBOXES": "صندوق‌های ورودی",
     "NOTIFICATIONS": "اعلان ها",
     "CANNED_RESPONSES": "پاسخ‌های آماده",
diff --git a/app/javascript/dashboard/i18n/locale/fi/auditLogs.json b/app/javascript/dashboard/i18n/locale/fi/auditLogs.json
new file mode 100644
index 000000000..a2cfb376f
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/fi/auditLogs.json
@@ -0,0 +1,24 @@
+{
+  "AUDIT_LOGS": {
+    "HEADER": "Audit Logs",
+    "HEADER_BTN_TXT": "Add Audit Logs",
+    "LOADING": "Fetching Audit Logs",
+    "SEARCH_404": "Tätä hakua vastaavia kohteita ei löydy",
+    "SIDEBAR_TXT": "<p><b>Audit Logs</b> </p><p> Audit Logs are trails for events and actions in a Chatwoot System. </p>",
+    "LIST": {
+      "404": "There are no Audit Logs available in this account.",
+      "TITLE": "Manage Audit Logs",
+      "DESC": "Audit Logs are trails for events and actions in a Chatwoot System.",
+      "TABLE_HEADER": [
+        "User",
+        "Action",
+        "IP-osoite",
+        "Time"
+      ]
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "AuditLogs retrieved successfully",
+      "ERROR_MESSAGE": "Yhteyden muodostaminen Woot-palvelimelle ei onnistunut, yritä myöhemmin uudelleen"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/fi/contact.json b/app/javascript/dashboard/i18n/locale/fi/contact.json
index 2d50f8fc2..274c5f9b5 100644
--- a/app/javascript/dashboard/i18n/locale/fi/contact.json
+++ b/app/javascript/dashboard/i18n/locale/fi/contact.json
@@ -120,8 +120,9 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Anna yhteystiedon puhelinnumero",
         "LABEL": "Puhelinnumero",
-        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]",
+        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
         "ERROR": "Phone number should be either empty or of E.164 format",
+        "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "This phone number is in use for another contact."
       },
       "LOCATION": {
@@ -181,7 +182,8 @@
         "LABEL": "To"
       },
       "INBOX": {
-        "LABEL": "Inbox",
+        "LABEL": "Via Inbox",
+        "PLACEHOLDER": "Choose source inbox",
         "ERROR": "Select an inbox"
       },
       "SUBJECT": {
diff --git a/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json
index eb5db4e44..3b5f4a6b1 100644
--- a/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json
@@ -478,6 +478,8 @@
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Päivitä",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
+      "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
diff --git a/app/javascript/dashboard/i18n/locale/fi/settings.json b/app/javascript/dashboard/i18n/locale/fi/settings.json
index f1a139347..4b0f837da 100644
--- a/app/javascript/dashboard/i18n/locale/fi/settings.json
+++ b/app/javascript/dashboard/i18n/locale/fi/settings.json
@@ -203,6 +203,7 @@
     "HOME": "Koti",
     "AGENTS": "Edustajat",
     "AGENT_BOTS": "Bots",
+    "AUDIT_LOGS": "Audit Logs",
     "INBOXES": "Kansiot",
     "NOTIFICATIONS": "Ilmoitukset",
     "CANNED_RESPONSES": "Tallennetut vastaukset",
diff --git a/app/javascript/dashboard/i18n/locale/fr/auditLogs.json b/app/javascript/dashboard/i18n/locale/fr/auditLogs.json
new file mode 100644
index 000000000..171c05a75
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/fr/auditLogs.json
@@ -0,0 +1,24 @@
+{
+  "AUDIT_LOGS": {
+    "HEADER": "Audit Logs",
+    "HEADER_BTN_TXT": "Add Audit Logs",
+    "LOADING": "Fetching Audit Logs",
+    "SEARCH_404": "Il n'y a aucun élément correspondant à cette requête",
+    "SIDEBAR_TXT": "<p><b>Audit Logs</b> </p><p> Audit Logs are trails for events and actions in a Chatwoot System. </p>",
+    "LIST": {
+      "404": "There are no Audit Logs available in this account.",
+      "TITLE": "Manage Audit Logs",
+      "DESC": "Audit Logs are trails for events and actions in a Chatwoot System.",
+      "TABLE_HEADER": [
+        "User",
+        "Action",
+        "Adresse IP",
+        "Time"
+      ]
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "AuditLogs retrieved successfully",
+      "ERROR_MESSAGE": "Impossible de se connecter au serveur Woot, veuillez réessayer plus tard"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/fr/contact.json b/app/javascript/dashboard/i18n/locale/fr/contact.json
index f45021741..1e0731da0 100644
--- a/app/javascript/dashboard/i18n/locale/fr/contact.json
+++ b/app/javascript/dashboard/i18n/locale/fr/contact.json
@@ -120,8 +120,9 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Entrez le numéro de téléphone du contact",
         "LABEL": "Numéro de téléphone",
-        "HELP": "Le numéro de téléphone doit être au format E.164. Ex. : +1415555555 [+][code pays][code régional][numéro de téléphone local]",
+        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
         "ERROR": "Le numéro de téléphone doit être soit vide soit au format E.164",
+        "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "Ce numéro de téléphone est utilisé par un autre contact."
       },
       "LOCATION": {
@@ -181,7 +182,8 @@
         "LABEL": "À"
       },
       "INBOX": {
-        "LABEL": "Boîte de réception",
+        "LABEL": "Via Inbox",
+        "PLACEHOLDER": "Choose source inbox",
         "ERROR": "Sélectionner une boîte de réception"
       },
       "SUBJECT": {
diff --git a/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json
index da28a23f8..cebe8d7e8 100644
--- a/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json
@@ -478,6 +478,8 @@
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Mettre à jour",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
+      "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
diff --git a/app/javascript/dashboard/i18n/locale/fr/settings.json b/app/javascript/dashboard/i18n/locale/fr/settings.json
index c76f8a13b..1a47938cc 100644
--- a/app/javascript/dashboard/i18n/locale/fr/settings.json
+++ b/app/javascript/dashboard/i18n/locale/fr/settings.json
@@ -203,6 +203,7 @@
     "HOME": "Accueil",
     "AGENTS": "Agents",
     "AGENT_BOTS": "Bots",
+    "AUDIT_LOGS": "Audit Logs",
     "INBOXES": "Boîtes de réception",
     "NOTIFICATIONS": "Notifications",
     "CANNED_RESPONSES": "Réponses standardisées",
diff --git a/app/javascript/dashboard/i18n/locale/he/auditLogs.json b/app/javascript/dashboard/i18n/locale/he/auditLogs.json
new file mode 100644
index 000000000..6d2ec466b
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/he/auditLogs.json
@@ -0,0 +1,24 @@
+{
+  "AUDIT_LOGS": {
+    "HEADER": "Audit Logs",
+    "HEADER_BTN_TXT": "Add Audit Logs",
+    "LOADING": "Fetching Audit Logs",
+    "SEARCH_404": "אין פריטים התואמים לשאילתה זו",
+    "SIDEBAR_TXT": "<p><b>Audit Logs</b> </p><p> Audit Logs are trails for events and actions in a Chatwoot System. </p>",
+    "LIST": {
+      "404": "There are no Audit Logs available in this account.",
+      "TITLE": "Manage Audit Logs",
+      "DESC": "Audit Logs are trails for events and actions in a Chatwoot System.",
+      "TABLE_HEADER": [
+        "User",
+        "Action",
+        "כתובת IP",
+        "Time"
+      ]
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "AuditLogs retrieved successfully",
+      "ERROR_MESSAGE": "לא ניתן להתחבר לשרת Woot, נסה שוב מאוחר יותר"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/he/contact.json b/app/javascript/dashboard/i18n/locale/he/contact.json
index 3dfc780ab..0496b6def 100644
--- a/app/javascript/dashboard/i18n/locale/he/contact.json
+++ b/app/javascript/dashboard/i18n/locale/he/contact.json
@@ -120,8 +120,9 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "הזן את מספר הטלפון של איש הקשר",
         "LABEL": "מספר טלפון",
-        "HELP": "מספר הטלפון צריך להיות בפורמט E.164, למשל: +1415555555 [+][קוד מדינה][אזור חיוג][מספר טלפון מקומי]",
+        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
         "ERROR": "מספר הטלפון צריך להיות ריק או בפורמט E.164",
+        "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "מספר טלפון זה נמצאת בשימוש עבור איש קשר אחר."
       },
       "LOCATION": {
@@ -181,7 +182,8 @@
         "LABEL": "אל"
       },
       "INBOX": {
-        "LABEL": "תיבת הדואר הנכנס",
+        "LABEL": "Via Inbox",
+        "PLACEHOLDER": "Choose source inbox",
         "ERROR": "בחר תיבת דואר נכנס"
       },
       "SUBJECT": {
diff --git a/app/javascript/dashboard/i18n/locale/he/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/he/inboxMgmt.json
index 462b7d455..ceda7781d 100644
--- a/app/javascript/dashboard/i18n/locale/he/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/he/inboxMgmt.json
@@ -478,6 +478,8 @@
       "WHATSAPP_SECTION_UPDATE_TITLE": "עדכון מפתח API",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "הזן את מפתח ה-API החדש כאן",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "עדכן",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
+      "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "עדכון הגדרות טופס טרום צ'אט"
     },
     "AUTO_ASSIGNMENT": {
diff --git a/app/javascript/dashboard/i18n/locale/he/settings.json b/app/javascript/dashboard/i18n/locale/he/settings.json
index bc97d2932..0e188e27e 100644
--- a/app/javascript/dashboard/i18n/locale/he/settings.json
+++ b/app/javascript/dashboard/i18n/locale/he/settings.json
@@ -203,6 +203,7 @@
     "HOME": "בית",
     "AGENTS": "סוכנים",
     "AGENT_BOTS": "בוטים",
+    "AUDIT_LOGS": "Audit Logs",
     "INBOXES": "תיבות דואר נכנס",
     "NOTIFICATIONS": "התראות",
     "CANNED_RESPONSES": "תגובות מוכנות",
diff --git a/app/javascript/dashboard/i18n/locale/hi/auditLogs.json b/app/javascript/dashboard/i18n/locale/hi/auditLogs.json
new file mode 100644
index 000000000..e288e2959
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hi/auditLogs.json
@@ -0,0 +1,24 @@
+{
+  "AUDIT_LOGS": {
+    "HEADER": "Audit Logs",
+    "HEADER_BTN_TXT": "Add Audit Logs",
+    "LOADING": "Fetching Audit Logs",
+    "SEARCH_404": "There are no items matching this query",
+    "SIDEBAR_TXT": "<p><b>Audit Logs</b> </p><p> Audit Logs are trails for events and actions in a Chatwoot System. </p>",
+    "LIST": {
+      "404": "There are no Audit Logs available in this account.",
+      "TITLE": "Manage Audit Logs",
+      "DESC": "Audit Logs are trails for events and actions in a Chatwoot System.",
+      "TABLE_HEADER": [
+        "User",
+        "Action",
+        "IP Address",
+        "Time"
+      ]
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "AuditLogs retrieved successfully",
+      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hi/contact.json b/app/javascript/dashboard/i18n/locale/hi/contact.json
index 9191698d8..4d1736ed0 100644
--- a/app/javascript/dashboard/i18n/locale/hi/contact.json
+++ b/app/javascript/dashboard/i18n/locale/hi/contact.json
@@ -120,8 +120,9 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Enter the phone number of the contact",
         "LABEL": "Phone Number",
-        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]",
+        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
         "ERROR": "Phone number should be either empty or of E.164 format",
+        "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "This phone number is in use for another contact."
       },
       "LOCATION": {
@@ -181,7 +182,8 @@
         "LABEL": "To"
       },
       "INBOX": {
-        "LABEL": "Inbox",
+        "LABEL": "Via Inbox",
+        "PLACEHOLDER": "Choose source inbox",
         "ERROR": "Select an inbox"
       },
       "SUBJECT": {
diff --git a/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json
index 60454261d..bed0ec0c9 100644
--- a/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json
@@ -478,6 +478,8 @@
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Update",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
+      "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
diff --git a/app/javascript/dashboard/i18n/locale/hi/settings.json b/app/javascript/dashboard/i18n/locale/hi/settings.json
index 112ac79bd..ab850562b 100644
--- a/app/javascript/dashboard/i18n/locale/hi/settings.json
+++ b/app/javascript/dashboard/i18n/locale/hi/settings.json
@@ -203,6 +203,7 @@
     "HOME": "Home",
     "AGENTS": "Agents",
     "AGENT_BOTS": "Bots",
+    "AUDIT_LOGS": "Audit Logs",
     "INBOXES": "Inboxes",
     "NOTIFICATIONS": "Notifications",
     "CANNED_RESPONSES": "Canned Responses",
diff --git a/app/javascript/dashboard/i18n/locale/hr/auditLogs.json b/app/javascript/dashboard/i18n/locale/hr/auditLogs.json
new file mode 100644
index 000000000..ff0faf90c
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hr/auditLogs.json
@@ -0,0 +1,24 @@
+{
+  "AUDIT_LOGS": {
+    "HEADER": "Audit Logovi",
+    "HEADER_BTN_TXT": "Dodaj Audit Logove",
+    "LOADING": "Dohvat Audit Logova",
+    "SEARCH_404": "Ne postoji rezultat za zadano pretraživanje",
+    "SIDEBAR_TXT": "<p><b>Audit Logovi</b> </p><p> Audit Logovi su tragovi događaja i akcija u Chatwoot sustavu. </p>",
+    "LIST": {
+      "404": "Na ovom korisničkom računu nema dostupnih Audit Logova.",
+      "TITLE": "Upravljanje Audit Logovima",
+      "DESC": "Audit Logovi su tragovi događaja i akcija u Chatwoot sustavu.",
+      "TABLE_HEADER": [
+        "Korisnik",
+        "Akcija",
+        "IP adresa",
+        "Vrijeme"
+      ]
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "Audit Logovi su uspješno dohvaćeni",
+      "ERROR_MESSAGE": "Neuspješno spajanje na Woot Server, Molimo pokušajte kasnije"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hr/contact.json b/app/javascript/dashboard/i18n/locale/hr/contact.json
index 84c99aee3..a7767f8f4 100644
--- a/app/javascript/dashboard/i18n/locale/hr/contact.json
+++ b/app/javascript/dashboard/i18n/locale/hr/contact.json
@@ -120,8 +120,9 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Enter the phone number of the contact",
         "LABEL": "Phone Number",
-        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]",
+        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
         "ERROR": "Phone number should be either empty or of E.164 format",
+        "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "This phone number is in use for another contact."
       },
       "LOCATION": {
@@ -181,7 +182,8 @@
         "LABEL": "To"
       },
       "INBOX": {
-        "LABEL": "Inbox",
+        "LABEL": "Kroz Inbox",
+        "PLACEHOLDER": "Izaberi izvorišni inbox",
         "ERROR": "Select an inbox"
       },
       "SUBJECT": {
diff --git a/app/javascript/dashboard/i18n/locale/hr/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/hr/inboxMgmt.json
index 8b28d2a3f..ed77491a9 100644
--- a/app/javascript/dashboard/i18n/locale/hr/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hr/inboxMgmt.json
@@ -478,6 +478,8 @@
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Update",
+      "WHATSAPP_WEBHOOK_TITLE": "Token za verifikaciju Webhook-a",
+      "WHATSAPP_WEBHOOK_SUBHEADER": "Ovaj token se koristi za verifikaciju autentičnosti webhook endpoint-a.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
diff --git a/app/javascript/dashboard/i18n/locale/hr/settings.json b/app/javascript/dashboard/i18n/locale/hr/settings.json
index 5e6ad266e..a12024285 100644
--- a/app/javascript/dashboard/i18n/locale/hr/settings.json
+++ b/app/javascript/dashboard/i18n/locale/hr/settings.json
@@ -203,6 +203,7 @@
     "HOME": "Home",
     "AGENTS": "Agents",
     "AGENT_BOTS": "Botovi",
+    "AUDIT_LOGS": "Audit Logovi",
     "INBOXES": "Inboxes",
     "NOTIFICATIONS": "Notifications",
     "CANNED_RESPONSES": "Canned Responses",
diff --git a/app/javascript/dashboard/i18n/locale/hu/auditLogs.json b/app/javascript/dashboard/i18n/locale/hu/auditLogs.json
new file mode 100644
index 000000000..ba6cf192c
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hu/auditLogs.json
@@ -0,0 +1,24 @@
+{
+  "AUDIT_LOGS": {
+    "HEADER": "Audit Logs",
+    "HEADER_BTN_TXT": "Add Audit Logs",
+    "LOADING": "Fetching Audit Logs",
+    "SEARCH_404": "Nincs megfelelő elem",
+    "SIDEBAR_TXT": "<p><b>Audit Logs</b> </p><p> Audit Logs are trails for events and actions in a Chatwoot System. </p>",
+    "LIST": {
+      "404": "There are no Audit Logs available in this account.",
+      "TITLE": "Manage Audit Logs",
+      "DESC": "Audit Logs are trails for events and actions in a Chatwoot System.",
+      "TABLE_HEADER": [
+        "User",
+        "Action",
+        "IP cím",
+        "Time"
+      ]
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "AuditLogs retrieved successfully",
+      "ERROR_MESSAGE": "Nem sikerült csatlakozni a Woot szerverhez, kérjük próbáld később"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hu/contact.json b/app/javascript/dashboard/i18n/locale/hu/contact.json
index 2d7a0eab4..d2c773dbe 100644
--- a/app/javascript/dashboard/i18n/locale/hu/contact.json
+++ b/app/javascript/dashboard/i18n/locale/hu/contact.json
@@ -120,8 +120,9 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "A kontakt telefonszámának megadása",
         "LABEL": "Telefonszám",
-        "HELP": "A telefonszámnak E.164 formátumúnak kell lennie, pl: +[+][országkód][körzetszám][helyi telefonszám]",
+        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
         "ERROR": "A telefonszámnak üresnek vagy E.164 formátumúnak kell lennie",
+        "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "Ez a telefonszám már egy másik kontakthoz tartozik."
       },
       "LOCATION": {
@@ -181,7 +182,8 @@
         "LABEL": "Ide"
       },
       "INBOX": {
-        "LABEL": "Fiók",
+        "LABEL": "Via Inbox",
+        "PLACEHOLDER": "Choose source inbox",
         "ERROR": "Válassz egy fiókot"
       },
       "SUBJECT": {
diff --git a/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json
index c294b2c12..836483989 100644
--- a/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json
@@ -478,6 +478,8 @@
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Frissítés",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
+      "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
diff --git a/app/javascript/dashboard/i18n/locale/hu/settings.json b/app/javascript/dashboard/i18n/locale/hu/settings.json
index 3a2600661..4c4b76974 100644
--- a/app/javascript/dashboard/i18n/locale/hu/settings.json
+++ b/app/javascript/dashboard/i18n/locale/hu/settings.json
@@ -203,6 +203,7 @@
     "HOME": "Nyitólap",
     "AGENTS": "Ügynökök",
     "AGENT_BOTS": "Bots",
+    "AUDIT_LOGS": "Audit Logs",
     "INBOXES": "Bejövők",
     "NOTIFICATIONS": "Értesítések",
     "CANNED_RESPONSES": "Mentett válaszok",
diff --git a/app/javascript/dashboard/i18n/locale/hy/auditLogs.json b/app/javascript/dashboard/i18n/locale/hy/auditLogs.json
new file mode 100644
index 000000000..e288e2959
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hy/auditLogs.json
@@ -0,0 +1,24 @@
+{
+  "AUDIT_LOGS": {
+    "HEADER": "Audit Logs",
+    "HEADER_BTN_TXT": "Add Audit Logs",
+    "LOADING": "Fetching Audit Logs",
+    "SEARCH_404": "There are no items matching this query",
+    "SIDEBAR_TXT": "<p><b>Audit Logs</b> </p><p> Audit Logs are trails for events and actions in a Chatwoot System. </p>",
+    "LIST": {
+      "404": "There are no Audit Logs available in this account.",
+      "TITLE": "Manage Audit Logs",
+      "DESC": "Audit Logs are trails for events and actions in a Chatwoot System.",
+      "TABLE_HEADER": [
+        "User",
+        "Action",
+        "IP Address",
+        "Time"
+      ]
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "AuditLogs retrieved successfully",
+      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hy/contact.json b/app/javascript/dashboard/i18n/locale/hy/contact.json
index 9191698d8..4d1736ed0 100644
--- a/app/javascript/dashboard/i18n/locale/hy/contact.json
+++ b/app/javascript/dashboard/i18n/locale/hy/contact.json
@@ -120,8 +120,9 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Enter the phone number of the contact",
         "LABEL": "Phone Number",
-        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]",
+        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
         "ERROR": "Phone number should be either empty or of E.164 format",
+        "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "This phone number is in use for another contact."
       },
       "LOCATION": {
@@ -181,7 +182,8 @@
         "LABEL": "To"
       },
       "INBOX": {
-        "LABEL": "Inbox",
+        "LABEL": "Via Inbox",
+        "PLACEHOLDER": "Choose source inbox",
         "ERROR": "Select an inbox"
       },
       "SUBJECT": {
diff --git a/app/javascript/dashboard/i18n/locale/hy/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/hy/inboxMgmt.json
index 8b28d2a3f..14f60eac8 100644
--- a/app/javascript/dashboard/i18n/locale/hy/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hy/inboxMgmt.json
@@ -478,6 +478,8 @@
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Update",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
+      "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
diff --git a/app/javascript/dashboard/i18n/locale/hy/settings.json b/app/javascript/dashboard/i18n/locale/hy/settings.json
index f670fc360..86ddf40e6 100644
--- a/app/javascript/dashboard/i18n/locale/hy/settings.json
+++ b/app/javascript/dashboard/i18n/locale/hy/settings.json
@@ -203,6 +203,7 @@
     "HOME": "Home",
     "AGENTS": "Agents",
     "AGENT_BOTS": "Bots",
+    "AUDIT_LOGS": "Audit Logs",
     "INBOXES": "Inboxes",
     "NOTIFICATIONS": "Notifications",
     "CANNED_RESPONSES": "Canned Responses",
diff --git a/app/javascript/dashboard/i18n/locale/id/auditLogs.json b/app/javascript/dashboard/i18n/locale/id/auditLogs.json
new file mode 100644
index 000000000..667b9c6d6
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/id/auditLogs.json
@@ -0,0 +1,24 @@
+{
+  "AUDIT_LOGS": {
+    "HEADER": "Audit Logs",
+    "HEADER_BTN_TXT": "Add Audit Logs",
+    "LOADING": "Fetching Audit Logs",
+    "SEARCH_404": "Tidak ada item yang cocok dengan kueri ini",
+    "SIDEBAR_TXT": "<p><b>Audit Logs</b> </p><p> Audit Logs are trails for events and actions in a Chatwoot System. </p>",
+    "LIST": {
+      "404": "There are no Audit Logs available in this account.",
+      "TITLE": "Manage Audit Logs",
+      "DESC": "Audit Logs are trails for events and actions in a Chatwoot System.",
+      "TABLE_HEADER": [
+        "User",
+        "Action",
+        "IP Address",
+        "Time"
+      ]
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "AuditLogs retrieved successfully",
+      "ERROR_MESSAGE": "Tidak dapat terhubung ke Server Woot, Silahkan coba lagi nanti"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/id/contact.json b/app/javascript/dashboard/i18n/locale/id/contact.json
index 0064a00ce..ef47b63c0 100644
--- a/app/javascript/dashboard/i18n/locale/id/contact.json
+++ b/app/javascript/dashboard/i18n/locale/id/contact.json
@@ -120,8 +120,9 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Masukkan nomor telepon kontak tersebut",
         "LABEL": "Nomor Telpon",
-        "HELP": "Nomer telepon harus dalam format E.164 misalnya: +1415555555 [+][kode negara][kode area][nomer telepon]",
+        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
         "ERROR": "Nomer telepon harus kosong atau dalam format E. 164",
+        "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "Nomer ini sudah dipakai dengan kontak lain."
       },
       "LOCATION": {
@@ -181,7 +182,8 @@
         "LABEL": "Ke"
       },
       "INBOX": {
-        "LABEL": "Kotak masuk",
+        "LABEL": "Via Inbox",
+        "PLACEHOLDER": "Choose source inbox",
         "ERROR": "Pilih kotak masuk"
       },
       "SUBJECT": {
diff --git a/app/javascript/dashboard/i18n/locale/id/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/id/inboxMgmt.json
index d4b524eb7..277ab2e3d 100644
--- a/app/javascript/dashboard/i18n/locale/id/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/id/inboxMgmt.json
@@ -478,6 +478,8 @@
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Perbarui",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
+      "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
diff --git a/app/javascript/dashboard/i18n/locale/id/settings.json b/app/javascript/dashboard/i18n/locale/id/settings.json
index 00afcd484..54a506d0f 100644
--- a/app/javascript/dashboard/i18n/locale/id/settings.json
+++ b/app/javascript/dashboard/i18n/locale/id/settings.json
@@ -203,6 +203,7 @@
     "HOME": "Home",
     "AGENTS": "Agen",
     "AGENT_BOTS": "Bots",
+    "AUDIT_LOGS": "Audit Logs",
     "INBOXES": "Kotak masuk",
     "NOTIFICATIONS": "Notifikasi",
     "CANNED_RESPONSES": "Canned Responses",
diff --git a/app/javascript/dashboard/i18n/locale/is/advancedFilters.json b/app/javascript/dashboard/i18n/locale/is/advancedFilters.json
index 5dbaee6df..eb5e0842a 100644
--- a/app/javascript/dashboard/i18n/locale/is/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/is/advancedFilters.json
@@ -46,7 +46,7 @@
       "CUSTOM_ATTRIBUTE_LINK": "Link",
       "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox",
       "CREATED_AT": "Created At",
-      "LAST_ACTIVITY": "Last Activity"
+      "LAST_ACTIVITY": "Seinasta virkni"
     },
     "GROUPS": {
       "STANDARD_FILTERS": "Standard Filters",
diff --git a/app/javascript/dashboard/i18n/locale/is/agentMgmt.json b/app/javascript/dashboard/i18n/locale/is/agentMgmt.json
index f74a445fb..c349a1e64 100644
--- a/app/javascript/dashboard/i18n/locale/is/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/is/agentMgmt.json
@@ -75,7 +75,7 @@
           "PLACEHOLDER": "Vinsamlegast skráið netfang þjónustufulltrúa"
         },
         "AGENT_AVAILABILITY": {
-          "LABEL": "Availability",
+          "LABEL": "Framboð",
           "PLACEHOLDER": "Please select an availability status",
           "ERROR": "Availability is required"
         },
diff --git a/app/javascript/dashboard/i18n/locale/is/auditLogs.json b/app/javascript/dashboard/i18n/locale/is/auditLogs.json
new file mode 100644
index 000000000..1e04bac19
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/is/auditLogs.json
@@ -0,0 +1,24 @@
+{
+  "AUDIT_LOGS": {
+    "HEADER": "Aðgerðaskrá",
+    "HEADER_BTN_TXT": "Bæta við Aðgerðaskrá",
+    "LOADING": "Hleð Aðgerðaskrá",
+    "SEARCH_404": "Það eru engin atriði sem passa við þessa fyrirspurn",
+    "SIDEBAR_TXT": "<p><b>Aðgerðaskrá</b> </p><p> Aðgerðaskrá heldur utan um alla atburði og aðgerðir í Chatwoot. </p>",
+    "LIST": {
+      "404": "Það eru engar aðgerðaskrár tiltækar á þessum reikning.",
+      "TITLE": "Stjórna Aðgerðaskrám",
+      "DESC": "Aðgerðaskrár heldur utan um alla atburði og aðgerðir í Chatwoot.",
+      "TABLE_HEADER": [
+        "Notandi",
+        "Aðgerð",
+        "IP tala",
+        "Tími"
+      ]
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "Aðgerðaskrá sótt",
+      "ERROR_MESSAGE": "Náði ekki að tengjast við netþjóna Woot, vinsamlegast reynið aftur"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/is/campaign.json b/app/javascript/dashboard/i18n/locale/is/campaign.json
index 9fb4de459..476c11fc3 100644
--- a/app/javascript/dashboard/i18n/locale/is/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/is/campaign.json
@@ -89,7 +89,7 @@
       "TABLE_HEADER": {
         "TITLE": "Title",
         "MESSAGE": "Skilaboð",
-        "INBOX": "Inbox",
+        "INBOX": "Innhólf",
         "STATUS": "Staða",
         "SENDER": "Sender",
         "URL": "URL",
diff --git a/app/javascript/dashboard/i18n/locale/is/contact.json b/app/javascript/dashboard/i18n/locale/is/contact.json
index bc8c435d2..581bc4e93 100644
--- a/app/javascript/dashboard/i18n/locale/is/contact.json
+++ b/app/javascript/dashboard/i18n/locale/is/contact.json
@@ -15,7 +15,7 @@
     "INITIATED_FROM": "Hafið frá",
     "INITIATED_AT": "Hafið",
     "IP_ADDRESS": "IP tala",
-    "CREATED_AT_LABEL": "Created",
+    "CREATED_AT_LABEL": "Skráð",
     "NEW_MESSAGE": "Ný skilaboð",
     "CONVERSATIONS": {
       "NO_RECORDS_FOUND": "Engin fyrri samtöl eru tengd þessum tengilið.",
@@ -120,8 +120,9 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Sláðu inn símanúmer tengiliðs",
         "LABEL": "Símanúmer",
-        "HELP": "Símanúmer ætti að vera á E.164 sniði, td: +3541234567 [+][landsnúmer][svæðisnúmer][staðbundið símanúmer]",
+        "HELP": "Símanúmer skal fylgja E.164 sniðmátinu. Dæmi: +3541112222 [+][landsnúmer][svæðisnúmer][símanúmer]. Þú getur valið landsnúmer úr valmyndinni.",
         "ERROR": "Símanúmer ætti að vera annað hvort autt eða á E.164 sniði",
+        "DIAL_CODE_ERROR": "Vinsamlegast veldu landsnúmer úr listanum",
         "DUPLICATE": "Þetta símanúmer er í notkun fyrir annan tengilið."
       },
       "LOCATION": {
@@ -129,47 +130,47 @@
         "LABEL": "Staðsetning"
       },
       "COMPANY_NAME": {
-        "PLACEHOLDER": "Enter the company name",
-        "LABEL": "Company Name"
+        "PLACEHOLDER": "Sláðu inn nafn fyrirtækis",
+        "LABEL": "Nafn fyrirtækis"
       },
       "COUNTRY": {
-        "PLACEHOLDER": "Enter the country name",
-        "LABEL": "Country Name",
+        "PLACEHOLDER": "Sláðu inn nafn lands",
+        "LABEL": "Nafn lands",
         "SELECT_PLACEHOLDER": "Velja",
         "REMOVE": "Fjarlægja",
-        "SELECT_COUNTRY": "Select Country"
+        "SELECT_COUNTRY": "Veldu land"
       },
       "CITY": {
-        "PLACEHOLDER": "Enter the city name",
-        "LABEL": "City Name"
+        "PLACEHOLDER": "Sláðu inn nafn borgar",
+        "LABEL": "Nafn borgar"
       },
       "SOCIAL_PROFILES": {
         "FACEBOOK": {
-          "PLACEHOLDER": "Enter the Facebook username",
+          "PLACEHOLDER": "Sláðu inn Facebook notandanafn",
           "LABEL": "Facebook"
         },
         "TWITTER": {
-          "PLACEHOLDER": "Enter the Twitter username",
+          "PLACEHOLDER": "Sláðu inn Twitter notandanafn",
           "LABEL": "Twitter"
         },
         "LINKEDIN": {
-          "PLACEHOLDER": "Enter the LinkedIn username",
+          "PLACEHOLDER": "Sláðu inn LinkedIn notandanafn",
           "LABEL": "LinkedIn"
         },
         "GITHUB": {
-          "PLACEHOLDER": "Enter the Github username",
+          "PLACEHOLDER": "Sláðu inn Github notandanafn",
           "LABEL": "Github"
         }
       }
     },
     "DELETE_AVATAR": {
       "API": {
-        "SUCCESS_MESSAGE": "Contact avatar deleted successfully",
+        "SUCCESS_MESSAGE": "Notandamynd tengiliðs eytt",
         "ERROR_MESSAGE": "Gat ekki eytt notandamynd tengiliða. Vinsamlegast reyndu aftur síðar."
       }
     },
-    "SUCCESS_MESSAGE": "Contact saved successfully",
-    "ERROR_MESSAGE": "There was an error, please try again"
+    "SUCCESS_MESSAGE": "Tengiliðurinn var vistaður",
+    "ERROR_MESSAGE": "Það kom upp villa, vinsamlegast reyndu aftur"
   },
   "NEW_CONVERSATION": {
     "BUTTON_LABEL": "Hefja samtal",
@@ -181,55 +182,56 @@
         "LABEL": "Til"
       },
       "INBOX": {
-        "LABEL": "Inbox",
-        "ERROR": "Select an inbox"
+        "LABEL": "Via Inbox",
+        "PLACEHOLDER": "Choose source inbox",
+        "ERROR": "Veldu innhólf"
       },
       "SUBJECT": {
-        "LABEL": "Subject",
-        "PLACEHOLDER": "Subject",
-        "ERROR": "Subject can't be empty"
+        "LABEL": "Viðfangsefni",
+        "PLACEHOLDER": "Viðfangsefni",
+        "ERROR": "Viðfangsefni má ekki vera tómt"
       },
       "MESSAGE": {
         "LABEL": "Skilaboð",
-        "PLACEHOLDER": "Write your message here",
-        "ERROR": "Message can't be empty"
+        "PLACEHOLDER": "Skrifaðu skilaboðin þín hér",
+        "ERROR": "Skilaboð mega ekki vera tóm"
       },
-      "SUBMIT": "Send message",
+      "SUBMIT": "Senda skilaboð",
       "CANCEL": "Hætta við",
-      "SUCCESS_MESSAGE": "Message sent!",
+      "SUCCESS_MESSAGE": "Skilaboð send!",
       "GO_TO_CONVERSATION": "Skoða",
-      "ERROR_MESSAGE": "Couldn't send! try again"
+      "ERROR_MESSAGE": "Gat ekki sent! Reyndu aftur"
     }
   },
   "CONTACTS_PAGE": {
-    "HEADER": "Contacts",
-    "FIELDS": "Contact fields",
-    "SEARCH_BUTTON": "Search",
-    "SEARCH_INPUT_PLACEHOLDER": "Search for contacts",
-    "FILTER_CONTACTS": "Filter",
-    "FILTER_CONTACTS_SAVE": "Save filter",
-    "FILTER_CONTACTS_DELETE": "Delete filter",
+    "HEADER": "Tengiliðir",
+    "FIELDS": "Tengiliðs reitir",
+    "SEARCH_BUTTON": "Leit",
+    "SEARCH_INPUT_PLACEHOLDER": "Leita að tengiliðum",
+    "FILTER_CONTACTS": "Sía",
+    "FILTER_CONTACTS_SAVE": "Vista síu",
+    "FILTER_CONTACTS_DELETE": "Eyða síu",
     "LIST": {
-      "LOADING_MESSAGE": "Loading contacts...",
-      "404": "No contacts matches your search 🔍",
-      "NO_CONTACTS": "There are no available contacts",
+      "LOADING_MESSAGE": "Hleð tengiliðum...",
+      "404": "Engir tengiliðir fundust",
+      "NO_CONTACTS": "Það eru engir tengiliðir til staðar",
       "TABLE_HEADER": {
         "NAME": "Nafn",
         "PHONE_NUMBER": "Símanúmer",
         "CONVERSATIONS": "Samtöl",
-        "LAST_ACTIVITY": "Last Activity",
-        "CREATED_AT": "Created At",
-        "COUNTRY": "Country",
-        "CITY": "City",
+        "LAST_ACTIVITY": "Seinasta virkni",
+        "CREATED_AT": "Skráð",
+        "COUNTRY": "Land",
+        "CITY": "Borg",
         "SOCIAL_PROFILES": "Social Profiles",
         "COMPANY": "Fyrirtæki",
         "EMAIL_ADDRESS": "Netfang"
       },
-      "VIEW_DETAILS": "View details"
+      "VIEW_DETAILS": "Sjá smáatriði"
     }
   },
   "CONTACT_PROFILE": {
-    "BACK_BUTTON": "Contacts",
+    "BACK_BUTTON": "Tengiliðir",
     "LOADING": "Loading contact profile..."
   },
   "REMINDER": {
diff --git a/app/javascript/dashboard/i18n/locale/is/contactFilters.json b/app/javascript/dashboard/i18n/locale/is/contactFilters.json
index 2dc22d6e7..2daf5e865 100644
--- a/app/javascript/dashboard/i18n/locale/is/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/is/contactFilters.json
@@ -30,15 +30,15 @@
             "EMAIL": "Tölvupóstfang",
             "PHONE_NUMBER": "Símanúmer",
             "IDENTIFIER": "Identifier",
-            "CITY": "City",
-            "COUNTRY": "Country",
+            "CITY": "Borg",
+            "COUNTRY": "Land",
             "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",
+            "LAST_ACTIVITY": "Seinasta virkni",
             "REFERER_LINK": "Referrer link"
         },
         "GROUPS": {
diff --git a/app/javascript/dashboard/i18n/locale/is/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/is/inboxMgmt.json
index a5ee57d9a..86c59b96b 100644
--- a/app/javascript/dashboard/i18n/locale/is/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/is/inboxMgmt.json
@@ -208,7 +208,7 @@
         },
         "INBOX_NAME": {
           "LABEL": "Nafn Innhólfs",
-          "PLACEHOLDER": "Please enter an inbox name",
+          "PLACEHOLDER": "Vinsamlegast sláðu inn nafn innhólfs",
           "ERROR": "Það er nauðsynlegt að fylla út þennan reit"
         },
         "PHONE_NUMBER": {
@@ -219,23 +219,23 @@
         "PHONE_NUMBER_ID": {
           "LABEL": "Phone number ID",
           "PLACEHOLDER": "Vinsamlega sláðu inn auðkenni símanúmers sem þú færð frá stjórnborði Facebook Developer.",
-          "ERROR": "Please enter a valid value."
+          "ERROR": "Vinsamlegast sláðu inn gilt gildi."
         },
         "BUSINESS_ACCOUNT_ID": {
           "LABEL": "Business Account ID",
           "PLACEHOLDER": "Vinsamlega sláðu inn auðkenni fyrirtækjareiknings sem þú færð frá stjórnborði Facebook Developer.",
-          "ERROR": "Please enter a valid value."
+          "ERROR": "Vinsamlegast sláðu inn gilt gildi."
         },
         "WEBHOOK_VERIFY_TOKEN": {
           "LABEL": "Webhook Verify Token",
           "PLACEHOLDER": "Sláðu inn staðfestingartákn sem þú vilt stilla fyrir Facebook webhooks.",
-          "ERROR": "Please enter a valid value."
+          "ERROR": "Vinsamlegast sláðu inn gilt gildi."
         },
         "API_KEY": {
           "LABEL": "API key",
           "SUBTITLE": "Configure the WhatsApp API key.",
           "PLACEHOLDER": "API key",
-          "ERROR": "Please enter a valid value."
+          "ERROR": "Vinsamlegast sláðu inn gilt gildi."
         },
         "API_CALLBACK": {
           "TITLE": "Callback URL",
@@ -478,6 +478,8 @@
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Uppfæra",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
+      "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
diff --git a/app/javascript/dashboard/i18n/locale/is/integrationApps.json b/app/javascript/dashboard/i18n/locale/is/integrationApps.json
index cb1d2b131..2cdb42fe2 100644
--- a/app/javascript/dashboard/i18n/locale/is/integrationApps.json
+++ b/app/javascript/dashboard/i18n/locale/is/integrationApps.json
@@ -30,7 +30,7 @@
     },
     "LIST": {
       "FETCHING": "Fetching integration hooks",
-      "INBOX": "Inbox",
+      "INBOX": "Innhólf",
       "DELETE": {
         "BUTTON_TEXT": "Eyða"
       }
diff --git a/app/javascript/dashboard/i18n/locale/is/resetPassword.json b/app/javascript/dashboard/i18n/locale/is/resetPassword.json
index 4f3067751..5d5067e2c 100644
--- a/app/javascript/dashboard/i18n/locale/is/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/is/resetPassword.json
@@ -3,8 +3,8 @@
     "TITLE": "Endurstilla lykilorð",
     "EMAIL": {
       "LABEL": "Tölvupóstfang",
-      "PLACEHOLDER": "Please enter your email",
-      "ERROR": "Please enter a valid email"
+      "PLACEHOLDER": "Vinsamlegast sláðu inn netfangið þitt",
+      "ERROR": "Vinsamlegast skrifaðu gilt netfang"
     },
     "API": {
       "SUCCESS_MESSAGE": "Tengill til að endurstilla lykilorð hefur verið sendur á netfangið þitt",
diff --git a/app/javascript/dashboard/i18n/locale/is/search.json b/app/javascript/dashboard/i18n/locale/is/search.json
index a9c463e37..6ea79ef5f 100644
--- a/app/javascript/dashboard/i18n/locale/is/search.json
+++ b/app/javascript/dashboard/i18n/locale/is/search.json
@@ -2,12 +2,12 @@
   "SEARCH": {
     "TABS": {
       "ALL": "Allt",
-      "CONTACTS": "Contacts",
+      "CONTACTS": "Tengiliðir",
       "CONVERSATIONS": "Samtöl",
       "MESSAGES": "Skilaboð"
     },
     "SECTION": {
-      "CONTACTS": "Contacts",
+      "CONTACTS": "Tengiliðir",
       "CONVERSATIONS": "Samtöl",
       "MESSAGES": "Skilaboð"
     },
diff --git a/app/javascript/dashboard/i18n/locale/is/settings.json b/app/javascript/dashboard/i18n/locale/is/settings.json
index 883fdc37b..6363bfe88 100644
--- a/app/javascript/dashboard/i18n/locale/is/settings.json
+++ b/app/javascript/dashboard/i18n/locale/is/settings.json
@@ -102,8 +102,8 @@
       },
       "NAME": {
         "LABEL": "Your full name",
-        "ERROR": "Please enter a valid full name",
-        "PLACEHOLDER": "Please enter your full name"
+        "ERROR": "Vinsamlegast skrifaðu gilt nafn",
+        "PLACEHOLDER": "Vinsamlegast sláðu inn nafnið þitt"
       },
       "DISPLAY_NAME": {
         "LABEL": "Display name",
@@ -122,23 +122,23 @@
       },
       "EMAIL": {
         "LABEL": "Your email address",
-        "ERROR": "Please enter a valid email address",
+        "ERROR": "Vinsamlegast skrifaðu gilt netfang",
         "PLACEHOLDER": "Vinsamlegast sláðu inn netfangið þitt, þetta myndi birtast í samtölum"
       },
       "CURRENT_PASSWORD": {
         "LABEL": "Current password",
-        "ERROR": "Please enter the current password",
-        "PLACEHOLDER": "Please enter the current password"
+        "ERROR": "Vinsamlegast sláðu inn núverandi lykilorð",
+        "PLACEHOLDER": "Vinsamlegast sláðu inn núverandi lykilorð"
       },
       "PASSWORD": {
         "LABEL": "New password",
         "ERROR": "Vinsamlegast sláðu inn lykilorð 6 stafa lengd eða meira",
-        "PLACEHOLDER": "Please enter a new password"
+        "PLACEHOLDER": "Vinsamlegast sláðu inn nýja lykilorðið"
       },
       "PASSWORD_CONFIRMATION": {
         "LABEL": "Confirm new password",
         "ERROR": "Staðfest lykilorð ætti að passa við lykilorðið",
-        "PLACEHOLDER": "Please re-enter your new password"
+        "PLACEHOLDER": "Vinsamlegasts staðfestu nýja lykilorðið"
       }
     }
   },
@@ -199,10 +199,11 @@
     "UNATTENDED_CONVERSATIONS": "Unattended",
     "REPORTS": "Reports",
     "SETTINGS": "Stillingar",
-    "CONTACTS": "Contacts",
+    "CONTACTS": "Tengiliðir",
     "HOME": "Home",
     "AGENTS": "Þjónustufulltrúar",
     "AGENT_BOTS": "Bots",
+    "AUDIT_LOGS": "Aðgerðaskrá",
     "INBOXES": "Innhólf",
     "NOTIFICATIONS": "Skilaboð",
     "CANNED_RESPONSES": "Stöðluð svör",
@@ -230,7 +231,7 @@
     "ONE_OFF": "One off",
     "REPORTS_AGENT": "Þjónustufulltrúar",
     "REPORTS_LABEL": "Labels",
-    "REPORTS_INBOX": "Inbox",
+    "REPORTS_INBOX": "Innhólf",
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
     "BETA": "Beta",
@@ -281,7 +282,7 @@
     },
     "FORM": {
       "NAME": {
-        "LABEL": "Company Name",
+        "LABEL": "Nafn fyrirtækis",
         "PLACEHOLDER": "Wayne Enterprises"
       },
       "SUBMIT": "Senda"
diff --git a/app/javascript/dashboard/i18n/locale/it/auditLogs.json b/app/javascript/dashboard/i18n/locale/it/auditLogs.json
new file mode 100644
index 000000000..5482d6f7e
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/it/auditLogs.json
@@ -0,0 +1,24 @@
+{
+  "AUDIT_LOGS": {
+    "HEADER": "Audit Logs",
+    "HEADER_BTN_TXT": "Add Audit Logs",
+    "LOADING": "Fetching Audit Logs",
+    "SEARCH_404": "Non ci sono elementi che corrispondono a questa richiesta",
+    "SIDEBAR_TXT": "<p><b>Audit Logs</b> </p><p> Audit Logs are trails for events and actions in a Chatwoot System. </p>",
+    "LIST": {
+      "404": "There are no Audit Logs available in this account.",
+      "TITLE": "Manage Audit Logs",
+      "DESC": "Audit Logs are trails for events and actions in a Chatwoot System.",
+      "TABLE_HEADER": [
+        "User",
+        "Action",
+        "Indirizzo IP",
+        "Time"
+      ]
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "AuditLogs retrieved successfully",
+      "ERROR_MESSAGE": "Impossibile connettersi al server Woot, riprova più tardi"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/it/contact.json b/app/javascript/dashboard/i18n/locale/it/contact.json
index 49985ab33..e4831c951 100644
--- a/app/javascript/dashboard/i18n/locale/it/contact.json
+++ b/app/javascript/dashboard/i18n/locale/it/contact.json
@@ -120,8 +120,9 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Inserisci il numero di telefono del contatto",
         "LABEL": "Numero di telefono",
-        "HELP": "Il numero di telefono dovrebbe essere di formato E.164 es.: +3915555555 [+][codice nazione][codice zona][numero di telefono locale]",
+        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
         "ERROR": "Il numero di telefono deve essere vuoto o di formato E.164",
+        "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "Questo numero di telefono è in uso per un altro contatto."
       },
       "LOCATION": {
@@ -181,7 +182,8 @@
         "LABEL": "A"
       },
       "INBOX": {
-        "LABEL": "Casella",
+        "LABEL": "Via Inbox",
+        "PLACEHOLDER": "Choose source inbox",
         "ERROR": "Seleziona una casella"
       },
       "SUBJECT": {
diff --git a/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json
index d1d5fcce0..2c15ef8f8 100644
--- a/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json
@@ -478,6 +478,8 @@
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Aggiorna",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook verifica token",
+      "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
diff --git a/app/javascript/dashboard/i18n/locale/it/settings.json b/app/javascript/dashboard/i18n/locale/it/settings.json
index 1f0734872..85e933b8c 100644
--- a/app/javascript/dashboard/i18n/locale/it/settings.json
+++ b/app/javascript/dashboard/i18n/locale/it/settings.json
@@ -203,6 +203,7 @@
     "HOME": "Home",
     "AGENTS": "Agenti",
     "AGENT_BOTS": "Bots",
+    "AUDIT_LOGS": "Audit Logs",
     "INBOXES": "Posta",
     "NOTIFICATIONS": "Notifiche",
     "CANNED_RESPONSES": "Risposte predefinite",
diff --git a/app/javascript/dashboard/i18n/locale/ja/auditLogs.json b/app/javascript/dashboard/i18n/locale/ja/auditLogs.json
new file mode 100644
index 000000000..538047568
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ja/auditLogs.json
@@ -0,0 +1,24 @@
+{
+  "AUDIT_LOGS": {
+    "HEADER": "Audit Logs",
+    "HEADER_BTN_TXT": "Add Audit Logs",
+    "LOADING": "Fetching Audit Logs",
+    "SEARCH_404": "検索内容（クエリ）に一致する項目はありませんでした",
+    "SIDEBAR_TXT": "<p><b>Audit Logs</b> </p><p> Audit Logs are trails for events and actions in a Chatwoot System. </p>",
+    "LIST": {
+      "404": "There are no Audit Logs available in this account.",
+      "TITLE": "Manage Audit Logs",
+      "DESC": "Audit Logs are trails for events and actions in a Chatwoot System.",
+      "TABLE_HEADER": [
+        "User",
+        "Action",
+        "IP Address",
+        "Time"
+      ]
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "AuditLogs retrieved successfully",
+      "ERROR_MESSAGE": "Woot Serverに接続できませんでした。後でもう一度お試しください。"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ja/contact.json b/app/javascript/dashboard/i18n/locale/ja/contact.json
index 591c14591..1a34ba8f5 100644
--- a/app/javascript/dashboard/i18n/locale/ja/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ja/contact.json
@@ -120,8 +120,9 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "連絡先の電話番号を入力してください",
         "LABEL": "電話番号",
-        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]",
+        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
         "ERROR": "Phone number should be either empty or of E.164 format",
+        "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "This phone number is in use for another contact."
       },
       "LOCATION": {
@@ -181,7 +182,8 @@
         "LABEL": "To"
       },
       "INBOX": {
-        "LABEL": "Inbox",
+        "LABEL": "Via Inbox",
+        "PLACEHOLDER": "Choose source inbox",
         "ERROR": "Select an inbox"
       },
       "SUBJECT": {
diff --git a/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json
index cb1ddedde..ce1e994a9 100644
--- a/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json
@@ -478,6 +478,8 @@
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "更新",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
+      "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
diff --git a/app/javascript/dashboard/i18n/locale/ja/settings.json b/app/javascript/dashboard/i18n/locale/ja/settings.json
index 6110d8c7e..7c0202793 100644
--- a/app/javascript/dashboard/i18n/locale/ja/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ja/settings.json
@@ -203,6 +203,7 @@
     "HOME": "ホーム",
     "AGENTS": "担当者",
     "AGENT_BOTS": "Bots",
+    "AUDIT_LOGS": "Audit Logs",
     "INBOXES": "受信トレイ",
     "NOTIFICATIONS": "Notifications",
     "CANNED_RESPONSES": "定型文",
diff --git a/app/javascript/dashboard/i18n/locale/ka/auditLogs.json b/app/javascript/dashboard/i18n/locale/ka/auditLogs.json
new file mode 100644
index 000000000..e288e2959
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ka/auditLogs.json
@@ -0,0 +1,24 @@
+{
+  "AUDIT_LOGS": {
+    "HEADER": "Audit Logs",
+    "HEADER_BTN_TXT": "Add Audit Logs",
+    "LOADING": "Fetching Audit Logs",
+    "SEARCH_404": "There are no items matching this query",
+    "SIDEBAR_TXT": "<p><b>Audit Logs</b> </p><p> Audit Logs are trails for events and actions in a Chatwoot System. </p>",
+    "LIST": {
+      "404": "There are no Audit Logs available in this account.",
+      "TITLE": "Manage Audit Logs",
+      "DESC": "Audit Logs are trails for events and actions in a Chatwoot System.",
+      "TABLE_HEADER": [
+        "User",
+        "Action",
+        "IP Address",
+        "Time"
+      ]
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "AuditLogs retrieved successfully",
+      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ka/contact.json b/app/javascript/dashboard/i18n/locale/ka/contact.json
index 9191698d8..4d1736ed0 100644
--- a/app/javascript/dashboard/i18n/locale/ka/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ka/contact.json
@@ -120,8 +120,9 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Enter the phone number of the contact",
         "LABEL": "Phone Number",
-        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]",
+        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
         "ERROR": "Phone number should be either empty or of E.164 format",
+        "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "This phone number is in use for another contact."
       },
       "LOCATION": {
@@ -181,7 +182,8 @@
         "LABEL": "To"
       },
       "INBOX": {
-        "LABEL": "Inbox",
+        "LABEL": "Via Inbox",
+        "PLACEHOLDER": "Choose source inbox",
         "ERROR": "Select an inbox"
       },
       "SUBJECT": {
diff --git a/app/javascript/dashboard/i18n/locale/ka/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ka/inboxMgmt.json
index 60454261d..bed0ec0c9 100644
--- a/app/javascript/dashboard/i18n/locale/ka/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ka/inboxMgmt.json
@@ -478,6 +478,8 @@
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Update",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
+      "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
diff --git a/app/javascript/dashboard/i18n/locale/ka/settings.json b/app/javascript/dashboard/i18n/locale/ka/settings.json
index 112ac79bd..ab850562b 100644
--- a/app/javascript/dashboard/i18n/locale/ka/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ka/settings.json
@@ -203,6 +203,7 @@
     "HOME": "Home",
     "AGENTS": "Agents",
     "AGENT_BOTS": "Bots",
+    "AUDIT_LOGS": "Audit Logs",
     "INBOXES": "Inboxes",
     "NOTIFICATIONS": "Notifications",
     "CANNED_RESPONSES": "Canned Responses",
diff --git a/app/javascript/dashboard/i18n/locale/ko/auditLogs.json b/app/javascript/dashboard/i18n/locale/ko/auditLogs.json
new file mode 100644
index 000000000..c273982f9
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ko/auditLogs.json
@@ -0,0 +1,24 @@
+{
+  "AUDIT_LOGS": {
+    "HEADER": "Audit Logs",
+    "HEADER_BTN_TXT": "Add Audit Logs",
+    "LOADING": "Fetching Audit Logs",
+    "SEARCH_404": "이 쿼리와 일치하는 항목이 없음",
+    "SIDEBAR_TXT": "<p><b>Audit Logs</b> </p><p> Audit Logs are trails for events and actions in a Chatwoot System. </p>",
+    "LIST": {
+      "404": "There are no Audit Logs available in this account.",
+      "TITLE": "Manage Audit Logs",
+      "DESC": "Audit Logs are trails for events and actions in a Chatwoot System.",
+      "TABLE_HEADER": [
+        "User",
+        "Action",
+        "IP 주소",
+        "Time"
+      ]
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "AuditLogs retrieved successfully",
+      "ERROR_MESSAGE": "Woot 서버에 연결할 수 없음. 나중에 다시 시도하십시오."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ko/contact.json b/app/javascript/dashboard/i18n/locale/ko/contact.json
index bbd1194b3..b6ae1aa93 100644
--- a/app/javascript/dashboard/i18n/locale/ko/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ko/contact.json
@@ -120,8 +120,9 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "연락처의 전화 번호 입력",
         "LABEL": "전화 번호",
-        "HELP": "전화번호는 E.164 형식이여야 합니다. 예: +1415555555 [+][국가 코드][지역 코드][전화번호]",
+        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
         "ERROR": "전화번호는 비어있거나 E.164 형식이여야 합니다",
+        "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "이 전화번호는 다른 연락처에 사용 중입니다."
       },
       "LOCATION": {
@@ -181,7 +182,8 @@
         "LABEL": "~~에게"
       },
       "INBOX": {
-        "LABEL": "받은 메시지함",
+        "LABEL": "Via Inbox",
+        "PLACEHOLDER": "Choose source inbox",
         "ERROR": "받은 메시지함 선택"
       },
       "SUBJECT": {
diff --git a/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json
index bb94e80c6..e100877fd 100644
--- a/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json
@@ -478,6 +478,8 @@
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "업데이트",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
+      "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
diff --git a/app/javascript/dashboard/i18n/locale/ko/settings.json b/app/javascript/dashboard/i18n/locale/ko/settings.json
index cf387e1f6..d2e5b659c 100644
--- a/app/javascript/dashboard/i18n/locale/ko/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ko/settings.json
@@ -203,6 +203,7 @@
     "HOME": "홈",
     "AGENTS": "에이전트",
     "AGENT_BOTS": "봇",
+    "AUDIT_LOGS": "Audit Logs",
     "INBOXES": "받은 메시지함",
     "NOTIFICATIONS": "알림",
     "CANNED_RESPONSES": "미리 준비된 답변",
diff --git a/app/javascript/dashboard/i18n/locale/lt/auditLogs.json b/app/javascript/dashboard/i18n/locale/lt/auditLogs.json
new file mode 100644
index 000000000..e288e2959
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/lt/auditLogs.json
@@ -0,0 +1,24 @@
+{
+  "AUDIT_LOGS": {
+    "HEADER": "Audit Logs",
+    "HEADER_BTN_TXT": "Add Audit Logs",
+    "LOADING": "Fetching Audit Logs",
+    "SEARCH_404": "There are no items matching this query",
+    "SIDEBAR_TXT": "<p><b>Audit Logs</b> </p><p> Audit Logs are trails for events and actions in a Chatwoot System. </p>",
+    "LIST": {
+      "404": "There are no Audit Logs available in this account.",
+      "TITLE": "Manage Audit Logs",
+      "DESC": "Audit Logs are trails for events and actions in a Chatwoot System.",
+      "TABLE_HEADER": [
+        "User",
+        "Action",
+        "IP Address",
+        "Time"
+      ]
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "AuditLogs retrieved successfully",
+      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/lt/contact.json b/app/javascript/dashboard/i18n/locale/lt/contact.json
index 9191698d8..4d1736ed0 100644
--- a/app/javascript/dashboard/i18n/locale/lt/contact.json
+++ b/app/javascript/dashboard/i18n/locale/lt/contact.json
@@ -120,8 +120,9 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Enter the phone number of the contact",
         "LABEL": "Phone Number",
-        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]",
+        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
         "ERROR": "Phone number should be either empty or of E.164 format",
+        "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "This phone number is in use for another contact."
       },
       "LOCATION": {
@@ -181,7 +182,8 @@
         "LABEL": "To"
       },
       "INBOX": {
-        "LABEL": "Inbox",
+        "LABEL": "Via Inbox",
+        "PLACEHOLDER": "Choose source inbox",
         "ERROR": "Select an inbox"
       },
       "SUBJECT": {
diff --git a/app/javascript/dashboard/i18n/locale/lt/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/lt/inboxMgmt.json
index 60454261d..bed0ec0c9 100644
--- a/app/javascript/dashboard/i18n/locale/lt/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/lt/inboxMgmt.json
@@ -478,6 +478,8 @@
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Update",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
+      "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
diff --git a/app/javascript/dashboard/i18n/locale/lt/settings.json b/app/javascript/dashboard/i18n/locale/lt/settings.json
index 112ac79bd..ab850562b 100644
--- a/app/javascript/dashboard/i18n/locale/lt/settings.json
+++ b/app/javascript/dashboard/i18n/locale/lt/settings.json
@@ -203,6 +203,7 @@
     "HOME": "Home",
     "AGENTS": "Agents",
     "AGENT_BOTS": "Bots",
+    "AUDIT_LOGS": "Audit Logs",
     "INBOXES": "Inboxes",
     "NOTIFICATIONS": "Notifications",
     "CANNED_RESPONSES": "Canned Responses",
diff --git a/app/javascript/dashboard/i18n/locale/lv/auditLogs.json b/app/javascript/dashboard/i18n/locale/lv/auditLogs.json
new file mode 100644
index 000000000..c1af1d90c
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/lv/auditLogs.json
@@ -0,0 +1,24 @@
+{
+  "AUDIT_LOGS": {
+    "HEADER": "Audita Žurnāli",
+    "HEADER_BTN_TXT": "Pievienot Audita Žurnālus",
+    "LOADING": "Audita Žurnālu Iegūšana",
+    "SEARCH_404": "Šim vaicājumam nav atbilstošu vienumu",
+    "SIDEBAR_TXT": "<p><b>Audita Žurnāls</b> </p><p> Audita Žurnāli ir notikumu un darbību pēdas Chatwoot sistēmā. </p>",
+    "LIST": {
+      "404": "Šajā kontā nav pieejami Audita Žurnāli.",
+      "TITLE": "Pārvaldīt Audita Žurnālus",
+      "DESC": "Audita Žurnāli ir notikumu un darbību pēdas Chatwoot sistēmā.",
+      "TABLE_HEADER": [
+        "Lietotājs",
+        "Darbība",
+        "IP adrese",
+        "Laiks"
+      ]
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "AuditaŽurnāli ir veiksmīgi iegūti",
+      "ERROR_MESSAGE": "Nevar izveidot savienojumu ar Woot serveri. Lūdzu, vēlāk pamēģiniet vēlreiz"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/lv/contact.json b/app/javascript/dashboard/i18n/locale/lv/contact.json
index e2b4d3718..5940a1f88 100644
--- a/app/javascript/dashboard/i18n/locale/lv/contact.json
+++ b/app/javascript/dashboard/i18n/locale/lv/contact.json
@@ -120,8 +120,9 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Ievadiet kontaktpersonas tālruņa numuru",
         "LABEL": "Telefona numurs",
-        "HELP": "Tālruņa numuram ir jābūt E.164 formātā, piemēram: +37155555555",
+        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
         "ERROR": "Tālruņa numuram ir jābūt tukšam, vai E.164 formātā",
+        "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "Šis tālruņa numurs tiek izmantots citai kontaktpersonai."
       },
       "LOCATION": {
@@ -181,7 +182,8 @@
         "LABEL": "Kam"
       },
       "INBOX": {
-        "LABEL": "Iesūtne",
+        "LABEL": "Via Inbox",
+        "PLACEHOLDER": "Choose source inbox",
         "ERROR": "Izvēlieties iesūtni"
       },
       "SUBJECT": {
diff --git a/app/javascript/dashboard/i18n/locale/lv/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/lv/inboxMgmt.json
index c29ad9b57..12c76e68f 100644
--- a/app/javascript/dashboard/i18n/locale/lv/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/lv/inboxMgmt.json
@@ -478,6 +478,8 @@
       "WHATSAPP_SECTION_UPDATE_TITLE": "Atjaunināt API atslēgu",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Ievadiet šeit jauno API atslēgu",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Atjaunināt",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Pārbaudes Token",
+      "WHATSAPP_WEBHOOK_SUBHEADER": "Šis marķieris tiek izmantots, lai pārbaudītu webhook endpoint autentiskumu.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Atjaunināt pirms-tērzēšanas veidlapas iestatījumus"
     },
     "AUTO_ASSIGNMENT": {
diff --git a/app/javascript/dashboard/i18n/locale/lv/settings.json b/app/javascript/dashboard/i18n/locale/lv/settings.json
index 36bd9813f..f1a0441c0 100644
--- a/app/javascript/dashboard/i18n/locale/lv/settings.json
+++ b/app/javascript/dashboard/i18n/locale/lv/settings.json
@@ -203,6 +203,7 @@
     "HOME": "Sākums",
     "AGENTS": "Aģenti",
     "AGENT_BOTS": "Bots",
+    "AUDIT_LOGS": "Audita Žurnāli",
     "INBOXES": "Iesūtnes",
     "NOTIFICATIONS": "Paziņojumi",
     "CANNED_RESPONSES": "Sagatavotās Atbildes",
diff --git a/app/javascript/dashboard/i18n/locale/ml/auditLogs.json b/app/javascript/dashboard/i18n/locale/ml/auditLogs.json
new file mode 100644
index 000000000..3015d24e7
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ml/auditLogs.json
@@ -0,0 +1,24 @@
+{
+  "AUDIT_LOGS": {
+    "HEADER": "Audit Logs",
+    "HEADER_BTN_TXT": "Add Audit Logs",
+    "LOADING": "Fetching Audit Logs",
+    "SEARCH_404": "ഈ ചോദ്യവുമായി പൊരുത്തപ്പെടുന്ന ഇനങ്ങളൊന്നുമില്ല",
+    "SIDEBAR_TXT": "<p><b>Audit Logs</b> </p><p> Audit Logs are trails for events and actions in a Chatwoot System. </p>",
+    "LIST": {
+      "404": "There are no Audit Logs available in this account.",
+      "TITLE": "Manage Audit Logs",
+      "DESC": "Audit Logs are trails for events and actions in a Chatwoot System.",
+      "TABLE_HEADER": [
+        "User",
+        "Action",
+        "IP വിലാസം",
+        "Time"
+      ]
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "AuditLogs retrieved successfully",
+      "ERROR_MESSAGE": "വൂട്ട് സെർവറിലേക്ക് കണക്റ്റുചെയ്യാനായില്ല, ദയവായി പിന്നീട് വീണ്ടും ശ്രമിക്കുക"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ml/contact.json b/app/javascript/dashboard/i18n/locale/ml/contact.json
index cd3dd3f73..1051069d0 100644
--- a/app/javascript/dashboard/i18n/locale/ml/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ml/contact.json
@@ -120,8 +120,9 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "കോൺടാക്റ്റിന്റെ ഫോൺ നമ്പർ നൽകുക",
         "LABEL": "ഫോൺ നമ്പർ",
-        "HELP": "ഫോൺ നമ്പർ E.164 ഫോർമാറ്റ് ആയിരിക്കണം ഉദാ: +1415555555 [+][രാജ്യ കോഡ്][ഏരിയ കോഡ്][പ്രാദേശിക ഫോൺ നമ്പർ]",
+        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
         "ERROR": "ഫോൺ നമ്പർ ശൂന്യമോ E.164 ഫോർമാറ്റിലുള്ളതോ ആയിരിക്കണം",
+        "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "ഈ ഫോൺ നമ്പർ മറ്റൊരു കോൺടാക്റ്റിനായി ഉപയോഗിക്കുന്നു."
       },
       "LOCATION": {
@@ -181,7 +182,8 @@
         "LABEL": "To"
       },
       "INBOX": {
-        "LABEL": "ഇൻബോക്സ്",
+        "LABEL": "Via Inbox",
+        "PLACEHOLDER": "Choose source inbox",
         "ERROR": "ഒരു ഇൻബോക്സ് തിരഞ്ഞെടുക്കുക"
       },
       "SUBJECT": {
diff --git a/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json
index c01799541..62ecc1bb0 100644
--- a/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json
@@ -478,6 +478,8 @@
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "അപ്‌ഡേറ്റ്",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
+      "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
diff --git a/app/javascript/dashboard/i18n/locale/ml/settings.json b/app/javascript/dashboard/i18n/locale/ml/settings.json
index ded3d4ab5..a6f5759e7 100644
--- a/app/javascript/dashboard/i18n/locale/ml/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ml/settings.json
@@ -203,6 +203,7 @@
     "HOME": "ഹോം",
     "AGENTS": "ഏജന്റുമാർ",
     "AGENT_BOTS": "Bots",
+    "AUDIT_LOGS": "Audit Logs",
     "INBOXES": "ഇൻ‌ബോക്സുകൾ",
     "NOTIFICATIONS": "Notifications",
     "CANNED_RESPONSES": "ക്യാൻഡ് പ്രതികരണങ്ങൾ",
diff --git a/app/javascript/dashboard/i18n/locale/ms/auditLogs.json b/app/javascript/dashboard/i18n/locale/ms/auditLogs.json
new file mode 100644
index 000000000..40ce395d2
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ms/auditLogs.json
@@ -0,0 +1,24 @@
+{
+  "AUDIT_LOGS": {
+    "HEADER": "Audit Logs",
+    "HEADER_BTN_TXT": "Add Audit Logs",
+    "LOADING": "Fetching Audit Logs",
+    "SEARCH_404": "There are no items matching this query",
+    "SIDEBAR_TXT": "<p><b>Audit Logs</b> </p><p> Audit Logs are trails for events and actions in a Chatwoot System. </p>",
+    "LIST": {
+      "404": "There are no Audit Logs available in this account.",
+      "TITLE": "Manage Audit Logs",
+      "DESC": "Audit Logs are trails for events and actions in a Chatwoot System.",
+      "TABLE_HEADER": [
+        "User",
+        "Action",
+        "IP Address",
+        "Time"
+      ]
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "AuditLogs retrieved successfully",
+      "ERROR_MESSAGE": "Masalah untuk hubungi Woot Server, Sila cuba sebentar lagi"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ms/contact.json b/app/javascript/dashboard/i18n/locale/ms/contact.json
index 0f11799fb..9ced03c8f 100644
--- a/app/javascript/dashboard/i18n/locale/ms/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ms/contact.json
@@ -120,8 +120,9 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Enter the phone number of the contact",
         "LABEL": "Phone Number",
-        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]",
+        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
         "ERROR": "Phone number should be either empty or of E.164 format",
+        "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "This phone number is in use for another contact."
       },
       "LOCATION": {
@@ -181,7 +182,8 @@
         "LABEL": "To"
       },
       "INBOX": {
-        "LABEL": "Inbox",
+        "LABEL": "Via Inbox",
+        "PLACEHOLDER": "Choose source inbox",
         "ERROR": "Select an inbox"
       },
       "SUBJECT": {
diff --git a/app/javascript/dashboard/i18n/locale/ms/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ms/inboxMgmt.json
index 3d9df13da..7071700cf 100644
--- a/app/javascript/dashboard/i18n/locale/ms/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ms/inboxMgmt.json
@@ -478,6 +478,8 @@
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Update",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
+      "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
diff --git a/app/javascript/dashboard/i18n/locale/ms/settings.json b/app/javascript/dashboard/i18n/locale/ms/settings.json
index 7d37e5ac2..73a059284 100644
--- a/app/javascript/dashboard/i18n/locale/ms/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ms/settings.json
@@ -203,6 +203,7 @@
     "HOME": "Home",
     "AGENTS": "Ejen",
     "AGENT_BOTS": "Bots",
+    "AUDIT_LOGS": "Audit Logs",
     "INBOXES": "Inboxes",
     "NOTIFICATIONS": "Notifications",
     "CANNED_RESPONSES": "Canned Responses",
diff --git a/app/javascript/dashboard/i18n/locale/ne/auditLogs.json b/app/javascript/dashboard/i18n/locale/ne/auditLogs.json
new file mode 100644
index 000000000..e288e2959
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ne/auditLogs.json
@@ -0,0 +1,24 @@
+{
+  "AUDIT_LOGS": {
+    "HEADER": "Audit Logs",
+    "HEADER_BTN_TXT": "Add Audit Logs",
+    "LOADING": "Fetching Audit Logs",
+    "SEARCH_404": "There are no items matching this query",
+    "SIDEBAR_TXT": "<p><b>Audit Logs</b> </p><p> Audit Logs are trails for events and actions in a Chatwoot System. </p>",
+    "LIST": {
+      "404": "There are no Audit Logs available in this account.",
+      "TITLE": "Manage Audit Logs",
+      "DESC": "Audit Logs are trails for events and actions in a Chatwoot System.",
+      "TABLE_HEADER": [
+        "User",
+        "Action",
+        "IP Address",
+        "Time"
+      ]
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "AuditLogs retrieved successfully",
+      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ne/contact.json b/app/javascript/dashboard/i18n/locale/ne/contact.json
index 6cf2d58ab..ac4d4686c 100644
--- a/app/javascript/dashboard/i18n/locale/ne/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ne/contact.json
@@ -120,8 +120,9 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Enter the phone number of the contact",
         "LABEL": "Phone Number",
-        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]",
+        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
         "ERROR": "Phone number should be either empty or of E.164 format",
+        "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "This phone number is in use for another contact."
       },
       "LOCATION": {
@@ -181,7 +182,8 @@
         "LABEL": "To"
       },
       "INBOX": {
-        "LABEL": "Inbox",
+        "LABEL": "Via Inbox",
+        "PLACEHOLDER": "Choose source inbox",
         "ERROR": "Select an inbox"
       },
       "SUBJECT": {
diff --git a/app/javascript/dashboard/i18n/locale/ne/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ne/inboxMgmt.json
index 1a09fafc3..726687bff 100644
--- a/app/javascript/dashboard/i18n/locale/ne/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ne/inboxMgmt.json
@@ -478,6 +478,8 @@
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Update",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
+      "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
diff --git a/app/javascript/dashboard/i18n/locale/ne/settings.json b/app/javascript/dashboard/i18n/locale/ne/settings.json
index 6cbab6043..144cd83e6 100644
--- a/app/javascript/dashboard/i18n/locale/ne/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ne/settings.json
@@ -203,6 +203,7 @@
     "HOME": "Home",
     "AGENTS": "Agents",
     "AGENT_BOTS": "Bots",
+    "AUDIT_LOGS": "Audit Logs",
     "INBOXES": "Inboxes",
     "NOTIFICATIONS": "Notifications",
     "CANNED_RESPONSES": "Canned Responses",
diff --git a/app/javascript/dashboard/i18n/locale/nl/auditLogs.json b/app/javascript/dashboard/i18n/locale/nl/auditLogs.json
new file mode 100644
index 000000000..e30653fbd
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/nl/auditLogs.json
@@ -0,0 +1,24 @@
+{
+  "AUDIT_LOGS": {
+    "HEADER": "Audit Logs",
+    "HEADER_BTN_TXT": "Add Audit Logs",
+    "LOADING": "Fetching Audit Logs",
+    "SEARCH_404": "Er zijn geen items die overeenkomen met deze zoekopdracht",
+    "SIDEBAR_TXT": "<p><b>Audit Logs</b> </p><p> Audit Logs are trails for events and actions in a Chatwoot System. </p>",
+    "LIST": {
+      "404": "There are no Audit Logs available in this account.",
+      "TITLE": "Manage Audit Logs",
+      "DESC": "Audit Logs are trails for events and actions in a Chatwoot System.",
+      "TABLE_HEADER": [
+        "User",
+        "Action",
+        "IP-adres",
+        "Time"
+      ]
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "AuditLogs retrieved successfully",
+      "ERROR_MESSAGE": "Kan geen verbinding maken met Woot Server, probeer het later opnieuw"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/nl/contact.json b/app/javascript/dashboard/i18n/locale/nl/contact.json
index 31c9025af..70d87f736 100644
--- a/app/javascript/dashboard/i18n/locale/nl/contact.json
+++ b/app/javascript/dashboard/i18n/locale/nl/contact.json
@@ -120,8 +120,9 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Voer het telefoonnummer van de contactpersoon in",
         "LABEL": "Telefoonnummer",
-        "HELP": "Telefoonnummer moet van het E.164 formaat zijn: +14155555 [+][landcode][gebiedscode][lokaal telefoonnummer]",
+        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
         "ERROR": "Telefoonnummer moet leeg of in E.164-formaat zijn",
+        "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "Dit telefoonnummer wordt reeds gebruikt voor een ander contactpersoon."
       },
       "LOCATION": {
@@ -181,7 +182,8 @@
         "LABEL": "Aan"
       },
       "INBOX": {
-        "LABEL": "Postvak In",
+        "LABEL": "Via Inbox",
+        "PLACEHOLDER": "Choose source inbox",
         "ERROR": "Selecteer een inbox"
       },
       "SUBJECT": {
diff --git a/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json
index 1daf26069..bd9715b71 100644
--- a/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json
@@ -478,6 +478,8 @@
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Vernieuwen",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
+      "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
diff --git a/app/javascript/dashboard/i18n/locale/nl/settings.json b/app/javascript/dashboard/i18n/locale/nl/settings.json
index 72945c7b6..0b750c23a 100644
--- a/app/javascript/dashboard/i18n/locale/nl/settings.json
+++ b/app/javascript/dashboard/i18n/locale/nl/settings.json
@@ -203,6 +203,7 @@
     "HOME": "Startpagina",
     "AGENTS": "Medewerkers",
     "AGENT_BOTS": "Bots",
+    "AUDIT_LOGS": "Audit Logs",
     "INBOXES": "Inboxen",
     "NOTIFICATIONS": "Notifications",
     "CANNED_RESPONSES": "Standaard antwoorden",
diff --git a/app/javascript/dashboard/i18n/locale/no/auditLogs.json b/app/javascript/dashboard/i18n/locale/no/auditLogs.json
new file mode 100644
index 000000000..17829464b
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/no/auditLogs.json
@@ -0,0 +1,24 @@
+{
+  "AUDIT_LOGS": {
+    "HEADER": "Audit Logs",
+    "HEADER_BTN_TXT": "Add Audit Logs",
+    "LOADING": "Fetching Audit Logs",
+    "SEARCH_404": "Det finnes ingen elementer som samsvarer med denne spørringen",
+    "SIDEBAR_TXT": "<p><b>Audit Logs</b> </p><p> Audit Logs are trails for events and actions in a Chatwoot System. </p>",
+    "LIST": {
+      "404": "There are no Audit Logs available in this account.",
+      "TITLE": "Manage Audit Logs",
+      "DESC": "Audit Logs are trails for events and actions in a Chatwoot System.",
+      "TABLE_HEADER": [
+        "User",
+        "Action",
+        "IP Adresse",
+        "Time"
+      ]
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "AuditLogs retrieved successfully",
+      "ERROR_MESSAGE": "Kunne ikke koble til Woot Server, vennligst prøv igjen senere"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/no/contact.json b/app/javascript/dashboard/i18n/locale/no/contact.json
index 04f24401b..d676aa9fe 100644
--- a/app/javascript/dashboard/i18n/locale/no/contact.json
+++ b/app/javascript/dashboard/i18n/locale/no/contact.json
@@ -120,8 +120,9 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Skriv inn telefonnummeret til kontakten",
         "LABEL": "Telefonnummer",
-        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]",
+        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
         "ERROR": "Phone number should be either empty or of E.164 format",
+        "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "This phone number is in use for another contact."
       },
       "LOCATION": {
@@ -181,7 +182,8 @@
         "LABEL": "To"
       },
       "INBOX": {
-        "LABEL": "Inbox",
+        "LABEL": "Via Inbox",
+        "PLACEHOLDER": "Choose source inbox",
         "ERROR": "Select an inbox"
       },
       "SUBJECT": {
diff --git a/app/javascript/dashboard/i18n/locale/no/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/no/inboxMgmt.json
index 81e311950..26907a930 100644
--- a/app/javascript/dashboard/i18n/locale/no/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/no/inboxMgmt.json
@@ -478,6 +478,8 @@
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Oppdater",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
+      "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
diff --git a/app/javascript/dashboard/i18n/locale/no/settings.json b/app/javascript/dashboard/i18n/locale/no/settings.json
index 655b820ff..c7b6ba3b5 100644
--- a/app/javascript/dashboard/i18n/locale/no/settings.json
+++ b/app/javascript/dashboard/i18n/locale/no/settings.json
@@ -203,6 +203,7 @@
     "HOME": "Hjem",
     "AGENTS": "Agenter",
     "AGENT_BOTS": "Bots",
+    "AUDIT_LOGS": "Audit Logs",
     "INBOXES": "Innbokser",
     "NOTIFICATIONS": "Varsler",
     "CANNED_RESPONSES": "Forhåndslagde svar",
diff --git a/app/javascript/dashboard/i18n/locale/pl/auditLogs.json b/app/javascript/dashboard/i18n/locale/pl/auditLogs.json
new file mode 100644
index 000000000..7f568c8aa
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/pl/auditLogs.json
@@ -0,0 +1,24 @@
+{
+  "AUDIT_LOGS": {
+    "HEADER": "Audit Logs",
+    "HEADER_BTN_TXT": "Add Audit Logs",
+    "LOADING": "Fetching Audit Logs",
+    "SEARCH_404": "Brak elementów pasujących do tego zapytania",
+    "SIDEBAR_TXT": "<p><b>Audit Logs</b> </p><p> Audit Logs are trails for events and actions in a Chatwoot System. </p>",
+    "LIST": {
+      "404": "There are no Audit Logs available in this account.",
+      "TITLE": "Manage Audit Logs",
+      "DESC": "Audit Logs are trails for events and actions in a Chatwoot System.",
+      "TABLE_HEADER": [
+        "User",
+        "Action",
+        "Adres IP",
+        "Time"
+      ]
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "AuditLogs retrieved successfully",
+      "ERROR_MESSAGE": "Nie można połączyć się z Woot Server, spróbuj ponownie później"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/pl/contact.json b/app/javascript/dashboard/i18n/locale/pl/contact.json
index d250ba001..169c25bc9 100644
--- a/app/javascript/dashboard/i18n/locale/pl/contact.json
+++ b/app/javascript/dashboard/i18n/locale/pl/contact.json
@@ -120,8 +120,9 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Wprowadź numer telefonu kontaktu",
         "LABEL": "Numer telefonu",
-        "HELP": "Numer telefonu powinien mieć format E.164, np. +1415555555 [+][kod krajowy][kod kierunkowy][numer telefonu]",
+        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
         "ERROR": "Numer telefonu powinien być pusty lub w formacie E.164",
+        "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "Ten numer telefonu jest już zajęty przez inny kontakt."
       },
       "LOCATION": {
@@ -181,7 +182,8 @@
         "LABEL": "Do"
       },
       "INBOX": {
-        "LABEL": "Skrzynka odbiorcza",
+        "LABEL": "Via Inbox",
+        "PLACEHOLDER": "Choose source inbox",
         "ERROR": "Wybierz skrzynkę odbiorczą"
       },
       "SUBJECT": {
diff --git a/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json
index 925f3a509..dacdb0885 100644
--- a/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json
@@ -478,6 +478,8 @@
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Aktualizuj",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
+      "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
diff --git a/app/javascript/dashboard/i18n/locale/pl/settings.json b/app/javascript/dashboard/i18n/locale/pl/settings.json
index 1b40cc7b8..878c2aba9 100644
--- a/app/javascript/dashboard/i18n/locale/pl/settings.json
+++ b/app/javascript/dashboard/i18n/locale/pl/settings.json
@@ -203,6 +203,7 @@
     "HOME": "Home",
     "AGENTS": "Agenci",
     "AGENT_BOTS": "Bots",
+    "AUDIT_LOGS": "Audit Logs",
     "INBOXES": "Skrzynki",
     "NOTIFICATIONS": "Powiadomienia",
     "CANNED_RESPONSES": "Gotowe odpowiedzi",
diff --git a/app/javascript/dashboard/i18n/locale/pt/auditLogs.json b/app/javascript/dashboard/i18n/locale/pt/auditLogs.json
new file mode 100644
index 000000000..7c89d7632
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/pt/auditLogs.json
@@ -0,0 +1,24 @@
+{
+  "AUDIT_LOGS": {
+    "HEADER": "Audit Logs",
+    "HEADER_BTN_TXT": "Add Audit Logs",
+    "LOADING": "Fetching Audit Logs",
+    "SEARCH_404": "Não existem itens correspondentes a esta consulta",
+    "SIDEBAR_TXT": "<p><b>Audit Logs</b> </p><p> Audit Logs are trails for events and actions in a Chatwoot System. </p>",
+    "LIST": {
+      "404": "There are no Audit Logs available in this account.",
+      "TITLE": "Manage Audit Logs",
+      "DESC": "Audit Logs are trails for events and actions in a Chatwoot System.",
+      "TABLE_HEADER": [
+        "User",
+        "Action",
+        "Endereço IP",
+        "Time"
+      ]
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "AuditLogs retrieved successfully",
+      "ERROR_MESSAGE": "Não foi possível conectar ao servidor Woot, por favor tente novamente mais tarde"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/pt/contact.json b/app/javascript/dashboard/i18n/locale/pt/contact.json
index e77d02e66..8d1f02874 100644
--- a/app/javascript/dashboard/i18n/locale/pt/contact.json
+++ b/app/javascript/dashboard/i18n/locale/pt/contact.json
@@ -120,8 +120,9 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Digite o número de telefone do contato",
         "LABEL": "Número de Telefone",
-        "HELP": "O número de telefone deve ter o formato E.164, por exemplo: +1415555555 [+][código do país][código de área] [número de telefone local]",
+        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
         "ERROR": "O número de telefone deve estar vazio ou no formato E.164",
+        "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "Este número está a ser usado por outro contacto."
       },
       "LOCATION": {
@@ -181,7 +182,8 @@
         "LABEL": "Para"
       },
       "INBOX": {
-        "LABEL": "Caixa de Entrada",
+        "LABEL": "Via Inbox",
+        "PLACEHOLDER": "Choose source inbox",
         "ERROR": "Selecione uma caixa de entrada"
       },
       "SUBJECT": {
diff --git a/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json
index 2e3920d43..029049644 100644
--- a/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json
@@ -478,6 +478,8 @@
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Atualização",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook de Verificação de Token",
+      "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Atualizar configurações do Formulário Pre Chat"
     },
     "AUTO_ASSIGNMENT": {
diff --git a/app/javascript/dashboard/i18n/locale/pt/settings.json b/app/javascript/dashboard/i18n/locale/pt/settings.json
index 11cb7e3fd..377f22493 100644
--- a/app/javascript/dashboard/i18n/locale/pt/settings.json
+++ b/app/javascript/dashboard/i18n/locale/pt/settings.json
@@ -203,6 +203,7 @@
     "HOME": "Principal",
     "AGENTS": "agentes",
     "AGENT_BOTS": "Bots",
+    "AUDIT_LOGS": "Audit Logs",
     "INBOXES": "Caixas de Entrada",
     "NOTIFICATIONS": "Notificaçoes",
     "CANNED_RESPONSES": "Respostas Prontas",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/auditLogs.json b/app/javascript/dashboard/i18n/locale/pt_BR/auditLogs.json
new file mode 100644
index 000000000..1c376a7a2
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/auditLogs.json
@@ -0,0 +1,24 @@
+{
+  "AUDIT_LOGS": {
+    "HEADER": "Audit Logs",
+    "HEADER_BTN_TXT": "Add Audit Logs",
+    "LOADING": "Fetching Audit Logs",
+    "SEARCH_404": "Não existem itens correspondentes a esta consulta",
+    "SIDEBAR_TXT": "<p><b>Audit Logs</b> </p><p> Audit Logs are trails for events and actions in a Chatwoot System. </p>",
+    "LIST": {
+      "404": "There are no Audit Logs available in this account.",
+      "TITLE": "Manage Audit Logs",
+      "DESC": "Audit Logs are trails for events and actions in a Chatwoot System.",
+      "TABLE_HEADER": [
+        "Usuário",
+        "Action",
+        "Endereço IP",
+        "Time"
+      ]
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "AuditLogs retrieved successfully",
+      "ERROR_MESSAGE": "Não foi possível conectar ao servidor Woot, por favor tente novamente mais tarde"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/contact.json b/app/javascript/dashboard/i18n/locale/pt_BR/contact.json
index 838293c2c..8ce895c0a 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/contact.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/contact.json
@@ -120,8 +120,9 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Adicione o número de telefone do contato",
         "LABEL": "Número de Telefone",
-        "HELP": "O número de telefone deve ser do formato E.164, por exemplo: +1415555555 [+][código do país][código de área][número de telefone local]",
+        "HELP": "O número de telefone deve ter o formato E.164, por exemplo: +1415555555 [+][código do país][código de área][número de telefone local]. Você pode selecionar o código de discagem no menu suspenso.",
         "ERROR": "O número de telefone deve estar vazio ou no formato E.164",
+        "DIAL_CODE_ERROR": "Por favor, selecione um código de discagem da lista",
         "DUPLICATE": "Este número de telefone está em uso para outro contato."
       },
       "LOCATION": {
@@ -181,7 +182,8 @@
         "LABEL": "Para"
       },
       "INBOX": {
-        "LABEL": "Caixa de Entrada",
+        "LABEL": "Via Inbox",
+        "PLACEHOLDER": "Choose source inbox",
         "ERROR": "Selecione uma caixa de entrada"
       },
       "SUBJECT": {
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
index 282135f1b..9afa834e2 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
@@ -478,6 +478,8 @@
       "WHATSAPP_SECTION_UPDATE_TITLE": "Atualizar Chave de API",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Digite a nova chave de API aqui",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Atualizar",
+      "WHATSAPP_WEBHOOK_TITLE": "Token de verificação do Webhook",
+      "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Atualizar configurações do Formulário Pre Chat"
     },
     "AUTO_ASSIGNMENT": {
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/settings.json b/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
index fba54f79b..9ea0b9c98 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
@@ -203,6 +203,7 @@
     "HOME": "Principal",
     "AGENTS": "Agentes",
     "AGENT_BOTS": "Bots",
+    "AUDIT_LOGS": "Audit Logs",
     "INBOXES": "Caixas de Entrada",
     "NOTIFICATIONS": "Notificações",
     "CANNED_RESPONSES": "Atalhos",
diff --git a/app/javascript/dashboard/i18n/locale/ro/agentMgmt.json b/app/javascript/dashboard/i18n/locale/ro/agentMgmt.json
index b05723001..4bc47c5a8 100644
--- a/app/javascript/dashboard/i18n/locale/ro/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ro/agentMgmt.json
@@ -76,8 +76,8 @@
         },
         "AGENT_AVAILABILITY": {
           "LABEL": "Disponibilitate",
-          "PLACEHOLDER": "Please select an availability status",
-          "ERROR": "Availability is required"
+          "PLACEHOLDER": "Vă rugăm să selectați o stare de disponibilitate",
+          "ERROR": "Disponibilitatea este necesară"
         },
         "SUBMIT": "Editează agent"
       },
diff --git a/app/javascript/dashboard/i18n/locale/ro/auditLogs.json b/app/javascript/dashboard/i18n/locale/ro/auditLogs.json
new file mode 100644
index 000000000..3b6b82852
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ro/auditLogs.json
@@ -0,0 +1,24 @@
+{
+  "AUDIT_LOGS": {
+    "HEADER": "Audit Logs",
+    "HEADER_BTN_TXT": "Add Audit Logs",
+    "LOADING": "Fetching Audit Logs",
+    "SEARCH_404": "Nu există elemente care să corespundă acestei interogări",
+    "SIDEBAR_TXT": "<p><b>Audit Logs</b> </p><p> Audit Logs are trails for events and actions in a Chatwoot System. </p>",
+    "LIST": {
+      "404": "There are no Audit Logs available in this account.",
+      "TITLE": "Manage Audit Logs",
+      "DESC": "Audit Logs are trails for events and actions in a Chatwoot System.",
+      "TABLE_HEADER": [
+        "User",
+        "Action",
+        "Adresă IP",
+        "Time"
+      ]
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "AuditLogs retrieved successfully",
+      "ERROR_MESSAGE": "Nu s-a putut conecta la Woot Server, încercați din nou mai târziu"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ro/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/ro/cannedMgmt.json
index 4066ec2b4..57b3315f8 100644
--- a/app/javascript/dashboard/i18n/locale/ro/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ro/cannedMgmt.json
@@ -67,7 +67,7 @@
       },
       "CONFIRM": {
         "TITLE": "Confirmă ștergerea",
-        "MESSAGE": "Sigur doriți să ștergeți",
+        "MESSAGE": "Sigur doriți să ștergeți ",
         "YES": "Da, șterge ",
         "NO": "Nu, păstreaza "
       }
diff --git a/app/javascript/dashboard/i18n/locale/ro/chatlist.json b/app/javascript/dashboard/i18n/locale/ro/chatlist.json
index 182cec650..1f0b9edc9 100644
--- a/app/javascript/dashboard/i18n/locale/ro/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/ro/chatlist.json
@@ -8,7 +8,7 @@
     },
     "TAB_HEADING": "Conversații",
     "MENTION_HEADING": "Mențiuni",
-    "UNATTENDED_HEADING": "Unattended",
+    "UNATTENDED_HEADING": "Neasistat",
     "SEARCH": {
       "INPUT": "Caută persoane, conversații, răspunsuri salvate .."
     },
@@ -60,8 +60,8 @@
     "REPLY_TO_TWEET": "Răspunde la acest tweet",
     "LINK_TO_STORY": "Accesați povestea Instagram",
     "SENT": "Trimis cu succes",
-    "READ": "Read successfully",
-    "DELIVERED": "Delivered successfully",
+    "READ": "Citit cu succes",
+    "DELIVERED": "Livrat cu succes",
     "NO_MESSAGES": "Niciun mesaj",
     "NO_CONTENT": "Nici un conținut disponibil",
     "HIDE_QUOTED_TEXT": "Ascunde textul citat",
diff --git a/app/javascript/dashboard/i18n/locale/ro/contact.json b/app/javascript/dashboard/i18n/locale/ro/contact.json
index 3e90b238b..6ff634ce0 100644
--- a/app/javascript/dashboard/i18n/locale/ro/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ro/contact.json
@@ -15,7 +15,7 @@
     "INITIATED_FROM": "Inițiat de la",
     "INITIATED_AT": "Iniţiat la",
     "IP_ADDRESS": "Adresă IP",
-    "CREATED_AT_LABEL": "Created",
+    "CREATED_AT_LABEL": "Creat",
     "NEW_MESSAGE": "Mesaj nou",
     "CONVERSATIONS": {
       "NO_RECORDS_FOUND": "Nu există conversații anterioare asociate cu acest contact.",
@@ -77,7 +77,7 @@
     "CONFIRM": {
       "TITLE": "Confirmă ștergerea",
       "MESSAGE": "Doriți să ștergeți această notă?",
-      "YES": "Da, șterge ",
+      "YES": "Da, șterge",
       "NO": "Nu, păstreaza"
     }
   },
@@ -120,8 +120,9 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Introduceți numărul de telefon al persoanei de contact",
         "LABEL": "Număr de telefon",
-        "HELP": "Numărul de telefon trebuie să aibă formatul E.164, ex. +1415555555 [+][country code][area code][local phone number]",
+        "HELP": "Numărul de telefon ar trebui să fie de format E.164 de exemplu: +1415555555 [+][codul țării][prefixul zonei][numărul de telefon local]. Puteți selecta codul de apelare din lista verticală.",
         "ERROR": "Numărul de telefon trebuie să fie gol sau in format E.164",
+        "DIAL_CODE_ERROR": "Vă rugăm să selectați un cod de apelare din listă",
         "DUPLICATE": "Acest număr de telefon este utilizat pentru o altă persoană de contact."
       },
       "LOCATION": {
@@ -133,15 +134,15 @@
         "LABEL": "Nume companie"
       },
       "COUNTRY": {
-        "PLACEHOLDER": "Enter the country name",
+        "PLACEHOLDER": "Introduceți numele țării",
         "LABEL": "Numele țării",
         "SELECT_PLACEHOLDER": "Selectați",
         "REMOVE": "Elimină",
-        "SELECT_COUNTRY": "Select Country"
+        "SELECT_COUNTRY": "Selectați Țara"
       },
       "CITY": {
-        "PLACEHOLDER": "Enter the city name",
-        "LABEL": "City Name"
+        "PLACEHOLDER": "Introduceți numele orașului",
+        "LABEL": "Oraș"
       },
       "SOCIAL_PROFILES": {
         "FACEBOOK": {
@@ -181,7 +182,8 @@
         "LABEL": "Către"
       },
       "INBOX": {
-        "LABEL": "Inbox",
+        "LABEL": "Via Inbox",
+        "PLACEHOLDER": "Choose source inbox",
         "ERROR": "Selectați un inbox"
       },
       "SUBJECT": {
diff --git a/app/javascript/dashboard/i18n/locale/ro/conversation.json b/app/javascript/dashboard/i18n/locale/ro/conversation.json
index d53702309..7f24cf08f 100644
--- a/app/javascript/dashboard/i18n/locale/ro/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ro/conversation.json
@@ -35,7 +35,7 @@
     "REMOVE_SELECTION": "Elimină selecția",
     "DOWNLOAD": "Descărcare",
     "UNKNOWN_FILE_TYPE": "Fișier necunoscut",
-    "SAVE_CONTACT": "Save",
+    "SAVE_CONTACT": "Salvează",
     "UPLOADING_ATTACHMENTS": "Se încarcă atașamentele...",
     "SUCCESS_DELETE_MESSAGE": "Mesaj şters cu succes",
     "FAIL_DELETE_MESSSAGE": "Mesajul nu a putut fi șters! Încercați din nou",
@@ -43,8 +43,8 @@
     "RATING_TITLE": "Evaluare",
     "FEEDBACK_TITLE": "Păreri",
     "CARD": {
-      "SHOW_LABELS": "Show labels",
-      "HIDE_LABELS": "Hide labels"
+      "SHOW_LABELS": "Afișare etichete",
+      "HIDE_LABELS": "Ascunderea etichetelor"
     },
     "HEADER": {
       "RESOLVE_ACTION": "Rezolvă",
@@ -69,7 +69,7 @@
     "CARD_CONTEXT_MENU": {
       "PENDING": "Marchează ca în așteptare",
       "RESOLVED": "Marcați ca rezolvat",
-      "MARK_AS_UNREAD": "Mark as unread",
+      "MARK_AS_UNREAD": "Marcheaza ca necitit",
       "REOPEN": "Redeschiderea conversației",
       "SNOOZE": {
         "TITLE": "Amânați",
@@ -135,8 +135,8 @@
         }
       },
       "UNDEFINED_VARIABLES": {
-        "TITLE": "Undefined variables",
-        "MESSAGE": "You have {undefinedVariablesCount} undefined variables in your message: {undefinedVariables}. Would you like to send the message anyway?",
+        "TITLE": "Variabile nedefinite",
+        "MESSAGE": "Aveți {undefinedVariablesCount} variabile nedefinite în mesajul dvs.: {undefinedVariables}. Doriți să trimiteți mesajul oricum?",
         "CONFIRM": {
           "YES": "Trimite",
           "CANCEL": "Renunță"
@@ -156,7 +156,7 @@
     "SENT_BY": "Trimis de:",
     "BOT": "Bot",
     "SEND_FAILED": "Nu a putut trimite mesaj! Încearcă din nou",
-    "TRY_AGAIN": "Reîncercare",
+    "TRY_AGAIN": "reîncercare",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Selectează agent",
       "REMOVE": "Elimină",
@@ -166,12 +166,12 @@
       "COPY": "Copiază",
       "DELETE": "Şterge",
       "CREATE_A_CANNED_RESPONSE": "Adaugați la răspunsuri predefinite",
-      "TRANSLATE": "Translate",
-      "COPY_PERMALINK": "Copy link to the message",
-      "LINK_COPIED": "Message URL copied to the clipboard",
+      "TRANSLATE": "Traduceți",
+      "COPY_PERMALINK": "Copierea linkului la mesaj",
+      "LINK_COPIED": "URL-ul mesajului copiat în clipboard",
       "DELETE_CONFIRMATION": {
-        "TITLE": "Are you sure you want to delete this message?",
-        "MESSAGE": "You cannot undo this action",
+        "TITLE": "Ești sigur că vrei să ștergi acest mesaj?",
+        "MESSAGE": "Nu puteți anula această acțiune",
         "DELETE": "Şterge",
         "CANCEL": "Renunță"
       }
@@ -187,7 +187,7 @@
     "FORM": {
       "SEND_TO_CONTACT": "Trimite transcrierea către client",
       "SEND_TO_AGENT": "Trimite transcrierea către agentul atribuit",
-      "SEND_TO_OTHER_EMAIL_ADDRESS": "Această adresă de e-mail este folosită pentru un alt contact.",
+      "SEND_TO_OTHER_EMAIL_ADDRESS": "Această adresă de e-mail este folosită pentru un alt contact",
       "EMAIL": {
         "PLACEHOLDER": "Introduceți o adresă de e-mail",
         "ERROR": "Vă rugăm să introduceți o adresă de e-mail validă"
@@ -264,27 +264,27 @@
     "SUBJECT": "Subiect"
   },
   "CONVERSATION_PARTICIPANTS": {
-    "SIDEBAR_MENU_TITLE": "Participating",
-    "SIDEBAR_TITLE": "Conversation participants",
+    "SIDEBAR_MENU_TITLE": "Participante",
+    "SIDEBAR_TITLE": "Participanți la conversație",
     "NO_RECORDS_FOUND": "Niciun rezultat găsit",
-    "ADD_PARTICIPANTS": "Select participants",
-    "REMANING_PARTICIPANTS_TEXT": "+%{count} others",
-    "REMANING_PARTICIPANT_TEXT": "+%{count} other",
-    "TOTAL_PARTICIPANTS_TEXT": "%{count} people are participating.",
-    "TOTAL_PARTICIPANT_TEXT": "%{count} person is participating.",
-    "NO_PARTICIPANTS_TEXT": "No one is participating!.",
-    "WATCH_CONVERSATION": "Join conversation",
-    "YOU_ARE_WATCHING": "You are participating",
+    "ADD_PARTICIPANTS": "Selectarea participanților",
+    "REMANING_PARTICIPANTS_TEXT": "+%{count} altele",
+    "REMANING_PARTICIPANT_TEXT": "+%{count} altele",
+    "TOTAL_PARTICIPANTS_TEXT": "%{count} participă oamenii.",
+    "TOTAL_PARTICIPANT_TEXT": "%{count} persoană participă.",
+    "NO_PARTICIPANTS_TEXT": "Nimeni nu participă!",
+    "WATCH_CONVERSATION": "Începe conversația",
+    "YOU_ARE_WATCHING": "Participați",
     "API": {
-      "ERROR_MESSAGE": "Could not update, try again!",
-      "SUCCESS_MESSAGE": "Participants updated!"
+      "ERROR_MESSAGE": "Nu a putut actualiza, încercați din nou",
+      "SUCCESS_MESSAGE": "Participanții au actualizat!"
     }
   },
   "TRANSLATE_MODAL": {
-    "TITLE": "View translated content",
-    "DESC": "You can view the translated content in each langauge.",
-    "ORIGINAL_CONTENT": "Original Content",
-    "TRANSLATED_CONTENT": "Translated Content",
-    "NO_TRANSLATIONS_AVAILABLE": "No translations are available for this content"
+    "TITLE": "Vizualizarea conținutului tradus",
+    "DESC": "Puteți vizualiza conținutul tradus în fiecare langauge.",
+    "ORIGINAL_CONTENT": "Conținut original",
+    "TRANSLATED_CONTENT": "Conținut tradus",
+    "NO_TRANSLATIONS_AVAILABLE": "Nu sunt disponibile traduceri pentru acest conținut"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json
index 278020b03..22c4ccf2a 100644
--- a/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json
@@ -478,6 +478,8 @@
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Actualizare",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
+      "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
diff --git a/app/javascript/dashboard/i18n/locale/ro/settings.json b/app/javascript/dashboard/i18n/locale/ro/settings.json
index d0030add4..00ca627f4 100644
--- a/app/javascript/dashboard/i18n/locale/ro/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ro/settings.json
@@ -195,7 +195,7 @@
     "CONVERSATIONS": "Conversații",
     "ALL_CONVERSATIONS": "Toate conversațiile",
     "MENTIONED_CONVERSATIONS": "Menţionări",
-    "PARTICIPATING_CONVERSATIONS": "Participating",
+    "PARTICIPATING_CONVERSATIONS": "Participante",
     "UNATTENDED_CONVERSATIONS": "Unattended",
     "REPORTS": "Rapoarte",
     "SETTINGS": "Setări",
@@ -203,6 +203,7 @@
     "HOME": "Acasa",
     "AGENTS": "Agenți",
     "AGENT_BOTS": "Boți",
+    "AUDIT_LOGS": "Audit Logs",
     "INBOXES": "Căsuțe",
     "NOTIFICATIONS": "Notificări",
     "CANNED_RESPONSES": "Răspunsuri predefinite",
diff --git a/app/javascript/dashboard/i18n/locale/ru/auditLogs.json b/app/javascript/dashboard/i18n/locale/ru/auditLogs.json
new file mode 100644
index 000000000..c1b5617f2
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ru/auditLogs.json
@@ -0,0 +1,24 @@
+{
+  "AUDIT_LOGS": {
+    "HEADER": "Audit Logs",
+    "HEADER_BTN_TXT": "Add Audit Logs",
+    "LOADING": "Fetching Audit Logs",
+    "SEARCH_404": "Нет шаблонных ответов, соответствующих запросу",
+    "SIDEBAR_TXT": "<p><b>Audit Logs</b> </p><p> Audit Logs are trails for events and actions in a Chatwoot System. </p>",
+    "LIST": {
+      "404": "There are no Audit Logs available in this account.",
+      "TITLE": "Manage Audit Logs",
+      "DESC": "Audit Logs are trails for events and actions in a Chatwoot System.",
+      "TABLE_HEADER": [
+        "User",
+        "Action",
+        "IP адрес",
+        "Time"
+      ]
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "AuditLogs retrieved successfully",
+      "ERROR_MESSAGE": "Не удается соединиться с сервером Woot, попробуйте позже"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ru/contact.json b/app/javascript/dashboard/i18n/locale/ru/contact.json
index a464be292..5fc2c4248 100644
--- a/app/javascript/dashboard/i18n/locale/ru/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ru/contact.json
@@ -120,8 +120,9 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Введите номер телефона контакта",
         "LABEL": "Номер телефона",
-        "HELP": "Номер телефона должен быть в формате E.164, например: +1415555555 [+] [код страны][код города] [локальный номер телефона]",
+        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
         "ERROR": "Номер телефона должен быть пустым или в формате E.164",
+        "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "Этот номер телефона используется для другого контакта."
       },
       "LOCATION": {
@@ -181,7 +182,8 @@
         "LABEL": "Кому"
       },
       "INBOX": {
-        "LABEL": "Электронная почта",
+        "LABEL": "Via Inbox",
+        "PLACEHOLDER": "Choose source inbox",
         "ERROR": "Выберите электронную почту"
       },
       "SUBJECT": {
diff --git a/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json
index ec8990d26..f4c93f689 100644
--- a/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json
@@ -478,6 +478,8 @@
       "WHATSAPP_SECTION_UPDATE_TITLE": "Обновить ключ API",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Введите сюда новый ключ API",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Обновить",
+      "WHATSAPP_WEBHOOK_TITLE": "Вебхук верифицировать токен",
+      "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
diff --git a/app/javascript/dashboard/i18n/locale/ru/settings.json b/app/javascript/dashboard/i18n/locale/ru/settings.json
index afe715e21..9afc4532c 100644
--- a/app/javascript/dashboard/i18n/locale/ru/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ru/settings.json
@@ -203,6 +203,7 @@
     "HOME": "Главная",
     "AGENTS": "Операторы",
     "AGENT_BOTS": "Боты",
+    "AUDIT_LOGS": "Audit Logs",
     "INBOXES": "Источники",
     "NOTIFICATIONS": "Уведомления",
     "CANNED_RESPONSES": "Шаблонные ответы",
diff --git a/app/javascript/dashboard/i18n/locale/sh/auditLogs.json b/app/javascript/dashboard/i18n/locale/sh/auditLogs.json
new file mode 100644
index 000000000..e288e2959
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sh/auditLogs.json
@@ -0,0 +1,24 @@
+{
+  "AUDIT_LOGS": {
+    "HEADER": "Audit Logs",
+    "HEADER_BTN_TXT": "Add Audit Logs",
+    "LOADING": "Fetching Audit Logs",
+    "SEARCH_404": "There are no items matching this query",
+    "SIDEBAR_TXT": "<p><b>Audit Logs</b> </p><p> Audit Logs are trails for events and actions in a Chatwoot System. </p>",
+    "LIST": {
+      "404": "There are no Audit Logs available in this account.",
+      "TITLE": "Manage Audit Logs",
+      "DESC": "Audit Logs are trails for events and actions in a Chatwoot System.",
+      "TABLE_HEADER": [
+        "User",
+        "Action",
+        "IP Address",
+        "Time"
+      ]
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "AuditLogs retrieved successfully",
+      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/sh/contact.json b/app/javascript/dashboard/i18n/locale/sh/contact.json
index 9191698d8..4d1736ed0 100644
--- a/app/javascript/dashboard/i18n/locale/sh/contact.json
+++ b/app/javascript/dashboard/i18n/locale/sh/contact.json
@@ -120,8 +120,9 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Enter the phone number of the contact",
         "LABEL": "Phone Number",
-        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]",
+        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
         "ERROR": "Phone number should be either empty or of E.164 format",
+        "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "This phone number is in use for another contact."
       },
       "LOCATION": {
@@ -181,7 +182,8 @@
         "LABEL": "To"
       },
       "INBOX": {
-        "LABEL": "Inbox",
+        "LABEL": "Via Inbox",
+        "PLACEHOLDER": "Choose source inbox",
         "ERROR": "Select an inbox"
       },
       "SUBJECT": {
diff --git a/app/javascript/dashboard/i18n/locale/sh/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/sh/inboxMgmt.json
index 8b28d2a3f..14f60eac8 100644
--- a/app/javascript/dashboard/i18n/locale/sh/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sh/inboxMgmt.json
@@ -478,6 +478,8 @@
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Update",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
+      "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
diff --git a/app/javascript/dashboard/i18n/locale/sh/settings.json b/app/javascript/dashboard/i18n/locale/sh/settings.json
index f670fc360..86ddf40e6 100644
--- a/app/javascript/dashboard/i18n/locale/sh/settings.json
+++ b/app/javascript/dashboard/i18n/locale/sh/settings.json
@@ -203,6 +203,7 @@
     "HOME": "Home",
     "AGENTS": "Agents",
     "AGENT_BOTS": "Bots",
+    "AUDIT_LOGS": "Audit Logs",
     "INBOXES": "Inboxes",
     "NOTIFICATIONS": "Notifications",
     "CANNED_RESPONSES": "Canned Responses",
diff --git a/app/javascript/dashboard/i18n/locale/sk/auditLogs.json b/app/javascript/dashboard/i18n/locale/sk/auditLogs.json
new file mode 100644
index 000000000..868e4f979
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sk/auditLogs.json
@@ -0,0 +1,24 @@
+{
+  "AUDIT_LOGS": {
+    "HEADER": "Audit Logs",
+    "HEADER_BTN_TXT": "Add Audit Logs",
+    "LOADING": "Fetching Audit Logs",
+    "SEARCH_404": "Neexistujú žiadne položky, ktoré by zodpovedali tejto požiadavke",
+    "SIDEBAR_TXT": "<p><b>Audit Logs</b> </p><p> Audit Logs are trails for events and actions in a Chatwoot System. </p>",
+    "LIST": {
+      "404": "There are no Audit Logs available in this account.",
+      "TITLE": "Manage Audit Logs",
+      "DESC": "Audit Logs are trails for events and actions in a Chatwoot System.",
+      "TABLE_HEADER": [
+        "User",
+        "Action",
+        "IP adresa",
+        "Time"
+      ]
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "AuditLogs retrieved successfully",
+      "ERROR_MESSAGE": "Nepodarilo sa pripojiť k serveru Woot, skúste to prosím neskôr"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/sk/contact.json b/app/javascript/dashboard/i18n/locale/sk/contact.json
index 182c12173..10530be28 100644
--- a/app/javascript/dashboard/i18n/locale/sk/contact.json
+++ b/app/javascript/dashboard/i18n/locale/sk/contact.json
@@ -120,8 +120,9 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Zadajte telefónne číslo kontaktu",
         "LABEL": "Telefónne číslo",
-        "HELP": "Telefónne číslo by malo byť vo formáte E.164, napr: + 1415555555 [+][kód krajiny][smerové číslo oblasti][miestne telefónne číslo]",
+        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
         "ERROR": "Telefónne číslo by malo byť prázdne alebo vo formáte E.164",
+        "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "Toto telefónne číslo sa používa pre iný kontakt."
       },
       "LOCATION": {
@@ -181,7 +182,8 @@
         "LABEL": "Pre"
       },
       "INBOX": {
-        "LABEL": "Schránka",
+        "LABEL": "Via Inbox",
+        "PLACEHOLDER": "Choose source inbox",
         "ERROR": "Vybrať schránku"
       },
       "SUBJECT": {
diff --git a/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json
index 565133aee..52004bc89 100644
--- a/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json
@@ -478,6 +478,8 @@
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Update",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
+      "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
diff --git a/app/javascript/dashboard/i18n/locale/sk/settings.json b/app/javascript/dashboard/i18n/locale/sk/settings.json
index a0cedbd63..e2b0aa2d1 100644
--- a/app/javascript/dashboard/i18n/locale/sk/settings.json
+++ b/app/javascript/dashboard/i18n/locale/sk/settings.json
@@ -203,6 +203,7 @@
     "HOME": "Home",
     "AGENTS": "Agenti",
     "AGENT_BOTS": "Bots",
+    "AUDIT_LOGS": "Audit Logs",
     "INBOXES": "Inboxes",
     "NOTIFICATIONS": "Upozornenia",
     "CANNED_RESPONSES": "Uložené odpovede",
diff --git a/app/javascript/dashboard/i18n/locale/sr/auditLogs.json b/app/javascript/dashboard/i18n/locale/sr/auditLogs.json
new file mode 100644
index 000000000..9faf18973
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sr/auditLogs.json
@@ -0,0 +1,24 @@
+{
+  "AUDIT_LOGS": {
+    "HEADER": "Audit Logs",
+    "HEADER_BTN_TXT": "Add Audit Logs",
+    "LOADING": "Fetching Audit Logs",
+    "SEARCH_404": "Nema stavki koje se poklapaju sa upitom",
+    "SIDEBAR_TXT": "<p><b>Audit Logs</b> </p><p> Audit Logs are trails for events and actions in a Chatwoot System. </p>",
+    "LIST": {
+      "404": "There are no Audit Logs available in this account.",
+      "TITLE": "Manage Audit Logs",
+      "DESC": "Audit Logs are trails for events and actions in a Chatwoot System.",
+      "TABLE_HEADER": [
+        "User",
+        "Action",
+        "IP adresa",
+        "Time"
+      ]
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "AuditLogs retrieved successfully",
+      "ERROR_MESSAGE": "Nije moguće se povezati sa Woot serverom, pokušajte ponovo kasnije"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/sr/contact.json b/app/javascript/dashboard/i18n/locale/sr/contact.json
index 9d7eb244f..db761cf22 100644
--- a/app/javascript/dashboard/i18n/locale/sr/contact.json
+++ b/app/javascript/dashboard/i18n/locale/sr/contact.json
@@ -120,8 +120,9 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Unesite broj telefona kontakta",
         "LABEL": "Broj telefona",
-        "HELP": "Broj telefona bi trebao biti u E.164 formatu npr.: +381601234567 [+][broj države][pozivni broj][broj telefona]",
+        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
         "ERROR": "Broj telefona bi trebao biti ili prazan ili u E.164 formatu",
+        "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "Broj telefona je iskorišćen kod drugog kontakta."
       },
       "LOCATION": {
@@ -181,7 +182,8 @@
         "LABEL": "Za"
       },
       "INBOX": {
-        "LABEL": "Prijemno sanduče",
+        "LABEL": "Via Inbox",
+        "PLACEHOLDER": "Choose source inbox",
         "ERROR": "Izaberite prijemno sanduče"
       },
       "SUBJECT": {
diff --git a/app/javascript/dashboard/i18n/locale/sr/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/sr/inboxMgmt.json
index fe4882876..b52910a57 100644
--- a/app/javascript/dashboard/i18n/locale/sr/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sr/inboxMgmt.json
@@ -478,6 +478,8 @@
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Primeni",
+      "WHATSAPP_WEBHOOK_TITLE": "Token potvrde veb zakačke",
+      "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
diff --git a/app/javascript/dashboard/i18n/locale/sr/settings.json b/app/javascript/dashboard/i18n/locale/sr/settings.json
index 7fe457538..701b754cc 100644
--- a/app/javascript/dashboard/i18n/locale/sr/settings.json
+++ b/app/javascript/dashboard/i18n/locale/sr/settings.json
@@ -203,6 +203,7 @@
     "HOME": "Početak",
     "AGENTS": "Agenti",
     "AGENT_BOTS": "Bots",
+    "AUDIT_LOGS": "Audit Logs",
     "INBOXES": "Prijemni sandučići",
     "NOTIFICATIONS": "Obaveštenja",
     "CANNED_RESPONSES": "Gotovi odgovori",
diff --git a/app/javascript/dashboard/i18n/locale/sv/auditLogs.json b/app/javascript/dashboard/i18n/locale/sv/auditLogs.json
new file mode 100644
index 000000000..98f350444
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sv/auditLogs.json
@@ -0,0 +1,24 @@
+{
+  "AUDIT_LOGS": {
+    "HEADER": "Audit Logs",
+    "HEADER_BTN_TXT": "Add Audit Logs",
+    "LOADING": "Fetching Audit Logs",
+    "SEARCH_404": "Det finns inga objekt som matchar denna fråga",
+    "SIDEBAR_TXT": "<p><b>Audit Logs</b> </p><p> Audit Logs are trails for events and actions in a Chatwoot System. </p>",
+    "LIST": {
+      "404": "There are no Audit Logs available in this account.",
+      "TITLE": "Manage Audit Logs",
+      "DESC": "Audit Logs are trails for events and actions in a Chatwoot System.",
+      "TABLE_HEADER": [
+        "User",
+        "Action",
+        "IP-adress",
+        "Time"
+      ]
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "AuditLogs retrieved successfully",
+      "ERROR_MESSAGE": "Kunde inte ansluta till Woot Server, försök igen senare"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/sv/contact.json b/app/javascript/dashboard/i18n/locale/sv/contact.json
index a301604cc..42f077f6e 100644
--- a/app/javascript/dashboard/i18n/locale/sv/contact.json
+++ b/app/javascript/dashboard/i18n/locale/sv/contact.json
@@ -120,8 +120,9 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Ange telefonnummer till kontakten",
         "LABEL": "Telefonnummer",
-        "HELP": "Telefonnumret bör ha formatet E.164, t.ex.: +1415555555 [+][landsnummer][riktnummer][lokalt telefonnummer]",
+        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
         "ERROR": "Telefonnumret ska vara antingen tomt eller i E.164-format",
+        "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "This phone number is in use for another contact."
       },
       "LOCATION": {
@@ -181,7 +182,8 @@
         "LABEL": "Till"
       },
       "INBOX": {
-        "LABEL": "Inkorg",
+        "LABEL": "Via Inbox",
+        "PLACEHOLDER": "Choose source inbox",
         "ERROR": "Välj en inkorg"
       },
       "SUBJECT": {
diff --git a/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json
index bcfed5b9e..4f649db05 100644
--- a/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json
@@ -478,6 +478,8 @@
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Uppdatera",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
+      "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
diff --git a/app/javascript/dashboard/i18n/locale/sv/settings.json b/app/javascript/dashboard/i18n/locale/sv/settings.json
index da795302b..23d82e09d 100644
--- a/app/javascript/dashboard/i18n/locale/sv/settings.json
+++ b/app/javascript/dashboard/i18n/locale/sv/settings.json
@@ -203,6 +203,7 @@
     "HOME": "Hem",
     "AGENTS": "Agenter",
     "AGENT_BOTS": "Bots",
+    "AUDIT_LOGS": "Audit Logs",
     "INBOXES": "Inkorgar",
     "NOTIFICATIONS": "Aviseringar",
     "CANNED_RESPONSES": "Svarsmallar",
diff --git a/app/javascript/dashboard/i18n/locale/ta/auditLogs.json b/app/javascript/dashboard/i18n/locale/ta/auditLogs.json
new file mode 100644
index 000000000..5798061ed
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ta/auditLogs.json
@@ -0,0 +1,24 @@
+{
+  "AUDIT_LOGS": {
+    "HEADER": "Audit Logs",
+    "HEADER_BTN_TXT": "Add Audit Logs",
+    "LOADING": "Fetching Audit Logs",
+    "SEARCH_404": "இந்த கேள்விக்கு பொருந்தக்கூடியவை எதுவும் இல்லை",
+    "SIDEBAR_TXT": "<p><b>Audit Logs</b> </p><p> Audit Logs are trails for events and actions in a Chatwoot System. </p>",
+    "LIST": {
+      "404": "There are no Audit Logs available in this account.",
+      "TITLE": "Manage Audit Logs",
+      "DESC": "Audit Logs are trails for events and actions in a Chatwoot System.",
+      "TABLE_HEADER": [
+        "User",
+        "Action",
+        "IP Address",
+        "Time"
+      ]
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "AuditLogs retrieved successfully",
+      "ERROR_MESSAGE": "வூட் சர்வருடன் இணைக்க முடியவில்ல, மீண்டும் முயற்சிக்கவும்"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ta/contact.json b/app/javascript/dashboard/i18n/locale/ta/contact.json
index c6d848057..ae5553b7e 100644
--- a/app/javascript/dashboard/i18n/locale/ta/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ta/contact.json
@@ -120,8 +120,9 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Enter the phone number of the contact",
         "LABEL": "Phone Number",
-        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]",
+        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
         "ERROR": "Phone number should be either empty or of E.164 format",
+        "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "This phone number is in use for another contact."
       },
       "LOCATION": {
@@ -181,7 +182,8 @@
         "LABEL": "To"
       },
       "INBOX": {
-        "LABEL": "Inbox",
+        "LABEL": "Via Inbox",
+        "PLACEHOLDER": "Choose source inbox",
         "ERROR": "Select an inbox"
       },
       "SUBJECT": {
diff --git a/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json
index a85fdfc07..d3e2f538c 100644
--- a/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json
@@ -478,6 +478,8 @@
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "புதுப்பிப்பு",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
+      "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
diff --git a/app/javascript/dashboard/i18n/locale/ta/settings.json b/app/javascript/dashboard/i18n/locale/ta/settings.json
index dd882ecd5..49b037ecf 100644
--- a/app/javascript/dashboard/i18n/locale/ta/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ta/settings.json
@@ -203,6 +203,7 @@
     "HOME": "முகப்பு",
     "AGENTS": "ஏஜென்ட்கள்",
     "AGENT_BOTS": "Bots",
+    "AUDIT_LOGS": "Audit Logs",
     "INBOXES": "இன்பாக்ஸ்கள்",
     "NOTIFICATIONS": "Notifications",
     "CANNED_RESPONSES": "பதிவு செய்யப்பட்ட பதில்கள்",
diff --git a/app/javascript/dashboard/i18n/locale/th/auditLogs.json b/app/javascript/dashboard/i18n/locale/th/auditLogs.json
new file mode 100644
index 000000000..ee53800a8
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/th/auditLogs.json
@@ -0,0 +1,24 @@
+{
+  "AUDIT_LOGS": {
+    "HEADER": "Audit Logs",
+    "HEADER_BTN_TXT": "Add Audit Logs",
+    "LOADING": "Fetching Audit Logs",
+    "SEARCH_404": "ไม่มีรายการที่ตรงกับเนื้อหานี้",
+    "SIDEBAR_TXT": "<p><b>Audit Logs</b> </p><p> Audit Logs are trails for events and actions in a Chatwoot System. </p>",
+    "LIST": {
+      "404": "There are no Audit Logs available in this account.",
+      "TITLE": "Manage Audit Logs",
+      "DESC": "Audit Logs are trails for events and actions in a Chatwoot System.",
+      "TABLE_HEADER": [
+        "User",
+        "Action",
+        "ที่อยู่ไอพี",
+        "Time"
+      ]
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "AuditLogs retrieved successfully",
+      "ERROR_MESSAGE": "ไม่สามารถเชื่อมต่อเซิฟเวอร์ได้ โปรดลองอีกครั้งในภายหลัง"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/th/contact.json b/app/javascript/dashboard/i18n/locale/th/contact.json
index bde9e6b31..b27cec46f 100644
--- a/app/javascript/dashboard/i18n/locale/th/contact.json
+++ b/app/javascript/dashboard/i18n/locale/th/contact.json
@@ -120,8 +120,9 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "กรอกหมายเลขโทรศัพท์ผู้ติดต่อ",
         "LABEL": "หมายเลขโทรศัพท์",
-        "HELP": "เบอร์โทรศัพท์ควรจะเป็นเเบบนี้เช่น +663990214 [+][หรัสประเทศ][หรัสพื้นที่][เลขโทรศัพท์]",
+        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
         "ERROR": "หมายเลขโทรศัพท์ควรจะว่างปล่าวหรืออยู่ในรู้เเบบ E.164",
+        "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "หมายเลขนี้ถูกใช้สำหรับผู้ติดต่อคนอื่นเเล้ว"
       },
       "LOCATION": {
@@ -181,7 +182,8 @@
         "LABEL": "ถึง"
       },
       "INBOX": {
-        "LABEL": "กล่องข้อความ",
+        "LABEL": "Via Inbox",
+        "PLACEHOLDER": "Choose source inbox",
         "ERROR": "เลือกกล่องข้อความ"
       },
       "SUBJECT": {
diff --git a/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json
index 5ac450b0f..4daafc43a 100644
--- a/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json
@@ -478,6 +478,8 @@
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "อัพเดท",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
+      "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
diff --git a/app/javascript/dashboard/i18n/locale/th/settings.json b/app/javascript/dashboard/i18n/locale/th/settings.json
index 8d3af9ee8..b2d69d818 100644
--- a/app/javascript/dashboard/i18n/locale/th/settings.json
+++ b/app/javascript/dashboard/i18n/locale/th/settings.json
@@ -203,6 +203,7 @@
     "HOME": "หน้าหลัก",
     "AGENTS": "พนักงาน",
     "AGENT_BOTS": "บอท",
+    "AUDIT_LOGS": "Audit Logs",
     "INBOXES": "กล่องข้อความ",
     "NOTIFICATIONS": "การแจ้งเตือน",
     "CANNED_RESPONSES": "คำตอบสำเร็จรูป",
diff --git a/app/javascript/dashboard/i18n/locale/tr/auditLogs.json b/app/javascript/dashboard/i18n/locale/tr/auditLogs.json
new file mode 100644
index 000000000..7a4e2aa2c
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/tr/auditLogs.json
@@ -0,0 +1,24 @@
+{
+  "AUDIT_LOGS": {
+    "HEADER": "Audit Logs",
+    "HEADER_BTN_TXT": "Add Audit Logs",
+    "LOADING": "Fetching Audit Logs",
+    "SEARCH_404": "Bu sorgu ile eşleşen öğe yok",
+    "SIDEBAR_TXT": "<p><b>Audit Logs</b> </p><p> Audit Logs are trails for events and actions in a Chatwoot System. </p>",
+    "LIST": {
+      "404": "There are no Audit Logs available in this account.",
+      "TITLE": "Manage Audit Logs",
+      "DESC": "Audit Logs are trails for events and actions in a Chatwoot System.",
+      "TABLE_HEADER": [
+        "User",
+        "Action",
+        "IP Adresi",
+        "Time"
+      ]
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "AuditLogs retrieved successfully",
+      "ERROR_MESSAGE": "Woot Sunucusuna bağlanılamadı, Lütfen daha sonra tekrar deneyin"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/tr/contact.json b/app/javascript/dashboard/i18n/locale/tr/contact.json
index d345c9bcf..5dbe794b8 100644
--- a/app/javascript/dashboard/i18n/locale/tr/contact.json
+++ b/app/javascript/dashboard/i18n/locale/tr/contact.json
@@ -120,8 +120,9 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Kişinin telefon numarasını girin",
         "LABEL": "Telefon numarası",
-        "HELP": "Telefon numarası E.164 formatında olmalı örn: +1415555555 [+][country code][area code][local phone number]",
+        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
         "ERROR": "Telefon numarası boş ya da E.164 formatında olabilir",
+        "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "Bu telefon numarası başkası tarafından kullanılıyor."
       },
       "LOCATION": {
@@ -181,7 +182,8 @@
         "LABEL": "ya"
       },
       "INBOX": {
-        "LABEL": "Gelen kutusu",
+        "LABEL": "Via Inbox",
+        "PLACEHOLDER": "Choose source inbox",
         "ERROR": "Gelen kutusu seç"
       },
       "SUBJECT": {
diff --git a/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json
index f463e896b..1fdc06c5e 100644
--- a/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json
@@ -478,6 +478,8 @@
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Güncelleme",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
+      "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
diff --git a/app/javascript/dashboard/i18n/locale/tr/settings.json b/app/javascript/dashboard/i18n/locale/tr/settings.json
index 9d55a415e..d06dde9f2 100644
--- a/app/javascript/dashboard/i18n/locale/tr/settings.json
+++ b/app/javascript/dashboard/i18n/locale/tr/settings.json
@@ -203,6 +203,7 @@
     "HOME": "Anasayfa",
     "AGENTS": "Kullanıcılar",
     "AGENT_BOTS": "Bots",
+    "AUDIT_LOGS": "Audit Logs",
     "INBOXES": "Gelen kutuları",
     "NOTIFICATIONS": "Bildirimler",
     "CANNED_RESPONSES": "Hazır Yanıtlar",
diff --git a/app/javascript/dashboard/i18n/locale/uk/agentMgmt.json b/app/javascript/dashboard/i18n/locale/uk/agentMgmt.json
index ec17116db..1c3958abc 100644
--- a/app/javascript/dashboard/i18n/locale/uk/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/uk/agentMgmt.json
@@ -76,8 +76,8 @@
         },
         "AGENT_AVAILABILITY": {
           "LABEL": "Присутність",
-          "PLACEHOLDER": "Please select an availability status",
-          "ERROR": "Availability is required"
+          "PLACEHOLDER": "Будь ласка, оберіть статус доступності",
+          "ERROR": "Потрібно вказати доступність"
         },
         "SUBMIT": "Редагувати агента"
       },
diff --git a/app/javascript/dashboard/i18n/locale/uk/auditLogs.json b/app/javascript/dashboard/i18n/locale/uk/auditLogs.json
new file mode 100644
index 000000000..dfe5b5183
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/uk/auditLogs.json
@@ -0,0 +1,24 @@
+{
+  "AUDIT_LOGS": {
+    "HEADER": "Логи аудиту",
+    "HEADER_BTN_TXT": "Додати логи",
+    "LOADING": "Завантаження логів",
+    "SEARCH_404": "Немає елементів, що відповідають запиту",
+    "SIDEBAR_TXT": "<p><b>Логи аудиту</b> </p><p> Логи - це історія всіх подій в системі Chatwoot. </p>",
+    "LIST": {
+      "404": "У цьому акаунті немає логів.",
+      "TITLE": "Керувати логами",
+      "DESC": " Логи - це історія всіх подій в системі Chatwoot.",
+      "TABLE_HEADER": [
+        "Користувач",
+        "Дія",
+        "IP-адреса",
+        "Час"
+      ]
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "Логи успішно отримано",
+      "ERROR_MESSAGE": "Не вдалося підключитися до Woot Server, спробуйте ще раз пізніше"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/uk/contact.json b/app/javascript/dashboard/i18n/locale/uk/contact.json
index 26880acc8..7cea46d8c 100644
--- a/app/javascript/dashboard/i18n/locale/uk/contact.json
+++ b/app/javascript/dashboard/i18n/locale/uk/contact.json
@@ -120,8 +120,9 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Введіть номер телефону контакту",
         "LABEL": "Номер телефону",
-        "HELP": "Номер телефону має бути в форматі E.164; наприклад: +1415555555 [+][код країни][код міста][локальний номер телефону]",
+        "HELP": "Номер телефону має бути в форматі E.164; + 14155555 [+][код країни][місцевий номер]. Можна вибрати телефонний код зі списку.",
         "ERROR": "Номер телефону повинен бути пустим, або у форматі E.164",
+        "DIAL_CODE_ERROR": "Будь ласка, виберіть телефонний код зі списку",
         "DUPLICATE": "Цей номер телефону використовується для іншого контакту."
       },
       "LOCATION": {
@@ -181,7 +182,8 @@
         "LABEL": "Для"
       },
       "INBOX": {
-        "LABEL": "Вхідні",
+        "LABEL": "Через вхідні",
+        "PLACEHOLDER": "Оберіть джерело вхідних",
         "ERROR": "Оберіть канал"
       },
       "SUBJECT": {
diff --git a/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json
index 59f847070..e1fd8a914 100644
--- a/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json
@@ -440,7 +440,7 @@
       "DISPLAY_FILE_PICKER": "Показувати вибір файлу на віджеті",
       "DISPLAY_EMOJI_PICKER": "Відображати емодзі на віджеті",
       "ALLOW_END_CONVERSATION": "Дозволити користувачам завершити розмову з віджета",
-      "USE_INBOX_AVATAR_FOR_BOT": "Use inbox name and avatar for the bot"
+      "USE_INBOX_AVATAR_FOR_BOT": "Вкажіть ім'я та аватар для бота"
     },
     "SETTINGS_POPUP": {
       "MESSENGER_HEADING": "Скрипт месенджера",
@@ -478,6 +478,8 @@
       "WHATSAPP_SECTION_UPDATE_TITLE": "Оновити ключ API",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Введіть тут новий ключ API",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Оновити",
+      "WHATSAPP_WEBHOOK_TITLE": "Токен перевірки вебхуків",
+      "WHATSAPP_WEBHOOK_SUBHEADER": "Цей токен використовується для перевірки аутентифікації кінцевої точки вебхука.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Оновити параметри форми чату"
     },
     "AUTO_ASSIGNMENT": {
diff --git a/app/javascript/dashboard/i18n/locale/uk/settings.json b/app/javascript/dashboard/i18n/locale/uk/settings.json
index ba46569ab..a7fbcb7dc 100644
--- a/app/javascript/dashboard/i18n/locale/uk/settings.json
+++ b/app/javascript/dashboard/i18n/locale/uk/settings.json
@@ -164,7 +164,7 @@
   "COMPONENTS": {
     "CODE": {
       "BUTTON_TEXT": "Копіювати",
-      "CODEPEN": "Open in CodePen",
+      "CODEPEN": "Відкрити у CodePen",
       "COPY_SUCCESSFUL": "Код скопійований в буфер обміну"
     },
     "SHOW_MORE_BLOCK": {
@@ -203,6 +203,7 @@
     "HOME": "Головна",
     "AGENTS": "Агенти",
     "AGENT_BOTS": "Боти",
+    "AUDIT_LOGS": "Журнал аудиту",
     "INBOXES": "Вхідні",
     "NOTIFICATIONS": "Сповіщення",
     "CANNED_RESPONSES": "Швидкі відповіді",
diff --git a/app/javascript/dashboard/i18n/locale/ur/auditLogs.json b/app/javascript/dashboard/i18n/locale/ur/auditLogs.json
new file mode 100644
index 000000000..c605dcaf4
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur/auditLogs.json
@@ -0,0 +1,24 @@
+{
+  "AUDIT_LOGS": {
+    "HEADER": "Audit Logs",
+    "HEADER_BTN_TXT": "Add Audit Logs",
+    "LOADING": "Fetching Audit Logs",
+    "SEARCH_404": "اس سوال سے مماثل کوئی آئٹمز نہیں ہیں۔",
+    "SIDEBAR_TXT": "<p><b>Audit Logs</b> </p><p> Audit Logs are trails for events and actions in a Chatwoot System. </p>",
+    "LIST": {
+      "404": "There are no Audit Logs available in this account.",
+      "TITLE": "Manage Audit Logs",
+      "DESC": "Audit Logs are trails for events and actions in a Chatwoot System.",
+      "TABLE_HEADER": [
+        "User",
+        "Action",
+        "آئی پی ایڈریس",
+        "Time"
+      ]
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "AuditLogs retrieved successfully",
+      "ERROR_MESSAGE": "ووٹ سرور کے ساتھ رابطہ ممکن نہی ہوسکا ، براہ کرم کچھ دیر بعد کوشش کریں"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ur/contact.json b/app/javascript/dashboard/i18n/locale/ur/contact.json
index a3c0d1e2c..66992779a 100644
--- a/app/javascript/dashboard/i18n/locale/ur/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ur/contact.json
@@ -120,8 +120,9 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "کانٹیکٹ کا فون نمبر درج کریں۔",
         "LABEL": "فون نمبر",
-        "HELP": "فون نمبر E.164 فارمیٹ کا ہونا چاہیے جیسے: +1415555555 [+][ملک کا کوڈ][علاقہ کا کوڈ][مقامی فون نمبر]",
+        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
         "ERROR": "فون نمبر یا تو خالی یا E.164 فارمیٹ کا ہونا چاہیے۔",
+        "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "یہ فون نمبر دوسرے کانٹیکٹ کے لیے استعمال میں ہے۔."
       },
       "LOCATION": {
@@ -181,7 +182,8 @@
         "LABEL": "کو"
       },
       "INBOX": {
-        "LABEL": "ان باکس",
+        "LABEL": "Via Inbox",
+        "PLACEHOLDER": "Choose source inbox",
         "ERROR": "ایک ان باکس منتخب کریں۔"
       },
       "SUBJECT": {
diff --git a/app/javascript/dashboard/i18n/locale/ur/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ur/inboxMgmt.json
index 8b0b4df9b..e4f97b79f 100644
--- a/app/javascript/dashboard/i18n/locale/ur/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ur/inboxMgmt.json
@@ -478,6 +478,8 @@
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Update",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
+      "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
diff --git a/app/javascript/dashboard/i18n/locale/ur/settings.json b/app/javascript/dashboard/i18n/locale/ur/settings.json
index 05931108f..57f85678c 100644
--- a/app/javascript/dashboard/i18n/locale/ur/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ur/settings.json
@@ -203,6 +203,7 @@
     "HOME": "Home",
     "AGENTS": "ایجنٹ",
     "AGENT_BOTS": "Bots",
+    "AUDIT_LOGS": "Audit Logs",
     "INBOXES": "Inboxes",
     "NOTIFICATIONS": "Notifications",
     "CANNED_RESPONSES": "محفوظ کردہ جوابات",
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/auditLogs.json b/app/javascript/dashboard/i18n/locale/ur_IN/auditLogs.json
new file mode 100644
index 000000000..e288e2959
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/auditLogs.json
@@ -0,0 +1,24 @@
+{
+  "AUDIT_LOGS": {
+    "HEADER": "Audit Logs",
+    "HEADER_BTN_TXT": "Add Audit Logs",
+    "LOADING": "Fetching Audit Logs",
+    "SEARCH_404": "There are no items matching this query",
+    "SIDEBAR_TXT": "<p><b>Audit Logs</b> </p><p> Audit Logs are trails for events and actions in a Chatwoot System. </p>",
+    "LIST": {
+      "404": "There are no Audit Logs available in this account.",
+      "TITLE": "Manage Audit Logs",
+      "DESC": "Audit Logs are trails for events and actions in a Chatwoot System.",
+      "TABLE_HEADER": [
+        "User",
+        "Action",
+        "IP Address",
+        "Time"
+      ]
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "AuditLogs retrieved successfully",
+      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/contact.json b/app/javascript/dashboard/i18n/locale/ur_IN/contact.json
index 9191698d8..4d1736ed0 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/contact.json
@@ -120,8 +120,9 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Enter the phone number of the contact",
         "LABEL": "Phone Number",
-        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]",
+        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
         "ERROR": "Phone number should be either empty or of E.164 format",
+        "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "This phone number is in use for another contact."
       },
       "LOCATION": {
@@ -181,7 +182,8 @@
         "LABEL": "To"
       },
       "INBOX": {
-        "LABEL": "Inbox",
+        "LABEL": "Via Inbox",
+        "PLACEHOLDER": "Choose source inbox",
         "ERROR": "Select an inbox"
       },
       "SUBJECT": {
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ur_IN/inboxMgmt.json
index 60454261d..bed0ec0c9 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/inboxMgmt.json
@@ -478,6 +478,8 @@
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Update",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
+      "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/settings.json b/app/javascript/dashboard/i18n/locale/ur_IN/settings.json
index 112ac79bd..ab850562b 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/settings.json
@@ -203,6 +203,7 @@
     "HOME": "Home",
     "AGENTS": "Agents",
     "AGENT_BOTS": "Bots",
+    "AUDIT_LOGS": "Audit Logs",
     "INBOXES": "Inboxes",
     "NOTIFICATIONS": "Notifications",
     "CANNED_RESPONSES": "Canned Responses",
diff --git a/app/javascript/dashboard/i18n/locale/vi/auditLogs.json b/app/javascript/dashboard/i18n/locale/vi/auditLogs.json
new file mode 100644
index 000000000..6add09647
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/vi/auditLogs.json
@@ -0,0 +1,24 @@
+{
+  "AUDIT_LOGS": {
+    "HEADER": "Audit Logs",
+    "HEADER_BTN_TXT": "Add Audit Logs",
+    "LOADING": "Fetching Audit Logs",
+    "SEARCH_404": "Không có kết quả nào được tìm thấy",
+    "SIDEBAR_TXT": "<p><b>Audit Logs</b> </p><p> Audit Logs are trails for events and actions in a Chatwoot System. </p>",
+    "LIST": {
+      "404": "There are no Audit Logs available in this account.",
+      "TITLE": "Manage Audit Logs",
+      "DESC": "Audit Logs are trails for events and actions in a Chatwoot System.",
+      "TABLE_HEADER": [
+        "User",
+        "Action",
+        "Địa chỉ IP",
+        "Time"
+      ]
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "AuditLogs retrieved successfully",
+      "ERROR_MESSAGE": "Không thể kết nối với Máy chủ Woot, Vui lòng thử lại sau"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/vi/contact.json b/app/javascript/dashboard/i18n/locale/vi/contact.json
index 99ac8306c..a71e478e6 100644
--- a/app/javascript/dashboard/i18n/locale/vi/contact.json
+++ b/app/javascript/dashboard/i18n/locale/vi/contact.json
@@ -120,8 +120,9 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Nhập số điện thoại của liên hệ",
         "LABEL": "Số điện thoại",
-        "HELP": "Số điện thoại phải thuộc định đạng E.164 như: +1415555555 [+][mã nước][mã khu vực][số điện thoại vùng]",
+        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
         "ERROR": "Số điện thoại nên rỗng hoặc thuộc định dạng E.164",
+        "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "Số điện thoại này đang được dùng cho một liên hệ khác."
       },
       "LOCATION": {
@@ -181,7 +182,8 @@
         "LABEL": "Đến"
       },
       "INBOX": {
-        "LABEL": "Kênh",
+        "LABEL": "Via Inbox",
+        "PLACEHOLDER": "Choose source inbox",
         "ERROR": "Chọn kênh"
       },
       "SUBJECT": {
diff --git a/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json
index 3c340554c..58f5b1afc 100644
--- a/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json
@@ -478,6 +478,8 @@
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Cập nhật",
+      "WHATSAPP_WEBHOOK_TITLE": "Token xác thực Webhook",
+      "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
diff --git a/app/javascript/dashboard/i18n/locale/vi/settings.json b/app/javascript/dashboard/i18n/locale/vi/settings.json
index ed58bf900..768bbbaa2 100644
--- a/app/javascript/dashboard/i18n/locale/vi/settings.json
+++ b/app/javascript/dashboard/i18n/locale/vi/settings.json
@@ -203,6 +203,7 @@
     "HOME": "Trang Chủ",
     "AGENTS": "Đại lý",
     "AGENT_BOTS": "Bots",
+    "AUDIT_LOGS": "Audit Logs",
     "INBOXES": "Hộp thư đến",
     "NOTIFICATIONS": "Thông báo",
     "CANNED_RESPONSES": "Thư mẫu phẩn hồi",
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/auditLogs.json b/app/javascript/dashboard/i18n/locale/zh_CN/auditLogs.json
new file mode 100644
index 000000000..d1b6441d6
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/auditLogs.json
@@ -0,0 +1,24 @@
+{
+  "AUDIT_LOGS": {
+    "HEADER": "Audit Logs",
+    "HEADER_BTN_TXT": "Add Audit Logs",
+    "LOADING": "Fetching Audit Logs",
+    "SEARCH_404": "没有任何项目符合此查询",
+    "SIDEBAR_TXT": "<p><b>Audit Logs</b> </p><p> Audit Logs are trails for events and actions in a Chatwoot System. </p>",
+    "LIST": {
+      "404": "There are no Audit Logs available in this account.",
+      "TITLE": "Manage Audit Logs",
+      "DESC": "Audit Logs are trails for events and actions in a Chatwoot System.",
+      "TABLE_HEADER": [
+        "User",
+        "Action",
+        "IP 地址",
+        "Time"
+      ]
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "AuditLogs retrieved successfully",
+      "ERROR_MESSAGE": "无法连接服务器，请稍后再试"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/contact.json b/app/javascript/dashboard/i18n/locale/zh_CN/contact.json
index 01eca1da1..64692f1a4 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/contact.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/contact.json
@@ -120,8 +120,9 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "输入联系人的电话号码",
         "LABEL": "电话号码",
-        "HELP": "电话号码应为E.164格式，例如：+14155555 [+] [国家代码][地区代码][本地电话号码]",
+        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
         "ERROR": "电话号码应为空或E.164格式",
+        "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "此电话号码正在用于另一个联系人。"
       },
       "LOCATION": {
@@ -181,7 +182,8 @@
         "LABEL": "发送至"
       },
       "INBOX": {
-        "LABEL": "收件箱",
+        "LABEL": "Via Inbox",
+        "PLACEHOLDER": "Choose source inbox",
         "ERROR": "选择一个收件箱"
       },
       "SUBJECT": {
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json
index 0a074a5ac..a16d4c8f6 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json
@@ -478,6 +478,8 @@
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "更新",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
+      "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/settings.json b/app/javascript/dashboard/i18n/locale/zh_CN/settings.json
index 803826f3e..94346b48e 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/settings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/settings.json
@@ -203,6 +203,7 @@
     "HOME": "首页",
     "AGENTS": "客服代理们",
     "AGENT_BOTS": "机器人",
+    "AUDIT_LOGS": "Audit Logs",
     "INBOXES": "收件箱",
     "NOTIFICATIONS": "消息通知",
     "CANNED_RESPONSES": "预设回复",
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/auditLogs.json b/app/javascript/dashboard/i18n/locale/zh_TW/auditLogs.json
new file mode 100644
index 000000000..1668572d0
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/auditLogs.json
@@ -0,0 +1,24 @@
+{
+  "AUDIT_LOGS": {
+    "HEADER": "Audit Logs",
+    "HEADER_BTN_TXT": "Add Audit Logs",
+    "LOADING": "Fetching Audit Logs",
+    "SEARCH_404": "沒有任何項目符合此查詢",
+    "SIDEBAR_TXT": "<p><b>Audit Logs</b> </p><p> Audit Logs are trails for events and actions in a Chatwoot System. </p>",
+    "LIST": {
+      "404": "There are no Audit Logs available in this account.",
+      "TITLE": "Manage Audit Logs",
+      "DESC": "Audit Logs are trails for events and actions in a Chatwoot System.",
+      "TABLE_HEADER": [
+        "User",
+        "Action",
+        "IP 位置",
+        "Time"
+      ]
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "AuditLogs retrieved successfully",
+      "ERROR_MESSAGE": "無法連接伺服器，請稍後再試"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/contact.json b/app/javascript/dashboard/i18n/locale/zh_TW/contact.json
index 20cb25b42..ae407ad05 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/contact.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/contact.json
@@ -120,8 +120,9 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "請輸入聯絡人電話",
         "LABEL": "聯絡人電話",
-        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]",
+        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
         "ERROR": "Phone number should be either empty or of E.164 format",
+        "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "This phone number is in use for another contact."
       },
       "LOCATION": {
@@ -181,7 +182,8 @@
         "LABEL": "To"
       },
       "INBOX": {
-        "LABEL": "收件匣",
+        "LABEL": "Via Inbox",
+        "PLACEHOLDER": "Choose source inbox",
         "ERROR": "選擇一個收件匣"
       },
       "SUBJECT": {
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json
index 9717cc6fe..ff34b8695 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json
@@ -478,6 +478,8 @@
       "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "更新",
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
+      "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "AUTO_ASSIGNMENT": {
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/settings.json b/app/javascript/dashboard/i18n/locale/zh_TW/settings.json
index 06462f6bb..d1127e9e5 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/settings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/settings.json
@@ -203,6 +203,7 @@
     "HOME": "首頁",
     "AGENTS": "客服",
     "AGENT_BOTS": "機器人",
+    "AUDIT_LOGS": "Audit Logs",
     "INBOXES": "收件匣",
     "NOTIFICATIONS": "通知",
     "CANNED_RESPONSES": "預設回覆",
diff --git a/app/javascript/widget/i18n/locale/is.json b/app/javascript/widget/i18n/locale/is.json
index 1e7f6e5af..94c6ef72e 100644
--- a/app/javascript/widget/i18n/locale/is.json
+++ b/app/javascript/widget/i18n/locale/is.json
@@ -90,8 +90,8 @@
   },
   "INTEGRATIONS": {
     "DYTE": {
-      "CLICK_HERE_TO_JOIN": "Click here to join",
-      "LEAVE_THE_ROOM": "Leave the call"
+      "CLICK_HERE_TO_JOIN": "Smelltu hér til að taka þátt",
+      "LEAVE_THE_ROOM": "Yfirgefa símtalið"
     }
   }
 }
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 2833369d3..5d7d5ccfa 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -112,7 +112,7 @@ uk:
         pending: "Бесіда була позначена як очікується %{user_name}"
         snoozed: "Розмова була відкладена %{user_name}"
         auto_resolved: "Діалог був закритий системою через %{duration} днів неактивності"
-        system_auto_open: System reopened the conversation due to a new incoming message.
+        system_auto_open: Система повторно відкрила розмову через нове вхідне повідомлення.
       assignee:
         self_assigned: "%{user_name} самостійно призначив цей діалог"
         assigned: "Призначено до %{assignee_name} користувачем %{user_name}"
diff --git a/spec/services/auto_assignment/inbox_round_robin_service_spec.rb b/spec/services/auto_assignment/inbox_round_robin_service_spec.rb
index 1c78a2785..abf6e42cc 100644
--- a/spec/services/auto_assignment/inbox_round_robin_service_spec.rb
+++ b/spec/services/auto_assignment/inbox_round_robin_service_spec.rb
@@ -24,16 +24,16 @@ describe AutoAssignment::InboxRoundRobinService do
       expect(inbox_round_robin_service.send(:queue)).to eq([])
       inbox_round_robin_service.available_agent
       # the service constructed the redis queue before performing
-      expect(inbox_round_robin_service.send(:queue).sort.map(&:to_i)).to eq(inbox_members.map(&:user_id).sort)
+      expect(inbox_round_robin_service.send(:queue).map(&:to_i)).to match_array(inbox_members.map(&:user_id))
     end
 
     it 'validates the queue and correct it before performing round robin' do
       # adding some invalid ids to queue
       inbox_round_robin_service.add_agent_to_queue([2, 3, 5, 9])
-      expect(inbox_round_robin_service.send(:queue).sort.map(&:to_i)).not_to eq(inbox_members.map(&:user_id).sort)
+      expect(inbox_round_robin_service.send(:queue).map(&:to_i)).not_to match_array(inbox_members.map(&:user_id))
       inbox_round_robin_service.available_agent
       # the service have refreshed the redis queue before performing
-      expect(inbox_round_robin_service.send(:queue).sort.map(&:to_i)).to eq(inbox_members.map(&:user_id).sort)
+      expect(inbox_round_robin_service.send(:queue).map(&:to_i)).to match_array(inbox_members.map(&:user_id))
     end
 
     context 'when allowed_agent_ids is passed' do

From 474e65f4c8fc07494496fcd3e04dbcde2e1db1e6 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Sun, 23 Apr 2023 18:28:14 -0700
Subject: [PATCH 017/101] feat: Save in_reply_to from WhatsApp messages (#6964)

---
 app/models/message.rb                          |  2 +-
 .../whatsapp/incoming_message_base_service.rb  | 11 ++++-------
 .../incoming_message_service_helpers.rb        | 18 ++++++++++++++++++
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/app/models/message.rb b/app/models/message.rb
index 156b70240..1b1bd1479 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -72,7 +72,7 @@ class Message < ApplicationRecord
   # [:external_error : Can specify if the message creation failed due to an error at external API
   store :content_attributes, accessors: [:submitted_email, :items, :submitted_values, :email, :in_reply_to, :deleted,
                                          :external_created_at, :story_sender, :story_id, :external_error,
-                                         :translations], coder: JSON
+                                         :translations, :in_reply_to_external_id], coder: JSON
 
   store :external_source_ids, accessors: [:slack], coder: JSON, prefix: :external_source_id
 
diff --git a/app/services/whatsapp/incoming_message_base_service.rb b/app/services/whatsapp/incoming_message_base_service.rb
index af90abdde..15357f75b 100644
--- a/app/services/whatsapp/incoming_message_base_service.rb
+++ b/app/services/whatsapp/incoming_message_base_service.rb
@@ -18,12 +18,6 @@ class Whatsapp::IncomingMessageBaseService
 
   private
 
-  def find_message_by_source_id(source_id)
-    return unless source_id
-
-    @message = Message.find_by(source_id: source_id)
-  end
-
   def process_messages
     # message allready exists so we don't need to process
     return if find_message_by_source_id(@processed_params[:messages].first[:id])
@@ -58,6 +52,7 @@ class Whatsapp::IncomingMessageBaseService
     message = @processed_params[:messages].first
     log_error(message) && return if error_webhook_event?(message)
 
+    process_in_reply_to(message)
     if message_type == 'contacts'
       create_contact_messages(message)
     else
@@ -143,7 +138,9 @@ class Whatsapp::IncomingMessageBaseService
       inbox_id: @inbox.id,
       message_type: :incoming,
       sender: @contact,
-      source_id: message[:id].to_s
+      source_id: message[:id].to_s,
+      in_reply_to_external_id: @in_reply_to_external_id,
+      in_reply_to: @in_reply_to
     )
   end
 
diff --git a/app/services/whatsapp/incoming_message_service_helpers.rb b/app/services/whatsapp/incoming_message_service_helpers.rb
index 099f9e88f..a5226fbab 100644
--- a/app/services/whatsapp/incoming_message_service_helpers.rb
+++ b/app/services/whatsapp/incoming_message_service_helpers.rb
@@ -86,4 +86,22 @@ module Whatsapp::IncomingMessageServiceHelpers
   def log_error(message)
     Rails.logger.warn "Whatsapp Error: #{message['errors'][0]['title']} - contact: #{message['from']}"
   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?
+  end
+
+  def find_message_by_source_id(source_id)
+    return unless source_id
+
+    @message = Message.find_by(source_id: source_id)
+  end
 end

From 815322b27a8fafe6f5fd512335e4334003447e11 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Mon, 24 Apr 2023 10:17:12 +0530
Subject: [PATCH 018/101] feat: Refetch the active conversation messages on
 action cable reconnect (#6790)

---
 .../dashboard/helper/actionCable.js           | 30 +++++++++
 .../store/modules/conversations/actions.js    | 64 +++++++++++++++++++
 .../store/modules/conversations/index.js      | 13 ++++
 .../specs/conversations/actions.spec.js       | 62 ++++++++++++++++++
 .../dashboard/store/mutation-types.js         |  3 +
 app/javascript/shared/constants/busEvents.js  |  2 +-
 .../helpers/BaseActionCableConnector.js       | 41 +++++++++---
 7 files changed, 204 insertions(+), 11 deletions(-)

diff --git a/app/javascript/dashboard/helper/actionCable.js b/app/javascript/dashboard/helper/actionCable.js
index b5ea85f0a..9f6a7c6fe 100644
--- a/app/javascript/dashboard/helper/actionCable.js
+++ b/app/javascript/dashboard/helper/actionCable.js
@@ -30,6 +30,36 @@ class ActionCableConnector extends BaseActionCableConnector {
     };
   }
 
+  onReconnect = () => {
+    this.syncActiveConversationMessages();
+  };
+
+  onDisconnected = () => {
+    this.setActiveConversationLastMessageId();
+  };
+
+  setActiveConversationLastMessageId = () => {
+    const {
+      params: { conversation_id },
+    } = this.app.$route;
+    if (conversation_id) {
+      this.app.$store.dispatch('setConversationLastMessageId', {
+        conversationId: Number(conversation_id),
+      });
+    }
+  };
+
+  syncActiveConversationMessages = () => {
+    const {
+      params: { conversation_id },
+    } = this.app.$route;
+    if (conversation_id) {
+      this.app.$store.dispatch('syncActiveConversationMessages', {
+        conversationId: Number(conversation_id),
+      });
+    }
+  };
+
   isAValidEvent = data => {
     return this.app.$store.getters.getCurrentAccountId === data.account_id;
   };
diff --git a/app/javascript/dashboard/store/modules/conversations/actions.js b/app/javascript/dashboard/store/modules/conversations/actions.js
index cdea92dfc..c2715a093 100644
--- a/app/javascript/dashboard/store/modules/conversations/actions.js
+++ b/app/javascript/dashboard/store/modules/conversations/actions.js
@@ -86,6 +86,70 @@ const actions = {
     }
   },
 
+  syncActiveConversationMessages: async (
+    { commit, state, dispatch },
+    { conversationId }
+  ) => {
+    const { allConversations, syncConversationsMessages } = state;
+    const lastMessageId = syncConversationsMessages[conversationId];
+    const selectedChat = allConversations.find(
+      conversation => conversation.id === conversationId
+    );
+    if (!selectedChat) return;
+    try {
+      const { messages } = selectedChat;
+      // Fetch all the messages after the last message id
+      const {
+        data: { meta, payload },
+      } = await MessageApi.getPreviousMessages({
+        conversationId,
+        after: lastMessageId,
+      });
+      commit(`conversationMetadata/${types.SET_CONVERSATION_METADATA}`, {
+        id: conversationId,
+        data: meta,
+      });
+      // Find the messages that are not already present in the store
+      const missingMessages = payload.filter(
+        message => !messages.find(item => item.id === message.id)
+      );
+      selectedChat.messages.push(...missingMessages);
+      // Sort the messages by created_at
+      const sortedMessages = selectedChat.messages.sort((a, b) => {
+        return new Date(a.created_at) - new Date(b.created_at);
+      });
+      commit(types.SET_MISSING_MESSAGES, {
+        id: conversationId,
+        data: sortedMessages,
+      });
+      commit(types.SET_LAST_MESSAGE_ID_IN_SYNC_CONVERSATION, {
+        conversationId,
+        messageId: null,
+      });
+      dispatch('markMessagesRead', { id: conversationId }, { root: true });
+    } catch (error) {
+      // Handle error
+    }
+  },
+
+  setConversationLastMessageId: async (
+    { commit, state },
+    { conversationId }
+  ) => {
+    const { allConversations } = state;
+    const selectedChat = allConversations.find(
+      conversation => conversation.id === conversationId
+    );
+    if (!selectedChat) return;
+    const { messages } = selectedChat;
+    const lastMessage = messages.last();
+    if (!lastMessage) return;
+    commit(types.SET_LAST_MESSAGE_ID_IN_SYNC_CONVERSATION, {
+      conversationId,
+      messageId: lastMessage.id,
+    });
+  },
+
   async setActiveChat({ commit, dispatch }, { data, after }) {
     commit(types.SET_CURRENT_CHAT_WINDOW, data);
     commit(types.CLEAR_ALL_MESSAGES_LOADED);
diff --git a/app/javascript/dashboard/store/modules/conversations/index.js b/app/javascript/dashboard/store/modules/conversations/index.js
index 7a11b1c77..6ba2fb2b9 100644
--- a/app/javascript/dashboard/store/modules/conversations/index.js
+++ b/app/javascript/dashboard/store/modules/conversations/index.js
@@ -15,6 +15,7 @@ const state = {
   appliedFilters: [],
   conversationParticipants: [],
   conversationLastSeen: null,
+  syncConversationsMessages: {},
 };
 
 // mutations
@@ -54,6 +55,11 @@ export const mutations = {
       chat.messages.unshift(...data);
     }
   },
+  [types.SET_MISSING_MESSAGES](_state, { id, data }) {
+    const [chat] = _state.allConversations.filter(c => c.id === id);
+    if (!chat) return;
+    Vue.set(chat, 'messages', data);
+  },
 
   [types.SET_CURRENT_CHAT_WINDOW](_state, activeChat) {
     if (activeChat) {
@@ -202,6 +208,13 @@ export const mutations = {
   [types.CLEAR_CONVERSATION_FILTERS](_state) {
     _state.appliedFilters = [];
   },
+
+  [types.SET_LAST_MESSAGE_ID_IN_SYNC_CONVERSATION](
+    _state,
+    { conversationId, messageId }
+  ) {
+    _state.syncConversationsMessages[conversationId] = messageId;
+  },
 };
 
 export default {
diff --git a/app/javascript/dashboard/store/modules/specs/conversations/actions.spec.js b/app/javascript/dashboard/store/modules/specs/conversations/actions.spec.js
index 5a7d8f9a8..d25b70589 100644
--- a/app/javascript/dashboard/store/modules/specs/conversations/actions.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/conversations/actions.spec.js
@@ -465,4 +465,66 @@ describe('#addMentions', () => {
       ['updateConversation', { id: 1, meta: { sender: { id: 1 } } }],
     ]);
   });
+
+  it('#syncActiveConversationMessages', async () => {
+    const conversations = [
+      {
+        id: 1,
+        messages: [
+          {
+            id: 1,
+            content: 'Hello',
+          },
+        ],
+        meta: { sender: { id: 1, name: 'john-doe' } },
+        inbox_id: 1,
+      },
+    ];
+    axios.get.mockResolvedValue({
+      data: {
+        payload: [{ id: 2, content: 'Welcome' }],
+        meta: {
+          agent_last_seen_at: '2023-04-20T05:22:42.990Z',
+        },
+      },
+    });
+    await actions.syncActiveConversationMessages(
+      {
+        commit,
+        dispatch,
+        state: {
+          allConversations: conversations,
+          syncConversationsMessages: {
+            1: 1,
+          },
+        },
+      },
+      { conversationId: 1 }
+    );
+    expect(commit.mock.calls).toEqual([
+      [
+        'conversationMetadata/SET_CONVERSATION_METADATA',
+        {
+          id: 1,
+          data: {
+            agent_last_seen_at: '2023-04-20T05:22:42.990Z',
+          },
+        },
+      ],
+      [
+        'SET_MISSING_MESSAGES',
+        {
+          id: 1,
+          data: [
+            { id: 1, content: 'Hello' },
+            { id: 2, content: 'Welcome' },
+          ],
+        },
+      ],
+      [
+        'SET_LAST_MESSAGE_ID_FOR_SYNC_CONVERSATION',
+        { conversationId: 1, messageId: null },
+      ],
+    ]);
+  });
 });
diff --git a/app/javascript/dashboard/store/mutation-types.js b/app/javascript/dashboard/store/mutation-types.js
index 59b3e45b9..c7f4087c5 100644
--- a/app/javascript/dashboard/store/mutation-types.js
+++ b/app/javascript/dashboard/store/mutation-types.js
@@ -22,6 +22,8 @@ export default {
   SET_CONVERSATION_FILTERS: 'SET_CONVERSATION_FILTERS',
   CLEAR_CONVERSATION_FILTERS: 'CLEAR_CONVERSATION_FILTERS',
   SET_CONVERSATION_LAST_SEEN: 'SET_CONVERSATION_LAST_SEEN',
+  SET_LAST_MESSAGE_ID_IN_SYNC_CONVERSATION:
+    'SET_LAST_MESSAGE_ID_FOR_SYNC_CONVERSATION',
 
   SET_CURRENT_CHAT_WINDOW: 'SET_CURRENT_CHAT_WINDOW',
   CLEAR_CURRENT_CHAT_WINDOW: 'CLEAR_CURRENT_CHAT_WINDOW',
@@ -42,6 +44,7 @@ export default {
   SET_ACTIVE_INBOX: 'SET_ACTIVE_INBOX',
   UPDATE_CONVERSATION_CUSTOM_ATTRIBUTES:
     'UPDATE_CONVERSATION_CUSTOM_ATTRIBUTES',
+  SET_MISSING_MESSAGES: 'SET_MISSING_MESSAGES',
 
   SET_CONVERSATION_CAN_REPLY: 'SET_CONVERSATION_CAN_REPLY',
 
diff --git a/app/javascript/shared/constants/busEvents.js b/app/javascript/shared/constants/busEvents.js
index 0c446afea..a7eb947e3 100644
--- a/app/javascript/shared/constants/busEvents.js
+++ b/app/javascript/shared/constants/busEvents.js
@@ -5,6 +5,6 @@ export const BUS_EVENTS = {
   FOCUS_CUSTOM_ATTRIBUTE: 'FOCUS_CUSTOM_ATTRIBUTE',
   SCROLL_TO_MESSAGE: 'SCROLL_TO_MESSAGE',
   TOGGLE_SIDEMENU: 'TOGGLE_SIDEMENU',
-  WEBSOCKET_DISCONNECT: 'WEBSOCKET_DISCONNECT',
   ON_MESSAGE_LIST_SCROLL: 'ON_MESSAGE_LIST_SCROLL',
+  WEBSOCKET_DISCONNECT: 'WEBSOCKET_DISCONNECT',
 };
diff --git a/app/javascript/shared/helpers/BaseActionCableConnector.js b/app/javascript/shared/helpers/BaseActionCableConnector.js
index 57dce0351..44ef0d1bd 100644
--- a/app/javascript/shared/helpers/BaseActionCableConnector.js
+++ b/app/javascript/shared/helpers/BaseActionCableConnector.js
@@ -4,8 +4,11 @@ import { BUS_EVENTS } from 'shared/constants/busEvents';
 const PRESENCE_INTERVAL = 20000;
 
 class BaseActionCableConnector {
+  static isDisconnected = false;
+
   constructor(app, pubsubToken, websocketHost = '') {
     const websocketURL = websocketHost ? `${websocketHost}/cable` : undefined;
+
     this.consumer = createConsumer(websocketURL);
     this.subscription = this.consumer.subscriptions.create(
       {
@@ -19,27 +22,45 @@ class BaseActionCableConnector {
           this.perform('update_presence');
         },
         received: this.onReceived,
-        disconnected: this.onDisconnected,
+        disconnected: () => {
+          BaseActionCableConnector.isDisconnected = true;
+          this.onDisconnected();
+          // TODO: Remove this after completing the conversation list refetching
+          window.bus.$emit(BUS_EVENTS.WEBSOCKET_DISCONNECT);
+        },
       }
     );
     this.app = app;
     this.events = {};
     this.isAValidEvent = () => true;
-
-    setInterval(() => {
-      this.subscription.updatePresence();
-    }, PRESENCE_INTERVAL);
+    this.triggerPresenceInterval = () => {
+      setTimeout(() => {
+        this.subscription.updatePresence();
+        this.checkConnection();
+        this.triggerPresenceInterval();
+      }, PRESENCE_INTERVAL);
+    };
+    this.triggerPresenceInterval();
   }
 
+  checkConnection() {
+    const isConnectionActive = this.consumer.connection.isOpen();
+    const isReconnected =
+      BaseActionCableConnector.isDisconnected && isConnectionActive;
+    if (isReconnected) {
+      this.onReconnect();
+      BaseActionCableConnector.isDisconnected = false;
+    }
+  }
+
+  onReconnect = () => {};
+
+  onDisconnected = () => {};
+
   disconnect() {
     this.consumer.disconnect();
   }
 
-  // eslint-disable-next-line class-methods-use-this
-  onDisconnected() {
-    window.bus.$emit(BUS_EVENTS.WEBSOCKET_DISCONNECT);
-  }
-
   onReceived = ({ event, data } = {}) => {
     if (this.isAValidEvent(data)) {
       if (this.events[event] && typeof this.events[event] === 'function') {

From f825a229976c6e855c7a64b769d188dcfef85485 Mon Sep 17 00:00:00 2001
From: Vishnu Narayanan <vishnu@chatwoot.com>
Date: Mon, 24 Apr 2023 11:32:17 +0530
Subject: [PATCH 019/101] feat: add Makefile (#6948)

* feat: add  Makefile
* chore: refactor
---
 Makefile | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 Makefile

diff --git a/Makefile b/Makefile
new file mode 100644
index 000000000..499d0ab6b
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,38 @@
+# Variables
+APP_NAME := chatwoot
+RAILS_ENV ?= development
+
+# Targets
+setup:
+	gem install bundler
+	bundle install
+	yarn install
+
+db_create:
+	RAILS_ENV=$(RAILS_ENV) bundle exec rails db:create
+
+db_migrate:
+	RAILS_ENV=$(RAILS_ENV) bundle exec rails db:migrate
+
+db_seed:
+	RAILS_ENV=$(RAILS_ENV) bundle exec rails db:seed
+
+db:
+	RAILS_ENV=$(RAILS_ENV) bundle exec rails db:chatwoot_prepare
+
+console:
+	RAILS_ENV=$(RAILS_ENV) bundle exec rails console
+
+server:
+	RAILS_ENV=$(RAILS_ENV) bundle exec rails server -b 0.0.0.0 -p 3000
+
+burn:
+	bundle && yarn
+
+run:
+	overmind start -f Procfile.dev
+
+docker: 
+	docker build -t $(APP_NAME) -f ./docker/Dockerfile .
+
+.PHONY: setup db_create db_migrate db_seed db console server burn docker run

From e3193dcabc9dbeb690b882de6cac00a717e2eedc Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Mon, 24 Apr 2023 12:49:52 +0530
Subject: [PATCH 020/101] feat: Link help center portal to an Inbox (#6903)

---
 .../api/v1/accounts/inboxes_controller.rb     |  5 ++-
 .../dashboard/i18n/locale/en/inboxMgmt.json   |  7 ++++
 .../dashboard/settings/inbox/Settings.vue     | 32 ++++++++++++++++++-
 app/models/inbox.rb                           |  7 ++++
 app/models/portal.rb                          |  1 +
 app/views/api/v1/models/_inbox.json.jbuilder  |  7 ++++
 .../20230413085302_add_portal_id_to_inbox.rb  |  5 +++
 db/schema.rb                                  |  3 ++
 .../v1/accounts/inboxes_controller_spec.rb    |  4 ++-
 spec/models/inbox_spec.rb                     |  8 +++++
 spec/models/portal_spec.rb                    |  1 +
 11 files changed, 77 insertions(+), 3 deletions(-)
 create mode 100644 db/migrate/20230413085302_add_portal_id_to_inbox.rb

diff --git a/app/controllers/api/v1/accounts/inboxes_controller.rb b/app/controllers/api/v1/accounts/inboxes_controller.rb
index 20402b5d1..9b5cafc4c 100644
--- a/app/controllers/api/v1/accounts/inboxes_controller.rb
+++ b/app/controllers/api/v1/accounts/inboxes_controller.rb
@@ -114,10 +114,13 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
   def inbox_attributes
     [:name, :avatar, :greeting_enabled, :greeting_message, :enable_email_collect, :csat_survey_enabled,
      :enable_auto_assignment, :working_hours_enabled, :out_of_office_message, :timezone, :allow_messages_after_resolved,
-     :lock_to_single_conversation]
+     :lock_to_single_conversation, :portal_id]
   end
 
   def permitted_params(channel_attributes = [])
+    # We will remove this line after fixing https://linear.app/chatwoot/issue/CW-1567/null-value-passed-as-null-string-to-backend
+    params.each { |k, v| params[k] = params[k] == 'null' ? nil : v }
+
     params.permit(
       *inbox_attributes,
       channel: [:type, *channel_attributes]
diff --git a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
index 14f60eac8..97a4ee2f6 100644
--- a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
@@ -482,6 +482,13 @@
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
+    "HELP_CENTER": {
+      "LABEL": "Help Center",
+      "PLACEHOLDER": "Select Help Center",
+      "SELECT_PLACEHOLDER": "Select Help Center",
+      "REMOVE": "Remove Help Center",
+      "SUB_TEXT": "Attach a Help Center with the inbox"
+    },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
       "MAX_ASSIGNMENT_LIMIT_RANGE_ERROR": "Please enter a value greater than 0",
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
index ebee9474d..5e1e55cff 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
@@ -258,7 +258,22 @@
             }}
           </p>
         </label>
-
+        <div class="medium-9 settings-item settings-item">
+          <label>
+            {{ $t('INBOX_MGMT.HELP_CENTER.LABEL') }}
+          </label>
+          <select v-model="selectedPortalSlug" class="filter__question">
+            <option value="">
+              {{ $t('INBOX_MGMT.HELP_CENTER.PLACEHOLDER') }}
+            </option>
+            <option v-for="p in portals" :key="p.slug" :value="p.slug">
+              {{ p.name }}
+            </option>
+          </select>
+          <p class="help-text">
+            {{ $t('INBOX_MGMT.HELP_CENTER.SUB_TEXT') }}
+          </p>
+        </div>
         <label
           v-if="canLocktoSingleConversation"
           class="medium-9 columns settings-item"
@@ -425,6 +440,7 @@ export default {
       selectedFeatureFlags: [],
       replyTime: '',
       selectedTabIndex: 0,
+      selectedPortalSlug: '',
     };
   },
   computed: {
@@ -432,6 +448,7 @@ export default {
       accountId: 'getCurrentAccountId',
       isFeatureEnabledonAccount: 'accounts/isFeatureEnabledonAccount',
       uiFlags: 'inboxes/getUIFlags',
+      portals: 'portals/allPortals',
     }),
     selectedTabKey() {
       return this.tabs[this.selectedTabIndex]?.key;
@@ -519,6 +536,7 @@ export default {
     inbox() {
       return this.$store.getters['inboxes/getInbox'](this.currentInboxId);
     },
+
     inboxName() {
       if (this.isATwilioSMSChannel || this.isATwilioWhatsAppChannel) {
         return `${this.inbox.name} (${this.inbox.messaging_service_sid ||
@@ -566,8 +584,12 @@ export default {
   },
   mounted() {
     this.fetchInboxSettings();
+    this.fetchPortals();
   },
   methods: {
+    fetchPortals() {
+      this.$store.dispatch('portals/index');
+    },
     handleFeatureFlag(e) {
       this.selectedFeatureFlags = this.toggleInput(
         this.selectedFeatureFlags,
@@ -607,6 +629,9 @@ export default {
         this.selectedFeatureFlags = this.inbox.selected_feature_flags || [];
         this.replyTime = this.inbox.reply_time;
         this.locktoSingleConversation = this.inbox.lock_to_single_conversation;
+        this.selectedPortalSlug = this.inbox.help_center
+          ? this.inbox.help_center.slug
+          : '';
       });
     },
     async updateInbox() {
@@ -619,6 +644,11 @@ export default {
           allow_messages_after_resolved: this.allowMessagesAfterResolved,
           greeting_enabled: this.greetingEnabled,
           greeting_message: this.greetingMessage || '',
+          portal_id: this.selectedPortalSlug
+            ? this.portals.find(
+                portal => portal.slug === this.selectedPortalSlug
+              ).id
+            : null,
           lock_to_single_conversation: this.locktoSingleConversation,
           channel: {
             widget_color: this.inbox.widget_color,
diff --git a/app/models/inbox.rb b/app/models/inbox.rb
index b74a79894..592ac0923 100644
--- a/app/models/inbox.rb
+++ b/app/models/inbox.rb
@@ -23,11 +23,17 @@
 #  updated_at                    :datetime         not null
 #  account_id                    :integer          not null
 #  channel_id                    :integer          not null
+#  portal_id                     :bigint
 #
 # Indexes
 #
 #  index_inboxes_on_account_id                   (account_id)
 #  index_inboxes_on_channel_id_and_channel_type  (channel_id,channel_type)
+#  index_inboxes_on_portal_id                    (portal_id)
+#
+# Foreign Keys
+#
+#  fk_rails_...  (portal_id => portals.id)
 #
 
 class Inbox < ApplicationRecord
@@ -45,6 +51,7 @@ class Inbox < ApplicationRecord
   validate :ensure_valid_max_assignment_limit
 
   belongs_to :account
+  belongs_to :portal, optional: true
 
   belongs_to :channel, polymorphic: true, dependent: :destroy
 
diff --git a/app/models/portal.rb b/app/models/portal.rb
index 9d36c8217..269f64110 100644
--- a/app/models/portal.rb
+++ b/app/models/portal.rb
@@ -37,6 +37,7 @@ class Portal < ApplicationRecord
            dependent: :nullify,
            source: :user
   has_one_attached :logo
+  has_many :inboxes, dependent: :nullify
 
   before_validation -> { normalize_empty_string_to_nil(%i[custom_domain homepage_link]) }
   validates :account_id, presence: true
diff --git a/app/views/api/v1/models/_inbox.json.jbuilder b/app/views/api/v1/models/_inbox.json.jbuilder
index c87dadec7..a82e63bc9 100644
--- a/app/views/api/v1/models/_inbox.json.jbuilder
+++ b/app/views/api/v1/models/_inbox.json.jbuilder
@@ -17,6 +17,13 @@ json.callback_webhook_url resource.callback_webhook_url
 json.allow_messages_after_resolved resource.allow_messages_after_resolved
 json.lock_to_single_conversation resource.lock_to_single_conversation
 
+if resource.portal.present?
+  json.help_center do
+    json.name resource.portal.name
+    json.slug resource.portal.slug
+  end
+end
+
 ## Channel specific settings
 ## TODO : Clean up and move the attributes into channel sub section
 
diff --git a/db/migrate/20230413085302_add_portal_id_to_inbox.rb b/db/migrate/20230413085302_add_portal_id_to_inbox.rb
new file mode 100644
index 000000000..05f71078e
--- /dev/null
+++ b/db/migrate/20230413085302_add_portal_id_to_inbox.rb
@@ -0,0 +1,5 @@
+class AddPortalIdToInbox < ActiveRecord::Migration[6.1]
+  def change
+    add_reference :inboxes, :portal, foreign_key: true
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index f89f9662b..b9e93c344 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -579,8 +579,10 @@ ActiveRecord::Schema.define(version: 2023_04_18_100944) do
     t.boolean "allow_messages_after_resolved", default: true
     t.jsonb "auto_assignment_config", default: {}
     t.boolean "lock_to_single_conversation", default: false, null: false
+    t.bigint "portal_id"
     t.index ["account_id"], name: "index_inboxes_on_account_id"
     t.index ["channel_id", "channel_type"], name: "index_inboxes_on_channel_id_and_channel_type"
+    t.index ["portal_id"], name: "index_inboxes_on_portal_id"
   end
 
   create_table "installation_configs", force: :cascade do |t|
@@ -918,6 +920,7 @@ ActiveRecord::Schema.define(version: 2023_04_18_100944) do
 
   add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id"
   add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id"
+  add_foreign_key "inboxes", "portals"
   create_trigger("accounts_after_insert_row_tr", :generated => true, :compatibility => 1).
       on("accounts").
       after(:insert).
diff --git a/spec/controllers/api/v1/accounts/inboxes_controller_spec.rb b/spec/controllers/api/v1/accounts/inboxes_controller_spec.rb
index 90fbf68c6..f19094b0c 100644
--- a/spec/controllers/api/v1/accounts/inboxes_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/inboxes_controller_spec.rb
@@ -429,7 +429,8 @@ RSpec.describe 'Inboxes API', type: :request do
 
     context 'when it is an authenticated user' do
       let(:admin) { create(:user, account: account, role: :administrator) }
-      let(:valid_params) { { name: 'new test inbox', enable_auto_assignment: false } }
+      let!(:portal) { create(:portal, account_id: account.id) }
+      let(:valid_params) { { name: 'new test inbox', enable_auto_assignment: false, portal_id: portal.id } }
 
       it 'will not update inbox for agent' do
         agent = create(:user, account: account, role: :agent)
@@ -450,6 +451,7 @@ RSpec.describe 'Inboxes API', type: :request do
 
         expect(response).to have_http_status(:success)
         expect(inbox.reload.enable_auto_assignment).to be_falsey
+        expect(inbox.reload.portal_id).to eq(portal.id)
         expect(JSON.parse(response.body)['name']).to eq 'new test inbox'
       end
 
diff --git a/spec/models/inbox_spec.rb b/spec/models/inbox_spec.rb
index bc1abd501..02122709c 100644
--- a/spec/models/inbox_spec.rb
+++ b/spec/models/inbox_spec.rb
@@ -197,11 +197,19 @@ RSpec.describe Inbox do
 
   describe '#update' do
     let!(:inbox) { FactoryBot.create(:inbox) }
+    let!(:portal) { FactoryBot.create(:portal) }
 
     before do
       allow(Rails.configuration.dispatcher).to receive(:dispatch)
     end
 
+    it 'set portal id in inbox' do
+      inbox.portal_id = portal.id
+      inbox.save
+
+      expect(inbox.portal).to eq(portal)
+    end
+
     it 'resets cache key if there is an update in the channel' do
       channel = inbox.channel
       channel.update(widget_color: '#fff')
diff --git a/spec/models/portal_spec.rb b/spec/models/portal_spec.rb
index 925ec3938..070c2ca6c 100644
--- a/spec/models/portal_spec.rb
+++ b/spec/models/portal_spec.rb
@@ -14,6 +14,7 @@ RSpec.describe Portal, type: :model do
     it { is_expected.to have_many(:articles) }
     it { is_expected.to have_many(:portal_members) }
     it { is_expected.to have_many(:members) }
+    it { is_expected.to have_many(:inboxes) }
   end
 
   describe 'validations' do

From f1fc658a0d96dc610f56eebee0764947409b310b Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Mon, 24 Apr 2023 17:14:30 +0530
Subject: [PATCH 021/101] feat: Add an action in Macro to change the priority
 (#6940)

---
 app/javascript/dashboard/helper/specs/macrosHelper.spec.js   | 1 +
 app/javascript/dashboard/mixins/macrosMixin.js               | 3 +++
 app/javascript/dashboard/mixins/specs/macros.spec.js         | 4 ++++
 .../dashboard/routes/dashboard/settings/macros/constants.js  | 5 +++++
 app/models/macro.rb                                          | 2 +-
 5 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/javascript/dashboard/helper/specs/macrosHelper.spec.js b/app/javascript/dashboard/helper/specs/macrosHelper.spec.js
index fa15e44b8..26e435826 100644
--- a/app/javascript/dashboard/helper/specs/macrosHelper.spec.js
+++ b/app/javascript/dashboard/helper/specs/macrosHelper.spec.js
@@ -36,6 +36,7 @@ describe('#resolveActionName', () => {
     expect(resolveActionName(MACRO_ACTION_TYPES[1].key)).not.toEqual(
       MACRO_ACTION_TYPES[0].label
     );
+    expect(resolveActionName('change_priority')).toEqual('Change Priority');
   });
 });
 
diff --git a/app/javascript/dashboard/mixins/macrosMixin.js b/app/javascript/dashboard/mixins/macrosMixin.js
index b7124ff68..3d02c4b01 100644
--- a/app/javascript/dashboard/mixins/macrosMixin.js
+++ b/app/javascript/dashboard/mixins/macrosMixin.js
@@ -1,3 +1,4 @@
+import { PRIORITY_CONDITION_VALUES } from 'dashboard/helper/automationHelper.js';
 export default {
   methods: {
     getDropdownValues(type) {
@@ -15,6 +16,8 @@ export default {
               name: i.title,
             };
           });
+        case 'change_priority':
+          return PRIORITY_CONDITION_VALUES;
         default:
           return [];
       }
diff --git a/app/javascript/dashboard/mixins/specs/macros.spec.js b/app/javascript/dashboard/mixins/specs/macros.spec.js
index b94fe9f89..c9dfd0475 100644
--- a/app/javascript/dashboard/mixins/specs/macros.spec.js
+++ b/app/javascript/dashboard/mixins/specs/macros.spec.js
@@ -2,6 +2,7 @@ import { createWrapper } from '@vue/test-utils';
 import macrosMixin from '../macrosMixin';
 import Vue from 'vue';
 import { teams, labels, agents } from '../../helper/specs/macrosFixtures';
+import { PRIORITY_CONDITION_VALUES } from 'dashboard/helper/automationHelper.js';
 describe('webhookMixin', () => {
   describe('#getEventLabel', () => {
     it('returns correct i18n translation:', () => {
@@ -37,6 +38,9 @@ describe('webhookMixin', () => {
       expect(wrapper.vm.getDropdownValues('send_email_to_team')).toEqual(teams);
       expect(wrapper.vm.getDropdownValues('add_label')).toEqual(resolvedLabels);
       expect(wrapper.vm.getDropdownValues('assign_agent')).toEqual(agents);
+      expect(wrapper.vm.getDropdownValues('change_priority')).toEqual(
+        PRIORITY_CONDITION_VALUES
+      );
       expect(wrapper.vm.getDropdownValues()).toEqual([]);
     });
   });
diff --git a/app/javascript/dashboard/routes/dashboard/settings/macros/constants.js b/app/javascript/dashboard/routes/dashboard/settings/macros/constants.js
index 9e92d3bfe..111a3632d 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/macros/constants.js
+++ b/app/javascript/dashboard/routes/dashboard/settings/macros/constants.js
@@ -59,4 +59,9 @@ export const MACRO_ACTION_TYPES = [
     label: 'Add a private note',
     inputType: 'textarea',
   },
+  {
+    key: 'change_priority',
+    label: 'Change Priority',
+    inputType: 'search_select',
+  },
 ];
diff --git a/app/models/macro.rb b/app/models/macro.rb
index 00beccd01..0951f7ae9 100644
--- a/app/models/macro.rb
+++ b/app/models/macro.rb
@@ -31,7 +31,7 @@ class Macro < ApplicationRecord
   validate :json_actions_format
 
   ACTIONS_ATTRS = %w[send_message add_label assign_team assign_agent mute_conversation change_status remove_label remove_assigned_team
-                     resolve_conversation snooze_conversation send_email_transcript send_attachment add_private_note].freeze
+                     resolve_conversation snooze_conversation change_priority send_email_transcript send_attachment add_private_note].freeze
 
   def set_visibility(user, params)
     self.visibility = params[:visibility]

From 0874aeee2d2c69ee08f73ff713b474329f01b7bd Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Mon, 24 Apr 2023 19:00:08 +0530
Subject: [PATCH 022/101] feat: priority UI (#6966)

---
 .../widgets/conversation/ConversationCard.vue |  24 ++--
 .../widgets/conversation/PriorityMark.vue     | 113 ++++++++++++++++++
 .../i18n/locale/en/conversation.json          |  17 +++
 .../conversation/ConversationAction.vue       |  90 +++++++++++++-
 .../store/modules/conversations/actions.js    |  21 ++++
 .../store/modules/conversations/index.js      |   5 +
 .../dashboard/store/mutation-types.js         |   1 +
 .../partials/_conversation.json.jbuilder      |   1 +
 .../assets/images/dashboard/priority/high.svg |   6 +
 .../assets/images/dashboard/priority/low.svg  |   4 +
 .../images/dashboard/priority/medium.svg      |   5 +
 .../assets/images/dashboard/priority/none.svg |   4 +
 .../images/dashboard/priority/urgent.svg      |   9 ++
 13 files changed, 292 insertions(+), 8 deletions(-)
 create mode 100644 app/javascript/dashboard/components/widgets/conversation/PriorityMark.vue
 create mode 100644 public/assets/images/dashboard/priority/high.svg
 create mode 100644 public/assets/images/dashboard/priority/low.svg
 create mode 100644 public/assets/images/dashboard/priority/medium.svg
 create mode 100644 public/assets/images/dashboard/priority/none.svg
 create mode 100644 public/assets/images/dashboard/priority/urgent.svg

diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
index 67cd10a5a..397928e75 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
@@ -33,13 +33,16 @@
     <div class="conversation--details columns">
       <div class="conversation--metadata">
         <inbox-name v-if="showInboxName" :inbox="inbox" />
-        <span
-          v-if="showAssignee && assignee.name"
-          class="label assignee-label text-truncate"
-        >
-          <fluent-icon icon="person" size="12" />
-          {{ assignee.name }}
-        </span>
+        <div class="conversation-metadata-attributes">
+          <span
+            v-if="showAssignee && assignee.name"
+            class="label assignee-label text-truncate"
+          >
+            <fluent-icon icon="person" size="12" />
+            {{ assignee.name }}
+          </span>
+          <priority-mark :priority="chat.priority" />
+        </div>
       </div>
       <h4 class="conversation--user">
         {{ currentContact.name }}
@@ -131,6 +134,7 @@ import ConversationContextMenu from './contextMenu/Index.vue';
 import alertMixin from 'shared/mixins/alertMixin';
 import TimeAgo from 'dashboard/components/ui/TimeAgo';
 import CardLabels from './conversationCardComponents/CardLabels.vue';
+import PriorityMark from './PriorityMark.vue';
 const ATTACHMENT_ICONS = {
   image: 'image',
   audio: 'headphones-sound-wave',
@@ -147,6 +151,7 @@ export default {
     Thumbnail,
     ConversationContextMenu,
     TimeAgo,
+    PriorityMark,
   },
 
   mixins: [
@@ -429,6 +434,11 @@ export default {
     padding: var(--space-micro) 0 var(--space-micro) 0;
   }
 
+  .conversation-metadata-attributes {
+    display: flex;
+    gap: var(--space-small);
+  }
+
   .assignee-label {
     display: inline-flex;
     margin-left: var(--space-small);
diff --git a/app/javascript/dashboard/components/widgets/conversation/PriorityMark.vue b/app/javascript/dashboard/components/widgets/conversation/PriorityMark.vue
new file mode 100644
index 000000000..7d0105b9d
--- /dev/null
+++ b/app/javascript/dashboard/components/widgets/conversation/PriorityMark.vue
@@ -0,0 +1,113 @@
+<template>
+  <span class="conversation-priority-mark">
+    <svg
+      v-if="priority"
+      v-tooltip="tooltipText"
+      width="14"
+      height="14"
+      viewBox="0 0 14 14"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <template v-if="priority === CONVERSATION_PRIORITY.URGENT">
+        <rect width="14" height="14" rx="2" fill="#FF382D" />
+        <path
+          d="M2.33325 2.91667C2.33325 2.27233 2.85559 1.75 3.49992 1.75C4.14425 1.75 4.66659 2.27233 4.66659 2.91667V8.16667C4.66659 8.811 4.14425 9.33333 3.49992 9.33333C2.85559 9.33333 2.33325 8.811 2.33325 8.16667V2.91667Z"
+          fill="white"
+        />
+        <path
+          d="M2.33325 11.0833C2.33325 10.439 2.85559 9.91667 3.49992 9.91667C4.14425 9.91667 4.66659 10.439 4.66659 11.0833C4.66659 11.7277 4.14425 12.25 3.49992 12.25C2.85559 12.25 2.33325 11.7277 2.33325 11.0833Z"
+          fill="white"
+        />
+        <path
+          d="M5.83325 2.91667C5.83325 2.27233 6.35559 1.75 6.99992 1.75C7.64425 1.75 8.16659 2.27233 8.16659 2.91667V8.16667C8.16659 8.811 7.64425 9.33333 6.99992 9.33333C6.35559 9.33333 5.83325 8.811 5.83325 8.16667V2.91667Z"
+          fill="white"
+        />
+        <path
+          d="M5.83325 11.0833C5.83325 10.439 6.35559 9.91667 6.99992 9.91667C7.64425 9.91667 8.16659 10.439 8.16659 11.0833C8.16659 11.7277 7.64425 12.25 6.99992 12.25C6.35559 12.25 5.83325 11.7277 5.83325 11.0833Z"
+          fill="white"
+        />
+        <path
+          d="M9.33325 2.91667C9.33325 2.27233 9.85559 1.75 10.4999 1.75C11.1443 1.75 11.6666 2.27233 11.6666 2.91667V8.16667C11.6666 8.811 11.1443 9.33333 10.4999 9.33333C9.85559 9.33333 9.33325 8.811 9.33325 8.16667V2.91667Z"
+          fill="white"
+        />
+        <path
+          d="M9.33325 11.0833C9.33325 10.439 9.85559 9.91667 10.4999 9.91667C11.1443 9.91667 11.6666 10.439 11.6666 11.0833C11.6666 11.7277 11.1443 12.25 10.4999 12.25C9.85559 12.25 9.33325 11.7277 9.33325 11.0833Z"
+          fill="white"
+        />
+      </template>
+      <template v-else-if="priority === CONVERSATION_PRIORITY.HIGH">
+        <rect width="14" height="14" rx="2" fill="#F1F5F8" />
+        <path
+          d="M4.87216 3.50012L4.76278 8.29274H3.69555L3.58949 3.50012H4.87216ZM4.22917 10.3609C4.02809 10.3609 3.85574 10.2902 3.71212 10.1488C3.57071 10.0074 3.5 9.83503 3.5 9.63175C3.5 9.43289 3.57071 9.26275 3.71212 9.12133C3.85574 8.97992 4.02809 8.90921 4.22917 8.90921C4.42582 8.90921 4.59596 8.97992 4.73958 9.12133C4.88542 9.26275 4.95833 9.43289 4.95833 9.63175C4.95833 9.76654 4.92408 9.88917 4.85559 9.99965C4.7893 10.1101 4.70092 10.1985 4.59044 10.2648C4.48217 10.3289 4.36174 10.3609 4.22917 10.3609Z"
+          fill="#446888"
+        />
+        <path
+          d="M7.47237 3.50012L7.36299 8.29274H6.29576L6.1897 3.50012H7.47237ZM6.82937 10.3609C6.6283 10.3609 6.45595 10.2902 6.31233 10.1488C6.17092 10.0074 6.10021 9.83503 6.10021 9.63175C6.10021 9.43289 6.17092 9.26275 6.31233 9.12133C6.45595 8.97992 6.6283 8.90921 6.82937 8.90921C7.02603 8.90921 7.19617 8.97992 7.33979 9.12133C7.48562 9.26275 7.55854 9.43289 7.55854 9.63175C7.55854 9.76654 7.52429 9.88917 7.4558 9.99965C7.38951 10.1101 7.30112 10.1985 7.19064 10.2648C7.08237 10.3289 6.96195 10.3609 6.82937 10.3609Z"
+          fill="#446888"
+        />
+        <path
+          d="M10.0726 3.50012L9.9632 8.29274H8.89597L8.78991 3.50012H10.0726ZM9.42958 10.3609C9.22851 10.3609 9.05616 10.2902 8.91254 10.1488C8.77112 10.0074 8.70042 9.83503 8.70042 9.63175C8.70042 9.43289 8.77112 9.26275 8.91254 9.12133C9.05616 8.97992 9.22851 8.90921 9.42958 8.90921C9.62624 8.90921 9.79638 8.97992 9.94 9.12133C10.0858 9.26275 10.1587 9.43289 10.1587 9.63175C10.1587 9.76654 10.1245 9.88917 10.056 9.99965C9.98972 10.1101 9.90133 10.1985 9.79085 10.2648C9.68258 10.3289 9.56216 10.3609 9.42958 10.3609Z"
+          fill="#446888"
+        />
+      </template>
+      <template v-else-if="priority === CONVERSATION_PRIORITY.MEDIUM">
+        <rect width="14" height="14" rx="2" fill="#F1F5F8" />
+        <path
+          d="M6.03866 3.50012L5.92929 8.29274H4.86205L4.75599 3.50012H6.03866ZM5.39567 10.3609C5.1946 10.3609 5.02225 10.2902 4.87863 10.1488C4.73721 10.0074 4.6665 9.83503 4.6665 9.63175C4.6665 9.43289 4.73721 9.26275 4.87863 9.12133C5.02225 8.97992 5.1946 8.90921 5.39567 8.90921C5.59232 8.90921 5.76246 8.97992 5.90609 9.12133C6.05192 9.26275 6.12484 9.43289 6.12484 9.63175C6.12484 9.76654 6.09059 9.88917 6.02209 9.99965C5.9558 10.1101 5.86742 10.1985 5.75694 10.2648C5.64867 10.3289 5.52825 10.3609 5.39567 10.3609Z"
+          fill="#446888"
+        />
+        <path
+          d="M8.63887 3.50012L8.5295 8.29274H7.46226L7.3562 3.50012H8.63887ZM7.99588 10.3609C7.79481 10.3609 7.62246 10.2902 7.47883 10.1488C7.33742 10.0074 7.26671 9.83503 7.26671 9.63175C7.26671 9.43289 7.33742 9.26275 7.47883 9.12133C7.62246 8.97992 7.79481 8.90921 7.99588 8.90921C8.19253 8.90921 8.36267 8.97992 8.5063 9.12133C8.65213 9.26275 8.72505 9.43289 8.72505 9.63175C8.72505 9.76654 8.6908 9.88917 8.6223 9.99965C8.55601 10.1101 8.46763 10.1985 8.35715 10.2648C8.24888 10.3289 8.12845 10.3609 7.99588 10.3609Z"
+          fill="#446888"
+        />
+      </template>
+      <template v-else-if="priority === CONVERSATION_PRIORITY.LOW">
+        <rect width="14" height="14" rx="2" fill="#F1F5F8" />
+        <path
+          d="M6.03866 3.50012L5.92929 8.29274H4.86205L4.75599 3.50012H6.03866ZM5.39567 10.3609C5.1946 10.3609 5.02225 10.2902 4.87863 10.1488C4.73721 10.0074 4.6665 9.83503 4.6665 9.63175C4.6665 9.43289 4.73721 9.26275 4.87863 9.12133C5.02225 8.97992 5.1946 8.90921 5.39567 8.90921C5.59232 8.90921 5.76246 8.97992 5.90609 9.12133C6.05192 9.26275 6.12484 9.43289 6.12484 9.63175C6.12484 9.76654 6.09059 9.88917 6.02209 9.99965C5.9558 10.1101 5.86742 10.1985 5.75694 10.2648C5.64867 10.3289 5.52825 10.3609 5.39567 10.3609Z"
+          fill="#446888"
+        />
+        <path
+          d="M8.63887 3.50012L8.5295 8.29274H7.46226L7.3562 3.50012H8.63887ZM7.99588 10.3609C7.79481 10.3609 7.62246 10.2902 7.47883 10.1488C7.33742 10.0074 7.26671 9.83503 7.26671 9.63175C7.26671 9.43289 7.33742 9.26275 7.47883 9.12133C7.62246 8.97992 7.79481 8.90921 7.99588 8.90921C8.19253 8.90921 8.36267 8.97992 8.5063 9.12133C8.65213 9.26275 8.72505 9.43289 8.72505 9.63175C8.72505 9.76654 8.6908 9.88917 8.6223 9.99965C8.55601 10.1101 8.46763 10.1985 8.35715 10.2648C8.24888 10.3289 8.12845 10.3609 7.99588 10.3609Z"
+          fill="#446888"
+        />
+      </template>
+    </svg>
+  </span>
+</template>
+
+<script>
+import { CONVERSATION_PRIORITY } from '../../../../shared/constants/messages';
+
+export default {
+  name: 'PriorityMark',
+  props: {
+    priority: {
+      type: String,
+      default: undefined,
+      validate: value =>
+        [...Object.values(CONVERSATION_PRIORITY), undefined].includes(value),
+    },
+  },
+  data() {
+    return {
+      CONVERSATION_PRIORITY,
+    };
+  },
+  computed: {
+    tooltipText() {
+      return this.$t(
+        `CONVERSATION.PRIORITY.OPTIONS.${this.priority.toUpperCase()}`
+      );
+    },
+  },
+};
+</script>
+
+<style scoped>
+.conversation-priority-mark {
+  display: inline-flex;
+  align-items: center;
+}
+</style>
diff --git a/app/javascript/dashboard/i18n/locale/en/conversation.json b/app/javascript/dashboard/i18n/locale/en/conversation.json
index 597799c15..78b7e660c 100644
--- a/app/javascript/dashboard/i18n/locale/en/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/en/conversation.json
@@ -66,6 +66,23 @@
         "NEXT_WEEK": "Next week"
       }
     },
+    "PRIORITY": {
+      "TITLE": "Priority",
+      "OPTIONS": {
+        "NONE": "None",
+        "URGENT": "Urgent",
+        "HIGH": "High",
+        "MEDIUM": "Medium",
+        "LOW": "Low"
+      },
+      "CHANGE_PRIORITY": {
+        "SELECT_PLACEHOLDER": "None",
+        "INPUT_PLACEHOLDER": "Select priority",
+        "NO_RESULTS": "No results found",
+        "SUCCESSFUL": "Changed priority of conversation id %{conversationId} to %{priority}",
+        "FAILED": "Couldn't change priority. Please try again."
+      }
+    },
     "CARD_CONTEXT_MENU": {
       "PENDING": "Mark as pending",
       "RESOLVED": "Mark as resolved",
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/ConversationAction.vue b/app/javascript/dashboard/routes/dashboard/conversation/ConversationAction.vue
index d71a397c5..c55ebed6a 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/ConversationAction.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/ConversationAction.vue
@@ -45,11 +45,32 @@
           $t('AGENT_MGMT.MULTI_SELECTOR.SEARCH.NO_RESULTS.TEAM')
         "
         :input-placeholder="
-          $t('AGENT_MGMT.MULTI_SELECTOR.SEARCH.PLACEHOLDER.TEAM')
+          $t('AGENT_MGMT.MULTI_SELECTOR.SEARCH.PLACEHOLDER.INPUT_PLACEHOLDER')
         "
         @click="onClickAssignTeam"
       />
     </div>
+    <div class="multiselect-wrap--small">
+      <contact-details-item
+        compact
+        :title="$t('CONVERSATION.PRIORITY.TITLE')"
+      />
+      <multiselect-dropdown
+        :options="priorityOptions"
+        :selected-item="assignedPriority"
+        :multiselector-title="$t('CONVERSATION.PRIORITY.TITLE')"
+        :multiselector-placeholder="
+          $t('CONVERSATION.PRIORITY.CHANGE_PRIORITY.SELECT_PLACEHOLDER')
+        "
+        :no-search-result="
+          $t('CONVERSATION.PRIORITY.CHANGE_PRIORITY.NO_RESULTS')
+        "
+        :input-placeholder="
+          $t('CONVERSATION.PRIORITY.CHANGE_PRIORITY.INPUT_PLACEHOLDER')
+        "
+        @click="onClickAssignPriority"
+      />
+    </div>
     <contact-details-item
       compact
       :title="$t('CONVERSATION_SIDEBAR.ACCORDION.CONVERSATION_LABELS')"
@@ -66,6 +87,7 @@ import MultiselectDropdown from 'shared/components/ui/MultiselectDropdown.vue';
 import ConversationLabels from './labels/LabelBox.vue';
 import agentMixin from 'dashboard/mixins/agentMixin';
 import teamMixin from 'dashboard/mixins/conversation/teamMixin';
+import { CONVERSATION_PRIORITY } from '../../../../shared/constants/messages';
 
 export default {
   components: {
@@ -84,6 +106,37 @@ export default {
       default: undefined,
     },
   },
+  data() {
+    return {
+      priorityOptions: [
+        {
+          id: null,
+          name: this.$t('CONVERSATION.PRIORITY.OPTIONS.NONE'),
+          thumbnail: `/assets/images/dashboard/priority/none.svg`,
+        },
+        {
+          id: CONVERSATION_PRIORITY.URGENT,
+          name: this.$t('CONVERSATION.PRIORITY.OPTIONS.URGENT'),
+          thumbnail: `/assets/images/dashboard/priority/${CONVERSATION_PRIORITY.URGENT}.svg`,
+        },
+        {
+          id: CONVERSATION_PRIORITY.HIGH,
+          name: this.$t('CONVERSATION.PRIORITY.OPTIONS.HIGH'),
+          thumbnail: `/assets/images/dashboard/priority/${CONVERSATION_PRIORITY.HIGH}.svg`,
+        },
+        {
+          id: CONVERSATION_PRIORITY.MEDIUM,
+          name: this.$t('CONVERSATION.PRIORITY.OPTIONS.MEDIUM'),
+          thumbnail: `/assets/images/dashboard/priority/${CONVERSATION_PRIORITY.MEDIUM}.svg`,
+        },
+        {
+          id: CONVERSATION_PRIORITY.LOW,
+          name: this.$t('CONVERSATION.PRIORITY.OPTIONS.LOW'),
+          thumbnail: `/assets/images/dashboard/priority/${CONVERSATION_PRIORITY.LOW}.svg`,
+        },
+      ],
+    };
+  },
   computed: {
     ...mapGetters({
       currentChat: 'getSelectedChat',
@@ -121,6 +174,33 @@ export default {
           });
       },
     },
+    assignedPriority: {
+      get() {
+        const selectedOption = this.priorityOptions.find(
+          opt => opt.id === this.currentChat.priority
+        );
+
+        return selectedOption || this.priorityOptions[0];
+      },
+      set(priorityItem) {
+        const conversationId = this.currentChat.id;
+        const priority = priorityItem ? priorityItem.id : null;
+        this.$store.dispatch('setCurrentChatPriority', {
+          priority,
+          conversationId,
+        });
+        this.$store
+          .dispatch('assignPriority', { conversationId, priority })
+          .then(() => {
+            this.showAlert(
+              this.$t('CONVERSATION.PRIORITY.CHANGE_PRIORITY.SUCCESSFUL', {
+                priority: priorityItem.name,
+                conversationId,
+              })
+            );
+          });
+      },
+    },
     showSelfAssign() {
       if (!this.assignedAgent) {
         return true;
@@ -170,6 +250,14 @@ export default {
         this.assignedTeam = selectedItemTeam;
       }
     },
+
+    onClickAssignPriority(selectedPriorityItem) {
+      const isSamePriority =
+        this.assignedPriority &&
+        this.assignedPriority.id === selectedPriorityItem.id;
+
+      this.assignedPriority = isSamePriority ? null : selectedPriorityItem;
+    },
   },
 };
 </script>
diff --git a/app/javascript/dashboard/store/modules/conversations/actions.js b/app/javascript/dashboard/store/modules/conversations/actions.js
index c2715a093..c801e6162 100644
--- a/app/javascript/dashboard/store/modules/conversations/actions.js
+++ b/app/javascript/dashboard/store/modules/conversations/actions.js
@@ -403,6 +403,27 @@ const actions = {
   clearConversationFilters({ commit }) {
     commit(types.CLEAR_CONVERSATION_FILTERS);
   },
+
+  assignPriority: async ({ dispatch }, { conversationId, priority }) => {
+    try {
+      await ConversationApi.togglePriority({
+        conversationId,
+        priority,
+      });
+
+      dispatch('setCurrentChatPriority', {
+        priority,
+        conversationId,
+      });
+    } catch (error) {
+      // Handle error
+    }
+  },
+
+  setCurrentChatPriority({ commit }, { priority, conversationId }) {
+    commit(types.ASSIGN_PRIORITY, { priority, conversationId });
+  },
+
   ...messageReadActions,
   ...messageTranslateActions,
 };
diff --git a/app/javascript/dashboard/store/modules/conversations/index.js b/app/javascript/dashboard/store/modules/conversations/index.js
index 6ba2fb2b9..8e68071ef 100644
--- a/app/javascript/dashboard/store/modules/conversations/index.js
+++ b/app/javascript/dashboard/store/modules/conversations/index.js
@@ -77,6 +77,11 @@ export const mutations = {
     Vue.set(chat.meta, 'team', team);
   },
 
+  [types.ASSIGN_PRIORITY](_state, { priority, conversationId }) {
+    const [chat] = _state.allConversations.filter(c => c.id === conversationId);
+    Vue.set(chat, 'priority', priority);
+  },
+
   [types.UPDATE_CONVERSATION_CUSTOM_ATTRIBUTES](_state, custom_attributes) {
     const [chat] = getSelectedChatConversation(_state);
     Vue.set(chat, 'custom_attributes', custom_attributes);
diff --git a/app/javascript/dashboard/store/mutation-types.js b/app/javascript/dashboard/store/mutation-types.js
index c7f4087c5..bb9d8221f 100644
--- a/app/javascript/dashboard/store/mutation-types.js
+++ b/app/javascript/dashboard/store/mutation-types.js
@@ -35,6 +35,7 @@ export default {
   UNMUTE_CONVERSATION: 'UNMUTE_CONVERSATION',
   ASSIGN_AGENT: 'ASSIGN_AGENT',
   ASSIGN_TEAM: 'ASSIGN_TEAM',
+  ASSIGN_PRIORITY: 'ASSIGN_PRIORITY',
   SET_CHAT_META: 'SET_CHAT_META',
   ADD_MESSAGE: 'ADD_MESSAGE',
   DELETE_MESSAGE: 'DELETE_MESSAGE',
diff --git a/app/views/api/v1/conversations/partials/_conversation.json.jbuilder b/app/views/api/v1/conversations/partials/_conversation.json.jbuilder
index 1f3bca044..15cae0b07 100644
--- a/app/views/api/v1/conversations/partials/_conversation.json.jbuilder
+++ b/app/views/api/v1/conversations/partials/_conversation.json.jbuilder
@@ -42,3 +42,4 @@ json.timestamp conversation.last_activity_at.to_i
 json.first_reply_created_at conversation.first_reply_created_at.to_i
 json.unread_count conversation.unread_incoming_messages.count
 json.last_non_activity_message conversation.messages.non_activity_messages.first.try(:push_event_data)
+json.priority conversation.priority
diff --git a/public/assets/images/dashboard/priority/high.svg b/public/assets/images/dashboard/priority/high.svg
new file mode 100644
index 000000000..9196db1b7
--- /dev/null
+++ b/public/assets/images/dashboard/priority/high.svg
@@ -0,0 +1,6 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="24" height="24" fill="#F1F5F8"/>
+<path d="M9.7642 8L9.62358 14.1619H8.25142L8.11506 8H9.7642ZM8.9375 16.821C8.67898 16.821 8.45739 16.7301 8.27273 16.5483C8.09091 16.3665 8 16.1449 8 15.8835C8 15.6278 8.09091 15.4091 8.27273 15.2273C8.45739 15.0455 8.67898 14.9545 8.9375 14.9545C9.19034 14.9545 9.40909 15.0455 9.59375 15.2273C9.78125 15.4091 9.875 15.6278 9.875 15.8835C9.875 16.0568 9.83097 16.2145 9.7429 16.3565C9.65767 16.4986 9.54403 16.6122 9.40199 16.6974C9.26278 16.7798 9.10795 16.821 8.9375 16.821Z" fill="#446888"/>
+<path d="M13.1073 8L12.9667 14.1619H11.5945L11.4582 8H13.1073ZM12.2806 16.821C12.0221 16.821 11.8005 16.7301 11.6159 16.5483C11.434 16.3665 11.3431 16.1449 11.3431 15.8835C11.3431 15.6278 11.434 15.4091 11.6159 15.2273C11.8005 15.0455 12.0221 14.9545 12.2806 14.9545C12.5335 14.9545 12.7522 15.0455 12.9369 15.2273C13.1244 15.4091 13.2181 15.6278 13.2181 15.8835C13.2181 16.0568 13.1741 16.2145 13.086 16.3565C13.0008 16.4986 12.8872 16.6122 12.7451 16.6974C12.6059 16.7798 12.4511 16.821 12.2806 16.821Z" fill="#446888"/>
+<path d="M16.4505 8L16.3098 14.1619H14.9377L14.8013 8H16.4505ZM15.6237 16.821C15.3652 16.821 15.1436 16.7301 14.959 16.5483C14.7772 16.3665 14.6862 16.1449 14.6862 15.8835C14.6862 15.6278 14.7772 15.4091 14.959 15.2273C15.1436 15.0455 15.3652 14.9545 15.6237 14.9545C15.8766 14.9545 16.0953 15.0455 16.28 15.2273C16.4675 15.4091 16.5612 15.6278 16.5612 15.8835C16.5612 16.0568 16.5172 16.2145 16.4291 16.3565C16.3439 16.4986 16.2303 16.6122 16.0882 16.6974C15.949 16.7798 15.7942 16.821 15.6237 16.821Z" fill="#446888"/>
+</svg>
diff --git a/public/assets/images/dashboard/priority/low.svg b/public/assets/images/dashboard/priority/low.svg
new file mode 100644
index 000000000..5b6d70a69
--- /dev/null
+++ b/public/assets/images/dashboard/priority/low.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="24" height="24" fill="#F1F5F8"/>
+<path d="M12.7642 8L12.6236 14.1619H11.2514L11.1151 8H12.7642ZM11.9375 16.821C11.679 16.821 11.4574 16.7301 11.2727 16.5483C11.0909 16.3665 11 16.1449 11 15.8835C11 15.6278 11.0909 15.4091 11.2727 15.2273C11.4574 15.0455 11.679 14.9545 11.9375 14.9545C12.1903 14.9545 12.4091 15.0455 12.5938 15.2273C12.7812 15.4091 12.875 15.6278 12.875 15.8835C12.875 16.0568 12.831 16.2145 12.7429 16.3565C12.6577 16.4986 12.544 16.6122 12.402 16.6974C12.2628 16.7798 12.108 16.821 11.9375 16.821Z" fill="#446888"/>
+</svg>
diff --git a/public/assets/images/dashboard/priority/medium.svg b/public/assets/images/dashboard/priority/medium.svg
new file mode 100644
index 000000000..ffb17d44c
--- /dev/null
+++ b/public/assets/images/dashboard/priority/medium.svg
@@ -0,0 +1,5 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="24" height="24" fill="#F1F5F8"/>
+<path d="M10.7642 8L10.6236 14.1619H9.25142L9.11506 8H10.7642ZM9.9375 16.821C9.67898 16.821 9.45739 16.7301 9.27273 16.5483C9.09091 16.3665 9 16.1449 9 15.8835C9 15.6278 9.09091 15.4091 9.27273 15.2273C9.45739 15.0455 9.67898 14.9545 9.9375 14.9545C10.1903 14.9545 10.4091 15.0455 10.5938 15.2273C10.7812 15.4091 10.875 15.6278 10.875 15.8835C10.875 16.0568 10.831 16.2145 10.7429 16.3565C10.6577 16.4986 10.544 16.6122 10.402 16.6974C10.2628 16.7798 10.108 16.821 9.9375 16.821Z" fill="#446888"/>
+<path d="M14.1073 8L13.9667 14.1619H12.5945L12.4582 8H14.1073ZM13.2806 16.821C13.0221 16.821 12.8005 16.7301 12.6159 16.5483C12.434 16.3665 12.3431 16.1449 12.3431 15.8835C12.3431 15.6278 12.434 15.4091 12.6159 15.2273C12.8005 15.0455 13.0221 14.9545 13.2806 14.9545C13.5335 14.9545 13.7522 15.0455 13.9369 15.2273C14.1244 15.4091 14.2181 15.6278 14.2181 15.8835C14.2181 16.0568 14.1741 16.2145 14.086 16.3565C14.0008 16.4986 13.8872 16.6122 13.7451 16.6974C13.6059 16.7798 13.4511 16.821 13.2806 16.821Z" fill="#446888"/>
+</svg>
diff --git a/public/assets/images/dashboard/priority/none.svg b/public/assets/images/dashboard/priority/none.svg
new file mode 100644
index 000000000..e215fda39
--- /dev/null
+++ b/public/assets/images/dashboard/priority/none.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="24" height="24" fill="#F1F5F8"/>
+<path d="M13.5686 8L11.1579 16.9562H10L12.4107 8H13.5686Z" fill="#446888"/>
+</svg>
diff --git a/public/assets/images/dashboard/priority/urgent.svg b/public/assets/images/dashboard/priority/urgent.svg
new file mode 100644
index 000000000..fc4f16b50
--- /dev/null
+++ b/public/assets/images/dashboard/priority/urgent.svg
@@ -0,0 +1,9 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="24" height="24" fill="#FFEBEE"/>
+<path d="M8 8.5C8 7.94772 8.44772 7.5 9 7.5C9.55228 7.5 10 7.94772 10 8.5V13C10 13.5523 9.55228 14 9 14C8.44772 14 8 13.5523 8 13V8.5Z" fill="#FF382D"/>
+<path d="M8 15.5C8 14.9477 8.44772 14.5 9 14.5C9.55228 14.5 10 14.9477 10 15.5C10 16.0523 9.55228 16.5 9 16.5C8.44772 16.5 8 16.0523 8 15.5Z" fill="#FF382D"/>
+<path d="M11 8.5C11 7.94772 11.4477 7.5 12 7.5C12.5523 7.5 13 7.94772 13 8.5V13C13 13.5523 12.5523 14 12 14C11.4477 14 11 13.5523 11 13V8.5Z" fill="#FF382D"/>
+<path d="M11 15.5C11 14.9477 11.4477 14.5 12 14.5C12.5523 14.5 13 14.9477 13 15.5C13 16.0523 12.5523 16.5 12 16.5C11.4477 16.5 11 16.0523 11 15.5Z" fill="#FF382D"/>
+<path d="M14 8.5C14 7.94772 14.4477 7.5 15 7.5C15.5523 7.5 16 7.94772 16 8.5V13C16 13.5523 15.5523 14 15 14C14.4477 14 14 13.5523 14 13V8.5Z" fill="#FF382D"/>
+<path d="M14 15.5C14 14.9477 14.4477 14.5 15 14.5C15.5523 14.5 16 14.9477 16 15.5C16 16.0523 15.5523 16.5 15 16.5C14.4477 16.5 14 16.0523 14 15.5Z" fill="#FF382D"/>
+</svg>

From e32f3e71e45807c98b09b34279e367fbd1149cfe Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Mon, 24 Apr 2023 20:07:50 +0530
Subject: [PATCH 023/101] feat: Right click context menu action to change the
 priority (#6947)

* Right click context menu action to change the priority

* Review comments

* Update Index.vue

* Remove selected priority  from menu

* Code cleanup

* Update conversation.json
---
 .../dashboard/components/ChatList.vue         | 17 ++++++++
 .../widgets/conversation/ConversationCard.vue |  6 +++
 .../conversation/contextMenu/Index.vue        | 42 +++++++++++++++++++
 3 files changed, 65 insertions(+)

diff --git a/app/javascript/dashboard/components/ChatList.vue b/app/javascript/dashboard/components/ChatList.vue
index dd9e353b8..990ea9e02 100644
--- a/app/javascript/dashboard/components/ChatList.vue
+++ b/app/javascript/dashboard/components/ChatList.vue
@@ -125,6 +125,7 @@
         @update-conversation-status="toggleConversationStatus"
         @context-menu-toggle="onContextMenuToggle"
         @mark-as-unread="markAsUnread"
+        @assign-priority="assignPriority"
       />
 
       <div v-if="chatListLoading" class="text-center">
@@ -670,6 +671,22 @@ export default {
         this.showAlert(this.$t('BULK_ACTION.ASSIGN_FAILED'));
       }
     },
+    async assignPriority(priority, conversationId = null) {
+      this.$store.dispatch('setCurrentChatPriority', {
+        priority,
+        conversationId,
+      });
+      this.$store
+        .dispatch('assignPriority', { conversationId, priority })
+        .then(() => {
+          this.showAlert(
+            this.$t('CONVERSATION.PRIORITY.CHANGE_PRIORITY.SUCCESSFUL', {
+              priority,
+              conversationId,
+            })
+          );
+        });
+    },
     async markAsUnread(conversationId) {
       try {
         await this.$store.dispatch('markMessagesUnread', {
diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
index 397928e75..d2d49580a 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
@@ -109,12 +109,14 @@
       <conversation-context-menu
         :status="chat.status"
         :inbox-id="inbox.id"
+        :priority="chat.priority"
         :has-unread-messages="hasUnread"
         @update-conversation="onUpdateConversation"
         @assign-agent="onAssignAgent"
         @assign-label="onAssignLabel"
         @assign-team="onAssignTeam"
         @mark-as-unread="markAsUnread"
+        @assign-priority="assignPriority"
       />
     </woot-context-menu>
   </div>
@@ -375,6 +377,10 @@ export default {
       this.$emit('mark-as-unread', this.chat.id);
       this.closeContextMenu();
     },
+    async assignPriority(priority) {
+      this.$emit('assign-priority', priority, this.chat.id);
+      this.closeContextMenu();
+    },
   },
 };
 </script>
diff --git a/app/javascript/dashboard/components/widgets/conversation/contextMenu/Index.vue b/app/javascript/dashboard/components/widgets/conversation/contextMenu/Index.vue
index acbfa5575..ca7117cfc 100644
--- a/app/javascript/dashboard/components/widgets/conversation/contextMenu/Index.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/contextMenu/Index.vue
@@ -23,6 +23,14 @@
         @click="snoozeConversation(option.snoozedUntil)"
       />
     </menu-item-with-submenu>
+    <menu-item-with-submenu :option="priorityConfig">
+      <menu-item
+        v-for="(option, i) in priorityConfig.options"
+        :key="i"
+        :option="option"
+        @click="assignPriority(option.key)"
+      />
+    </menu-item-with-submenu>
     <menu-item-with-submenu
       :option="labelMenuConfig"
       :sub-menu-available="!!labels.length"
@@ -93,6 +101,10 @@ export default {
       type: Number,
       default: null,
     },
+    priority: {
+      type: String,
+      default: null,
+    },
   },
   data() {
     return {
@@ -140,6 +152,33 @@ export default {
           },
         ],
       },
+      priorityConfig: {
+        key: 'priority',
+        label: this.$t('CONVERSATION.PRIORITY.TITLE'),
+        icon: 'warning',
+        options: [
+          {
+            label: this.$t('CONVERSATION.PRIORITY.OPTIONS.NONE'),
+            key: null,
+          },
+          {
+            label: this.$t('CONVERSATION.PRIORITY.OPTIONS.URGENT'),
+            key: 'urgent',
+          },
+          {
+            label: this.$t('CONVERSATION.PRIORITY.OPTIONS.HIGH'),
+            key: 'high',
+          },
+          {
+            label: this.$t('CONVERSATION.PRIORITY.OPTIONS.MEDIUM'),
+            key: 'medium',
+          },
+          {
+            label: this.$t('CONVERSATION.PRIORITY.OPTIONS.LOW'),
+            key: 'low',
+          },
+        ].filter(item => item.key !== this.priority),
+      },
       labelMenuConfig: {
         key: 'label',
         icon: 'tag',
@@ -193,6 +232,9 @@ export default {
         this.snoozeTimes[snoozedUntil] || null
       );
     },
+    assignPriority(priority) {
+      this.$emit('assign-priority', priority);
+    },
     show(key) {
       // If the conversation status is same as the action, then don't display the option
       // i.e.: Don't show an option to resolve if the conversation is already resolved.

From 54880b23427aecf9d0cc84487e557af6c2cef3af Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Mon, 24 Apr 2023 20:21:43 +0530
Subject: [PATCH 024/101] feat: Track conversation priority events (#6968)

---
 app/javascript/dashboard/components/ChatList.vue          | 5 +++++
 app/javascript/dashboard/helper/AnalyticsHelper/events.js | 1 +
 .../routes/dashboard/conversation/ConversationAction.vue  | 8 ++++++++
 3 files changed, 14 insertions(+)

diff --git a/app/javascript/dashboard/components/ChatList.vue b/app/javascript/dashboard/components/ChatList.vue
index 990ea9e02..c53dd926f 100644
--- a/app/javascript/dashboard/components/ChatList.vue
+++ b/app/javascript/dashboard/components/ChatList.vue
@@ -192,6 +192,7 @@ import {
   isOnMentionsView,
   isOnUnattendedView,
 } from '../store/modules/conversations/helpers/actionHelpers';
+import { CONVERSATION_EVENTS } from '../helper/AnalyticsHelper/events';
 
 export default {
   components: {
@@ -679,6 +680,10 @@ export default {
       this.$store
         .dispatch('assignPriority', { conversationId, priority })
         .then(() => {
+          this.$track(CONVERSATION_EVENTS.CHANGE_PRIORITY, {
+            newValue: priority,
+            from: 'Context menu',
+          });
           this.showAlert(
             this.$t('CONVERSATION.PRIORITY.CHANGE_PRIORITY.SUCCESSFUL', {
               priority,
diff --git a/app/javascript/dashboard/helper/AnalyticsHelper/events.js b/app/javascript/dashboard/helper/AnalyticsHelper/events.js
index f8615a30c..979120560 100644
--- a/app/javascript/dashboard/helper/AnalyticsHelper/events.js
+++ b/app/javascript/dashboard/helper/AnalyticsHelper/events.js
@@ -7,6 +7,7 @@ export const CONVERSATION_EVENTS = Object.freeze({
   USED_MENTIONS: 'Used mentions',
   SEARCH_CONVERSATION: 'Searched conversations',
   APPLY_FILTER: 'Applied filters in the conversation list',
+  CHANGE_PRIORITY: 'Assigned priority to a conversation',
 });
 
 export const ACCOUNT_EVENTS = Object.freeze({
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/ConversationAction.vue b/app/javascript/dashboard/routes/dashboard/conversation/ConversationAction.vue
index c55ebed6a..6a4135d5b 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/ConversationAction.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/ConversationAction.vue
@@ -88,6 +88,7 @@ import ConversationLabels from './labels/LabelBox.vue';
 import agentMixin from 'dashboard/mixins/agentMixin';
 import teamMixin from 'dashboard/mixins/conversation/teamMixin';
 import { CONVERSATION_PRIORITY } from '../../../../shared/constants/messages';
+import { CONVERSATION_EVENTS } from '../../../helper/AnalyticsHelper/events';
 
 export default {
   components: {
@@ -184,7 +185,9 @@ export default {
       },
       set(priorityItem) {
         const conversationId = this.currentChat.id;
+        const oldValue = this.currentChat?.priority;
         const priority = priorityItem ? priorityItem.id : null;
+
         this.$store.dispatch('setCurrentChatPriority', {
           priority,
           conversationId,
@@ -192,6 +195,11 @@ export default {
         this.$store
           .dispatch('assignPriority', { conversationId, priority })
           .then(() => {
+            this.$track(CONVERSATION_EVENTS.CHANGE_PRIORITY, {
+              oldValue,
+              newValue: priority,
+              from: 'Conversation Sidebar',
+            });
             this.showAlert(
               this.$t('CONVERSATION.PRIORITY.CHANGE_PRIORITY.SUCCESSFUL', {
                 priority: priorityItem.name,

From 1a07828b1b5f029d6ee727489d9cbd2a18f78b1f Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Mon, 24 Apr 2023 10:21:39 -0700
Subject: [PATCH 025/101] fix: Disable the entire element if priority is
 missing (#6972)

---
 .../dashboard/components/widgets/conversation/PriorityMark.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/javascript/dashboard/components/widgets/conversation/PriorityMark.vue b/app/javascript/dashboard/components/widgets/conversation/PriorityMark.vue
index 7d0105b9d..0fdc786ca 100644
--- a/app/javascript/dashboard/components/widgets/conversation/PriorityMark.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/PriorityMark.vue
@@ -1,7 +1,6 @@
 <template>
-  <span class="conversation-priority-mark">
+  <span v-if="priority" class="conversation-priority-mark">
     <svg
-      v-if="priority"
       v-tooltip="tooltipText"
       width="14"
       height="14"

From f6e0453bb2dc5d59a11850c1a69ff29311307f29 Mon Sep 17 00:00:00 2001
From: GitStart <1501599+gitstart@users.noreply.github.com>
Date: Mon, 24 Apr 2023 20:27:58 +0300
Subject: [PATCH 026/101] fix vertical overflow scroll on `BackButton` (#6914)

* fix: vertical overflow scroll on BackButton

Co-authored-by: raph941 <45232708+raph941@users.noreply.github.com>

* chore: adds suggested improvement to handle RTS view

Co-authored-by: raph941 <45232708+raph941@users.noreply.github.com>

---------

Co-authored-by: raph941 <45232708+raph941@users.noreply.github.com>
Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
---
 app/javascript/dashboard/assets/scss/_rtl.scss             | 2 +-
 app/javascript/dashboard/components/widgets/BackButton.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/dashboard/assets/scss/_rtl.scss b/app/javascript/dashboard/assets/scss/_rtl.scss
index 48790f715..0ed2fe2f4 100644
--- a/app/javascript/dashboard/assets/scss/_rtl.scss
+++ b/app/javascript/dashboard/assets/scss/_rtl.scss
@@ -85,7 +85,7 @@
     }
   }
 
-  .settings.back-button {
+  .header-section.back-button {
     direction: initial;
     margin-left: var(--space-normal);
     margin-right: var(--space-smaller);
diff --git a/app/javascript/dashboard/components/widgets/BackButton.vue b/app/javascript/dashboard/components/widgets/BackButton.vue
index 0610618b8..3c1b07a4c 100644
--- a/app/javascript/dashboard/components/widgets/BackButton.vue
+++ b/app/javascript/dashboard/components/widgets/BackButton.vue
@@ -1,5 +1,5 @@
 <template>
-  <button class="settings back-button" @click.capture="goBack">
+  <button class="header-section back-button" @click.capture="goBack">
     <fluent-icon icon="chevron-left" />
     {{ buttonLabel || $t('GENERAL_SETTINGS.BACK') }}
   </button>

From 92fa9c4fdca3bdfad6480bcd98977583536c41a2 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Mon, 24 Apr 2023 23:52:23 +0530
Subject: [PATCH 027/101] feat: Ability to improve drafts in the editor using
 GPT integration (#6957)

ref: https://github.com/chatwoot/chatwoot/issues/6436
fixes: https://linear.app/chatwoot/issue/CW-1552/ability-to-rephrase-text-in-the-editor-using-gpt-integration

---------

Co-authored-by: Sojan <sojan@pepalo.com>
Co-authored-by: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
---
 .../accounts/integrations/hooks_controller.rb |   6 +-
 .../dashboard/api/integrations/openapi.js     |  23 +++
 .../components/widgets/AIAssistanceButton.vue | 171 ++++++++++++++++++
 .../widgets/WootWriter/ReplyBottomPanel.vue   |  16 +-
 .../widgets/conversation/ReplyBox.vue         |   2 +
 .../dashboard/i18n/locale/en/agentMgmt.json   |   3 +-
 .../i18n/locale/en/integrations.json          |  17 ++
 .../conversation/ConversationAction.vue       |   2 +-
 .../dashboard/store/modules/integrations.js   |   4 +-
 .../FluentIcon/dashboard-icons.json           |   1 +
 app/models/integrations/hook.rb               |  11 ++
 app/policies/hook_policy.rb                   |   4 +
 config/integration/apps.yml                   |  24 +++
 config/locales/en.yml                         |   3 +
 config/routes.rb                              |   6 +-
 lib/integrations/openai/processor_service.rb  |  39 ++++
 .../dashboard/images/integrations/openai.png  | Bin 0 -> 6630 bytes
 .../integrations/apps_controller_spec.rb      |  51 +++++-
 .../integrations/hooks_controller_spec.rb     |  27 +++
 spec/factories/integrations/hooks.rb          |   5 +
 .../openai/processor_service_spec.rb          |  51 ++++++
 spec/models/integrations/hook_spec.rb         |  21 +++
 22 files changed, 480 insertions(+), 7 deletions(-)
 create mode 100644 app/javascript/dashboard/api/integrations/openapi.js
 create mode 100644 app/javascript/dashboard/components/widgets/AIAssistanceButton.vue
 create mode 100644 lib/integrations/openai/processor_service.rb
 create mode 100644 public/dashboard/images/integrations/openai.png
 create mode 100644 spec/lib/integrations/openai/processor_service_spec.rb

diff --git a/app/controllers/api/v1/accounts/integrations/hooks_controller.rb b/app/controllers/api/v1/accounts/integrations/hooks_controller.rb
index dd2af4ef2..d09ea2f00 100644
--- a/app/controllers/api/v1/accounts/integrations/hooks_controller.rb
+++ b/app/controllers/api/v1/accounts/integrations/hooks_controller.rb
@@ -1,5 +1,5 @@
 class Api::V1::Accounts::Integrations::HooksController < Api::V1::Accounts::BaseController
-  before_action :fetch_hook, only: [:update, :destroy]
+  before_action :fetch_hook, except: [:create]
   before_action :check_authorization
 
   def create
@@ -10,6 +10,10 @@ class Api::V1::Accounts::Integrations::HooksController < Api::V1::Accounts::Base
     @hook.update!(permitted_params.slice(:status, :settings))
   end
 
+  def process_event
+    render json: { message: @hook.process_event(params[:event]) }
+  end
+
   def destroy
     @hook.destroy!
     head :ok
diff --git a/app/javascript/dashboard/api/integrations/openapi.js b/app/javascript/dashboard/api/integrations/openapi.js
new file mode 100644
index 000000000..88507bf81
--- /dev/null
+++ b/app/javascript/dashboard/api/integrations/openapi.js
@@ -0,0 +1,23 @@
+/* global axios */
+
+import ApiClient from '../ApiClient';
+
+class OpenAIAPI extends ApiClient {
+  constructor() {
+    super('integrations', { accountScoped: true });
+  }
+
+  processEvent({ name = 'rephrase', content, tone, hookId }) {
+    return axios.post(`${this.url}/hooks/${hookId}/process_event`, {
+      event: {
+        name: name,
+        data: {
+          tone,
+          content,
+        },
+      },
+    });
+  }
+}
+
+export default new OpenAIAPI();
diff --git a/app/javascript/dashboard/components/widgets/AIAssistanceButton.vue b/app/javascript/dashboard/components/widgets/AIAssistanceButton.vue
new file mode 100644
index 000000000..7c58f2aeb
--- /dev/null
+++ b/app/javascript/dashboard/components/widgets/AIAssistanceButton.vue
@@ -0,0 +1,171 @@
+<template>
+  <div v-if="isAIIntegrationEnabled" class="position-relative">
+    <woot-button
+      v-tooltip.top-end="$t('INTEGRATION_SETTINGS.OPEN_AI.TITLE')"
+      icon="wand"
+      color-scheme="secondary"
+      variant="smooth"
+      size="small"
+      @click="toggleDropdown"
+    />
+    <div
+      v-if="showDropdown"
+      v-on-clickaway="closeDropdown"
+      class="dropdown-pane dropdown-pane--open ai-modal"
+    >
+      <h4 class="sub-block-title margin-top-1">
+        {{ $t('INTEGRATION_SETTINGS.OPEN_AI.TITLE') }}
+      </h4>
+      <p>
+        {{ $t('INTEGRATION_SETTINGS.OPEN_AI.SUBTITLE') }}
+      </p>
+      <label>
+        {{ $t('INTEGRATION_SETTINGS.OPEN_AI.TONE.TITLE') }}
+      </label>
+      <div class="tone__item">
+        <select v-model="activeTone" class="status--filter small">
+          <option v-for="tone in tones" :key="tone.key" :value="tone.key">
+            {{ tone.value }}
+          </option>
+        </select>
+      </div>
+      <div class="modal-footer flex-container align-right">
+        <woot-button variant="clear" size="small" @click="closeDropdown">
+          {{ $t('INTEGRATION_SETTINGS.OPEN_AI.BUTTONS.CANCEL') }}
+        </woot-button>
+        <woot-button
+          :is-loading="isGenerating"
+          size="small"
+          @click="processText"
+        >
+          {{ buttonText }}
+        </woot-button>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import { mapGetters } from 'vuex';
+import { mixin as clickaway } from 'vue-clickaway';
+import OpenAPI from 'dashboard/api/integrations/openapi';
+import alertMixin from 'shared/mixins/alertMixin';
+
+export default {
+  mixins: [alertMixin, clickaway],
+  props: {
+    conversationId: {
+      type: Number,
+      default: 0,
+    },
+    message: {
+      type: String,
+      default: '',
+    },
+  },
+  data() {
+    return {
+      isGenerating: false,
+      showDropdown: false,
+      activeTone: 'professional',
+      tones: [
+        {
+          key: 'professional',
+          value: this.$t(
+            'INTEGRATION_SETTINGS.OPEN_AI.TONE.OPTIONS.PROFESSIONAL'
+          ),
+        },
+        {
+          key: 'friendly',
+          value: this.$t('INTEGRATION_SETTINGS.OPEN_AI.TONE.OPTIONS.FRIENDLY'),
+        },
+      ],
+    };
+  },
+  computed: {
+    ...mapGetters({ appIntegrations: 'integrations/getAppIntegrations' }),
+    isAIIntegrationEnabled() {
+      return this.appIntegrations.find(
+        integration => integration.id === 'openai' && !!integration.hooks.length
+      );
+    },
+    hookId() {
+      return this.appIntegrations.find(
+        integration => integration.id === 'openai' && !!integration.hooks.length
+      ).hooks[0].id;
+    },
+    buttonText() {
+      return this.isGenerating
+        ? this.$t('INTEGRATION_SETTINGS.OPEN_AI.BUTTONS.GENERATING')
+        : this.$t('INTEGRATION_SETTINGS.OPEN_AI.BUTTONS.GENERATE');
+    },
+  },
+  mounted() {
+    if (!this.appIntegrations.length) {
+      this.$store.dispatch('integrations/get');
+    }
+  },
+  methods: {
+    toggleDropdown() {
+      this.showDropdown = !this.showDropdown;
+    },
+    closeDropdown() {
+      this.showDropdown = false;
+    },
+    async processText() {
+      this.isGenerating = true;
+      try {
+        const result = await OpenAPI.processEvent({
+          hookId: this.hookId,
+          type: 'rephrase',
+          content: this.message,
+          tone: this.activeTone,
+        });
+        const {
+          data: { message: generatedMessage },
+        } = result;
+        this.$emit('replace-text', generatedMessage || this.message);
+        this.closeDropdown();
+      } catch (error) {
+        this.showAlert(this.$t('INTEGRATION_SETTINGS.OPEN_AI.GENERATE_ERROR'));
+      } finally {
+        this.isGenerating = false;
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.ai-modal {
+  width: 400px;
+  right: 0;
+  left: 0;
+  padding: var(--space-normal);
+  bottom: 34px;
+  position: absolute;
+  span {
+    font-size: var(--font-size-small);
+    font-weight: var(--font-weight-medium);
+  }
+
+  p {
+    color: var(--s-600);
+  }
+
+  label {
+    margin-bottom: var(--space-smaller);
+  }
+
+  .status--filter {
+    background-color: var(--color-background-light);
+    border: 1px solid var(--color-border);
+    font-size: var(--font-size-small);
+    height: var(--space-large);
+    padding: 0 var(--space-medium) 0 var(--space-small);
+  }
+
+  .modal-footer {
+    gap: var(--space-smaller);
+  }
+}
+</style>
diff --git a/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue b/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue
index 6922389b0..5f638d6dc 100644
--- a/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue
+++ b/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue
@@ -91,6 +91,12 @@
         v-if="(isAWebWidgetInbox || isAPIInbox) && !isOnPrivateNote"
         :conversation-id="conversationId"
       />
+      <AIAssistanceButton
+        v-if="message"
+        :conversation-id="conversationId"
+        :message="message"
+        @replace-text="replaceText"
+      />
       <transition name="modal-fade">
         <div
           v-show="$refs.upload && $refs.upload.dropActive"
@@ -129,12 +135,13 @@ import {
   ALLOWED_FILE_TYPES_FOR_TWILIO_WHATSAPP,
 } from 'shared/constants/messages';
 import VideoCallButton from '../VideoCallButton';
+import AIAssistanceButton from '../AIAssistanceButton.vue';
 import { REPLY_EDITOR_MODES } from './constants';
 import { mapGetters } from 'vuex';
 
 export default {
   name: 'ReplyBottomPanel',
-  components: { FileUpload, VideoCallButton },
+  components: { FileUpload, VideoCallButton, AIAssistanceButton },
   mixins: [eventListenerMixins, uiSettingsMixin, inboxMixin],
   props: {
     mode: {
@@ -217,6 +224,10 @@ export default {
       type: Number,
       required: true,
     },
+    message: {
+      type: String,
+      default: '',
+    },
   },
   computed: {
     ...mapGetters({
@@ -303,6 +314,9 @@ export default {
         send_with_signature: !this.sendWithSignature,
       });
     },
+    replaceText(text) {
+      this.$emit('replace-text', text);
+    },
   },
 };
 </script>
diff --git a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
index accf82565..9278e6b24 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
@@ -120,8 +120,10 @@
       :toggle-audio-recorder-play-pause="toggleAudioRecorderPlayPause"
       :toggle-audio-recorder="toggleAudioRecorder"
       :toggle-emoji-picker="toggleEmojiPicker"
+      :message="message"
       @selectWhatsappTemplate="openWhatsappTemplateModal"
       @toggle-editor="toggleRichContentEditor"
+      @replace-text="replaceText"
     />
     <whatsapp-templates
       :inbox-id="inbox.id"
diff --git a/app/javascript/dashboard/i18n/locale/en/agentMgmt.json b/app/javascript/dashboard/i18n/locale/en/agentMgmt.json
index 13e7e818c..d01730ed8 100644
--- a/app/javascript/dashboard/i18n/locale/en/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/en/agentMgmt.json
@@ -111,7 +111,8 @@
         },
         "PLACEHOLDER": {
           "AGENT": "Search agents",
-          "TEAM": "Search teams"
+          "TEAM": "Search teams",
+          "INPUT": "Search for agents"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/en/integrations.json b/app/javascript/dashboard/i18n/locale/en/integrations.json
index 64064e228..f37054878 100644
--- a/app/javascript/dashboard/i18n/locale/en/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/en/integrations.json
@@ -82,6 +82,23 @@
       "JOIN_ERROR": "There was an error joining the call, please try again",
       "CREATE_ERROR": "There was an error creating a meeting link, please try again"
     },
+    "OPEN_AI": {
+      "TITLE": "Improve With AI",
+      "SUBTITLE": "An improved reply will be generated using AI, based on your current draft.",
+      "TONE": {
+        "TITLE": "Tone",
+        "OPTIONS": {
+          "PROFESSIONAL": "Professional",
+          "FRIENDLY": "Friendly"
+        }
+      },
+      "BUTTONS": {
+        "GENERATE": "Generate",
+        "GENERATING": "Generating...",
+        "CANCEL": "Cancel"
+      },
+      "GENERATE_ERROR": "There was an error processing the content, please try again"
+    },
     "DELETE": {
       "BUTTON_TEXT": "Delete",
       "API": {
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/ConversationAction.vue b/app/javascript/dashboard/routes/dashboard/conversation/ConversationAction.vue
index 6a4135d5b..8ea349f2a 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/ConversationAction.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/ConversationAction.vue
@@ -45,7 +45,7 @@
           $t('AGENT_MGMT.MULTI_SELECTOR.SEARCH.NO_RESULTS.TEAM')
         "
         :input-placeholder="
-          $t('AGENT_MGMT.MULTI_SELECTOR.SEARCH.PLACEHOLDER.INPUT_PLACEHOLDER')
+          $t('AGENT_MGMT.MULTI_SELECTOR.SEARCH.PLACEHOLDER.INPUT')
         "
         @click="onClickAssignTeam"
       />
diff --git a/app/javascript/dashboard/store/modules/integrations.js b/app/javascript/dashboard/store/modules/integrations.js
index c7518547d..7ba6a93af 100644
--- a/app/javascript/dashboard/store/modules/integrations.js
+++ b/app/javascript/dashboard/store/modules/integrations.js
@@ -17,7 +17,9 @@ const state = {
 };
 
 const isAValidAppIntegration = integration => {
-  return ['dialogflow', 'dyte', 'google_translate'].includes(integration.id);
+  return ['dialogflow', 'dyte', 'google_translate', 'openai'].includes(
+    integration.id
+  );
 };
 export const getters = {
   getIntegrations($state) {
diff --git a/app/javascript/shared/components/FluentIcon/dashboard-icons.json b/app/javascript/shared/components/FluentIcon/dashboard-icons.json
index c76fbc33b..d232e586b 100644
--- a/app/javascript/shared/components/FluentIcon/dashboard-icons.json
+++ b/app/javascript/shared/components/FluentIcon/dashboard-icons.json
@@ -178,6 +178,7 @@
   "translate-outline": "M16.953 5.303a1 1 0 0 0-1.906-.606c-.124.389-.236.899-.324 1.344-.565.012-1.12 0-1.652-.038a1 1 0 1 0-.142 1.995c.46.032.934.048 1.416.047a25.649 25.649 0 0 0-.24 1.698c-1.263.716-2.142 1.684-2.636 2.7-.624 1.283-.7 2.857.239 3.883.675.736 1.704.758 2.499.588.322-.068.654-.176.988-.32a1 1 0 0 0 1.746-.93 13.17 13.17 0 0 0-.041-.115 8.404 8.404 0 0 0 2.735-4.06c.286.251.507.55.658.864.284.594.334 1.271.099 1.91-.234.633-.78 1.313-1.84 1.843a1 1 0 0 0 .895 1.789c1.44-.72 2.385-1.758 2.821-2.94a4.436 4.436 0 0 0-.17-3.464 4.752 4.752 0 0 0-2.104-2.165C19.998 9.22 20 9.11 20 9a1 1 0 0 0-1.974-.23 5.984 5.984 0 0 0-1.796.138c.047-.305.102-.626.166-.964a20.142 20.142 0 0 0 2.842-.473 1 1 0 0 0-.476-1.942c-.622.152-1.286.272-1.964.358.048-.208.1-.409.155-.584Zm-3.686 8.015c.166-.34.414-.697.758-1.037.02.348.053.67.098.973.083.56.207 1.048.341 1.477a3.41 3.41 0 0 1-.674.227c-.429.092-.588.019-.614.006l-.004-.001c-.162-.193-.329-.774.095-1.645Zm4.498-2.562a6.362 6.362 0 0 1-1.568 2.73 7.763 7.763 0 0 1-.095-.525 10.294 10.294 0 0 1-.088-1.904c.033-.013.067-.024.1-.036l1.651-.265Zm0 0-1.651.265c.602-.212 1.155-.29 1.651-.265ZM7.536 6.29a6.342 6.342 0 0 0-4.456.331 1 1 0 0 0 .848 1.811 4.342 4.342 0 0 1 3.049-.222c.364.107.568.248.69.37.12.123.203.27.257.454.067.225.087.446.09.69a8.195 8.195 0 0 0-.555-.117c-1.146-.199-2.733-.215-4.262.64-1.271.713-1.796 2.168-1.682 3.448.12 1.326.94 2.679 2.572 3.136 1.48.414 2.913-.045 3.877-.507l.08-.04a1 1 0 0 0 1.96-.281V10.5c0-.053.002-.12.005-.2.012-.417.034-1.16-.168-1.838a3.043 3.043 0 0 0-.755-1.29c-.394-.398-.91-.694-1.547-.881h-.003Zm-.419 5.288c.344.06.647.143.887.222v2.197a7.021 7.021 0 0 1-.905.524c-.792.38-1.682.605-2.473.384-.698-.195-1.06-.742-1.119-1.389-.062-.693.243-1.286.667-1.523.987-.553 2.06-.569 2.943-.415Z",
   "eye-show-outline": "M12 9.005a4 4 0 1 1 0 8 4 4 0 0 1 0-8Zm0 1.5a2.5 2.5 0 1 0 0 5 2.5 2.5 0 0 0 0-5ZM12 5.5c4.613 0 8.596 3.15 9.701 7.564a.75.75 0 1 1-1.455.365 8.503 8.503 0 0 0-16.493.004.75.75 0 0 1-1.455-.363A10.003 10.003 0 0 1 12 5.5Z",
   "eye-hide-outline": "M2.22 2.22a.75.75 0 0 0-.073.976l.073.084 4.034 4.035a9.986 9.986 0 0 0-3.955 5.75.75.75 0 0 0 1.455.364 8.49 8.49 0 0 1 3.58-5.034l1.81 1.81A4 4 0 0 0 14.8 15.86l5.919 5.92a.75.75 0 0 0 1.133-.977l-.073-.084-6.113-6.114.001-.002-1.2-1.198-2.87-2.87h.002L8.719 7.658l.001-.002-1.133-1.13L3.28 2.22a.75.75 0 0 0-1.06 0Zm7.984 9.045 3.535 3.536a2.5 2.5 0 0 1-3.535-3.535ZM12 5.5c-1 0-1.97.148-2.889.425l1.237 1.236a8.503 8.503 0 0 1 9.899 6.272.75.75 0 0 0 1.455-.363A10.003 10.003 0 0 0 12 5.5Zm.195 3.51 3.801 3.8a4.003 4.003 0 0 0-3.801-3.8Z",
+  "wand-outline": "m13.314 7.565l-.136.126l-10.48 10.488a2.27 2.27 0 0 0 3.211 3.208L16.388 10.9a2.251 2.251 0 0 0-.001-3.182l-.157-.146a2.25 2.25 0 0 0-2.916-.007Zm-.848 2.961l1.088 1.088l-8.706 8.713a.77.77 0 1 1-1.089-1.088l8.707-8.713Zm4.386 4.48L16.75 15a.75.75 0 0 0-.743.648L16 15.75v.75h-.75a.75.75 0 0 0-.743.648l-.007.102c0 .38.282.694.648.743l.102.007H16v.75c0 .38.282.694.648.743l.102.007a.75.75 0 0 0 .743-.648l.007-.102V18h.75a.75.75 0 0 0 .743-.648L19 17.25a.75.75 0 0 0-.648-.743l-.102-.007h-.75v-.75a.75.75 0 0 0-.648-.743L16.75 15l.102.007Zm-1.553-6.254l.027.027a.751.751 0 0 1 0 1.061l-.711.713l-1.089-1.089l.73-.73a.75.75 0 0 1 1.043.018ZM6.852 5.007L6.75 5a.75.75 0 0 0-.743.648L6 5.75v.75h-.75a.75.75 0 0 0-.743.648L4.5 7.25c0 .38.282.693.648.743L5.25 8H6v.75c0 .38.282.693.648.743l.102.007a.75.75 0 0 0 .743-.648L7.5 8.75V8h.75a.75.75 0 0 0 .743-.648L9 7.25a.75.75 0 0 0-.648-.743L8.25 6.5H7.5v-.75a.75.75 0 0 0-.648-.743L6.75 5l.102.007Zm12-2L18.75 3a.75.75 0 0 0-.743.648L18 3.75v.75h-.75a.75.75 0 0 0-.743.648l-.007.102c0 .38.282.693.648.743L17.25 6H18v.75c0 .38.282.693.648.743l.102.007a.75.75 0 0 0 .743-.648l.007-.102V6h.75a.75.75 0 0 0 .743-.648L21 5.25a.75.75 0 0 0-.648-.743L20.25 4.5h-.75v-.75a.75.75 0 0 0-.648-.743L18.75 3l.102.007Z",
   "grab-handle-outline": [
     "M5 4C5 3.44772 5.44772 3 6 3H10C10.5523 3 11 3.44772 11 4V7C11 7.55228 10.5523 8 10 8H6C5.44772 8 5 7.55228 5 7V4Z",
     "M13 4C13 3.44772 13.4477 3 14 3H18C18.5523 3 19 3.44772 19 4V7C19 7.55228 18.5523 8 18 8H14C13.4477 8 13 7.55228 13 7V4Z",
diff --git a/app/models/integrations/hook.rb b/app/models/integrations/hook.rb
index 55e64410c..57d052584 100644
--- a/app/models/integrations/hook.rb
+++ b/app/models/integrations/hook.rb
@@ -25,6 +25,8 @@ class Integrations::Hook < ApplicationRecord
   validate :validate_settings_json_schema
   validates :app_id, uniqueness: { scope: [:account_id], unless: -> { app.present? && app.params[:allow_multiple_hooks].present? } }
 
+  # TODO: This seems to be only used for slack at the moment
+  # We can add a validator when storing the integration settings and toggle this in future
   enum status: { disabled: 0, enabled: 1 }
 
   belongs_to :account
@@ -45,6 +47,15 @@ class Integrations::Hook < ApplicationRecord
     update(status: 'disabled')
   end
 
+  def process_event(event)
+    case app_id
+    when 'openai'
+      Integrations::Openai::ProcessorService.new(hook: self, event: event).perform if app_id == 'openai'
+    else
+      'No processor found'
+    end
+  end
+
   private
 
   def ensure_hook_type
diff --git a/app/policies/hook_policy.rb b/app/policies/hook_policy.rb
index 3f25cf8e4..c94a71fe4 100644
--- a/app/policies/hook_policy.rb
+++ b/app/policies/hook_policy.rb
@@ -7,6 +7,10 @@ class HookPolicy < ApplicationPolicy
     @account_user.administrator?
   end
 
+  def process_event?
+    true
+  end
+
   def destroy?
     @account_user.administrator?
   end
diff --git a/config/integration/apps.yml b/config/integration/apps.yml
index d4743a941..5bad57eb6 100644
--- a/config/integration/apps.yml
+++ b/config/integration/apps.yml
@@ -128,3 +128,27 @@ google_translate:
     },
   ]
   visible_properties: ['project_id']
+openai:
+  id: openai
+  logo: openai.png
+  i18n_key: openai
+  action: /openai
+  hook_type: account
+  allow_multiple_hooks: false
+  settings_json_schema: {
+    "type": "object",
+    "properties": {
+        "api_key": { "type": "string" },
+      },
+    "required": ["api_key"],
+    "additionalProperties": false,
+  }
+  settings_form_schema: [
+    {
+      "label": "API Key",
+      "type": "text",
+      "name": "api_key",
+      "validation": "required",
+    },
+  ]
+  visible_properties: ['api_key']
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 189d04102..0a9026554 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -187,6 +187,9 @@ en:
     google_translate:
       name: "Google Translate"
       description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
+    openai:
+      name: "OpenAI"
+      description: "Integrate powerful AI features into Chatwoot by leveraging the GPT models from OpenAI."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
diff --git a/config/routes.rb b/config/routes.rb
index c28dfd41c..590522844 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -177,7 +177,11 @@ Rails.application.routes.draw do
           resources :webhooks, only: [:index, :create, :update, :destroy]
           namespace :integrations do
             resources :apps, only: [:index, :show]
-            resources :hooks, only: [:create, :update, :destroy]
+            resources :hooks, only: [:create, :update, :destroy] do
+              member do
+                post :process_event
+              end
+            end
             resource :slack, only: [:create, :update, :destroy], controller: 'slack'
             resource :dyte, controller: 'dyte', only: [] do
               collection do
diff --git a/lib/integrations/openai/processor_service.rb b/lib/integrations/openai/processor_service.rb
new file mode 100644
index 000000000..95bb00d84
--- /dev/null
+++ b/lib/integrations/openai/processor_service.rb
@@ -0,0 +1,39 @@
+class Integrations::Openai::ProcessorService
+  pattr_initialize [:hook!, :event!]
+
+  def perform
+    rephrase_message if event['name'] == 'rephrase'
+  end
+
+  private
+
+  def rephrase_body(tone, message)
+    {
+      model: 'gpt-3.5-turbo',
+      messages: [
+        { role: 'system', content: "You are a helpful support agent. Please rephrase the following response to a more #{tone} tone." },
+        { role: 'user', content: message }
+      ]
+    }.to_json
+  end
+
+  def rephrase_message
+    response = make_api_call(rephrase_body(event['data']['tone'], event['data']['content']))
+    JSON.parse(response)['choices'].first['message']['content']
+  end
+
+  def make_api_call(body)
+    headers = {
+      'Content-Type' => 'application/json',
+      'Authorization' => "Bearer #{hook.settings['api_key']}"
+    }
+
+    response = HTTParty.post(
+      'https://api.openai.com/v1/chat/completions',
+      headers: headers,
+      body: body
+    )
+
+    response.body
+  end
+end
diff --git a/public/dashboard/images/integrations/openai.png b/public/dashboard/images/integrations/openai.png
new file mode 100644
index 0000000000000000000000000000000000000000..847b476b0c90946d190e224b1e39fa1fd62d07dc
GIT binary patch
literal 6630
zcmb`MRag|x_wYd)B$RHDl2BqnYU%DSNnz;{SXe^3yE`NV6zOJ3k(5}Ll-Q+9V37u?
zKi|9e@^|rG%*@4{XP$Y^nG^FlvD%tSg!nZ0XlQ7JD$4S@PwT(`2JW+`87FDN>1m+`
zD;R_I-0i@S51zJYG9Y(rTP79P5B9dYwjV%#9;3FvCz%)(c^Q4*r9*R92ZQ|<$xUTy
zem)&gMjB==m?=yZ^h{XH;^jXNJeAy`lIM7{@lx-Bd=DeZ@fOdUdo!Git$xTxJdp5E
z`4d!3NAzXv<NelA9kA-6%F%Io)$O0kpNX3!l6`yFB(Q5|?b(Qgbze#zFk=>q7M&G!
zf9^)^njfFlws;&2T9T2)E%jk{W8#;0%9enQUT2{2Bd5(vw4vN&s*p(8{aWqU2=f1D
z^Z%3BkAB5&%$_NIqt*6~pqfYVN0$$79x`=l(-PmeklnV!MQ_BB%RNmEwLOlmrM$x{
zO_4W)k-b2u)Y;bh5eM-Fx;8Xk5n@Adow%wVRQE~w9S1QsvZVjv<i@0)vG-z0vCnxa
zKNbV?bffkX6_q92d!ZO}^*9{AyGd*peQc&QvhckItVMV~Q8Rqyvoz>Q5Q6&Iw7`of
zoae3sC&!Tnh~MU!mc0m!9AJbR=uUGZyr|&cQ-VG^$=Y^LOB5?gA?6KCR8`R^8i#8W
zors1BELP8DDlH=8{BI_t9^1dwTFidsD|%=%?Y;Z6J-dnHpDYNyEtwrml8o>f4VTZ6
z0*am{Q^GESOyo2$Rk*rm&B-Rc(Ow?d9f#a`a3K^3s0J>i7s1DUA{+s6#wy$%N7^%;
zRl7vzvJ?Tq%gb5}hO9WNmR5X+_ubbuj;iGW_-4^x*ontiHe@p;bd+B-F4C>^%$TQy
zocR8<`JBWRo{9R=p&9V7dDe9I#rNjhb+ASlmK;QmAjmX1bf_*tSoV#bomso)ZJ||1
z_H#Vn<WxGuoZA~;>`HdNhQq~1j4Hg|lPH4<BB19v?W*-oe6-LW?3*a`v(o`rYx8n!
z7NAXafa+M;nK3)#_wPHGMD5<zJt9N67)&4f9GMeSFF4?ZJ6)N^{)$_m$EL^6QVu-K
zBekd}cyIKi_Y#XzS5(M>FO#`oH_J%czFLinTulzHbQ$-f=fLZa8$pkUe~w`=i^tRN
z+3=xQ81$}fS<4dWzC8bT=zx>;C2~nWI{Iit-1Qo)EwuwNf(HC_Cwid56u|eC`Zp8V
z?80@u0xObyu-Zj6zol${KwcKg|C1ie)Ym5MtWueW$uq2B_dcFPHmk?vgw+@I{DyOU
zP#t)`u~QOCHkfI-C3UQMxZe9P-MvqizQ|c?xF9>TGa!W{6nwbkFpm}Zuut^tg!B`q
zC;i6yN+@y`mZ6`^?C!>hwh0JaVclISEa?8!oz&uZH%N``=N5bny9%^y*CP~T7{hyh
zn%)~+3pano^gO4oAfOeko58OU+grIC<lG8u5468?E?1koC}Usc`Pfc&yCom&bufVp
zb@3>y4;V}0mJ&%**bOWy6aTCt*QUx3A!VM?YV*D+Cm8zAPwqDQ#}_VbxMtcqUA~k=
zf94W1c!(F@e6iWoLXf{~Zm<FmV0;iye@$=m6V6TtjObCn%zOp9=FiLHOZY;Om(SLu
zjf@?m*z}@B++_TFt;!Vz`UlVQ;XQz>T~$1}N-GjgcJ{NWIx@6+genK2pMGdy&o#9B
z4!Q~y>{IzOI0_8Ytz3exq$k8w?Aq7aj3e9nNDj3QkD9-Wgy|g7O6138I!o?PLc-T2
zu@Dj$#_iZVj0JhPzqk$*uu22iJ%#+nI&J*#k!`)<(u16oa%oH}%0V|;QUl2W>oi;)
z9_vltrUITBBR2GSo;$g_R{c!AqyJjq0Kxq7uwyu5Q~acp(4p|%iFkFbayJWWv>-m`
z_r5ss<;#|=J0Hpe`s8tH8_n0Jx1O7#QE!eBNDJJn*W-91T3m*I*Y9%<Zw83hNkV!3
z7V`|C;Rb_QKG{H;jD#!uWPD8D)cqVk-8zC;1z^~-$2&^9CQHV>#H_g*JZR?@N!HIY
zS*EgT#EaiXy9FOPtX&zpPM4x!zI%)-h0W~cW^jbf^|`OeM7FJwiv~n*$OiuMmBD*C
z@ReKn=}Sooe{^Xu&*=dBX#$m&SK;_G5$fUqT$XDCVW>@!=!IK$Hb64R9@|}ggm;x_
zXp@4Eg@~g4ZGKOS8U*(TNs-LKVd$_QwvC9WP-;nfvG!KZuN-1gx0PE)OKm7E$$_<!
zWsD-t{PP2MHwA4-_C6ec!FRa9xvacKVNyMwHk#3qxJkQL{6-B!D6t`BWGgbv*Lzn?
z@LvzSiMnPrUTv6i`x$|kJIUC^$4VUa%;z46`$f607;w2;3t5cSunt>vEZ&+km}0IO
zrMDBQD&k}@KcH3G^j&DJF>Jx#e`oY3ZW0EtVLa)VRo7R#JH>6W-J*{1hYZkj{(1w*
z%B$ZlBWryobyq@TrMFR^KGF+^2=a4;g^?&`GzQ)A?b|3bw-;rk0jD~v21*<GN?>UM
z5IjCA9i{i>@{s9aih)vPn`R|a=F!AT)Yhy#Qxn;+TkNn^V<lB>5jT>Q7%(gxip6b5
zn}}Ksp<m#)g(MMwjx{dH26)pI(cyuM-h6WfJA@pYpwYWu68Z9<b;X@^nW*Xikaz*7
zKWp62zzGUBD4m8<oF$}AH;I!g2w^0noUVEdhgf5U%^=EC01fX8+1A9FO7WtgnU>-{
z|HyToPK(2=HM$+G<NKYH8c{7K3qYGl4cM{@>3*)&$E6d0Uz}y$ORoFvMT3&~`?SYJ
zSYDp~c!q7lx+Ggzdcplju|>#7a^2)?BdCR95_bsOFQ^NWB?{&E)<9#dHhx2_W==K%
zN0qW4Lu$PWeddeUq8@maYsXg&BUeU15mMH8Fx}1&6UlMuBkMk}j^he8JKXbH{9|7w
z!t53{J1~xy-V@i-=S|Sbwk<}V$<J;KG@ln`v+HT`Xo}fV7XuG#Nc_?i!mPn&L8quJ
z&Eln9aUIRL+jn+r5s?^S<u45=cl4cz&3)C0O%SG(bX&|(={{zG#!_2XPqImT{XJlU
zPQ8`noC2w(8A3Uo$r`ygNqp3tone&gro-%AGa&kQmKt*>U<ReMa02_`TlOrF`V>$p
z4T(|Mk;u|^W=l~QcEy7=kZiv1emueAr5=CEs-3j&b*m3D82Nt!_f(GZy%fQ!QB2rp
z`^pp>f!QztFQ!rEv@r&v)UCQP5I&s#D&MbCE3N^4qs#jgkkpS}&Km?rk9jwAw-dkh
zIroDw&f+6-cPYQID7dvhU1|;?TL5yeNIOgn7<BbyjA$a=%|eam@(ZWIOH)HvH<k7M
z5Nc9b>SQ^E{q&Q+@_p>Ns8>qpB79Dtu?A$ZvzC=TAd`{ngv@&g8-R)cuD@sxS_k-e
zJ@T@;PCHxV!#0+2)nAWd;ek-|@m!UDWXC!GVk|cbV{$=Ij4ziI3UCjuSWXELmBySP
z*&};7!H^=1I<xm|u7a##^1|3bx!g%82In(H#l|9W!H{+o8y`+4;hGrLXI9gK@V9^(
zo~<G`lEI4z6mcWv5`X2)dhoI7HY;r!glO$`7Z?Kda`AnwYACI&mh20*_rGguQLZue
zNxZb?3#Z0=_Y0%wFQnShZ;DNZQD6F(qa`Wti^Y)`EwAmK9co?PipBG7gJ6xs6b3Ek
zZmw!#t)vJCbFG{gau5^v{Uv3tqp$^Eb$dqji@HRg1VW<<-aGVQp(Vi!Uwp?oKk`jH
zj~(;L1o~tYogJurp`Eiz|GxauHY4D|6aQOW@s-6*HO2m9E?XqX{vNsS{rzFuO{!_b
z63h5a1~fhtvwP52fLYs?ylXNYLD_b5pUk@!eN#TtliyWzKc4Q`Fst`mM+IRGJoO@`
z#m8SYj!VjREoE7RB>LReXfdA*Z(4H{Ws~)T;1W1X2(>xOctns`B-uz{ee-3#C!^Iv
z>Sj)|JjBkQ`@r>0+W1gqkN|D-axXCbCwd35CZ+?@kUCjGxqpl0ONuco6ecycPTjRF
zAfY{H*?3HIbcrJo8F2#6aUak<^TjjgdIc|}{wtr^V;{u3ay!|uUfh|Mi3nnm>D_Y1
zO{tEU@0W8Bj9s6kF@RU$9lfp5(C{9peyi1ae=Wk|Du=?btZgCxMHtSXH<7l9bd2|%
z7#Df7_R3!K+ZX75FaGRoh(M-d!qxOQ04;boqAz?A$il)HdN|NtshCjdt)MYg=%qsw
z*|I)PZCD_y8hMff(lsj?EEDHwtLJc5o8u|<#2?MBWg0r8<g1)9Z5k>Qw}-g4O-t09
zRj>IjRveE7N+;~{7SD(+J{il%&$${nR~?t|Go6KVDYnG^`sSLHlk++TUf8B{T2yOD
zZ{^CN`Ab!dz&|LNYh_#C?lfj8&?A&(RS4R7fIr|%a1}}^&fh!x!NVw^Xy0PZPllzL
zJlbkvJ}9fOIV2~ltD&B>Q=YEp%f6dKY%t{j9C6aIOBb*H%7iMpUC@|}nB^)ozA0_-
z9Q&9tn0=Mx<`00w@W6Qj*lKnXvmpC+q+c_^)XLSP1hqbn_Sqh~Da%Lg-o5FnPtHJ4
zF<P`CN^RFYWrS?@rJ`~#d}oF28)Or&KHc3{n+JM7Wi6V<1&d1MNl`MRQIC%{Ip}7s
zJ#hnrBuEQUU3tE<(2;+7uhZ~OV$?7eV?}4G)pVNI#j8c%c_KyMA#Pw2*SoK(-w>H#
zU&N@*yeomJY}|{kv+sg=GiVd|E%)7O>wo*;?Y^iJ;^Rok`N4(-J=0jWD(d{wy6l6u
z^}-0+8<#WM08WDZ4S<WN=52d@A8aMC25u$3TzIeLY0=7Y1s47zh|PbbW@PNr`SlCl
z#P!gpc<N`XW-|At!0AaN7{wqo=f%8~q!5($2q)DU#<D4K>7t|mLvM&DFZf84?<F~s
z+VbyGlR^WRNHm@GuR+0mO*Ys~9mh}r%+%z{g|oF;X>w|F^BgE`xUcD~#6n0olnuS7
zJZn2x)a4YVUzgP}Dj->v0L$w^gE7LRYNi~wX~ICWO@pOr@(x!r!Co82k_^Qe0TJYR
z(}A{V*CSmCuTl3PE&c(n;Zl3G!N9dZpc==)<<*e7<<}fM28;yxPm%cRhn*A>rguxR
z>0UE9vMnFtupMVoGfMqPCVU7b!{6n!?k#TE0%yBkx@TTEa2=f|6w{>6cRI_^sxM!p
zG%#rCp6yLZQ`kb|r~x8rLJr}M;^GZ(-@lFJaXzAH`_t94x_e0`urXI6r`49d#eQno
zw9AxuN^ikay)iV7R4(aUUFrp`66!ej)kdplo@^~Uj>A#>UT4;&w}vq1ykf$Nqr(C2
zA-P<-vRK^lk*v{ZFH@V=l-1W;P)q>{J*5AqAfLZO5m)mVzNRU}p}D~+T>?d6H{Z5O
zOxeD2eljx@B#sbQ8Xq{6=Zr+j01TNZf@0nVRcd-NN>4DZE|0=!^Il3!ZE~?*@##4)
zNoe}Ka|qv;_OW*AF8o^Y{F2n(P$P~LCO=j94U;b5jG|vShh4m(uBU3grY&+sZ<3Yb
zW;wQ493bx8Fx)ZEN?ZFwu!H!}Cnj6!H>##hkLW0IL$;F&3ZM`KoAX?XEXYn_&ww~u
zanC^7fF)QOo}H674@l~L3Ak-7VxM96J*gYh?OWtu;wbyN{uZRBZR#(R<aKVPheq0_
z01f^HOQ>*QRm~V&RpHVcD9b@uc;)=2^XaoeT|@X4grXL{XTcvA^#Zy%@PfJ%>k&@}
zqK|@ScIP^tJ+6Rl2()-wkduT9H-$qvbE85}&!~AA?;fpHl*YYSgx^Rz3VF_$w?uUk
zbDB?Wi#x6x-R^v1yF9dFW*aXt$tCk|uhwUrmhSDVG`7Glbq0WgAyDVU#<YN(%ZrjN
zvukDuXztu8G1-E7pUFsvj!18$b9OlqoMSWjG(#2?Ghxo$hxOqyWLLQLtIp9R@o$DJ
zk<p%8Cn>Qi0xPFQ4b{uUA_*H^a}LwKxX*t1la=Rv@iC|ZR_Hf)$fd|_zNuFC!Jj~-
zfiP*BE`FKQpBoa)x>}kVTb<U_Wb|hYp?i);#iPaIFp{v2=~=O7VXrEt#il*nLfuMg
zNXu}D+vcs;^F^63|ITgRoHrNXLIJc+;r0}oPx($s*=I#lpzuTAX~~^x_O_W4&l+rt
z)6QJM0m2?@4m_b?OE*h7yiF>a2&L@fT_D(QHQ`J${H2?jd+PO=F_n}NN68dnOS$qV
zefIu$#z6*;rbnOd%T$0CL+zMd7aGk{;kPZxki4q^S;4QAA^$F8#D*hIsA^)=xz~1b
zQR<24Cr7rBsFf|NN`;M27eXi9`_k#yY)uN8#-)*+`?4boDj~qBLeXJw;bz~J1Xl5e
z!PdRF)PR$$8gdzW;aItG07W(dz=`WtRd%0fCzSu7LXt#>XFBzOmz(!<3zMNXZwMtp
zN{Syg#3u!j|CN2u;x)v74fOA0huq#KVEa&HMpIotB89TAUzSd$+c-aUue~OP_f-rE
zH@%>R<*h$cQEH*@_2k7L7Xl;7kfeNL-eQazx}+@gQlBt<IWaSu)bvDhd59Bt59(Ya
zm3_q!Yccl8UO&3X!}0!L)z_2MF=bs{V3<Ui^+z}VG-;$uWr0+RcGP@C54zD0XH4no
zzs}_##(2|8xA031gJND-k7;2LUO2s8pu+e{y#K+>K@D0M={ra5s66fWI@gR>8Gt57
z0w^P!1<fzNH#Uwj!t#^S*oA&HBIY@!W6bjFGb>o7=T_L^#vqT2MRQ;!xo`KHAm;H-
zGN)}>^Jg}urQYk7#*U+lqmCoQH7fWm$M%CrD+v^{cWqI*4DBMr0|Uv)OSPG!Snm=#
z27U%`RI;-N#1$C%2)9bV1Z_}BfuNlj9WQ0*0VT*xb?XG~#F4rbmQ+-`llI?ngt+oE
zGw0Fa0`p4;i*5l6fs&xHc>BHcnyIqI_AmtD8}*<R90T@Eqlwk!Z85G&oNfm$-ebM{
zJ?M0ygy>s#pA5aOI5q+5V|e4il|EV1yJM(4%sQ2>BU1Qd@(Y?9ZZ6S;N>_B=ECk8=
zOzMHL=-NE!Jf~w%48RyD=0EtQ{xwzdFpK$FA@7)58fa_ITVUSE5XL+N@PyDfSMj_v
z9KlAAZtf-Gm2G}7CSzFX0c846_V9GdXekKI&C%|2uY`S1M%he`%b0J3-EmpBPqj-Z
zqT`|W%$g^dp!&;fg;&14e&*#)(1g#KRY3nH*!78D;xfL9Kxa)HY*mi1Rt&QBZ`aew
zoSFoSJQbh2ECu#FP|BW5+D!kr3b9bA81^sb5HYI`-rS@ZhIJQOK=bgiKrz^I^!jIc
zDtFX9AMR`{-c@pv8Wc7e+b+PF*HWvV+@us9{aJM94B}~e#)DyPr_k(^P@(?^boZkg
z{+@zS)!<+H&&Hz3WZ4Rv&=;;M5{r5u{QkD!D@MN>>`XT3t@S6i#x#1u;IH7uLCX?d
znz4wX$|s;!)=<mPdrwofaSZ?K+`q=G-Zqsz9muvBJn{A&w|1uA`Ln-uR5PA9hfkPf
zf85_2R3}VY$TqQ2i`4G81%YbyEaL0xJjcD)E;Jayc5YLaK^HHDv4tC5P373J6R>_p
z2S2<Cve`Q6m^_?*es{2?+~eGC*KRUlC0ZHe*1HGL*ncO$WP}xbItuwOWW!lof>X5<
zUA=Q9h1SdQD%ci?sWLpCfK<wD5kVwf^D8yo({z?;)$#J>kv?liD1|EA-k`HL?un{N
zN(J1vcv5U6F6aeCom_w5OSSdK(*E;!gZND4K~GR(dA~3xOUT3l=8%48cI|=>RLeeJ
zy}g7y?A};&-Tuwl4!S~o{<~1YYEv((aj>or6-RGNR8ICy?tGZ9fL`15rDHE0EjDhZ
zKRy6y5}B-mdX8_OoF$>i3pa;Y>gG+8aMrZ>+x-`2GXGewu6lW8{#`HTLy#*zTZQiu
zKz~lcr#{cEuEZ4wO|699xd-2Gas)qiX#+-(wN>;??*25UBUdkP%EGfkA)+thFPc*t
z4^*$}XIGoNm1cIzy(A3U!#Km}gr0C?@4r3CbG*mq>#8qT)}uV10=t&Vhh%!X`BfqA
zjX(DI)~kRlMiunOKTfxz%`@dYYQYfMhH`}15HAjulwK=Hx2%ZEOGj@pb6+iXj%Ohg
z^=<H)Yss<W?bXAJmhlT&A|C@i^cr!k?&WRab<(A|gh<CXB3M;c;hqb5Cn~nP383mx
zC!I|*BWR~n@?^t@T<n(2O*&Yg2n*BaWp()9Z6jXZ$D_*`O4xF%&==I43HcKMlj{C=
z`@TMy6T$M~&k06KkE7SUxVu|Apy~;x6QhTR?h{r?0|1ii<<UjrVW>?m1o>)6T^>pm
zTpp06%-AHsG?%Db%8i(j*X{g1ek+}&UM(}sI8L<MQM4ccQN61E^$#_a6}}AdUsMZo
zFyV@>*jFIkt94=x$pb6q|2a;@sc5Jz;yn3rd^3pExX6^U+XD(wyjm&Mt#CIOmonA%
zbOytS`|Q}jbYEko|Ca{Df8B}yp-=I@i1}Vip<|<!J7gxY;;b<|HEz&U6g1^)Wv#;g
E4{*gKcmMzZ

literal 0
HcmV?d00001

diff --git a/spec/controllers/api/v1/accounts/integrations/apps_controller_spec.rb b/spec/controllers/api/v1/accounts/integrations/apps_controller_spec.rb
index c465e4cd6..4f120df9c 100644
--- a/spec/controllers/api/v1/accounts/integrations/apps_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/integrations/apps_controller_spec.rb
@@ -28,6 +28,18 @@ RSpec.describe 'Integration Apps API', type: :request do
         expect(apps['action']).to be_nil
       end
 
+      it 'will not return sensitive information for openai app for agents' do
+        openai = create(:integrations_hook, :openai, account: account)
+        get api_v1_account_integrations_apps_url(account),
+            headers: agent.create_new_auth_token,
+            as: :json
+
+        expect(response).to have_http_status(:success)
+
+        app = JSON.parse(response.body)['payload'].find { |int_app| int_app['id'] == openai.app.id }
+        expect(app['hooks'].first['settings']).to be_nil
+      end
+
       it 'returns all active apps with sensitive information if user is an admin' do
         first_app = Integrations::App.all.find(&:active?)
         get api_v1_account_integrations_apps_url(account),
@@ -53,6 +65,18 @@ RSpec.describe 'Integration Apps API', type: :request do
           expect(slack_app['action']).to include('client_id=client_id')
         end
       end
+
+      it 'will return sensitive information for openai app for admins' do
+        openai = create(:integrations_hook, :openai, account: account)
+        get api_v1_account_integrations_apps_url(account),
+            headers: admin.create_new_auth_token,
+            as: :json
+
+        expect(response).to have_http_status(:success)
+
+        app = JSON.parse(response.body)['payload'].find { |int_app| int_app['id'] == openai.app.id }
+        expect(app['hooks'].first['settings']).not_to be_nil
+      end
     end
   end
 
@@ -65,7 +89,8 @@ RSpec.describe 'Integration Apps API', type: :request do
     end
 
     context 'when it is an authenticated user' do
-      let(:agent) { create(:user, account: account, role: :administrator) }
+      let(:agent) { create(:user, account: account, role: :agent) }
+      let(:admin) { create(:user, account: account, role: :administrator) }
 
       it 'returns details of the app' do
         get api_v1_account_integrations_app_url(account_id: account.id, id: 'slack'),
@@ -77,6 +102,30 @@ RSpec.describe 'Integration Apps API', type: :request do
         expect(app['id']).to eql('slack')
         expect(app['name']).to eql('Slack')
       end
+
+      it 'will not return sensitive information for openai app for agents' do
+        openai = create(:integrations_hook, :openai, account: account)
+        get api_v1_account_integrations_app_url(account_id: account.id, id: openai.app.id),
+            headers: agent.create_new_auth_token,
+            as: :json
+
+        expect(response).to have_http_status(:success)
+
+        app = JSON.parse(response.body)
+        expect(app['hooks'].first['settings']).to be_nil
+      end
+
+      it 'will return sensitive information for openai app for admins' do
+        openai = create(:integrations_hook, :openai, account: account)
+        get api_v1_account_integrations_app_url(account_id: account.id, id: openai.app.id),
+            headers: admin.create_new_auth_token,
+            as: :json
+
+        expect(response).to have_http_status(:success)
+
+        app = JSON.parse(response.body)
+        expect(app['hooks'].first['settings']).not_to be_nil
+      end
     end
   end
 end
diff --git a/spec/controllers/api/v1/accounts/integrations/hooks_controller_spec.rb b/spec/controllers/api/v1/accounts/integrations/hooks_controller_spec.rb
index bb87d8837..37378b5a5 100644
--- a/spec/controllers/api/v1/accounts/integrations/hooks_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/integrations/hooks_controller_spec.rb
@@ -77,6 +77,33 @@ RSpec.describe 'Integration Hooks API', type: :request do
     end
   end
 
+  describe 'POST /api/v1/accounts/{account.id}/integrations/hooks/{hook_id}/process_event' do
+    let(:hook) { create(:integrations_hook, account: account) }
+    let(:params) { { event: 'rephrase', payload: { test: 'test' } } }
+
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        post process_event_api_v1_account_integrations_hook_url(account_id: account.id, id: hook.id),
+             params: params,
+             as: :json
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated user' do
+      it 'will process the events' do
+        post process_event_api_v1_account_integrations_hook_url(account_id: account.id, id: hook.id),
+             params: params,
+             headers: agent.create_new_auth_token,
+             as: :json
+
+        expect(response).to have_http_status(:success)
+        expect(response.parsed_body['message']).to eq('No processor found')
+      end
+    end
+  end
+
   describe 'DELETE /api/v1/accounts/{account.id}/integrations/hooks/{hook_id}' do
     let(:hook) { create(:integrations_hook, account: account) }
 
diff --git a/spec/factories/integrations/hooks.rb b/spec/factories/integrations/hooks.rb
index 0c41cad13..7219884df 100644
--- a/spec/factories/integrations/hooks.rb
+++ b/spec/factories/integrations/hooks.rb
@@ -21,5 +21,10 @@ FactoryBot.define do
       app_id { 'google_translate' }
       settings { { project_id: 'test', credentials: {} } }
     end
+
+    trait :openai do
+      app_id { 'openai' }
+      settings { { api_key: 'api_key' } }
+    end
   end
 end
diff --git a/spec/lib/integrations/openai/processor_service_spec.rb b/spec/lib/integrations/openai/processor_service_spec.rb
new file mode 100644
index 000000000..ef9e9ba1e
--- /dev/null
+++ b/spec/lib/integrations/openai/processor_service_spec.rb
@@ -0,0 +1,51 @@
+require 'rails_helper'
+
+RSpec.describe Integrations::Openai::ProcessorService do
+  subject { described_class.new(hook: hook, event: event) }
+
+  let(:hook) { create(:integrations_hook, :openai) }
+  let(:expected_headers) { { 'Authorization' => "Bearer #{hook.settings['api_key']}" } }
+  let(:openai_response) do
+    {
+      'choices' => [
+        {
+          'message' => {
+            'content' => 'This is a rephrased test message.'
+          }
+        }
+      ]
+    }.to_json
+  end
+
+  describe '#perform' do
+    context 'when event name is rephrase' do
+      let(:event) { { 'name' => 'rephrase', 'data' => { 'tone' => 'friendly', 'content' => 'This is a test message' } } }
+
+      it 'returns the rephrased message using the tone in data' do
+        request_body = {
+          'model' => 'gpt-3.5-turbo',
+          'messages' => [
+            { 'role' => 'system',
+              'content' => "You are a helpful support agent. Please rephrase the following response to a more #{event['data']['tone']} tone." },
+            { 'role' => 'user', 'content' => event['data']['content'] }
+          ]
+        }.to_json
+
+        stub_request(:post, 'https://api.openai.com/v1/chat/completions')
+          .with(body: request_body, headers: expected_headers)
+          .to_return(status: 200, body: openai_response, headers: {})
+
+        result = subject.perform
+        expect(result).to eq('This is a rephrased test message.')
+      end
+    end
+
+    context 'when event name is not rephrase' do
+      let(:event) { { 'name' => 'unknown', 'data' => {} } }
+
+      it 'returns nil' do
+        expect(subject.perform).to be_nil
+      end
+    end
+  end
+end
diff --git a/spec/models/integrations/hook_spec.rb b/spec/models/integrations/hook_spec.rb
index 08a08cc4e..874fc4346 100644
--- a/spec/models/integrations/hook_spec.rb
+++ b/spec/models/integrations/hook_spec.rb
@@ -27,4 +27,25 @@ RSpec.describe Integrations::Hook, type: :model do
       end
     end
   end
+
+  describe 'process_event' do
+    let(:account) { create(:account) }
+    let(:params) { { event: 'rephrase', payload: { test: 'test' } } }
+
+    it 'returns no processor found for hooks with out processor defined' do
+      hook = create(:integrations_hook, account: account)
+      expect(hook.process_event(params)).to eq('No processor found')
+    end
+
+    it 'returns results from procesor for openai hook' do
+      hook = create(:integrations_hook, :openai, account: account)
+
+      openai_double = double
+      allow(Integrations::Openai::ProcessorService).to receive(:new).and_return(openai_double)
+      allow(openai_double).to receive(:perform).and_return('test')
+      expect(hook.process_event(params)).to eq('test')
+      expect(Integrations::Openai::ProcessorService).to have_received(:new).with(event: params, hook: hook)
+      expect(openai_double).to have_received(:perform)
+    end
+  end
 end

From c071f66cdd0dab854e63435b39520d0f3926af13 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Mon, 24 Apr 2023 13:52:14 -0700
Subject: [PATCH 028/101] fix: Update the icon for low priority (#6978)

---
 .../widgets/conversation/PriorityMark.vue     | 106 +++++-------------
 .../components/FluentIcon/DashboardIcon.vue   |  12 +-
 .../shared/components/FluentIcon/Icon.vue     |   6 +-
 .../shared/components/FluentIcon/Index.vue    |  12 +-
 .../FluentIcon/dashboard-icons.json           |  20 +++-
 5 files changed, 74 insertions(+), 82 deletions(-)

diff --git a/app/javascript/dashboard/components/widgets/conversation/PriorityMark.vue b/app/javascript/dashboard/components/widgets/conversation/PriorityMark.vue
index 0fdc786ca..9f8237397 100644
--- a/app/javascript/dashboard/components/widgets/conversation/PriorityMark.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/PriorityMark.vue
@@ -1,78 +1,19 @@
 <template>
-  <span v-if="priority" class="conversation-priority-mark">
-    <svg
-      v-tooltip="tooltipText"
-      width="14"
-      height="14"
-      viewBox="0 0 14 14"
-      fill="none"
-      xmlns="http://www.w3.org/2000/svg"
-    >
-      <template v-if="priority === CONVERSATION_PRIORITY.URGENT">
-        <rect width="14" height="14" rx="2" fill="#FF382D" />
-        <path
-          d="M2.33325 2.91667C2.33325 2.27233 2.85559 1.75 3.49992 1.75C4.14425 1.75 4.66659 2.27233 4.66659 2.91667V8.16667C4.66659 8.811 4.14425 9.33333 3.49992 9.33333C2.85559 9.33333 2.33325 8.811 2.33325 8.16667V2.91667Z"
-          fill="white"
-        />
-        <path
-          d="M2.33325 11.0833C2.33325 10.439 2.85559 9.91667 3.49992 9.91667C4.14425 9.91667 4.66659 10.439 4.66659 11.0833C4.66659 11.7277 4.14425 12.25 3.49992 12.25C2.85559 12.25 2.33325 11.7277 2.33325 11.0833Z"
-          fill="white"
-        />
-        <path
-          d="M5.83325 2.91667C5.83325 2.27233 6.35559 1.75 6.99992 1.75C7.64425 1.75 8.16659 2.27233 8.16659 2.91667V8.16667C8.16659 8.811 7.64425 9.33333 6.99992 9.33333C6.35559 9.33333 5.83325 8.811 5.83325 8.16667V2.91667Z"
-          fill="white"
-        />
-        <path
-          d="M5.83325 11.0833C5.83325 10.439 6.35559 9.91667 6.99992 9.91667C7.64425 9.91667 8.16659 10.439 8.16659 11.0833C8.16659 11.7277 7.64425 12.25 6.99992 12.25C6.35559 12.25 5.83325 11.7277 5.83325 11.0833Z"
-          fill="white"
-        />
-        <path
-          d="M9.33325 2.91667C9.33325 2.27233 9.85559 1.75 10.4999 1.75C11.1443 1.75 11.6666 2.27233 11.6666 2.91667V8.16667C11.6666 8.811 11.1443 9.33333 10.4999 9.33333C9.85559 9.33333 9.33325 8.811 9.33325 8.16667V2.91667Z"
-          fill="white"
-        />
-        <path
-          d="M9.33325 11.0833C9.33325 10.439 9.85559 9.91667 10.4999 9.91667C11.1443 9.91667 11.6666 10.439 11.6666 11.0833C11.6666 11.7277 11.1443 12.25 10.4999 12.25C9.85559 12.25 9.33325 11.7277 9.33325 11.0833Z"
-          fill="white"
-        />
-      </template>
-      <template v-else-if="priority === CONVERSATION_PRIORITY.HIGH">
-        <rect width="14" height="14" rx="2" fill="#F1F5F8" />
-        <path
-          d="M4.87216 3.50012L4.76278 8.29274H3.69555L3.58949 3.50012H4.87216ZM4.22917 10.3609C4.02809 10.3609 3.85574 10.2902 3.71212 10.1488C3.57071 10.0074 3.5 9.83503 3.5 9.63175C3.5 9.43289 3.57071 9.26275 3.71212 9.12133C3.85574 8.97992 4.02809 8.90921 4.22917 8.90921C4.42582 8.90921 4.59596 8.97992 4.73958 9.12133C4.88542 9.26275 4.95833 9.43289 4.95833 9.63175C4.95833 9.76654 4.92408 9.88917 4.85559 9.99965C4.7893 10.1101 4.70092 10.1985 4.59044 10.2648C4.48217 10.3289 4.36174 10.3609 4.22917 10.3609Z"
-          fill="#446888"
-        />
-        <path
-          d="M7.47237 3.50012L7.36299 8.29274H6.29576L6.1897 3.50012H7.47237ZM6.82937 10.3609C6.6283 10.3609 6.45595 10.2902 6.31233 10.1488C6.17092 10.0074 6.10021 9.83503 6.10021 9.63175C6.10021 9.43289 6.17092 9.26275 6.31233 9.12133C6.45595 8.97992 6.6283 8.90921 6.82937 8.90921C7.02603 8.90921 7.19617 8.97992 7.33979 9.12133C7.48562 9.26275 7.55854 9.43289 7.55854 9.63175C7.55854 9.76654 7.52429 9.88917 7.4558 9.99965C7.38951 10.1101 7.30112 10.1985 7.19064 10.2648C7.08237 10.3289 6.96195 10.3609 6.82937 10.3609Z"
-          fill="#446888"
-        />
-        <path
-          d="M10.0726 3.50012L9.9632 8.29274H8.89597L8.78991 3.50012H10.0726ZM9.42958 10.3609C9.22851 10.3609 9.05616 10.2902 8.91254 10.1488C8.77112 10.0074 8.70042 9.83503 8.70042 9.63175C8.70042 9.43289 8.77112 9.26275 8.91254 9.12133C9.05616 8.97992 9.22851 8.90921 9.42958 8.90921C9.62624 8.90921 9.79638 8.97992 9.94 9.12133C10.0858 9.26275 10.1587 9.43289 10.1587 9.63175C10.1587 9.76654 10.1245 9.88917 10.056 9.99965C9.98972 10.1101 9.90133 10.1985 9.79085 10.2648C9.68258 10.3289 9.56216 10.3609 9.42958 10.3609Z"
-          fill="#446888"
-        />
-      </template>
-      <template v-else-if="priority === CONVERSATION_PRIORITY.MEDIUM">
-        <rect width="14" height="14" rx="2" fill="#F1F5F8" />
-        <path
-          d="M6.03866 3.50012L5.92929 8.29274H4.86205L4.75599 3.50012H6.03866ZM5.39567 10.3609C5.1946 10.3609 5.02225 10.2902 4.87863 10.1488C4.73721 10.0074 4.6665 9.83503 4.6665 9.63175C4.6665 9.43289 4.73721 9.26275 4.87863 9.12133C5.02225 8.97992 5.1946 8.90921 5.39567 8.90921C5.59232 8.90921 5.76246 8.97992 5.90609 9.12133C6.05192 9.26275 6.12484 9.43289 6.12484 9.63175C6.12484 9.76654 6.09059 9.88917 6.02209 9.99965C5.9558 10.1101 5.86742 10.1985 5.75694 10.2648C5.64867 10.3289 5.52825 10.3609 5.39567 10.3609Z"
-          fill="#446888"
-        />
-        <path
-          d="M8.63887 3.50012L8.5295 8.29274H7.46226L7.3562 3.50012H8.63887ZM7.99588 10.3609C7.79481 10.3609 7.62246 10.2902 7.47883 10.1488C7.33742 10.0074 7.26671 9.83503 7.26671 9.63175C7.26671 9.43289 7.33742 9.26275 7.47883 9.12133C7.62246 8.97992 7.79481 8.90921 7.99588 8.90921C8.19253 8.90921 8.36267 8.97992 8.5063 9.12133C8.65213 9.26275 8.72505 9.43289 8.72505 9.63175C8.72505 9.76654 8.6908 9.88917 8.6223 9.99965C8.55601 10.1101 8.46763 10.1985 8.35715 10.2648C8.24888 10.3289 8.12845 10.3609 7.99588 10.3609Z"
-          fill="#446888"
-        />
-      </template>
-      <template v-else-if="priority === CONVERSATION_PRIORITY.LOW">
-        <rect width="14" height="14" rx="2" fill="#F1F5F8" />
-        <path
-          d="M6.03866 3.50012L5.92929 8.29274H4.86205L4.75599 3.50012H6.03866ZM5.39567 10.3609C5.1946 10.3609 5.02225 10.2902 4.87863 10.1488C4.73721 10.0074 4.6665 9.83503 4.6665 9.63175C4.6665 9.43289 4.73721 9.26275 4.87863 9.12133C5.02225 8.97992 5.1946 8.90921 5.39567 8.90921C5.59232 8.90921 5.76246 8.97992 5.90609 9.12133C6.05192 9.26275 6.12484 9.43289 6.12484 9.63175C6.12484 9.76654 6.09059 9.88917 6.02209 9.99965C5.9558 10.1101 5.86742 10.1985 5.75694 10.2648C5.64867 10.3289 5.52825 10.3609 5.39567 10.3609Z"
-          fill="#446888"
-        />
-        <path
-          d="M8.63887 3.50012L8.5295 8.29274H7.46226L7.3562 3.50012H8.63887ZM7.99588 10.3609C7.79481 10.3609 7.62246 10.2902 7.47883 10.1488C7.33742 10.0074 7.26671 9.83503 7.26671 9.63175C7.26671 9.43289 7.33742 9.26275 7.47883 9.12133C7.62246 8.97992 7.79481 8.90921 7.99588 8.90921C8.19253 8.90921 8.36267 8.97992 8.5063 9.12133C8.65213 9.26275 8.72505 9.43289 8.72505 9.63175C8.72505 9.76654 8.6908 9.88917 8.6223 9.99965C8.55601 10.1101 8.46763 10.1985 8.35715 10.2648C8.24888 10.3289 8.12845 10.3609 7.99588 10.3609Z"
-          fill="#446888"
-        />
-      </template>
-    </svg>
+  <span
+    v-if="priority"
+    v-tooltip="{
+      content: tooltipText,
+      delay: { show: 1500, hide: 0 },
+      hideOnClick: true,
+    }"
+    class="conversation-priority-mark"
+    :class="{ urgent: priority === CONVERSATION_PRIORITY.URGENT }"
+  >
+    <fluent-icon
+      :icon="`priority-${priority.toLowerCase()}`"
+      size="14"
+      view-box="0 0 14 14"
+    />
   </span>
 </template>
 
@@ -84,9 +25,9 @@ export default {
   props: {
     priority: {
       type: String,
-      default: undefined,
+      default: '',
       validate: value =>
-        [...Object.values(CONVERSATION_PRIORITY), undefined].includes(value),
+        [...Object.values(CONVERSATION_PRIORITY), ''].includes(value),
     },
   },
   data() {
@@ -104,9 +45,18 @@ export default {
 };
 </script>
 
-<style scoped>
+<style scoped lang="scss">
 .conversation-priority-mark {
-  display: inline-flex;
   align-items: center;
+  background: var(--s-50);
+  border-radius: var(--border-radius-small);
+  color: var(--s-600);
+  display: inline-flex;
+  width: var(--space-snug);
+
+  &.urgent {
+    background: var(--r-500);
+    color: var(--w-25);
+  }
 }
 </style>
diff --git a/app/javascript/shared/components/FluentIcon/DashboardIcon.vue b/app/javascript/shared/components/FluentIcon/DashboardIcon.vue
index b695aaaa7..a1135cfb8 100644
--- a/app/javascript/shared/components/FluentIcon/DashboardIcon.vue
+++ b/app/javascript/shared/components/FluentIcon/DashboardIcon.vue
@@ -1,5 +1,11 @@
 <template>
-  <base-icon :size="size" :icon="icon" :type="type" :icons="icons" />
+  <base-icon
+    :size="size"
+    :icon="icon"
+    :type="type"
+    :icons="icons"
+    :view-box="viewBox"
+  />
 </template>
 <script>
 import BaseIcon from './Icon';
@@ -23,6 +29,10 @@ export default {
       type: String,
       default: 'outline',
     },
+    viewBox: {
+      type: String,
+      default: '0 0 24 24',
+    },
   },
   data() {
     return { icons };
diff --git a/app/javascript/shared/components/FluentIcon/Icon.vue b/app/javascript/shared/components/FluentIcon/Icon.vue
index e49cb3d6d..6e4fbda73 100644
--- a/app/javascript/shared/components/FluentIcon/Icon.vue
+++ b/app/javascript/shared/components/FluentIcon/Icon.vue
@@ -3,7 +3,7 @@
     :width="size"
     :height="size"
     fill="none"
-    viewBox="0 0 24 24"
+    :viewBox="viewBox"
     xmlns="http://www.w3.org/2000/svg"
   >
     <path
@@ -33,6 +33,10 @@ export default {
       type: String,
       default: 'outline',
     },
+    viewBox: {
+      type: String,
+      default: '0 0 24 24',
+    },
   },
 
   computed: {
diff --git a/app/javascript/shared/components/FluentIcon/Index.vue b/app/javascript/shared/components/FluentIcon/Index.vue
index 7bc98a7a7..4cc0465d4 100644
--- a/app/javascript/shared/components/FluentIcon/Index.vue
+++ b/app/javascript/shared/components/FluentIcon/Index.vue
@@ -1,5 +1,11 @@
 <template>
-  <base-icon :size="size" :icon="icon" :type="type" :icons="icons" />
+  <base-icon
+    :size="size"
+    :icon="icon"
+    :type="type"
+    :icons="icons"
+    :view-box="viewBox"
+  />
 </template>
 <script>
 import BaseIcon from './Icon';
@@ -23,6 +29,10 @@ export default {
       type: String,
       default: 'outline',
     },
+    viewBox: {
+      type: String,
+      default: '0 0 24 24',
+    },
   },
   data() {
     return { icons };
diff --git a/app/javascript/shared/components/FluentIcon/dashboard-icons.json b/app/javascript/shared/components/FluentIcon/dashboard-icons.json
index d232e586b..94679eb9f 100644
--- a/app/javascript/shared/components/FluentIcon/dashboard-icons.json
+++ b/app/javascript/shared/components/FluentIcon/dashboard-icons.json
@@ -186,5 +186,23 @@
     "M5 11C5 10.4477 5.44772 10 6 10H10C10.5523 10 11 10.4477 11 11V14C11 14.5523 10.5523 15 10 15H6C5.44772 15 5 14.5523 5 14V11Z",
     "M5 18C5 17.4477 5.44772 17 6 17H10C10.5523 17 11 17.4477 11 18V21C11 21.5523 10.5523 22 10 22H6C5.44772 22 5 21.5523 5 21V18Z",
     "M13 18C13 17.4477 13.4477 17 14 17H18C18.5523 17 19 17.4477 19 18V21C19 21.5523 18.5523 22 18 22H14C13.4477 22 13 21.5523 13 21V18Z"
-  ]
+  ],
+  "priority-urgent-outline": [
+    "M2.33325 2.91667C2.33325 2.27233 2.85559 1.75 3.49992 1.75C4.14425 1.75 4.66659 2.27233 4.66659 2.91667V8.16667C4.66659 8.811 4.14425 9.33333 3.49992 9.33333C2.85559 9.33333 2.33325 8.811 2.33325 8.16667V2.91667Z",
+    "M2.33325 11.0833C2.33325 10.439 2.85559 9.91667 3.49992 9.91667C4.14425 9.91667 4.66659 10.439 4.66659 11.0833C4.66659 11.7277 4.14425 12.25 3.49992 12.25C2.85559 12.25 2.33325 11.7277 2.33325 11.0833Z",
+    "M5.83325 2.91667C5.83325 2.27233 6.35559 1.75 6.99992 1.75C7.64425 1.75 8.16659 2.27233 8.16659 2.91667V8.16667C8.16659 8.811 7.64425 9.33333 6.99992 9.33333C6.35559 9.33333 5.83325 8.811 5.83325 8.16667V2.91667Z",
+    "M5.83325 11.0833C5.83325 10.439 6.35559 9.91667 6.99992 9.91667C7.64425 9.91667 8.16659 10.439 8.16659 11.0833C8.16659 11.7277 7.64425 12.25 6.99992 12.25C6.35559 12.25 5.83325 11.7277 5.83325 11.0833Z",
+    "M9.33325 2.91667C9.33325 2.27233 9.85559 1.75 10.4999 1.75C11.1443 1.75 11.6666 2.27233 11.6666 2.91667V8.16667C11.6666 8.811 11.1443 9.33333 10.4999 9.33333C9.85559 9.33333 9.33325 8.811 9.33325 8.16667V2.91667Z",
+    "M9.33325 11.0833C9.33325 10.439 9.85559 9.91667 10.4999 9.91667C11.1443 9.91667 11.6666 10.439 11.6666 11.0833C11.6666 11.7277 11.1443 12.25 10.4999 12.25C9.85559 12.25 9.33325 11.7277 9.33325 11.0833Z"
+  ],
+  "priority-high-outline": [
+    "M4.87216 3.50012L4.76278 8.29274H3.69555L3.58949 3.50012H4.87216ZM4.22917 10.3609C4.02809 10.3609 3.85574 10.2902 3.71212 10.1488C3.57071 10.0074 3.5 9.83503 3.5 9.63175C3.5 9.43289 3.57071 9.26275 3.71212 9.12133C3.85574 8.97992 4.02809 8.90921 4.22917 8.90921C4.42582 8.90921 4.59596 8.97992 4.73958 9.12133C4.88542 9.26275 4.95833 9.43289 4.95833 9.63175C4.95833 9.76654 4.92408 9.88917 4.85559 9.99965C4.7893 10.1101 4.70092 10.1985 4.59044 10.2648C4.48217 10.3289 4.36174 10.3609 4.22917 10.3609Z",
+    "M7.47237 3.50012L7.36299 8.29274H6.29576L6.1897 3.50012H7.47237ZM6.82937 10.3609C6.6283 10.3609 6.45595 10.2902 6.31233 10.1488C6.17092 10.0074 6.10021 9.83503 6.10021 9.63175C6.10021 9.43289 6.17092 9.26275 6.31233 9.12133C6.45595 8.97992 6.6283 8.90921 6.82937 8.90921C7.02603 8.90921 7.19617 8.97992 7.33979 9.12133C7.48562 9.26275 7.55854 9.43289 7.55854 9.63175C7.55854 9.76654 7.52429 9.88917 7.4558 9.99965C7.38951 10.1101 7.30112 10.1985 7.19064 10.2648C7.08237 10.3289 6.96195 10.3609 6.82937 10.3609Z",
+    "M10.0726 3.50012L9.9632 8.29274H8.89597L8.78991 3.50012H10.0726ZM9.42958 10.3609C9.22851 10.3609 9.05616 10.2902 8.91254 10.1488C8.77112 10.0074 8.70042 9.83503 8.70042 9.63175C8.70042 9.43289 8.77112 9.26275 8.91254 9.12133C9.05616 8.97992 9.22851 8.90921 9.42958 8.90921C9.62624 8.90921 9.79638 8.97992 9.94 9.12133C10.0858 9.26275 10.1587 9.43289 10.1587 9.63175C10.1587 9.76654 10.1245 9.88917 10.056 9.99965C9.98972 10.1101 9.90133 10.1985 9.79085 10.2648C9.68258 10.3289 9.56216 10.3609 9.42958 10.3609Z"
+  ],
+  "priority-medium-outline": [
+    "M6.03866 3.50012L5.92929 8.29274H4.86205L4.75599 3.50012H6.03866ZM5.39567 10.3609C5.1946 10.3609 5.02225 10.2902 4.87863 10.1488C4.73721 10.0074 4.6665 9.83503 4.6665 9.63175C4.6665 9.43289 4.73721 9.26275 4.87863 9.12133C5.02225 8.97992 5.1946 8.90921 5.39567 8.90921C5.59232 8.90921 5.76246 8.97992 5.90609 9.12133C6.05192 9.26275 6.12484 9.43289 6.12484 9.63175C6.12484 9.76654 6.09059 9.88917 6.02209 9.99965C5.9558 10.1101 5.86742 10.1985 5.75694 10.2648C5.64867 10.3289 5.52825 10.3609 5.39567 10.3609Z",
+    "M8.63887 3.50012L8.5295 8.29274H7.46226L7.3562 3.50012H8.63887ZM7.99588 10.3609C7.79481 10.3609 7.62246 10.2902 7.47883 10.1488C7.33742 10.0074 7.26671 9.83503 7.26671 9.63175C7.26671 9.43289 7.33742 9.26275 7.47883 9.12133C7.62246 8.97992 7.79481 8.90921 7.99588 8.90921C8.19253 8.90921 8.36267 8.97992 8.5063 9.12133C8.65213 9.26275 8.72505 9.43289 8.72505 9.63175C8.72505 9.76654 8.6908 9.88917 8.6223 9.99965C8.55601 10.1101 8.46763 10.1985 8.35715 10.2648C8.24888 10.3289 8.12845 10.3609 7.99588 10.3609Z"
+  ],
+  "priority-low-outline": "M7.88754 3.5L7.77816 8.29261H6.71093L6.60487 3.5H7.88754ZM7.24455 10.3608C7.04347 10.3608 6.87113 10.2901 6.7275 10.1487C6.58609 10.0073 6.51538 9.83491 6.51538 9.63163C6.51538 9.43277 6.58609 9.26263 6.7275 9.12121C6.87113 8.9798 7.04347 8.90909 7.24455 8.90909C7.4412 8.90909 7.61134 8.9798 7.75496 9.12121C7.9008 9.26263 7.97371 9.43277 7.97371 9.63163C7.97371 9.76641 7.93947 9.88905 7.87097 9.99953C7.80468 10.11 7.7163 10.1984 7.60582 10.2647C7.49755 10.3288 7.37712 10.3608 7.24455 10.3608Z"
 }

From b529baa5eba3cae104d9646ed23fc3d517761e64 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Tue, 25 Apr 2023 09:01:54 +0530
Subject: [PATCH 029/101] fix: Pagination bug in chat list (#6899)

* fix: Pagination bug in chat list

* chore: Review fixes

* Improves variable namings

---------

Co-authored-by: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
---
 .../dashboard/components/ChatList.vue         | 30 +++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/app/javascript/dashboard/components/ChatList.vue b/app/javascript/dashboard/components/ChatList.vue
index c53dd926f..ecf0557e1 100644
--- a/app/javascript/dashboard/components/ChatList.vue
+++ b/app/javascript/dashboard/components/ChatList.vue
@@ -250,6 +250,9 @@ export default {
         ...filter,
         attributeName: this.$t(`FILTER.ATTRIBUTES.${filter.attributeI18nKey}`),
       })),
+      // chatsOnView is to store the chats that are currently visible on the screen,
+      // which mirrors the conversationList.
+      chatsOnView: [],
       foldersQuery: {},
       showAddFoldersModal: false,
       showDeleteFoldersModal: false,
@@ -349,18 +352,39 @@ export default {
         this.currentPageFilterKey
       );
     },
+    activeAssigneeTabCount() {
+      const { activeAssigneeTab } = this;
+      const count = this.assigneeTabItems.find(
+        item => item.key === activeAssigneeTab
+      ).count;
+      return count;
+    },
     conversationFilters() {
       return {
         inboxId: this.conversationInbox ? this.conversationInbox : undefined,
         assigneeType: this.activeAssigneeTab,
         status: this.activeStatus,
-        page: this.currentPage + 1,
+        page: this.conversationListPagination,
         labels: this.label ? [this.label] : undefined,
         teamId: this.teamId || undefined,
         conversationType: this.conversationType || undefined,
         folders: this.hasActiveFolders ? this.savedFoldersValue : undefined,
       };
     },
+    conversationListPagination() {
+      const conversationsPerPage = 25;
+      const isNoFiltersOrFoldersAndChatListNotEmpty =
+        !this.hasAppliedFiltersOrActiveFolders && this.chatsOnView !== [];
+      const isUnderPerPage =
+        this.chatsOnView.length < conversationsPerPage &&
+        this.activeAssigneeTabCount < conversationsPerPage &&
+        this.activeAssigneeTabCount > this.chatsOnView.length;
+
+      if (isNoFiltersOrFoldersAndChatListNotEmpty && isUnderPerPage) {
+        return 1;
+      }
+      return this.currentPage + 1;
+    },
     pageTitle() {
       if (this.hasAppliedFilters) {
         return this.$t('CHAT_LIST.TAB_HEADING');
@@ -402,7 +426,6 @@ export default {
       } else {
         conversationList = [...this.chatLists];
       }
-
       return conversationList;
     },
     activeFolder() {
@@ -451,6 +474,9 @@ export default {
         this.resetAndFetchData();
       }
     },
+    chatLists() {
+      this.chatsOnView = this.conversationList;
+    },
   },
   mounted() {
     this.$store.dispatch('setChatFilter', this.activeStatus);

From cf91e9eb58fcb98f7c2cd2fa4331c8e9cb63a6b4 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Tue, 25 Apr 2023 09:32:35 +0530
Subject: [PATCH 030/101] chore: Use find_each instead of .all.each (#6975)

- Enable the rubocop Rails/FindEach
- Replace the .all.each with .find_each

This should let us avoid potential memory usage.
Motivation from the speedshop newsletter by Nate Berkopec

ref: https://www.rubyinrails.com/2017/11/16/use-find-each-instead-of-all-each-in-rails/
ref: https://linear.app/chatwoot/issue/CW-1480/chore-run-all-sidekiq-jobs-async
---
 .rubocop.yml                                                  | 4 ++++
 app/jobs/account/conversations_resolution_scheduler_job.rb    | 2 +-
 app/jobs/conversations/reopen_snoozed_conversations_job.rb    | 2 +-
 app/jobs/inboxes/fetch_imap_email_inboxes_job.rb              | 2 +-
 .../update_first_response_time_in_reporting_events_job.rb     | 2 +-
 app/jobs/trigger_scheduled_items_job.rb                       | 3 ++-
 .../api/v1/accounts/bulk_actions_controller_spec.rb           | 2 +-
 spec/jobs/bulk_actions_job_spec.rb                            | 2 +-
 spec/jobs/inboxes/fetch_imap_email_inboxes_job_spec.rb        | 4 ----
 9 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 8b41dd5fd..e66d0bc16 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -71,6 +71,10 @@ Rails/ApplicationController:
     - 'app/controllers/platform_controller.rb'
     - 'app/controllers/public_controller.rb'
     - 'app/controllers/survey/responses_controller.rb'
+Rails/FindEach:
+  Enabled: true
+  Include: 
+    - 'app/**/*.rb'
 Rails/CompactBlank:
   Enabled: false
 Rails/EnvironmentVariableAccess:
diff --git a/app/jobs/account/conversations_resolution_scheduler_job.rb b/app/jobs/account/conversations_resolution_scheduler_job.rb
index d98604c27..37848db49 100644
--- a/app/jobs/account/conversations_resolution_scheduler_job.rb
+++ b/app/jobs/account/conversations_resolution_scheduler_job.rb
@@ -2,7 +2,7 @@ class Account::ConversationsResolutionSchedulerJob < ApplicationJob
   queue_as :scheduled_jobs
 
   def perform
-    Account.where.not(auto_resolve_duration: nil).all.each do |account|
+    Account.where.not(auto_resolve_duration: nil).all.find_each(batch_size: 100) do |account|
       Conversations::ResolutionJob.perform_later(account: account)
     end
   end
diff --git a/app/jobs/conversations/reopen_snoozed_conversations_job.rb b/app/jobs/conversations/reopen_snoozed_conversations_job.rb
index c11298585..6a2c0d370 100644
--- a/app/jobs/conversations/reopen_snoozed_conversations_job.rb
+++ b/app/jobs/conversations/reopen_snoozed_conversations_job.rb
@@ -2,6 +2,6 @@ class Conversations::ReopenSnoozedConversationsJob < ApplicationJob
   queue_as :low
 
   def perform
-    Conversation.where(status: :snoozed).where(snoozed_until: 3.days.ago..Time.current).all.each(&:open!)
+    Conversation.where(status: :snoozed).where(snoozed_until: 3.days.ago..Time.current).all.find_each(batch_size: 100, &:open!)
   end
 end
diff --git a/app/jobs/inboxes/fetch_imap_email_inboxes_job.rb b/app/jobs/inboxes/fetch_imap_email_inboxes_job.rb
index c9b847575..190714c1e 100644
--- a/app/jobs/inboxes/fetch_imap_email_inboxes_job.rb
+++ b/app/jobs/inboxes/fetch_imap_email_inboxes_job.rb
@@ -2,7 +2,7 @@ class Inboxes::FetchImapEmailInboxesJob < ApplicationJob
   queue_as :low
 
   def perform
-    Inbox.where(channel_type: 'Channel::Email').all.each do |inbox|
+    Inbox.where(channel_type: 'Channel::Email').all.find_each(batch_size: 100) do |inbox|
       ::Inboxes::FetchImapEmailsJob.perform_later(inbox.channel) if inbox.channel.imap_enabled
     end
   end
diff --git a/app/jobs/migration/update_first_response_time_in_reporting_events_job.rb b/app/jobs/migration/update_first_response_time_in_reporting_events_job.rb
index 0c43a0e7a..32f73910f 100644
--- a/app/jobs/migration/update_first_response_time_in_reporting_events_job.rb
+++ b/app/jobs/migration/update_first_response_time_in_reporting_events_job.rb
@@ -6,7 +6,7 @@ class Migration::UpdateFirstResponseTimeInReportingEventsJob < ApplicationJob
 
   def perform(account)
     get_conversations_with_bot_handoffs(account)
-    account.reporting_events.where(name: 'first_response').each do |event|
+    account.reporting_events.where(name: 'first_response').find_each do |event|
       conversation = event.conversation
 
       # if the conversation has a bot handoff event, we don't need to update the response_time
diff --git a/app/jobs/trigger_scheduled_items_job.rb b/app/jobs/trigger_scheduled_items_job.rb
index a3a502ec0..f51d9df9a 100644
--- a/app/jobs/trigger_scheduled_items_job.rb
+++ b/app/jobs/trigger_scheduled_items_job.rb
@@ -3,7 +3,8 @@ class TriggerScheduledItemsJob < ApplicationJob
 
   def perform
     # trigger the scheduled campaign jobs
-    Campaign.where(campaign_type: :one_off, campaign_status: :active).where(scheduled_at: 3.days.ago..Time.current).all.each do |campaign|
+    Campaign.where(campaign_type: :one_off,
+                   campaign_status: :active).where(scheduled_at: 3.days.ago..Time.current).all.find_each(batch_size: 100) do |campaign|
       Campaigns::TriggerOneoffCampaignJob.perform_later(campaign)
     end
 
diff --git a/spec/controllers/api/v1/accounts/bulk_actions_controller_spec.rb b/spec/controllers/api/v1/accounts/bulk_actions_controller_spec.rb
index 8306ec539..ec6af61be 100644
--- a/spec/controllers/api/v1/accounts/bulk_actions_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/bulk_actions_controller_spec.rb
@@ -12,7 +12,7 @@ RSpec.describe 'Api::V1::Accounts::BulkActionsController', type: :request do
     create(:conversation, account_id: account.id, status: :open, team_id: team_1.id)
     create(:conversation, account_id: account.id, status: :open)
     create(:conversation, account_id: account.id, status: :open)
-    Conversation.all.each do |conversation|
+    Conversation.all.find_each do |conversation|
       create(:inbox_member, inbox: conversation.inbox, user: agent_1)
       create(:inbox_member, inbox: conversation.inbox, user: agent_2)
     end
diff --git a/spec/jobs/bulk_actions_job_spec.rb b/spec/jobs/bulk_actions_job_spec.rb
index 2051c69b2..5e8ee8f9e 100644
--- a/spec/jobs/bulk_actions_job_spec.rb
+++ b/spec/jobs/bulk_actions_job_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe BulkActionsJob, type: :job do
   let!(:conversation_3) { create(:conversation, account_id: account.id, status: :open) }
 
   before do
-    Conversation.all.each do |conversation|
+    Conversation.all.find_each do |conversation|
       create(:inbox_member, inbox: conversation.inbox, user: agent)
     end
   end
diff --git a/spec/jobs/inboxes/fetch_imap_email_inboxes_job_spec.rb b/spec/jobs/inboxes/fetch_imap_email_inboxes_job_spec.rb
index 0b23ef9c4..df0b34aca 100644
--- a/spec/jobs/inboxes/fetch_imap_email_inboxes_job_spec.rb
+++ b/spec/jobs/inboxes/fetch_imap_email_inboxes_job_spec.rb
@@ -15,10 +15,6 @@ RSpec.describe Inboxes::FetchImapEmailInboxesJob, type: :job do
 
   context 'when called' do
     it 'fetch all the email channels' do
-      imap_email_inboxes = double
-      allow(imap_email_inboxes).to receive(:all).and_return([email_inbox])
-      allow(Inbox).to receive(:where).and_return(imap_email_inboxes)
-
       expect(Inboxes::FetchImapEmailsJob).to receive(:perform_later).with(imap_email_channel).once
 
       described_class.perform_now

From 0bbb28c4320bda87054dfcec2d53a39bbf980929 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 25 Apr 2023 09:47:47 +0530
Subject: [PATCH 031/101] feat: sort conversation on priority (#6943)

* feat: update seed script to include prioritt

* feat: add sort_handler for conversations

* test: sort on priority order

---------

Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
---
 app/models/concerns/sort_handler.rb |  8 +++++++
 lib/seeders/account_seeder.rb       |  1 +
 lib/seeders/seed_data.yml           |  7 ++++++
 spec/models/conversation_spec.rb    | 37 ++++++++++++++++++++++++-----
 4 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/app/models/concerns/sort_handler.rb b/app/models/concerns/sort_handler.rb
index 135912aad..61950f32e 100644
--- a/app/models/concerns/sort_handler.rb
+++ b/app/models/concerns/sort_handler.rb
@@ -21,5 +21,13 @@ module SortHandler
         'grouped_conversations.message_type', 'grouped_conversations.created_at ASC'
       )
     end
+
+    def self.sort_on_priority
+      order(
+        Arel::Nodes::SqlLiteral.new(
+          sanitize_sql_for_order('CASE WHEN priority IS NULL THEN 0 ELSE priority END DESC, last_activity_at DESC')
+        )
+      )
+    end
   end
 end
diff --git a/lib/seeders/account_seeder.rb b/lib/seeders/account_seeder.rb
index 7af6110d2..db8d31c37 100644
--- a/lib/seeders/account_seeder.rb
+++ b/lib/seeders/account_seeder.rb
@@ -90,6 +90,7 @@ class Seeders::AccountSeeder
                                                        inbox: contact_inbox.inbox, assignee: assignee)
     create_messages(conversation: conversation, messages: conversation_data['messages'])
     conversation.update_labels(conversation_data[:labels]) if conversation_data[:labels].present?
+    conversation.update!(priority: conversation_data[:priority]) if conversation_data[:priority].present?
   end
 
   def create_messages(conversation:, messages:)
diff --git a/lib/seeders/seed_data.yml b/lib/seeders/seed_data.yml
index 5426f4c9a..8390aa48b 100644
--- a/lib/seeders/seed_data.yml
+++ b/lib/seeders/seed_data.yml
@@ -308,6 +308,7 @@ contacts:
       conversations:
         - channel: Channel::Email
           source_id: "mpetrukd@wunderground.test"
+          priority: urgent
           messages: 
             - message_type: incoming
               content: hello world
@@ -316,6 +317,7 @@ contacts:
       gender: 'male'
       conversations:
         - channel: Channel::FacebookPage
+          priority: high
           messages: 
             - message_type: incoming
               content: "Hey there,I need some help with billing, my card is not working on the website."
@@ -324,6 +326,7 @@ contacts:
       gender: 'female'
       conversations:
         - channel: Channel::WebWidget
+          priority: high
           assignee: michael_scott@paperlayer.test
           messages: 
             - message_type: incoming
@@ -333,6 +336,7 @@ contacts:
       gender: 'female'
       conversations:
         - channel: Channel::Whatsapp
+          priority: high
           source_id: "1223423567"
           labels: 
             - billing
@@ -347,6 +351,7 @@ contacts:
       gender: 'male'
       conversations:
         - channel: Channel::WebWidget
+          priority: medium
           labels: 
             - software
             - ops-handover
@@ -358,6 +363,7 @@ contacts:
       gender: 'female'
       conversations:
         - channel: Channel::WebWidget
+          priority: low
           assignee: michael_scott@paperlayer.test
           labels: 
             - billing
@@ -371,6 +377,7 @@ contacts:
       gender: 'female'
       conversations:
         - channel: Channel::Email
+          priority: urgent
           source_id: "cmathersonj@va.test"
           assignee: michael_scott@paperlayer.test
           labels: 
diff --git a/spec/models/conversation_spec.rb b/spec/models/conversation_spec.rb
index 163c27452..bf7031cc3 100644
--- a/spec/models/conversation_spec.rb
+++ b/spec/models/conversation_spec.rb
@@ -691,15 +691,17 @@ RSpec.describe Conversation, type: :model do
   describe 'Custom Sort' do
     include ActiveJob::TestHelper
 
-    let!(:conversation_4) { create(:conversation, created_at: DateTime.now - 10.days, last_activity_at: DateTime.now - 10.days) }
-    let!(:conversation_3) { create(:conversation, created_at: DateTime.now - 9.days, last_activity_at: DateTime.now - 9.days) }
-    let!(:conversation_1) { create(:conversation, created_at: DateTime.now - 8.days, last_activity_at: DateTime.now - 8.days) }
-    let!(:conversation_2) { create(:conversation, created_at: DateTime.now - 6.days, last_activity_at: DateTime.now - 6.days) }
+    let!(:conversation_7) { create(:conversation, created_at: DateTime.now - 10.days, last_activity_at: DateTime.now - 13.days) }
+    let!(:conversation_6) { create(:conversation, created_at: DateTime.now - 10.days, last_activity_at: DateTime.now - 10.days) }
+    let!(:conversation_5) { create(:conversation, created_at: DateTime.now - 10.days, last_activity_at: DateTime.now - 12.days, priority: :urgent) }
+    let!(:conversation_4) { create(:conversation, created_at: DateTime.now - 10.days, last_activity_at: DateTime.now - 10.days, priority: :urgent) }
+    let!(:conversation_3) { create(:conversation, created_at: DateTime.now - 9.days, last_activity_at: DateTime.now - 9.days, priority: :low) }
+    let!(:conversation_2) { create(:conversation, created_at: DateTime.now - 6.days, last_activity_at: DateTime.now - 6.days, priority: :high) }
+    let!(:conversation_1) { create(:conversation, created_at: DateTime.now - 8.days, last_activity_at: DateTime.now - 8.days, priority: :medium) }
 
     it 'Sort conversations based on created_at' do
       records = described_class.sort_on_created_at
-
-      expect(records.first.id).to eq(conversation_4.id)
+      expect(records.first.id).to eq(conversation_7.id)
       expect(records.last.id).to eq(conversation_2.id)
     end
 
@@ -778,5 +780,28 @@ RSpec.describe Conversation, type: :model do
         expect(records.first.id).to eq(conversation_3.id)
       end
     end
+
+    context 'when sort on priority' do
+      it 'Sort conversations with the following order high > medium > low > nil' do
+        # ensure they are not pre-sorted
+        records = described_class.sort_on_created_at
+        expect(records.pluck(:priority)).not_to eq(['urgent', 'urgent', 'high', 'medium', 'low', nil, nil])
+
+        records = described_class.sort_on_priority
+        expect(records.pluck(:priority)).to eq(['urgent', 'urgent', 'high', 'medium', 'low', nil, nil])
+      end
+
+      it 'sorts conversation with last_activity for the same priority' do
+        records = described_class.where(priority: 'urgent').sort_on_priority
+        # ensure that the conversation 4 last_activity_at is more recent than conversation 5
+        expect(conversation_4.last_activity_at > conversation_5.last_activity_at).to be(true)
+        expect(records.pluck(:priority, :id)).to eq([['urgent', conversation_4.id], ['urgent', conversation_5.id]])
+
+        records = described_class.where(priority: nil).sort_on_priority
+        # ensure that the conversation 6 last_activity_at is more recent than conversation 7
+        expect(conversation_6.last_activity_at > conversation_7.last_activity_at).to be(true)
+        expect(records.pluck(:priority, :id)).to eq([[nil, conversation_6.id], [nil, conversation_7.id]])
+      end
+    end
   end
 end

From 5600b518ace4234a8c1bf2a52494cc52eb23e77a Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 25 Apr 2023 16:50:36 +0530
Subject: [PATCH 032/101] fix: validate `template_params` for WhatsApp (#6881)

- Add JsonSchemaValidator, which takes a declarative schema and validates it for a given property.
- Add specs for JsonSchemaValidator
- Enable the validator for template_params
---
 app/models/concerns/json_schema_validator.rb  |  84 +++++++++++++
 app/models/message.rb                         |  21 ++++
 .../whatsapp/send_on_whatsapp_service.rb      |   4 +-
 .../concerns/json_schema_validator_spec.rb    | 112 ++++++++++++++++++
 .../whatsapp/send_on_whatsapp_service_spec.rb |   1 +
 5 files changed, 221 insertions(+), 1 deletion(-)
 create mode 100644 app/models/concerns/json_schema_validator.rb
 create mode 100644 spec/models/concerns/json_schema_validator_spec.rb

diff --git a/app/models/concerns/json_schema_validator.rb b/app/models/concerns/json_schema_validator.rb
new file mode 100644
index 000000000..4ae94df12
--- /dev/null
+++ b/app/models/concerns/json_schema_validator.rb
@@ -0,0 +1,84 @@
+# This file defines a custom validator class `JsonSchemaValidator` for validating a JSON object against a schema.
+# To use this validator, define a schema as a Ruby hash and include it in the validation options when validating a model.
+# The schema should define the expected structure and types of the JSON object, as well as any validation rules.
+# Here's an example schema:
+#
+# schema = {
+#   'type' => 'object',
+#   'properties' => {
+#     'name' => { 'type' => 'string' },
+#     'age' => { 'type' => 'integer' },
+#     'is_active' => { 'type' => 'boolean' },
+#     'tags' => { 'type' => 'array' },
+#     'address' => {
+#       'type' => 'object',
+#       'properties' => {
+#         'street' => { 'type' => 'string' },
+#         'city' => { 'type' => 'string' }
+#       },
+#       'required' => ['street', 'city']
+#     }
+#   },
+#   'required': ['name', 'age']
+# }.to_json.freeze
+#
+# To validate a model using this schema, include the `JsonSchemaValidator` in the model's validations and pass the schema
+# as an option:
+#
+# class MyModel < ApplicationRecord
+#   validates_with JsonSchemaValidator, schema: schema
+# end
+
+class JsonSchemaValidator < ActiveModel::Validator
+  def validate(record)
+    # Get the attribute resolver function from options or use a default one
+    attribute_resolver = options[:attribute_resolver] || ->(rec) { rec.additional_attributes }
+
+    # Resolve the JSON data to be validated
+    json_data = attribute_resolver.call(record)
+
+    # Get the schema to be used for validation
+    schema = options[:schema]
+
+    # Create a JSONSchemer instance using the schema
+    schemer = JSONSchemer.schema(schema)
+
+    # Validate the JSON data against the schema
+    validation_errors = schemer.validate(json_data)
+
+    # Add validation errors to the record with a formatted statement
+    validation_errors.each do |error|
+      # byebug
+      format_and_append_error(error, record)
+    end
+  end
+
+  private
+
+  def format_and_append_error(error, record)
+    return handle_required(error, record) if error['type'] == 'required'
+
+    type = error['type'] == 'object' ? 'hash' : error['type']
+
+    handle_type(error, record, type)
+  end
+
+  def handle_required(error, record)
+    missing_values = error['details']['missing_keys']
+    missing_values.each do |missing|
+      record.errors.add(missing, 'is required')
+    end
+  end
+
+  def handle_type(error, record, expected_type)
+    data = get_name_from_data_pointer(error)
+    record.errors.add(data, "must be of type #{expected_type}")
+  end
+
+  def get_name_from_data_pointer(error)
+    data = error['data_pointer']
+
+    # if data starts with a "/" remove it
+    data[1..] if data[0] == '/'
+  end
+end
diff --git a/app/models/message.rb b/app/models/message.rb
index 1b1bd1479..e0e5d94a2 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -37,12 +37,33 @@ class Message < ApplicationRecord
   include Liquidable
   NUMBER_OF_PERMITTED_ATTACHMENTS = 15
 
+  TEMPLATE_PARAMS_SCHEMA = {
+    'type': 'object',
+    'properties': {
+      'template_params': {
+        'type': 'object',
+        'properties': {
+          'name': { 'type': 'string' },
+          'category': { 'type': 'string' },
+          'language': { 'type': 'string' },
+          'namespace': { 'type': 'string' },
+          'processed_params': { 'type': 'object' }
+        },
+        'required': %w[name category language namespace processed_params]
+      }
+    }
+  }.to_json.freeze
+
   before_validation :ensure_content_type
 
   validates :account_id, presence: true
   validates :inbox_id, presence: true
   validates :conversation_id, presence: true
   validates_with ContentAttributeValidator
+  validates_with JsonSchemaValidator,
+                 schema: TEMPLATE_PARAMS_SCHEMA,
+                 attribute_resolver: ->(record) { record.additional_attributes }
+
   validates :content_type, presence: true
   validates :content, length: { maximum: 150_000 }
 
diff --git a/app/services/whatsapp/send_on_whatsapp_service.rb b/app/services/whatsapp/send_on_whatsapp_service.rb
index 6b96d1731..3d843e64b 100644
--- a/app/services/whatsapp/send_on_whatsapp_service.rb
+++ b/app/services/whatsapp/send_on_whatsapp_service.rb
@@ -28,13 +28,14 @@ class Whatsapp::SendOnWhatsappService < Base::SendOnChannelService
     message.update!(source_id: message_id) if message_id.present?
   end
 
+  # rubocop:disable Metrics/CyclomaticComplexity
   def processable_channel_message_template
     if template_params.present?
       return [
         template_params['name'],
         template_params['namespace'],
         template_params['language'],
-        template_params['processed_params'].map { |_, value| { type: 'text', text: value } }
+        template_params['processed_params']&.map { |_, value| { type: 'text', text: value } }
       ]
     end
 
@@ -55,6 +56,7 @@ class Whatsapp::SendOnWhatsappService < Base::SendOnChannelService
     end
     [nil, nil, nil, nil]
   end
+  # rubocop:enable Metrics/CyclomaticComplexity
 
   def template_match_object(template)
     body_object = validated_body_object(template)
diff --git a/spec/models/concerns/json_schema_validator_spec.rb b/spec/models/concerns/json_schema_validator_spec.rb
new file mode 100644
index 000000000..77e08f53f
--- /dev/null
+++ b/spec/models/concerns/json_schema_validator_spec.rb
@@ -0,0 +1,112 @@
+require 'rails_helper'
+
+RSpec.describe JsonSchemaValidator, type: :validator do
+  schema = {
+    'type' => 'object',
+    'properties' => {
+      'name' => { 'type' => 'string' },
+      'age' => { 'type' => 'integer' },
+      'is_active' => { 'type' => 'boolean' },
+      'tags' => { 'type' => 'array' },
+      'address' => {
+        'type' => 'object',
+        'properties' => {
+          'street' => { 'type' => 'string' },
+          'city' => { 'type' => 'string' }
+        },
+        'required' => %w[street city]
+      }
+    },
+    :required => %w[name age]
+  }.to_json.freeze
+
+  # Create a simple test model for validation
+  before_all do
+    # rubocop:disable Lint/ConstantDefinitionInBlock
+    # rubocop:disable RSpec/LeakyConstantDeclaration
+    TestModelForJSONValidation = Struct.new(:additional_attributes) do
+      include ActiveModel::Validations
+
+      validates_with JsonSchemaValidator, schema: schema
+    end
+    # rubocop:enable Lint/ConstantDefinitionInBlock
+    # rubocop:enable RSpec/LeakyConstantDeclaration
+  end
+
+  context 'with valid data' do
+    let(:valid_data) do
+      {
+        'name' => 'John Doe',
+        'age' => 30,
+        'tags' => %w[tag1 tag2],
+        'is_active' => true,
+        'address' => {
+          'street' => '123 Main St',
+          'city' => 'Iceland'
+        }
+      }
+    end
+
+    it 'passes validation' do
+      model = TestModelForJSONValidation.new(valid_data)
+      expect(model.valid?).to be true
+      expect(model.errors.full_messages).to be_empty
+    end
+  end
+
+  context 'with missing required attributes' do
+    let(:invalid_data) do
+      {
+        'name' => 'John Doe',
+        'address' => {
+          'street' => '123 Main St',
+          'city' => 'Iceland'
+        }
+      }
+    end
+
+    it 'fails validation' do
+      model = TestModelForJSONValidation.new(invalid_data)
+      expect(model.valid?).to be false
+      expect(model.errors.messages).to eq({ :age => ['is required'] })
+    end
+  end
+
+  context 'with incorrect address hash' do
+    let(:invalid_data) do
+      {
+        'name' => 'John Doe',
+        'age' => 30,
+        'address' => 'not-a-hash'
+      }
+    end
+
+    it 'fails validation' do
+      model = TestModelForJSONValidation.new(invalid_data)
+      expect(model.valid?).to be false
+      expect(model.errors.messages).to eq({ :address => ['must be of type hash'] })
+    end
+  end
+
+  context 'with incorrect types' do
+    let(:invalid_data) do
+      {
+        'name' => 'John Doe',
+        'age' => '30',
+        'is_active' => 'some-value',
+        'tags' => 'not-an-array',
+        'address' => {
+          'street' => 123,
+          'city' => 'Iceland'
+        }
+      }
+    end
+
+    it 'fails validation' do
+      model = TestModelForJSONValidation.new(invalid_data)
+      expect(model.valid?).to be false
+      expect(model.errors.messages).to eq({ :age => ['must be of type integer'], :'address/street' => ['must be of type string'],
+                                            :is_active => ['must be of type boolean'], :tags => ['must be of type array'] })
+    end
+  end
+end
diff --git a/spec/services/whatsapp/send_on_whatsapp_service_spec.rb b/spec/services/whatsapp/send_on_whatsapp_service_spec.rb
index 1dc405abd..0df9316f5 100644
--- a/spec/services/whatsapp/send_on_whatsapp_service_spec.rb
+++ b/spec/services/whatsapp/send_on_whatsapp_service_spec.rb
@@ -5,6 +5,7 @@ describe Whatsapp::SendOnWhatsappService do
     name: 'sample_shipping_confirmation',
     namespace: '23423423_2342423_324234234_2343224',
     language: 'en_US',
+    category: 'Marketing',
     processed_params: { '1' => '3' }
   }
 

From 402428fb4d91f00259c672dc1523c0cb1842c336 Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Date: Tue, 25 Apr 2023 17:59:38 +0530
Subject: [PATCH 033/101] feat: Splits search api by resources to improve query
 time [cw-47] (#6942)

* feat: Splits search api by resources to improve query time

* Review fixes

* Spacing fixes

* Update app/javascript/dashboard/modules/search/components/SearchView.vue

Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>

* Review fixes

* Refactor searchview

---------

Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
---
 app/javascript/dashboard/api/search.js        |  24 ++++
 .../search/components/SearchHeader.vue        |   5 +
 .../components/SearchResultContactsList.vue   |  10 ++
 .../SearchResultConversationsList.vue         |  10 ++
 .../components/SearchResultMessagesList.vue   |  10 ++
 .../search/components/SearchResultSection.vue |  19 ++-
 .../modules/search/components/SearchView.vue  | 121 +++++++++---------
 .../store/modules/conversationSearch.js       |  95 ++++++++++++--
 .../dashboard/store/mutation-types.js         |   6 +
 9 files changed, 222 insertions(+), 78 deletions(-)

diff --git a/app/javascript/dashboard/api/search.js b/app/javascript/dashboard/api/search.js
index 2e4c3b198..7dc98dcf2 100644
--- a/app/javascript/dashboard/api/search.js
+++ b/app/javascript/dashboard/api/search.js
@@ -13,6 +13,30 @@ class SearchAPI extends ApiClient {
       },
     });
   }
+
+  contacts({ q }) {
+    return axios.get(`${this.url}/contacts`, {
+      params: {
+        q,
+      },
+    });
+  }
+
+  conversations({ q }) {
+    return axios.get(`${this.url}/conversations`, {
+      params: {
+        q,
+      },
+    });
+  }
+
+  messages({ q }) {
+    return axios.get(`${this.url}/messages`, {
+      params: {
+        q,
+      },
+    });
+  }
 }
 
 export default new SearchAPI();
diff --git a/app/javascript/dashboard/modules/search/components/SearchHeader.vue b/app/javascript/dashboard/modules/search/components/SearchHeader.vue
index 107cfbc2a..fb5c4a54e 100644
--- a/app/javascript/dashboard/modules/search/components/SearchHeader.vue
+++ b/app/javascript/dashboard/modules/search/components/SearchHeader.vue
@@ -16,6 +16,7 @@
       :title="$t('SEARCH.PLACEHOLDER_KEYBINDING')"
       :show-close="false"
       small
+      class="helper-label"
     />
   </div>
 </template>
@@ -101,4 +102,8 @@ export default {
     color: var(--s-400);
   }
 }
+
+.helper-label {
+  margin: 0;
+}
 </style>
diff --git a/app/javascript/dashboard/modules/search/components/SearchResultContactsList.vue b/app/javascript/dashboard/modules/search/components/SearchResultContactsList.vue
index 1c343451c..5bfd58247 100644
--- a/app/javascript/dashboard/modules/search/components/SearchResultContactsList.vue
+++ b/app/javascript/dashboard/modules/search/components/SearchResultContactsList.vue
@@ -3,6 +3,8 @@
     :title="$t('SEARCH.SECTION.CONTACTS')"
     :empty="!contacts.length"
     :query="query"
+    :show-title="showTitle"
+    :is-fetching="isFetching"
   >
     <ul class="search-list">
       <li v-for="contact in contacts" :key="contact.id">
@@ -39,6 +41,14 @@ export default {
       type: String,
       default: '',
     },
+    isFetching: {
+      type: Boolean,
+      default: false,
+    },
+    showTitle: {
+      type: Boolean,
+      default: true,
+    },
   },
   computed: {
     ...mapGetters({
diff --git a/app/javascript/dashboard/modules/search/components/SearchResultConversationsList.vue b/app/javascript/dashboard/modules/search/components/SearchResultConversationsList.vue
index 40a6ddb7b..6c8241e30 100644
--- a/app/javascript/dashboard/modules/search/components/SearchResultConversationsList.vue
+++ b/app/javascript/dashboard/modules/search/components/SearchResultConversationsList.vue
@@ -3,6 +3,8 @@
     :title="$t('SEARCH.SECTION.CONVERSATIONS')"
     :empty="!conversations.length"
     :query="query"
+    :show-title="showTitle || isFetching"
+    :is-fetching="isFetching"
   >
     <ul class="search-list">
       <li v-for="conversation in conversations" :key="conversation.id">
@@ -37,6 +39,14 @@ export default {
       type: String,
       default: '',
     },
+    isFetching: {
+      type: Boolean,
+      default: false,
+    },
+    showTitle: {
+      type: Boolean,
+      default: true,
+    },
   },
   computed: {
     ...mapGetters({
diff --git a/app/javascript/dashboard/modules/search/components/SearchResultMessagesList.vue b/app/javascript/dashboard/modules/search/components/SearchResultMessagesList.vue
index 53846cf89..42478ffe2 100644
--- a/app/javascript/dashboard/modules/search/components/SearchResultMessagesList.vue
+++ b/app/javascript/dashboard/modules/search/components/SearchResultMessagesList.vue
@@ -3,6 +3,8 @@
     :title="$t('SEARCH.SECTION.MESSAGES')"
     :empty="!messages.length"
     :query="query"
+    :show-title="showTitle"
+    :is-fetching="isFetching"
   >
     <ul class="search-list">
       <li v-for="message in messages" :key="message.id">
@@ -45,6 +47,14 @@ export default {
       type: String,
       default: '',
     },
+    isFetching: {
+      type: Boolean,
+      default: false,
+    },
+    showTitle: {
+      type: Boolean,
+      default: true,
+    },
   },
   computed: {
     ...mapGetters({
diff --git a/app/javascript/dashboard/modules/search/components/SearchResultSection.vue b/app/javascript/dashboard/modules/search/components/SearchResultSection.vue
index eab6f920c..ec8d343b8 100644
--- a/app/javascript/dashboard/modules/search/components/SearchResultSection.vue
+++ b/app/javascript/dashboard/modules/search/components/SearchResultSection.vue
@@ -1,10 +1,11 @@
 <template>
   <section class="result-section">
-    <div class="header">
+    <div v-if="showTitle" class="header">
       <h3 class="text-block-title">{{ title }}</h3>
     </div>
-    <slot />
-    <div v-if="empty" class="empty">
+    <woot-loading-state v-if="isFetching" :message="'Searching'" />
+    <slot v-else />
+    <div v-if="empty && !isFetching" class="empty">
       <fluent-icon icon="info" size="16px" class="icon" />
       <p class="empty-state__text">
         {{ $t('SEARCH.EMPTY_STATE', { item: titleCase, query }) }}
@@ -28,6 +29,14 @@ export default {
       type: String,
       default: '',
     },
+    showTitle: {
+      type: Boolean,
+      default: true,
+    },
+    isFetching: {
+      type: Boolean,
+      default: true,
+    },
   },
   computed: {
     titleCase() {
@@ -39,7 +48,7 @@ export default {
 
 <style scoped lang="scss">
 .result-section {
-  margin-bottom: var(--space-normal);
+  margin: var(--space-small) 0;
 }
 .search-list {
   list-style: none;
@@ -60,7 +69,7 @@ export default {
   align-items: center;
   justify-content: center;
   padding: var(--space-medium) var(--space-normal);
-  margin: 0 var(--space-small);
+  margin: var(--space-small);
   background: var(--s-25);
   border-radius: var(--border-radius-medium);
   .icon {
diff --git a/app/javascript/dashboard/modules/search/components/SearchView.vue b/app/javascript/dashboard/modules/search/components/SearchView.vue
index 819f4acec..94862a3cf 100644
--- a/app/javascript/dashboard/modules/search/components/SearchView.vue
+++ b/app/javascript/dashboard/modules/search/components/SearchView.vue
@@ -21,39 +21,44 @@
         />
       </header>
       <div class="search-results">
-        <woot-loading-state v-if="uiFlags.isFetching" :message="'Searching'" />
-        <div v-else>
-          <div v-if="all.length">
-            <search-result-contacts-list
-              v-if="filterContacts"
-              :contacts="contacts"
-              :query="query"
-            />
-            <search-result-messages-list
-              v-if="filterMessages"
-              :messages="messages"
-              :query="query"
-            />
-            <search-result-conversations-list
-              v-if="filterConversations"
-              :conversations="conversations"
-              :query="query"
-            />
-          </div>
-          <div v-else-if="showEmptySearchResults && !all.length" class="empty">
-            <fluent-icon icon="info" size="16px" class="icon" />
-            <p class="empty-state__text">
-              {{ $t('SEARCH.EMPTY_STATE_FULL', { query }) }}
-            </p>
-          </div>
-          <div v-else class="empty text-center">
-            <p class="text-center margin-bottom-0">
-              <fluent-icon icon="search" size="24px" class="icon" />
-            </p>
-            <p class="empty-state__text">
-              {{ $t('SEARCH.EMPTY_STATE_DEFAULT') }}
-            </p>
-          </div>
+        <div v-if="all.length">
+          <search-result-contacts-list
+            v-if="filterContacts"
+            :is-fetching="uiFlags.contact.isFetching"
+            :contacts="contacts"
+            :query="query"
+            :show-title="isSelectedTabAll"
+          />
+
+          <search-result-messages-list
+            v-if="filterMessages"
+            :is-fetching="uiFlags.message.isFetching"
+            :messages="messages"
+            :query="query"
+            :show-title="isSelectedTabAll"
+          />
+
+          <search-result-conversations-list
+            v-if="filterConversations"
+            :is-fetching="uiFlags.conversation.isFetching"
+            :conversations="conversations"
+            :query="query"
+            :show-title="isSelectedTabAll"
+          />
+        </div>
+        <div v-else-if="showEmptySearchResults && !all.length" class="empty">
+          <fluent-icon icon="info" size="16px" class="icon" />
+          <p class="empty-state__text">
+            {{ $t('SEARCH.EMPTY_STATE_FULL', { query }) }}
+          </p>
+        </div>
+        <div v-else class="empty text-center">
+          <p class="text-center margin-bottom-0">
+            <fluent-icon icon="search" size="24px" class="icon" />
+          </p>
+          <p class="empty-state__text">
+            {{ $t('SEARCH.EMPTY_STATE_DEFAULT') }}
+          </p>
         </div>
       </div>
     </section>
@@ -66,7 +71,6 @@ import SearchTabs from './SearchTabs.vue';
 import SearchResultConversationsList from './SearchResultConversationsList.vue';
 import SearchResultMessagesList from './SearchResultMessagesList.vue';
 import SearchResultContactsList from './SearchResultContactsList.vue';
-import { isEmptyObject } from 'dashboard/helper/commons.js';
 
 import { mixin as clickaway } from 'vue-clickaway';
 import { mapGetters } from 'vuex';
@@ -89,47 +93,40 @@ export default {
 
   computed: {
     ...mapGetters({
-      fullSearchRecords: 'conversationSearch/getFullSearchRecords',
+      contactRecords: 'conversationSearch/getContactRecords',
+      conversationRecords: 'conversationSearch/getConversationRecords',
+      messageRecords: 'conversationSearch/getMessageRecords',
       uiFlags: 'conversationSearch/getUIFlags',
     }),
     contacts() {
-      if (this.fullSearchRecords.contacts) {
-        return this.fullSearchRecords.contacts.map(contact => ({
-          ...contact,
-          type: 'contact',
-        }));
-      }
-      return [];
+      return this.contactRecords.map(contact => ({
+        ...contact,
+        type: 'contact',
+      }));
     },
     conversations() {
-      if (this.fullSearchRecords.conversations) {
-        return this.fullSearchRecords.conversations.map(conversation => ({
-          ...conversation,
-          type: 'conversation',
-        }));
-      }
-      return [];
+      return this.conversationRecords.map(conversation => ({
+        ...conversation,
+        type: 'conversation',
+      }));
     },
     messages() {
-      if (this.fullSearchRecords.messages) {
-        return this.fullSearchRecords.messages.map(message => ({
-          ...message,
-          type: 'message',
-        }));
-      }
-      return [];
+      return this.messageRecords.map(message => ({
+        ...message,
+        type: 'message',
+      }));
     },
     all() {
       return [...this.contacts, ...this.conversations, ...this.messages];
     },
     filterContacts() {
-      return this.selectedTab === 'contacts' || this.selectedTab === 'all';
+      return this.selectedTab === 'contacts' || this.isSelectedTabAll;
     },
     filterConversations() {
-      return this.selectedTab === 'conversations' || this.selectedTab === 'all';
+      return this.selectedTab === 'conversations' || this.isSelectedTabAll;
     },
     filterMessages() {
-      return this.selectedTab === 'messages' || this.selectedTab === 'all';
+      return this.selectedTab === 'messages' || this.isSelectedTabAll;
     },
     totalSearchResultsCount() {
       return (
@@ -162,10 +159,12 @@ export default {
     },
     showEmptySearchResults() {
       return (
-        this.totalSearchResultsCount === 0 &&
-        !isEmptyObject(this.fullSearchRecords)
+        this.totalSearchResultsCount === 0 && this.uiFlags.isSearchCompleted
       );
     },
+    isSelectedTabAll() {
+      return this.selectedTab === 'all';
+    },
   },
   beforeDestroy() {
     this.query = '';
diff --git a/app/javascript/dashboard/store/modules/conversationSearch.js b/app/javascript/dashboard/store/modules/conversationSearch.js
index 15b15e474..57b993cd1 100644
--- a/app/javascript/dashboard/store/modules/conversationSearch.js
+++ b/app/javascript/dashboard/store/modules/conversationSearch.js
@@ -2,9 +2,15 @@ import SearchAPI from '../../api/search';
 import types from '../mutation-types';
 export const initialState = {
   records: [],
-  fullSearchRecords: {},
+  contactRecords: [],
+  conversationRecords: [],
+  messageRecords: [],
   uiFlags: {
     isFetching: false,
+    isSearchCompleted: false,
+    contact: { isFetching: false },
+    conversation: { isFetching: false },
+    message: { isFetching: false },
   },
 };
 
@@ -12,8 +18,14 @@ export const getters = {
   getConversations(state) {
     return state.records;
   },
-  getFullSearchRecords(state) {
-    return state.fullSearchRecords;
+  getContactRecords(state) {
+    return state.contactRecords;
+  },
+  getConversationRecords(state) {
+    return state.conversationRecords;
+  },
+  getMessageRecords(state) {
+    return state.messageRecords;
   },
   getUIFlags(state) {
     return state.uiFlags;
@@ -40,23 +52,67 @@ export const actions = {
       });
     }
   },
-  async fullSearch({ commit }, { q }) {
-    commit(types.FULL_SEARCH_SET, []);
+  async fullSearch({ commit, dispatch }, { q }) {
     if (!q) {
       return;
     }
-    commit(types.FULL_SEARCH_SET_UI_FLAG, { isFetching: true });
+    commit(types.FULL_SEARCH_SET_UI_FLAG, {
+      isFetching: true,
+      isSearchCompleted: false,
+    });
     try {
-      const { data } = await SearchAPI.get({ q });
-      commit(types.FULL_SEARCH_SET, data.payload);
+      dispatch('contactSearch', { q });
+      dispatch('conversationSearch', { q });
+      dispatch('messageSearch', { q });
     } catch (error) {
       // Ignore error
     } finally {
-      commit(types.FULL_SEARCH_SET_UI_FLAG, { isFetching: false });
+      commit(types.FULL_SEARCH_SET_UI_FLAG, {
+        isFetching: false,
+        isSearchCompleted: true,
+      });
+    }
+  },
+  async contactSearch({ commit }, { q }) {
+    commit(types.CONTACT_SEARCH_SET, []);
+    commit(types.CONTACT_SEARCH_SET_UI_FLAG, { isFetching: true });
+    try {
+      const { data } = await SearchAPI.contacts({ q });
+      commit(types.CONTACT_SEARCH_SET, data.payload.contacts);
+    } catch (error) {
+      // Ignore error
+    } finally {
+      commit(types.CONTACT_SEARCH_SET_UI_FLAG, { isFetching: false });
+    }
+  },
+  async conversationSearch({ commit }, { q }) {
+    commit(types.CONVERSATION_SEARCH_SET, []);
+    commit(types.CONVERSATION_SEARCH_SET_UI_FLAG, { isFetching: true });
+    try {
+      const { data } = await SearchAPI.conversations({ q });
+      commit(types.CONVERSATION_SEARCH_SET, data.payload.conversations);
+    } catch (error) {
+      // Ignore error
+    } finally {
+      commit(types.CONVERSATION_SEARCH_SET_UI_FLAG, { isFetching: false });
+    }
+  },
+  async messageSearch({ commit }, { q }) {
+    commit(types.MESSAGE_SEARCH_SET, []);
+    commit(types.MESSAGE_SEARCH_SET_UI_FLAG, { isFetching: true });
+    try {
+      const { data } = await SearchAPI.messages({ q });
+      commit(types.MESSAGE_SEARCH_SET, data.payload.messages);
+    } catch (error) {
+      // Ignore error
+    } finally {
+      commit(types.MESSAGE_SEARCH_SET_UI_FLAG, { isFetching: false });
     }
   },
   async clearSearchResults({ commit }) {
-    commit(types.FULL_SEARCH_SET, {});
+    commit(types.MESSAGE_SEARCH_SET, []);
+    commit(types.CONVERSATION_SEARCH_SET, []);
+    commit(types.CONTACT_SEARCH_SET, []);
   },
 };
 
@@ -64,8 +120,14 @@ export const mutations = {
   [types.SEARCH_CONVERSATIONS_SET](state, records) {
     state.records = records;
   },
-  [types.FULL_SEARCH_SET](state, records) {
-    state.fullSearchRecords = records;
+  [types.CONTACT_SEARCH_SET](state, records) {
+    state.contactRecords = records;
+  },
+  [types.CONVERSATION_SEARCH_SET](state, records) {
+    state.conversationRecords = records;
+  },
+  [types.MESSAGE_SEARCH_SET](state, records) {
+    state.messageRecords = records;
   },
   [types.SEARCH_CONVERSATIONS_SET_UI_FLAG](state, uiFlags) {
     state.uiFlags = { ...state.uiFlags, ...uiFlags };
@@ -73,6 +135,15 @@ export const mutations = {
   [types.FULL_SEARCH_SET_UI_FLAG](state, uiFlags) {
     state.uiFlags = { ...state.uiFlags, ...uiFlags };
   },
+  [types.CONTACT_SEARCH_SET_UI_FLAG](state, uiFlags) {
+    state.uiFlags.contact = { ...state.uiFlags.contact, ...uiFlags };
+  },
+  [types.CONVERSATION_SEARCH_SET_UI_FLAG](state, uiFlags) {
+    state.uiFlags.conversation = { ...state.uiFlags.conversation, ...uiFlags };
+  },
+  [types.MESSAGE_SEARCH_SET_UI_FLAG](state, uiFlags) {
+    state.uiFlags.message = { ...state.uiFlags.message, ...uiFlags };
+  },
 };
 
 export default {
diff --git a/app/javascript/dashboard/store/mutation-types.js b/app/javascript/dashboard/store/mutation-types.js
index bb9d8221f..3938061b9 100644
--- a/app/javascript/dashboard/store/mutation-types.js
+++ b/app/javascript/dashboard/store/mutation-types.js
@@ -269,6 +269,12 @@ export default {
 
   // Full Search
   FULL_SEARCH_SET: 'FULL_SEARCH_SET',
+  CONTACT_SEARCH_SET: 'CONTACT_SEARCH_SET',
+  CONTACT_SEARCH_SET_UI_FLAG: 'CONTACT_SEARCH_SET_UI_FLAG',
+  CONVERSATION_SEARCH_SET: 'CONVERSATION_SEARCH_SET',
+  CONVERSATION_SEARCH_SET_UI_FLAG: 'CONVERSATION_SEARCH_SET_UI_FLAG',
+  MESSAGE_SEARCH_SET: 'MESSAGE_SEARCH_SET',
+  MESSAGE_SEARCH_SET_UI_FLAG: 'MESSAGE_SEARCH_SET_UI_FLAG',
   FULL_SEARCH_SET_UI_FLAG: 'FULL_SEARCH_SET_UI_FLAG',
   SET_CONVERSATION_PARTICIPANTS_UI_FLAG:
     'SET_CONVERSATION_PARTICIPANTS_UI_FLAG',

From d95283f5c298d74b4f3f72288fac662710a7c1d9 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 25 Apr 2023 22:28:19 +0530
Subject: [PATCH 034/101] feat: improvements to priority  (#6981)

* fix: colors for urgent icon

* feat: trigger updated event on priority change

* fix: specs
---
 .../components/widgets/conversation/PriorityMark.vue        | 6 ++++--
 app/models/conversation.rb                                  | 6 +++---
 app/presenters/conversations/event_data_presenter.rb        | 1 +
 spec/models/conversation_spec.rb                            | 1 +
 spec/presenters/conversations/event_data_presenter_spec.rb  | 1 +
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/javascript/dashboard/components/widgets/conversation/PriorityMark.vue b/app/javascript/dashboard/components/widgets/conversation/PriorityMark.vue
index 9f8237397..a9fba98f0 100644
--- a/app/javascript/dashboard/components/widgets/conversation/PriorityMark.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/PriorityMark.vue
@@ -48,15 +48,17 @@ export default {
 <style scoped lang="scss">
 .conversation-priority-mark {
   align-items: center;
+  flex-shrink: 0;
   background: var(--s-50);
   border-radius: var(--border-radius-small);
   color: var(--s-600);
   display: inline-flex;
   width: var(--space-snug);
+  height: var(--space-snug);
 
   &.urgent {
-    background: var(--r-500);
-    color: var(--w-25);
+    background: var(--r-50);
+    color: var(--r-500);
   }
 }
 </style>
diff --git a/app/models/conversation.rb b/app/models/conversation.rb
index 299a7f2a5..fa59e8d24 100644
--- a/app/models/conversation.rb
+++ b/app/models/conversation.rb
@@ -221,14 +221,14 @@ class Conversation < ApplicationRecord
   end
 
   def notify_conversation_updation
-    return unless previous_changes.keys.present? && whitelisted_keys?
+    return unless previous_changes.keys.present? && allowed_keys?
 
     dispatcher_dispatch(CONVERSATION_UPDATED, previous_changes)
   end
 
-  def whitelisted_keys?
+  def allowed_keys?
     (
-      (previous_changes.keys & %w[team_id assignee_id status snoozed_until custom_attributes label_list first_reply_created_at]).present? ||
+      (previous_changes.keys & %w[team_id assignee_id status snoozed_until custom_attributes label_list first_reply_created_at priority]).present? ||
       (previous_changes['additional_attributes'].present? && (previous_changes['additional_attributes'][1].keys & %w[conversation_language]).present?)
     )
   end
diff --git a/app/presenters/conversations/event_data_presenter.rb b/app/presenters/conversations/event_data_presenter.rb
index f3d9cdfe7..0eabad899 100644
--- a/app/presenters/conversations/event_data_presenter.rb
+++ b/app/presenters/conversations/event_data_presenter.rb
@@ -15,6 +15,7 @@ class Conversations::EventDataPresenter < SimpleDelegator
       snoozed_until: snoozed_until,
       unread_count: unread_incoming_messages.count,
       first_reply_created_at: first_reply_created_at,
+      priority: priority,
       **push_timestamps
     }
   end
diff --git a/spec/models/conversation_spec.rb b/spec/models/conversation_spec.rb
index bf7031cc3..514fb80c5 100644
--- a/spec/models/conversation_spec.rb
+++ b/spec/models/conversation_spec.rb
@@ -518,6 +518,7 @@ RSpec.describe Conversation, type: :model do
         contact_last_seen_at: conversation.contact_last_seen_at.to_i,
         agent_last_seen_at: conversation.agent_last_seen_at.to_i,
         created_at: conversation.created_at.to_i,
+        priority: nil,
         unread_count: 0
       }
     end
diff --git a/spec/presenters/conversations/event_data_presenter_spec.rb b/spec/presenters/conversations/event_data_presenter_spec.rb
index 874ed54bf..15ada3e32 100644
--- a/spec/presenters/conversations/event_data_presenter_spec.rb
+++ b/spec/presenters/conversations/event_data_presenter_spec.rb
@@ -31,6 +31,7 @@ RSpec.describe Conversations::EventDataPresenter do
         contact_last_seen_at: conversation.contact_last_seen_at.to_i,
         agent_last_seen_at: conversation.agent_last_seen_at.to_i,
         created_at: conversation.created_at.to_i,
+        priority: nil,
         unread_count: 0
       }
     end

From 2f2cdd7e7c6fae5d41ed28128657cc84812f8d1d Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Date: Tue, 25 Apr 2023 22:38:36 +0530
Subject: [PATCH 035/101] feat: Hides dismissed campaigns while browsing 
 [cw-33] (#6842)

* Chore: moves localstorage helper as a shared utility and refactors constants

* Refactors constants file

* feat: Hides dismissed campaigns while browsing

* Snoozes all campaigns for an hour after dismissing

* Fixes error with date parsing

* Snooze ongoing campaigns

* Review fixes

---------

Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
---
 app/javascript/sdk/IFrameHelper.js             | 15 +++++++++++++++
 app/javascript/widget/App.vue                  | 18 +++++++++++++++++-
 .../widget/components/UnreadMessageList.vue    |  5 +----
 app/javascript/widget/views/Campaigns.vue      | 14 +++++++++++++-
 app/javascript/widget/views/UnreadMessages.vue | 10 +++++++++-
 5 files changed, 55 insertions(+), 7 deletions(-)

diff --git a/app/javascript/sdk/IFrameHelper.js b/app/javascript/sdk/IFrameHelper.js
index 8f4e85bae..9ded2c9bf 100644
--- a/app/javascript/sdk/IFrameHelper.js
+++ b/app/javascript/sdk/IFrameHelper.js
@@ -36,6 +36,7 @@ import {
 } from 'shared/helpers/AudioNotificationHelper';
 import { isFlatWidgetStyle } from './settingsHelper';
 import { popoutChatWindow } from '../widget/helpers/popoutHelper';
+import addHours from 'date-fns/addHours';
 
 const updateAuthCookie = cookieContent =>
   Cookies.set('cw_conversation', cookieContent, {
@@ -43,6 +44,14 @@ const updateAuthCookie = cookieContent =>
     sameSite: 'Lax',
   });
 
+const updateCampaignReadStatus = () => {
+  const expireBy = addHours(new Date(), 1);
+  Cookies.set('cw_snooze_campaigns_till', Number(expireBy), {
+    expires: expireBy,
+    sameSite: 'Lax',
+  });
+};
+
 export const IFrameHelper = {
   getUrl({ baseUrl, websiteToken }) {
     return `${baseUrl}/widget?website_token=${websiteToken}`;
@@ -147,6 +156,7 @@ export const IFrameHelper = {
     loaded: message => {
       updateAuthCookie(message.config.authToken);
       window.$chatwoot.hasLoaded = true;
+      const campaignsSnoozedTill = Cookies.get('cw_snooze_campaigns_till');
       IFrameHelper.sendMessage('config-set', {
         locale: window.$chatwoot.locale,
         position: window.$chatwoot.position,
@@ -154,6 +164,7 @@ export const IFrameHelper = {
         showPopoutButton: window.$chatwoot.showPopoutButton,
         widgetStyle: window.$chatwoot.widgetStyle,
         darkMode: window.$chatwoot.darkMode,
+        campaignsSnoozedTill,
       });
       IFrameHelper.onLoad({
         widgetColor: message.config.channelConfig.widgetColor,
@@ -192,6 +203,10 @@ export const IFrameHelper = {
       updateAuthCookie(widgetAuthToken);
     },
 
+    setCampaignReadOn() {
+      updateCampaignReadStatus();
+    },
+
     toggleBubble: state => {
       let bubbleState = {};
       if (state === 'open') {
diff --git a/app/javascript/widget/App.vue b/app/javascript/widget/App.vue
index a6d627fca..7d158eb74 100755
--- a/app/javascript/widget/App.vue
+++ b/app/javascript/widget/App.vue
@@ -22,6 +22,7 @@
 <script>
 import { mapGetters, mapActions } from 'vuex';
 import { setHeader } from 'widget/helpers/axios';
+import addHours from 'date-fns/addHours';
 import { IFrameHelper, RNHelper } from 'widget/helpers/utils';
 import configMixin from './mixins/configMixin';
 import availabilityMixin from 'widget/mixins/availability';
@@ -50,6 +51,7 @@ export default {
   data() {
     return {
       isMobile: false,
+      campaignsSnoozedTill: undefined,
     };
   },
   computed: {
@@ -179,11 +181,19 @@ export default {
         this.executeCampaign({ campaignId, websiteToken, customAttributes });
         this.replaceRoute('messages');
       });
+      bus.$on('snooze-campaigns', () => {
+        const expireBy = addHours(new Date(), 1);
+        this.campaignsSnoozedTill = Number(expireBy);
+      });
     },
     setCampaignView() {
       const { messageCount, activeCampaign } = this;
+      const shouldSnoozeCampaign =
+        this.campaignsSnoozedTill && this.campaignsSnoozedTill > Date.now();
       const isCampaignReadyToExecute =
-        !isEmptyObject(activeCampaign) && !messageCount;
+        !isEmptyObject(activeCampaign) &&
+        !messageCount &&
+        !shouldSnoozeCampaign;
       if (this.isIFrame && isCampaignReadyToExecute) {
         this.replaceRoute('campaigns').then(() => {
           this.setIframeHeight(true);
@@ -243,6 +253,7 @@ export default {
           this.fetchAvailableAgents(websiteToken);
           this.setAppConfig(message);
           this.$store.dispatch('contacts/get');
+          this.setCampaignReadData(message.campaignsSnoozedTill);
         } else if (message.event === 'widget-visible') {
           this.scrollConversationToBottom();
         } else if (message.event === 'change-url') {
@@ -320,6 +331,11 @@ export default {
     sendRNWebViewLoadedEvent() {
       RNHelper.sendMessage(loadedEventConfig());
     },
+    setCampaignReadData(snoozedTill) {
+      if (snoozedTill) {
+        this.campaignsSnoozedTill = Number(snoozedTill);
+      }
+    },
   },
 };
 </script>
diff --git a/app/javascript/widget/components/UnreadMessageList.vue b/app/javascript/widget/components/UnreadMessageList.vue
index d43c09302..4ea9e3f00 100644
--- a/app/javascript/widget/components/UnreadMessageList.vue
+++ b/app/javascript/widget/components/UnreadMessageList.vue
@@ -45,7 +45,6 @@
 </template>
 
 <script>
-import { IFrameHelper } from 'widget/helpers/utils';
 import { mapGetters } from 'vuex';
 import configMixin from '../mixins/configMixin';
 import { ON_UNREAD_MESSAGE_CLICK } from '../constants/widgetBusEvents';
@@ -84,9 +83,7 @@ export default {
       bus.$emit(ON_UNREAD_MESSAGE_CLICK);
     },
     closeFullView() {
-      if (IFrameHelper.isIFrame()) {
-        IFrameHelper.sendMessage({ event: 'toggleBubble' });
-      }
+      this.$emit('close');
     },
     getMessageContent(message) {
       const { attachments, content } = message;
diff --git a/app/javascript/widget/views/Campaigns.vue b/app/javascript/widget/views/Campaigns.vue
index 6bd28b7fa..2552c6f43 100644
--- a/app/javascript/widget/views/Campaigns.vue
+++ b/app/javascript/widget/views/Campaigns.vue
@@ -1,9 +1,10 @@
 <template>
-  <unread-message-list :messages="messages" />
+  <unread-message-list :messages="messages" @close="closeFullView" />
 </template>
 
 <script>
 import { mapGetters } from 'vuex';
+import { IFrameHelper } from 'widget/helpers/utils';
 import UnreadMessageList from '../components/UnreadMessageList.vue';
 
 export default {
@@ -24,5 +25,16 @@ export default {
       ];
     },
   },
+  methods: {
+    closeFullView() {
+      if (IFrameHelper.isIFrame()) {
+        IFrameHelper.sendMessage({
+          event: 'setCampaignReadOn',
+        });
+        IFrameHelper.sendMessage({ event: 'toggleBubble' });
+        bus.$emit('snooze-campaigns');
+      }
+    },
+  },
 };
 </script>
diff --git a/app/javascript/widget/views/UnreadMessages.vue b/app/javascript/widget/views/UnreadMessages.vue
index d7e52a382..c37b0763c 100644
--- a/app/javascript/widget/views/UnreadMessages.vue
+++ b/app/javascript/widget/views/UnreadMessages.vue
@@ -1,9 +1,10 @@
 <template>
-  <unread-message-list :messages="messages" />
+  <unread-message-list :messages="messages" @close="closeFullView" />
 </template>
 
 <script>
 import { mapGetters } from 'vuex';
+import { IFrameHelper } from 'widget/helpers/utils';
 import UnreadMessageList from '../components/UnreadMessageList.vue';
 
 export default {
@@ -16,5 +17,12 @@ export default {
       messages: 'conversation/getUnreadTextMessages',
     }),
   },
+  methods: {
+    closeFullView() {
+      if (IFrameHelper.isIFrame()) {
+        IFrameHelper.sendMessage({ event: 'toggleBubble' });
+      }
+    },
+  },
 };
 </script>

From af971c9b18a6b6556856a8a4cb4509dd8afcf08e Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Wed, 26 Apr 2023 08:46:30 +0530
Subject: [PATCH 036/101] fix: whatsapp template params validation (#6986)

---
 app/models/message.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/message.rb b/app/models/message.rb
index e0e5d94a2..00107c7cc 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -49,7 +49,7 @@ class Message < ApplicationRecord
           'namespace': { 'type': 'string' },
           'processed_params': { 'type': 'object' }
         },
-        'required': %w[name category language namespace processed_params]
+        'required': %w[name]
       }
     }
   }.to_json.freeze

From 92705723f1dfcb9e0c246742427f13aa4f74a2b4 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Tue, 25 Apr 2023 20:17:15 -0700
Subject: [PATCH 037/101] fix: Add /api/v1 to the team_members API
 documentation (#6987)

---
 swagger/paths/index.yml | 2 +-
 swagger/swagger.json    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/swagger/paths/index.yml b/swagger/paths/index.yml
index daa311528..6a42fc37e 100644
--- a/swagger/paths/index.yml
+++ b/swagger/paths/index.yml
@@ -382,7 +382,7 @@
     $ref: ./application/teams/update.yml
   delete:
     $ref: ./application/teams/delete.yml
-/accounts/{account_id}/teams/{team_id}/team_members:
+/api/v1/accounts/{account_id}/teams/{team_id}/team_members:
   parameters:
     - $ref: '#/parameters/account_id'
     - $ref: '#/parameters/team_id'
diff --git a/swagger/swagger.json b/swagger/swagger.json
index 705195f1c..62a7d673e 100644
--- a/swagger/swagger.json
+++ b/swagger/swagger.json
@@ -3980,7 +3980,7 @@
         }
       }
     },
-    "/accounts/{account_id}/teams/{team_id}/team_members": {
+    "/api/v1/accounts/{account_id}/teams/{team_id}/team_members": {
       "parameters": [
         {
           "$ref": "#/parameters/account_id"

From cef1f97d18b15dbb87978d7a48c55554a0e797b8 Mon Sep 17 00:00:00 2001
From: Hricha Shandily <103104754+Hricha-Shandily@users.noreply.github.com>
Date: Wed, 26 Apr 2023 10:32:15 +0530
Subject: [PATCH 038/101] feat: update product copy [CWM-45] (#6372)

* chore: Update non-logged-in-page copy

* Update app/javascript/dashboard/i18n/locale/en/login.json

Co-authored-by: Pranav Raj S <pranav@chatwoot.com>

* Update app/javascript/dashboard/i18n/locale/en/signup.json

* Update app/javascript/dashboard/i18n/locale/en/signup.json

---------

Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
---
 .../dashboard/i18n/locale/en/login.json       |  8 +++----
 .../i18n/locale/en/resetPassword.json         | 10 ++++----
 .../i18n/locale/en/setNewPassword.json        | 12 +++++-----
 .../dashboard/i18n/locale/en/signup.json      | 24 +++++++++----------
 4 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/app/javascript/dashboard/i18n/locale/en/login.json b/app/javascript/dashboard/i18n/locale/en/login.json
index 25c956a81..f2b2f51b9 100644
--- a/app/javascript/dashboard/i18n/locale/en/login.json
+++ b/app/javascript/dashboard/i18n/locale/en/login.json
@@ -3,16 +3,16 @@
     "TITLE": "Login to Chatwoot",
     "EMAIL": {
       "LABEL": "Email",
-      "PLACEHOLDER": "Email eg: someone@example.com"
+      "PLACEHOLDER": "example@companyname.com"
     },
     "PASSWORD": {
       "LABEL": "Password",
       "PLACEHOLDER": "Password"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Login Successful",
-      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later",
-      "UNAUTH": "Username / Password Incorrect. Please try again"
+      "SUCCESS_MESSAGE": "Login successful",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again.",
+      "UNAUTH": "Username or password is incorrect. Please try again."
     },
     "OAUTH": {
       "GOOGLE_LOGIN": "Login with Google",
diff --git a/app/javascript/dashboard/i18n/locale/en/resetPassword.json b/app/javascript/dashboard/i18n/locale/en/resetPassword.json
index bb678e809..37aa1860a 100644
--- a/app/javascript/dashboard/i18n/locale/en/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/en/resetPassword.json
@@ -1,14 +1,14 @@
 {
   "RESET_PASSWORD": {
-    "TITLE": "Reset Password",
+    "TITLE": "Reset password",
     "EMAIL": {
       "LABEL": "Email",
-      "PLACEHOLDER": "Please enter your email",
-      "ERROR": "Please enter a valid email"
+      "PLACEHOLDER": "Please enter your email.",
+      "ERROR": "Please enter a valid email."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Password reset link has been sent to your email",
-      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      "SUCCESS_MESSAGE": "Password reset link has been sent to your email.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Submit"
   }
diff --git a/app/javascript/dashboard/i18n/locale/en/setNewPassword.json b/app/javascript/dashboard/i18n/locale/en/setNewPassword.json
index ec2d94744..4908dad02 100644
--- a/app/javascript/dashboard/i18n/locale/en/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/en/setNewPassword.json
@@ -1,19 +1,19 @@
 {
   "SET_NEW_PASSWORD": {
-    "TITLE": "Set New Password",
+    "TITLE": "Set new password",
     "PASSWORD": {
       "LABEL": "Password",
       "PLACEHOLDER": "Password",
-      "ERROR": "Password is too short"
+      "ERROR": "Password is too short."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirm Password",
+      "LABEL": "Confirm password",
       "PLACEHOLDER": "Confirm Password",
-      "ERROR": "Passwords do not match"
+      "ERROR": "Passwords do not match."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Successfully changed the password",
-      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      "SUCCESS_MESSAGE": "Successfully changed the password.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "CAPTCHA": {
       "ERROR": "Verification expired. Please solve captcha again."
diff --git a/app/javascript/dashboard/i18n/locale/en/signup.json b/app/javascript/dashboard/i18n/locale/en/signup.json
index 10ddc5b86..1ad4865ff 100644
--- a/app/javascript/dashboard/i18n/locale/en/signup.json
+++ b/app/javascript/dashboard/i18n/locale/en/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Company name",
-      "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
-      "ERROR": "Company name is too short"
+      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
+      "ERROR": "Company name is too short."
     },
     "FULL_NAME": {
       "LABEL": "Full name",
-      "PLACEHOLDER": "Enter your full name. eg: Bruce Wayne",
-      "ERROR": "Full name is too short"
+      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
+      "ERROR": "Full name is too short."
     },
     "EMAIL": {
       "LABEL": "Work email",
-      "PLACEHOLDER": "Enter your work email address. eg: bruce@wayne.enterprises",
-      "ERROR": "Please enter a valid work email address"
+      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
+      "ERROR": "Please enter a valid work email address."
     },
     "PASSWORD": {
       "LABEL": "Password",
       "PLACEHOLDER": "Password",
-      "ERROR": "Password is too short",
-      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
+      "ERROR": "Password is too short.",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirm Password",
-      "PLACEHOLDER": "Confirm Password",
-      "ERROR": "Password doesnot match"
+      "LABEL": "Confirm password",
+      "PLACEHOLDER": "Confirm password",
+      "ERROR": "Password doesnot match."
     },
     "API": {
       "SUCCESS_MESSAGE": "Registration Successfull",
-      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Create account",
     "HAVE_AN_ACCOUNT": "Already have an account?"

From 5d30dabf9769ee047bdf1d4a1263c974204ef4f7 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Wed, 26 Apr 2023 13:29:01 +0530
Subject: [PATCH 039/101] feat: Command bar action for priority (#6989)

* Add command action for priority assignment

* Fix icon path

* Update conversationHotKeys.js
---
 .../i18n/locale/en/generalSettings.json       |  2 +
 .../dashboard/commands/CommandBarIcons.js     | 33 ++++++++++
 .../dashboard/commands/conversationHotKeys.js | 63 +++++++++++++++++++
 3 files changed, 98 insertions(+)

diff --git a/app/javascript/dashboard/i18n/locale/en/generalSettings.json b/app/javascript/dashboard/i18n/locale/en/generalSettings.json
index 367b35b1c..7ed6d8925 100644
--- a/app/javascript/dashboard/i18n/locale/en/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/en/generalSettings.json
@@ -101,6 +101,7 @@
       "REPORTS": "Reports",
       "CONVERSATION": "Conversation",
       "CHANGE_ASSIGNEE": "Change Assignee",
+      "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Change Team",
       "ADD_LABEL": "Add label to the conversation",
       "REMOVE_LABEL": "Remove label from the conversation",
@@ -126,6 +127,7 @@
       "GO_TO_NOTIFICATIONS": "Go to Notifications",
       "ADD_LABELS_TO_CONVERSATION": "Add label to the conversation",
       "ASSIGN_AN_AGENT": "Assign an agent",
+      "ASSIGN_PRIORITY": "Assign priority",
       "ASSIGN_A_TEAM": "Assign a team",
       "MUTE_CONVERSATION": "Mute conversation",
       "UNMUTE_CONVERSATION": "Unmute conversation",
diff --git a/app/javascript/dashboard/routes/dashboard/commands/CommandBarIcons.js b/app/javascript/dashboard/routes/dashboard/commands/CommandBarIcons.js
index d0d0bb633..4a4bd9cf0 100644
--- a/app/javascript/dashboard/routes/dashboard/commands/CommandBarIcons.js
+++ b/app/javascript/dashboard/routes/dashboard/commands/CommandBarIcons.js
@@ -26,3 +26,36 @@ export const ICON_LABELS = `<svg role="img" class="ninja-icon ninja-icon--fluent
 export const ICON_ACCOUNT_SETTINGS = `<svg role="img" class="ninja-icon ninja-icon--fluent" width="18" height="18" fill="none" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M8.75 3h6.5a.75.75 0 0 1 .743.648L16 3.75V7h1.75A3.25 3.25 0 0 1 21 10.25v6.5A3.25 3.25 0 0 1 17.75 20H6.25A3.25 3.25 0 0 1 3 16.75v-6.5A3.25 3.25 0 0 1 6.25 7H8V3.75a.75.75 0 0 1 .648-.743L8.75 3h6.5-6.5Zm9 5.5H6.25a1.75 1.75 0 0 0-1.75 1.75v6.5c0 .966.784 1.75 1.75 1.75h11.5a1.75 1.75 0 0 0 1.75-1.75v-6.5a1.75 1.75 0 0 0-1.75-1.75Zm-3.25-4h-5V7h5V4.5Z" fill="currentColor"/></svg>`;
 export const ICON_INBOXES = `<svg role="img" class="ninja-icon ninja-icon--fluent" width="18" height="18" fill="none" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M6.25 3h11.5a3.25 3.25 0 0 1 3.245 3.066L21 6.25v11.5a3.25 3.25 0 0 1-3.066 3.245L17.75 21H6.25a3.25 3.25 0 0 1-3.245-3.066L3 17.75V6.25a3.25 3.25 0 0 1 3.066-3.245L6.25 3h11.5-11.5ZM4.5 14.5v3.25a1.75 1.75 0 0 0 1.606 1.744l.144.006h11.5a1.75 1.75 0 0 0 1.744-1.607l.006-.143V14.5h-3.825a3.752 3.752 0 0 1-3.475 2.995l-.2.005a3.752 3.752 0 0 1-3.632-2.812l-.043-.188H4.5v3.25-3.25Zm13.25-10H6.25a1.75 1.75 0 0 0-1.744 1.606L4.5 6.25V13H9a.75.75 0 0 1 .743.648l.007.102a2.25 2.25 0 0 0 4.495.154l.005-.154a.75.75 0 0 1 .648-.743L15 13h4.5V6.25a1.75 1.75 0 0 0-1.607-1.744L17.75 4.5Z" fill="currentColor"/></svg>`;
 export const ICON_APPS = `<svg role="img" class="ninja-icon ninja-icon--fluent" width="18" height="18" fill="none" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m18.492 2.33 3.179 3.179a2.25 2.25 0 0 1 0 3.182l-2.584 2.584A2.25 2.25 0 0 1 21 13.5v5.25A2.25 2.25 0 0 1 18.75 21H5.25A2.25 2.25 0 0 1 3 18.75V5.25A2.25 2.25 0 0 1 5.25 3h5.25a2.25 2.25 0 0 1 2.225 1.915L15.31 2.33a2.25 2.25 0 0 1 3.182 0ZM4.5 18.75c0 .414.336.75.75.75l5.999-.001.001-6.75H4.5v6Zm8.249.749h6.001a.75.75 0 0 0 .75-.75V13.5a.75.75 0 0 0-.75-.75h-6.001v6.75Zm-2.249-15H5.25a.75.75 0 0 0-.75.75v6h6.75v-6a.75.75 0 0 0-.75-.75Zm2.25 4.81v1.94h1.94l-1.94-1.94Zm3.62-5.918-3.178 3.178a.75.75 0 0 0 0 1.061l3.179 3.179a.75.75 0 0 0 1.06 0l3.18-3.179a.75.75 0 0 0 0-1.06l-3.18-3.18a.75.75 0 0 0-1.06 0Z" fill="currentColor"/></svg>`;
+export const ICON_ASSIGN_PRIORITY = `<svg role="img" class="ninja-icon ninja-icon--fluent" xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 20 20"><path fill="currentColor" d="M9.562 3.262a.5.5 0 0 1 .879 0l6.5 12a.5.5 0 0 1-.44.739H3.5a.5.5 0 0 1-.44-.739l6.503-12Zm1.758-.477c-.567-1.047-2.07-1.047-2.638 0L2.18 14.786a1.5 1.5 0 0 0 1.32 2.215h13.002a1.5 1.5 0 0 0 1.319-2.215l-6.5-12ZM10.5 7.5a.5.5 0 1 0-1 0v4a.5.5 0 0 0 1 0v-4Zm.25 6.25a.75.75 0 1 1-1.5 0a.75.75 0 0 1 1.5 0Z"/></svg>`;
+export const ICON_PRIORITY_URGENT = `<svg role="img" class="ninja-icon ninja-icon--fluent" width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="24" height="24" fill="#FFEBEE"/>
+<path d="M8 8.5C8 7.94772 8.44772 7.5 9 7.5C9.55228 7.5 10 7.94772 10 8.5V13C10 13.5523 9.55228 14 9 14C8.44772 14 8 13.5523 8 13V8.5Z" fill="#FF382D"/>
+<path d="M8 15.5C8 14.9477 8.44772 14.5 9 14.5C9.55228 14.5 10 14.9477 10 15.5C10 16.0523 9.55228 16.5 9 16.5C8.44772 16.5 8 16.0523 8 15.5Z" fill="#FF382D"/>
+<path d="M11 8.5C11 7.94772 11.4477 7.5 12 7.5C12.5523 7.5 13 7.94772 13 8.5V13C13 13.5523 12.5523 14 12 14C11.4477 14 11 13.5523 11 13V8.5Z" fill="#FF382D"/>
+<path d="M11 15.5C11 14.9477 11.4477 14.5 12 14.5C12.5523 14.5 13 14.9477 13 15.5C13 16.0523 12.5523 16.5 12 16.5C11.4477 16.5 11 16.0523 11 15.5Z" fill="#FF382D"/>
+<path d="M14 8.5C14 7.94772 14.4477 7.5 15 7.5C15.5523 7.5 16 7.94772 16 8.5V13C16 13.5523 15.5523 14 15 14C14.4477 14 14 13.5523 14 13V8.5Z" fill="#FF382D"/>
+<path d="M14 15.5C14 14.9477 14.4477 14.5 15 14.5C15.5523 14.5 16 14.9477 16 15.5C16 16.0523 15.5523 16.5 15 16.5C14.4477 16.5 14 16.0523 14 15.5Z" fill="#FF382D"/>
+</svg>
+`;
+export const ICON_PRIORITY_HIGH = `<svg role="img" class="ninja-icon ninja-icon--fluent" width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="24" height="24" fill="#F1F5F8"/>
+<path d="M9.7642 8L9.62358 14.1619H8.25142L8.11506 8H9.7642ZM8.9375 16.821C8.67898 16.821 8.45739 16.7301 8.27273 16.5483C8.09091 16.3665 8 16.1449 8 15.8835C8 15.6278 8.09091 15.4091 8.27273 15.2273C8.45739 15.0455 8.67898 14.9545 8.9375 14.9545C9.19034 14.9545 9.40909 15.0455 9.59375 15.2273C9.78125 15.4091 9.875 15.6278 9.875 15.8835C9.875 16.0568 9.83097 16.2145 9.7429 16.3565C9.65767 16.4986 9.54403 16.6122 9.40199 16.6974C9.26278 16.7798 9.10795 16.821 8.9375 16.821Z" fill="#446888"/>
+<path d="M13.1073 8L12.9667 14.1619H11.5945L11.4582 8H13.1073ZM12.2806 16.821C12.0221 16.821 11.8005 16.7301 11.6159 16.5483C11.434 16.3665 11.3431 16.1449 11.3431 15.8835C11.3431 15.6278 11.434 15.4091 11.6159 15.2273C11.8005 15.0455 12.0221 14.9545 12.2806 14.9545C12.5335 14.9545 12.7522 15.0455 12.9369 15.2273C13.1244 15.4091 13.2181 15.6278 13.2181 15.8835C13.2181 16.0568 13.1741 16.2145 13.086 16.3565C13.0008 16.4986 12.8872 16.6122 12.7451 16.6974C12.6059 16.7798 12.4511 16.821 12.2806 16.821Z" fill="#446888"/>
+<path d="M16.4505 8L16.3098 14.1619H14.9377L14.8013 8H16.4505ZM15.6237 16.821C15.3652 16.821 15.1436 16.7301 14.959 16.5483C14.7772 16.3665 14.6862 16.1449 14.6862 15.8835C14.6862 15.6278 14.7772 15.4091 14.959 15.2273C15.1436 15.0455 15.3652 14.9545 15.6237 14.9545C15.8766 14.9545 16.0953 15.0455 16.28 15.2273C16.4675 15.4091 16.5612 15.6278 16.5612 15.8835C16.5612 16.0568 16.5172 16.2145 16.4291 16.3565C16.3439 16.4986 16.2303 16.6122 16.0882 16.6974C15.949 16.7798 15.7942 16.821 15.6237 16.821Z" fill="#446888"/>
+</svg>`;
+
+export const ICON_PRIORITY_MEDIUM = `<svg role="img" class="ninja-icon ninja-icon--fluent" width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="24" height="24" fill="#F1F5F8"/>
+<path d="M10.7642 8L10.6236 14.1619H9.25142L9.11506 8H10.7642ZM9.9375 16.821C9.67898 16.821 9.45739 16.7301 9.27273 16.5483C9.09091 16.3665 9 16.1449 9 15.8835C9 15.6278 9.09091 15.4091 9.27273 15.2273C9.45739 15.0455 9.67898 14.9545 9.9375 14.9545C10.1903 14.9545 10.4091 15.0455 10.5938 15.2273C10.7812 15.4091 10.875 15.6278 10.875 15.8835C10.875 16.0568 10.831 16.2145 10.7429 16.3565C10.6577 16.4986 10.544 16.6122 10.402 16.6974C10.2628 16.7798 10.108 16.821 9.9375 16.821Z" fill="#446888"/>
+<path d="M14.1073 8L13.9667 14.1619H12.5945L12.4582 8H14.1073ZM13.2806 16.821C13.0221 16.821 12.8005 16.7301 12.6159 16.5483C12.434 16.3665 12.3431 16.1449 12.3431 15.8835C12.3431 15.6278 12.434 15.4091 12.6159 15.2273C12.8005 15.0455 13.0221 14.9545 13.2806 14.9545C13.5335 14.9545 13.7522 15.0455 13.9369 15.2273C14.1244 15.4091 14.2181 15.6278 14.2181 15.8835C14.2181 16.0568 14.1741 16.2145 14.086 16.3565C14.0008 16.4986 13.8872 16.6122 13.7451 16.6974C13.6059 16.7798 13.4511 16.821 13.2806 16.821Z" fill="#446888"/>
+</svg>`;
+
+export const ICON_PRIORITY_LOW = `<svg role="img" class="ninja-icon ninja-icon--fluent" width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="24" height="24" fill="#F1F5F8"/>
+<path d="M12.7642 8L12.6236 14.1619H11.2514L11.1151 8H12.7642ZM11.9375 16.821C11.679 16.821 11.4574 16.7301 11.2727 16.5483C11.0909 16.3665 11 16.1449 11 15.8835C11 15.6278 11.0909 15.4091 11.2727 15.2273C11.4574 15.0455 11.679 14.9545 11.9375 14.9545C12.1903 14.9545 12.4091 15.0455 12.5938 15.2273C12.7812 15.4091 12.875 15.6278 12.875 15.8835C12.875 16.0568 12.831 16.2145 12.7429 16.3565C12.6577 16.4986 12.544 16.6122 12.402 16.6974C12.2628 16.7798 12.108 16.821 11.9375 16.821Z" fill="#446888"/>
+</svg>`;
+
+export const ICON_PRIORITY_NONE = `<svg role="img" class="ninja-icon ninja-icon--fluent" width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="24" height="24" fill="#F1F5F8"/>
+<path d="M13.5686 8L11.1579 16.9562H10L12.4107 8H13.5686Z" fill="#446888"/>
+</svg>`;
diff --git a/app/javascript/dashboard/routes/dashboard/commands/conversationHotKeys.js b/app/javascript/dashboard/routes/dashboard/commands/conversationHotKeys.js
index 7090406ce..01bd6a2f5 100644
--- a/app/javascript/dashboard/routes/dashboard/commands/conversationHotKeys.js
+++ b/app/javascript/dashboard/routes/dashboard/commands/conversationHotKeys.js
@@ -12,6 +12,7 @@ import {
 import {
   ICON_ADD_LABEL,
   ICON_ASSIGN_AGENT,
+  ICON_ASSIGN_PRIORITY,
   ICON_ASSIGN_TEAM,
   ICON_MUTE_CONVERSATION,
   ICON_REMOVE_LABEL,
@@ -23,6 +24,11 @@ import {
   ICON_SNOOZE_UNTIL_NEXT_WEEK,
   ICON_SNOOZE_UNTIL_TOMORRROW,
   ICON_UNMUTE_CONVERSATION,
+  ICON_PRIORITY_URGENT,
+  ICON_PRIORITY_HIGH,
+  ICON_PRIORITY_LOW,
+  ICON_PRIORITY_MEDIUM,
+  ICON_PRIORITY_NONE,
 } from './CommandBarIcons';
 
 const OPEN_CONVERSATION_ACTIONS = [
@@ -145,6 +151,35 @@ export default {
       }
       return this.prepareActions(actions);
     },
+    priorityOptions() {
+      return [
+        {
+          label: this.$t('CONVERSATION.PRIORITY.OPTIONS.NONE'),
+          key: null,
+          icon: ICON_PRIORITY_NONE,
+        },
+        {
+          label: this.$t('CONVERSATION.PRIORITY.OPTIONS.URGENT'),
+          key: 'urgent',
+          icon: ICON_PRIORITY_URGENT,
+        },
+        {
+          label: this.$t('CONVERSATION.PRIORITY.OPTIONS.HIGH'),
+          key: 'high',
+          icon: ICON_PRIORITY_HIGH,
+        },
+        {
+          label: this.$t('CONVERSATION.PRIORITY.OPTIONS.MEDIUM'),
+          key: 'medium',
+          icon: ICON_PRIORITY_MEDIUM,
+        },
+        {
+          label: this.$t('CONVERSATION.PRIORITY.OPTIONS.LOW'),
+          key: 'low',
+          icon: ICON_PRIORITY_LOW,
+        },
+      ].filter(item => item.key !== this.currentChat?.priority);
+    },
     assignAgentActions() {
       const agentOptions = this.agentsList.map(agent => ({
         id: `agent-${agent.id}`,
@@ -166,6 +201,27 @@ export default {
         ...agentOptions,
       ];
     },
+    assignPriorityActions() {
+      const options = this.priorityOptions.map(priority => ({
+        id: `priority-${priority.key}`,
+        title: priority.label,
+        parent: 'assign_priority',
+        section: this.$t('COMMAND_BAR.SECTIONS.CHANGE_PRIORITY'),
+        priority: priority,
+        icon: priority.icon,
+        handler: this.onChangePriority,
+      }));
+      return [
+        {
+          id: 'assign_priority',
+          title: this.$t('COMMAND_BAR.COMMANDS.ASSIGN_PRIORITY'),
+          section: this.$t('COMMAND_BAR.SECTIONS.CONVERSATION'),
+          icon: ICON_ASSIGN_PRIORITY,
+          children: options.map(option => option.id),
+        },
+        ...options,
+      ];
+    },
     assignTeamActions() {
       const teamOptions = this.teamsList.map(team => ({
         id: `team-${team.id}`,
@@ -248,6 +304,7 @@ export default {
           ...this.assignAgentActions,
           ...this.assignTeamActions,
           ...this.labelActions,
+          ...this.assignPriorityActions,
         ];
       }
 
@@ -262,6 +319,12 @@ export default {
         agentId: action.agentInfo.id,
       });
     },
+    onChangePriority(action) {
+      this.$store.dispatch('assignPriority', {
+        conversationId: this.currentChat.id,
+        priority: action.priority.key,
+      });
+    },
     onChangeTeam(action) {
       this.$store.dispatch('assignTeam', {
         conversationId: this.currentChat.id,

From 3c2d6faf6854725203502bfaafe2a24de2b041e7 Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Wed, 26 Apr 2023 15:27:07 +0530
Subject: [PATCH 040/101] feat: Instagram story replies will display the
 original story link (#6846)

---
 .../messages/instagram/message_builder.rb     | 11 +++++++
 .../widgets/conversation/Message.vue          | 33 +++++++++++++++++--
 .../widgets/conversation/bubble/Actions.vue   |  2 +-
 .../i18n/locale/en/conversation.json          |  1 +
 app/models/message.rb                         | 11 +++++++
 .../instagram/message_builder_spec.rb         | 24 ++++++++++++++
 .../instagram_message_create_event.rb         | 33 +++++++++++++++++++
 7 files changed, 112 insertions(+), 3 deletions(-)

diff --git a/app/builders/messages/instagram/message_builder.rb b/app/builders/messages/instagram/message_builder.rb
index 1be960d21..e917af5db 100644
--- a/app/builders/messages/instagram/message_builder.rb
+++ b/app/builders/messages/instagram/message_builder.rb
@@ -70,17 +70,28 @@ class Messages::Instagram::MessageBuilder < Messages::Messenger::MessageBuilder
     @messaging[:message][:text]
   end
 
+  def story_reply_attributes
+    message[:reply_to][:story] if message[:reply_to].present? && message[:reply_to][:story].present?
+  end
+
   def build_message
     return if @outgoing_echo && already_sent_from_chatwoot?
     return if message_content.blank? && all_unsupported_files?
 
     @message = conversation.messages.create!(message_params)
+    save_story_id
 
     attachments.each do |attachment|
       process_attachment(attachment)
     end
   end
 
+  def save_story_id
+    return if story_reply_attributes.blank?
+
+    @message.save_story_info(story_reply_attributes)
+  end
+
   def build_conversation
     @contact_inbox ||= contact.contact_inboxes.find_by!(source_id: message_source_id)
     Conversation.create!(conversation_params.merge(
diff --git a/app/javascript/dashboard/components/widgets/conversation/Message.vue b/app/javascript/dashboard/components/widgets/conversation/Message.vue
index 80a6b3449..985c1ce11 100644
--- a/app/javascript/dashboard/components/widgets/conversation/Message.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/Message.vue
@@ -22,6 +22,14 @@
           :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="!hasStoryError"
+            :url="storyUrl"
+            @error="onStoryLoadError"
+          />
+        </blockquote>
         <bubble-text
           v-if="data.content"
           :message="message"
@@ -79,7 +87,7 @@
           :sender="data.sender"
           :story-sender="storySender"
           :external-error="externalError"
-          :story-id="storyId"
+          :story-id="`${storyId}`"
           :is-a-tweet="isATweet"
           :is-a-whatsapp-channel="isAWhatsAppChannel"
           :has-instagram-story="hasInstagramStory"
@@ -192,6 +200,7 @@ export default {
       hasImageError: false,
       contextMenuPosition: {},
       showBackgroundHighlight: false,
+      hasStoryError: false,
     };
   },
   computed: {
@@ -277,6 +286,12 @@ export default {
     storyId() {
       return this.contentAttributes.story_id || null;
     },
+    storyUrl() {
+      return this.contentAttributes.story_url || null;
+    },
+    storyReply() {
+      return this.storyUrl && this.hasInstagramStory;
+    },
     contentType() {
       const {
         data: { content_type: contentType },
@@ -414,10 +429,12 @@ export default {
   watch: {
     data() {
       this.hasImageError = false;
+      this.hasStoryError = false;
     },
   },
   mounted() {
     this.hasImageError = false;
+    this.hasStoryError = false;
     bus.$on(BUS_EVENTS.ON_MESSAGE_LIST_SCROLL, this.closeContextMenu);
     this.setupHighlightTimer();
   },
@@ -432,6 +449,9 @@ export default {
         const { file_type: fileType } = attachments[0];
         return fileType === type && !this.hasImageError;
       }
+      if (this.storyReply) {
+        return true;
+      }
       return false;
     },
     handleContextMenuClick() {
@@ -443,6 +463,9 @@ export default {
     onImageLoadError() {
       this.hasImageError = true;
     },
+    onStoryLoadError() {
+      this.hasStoryError = true;
+    },
     openContextMenu(e) {
       const shouldSkipContextMenu =
         e.target?.classList.contains('skip-context-menu') ||
@@ -672,7 +695,6 @@ li.right {
   blockquote {
     border-left: var(--space-micro) solid var(--s-75);
     color: var(--s-800);
-    padding: var(--space-smaller) var(--space-small);
     margin: var(--space-smaller) 0;
     padding: var(--space-small) var(--space-small) 0 var(--space-normal);
   }
@@ -704,4 +726,11 @@ li.right {
     }
   }
 }
+
+.story-reply-quote {
+  border-left: var(--space-micro) solid var(--s-75);
+  color: var(--s-600);
+  margin: var(--space-small) var(--space-normal) 0;
+  padding: var(--space-small) var(--space-small) 0 var(--space-small);
+}
 </style>
diff --git a/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue b/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue
index eb51af58a..750c4a982 100644
--- a/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue
@@ -195,7 +195,7 @@ export default {
         return '';
       }
       const { storySender, storyId } = this;
-      return `https://www.instagram.com/stories/${storySender}/${storyId}`;
+      return `https://www.instagram.com/stories/direct/${storySender}_${storyId}`;
     },
     showStatusIndicators() {
       if ((this.isOutgoing || this.isTemplate) && !this.isPrivate) {
diff --git a/app/javascript/dashboard/i18n/locale/en/conversation.json b/app/javascript/dashboard/i18n/locale/en/conversation.json
index 78b7e660c..a20522108 100644
--- a/app/javascript/dashboard/i18n/locale/en/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/en/conversation.json
@@ -37,6 +37,7 @@
     "UNKNOWN_FILE_TYPE": "Unknown File",
     "SAVE_CONTACT": "Save",
     "UPLOADING_ATTACHMENTS": "Uploading attachments...",
+    "REPLIED_TO_STORY": "Replied to your story",
     "SUCCESS_DELETE_MESSAGE": "Message deleted successfully",
     "FAIL_DELETE_MESSSAGE": "Couldn't delete message! Try again",
     "NO_RESPONSE": "No response",
diff --git a/app/models/message.rb b/app/models/message.rb
index 00107c7cc..9000af0ec 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -198,6 +198,17 @@ class Message < ApplicationRecord
     outgoing? && human_response? && not_created_by_automation? && !private?
   end
 
+  def save_story_info(story_info)
+    self.content_attributes = content_attributes.merge(
+      {
+        story_id: story_info['id'],
+        story_sender: inbox.channel.instagram_id,
+        story_url: story_info['url']
+      }
+    )
+    save!
+  end
+
   private
 
   def ensure_content_type
diff --git a/spec/builders/messages/instagram/message_builder_spec.rb b/spec/builders/messages/instagram/message_builder_spec.rb
index 2220c3295..e33c697eb 100644
--- a/spec/builders/messages/instagram/message_builder_spec.rb
+++ b/spec/builders/messages/instagram/message_builder_spec.rb
@@ -13,6 +13,7 @@ describe  ::Messages::Instagram::MessageBuilder do
   let!(:instagram_inbox) { create(:inbox, channel: instagram_channel, account: account, greeting_enabled: false) }
   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(: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') }
@@ -44,6 +45,29 @@ describe  ::Messages::Instagram::MessageBuilder do
       expect(message.content).to eq('This is the first message from the customer')
     end
 
+    it 'creates message with for reply with story id' 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
+      )
+      messaging = instagram_story_reply_event[:entry][0]['messaging'][0]
+      contact_inbox
+
+      described_class.new(messaging, instagram_inbox).perform
+
+      message = instagram_channel.inbox.messages.first
+
+      expect(message.content).to eq('This is the story reply')
+      expect(message.content_attributes[:story_sender]).to eq(instagram_inbox.channel.instagram_id)
+      expect(message.content_attributes[:story_id]).to eq('chatwoot-app-user-id-1')
+      expect(message.content_attributes[:story_url]).to eq('https://chatwoot-assets.local/sample.png')
+    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 d024deccc..0220feab5 100644
--- a/spec/factories/instagram/instagram_message_create_event.rb
+++ b/spec/factories/instagram/instagram_message_create_event.rb
@@ -26,6 +26,39 @@ FactoryBot.define do
     initialize_with { attributes }
   end
 
+  factory :instagram_story_reply_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',
+              'message': {
+                'mid': 'message-id-1',
+                'text': 'This is the story reply',
+                'reply_to': {
+                  'story': {
+                    'id': 'chatwoot-app-user-id-1',
+                    'url': 'https://chatwoot-assets.local/sample.png'
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    end
+    initialize_with { attributes }
+  end
+
   factory :instagram_test_text_event, class: Hash do
     entry do
       [

From 37fde64c67ef47433d62bfa2c0a9d5ba505f0fff Mon Sep 17 00:00:00 2001
From: shaheer-haider <shaheerhaider00000@gmail.com>
Date: Wed, 26 Apr 2023 16:34:17 +0500
Subject: [PATCH 041/101] fix: installation of gem bundles (lograge,
 rack-mini-profiler, stackprof, nokogiri) in docker (#6897)

---
 docker/Dockerfile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 4b7fdd718..4ff968674 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -15,7 +15,7 @@ ENV RAILS_ENV ${RAILS_ENV}
 
 ENV BUNDLE_PATH="/gems"
 
-RUN apk add --no-cache \
+RUN apk update && apk add --no-cache \
     openssl \
     tar \
     build-base \
@@ -36,7 +36,7 @@ COPY Gemfile Gemfile.lock ./
 # https://github.com/googleapis/google-cloud-ruby/issues/13306
 # adding xz as nokogiri was failing to build libxml
 # https://github.com/chatwoot/chatwoot/issues/4045
-RUN apk add --no-cache musl ruby-full ruby-dev gcc make musl-dev openssl openssl-dev g++ linux-headers xz
+RUN apk update && apk add --no-cache build-base musl ruby-full ruby-dev gcc make musl-dev openssl openssl-dev g++ linux-headers xz
 RUN bundle config set --local force_ruby_platform true
 
 # Do not install development or test gems in production
@@ -90,7 +90,8 @@ ARG RAILS_ENV=production
 ENV RAILS_ENV ${RAILS_ENV}
 ENV BUNDLE_PATH="/gems"
 
-RUN apk add --no-cache \
+RUN apk update && apk add --no-cache \
+  build-base \
     openssl \
     tzdata \
     postgresql-client \

From 3fa654f5c649a2b01698f4601ba0cf41684ec674 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Wed, 26 Apr 2023 19:22:16 +0530
Subject: [PATCH 042/101] chore: Add Index for widget contact lookup (#6998)

- Adds an index to improve the contact lookup performance while calling setUser from widget
---
 app/models/contact.rb                                      | 1 +
 .../20230426130150_add_index_for_widget_contact_look_up.rb | 7 +++++++
 db/schema.rb                                               | 3 ++-
 3 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 db/migrate/20230426130150_add_index_for_widget_contact_look_up.rb

diff --git a/app/models/contact.rb b/app/models/contact.rb
index 9a742c0b2..4f7832ac8 100644
--- a/app/models/contact.rb
+++ b/app/models/contact.rb
@@ -17,6 +17,7 @@
 # Indexes
 #
 #  index_contacts_on_account_id                          (account_id)
+#  index_contacts_on_lower_email_account_id              (lower((email)::text), account_id)
 #  index_contacts_on_name_email_phone_number_identifier  (name,email,phone_number,identifier) USING gin
 #  index_contacts_on_phone_number_and_account_id         (phone_number,account_id)
 #  uniq_email_per_account_contact                        (email,account_id) UNIQUE
diff --git a/db/migrate/20230426130150_add_index_for_widget_contact_look_up.rb b/db/migrate/20230426130150_add_index_for_widget_contact_look_up.rb
new file mode 100644
index 000000000..f8f2b9f36
--- /dev/null
+++ b/db/migrate/20230426130150_add_index_for_widget_contact_look_up.rb
@@ -0,0 +1,7 @@
+class AddIndexForWidgetContactLookUp < ActiveRecord::Migration[6.1]
+  disable_ddl_transaction!
+
+  def change
+    add_index :contacts, 'LOWER(email), account_id', name: 'index_contacts_on_lower_email_account_id', algorithm: :concurrently
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index b9e93c344..ef989dd14 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.define(version: 2023_04_18_100944) do
+ActiveRecord::Schema.define(version: 2023_04_26_130150) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_stat_statements"
@@ -405,6 +405,7 @@ ActiveRecord::Schema.define(version: 2023_04_18_100944) do
     t.string "identifier"
     t.jsonb "custom_attributes", default: {}
     t.datetime "last_activity_at"
+    t.index "lower((email)::text), account_id", name: "index_contacts_on_lower_email_account_id"
     t.index ["account_id"], name: "index_contacts_on_account_id"
     t.index ["email", "account_id"], name: "uniq_email_per_account_contact", unique: true
     t.index ["identifier", "account_id"], name: "uniq_identifier_per_account_contact", unique: true

From 99dfe1d5afa52eceb41773e05eb5ffaf22e58c76 Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Wed, 26 Apr 2023 20:23:46 +0530
Subject: [PATCH 043/101] feat: Enable template variables in channel greeting
 messages (#6971)

---
 app/drops/account_drop.rb                     |  3 ++
 app/helpers/email_helper.rb                   | 22 +++++++++++++
 .../inbox/components/WeeklyAvailability.vue   | 32 +++++++++++++++++--
 .../shared/components/GreetingsEditor.vue     |  1 +
 app/models/concerns/liquidable.rb             |  5 +--
 app/services/action_service.rb                |  3 ++
 .../automation_rules/action_service_spec.rb   | 12 +++++++
 .../template/greeting_spec.rb                 | 21 ++++++++++++
 .../template/out_of_office_spec.rb            | 17 ++++++++++
 9 files changed, 112 insertions(+), 4 deletions(-)

diff --git a/app/drops/account_drop.rb b/app/drops/account_drop.rb
index 2e3a2530f..d784475db 100644
--- a/app/drops/account_drop.rb
+++ b/app/drops/account_drop.rb
@@ -1,2 +1,5 @@
 class AccountDrop < BaseDrop
+  def name
+    @obj.try(:name)
+  end
 end
diff --git a/app/helpers/email_helper.rb b/app/helpers/email_helper.rb
index 46689ba00..05b6a53e3 100644
--- a/app/helpers/email_helper.rb
+++ b/app/helpers/email_helper.rb
@@ -10,4 +10,26 @@ module EmailHelper
   def normalize_email_with_plus_addressing(email)
     "#{email.split('@').first.split('+').first}@#{email.split('@').last}".downcase
   end
+
+  def parse_email_variables(conversation, email)
+    case email
+    when modified_liquid_content(email)
+      template = Liquid::Template.parse(modified_liquid_content(email))
+      template.render(message_drops(conversation))
+    when URI::MailTo::EMAIL_REGEXP
+      email
+    end
+  end
+
+  def modified_liquid_content(email)
+    # This regex is used to match the code blocks in the content
+    # We don't want to process liquid in code blocks
+    email.gsub(/`(.*?)`/m, '{% raw %}`\\1`{% endraw %}')
+  end
+
+  def message_drops(conversation)
+    {
+      'contact' => ContactDrop.new(conversation.contact)
+    }
+  end
 end
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/components/WeeklyAvailability.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/components/WeeklyAvailability.vue
index ecad7814b..5eee329b4 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/components/WeeklyAvailability.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/components/WeeklyAvailability.vue
@@ -17,7 +17,16 @@
         <div v-if="isBusinessHoursEnabled" class="business-hours-wrap">
           <label class="unavailable-input-wrap">
             {{ $t('INBOX_MGMT.BUSINESS_HOURS.UNAVAILABLE_MESSAGE_LABEL') }}
-            <textarea v-model="unavailableMessage" type="text" />
+            <label v-if="isRichEditorEnabled" class="richtext">
+              <woot-message-editor
+                v-model="unavailableMessage"
+                :enable-variables="true"
+                :is-format-mode="true"
+                class="input"
+                :min-height="4"
+              />
+            </label>
+            <textarea v-else v-model="unavailableMessage" type="text" />
           </label>
           <div class="timezone-input-wrap">
             <label>
@@ -61,7 +70,9 @@
 <script>
 import { mapGetters } from 'vuex';
 import alertMixin from 'shared/mixins/alertMixin';
+import inboxMixin from 'shared/mixins/inboxMixin';
 import SettingsSection from 'dashboard/components/SettingsSection';
+import WootMessageEditor from 'dashboard/components/widgets/WootWriter/Editor';
 import BusinessDay from './BusinessDay';
 import {
   timeSlotParse,
@@ -79,8 +90,9 @@ export default {
   components: {
     SettingsSection,
     BusinessDay,
+    WootMessageEditor,
   },
-  mixins: [alertMixin],
+  mixins: [alertMixin, inboxMixin],
   props: {
     inbox: {
       type: Object,
@@ -115,6 +127,15 @@ export default {
     timeZones() {
       return [...timeZoneOptions()];
     },
+    isRichEditorEnabled() {
+      if (
+        this.isATwilioChannel ||
+        this.isATwitterInbox ||
+        this.isAFacebookInbox
+      )
+        return false;
+      return true;
+    },
   },
   watch: {
     inbox() {
@@ -190,4 +211,11 @@ export default {
 .business-hours-wrap {
   margin-bottom: var(--space-medium);
 }
+
+.richtext {
+  padding: 0 var(--space-normal);
+  border-radius: var(--border-radius-normal);
+  border: 1px solid var(--color-border);
+  margin: 0 0 var(--space-normal);
+}
 </style>
diff --git a/app/javascript/shared/components/GreetingsEditor.vue b/app/javascript/shared/components/GreetingsEditor.vue
index 2e9130886..4d3920fd0 100644
--- a/app/javascript/shared/components/GreetingsEditor.vue
+++ b/app/javascript/shared/components/GreetingsEditor.vue
@@ -4,6 +4,7 @@
       <woot-message-editor
         v-model="greetingsMessage"
         :is-format-mode="true"
+        :enable-variables="true"
         class="input"
         :placeholder="placeholder"
         :min-height="4"
diff --git a/app/models/concerns/liquidable.rb b/app/models/concerns/liquidable.rb
index e3d6cb64d..6734dfeae 100644
--- a/app/models/concerns/liquidable.rb
+++ b/app/models/concerns/liquidable.rb
@@ -13,12 +13,13 @@ module Liquidable
       'contact' => ContactDrop.new(conversation.contact),
       'agent' => UserDrop.new(sender),
       'conversation' => ConversationDrop.new(conversation),
-      'inbox' => InboxDrop.new(inbox)
+      'inbox' => InboxDrop.new(inbox),
+      'account' => AccountDrop.new(conversation.account)
     }
   end
 
   def liquid_processable_message?
-    content.present? && message_type == 'outgoing'
+    content.present? && (message_type == 'outgoing' || message_type == 'template')
   end
 
   def process_liquid_in_content
diff --git a/app/services/action_service.rb b/app/services/action_service.rb
index 6e8a3b8ca..ecaa9ce9e 100644
--- a/app/services/action_service.rb
+++ b/app/services/action_service.rb
@@ -1,4 +1,6 @@
 class ActionService
+  include EmailHelper
+
   def initialize(conversation)
     @conversation = conversation.reload
   end
@@ -59,6 +61,7 @@ class ActionService
     emails = emails[0].gsub(/\s+/, '').split(',')
 
     emails.each do |email|
+      email = parse_email_variables(@conversation, email)
       ConversationReplyMailer.with(account: @conversation.account).conversation_transcript(@conversation, email)&.deliver_later
     end
   end
diff --git a/spec/services/automation_rules/action_service_spec.rb b/spec/services/automation_rules/action_service_spec.rb
index c95789399..0f0d09943 100644
--- a/spec/services/automation_rules/action_service_spec.rb
+++ b/spec/services/automation_rules/action_service_spec.rb
@@ -91,6 +91,7 @@ RSpec.describe AutomationRules::ActionService do
     describe '#perform with send_email_transcript action' do
       before do
         rule.actions << { action_name: 'send_email_transcript', action_params: ['contact@example.com, agent@example.com,agent1@example.com'] }
+        rule.save
       end
 
       it 'will send email to transcript to action params emails' do
@@ -102,6 +103,17 @@ RSpec.describe AutomationRules::ActionService do
 
         described_class.new(rule, account, conversation).perform
       end
+
+      it 'will send email to transcript to contacts' do
+        rule.actions = [{ action_name: 'send_email_transcript', action_params: ['{{contact.email}}'] }]
+        rule.save
+
+        mailer = double
+        allow(ConversationReplyMailer).to receive(:with).and_return(mailer)
+        allow(mailer).to receive(:conversation_transcript).with(conversation, conversation.contact.email)
+
+        described_class.new(rule.reload, account, conversation).perform
+      end
     end
   end
 end
diff --git a/spec/services/message_templates/template/greeting_spec.rb b/spec/services/message_templates/template/greeting_spec.rb
index 7d1f45d8c..3d7645e3a 100644
--- a/spec/services/message_templates/template/greeting_spec.rb
+++ b/spec/services/message_templates/template/greeting_spec.rb
@@ -8,5 +8,26 @@ describe ::MessageTemplates::Template::Greeting do
       described_class.new(conversation: conversation).perform
       expect(conversation.messages.count).to eq(1)
     end
+
+    it 'creates the greeting messages with template variable' do
+      conversation.inbox.update!(greeting_message: 'Hey, {{contact.name}} welcome to our board.')
+      described_class.new(conversation: conversation).perform
+      expect(conversation.messages.count).to eq(1)
+      expect(conversation.messages.last.content).to eq("Hey, #{conversation.contact.name} welcome to our board.")
+    end
+
+    it 'creates the greeting messages with more than one variable strings' do
+      conversation.inbox.update!(greeting_message: 'Hey, {{contact.name}} welcome to our board. - from {{account.name}}')
+      described_class.new(conversation: conversation).perform
+      expect(conversation.messages.count).to eq(1)
+      expect(conversation.messages.last.content).to eq("Hey, #{conversation.contact.name} welcome to our board. - from #{conversation.account.name}")
+    end
+
+    it 'creates the greeting messages' do
+      conversation.inbox.update!(greeting_message: 'Hello welcome to our board.')
+      described_class.new(conversation: conversation).perform
+      expect(conversation.messages.count).to eq(1)
+      expect(conversation.messages.last.content).to eq('Hello welcome to our board.')
+    end
   end
 end
diff --git a/spec/services/message_templates/template/out_of_office_spec.rb b/spec/services/message_templates/template/out_of_office_spec.rb
index ee2050a70..5fb0dbf79 100644
--- a/spec/services/message_templates/template/out_of_office_spec.rb
+++ b/spec/services/message_templates/template/out_of_office_spec.rb
@@ -9,5 +9,22 @@ describe ::MessageTemplates::Template::OutOfOffice do
       expect(conversation.messages.template.count).to eq(1)
       expect(conversation.messages.template.first.content).to eq(conversation.inbox.out_of_office_message)
     end
+
+    it 'creates the out of office messages with template variable' do
+      conversation.inbox.update!(out_of_office_message: 'Hey, {{contact.name}} we are unavailable at the moment.')
+      described_class.new(conversation: conversation).perform
+      expect(conversation.messages.count).to eq(1)
+      expect(conversation.messages.last.content).to eq("Hey, #{conversation.contact.name} we are unavailable at the moment.")
+    end
+
+    it 'creates the out of office messages with more than one variable strings' do
+      conversation.inbox.update!(out_of_office_message:
+        'Hey, {{contact.name}} we are unavailable at the moment. - from {{account.name}}')
+      described_class.new(conversation: conversation).perform
+      expect(conversation.messages.count).to eq(1)
+      expect(conversation.messages.last.content).to eq(
+        "Hey, #{conversation.contact.name} we are unavailable at the moment. - from #{conversation.account.name}"
+      )
+    end
   end
 end

From cae1e3016069979a499e9bf5ee3093194a3e51d7 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Wed, 26 Apr 2023 22:50:56 +0530
Subject: [PATCH 044/101] feat: Update demo data to include better messages
 (#6995)

---
 lib/seeders/seed_data.yml | 100 +++++++++++++++++++++++++++-----------
 1 file changed, 72 insertions(+), 28 deletions(-)

diff --git a/lib/seeders/seed_data.yml b/lib/seeders/seed_data.yml
index 8390aa48b..542d022d0 100644
--- a/lib/seeders/seed_data.yml
+++ b/lib/seeders/seed_data.yml
@@ -199,24 +199,33 @@ contacts:
       conversations:
         - channel: Channel::WebWidget
           messages: 
-            - message_type: incoming
-              content: hello world
+          - message_type: incoming
+            content: Hi, I'm having trouble logging in to my account.
+          - message_type: outgoing
+            sender: michael_scott@paperlayer.test
+            content: Hi! Sorry to hear that. Can you please provide me with your username and email address so I can look into it for you?
     - name: "Tiffanie Cloughton"
       email: "tcloughton1@newyorker.test"
       gender: 'female'
       conversations:
         - channel: Channel::FacebookPage
           messages: 
-            - message_type: incoming
-              content: hello world
+          - message_type: incoming
+            content: Hi, I need some help with my billing statement.
+          - message_type: outgoing
+            sender: michael_scott@paperlayer.test
+            content: Hello! I'd be happy to assist you with that. Can you please tell me which billing statement you're referring to?
     - name: "Melonie Keatch"
       email: "mkeatch2@reuters.test"
       gender: 'female'
       conversations:
         - channel: Channel::TwitterProfile
           messages: 
-            - message_type: incoming
-              content: hello world
+          - message_type: incoming
+            content: Hi, I think I accidentally deleted some important files. Can you help me recover them?
+          - message_type: outgoing
+            sender: michael_scott@paperlayer.test
+            content: Of course! Can you please tell me what type of files they were and where they were located on your device?
     - name: "Olin Canniffe"
       email: "ocanniffe3@feedburner.test"
       gender: 'male'
@@ -224,8 +233,11 @@ contacts:
         - channel: Channel::Whatsapp
           source_id: "123456723"
           messages: 
-            - message_type: incoming
-              content: hello world
+          - message_type: incoming
+            content: Hi, I'm having trouble connecting to the internet.
+          - message_type: outgoing
+            sender: michael_scott@paperlayer.test
+            content: I'm sorry to hear that. Have you tried restarting your modem/router? If that doesn't work, please let me know and I can provide further assistance.
     - name: "Viviene Corp"
       email: "vcorp4@instagram.test"
       gender: 'female'
@@ -233,32 +245,44 @@ contacts:
         - channel: Channel::Sms
           source_id: "+1234567"
           messages: 
-            - message_type: incoming
-              content: hello world
+          - message_type: incoming
+            content: Hi, I'm having trouble with the mobile app. It keeps crashing.
+          - message_type: outgoing
+            sender: michael_scott@paperlayer.test
+            content: I'm sorry to hear that. Can you please try uninstalling and reinstalling the app and see if that helps? If not, please let me know and I can look into it further.
     - name: "Drake Pittway"
       email: "dpittway5@chron.test"
       gender: 'male'
       conversations:
         - channel: Channel::Line
           messages: 
-            - message_type: incoming
-              content: hello world
+          - message_type: incoming
+            content: Hi, I'm trying to update my account information but it won't save.
+          - message_type: outgoing
+            sender: michael_scott@paperlayer.test
+            content: Sorry for the inconvenience. Can you please provide me with the specific information you're trying to update and the error message you're receiving?
     - name: "Klaus Crawley"
       email: "kcrawley6@narod.ru"
       gender: 'male'
       conversations:
         - channel: Channel::WebWidget
           messages: 
-            - message_type: incoming
-              content: hello world
+          - message_type: incoming
+            content: Hi, I need some help setting up my new device.
+          - message_type: outgoing
+            sender: michael_scott@paperlayer.test
+            content: No problem! Can you please tell me the make and model of your device and what specifically you need help with?
     - name: "Bing Cusworth"
       email: "bcusworth7@arstechnica.test"
       gender: 'male'
       conversations:
         - channel: Channel::TwitterProfile
           messages: 
-            - message_type: incoming
-              content: hello world
+          - message_type: incoming
+            content: Hi, I accidentally placed an order for the wrong item. Can I cancel it?
+          - message_type: outgoing
+            sender: michael_scott@paperlayer.test
+            content: I'm sorry to hear that. Can you please provide me with your order number and I'll see if I can cancel it for you?
     - name: "Claus Jira"
       email: "cjira8@comcast.net"
       gender: 'male'
@@ -266,8 +290,11 @@ contacts:
         - channel: Channel::Whatsapp
           source_id: "12323432"
           messages: 
-            - message_type: incoming
-              content: hello world
+          - message_type: incoming
+            content: Hi, I'm having trouble with my email. I can't seem to send or receive any messages.
+          - message_type: outgoing
+            sender: michael_scott@paperlayer.test
+            content: I'm sorry to hear that. Can you please tell me what email client you're using and if you're receiving any error messages?
     - name: "Quent Dalliston"
       email: "qdalliston9@zimbio.test"
       gender: 'male'
@@ -275,24 +302,33 @@ contacts:
         - channel: Channel::Whatsapp
           source_id: "12342234324"
           messages: 
-            - message_type: incoming
-              content: hello world
+          - message_type: incoming
+            content: Hi, I need some help resetting my password.
+          - message_type: outgoing
+            sender: michael_scott@paperlayer.test
+            content: Sure! Can you please provide me with your username or email address and I'll send you a password reset link?
     - name: "Coreen Mewett"
       email: "cmewetta@home.pl"
       gender: 'female'
       conversations:
         - channel: Channel::FacebookPage
           messages: 
-            - message_type: incoming
-              content: hello world
+          - message_type: incoming
+            content: Hi, I think someone may have hacked into my account. What should I do?
+          - message_type: outgoing
+            sender: michael_scott@paperlayer.test
+            content: I'm sorry to hear that. Please change your password immediately and enable two-factor authentication if you haven't already done so. I can also assist you in reviewing your account activity if needed.
     - name: "Benyamin Janeway"
       email: "bjanewayb@ustream.tv"
       gender: 'male'
       conversations:
         - channel: Channel::Line
           messages: 
-            - message_type: incoming
-              content: hello world
+          - message_type: incoming
+            content: Hi, I have a question about your product features.
+          - message_type: outgoing
+            sender: michael_scott@paperlayer.test
+            content: Sure thing! What specific feature are you interested in learning more about?
     - name: "Cordell Dalinder"
       email: "cdalinderc@msn.test"
       gender: 'male'
@@ -300,8 +336,11 @@ contacts:
         - channel: Channel::Email
           source_id: "cdalinderc@msn.test"
           messages: 
-            - message_type: incoming
-              content: hello world
+          - message_type: incoming
+            content: Hi, I need help setting up my new printer.
+          - message_type: outgoing
+            sender: michael_scott@paperlayer.test
+            content: No problem! Can you please provide me with the make and model of your printer and what type of device you'll be connecting it to?
     - name: "Merrile Petruk"
       email: "mpetrukd@wunderground.test"
       gender: 'female'
@@ -310,8 +349,11 @@ contacts:
           source_id: "mpetrukd@wunderground.test"
           priority: urgent
           messages: 
-            - message_type: incoming
-              content: hello world
+          - message_type: incoming
+            content: Hi, I'm having trouble accessing a file that I shared with someone.
+          - message_type: outgoing
+            sender: michael_scott@paperlayer.test
+            content: I'm sorry to hear that. Can you please tell me which file you're having trouble accessing and who you shared it with? I'll do my best to help you regain access.
     - name: "Nathaniel Vannuchi"
       email: "nvannuchie@photobucket.test"
       gender: 'male'
@@ -387,7 +429,9 @@ contacts:
             - message_type: incoming
               content: "Hey, \n I'm looking for some help to figure out if it is the right product for me."
             - message_type: outgoing
+              sender: michael_scott@paperlayer.test
               content: Welcome to PaperLayer. Our Team will be getting back you shortly.
             - message_type: outgoing
+              sender: michael_scott@paperlayer.test
               content: How may i help you ?
               sender: michael_scott@paperlayer.test

From 74afb785c2f312105773124928a21ae3612bb7c4 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Wed, 26 Apr 2023 22:51:30 +0530
Subject: [PATCH 045/101] fix: Update spacing for the priority icon in the
 inbox views (#6993)

Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
---
 .../components/widgets/conversation/ConversationCard.vue        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
index d2d49580a..83c40e027 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
@@ -443,11 +443,11 @@ export default {
   .conversation-metadata-attributes {
     display: flex;
     gap: var(--space-small);
+    margin-left: var(--space-small);
   }
 
   .assignee-label {
     display: inline-flex;
-    margin-left: var(--space-small);
     max-width: 50%;
   }
 }

From 32f7342cd6946b1a5afdf5be8100e18588939d5f Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Wed, 26 Apr 2023 23:55:02 +0530
Subject: [PATCH 046/101] chore: Add issue forms for GitHub (#6982)

---
 .github/ISSUE_TEMPLATE/bug_report.md          | 78 -------------------
 .github/ISSUE_TEMPLATE/bug_report.yml         | 78 +++++++++++++++++++
 .github/ISSUE_TEMPLATE/config.yml             |  8 ++
 .github/ISSUE_TEMPLATE/enhancement_request.md | 20 -----
 .github/ISSUE_TEMPLATE/feature_request.md     | 20 -----
 .github/ISSUE_TEMPLATE/feature_request.yml    | 28 +++++++
 6 files changed, 114 insertions(+), 118 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE/bug_report.md
 create mode 100644 .github/ISSUE_TEMPLATE/bug_report.yml
 create mode 100644 .github/ISSUE_TEMPLATE/config.yml
 delete mode 100644 .github/ISSUE_TEMPLATE/enhancement_request.md
 delete mode 100644 .github/ISSUE_TEMPLATE/feature_request.md
 create mode 100644 .github/ISSUE_TEMPLATE/feature_request.yml

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 26b053b5f..000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,78 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: 'Bug'
-assignees: ''
-
----
-
-**Describe the bug**
-
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See the error
-
-**Expected behavior**
-
-Share a clear and concise description of what you expected to happen.
-
-**Screenshots**
-
-If applicable, add screenshots to help explain your problem.
-
-**Browser logs**
-
-Share the browser logs to debug the issue further.
-
-**Server logs**
-
-Share the server logs to debug the issue further.
-
-**Environment**
-
-Describe whether you are using Chatwoot Cloud (app.chatwoot.com) or a self-hosted installation of Chatwoot. If you are using a self-hosted installation of Chatwoot, describe the type of deployment (Docker/Linux VM installation/Heroku/Kubernetes/Other).
-
-- [ ] app.chatwoot.com (Chatwoot Cloud)
-- [ ] Self-hosted
-- - [ ] Linux VM
-- - [ ] Docker
-- - [ ] Kubernetes
-- - [ ] Heroku
-- - [ ] Other (Please specify)
-
-
-**Desktop (please complete the following information)** (If applicable)
- - OS: [e.g. Linux, Windows, MacOS]
- - Browser [e.g. chrome, firefox, safari]
- - Version [e.g. 22]
-
-**Smartphone (please complete the following information)** (If applicable)
- - Device: [e.g. iPhone6, Pixel7]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, firefox, safari]
- - Version [e.g. 22]
-
-**Docker** (If applicable)
-
-Please share the output of the following.
-- `docker version`
-- `docker info`
-- `docker-compose version`
-
-**Cloud Provider** (If applicable)
-- [ ] AWS
-- [ ] GCP
-- [ ] Azure
-- [ ] DigitalOcean
-- [ ] Others
-
-**Additional context**
-
-Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 000000000..a0c213dde
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,78 @@
+name: 🐞 Bug report
+description: Create a report to help us improve
+labels: 'Bug'
+body:
+  - type: textarea
+    attributes:
+      label: Describe the bug
+      description: A concise description of what you expected to happen along with screenshots if applicable.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: To Reproduce
+      description: Steps to reproduce the behavior.
+      placeholder: |
+        1. In this environment...
+        2. With this config...
+        3. Run '...'
+        4. See error...
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Expected behavior
+      description: A concise description of what you expected to happen.
+  - type: dropdown
+    id: environment
+    attributes:
+      label: Environment
+      description: Describe whether you are using Chatwoot Cloud (app.chatwoot.com) or a self-hosted installation of Chatwoot. If you are using a self-hosted installation of Chatwoot, describe the type of deployment (Docker/Linux VM installation/Heroku/Kubernetes/Other).
+      options:
+        - app.chatwoot.com
+        - Linux VM
+        - Docker
+        - Kubernetes
+        - Heroku
+        - Other [please specify in the description]
+    validations:
+      required: true
+  - type: dropdown
+    id: provider
+    attributes:
+      label: Cloud Provider
+      description:
+      options:
+        - AWS
+        - GCP
+        - Azure
+        - DigitalOcean
+        - Other [please specify in the description]
+  - type: dropdown
+    id: platform
+    attributes:
+      label: Platform
+      description: Describe the platform you are using
+      options:
+        - Browser
+        - Mobile
+  - type: input
+    attributes:
+      label: Operating system
+      description: The operating system and the version you are using.
+  - type: input
+    attributes:
+      label: Browser and version
+      description: The name of the browser and version you are using.
+  - type: textarea
+    attributes:
+      label: Docker (if applicable)
+      description: |
+        Please share the output of the following. 
+        - `docker version`
+        - `docker info`
+        - `docker-compose version`
+  - type: textarea
+    attributes:
+      label: Additional context
+      description: Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 000000000..306f5e4a1
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Report a security issue
+    url: https://www.chatwoot.com/docs/contributing-guide/security-reports/
+    about: Guidelines and steps to report a security vulnerability. Please report security vulnerabilities here.
+  - name: Product Documentation
+    url: https://www.chatwoot.com/help-center
+    about: If you have questions, are confused, or just want to understand our product better, please check out our documentation.
diff --git a/.github/ISSUE_TEMPLATE/enhancement_request.md b/.github/ISSUE_TEMPLATE/enhancement_request.md
deleted file mode 100644
index da1995668..000000000
--- a/.github/ISSUE_TEMPLATE/enhancement_request.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-name: Enhancement request
-about: Suggest any enhancements for this project
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Is your enhancement request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions you've considered.
-
-**Additional context**
-Add any other context or screenshots about the enhancement request here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index bbcbbe7d6..000000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
new file mode 100644
index 000000000..f549bccd7
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,28 @@
+name: 🧙 Feature request
+description: Suggest an idea for this project
+labels: 'feature-request'
+body:
+  - type: textarea
+    attributes:
+      label: Is your feature or enhancement related to a problem? Please describe.
+      description: A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Describe the solution you'd like
+      description: A clear and concise description of what you want to happen.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Describe alternatives you've considered
+      description: A clear and concise description of any alternative solutions or features you've considered.
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Additional context
+      description: Add any other context or screenshots about the feature request here.
+    validations:
+      required: false

From 04da8aa8dce7a2485a5727f22000bd2aae881e5a Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Wed, 26 Apr 2023 19:57:06 -0700
Subject: [PATCH 047/101] fix: Remove duplicates message in WhatsApp Channel
 (#7003)

---
 .../widgets/conversation/MessagesView.vue     | 34 +++++++++-------
 .../dashboard/mixins/conversations.js         | 32 ++++++++++++---
 .../mixins/specs/conversation.spec.js         | 39 +++++++++++++++++--
 3 files changed, 82 insertions(+), 23 deletions(-)

diff --git a/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue b/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
index 5d6158598..7fb349c18 100644
--- a/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
@@ -93,7 +93,9 @@ import { mapGetters } from 'vuex';
 
 import ReplyBox from './ReplyBox';
 import Message from './Message';
-import conversationMixin from '../../../mixins/conversations';
+import conversationMixin, {
+  filterDuplicateSourceMessages,
+} from '../../../mixins/conversations';
 import Banner from 'dashboard/components/ui/Banner.vue';
 import { getTypingUsersText } from '../../../helper/commons';
 import { BUS_EVENTS } from 'shared/constants/busEvents';
@@ -171,24 +173,28 @@ export default {
 
       return '';
     },
-
     getMessages() {
-      const [chat] = this.allConversations.filter(
-        c => c.id === this.currentChat.id
-      );
-      return chat;
+      const messages = this.currentChat.messages || [];
+      if (this.isAWhatsAppChannel) {
+        return filterDuplicateSourceMessages(messages);
+      }
+      return messages;
     },
     getReadMessages() {
-      const chat = this.getMessages;
-      return chat === undefined ? null : this.readMessages(chat);
+      return this.readMessages(
+        this.getMessages,
+        this.currentChat.agent_last_seen_at
+      );
     },
     getUnReadMessages() {
-      const chat = this.getMessages;
-      return chat === undefined ? null : this.unReadMessages(chat);
+      return this.unReadMessages(
+        this.getMessages,
+        this.currentChat.agent_last_seen_at
+      );
     },
     shouldShowSpinner() {
       return (
-        (this.getMessages && this.getMessages.dataFetched === undefined) ||
+        (this.currentChat && this.currentChat.dataFetched === undefined) ||
         (!this.listLoadingStatus && this.isLoadingPrevious)
       );
     },
@@ -208,7 +214,7 @@ export default {
 
     selectedTweet() {
       if (this.selectedTweetId) {
-        const { messages = [] } = this.getMessages;
+        const { messages = [] } = this.currentChat;
         const [selectedMessage] = messages.filter(
           message => message.id === this.selectedTweetId
         );
@@ -360,7 +366,7 @@ export default {
     async fetchPreviousMessages(scrollTop = 0) {
       this.setScrollParams();
       const shouldLoadMoreMessages =
-        this.getMessages.dataFetched === true &&
+        this.currentChat.dataFetched === true &&
         !this.listLoadingStatus &&
         !this.isLoadingPrevious;
 
@@ -373,7 +379,7 @@ export default {
         try {
           await this.$store.dispatch('fetchPreviousMessages', {
             conversationId: this.currentChat.id,
-            before: this.getMessages.messages[0].id,
+            before: this.currentChat.messages[0].id,
           });
           const heightDifference =
             this.conversationPanel.scrollHeight - this.heightBeforeLoad;
diff --git a/app/javascript/dashboard/mixins/conversations.js b/app/javascript/dashboard/mixins/conversations.js
index f7420c144..d864bc020 100644
--- a/app/javascript/dashboard/mixins/conversations.js
+++ b/app/javascript/dashboard/mixins/conversations.js
@@ -12,6 +12,26 @@ const getLastNonActivityMessage = (messageInStore, messageFromAPI) => {
   return messageInStore || messageFromAPI;
 };
 
+export const filterDuplicateSourceMessages = (messages = []) => {
+  const messagesWithoutDuplicates = [];
+  // We cannot use Map or any short hand method as it returns the last message with the duplicate ID
+  // We should return the message with smaller id when there is a duplicate
+  messages.forEach(m1 => {
+    if (m1.source_id) {
+      if (
+        messagesWithoutDuplicates.findIndex(
+          m2 => m1.source_id === m2.source_id
+        ) < 0
+      ) {
+        messagesWithoutDuplicates.push(m1);
+      }
+    } else {
+      messagesWithoutDuplicates.push(m1);
+    }
+  });
+  return messagesWithoutDuplicates;
+};
+
 export default {
   methods: {
     lastMessage(m) {
@@ -34,14 +54,14 @@ export default {
         lastNonActivityMessageFromAPI
       );
     },
-    readMessages(m) {
-      return m.messages.filter(
-        chat => chat.created_at * 1000 <= m.agent_last_seen_at * 1000
+    readMessages(messages, agentLastSeenAt) {
+      return messages.filter(
+        message => message.created_at * 1000 <= agentLastSeenAt * 1000
       );
     },
-    unReadMessages(m) {
-      return m.messages.filter(
-        chat => chat.created_at * 1000 > m.agent_last_seen_at * 1000
+    unReadMessages(messages, agentLastSeenAt) {
+      return messages.filter(
+        message => message.created_at * 1000 > agentLastSeenAt * 1000
       );
     },
   },
diff --git a/app/javascript/dashboard/mixins/specs/conversation.spec.js b/app/javascript/dashboard/mixins/specs/conversation.spec.js
index a8413e8fe..9db7f8c28 100644
--- a/app/javascript/dashboard/mixins/specs/conversation.spec.js
+++ b/app/javascript/dashboard/mixins/specs/conversation.spec.js
@@ -1,17 +1,50 @@
-import conversationMixin from '../conversations';
+import conversationMixin, {
+  filterDuplicateSourceMessages,
+} from '../conversations';
 import conversationFixture from './conversationFixtures';
 import commonHelpers from '../../helper/commons';
 commonHelpers();
 
+describe('#filterDuplicateSourceMessages', () => {
+  it('returns messages without duplicate source_id and all messages without source_id', () => {
+    expect(
+      filterDuplicateSourceMessages([
+        { source_id: null, id: 1 },
+        { source_id: '', id: 2 },
+        { id: 3 },
+        { source_id: 'wa_1', id: 4 },
+        { source_id: 'wa_1', id: 5 },
+        { source_id: 'wa_1', id: 6 },
+        { source_id: 'wa_2', id: 7 },
+        { source_id: 'wa_2', id: 8 },
+        { source_id: 'wa_3', id: 9 },
+      ])
+    ).toEqual([
+      { source_id: null, id: 1 },
+      { source_id: '', id: 2 },
+      { id: 3 },
+      { source_id: 'wa_1', id: 4 },
+      { source_id: 'wa_2', id: 7 },
+      { source_id: 'wa_3', id: 9 },
+    ]);
+  });
+});
+
 describe('#conversationMixin', () => {
   it('should return read messages if conversation is passed', () => {
     expect(
-      conversationMixin.methods.readMessages(conversationFixture.conversation)
+      conversationMixin.methods.readMessages(
+        conversationFixture.conversation.messages,
+        conversationFixture.conversation.agent_last_seen_at
+      )
     ).toEqual(conversationFixture.readMessages);
   });
   it('should return read messages if conversation is passed', () => {
     expect(
-      conversationMixin.methods.unReadMessages(conversationFixture.conversation)
+      conversationMixin.methods.unReadMessages(
+        conversationFixture.conversation.messages,
+        conversationFixture.conversation.agent_last_seen_at
+      )
     ).toEqual(conversationFixture.unReadMessages);
   });
 

From c0e905b5d8e157351afa1354ff5ec90f68e44235 Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Date: Thu, 27 Apr 2023 13:20:29 +0530
Subject: [PATCH 048/101] fix: Search improvements and bug fixes [CW-1604]
 (#6985)

* fix: Search improvements and bug fixes

* Resets tab to all on search

* Fix index bug with tabs

---------

Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
---
 .../dashboard/i18n/locale/en/search.json      |  4 ++--
 .../modules/search/components/SearchTabs.vue  | 11 ++++++++++
 .../modules/search/components/SearchView.vue  | 22 ++++++++++++++++---
 .../store/modules/conversationSearch.js       |  8 ++++---
 4 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/app/javascript/dashboard/i18n/locale/en/search.json b/app/javascript/dashboard/i18n/locale/en/search.json
index 418572c0c..9044bf5f9 100644
--- a/app/javascript/dashboard/i18n/locale/en/search.json
+++ b/app/javascript/dashboard/i18n/locale/en/search.json
@@ -14,8 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
-    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
+    "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/modules/search/components/SearchTabs.vue b/app/javascript/dashboard/modules/search/components/SearchTabs.vue
index 011dff845..1702b159f 100644
--- a/app/javascript/dashboard/modules/search/components/SearchTabs.vue
+++ b/app/javascript/dashboard/modules/search/components/SearchTabs.vue
@@ -18,12 +18,23 @@ export default {
       type: Array,
       default: () => [],
     },
+    selectedTab: {
+      type: Number,
+      default: 0,
+    },
   },
   data() {
     return {
       activeTab: 0,
     };
   },
+  watch: {
+    selectedTab(value, oldValue) {
+      if (value !== oldValue) {
+        this.activeTab = this.selectedTab;
+      }
+    },
+  },
   methods: {
     onTabChange(index) {
       this.activeTab = index;
diff --git a/app/javascript/dashboard/modules/search/components/SearchView.vue b/app/javascript/dashboard/modules/search/components/SearchView.vue
index 94862a3cf..cd72625fd 100644
--- a/app/javascript/dashboard/modules/search/components/SearchView.vue
+++ b/app/javascript/dashboard/modules/search/components/SearchView.vue
@@ -17,11 +17,12 @@
         <search-tabs
           v-if="query"
           :tabs="tabs"
+          :selected-tab="activeTabIndex"
           @tab-change="tab => (selectedTab = tab)"
         />
       </header>
       <div class="search-results">
-        <div v-if="all.length">
+        <div v-if="showResultsSection">
           <search-result-contacts-list
             v-if="filterContacts"
             :is-fetching="uiFlags.contact.isFetching"
@@ -46,7 +47,7 @@
             :show-title="isSelectedTabAll"
           />
         </div>
-        <div v-else-if="showEmptySearchResults && !all.length" class="empty">
+        <div v-else-if="showEmptySearchResults" class="empty">
           <fluent-icon icon="info" size="16px" class="icon" />
           <p class="empty-state__text">
             {{ $t('SEARCH.EMPTY_STATE_FULL', { query }) }}
@@ -157,9 +158,23 @@ export default {
         },
       ];
     },
+    activeTabIndex() {
+      const index = this.tabs.findIndex(tab => tab.key === this.selectedTab);
+      return index >= 0 ? index : 0;
+    },
     showEmptySearchResults() {
       return (
-        this.totalSearchResultsCount === 0 && this.uiFlags.isSearchCompleted
+        this.totalSearchResultsCount === 0 &&
+        this.uiFlags.isSearchCompleted &&
+        !this.uiFlags.isFetching &&
+        this.query
+      );
+    },
+    showResultsSection() {
+      return (
+        (this.uiFlags.isSearchCompleted &&
+          this.totalSearchResultsCount !== 0) ||
+        this.uiFlags.isFetching
       );
     },
     isSelectedTabAll() {
@@ -175,6 +190,7 @@ export default {
   },
   methods: {
     onSearch(q) {
+      this.selectedTab = 'all';
       this.query = q;
       if (!q) {
         this.$store.dispatch('conversationSearch/clearSearchResults');
diff --git a/app/javascript/dashboard/store/modules/conversationSearch.js b/app/javascript/dashboard/store/modules/conversationSearch.js
index 57b993cd1..210081fa1 100644
--- a/app/javascript/dashboard/store/modules/conversationSearch.js
+++ b/app/javascript/dashboard/store/modules/conversationSearch.js
@@ -61,9 +61,11 @@ export const actions = {
       isSearchCompleted: false,
     });
     try {
-      dispatch('contactSearch', { q });
-      dispatch('conversationSearch', { q });
-      dispatch('messageSearch', { q });
+      await Promise.all([
+        dispatch('contactSearch', { q }),
+        dispatch('conversationSearch', { q }),
+        dispatch('messageSearch', { q }),
+      ]);
     } catch (error) {
       // Ignore error
     } finally {

From 09c9300c213fcc7636763fa391e918ae88e502d5 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Thu, 27 Apr 2023 17:01:34 +0530
Subject: [PATCH 049/101] chore: Use canned response variable helpers from
 `utils` (#7007)

---
 .../components/widgets/WootWriter/Editor.vue  |   2 +-
 .../widgets/conversation/ReplyBox.vue         |   4 +-
 .../dashboard/helper/messageHelper.js         |  66 -------
 .../helper/specs/messageHelper.spec.js        | 166 ------------------
 package.json                                  |   2 +-
 yarn.lock                                     |   8 +-
 6 files changed, 8 insertions(+), 240 deletions(-)
 delete mode 100644 app/javascript/dashboard/helper/messageHelper.js
 delete mode 100644 app/javascript/dashboard/helper/specs/messageHelper.spec.js

diff --git a/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue b/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue
index abe84c6c9..5252bed4d 100644
--- a/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue
+++ b/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue
@@ -49,7 +49,7 @@ import {
 import eventListenerMixins from 'shared/mixins/eventListenerMixins';
 import uiSettingsMixin from 'dashboard/mixins/uiSettings';
 import { isEditorHotKeyEnabled } from 'dashboard/mixins/uiSettings';
-import { replaceVariablesInMessage } from 'dashboard/helper/messageHelper';
+import { replaceVariablesInMessage } from '@chatwoot/utils';
 import { CONVERSATION_EVENTS } from '../../../helper/AnalyticsHelper/events';
 
 const createState = (content, placeholder, plugins = []) => {
diff --git a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
index 9278e6b24..bae30d407 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
@@ -164,11 +164,11 @@ import {
   AUDIO_FORMATS,
 } from 'shared/constants/messages';
 import { BUS_EVENTS } from 'shared/constants/busEvents';
-import { replaceVariablesInMessage } from 'dashboard/helper/messageHelper';
 import {
   getMessageVariables,
   getUndefinedVariablesInMessage,
-} from 'dashboard/helper/messageHelper';
+  replaceVariablesInMessage,
+} from '@chatwoot/utils';
 import WhatsappTemplates from './WhatsappTemplates/Modal.vue';
 import { buildHotKeys } from 'shared/helpers/KeyboardHelpers';
 import { MESSAGE_MAX_LENGTH } from 'shared/helpers/MessageTypeHelper';
diff --git a/app/javascript/dashboard/helper/messageHelper.js b/app/javascript/dashboard/helper/messageHelper.js
deleted file mode 100644
index 1ae9a9aff..000000000
--- a/app/javascript/dashboard/helper/messageHelper.js
+++ /dev/null
@@ -1,66 +0,0 @@
-const MESSAGE_VARIABLES_REGEX = /{{(.*?)}}/g;
-export const replaceVariablesInMessage = ({ message, variables }) => {
-  return message.replace(MESSAGE_VARIABLES_REGEX, (match, replace) => {
-    return variables[replace.trim()]
-      ? variables[replace.trim().toLowerCase()]
-      : '';
-  });
-};
-
-export const capitalizeName = name => {
-  return name.replace(/\b(\w)/g, s => s.toUpperCase());
-};
-
-const skipCodeBlocks = str => str.replace(/```(?:.|\n)+?```/g, '');
-
-export const getFirstName = ({ user }) => {
-  const firstName = user?.name ? user.name.split(' ').shift() : '';
-  return capitalizeName(firstName);
-};
-
-export const getLastName = ({ user }) => {
-  if (user && user.name) {
-    const lastName =
-      user.name.split(' ').length > 1 ? user.name.split(' ').pop() : '';
-    return capitalizeName(lastName);
-  }
-  return '';
-};
-
-export const getMessageVariables = ({ conversation }) => {
-  const {
-    meta: { assignee = {}, sender = {} },
-    id,
-  } = conversation;
-
-  return {
-    'contact.name': capitalizeName(sender?.name),
-    'contact.first_name': getFirstName({ user: sender }),
-    'contact.last_name': getLastName({ user: sender }),
-    'contact.email': sender?.email,
-    'contact.phone': sender?.phone_number,
-    'contact.id': sender?.id,
-    'conversation.id': id,
-    'agent.name': capitalizeName(assignee?.name || ''),
-    'agent.first_name': getFirstName({ user: assignee }),
-    'agent.last_name': getLastName({ user: assignee }),
-    'agent.email': assignee?.email ?? '',
-  };
-};
-
-export const getUndefinedVariablesInMessage = ({ message, variables }) => {
-  const messageWithOutCodeBlocks = skipCodeBlocks(message);
-  const matches = messageWithOutCodeBlocks.match(MESSAGE_VARIABLES_REGEX);
-  if (!matches) return [];
-
-  return matches
-    .map(match => {
-      return match
-        .replace('{{', '')
-        .replace('}}', '')
-        .trim();
-    })
-    .filter(variable => {
-      return !variables[variable];
-    });
-};
diff --git a/app/javascript/dashboard/helper/specs/messageHelper.spec.js b/app/javascript/dashboard/helper/specs/messageHelper.spec.js
deleted file mode 100644
index c661c483b..000000000
--- a/app/javascript/dashboard/helper/specs/messageHelper.spec.js
+++ /dev/null
@@ -1,166 +0,0 @@
-import {
-  replaceVariablesInMessage,
-  getFirstName,
-  getLastName,
-  getMessageVariables,
-  getUndefinedVariablesInMessage,
-  capitalizeName,
-} from '../messageHelper';
-
-const variables = {
-  'contact.name': 'John Doe',
-  'contact.first_name': 'John',
-  'contact.last_name': 'Doe',
-  'contact.email': 'john.p@example.com',
-  'contact.phone': '1234567890',
-  'conversation.id': 1,
-  'agent.first_name': 'Samuel',
-  'agent.last_name': 'Smith',
-  'agent.email': 'samuel@gmail.com',
-};
-
-describe('#replaceVariablesInMessage', () => {
-  it('returns the message with variable name', () => {
-    const message =
-      'No issues. Hey {{contact.first_name}}, we will send the reset instructions to your email {{ contact.email}}. The {{ agent.first_name }} {{ agent.last_name }} will take care of everything. Your conversation id is {{ conversation.id }}.';
-    expect(replaceVariablesInMessage({ message, variables })).toBe(
-      'No issues. Hey John, we will send the reset instructions to your email john.p@example.com. The Samuel Smith will take care of everything. Your conversation id is 1.'
-    );
-  });
-
-  it('returns the message with variable name having white space', () => {
-    const message = 'hey {{contact.name}} how may I help you?';
-    expect(replaceVariablesInMessage({ message, variables })).toBe(
-      'hey John Doe how may I help you?'
-    );
-  });
-
-  it('returns the message with variable email', () => {
-    const message =
-      'No issues. We will send the reset instructions to your email at {{contact.email}}';
-    expect(replaceVariablesInMessage({ message, variables })).toBe(
-      'No issues. We will send the reset instructions to your email at john.p@example.com'
-    );
-  });
-
-  it('returns the message with multiple variables', () => {
-    const message =
-      'hey {{ contact.name }}, no issues. We will send the reset instructions to your email at {{contact.email}}';
-    expect(replaceVariablesInMessage({ message, variables })).toBe(
-      'hey John Doe, no issues. We will send the reset instructions to your email at john.p@example.com'
-    );
-  });
-
-  it('returns the message if the variable is not present in variables', () => {
-    const message = 'Please dm me at {{contact.twitter}}';
-    expect(replaceVariablesInMessage({ message, variables })).toBe(
-      'Please dm me at '
-    );
-  });
-});
-
-describe('#getFirstName', () => {
-  it('returns the first name of the contact', () => {
-    const assignee = { name: 'John Doe' };
-    expect(getFirstName({ user: assignee })).toBe('John');
-  });
-
-  it('returns the first name of the contact with multiple names', () => {
-    const assignee = { name: 'John Doe Smith' };
-    expect(getFirstName({ user: assignee })).toBe('John');
-  });
-});
-
-describe('#getLastName', () => {
-  it('returns the last name of the contact', () => {
-    const assignee = { name: 'John Doe' };
-    expect(getLastName({ user: assignee })).toBe('Doe');
-  });
-
-  it('returns the last name of the contact with multiple names', () => {
-    const assignee = { name: 'John Doe Smith' };
-    expect(getLastName({ user: assignee })).toBe('Smith');
-  });
-});
-
-describe('#getMessageVariables', () => {
-  it('returns the variables', () => {
-    const conversation = {
-      meta: {
-        assignee: {
-          name: 'samuel Smith',
-          email: 'samuel@example.com',
-        },
-        sender: {
-          name: 'john Doe',
-          email: 'john.doe@gmail.com',
-          phone_number: '1234567890',
-        },
-      },
-      id: 1,
-    };
-    expect(getMessageVariables({ conversation })).toEqual({
-      'contact.name': 'John Doe',
-      'contact.first_name': 'John',
-      'contact.last_name': 'Doe',
-      'contact.email': 'john.doe@gmail.com',
-      'contact.phone': '1234567890',
-      'conversation.id': 1,
-      'agent.name': 'Samuel Smith',
-      'agent.first_name': 'Samuel',
-      'agent.last_name': 'Smith',
-      'agent.email': 'samuel@example.com',
-    });
-  });
-});
-
-describe('#getUndefinedVariablesInMessage', () => {
-  it('returns the undefined variables', () => {
-    const message = 'Please dm me at {{contact.twitter}}';
-    expect(
-      getUndefinedVariablesInMessage({ message, variables }).length
-    ).toEqual(1);
-    expect(getUndefinedVariablesInMessage({ message, variables })).toEqual(
-      expect.arrayContaining(['contact.twitter'])
-    );
-  });
-  it('skip variables in string with code blocks', () => {
-    const message =
-      'hey {{contact_name}} how are you? ``` code: {{contact_name}} ```';
-    const undefinedVariables = getUndefinedVariablesInMessage({
-      message,
-      variables,
-    });
-    expect(undefinedVariables.length).toEqual(1);
-    expect(undefinedVariables).toEqual(
-      expect.arrayContaining(['contact_name'])
-    );
-  });
-});
-
-describe('#capitalizeName', () => {
-  it('capitalize name if name is passed', () => {
-    const string = 'john peter';
-    expect(capitalizeName(string)).toBe('John Peter');
-  });
-  it('capitalize first name if full name is passed', () => {
-    const string = 'john Doe';
-    expect(capitalizeName(string)).toBe('John Doe');
-  });
-  it('returns empty string if the string is empty', () => {
-    const string = '';
-    expect(capitalizeName(string)).toBe('');
-  });
-  it('capitalize last name if last name is passed', () => {
-    const string = 'john doe';
-    expect(capitalizeName(string)).toBe('John Doe');
-  });
-  it('capitalize first name if first name is passed', () => {
-    const string = 'john';
-    expect(capitalizeName(string)).toBe('John');
-  });
-  it('capitalize last name if last name is passed', () => {
-    const string = 'doe';
-    expect(capitalizeName(string)).toBe('Doe');
-  });
-});
diff --git a/package.json b/package.json
index 5ddcb9a1d..aec30d1ff 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
   "dependencies": {
     "@braid/vue-formulate": "^2.5.2",
     "@chatwoot/prosemirror-schema": "https://github.com/chatwoot/prosemirror-schema.git",
-    "@chatwoot/utils": "^0.0.12",
+    "@chatwoot/utils": "^0.0.15",
     "@hcaptcha/vue-hcaptcha": "^0.3.2",
     "@june-so/analytics-next": "^1.36.5",
     "@rails/actioncable": "6.1.3",
diff --git a/yarn.lock b/yarn.lock
index 27e5a915b..da92bf82c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1410,10 +1410,10 @@
     prosemirror-utils "^0.9.6"
     prosemirror-view "^1.17.2"
 
-"@chatwoot/utils@^0.0.12":
-  version "0.0.12"
-  resolved "https://registry.yarnpkg.com/@chatwoot/utils/-/utils-0.0.12.tgz#684fb5a475c1c7fdeaa628091e90c7d1decd156e"
-  integrity sha512-3O4zC4SO4z4rD2Chno+pzUUb/GacHQfIBfLCOsHviNzgljUE+neyOhS91yWDfCcd3Y0WmQs7UuXgvulmkdxqKg==
+"@chatwoot/utils@^0.0.15":
+  version "0.0.15"
+  resolved "https://registry.yarnpkg.com/@chatwoot/utils/-/utils-0.0.15.tgz#7de3055c3ec269201679aef2351f43a2a250baad"
+  integrity sha512-JYH6cEaiPVjXHTbSAyPkrS3gOyR0W7vpn/9uJfBcWg2m8d5uWi0LXmvX77pq/IsMNK0KK7zqUUkbT0E8VKJDlQ==
   dependencies:
     date-fns "^2.29.1"
 

From 2313edd244f0906d0c76b4bce30135aeb0317dd4 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Fri, 28 Apr 2023 13:36:58 +0530
Subject: [PATCH 050/101] feat: update identity validation docs link (#6994)

* feat: update identity validation docs link

* fix: copy

* fix: grammar
---
 .../dashboard/components/SettingsSection.vue      |  4 +++-
 .../dashboard/i18n/locale/en/inboxMgmt.json       |  5 +++--
 .../inbox/settingsPage/ConfigurationPage.vue      | 15 ++++++++++++++-
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/app/javascript/dashboard/components/SettingsSection.vue b/app/javascript/dashboard/components/SettingsSection.vue
index b3348ae04..b827ad9d4 100644
--- a/app/javascript/dashboard/components/SettingsSection.vue
+++ b/app/javascript/dashboard/components/SettingsSection.vue
@@ -5,7 +5,9 @@
         {{ title }}
       </p>
       <p class="sub-head">
-        {{ subTitle }}
+        <slot name="subTitle">
+          {{ subTitle }}
+        </slot>
       </p>
       <p v-if="note">
         <span class="note">{{ $t('INBOX_MGMT.NOTE') }}</span>
diff --git a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
index 97a4ee2f6..afe22286f 100644
--- a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
@@ -463,9 +463,10 @@
       "INBOX_UPDATE_SUB_TEXT": "Update your inbox settings",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Enable or disable the automatic assignment of new conversations to the agents added to this inbox.",
       "HMAC_VERIFICATION": "User Identity Validation",
-      "HMAC_DESCRIPTION": "In order to validate the user's identity, you can pass an `identifier_hash` for each user. You can generate a HMAC sha256 hash using the `identifier` with the key shown here.",
+      "HMAC_DESCRIPTION": "With this key you can generate a secret token that can be used to verify the identity of your users.",
+      "HMAC_LINK_TO_DOCS": "You can read more here.",
       "HMAC_MANDATORY_VERIFICATION": "Enforce User Identity Validation",
-      "HMAC_MANDATORY_DESCRIPTION": "If enabled, requests missing the `identifier_hash` will be rejected.",
+      "HMAC_MANDATORY_DESCRIPTION": "If enabled, requests that cannot be verified will be rejected.",
       "INBOX_IDENTIFIER": "Inbox Identifier",
       "INBOX_IDENTIFIER_SUB_TEXT": "Use the `inbox_identifier` token shown here to authentication your API clients.",
       "FORWARD_EMAIL_TITLE": "Forward to Email",
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/ConfigurationPage.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/ConfigurationPage.vue
index edfbc4842..ba5d9b8db 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/ConfigurationPage.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/ConfigurationPage.vue
@@ -31,9 +31,18 @@
 
       <settings-section
         :title="$t('INBOX_MGMT.SETTINGS_POPUP.HMAC_VERIFICATION')"
-        :sub-title="$t('INBOX_MGMT.SETTINGS_POPUP.HMAC_DESCRIPTION')"
       >
         <woot-code :script="inbox.hmac_token" />
+        <template #subTitle>
+          {{ $t('INBOX_MGMT.SETTINGS_POPUP.HMAC_DESCRIPTION') }}
+          <a
+            target="_blank"
+            rel="noopener noreferrer"
+            href="https://www.chatwoot.com/docs/product/channels/live-chat/sdk/identity-validation/"
+          >
+            {{ $t('INBOX_MGMT.SETTINGS_POPUP.HMAC_LINK_TO_DOCS') }}
+          </a>
+        </template>
       </settings-section>
       <settings-section
         :title="$t('INBOX_MGMT.SETTINGS_POPUP.HMAC_MANDATORY_VERIFICATION')"
@@ -243,4 +252,8 @@ export default {
     }
   }
 }
+
+.hmac-link-to-docs {
+  margin-top: var(--space-small);
+}
 </style>

From 13fe439d9f22f37288730cded6084fb0c380baec Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Fri, 28 Apr 2023 14:02:30 +0530
Subject: [PATCH 051/101]  Move the reconnect logic from the update presence
 (#6992)

---
 .../helpers/BaseActionCableConnector.js       | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/app/javascript/shared/helpers/BaseActionCableConnector.js b/app/javascript/shared/helpers/BaseActionCableConnector.js
index 44ef0d1bd..eda4316c9 100644
--- a/app/javascript/shared/helpers/BaseActionCableConnector.js
+++ b/app/javascript/shared/helpers/BaseActionCableConnector.js
@@ -2,6 +2,7 @@ import { createConsumer } from '@rails/actioncable';
 import { BUS_EVENTS } from 'shared/constants/busEvents';
 
 const PRESENCE_INTERVAL = 20000;
+const RECONNECT_INTERVAL = 1000;
 
 class BaseActionCableConnector {
   static isDisconnected = false;
@@ -25,6 +26,7 @@ class BaseActionCableConnector {
         disconnected: () => {
           BaseActionCableConnector.isDisconnected = true;
           this.onDisconnected();
+          this.initReconnectTimer();
           // TODO: Remove this after completing the conversation list refetching
           window.bus.$emit(BUS_EVENTS.WEBSOCKET_DISCONNECT);
         },
@@ -32,11 +34,11 @@ class BaseActionCableConnector {
     );
     this.app = app;
     this.events = {};
+    this.reconnectTimer = null;
     this.isAValidEvent = () => true;
     this.triggerPresenceInterval = () => {
       setTimeout(() => {
         this.subscription.updatePresence();
-        this.checkConnection();
         this.triggerPresenceInterval();
       }, PRESENCE_INTERVAL);
     };
@@ -48,11 +50,28 @@ class BaseActionCableConnector {
     const isReconnected =
       BaseActionCableConnector.isDisconnected && isConnectionActive;
     if (isReconnected) {
+      this.clearReconnectTimer();
       this.onReconnect();
       BaseActionCableConnector.isDisconnected = false;
+    } else {
+      this.initReconnectTimer();
     }
   }
 
+  clearReconnectTimer = () => {
+    if (this.reconnectTimer) {
+      clearTimeout(this.reconnectTimer);
+      this.reconnectTimer = null;
+    }
+  };
+
+  initReconnectTimer = () => {
+    this.clearReconnectTimer();
+    this.reconnectTimer = setTimeout(() => {
+      this.checkConnection();
+    }, RECONNECT_INTERVAL);
+  };
+
   onReconnect = () => {};
 
   onDisconnected = () => {};

From 02c467b6db38f3ae9f1d8cb70b86e824ddba29fe Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Fri, 28 Apr 2023 19:57:25 +0530
Subject: [PATCH 052/101] chore: GPT Reply suggestion & summarize endpoints
 (#7011)

Adds additional endpoints for OpenAI integration which will allow
- Reply Suggestions
- Summarization

ref: #6436
fixes: https://linear.app/chatwoot/issue/CW-1596/backend-for-generating-conversation-summary
---
 lib/integrations/openai/processor_service.rb  | 96 ++++++++++++++++---
 .../openai/processor_service_spec.rb          | 61 +++++++++++-
 2 files changed, 139 insertions(+), 18 deletions(-)

diff --git a/lib/integrations/openai/processor_service.rb b/lib/integrations/openai/processor_service.rb
index 95bb00d84..54d2e5ac5 100644
--- a/lib/integrations/openai/processor_service.rb
+++ b/lib/integrations/openai/processor_service.rb
@@ -1,25 +1,98 @@
 class Integrations::Openai::ProcessorService
+  # 3.5 support 4,096 tokens
+  # 1 token is approx 4 characters
+  # 4,096 * 4 = 16,384 characters, sticking to 15,000 to be safe
+  TOKEN_LIMIT = 15_000
+  API_URL = 'https://api.openai.com/v1/chat/completions'.freeze
+  GPT_MODEL = 'gpt-3.5-turbo'.freeze
+
+  ALLOWED_EVENT_NAMES = %w[rephrase summarize reply_suggestion].freeze
+
   pattr_initialize [:hook!, :event!]
 
   def perform
-    rephrase_message if event['name'] == 'rephrase'
+    event_name = event['name']
+    return nil unless valid_event_name?(event_name)
+
+    send("#{event_name}_message")
   end
 
   private
 
-  def rephrase_body(tone, message)
+  def valid_event_name?(event_name)
+    ALLOWED_EVENT_NAMES.include?(event_name)
+  end
+
+  def rephrase_body
     {
-      model: 'gpt-3.5-turbo',
+      model: GPT_MODEL,
       messages: [
-        { role: 'system', content: "You are a helpful support agent. Please rephrase the following response to a more #{tone} tone." },
-        { role: 'user', content: message }
+        { role: 'system',
+          content: "You are a helpful support agent. Please rephrase the following response to a more #{event['data']['tone']} tone." },
+        { role: 'user', content: event['data']['content'] }
       ]
     }.to_json
   end
 
+  def conversation_messages(in_array_format: false)
+    conversation = hook.account.conversations.find_by(display_id: event['data']['conversation_display_id'])
+    messages = in_array_format ? [] : ''
+    character_count = 0
+
+    conversation.messages.chat.reorder('id desc').each do |message|
+      character_count += message.content.length
+      break if character_count > TOKEN_LIMIT
+
+      formatted_message = format_message(message, in_array_format)
+      messages.prepend(formatted_message)
+    end
+    messages
+  end
+
+  def format_message(message, in_array_format)
+    in_array_format ? format_message_in_array(message) : format_message_in_string(message)
+  end
+
+  def format_message_in_array(message)
+    { role: (message.incoming? ? 'user' : 'assistant'), content: message.content }
+  end
+
+  def format_message_in_string(message)
+    sender_type = message.incoming? ? 'Customer' : 'Agent'
+    "#{sender_type} #{message.sender&.name} : #{message.content}\n"
+  end
+
+  def summarize_body
+    {
+      model: GPT_MODEL,
+      messages: [
+        { role: 'system',
+          content: 'Please summarize the key points from the following conversation between support agents and ' \
+                   'customer as bullet points for the next support agent looking into the conversation' },
+        { role: 'user', content: conversation_messages }
+      ]
+    }.to_json
+  end
+
+  def reply_suggestion_body
+    {
+      model: GPT_MODEL,
+      messages: [
+        { role: 'system', content: 'Please suggest a reply to the following conversation between support agents and customer' }
+      ].concat(conversation_messages(in_array_format: true))
+    }.to_json
+  end
+
+  def reply_suggestion_message
+    make_api_call(reply_suggestion_body)
+  end
+
+  def summarize_message
+    make_api_call(summarize_body)
+  end
+
   def rephrase_message
-    response = make_api_call(rephrase_body(event['data']['tone'], event['data']['content']))
-    JSON.parse(response)['choices'].first['message']['content']
+    make_api_call(rephrase_body)
   end
 
   def make_api_call(body)
@@ -28,12 +101,7 @@ class Integrations::Openai::ProcessorService
       'Authorization' => "Bearer #{hook.settings['api_key']}"
     }
 
-    response = HTTParty.post(
-      'https://api.openai.com/v1/chat/completions',
-      headers: headers,
-      body: body
-    )
-
-    response.body
+    response = HTTParty.post(API_URL, headers: headers, body: body)
+    JSON.parse(response.body)['choices'].first['message']['content']
   end
 end
diff --git a/spec/lib/integrations/openai/processor_service_spec.rb b/spec/lib/integrations/openai/processor_service_spec.rb
index ef9e9ba1e..2accf1070 100644
--- a/spec/lib/integrations/openai/processor_service_spec.rb
+++ b/spec/lib/integrations/openai/processor_service_spec.rb
@@ -3,19 +3,23 @@ require 'rails_helper'
 RSpec.describe Integrations::Openai::ProcessorService do
   subject { described_class.new(hook: hook, event: event) }
 
-  let(:hook) { create(:integrations_hook, :openai) }
+  let(:account) { create(:account) }
+  let(:hook) { create(:integrations_hook, :openai, account: account) }
   let(:expected_headers) { { 'Authorization' => "Bearer #{hook.settings['api_key']}" } }
   let(:openai_response) do
     {
       'choices' => [
         {
           'message' => {
-            'content' => 'This is a rephrased test message.'
+            'content' => 'This is a reply from openai.'
           }
         }
       ]
     }.to_json
   end
+  let!(:conversation) { create(:conversation, account: account) }
+  let!(:customer_message) { create(:message, account: account, conversation: conversation, message_type: :incoming, content: 'hello agent') }
+  let!(:agent_message) { create(:message, account: account, conversation: conversation, message_type: :outgoing, content: 'hello customer') }
 
   describe '#perform' do
     context 'when event name is rephrase' do
@@ -36,11 +40,60 @@ RSpec.describe Integrations::Openai::ProcessorService do
           .to_return(status: 200, body: openai_response, headers: {})
 
         result = subject.perform
-        expect(result).to eq('This is a rephrased test message.')
+        expect(result).to eq('This is a reply from openai.')
       end
     end
 
-    context 'when event name is not rephrase' do
+    context 'when event name is reply_suggestion' do
+      let(:event) { { 'name' => 'reply_suggestion', 'data' => { 'conversation_display_id' => conversation.display_id } } }
+
+      it 'returns the suggested reply' do
+        request_body = {
+          'model' => 'gpt-3.5-turbo',
+          'messages' => [
+            { role: 'system', content: 'Please suggest a reply to the following conversation between support agents and customer' },
+            { role: 'user', content: customer_message.content },
+            { role: 'assistant', content: agent_message.content }
+          ]
+        }.to_json
+
+        # Update the stub_request with the correct messages order
+        stub_request(:post, 'https://api.openai.com/v1/chat/completions')
+          .with(body: request_body, headers: expected_headers)
+          .to_return(status: 200, body: openai_response, headers: {})
+
+        result = subject.perform
+        expect(result).to eq('This is a reply from openai.')
+      end
+    end
+
+    context 'when event name is summarize' do
+      let(:event) { { 'name' => 'summarize', 'data' => { 'conversation_display_id' => conversation.display_id } } }
+      let(:conversation_messages) do
+        "Customer #{customer_message.sender.name} : #{customer_message.content}\nAgent #{agent_message.sender.name} : #{agent_message.content}\n"
+      end
+
+      it 'returns the summarized message' do
+        request_body = {
+          'model' => 'gpt-3.5-turbo',
+          'messages' => [
+            { 'role' => 'system',
+              'content' => 'Please summarize the key points from the following conversation between support agents and customer ' \
+                           'as bullet points for the next support agent looking into the conversation' },
+            { 'role' => 'user', 'content' => conversation_messages }
+          ]
+        }.to_json
+
+        stub_request(:post, 'https://api.openai.com/v1/chat/completions')
+          .with(body: request_body, headers: expected_headers)
+          .to_return(status: 200, body: openai_response, headers: {})
+
+        result = subject.perform
+        expect(result).to eq('This is a reply from openai.')
+      end
+    end
+
+    context 'when event name is not one that can be processed' do
       let(:event) { { 'name' => 'unknown', 'data' => {} } }
 
       it 'returns nil' do

From be3c75e8588baeac12e36460374f9e575c673740 Mon Sep 17 00:00:00 2001
From: Chatwoot Bot <92152627+chatwoot-bot@users.noreply.github.com>
Date: Fri, 28 Apr 2023 07:58:03 -0700
Subject: [PATCH 053/101] chore: Update translations (#6999)

Co-authored-by: Sojan Jose <sojan@pepalo.com>
---
 .../i18n/locale/ar/advancedFilters.json       |   1 +
 .../dashboard/i18n/locale/ar/agentMgmt.json   |   3 +-
 .../i18n/locale/ar/conversation.json          |  18 ++
 .../i18n/locale/ar/generalSettings.json       |   2 +
 .../dashboard/i18n/locale/ar/inboxMgmt.json   |   7 +
 .../i18n/locale/ar/integrations.json          |  17 ++
 .../dashboard/i18n/locale/ar/login.json       |   8 +-
 .../i18n/locale/ar/resetPassword.json         |   8 +-
 .../dashboard/i18n/locale/ar/search.json      |   4 +-
 .../i18n/locale/ar/setNewPassword.json        |  12 +-
 .../dashboard/i18n/locale/ar/signup.json      |  24 +--
 .../i18n/locale/bg/advancedFilters.json       |   1 +
 .../dashboard/i18n/locale/bg/agentMgmt.json   |   3 +-
 .../i18n/locale/bg/conversation.json          |  18 ++
 .../i18n/locale/bg/generalSettings.json       |   2 +
 .../dashboard/i18n/locale/bg/inboxMgmt.json   |   7 +
 .../i18n/locale/bg/integrations.json          |  17 ++
 .../dashboard/i18n/locale/bg/login.json       |   8 +-
 .../i18n/locale/bg/resetPassword.json         |  10 +-
 .../dashboard/i18n/locale/bg/search.json      |   4 +-
 .../i18n/locale/bg/setNewPassword.json        |  12 +-
 .../dashboard/i18n/locale/bg/signup.json      |  24 +--
 .../i18n/locale/ca/advancedFilters.json       |   1 +
 .../dashboard/i18n/locale/ca/agentMgmt.json   |   3 +-
 .../i18n/locale/ca/conversation.json          |  18 ++
 .../i18n/locale/ca/generalSettings.json       |   2 +
 .../dashboard/i18n/locale/ca/inboxMgmt.json   |   7 +
 .../i18n/locale/ca/integrations.json          |  17 ++
 .../dashboard/i18n/locale/ca/login.json       |   8 +-
 .../i18n/locale/ca/resetPassword.json         |  10 +-
 .../dashboard/i18n/locale/ca/search.json      |   4 +-
 .../i18n/locale/ca/setNewPassword.json        |  12 +-
 .../dashboard/i18n/locale/ca/signup.json      |  24 +--
 .../i18n/locale/cs/advancedFilters.json       |   1 +
 .../dashboard/i18n/locale/cs/agentMgmt.json   |   3 +-
 .../i18n/locale/cs/conversation.json          |  18 ++
 .../i18n/locale/cs/generalSettings.json       |   2 +
 .../dashboard/i18n/locale/cs/inboxMgmt.json   |   7 +
 .../i18n/locale/cs/integrations.json          |  17 ++
 .../dashboard/i18n/locale/cs/login.json       |   8 +-
 .../i18n/locale/cs/resetPassword.json         |  10 +-
 .../dashboard/i18n/locale/cs/search.json      |   4 +-
 .../i18n/locale/cs/setNewPassword.json        |  12 +-
 .../dashboard/i18n/locale/cs/signup.json      |  24 +--
 .../i18n/locale/da/advancedFilters.json       |   1 +
 .../dashboard/i18n/locale/da/agentMgmt.json   |   3 +-
 .../i18n/locale/da/conversation.json          |  18 ++
 .../i18n/locale/da/generalSettings.json       |   2 +
 .../dashboard/i18n/locale/da/inboxMgmt.json   |   7 +
 .../i18n/locale/da/integrations.json          |  17 ++
 .../dashboard/i18n/locale/da/login.json       |   8 +-
 .../i18n/locale/da/resetPassword.json         |  10 +-
 .../dashboard/i18n/locale/da/search.json      |   4 +-
 .../i18n/locale/da/setNewPassword.json        |  12 +-
 .../dashboard/i18n/locale/da/signup.json      |  24 +--
 .../i18n/locale/de/advancedFilters.json       |   1 +
 .../dashboard/i18n/locale/de/agentMgmt.json   |   3 +-
 .../i18n/locale/de/conversation.json          |  18 ++
 .../i18n/locale/de/generalSettings.json       |   2 +
 .../dashboard/i18n/locale/de/inboxMgmt.json   |   7 +
 .../i18n/locale/de/integrations.json          |  17 ++
 .../dashboard/i18n/locale/de/login.json       |   8 +-
 .../i18n/locale/de/resetPassword.json         |   8 +-
 .../dashboard/i18n/locale/de/search.json      |   4 +-
 .../i18n/locale/de/setNewPassword.json        |  12 +-
 .../dashboard/i18n/locale/de/signup.json      |  24 +--
 .../i18n/locale/el/advancedFilters.json       |   1 +
 .../dashboard/i18n/locale/el/agentMgmt.json   |   3 +-
 .../i18n/locale/el/conversation.json          |  18 ++
 .../i18n/locale/el/generalSettings.json       |   2 +
 .../dashboard/i18n/locale/el/inboxMgmt.json   |   7 +
 .../i18n/locale/el/integrations.json          |  17 ++
 .../dashboard/i18n/locale/el/login.json       |   8 +-
 .../i18n/locale/el/resetPassword.json         |  10 +-
 .../dashboard/i18n/locale/el/search.json      |   4 +-
 .../i18n/locale/el/setNewPassword.json        |  12 +-
 .../dashboard/i18n/locale/el/signup.json      |  24 +--
 .../i18n/locale/es/advancedFilters.json       |   1 +
 .../dashboard/i18n/locale/es/agentMgmt.json   |   3 +-
 .../i18n/locale/es/conversation.json          |  18 ++
 .../i18n/locale/es/generalSettings.json       |   2 +
 .../dashboard/i18n/locale/es/inboxMgmt.json   |   7 +
 .../i18n/locale/es/integrations.json          |  17 ++
 .../dashboard/i18n/locale/es/login.json       |   8 +-
 .../i18n/locale/es/resetPassword.json         |   8 +-
 .../dashboard/i18n/locale/es/search.json      |   4 +-
 .../i18n/locale/es/setNewPassword.json        |  12 +-
 .../dashboard/i18n/locale/es/signup.json      |  24 +--
 .../i18n/locale/fa/advancedFilters.json       |   1 +
 .../dashboard/i18n/locale/fa/agentMgmt.json   |   3 +-
 .../dashboard/i18n/locale/fa/auditLogs.json   |  16 +-
 .../dashboard/i18n/locale/fa/contact.json     |   4 +-
 .../i18n/locale/fa/conversation.json          |  18 ++
 .../i18n/locale/fa/generalSettings.json       |   2 +
 .../dashboard/i18n/locale/fa/inboxMgmt.json   |  11 +-
 .../i18n/locale/fa/integrations.json          |  17 ++
 .../dashboard/i18n/locale/fa/login.json       |   8 +-
 .../i18n/locale/fa/resetPassword.json         |  10 +-
 .../dashboard/i18n/locale/fa/search.json      |   4 +-
 .../i18n/locale/fa/setNewPassword.json        |  12 +-
 .../dashboard/i18n/locale/fa/settings.json    |   2 +-
 .../dashboard/i18n/locale/fa/signup.json      |  24 +--
 .../i18n/locale/fi/advancedFilters.json       |   1 +
 .../dashboard/i18n/locale/fi/agentMgmt.json   |   3 +-
 .../i18n/locale/fi/conversation.json          |  18 ++
 .../i18n/locale/fi/generalSettings.json       |   2 +
 .../dashboard/i18n/locale/fi/inboxMgmt.json   |   7 +
 .../i18n/locale/fi/integrations.json          |  17 ++
 .../dashboard/i18n/locale/fi/login.json       |   8 +-
 .../i18n/locale/fi/resetPassword.json         |   8 +-
 .../dashboard/i18n/locale/fi/search.json      |   4 +-
 .../i18n/locale/fi/setNewPassword.json        |  12 +-
 .../dashboard/i18n/locale/fi/signup.json      |  24 +--
 .../i18n/locale/fr/advancedFilters.json       |   1 +
 .../dashboard/i18n/locale/fr/agentMgmt.json   |   3 +-
 .../i18n/locale/fr/conversation.json          |  18 ++
 .../i18n/locale/fr/generalSettings.json       |   2 +
 .../dashboard/i18n/locale/fr/inboxMgmt.json   |   7 +
 .../i18n/locale/fr/integrations.json          |  17 ++
 .../dashboard/i18n/locale/fr/login.json       |   8 +-
 .../i18n/locale/fr/resetPassword.json         |   8 +-
 .../dashboard/i18n/locale/fr/search.json      |   4 +-
 .../i18n/locale/fr/setNewPassword.json        |  12 +-
 .../dashboard/i18n/locale/fr/signup.json      |  24 +--
 .../i18n/locale/he/advancedFilters.json       |   1 +
 .../dashboard/i18n/locale/he/agentMgmt.json   |   3 +-
 .../i18n/locale/he/conversation.json          |  18 ++
 .../i18n/locale/he/generalSettings.json       |   2 +
 .../dashboard/i18n/locale/he/inboxMgmt.json   |   7 +
 .../i18n/locale/he/integrations.json          |  17 ++
 .../dashboard/i18n/locale/he/login.json       |   8 +-
 .../i18n/locale/he/resetPassword.json         |  10 +-
 .../dashboard/i18n/locale/he/search.json      |   4 +-
 .../i18n/locale/he/setNewPassword.json        |  12 +-
 .../dashboard/i18n/locale/he/signup.json      |  24 +--
 .../i18n/locale/hi/advancedFilters.json       |   1 +
 .../dashboard/i18n/locale/hi/agentMgmt.json   |   3 +-
 .../i18n/locale/hi/conversation.json          |  18 ++
 .../i18n/locale/hi/generalSettings.json       |   2 +
 .../dashboard/i18n/locale/hi/inboxMgmt.json   |   7 +
 .../i18n/locale/hi/integrations.json          |  17 ++
 .../dashboard/i18n/locale/hi/login.json       |   8 +-
 .../i18n/locale/hi/resetPassword.json         |  10 +-
 .../dashboard/i18n/locale/hi/search.json      |   4 +-
 .../i18n/locale/hi/setNewPassword.json        |  12 +-
 .../dashboard/i18n/locale/hi/signup.json      |  24 +--
 .../i18n/locale/hr/advancedFilters.json       |   1 +
 .../dashboard/i18n/locale/hr/agentMgmt.json   |   3 +-
 .../i18n/locale/hr/conversation.json          |  18 ++
 .../i18n/locale/hr/generalSettings.json       |   2 +
 .../dashboard/i18n/locale/hr/inboxMgmt.json   |   7 +
 .../i18n/locale/hr/integrations.json          |  17 ++
 .../dashboard/i18n/locale/hr/login.json       |   8 +-
 .../i18n/locale/hr/resetPassword.json         |  10 +-
 .../dashboard/i18n/locale/hr/search.json      |   4 +-
 .../i18n/locale/hr/setNewPassword.json        |  12 +-
 .../dashboard/i18n/locale/hr/signup.json      |  24 +--
 .../i18n/locale/hu/advancedFilters.json       |   1 +
 .../dashboard/i18n/locale/hu/agentMgmt.json   |   3 +-
 .../i18n/locale/hu/conversation.json          |  18 ++
 .../i18n/locale/hu/generalSettings.json       |   2 +
 .../dashboard/i18n/locale/hu/inboxMgmt.json   |   7 +
 .../i18n/locale/hu/integrations.json          |  17 ++
 .../dashboard/i18n/locale/hu/login.json       |   8 +-
 .../i18n/locale/hu/resetPassword.json         |  10 +-
 .../dashboard/i18n/locale/hu/search.json      |   4 +-
 .../i18n/locale/hu/setNewPassword.json        |  12 +-
 .../dashboard/i18n/locale/hu/signup.json      |  24 +--
 .../i18n/locale/hy/advancedFilters.json       |   1 +
 .../dashboard/i18n/locale/hy/agentMgmt.json   |   3 +-
 .../i18n/locale/hy/conversation.json          |  18 ++
 .../i18n/locale/hy/generalSettings.json       |   2 +
 .../dashboard/i18n/locale/hy/inboxMgmt.json   |   7 +
 .../i18n/locale/hy/integrations.json          |  17 ++
 .../dashboard/i18n/locale/hy/login.json       |   8 +-
 .../i18n/locale/hy/resetPassword.json         |  10 +-
 .../dashboard/i18n/locale/hy/search.json      |   4 +-
 .../i18n/locale/hy/setNewPassword.json        |  12 +-
 .../dashboard/i18n/locale/hy/signup.json      |  24 +--
 .../i18n/locale/id/advancedFilters.json       |   1 +
 .../dashboard/i18n/locale/id/agentMgmt.json   |   3 +-
 .../i18n/locale/id/conversation.json          |  18 ++
 .../i18n/locale/id/generalSettings.json       |   2 +
 .../dashboard/i18n/locale/id/inboxMgmt.json   |   7 +
 .../i18n/locale/id/integrations.json          |  17 ++
 .../dashboard/i18n/locale/id/login.json       |   8 +-
 .../i18n/locale/id/resetPassword.json         |  10 +-
 .../dashboard/i18n/locale/id/search.json      |   4 +-
 .../i18n/locale/id/setNewPassword.json        |  12 +-
 .../dashboard/i18n/locale/id/signup.json      |  24 +--
 .../i18n/locale/is/advancedFilters.json       |   3 +-
 .../dashboard/i18n/locale/is/agentMgmt.json   |   3 +-
 .../i18n/locale/is/conversation.json          |  18 ++
 .../i18n/locale/is/generalSettings.json       |   2 +
 .../dashboard/i18n/locale/is/helpCenter.json  |   2 +-
 .../dashboard/i18n/locale/is/inboxMgmt.json   |   7 +
 .../i18n/locale/is/integrations.json          |  17 ++
 .../dashboard/i18n/locale/is/login.json       |   8 +-
 .../dashboard/i18n/locale/is/report.json      |   2 +-
 .../i18n/locale/is/resetPassword.json         |  10 +-
 .../dashboard/i18n/locale/is/search.json      |   4 +-
 .../i18n/locale/is/setNewPassword.json        |  12 +-
 .../dashboard/i18n/locale/is/settings.json    |  70 ++++----
 .../dashboard/i18n/locale/is/signup.json      |  24 +--
 .../i18n/locale/is/teamsSettings.json         |  20 +--
 .../i18n/locale/it/advancedFilters.json       |   1 +
 .../dashboard/i18n/locale/it/agentMgmt.json   |   3 +-
 .../i18n/locale/it/conversation.json          |  18 ++
 .../i18n/locale/it/generalSettings.json       |   2 +
 .../dashboard/i18n/locale/it/inboxMgmt.json   |   7 +
 .../i18n/locale/it/integrations.json          |  17 ++
 .../dashboard/i18n/locale/it/login.json       |   8 +-
 .../i18n/locale/it/resetPassword.json         |  10 +-
 .../dashboard/i18n/locale/it/search.json      |   4 +-
 .../i18n/locale/it/setNewPassword.json        |  12 +-
 .../dashboard/i18n/locale/it/signup.json      |  24 +--
 .../i18n/locale/ja/advancedFilters.json       |   1 +
 .../dashboard/i18n/locale/ja/agentMgmt.json   |   3 +-
 .../i18n/locale/ja/conversation.json          |  18 ++
 .../i18n/locale/ja/generalSettings.json       |   2 +
 .../dashboard/i18n/locale/ja/inboxMgmt.json   |   7 +
 .../i18n/locale/ja/integrations.json          |  17 ++
 .../dashboard/i18n/locale/ja/login.json       |   8 +-
 .../i18n/locale/ja/resetPassword.json         |  10 +-
 .../dashboard/i18n/locale/ja/search.json      |   4 +-
 .../i18n/locale/ja/setNewPassword.json        |  12 +-
 .../dashboard/i18n/locale/ja/signup.json      |  24 +--
 .../i18n/locale/ka/advancedFilters.json       |   1 +
 .../dashboard/i18n/locale/ka/agentMgmt.json   |   3 +-
 .../i18n/locale/ka/conversation.json          |  18 ++
 .../i18n/locale/ka/generalSettings.json       |   2 +
 .../dashboard/i18n/locale/ka/inboxMgmt.json   |   7 +
 .../i18n/locale/ka/integrations.json          |  17 ++
 .../dashboard/i18n/locale/ka/login.json       |   8 +-
 .../i18n/locale/ka/resetPassword.json         |  10 +-
 .../dashboard/i18n/locale/ka/search.json      |   4 +-
 .../i18n/locale/ka/setNewPassword.json        |  12 +-
 .../dashboard/i18n/locale/ka/signup.json      |  24 +--
 .../i18n/locale/ko/advancedFilters.json       |   1 +
 .../dashboard/i18n/locale/ko/agentMgmt.json   |   3 +-
 .../i18n/locale/ko/conversation.json          |  18 ++
 .../i18n/locale/ko/generalSettings.json       |   2 +
 .../dashboard/i18n/locale/ko/inboxMgmt.json   |   7 +
 .../i18n/locale/ko/integrations.json          |  17 ++
 .../dashboard/i18n/locale/ko/login.json       |   6 +-
 .../i18n/locale/ko/resetPassword.json         |   8 +-
 .../dashboard/i18n/locale/ko/search.json      |   4 +-
 .../i18n/locale/ko/setNewPassword.json        |   8 +-
 .../dashboard/i18n/locale/ko/signup.json      |  20 +--
 .../i18n/locale/lt/advancedFilters.json       |  43 ++---
 .../dashboard/i18n/locale/lt/agentBots.json   |  14 +-
 .../dashboard/i18n/locale/lt/agentMgmt.json   | 109 ++++++------
 .../i18n/locale/lt/attributesMgmt.json        |  34 ++--
 .../dashboard/i18n/locale/lt/auditLogs.json   |   6 +-
 .../dashboard/i18n/locale/lt/automation.json  |  46 ++---
 .../dashboard/i18n/locale/lt/bulkActions.json |   6 +-
 .../dashboard/i18n/locale/lt/campaign.json    |  38 ++---
 .../dashboard/i18n/locale/lt/cannedMgmt.json  |  52 +++---
 .../dashboard/i18n/locale/lt/chatlist.json    |  34 ++--
 .../dashboard/i18n/locale/lt/contact.json     |  74 ++++-----
 .../i18n/locale/lt/contactFilters.json        |  28 ++--
 .../i18n/locale/lt/conversation.json          |  56 ++++---
 .../dashboard/i18n/locale/lt/csatMgmt.json    |   2 +-
 .../i18n/locale/lt/generalSettings.json       |   8 +-
 .../dashboard/i18n/locale/lt/helpCenter.json  |  74 ++++-----
 .../dashboard/i18n/locale/lt/inboxMgmt.json   |  27 +--
 .../i18n/locale/lt/integrationApps.json       |  16 +-
 .../i18n/locale/lt/integrations.json          |  45 +++--
 .../dashboard/i18n/locale/lt/labelsMgmt.json  |  30 ++--
 .../dashboard/i18n/locale/lt/login.json       |   8 +-
 .../dashboard/i18n/locale/lt/macros.json      |  14 +-
 .../dashboard/i18n/locale/lt/report.json      |  82 ++++-----
 .../i18n/locale/lt/resetPassword.json         |  14 +-
 .../dashboard/i18n/locale/lt/search.json      |  14 +-
 .../i18n/locale/lt/setNewPassword.json        |  20 +--
 .../dashboard/i18n/locale/lt/settings.json    |  48 +++---
 .../dashboard/i18n/locale/lt/signup.json      |  44 ++---
 .../i18n/locale/lt/teamsSettings.json         |  26 +--
 .../i18n/locale/lt/whatsappTemplates.json     |   8 +-
 .../i18n/locale/lv/advancedFilters.json       |   1 +
 .../dashboard/i18n/locale/lv/agentMgmt.json   |   7 +-
 .../dashboard/i18n/locale/lv/contact.json     |  16 +-
 .../i18n/locale/lv/conversation.json          |  18 ++
 .../i18n/locale/lv/generalSettings.json       |   2 +
 .../dashboard/i18n/locale/lv/inboxMgmt.json   |   7 +
 .../i18n/locale/lv/integrations.json          |  17 ++
 .../dashboard/i18n/locale/lv/login.json       |   8 +-
 .../i18n/locale/lv/resetPassword.json         |  10 +-
 .../dashboard/i18n/locale/lv/search.json      |   4 +-
 .../i18n/locale/lv/setNewPassword.json        |  12 +-
 .../dashboard/i18n/locale/lv/settings.json    |   2 +-
 .../dashboard/i18n/locale/lv/signup.json      |  24 +--
 .../i18n/locale/ml/advancedFilters.json       |   1 +
 .../dashboard/i18n/locale/ml/agentMgmt.json   |   3 +-
 .../i18n/locale/ml/conversation.json          |  18 ++
 .../i18n/locale/ml/generalSettings.json       |   2 +
 .../dashboard/i18n/locale/ml/inboxMgmt.json   |   7 +
 .../i18n/locale/ml/integrations.json          |  17 ++
 .../dashboard/i18n/locale/ml/login.json       |   8 +-
 .../i18n/locale/ml/resetPassword.json         |  10 +-
 .../dashboard/i18n/locale/ml/search.json      |   4 +-
 .../i18n/locale/ml/setNewPassword.json        |  12 +-
 .../dashboard/i18n/locale/ml/signup.json      |  24 +--
 .../i18n/locale/ms/advancedFilters.json       |   1 +
 .../dashboard/i18n/locale/ms/agentMgmt.json   |   3 +-
 .../i18n/locale/ms/conversation.json          |  18 ++
 .../i18n/locale/ms/generalSettings.json       |   2 +
 .../dashboard/i18n/locale/ms/inboxMgmt.json   |   7 +
 .../i18n/locale/ms/integrations.json          |  17 ++
 .../dashboard/i18n/locale/ms/login.json       |   8 +-
 .../i18n/locale/ms/resetPassword.json         |  10 +-
 .../dashboard/i18n/locale/ms/search.json      |   4 +-
 .../i18n/locale/ms/setNewPassword.json        |  12 +-
 .../dashboard/i18n/locale/ms/signup.json      |  24 +--
 .../i18n/locale/ne/advancedFilters.json       |   1 +
 .../dashboard/i18n/locale/ne/agentMgmt.json   |   3 +-
 .../i18n/locale/ne/conversation.json          |  18 ++
 .../i18n/locale/ne/generalSettings.json       |   2 +
 .../dashboard/i18n/locale/ne/inboxMgmt.json   |   7 +
 .../i18n/locale/ne/integrations.json          |  17 ++
 .../dashboard/i18n/locale/ne/login.json       |   8 +-
 .../i18n/locale/ne/resetPassword.json         |  10 +-
 .../dashboard/i18n/locale/ne/search.json      |   4 +-
 .../i18n/locale/ne/setNewPassword.json        |  12 +-
 .../dashboard/i18n/locale/ne/signup.json      |  24 +--
 .../i18n/locale/nl/advancedFilters.json       |   1 +
 .../dashboard/i18n/locale/nl/agentMgmt.json   |   3 +-
 .../i18n/locale/nl/conversation.json          |  18 ++
 .../i18n/locale/nl/generalSettings.json       |   2 +
 .../dashboard/i18n/locale/nl/inboxMgmt.json   |   7 +
 .../i18n/locale/nl/integrations.json          |  17 ++
 .../dashboard/i18n/locale/nl/login.json       |   8 +-
 .../i18n/locale/nl/resetPassword.json         |   8 +-
 .../dashboard/i18n/locale/nl/search.json      |   4 +-
 .../i18n/locale/nl/setNewPassword.json        |  12 +-
 .../dashboard/i18n/locale/nl/signup.json      |  24 +--
 .../i18n/locale/no/advancedFilters.json       |   1 +
 .../dashboard/i18n/locale/no/agentMgmt.json   |   3 +-
 .../i18n/locale/no/conversation.json          |  18 ++
 .../i18n/locale/no/generalSettings.json       |   2 +
 .../dashboard/i18n/locale/no/inboxMgmt.json   |   7 +
 .../i18n/locale/no/integrations.json          |  17 ++
 .../dashboard/i18n/locale/no/login.json       |   8 +-
 .../i18n/locale/no/resetPassword.json         |  10 +-
 .../dashboard/i18n/locale/no/search.json      |   4 +-
 .../i18n/locale/no/setNewPassword.json        |  12 +-
 .../dashboard/i18n/locale/no/signup.json      |  24 +--
 .../i18n/locale/pl/advancedFilters.json       |   1 +
 .../dashboard/i18n/locale/pl/agentMgmt.json   |   3 +-
 .../i18n/locale/pl/conversation.json          |  18 ++
 .../i18n/locale/pl/generalSettings.json       |   2 +
 .../dashboard/i18n/locale/pl/inboxMgmt.json   |   7 +
 .../i18n/locale/pl/integrations.json          |  17 ++
 .../dashboard/i18n/locale/pl/login.json       |   8 +-
 .../i18n/locale/pl/resetPassword.json         |  10 +-
 .../dashboard/i18n/locale/pl/search.json      |   4 +-
 .../i18n/locale/pl/setNewPassword.json        |  12 +-
 .../dashboard/i18n/locale/pl/signup.json      |  24 +--
 .../i18n/locale/pt/advancedFilters.json       |   1 +
 .../dashboard/i18n/locale/pt/agentMgmt.json   |   3 +-
 .../i18n/locale/pt/conversation.json          |  18 ++
 .../i18n/locale/pt/generalSettings.json       |   2 +
 .../dashboard/i18n/locale/pt/inboxMgmt.json   |   7 +
 .../i18n/locale/pt/integrations.json          |  17 ++
 .../dashboard/i18n/locale/pt/login.json       |   6 +-
 .../i18n/locale/pt/resetPassword.json         |  10 +-
 .../dashboard/i18n/locale/pt/search.json      |   4 +-
 .../i18n/locale/pt/setNewPassword.json        |   8 +-
 .../dashboard/i18n/locale/pt/signup.json      |  20 +--
 .../i18n/locale/pt_BR/advancedFilters.json    |   1 +
 .../i18n/locale/pt_BR/agentMgmt.json          |   3 +-
 .../i18n/locale/pt_BR/attributesMgmt.json     |   2 +-
 .../i18n/locale/pt_BR/conversation.json       |  18 ++
 .../i18n/locale/pt_BR/generalSettings.json    |   2 +
 .../i18n/locale/pt_BR/inboxMgmt.json          |   7 +
 .../i18n/locale/pt_BR/integrations.json       |  17 ++
 .../dashboard/i18n/locale/pt_BR/login.json    |   8 +-
 .../i18n/locale/pt_BR/resetPassword.json      |  10 +-
 .../dashboard/i18n/locale/pt_BR/search.json   |   4 +-
 .../i18n/locale/pt_BR/setNewPassword.json     |  12 +-
 .../dashboard/i18n/locale/pt_BR/signup.json   |  24 +--
 .../i18n/locale/ro/advancedFilters.json       |   3 +-
 .../dashboard/i18n/locale/ro/agentBots.json   |  68 ++++----
 .../dashboard/i18n/locale/ro/agentMgmt.json   |   3 +-
 .../i18n/locale/ro/attributesMgmt.json        |   2 +-
 .../dashboard/i18n/locale/ro/auditLogs.json   |  22 +--
 .../dashboard/i18n/locale/ro/bulkActions.json |   8 +-
 .../dashboard/i18n/locale/ro/contact.json     |   4 +-
 .../i18n/locale/ro/conversation.json          |  22 ++-
 .../dashboard/i18n/locale/ro/emoji.json       |   4 +-
 .../i18n/locale/ro/generalSettings.json       |   4 +-
 .../dashboard/i18n/locale/ro/helpCenter.json  |  10 +-
 .../dashboard/i18n/locale/ro/inboxMgmt.json   | 157 +++++++++---------
 .../i18n/locale/ro/integrations.json          | 105 +++++++-----
 .../dashboard/i18n/locale/ro/login.json       |  14 +-
 .../dashboard/i18n/locale/ro/macros.json      |  68 ++++----
 .../dashboard/i18n/locale/ro/report.json      |  64 +++----
 .../i18n/locale/ro/resetPassword.json         |  10 +-
 .../dashboard/i18n/locale/ro/search.json      |  14 +-
 .../i18n/locale/ro/setNewPassword.json        |  12 +-
 .../dashboard/i18n/locale/ro/settings.json    |  96 +++++------
 .../dashboard/i18n/locale/ro/signup.json      |  38 ++---
 .../i18n/locale/ro/whatsappTemplates.json     |  26 +--
 .../i18n/locale/ru/advancedFilters.json       |   1 +
 .../dashboard/i18n/locale/ru/agentMgmt.json   |   3 +-
 .../i18n/locale/ru/conversation.json          |  18 ++
 .../i18n/locale/ru/generalSettings.json       |   2 +
 .../dashboard/i18n/locale/ru/inboxMgmt.json   |   7 +
 .../i18n/locale/ru/integrations.json          |  17 ++
 .../dashboard/i18n/locale/ru/login.json       |   8 +-
 .../i18n/locale/ru/resetPassword.json         |  10 +-
 .../dashboard/i18n/locale/ru/search.json      |   4 +-
 .../i18n/locale/ru/setNewPassword.json        |  12 +-
 .../dashboard/i18n/locale/ru/signup.json      |  24 +--
 .../i18n/locale/sh/advancedFilters.json       |   1 +
 .../dashboard/i18n/locale/sh/agentMgmt.json   |   3 +-
 .../i18n/locale/sh/conversation.json          |  18 ++
 .../i18n/locale/sh/generalSettings.json       |   2 +
 .../dashboard/i18n/locale/sh/inboxMgmt.json   |   7 +
 .../i18n/locale/sh/integrations.json          |  17 ++
 .../dashboard/i18n/locale/sh/login.json       |   8 +-
 .../i18n/locale/sh/resetPassword.json         |  10 +-
 .../dashboard/i18n/locale/sh/search.json      |   4 +-
 .../i18n/locale/sh/setNewPassword.json        |  12 +-
 .../dashboard/i18n/locale/sh/signup.json      |  24 +--
 .../i18n/locale/sk/advancedFilters.json       |   1 +
 .../dashboard/i18n/locale/sk/agentMgmt.json   |   3 +-
 .../i18n/locale/sk/conversation.json          |  18 ++
 .../i18n/locale/sk/generalSettings.json       |   2 +
 .../dashboard/i18n/locale/sk/inboxMgmt.json   |   7 +
 .../i18n/locale/sk/integrations.json          |  17 ++
 .../dashboard/i18n/locale/sk/login.json       |   8 +-
 .../i18n/locale/sk/resetPassword.json         |  10 +-
 .../dashboard/i18n/locale/sk/search.json      |   4 +-
 .../i18n/locale/sk/setNewPassword.json        |  12 +-
 .../dashboard/i18n/locale/sk/signup.json      |  24 +--
 .../i18n/locale/sr/advancedFilters.json       |   1 +
 .../dashboard/i18n/locale/sr/agentMgmt.json   |   3 +-
 .../i18n/locale/sr/conversation.json          |  18 ++
 .../i18n/locale/sr/generalSettings.json       |   2 +
 .../dashboard/i18n/locale/sr/inboxMgmt.json   |   7 +
 .../i18n/locale/sr/integrations.json          |  17 ++
 .../dashboard/i18n/locale/sr/login.json       |   8 +-
 .../i18n/locale/sr/resetPassword.json         |  10 +-
 .../dashboard/i18n/locale/sr/search.json      |   4 +-
 .../i18n/locale/sr/setNewPassword.json        |  12 +-
 .../dashboard/i18n/locale/sr/signup.json      |  24 +--
 .../i18n/locale/sv/advancedFilters.json       |   1 +
 .../dashboard/i18n/locale/sv/agentMgmt.json   |   3 +-
 .../i18n/locale/sv/conversation.json          |  18 ++
 .../i18n/locale/sv/generalSettings.json       |   2 +
 .../dashboard/i18n/locale/sv/inboxMgmt.json   |   7 +
 .../i18n/locale/sv/integrations.json          |  17 ++
 .../dashboard/i18n/locale/sv/login.json       |   8 +-
 .../i18n/locale/sv/resetPassword.json         |   8 +-
 .../dashboard/i18n/locale/sv/search.json      |   4 +-
 .../i18n/locale/sv/setNewPassword.json        |  12 +-
 .../dashboard/i18n/locale/sv/signup.json      |  24 +--
 .../i18n/locale/ta/advancedFilters.json       |   1 +
 .../dashboard/i18n/locale/ta/agentMgmt.json   |   3 +-
 .../i18n/locale/ta/conversation.json          |  18 ++
 .../i18n/locale/ta/generalSettings.json       |   2 +
 .../dashboard/i18n/locale/ta/inboxMgmt.json   |   7 +
 .../i18n/locale/ta/integrations.json          |  17 ++
 .../dashboard/i18n/locale/ta/login.json       |   8 +-
 .../i18n/locale/ta/resetPassword.json         |  10 +-
 .../dashboard/i18n/locale/ta/search.json      |   4 +-
 .../i18n/locale/ta/setNewPassword.json        |  12 +-
 .../dashboard/i18n/locale/ta/signup.json      |  24 +--
 .../i18n/locale/th/advancedFilters.json       |   1 +
 .../dashboard/i18n/locale/th/agentMgmt.json   |   3 +-
 .../i18n/locale/th/conversation.json          |  18 ++
 .../i18n/locale/th/generalSettings.json       |   2 +
 .../dashboard/i18n/locale/th/inboxMgmt.json   |   7 +
 .../i18n/locale/th/integrations.json          |  17 ++
 .../dashboard/i18n/locale/th/login.json       |   8 +-
 .../i18n/locale/th/resetPassword.json         |  10 +-
 .../dashboard/i18n/locale/th/search.json      |   4 +-
 .../i18n/locale/th/setNewPassword.json        |  12 +-
 .../dashboard/i18n/locale/th/signup.json      |  24 +--
 .../i18n/locale/tr/advancedFilters.json       |   1 +
 .../dashboard/i18n/locale/tr/agentMgmt.json   |   3 +-
 .../i18n/locale/tr/conversation.json          |  18 ++
 .../i18n/locale/tr/generalSettings.json       |   2 +
 .../dashboard/i18n/locale/tr/inboxMgmt.json   |   7 +
 .../i18n/locale/tr/integrations.json          |  17 ++
 .../dashboard/i18n/locale/tr/login.json       |   8 +-
 .../i18n/locale/tr/resetPassword.json         |  10 +-
 .../dashboard/i18n/locale/tr/search.json      |   4 +-
 .../i18n/locale/tr/setNewPassword.json        |  12 +-
 .../dashboard/i18n/locale/tr/signup.json      |  24 +--
 .../i18n/locale/uk/advancedFilters.json       |   1 +
 .../dashboard/i18n/locale/uk/agentMgmt.json   |   3 +-
 .../i18n/locale/uk/conversation.json          |  18 ++
 .../i18n/locale/uk/generalSettings.json       |   2 +
 .../dashboard/i18n/locale/uk/inboxMgmt.json   |   7 +
 .../i18n/locale/uk/integrations.json          |  17 ++
 .../dashboard/i18n/locale/uk/login.json       |   8 +-
 .../i18n/locale/uk/resetPassword.json         |   8 +-
 .../dashboard/i18n/locale/uk/search.json      |   4 +-
 .../i18n/locale/uk/setNewPassword.json        |  10 +-
 .../dashboard/i18n/locale/uk/signup.json      |  24 +--
 .../i18n/locale/ur/advancedFilters.json       |   1 +
 .../dashboard/i18n/locale/ur/agentMgmt.json   |   3 +-
 .../i18n/locale/ur/conversation.json          |  18 ++
 .../i18n/locale/ur/generalSettings.json       |   2 +
 .../dashboard/i18n/locale/ur/inboxMgmt.json   |   7 +
 .../i18n/locale/ur/integrations.json          |  17 ++
 .../dashboard/i18n/locale/ur/login.json       |   8 +-
 .../i18n/locale/ur/resetPassword.json         |  10 +-
 .../dashboard/i18n/locale/ur/search.json      |   4 +-
 .../i18n/locale/ur/setNewPassword.json        |  12 +-
 .../dashboard/i18n/locale/ur/signup.json      |  24 +--
 .../i18n/locale/ur_IN/advancedFilters.json    |   1 +
 .../i18n/locale/ur_IN/agentMgmt.json          |   3 +-
 .../i18n/locale/ur_IN/conversation.json       |  18 ++
 .../i18n/locale/ur_IN/generalSettings.json    |   2 +
 .../i18n/locale/ur_IN/inboxMgmt.json          |   7 +
 .../i18n/locale/ur_IN/integrations.json       |  17 ++
 .../dashboard/i18n/locale/ur_IN/login.json    |   8 +-
 .../i18n/locale/ur_IN/resetPassword.json      |  10 +-
 .../dashboard/i18n/locale/ur_IN/search.json   |   4 +-
 .../i18n/locale/ur_IN/setNewPassword.json     |  12 +-
 .../dashboard/i18n/locale/ur_IN/signup.json   |  24 +--
 .../i18n/locale/vi/advancedFilters.json       |   1 +
 .../dashboard/i18n/locale/vi/agentMgmt.json   |   3 +-
 .../i18n/locale/vi/conversation.json          |  18 ++
 .../i18n/locale/vi/generalSettings.json       |   2 +
 .../dashboard/i18n/locale/vi/inboxMgmt.json   |   7 +
 .../i18n/locale/vi/integrations.json          |  17 ++
 .../dashboard/i18n/locale/vi/login.json       |   8 +-
 .../i18n/locale/vi/resetPassword.json         |   8 +-
 .../dashboard/i18n/locale/vi/search.json      |   4 +-
 .../i18n/locale/vi/setNewPassword.json        |  12 +-
 .../dashboard/i18n/locale/vi/signup.json      |  24 +--
 .../i18n/locale/zh_CN/advancedFilters.json    |   1 +
 .../i18n/locale/zh_CN/agentBots.json          |   8 +-
 .../i18n/locale/zh_CN/agentMgmt.json          |   3 +-
 .../i18n/locale/zh_CN/conversation.json       |  18 ++
 .../i18n/locale/zh_CN/generalSettings.json    |   2 +
 .../i18n/locale/zh_CN/inboxMgmt.json          |   7 +
 .../i18n/locale/zh_CN/integrations.json       |  17 ++
 .../dashboard/i18n/locale/zh_CN/login.json    |   8 +-
 .../i18n/locale/zh_CN/resetPassword.json      |   8 +-
 .../dashboard/i18n/locale/zh_CN/search.json   |   4 +-
 .../i18n/locale/zh_CN/setNewPassword.json     |  12 +-
 .../dashboard/i18n/locale/zh_CN/signup.json   |  24 +--
 .../i18n/locale/zh_TW/advancedFilters.json    |   1 +
 .../i18n/locale/zh_TW/agentBots.json          |   2 +-
 .../i18n/locale/zh_TW/agentMgmt.json          |   3 +-
 .../dashboard/i18n/locale/zh_TW/contact.json  |   2 +-
 .../i18n/locale/zh_TW/conversation.json       |  20 ++-
 .../i18n/locale/zh_TW/generalSettings.json    |  24 +--
 .../i18n/locale/zh_TW/inboxMgmt.json          |  33 ++--
 .../i18n/locale/zh_TW/integrations.json       |  29 +++-
 .../dashboard/i18n/locale/zh_TW/login.json    |   8 +-
 .../i18n/locale/zh_TW/resetPassword.json      |  10 +-
 .../dashboard/i18n/locale/zh_TW/search.json   |   4 +-
 .../i18n/locale/zh_TW/setNewPassword.json     |  12 +-
 .../dashboard/i18n/locale/zh_TW/settings.json |  12 +-
 .../dashboard/i18n/locale/zh_TW/signup.json   |  24 +--
 app/javascript/widget/i18n/locale/lt.json     |  26 +--
 app/javascript/widget/i18n/locale/ro.json     |   2 +-
 config/locales/ar.yml                         |   7 +
 config/locales/bg.yml                         |   7 +
 config/locales/ca.yml                         |   7 +
 config/locales/cs.yml                         |   7 +
 config/locales/da.yml                         |   7 +
 config/locales/de.yml                         |  13 +-
 config/locales/devise.lt.yml                  |  14 +-
 config/locales/el.yml                         |   7 +
 config/locales/es.yml                         |   7 +
 config/locales/fa.yml                         |   9 +-
 config/locales/fi.yml                         |   7 +
 config/locales/fr.yml                         |   7 +
 config/locales/he.yml                         |   7 +
 config/locales/hi.yml                         |   7 +
 config/locales/hr.yml                         |   7 +
 config/locales/hu.yml                         |   7 +
 config/locales/hy.yml                         |   7 +
 config/locales/id.yml                         |   7 +
 config/locales/is.yml                         |   7 +
 config/locales/it.yml                         |   7 +
 config/locales/ja.yml                         |   7 +
 config/locales/ka.yml                         |   7 +
 config/locales/ko.yml                         |   7 +
 config/locales/lt.yml                         |  25 ++-
 config/locales/lv.yml                         |  11 +-
 config/locales/ml.yml                         |   7 +
 config/locales/ms.yml                         |   7 +
 config/locales/ne.yml                         |   7 +
 config/locales/nl.yml                         |   7 +
 config/locales/no.yml                         |   7 +
 config/locales/pl.yml                         |   7 +
 config/locales/pt.yml                         |   7 +
 config/locales/pt_BR.yml                      |   7 +
 config/locales/ro.yml                         |  43 +++--
 config/locales/ru.yml                         |   7 +
 config/locales/sh.yml                         |   7 +
 config/locales/sk.yml                         |   7 +
 config/locales/sr.yml                         |   7 +
 config/locales/sv.yml                         |   7 +
 config/locales/ta.yml                         |   7 +
 config/locales/th.yml                         |   7 +
 config/locales/tr.yml                         |   7 +
 config/locales/uk.yml                         |   7 +
 config/locales/ur.yml                         |   7 +
 config/locales/ur_IN.yml                      |   7 +
 config/locales/vi.yml                         |   7 +
 config/locales/zh_CN.yml                      |   7 +
 config/locales/zh_TW.yml                      |   7 +
 611 files changed, 4830 insertions(+), 2339 deletions(-)

diff --git a/app/javascript/dashboard/i18n/locale/ar/advancedFilters.json b/app/javascript/dashboard/i18n/locale/ar/advancedFilters.json
index c6c850d7e..63c975ca4 100644
--- a/app/javascript/dashboard/i18n/locale/ar/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/ar/advancedFilters.json
@@ -38,6 +38,7 @@
       "CAMPAIGN_NAME": "اسم الحملة",
       "LABELS": "الوسوم",
       "BROWSER_LANGUAGE": "لغة المتصفح",
+      "PRIORITY": "Priority",
       "COUNTRY_NAME": "اسم الدولة",
       "REFERER_LINK": "رابط المرجع",
       "CUSTOM_ATTRIBUTE_LIST": "القائمة",
diff --git a/app/javascript/dashboard/i18n/locale/ar/agentMgmt.json b/app/javascript/dashboard/i18n/locale/ar/agentMgmt.json
index 7cab8b7a1..e5552a9ea 100644
--- a/app/javascript/dashboard/i18n/locale/ar/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ar/agentMgmt.json
@@ -110,7 +110,8 @@
         },
         "PLACEHOLDER": {
           "AGENT": "البحث عن وكلاء",
-          "TEAM": "البحث عن فريق"
+          "TEAM": "البحث عن فريق",
+          "INPUT": "Search for agents"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/ar/conversation.json b/app/javascript/dashboard/i18n/locale/ar/conversation.json
index 4538f6bbd..314592e66 100644
--- a/app/javascript/dashboard/i18n/locale/ar/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ar/conversation.json
@@ -37,6 +37,7 @@
     "UNKNOWN_FILE_TYPE": "ملف غير معروف",
     "SAVE_CONTACT": "حفظ",
     "UPLOADING_ATTACHMENTS": "جاري تحميل المرفقات...",
+    "REPLIED_TO_STORY": "Replied to your story",
     "SUCCESS_DELETE_MESSAGE": "تم حذف الرسالة بنجاح",
     "FAIL_DELETE_MESSSAGE": "تعذر حذف الرسالة! حاول مرة أخرى",
     "NO_RESPONSE": "لا توجد استجابة",
@@ -66,6 +67,23 @@
         "NEXT_WEEK": "الأسبوع المقبل"
       }
     },
+    "PRIORITY": {
+      "TITLE": "Priority",
+      "OPTIONS": {
+        "NONE": "لا شيء",
+        "URGENT": "Urgent",
+        "HIGH": "High",
+        "MEDIUM": "Medium",
+        "LOW": "Low"
+      },
+      "CHANGE_PRIORITY": {
+        "SELECT_PLACEHOLDER": "لا شيء",
+        "INPUT_PLACEHOLDER": "Select priority",
+        "NO_RESULTS": "لم يتم العثور على النتائج",
+        "SUCCESSFUL": "Changed priority of conversation id %{conversationId} to %{priority}",
+        "FAILED": "Couldn't change priority. Please try again."
+      }
+    },
     "CARD_CONTEXT_MENU": {
       "PENDING": "تحديد كمعلق",
       "RESOLVED": "تحديد كمحلولة",
diff --git a/app/javascript/dashboard/i18n/locale/ar/generalSettings.json b/app/javascript/dashboard/i18n/locale/ar/generalSettings.json
index 3bac19919..f82eb3256 100644
--- a/app/javascript/dashboard/i18n/locale/ar/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ar/generalSettings.json
@@ -101,6 +101,7 @@
       "REPORTS": "التقارير",
       "CONVERSATION": "المحادثات",
       "CHANGE_ASSIGNEE": "تغيير المحال إليه",
+      "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "تغيير الفريق",
       "ADD_LABEL": "إضافة تسمية إلى المحادثة",
       "REMOVE_LABEL": "إزالة التسمية من المحادثة",
@@ -126,6 +127,7 @@
       "GO_TO_NOTIFICATIONS": "الذهاب إلى الإشعارات",
       "ADD_LABELS_TO_CONVERSATION": "إضافة تسمية إلى المحادثة",
       "ASSIGN_AN_AGENT": "تعيين وكيل",
+      "ASSIGN_PRIORITY": "Assign priority",
       "ASSIGN_A_TEAM": "تعيين فريق",
       "MUTE_CONVERSATION": "كتم المحادثة",
       "UNMUTE_CONVERSATION": "إلغاء كتم المحادثة",
diff --git a/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json
index 9976d603d..8ae9bd735 100644
--- a/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json
@@ -482,6 +482,13 @@
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
+    "HELP_CENTER": {
+      "LABEL": "Help Center",
+      "PLACEHOLDER": "Select Help Center",
+      "SELECT_PLACEHOLDER": "Select Help Center",
+      "REMOVE": "Remove Help Center",
+      "SUB_TEXT": "Attach a Help Center with the inbox"
+    },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "حد الإسناد التلقائي",
       "MAX_ASSIGNMENT_LIMIT_RANGE_ERROR": "الرجاء إدخال قيمة أكبر من 0",
diff --git a/app/javascript/dashboard/i18n/locale/ar/integrations.json b/app/javascript/dashboard/i18n/locale/ar/integrations.json
index 361f02101..238e1fd02 100644
--- a/app/javascript/dashboard/i18n/locale/ar/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ar/integrations.json
@@ -85,6 +85,23 @@
       "JOIN_ERROR": "There was an error joining the call, please try again",
       "CREATE_ERROR": "There was an error creating a meeting link, please try again"
     },
+    "OPEN_AI": {
+      "TITLE": "Improve With AI",
+      "SUBTITLE": "An improved reply will be generated using AI, based on your current draft.",
+      "TONE": {
+        "TITLE": "Tone",
+        "OPTIONS": {
+          "PROFESSIONAL": "Professional",
+          "FRIENDLY": "Friendly"
+        }
+      },
+      "BUTTONS": {
+        "GENERATE": "Generate",
+        "GENERATING": "Generating...",
+        "CANCEL": "إلغاء"
+      },
+      "GENERATE_ERROR": "There was an error processing the content, please try again"
+    },
     "DELETE": {
       "BUTTON_TEXT": "حذف",
       "API": {
diff --git a/app/javascript/dashboard/i18n/locale/ar/login.json b/app/javascript/dashboard/i18n/locale/ar/login.json
index c98fb00b2..770e8730b 100644
--- a/app/javascript/dashboard/i18n/locale/ar/login.json
+++ b/app/javascript/dashboard/i18n/locale/ar/login.json
@@ -3,16 +3,16 @@
     "TITLE": "تسجيل الدخول إلى Chatwoot",
     "EMAIL": {
       "LABEL": "البريد الإلكتروني",
-      "PLACEHOLDER": "مثال: someone@example.com"
+      "PLACEHOLDER": "example@companyname.com"
     },
     "PASSWORD": {
       "LABEL": "كلمة المرور",
       "PLACEHOLDER": "كلمة المرور"
     },
     "API": {
-      "SUCCESS_MESSAGE": "تم تسجيل الدخول بنجاح",
-      "ERROR_MESSAGE": "تعذر الاتصال بالخادم، الرجاء المحاولة مرة أخرى لاحقاً",
-      "UNAUTH": "اسم المستخدم / كلمة المرور غير صحيحة. الرجاء المحاولة مرة أخرى"
+      "SUCCESS_MESSAGE": "Login successful",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again.",
+      "UNAUTH": "Username or password is incorrect. Please try again."
     },
     "OAUTH": {
       "GOOGLE_LOGIN": "Login with Google",
diff --git a/app/javascript/dashboard/i18n/locale/ar/resetPassword.json b/app/javascript/dashboard/i18n/locale/ar/resetPassword.json
index e862f7f13..daf695176 100644
--- a/app/javascript/dashboard/i18n/locale/ar/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/ar/resetPassword.json
@@ -3,12 +3,12 @@
     "TITLE": "إعادة تعيين كلمة المرور",
     "EMAIL": {
       "LABEL": "البريد الإلكتروني",
-      "PLACEHOLDER": "الرجاء إدخال بريدك الإلكتروني",
-      "ERROR": "الرجاء إدخال بريد إلكتروني صالح"
+      "PLACEHOLDER": "الرجاء إدخال بريدك الإلكتروني.",
+      "ERROR": "الرجاء إدخال بريد إلكتروني صالح."
     },
     "API": {
-      "SUCCESS_MESSAGE": "تم إرسال رابط إعادة تعيين كلمة المرور إلى بريدك الإلكتروني",
-      "ERROR_MESSAGE": "تعذر الاتصال بالخادم، الرجاء المحاولة مرة أخرى لاحقاً"
+      "SUCCESS_MESSAGE": "تم إرسال رابط إعادة تعيين كلمة المرور إلى بريدك الإلكتروني.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "إرسال"
   }
diff --git a/app/javascript/dashboard/i18n/locale/ar/search.json b/app/javascript/dashboard/i18n/locale/ar/search.json
index ef665170a..5555f0358 100644
--- a/app/javascript/dashboard/i18n/locale/ar/search.json
+++ b/app/javascript/dashboard/i18n/locale/ar/search.json
@@ -14,8 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
-    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
+    "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "رد آلي",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/ar/setNewPassword.json b/app/javascript/dashboard/i18n/locale/ar/setNewPassword.json
index 8ab16c39e..7fb41ec3f 100644
--- a/app/javascript/dashboard/i18n/locale/ar/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/ar/setNewPassword.json
@@ -1,19 +1,19 @@
 {
   "SET_NEW_PASSWORD": {
-    "TITLE": "تعيين كلمة مرور جديدة",
+    "TITLE": "Set new password",
     "PASSWORD": {
       "LABEL": "كلمة المرور",
       "PLACEHOLDER": "كلمة المرور",
-      "ERROR": "كلمة المرور قصيرة جداً"
+      "ERROR": "Password is too short."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "تأكيد كلمة المرور",
+      "LABEL": "Confirm password",
       "PLACEHOLDER": "تأكيد كلمة المرور",
-      "ERROR": "كلمة المرور غير متطابقة"
+      "ERROR": "كلمة المرور غير متطابقة."
     },
     "API": {
-      "SUCCESS_MESSAGE": "تم تغيير كلمة المرور بنجاح",
-      "ERROR_MESSAGE": "تعذر الاتصال بالخادم، الرجاء المحاولة مرة أخرى لاحقاً"
+      "SUCCESS_MESSAGE": "تم تغيير كلمة المرور بنجاح.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "CAPTCHA": {
       "ERROR": "انتهت صلاحية التحقق. الرجاء حل كلمة التحقق مرة أخرى."
diff --git a/app/javascript/dashboard/i18n/locale/ar/signup.json b/app/javascript/dashboard/i18n/locale/ar/signup.json
index e49d97f88..b676b7e98 100644
--- a/app/javascript/dashboard/i18n/locale/ar/signup.json
+++ b/app/javascript/dashboard/i18n/locale/ar/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Company name",
-      "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
-      "ERROR": "Company name is too short"
+      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
+      "ERROR": "Company name is too short."
     },
     "FULL_NAME": {
       "LABEL": "الاسم الكامل",
-      "PLACEHOLDER": "أدخل اسمك الكامل. مثال: بروس وين",
-      "ERROR": "الاسم الكامل قصير جداً"
+      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
+      "ERROR": "Full name is too short."
     },
     "EMAIL": {
       "LABEL": "البريد الإلكتروني للعمل",
-      "PLACEHOLDER": "أدخل عنوان بريدك الإلكتروني للعمل. مثال: bruce@wayne.enterprises",
-      "ERROR": "Please enter a valid work email address"
+      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
+      "ERROR": "Please enter a valid work email address."
     },
     "PASSWORD": {
       "LABEL": "كلمة المرور",
       "PLACEHOLDER": "كلمة المرور",
-      "ERROR": "كلمة المرور قصيرة جداً",
-      "IS_INVALID_PASSWORD": "يجب أن تحتوي كلمة المرور على الأقل على حرف كبير واحد وحرف صغير واحد ورقم واحد وحرف خاص واحد"
+      "ERROR": "Password is too short.",
+      "IS_INVALID_PASSWORD": "يجب أن تحتوي كلمة المرور على الأقل على حرف كبير واحد وحرف صغير واحد ورقم واحد وحرف خاص واحد."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "تأكيد كلمة المرور",
-      "PLACEHOLDER": "تأكيد كلمة المرور",
-      "ERROR": "كلمة المرور غير متطابقة"
+      "LABEL": "Confirm password",
+      "PLACEHOLDER": "Confirm password",
+      "ERROR": "كلمة المرور غير متطابقة."
     },
     "API": {
       "SUCCESS_MESSAGE": "تم التسجيل بنجاح",
-      "ERROR_MESSAGE": "تعذر الاتصال بالخادم، الرجاء المحاولة مرة أخرى لاحقاً"
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "إرسال",
     "HAVE_AN_ACCOUNT": "هل لديك حساب مسبق؟"
diff --git a/app/javascript/dashboard/i18n/locale/bg/advancedFilters.json b/app/javascript/dashboard/i18n/locale/bg/advancedFilters.json
index 31b387436..cf74d2200 100644
--- a/app/javascript/dashboard/i18n/locale/bg/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/bg/advancedFilters.json
@@ -38,6 +38,7 @@
       "CAMPAIGN_NAME": "Име на кампания",
       "LABELS": "Етикети",
       "BROWSER_LANGUAGE": "Език на браузъра",
+      "PRIORITY": "Priority",
       "COUNTRY_NAME": "Име на държавата",
       "REFERER_LINK": "Референтна връзка",
       "CUSTOM_ATTRIBUTE_LIST": "List",
diff --git a/app/javascript/dashboard/i18n/locale/bg/agentMgmt.json b/app/javascript/dashboard/i18n/locale/bg/agentMgmt.json
index 37441f1ba..7380d7530 100644
--- a/app/javascript/dashboard/i18n/locale/bg/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/bg/agentMgmt.json
@@ -110,7 +110,8 @@
         },
         "PLACEHOLDER": {
           "AGENT": "Търсете агенти",
-          "TEAM": "Търсете екипи"
+          "TEAM": "Търсете екипи",
+          "INPUT": "Search for agents"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/bg/conversation.json b/app/javascript/dashboard/i18n/locale/bg/conversation.json
index e064dc876..96582d5e5 100644
--- a/app/javascript/dashboard/i18n/locale/bg/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/bg/conversation.json
@@ -37,6 +37,7 @@
     "UNKNOWN_FILE_TYPE": "Unknown File",
     "SAVE_CONTACT": "Save",
     "UPLOADING_ATTACHMENTS": "Uploading attachments...",
+    "REPLIED_TO_STORY": "Replied to your story",
     "SUCCESS_DELETE_MESSAGE": "Message deleted successfully",
     "FAIL_DELETE_MESSSAGE": "Couldn't delete message! Try again",
     "NO_RESPONSE": "No response",
@@ -66,6 +67,23 @@
         "NEXT_WEEK": "Next week"
       }
     },
+    "PRIORITY": {
+      "TITLE": "Priority",
+      "OPTIONS": {
+        "NONE": "Нито един",
+        "URGENT": "Urgent",
+        "HIGH": "High",
+        "MEDIUM": "Medium",
+        "LOW": "Low"
+      },
+      "CHANGE_PRIORITY": {
+        "SELECT_PLACEHOLDER": "Нито един",
+        "INPUT_PLACEHOLDER": "Select priority",
+        "NO_RESULTS": "Няма намерени резултати",
+        "SUCCESSFUL": "Changed priority of conversation id %{conversationId} to %{priority}",
+        "FAILED": "Couldn't change priority. Please try again."
+      }
+    },
     "CARD_CONTEXT_MENU": {
       "PENDING": "Mark as pending",
       "RESOLVED": "Mark as resolved",
diff --git a/app/javascript/dashboard/i18n/locale/bg/generalSettings.json b/app/javascript/dashboard/i18n/locale/bg/generalSettings.json
index f2ba3f132..04058526c 100644
--- a/app/javascript/dashboard/i18n/locale/bg/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/bg/generalSettings.json
@@ -101,6 +101,7 @@
       "REPORTS": "Reports",
       "CONVERSATION": "Разговор",
       "CHANGE_ASSIGNEE": "Change Assignee",
+      "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Change Team",
       "ADD_LABEL": "Add label to the conversation",
       "REMOVE_LABEL": "Remove label from the conversation",
@@ -126,6 +127,7 @@
       "GO_TO_NOTIFICATIONS": "Go to Notifications",
       "ADD_LABELS_TO_CONVERSATION": "Add label to the conversation",
       "ASSIGN_AN_AGENT": "Assign an agent",
+      "ASSIGN_PRIORITY": "Assign priority",
       "ASSIGN_A_TEAM": "Assign a team",
       "MUTE_CONVERSATION": "Mute conversation",
       "UNMUTE_CONVERSATION": "Unmute conversation",
diff --git a/app/javascript/dashboard/i18n/locale/bg/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/bg/inboxMgmt.json
index 0f68b49a8..24293eee2 100644
--- a/app/javascript/dashboard/i18n/locale/bg/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/bg/inboxMgmt.json
@@ -482,6 +482,13 @@
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
+    "HELP_CENTER": {
+      "LABEL": "Help Center",
+      "PLACEHOLDER": "Select Help Center",
+      "SELECT_PLACEHOLDER": "Select Help Center",
+      "REMOVE": "Remove Help Center",
+      "SUB_TEXT": "Attach a Help Center with the inbox"
+    },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
       "MAX_ASSIGNMENT_LIMIT_RANGE_ERROR": "Please enter a value greater than 0",
diff --git a/app/javascript/dashboard/i18n/locale/bg/integrations.json b/app/javascript/dashboard/i18n/locale/bg/integrations.json
index b5f214961..5ee01757b 100644
--- a/app/javascript/dashboard/i18n/locale/bg/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/bg/integrations.json
@@ -85,6 +85,23 @@
       "JOIN_ERROR": "There was an error joining the call, please try again",
       "CREATE_ERROR": "There was an error creating a meeting link, please try again"
     },
+    "OPEN_AI": {
+      "TITLE": "Improve With AI",
+      "SUBTITLE": "An improved reply will be generated using AI, based on your current draft.",
+      "TONE": {
+        "TITLE": "Tone",
+        "OPTIONS": {
+          "PROFESSIONAL": "Professional",
+          "FRIENDLY": "Friendly"
+        }
+      },
+      "BUTTONS": {
+        "GENERATE": "Generate",
+        "GENERATING": "Generating...",
+        "CANCEL": "Отмени"
+      },
+      "GENERATE_ERROR": "There was an error processing the content, please try again"
+    },
     "DELETE": {
       "BUTTON_TEXT": "Изтрий",
       "API": {
diff --git a/app/javascript/dashboard/i18n/locale/bg/login.json b/app/javascript/dashboard/i18n/locale/bg/login.json
index a75430cb2..f2b2f51b9 100644
--- a/app/javascript/dashboard/i18n/locale/bg/login.json
+++ b/app/javascript/dashboard/i18n/locale/bg/login.json
@@ -3,16 +3,16 @@
     "TITLE": "Login to Chatwoot",
     "EMAIL": {
       "LABEL": "Email",
-      "PLACEHOLDER": "Email eg: someone@example.com"
+      "PLACEHOLDER": "example@companyname.com"
     },
     "PASSWORD": {
       "LABEL": "Password",
       "PLACEHOLDER": "Password"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Login Successful",
-      "ERROR_MESSAGE": "Не можа да се свърже с Woot сървър. Моля, опитайте отново по-късно",
-      "UNAUTH": "Username / Password Incorrect. Please try again"
+      "SUCCESS_MESSAGE": "Login successful",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again.",
+      "UNAUTH": "Username or password is incorrect. Please try again."
     },
     "OAUTH": {
       "GOOGLE_LOGIN": "Login with Google",
diff --git a/app/javascript/dashboard/i18n/locale/bg/resetPassword.json b/app/javascript/dashboard/i18n/locale/bg/resetPassword.json
index 440ce1b6c..5af33879a 100644
--- a/app/javascript/dashboard/i18n/locale/bg/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/bg/resetPassword.json
@@ -1,14 +1,14 @@
 {
   "RESET_PASSWORD": {
-    "TITLE": "Нулиране на парола",
+    "TITLE": "Reset password",
     "EMAIL": {
       "LABEL": "Email",
-      "PLACEHOLDER": "Please enter your email",
-      "ERROR": "Please enter a valid email"
+      "PLACEHOLDER": "Моля, въведете имейла адреса си.",
+      "ERROR": "Please enter a valid email."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Password reset link has been sent to your email",
-      "ERROR_MESSAGE": "Не можа да се свърже с Woot сървър. Моля, опитайте отново по-късно"
+      "SUCCESS_MESSAGE": "Password reset link has been sent to your email.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Изпращане"
   }
diff --git a/app/javascript/dashboard/i18n/locale/bg/search.json b/app/javascript/dashboard/i18n/locale/bg/search.json
index 02d13552c..ff7ad2d06 100644
--- a/app/javascript/dashboard/i18n/locale/bg/search.json
+++ b/app/javascript/dashboard/i18n/locale/bg/search.json
@@ -14,8 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
-    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
+    "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Бот",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/bg/setNewPassword.json b/app/javascript/dashboard/i18n/locale/bg/setNewPassword.json
index c2653e5c3..424c8b461 100644
--- a/app/javascript/dashboard/i18n/locale/bg/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/bg/setNewPassword.json
@@ -1,19 +1,19 @@
 {
   "SET_NEW_PASSWORD": {
-    "TITLE": "Set New Password",
+    "TITLE": "Set new password",
     "PASSWORD": {
       "LABEL": "Password",
       "PLACEHOLDER": "Password",
-      "ERROR": "Password is too short"
+      "ERROR": "Password is too short."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirm Password",
+      "LABEL": "Confirm password",
       "PLACEHOLDER": "Confirm Password",
-      "ERROR": "Passwords do not match"
+      "ERROR": "Passwords do not match."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Successfully changed the password",
-      "ERROR_MESSAGE": "Не можа да се свърже с Woot сървър. Моля, опитайте отново по-късно"
+      "SUCCESS_MESSAGE": "Successfully changed the password.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "CAPTCHA": {
       "ERROR": "Verification expired. Please solve captcha again."
diff --git a/app/javascript/dashboard/i18n/locale/bg/signup.json b/app/javascript/dashboard/i18n/locale/bg/signup.json
index aa9669b89..1ad4865ff 100644
--- a/app/javascript/dashboard/i18n/locale/bg/signup.json
+++ b/app/javascript/dashboard/i18n/locale/bg/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Company name",
-      "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
-      "ERROR": "Company name is too short"
+      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
+      "ERROR": "Company name is too short."
     },
     "FULL_NAME": {
       "LABEL": "Full name",
-      "PLACEHOLDER": "Enter your full name. eg: Bruce Wayne",
-      "ERROR": "Full name is too short"
+      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
+      "ERROR": "Full name is too short."
     },
     "EMAIL": {
       "LABEL": "Work email",
-      "PLACEHOLDER": "Enter your work email address. eg: bruce@wayne.enterprises",
-      "ERROR": "Please enter a valid work email address"
+      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
+      "ERROR": "Please enter a valid work email address."
     },
     "PASSWORD": {
       "LABEL": "Password",
       "PLACEHOLDER": "Password",
-      "ERROR": "Password is too short",
-      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
+      "ERROR": "Password is too short.",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirm Password",
-      "PLACEHOLDER": "Confirm Password",
-      "ERROR": "Password doesnot match"
+      "LABEL": "Confirm password",
+      "PLACEHOLDER": "Confirm password",
+      "ERROR": "Password doesnot match."
     },
     "API": {
       "SUCCESS_MESSAGE": "Registration Successfull",
-      "ERROR_MESSAGE": "Не можа да се свърже с Woot сървър. Моля, опитайте отново по-късно"
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Create account",
     "HAVE_AN_ACCOUNT": "Already have an account?"
diff --git a/app/javascript/dashboard/i18n/locale/ca/advancedFilters.json b/app/javascript/dashboard/i18n/locale/ca/advancedFilters.json
index c14c982df..97db8360c 100644
--- a/app/javascript/dashboard/i18n/locale/ca/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/ca/advancedFilters.json
@@ -38,6 +38,7 @@
       "CAMPAIGN_NAME": "Campaign Name",
       "LABELS": "Etiquetes",
       "BROWSER_LANGUAGE": "Browser Language",
+      "PRIORITY": "Priority",
       "COUNTRY_NAME": "Nom del país",
       "REFERER_LINK": "Referer link",
       "CUSTOM_ATTRIBUTE_LIST": "List",
diff --git a/app/javascript/dashboard/i18n/locale/ca/agentMgmt.json b/app/javascript/dashboard/i18n/locale/ca/agentMgmt.json
index c59eb9c42..829bcc7ef 100644
--- a/app/javascript/dashboard/i18n/locale/ca/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ca/agentMgmt.json
@@ -110,7 +110,8 @@
         },
         "PLACEHOLDER": {
           "AGENT": "Cerca agents",
-          "TEAM": "Cerca equips"
+          "TEAM": "Cerca equips",
+          "INPUT": "Search for agents"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/ca/conversation.json b/app/javascript/dashboard/i18n/locale/ca/conversation.json
index 7d13fdacc..93d18f940 100644
--- a/app/javascript/dashboard/i18n/locale/ca/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ca/conversation.json
@@ -37,6 +37,7 @@
     "UNKNOWN_FILE_TYPE": "Unknown File",
     "SAVE_CONTACT": "Save",
     "UPLOADING_ATTACHMENTS": "Pujant fitxers adjunts...",
+    "REPLIED_TO_STORY": "Replied to your story",
     "SUCCESS_DELETE_MESSAGE": "Message deleted successfully",
     "FAIL_DELETE_MESSSAGE": "Couldn't delete message! Try again",
     "NO_RESPONSE": "Sense resposta",
@@ -66,6 +67,23 @@
         "NEXT_WEEK": "Next week"
       }
     },
+    "PRIORITY": {
+      "TITLE": "Priority",
+      "OPTIONS": {
+        "NONE": "Ningú",
+        "URGENT": "Urgent",
+        "HIGH": "High",
+        "MEDIUM": "Medium",
+        "LOW": "Low"
+      },
+      "CHANGE_PRIORITY": {
+        "SELECT_PLACEHOLDER": "Ningú",
+        "INPUT_PLACEHOLDER": "Select priority",
+        "NO_RESULTS": "No s'ha trobat agents",
+        "SUCCESSFUL": "Changed priority of conversation id %{conversationId} to %{priority}",
+        "FAILED": "Couldn't change priority. Please try again."
+      }
+    },
     "CARD_CONTEXT_MENU": {
       "PENDING": "Mark as pending",
       "RESOLVED": "Mark as resolved",
diff --git a/app/javascript/dashboard/i18n/locale/ca/generalSettings.json b/app/javascript/dashboard/i18n/locale/ca/generalSettings.json
index 3fa6780f4..63be2176c 100644
--- a/app/javascript/dashboard/i18n/locale/ca/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ca/generalSettings.json
@@ -101,6 +101,7 @@
       "REPORTS": "Informes",
       "CONVERSATION": "Conversation",
       "CHANGE_ASSIGNEE": "Change Assignee",
+      "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Change Team",
       "ADD_LABEL": "Add label to the conversation",
       "REMOVE_LABEL": "Remove label from the conversation",
@@ -126,6 +127,7 @@
       "GO_TO_NOTIFICATIONS": "Go to Notifications",
       "ADD_LABELS_TO_CONVERSATION": "Add label to the conversation",
       "ASSIGN_AN_AGENT": "Assign an agent",
+      "ASSIGN_PRIORITY": "Assign priority",
       "ASSIGN_A_TEAM": "Assign a team",
       "MUTE_CONVERSATION": "Mute conversation",
       "UNMUTE_CONVERSATION": "Unmute conversation",
diff --git a/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json
index 28b7d8d70..60ea5f001 100644
--- a/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json
@@ -482,6 +482,13 @@
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
+    "HELP_CENTER": {
+      "LABEL": "Help Center",
+      "PLACEHOLDER": "Select Help Center",
+      "SELECT_PLACEHOLDER": "Select Help Center",
+      "REMOVE": "Remove Help Center",
+      "SUB_TEXT": "Attach a Help Center with the inbox"
+    },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
       "MAX_ASSIGNMENT_LIMIT_RANGE_ERROR": "Please enter a value greater than 0",
diff --git a/app/javascript/dashboard/i18n/locale/ca/integrations.json b/app/javascript/dashboard/i18n/locale/ca/integrations.json
index f15209a53..549ae08d6 100644
--- a/app/javascript/dashboard/i18n/locale/ca/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ca/integrations.json
@@ -85,6 +85,23 @@
       "JOIN_ERROR": "There was an error joining the call, please try again",
       "CREATE_ERROR": "There was an error creating a meeting link, please try again"
     },
+    "OPEN_AI": {
+      "TITLE": "Improve With AI",
+      "SUBTITLE": "An improved reply will be generated using AI, based on your current draft.",
+      "TONE": {
+        "TITLE": "Tone",
+        "OPTIONS": {
+          "PROFESSIONAL": "Professional",
+          "FRIENDLY": "Friendly"
+        }
+      },
+      "BUTTONS": {
+        "GENERATE": "Generate",
+        "GENERATING": "Generating...",
+        "CANCEL": "Cancel·la"
+      },
+      "GENERATE_ERROR": "There was an error processing the content, please try again"
+    },
     "DELETE": {
       "BUTTON_TEXT": "Suprimeix",
       "API": {
diff --git a/app/javascript/dashboard/i18n/locale/ca/login.json b/app/javascript/dashboard/i18n/locale/ca/login.json
index 2b5bcdb71..d10c1455f 100644
--- a/app/javascript/dashboard/i18n/locale/ca/login.json
+++ b/app/javascript/dashboard/i18n/locale/ca/login.json
@@ -3,16 +3,16 @@
     "TITLE": "Entra a Chatwoot",
     "EMAIL": {
       "LABEL": "Correu electrònic",
-      "PLACEHOLDER": "Correu electrònic p.e.: someone@exemple.com"
+      "PLACEHOLDER": "example@companyname.com"
     },
     "PASSWORD": {
       "LABEL": "Contrasenya",
       "PLACEHOLDER": "Contrasenya"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Iniciada la sessió amb èxit",
-      "ERROR_MESSAGE": "No s'ha pogut connectar amb el servidor Woot. Torna-ho a provar més endavant",
-      "UNAUTH": "Nom d'usuari / contrasenya incorrecte. Torna-ho a provar-ho"
+      "SUCCESS_MESSAGE": "Login successful",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again.",
+      "UNAUTH": "Username or password is incorrect. Please try again."
     },
     "OAUTH": {
       "GOOGLE_LOGIN": "Login with Google",
diff --git a/app/javascript/dashboard/i18n/locale/ca/resetPassword.json b/app/javascript/dashboard/i18n/locale/ca/resetPassword.json
index d9f15ba8c..374ebc3e2 100644
--- a/app/javascript/dashboard/i18n/locale/ca/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/ca/resetPassword.json
@@ -1,14 +1,14 @@
 {
   "RESET_PASSWORD": {
-    "TITLE": "Reinicialitza la contrasenya",
+    "TITLE": "Restablir la contrasenya",
     "EMAIL": {
       "LABEL": "Correu electrònic",
-      "PLACEHOLDER": "Introduïu el correu electrònic",
-      "ERROR": "Introduïu un correu electrònic vàlid"
+      "PLACEHOLDER": "Introduïu el vostre correu electrònic.",
+      "ERROR": "Introduïu un correu electrònic vàlid."
     },
     "API": {
-      "SUCCESS_MESSAGE": "L’enllaç de reinicialització de la contrasenya s’ha enviat al vostre correu electrònic",
-      "ERROR_MESSAGE": "No s'ha pogut connectar amb el servidor Woot. Torna-ho a provar més endavant"
+      "SUCCESS_MESSAGE": "L’enllaç de reinicialització de la contrasenya s’ha enviat al vostre correu electrònic.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Envia"
   }
diff --git a/app/javascript/dashboard/i18n/locale/ca/search.json b/app/javascript/dashboard/i18n/locale/ca/search.json
index efd6f1503..69f707f91 100644
--- a/app/javascript/dashboard/i18n/locale/ca/search.json
+++ b/app/javascript/dashboard/i18n/locale/ca/search.json
@@ -14,8 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
-    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
+    "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/ca/setNewPassword.json b/app/javascript/dashboard/i18n/locale/ca/setNewPassword.json
index 8098a7271..90b9c1b04 100644
--- a/app/javascript/dashboard/i18n/locale/ca/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/ca/setNewPassword.json
@@ -1,19 +1,19 @@
 {
   "SET_NEW_PASSWORD": {
-    "TITLE": "Estableix la nova contrasenya",
+    "TITLE": "Set new password",
     "PASSWORD": {
       "LABEL": "Contrasenya",
       "PLACEHOLDER": "Contrasenya",
-      "ERROR": "Contrasenya és massa curta"
+      "ERROR": "La contrasenya és massa curta."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirma la contrasenya",
+      "LABEL": "Confirm password",
       "PLACEHOLDER": "Confirma la contrasenya",
-      "ERROR": "La contrasenya no coindeix"
+      "ERROR": "La contrasenya no coindeix."
     },
     "API": {
-      "SUCCESS_MESSAGE": "S'ha canviat la contrasenya correctament",
-      "ERROR_MESSAGE": "No s'ha pogut connectar amb Woot Server. Torneu-ho a provar més endavant"
+      "SUCCESS_MESSAGE": "S'ha canviat la contrasenya correctament.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "CAPTCHA": {
       "ERROR": "Verification expired. Please solve captcha again."
diff --git a/app/javascript/dashboard/i18n/locale/ca/signup.json b/app/javascript/dashboard/i18n/locale/ca/signup.json
index 16dead7a5..1b7d96b78 100644
--- a/app/javascript/dashboard/i18n/locale/ca/signup.json
+++ b/app/javascript/dashboard/i18n/locale/ca/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Company name",
-      "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
-      "ERROR": "Company name is too short"
+      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
+      "ERROR": "Company name is too short."
     },
     "FULL_NAME": {
       "LABEL": "Nom complet",
-      "PLACEHOLDER": "Introdueix el teu nom complet. ex: Bruce Wayne",
-      "ERROR": "El nom del compte és massa curt"
+      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
+      "ERROR": "El nom del compte és massa curt."
     },
     "EMAIL": {
       "LABEL": "Email de treball",
-      "PLACEHOLDER": "Introdueix la teva adreça email de treball. ex: bruce@wayne.enterprises",
-      "ERROR": "Please enter a valid work email address"
+      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
+      "ERROR": "Please enter a valid work email address."
     },
     "PASSWORD": {
       "LABEL": "Contrasenya",
       "PLACEHOLDER": "Contrasenya",
-      "ERROR": "La contrasenya és massa curta",
-      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
+      "ERROR": "La contrasenya és massa curta.",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirma la contrasenya",
-      "PLACEHOLDER": "Confirma la contrasenya",
-      "ERROR": "Les contrasenyes no coincideixen"
+      "LABEL": "Confirm password",
+      "PLACEHOLDER": "Confirm password",
+      "ERROR": "Les contrasenyes no coincideixen."
     },
     "API": {
       "SUCCESS_MESSAGE": "Registrat correctament",
-      "ERROR_MESSAGE": "No s'ha pogut connectar amb el servidor Woot. Torna-ho a provar més endavant"
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Create account",
     "HAVE_AN_ACCOUNT": "Ja tens un compte?"
diff --git a/app/javascript/dashboard/i18n/locale/cs/advancedFilters.json b/app/javascript/dashboard/i18n/locale/cs/advancedFilters.json
index 1332d1519..ec6e093fa 100644
--- a/app/javascript/dashboard/i18n/locale/cs/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/cs/advancedFilters.json
@@ -38,6 +38,7 @@
       "CAMPAIGN_NAME": "Campaign Name",
       "LABELS": "Štítky",
       "BROWSER_LANGUAGE": "Browser Language",
+      "PRIORITY": "Priority",
       "COUNTRY_NAME": "Country Name",
       "REFERER_LINK": "Referer link",
       "CUSTOM_ATTRIBUTE_LIST": "List",
diff --git a/app/javascript/dashboard/i18n/locale/cs/agentMgmt.json b/app/javascript/dashboard/i18n/locale/cs/agentMgmt.json
index 7ae18a6a3..883dcd0fa 100644
--- a/app/javascript/dashboard/i18n/locale/cs/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/cs/agentMgmt.json
@@ -110,7 +110,8 @@
         },
         "PLACEHOLDER": {
           "AGENT": "Hledat agenty",
-          "TEAM": "Hledat týmy"
+          "TEAM": "Hledat týmy",
+          "INPUT": "Search for agents"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/cs/conversation.json b/app/javascript/dashboard/i18n/locale/cs/conversation.json
index 48180e03a..beb496c38 100644
--- a/app/javascript/dashboard/i18n/locale/cs/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/cs/conversation.json
@@ -37,6 +37,7 @@
     "UNKNOWN_FILE_TYPE": "Neznámý soubor",
     "SAVE_CONTACT": "Save",
     "UPLOADING_ATTACHMENTS": "Nahrávání příloh...",
+    "REPLIED_TO_STORY": "Replied to your story",
     "SUCCESS_DELETE_MESSAGE": "Zpráva byla úspěšně smazána",
     "FAIL_DELETE_MESSSAGE": "Zpráva se nepodařilo odstranit! Zkuste to znovu",
     "NO_RESPONSE": "Bez odpovědi",
@@ -66,6 +67,23 @@
         "NEXT_WEEK": "Příští týden"
       }
     },
+    "PRIORITY": {
+      "TITLE": "Priority",
+      "OPTIONS": {
+        "NONE": "Nic",
+        "URGENT": "Urgent",
+        "HIGH": "High",
+        "MEDIUM": "Medium",
+        "LOW": "Low"
+      },
+      "CHANGE_PRIORITY": {
+        "SELECT_PLACEHOLDER": "Nic",
+        "INPUT_PLACEHOLDER": "Select priority",
+        "NO_RESULTS": "Žádné výsledky",
+        "SUCCESSFUL": "Changed priority of conversation id %{conversationId} to %{priority}",
+        "FAILED": "Couldn't change priority. Please try again."
+      }
+    },
     "CARD_CONTEXT_MENU": {
       "PENDING": "Označit jako nevyřízené",
       "RESOLVED": "Označit jako vyřešené",
diff --git a/app/javascript/dashboard/i18n/locale/cs/generalSettings.json b/app/javascript/dashboard/i18n/locale/cs/generalSettings.json
index 4563aae25..7601ea687 100644
--- a/app/javascript/dashboard/i18n/locale/cs/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/cs/generalSettings.json
@@ -101,6 +101,7 @@
       "REPORTS": "Zprávy",
       "CONVERSATION": "Conversation",
       "CHANGE_ASSIGNEE": "Change Assignee",
+      "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Change Team",
       "ADD_LABEL": "Add label to the conversation",
       "REMOVE_LABEL": "Remove label from the conversation",
@@ -126,6 +127,7 @@
       "GO_TO_NOTIFICATIONS": "Go to Notifications",
       "ADD_LABELS_TO_CONVERSATION": "Add label to the conversation",
       "ASSIGN_AN_AGENT": "Assign an agent",
+      "ASSIGN_PRIORITY": "Assign priority",
       "ASSIGN_A_TEAM": "Assign a team",
       "MUTE_CONVERSATION": "Mute conversation",
       "UNMUTE_CONVERSATION": "Unmute conversation",
diff --git a/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json
index 59aa1ce2d..b229b4a39 100644
--- a/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json
@@ -482,6 +482,13 @@
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
+    "HELP_CENTER": {
+      "LABEL": "Help Center",
+      "PLACEHOLDER": "Select Help Center",
+      "SELECT_PLACEHOLDER": "Select Help Center",
+      "REMOVE": "Remove Help Center",
+      "SUB_TEXT": "Attach a Help Center with the inbox"
+    },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
       "MAX_ASSIGNMENT_LIMIT_RANGE_ERROR": "Please enter a value greater than 0",
diff --git a/app/javascript/dashboard/i18n/locale/cs/integrations.json b/app/javascript/dashboard/i18n/locale/cs/integrations.json
index ad1e104dc..3171c2123 100644
--- a/app/javascript/dashboard/i18n/locale/cs/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/cs/integrations.json
@@ -85,6 +85,23 @@
       "JOIN_ERROR": "There was an error joining the call, please try again",
       "CREATE_ERROR": "There was an error creating a meeting link, please try again"
     },
+    "OPEN_AI": {
+      "TITLE": "Improve With AI",
+      "SUBTITLE": "An improved reply will be generated using AI, based on your current draft.",
+      "TONE": {
+        "TITLE": "Tone",
+        "OPTIONS": {
+          "PROFESSIONAL": "Professional",
+          "FRIENDLY": "Friendly"
+        }
+      },
+      "BUTTONS": {
+        "GENERATE": "Generate",
+        "GENERATING": "Generating...",
+        "CANCEL": "Zrušit"
+      },
+      "GENERATE_ERROR": "There was an error processing the content, please try again"
+    },
     "DELETE": {
       "BUTTON_TEXT": "Vymazat",
       "API": {
diff --git a/app/javascript/dashboard/i18n/locale/cs/login.json b/app/javascript/dashboard/i18n/locale/cs/login.json
index cf7dad52a..da8421c07 100644
--- a/app/javascript/dashboard/i18n/locale/cs/login.json
+++ b/app/javascript/dashboard/i18n/locale/cs/login.json
@@ -3,16 +3,16 @@
     "TITLE": "Přihlásit se do Chatwoot",
     "EMAIL": {
       "LABEL": "E-mailová adresa",
-      "PLACEHOLDER": "E-mail např: někdo@example.com"
+      "PLACEHOLDER": "example@companyname.com"
     },
     "PASSWORD": {
       "LABEL": "Heslo",
       "PLACEHOLDER": "Heslo"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Přihlášení úspěšné",
-      "ERROR_MESSAGE": "Nelze se připojit k Woot serveru, opakujte akci později",
-      "UNAUTH": "Nesprávné uživatelské jméno / heslo. Zkuste to prosím znovu"
+      "SUCCESS_MESSAGE": "Login successful",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again.",
+      "UNAUTH": "Username or password is incorrect. Please try again."
     },
     "OAUTH": {
       "GOOGLE_LOGIN": "Login with Google",
diff --git a/app/javascript/dashboard/i18n/locale/cs/resetPassword.json b/app/javascript/dashboard/i18n/locale/cs/resetPassword.json
index 0348bcbf1..ce1cead0e 100644
--- a/app/javascript/dashboard/i18n/locale/cs/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/cs/resetPassword.json
@@ -1,14 +1,14 @@
 {
   "RESET_PASSWORD": {
-    "TITLE": "Obnovit heslo",
+    "TITLE": "Reset password",
     "EMAIL": {
       "LABEL": "E-mailová adresa",
-      "PLACEHOLDER": "Prosím, zadejte svůj e-mail",
-      "ERROR": "Zadejte prosím platný e-mail"
+      "PLACEHOLDER": "Prosím, zadejte svůj e-mail.",
+      "ERROR": "Zadejte prosím platný e-mail."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Odkaz pro obnovení hesla byl odeslán na váš e-mail",
-      "ERROR_MESSAGE": "Nelze se připojit k Woot serveru, opakujte akci později"
+      "SUCCESS_MESSAGE": "Odkaz pro obnovení hesla byl odeslán na váš e-mail.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Odeslat"
   }
diff --git a/app/javascript/dashboard/i18n/locale/cs/search.json b/app/javascript/dashboard/i18n/locale/cs/search.json
index ba3d90461..0906d184e 100644
--- a/app/javascript/dashboard/i18n/locale/cs/search.json
+++ b/app/javascript/dashboard/i18n/locale/cs/search.json
@@ -14,8 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
-    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
+    "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/cs/setNewPassword.json b/app/javascript/dashboard/i18n/locale/cs/setNewPassword.json
index e6421e12c..6fcc355fc 100644
--- a/app/javascript/dashboard/i18n/locale/cs/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/cs/setNewPassword.json
@@ -1,19 +1,19 @@
 {
   "SET_NEW_PASSWORD": {
-    "TITLE": "Nastavit nové heslo",
+    "TITLE": "Set new password",
     "PASSWORD": {
       "LABEL": "Heslo",
       "PLACEHOLDER": "Heslo",
-      "ERROR": "Heslo je příliš krátké"
+      "ERROR": "Heslo je příliš krátké."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Potvrzení hesla",
+      "LABEL": "Confirm password",
       "PLACEHOLDER": "Potvrzení hesla",
-      "ERROR": "Hesla se neshodují"
+      "ERROR": "Hesla se neshodují."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Heslo bylo úspěšně změněno",
-      "ERROR_MESSAGE": "Nelze se připojit k Woot serveru, opakujte akci později"
+      "SUCCESS_MESSAGE": "Heslo bylo úspěšně změněno.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "CAPTCHA": {
       "ERROR": "Ověření vypršelo. Vyřešte captchu znovu."
diff --git a/app/javascript/dashboard/i18n/locale/cs/signup.json b/app/javascript/dashboard/i18n/locale/cs/signup.json
index f05140e49..5cd92541d 100644
--- a/app/javascript/dashboard/i18n/locale/cs/signup.json
+++ b/app/javascript/dashboard/i18n/locale/cs/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Company name",
-      "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
-      "ERROR": "Company name is too short"
+      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
+      "ERROR": "Company name is too short."
     },
     "FULL_NAME": {
       "LABEL": "Celé jméno",
-      "PLACEHOLDER": "Zadejte celé jméno. např.: Jan Novák",
-      "ERROR": "Celé jméno je příliš krátké"
+      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
+      "ERROR": "Celé jméno je příliš krátké."
     },
     "EMAIL": {
       "LABEL": "Pracovní e-mail",
-      "PLACEHOLDER": "Zadejte svou pracovní e-mailovou adresu. např.: jan@novak.spolecnost",
-      "ERROR": "Please enter a valid work email address"
+      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
+      "ERROR": "Please enter a valid work email address."
     },
     "PASSWORD": {
       "LABEL": "Heslo",
       "PLACEHOLDER": "Heslo",
-      "ERROR": "Heslo je příliš krátké",
-      "IS_INVALID_PASSWORD": "Heslo by mělo obsahovat alespoň jedno velké písmeno, jedno malé písmeno, jedno číslo a jeden speciální znak"
+      "ERROR": "Heslo je příliš krátké.",
+      "IS_INVALID_PASSWORD": "Heslo by mělo obsahovat alespoň jedno velké písmeno, jedno malé písmeno, jedno číslo a jeden speciální znak."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Potvrzení hesla",
-      "PLACEHOLDER": "Potvrzení hesla",
-      "ERROR": "Heslo se neshoduje"
+      "LABEL": "Confirm password",
+      "PLACEHOLDER": "Confirm password",
+      "ERROR": "Heslo se neshoduje."
     },
     "API": {
       "SUCCESS_MESSAGE": "Registrace byla úspěšná",
-      "ERROR_MESSAGE": "Nelze se připojit k Woot serveru, opakujte akci později"
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Create account",
     "HAVE_AN_ACCOUNT": "Máte již účet?"
diff --git a/app/javascript/dashboard/i18n/locale/da/advancedFilters.json b/app/javascript/dashboard/i18n/locale/da/advancedFilters.json
index a9b191eee..e4387fc7c 100644
--- a/app/javascript/dashboard/i18n/locale/da/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/da/advancedFilters.json
@@ -38,6 +38,7 @@
       "CAMPAIGN_NAME": "Kampagne Navn",
       "LABELS": "Etiketter",
       "BROWSER_LANGUAGE": "Browser Sprog",
+      "PRIORITY": "Priority",
       "COUNTRY_NAME": "Land Navn",
       "REFERER_LINK": "Refererer link",
       "CUSTOM_ATTRIBUTE_LIST": "Liste",
diff --git a/app/javascript/dashboard/i18n/locale/da/agentMgmt.json b/app/javascript/dashboard/i18n/locale/da/agentMgmt.json
index 0fa2b4825..549ae64ed 100644
--- a/app/javascript/dashboard/i18n/locale/da/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/da/agentMgmt.json
@@ -110,7 +110,8 @@
         },
         "PLACEHOLDER": {
           "AGENT": "Søg agenter",
-          "TEAM": "Søg i teams"
+          "TEAM": "Søg i teams",
+          "INPUT": "Search for agents"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/da/conversation.json b/app/javascript/dashboard/i18n/locale/da/conversation.json
index c759dd823..631e847fc 100644
--- a/app/javascript/dashboard/i18n/locale/da/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/da/conversation.json
@@ -37,6 +37,7 @@
     "UNKNOWN_FILE_TYPE": "Ukendt Fil",
     "SAVE_CONTACT": "Save",
     "UPLOADING_ATTACHMENTS": "Uploader vedhæftede filer...",
+    "REPLIED_TO_STORY": "Replied to your story",
     "SUCCESS_DELETE_MESSAGE": "Besked slettet",
     "FAIL_DELETE_MESSSAGE": "Kunne ikke slette beskeden! Prøv igen",
     "NO_RESPONSE": "Intet svar",
@@ -66,6 +67,23 @@
         "NEXT_WEEK": "Næste uge"
       }
     },
+    "PRIORITY": {
+      "TITLE": "Priority",
+      "OPTIONS": {
+        "NONE": "Ingen",
+        "URGENT": "Urgent",
+        "HIGH": "High",
+        "MEDIUM": "Medium",
+        "LOW": "Low"
+      },
+      "CHANGE_PRIORITY": {
+        "SELECT_PLACEHOLDER": "Ingen",
+        "INPUT_PLACEHOLDER": "Select priority",
+        "NO_RESULTS": "Ingen resultater fundet",
+        "SUCCESSFUL": "Changed priority of conversation id %{conversationId} to %{priority}",
+        "FAILED": "Couldn't change priority. Please try again."
+      }
+    },
     "CARD_CONTEXT_MENU": {
       "PENDING": "Markér som afventende",
       "RESOLVED": "Marker som løst",
diff --git a/app/javascript/dashboard/i18n/locale/da/generalSettings.json b/app/javascript/dashboard/i18n/locale/da/generalSettings.json
index 22251505b..3cc0e219e 100644
--- a/app/javascript/dashboard/i18n/locale/da/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/da/generalSettings.json
@@ -101,6 +101,7 @@
       "REPORTS": "Rapporter",
       "CONVERSATION": "Samtale",
       "CHANGE_ASSIGNEE": "Skift Modtager",
+      "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Skift Team",
       "ADD_LABEL": "Tilføj etiket til samtalen",
       "REMOVE_LABEL": "Fjern etiket fra samtalen",
@@ -126,6 +127,7 @@
       "GO_TO_NOTIFICATIONS": "Gå til Notifikationer",
       "ADD_LABELS_TO_CONVERSATION": "Tilføj etiket til samtalen",
       "ASSIGN_AN_AGENT": "Tildel en agent",
+      "ASSIGN_PRIORITY": "Assign priority",
       "ASSIGN_A_TEAM": "Tildel et team",
       "MUTE_CONVERSATION": "Gør samtale lydløs",
       "UNMUTE_CONVERSATION": "Fjern samtale",
diff --git a/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json
index bb5c71699..5348f1fe4 100644
--- a/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json
@@ -482,6 +482,13 @@
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
+    "HELP_CENTER": {
+      "LABEL": "Help Center",
+      "PLACEHOLDER": "Select Help Center",
+      "SELECT_PLACEHOLDER": "Select Help Center",
+      "REMOVE": "Remove Help Center",
+      "SUB_TEXT": "Attach a Help Center with the inbox"
+    },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Grænse for automatisk tildeling",
       "MAX_ASSIGNMENT_LIMIT_RANGE_ERROR": "Indtast en værdi større end 0",
diff --git a/app/javascript/dashboard/i18n/locale/da/integrations.json b/app/javascript/dashboard/i18n/locale/da/integrations.json
index 66d10290a..2868e45af 100644
--- a/app/javascript/dashboard/i18n/locale/da/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/da/integrations.json
@@ -85,6 +85,23 @@
       "JOIN_ERROR": "There was an error joining the call, please try again",
       "CREATE_ERROR": "There was an error creating a meeting link, please try again"
     },
+    "OPEN_AI": {
+      "TITLE": "Improve With AI",
+      "SUBTITLE": "An improved reply will be generated using AI, based on your current draft.",
+      "TONE": {
+        "TITLE": "Tone",
+        "OPTIONS": {
+          "PROFESSIONAL": "Professional",
+          "FRIENDLY": "Friendly"
+        }
+      },
+      "BUTTONS": {
+        "GENERATE": "Generate",
+        "GENERATING": "Generating...",
+        "CANCEL": "Annuller"
+      },
+      "GENERATE_ERROR": "There was an error processing the content, please try again"
+    },
     "DELETE": {
       "BUTTON_TEXT": "Slet",
       "API": {
diff --git a/app/javascript/dashboard/i18n/locale/da/login.json b/app/javascript/dashboard/i18n/locale/da/login.json
index 6f5f123eb..5f0104238 100644
--- a/app/javascript/dashboard/i18n/locale/da/login.json
+++ b/app/javascript/dashboard/i18n/locale/da/login.json
@@ -3,16 +3,16 @@
     "TITLE": "Log ind på Chatwoot",
     "EMAIL": {
       "LABEL": "E-mail",
-      "PLACEHOLDER": "E-mail, fx: navn@eksempel.dk"
+      "PLACEHOLDER": "example@companyname.com"
     },
     "PASSWORD": {
       "LABEL": "Adgangskode",
       "PLACEHOLDER": "Adgangskode"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Login Lykkedes",
-      "ERROR_MESSAGE": "Kunne ikke oprette forbindelse til Woot Server, Prøv igen senere",
-      "UNAUTH": "Brugernavn / adgangskode forkert. Prøv igen"
+      "SUCCESS_MESSAGE": "Login successful",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again.",
+      "UNAUTH": "Username or password is incorrect. Please try again."
     },
     "OAUTH": {
       "GOOGLE_LOGIN": "Login with Google",
diff --git a/app/javascript/dashboard/i18n/locale/da/resetPassword.json b/app/javascript/dashboard/i18n/locale/da/resetPassword.json
index 4fd200d7c..b77d9e020 100644
--- a/app/javascript/dashboard/i18n/locale/da/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/da/resetPassword.json
@@ -1,14 +1,14 @@
 {
   "RESET_PASSWORD": {
-    "TITLE": "Nulstil Adgangskode",
+    "TITLE": "Reset password",
     "EMAIL": {
       "LABEL": "E-mail",
-      "PLACEHOLDER": "Indtast venligst din e-mail",
-      "ERROR": "Indtast venligst en gyldig e-mail"
+      "PLACEHOLDER": "Indtast venligst din e-mail.",
+      "ERROR": "Indtast venligst en gyldig e-mail."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Link til nulstilling af adgangskode er blevet sendt til din e-mail",
-      "ERROR_MESSAGE": "Kunne ikke oprette forbindelse til Woot Server, Prøv igen senere"
+      "SUCCESS_MESSAGE": "Link til nulstilling af adgangskode er blevet sendt til din e-mail.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Send"
   }
diff --git a/app/javascript/dashboard/i18n/locale/da/search.json b/app/javascript/dashboard/i18n/locale/da/search.json
index a87685f4b..84570b52d 100644
--- a/app/javascript/dashboard/i18n/locale/da/search.json
+++ b/app/javascript/dashboard/i18n/locale/da/search.json
@@ -14,8 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
-    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
+    "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/da/setNewPassword.json b/app/javascript/dashboard/i18n/locale/da/setNewPassword.json
index 0f3f3b599..c46bca700 100644
--- a/app/javascript/dashboard/i18n/locale/da/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/da/setNewPassword.json
@@ -1,19 +1,19 @@
 {
   "SET_NEW_PASSWORD": {
-    "TITLE": "Angiv Ny Adgangskode",
+    "TITLE": "Set new password",
     "PASSWORD": {
       "LABEL": "Adgangskode",
       "PLACEHOLDER": "Adgangskode",
-      "ERROR": "Adgangskoden er for kort"
+      "ERROR": "Adgangskoden er for kort."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Bekræft Adgangskode",
+      "LABEL": "Confirm password",
       "PLACEHOLDER": "Bekræft Adgangskode",
-      "ERROR": "Adgangskoder stemmer ikke overens"
+      "ERROR": "Adgangskoder stemmer ikke overens."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Adgangskoden blev ændret",
-      "ERROR_MESSAGE": "Kunne ikke oprette forbindelse til Woot Server, Prøv igen senere"
+      "SUCCESS_MESSAGE": "Adgangskoden blev ændret.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "CAPTCHA": {
       "ERROR": "Bekræftelse er udløbet. Løs captcha igen."
diff --git a/app/javascript/dashboard/i18n/locale/da/signup.json b/app/javascript/dashboard/i18n/locale/da/signup.json
index dd9206bd0..87fb06faf 100644
--- a/app/javascript/dashboard/i18n/locale/da/signup.json
+++ b/app/javascript/dashboard/i18n/locale/da/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Firmanavn",
-      "PLACEHOLDER": "Indtast dit firmanavn, fx: Wayne Enterprises",
-      "ERROR": "Firmanavn er for kort"
+      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
+      "ERROR": "Firmanavn er for kort."
     },
     "FULL_NAME": {
       "LABEL": "Fulde navn",
-      "PLACEHOLDER": "Indtast dit fulde navn. fx: Bruce Wayne",
-      "ERROR": "Fulde navn er for kort"
+      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
+      "ERROR": "Fulde navn er for kort."
     },
     "EMAIL": {
       "LABEL": "Arbejde e-mail",
-      "PLACEHOLDER": "Indtast din arbejdsmailadresse fx: bruce@wayne.enterprises",
-      "ERROR": "Indtast venligst en gyldig arbejdsmail"
+      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
+      "ERROR": "Indtast venligst en gyldig arbejdsmail."
     },
     "PASSWORD": {
       "LABEL": "Adgangskode",
       "PLACEHOLDER": "Adgangskode",
-      "ERROR": "Adgangskoden er for kort",
-      "IS_INVALID_PASSWORD": "Adgangskoden skal indeholde mindst 1 stort bogstav, 1 lille bogstav, 1 nummer og 1 specialtegn"
+      "ERROR": "Adgangskoden er for kort.",
+      "IS_INVALID_PASSWORD": "Adgangskoden skal indeholde mindst 1 stort bogstav, 1 lille bogstav, 1 nummer og 1 specialtegn."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Bekræft Adgangskode",
-      "PLACEHOLDER": "Bekræft Adgangskode",
-      "ERROR": "Adgangskode stemmer ikke overens"
+      "LABEL": "Confirm password",
+      "PLACEHOLDER": "Confirm password",
+      "ERROR": "Adgangskode stemmer ikke overens."
     },
     "API": {
       "SUCCESS_MESSAGE": "Registrering Succesfuld",
-      "ERROR_MESSAGE": "Kunne ikke oprette forbindelse til Woot Server, Prøv igen senere"
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Create account",
     "HAVE_AN_ACCOUNT": "Har du allerede en konto?"
diff --git a/app/javascript/dashboard/i18n/locale/de/advancedFilters.json b/app/javascript/dashboard/i18n/locale/de/advancedFilters.json
index e6eb76b63..594bda7e3 100644
--- a/app/javascript/dashboard/i18n/locale/de/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/de/advancedFilters.json
@@ -38,6 +38,7 @@
       "CAMPAIGN_NAME": "Kampagnenname",
       "LABELS": "Labels",
       "BROWSER_LANGUAGE": "Browsersprache",
+      "PRIORITY": "Priority",
       "COUNTRY_NAME": "Ländername",
       "REFERER_LINK": "Referer-Link",
       "CUSTOM_ATTRIBUTE_LIST": "Liste",
diff --git a/app/javascript/dashboard/i18n/locale/de/agentMgmt.json b/app/javascript/dashboard/i18n/locale/de/agentMgmt.json
index 4d77637ca..3a3956a5d 100644
--- a/app/javascript/dashboard/i18n/locale/de/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/de/agentMgmt.json
@@ -110,7 +110,8 @@
         },
         "PLACEHOLDER": {
           "AGENT": "Agenten suchen",
-          "TEAM": "Teams suchen"
+          "TEAM": "Teams suchen",
+          "INPUT": "Search for agents"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/de/conversation.json b/app/javascript/dashboard/i18n/locale/de/conversation.json
index faf4b2db7..88f6cfb01 100644
--- a/app/javascript/dashboard/i18n/locale/de/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/de/conversation.json
@@ -37,6 +37,7 @@
     "UNKNOWN_FILE_TYPE": "Unbekannte Datei",
     "SAVE_CONTACT": "Save",
     "UPLOADING_ATTACHMENTS": "Anhänge werden hochgeladen...",
+    "REPLIED_TO_STORY": "Replied to your story",
     "SUCCESS_DELETE_MESSAGE": "Nachricht erfolgreich gelöscht",
     "FAIL_DELETE_MESSSAGE": "Nachricht konnte nicht gelöscht werden! Versuchen Sie es erneut",
     "NO_RESPONSE": "Keine Antwort",
@@ -66,6 +67,23 @@
         "NEXT_WEEK": "Nächste Woche"
       }
     },
+    "PRIORITY": {
+      "TITLE": "Priority",
+      "OPTIONS": {
+        "NONE": "Keine",
+        "URGENT": "Urgent",
+        "HIGH": "High",
+        "MEDIUM": "Medium",
+        "LOW": "Low"
+      },
+      "CHANGE_PRIORITY": {
+        "SELECT_PLACEHOLDER": "Keine",
+        "INPUT_PLACEHOLDER": "Select priority",
+        "NO_RESULTS": "Keine Ergebnisse gefunden",
+        "SUCCESSFUL": "Changed priority of conversation id %{conversationId} to %{priority}",
+        "FAILED": "Couldn't change priority. Please try again."
+      }
+    },
     "CARD_CONTEXT_MENU": {
       "PENDING": "Als ausstehend markieren",
       "RESOLVED": "Als gelöst markieren",
diff --git a/app/javascript/dashboard/i18n/locale/de/generalSettings.json b/app/javascript/dashboard/i18n/locale/de/generalSettings.json
index bd448e524..c380319e5 100644
--- a/app/javascript/dashboard/i18n/locale/de/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/de/generalSettings.json
@@ -101,6 +101,7 @@
       "REPORTS": "Berichte",
       "CONVERSATION": "Konversation",
       "CHANGE_ASSIGNEE": "Beauftragten ändern",
+      "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Team wechseln",
       "ADD_LABEL": "Label zur Konversation hinzufügen",
       "REMOVE_LABEL": "Label aus der Konversation entfernen",
@@ -126,6 +127,7 @@
       "GO_TO_NOTIFICATIONS": "Zu Benachrichtigungen",
       "ADD_LABELS_TO_CONVERSATION": "Label zur Konversation hinzufügen",
       "ASSIGN_AN_AGENT": "Einen Agent zuweisen",
+      "ASSIGN_PRIORITY": "Assign priority",
       "ASSIGN_A_TEAM": "Ein Team zuweisen",
       "MUTE_CONVERSATION": "Konversation stummschalten",
       "UNMUTE_CONVERSATION": "Konversation entstummen",
diff --git a/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
index f4d04fe87..ff6da5db0 100644
--- a/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
@@ -482,6 +482,13 @@
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
+    "HELP_CENTER": {
+      "LABEL": "Help Center",
+      "PLACEHOLDER": "Select Help Center",
+      "SELECT_PLACEHOLDER": "Select Help Center",
+      "REMOVE": "Remove Help Center",
+      "SUB_TEXT": "Attach a Help Center with the inbox"
+    },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Limit für automatische Zuweisung",
       "MAX_ASSIGNMENT_LIMIT_RANGE_ERROR": "Bitte geben Sie einen Wert größer als 0 ein",
diff --git a/app/javascript/dashboard/i18n/locale/de/integrations.json b/app/javascript/dashboard/i18n/locale/de/integrations.json
index 0a289f896..26c711f7e 100644
--- a/app/javascript/dashboard/i18n/locale/de/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/de/integrations.json
@@ -85,6 +85,23 @@
       "JOIN_ERROR": "Beim Verbinden des Anrufs ist ein Fehler aufgetreten, bitte versuche es erneut",
       "CREATE_ERROR": "Beim Erstellen eines Meeting-Links ist ein Fehler aufgetreten, bitte versuchen Sie es erneut"
     },
+    "OPEN_AI": {
+      "TITLE": "Improve With AI",
+      "SUBTITLE": "An improved reply will be generated using AI, based on your current draft.",
+      "TONE": {
+        "TITLE": "Tone",
+        "OPTIONS": {
+          "PROFESSIONAL": "Professional",
+          "FRIENDLY": "Friendly"
+        }
+      },
+      "BUTTONS": {
+        "GENERATE": "Generate",
+        "GENERATING": "Generating...",
+        "CANCEL": "Stornieren"
+      },
+      "GENERATE_ERROR": "There was an error processing the content, please try again"
+    },
     "DELETE": {
       "BUTTON_TEXT": "Löschen",
       "API": {
diff --git a/app/javascript/dashboard/i18n/locale/de/login.json b/app/javascript/dashboard/i18n/locale/de/login.json
index 37542c323..b6d13ed39 100644
--- a/app/javascript/dashboard/i18n/locale/de/login.json
+++ b/app/javascript/dashboard/i18n/locale/de/login.json
@@ -3,16 +3,16 @@
     "TITLE": "Melden Sie sich bei Chatwoot an",
     "EMAIL": {
       "LABEL": "E-Mail",
-      "PLACEHOLDER": "E-Mail zB: jemand@example.com"
+      "PLACEHOLDER": "example@companyname.com"
     },
     "PASSWORD": {
       "LABEL": "Passwort",
       "PLACEHOLDER": "Passwort"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Anmeldung erfolgreich",
-      "ERROR_MESSAGE": "Es konnte keine Verbindung zum Woot Server hergestellt werden. Bitte versuchen Sie es später erneut",
-      "UNAUTH": "Benutzername / Passwort falsch. Bitte versuche es erneut"
+      "SUCCESS_MESSAGE": "Login successful",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again.",
+      "UNAUTH": "Username or password is incorrect. Please try again."
     },
     "OAUTH": {
       "GOOGLE_LOGIN": "Login with Google",
diff --git a/app/javascript/dashboard/i18n/locale/de/resetPassword.json b/app/javascript/dashboard/i18n/locale/de/resetPassword.json
index ccb8f35d4..7a527749c 100644
--- a/app/javascript/dashboard/i18n/locale/de/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/de/resetPassword.json
@@ -3,12 +3,12 @@
     "TITLE": "Passwort zurücksetzen",
     "EMAIL": {
       "LABEL": "E-Mail",
-      "PLACEHOLDER": "Bitte geben Sie ihre E-Mail-Adresse ein",
-      "ERROR": "Bitte geben Sie eine gültige Email-Adresse ein"
+      "PLACEHOLDER": "Bitte geben Sie Ihre E-Mail ein.",
+      "ERROR": "Bitte geben Sie eine gültige Email-Adresse ein."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Der Link zum Zurücksetzen des Passworts wurde an Ihre E-Mail gesendet",
-      "ERROR_MESSAGE": "Es konnte keine Verbindung zum Woot Server hergestellt werden. Bitte versuchen Sie es später erneut"
+      "SUCCESS_MESSAGE": "Der Link zum Zurücksetzen des Passworts wurde an Ihre E-Mail gesendet.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Einreichen"
   }
diff --git a/app/javascript/dashboard/i18n/locale/de/search.json b/app/javascript/dashboard/i18n/locale/de/search.json
index b7ce03892..ca32126c3 100644
--- a/app/javascript/dashboard/i18n/locale/de/search.json
+++ b/app/javascript/dashboard/i18n/locale/de/search.json
@@ -14,8 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
-    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
+    "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/de/setNewPassword.json b/app/javascript/dashboard/i18n/locale/de/setNewPassword.json
index 4eb8b36e0..f0bf0c581 100644
--- a/app/javascript/dashboard/i18n/locale/de/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/de/setNewPassword.json
@@ -1,19 +1,19 @@
 {
   "SET_NEW_PASSWORD": {
-    "TITLE": "Neues Passwort festlegen",
+    "TITLE": "Set new password",
     "PASSWORD": {
       "LABEL": "Passwort",
       "PLACEHOLDER": "Passwort",
-      "ERROR": "Das Passwort ist zu kurz"
+      "ERROR": "Das Passwort ist zu kurz."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Bestätige das Passwort",
+      "LABEL": "Confirm password",
       "PLACEHOLDER": "Bestätige das Passwort",
-      "ERROR": "Passwörter stimmen nicht überein"
+      "ERROR": "Passwörter stimmen nicht überein."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Das Passwort wurde erfolgreich geändert",
-      "ERROR_MESSAGE": "Es konnte keine Verbindung zum Woot Server hergestellt werden. Bitte versuchen Sie es später erneut"
+      "SUCCESS_MESSAGE": "Das Passwort wurde erfolgreich geändert.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "CAPTCHA": {
       "ERROR": "Verifizierung abgelaufen. Bitte Captcha erneut lösen."
diff --git a/app/javascript/dashboard/i18n/locale/de/signup.json b/app/javascript/dashboard/i18n/locale/de/signup.json
index 1107b6e4a..07c6f96be 100644
--- a/app/javascript/dashboard/i18n/locale/de/signup.json
+++ b/app/javascript/dashboard/i18n/locale/de/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Firmenname",
-      "PLACEHOLDER": "Geben Sie Ihren Firmennamen ein, z. B.: Wayne Enterprises",
-      "ERROR": "Firmenname ist zu kurz"
+      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
+      "ERROR": "Firmenname ist zu kurz."
     },
     "FULL_NAME": {
       "LABEL": "Vollständiger Name",
-      "PLACEHOLDER": "Geben Sie Ihren vollständigen Namen ein, z. B.: Bruce Wayne",
-      "ERROR": "Vollständiger Name ist zu kurz"
+      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
+      "ERROR": "Vollständiger Name ist zu kurz."
     },
     "EMAIL": {
       "LABEL": "Geschäftliche E-Mail-Adresse",
-      "PLACEHOLDER": "Geben Sie Ihre geschäftliche E-Mail-Adresse ein, z. B.: bruce@wayne.enterprises",
-      "ERROR": "Bitte geben Sie eine gültige Arbeits-E-Mail-Adresse ein"
+      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
+      "ERROR": "Bitte geben Sie eine gültige Arbeits-E-Mail-Adresse ein."
     },
     "PASSWORD": {
       "LABEL": "Passwort",
       "PLACEHOLDER": "Passwort",
-      "ERROR": "Das Passwort ist zu kurz",
-      "IS_INVALID_PASSWORD": "Das Passwort sollte mindestens 1 Großbuchstaben, 1 Kleinbuchstaben, 1 Ziffer und 1 Sonderzeichen enthalten"
+      "ERROR": "Das Passwort ist zu kurz.",
+      "IS_INVALID_PASSWORD": "Das Passwort sollte mindestens 1 Großbuchstaben, 1 Kleinbuchstaben, 1 Ziffer und 1 Sonderzeichen enthalten."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Bestätige das Passwort",
-      "PLACEHOLDER": "Bestätige das Passwort",
-      "ERROR": "Passwort stimmt nicht überein"
+      "LABEL": "Confirm password",
+      "PLACEHOLDER": "Confirm password",
+      "ERROR": "Passwort stimmt nicht überein."
     },
     "API": {
       "SUCCESS_MESSAGE": "Registrierung erfolgreich",
-      "ERROR_MESSAGE": "Es konnte keine Verbindung zum Woot Server hergestellt werden. Bitte versuchen Sie es später erneut"
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Konto erstellen",
     "HAVE_AN_ACCOUNT": "Haben Sie bereits ein Konto?"
diff --git a/app/javascript/dashboard/i18n/locale/el/advancedFilters.json b/app/javascript/dashboard/i18n/locale/el/advancedFilters.json
index ada58acf8..dd996a342 100644
--- a/app/javascript/dashboard/i18n/locale/el/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/el/advancedFilters.json
@@ -38,6 +38,7 @@
       "CAMPAIGN_NAME": "Όνομα Καμπάνιας",
       "LABELS": "Ετικέτες",
       "BROWSER_LANGUAGE": "Γλώσσα Περιήγησης",
+      "PRIORITY": "Priority",
       "COUNTRY_NAME": "Όνομα Χώρας",
       "REFERER_LINK": "Σύνδεσμος αναφοράς",
       "CUSTOM_ATTRIBUTE_LIST": "Λίστα",
diff --git a/app/javascript/dashboard/i18n/locale/el/agentMgmt.json b/app/javascript/dashboard/i18n/locale/el/agentMgmt.json
index 56d66ebfa..ce1b8f80e 100644
--- a/app/javascript/dashboard/i18n/locale/el/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/el/agentMgmt.json
@@ -110,7 +110,8 @@
         },
         "PLACEHOLDER": {
           "AGENT": "Αναζήτηση πράκτορων",
-          "TEAM": "Αναζήτηση ομάδων"
+          "TEAM": "Αναζήτηση ομάδων",
+          "INPUT": "Search for agents"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/el/conversation.json b/app/javascript/dashboard/i18n/locale/el/conversation.json
index af15d1c34..19118258e 100644
--- a/app/javascript/dashboard/i18n/locale/el/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/el/conversation.json
@@ -37,6 +37,7 @@
     "UNKNOWN_FILE_TYPE": "Άγνωστο Αρχείο",
     "SAVE_CONTACT": "Save",
     "UPLOADING_ATTACHMENTS": "Ανέβασμα επισυναπτόμενων...",
+    "REPLIED_TO_STORY": "Replied to your story",
     "SUCCESS_DELETE_MESSAGE": "Το μήνυμα διαγράφηκε επιτυχώς",
     "FAIL_DELETE_MESSSAGE": "Δεν ήταν δυνατή η διαγραφή μηνύματος! Προσπαθήστε ξανά",
     "NO_RESPONSE": "Καμία ανταπόκριση",
@@ -66,6 +67,23 @@
         "NEXT_WEEK": "Επόμενη εβδομάδα"
       }
     },
+    "PRIORITY": {
+      "TITLE": "Priority",
+      "OPTIONS": {
+        "NONE": "Κανένα",
+        "URGENT": "Urgent",
+        "HIGH": "High",
+        "MEDIUM": "Medium",
+        "LOW": "Low"
+      },
+      "CHANGE_PRIORITY": {
+        "SELECT_PLACEHOLDER": "Κανένα",
+        "INPUT_PLACEHOLDER": "Select priority",
+        "NO_RESULTS": "Δεν βρέθηκαν αποτελέσματα",
+        "SUCCESSFUL": "Changed priority of conversation id %{conversationId} to %{priority}",
+        "FAILED": "Couldn't change priority. Please try again."
+      }
+    },
     "CARD_CONTEXT_MENU": {
       "PENDING": "Σήμανση ως εκκρεμής",
       "RESOLVED": "Σήμανση ως επιλυμένου",
diff --git a/app/javascript/dashboard/i18n/locale/el/generalSettings.json b/app/javascript/dashboard/i18n/locale/el/generalSettings.json
index 46d815076..1d82eb788 100644
--- a/app/javascript/dashboard/i18n/locale/el/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/el/generalSettings.json
@@ -101,6 +101,7 @@
       "REPORTS": "Αναφορές",
       "CONVERSATION": "Συνομιλία",
       "CHANGE_ASSIGNEE": "Αλλαγή Αναδόχου",
+      "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Αλλαγή Ομάδας",
       "ADD_LABEL": "Προσθήκη ετικέτας στη συνομιλία",
       "REMOVE_LABEL": "Αφαίρεση ετικέτας από την συνομιλία",
@@ -126,6 +127,7 @@
       "GO_TO_NOTIFICATIONS": "Μετάβαση στις ειδοποιήσεις",
       "ADD_LABELS_TO_CONVERSATION": "Προσθήκη ετικέτας στη συνομιλία",
       "ASSIGN_AN_AGENT": "Εκχώρηση πράκτορα",
+      "ASSIGN_PRIORITY": "Assign priority",
       "ASSIGN_A_TEAM": "Εκχώρηση ομάδας",
       "MUTE_CONVERSATION": "Σίγαση Συνομιλίας",
       "UNMUTE_CONVERSATION": "Επαναφορά Συνομιλίας",
diff --git a/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json
index 8e630f1a4..e35e42ecc 100644
--- a/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json
@@ -482,6 +482,13 @@
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
+    "HELP_CENTER": {
+      "LABEL": "Help Center",
+      "PLACEHOLDER": "Select Help Center",
+      "SELECT_PLACEHOLDER": "Select Help Center",
+      "REMOVE": "Remove Help Center",
+      "SUB_TEXT": "Attach a Help Center with the inbox"
+    },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Αυτόματο όριο ανάθεσης",
       "MAX_ASSIGNMENT_LIMIT_RANGE_ERROR": "Παρακαλώ εισάγετε μια τιμή μεγαλύτερη από 0",
diff --git a/app/javascript/dashboard/i18n/locale/el/integrations.json b/app/javascript/dashboard/i18n/locale/el/integrations.json
index bed8b48ed..d855ba479 100644
--- a/app/javascript/dashboard/i18n/locale/el/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/el/integrations.json
@@ -85,6 +85,23 @@
       "JOIN_ERROR": "Παρουσιάστηκε σφάλμα κατά τη σύνδεση της κλήσης, παρακαλώ προσπαθήστε ξανά",
       "CREATE_ERROR": "Παρουσιάστηκε σφάλμα κατά τη δημιουργία ενός συνδέσμου συνάντησης, παρακαλώ προσπαθήστε ξανά"
     },
+    "OPEN_AI": {
+      "TITLE": "Improve With AI",
+      "SUBTITLE": "An improved reply will be generated using AI, based on your current draft.",
+      "TONE": {
+        "TITLE": "Tone",
+        "OPTIONS": {
+          "PROFESSIONAL": "Professional",
+          "FRIENDLY": "Friendly"
+        }
+      },
+      "BUTTONS": {
+        "GENERATE": "Generate",
+        "GENERATING": "Generating...",
+        "CANCEL": "Άκυρο"
+      },
+      "GENERATE_ERROR": "There was an error processing the content, please try again"
+    },
     "DELETE": {
       "BUTTON_TEXT": "Διαγραφή",
       "API": {
diff --git a/app/javascript/dashboard/i18n/locale/el/login.json b/app/javascript/dashboard/i18n/locale/el/login.json
index d4f6a9185..e27d474a4 100644
--- a/app/javascript/dashboard/i18n/locale/el/login.json
+++ b/app/javascript/dashboard/i18n/locale/el/login.json
@@ -3,16 +3,16 @@
     "TITLE": "Είσοδος στο Chatwoot",
     "EMAIL": {
       "LABEL": "Email",
-      "PLACEHOLDER": "Email π.χ.: someone@example.com"
+      "PLACEHOLDER": "example@companyname.com"
     },
     "PASSWORD": {
       "LABEL": "Κωδικός",
       "PLACEHOLDER": "Κωδικός"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Επιτυχής είσοδος",
-      "ERROR_MESSAGE": "Αδυναμία σύνδεσης με τον Woot Server, Παρακαλώ προσπαθήστε αργότερα",
-      "UNAUTH": "Το όνομα χρήστη ή ο κωδικός δεν είναι σωστός. Παρακαλώ ξαναπροσπαθήστε"
+      "SUCCESS_MESSAGE": "Login successful",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again.",
+      "UNAUTH": "Username or password is incorrect. Please try again."
     },
     "OAUTH": {
       "GOOGLE_LOGIN": "Login with Google",
diff --git a/app/javascript/dashboard/i18n/locale/el/resetPassword.json b/app/javascript/dashboard/i18n/locale/el/resetPassword.json
index 2a829cbdb..492ea506d 100644
--- a/app/javascript/dashboard/i18n/locale/el/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/el/resetPassword.json
@@ -1,14 +1,14 @@
 {
   "RESET_PASSWORD": {
-    "TITLE": "Επαναφορά Κωδικού",
+    "TITLE": "Reset password",
     "EMAIL": {
       "LABEL": "Email",
-      "PLACEHOLDER": "Παρακαλώ εισάγετε το email σας",
-      "ERROR": "Παρακαλώ εισάγετε ένα έγκυρο email"
+      "PLACEHOLDER": "Παρακαλώ εισάγετε το email σας.",
+      "ERROR": "Παρακαλώ εισάγετε ένα έγκυρο email."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Σύνδεσμος για την επαναφορά του κωδικού έχει αποσταλεί στο email σας",
-      "ERROR_MESSAGE": "Αδυναμία σύνδεσης με τον Woot Server, Παρακαλώ προσπαθήστε αργότερα"
+      "SUCCESS_MESSAGE": "Σύνδεσμος για την επαναφορά του κωδικού έχει αποσταλεί στο email σας.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Καταχώρηση"
   }
diff --git a/app/javascript/dashboard/i18n/locale/el/search.json b/app/javascript/dashboard/i18n/locale/el/search.json
index 0fc63cfd2..e95ca251b 100644
--- a/app/javascript/dashboard/i18n/locale/el/search.json
+++ b/app/javascript/dashboard/i18n/locale/el/search.json
@@ -14,8 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
-    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
+    "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/el/setNewPassword.json b/app/javascript/dashboard/i18n/locale/el/setNewPassword.json
index f682e98cf..e3914ffee 100644
--- a/app/javascript/dashboard/i18n/locale/el/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/el/setNewPassword.json
@@ -1,19 +1,19 @@
 {
   "SET_NEW_PASSWORD": {
-    "TITLE": "Ορίστε νέο κωδικό",
+    "TITLE": "Set new password",
     "PASSWORD": {
       "LABEL": "Κωδικός",
       "PLACEHOLDER": "Κωδικός",
-      "ERROR": "Ο κωδικός είναι πολύ σύντομος"
+      "ERROR": "Ο κωδικός είναι πολύ σύντομος."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Επιβεβαίωση κωδικού",
+      "LABEL": "Confirm password",
       "PLACEHOLDER": "Επιβεβαίωση κωδικού",
-      "ERROR": "Οι κωδικοί δεν ταιριάζουν"
+      "ERROR": "Οι κωδικοί δεν ταιριάζουν."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Ο κωδικός άλλαξε με επιτυχία",
-      "ERROR_MESSAGE": "Αδυναμία σύνδεσης με τον Woot Server, Παρακαλώ προσπαθήστε αργότερα"
+      "SUCCESS_MESSAGE": "Ο κωδικός άλλαξε με επιτυχία.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "CAPTCHA": {
       "ERROR": "Η επαλήθευση έληξε. Παρακαλώ λύστε ξανά captcha."
diff --git a/app/javascript/dashboard/i18n/locale/el/signup.json b/app/javascript/dashboard/i18n/locale/el/signup.json
index c610bb125..f4d4f2bcc 100644
--- a/app/javascript/dashboard/i18n/locale/el/signup.json
+++ b/app/javascript/dashboard/i18n/locale/el/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Επωνυμία εταιρείας",
-      "PLACEHOLDER": "Εισάγετε το όνομα της εταιρείας σας. π. χ.: Wayne Enterprises",
-      "ERROR": "Το όνομα της εταιρείας είναι πολύ σύντομο"
+      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
+      "ERROR": "Το όνομα της εταιρείας είναι πολύ σύντομο."
     },
     "FULL_NAME": {
       "LABEL": "Πλήρες όνομα",
-      "PLACEHOLDER": "Συμπληρώστε το πλήρες σας όνομα: πχ: Χρήστος Παπαδόπουλος",
-      "ERROR": "Το πλήρες όνομα είναι πολύ σύντομο"
+      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
+      "ERROR": "Το πλήρες όνομα είναι πολύ σύντομο."
     },
     "EMAIL": {
       "LABEL": "email εργασίας",
-      "PLACEHOLDER": "συμπληρώστε το email εργασίας πχ: papadopoulos@wyane.com",
-      "ERROR": "Παρακαλώ εισάγετε μια έγκυρη διεύθυνση email"
+      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
+      "ERROR": "Παρακαλώ εισάγετε μια έγκυρη διεύθυνση email."
     },
     "PASSWORD": {
       "LABEL": "Κωδικός",
       "PLACEHOLDER": "Κωδικός",
-      "ERROR": "Ο κωδικός είναι πολύ σύντομος",
-      "IS_INVALID_PASSWORD": "Ο κωδικός πρόσβασης πρέπει να περιέχει τουλάχιστον 1 κεφαλαίο γράμμα, 1 πεζό γράμμα, 1 αριθμό και 1 ειδικό χαρακτήρα"
+      "ERROR": "Ο κωδικός είναι πολύ σύντομος.",
+      "IS_INVALID_PASSWORD": "Ο κωδικός πρόσβασης πρέπει να περιέχει τουλάχιστον 1 κεφαλαίο γράμμα, 1 πεζό γράμμα, 1 αριθμό και 1 ειδικό χαρακτήρα."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Επιβεβαίωση κωδικού",
-      "PLACEHOLDER": "Επιβεβαίωση κωδικού",
-      "ERROR": "Οι κωδικοί δεν συμφωνούν"
+      "LABEL": "Confirm password",
+      "PLACEHOLDER": "Confirm password",
+      "ERROR": "Οι κωδικοί δεν συμφωνούν."
     },
     "API": {
       "SUCCESS_MESSAGE": "Επιτυχής καταχώρηση",
-      "ERROR_MESSAGE": "Αδυναμία σύνδεσης με τον Woot Server, Παρακαλώ προσπαθήστε αργότερα"
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Create account",
     "HAVE_AN_ACCOUNT": "Έχετε ήδη ένα λογαριασμό?"
diff --git a/app/javascript/dashboard/i18n/locale/es/advancedFilters.json b/app/javascript/dashboard/i18n/locale/es/advancedFilters.json
index 2d2323d38..e01c94e21 100644
--- a/app/javascript/dashboard/i18n/locale/es/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/es/advancedFilters.json
@@ -38,6 +38,7 @@
       "CAMPAIGN_NAME": "Nombre de Campaña",
       "LABELS": "Etiquetas",
       "BROWSER_LANGUAGE": "Idioma del navegador",
+      "PRIORITY": "Priority",
       "COUNTRY_NAME": "Nombre del país",
       "REFERER_LINK": "Enlace de referencia",
       "CUSTOM_ATTRIBUTE_LIST": "Lista",
diff --git a/app/javascript/dashboard/i18n/locale/es/agentMgmt.json b/app/javascript/dashboard/i18n/locale/es/agentMgmt.json
index 04cd4c9e4..8fc403056 100644
--- a/app/javascript/dashboard/i18n/locale/es/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/es/agentMgmt.json
@@ -110,7 +110,8 @@
         },
         "PLACEHOLDER": {
           "AGENT": "Buscar agentes",
-          "TEAM": "Buscar equipos"
+          "TEAM": "Buscar equipos",
+          "INPUT": "Search for agents"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/es/conversation.json b/app/javascript/dashboard/i18n/locale/es/conversation.json
index 3ee75ac74..01bf3639e 100644
--- a/app/javascript/dashboard/i18n/locale/es/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/es/conversation.json
@@ -37,6 +37,7 @@
     "UNKNOWN_FILE_TYPE": "Archivo desconocido",
     "SAVE_CONTACT": "Guardar",
     "UPLOADING_ATTACHMENTS": "Subiendo archivos adjuntos...",
+    "REPLIED_TO_STORY": "Replied to your story",
     "SUCCESS_DELETE_MESSAGE": "Mensaje eliminado correctamente",
     "FAIL_DELETE_MESSSAGE": "¡No se pudo eliminar el mensaje! Inténtalo de nuevo",
     "NO_RESPONSE": "No hay respuesta",
@@ -66,6 +67,23 @@
         "NEXT_WEEK": "Próxima semana"
       }
     },
+    "PRIORITY": {
+      "TITLE": "Priority",
+      "OPTIONS": {
+        "NONE": "Ninguna",
+        "URGENT": "Urgent",
+        "HIGH": "High",
+        "MEDIUM": "Medium",
+        "LOW": "Low"
+      },
+      "CHANGE_PRIORITY": {
+        "SELECT_PLACEHOLDER": "Ninguna",
+        "INPUT_PLACEHOLDER": "Select priority",
+        "NO_RESULTS": "No se encontraron resultados",
+        "SUCCESSFUL": "Changed priority of conversation id %{conversationId} to %{priority}",
+        "FAILED": "Couldn't change priority. Please try again."
+      }
+    },
     "CARD_CONTEXT_MENU": {
       "PENDING": "Marcar como pendiente",
       "RESOLVED": "Marcar como resuelto",
diff --git a/app/javascript/dashboard/i18n/locale/es/generalSettings.json b/app/javascript/dashboard/i18n/locale/es/generalSettings.json
index a83693f8f..879c775d5 100644
--- a/app/javascript/dashboard/i18n/locale/es/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/es/generalSettings.json
@@ -101,6 +101,7 @@
       "REPORTS": "Informes",
       "CONVERSATION": "Conversación",
       "CHANGE_ASSIGNEE": "Cambiar Asignado",
+      "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Cambiar equipo",
       "ADD_LABEL": "Añadir etiqueta a la conversación",
       "REMOVE_LABEL": "Eliminar etiqueta de la conversación",
@@ -126,6 +127,7 @@
       "GO_TO_NOTIFICATIONS": "Ir a Notificaciones",
       "ADD_LABELS_TO_CONVERSATION": "Añadir etiqueta a la conversación",
       "ASSIGN_AN_AGENT": "Asignar un agente",
+      "ASSIGN_PRIORITY": "Assign priority",
       "ASSIGN_A_TEAM": "Asignar un equipo",
       "MUTE_CONVERSATION": "Silenciar conversación",
       "UNMUTE_CONVERSATION": "Quitar silencio de conversación",
diff --git a/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json
index 2164c374a..52da031ae 100644
--- a/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json
@@ -482,6 +482,13 @@
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Actualizar configuración de Formulario de Chat"
     },
+    "HELP_CENTER": {
+      "LABEL": "Help Center",
+      "PLACEHOLDER": "Select Help Center",
+      "SELECT_PLACEHOLDER": "Select Help Center",
+      "REMOVE": "Remove Help Center",
+      "SUB_TEXT": "Attach a Help Center with the inbox"
+    },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Límite de asignación automática",
       "MAX_ASSIGNMENT_LIMIT_RANGE_ERROR": "Por favor ingrese un valor mayor a 0",
diff --git a/app/javascript/dashboard/i18n/locale/es/integrations.json b/app/javascript/dashboard/i18n/locale/es/integrations.json
index 39484d6bb..43ff143fe 100644
--- a/app/javascript/dashboard/i18n/locale/es/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/es/integrations.json
@@ -85,6 +85,23 @@
       "JOIN_ERROR": "Hubo un error al unirse a la llamada, por favor intente de nuevo",
       "CREATE_ERROR": "Hubo un error al crear un enlace de reunión, por favor inténtelo de nuevo"
     },
+    "OPEN_AI": {
+      "TITLE": "Improve With AI",
+      "SUBTITLE": "An improved reply will be generated using AI, based on your current draft.",
+      "TONE": {
+        "TITLE": "Tone",
+        "OPTIONS": {
+          "PROFESSIONAL": "Professional",
+          "FRIENDLY": "Friendly"
+        }
+      },
+      "BUTTONS": {
+        "GENERATE": "Generate",
+        "GENERATING": "Generating...",
+        "CANCEL": "Cancelar"
+      },
+      "GENERATE_ERROR": "There was an error processing the content, please try again"
+    },
     "DELETE": {
       "BUTTON_TEXT": "Eliminar",
       "API": {
diff --git a/app/javascript/dashboard/i18n/locale/es/login.json b/app/javascript/dashboard/i18n/locale/es/login.json
index a19bf3983..6f2a45b47 100644
--- a/app/javascript/dashboard/i18n/locale/es/login.json
+++ b/app/javascript/dashboard/i18n/locale/es/login.json
@@ -3,16 +3,16 @@
     "TITLE": "Iniciar sesión en Chatwoot",
     "EMAIL": {
       "LABEL": "E-mail",
-      "PLACEHOLDER": "Email por ejemplo: alguien@ejemplo.com"
+      "PLACEHOLDER": "example@companyname.com"
     },
     "PASSWORD": {
       "LABEL": "Contraseña",
       "PLACEHOLDER": "Contraseña"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Inicio de sesión exitoso",
-      "ERROR_MESSAGE": "No se pudo conectar al servidor Woot, por favor inténtalo de nuevo más tarde",
-      "UNAUTH": "Nombre de usuario / Contraseña incorrecto. Inténtelo de nuevo"
+      "SUCCESS_MESSAGE": "Login successful",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again.",
+      "UNAUTH": "Username or password is incorrect. Please try again."
     },
     "OAUTH": {
       "GOOGLE_LOGIN": "Iniciar sesión con Google",
diff --git a/app/javascript/dashboard/i18n/locale/es/resetPassword.json b/app/javascript/dashboard/i18n/locale/es/resetPassword.json
index 60ff9b8d4..56a8ff278 100644
--- a/app/javascript/dashboard/i18n/locale/es/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/es/resetPassword.json
@@ -3,12 +3,12 @@
     "TITLE": "Restablecer contraseña",
     "EMAIL": {
       "LABEL": "E-mail",
-      "PLACEHOLDER": "Por favor ingrese su email",
-      "ERROR": "Por favor ingrese un email válido"
+      "PLACEHOLDER": "Por favor ingrese su email.",
+      "ERROR": "Por favor ingrese un email válido."
     },
     "API": {
-      "SUCCESS_MESSAGE": "El enlace para restablecer la contraseña ha sido enviado a tu correo electrónico",
-      "ERROR_MESSAGE": "No se pudo conectar al servidor Woot, por favor inténtalo de nuevo más tarde"
+      "SUCCESS_MESSAGE": "El enlace para restablecer la contraseña ha sido enviado a tu correo electrónico.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Enviar"
   }
diff --git a/app/javascript/dashboard/i18n/locale/es/search.json b/app/javascript/dashboard/i18n/locale/es/search.json
index 138d847cb..87bef1c1d 100644
--- a/app/javascript/dashboard/i18n/locale/es/search.json
+++ b/app/javascript/dashboard/i18n/locale/es/search.json
@@ -14,8 +14,8 @@
     "EMPTY_STATE": "Ningún %{item} encontrado para la consulta '%{query}'",
     "EMPTY_STATE_FULL": "No se han encontrado resultados para la consulta '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ para enfocar",
-    "INPUT_PLACEHOLDER": "Buscar mensajes, contactos o conversaciones",
-    "EMPTY_STATE_DEFAULT": "Buscar por Id de conversación, correo electrónico, número de teléfono, mensajes para mejores resultados de búsqueda.",
+    "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "EMPTY_STATE_DEFAULT": "Buscar por Id de conversación, correo electrónico, número de teléfono, mensajes para mejores resultados de búsqueda. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Leer más",
     "WROTE": "escribió:"
diff --git a/app/javascript/dashboard/i18n/locale/es/setNewPassword.json b/app/javascript/dashboard/i18n/locale/es/setNewPassword.json
index 12f49daf8..112af61c9 100644
--- a/app/javascript/dashboard/i18n/locale/es/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/es/setNewPassword.json
@@ -1,19 +1,19 @@
 {
   "SET_NEW_PASSWORD": {
-    "TITLE": "Establecer nueva contraseña",
+    "TITLE": "Set new password",
     "PASSWORD": {
       "LABEL": "Contraseña",
       "PLACEHOLDER": "Contraseña",
-      "ERROR": "La contraseña es demasiado corta"
+      "ERROR": "La contraseña es demasiado corta."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirmar contraseña",
+      "LABEL": "Confirm password",
       "PLACEHOLDER": "Confirmar contraseña",
-      "ERROR": "Las contraseñas no coinciden"
+      "ERROR": "Las contraseñas no coinciden."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Contraseña cambiada con éxito",
-      "ERROR_MESSAGE": "No se pudo conectar al servidor Woot, por favor inténtalo de nuevo más tarde"
+      "SUCCESS_MESSAGE": "Contraseña cambiada con éxito.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "CAPTCHA": {
       "ERROR": "La verificación ha caducado. Por favor, resuelve el captcha de nuevo."
diff --git a/app/javascript/dashboard/i18n/locale/es/signup.json b/app/javascript/dashboard/i18n/locale/es/signup.json
index a50166b4c..62d252722 100644
--- a/app/javascript/dashboard/i18n/locale/es/signup.json
+++ b/app/javascript/dashboard/i18n/locale/es/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Nombre de la empresa",
-      "PLACEHOLDER": "Introduce el nombre de tu empresa, por ejemplo: Wayne Enterprises",
-      "ERROR": "El nombre de la cuenta es demasiado corto"
+      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
+      "ERROR": "El nombre de la cuenta es demasiado corto."
     },
     "FULL_NAME": {
       "LABEL": "Nombre completo",
-      "PLACEHOLDER": "Introduce tu nombre completo, por ejemplo: Bruce Wayne",
-      "ERROR": "El nombre completo es demasiado corto"
+      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
+      "ERROR": "El nombre completo es demasiado corto."
     },
     "EMAIL": {
       "LABEL": "E-mail",
-      "PLACEHOLDER": "bruce@wayne.empresas",
-      "ERROR": "Por favor, introduzca una dirección de correo válida"
+      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
+      "ERROR": "Por favor, introduzca una dirección de correo válida."
     },
     "PASSWORD": {
       "LABEL": "Contraseña",
       "PLACEHOLDER": "Contraseña",
-      "ERROR": "La contraseña es demasiado corta",
-      "IS_INVALID_PASSWORD": "La contraseña debe contener al menos 1 letra mayúscula, 1 letra minúscula, 1 número y 1 carácter especial"
+      "ERROR": "La contraseña es demasiado corta.",
+      "IS_INVALID_PASSWORD": "La contraseña debe contener al menos 1 letra mayúscula, 1 letra minúscula, 1 número y 1 carácter especial."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirmar contraseña",
-      "PLACEHOLDER": "Confirmar contraseña",
-      "ERROR": "La contraseña no coincide"
+      "LABEL": "Confirm password",
+      "PLACEHOLDER": "Confirm password",
+      "ERROR": "La contraseña no coincide."
     },
     "API": {
       "SUCCESS_MESSAGE": "Registro Exitoso",
-      "ERROR_MESSAGE": "No se pudo conectar al servidor Woot, por favor inténtalo de nuevo más tarde"
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Crear una cuenta",
     "HAVE_AN_ACCOUNT": "¿Ya tienes una cuenta?"
diff --git a/app/javascript/dashboard/i18n/locale/fa/advancedFilters.json b/app/javascript/dashboard/i18n/locale/fa/advancedFilters.json
index 56f81139e..e4ae78280 100644
--- a/app/javascript/dashboard/i18n/locale/fa/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/fa/advancedFilters.json
@@ -38,6 +38,7 @@
       "CAMPAIGN_NAME": "نام کمپین",
       "LABELS": "برچسب‌ها",
       "BROWSER_LANGUAGE": "مرور زبان",
+      "PRIORITY": "اولویت",
       "COUNTRY_NAME": "نام کشور",
       "REFERER_LINK": "پیوند ارجاع‌دهنده",
       "CUSTOM_ATTRIBUTE_LIST": "فهرست",
diff --git a/app/javascript/dashboard/i18n/locale/fa/agentMgmt.json b/app/javascript/dashboard/i18n/locale/fa/agentMgmt.json
index f9bb7c095..57a0e6388 100644
--- a/app/javascript/dashboard/i18n/locale/fa/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fa/agentMgmt.json
@@ -110,7 +110,8 @@
         },
         "PLACEHOLDER": {
           "AGENT": "جستجوی اپراتور",
-          "TEAM": "جستجوی تیم"
+          "TEAM": "جستجوی تیم",
+          "INPUT": "Search for agents"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/fa/auditLogs.json b/app/javascript/dashboard/i18n/locale/fa/auditLogs.json
index 0714f7395..a3f496746 100644
--- a/app/javascript/dashboard/i18n/locale/fa/auditLogs.json
+++ b/app/javascript/dashboard/i18n/locale/fa/auditLogs.json
@@ -1,14 +1,14 @@
 {
   "AUDIT_LOGS": {
-    "HEADER": "Audit Logs",
-    "HEADER_BTN_TXT": "Add Audit Logs",
-    "LOADING": "Fetching Audit Logs",
+    "HEADER": "گزارش های حسابرسی",
+    "HEADER_BTN_TXT": "اضافه کردن گزارش های حسابرسی",
+    "LOADING": "واکشی گزارش های حسابرسی",
     "SEARCH_404": "هیچ آیتمی با این مشخصات یافت نشد",
-    "SIDEBAR_TXT": "<p><b>Audit Logs</b> </p><p> Audit Logs are trails for events and actions in a Chatwoot System. </p>",
+    "SIDEBAR_TXT": "<p><b>گزارش‌های حسابرسی</b> </p><p> گزارش‌های حسابرسی مسیرهایی برای رویدادها و اقدامات در یک سیستم Chatwoot هستند. </p>",
     "LIST": {
-      "404": "There are no Audit Logs available in this account.",
-      "TITLE": "Manage Audit Logs",
-      "DESC": "Audit Logs are trails for events and actions in a Chatwoot System.",
+      "404": "هیچ گزارش حسابرسی در این حساب موجود نیست.",
+      "TITLE": "مدیریت گزارش های حسابرسی",
+      "DESC": "گزارش های حسابرسی مسیرهایی برای رویدادها و اقدامات در یک سیستم چت ووت هستند.",
       "TABLE_HEADER": [
         "کاربر",
         "اقدام",
@@ -17,7 +17,7 @@
       ]
     },
     "API": {
-      "SUCCESS_MESSAGE": "AuditLogs retrieved successfully",
+      "SUCCESS_MESSAGE": "گزارش های حسابرسی با موفقیت بازیابی شد",
       "ERROR_MESSAGE": "متاسفانه ارتباط با سرور برقرار نشد، مجددا امتحان کنید"
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/fa/contact.json b/app/javascript/dashboard/i18n/locale/fa/contact.json
index de04de6d1..b81e15748 100644
--- a/app/javascript/dashboard/i18n/locale/fa/contact.json
+++ b/app/javascript/dashboard/i18n/locale/fa/contact.json
@@ -120,9 +120,9 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "شماره تلفن مخاطب را وارد کنید",
         "LABEL": "شماره تلفن",
-        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
+        "HELP": "شماره تلفن باید از قالب E.164 باشد، به عنوان مثال: +1415555555 [+][کد کشور][کد منطقه][شماره تلفن محلی]. می توانید کد شماره گیری را از منوی بازشو انتخاب کنید.",
         "ERROR": "شماره تلفن باید یا خالی باشد و یا با فرمت E.164",
-        "DIAL_CODE_ERROR": "Please select a dial code from the list",
+        "DIAL_CODE_ERROR": "لطفاً یک کد شماره گیری را از لیست انتخاب کنید",
         "DUPLICATE": "این شماره تلفن برای مخاطب دیگری در حال استفاده است."
       },
       "LOCATION": {
diff --git a/app/javascript/dashboard/i18n/locale/fa/conversation.json b/app/javascript/dashboard/i18n/locale/fa/conversation.json
index ae7e82c7d..34d2bb303 100644
--- a/app/javascript/dashboard/i18n/locale/fa/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/fa/conversation.json
@@ -37,6 +37,7 @@
     "UNKNOWN_FILE_TYPE": "پرونده ناشناخته",
     "SAVE_CONTACT": "ذخیره",
     "UPLOADING_ATTACHMENTS": "در حال بارگذاری پیوست‌ها...",
+    "REPLIED_TO_STORY": "Replied to your story",
     "SUCCESS_DELETE_MESSAGE": "پیام با موفقیت حذف شد",
     "FAIL_DELETE_MESSSAGE": "پیام حذف نشد! دوباره امتحان کنید",
     "NO_RESPONSE": "بدون پاسخ",
@@ -66,6 +67,23 @@
         "NEXT_WEEK": "هفته بعد"
       }
     },
+    "PRIORITY": {
+      "TITLE": "اولویت",
+      "OPTIONS": {
+        "NONE": "هیچکدام",
+        "URGENT": "Urgent",
+        "HIGH": "High",
+        "MEDIUM": "Medium",
+        "LOW": "Low"
+      },
+      "CHANGE_PRIORITY": {
+        "SELECT_PLACEHOLDER": "هیچکدام",
+        "INPUT_PLACEHOLDER": "Select priority",
+        "NO_RESULTS": "نتیجه‌ای یافت نشد",
+        "SUCCESSFUL": "Changed priority of conversation id %{conversationId} to %{priority}",
+        "FAILED": "Couldn't change priority. Please try again."
+      }
+    },
     "CARD_CONTEXT_MENU": {
       "PENDING": "علامت گذاری به عنوان در انتظار",
       "RESOLVED": "علامت زدن به عنوان حل شده",
diff --git a/app/javascript/dashboard/i18n/locale/fa/generalSettings.json b/app/javascript/dashboard/i18n/locale/fa/generalSettings.json
index 8156a063d..3ae56dc2e 100644
--- a/app/javascript/dashboard/i18n/locale/fa/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/fa/generalSettings.json
@@ -101,6 +101,7 @@
       "REPORTS": "گزارشات",
       "CONVERSATION": "گفتگو",
       "CHANGE_ASSIGNEE": "نماینده را تغییر دهید",
+      "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "تیم را تغییر دهید",
       "ADD_LABEL": "برچسب را به مکالمه اضافه کنید",
       "REMOVE_LABEL": "برچسب را از مکالمه حذف کنید",
@@ -126,6 +127,7 @@
       "GO_TO_NOTIFICATIONS": "به اعلان ها بروید",
       "ADD_LABELS_TO_CONVERSATION": "برچسب را به مکالمه اضافه کنید",
       "ASSIGN_AN_AGENT": "یک ایجنت تعیین کنید",
+      "ASSIGN_PRIORITY": "Assign priority",
       "ASSIGN_A_TEAM": "یک تیم را تعیین کنید",
       "MUTE_CONVERSATION": "صدای گفتگو را قطع کن",
       "UNMUTE_CONVERSATION": "مکالمه را باصدا کنید",
diff --git a/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json
index 26e480817..66d90ce2c 100644
--- a/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json
@@ -440,7 +440,7 @@
       "DISPLAY_FILE_PICKER": "نمایش گزینه ضمیه فایل در ویجت",
       "DISPLAY_EMOJI_PICKER": "نمایش گزینه انتخاب ایموجی در ویجت",
       "ALLOW_END_CONVERSATION": "به کاربران اجازه دهید مکالمه را از ویجت پایان دهند",
-      "USE_INBOX_AVATAR_FOR_BOT": "Use inbox name and avatar for the bot"
+      "USE_INBOX_AVATAR_FOR_BOT": "از نام صندوق ورودی و آواتار برای ربات استفاده کنید"
     },
     "SETTINGS_POPUP": {
       "MESSENGER_HEADING": "اسکریپت ویجت",
@@ -479,9 +479,16 @@
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "کلید API جدید را در اینجا وارد کنید",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "اعمال شود",
       "WHATSAPP_WEBHOOK_TITLE": "رمز تأیید وب هوک",
-      "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
+      "WHATSAPP_WEBHOOK_SUBHEADER": "این توکن برای تأیید صحت نقطه پایانی webhook استفاده می شود.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "به‌روزرسانی تنظیمات فرم قبل از گفتگو"
     },
+    "HELP_CENTER": {
+      "LABEL": "مرکز راهنما",
+      "PLACEHOLDER": "مرکز راهنما را انتخاب کنید",
+      "SELECT_PLACEHOLDER": "مرکز راهنما را انتخاب کنید",
+      "REMOVE": "مرکز راهنما را حذف کنید",
+      "SUB_TEXT": "یک مرکز راهنما را با صندوق ورودی پیوست کنید"
+    },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "محدودیت تخصیص خودکار",
       "MAX_ASSIGNMENT_LIMIT_RANGE_ERROR": "لطفا مقداری بزرگ‌تر از عدد 0 وارد کنید",
diff --git a/app/javascript/dashboard/i18n/locale/fa/integrations.json b/app/javascript/dashboard/i18n/locale/fa/integrations.json
index 5f41d1164..9313abf84 100644
--- a/app/javascript/dashboard/i18n/locale/fa/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/fa/integrations.json
@@ -85,6 +85,23 @@
       "JOIN_ERROR": "هنگام پیوستن به تماس خطایی روی داد، لطفاً دوباره امتحان کنید",
       "CREATE_ERROR": "در ایجاد پیوند جلسه خطایی روی داد، لطفاً دوباره امتحان کنید"
     },
+    "OPEN_AI": {
+      "TITLE": "Improve With AI",
+      "SUBTITLE": "An improved reply will be generated using AI, based on your current draft.",
+      "TONE": {
+        "TITLE": "Tone",
+        "OPTIONS": {
+          "PROFESSIONAL": "Professional",
+          "FRIENDLY": "Friendly"
+        }
+      },
+      "BUTTONS": {
+        "GENERATE": "Generate",
+        "GENERATING": "Generating...",
+        "CANCEL": "انصراف"
+      },
+      "GENERATE_ERROR": "There was an error processing the content, please try again"
+    },
     "DELETE": {
       "BUTTON_TEXT": "حذف",
       "API": {
diff --git a/app/javascript/dashboard/i18n/locale/fa/login.json b/app/javascript/dashboard/i18n/locale/fa/login.json
index 0d75f9b03..3ea5715a2 100644
--- a/app/javascript/dashboard/i18n/locale/fa/login.json
+++ b/app/javascript/dashboard/i18n/locale/fa/login.json
@@ -3,16 +3,16 @@
     "TITLE": "ورود به چت ووت",
     "EMAIL": {
       "LABEL": "ایمیل",
-      "PLACEHOLDER": "ایمیل به عنوان مثال: someone@example.com"
+      "PLACEHOLDER": "example@companyname.com"
     },
     "PASSWORD": {
       "LABEL": "رمز عبور",
       "PLACEHOLDER": "رمز عبور"
     },
     "API": {
-      "SUCCESS_MESSAGE": "ورود موفق",
-      "ERROR_MESSAGE": "متاسفانه ارتباط با سرور برقرار نشد، مجددا امتحان کنید",
-      "UNAUTH": "این نام کاربری و رمز عبور صحیح نیست"
+      "SUCCESS_MESSAGE": "Login successful",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again.",
+      "UNAUTH": "Username or password is incorrect. Please try again."
     },
     "OAUTH": {
       "GOOGLE_LOGIN": "با گوگل وارد شوید",
diff --git a/app/javascript/dashboard/i18n/locale/fa/resetPassword.json b/app/javascript/dashboard/i18n/locale/fa/resetPassword.json
index c26df9e8f..f8cdf3b2e 100644
--- a/app/javascript/dashboard/i18n/locale/fa/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/fa/resetPassword.json
@@ -1,14 +1,14 @@
 {
   "RESET_PASSWORD": {
-    "TITLE": "ریست کردن رمز عبور",
+    "TITLE": "تغییر رمز عبور",
     "EMAIL": {
       "LABEL": "ایمیل",
-      "PLACEHOLDER": "لطفا ایمیل خود را وارد کنید",
-      "ERROR": "ظاهرا این ایمیل صحیح نیست، لطفا اصلاح کنید"
+      "PLACEHOLDER": "لطفا ایمیل خود را وارد کنید.",
+      "ERROR": "ظاهرا این ایمیل صحیح نیست، لطفا اصلاح کنید."
     },
     "API": {
-      "SUCCESS_MESSAGE": "لینک ریست کردن رمز عبور به ایمیلتان ارسال شد",
-      "ERROR_MESSAGE": "ارتباط با سرور برقرار نشد، لطفا مجددا امتحان کنید"
+      "SUCCESS_MESSAGE": "لینک ریست کردن رمز عبور به ایمیلتان ارسال شد.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "ثبت"
   }
diff --git a/app/javascript/dashboard/i18n/locale/fa/search.json b/app/javascript/dashboard/i18n/locale/fa/search.json
index b695bc8b0..68f391cbf 100644
--- a/app/javascript/dashboard/i18n/locale/fa/search.json
+++ b/app/javascript/dashboard/i18n/locale/fa/search.json
@@ -14,8 +14,8 @@
     "EMPTY_STATE": "هیچ %{item} برای درخواست '%{query}' یافت نشد",
     "EMPTY_STATE_FULL": "هیچ نتیجه ای برای پرس و جو «%{query}» یافت نشد",
     "PLACEHOLDER_KEYBINDING": "/ برای تمرکز",
-    "INPUT_PLACEHOLDER": "جستجوی پیام‌ها، مخاطبین یا گفتگوها",
-    "EMPTY_STATE_DEFAULT": "جستجو بر اساس شناسه گفتگو، ایمیل، شماره تلفن، پیام‌ها برای نتایج جستجوی بهتر.",
+    "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "EMPTY_STATE_DEFAULT": "جستجو بر اساس شناسه گفتگو، ایمیل، شماره تلفن، پیام‌ها برای نتایج جستجوی بهتر. ",
     "BOT_LABEL": "ربات",
     "READ_MORE": "ادامه مطلب",
     "WROTE": "نوشت:"
diff --git a/app/javascript/dashboard/i18n/locale/fa/setNewPassword.json b/app/javascript/dashboard/i18n/locale/fa/setNewPassword.json
index 0dda2d16e..d9f253aad 100644
--- a/app/javascript/dashboard/i18n/locale/fa/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/fa/setNewPassword.json
@@ -1,19 +1,19 @@
 {
   "SET_NEW_PASSWORD": {
-    "TITLE": "گذاشتن رمز جدید",
+    "TITLE": "Set new password",
     "PASSWORD": {
       "LABEL": "رمز عبور",
       "PLACEHOLDER": "رمز عبور",
-      "ERROR": "رمز عبور خیلی کوتاه است"
+      "ERROR": "رمز عبور خیلی کوتاه است."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "تکرار رمز عبور",
+      "LABEL": "Confirm password",
       "PLACEHOLDER": "لطفا رمز عبور را مجددا وارد کنید",
-      "ERROR": "تکرار رمز عبور می‌بایست با رمز عبور یکسان باشد"
+      "ERROR": "تکرار رمز عبور می‌بایست با رمز عبور یکسان باشد."
     },
     "API": {
-      "SUCCESS_MESSAGE": "رمز عوض شد",
-      "ERROR_MESSAGE": "ارتباط با سرور برقرار نشد، لطفا مجددا امتحان کنید"
+      "SUCCESS_MESSAGE": "رمز عوض شد.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "CAPTCHA": {
       "ERROR": "تأیید اعتبار منقضی شد. لطفا دوباره کپچا را حل کنید."
diff --git a/app/javascript/dashboard/i18n/locale/fa/settings.json b/app/javascript/dashboard/i18n/locale/fa/settings.json
index 0d2945f22..3c8f81a3e 100644
--- a/app/javascript/dashboard/i18n/locale/fa/settings.json
+++ b/app/javascript/dashboard/i18n/locale/fa/settings.json
@@ -203,7 +203,7 @@
     "HOME": "صفحه اصلی",
     "AGENTS": "ایجنت ها",
     "AGENT_BOTS": "ربات‌ها",
-    "AUDIT_LOGS": "Audit Logs",
+    "AUDIT_LOGS": "بررسی لاگ هاگزارش های حسابرسی",
     "INBOXES": "صندوق‌های ورودی",
     "NOTIFICATIONS": "اعلان ها",
     "CANNED_RESPONSES": "پاسخ‌های آماده",
diff --git a/app/javascript/dashboard/i18n/locale/fa/signup.json b/app/javascript/dashboard/i18n/locale/fa/signup.json
index fef19a0cb..705a52edb 100644
--- a/app/javascript/dashboard/i18n/locale/fa/signup.json
+++ b/app/javascript/dashboard/i18n/locale/fa/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "نام شرکت",
-      "PLACEHOLDER": "نام شرکت خود را وارد کنید. به عنوان مثال: شرکت وین",
-      "ERROR": "نام شرکت خیلی کوتاه است"
+      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
+      "ERROR": "نام شرکت خیلی کوتاه است."
     },
     "FULL_NAME": {
       "LABEL": "نام کامل",
-      "PLACEHOLDER": "نام کامل خود را وارد کنید به عنوان مثال: گودرز جعفری",
-      "ERROR": "نام کامل خیلی کوتاه است"
+      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
+      "ERROR": "نام کامل خیلی کوتاه است."
     },
     "EMAIL": {
       "LABEL": "ایمیل کاری",
-      "PLACEHOLDER": "ایمیل کاری خود را وارد کنید به عنوان مثال: jafari@wayne.enterprises",
-      "ERROR": "لطفا یک آدرس ایمیل کاری معتبر وارد کنید"
+      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
+      "ERROR": "لطفا یک آدرس ایمیل کاری معتبر وارد کنید."
     },
     "PASSWORD": {
       "LABEL": "رمز عبور",
       "PLACEHOLDER": "رمز عبور",
-      "ERROR": "رمز عبور خیلی کوتاه است",
-      "IS_INVALID_PASSWORD": "رمز عبور باید شامل حداقل ۱ حرف بزرگ، ۱ حرف کوچک، ۱ عدد و ۱ کاراکتر خاص باشد"
+      "ERROR": "رمز عبور خیلی کوتاه است.",
+      "IS_INVALID_PASSWORD": "رمز عبور باید شامل حداقل ۱ حرف بزرگ، ۱ حرف کوچک، ۱ عدد و ۱ کاراکتر خاص باشد."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "تکرار رمز عبور",
-      "PLACEHOLDER": "تکرار رمز عبور",
-      "ERROR": "رمز عبور و تکرار رمز عبور یکسان نیستند"
+      "LABEL": "Confirm password",
+      "PLACEHOLDER": "Confirm password",
+      "ERROR": "رمز عبور و تکرار رمز عبور یکسان نیستند."
     },
     "API": {
       "SUCCESS_MESSAGE": "ثبت نام با موفقیت انجام شد",
-      "ERROR_MESSAGE": "ارتباط با سرور برقرار نشد، لطفا بعدا امتحان کنید"
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "ایجاد حساب کاربری",
     "HAVE_AN_ACCOUNT": "از قبل حساب‌کاربری دارید؟"
diff --git a/app/javascript/dashboard/i18n/locale/fi/advancedFilters.json b/app/javascript/dashboard/i18n/locale/fi/advancedFilters.json
index 013e51607..0fc1aef18 100644
--- a/app/javascript/dashboard/i18n/locale/fi/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/fi/advancedFilters.json
@@ -38,6 +38,7 @@
       "CAMPAIGN_NAME": "Campaign Name",
       "LABELS": "Tunnisteet",
       "BROWSER_LANGUAGE": "Browser Language",
+      "PRIORITY": "Priority",
       "COUNTRY_NAME": "Country Name",
       "REFERER_LINK": "Referer link",
       "CUSTOM_ATTRIBUTE_LIST": "List",
diff --git a/app/javascript/dashboard/i18n/locale/fi/agentMgmt.json b/app/javascript/dashboard/i18n/locale/fi/agentMgmt.json
index 77c726d8f..81cf67bbf 100644
--- a/app/javascript/dashboard/i18n/locale/fi/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fi/agentMgmt.json
@@ -110,7 +110,8 @@
         },
         "PLACEHOLDER": {
           "AGENT": "Search agents",
-          "TEAM": "Search teams"
+          "TEAM": "Search teams",
+          "INPUT": "Search for agents"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/fi/conversation.json b/app/javascript/dashboard/i18n/locale/fi/conversation.json
index 78d5654ec..065edab34 100644
--- a/app/javascript/dashboard/i18n/locale/fi/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/fi/conversation.json
@@ -37,6 +37,7 @@
     "UNKNOWN_FILE_TYPE": "Unknown File",
     "SAVE_CONTACT": "Save",
     "UPLOADING_ATTACHMENTS": "Ladataan liitteitä...",
+    "REPLIED_TO_STORY": "Replied to your story",
     "SUCCESS_DELETE_MESSAGE": "Message deleted successfully",
     "FAIL_DELETE_MESSSAGE": "Couldn't delete message! Try again",
     "NO_RESPONSE": "No response",
@@ -66,6 +67,23 @@
         "NEXT_WEEK": "Next week"
       }
     },
+    "PRIORITY": {
+      "TITLE": "Priority",
+      "OPTIONS": {
+        "NONE": "None",
+        "URGENT": "Urgent",
+        "HIGH": "High",
+        "MEDIUM": "Medium",
+        "LOW": "Low"
+      },
+      "CHANGE_PRIORITY": {
+        "SELECT_PLACEHOLDER": "None",
+        "INPUT_PLACEHOLDER": "Select priority",
+        "NO_RESULTS": "No results found",
+        "SUCCESSFUL": "Changed priority of conversation id %{conversationId} to %{priority}",
+        "FAILED": "Couldn't change priority. Please try again."
+      }
+    },
     "CARD_CONTEXT_MENU": {
       "PENDING": "Mark as pending",
       "RESOLVED": "Mark as resolved",
diff --git a/app/javascript/dashboard/i18n/locale/fi/generalSettings.json b/app/javascript/dashboard/i18n/locale/fi/generalSettings.json
index b3a129d25..1ff91626b 100644
--- a/app/javascript/dashboard/i18n/locale/fi/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/fi/generalSettings.json
@@ -101,6 +101,7 @@
       "REPORTS": "Raportit",
       "CONVERSATION": "Conversation",
       "CHANGE_ASSIGNEE": "Change Assignee",
+      "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Change Team",
       "ADD_LABEL": "Add label to the conversation",
       "REMOVE_LABEL": "Remove label from the conversation",
@@ -126,6 +127,7 @@
       "GO_TO_NOTIFICATIONS": "Go to Notifications",
       "ADD_LABELS_TO_CONVERSATION": "Add label to the conversation",
       "ASSIGN_AN_AGENT": "Assign an agent",
+      "ASSIGN_PRIORITY": "Assign priority",
       "ASSIGN_A_TEAM": "Assign a team",
       "MUTE_CONVERSATION": "Mute conversation",
       "UNMUTE_CONVERSATION": "Unmute conversation",
diff --git a/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json
index 3b5f4a6b1..33ef27a92 100644
--- a/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json
@@ -482,6 +482,13 @@
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
+    "HELP_CENTER": {
+      "LABEL": "Help Center",
+      "PLACEHOLDER": "Select Help Center",
+      "SELECT_PLACEHOLDER": "Select Help Center",
+      "REMOVE": "Remove Help Center",
+      "SUB_TEXT": "Attach a Help Center with the inbox"
+    },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
       "MAX_ASSIGNMENT_LIMIT_RANGE_ERROR": "Please enter a value greater than 0",
diff --git a/app/javascript/dashboard/i18n/locale/fi/integrations.json b/app/javascript/dashboard/i18n/locale/fi/integrations.json
index 96f2e48f0..c2ca9d517 100644
--- a/app/javascript/dashboard/i18n/locale/fi/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/fi/integrations.json
@@ -85,6 +85,23 @@
       "JOIN_ERROR": "There was an error joining the call, please try again",
       "CREATE_ERROR": "There was an error creating a meeting link, please try again"
     },
+    "OPEN_AI": {
+      "TITLE": "Improve With AI",
+      "SUBTITLE": "An improved reply will be generated using AI, based on your current draft.",
+      "TONE": {
+        "TITLE": "Tone",
+        "OPTIONS": {
+          "PROFESSIONAL": "Professional",
+          "FRIENDLY": "Friendly"
+        }
+      },
+      "BUTTONS": {
+        "GENERATE": "Generate",
+        "GENERATING": "Generating...",
+        "CANCEL": "Peruuta"
+      },
+      "GENERATE_ERROR": "There was an error processing the content, please try again"
+    },
     "DELETE": {
       "BUTTON_TEXT": "Poista",
       "API": {
diff --git a/app/javascript/dashboard/i18n/locale/fi/login.json b/app/javascript/dashboard/i18n/locale/fi/login.json
index c807d305a..6eada62c0 100644
--- a/app/javascript/dashboard/i18n/locale/fi/login.json
+++ b/app/javascript/dashboard/i18n/locale/fi/login.json
@@ -3,16 +3,16 @@
     "TITLE": "Kirjaudu sisään Chatwootiin",
     "EMAIL": {
       "LABEL": "Sähköposti",
-      "PLACEHOLDER": "Sähköposti, esim: someone@example.fi"
+      "PLACEHOLDER": "example@companyname.com"
     },
     "PASSWORD": {
       "LABEL": "Salasana",
       "PLACEHOLDER": "Salasana"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Kirjautuminen Onnistui",
-      "ERROR_MESSAGE": "Yhteyden muodostaminen Woot-palvelimelle ei onnistunut, yritä myöhemmin uudelleen",
-      "UNAUTH": "Käyttäjätunnus / salasana virheellinen. Yritä uudelleen"
+      "SUCCESS_MESSAGE": "Login successful",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again.",
+      "UNAUTH": "Username or password is incorrect. Please try again."
     },
     "OAUTH": {
       "GOOGLE_LOGIN": "Login with Google",
diff --git a/app/javascript/dashboard/i18n/locale/fi/resetPassword.json b/app/javascript/dashboard/i18n/locale/fi/resetPassword.json
index db3a8fa71..4739c9b02 100644
--- a/app/javascript/dashboard/i18n/locale/fi/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/fi/resetPassword.json
@@ -3,12 +3,12 @@
     "TITLE": "Nollaa salasana",
     "EMAIL": {
       "LABEL": "Sähköposti",
-      "PLACEHOLDER": "Ole hyvä ja syötä sähköpostiosoitteesi",
-      "ERROR": "Ole hyvä ja syötä validi sähköposti"
+      "PLACEHOLDER": "Ole hyvä ja syötä sähköpostiosoitteesi.",
+      "ERROR": "Ole hyvä ja syötä validi sähköposti."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Salasanan palautuslinkki on lähetetty sähköpostiisi",
-      "ERROR_MESSAGE": "Yhteyden muodostaminen Woot-palvelimelle ei onnistunut, yritä myöhemmin uudelleen"
+      "SUCCESS_MESSAGE": "Salasanan palautuslinkki on lähetetty sähköpostiisi.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Lähetä"
   }
diff --git a/app/javascript/dashboard/i18n/locale/fi/search.json b/app/javascript/dashboard/i18n/locale/fi/search.json
index c9924167c..1b7aed36c 100644
--- a/app/javascript/dashboard/i18n/locale/fi/search.json
+++ b/app/javascript/dashboard/i18n/locale/fi/search.json
@@ -14,8 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
-    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
+    "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Botti",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/fi/setNewPassword.json b/app/javascript/dashboard/i18n/locale/fi/setNewPassword.json
index 1cf732846..2d36ad65c 100644
--- a/app/javascript/dashboard/i18n/locale/fi/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/fi/setNewPassword.json
@@ -1,19 +1,19 @@
 {
   "SET_NEW_PASSWORD": {
-    "TITLE": "Aseta uusi salasana",
+    "TITLE": "Set new password",
     "PASSWORD": {
       "LABEL": "Salasana",
       "PLACEHOLDER": "Salasana",
-      "ERROR": "Salasana on liian lyhyt"
+      "ERROR": "Salasana on liian lyhyt."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Vahvista salasana",
+      "LABEL": "Confirm password",
       "PLACEHOLDER": "Vahvista salasana",
-      "ERROR": "Salasanat eivät täsmää"
+      "ERROR": "Salasanat eivät täsmää."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Salasanan vaihtaminen onnistui",
-      "ERROR_MESSAGE": "Yhteyden muodostaminen Woot-palvelimelle ei onnistunut, yritä myöhemmin uudelleen"
+      "SUCCESS_MESSAGE": "Salasanan vaihtaminen onnistui.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "CAPTCHA": {
       "ERROR": "Verification expired. Please solve captcha again."
diff --git a/app/javascript/dashboard/i18n/locale/fi/signup.json b/app/javascript/dashboard/i18n/locale/fi/signup.json
index 717809d30..a4b60728a 100644
--- a/app/javascript/dashboard/i18n/locale/fi/signup.json
+++ b/app/javascript/dashboard/i18n/locale/fi/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Company name",
-      "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
-      "ERROR": "Company name is too short"
+      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
+      "ERROR": "Company name is too short."
     },
     "FULL_NAME": {
       "LABEL": "Koko nimi",
-      "PLACEHOLDER": "Anna koko nimesi, esim: Bruce Wayne",
-      "ERROR": "Koko nimi on liian lyhyt"
+      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
+      "ERROR": "Koko nimi on liian lyhyt."
     },
     "EMAIL": {
       "LABEL": "Työsähköposti",
-      "PLACEHOLDER": "Anna työsi sähköpostiosoite, esim: bruce@wayne.enterprises",
-      "ERROR": "Please enter a valid work email address"
+      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
+      "ERROR": "Please enter a valid work email address."
     },
     "PASSWORD": {
       "LABEL": "Salasana",
       "PLACEHOLDER": "Salasana",
-      "ERROR": "Salasana on liian lyhyt",
-      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
+      "ERROR": "Salasana on liian lyhyt.",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Vahvista salasana",
-      "PLACEHOLDER": "Vahvista salasana",
-      "ERROR": "Salasanat eivät täsmää"
+      "LABEL": "Confirm password",
+      "PLACEHOLDER": "Confirm password",
+      "ERROR": "Salasanat eivät täsmää."
     },
     "API": {
       "SUCCESS_MESSAGE": "Rekisteröinti onnistui",
-      "ERROR_MESSAGE": "Yhteyden muodostaminen Woot-palvelimelle ei onnistunut, yritä myöhemmin uudelleen"
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Create account",
     "HAVE_AN_ACCOUNT": "Onko sinulla jo tili?"
diff --git a/app/javascript/dashboard/i18n/locale/fr/advancedFilters.json b/app/javascript/dashboard/i18n/locale/fr/advancedFilters.json
index 655912400..56017f757 100644
--- a/app/javascript/dashboard/i18n/locale/fr/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/fr/advancedFilters.json
@@ -38,6 +38,7 @@
       "CAMPAIGN_NAME": "Nom de la campagne",
       "LABELS": "Étiquettes",
       "BROWSER_LANGUAGE": "Langue du navigateur",
+      "PRIORITY": "Priority",
       "COUNTRY_NAME": "Nom du pays",
       "REFERER_LINK": "Referer link",
       "CUSTOM_ATTRIBUTE_LIST": "Liste",
diff --git a/app/javascript/dashboard/i18n/locale/fr/agentMgmt.json b/app/javascript/dashboard/i18n/locale/fr/agentMgmt.json
index b43b374fe..495c92bee 100644
--- a/app/javascript/dashboard/i18n/locale/fr/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fr/agentMgmt.json
@@ -110,7 +110,8 @@
         },
         "PLACEHOLDER": {
           "AGENT": "Chercher des agents",
-          "TEAM": "Chercher des équipes"
+          "TEAM": "Chercher des équipes",
+          "INPUT": "Search for agents"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/fr/conversation.json b/app/javascript/dashboard/i18n/locale/fr/conversation.json
index c86781a3d..5f68b73f7 100644
--- a/app/javascript/dashboard/i18n/locale/fr/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/fr/conversation.json
@@ -37,6 +37,7 @@
     "UNKNOWN_FILE_TYPE": "Unknown File",
     "SAVE_CONTACT": "Save",
     "UPLOADING_ATTACHMENTS": "Envoi des pièces jointes...",
+    "REPLIED_TO_STORY": "Replied to your story",
     "SUCCESS_DELETE_MESSAGE": "Le message a bien été supprimé",
     "FAIL_DELETE_MESSSAGE": "Impossible de supprimer le message ! Veuillez réessayez",
     "NO_RESPONSE": "Pas de réponse",
@@ -66,6 +67,23 @@
         "NEXT_WEEK": "Semaine prochaine"
       }
     },
+    "PRIORITY": {
+      "TITLE": "Priority",
+      "OPTIONS": {
+        "NONE": "Aucun",
+        "URGENT": "Urgent",
+        "HIGH": "High",
+        "MEDIUM": "Medium",
+        "LOW": "Low"
+      },
+      "CHANGE_PRIORITY": {
+        "SELECT_PLACEHOLDER": "Aucun",
+        "INPUT_PLACEHOLDER": "Select priority",
+        "NO_RESULTS": "Aucun résultat trouvé",
+        "SUCCESSFUL": "Changed priority of conversation id %{conversationId} to %{priority}",
+        "FAILED": "Couldn't change priority. Please try again."
+      }
+    },
     "CARD_CONTEXT_MENU": {
       "PENDING": "Marquer comme en attente",
       "RESOLVED": "Mark as resolved",
diff --git a/app/javascript/dashboard/i18n/locale/fr/generalSettings.json b/app/javascript/dashboard/i18n/locale/fr/generalSettings.json
index 8c7109402..434e2e192 100644
--- a/app/javascript/dashboard/i18n/locale/fr/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/fr/generalSettings.json
@@ -101,6 +101,7 @@
       "REPORTS": "Rapports",
       "CONVERSATION": "Conversation",
       "CHANGE_ASSIGNEE": "Change Assignee",
+      "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Changer d’équipe",
       "ADD_LABEL": "Add label to the conversation",
       "REMOVE_LABEL": "Remove label from the conversation",
@@ -126,6 +127,7 @@
       "GO_TO_NOTIFICATIONS": "Go to Notifications",
       "ADD_LABELS_TO_CONVERSATION": "Add label to the conversation",
       "ASSIGN_AN_AGENT": "Assign an agent",
+      "ASSIGN_PRIORITY": "Assign priority",
       "ASSIGN_A_TEAM": "Assign a team",
       "MUTE_CONVERSATION": "Mute conversation",
       "UNMUTE_CONVERSATION": "Unmute conversation",
diff --git a/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json
index cebe8d7e8..e20beab54 100644
--- a/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json
@@ -482,6 +482,13 @@
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
+    "HELP_CENTER": {
+      "LABEL": "Help Center",
+      "PLACEHOLDER": "Select Help Center",
+      "SELECT_PLACEHOLDER": "Select Help Center",
+      "REMOVE": "Remove Help Center",
+      "SUB_TEXT": "Attach a Help Center with the inbox"
+    },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
       "MAX_ASSIGNMENT_LIMIT_RANGE_ERROR": "Please enter a value greater than 0",
diff --git a/app/javascript/dashboard/i18n/locale/fr/integrations.json b/app/javascript/dashboard/i18n/locale/fr/integrations.json
index 406238803..4f869cbd7 100644
--- a/app/javascript/dashboard/i18n/locale/fr/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/fr/integrations.json
@@ -85,6 +85,23 @@
       "JOIN_ERROR": "There was an error joining the call, please try again",
       "CREATE_ERROR": "There was an error creating a meeting link, please try again"
     },
+    "OPEN_AI": {
+      "TITLE": "Improve With AI",
+      "SUBTITLE": "An improved reply will be generated using AI, based on your current draft.",
+      "TONE": {
+        "TITLE": "Tone",
+        "OPTIONS": {
+          "PROFESSIONAL": "Professional",
+          "FRIENDLY": "Friendly"
+        }
+      },
+      "BUTTONS": {
+        "GENERATE": "Generate",
+        "GENERATING": "Generating...",
+        "CANCEL": "Annuler"
+      },
+      "GENERATE_ERROR": "There was an error processing the content, please try again"
+    },
     "DELETE": {
       "BUTTON_TEXT": "Supprimer",
       "API": {
diff --git a/app/javascript/dashboard/i18n/locale/fr/login.json b/app/javascript/dashboard/i18n/locale/fr/login.json
index 68d3d47b3..283478872 100644
--- a/app/javascript/dashboard/i18n/locale/fr/login.json
+++ b/app/javascript/dashboard/i18n/locale/fr/login.json
@@ -3,16 +3,16 @@
     "TITLE": "Se connecter à Chatwoot",
     "EMAIL": {
       "LABEL": "Courriel",
-      "PLACEHOLDER": "Courriel ex : quelquun@exemple.com"
+      "PLACEHOLDER": "example@companyname.com"
     },
     "PASSWORD": {
       "LABEL": "Mot de passe",
       "PLACEHOLDER": "Mot de passe"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Connexion réussie",
-      "ERROR_MESSAGE": "Impossible de se connecter au serveur Woot, veuillez réessayer plus tard",
-      "UNAUTH": "Nom d'utilisateur / Mot de passe incorrect. Veuillez réessayer"
+      "SUCCESS_MESSAGE": "Login successful",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again.",
+      "UNAUTH": "Username or password is incorrect. Please try again."
     },
     "OAUTH": {
       "GOOGLE_LOGIN": "Login with Google",
diff --git a/app/javascript/dashboard/i18n/locale/fr/resetPassword.json b/app/javascript/dashboard/i18n/locale/fr/resetPassword.json
index 2f2750c95..55ef1ff67 100644
--- a/app/javascript/dashboard/i18n/locale/fr/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/fr/resetPassword.json
@@ -3,12 +3,12 @@
     "TITLE": "Réinitialiser le mot de passe",
     "EMAIL": {
       "LABEL": "Courriel",
-      "PLACEHOLDER": "Veuillez saisir votre adresse de courriel",
-      "ERROR": "Veuillez saisir une adresse de courriel valide"
+      "PLACEHOLDER": "Veuillez saisir votre adresse de courriel.",
+      "ERROR": "Veuillez saisir une adresse de courriel valide."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Le lien de réinitialisation du mot de passe a été envoyé à votre adresse de courriel",
-      "ERROR_MESSAGE": "Impossible de se connecter au serveur Woot, veuillez réessayer plus tard"
+      "SUCCESS_MESSAGE": "Le lien de réinitialisation du mot de passe a été envoyé à votre adresse de courriel.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Envoyer"
   }
diff --git a/app/javascript/dashboard/i18n/locale/fr/search.json b/app/javascript/dashboard/i18n/locale/fr/search.json
index c3129a175..2cdee1d40 100644
--- a/app/javascript/dashboard/i18n/locale/fr/search.json
+++ b/app/javascript/dashboard/i18n/locale/fr/search.json
@@ -14,8 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
-    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
+    "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/fr/setNewPassword.json b/app/javascript/dashboard/i18n/locale/fr/setNewPassword.json
index 0d9777fbf..a0c131f41 100644
--- a/app/javascript/dashboard/i18n/locale/fr/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/fr/setNewPassword.json
@@ -1,19 +1,19 @@
 {
   "SET_NEW_PASSWORD": {
-    "TITLE": "Définir un nouveau mot de passe",
+    "TITLE": "Set new password",
     "PASSWORD": {
       "LABEL": "Mot de passe",
       "PLACEHOLDER": "Mot de passe",
-      "ERROR": "Le mot de passe est trop court"
+      "ERROR": "Le mot de passe est trop court."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirmer le mot de passe",
+      "LABEL": "Confirm password",
       "PLACEHOLDER": "Confirmer le mot de passe",
-      "ERROR": "Les mots de passe ne correspondent pas"
+      "ERROR": "Les mots de passe ne correspondent pas."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Mot de passe modifié avec succès",
-      "ERROR_MESSAGE": "Impossible de se connecter au serveur Woot, veuillez réessayer plus tard"
+      "SUCCESS_MESSAGE": "Mot de passe modifié avec succès.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "CAPTCHA": {
       "ERROR": "La vérification a expiré. Veuillez résoudre le captcha à nouveau."
diff --git a/app/javascript/dashboard/i18n/locale/fr/signup.json b/app/javascript/dashboard/i18n/locale/fr/signup.json
index 81e4fd50f..9deaf33f9 100644
--- a/app/javascript/dashboard/i18n/locale/fr/signup.json
+++ b/app/javascript/dashboard/i18n/locale/fr/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Nom de la société",
-      "PLACEHOLDER": "Entrez le nom de votre entreprise. Ex : Wayne Enterprises",
-      "ERROR": "Le nom de la société est trop court"
+      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
+      "ERROR": "Le nom de la société est trop court."
     },
     "FULL_NAME": {
       "LABEL": "Nom complet",
-      "PLACEHOLDER": "Entrez votre nom complet. Ex. : Bruce Wayne",
-      "ERROR": "Le nom complet est trop court"
+      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
+      "ERROR": "Le nom complet est trop court."
     },
     "EMAIL": {
       "LABEL": "E-mail professionnel",
-      "PLACEHOLDER": "Entrez votre adresse e-mail professionnelle. Ex. : bruce@wayne.enterprises",
-      "ERROR": "Veuillez entrer une adresse e-mail professionnelle valide"
+      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
+      "ERROR": "Veuillez entrer une adresse e-mail professionnelle valide."
     },
     "PASSWORD": {
       "LABEL": "Mot de passe",
       "PLACEHOLDER": "Mot de passe",
-      "ERROR": "Le mot de passe est trop court",
-      "IS_INVALID_PASSWORD": "Le mot de passe doit contenir au moins 1 lettre majuscule, 1 lettre minuscule, 1 chiffre et 1 caractère spécial"
+      "ERROR": "Le mot de passe est trop court.",
+      "IS_INVALID_PASSWORD": "Le mot de passe doit contenir au moins 1 lettre majuscule, 1 lettre minuscule, 1 chiffre et 1 caractère spécial."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirmer le mot de passe",
-      "PLACEHOLDER": "Confirmer le mot de passe",
-      "ERROR": "Les mots de passe ne correspondent pas"
+      "LABEL": "Confirm password",
+      "PLACEHOLDER": "Confirm password",
+      "ERROR": "Les mots de passe ne correspondent pas."
     },
     "API": {
       "SUCCESS_MESSAGE": "Inscription réussie",
-      "ERROR_MESSAGE": "Impossible de se connecter au serveur Woot, veuillez réessayer plus tard"
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Créer un compte",
     "HAVE_AN_ACCOUNT": "Vous avez déjà un compte ?"
diff --git a/app/javascript/dashboard/i18n/locale/he/advancedFilters.json b/app/javascript/dashboard/i18n/locale/he/advancedFilters.json
index 546eef447..dc2fa1c47 100644
--- a/app/javascript/dashboard/i18n/locale/he/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/he/advancedFilters.json
@@ -38,6 +38,7 @@
       "CAMPAIGN_NAME": "שם קמפיין",
       "LABELS": "תוויות",
       "BROWSER_LANGUAGE": "שפת דפדפן",
+      "PRIORITY": "Priority",
       "COUNTRY_NAME": "שם המדינה",
       "REFERER_LINK": "קישור מפנה",
       "CUSTOM_ATTRIBUTE_LIST": "רשימה",
diff --git a/app/javascript/dashboard/i18n/locale/he/agentMgmt.json b/app/javascript/dashboard/i18n/locale/he/agentMgmt.json
index 740bf130e..52ab71ea5 100644
--- a/app/javascript/dashboard/i18n/locale/he/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/he/agentMgmt.json
@@ -110,7 +110,8 @@
         },
         "PLACEHOLDER": {
           "AGENT": "חפש נציגים",
-          "TEAM": "חפש קבוצות"
+          "TEAM": "חפש קבוצות",
+          "INPUT": "Search for agents"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/he/conversation.json b/app/javascript/dashboard/i18n/locale/he/conversation.json
index f1c842a17..d7e23e216 100644
--- a/app/javascript/dashboard/i18n/locale/he/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/he/conversation.json
@@ -37,6 +37,7 @@
     "UNKNOWN_FILE_TYPE": "קובץ לא ידוע",
     "SAVE_CONTACT": "שמור",
     "UPLOADING_ATTACHMENTS": "מעלה קובץ מצורף...",
+    "REPLIED_TO_STORY": "Replied to your story",
     "SUCCESS_DELETE_MESSAGE": "ההודעה נמחקה בהצלחה",
     "FAIL_DELETE_MESSSAGE": "לא ניתן למחוק את ההודעה! נסה שוב",
     "NO_RESPONSE": "אין תגובה",
@@ -66,6 +67,23 @@
         "NEXT_WEEK": "שבוע הבא"
       }
     },
+    "PRIORITY": {
+      "TITLE": "Priority",
+      "OPTIONS": {
+        "NONE": "כלום",
+        "URGENT": "Urgent",
+        "HIGH": "High",
+        "MEDIUM": "Medium",
+        "LOW": "Low"
+      },
+      "CHANGE_PRIORITY": {
+        "SELECT_PLACEHOLDER": "כלום",
+        "INPUT_PLACEHOLDER": "Select priority",
+        "NO_RESULTS": "לא נמצאו תוצאות",
+        "SUCCESSFUL": "Changed priority of conversation id %{conversationId} to %{priority}",
+        "FAILED": "Couldn't change priority. Please try again."
+      }
+    },
     "CARD_CONTEXT_MENU": {
       "PENDING": "סמן כממתין",
       "RESOLVED": "סמן כפתור",
diff --git a/app/javascript/dashboard/i18n/locale/he/generalSettings.json b/app/javascript/dashboard/i18n/locale/he/generalSettings.json
index 4e44207a8..388a8cae2 100644
--- a/app/javascript/dashboard/i18n/locale/he/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/he/generalSettings.json
@@ -101,6 +101,7 @@
       "REPORTS": "דוחות",
       "CONVERSATION": "שיחה",
       "CHANGE_ASSIGNEE": "שנה מוקצה",
+      "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "להחליף קבוצה",
       "ADD_LABEL": "הוסף תווית לשיחה",
       "REMOVE_LABEL": "הסר תווית מהשיחה",
@@ -126,6 +127,7 @@
       "GO_TO_NOTIFICATIONS": "עבור להודעות",
       "ADD_LABELS_TO_CONVERSATION": "הוסף תווית לשיחה",
       "ASSIGN_AN_AGENT": "הקצה סוכן",
+      "ASSIGN_PRIORITY": "Assign priority",
       "ASSIGN_A_TEAM": "הקצה צוות",
       "MUTE_CONVERSATION": "שיחה אילמת",
       "UNMUTE_CONVERSATION": "בטל השתקת שיחה",
diff --git a/app/javascript/dashboard/i18n/locale/he/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/he/inboxMgmt.json
index ceda7781d..783383ebe 100644
--- a/app/javascript/dashboard/i18n/locale/he/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/he/inboxMgmt.json
@@ -482,6 +482,13 @@
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "עדכון הגדרות טופס טרום צ'אט"
     },
+    "HELP_CENTER": {
+      "LABEL": "Help Center",
+      "PLACEHOLDER": "Select Help Center",
+      "SELECT_PLACEHOLDER": "Select Help Center",
+      "REMOVE": "Remove Help Center",
+      "SUB_TEXT": "Attach a Help Center with the inbox"
+    },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "מגבלת הקצאה אוטומטית",
       "MAX_ASSIGNMENT_LIMIT_RANGE_ERROR": "אנא הזן ערך גדול מ-0",
diff --git a/app/javascript/dashboard/i18n/locale/he/integrations.json b/app/javascript/dashboard/i18n/locale/he/integrations.json
index 05b41e289..5371fdc62 100644
--- a/app/javascript/dashboard/i18n/locale/he/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/he/integrations.json
@@ -85,6 +85,23 @@
       "JOIN_ERROR": "אירעה שגיאה בהצטרפות לשיחה, אנא נסה שוב",
       "CREATE_ERROR": "אירעה שגיאה ביצירת קישור לפגישה, אנא נסה שוב"
     },
+    "OPEN_AI": {
+      "TITLE": "Improve With AI",
+      "SUBTITLE": "An improved reply will be generated using AI, based on your current draft.",
+      "TONE": {
+        "TITLE": "Tone",
+        "OPTIONS": {
+          "PROFESSIONAL": "Professional",
+          "FRIENDLY": "Friendly"
+        }
+      },
+      "BUTTONS": {
+        "GENERATE": "Generate",
+        "GENERATING": "Generating...",
+        "CANCEL": "ביטול"
+      },
+      "GENERATE_ERROR": "There was an error processing the content, please try again"
+    },
     "DELETE": {
       "BUTTON_TEXT": "מחק",
       "API": {
diff --git a/app/javascript/dashboard/i18n/locale/he/login.json b/app/javascript/dashboard/i18n/locale/he/login.json
index bc76228a5..16a9732d5 100644
--- a/app/javascript/dashboard/i18n/locale/he/login.json
+++ b/app/javascript/dashboard/i18n/locale/he/login.json
@@ -3,16 +3,16 @@
     "TITLE": "התחבר ל Woot",
     "EMAIL": {
       "LABEL": "אימייל",
-      "PLACEHOLDER": "מייל לדוגמא: someone@example.com"
+      "PLACEHOLDER": "example@companyname.com"
     },
     "PASSWORD": {
       "LABEL": "סיסמה",
       "PLACEHOLDER": "סיסמה"
     },
     "API": {
-      "SUCCESS_MESSAGE": "נכנסת בהצלחה",
-      "ERROR_MESSAGE": "לא ניתן להתחבר לשרת Woot, נסה שוב מאוחר יותר",
-      "UNAUTH": "שם משתמש / סיסמה שגויים. נסה שוב"
+      "SUCCESS_MESSAGE": "Login successful",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again.",
+      "UNAUTH": "Username or password is incorrect. Please try again."
     },
     "OAUTH": {
       "GOOGLE_LOGIN": "התחבר עם גוגל",
diff --git a/app/javascript/dashboard/i18n/locale/he/resetPassword.json b/app/javascript/dashboard/i18n/locale/he/resetPassword.json
index 6e0cceebe..10da8c2e9 100644
--- a/app/javascript/dashboard/i18n/locale/he/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/he/resetPassword.json
@@ -1,14 +1,14 @@
 {
   "RESET_PASSWORD": {
-    "TITLE": "אפס ססמה",
+    "TITLE": "אפס את הסיסמה",
     "EMAIL": {
       "LABEL": "אימייל",
-      "PLACEHOLDER": "הזן בבקשה את האימייל שלך",
-      "ERROR": "אנא הכנס כתובת דוא\"ל חוקית"
+      "PLACEHOLDER": "הזן בבקשה את האימייל שלך.",
+      "ERROR": "אנא הכנס כתובת דוא\"ל חוקית."
     },
     "API": {
-      "SUCCESS_MESSAGE": "הקישור לאיפוס הסיסמה נשלח לדוא\"ל שלך",
-      "ERROR_MESSAGE": "לא ניתן להתחבר לשרת Woot, נסה שוב מאוחר יותר"
+      "SUCCESS_MESSAGE": "הקישור לאיפוס הסיסמה נשלח לדוא\"ל שלך.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "שלח"
   }
diff --git a/app/javascript/dashboard/i18n/locale/he/search.json b/app/javascript/dashboard/i18n/locale/he/search.json
index dd211513c..b9ad4038c 100644
--- a/app/javascript/dashboard/i18n/locale/he/search.json
+++ b/app/javascript/dashboard/i18n/locale/he/search.json
@@ -14,8 +14,8 @@
     "EMPTY_STATE": "לא נמצא %{item} עבור השאילתה '%{query}'",
     "EMPTY_STATE_FULL": "לא נמצאו תוצאות עבור השאילתה '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ להתמקד",
-    "INPUT_PLACEHOLDER": "חפש הודעות, אנשי קשר או שיחות",
-    "EMPTY_STATE_DEFAULT": "חפש לפי מזהה שיחה, אימייל, מספר טלפון, הודעות לתוצאות חיפוש טובות יותר.",
+    "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "EMPTY_STATE_DEFAULT": "חפש לפי מזהה שיחה, אימייל, מספר טלפון, הודעות לתוצאות חיפוש טובות יותר. ",
     "BOT_LABEL": "בוט",
     "READ_MORE": "קרא עוד",
     "WROTE": "נכתב:"
diff --git a/app/javascript/dashboard/i18n/locale/he/setNewPassword.json b/app/javascript/dashboard/i18n/locale/he/setNewPassword.json
index 59175d871..2d0b71229 100644
--- a/app/javascript/dashboard/i18n/locale/he/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/he/setNewPassword.json
@@ -1,19 +1,19 @@
 {
   "SET_NEW_PASSWORD": {
-    "TITLE": "הגדר סיסמה חדשה",
+    "TITLE": "Set new password",
     "PASSWORD": {
       "LABEL": "סיסמה",
       "PLACEHOLDER": "סיסמה",
-      "ERROR": "הסיסמה קצרה מדי"
+      "ERROR": "הסיסמה קצרה מדי."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "אמת סיסמה",
+      "LABEL": "Confirm password",
       "PLACEHOLDER": "אמת סיסמה",
-      "ERROR": "סיסמאות לא תואמות"
+      "ERROR": "סיסמאות לא תואמות."
     },
     "API": {
-      "SUCCESS_MESSAGE": "שינתה את הסיסמה בהצלחה",
-      "ERROR_MESSAGE": "לא ניתן להתחבר לשרת Woot, נסה שוב מאוחר יותר"
+      "SUCCESS_MESSAGE": "שינתה את הסיסמה בהצלחה.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "CAPTCHA": {
       "ERROR": "פג תוקף האימות. נא לפתור שוב את ה-captcha."
diff --git a/app/javascript/dashboard/i18n/locale/he/signup.json b/app/javascript/dashboard/i18n/locale/he/signup.json
index a8d580aa4..17dc4ed65 100644
--- a/app/javascript/dashboard/i18n/locale/he/signup.json
+++ b/app/javascript/dashboard/i18n/locale/he/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "שם החברה",
-      "PLACEHOLDER": "הזן את שם החברה שלך. למשל: Wayne Enterprises",
-      "ERROR": "שם החברה קצר מדי"
+      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
+      "ERROR": "שם החברה קצר מדי."
     },
     "FULL_NAME": {
       "LABEL": "שם מלא",
-      "PLACEHOLDER": "הזן את שמך המלא. למשל: ברוס וויין",
-      "ERROR": "השם המלא קצר מדי"
+      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
+      "ERROR": "השם המלא קצר מדי."
     },
     "EMAIL": {
       "LABEL": "מייל עבודה",
-      "PLACEHOLDER": "הזן את כתובת הדוא\"ל שלך בעבודה. למשל: bruce@wayne.enterprises",
-      "ERROR": "אנא הזן כתובת דוא\"ל חוקית לעבודה"
+      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
+      "ERROR": "אנא הזן כתובת דוא\"ל חוקית לעבודה."
     },
     "PASSWORD": {
       "LABEL": "סיסמה",
       "PLACEHOLDER": "סיסמה",
-      "ERROR": "הסיסמה קצרה מדי",
-      "IS_INVALID_PASSWORD": "הסיסמה צריכה להכיל לפחות אות אחת גדולה, אות קטנה אחת, מספר אחד ותו מיוחד אחד"
+      "ERROR": "הסיסמה קצרה מדי.",
+      "IS_INVALID_PASSWORD": "הסיסמה צריכה להכיל לפחות אות אחת גדולה, אות קטנה אחת, מספר אחד ותו מיוחד אחד."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "אמת סיסמה",
-      "PLACEHOLDER": "אמת סיסמה",
-      "ERROR": "סיסמה לא מתאימה"
+      "LABEL": "Confirm password",
+      "PLACEHOLDER": "Confirm password",
+      "ERROR": "סיסמה לא מתאימה."
     },
     "API": {
       "SUCCESS_MESSAGE": "ההרשמה הצליחה",
-      "ERROR_MESSAGE": "לא ניתן להתחבר לשרת Woot, נסה שוב מאוחר יותר"
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "צור חשבון",
     "HAVE_AN_ACCOUNT": "כבר יש לך חשבון?"
diff --git a/app/javascript/dashboard/i18n/locale/hi/advancedFilters.json b/app/javascript/dashboard/i18n/locale/hi/advancedFilters.json
index 2875d51c2..1fe3e4f70 100644
--- a/app/javascript/dashboard/i18n/locale/hi/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/hi/advancedFilters.json
@@ -38,6 +38,7 @@
       "CAMPAIGN_NAME": "Campaign Name",
       "LABELS": "Labels",
       "BROWSER_LANGUAGE": "Browser Language",
+      "PRIORITY": "Priority",
       "COUNTRY_NAME": "Country Name",
       "REFERER_LINK": "Referer link",
       "CUSTOM_ATTRIBUTE_LIST": "List",
diff --git a/app/javascript/dashboard/i18n/locale/hi/agentMgmt.json b/app/javascript/dashboard/i18n/locale/hi/agentMgmt.json
index 97f7a4c55..d711762fa 100644
--- a/app/javascript/dashboard/i18n/locale/hi/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hi/agentMgmt.json
@@ -110,7 +110,8 @@
         },
         "PLACEHOLDER": {
           "AGENT": "Search agents",
-          "TEAM": "Search teams"
+          "TEAM": "Search teams",
+          "INPUT": "Search for agents"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/hi/conversation.json b/app/javascript/dashboard/i18n/locale/hi/conversation.json
index 597799c15..a20522108 100644
--- a/app/javascript/dashboard/i18n/locale/hi/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/hi/conversation.json
@@ -37,6 +37,7 @@
     "UNKNOWN_FILE_TYPE": "Unknown File",
     "SAVE_CONTACT": "Save",
     "UPLOADING_ATTACHMENTS": "Uploading attachments...",
+    "REPLIED_TO_STORY": "Replied to your story",
     "SUCCESS_DELETE_MESSAGE": "Message deleted successfully",
     "FAIL_DELETE_MESSSAGE": "Couldn't delete message! Try again",
     "NO_RESPONSE": "No response",
@@ -66,6 +67,23 @@
         "NEXT_WEEK": "Next week"
       }
     },
+    "PRIORITY": {
+      "TITLE": "Priority",
+      "OPTIONS": {
+        "NONE": "None",
+        "URGENT": "Urgent",
+        "HIGH": "High",
+        "MEDIUM": "Medium",
+        "LOW": "Low"
+      },
+      "CHANGE_PRIORITY": {
+        "SELECT_PLACEHOLDER": "None",
+        "INPUT_PLACEHOLDER": "Select priority",
+        "NO_RESULTS": "No results found",
+        "SUCCESSFUL": "Changed priority of conversation id %{conversationId} to %{priority}",
+        "FAILED": "Couldn't change priority. Please try again."
+      }
+    },
     "CARD_CONTEXT_MENU": {
       "PENDING": "Mark as pending",
       "RESOLVED": "Mark as resolved",
diff --git a/app/javascript/dashboard/i18n/locale/hi/generalSettings.json b/app/javascript/dashboard/i18n/locale/hi/generalSettings.json
index 367b35b1c..7ed6d8925 100644
--- a/app/javascript/dashboard/i18n/locale/hi/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/hi/generalSettings.json
@@ -101,6 +101,7 @@
       "REPORTS": "Reports",
       "CONVERSATION": "Conversation",
       "CHANGE_ASSIGNEE": "Change Assignee",
+      "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Change Team",
       "ADD_LABEL": "Add label to the conversation",
       "REMOVE_LABEL": "Remove label from the conversation",
@@ -126,6 +127,7 @@
       "GO_TO_NOTIFICATIONS": "Go to Notifications",
       "ADD_LABELS_TO_CONVERSATION": "Add label to the conversation",
       "ASSIGN_AN_AGENT": "Assign an agent",
+      "ASSIGN_PRIORITY": "Assign priority",
       "ASSIGN_A_TEAM": "Assign a team",
       "MUTE_CONVERSATION": "Mute conversation",
       "UNMUTE_CONVERSATION": "Unmute conversation",
diff --git a/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json
index bed0ec0c9..407441618 100644
--- a/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json
@@ -482,6 +482,13 @@
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
+    "HELP_CENTER": {
+      "LABEL": "Help Center",
+      "PLACEHOLDER": "Select Help Center",
+      "SELECT_PLACEHOLDER": "Select Help Center",
+      "REMOVE": "Remove Help Center",
+      "SUB_TEXT": "Attach a Help Center with the inbox"
+    },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
       "MAX_ASSIGNMENT_LIMIT_RANGE_ERROR": "Please enter a value greater than 0",
diff --git a/app/javascript/dashboard/i18n/locale/hi/integrations.json b/app/javascript/dashboard/i18n/locale/hi/integrations.json
index 00d92f297..f0326fa78 100644
--- a/app/javascript/dashboard/i18n/locale/hi/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/hi/integrations.json
@@ -85,6 +85,23 @@
       "JOIN_ERROR": "There was an error joining the call, please try again",
       "CREATE_ERROR": "There was an error creating a meeting link, please try again"
     },
+    "OPEN_AI": {
+      "TITLE": "Improve With AI",
+      "SUBTITLE": "An improved reply will be generated using AI, based on your current draft.",
+      "TONE": {
+        "TITLE": "Tone",
+        "OPTIONS": {
+          "PROFESSIONAL": "Professional",
+          "FRIENDLY": "Friendly"
+        }
+      },
+      "BUTTONS": {
+        "GENERATE": "Generate",
+        "GENERATING": "Generating...",
+        "CANCEL": "Cancel"
+      },
+      "GENERATE_ERROR": "There was an error processing the content, please try again"
+    },
     "DELETE": {
       "BUTTON_TEXT": "Delete",
       "API": {
diff --git a/app/javascript/dashboard/i18n/locale/hi/login.json b/app/javascript/dashboard/i18n/locale/hi/login.json
index 25c956a81..f2b2f51b9 100644
--- a/app/javascript/dashboard/i18n/locale/hi/login.json
+++ b/app/javascript/dashboard/i18n/locale/hi/login.json
@@ -3,16 +3,16 @@
     "TITLE": "Login to Chatwoot",
     "EMAIL": {
       "LABEL": "Email",
-      "PLACEHOLDER": "Email eg: someone@example.com"
+      "PLACEHOLDER": "example@companyname.com"
     },
     "PASSWORD": {
       "LABEL": "Password",
       "PLACEHOLDER": "Password"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Login Successful",
-      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later",
-      "UNAUTH": "Username / Password Incorrect. Please try again"
+      "SUCCESS_MESSAGE": "Login successful",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again.",
+      "UNAUTH": "Username or password is incorrect. Please try again."
     },
     "OAUTH": {
       "GOOGLE_LOGIN": "Login with Google",
diff --git a/app/javascript/dashboard/i18n/locale/hi/resetPassword.json b/app/javascript/dashboard/i18n/locale/hi/resetPassword.json
index bb678e809..37aa1860a 100644
--- a/app/javascript/dashboard/i18n/locale/hi/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/hi/resetPassword.json
@@ -1,14 +1,14 @@
 {
   "RESET_PASSWORD": {
-    "TITLE": "Reset Password",
+    "TITLE": "Reset password",
     "EMAIL": {
       "LABEL": "Email",
-      "PLACEHOLDER": "Please enter your email",
-      "ERROR": "Please enter a valid email"
+      "PLACEHOLDER": "Please enter your email.",
+      "ERROR": "Please enter a valid email."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Password reset link has been sent to your email",
-      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      "SUCCESS_MESSAGE": "Password reset link has been sent to your email.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Submit"
   }
diff --git a/app/javascript/dashboard/i18n/locale/hi/search.json b/app/javascript/dashboard/i18n/locale/hi/search.json
index 418572c0c..9044bf5f9 100644
--- a/app/javascript/dashboard/i18n/locale/hi/search.json
+++ b/app/javascript/dashboard/i18n/locale/hi/search.json
@@ -14,8 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
-    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
+    "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/hi/setNewPassword.json b/app/javascript/dashboard/i18n/locale/hi/setNewPassword.json
index ec2d94744..4908dad02 100644
--- a/app/javascript/dashboard/i18n/locale/hi/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/hi/setNewPassword.json
@@ -1,19 +1,19 @@
 {
   "SET_NEW_PASSWORD": {
-    "TITLE": "Set New Password",
+    "TITLE": "Set new password",
     "PASSWORD": {
       "LABEL": "Password",
       "PLACEHOLDER": "Password",
-      "ERROR": "Password is too short"
+      "ERROR": "Password is too short."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirm Password",
+      "LABEL": "Confirm password",
       "PLACEHOLDER": "Confirm Password",
-      "ERROR": "Passwords do not match"
+      "ERROR": "Passwords do not match."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Successfully changed the password",
-      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      "SUCCESS_MESSAGE": "Successfully changed the password.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "CAPTCHA": {
       "ERROR": "Verification expired. Please solve captcha again."
diff --git a/app/javascript/dashboard/i18n/locale/hi/signup.json b/app/javascript/dashboard/i18n/locale/hi/signup.json
index 10ddc5b86..1ad4865ff 100644
--- a/app/javascript/dashboard/i18n/locale/hi/signup.json
+++ b/app/javascript/dashboard/i18n/locale/hi/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Company name",
-      "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
-      "ERROR": "Company name is too short"
+      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
+      "ERROR": "Company name is too short."
     },
     "FULL_NAME": {
       "LABEL": "Full name",
-      "PLACEHOLDER": "Enter your full name. eg: Bruce Wayne",
-      "ERROR": "Full name is too short"
+      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
+      "ERROR": "Full name is too short."
     },
     "EMAIL": {
       "LABEL": "Work email",
-      "PLACEHOLDER": "Enter your work email address. eg: bruce@wayne.enterprises",
-      "ERROR": "Please enter a valid work email address"
+      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
+      "ERROR": "Please enter a valid work email address."
     },
     "PASSWORD": {
       "LABEL": "Password",
       "PLACEHOLDER": "Password",
-      "ERROR": "Password is too short",
-      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
+      "ERROR": "Password is too short.",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirm Password",
-      "PLACEHOLDER": "Confirm Password",
-      "ERROR": "Password doesnot match"
+      "LABEL": "Confirm password",
+      "PLACEHOLDER": "Confirm password",
+      "ERROR": "Password doesnot match."
     },
     "API": {
       "SUCCESS_MESSAGE": "Registration Successfull",
-      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Create account",
     "HAVE_AN_ACCOUNT": "Already have an account?"
diff --git a/app/javascript/dashboard/i18n/locale/hr/advancedFilters.json b/app/javascript/dashboard/i18n/locale/hr/advancedFilters.json
index 31a9b4056..b7ca33b82 100644
--- a/app/javascript/dashboard/i18n/locale/hr/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/hr/advancedFilters.json
@@ -38,6 +38,7 @@
       "CAMPAIGN_NAME": "Campaign Name",
       "LABELS": "Labels",
       "BROWSER_LANGUAGE": "Browser Language",
+      "PRIORITY": "Prioritet",
       "COUNTRY_NAME": "Country Name",
       "REFERER_LINK": "Referer link",
       "CUSTOM_ATTRIBUTE_LIST": "List",
diff --git a/app/javascript/dashboard/i18n/locale/hr/agentMgmt.json b/app/javascript/dashboard/i18n/locale/hr/agentMgmt.json
index 4f0cdab51..e5af8f609 100644
--- a/app/javascript/dashboard/i18n/locale/hr/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hr/agentMgmt.json
@@ -110,7 +110,8 @@
         },
         "PLACEHOLDER": {
           "AGENT": "Search agents",
-          "TEAM": "Search teams"
+          "TEAM": "Search teams",
+          "INPUT": "Pretraga agenata"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/hr/conversation.json b/app/javascript/dashboard/i18n/locale/hr/conversation.json
index 597799c15..1c932b5a7 100644
--- a/app/javascript/dashboard/i18n/locale/hr/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/hr/conversation.json
@@ -37,6 +37,7 @@
     "UNKNOWN_FILE_TYPE": "Unknown File",
     "SAVE_CONTACT": "Save",
     "UPLOADING_ATTACHMENTS": "Uploading attachments...",
+    "REPLIED_TO_STORY": "Replied to your story",
     "SUCCESS_DELETE_MESSAGE": "Message deleted successfully",
     "FAIL_DELETE_MESSSAGE": "Couldn't delete message! Try again",
     "NO_RESPONSE": "No response",
@@ -66,6 +67,23 @@
         "NEXT_WEEK": "Next week"
       }
     },
+    "PRIORITY": {
+      "TITLE": "Prioritet",
+      "OPTIONS": {
+        "NONE": "Nijedno",
+        "URGENT": "Hitno",
+        "HIGH": "Visoko",
+        "MEDIUM": "Srednje",
+        "LOW": "Nisko"
+      },
+      "CHANGE_PRIORITY": {
+        "SELECT_PLACEHOLDER": "Nijedno",
+        "INPUT_PLACEHOLDER": "Odaberi prioritet",
+        "NO_RESULTS": "Nisu pronađeni rezultati",
+        "SUCCESSFUL": "Prioritet razgovora id %{conversationId} promijenjen na %{priority}",
+        "FAILED": "Nije moguće promijeniti prioritet. Molim, pokušajte kasnije."
+      }
+    },
     "CARD_CONTEXT_MENU": {
       "PENDING": "Mark as pending",
       "RESOLVED": "Mark as resolved",
diff --git a/app/javascript/dashboard/i18n/locale/hr/generalSettings.json b/app/javascript/dashboard/i18n/locale/hr/generalSettings.json
index 367b35b1c..1dce7fd29 100644
--- a/app/javascript/dashboard/i18n/locale/hr/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/hr/generalSettings.json
@@ -101,6 +101,7 @@
       "REPORTS": "Reports",
       "CONVERSATION": "Conversation",
       "CHANGE_ASSIGNEE": "Change Assignee",
+      "CHANGE_PRIORITY": "Promjena prioriteta",
       "CHANGE_TEAM": "Change Team",
       "ADD_LABEL": "Add label to the conversation",
       "REMOVE_LABEL": "Remove label from the conversation",
@@ -126,6 +127,7 @@
       "GO_TO_NOTIFICATIONS": "Go to Notifications",
       "ADD_LABELS_TO_CONVERSATION": "Add label to the conversation",
       "ASSIGN_AN_AGENT": "Assign an agent",
+      "ASSIGN_PRIORITY": "Dodijeli prioritet",
       "ASSIGN_A_TEAM": "Assign a team",
       "MUTE_CONVERSATION": "Mute conversation",
       "UNMUTE_CONVERSATION": "Unmute conversation",
diff --git a/app/javascript/dashboard/i18n/locale/hr/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/hr/inboxMgmt.json
index ed77491a9..5887669b2 100644
--- a/app/javascript/dashboard/i18n/locale/hr/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hr/inboxMgmt.json
@@ -482,6 +482,13 @@
       "WHATSAPP_WEBHOOK_SUBHEADER": "Ovaj token se koristi za verifikaciju autentičnosti webhook endpoint-a.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
+    "HELP_CENTER": {
+      "LABEL": "Centar za pomoć",
+      "PLACEHOLDER": "Odaberi centar za pomoć",
+      "SELECT_PLACEHOLDER": "Odaberi centar za pomoć",
+      "REMOVE": "Makni Centar za Pomoć",
+      "SUB_TEXT": "Pridruži Centar za Pomoć inbox-u"
+    },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
       "MAX_ASSIGNMENT_LIMIT_RANGE_ERROR": "Please enter a value greater than 0",
diff --git a/app/javascript/dashboard/i18n/locale/hr/integrations.json b/app/javascript/dashboard/i18n/locale/hr/integrations.json
index 00d92f297..dd8a351ff 100644
--- a/app/javascript/dashboard/i18n/locale/hr/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/hr/integrations.json
@@ -85,6 +85,23 @@
       "JOIN_ERROR": "There was an error joining the call, please try again",
       "CREATE_ERROR": "There was an error creating a meeting link, please try again"
     },
+    "OPEN_AI": {
+      "TITLE": "Poboljšaj s AI",
+      "SUBTITLE": "Poboljšani odgovor će se generirati uz pomoć AI, bazirano na trenutnom odgovoru.",
+      "TONE": {
+        "TITLE": "Ton",
+        "OPTIONS": {
+          "PROFESSIONAL": "Profesionalno",
+          "FRIENDLY": "Prijateljski"
+        }
+      },
+      "BUTTONS": {
+        "GENERATE": "Generiraj",
+        "GENERATING": "Generiranje...",
+        "CANCEL": "Odustani"
+      },
+      "GENERATE_ERROR": "Došlo je do greške tijekom procesiranja sadržaja, molim pokušajte ponovno"
+    },
     "DELETE": {
       "BUTTON_TEXT": "Delete",
       "API": {
diff --git a/app/javascript/dashboard/i18n/locale/hr/login.json b/app/javascript/dashboard/i18n/locale/hr/login.json
index 25c956a81..e8b8494a0 100644
--- a/app/javascript/dashboard/i18n/locale/hr/login.json
+++ b/app/javascript/dashboard/i18n/locale/hr/login.json
@@ -3,16 +3,16 @@
     "TITLE": "Login to Chatwoot",
     "EMAIL": {
       "LABEL": "Email",
-      "PLACEHOLDER": "Email eg: someone@example.com"
+      "PLACEHOLDER": "primjer@imetvrtke.com"
     },
     "PASSWORD": {
       "LABEL": "Password",
       "PLACEHOLDER": "Password"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Login Successful",
-      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later",
-      "UNAUTH": "Username / Password Incorrect. Please try again"
+      "SUCCESS_MESSAGE": "Prijava uspješna",
+      "ERROR_MESSAGE": "Nije uspjelo spajanje na Woot server. Molimo pokušajte ponovno.",
+      "UNAUTH": "Korisničko ime ili lozinka je pogrešno. Molimo, pokušajte ponovno."
     },
     "OAUTH": {
       "GOOGLE_LOGIN": "Login with Google",
diff --git a/app/javascript/dashboard/i18n/locale/hr/resetPassword.json b/app/javascript/dashboard/i18n/locale/hr/resetPassword.json
index bb678e809..9208731c8 100644
--- a/app/javascript/dashboard/i18n/locale/hr/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/hr/resetPassword.json
@@ -1,14 +1,14 @@
 {
   "RESET_PASSWORD": {
-    "TITLE": "Reset Password",
+    "TITLE": "Reset lozinke",
     "EMAIL": {
       "LABEL": "Email",
-      "PLACEHOLDER": "Please enter your email",
-      "ERROR": "Please enter a valid email"
+      "PLACEHOLDER": "Molimo, unesite e-mail.",
+      "ERROR": "Molimo, unesite validan e-mail."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Password reset link has been sent to your email",
-      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      "SUCCESS_MESSAGE": "Link za reset lozinke je poslan na zadani e-mail.",
+      "ERROR_MESSAGE": "Nije uspjelo spajanje na Woot server. Molimo pokušajte ponovno."
     },
     "SUBMIT": "Submit"
   }
diff --git a/app/javascript/dashboard/i18n/locale/hr/search.json b/app/javascript/dashboard/i18n/locale/hr/search.json
index 418572c0c..2e2c9994d 100644
--- a/app/javascript/dashboard/i18n/locale/hr/search.json
+++ b/app/javascript/dashboard/i18n/locale/hr/search.json
@@ -14,8 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
-    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
+    "INPUT_PLACEHOLDER": "Unesi 3 ili više znakova za pretragu",
+    "EMPTY_STATE_DEFAULT": "Traži po conversation id, e-mail, broj telefona, poruke za bolje rezultate pretrage. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/hr/setNewPassword.json b/app/javascript/dashboard/i18n/locale/hr/setNewPassword.json
index ec2d94744..84575c6a1 100644
--- a/app/javascript/dashboard/i18n/locale/hr/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/hr/setNewPassword.json
@@ -1,19 +1,19 @@
 {
   "SET_NEW_PASSWORD": {
-    "TITLE": "Set New Password",
+    "TITLE": "Postavi novu lozinku",
     "PASSWORD": {
       "LABEL": "Password",
       "PLACEHOLDER": "Password",
-      "ERROR": "Password is too short"
+      "ERROR": "Lozinka je prekratka."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirm Password",
+      "LABEL": "Potvrdi lozinku",
       "PLACEHOLDER": "Confirm Password",
-      "ERROR": "Passwords do not match"
+      "ERROR": "Lozinke se ne poklapaju."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Successfully changed the password",
-      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      "SUCCESS_MESSAGE": "Lozinka je uspješno promijenjena.",
+      "ERROR_MESSAGE": "Nije uspjelo spajanje na Woot server. Molimo pokušajte ponovno."
     },
     "CAPTCHA": {
       "ERROR": "Verification expired. Please solve captcha again."
diff --git a/app/javascript/dashboard/i18n/locale/hr/signup.json b/app/javascript/dashboard/i18n/locale/hr/signup.json
index 10ddc5b86..a9fec9396 100644
--- a/app/javascript/dashboard/i18n/locale/hr/signup.json
+++ b/app/javascript/dashboard/i18n/locale/hr/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Company name",
-      "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
-      "ERROR": "Company name is too short"
+      "PLACEHOLDER": "Unesi ime svoje tvrtke. Npr., Wayne Enterprises",
+      "ERROR": "Ime tvrtke je prekratko."
     },
     "FULL_NAME": {
       "LABEL": "Full name",
-      "PLACEHOLDER": "Enter your full name. eg: Bruce Wayne",
-      "ERROR": "Full name is too short"
+      "PLACEHOLDER": "Unesi svoje puno ime. Npr, Bruce Wayne",
+      "ERROR": "Puno ime je prekratko."
     },
     "EMAIL": {
       "LABEL": "Work email",
-      "PLACEHOLDER": "Enter your work email address. eg: bruce@wayne.enterprises",
-      "ERROR": "Please enter a valid work email address"
+      "PLACEHOLDER": "Unesi svoju poslovnu e-mail adresu. Npr., bruce@wayne.enterprises",
+      "ERROR": "Unesi validnu poslovnu e-mail adresu."
     },
     "PASSWORD": {
       "LABEL": "Password",
       "PLACEHOLDER": "Password",
-      "ERROR": "Password is too short",
-      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
+      "ERROR": "Lozinka je prekratka.",
+      "IS_INVALID_PASSWORD": "Lozinka mora sadržavati barem 1 veliko slovo, 1 malo slovo, 1 broj i 1 posebni znak."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirm Password",
-      "PLACEHOLDER": "Confirm Password",
-      "ERROR": "Password doesnot match"
+      "LABEL": "Potvrdi lozinku",
+      "PLACEHOLDER": "Potvrdi lozinku",
+      "ERROR": "Lozinke se ne poklapaju."
     },
     "API": {
       "SUCCESS_MESSAGE": "Registration Successfull",
-      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      "ERROR_MESSAGE": "Nije uspjelo spajanje na Woot server. Molimo pokušajte ponovno."
     },
     "SUBMIT": "Create account",
     "HAVE_AN_ACCOUNT": "Already have an account?"
diff --git a/app/javascript/dashboard/i18n/locale/hu/advancedFilters.json b/app/javascript/dashboard/i18n/locale/hu/advancedFilters.json
index 3e1ec395e..c330f2f2e 100644
--- a/app/javascript/dashboard/i18n/locale/hu/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/hu/advancedFilters.json
@@ -38,6 +38,7 @@
       "CAMPAIGN_NAME": "Campaign Name",
       "LABELS": "Cimkék",
       "BROWSER_LANGUAGE": "Browser Language",
+      "PRIORITY": "Priority",
       "COUNTRY_NAME": "Country Name",
       "REFERER_LINK": "Referer link",
       "CUSTOM_ATTRIBUTE_LIST": "List",
diff --git a/app/javascript/dashboard/i18n/locale/hu/agentMgmt.json b/app/javascript/dashboard/i18n/locale/hu/agentMgmt.json
index df9edc981..d48453342 100644
--- a/app/javascript/dashboard/i18n/locale/hu/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hu/agentMgmt.json
@@ -110,7 +110,8 @@
         },
         "PLACEHOLDER": {
           "AGENT": "Ügynökök keresése",
-          "TEAM": "Csapatok keresése"
+          "TEAM": "Csapatok keresése",
+          "INPUT": "Search for agents"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/hu/conversation.json b/app/javascript/dashboard/i18n/locale/hu/conversation.json
index 0b4f87e45..5a137515a 100644
--- a/app/javascript/dashboard/i18n/locale/hu/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/hu/conversation.json
@@ -37,6 +37,7 @@
     "UNKNOWN_FILE_TYPE": "Unknown File",
     "SAVE_CONTACT": "Save",
     "UPLOADING_ATTACHMENTS": "Csatolt fileok feltöltése...",
+    "REPLIED_TO_STORY": "Replied to your story",
     "SUCCESS_DELETE_MESSAGE": "Message deleted successfully",
     "FAIL_DELETE_MESSSAGE": "Couldn't delete message! Try again",
     "NO_RESPONSE": "Nincs válasz",
@@ -66,6 +67,23 @@
         "NEXT_WEEK": "Next week"
       }
     },
+    "PRIORITY": {
+      "TITLE": "Priority",
+      "OPTIONS": {
+        "NONE": "Nincs",
+        "URGENT": "Urgent",
+        "HIGH": "High",
+        "MEDIUM": "Medium",
+        "LOW": "Low"
+      },
+      "CHANGE_PRIORITY": {
+        "SELECT_PLACEHOLDER": "Nincs",
+        "INPUT_PLACEHOLDER": "Select priority",
+        "NO_RESULTS": "Nincs találat",
+        "SUCCESSFUL": "Changed priority of conversation id %{conversationId} to %{priority}",
+        "FAILED": "Couldn't change priority. Please try again."
+      }
+    },
     "CARD_CONTEXT_MENU": {
       "PENDING": "Mark as pending",
       "RESOLVED": "Mark as resolved",
diff --git a/app/javascript/dashboard/i18n/locale/hu/generalSettings.json b/app/javascript/dashboard/i18n/locale/hu/generalSettings.json
index dc5853700..5478fa4a1 100644
--- a/app/javascript/dashboard/i18n/locale/hu/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/hu/generalSettings.json
@@ -101,6 +101,7 @@
       "REPORTS": "Jelentések",
       "CONVERSATION": "Conversation",
       "CHANGE_ASSIGNEE": "Change Assignee",
+      "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Change Team",
       "ADD_LABEL": "Add label to the conversation",
       "REMOVE_LABEL": "Remove label from the conversation",
@@ -126,6 +127,7 @@
       "GO_TO_NOTIFICATIONS": "Go to Notifications",
       "ADD_LABELS_TO_CONVERSATION": "Add label to the conversation",
       "ASSIGN_AN_AGENT": "Assign an agent",
+      "ASSIGN_PRIORITY": "Assign priority",
       "ASSIGN_A_TEAM": "Assign a team",
       "MUTE_CONVERSATION": "Mute conversation",
       "UNMUTE_CONVERSATION": "Unmute conversation",
diff --git a/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json
index 836483989..8865e5966 100644
--- a/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json
@@ -482,6 +482,13 @@
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
+    "HELP_CENTER": {
+      "LABEL": "Help Center",
+      "PLACEHOLDER": "Select Help Center",
+      "SELECT_PLACEHOLDER": "Select Help Center",
+      "REMOVE": "Remove Help Center",
+      "SUB_TEXT": "Attach a Help Center with the inbox"
+    },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
       "MAX_ASSIGNMENT_LIMIT_RANGE_ERROR": "Please enter a value greater than 0",
diff --git a/app/javascript/dashboard/i18n/locale/hu/integrations.json b/app/javascript/dashboard/i18n/locale/hu/integrations.json
index ce89a7ec7..585a855b5 100644
--- a/app/javascript/dashboard/i18n/locale/hu/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/hu/integrations.json
@@ -85,6 +85,23 @@
       "JOIN_ERROR": "There was an error joining the call, please try again",
       "CREATE_ERROR": "There was an error creating a meeting link, please try again"
     },
+    "OPEN_AI": {
+      "TITLE": "Improve With AI",
+      "SUBTITLE": "An improved reply will be generated using AI, based on your current draft.",
+      "TONE": {
+        "TITLE": "Tone",
+        "OPTIONS": {
+          "PROFESSIONAL": "Professional",
+          "FRIENDLY": "Friendly"
+        }
+      },
+      "BUTTONS": {
+        "GENERATE": "Generate",
+        "GENERATING": "Generating...",
+        "CANCEL": "Mégse"
+      },
+      "GENERATE_ERROR": "There was an error processing the content, please try again"
+    },
     "DELETE": {
       "BUTTON_TEXT": "Törlés",
       "API": {
diff --git a/app/javascript/dashboard/i18n/locale/hu/login.json b/app/javascript/dashboard/i18n/locale/hu/login.json
index c99045ffd..f03db3997 100644
--- a/app/javascript/dashboard/i18n/locale/hu/login.json
+++ b/app/javascript/dashboard/i18n/locale/hu/login.json
@@ -3,16 +3,16 @@
     "TITLE": "Chatwoot belépés",
     "EMAIL": {
       "LABEL": "E-mail",
-      "PLACEHOLDER": "E-mail pl.: valaki@példa.hu"
+      "PLACEHOLDER": "example@companyname.com"
     },
     "PASSWORD": {
       "LABEL": "Jelszó",
       "PLACEHOLDER": "Jelszó"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Bejelentkezés sikeres",
-      "ERROR_MESSAGE": "Nem sikerült csatlakozni a Woot szerverhez, kérjük próbáld később",
-      "UNAUTH": "A felhasználó / jelszó helytelen. Kérjük próbálja újra"
+      "SUCCESS_MESSAGE": "Login successful",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again.",
+      "UNAUTH": "Username or password is incorrect. Please try again."
     },
     "OAUTH": {
       "GOOGLE_LOGIN": "Login with Google",
diff --git a/app/javascript/dashboard/i18n/locale/hu/resetPassword.json b/app/javascript/dashboard/i18n/locale/hu/resetPassword.json
index 6303f19fb..acb9f3193 100644
--- a/app/javascript/dashboard/i18n/locale/hu/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/hu/resetPassword.json
@@ -1,14 +1,14 @@
 {
   "RESET_PASSWORD": {
-    "TITLE": "Új jelszó kérése",
+    "TITLE": "Jelszó megváltoztatása",
     "EMAIL": {
       "LABEL": "E-mail",
-      "PLACEHOLDER": "Add meg az e-mailed",
-      "ERROR": "Kérjük helyes e-mailcímet adj meg"
+      "PLACEHOLDER": "Kérjük add meg az e-mailcímed.",
+      "ERROR": "Kérjük helyes e-mailcímet adj meg."
     },
     "API": {
-      "SUCCESS_MESSAGE": "A jelszó helyreállító linket e-mailben elküldtük",
-      "ERROR_MESSAGE": "Nem sikerült csatlakozni a Woot szerverhez, kérjük próbáld később"
+      "SUCCESS_MESSAGE": "A jelszó helyreállító linket e-mailben elküldtük.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Elküldés"
   }
diff --git a/app/javascript/dashboard/i18n/locale/hu/search.json b/app/javascript/dashboard/i18n/locale/hu/search.json
index 21d4522e5..739bc8c77 100644
--- a/app/javascript/dashboard/i18n/locale/hu/search.json
+++ b/app/javascript/dashboard/i18n/locale/hu/search.json
@@ -14,8 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
-    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
+    "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/hu/setNewPassword.json b/app/javascript/dashboard/i18n/locale/hu/setNewPassword.json
index a213361d1..b3ff813ea 100644
--- a/app/javascript/dashboard/i18n/locale/hu/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/hu/setNewPassword.json
@@ -1,19 +1,19 @@
 {
   "SET_NEW_PASSWORD": {
-    "TITLE": "Új jelszó megadása",
+    "TITLE": "Set new password",
     "PASSWORD": {
       "LABEL": "Jelszó",
       "PLACEHOLDER": "Jelszó",
-      "ERROR": "A jelszó túl rövid"
+      "ERROR": "A jelszó túl rövid."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Jelszó megerősítése",
+      "LABEL": "Confirm password",
       "PLACEHOLDER": "Jelszó megerősítése",
-      "ERROR": "A jelszavak nem egyeznek"
+      "ERROR": "A jelszavak nem egyeznek."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Jelszó sikeresen megváltoztatva",
-      "ERROR_MESSAGE": "Nem sikerült csatlakozni a Woot szerverhez, kérjük próbáld később"
+      "SUCCESS_MESSAGE": "Jelszó sikeresen megváltoztatva.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "CAPTCHA": {
       "ERROR": "Verification expired. Please solve captcha again."
diff --git a/app/javascript/dashboard/i18n/locale/hu/signup.json b/app/javascript/dashboard/i18n/locale/hu/signup.json
index 13453510b..e43d2f960 100644
--- a/app/javascript/dashboard/i18n/locale/hu/signup.json
+++ b/app/javascript/dashboard/i18n/locale/hu/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Company name",
-      "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
-      "ERROR": "Company name is too short"
+      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
+      "ERROR": "Company name is too short."
     },
     "FULL_NAME": {
       "LABEL": "Teljes név",
-      "PLACEHOLDER": "Add meg a teljes neved. Pl.: Kovács János",
-      "ERROR": "A teljes név túl rövid"
+      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
+      "ERROR": "A teljes név túl rövid."
     },
     "EMAIL": {
       "LABEL": "Munkahelyi e-mail",
-      "PLACEHOLDER": "Add meg munkahelyi e-mailcímed. Pl. kovacs.janos@email.hu",
-      "ERROR": "Please enter a valid work email address"
+      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
+      "ERROR": "Please enter a valid work email address."
     },
     "PASSWORD": {
       "LABEL": "Jelszó",
       "PLACEHOLDER": "Jelszó",
-      "ERROR": "A jelszó túl rövid",
-      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
+      "ERROR": "A jelszó túl rövid.",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Jelszó megerősítése",
-      "PLACEHOLDER": "Jelszó megerősítése",
-      "ERROR": "A jelszavak nem egyeznek"
+      "LABEL": "Confirm password",
+      "PLACEHOLDER": "Confirm password",
+      "ERROR": "A jelszavak nem egyeznek."
     },
     "API": {
       "SUCCESS_MESSAGE": "Sikeres regisztráció",
-      "ERROR_MESSAGE": "Nem sikerült csatlakozni a Woot szerverhez, kérjük próbáld később"
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Create account",
     "HAVE_AN_ACCOUNT": "Már van fiókod?"
diff --git a/app/javascript/dashboard/i18n/locale/hy/advancedFilters.json b/app/javascript/dashboard/i18n/locale/hy/advancedFilters.json
index a32c1bd9d..361c0c8ae 100644
--- a/app/javascript/dashboard/i18n/locale/hy/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/hy/advancedFilters.json
@@ -38,6 +38,7 @@
       "CAMPAIGN_NAME": "Campaign Name",
       "LABELS": "Labels",
       "BROWSER_LANGUAGE": "Browser Language",
+      "PRIORITY": "Priority",
       "COUNTRY_NAME": "Country Name",
       "REFERER_LINK": "Referer link",
       "CUSTOM_ATTRIBUTE_LIST": "List",
diff --git a/app/javascript/dashboard/i18n/locale/hy/agentMgmt.json b/app/javascript/dashboard/i18n/locale/hy/agentMgmt.json
index b44e74542..b563de61f 100644
--- a/app/javascript/dashboard/i18n/locale/hy/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hy/agentMgmt.json
@@ -110,7 +110,8 @@
         },
         "PLACEHOLDER": {
           "AGENT": "Search agents",
-          "TEAM": "Search teams"
+          "TEAM": "Search teams",
+          "INPUT": "Search for agents"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/hy/conversation.json b/app/javascript/dashboard/i18n/locale/hy/conversation.json
index 597799c15..a20522108 100644
--- a/app/javascript/dashboard/i18n/locale/hy/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/hy/conversation.json
@@ -37,6 +37,7 @@
     "UNKNOWN_FILE_TYPE": "Unknown File",
     "SAVE_CONTACT": "Save",
     "UPLOADING_ATTACHMENTS": "Uploading attachments...",
+    "REPLIED_TO_STORY": "Replied to your story",
     "SUCCESS_DELETE_MESSAGE": "Message deleted successfully",
     "FAIL_DELETE_MESSSAGE": "Couldn't delete message! Try again",
     "NO_RESPONSE": "No response",
@@ -66,6 +67,23 @@
         "NEXT_WEEK": "Next week"
       }
     },
+    "PRIORITY": {
+      "TITLE": "Priority",
+      "OPTIONS": {
+        "NONE": "None",
+        "URGENT": "Urgent",
+        "HIGH": "High",
+        "MEDIUM": "Medium",
+        "LOW": "Low"
+      },
+      "CHANGE_PRIORITY": {
+        "SELECT_PLACEHOLDER": "None",
+        "INPUT_PLACEHOLDER": "Select priority",
+        "NO_RESULTS": "No results found",
+        "SUCCESSFUL": "Changed priority of conversation id %{conversationId} to %{priority}",
+        "FAILED": "Couldn't change priority. Please try again."
+      }
+    },
     "CARD_CONTEXT_MENU": {
       "PENDING": "Mark as pending",
       "RESOLVED": "Mark as resolved",
diff --git a/app/javascript/dashboard/i18n/locale/hy/generalSettings.json b/app/javascript/dashboard/i18n/locale/hy/generalSettings.json
index 367b35b1c..7ed6d8925 100644
--- a/app/javascript/dashboard/i18n/locale/hy/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/hy/generalSettings.json
@@ -101,6 +101,7 @@
       "REPORTS": "Reports",
       "CONVERSATION": "Conversation",
       "CHANGE_ASSIGNEE": "Change Assignee",
+      "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Change Team",
       "ADD_LABEL": "Add label to the conversation",
       "REMOVE_LABEL": "Remove label from the conversation",
@@ -126,6 +127,7 @@
       "GO_TO_NOTIFICATIONS": "Go to Notifications",
       "ADD_LABELS_TO_CONVERSATION": "Add label to the conversation",
       "ASSIGN_AN_AGENT": "Assign an agent",
+      "ASSIGN_PRIORITY": "Assign priority",
       "ASSIGN_A_TEAM": "Assign a team",
       "MUTE_CONVERSATION": "Mute conversation",
       "UNMUTE_CONVERSATION": "Unmute conversation",
diff --git a/app/javascript/dashboard/i18n/locale/hy/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/hy/inboxMgmt.json
index 14f60eac8..97a4ee2f6 100644
--- a/app/javascript/dashboard/i18n/locale/hy/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hy/inboxMgmt.json
@@ -482,6 +482,13 @@
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
+    "HELP_CENTER": {
+      "LABEL": "Help Center",
+      "PLACEHOLDER": "Select Help Center",
+      "SELECT_PLACEHOLDER": "Select Help Center",
+      "REMOVE": "Remove Help Center",
+      "SUB_TEXT": "Attach a Help Center with the inbox"
+    },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
       "MAX_ASSIGNMENT_LIMIT_RANGE_ERROR": "Please enter a value greater than 0",
diff --git a/app/javascript/dashboard/i18n/locale/hy/integrations.json b/app/javascript/dashboard/i18n/locale/hy/integrations.json
index 00d92f297..f0326fa78 100644
--- a/app/javascript/dashboard/i18n/locale/hy/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/hy/integrations.json
@@ -85,6 +85,23 @@
       "JOIN_ERROR": "There was an error joining the call, please try again",
       "CREATE_ERROR": "There was an error creating a meeting link, please try again"
     },
+    "OPEN_AI": {
+      "TITLE": "Improve With AI",
+      "SUBTITLE": "An improved reply will be generated using AI, based on your current draft.",
+      "TONE": {
+        "TITLE": "Tone",
+        "OPTIONS": {
+          "PROFESSIONAL": "Professional",
+          "FRIENDLY": "Friendly"
+        }
+      },
+      "BUTTONS": {
+        "GENERATE": "Generate",
+        "GENERATING": "Generating...",
+        "CANCEL": "Cancel"
+      },
+      "GENERATE_ERROR": "There was an error processing the content, please try again"
+    },
     "DELETE": {
       "BUTTON_TEXT": "Delete",
       "API": {
diff --git a/app/javascript/dashboard/i18n/locale/hy/login.json b/app/javascript/dashboard/i18n/locale/hy/login.json
index 25c956a81..f2b2f51b9 100644
--- a/app/javascript/dashboard/i18n/locale/hy/login.json
+++ b/app/javascript/dashboard/i18n/locale/hy/login.json
@@ -3,16 +3,16 @@
     "TITLE": "Login to Chatwoot",
     "EMAIL": {
       "LABEL": "Email",
-      "PLACEHOLDER": "Email eg: someone@example.com"
+      "PLACEHOLDER": "example@companyname.com"
     },
     "PASSWORD": {
       "LABEL": "Password",
       "PLACEHOLDER": "Password"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Login Successful",
-      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later",
-      "UNAUTH": "Username / Password Incorrect. Please try again"
+      "SUCCESS_MESSAGE": "Login successful",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again.",
+      "UNAUTH": "Username or password is incorrect. Please try again."
     },
     "OAUTH": {
       "GOOGLE_LOGIN": "Login with Google",
diff --git a/app/javascript/dashboard/i18n/locale/hy/resetPassword.json b/app/javascript/dashboard/i18n/locale/hy/resetPassword.json
index bb678e809..37aa1860a 100644
--- a/app/javascript/dashboard/i18n/locale/hy/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/hy/resetPassword.json
@@ -1,14 +1,14 @@
 {
   "RESET_PASSWORD": {
-    "TITLE": "Reset Password",
+    "TITLE": "Reset password",
     "EMAIL": {
       "LABEL": "Email",
-      "PLACEHOLDER": "Please enter your email",
-      "ERROR": "Please enter a valid email"
+      "PLACEHOLDER": "Please enter your email.",
+      "ERROR": "Please enter a valid email."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Password reset link has been sent to your email",
-      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      "SUCCESS_MESSAGE": "Password reset link has been sent to your email.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Submit"
   }
diff --git a/app/javascript/dashboard/i18n/locale/hy/search.json b/app/javascript/dashboard/i18n/locale/hy/search.json
index 418572c0c..9044bf5f9 100644
--- a/app/javascript/dashboard/i18n/locale/hy/search.json
+++ b/app/javascript/dashboard/i18n/locale/hy/search.json
@@ -14,8 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
-    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
+    "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/hy/setNewPassword.json b/app/javascript/dashboard/i18n/locale/hy/setNewPassword.json
index ec2d94744..4908dad02 100644
--- a/app/javascript/dashboard/i18n/locale/hy/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/hy/setNewPassword.json
@@ -1,19 +1,19 @@
 {
   "SET_NEW_PASSWORD": {
-    "TITLE": "Set New Password",
+    "TITLE": "Set new password",
     "PASSWORD": {
       "LABEL": "Password",
       "PLACEHOLDER": "Password",
-      "ERROR": "Password is too short"
+      "ERROR": "Password is too short."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirm Password",
+      "LABEL": "Confirm password",
       "PLACEHOLDER": "Confirm Password",
-      "ERROR": "Passwords do not match"
+      "ERROR": "Passwords do not match."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Successfully changed the password",
-      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      "SUCCESS_MESSAGE": "Successfully changed the password.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "CAPTCHA": {
       "ERROR": "Verification expired. Please solve captcha again."
diff --git a/app/javascript/dashboard/i18n/locale/hy/signup.json b/app/javascript/dashboard/i18n/locale/hy/signup.json
index 10ddc5b86..1ad4865ff 100644
--- a/app/javascript/dashboard/i18n/locale/hy/signup.json
+++ b/app/javascript/dashboard/i18n/locale/hy/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Company name",
-      "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
-      "ERROR": "Company name is too short"
+      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
+      "ERROR": "Company name is too short."
     },
     "FULL_NAME": {
       "LABEL": "Full name",
-      "PLACEHOLDER": "Enter your full name. eg: Bruce Wayne",
-      "ERROR": "Full name is too short"
+      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
+      "ERROR": "Full name is too short."
     },
     "EMAIL": {
       "LABEL": "Work email",
-      "PLACEHOLDER": "Enter your work email address. eg: bruce@wayne.enterprises",
-      "ERROR": "Please enter a valid work email address"
+      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
+      "ERROR": "Please enter a valid work email address."
     },
     "PASSWORD": {
       "LABEL": "Password",
       "PLACEHOLDER": "Password",
-      "ERROR": "Password is too short",
-      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
+      "ERROR": "Password is too short.",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirm Password",
-      "PLACEHOLDER": "Confirm Password",
-      "ERROR": "Password doesnot match"
+      "LABEL": "Confirm password",
+      "PLACEHOLDER": "Confirm password",
+      "ERROR": "Password doesnot match."
     },
     "API": {
       "SUCCESS_MESSAGE": "Registration Successfull",
-      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Create account",
     "HAVE_AN_ACCOUNT": "Already have an account?"
diff --git a/app/javascript/dashboard/i18n/locale/id/advancedFilters.json b/app/javascript/dashboard/i18n/locale/id/advancedFilters.json
index 81632e323..b4f4c805b 100644
--- a/app/javascript/dashboard/i18n/locale/id/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/id/advancedFilters.json
@@ -38,6 +38,7 @@
       "CAMPAIGN_NAME": "Campaign Name",
       "LABELS": "Label",
       "BROWSER_LANGUAGE": "Browser Language",
+      "PRIORITY": "Priority",
       "COUNTRY_NAME": "Country Name",
       "REFERER_LINK": "Referer link",
       "CUSTOM_ATTRIBUTE_LIST": "List",
diff --git a/app/javascript/dashboard/i18n/locale/id/agentMgmt.json b/app/javascript/dashboard/i18n/locale/id/agentMgmt.json
index 6d9894075..c592f1b7d 100644
--- a/app/javascript/dashboard/i18n/locale/id/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/id/agentMgmt.json
@@ -110,7 +110,8 @@
         },
         "PLACEHOLDER": {
           "AGENT": "Search agents",
-          "TEAM": "Search teams"
+          "TEAM": "Search teams",
+          "INPUT": "Search for agents"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/id/conversation.json b/app/javascript/dashboard/i18n/locale/id/conversation.json
index 635b546a7..2cc401265 100644
--- a/app/javascript/dashboard/i18n/locale/id/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/id/conversation.json
@@ -37,6 +37,7 @@
     "UNKNOWN_FILE_TYPE": "Unknown File",
     "SAVE_CONTACT": "Save",
     "UPLOADING_ATTACHMENTS": "Unggah lampiran...",
+    "REPLIED_TO_STORY": "Replied to your story",
     "SUCCESS_DELETE_MESSAGE": "Message deleted successfully",
     "FAIL_DELETE_MESSSAGE": "Couldn't delete message! Try again",
     "NO_RESPONSE": "Tidak ada respon",
@@ -66,6 +67,23 @@
         "NEXT_WEEK": "Next week"
       }
     },
+    "PRIORITY": {
+      "TITLE": "Priority",
+      "OPTIONS": {
+        "NONE": "Tidak ada",
+        "URGENT": "Urgent",
+        "HIGH": "High",
+        "MEDIUM": "Medium",
+        "LOW": "Low"
+      },
+      "CHANGE_PRIORITY": {
+        "SELECT_PLACEHOLDER": "Tidak ada",
+        "INPUT_PLACEHOLDER": "Select priority",
+        "NO_RESULTS": "Tidak ada hasil ditemukan",
+        "SUCCESSFUL": "Changed priority of conversation id %{conversationId} to %{priority}",
+        "FAILED": "Couldn't change priority. Please try again."
+      }
+    },
     "CARD_CONTEXT_MENU": {
       "PENDING": "Mark as pending",
       "RESOLVED": "Mark as resolved",
diff --git a/app/javascript/dashboard/i18n/locale/id/generalSettings.json b/app/javascript/dashboard/i18n/locale/id/generalSettings.json
index 54d582e08..a2b55c7c7 100644
--- a/app/javascript/dashboard/i18n/locale/id/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/id/generalSettings.json
@@ -101,6 +101,7 @@
       "REPORTS": "Laporan",
       "CONVERSATION": "Percakapan",
       "CHANGE_ASSIGNEE": "Change Assignee",
+      "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Change Team",
       "ADD_LABEL": "Add label to the conversation",
       "REMOVE_LABEL": "Remove label from the conversation",
@@ -126,6 +127,7 @@
       "GO_TO_NOTIFICATIONS": "Go to Notifications",
       "ADD_LABELS_TO_CONVERSATION": "Add label to the conversation",
       "ASSIGN_AN_AGENT": "Assign an agent",
+      "ASSIGN_PRIORITY": "Assign priority",
       "ASSIGN_A_TEAM": "Assign a team",
       "MUTE_CONVERSATION": "Mute conversation",
       "UNMUTE_CONVERSATION": "Unmute conversation",
diff --git a/app/javascript/dashboard/i18n/locale/id/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/id/inboxMgmt.json
index 277ab2e3d..6953bb126 100644
--- a/app/javascript/dashboard/i18n/locale/id/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/id/inboxMgmt.json
@@ -482,6 +482,13 @@
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
+    "HELP_CENTER": {
+      "LABEL": "Help Center",
+      "PLACEHOLDER": "Select Help Center",
+      "SELECT_PLACEHOLDER": "Select Help Center",
+      "REMOVE": "Remove Help Center",
+      "SUB_TEXT": "Attach a Help Center with the inbox"
+    },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
       "MAX_ASSIGNMENT_LIMIT_RANGE_ERROR": "Please enter a value greater than 0",
diff --git a/app/javascript/dashboard/i18n/locale/id/integrations.json b/app/javascript/dashboard/i18n/locale/id/integrations.json
index dd4ac65d0..3a23356c1 100644
--- a/app/javascript/dashboard/i18n/locale/id/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/id/integrations.json
@@ -85,6 +85,23 @@
       "JOIN_ERROR": "There was an error joining the call, please try again",
       "CREATE_ERROR": "There was an error creating a meeting link, please try again"
     },
+    "OPEN_AI": {
+      "TITLE": "Improve With AI",
+      "SUBTITLE": "An improved reply will be generated using AI, based on your current draft.",
+      "TONE": {
+        "TITLE": "Tone",
+        "OPTIONS": {
+          "PROFESSIONAL": "Professional",
+          "FRIENDLY": "Friendly"
+        }
+      },
+      "BUTTONS": {
+        "GENERATE": "Generate",
+        "GENERATING": "Generating...",
+        "CANCEL": "Batalkan"
+      },
+      "GENERATE_ERROR": "There was an error processing the content, please try again"
+    },
     "DELETE": {
       "BUTTON_TEXT": "Hapus",
       "API": {
diff --git a/app/javascript/dashboard/i18n/locale/id/login.json b/app/javascript/dashboard/i18n/locale/id/login.json
index b9d216d61..ebb72c2b5 100644
--- a/app/javascript/dashboard/i18n/locale/id/login.json
+++ b/app/javascript/dashboard/i18n/locale/id/login.json
@@ -3,16 +3,16 @@
     "TITLE": "Masuk ke Chatwoot",
     "EMAIL": {
       "LABEL": "Email",
-      "PLACEHOLDER": "Email cth: someone@example.com"
+      "PLACEHOLDER": "example@companyname.com"
     },
     "PASSWORD": {
       "LABEL": "Kata Sandi",
       "PLACEHOLDER": "Kata Sandi"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Berhasil Masuk",
-      "ERROR_MESSAGE": "Tidak dapat terhubung ke Server Woot, Silahkan coba lagi nanti",
-      "UNAUTH": "Nama Pengguna / Kata Sandi Salah. Silahkan coba lagi"
+      "SUCCESS_MESSAGE": "Login successful",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again.",
+      "UNAUTH": "Username or password is incorrect. Please try again."
     },
     "OAUTH": {
       "GOOGLE_LOGIN": "Login with Google",
diff --git a/app/javascript/dashboard/i18n/locale/id/resetPassword.json b/app/javascript/dashboard/i18n/locale/id/resetPassword.json
index 72996ca3a..99693c5f6 100644
--- a/app/javascript/dashboard/i18n/locale/id/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/id/resetPassword.json
@@ -1,14 +1,14 @@
 {
   "RESET_PASSWORD": {
-    "TITLE": "Atur Ulang Kata Sandi",
+    "TITLE": "Reset password",
     "EMAIL": {
       "LABEL": "Email",
-      "PLACEHOLDER": "Harap masukkan email Anda",
-      "ERROR": "Harap masukkan email yang valid"
+      "PLACEHOLDER": "Harap masukkan email Anda.",
+      "ERROR": "Harap masukkan email yang valid."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Link pengaturan ulang kata sandi telah dikirim ke email Anda",
-      "ERROR_MESSAGE": "Tidak dapat terhubung ke Server Woot, Silahkan coba lagi nanti"
+      "SUCCESS_MESSAGE": "Link pengaturan ulang kata sandi telah dikirim ke email Anda.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Kirim"
   }
diff --git a/app/javascript/dashboard/i18n/locale/id/search.json b/app/javascript/dashboard/i18n/locale/id/search.json
index e79e2ee85..0a57ae342 100644
--- a/app/javascript/dashboard/i18n/locale/id/search.json
+++ b/app/javascript/dashboard/i18n/locale/id/search.json
@@ -14,8 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
-    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
+    "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/id/setNewPassword.json b/app/javascript/dashboard/i18n/locale/id/setNewPassword.json
index b5d0bd0d7..e965fe73d 100644
--- a/app/javascript/dashboard/i18n/locale/id/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/id/setNewPassword.json
@@ -1,19 +1,19 @@
 {
   "SET_NEW_PASSWORD": {
-    "TITLE": "Setel Kata Sandi Baru",
+    "TITLE": "Set new password",
     "PASSWORD": {
       "LABEL": "Kata Sandi",
       "PLACEHOLDER": "Kata Sandi",
-      "ERROR": "Kata sandi terlalu pendek"
+      "ERROR": "Kata sandi terlalu pendek."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Konfirmasi Kata Sandi",
+      "LABEL": "Confirm password",
       "PLACEHOLDER": "Konfirmasi Kata Sandi",
-      "ERROR": "Kata Sandi tidak cocok"
+      "ERROR": "Kata Sandi tidak cocok."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Berhasil mengubah kata sandi",
-      "ERROR_MESSAGE": "Tidak dapat terhubung ke Server Woot, Silahkan coba lagi nanti"
+      "SUCCESS_MESSAGE": "Berhasil mengubah kata sandi.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "CAPTCHA": {
       "ERROR": "Verification expired. Please solve captcha again."
diff --git a/app/javascript/dashboard/i18n/locale/id/signup.json b/app/javascript/dashboard/i18n/locale/id/signup.json
index 3253f778a..a8f7e0292 100644
--- a/app/javascript/dashboard/i18n/locale/id/signup.json
+++ b/app/javascript/dashboard/i18n/locale/id/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Company name",
-      "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
-      "ERROR": "Company name is too short"
+      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
+      "ERROR": "Company name is too short."
     },
     "FULL_NAME": {
       "LABEL": "Nama Lengkap",
-      "PLACEHOLDER": "Masukkan nama lengkap Anda. cth: Bruce Wayne",
-      "ERROR": "Nama lengkap terlalu pendek"
+      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
+      "ERROR": "Nama lengkap terlalu pendek."
     },
     "EMAIL": {
       "LABEL": "Email kantor",
-      "PLACEHOLDER": "Masukkan alamat email kantor Anda. cth: bruce@wayne.enterprises",
-      "ERROR": "Please enter a valid work email address"
+      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
+      "ERROR": "Please enter a valid work email address."
     },
     "PASSWORD": {
       "LABEL": "Kata Sandi",
       "PLACEHOLDER": "Kata Sandi",
-      "ERROR": "Kata sandi terlalu pendek",
-      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
+      "ERROR": "Kata sandi terlalu pendek.",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Konfirmasi Kata Sandi",
-      "PLACEHOLDER": "Konfirmasi Kata Sandi",
-      "ERROR": "Kata Sandi tidak cocok"
+      "LABEL": "Confirm password",
+      "PLACEHOLDER": "Confirm password",
+      "ERROR": "Kata Sandi tidak cocok."
     },
     "API": {
       "SUCCESS_MESSAGE": "Pendaftaran Berhasil",
-      "ERROR_MESSAGE": "Tidak dapat terhubung ke Server Woot, Silahkan coba lagi nanti"
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Create account",
     "HAVE_AN_ACCOUNT": "Sudah punya akun?"
diff --git a/app/javascript/dashboard/i18n/locale/is/advancedFilters.json b/app/javascript/dashboard/i18n/locale/is/advancedFilters.json
index eb5e0842a..be1fbaf18 100644
--- a/app/javascript/dashboard/i18n/locale/is/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/is/advancedFilters.json
@@ -38,6 +38,7 @@
       "CAMPAIGN_NAME": "Campaign Name",
       "LABELS": "Labels",
       "BROWSER_LANGUAGE": "Browser Language",
+      "PRIORITY": "Priority",
       "COUNTRY_NAME": "Country Name",
       "REFERER_LINK": "Referer link",
       "CUSTOM_ATTRIBUTE_LIST": "List",
@@ -76,7 +77,7 @@
           "CONFIRM": {
             "TITLE": "Staðfesta eyðingu",
             "MESSAGE": "Are you sure to delete the filter ",
-            "YES": "Yes, Delete",
+            "YES": "Já, eyða",
             "NO": "No, Keep it"
           }
         },
diff --git a/app/javascript/dashboard/i18n/locale/is/agentMgmt.json b/app/javascript/dashboard/i18n/locale/is/agentMgmt.json
index c349a1e64..8836f13ac 100644
--- a/app/javascript/dashboard/i18n/locale/is/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/is/agentMgmt.json
@@ -110,7 +110,8 @@
         },
         "PLACEHOLDER": {
           "AGENT": "Leita að þjónustufulltrúum",
-          "TEAM": "Leita að teymum"
+          "TEAM": "Leita að teymum",
+          "INPUT": "Search for agents"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/is/conversation.json b/app/javascript/dashboard/i18n/locale/is/conversation.json
index be11937e3..e65177bae 100644
--- a/app/javascript/dashboard/i18n/locale/is/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/is/conversation.json
@@ -37,6 +37,7 @@
     "UNKNOWN_FILE_TYPE": "Óþekkt skrá",
     "SAVE_CONTACT": "Save",
     "UPLOADING_ATTACHMENTS": "Hleður upp viðhengi...",
+    "REPLIED_TO_STORY": "Replied to your story",
     "SUCCESS_DELETE_MESSAGE": "Skilaboðum eytt",
     "FAIL_DELETE_MESSSAGE": "Gat ekki eytt skilaboðum! Reynið aftur",
     "NO_RESPONSE": "Ekkert svar",
@@ -66,6 +67,23 @@
         "NEXT_WEEK": "Next week"
       }
     },
+    "PRIORITY": {
+      "TITLE": "Priority",
+      "OPTIONS": {
+        "NONE": "Enginn",
+        "URGENT": "Urgent",
+        "HIGH": "High",
+        "MEDIUM": "Medium",
+        "LOW": "Low"
+      },
+      "CHANGE_PRIORITY": {
+        "SELECT_PLACEHOLDER": "Enginn",
+        "INPUT_PLACEHOLDER": "Select priority",
+        "NO_RESULTS": "Engar niðurstöður fundust",
+        "SUCCESSFUL": "Changed priority of conversation id %{conversationId} to %{priority}",
+        "FAILED": "Couldn't change priority. Please try again."
+      }
+    },
     "CARD_CONTEXT_MENU": {
       "PENDING": "Mark as pending",
       "RESOLVED": "Mark as resolved",
diff --git a/app/javascript/dashboard/i18n/locale/is/generalSettings.json b/app/javascript/dashboard/i18n/locale/is/generalSettings.json
index ea1ff86a2..67e4c7201 100644
--- a/app/javascript/dashboard/i18n/locale/is/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/is/generalSettings.json
@@ -101,6 +101,7 @@
       "REPORTS": "Skýrslur",
       "CONVERSATION": "Samtal",
       "CHANGE_ASSIGNEE": "Breyta úthlutun",
+      "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Breyta Teymi",
       "ADD_LABEL": "Merkja samtalið",
       "REMOVE_LABEL": "Fjarlægja merki af samtali",
@@ -126,6 +127,7 @@
       "GO_TO_NOTIFICATIONS": "Opna Tilkynningar",
       "ADD_LABELS_TO_CONVERSATION": "Merkja samtalið",
       "ASSIGN_AN_AGENT": "Úthluta á þjónustufulltrúa",
+      "ASSIGN_PRIORITY": "Assign priority",
       "ASSIGN_A_TEAM": "Úthluta á teymi",
       "MUTE_CONVERSATION": "Þagga samtal",
       "UNMUTE_CONVERSATION": "Afþagga samtal",
diff --git a/app/javascript/dashboard/i18n/locale/is/helpCenter.json b/app/javascript/dashboard/i18n/locale/is/helpCenter.json
index c32cd653d..81e113c99 100644
--- a/app/javascript/dashboard/i18n/locale/is/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/is/helpCenter.json
@@ -30,7 +30,7 @@
     },
     "ARTICLE_EDITOR": {
       "IMAGE_UPLOAD": {
-        "TITLE": "Upload image",
+        "TITLE": "Hlaða upp mynd",
         "UPLOADING": "Hleður upp...",
         "SUCCESS": "Image uploaded successfully",
         "ERROR": "Error while uploading image",
diff --git a/app/javascript/dashboard/i18n/locale/is/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/is/inboxMgmt.json
index 86c59b96b..6dcfe152b 100644
--- a/app/javascript/dashboard/i18n/locale/is/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/is/inboxMgmt.json
@@ -482,6 +482,13 @@
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
+    "HELP_CENTER": {
+      "LABEL": "Help Center",
+      "PLACEHOLDER": "Select Help Center",
+      "SELECT_PLACEHOLDER": "Select Help Center",
+      "REMOVE": "Remove Help Center",
+      "SUB_TEXT": "Attach a Help Center with the inbox"
+    },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
       "MAX_ASSIGNMENT_LIMIT_RANGE_ERROR": "Please enter a value greater than 0",
diff --git a/app/javascript/dashboard/i18n/locale/is/integrations.json b/app/javascript/dashboard/i18n/locale/is/integrations.json
index 4e3967785..b8826c657 100644
--- a/app/javascript/dashboard/i18n/locale/is/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/is/integrations.json
@@ -85,6 +85,23 @@
       "JOIN_ERROR": "There was an error joining the call, please try again",
       "CREATE_ERROR": "There was an error creating a meeting link, please try again"
     },
+    "OPEN_AI": {
+      "TITLE": "Improve With AI",
+      "SUBTITLE": "An improved reply will be generated using AI, based on your current draft.",
+      "TONE": {
+        "TITLE": "Tone",
+        "OPTIONS": {
+          "PROFESSIONAL": "Professional",
+          "FRIENDLY": "Friendly"
+        }
+      },
+      "BUTTONS": {
+        "GENERATE": "Generate",
+        "GENERATING": "Generating...",
+        "CANCEL": "Hætta við"
+      },
+      "GENERATE_ERROR": "There was an error processing the content, please try again"
+    },
     "DELETE": {
       "BUTTON_TEXT": "Eyða",
       "API": {
diff --git a/app/javascript/dashboard/i18n/locale/is/login.json b/app/javascript/dashboard/i18n/locale/is/login.json
index 06cd997da..622c97658 100644
--- a/app/javascript/dashboard/i18n/locale/is/login.json
+++ b/app/javascript/dashboard/i18n/locale/is/login.json
@@ -3,16 +3,16 @@
     "TITLE": "Login to Chatwoot",
     "EMAIL": {
       "LABEL": "Tölvupóstfang",
-      "PLACEHOLDER": "Tölvupóstfang t.d. someone@example.com"
+      "PLACEHOLDER": "example@companyname.com"
     },
     "PASSWORD": {
       "LABEL": "Lykilorð",
       "PLACEHOLDER": "Lykilorð"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Innskráning tókst",
-      "ERROR_MESSAGE": "Náði ekki að tengjast við netþjóna Woot, vinsamlegast reynið aftur",
-      "UNAUTH": "Notandanafn / lykilorð rangt. Vinsamlegast reyndu aftur"
+      "SUCCESS_MESSAGE": "Login successful",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again.",
+      "UNAUTH": "Username or password is incorrect. Please try again."
     },
     "OAUTH": {
       "GOOGLE_LOGIN": "Login with Google",
diff --git a/app/javascript/dashboard/i18n/locale/is/report.json b/app/javascript/dashboard/i18n/locale/is/report.json
index a4c60ffcf..82f98f2c3 100644
--- a/app/javascript/dashboard/i18n/locale/is/report.json
+++ b/app/javascript/dashboard/i18n/locale/is/report.json
@@ -446,7 +446,7 @@
     "AGENT_STATUS": {
       "HEADER": "Agent status",
       "ONLINE": "Online",
-      "BUSY": "Busy",
+      "BUSY": "Upptekinn",
       "OFFLINE": "Offline"
     }
   },
diff --git a/app/javascript/dashboard/i18n/locale/is/resetPassword.json b/app/javascript/dashboard/i18n/locale/is/resetPassword.json
index 5d5067e2c..cb36d45d1 100644
--- a/app/javascript/dashboard/i18n/locale/is/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/is/resetPassword.json
@@ -1,14 +1,14 @@
 {
   "RESET_PASSWORD": {
-    "TITLE": "Endurstilla lykilorð",
+    "TITLE": "Reset password",
     "EMAIL": {
       "LABEL": "Tölvupóstfang",
-      "PLACEHOLDER": "Vinsamlegast sláðu inn netfangið þitt",
-      "ERROR": "Vinsamlegast skrifaðu gilt netfang"
+      "PLACEHOLDER": "Vinsamlegast sláðu inn netfangið þitt.",
+      "ERROR": "Vinsamlegast skrifaðu gilt netfang."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Tengill til að endurstilla lykilorð hefur verið sendur á netfangið þitt",
-      "ERROR_MESSAGE": "Náði ekki að tengjast við netþjóna Woot, vinsamlegast reynið aftur"
+      "SUCCESS_MESSAGE": "Tengill til að endurstilla lykilorð hefur verið sendur á netfangið þitt.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Senda"
   }
diff --git a/app/javascript/dashboard/i18n/locale/is/search.json b/app/javascript/dashboard/i18n/locale/is/search.json
index 6ea79ef5f..b7529bebb 100644
--- a/app/javascript/dashboard/i18n/locale/is/search.json
+++ b/app/javascript/dashboard/i18n/locale/is/search.json
@@ -14,8 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
-    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
+    "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/is/setNewPassword.json b/app/javascript/dashboard/i18n/locale/is/setNewPassword.json
index af28dc081..e1969d343 100644
--- a/app/javascript/dashboard/i18n/locale/is/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/is/setNewPassword.json
@@ -1,19 +1,19 @@
 {
   "SET_NEW_PASSWORD": {
-    "TITLE": "Set New Password",
+    "TITLE": "Set new password",
     "PASSWORD": {
       "LABEL": "Lykilorð",
       "PLACEHOLDER": "Lykilorð",
-      "ERROR": "Password is too short"
+      "ERROR": "Lykilorið er of stutt."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirm Password",
+      "LABEL": "Confirm password",
       "PLACEHOLDER": "Confirm Password",
-      "ERROR": "Passwords do not match"
+      "ERROR": "Passwords do not match."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Successfully changed the password",
-      "ERROR_MESSAGE": "Náði ekki að tengjast við netþjóna Woot, vinsamlegast reynið aftur"
+      "SUCCESS_MESSAGE": "Successfully changed the password.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "CAPTCHA": {
       "ERROR": "Staðfesting rann út. Vinsamlegast leystu captcha aftur."
diff --git a/app/javascript/dashboard/i18n/locale/is/settings.json b/app/javascript/dashboard/i18n/locale/is/settings.json
index 6363bfe88..e85819bc1 100644
--- a/app/javascript/dashboard/i18n/locale/is/settings.json
+++ b/app/javascript/dashboard/i18n/locale/is/settings.json
@@ -1,8 +1,8 @@
 {
   "PROFILE_SETTINGS": {
-    "LINK": "Profile Settings",
-    "TITLE": "Profile Settings",
-    "BTN_TEXT": "Update Profile",
+    "LINK": "Stillingar Prófíls",
+    "TITLE": "Stillingar Prófíls",
+    "BTN_TEXT": "Uppfæra Prófíl",
     "DELETE_AVATAR": "Eyða mynd",
     "AVATAR_DELETE_SUCCESS": "Avatar has been deleted successfully",
     "AVATAR_DELETE_FAILED": "Villa kom upp við að eyða notendamynd, vinsamlegast reyndu aftur",
@@ -10,17 +10,17 @@
     "PASSWORD_UPDATE_SUCCESS": "Lykilorðinu þínu hefur verið breytt",
     "AFTER_EMAIL_CHANGED": "Prófíllinn þinn hefur verið uppfærður, vinsamlegast skráðu þig inn aftur þar sem innskráningarskilríkjum þínum er breytt",
     "FORM": {
-      "AVATAR": "Profile Image",
+      "AVATAR": "Prófílmynd",
       "ERROR": "Vinsamlegast lagfærðu villurnar",
-      "REMOVE_IMAGE": "Remove",
-      "UPLOAD_IMAGE": "Upload image",
-      "UPDATE_IMAGE": "Update image",
+      "REMOVE_IMAGE": "Fjarlægja",
+      "UPLOAD_IMAGE": "Hlaða upp mynd",
+      "UPDATE_IMAGE": "Uppfæra mynd",
       "PROFILE_SECTION": {
-        "TITLE": "Profile",
+        "TITLE": "Prófíll",
         "NOTE": "Netfangið þitt er auðkenni þitt og er notað til að skrá þig inn."
       },
       "SEND_MESSAGE": {
-        "TITLE": "Hotkey to send messages",
+        "TITLE": "Flýtilykill til að senda skilaboð",
         "NOTE": "Þú getur valið flýtilykil (annaðhvort Enter eða Cmd/Ctrl+Enter) eftir því hvernig þú vilt skrifa.",
         "UPDATE_SUCCESS": "Stillingar þínar hafa verið uppfærðar",
         "CARD": {
@@ -35,46 +35,46 @@
         }
       },
       "MESSAGE_SIGNATURE_SECTION": {
-        "TITLE": "Personal message signature",
+        "TITLE": "Persónuleg undirskrift á skilaboðum",
         "NOTE": "Búðu til persónulega skilaboðaundirskrift sem verður bætt við öll skilaboðin sem þú sendir úr pósthólfinu þínu. Notaðu innihaldsríka ritilinn til að búa til mjög persónulega undirskrift.",
-        "BTN_TEXT": "Save message signature",
-        "API_ERROR": "Couldn't save signature! Try again",
-        "API_SUCCESS": "Signature saved successfully"
+        "BTN_TEXT": "Vista undirskrift á skilaboðum",
+        "API_ERROR": "Gat ekki vistað undirskrift! Reyndu aftur",
+        "API_SUCCESS": "Undirskrift var vistuð"
       },
       "MESSAGE_SIGNATURE": {
-        "LABEL": "Message Signature",
-        "ERROR": "Message Signature cannot be empty",
+        "LABEL": "Undirskrift skilaboða",
+        "ERROR": "Undirskrift skilaboða getur ekki verið tóm",
         "PLACEHOLDER": "Settu inn persónulegu skilaboðaundirskriftina þína hér."
       },
       "PASSWORD_SECTION": {
         "TITLE": "Lykilorð",
         "NOTE": "Að uppfæra lykilorðið þitt myndi endurstilla innskráningar þínar í mörgum tækjum.",
-        "BTN_TEXT": "Change password"
+        "BTN_TEXT": "Breyta lykilorði"
       },
       "ACCESS_TOKEN": {
-        "TITLE": "Access Token",
+        "TITLE": "Aðgangslykill",
         "NOTE": "Þetta token er hægt að nota ef þú ert að byggja upp API byggða samþættingu"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
-        "TITLE": "Audio Notifications",
+        "TITLE": "Hljóðtilkynningar",
         "NOTE": "Virkjaðu hljóðtilkynningar á mælaborðinu fyrir ný skilaboð og samtöl.",
         "ALERT_TYPE": {
           "TITLE": "Alert events:",
           "NONE": "Enginn",
-          "ASSIGNED": "Assigned Conversations",
-          "ALL_CONVERSATIONS": "All Conversations"
+          "ASSIGNED": "Úthlutuð Samtöl",
+          "ALL_CONVERSATIONS": "Öll Samtöl"
         },
         "DEFAULT_TONE": {
           "TITLE": "Alert tone:"
         },
         "CONDITIONS": {
           "TITLE": "Alert conditions:",
-          "CONDITION_ONE": "Send audio alerts only if the browser window is not active",
+          "CONDITION_ONE": "Senda hljóðviðvaranir aðeins ef vafraglugginn er ekki virkur",
           "CONDITION_TWO": "Send alerts every 30s until all the assigned conversations are read"
         }
       },
       "EMAIL_NOTIFICATIONS_SECTION": {
-        "TITLE": "Email Notifications",
+        "TITLE": "Tilkynningar í tölvupósti",
         "NOTE": "Uppfærðu stillingar þínar fyrir tölvupósttilkynningar hér",
         "CONVERSATION_ASSIGNMENT": "Senda tilkynningar í tölvupósti þegar mér er úthlutað samtali",
         "CONVERSATION_CREATION": "Senda tilkynningar í tölvupósti þegar nýtt samtal er stofnað",
@@ -98,7 +98,7 @@
         "REQUEST_PUSH": "Enable push notifications"
       },
       "PROFILE_IMAGE": {
-        "LABEL": "Profile Image"
+        "LABEL": "Prófílmynd"
       },
       "NAME": {
         "LABEL": "Your full name",
@@ -114,40 +114,40 @@
         "LABEL": "Availability",
         "STATUSES_LIST": [
           "Online",
-          "Busy",
+          "Upptekinn",
           "Offline"
         ],
         "SET_AVAILABILITY_SUCCESS": "Availability has been set successfully",
         "SET_AVAILABILITY_ERROR": "Couldn't set availability, please try again"
       },
       "EMAIL": {
-        "LABEL": "Your email address",
+        "LABEL": "Þitt tölvupóstfang",
         "ERROR": "Vinsamlegast skrifaðu gilt netfang",
         "PLACEHOLDER": "Vinsamlegast sláðu inn netfangið þitt, þetta myndi birtast í samtölum"
       },
       "CURRENT_PASSWORD": {
-        "LABEL": "Current password",
+        "LABEL": "Núverandi lykilorð",
         "ERROR": "Vinsamlegast sláðu inn núverandi lykilorð",
         "PLACEHOLDER": "Vinsamlegast sláðu inn núverandi lykilorð"
       },
       "PASSWORD": {
-        "LABEL": "New password",
+        "LABEL": "Nýtt lykilorð",
         "ERROR": "Vinsamlegast sláðu inn lykilorð 6 stafa lengd eða meira",
         "PLACEHOLDER": "Vinsamlegast sláðu inn nýja lykilorðið"
       },
       "PASSWORD_CONFIRMATION": {
-        "LABEL": "Confirm new password",
+        "LABEL": "Staðfesta nýtt lykilorð",
         "ERROR": "Staðfest lykilorð ætti að passa við lykilorðið",
         "PLACEHOLDER": "Vinsamlegasts staðfestu nýja lykilorðið"
       }
     }
   },
   "SIDEBAR_ITEMS": {
-    "CHANGE_AVAILABILITY_STATUS": "Change",
+    "CHANGE_AVAILABILITY_STATUS": "Breyta",
     "CHANGE_ACCOUNTS": "Switch Account",
     "CONTACT_SUPPORT": "Contact Support",
     "SELECTOR_SUBTITLE": "Veldu reikning úr eftirfarandi lista",
-    "PROFILE_SETTINGS": "Profile Settings",
+    "PROFILE_SETTINGS": "Stillingar Prófíls",
     "KEYBOARD_SHORTCUTS": "Keyboard Shortcuts",
     "SUPER_ADMIN_CONSOLE": "Super Admin Console",
     "LOGOUT": "Logout"
@@ -193,7 +193,7 @@
     "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
     "SWITCH": "Switch",
     "CONVERSATIONS": "Samtöl",
-    "ALL_CONVERSATIONS": "All Conversations",
+    "ALL_CONVERSATIONS": "Öll Samtöl",
     "MENTIONED_CONVERSATIONS": "Mentions",
     "PARTICIPATING_CONVERSATIONS": "Participating",
     "UNATTENDED_CONVERSATIONS": "Unattended",
@@ -208,7 +208,7 @@
     "NOTIFICATIONS": "Skilaboð",
     "CANNED_RESPONSES": "Stöðluð svör",
     "INTEGRATIONS": "Integrations",
-    "PROFILE_SETTINGS": "Profile Settings",
+    "PROFILE_SETTINGS": "Stillingar Prófíls",
     "ACCOUNT_SETTINGS": "Account Settings",
     "APPLICATIONS": "Applications",
     "LABELS": "Labels",
@@ -265,7 +265,7 @@
       "BUTTON_TXT": "Go to the billing portal"
     },
     "CHAT_WITH_US": {
-      "TITLE": "Need help?",
+      "TITLE": "Vantar þig aðstoð?",
       "DESCRIPTION": "Stendur þú frammi fyrir einhverjum vandamálum í innheimtu? Við erum hér til að hjálpa.",
       "BUTTON_TXT": "Spjallaðu við okkur"
     },
@@ -274,7 +274,7 @@
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh ó! Við fundum enga Chatwoot reikninga. Vinsamlegast búðu til nýjan reikning til að halda áfram.",
     "NEW_ACCOUNT": "New Account",
-    "SELECTOR_SUBTITLE": "Create a new account",
+    "SELECTOR_SUBTITLE": "Stofna nýjan aðgang",
     "API": {
       "SUCCESS_MESSAGE": "Account created successfully",
       "EXIST_MESSAGE": "Account already exists",
@@ -291,7 +291,7 @@
   "KEYBOARD_SHORTCUTS": {
     "TOGGLE_MODAL": "View all shortcuts",
     "TITLE": {
-      "OPEN_CONVERSATION": "Open conversation",
+      "OPEN_CONVERSATION": "Opna samtal",
       "RESOLVE_AND_NEXT": "Resolve and move to next",
       "NAVIGATE_DROPDOWN": "Navigate dropdown items",
       "RESOLVE_CONVERSATION": "Resolve Conversation",
diff --git a/app/javascript/dashboard/i18n/locale/is/signup.json b/app/javascript/dashboard/i18n/locale/is/signup.json
index 7aeb485eb..ec290250f 100644
--- a/app/javascript/dashboard/i18n/locale/is/signup.json
+++ b/app/javascript/dashboard/i18n/locale/is/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Nafn fyrirtækis",
-      "PLACEHOLDER": "Sláðu inn nafn fyrirtækisins þíns. Dæmi: Wayne Enterprises",
-      "ERROR": "Nafn fyrirtækis er of stutt"
+      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
+      "ERROR": "Nafn fyrirtækis er of stutt."
     },
     "FULL_NAME": {
       "LABEL": "Fullt nafn",
-      "PLACEHOLDER": "Skráðu inn fullt nafn. Dæmi: Bruce Wayne",
-      "ERROR": "Fullt nafn er of stutt"
+      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
+      "ERROR": "Fullt nafn er of stutt."
     },
     "EMAIL": {
       "LABEL": "Vinnu netfang",
-      "PLACEHOLDER": "Sláðu inn vinnunetfangið þitt. td: bruce@wayne.enterprises",
-      "ERROR": "Vinsamlegast sláðu inn gilt vinnu netfang"
+      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
+      "ERROR": "Vinsamlegast sláðu inn gilt vinnu netfang."
     },
     "PASSWORD": {
       "LABEL": "Lykilorð",
       "PLACEHOLDER": "Lykilorð",
-      "ERROR": "Lykilorið er of stutt",
-      "IS_INVALID_PASSWORD": "Lykilorð ætti að innihalda að minnsta kosti 1 hástaf, 1 lágstaf, 1 tölustaf og 1 tákn"
+      "ERROR": "Lykilorið er of stutt.",
+      "IS_INVALID_PASSWORD": "Lykilorð ætti að innihalda að minnsta kosti 1 hástaf, 1 lágstaf, 1 tölustaf og 1 tákn."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Staðfesta Lykilorð",
-      "PLACEHOLDER": "Staðfesta Lykilorð",
-      "ERROR": "Lykilorðin stemma ekki"
+      "LABEL": "Confirm password",
+      "PLACEHOLDER": "Confirm password",
+      "ERROR": "Lykilorðin stemma ekki."
     },
     "API": {
       "SUCCESS_MESSAGE": "Nýskráning tókst",
-      "ERROR_MESSAGE": "Náði ekki að tengjast við netþjóna Woot, vinsamlegast reynið aftur"
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Create account",
     "HAVE_AN_ACCOUNT": "Ertu nú þegar með aðgang?"
diff --git a/app/javascript/dashboard/i18n/locale/is/teamsSettings.json b/app/javascript/dashboard/i18n/locale/is/teamsSettings.json
index abc333ac6..6bb916df0 100644
--- a/app/javascript/dashboard/i18n/locale/is/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/is/teamsSettings.json
@@ -1,27 +1,27 @@
 {
   "TEAMS_SETTINGS": {
-    "NEW_TEAM": "Create new team",
-    "HEADER": "Teams",
+    "NEW_TEAM": "Stofna nýtt teymi",
+    "HEADER": "Teymi",
     "SIDEBAR_TXT": "<p><b>Teymi</b></p> <p>Teymi leyfa þér að skipuleggja þjónustufulltrúa þína í hópa út frá ábyrgð þeirra. <br /> Þjónustufulltrúi getur verið hluti af mörgum teymum. Þú getur úthlutað samtölum á teymi þegar þú ert að vinna í samvinnu. </p>",
     "LIST": {
       "404": "Það eru engin teymi til á þessum reikningi.",
-      "EDIT_TEAM": "Edit team"
+      "EDIT_TEAM": "Breyta teymi"
     },
     "CREATE_FLOW": {
       "CREATE": {
-        "TITLE": "Create a new team",
+        "TITLE": "Stofna nýtt teymi",
         "DESC": "Bættu titli og lýsingu við nýja teymið þitt."
       },
       "AGENTS": {
-        "BUTTON_TEXT": "Add agents to team",
-        "TITLE": "Add agents to team - %{teamName}",
+        "BUTTON_TEXT": "Bæta þjónustufulltrúum við teymið",
+        "TITLE": "Bæta þjónustufulltrúa við teymið - %{teamName}",
         "DESC": "Bættu þjónustufullrtúum við nýstofnað teymið þitt. Þetta gerir þér kleift að vinna sem teymi í samtölum, fá tilkynningu um nýja atburði í sama samtali."
       },
       "WIZARD": [
         {
-          "title": "Create",
+          "title": "Stofna",
           "route": "settings_teams_new",
-          "body": "Create a new team of agents."
+          "body": "Stofna nýtt teymi af þjónustufulltrúum."
         },
         {
           "title": "Bæta við þjónustufulltrúa",
@@ -43,7 +43,7 @@
       },
       "AGENTS": {
         "BUTTON_TEXT": "Update agents in team",
-        "TITLE": "Add agents to team - %{teamName}",
+        "TITLE": "Bæta þjónustufulltrúa við teymið - %{teamName}",
         "DESC": "Bættu þjónustufulltrúum við nýstofnaða teymið þitt. Allir þjónustufulltrúar sem bætt er við verða látnir vita þegar samtali er úthlutað þessu teymi."
       },
       "WIZARD": [
@@ -77,7 +77,7 @@
       "SELECTED_COUNT": "%{selected} af %{total} þjónustufulltrúum valdir."
     },
     "ADD": {
-      "TITLE": "Add agents to team - %{teamName}",
+      "TITLE": "Bæta þjónustufulltrúa við teymið - %{teamName}",
       "DESC": "Bættu þjónustufullrtúum við nýstofnað teymið þitt. Þetta gerir þér kleift að vinna sem teymi í samtölum, fá tilkynningu um nýja atburði í sama samtali.",
       "SELECT": "select",
       "SELECT_ALL": "select all agents",
diff --git a/app/javascript/dashboard/i18n/locale/it/advancedFilters.json b/app/javascript/dashboard/i18n/locale/it/advancedFilters.json
index 5be8ea973..8f94e4915 100644
--- a/app/javascript/dashboard/i18n/locale/it/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/it/advancedFilters.json
@@ -38,6 +38,7 @@
       "CAMPAIGN_NAME": "Nome campagna",
       "LABELS": "Etichette",
       "BROWSER_LANGUAGE": "Lingua del browser",
+      "PRIORITY": "Priority",
       "COUNTRY_NAME": "Nome del paese",
       "REFERER_LINK": "Link referente",
       "CUSTOM_ATTRIBUTE_LIST": "Elenco",
diff --git a/app/javascript/dashboard/i18n/locale/it/agentMgmt.json b/app/javascript/dashboard/i18n/locale/it/agentMgmt.json
index b7d72cbe7..01385d110 100644
--- a/app/javascript/dashboard/i18n/locale/it/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/it/agentMgmt.json
@@ -110,7 +110,8 @@
         },
         "PLACEHOLDER": {
           "AGENT": "Cerca agenti",
-          "TEAM": "Cerca team"
+          "TEAM": "Cerca team",
+          "INPUT": "Search for agents"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/it/conversation.json b/app/javascript/dashboard/i18n/locale/it/conversation.json
index ccb5dbd4d..4f1ca6903 100644
--- a/app/javascript/dashboard/i18n/locale/it/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/it/conversation.json
@@ -37,6 +37,7 @@
     "UNKNOWN_FILE_TYPE": "File sconosciuto",
     "SAVE_CONTACT": "Save",
     "UPLOADING_ATTACHMENTS": "Caricamento allegati...",
+    "REPLIED_TO_STORY": "Replied to your story",
     "SUCCESS_DELETE_MESSAGE": "Messaggio eliminato con successo",
     "FAIL_DELETE_MESSSAGE": "Impossibile eliminare il messaggio! Riprova",
     "NO_RESPONSE": "Nessuna risposta",
@@ -66,6 +67,23 @@
         "NEXT_WEEK": "Prossima settimana"
       }
     },
+    "PRIORITY": {
+      "TITLE": "Priority",
+      "OPTIONS": {
+        "NONE": "Nessuno",
+        "URGENT": "Urgent",
+        "HIGH": "High",
+        "MEDIUM": "Medium",
+        "LOW": "Low"
+      },
+      "CHANGE_PRIORITY": {
+        "SELECT_PLACEHOLDER": "Nessuno",
+        "INPUT_PLACEHOLDER": "Select priority",
+        "NO_RESULTS": "Nessun risultato trovato",
+        "SUCCESSFUL": "Changed priority of conversation id %{conversationId} to %{priority}",
+        "FAILED": "Couldn't change priority. Please try again."
+      }
+    },
     "CARD_CONTEXT_MENU": {
       "PENDING": "Segna come in sospeso",
       "RESOLVED": "Contrassegna come risolto",
diff --git a/app/javascript/dashboard/i18n/locale/it/generalSettings.json b/app/javascript/dashboard/i18n/locale/it/generalSettings.json
index 7ac365a8b..317a77b00 100644
--- a/app/javascript/dashboard/i18n/locale/it/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/it/generalSettings.json
@@ -101,6 +101,7 @@
       "REPORTS": "Rapporti",
       "CONVERSATION": "Conversazioni",
       "CHANGE_ASSIGNEE": "Cambia assegnatario",
+      "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Cambia Team",
       "ADD_LABEL": "Aggiungi etichetta alla conversazione",
       "REMOVE_LABEL": "Rimuovi etichetta dalla conversazione",
@@ -126,6 +127,7 @@
       "GO_TO_NOTIFICATIONS": "Vai alle notifiche",
       "ADD_LABELS_TO_CONVERSATION": "Aggiungi etichetta alla conversazione",
       "ASSIGN_AN_AGENT": "Assegna un agente",
+      "ASSIGN_PRIORITY": "Assign priority",
       "ASSIGN_A_TEAM": "Assegna un team",
       "MUTE_CONVERSATION": "Silenzia conversazione",
       "UNMUTE_CONVERSATION": "Riattiva conversazione",
diff --git a/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json
index 2c15ef8f8..f3cc154f5 100644
--- a/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json
@@ -482,6 +482,13 @@
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
+    "HELP_CENTER": {
+      "LABEL": "Help Center",
+      "PLACEHOLDER": "Select Help Center",
+      "SELECT_PLACEHOLDER": "Select Help Center",
+      "REMOVE": "Remove Help Center",
+      "SUB_TEXT": "Attach a Help Center with the inbox"
+    },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Limite assegnazione automatica",
       "MAX_ASSIGNMENT_LIMIT_RANGE_ERROR": "Inserisci un valore maggiore di 0",
diff --git a/app/javascript/dashboard/i18n/locale/it/integrations.json b/app/javascript/dashboard/i18n/locale/it/integrations.json
index 09996a7cf..09ebb59de 100644
--- a/app/javascript/dashboard/i18n/locale/it/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/it/integrations.json
@@ -85,6 +85,23 @@
       "JOIN_ERROR": "There was an error joining the call, please try again",
       "CREATE_ERROR": "There was an error creating a meeting link, please try again"
     },
+    "OPEN_AI": {
+      "TITLE": "Improve With AI",
+      "SUBTITLE": "An improved reply will be generated using AI, based on your current draft.",
+      "TONE": {
+        "TITLE": "Tone",
+        "OPTIONS": {
+          "PROFESSIONAL": "Professional",
+          "FRIENDLY": "Friendly"
+        }
+      },
+      "BUTTONS": {
+        "GENERATE": "Generate",
+        "GENERATING": "Generating...",
+        "CANCEL": "annulla"
+      },
+      "GENERATE_ERROR": "There was an error processing the content, please try again"
+    },
     "DELETE": {
       "BUTTON_TEXT": "Elimina",
       "API": {
diff --git a/app/javascript/dashboard/i18n/locale/it/login.json b/app/javascript/dashboard/i18n/locale/it/login.json
index a4d43ed0b..ce6435422 100644
--- a/app/javascript/dashboard/i18n/locale/it/login.json
+++ b/app/javascript/dashboard/i18n/locale/it/login.json
@@ -3,16 +3,16 @@
     "TITLE": "Accedi a Chatwoot",
     "EMAIL": {
       "LABEL": "Email",
-      "PLACEHOLDER": "Email es.: qualcuno@esempio.com"
+      "PLACEHOLDER": "example@companyname.com"
     },
     "PASSWORD": {
       "LABEL": "Password",
       "PLACEHOLDER": "Password"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Accesso riuscito",
-      "ERROR_MESSAGE": "Impossibile connettersi al server Woot, riprova più tardi",
-      "UNAUTH": "Nome utente / Password errati. Riprova"
+      "SUCCESS_MESSAGE": "Login successful",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again.",
+      "UNAUTH": "Username or password is incorrect. Please try again."
     },
     "OAUTH": {
       "GOOGLE_LOGIN": "Login with Google",
diff --git a/app/javascript/dashboard/i18n/locale/it/resetPassword.json b/app/javascript/dashboard/i18n/locale/it/resetPassword.json
index fadbcc482..004fe7b6f 100644
--- a/app/javascript/dashboard/i18n/locale/it/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/it/resetPassword.json
@@ -1,14 +1,14 @@
 {
   "RESET_PASSWORD": {
-    "TITLE": "Reimposta la password",
+    "TITLE": "Reimposta password",
     "EMAIL": {
       "LABEL": "Email",
-      "PLACEHOLDER": "Inserisci la tua email",
-      "ERROR": "Inserisci un indirizzo email valido"
+      "PLACEHOLDER": "Inserisci il tuo indirizzo email.",
+      "ERROR": "Inserisci un indirizzo email valido."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Il link per reimpostare la password è stato inviato alla tua email",
-      "ERROR_MESSAGE": "Impossibile connettersi al server Woot, riprova più tardi"
+      "SUCCESS_MESSAGE": "Il link per reimpostare la password è stato inviato alla tua email.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Invia"
   }
diff --git a/app/javascript/dashboard/i18n/locale/it/search.json b/app/javascript/dashboard/i18n/locale/it/search.json
index 240306055..c05eeca37 100644
--- a/app/javascript/dashboard/i18n/locale/it/search.json
+++ b/app/javascript/dashboard/i18n/locale/it/search.json
@@ -14,8 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
-    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
+    "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/it/setNewPassword.json b/app/javascript/dashboard/i18n/locale/it/setNewPassword.json
index 50cbee401..fe066733b 100644
--- a/app/javascript/dashboard/i18n/locale/it/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/it/setNewPassword.json
@@ -1,19 +1,19 @@
 {
   "SET_NEW_PASSWORD": {
-    "TITLE": "Imposta una nuova password",
+    "TITLE": "Set new password",
     "PASSWORD": {
       "LABEL": "Password",
       "PLACEHOLDER": "Password",
-      "ERROR": "Password troppo corta"
+      "ERROR": "Password troppo corta."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Conferma password",
+      "LABEL": "Confirm password",
       "PLACEHOLDER": "Conferma password",
-      "ERROR": "Le password non corrispondono"
+      "ERROR": "Le password non corrispondono."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Password cambiata con successo",
-      "ERROR_MESSAGE": "Impossibile connettersi al server Woot, riprova più tardi"
+      "SUCCESS_MESSAGE": "Password cambiata con successo.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "CAPTCHA": {
       "ERROR": "Verifica scaduta. Si prega di risolvere nuovamente il captcha."
diff --git a/app/javascript/dashboard/i18n/locale/it/signup.json b/app/javascript/dashboard/i18n/locale/it/signup.json
index b230554ee..7a04fe9a2 100644
--- a/app/javascript/dashboard/i18n/locale/it/signup.json
+++ b/app/javascript/dashboard/i18n/locale/it/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Company name",
-      "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
-      "ERROR": "Company name is too short"
+      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
+      "ERROR": "Company name is too short."
     },
     "FULL_NAME": {
       "LABEL": "Nome completo",
-      "PLACEHOLDER": "Inserisci il tuo nome completo, es.: Bruce Wayne",
-      "ERROR": "Nome account troppo corto"
+      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
+      "ERROR": "Nome account troppo corto."
     },
     "EMAIL": {
       "LABEL": "Email di lavoro",
-      "PLACEHOLDER": "Inserisci il tuo indirizzo email di lavoro. es.: bruce@wayne.enterprises",
-      "ERROR": "Please enter a valid work email address"
+      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
+      "ERROR": "Please enter a valid work email address."
     },
     "PASSWORD": {
       "LABEL": "Password",
       "PLACEHOLDER": "Password",
-      "ERROR": "Password troppo corta",
-      "IS_INVALID_PASSWORD": "La password dovrebbe contenere almeno 1 lettera maiuscola, 1 lettera minuscola, 1 numero e 1 carattere speciale"
+      "ERROR": "Password troppo corta.",
+      "IS_INVALID_PASSWORD": "La password dovrebbe contenere almeno 1 lettera maiuscola, 1 lettera minuscola, 1 numero e 1 carattere speciale."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Conferma password",
-      "PLACEHOLDER": "Conferma password",
-      "ERROR": "La password non corrisponde"
+      "LABEL": "Confirm password",
+      "PLACEHOLDER": "Confirm password",
+      "ERROR": "La password non corrisponde."
     },
     "API": {
       "SUCCESS_MESSAGE": "Registrazione riuscita",
-      "ERROR_MESSAGE": "Impossibile connettersi al server Woot, riprova più tardi"
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Create account",
     "HAVE_AN_ACCOUNT": "Hai già un account?"
diff --git a/app/javascript/dashboard/i18n/locale/ja/advancedFilters.json b/app/javascript/dashboard/i18n/locale/ja/advancedFilters.json
index 65deca910..e5e114e01 100644
--- a/app/javascript/dashboard/i18n/locale/ja/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/ja/advancedFilters.json
@@ -38,6 +38,7 @@
       "CAMPAIGN_NAME": "キャンペーンの名前",
       "LABELS": "ラベル",
       "BROWSER_LANGUAGE": "ブラウザの言語",
+      "PRIORITY": "Priority",
       "COUNTRY_NAME": "国名",
       "REFERER_LINK": "参照者のリンク",
       "CUSTOM_ATTRIBUTE_LIST": "リスト",
diff --git a/app/javascript/dashboard/i18n/locale/ja/agentMgmt.json b/app/javascript/dashboard/i18n/locale/ja/agentMgmt.json
index 9769712ae..2d3c7d272 100644
--- a/app/javascript/dashboard/i18n/locale/ja/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ja/agentMgmt.json
@@ -110,7 +110,8 @@
         },
         "PLACEHOLDER": {
           "AGENT": "Search agents",
-          "TEAM": "Search teams"
+          "TEAM": "Search teams",
+          "INPUT": "Search for agents"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/ja/conversation.json b/app/javascript/dashboard/i18n/locale/ja/conversation.json
index faf331d28..ce085671c 100644
--- a/app/javascript/dashboard/i18n/locale/ja/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ja/conversation.json
@@ -37,6 +37,7 @@
     "UNKNOWN_FILE_TYPE": "不明なファイル",
     "SAVE_CONTACT": "Save",
     "UPLOADING_ATTACHMENTS": "添付ファイルをアップロード中...",
+    "REPLIED_TO_STORY": "Replied to your story",
     "SUCCESS_DELETE_MESSAGE": "メッセージの削除に成功",
     "FAIL_DELETE_MESSSAGE": "メッセージを削除できませんでした！もう一度お試しください",
     "NO_RESPONSE": "No response",
@@ -66,6 +67,23 @@
         "NEXT_WEEK": "次週"
       }
     },
+    "PRIORITY": {
+      "TITLE": "Priority",
+      "OPTIONS": {
+        "NONE": "該当なし",
+        "URGENT": "Urgent",
+        "HIGH": "High",
+        "MEDIUM": "Medium",
+        "LOW": "Low"
+      },
+      "CHANGE_PRIORITY": {
+        "SELECT_PLACEHOLDER": "該当なし",
+        "INPUT_PLACEHOLDER": "Select priority",
+        "NO_RESULTS": "No results found",
+        "SUCCESSFUL": "Changed priority of conversation id %{conversationId} to %{priority}",
+        "FAILED": "Couldn't change priority. Please try again."
+      }
+    },
     "CARD_CONTEXT_MENU": {
       "PENDING": "保留としてマークする",
       "RESOLVED": "解決済みとしてマークする",
diff --git a/app/javascript/dashboard/i18n/locale/ja/generalSettings.json b/app/javascript/dashboard/i18n/locale/ja/generalSettings.json
index 194d79dad..35fb9504e 100644
--- a/app/javascript/dashboard/i18n/locale/ja/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ja/generalSettings.json
@@ -101,6 +101,7 @@
       "REPORTS": "レポート",
       "CONVERSATION": "Conversation",
       "CHANGE_ASSIGNEE": "Change Assignee",
+      "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Change Team",
       "ADD_LABEL": "Add label to the conversation",
       "REMOVE_LABEL": "Remove label from the conversation",
@@ -126,6 +127,7 @@
       "GO_TO_NOTIFICATIONS": "Go to Notifications",
       "ADD_LABELS_TO_CONVERSATION": "Add label to the conversation",
       "ASSIGN_AN_AGENT": "Assign an agent",
+      "ASSIGN_PRIORITY": "Assign priority",
       "ASSIGN_A_TEAM": "Assign a team",
       "MUTE_CONVERSATION": "Mute conversation",
       "UNMUTE_CONVERSATION": "Unmute conversation",
diff --git a/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json
index ce1e994a9..83323ba93 100644
--- a/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json
@@ -482,6 +482,13 @@
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
+    "HELP_CENTER": {
+      "LABEL": "Help Center",
+      "PLACEHOLDER": "Select Help Center",
+      "SELECT_PLACEHOLDER": "Select Help Center",
+      "REMOVE": "Remove Help Center",
+      "SUB_TEXT": "Attach a Help Center with the inbox"
+    },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
       "MAX_ASSIGNMENT_LIMIT_RANGE_ERROR": "Please enter a value greater than 0",
diff --git a/app/javascript/dashboard/i18n/locale/ja/integrations.json b/app/javascript/dashboard/i18n/locale/ja/integrations.json
index 09e2e50b6..fd2ad9a61 100644
--- a/app/javascript/dashboard/i18n/locale/ja/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ja/integrations.json
@@ -85,6 +85,23 @@
       "JOIN_ERROR": "There was an error joining the call, please try again",
       "CREATE_ERROR": "There was an error creating a meeting link, please try again"
     },
+    "OPEN_AI": {
+      "TITLE": "Improve With AI",
+      "SUBTITLE": "An improved reply will be generated using AI, based on your current draft.",
+      "TONE": {
+        "TITLE": "Tone",
+        "OPTIONS": {
+          "PROFESSIONAL": "Professional",
+          "FRIENDLY": "Friendly"
+        }
+      },
+      "BUTTONS": {
+        "GENERATE": "Generate",
+        "GENERATING": "Generating...",
+        "CANCEL": "キャンセル"
+      },
+      "GENERATE_ERROR": "There was an error processing the content, please try again"
+    },
     "DELETE": {
       "BUTTON_TEXT": "削除",
       "API": {
diff --git a/app/javascript/dashboard/i18n/locale/ja/login.json b/app/javascript/dashboard/i18n/locale/ja/login.json
index c2116ab5e..958467236 100644
--- a/app/javascript/dashboard/i18n/locale/ja/login.json
+++ b/app/javascript/dashboard/i18n/locale/ja/login.json
@@ -3,16 +3,16 @@
     "TITLE": "Chatwootにログイン",
     "EMAIL": {
       "LABEL": "Eメール",
-      "PLACEHOLDER": "Eメール　例：someone@example.com"
+      "PLACEHOLDER": "example@companyname.com"
     },
     "PASSWORD": {
       "LABEL": "パスワード",
       "PLACEHOLDER": "パスワード"
     },
     "API": {
-      "SUCCESS_MESSAGE": "ログインしました",
-      "ERROR_MESSAGE": "Woot Serverに接続できませんでした。後でもう一度お試しください。",
-      "UNAUTH": "ユーザー名/パスワードが正しくありません。もう一度やり直してください"
+      "SUCCESS_MESSAGE": "Login successful",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again.",
+      "UNAUTH": "Username or password is incorrect. Please try again."
     },
     "OAUTH": {
       "GOOGLE_LOGIN": "Login with Google",
diff --git a/app/javascript/dashboard/i18n/locale/ja/resetPassword.json b/app/javascript/dashboard/i18n/locale/ja/resetPassword.json
index 62f0afdb5..8ed5d613d 100644
--- a/app/javascript/dashboard/i18n/locale/ja/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/ja/resetPassword.json
@@ -1,14 +1,14 @@
 {
   "RESET_PASSWORD": {
-    "TITLE": "パスワードをリセットします",
+    "TITLE": "Reset password",
     "EMAIL": {
       "LABEL": "Eメール",
-      "PLACEHOLDER": "メールアドレスを入力してください。",
-      "ERROR": "有効なメールアドレスを入力してください"
+      "PLACEHOLDER": "Please enter your email.",
+      "ERROR": "有効なメールアドレスを入力してください."
     },
     "API": {
-      "SUCCESS_MESSAGE": "パスワードリセット用のリンクがあなたのメールアドレス宛に送信されました",
-      "ERROR_MESSAGE": "Woot Serverに接続できませんでした。後でもう一度お試しください。"
+      "SUCCESS_MESSAGE": "パスワードリセット用のリンクがあなたのメールアドレス宛に送信されました.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "送信"
   }
diff --git a/app/javascript/dashboard/i18n/locale/ja/search.json b/app/javascript/dashboard/i18n/locale/ja/search.json
index 01e57baaa..ac17a4127 100644
--- a/app/javascript/dashboard/i18n/locale/ja/search.json
+++ b/app/javascript/dashboard/i18n/locale/ja/search.json
@@ -14,8 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
-    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
+    "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/ja/setNewPassword.json b/app/javascript/dashboard/i18n/locale/ja/setNewPassword.json
index 79fff432a..90bdee19d 100644
--- a/app/javascript/dashboard/i18n/locale/ja/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/ja/setNewPassword.json
@@ -1,19 +1,19 @@
 {
   "SET_NEW_PASSWORD": {
-    "TITLE": "新しいパスワードを設定",
+    "TITLE": "Set new password",
     "PASSWORD": {
       "LABEL": "パスワード",
       "PLACEHOLDER": "パスワード",
-      "ERROR": "パスワードが短すぎます"
+      "ERROR": "パスワードが短すぎます."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "パスワードの確認",
+      "LABEL": "Confirm password",
       "PLACEHOLDER": "パスワードの確認",
-      "ERROR": "パスワードが一致しません"
+      "ERROR": "パスワードが一致しません."
     },
     "API": {
-      "SUCCESS_MESSAGE": "パスワードは正常に変更されました",
-      "ERROR_MESSAGE": "Woot Serverに接続できませんでした。後でもう一度お試しください。"
+      "SUCCESS_MESSAGE": "パスワードは正常に変更されました.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "CAPTCHA": {
       "ERROR": "Verification expired. Please solve captcha again."
diff --git a/app/javascript/dashboard/i18n/locale/ja/signup.json b/app/javascript/dashboard/i18n/locale/ja/signup.json
index 26461ba8e..24d32f1b6 100644
--- a/app/javascript/dashboard/i18n/locale/ja/signup.json
+++ b/app/javascript/dashboard/i18n/locale/ja/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Company name",
-      "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
-      "ERROR": "Company name is too short"
+      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
+      "ERROR": "Company name is too short."
     },
     "FULL_NAME": {
       "LABEL": "Full name",
-      "PLACEHOLDER": "Enter your full name. eg: Bruce Wayne",
-      "ERROR": "Full name is too short"
+      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
+      "ERROR": "Full name is too short."
     },
     "EMAIL": {
       "LABEL": "Work email",
-      "PLACEHOLDER": "Enter your work email address. eg: bruce@wayne.enterprises",
-      "ERROR": "Please enter a valid work email address"
+      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
+      "ERROR": "Please enter a valid work email address."
     },
     "PASSWORD": {
       "LABEL": "パスワード",
       "PLACEHOLDER": "パスワード",
-      "ERROR": "パスワードが短すぎます",
-      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
+      "ERROR": "パスワードが短すぎます.",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "パスワードの確認",
-      "PLACEHOLDER": "パスワードの確認",
-      "ERROR": "パスワードが一致しません"
+      "LABEL": "Confirm password",
+      "PLACEHOLDER": "Confirm password",
+      "ERROR": "パスワードが一致しません."
     },
     "API": {
       "SUCCESS_MESSAGE": "登録に成功しました",
-      "ERROR_MESSAGE": "Woot Serverに接続できませんでした。後でもう一度お試しください。"
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Create account",
     "HAVE_AN_ACCOUNT": "Already have an account?"
diff --git a/app/javascript/dashboard/i18n/locale/ka/advancedFilters.json b/app/javascript/dashboard/i18n/locale/ka/advancedFilters.json
index a32c1bd9d..361c0c8ae 100644
--- a/app/javascript/dashboard/i18n/locale/ka/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/ka/advancedFilters.json
@@ -38,6 +38,7 @@
       "CAMPAIGN_NAME": "Campaign Name",
       "LABELS": "Labels",
       "BROWSER_LANGUAGE": "Browser Language",
+      "PRIORITY": "Priority",
       "COUNTRY_NAME": "Country Name",
       "REFERER_LINK": "Referer link",
       "CUSTOM_ATTRIBUTE_LIST": "List",
diff --git a/app/javascript/dashboard/i18n/locale/ka/agentMgmt.json b/app/javascript/dashboard/i18n/locale/ka/agentMgmt.json
index b44e74542..b563de61f 100644
--- a/app/javascript/dashboard/i18n/locale/ka/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ka/agentMgmt.json
@@ -110,7 +110,8 @@
         },
         "PLACEHOLDER": {
           "AGENT": "Search agents",
-          "TEAM": "Search teams"
+          "TEAM": "Search teams",
+          "INPUT": "Search for agents"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/ka/conversation.json b/app/javascript/dashboard/i18n/locale/ka/conversation.json
index 597799c15..a20522108 100644
--- a/app/javascript/dashboard/i18n/locale/ka/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ka/conversation.json
@@ -37,6 +37,7 @@
     "UNKNOWN_FILE_TYPE": "Unknown File",
     "SAVE_CONTACT": "Save",
     "UPLOADING_ATTACHMENTS": "Uploading attachments...",
+    "REPLIED_TO_STORY": "Replied to your story",
     "SUCCESS_DELETE_MESSAGE": "Message deleted successfully",
     "FAIL_DELETE_MESSSAGE": "Couldn't delete message! Try again",
     "NO_RESPONSE": "No response",
@@ -66,6 +67,23 @@
         "NEXT_WEEK": "Next week"
       }
     },
+    "PRIORITY": {
+      "TITLE": "Priority",
+      "OPTIONS": {
+        "NONE": "None",
+        "URGENT": "Urgent",
+        "HIGH": "High",
+        "MEDIUM": "Medium",
+        "LOW": "Low"
+      },
+      "CHANGE_PRIORITY": {
+        "SELECT_PLACEHOLDER": "None",
+        "INPUT_PLACEHOLDER": "Select priority",
+        "NO_RESULTS": "No results found",
+        "SUCCESSFUL": "Changed priority of conversation id %{conversationId} to %{priority}",
+        "FAILED": "Couldn't change priority. Please try again."
+      }
+    },
     "CARD_CONTEXT_MENU": {
       "PENDING": "Mark as pending",
       "RESOLVED": "Mark as resolved",
diff --git a/app/javascript/dashboard/i18n/locale/ka/generalSettings.json b/app/javascript/dashboard/i18n/locale/ka/generalSettings.json
index 367b35b1c..7ed6d8925 100644
--- a/app/javascript/dashboard/i18n/locale/ka/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ka/generalSettings.json
@@ -101,6 +101,7 @@
       "REPORTS": "Reports",
       "CONVERSATION": "Conversation",
       "CHANGE_ASSIGNEE": "Change Assignee",
+      "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Change Team",
       "ADD_LABEL": "Add label to the conversation",
       "REMOVE_LABEL": "Remove label from the conversation",
@@ -126,6 +127,7 @@
       "GO_TO_NOTIFICATIONS": "Go to Notifications",
       "ADD_LABELS_TO_CONVERSATION": "Add label to the conversation",
       "ASSIGN_AN_AGENT": "Assign an agent",
+      "ASSIGN_PRIORITY": "Assign priority",
       "ASSIGN_A_TEAM": "Assign a team",
       "MUTE_CONVERSATION": "Mute conversation",
       "UNMUTE_CONVERSATION": "Unmute conversation",
diff --git a/app/javascript/dashboard/i18n/locale/ka/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ka/inboxMgmt.json
index bed0ec0c9..407441618 100644
--- a/app/javascript/dashboard/i18n/locale/ka/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ka/inboxMgmt.json
@@ -482,6 +482,13 @@
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
+    "HELP_CENTER": {
+      "LABEL": "Help Center",
+      "PLACEHOLDER": "Select Help Center",
+      "SELECT_PLACEHOLDER": "Select Help Center",
+      "REMOVE": "Remove Help Center",
+      "SUB_TEXT": "Attach a Help Center with the inbox"
+    },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
       "MAX_ASSIGNMENT_LIMIT_RANGE_ERROR": "Please enter a value greater than 0",
diff --git a/app/javascript/dashboard/i18n/locale/ka/integrations.json b/app/javascript/dashboard/i18n/locale/ka/integrations.json
index 00d92f297..f0326fa78 100644
--- a/app/javascript/dashboard/i18n/locale/ka/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ka/integrations.json
@@ -85,6 +85,23 @@
       "JOIN_ERROR": "There was an error joining the call, please try again",
       "CREATE_ERROR": "There was an error creating a meeting link, please try again"
     },
+    "OPEN_AI": {
+      "TITLE": "Improve With AI",
+      "SUBTITLE": "An improved reply will be generated using AI, based on your current draft.",
+      "TONE": {
+        "TITLE": "Tone",
+        "OPTIONS": {
+          "PROFESSIONAL": "Professional",
+          "FRIENDLY": "Friendly"
+        }
+      },
+      "BUTTONS": {
+        "GENERATE": "Generate",
+        "GENERATING": "Generating...",
+        "CANCEL": "Cancel"
+      },
+      "GENERATE_ERROR": "There was an error processing the content, please try again"
+    },
     "DELETE": {
       "BUTTON_TEXT": "Delete",
       "API": {
diff --git a/app/javascript/dashboard/i18n/locale/ka/login.json b/app/javascript/dashboard/i18n/locale/ka/login.json
index 25c956a81..f2b2f51b9 100644
--- a/app/javascript/dashboard/i18n/locale/ka/login.json
+++ b/app/javascript/dashboard/i18n/locale/ka/login.json
@@ -3,16 +3,16 @@
     "TITLE": "Login to Chatwoot",
     "EMAIL": {
       "LABEL": "Email",
-      "PLACEHOLDER": "Email eg: someone@example.com"
+      "PLACEHOLDER": "example@companyname.com"
     },
     "PASSWORD": {
       "LABEL": "Password",
       "PLACEHOLDER": "Password"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Login Successful",
-      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later",
-      "UNAUTH": "Username / Password Incorrect. Please try again"
+      "SUCCESS_MESSAGE": "Login successful",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again.",
+      "UNAUTH": "Username or password is incorrect. Please try again."
     },
     "OAUTH": {
       "GOOGLE_LOGIN": "Login with Google",
diff --git a/app/javascript/dashboard/i18n/locale/ka/resetPassword.json b/app/javascript/dashboard/i18n/locale/ka/resetPassword.json
index bb678e809..37aa1860a 100644
--- a/app/javascript/dashboard/i18n/locale/ka/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/ka/resetPassword.json
@@ -1,14 +1,14 @@
 {
   "RESET_PASSWORD": {
-    "TITLE": "Reset Password",
+    "TITLE": "Reset password",
     "EMAIL": {
       "LABEL": "Email",
-      "PLACEHOLDER": "Please enter your email",
-      "ERROR": "Please enter a valid email"
+      "PLACEHOLDER": "Please enter your email.",
+      "ERROR": "Please enter a valid email."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Password reset link has been sent to your email",
-      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      "SUCCESS_MESSAGE": "Password reset link has been sent to your email.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Submit"
   }
diff --git a/app/javascript/dashboard/i18n/locale/ka/search.json b/app/javascript/dashboard/i18n/locale/ka/search.json
index 418572c0c..9044bf5f9 100644
--- a/app/javascript/dashboard/i18n/locale/ka/search.json
+++ b/app/javascript/dashboard/i18n/locale/ka/search.json
@@ -14,8 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
-    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
+    "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/ka/setNewPassword.json b/app/javascript/dashboard/i18n/locale/ka/setNewPassword.json
index ec2d94744..4908dad02 100644
--- a/app/javascript/dashboard/i18n/locale/ka/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/ka/setNewPassword.json
@@ -1,19 +1,19 @@
 {
   "SET_NEW_PASSWORD": {
-    "TITLE": "Set New Password",
+    "TITLE": "Set new password",
     "PASSWORD": {
       "LABEL": "Password",
       "PLACEHOLDER": "Password",
-      "ERROR": "Password is too short"
+      "ERROR": "Password is too short."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirm Password",
+      "LABEL": "Confirm password",
       "PLACEHOLDER": "Confirm Password",
-      "ERROR": "Passwords do not match"
+      "ERROR": "Passwords do not match."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Successfully changed the password",
-      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      "SUCCESS_MESSAGE": "Successfully changed the password.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "CAPTCHA": {
       "ERROR": "Verification expired. Please solve captcha again."
diff --git a/app/javascript/dashboard/i18n/locale/ka/signup.json b/app/javascript/dashboard/i18n/locale/ka/signup.json
index 10ddc5b86..1ad4865ff 100644
--- a/app/javascript/dashboard/i18n/locale/ka/signup.json
+++ b/app/javascript/dashboard/i18n/locale/ka/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Company name",
-      "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
-      "ERROR": "Company name is too short"
+      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
+      "ERROR": "Company name is too short."
     },
     "FULL_NAME": {
       "LABEL": "Full name",
-      "PLACEHOLDER": "Enter your full name. eg: Bruce Wayne",
-      "ERROR": "Full name is too short"
+      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
+      "ERROR": "Full name is too short."
     },
     "EMAIL": {
       "LABEL": "Work email",
-      "PLACEHOLDER": "Enter your work email address. eg: bruce@wayne.enterprises",
-      "ERROR": "Please enter a valid work email address"
+      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
+      "ERROR": "Please enter a valid work email address."
     },
     "PASSWORD": {
       "LABEL": "Password",
       "PLACEHOLDER": "Password",
-      "ERROR": "Password is too short",
-      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
+      "ERROR": "Password is too short.",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirm Password",
-      "PLACEHOLDER": "Confirm Password",
-      "ERROR": "Password doesnot match"
+      "LABEL": "Confirm password",
+      "PLACEHOLDER": "Confirm password",
+      "ERROR": "Password doesnot match."
     },
     "API": {
       "SUCCESS_MESSAGE": "Registration Successfull",
-      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Create account",
     "HAVE_AN_ACCOUNT": "Already have an account?"
diff --git a/app/javascript/dashboard/i18n/locale/ko/advancedFilters.json b/app/javascript/dashboard/i18n/locale/ko/advancedFilters.json
index a0c25b1a8..ba4e5741a 100644
--- a/app/javascript/dashboard/i18n/locale/ko/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/ko/advancedFilters.json
@@ -38,6 +38,7 @@
       "CAMPAIGN_NAME": "캠페인 이름",
       "LABELS": "라벨",
       "BROWSER_LANGUAGE": "언어 표시",
+      "PRIORITY": "Priority",
       "COUNTRY_NAME": "국가 이름",
       "REFERER_LINK": "참고 링크",
       "CUSTOM_ATTRIBUTE_LIST": "리스트",
diff --git a/app/javascript/dashboard/i18n/locale/ko/agentMgmt.json b/app/javascript/dashboard/i18n/locale/ko/agentMgmt.json
index 289837d54..61f00d5da 100644
--- a/app/javascript/dashboard/i18n/locale/ko/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ko/agentMgmt.json
@@ -110,7 +110,8 @@
         },
         "PLACEHOLDER": {
           "AGENT": "에이전트 찾기",
-          "TEAM": "팀 찾기"
+          "TEAM": "팀 찾기",
+          "INPUT": "Search for agents"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/ko/conversation.json b/app/javascript/dashboard/i18n/locale/ko/conversation.json
index 3e998acf6..06af1f45d 100644
--- a/app/javascript/dashboard/i18n/locale/ko/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ko/conversation.json
@@ -37,6 +37,7 @@
     "UNKNOWN_FILE_TYPE": "알 수 없는 파일",
     "SAVE_CONTACT": "Save",
     "UPLOADING_ATTACHMENTS": "첨부 업로드 중...",
+    "REPLIED_TO_STORY": "Replied to your story",
     "SUCCESS_DELETE_MESSAGE": "Message deleted successfully",
     "FAIL_DELETE_MESSSAGE": "Couldn't delete message! Try again",
     "NO_RESPONSE": "응답없음",
@@ -66,6 +67,23 @@
         "NEXT_WEEK": "다음 주"
       }
     },
+    "PRIORITY": {
+      "TITLE": "Priority",
+      "OPTIONS": {
+        "NONE": "없음",
+        "URGENT": "Urgent",
+        "HIGH": "High",
+        "MEDIUM": "Medium",
+        "LOW": "Low"
+      },
+      "CHANGE_PRIORITY": {
+        "SELECT_PLACEHOLDER": "없음",
+        "INPUT_PLACEHOLDER": "Select priority",
+        "NO_RESULTS": "검색 결과가 없습니다",
+        "SUCCESSFUL": "Changed priority of conversation id %{conversationId} to %{priority}",
+        "FAILED": "Couldn't change priority. Please try again."
+      }
+    },
     "CARD_CONTEXT_MENU": {
       "PENDING": "Mark as pending",
       "RESOLVED": "Mark as resolved",
diff --git a/app/javascript/dashboard/i18n/locale/ko/generalSettings.json b/app/javascript/dashboard/i18n/locale/ko/generalSettings.json
index dd08c70ee..de082ef19 100644
--- a/app/javascript/dashboard/i18n/locale/ko/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ko/generalSettings.json
@@ -101,6 +101,7 @@
       "REPORTS": "보고서",
       "CONVERSATION": "Conversation",
       "CHANGE_ASSIGNEE": "Change Assignee",
+      "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Change Team",
       "ADD_LABEL": "Add label to the conversation",
       "REMOVE_LABEL": "Remove label from the conversation",
@@ -126,6 +127,7 @@
       "GO_TO_NOTIFICATIONS": "Go to Notifications",
       "ADD_LABELS_TO_CONVERSATION": "Add label to the conversation",
       "ASSIGN_AN_AGENT": "Assign an agent",
+      "ASSIGN_PRIORITY": "Assign priority",
       "ASSIGN_A_TEAM": "Assign a team",
       "MUTE_CONVERSATION": "Mute conversation",
       "UNMUTE_CONVERSATION": "Unmute conversation",
diff --git a/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json
index e100877fd..41ec1bb10 100644
--- a/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json
@@ -482,6 +482,13 @@
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
+    "HELP_CENTER": {
+      "LABEL": "Help Center",
+      "PLACEHOLDER": "Select Help Center",
+      "SELECT_PLACEHOLDER": "Select Help Center",
+      "REMOVE": "Remove Help Center",
+      "SUB_TEXT": "Attach a Help Center with the inbox"
+    },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
       "MAX_ASSIGNMENT_LIMIT_RANGE_ERROR": "Please enter a value greater than 0",
diff --git a/app/javascript/dashboard/i18n/locale/ko/integrations.json b/app/javascript/dashboard/i18n/locale/ko/integrations.json
index 9cb2d303b..f65641a49 100644
--- a/app/javascript/dashboard/i18n/locale/ko/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ko/integrations.json
@@ -85,6 +85,23 @@
       "JOIN_ERROR": "There was an error joining the call, please try again",
       "CREATE_ERROR": "There was an error creating a meeting link, please try again"
     },
+    "OPEN_AI": {
+      "TITLE": "Improve With AI",
+      "SUBTITLE": "An improved reply will be generated using AI, based on your current draft.",
+      "TONE": {
+        "TITLE": "Tone",
+        "OPTIONS": {
+          "PROFESSIONAL": "Professional",
+          "FRIENDLY": "Friendly"
+        }
+      },
+      "BUTTONS": {
+        "GENERATE": "Generate",
+        "GENERATING": "Generating...",
+        "CANCEL": "취소"
+      },
+      "GENERATE_ERROR": "There was an error processing the content, please try again"
+    },
     "DELETE": {
       "BUTTON_TEXT": "삭제",
       "API": {
diff --git a/app/javascript/dashboard/i18n/locale/ko/login.json b/app/javascript/dashboard/i18n/locale/ko/login.json
index 830ab769f..14ce68b5b 100644
--- a/app/javascript/dashboard/i18n/locale/ko/login.json
+++ b/app/javascript/dashboard/i18n/locale/ko/login.json
@@ -3,7 +3,7 @@
     "TITLE": "로그인",
     "EMAIL": {
       "LABEL": "이메일",
-      "PLACEHOLDER": "이메일 예시: someone@example.com"
+      "PLACEHOLDER": "example@companyname.com"
     },
     "PASSWORD": {
       "LABEL": "비밀번호",
@@ -11,8 +11,8 @@
     },
     "API": {
       "SUCCESS_MESSAGE": "로그인 성공",
-      "ERROR_MESSAGE": "Woot 서버에 연결할 수 없음. 나중에 다시 시도하십시오.",
-      "UNAUTH": "사용자 이름/암호가 잘못됨. 다시 시도하십시오."
+      "ERROR_MESSAGE": "Woot 서버에 연결할 수 없습니다. 나중에 다시 시도해 주세요.",
+      "UNAUTH": "이름 또는 비밀번호가 올바르지 않습니다. 다시 시도해 주세요."
     },
     "OAUTH": {
       "GOOGLE_LOGIN": "Login with Google",
diff --git a/app/javascript/dashboard/i18n/locale/ko/resetPassword.json b/app/javascript/dashboard/i18n/locale/ko/resetPassword.json
index 20498c881..d7726c36c 100644
--- a/app/javascript/dashboard/i18n/locale/ko/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/ko/resetPassword.json
@@ -1,14 +1,14 @@
 {
   "RESET_PASSWORD": {
-    "TITLE": "비밀번호 재설정",
+    "TITLE": "비밀번호 재설정하기",
     "EMAIL": {
       "LABEL": "이메일",
-      "PLACEHOLDER": "이메일 주소를 입력하세요.",
+      "PLACEHOLDER": "이메일을 입력해 주세요.",
       "ERROR": "올바른 이메일 주소를 입력하세요."
     },
     "API": {
-      "SUCCESS_MESSAGE": "비밀번호 재설정 링크가 이메일로 전송됨",
-      "ERROR_MESSAGE": "Woot 서버에 연결할 수 없음. 나중에 다시 시도하십시오."
+      "SUCCESS_MESSAGE": "비밀번호 재설정 링크가 이메일로 전송됨.",
+      "ERROR_MESSAGE": "Woot 서버에 연결할 수 없습니다. 나중에 다시 시도해 주세요."
     },
     "SUBMIT": "보내기"
   }
diff --git a/app/javascript/dashboard/i18n/locale/ko/search.json b/app/javascript/dashboard/i18n/locale/ko/search.json
index 9f104952a..dca48807d 100644
--- a/app/javascript/dashboard/i18n/locale/ko/search.json
+++ b/app/javascript/dashboard/i18n/locale/ko/search.json
@@ -14,8 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
-    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
+    "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "봇",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/ko/setNewPassword.json b/app/javascript/dashboard/i18n/locale/ko/setNewPassword.json
index 272774422..1456ba40e 100644
--- a/app/javascript/dashboard/i18n/locale/ko/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/ko/setNewPassword.json
@@ -4,16 +4,16 @@
     "PASSWORD": {
       "LABEL": "비밀번호",
       "PLACEHOLDER": "비밀번호",
-      "ERROR": "비밀번호가 너무 짧음"
+      "ERROR": "비밀번호가 너무 짧음."
     },
     "CONFIRM_PASSWORD": {
       "LABEL": "비밀번호 확인",
       "PLACEHOLDER": "비밀번호 확인",
-      "ERROR": "비밀번호가 일치하지 않음"
+      "ERROR": "비밀번호가 일치하지 않음."
     },
     "API": {
-      "SUCCESS_MESSAGE": "비밀번호 변경 성공",
-      "ERROR_MESSAGE": "Woot 서버에 연결할 수 없음. 나중에 다시 시도하십시오."
+      "SUCCESS_MESSAGE": "비밀번호 변경 성공.",
+      "ERROR_MESSAGE": "Woot 서버에 연결할 수 없습니다. 나중에 다시 시도해 주세요."
     },
     "CAPTCHA": {
       "ERROR": "Verification expired. Please solve captcha again."
diff --git a/app/javascript/dashboard/i18n/locale/ko/signup.json b/app/javascript/dashboard/i18n/locale/ko/signup.json
index e38ef41f6..cc1e38503 100644
--- a/app/javascript/dashboard/i18n/locale/ko/signup.json
+++ b/app/javascript/dashboard/i18n/locale/ko/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Company name",
-      "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
-      "ERROR": "Company name is too short"
+      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
+      "ERROR": "Company name is too short."
     },
     "FULL_NAME": {
       "LABEL": "전체 이름",
-      "PLACEHOLDER": "전체 이름을 입력합니다. 예: Taeyeon Kim",
-      "ERROR": "계정 이름이 너무 짧음"
+      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
+      "ERROR": "계정 이름이 너무 짧음."
     },
     "EMAIL": {
       "LABEL": "회사 이메일",
-      "PLACEHOLDER": "회사 이메일 주소를 입력하세요. 예: taeyeon@girls.generation",
-      "ERROR": "Please enter a valid work email address"
+      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
+      "ERROR": "Please enter a valid work email address."
     },
     "PASSWORD": {
       "LABEL": "비밀번호",
       "PLACEHOLDER": "비밀번호",
-      "ERROR": "비밀번호가 너무 짧음",
-      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
+      "ERROR": "비밀번호가 너무 짧음.",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character."
     },
     "CONFIRM_PASSWORD": {
       "LABEL": "비밀번호 확인",
       "PLACEHOLDER": "비밀번호 확인",
-      "ERROR": "비밀번호가 일치하지 않음"
+      "ERROR": "비밀번호가 일치하지 않음."
     },
     "API": {
       "SUCCESS_MESSAGE": "등록 성공",
-      "ERROR_MESSAGE": "Woot Server에 연결할 수 없음. 나중에 다시 시도하십시오."
+      "ERROR_MESSAGE": "Woot 서버에 연결할 수 없습니다. 나중에 다시 시도해 주세요."
     },
     "SUBMIT": "Create account",
     "HAVE_AN_ACCOUNT": "이미 계정이 있습니까?"
diff --git a/app/javascript/dashboard/i18n/locale/lt/advancedFilters.json b/app/javascript/dashboard/i18n/locale/lt/advancedFilters.json
index a32c1bd9d..d8f4af8eb 100644
--- a/app/javascript/dashboard/i18n/locale/lt/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/lt/advancedFilters.json
@@ -2,16 +2,16 @@
   "FILTER": {
     "TITLE": "Filter Conversations",
     "SUBTITLE": "Add filters below and hit 'Apply filters' to filter conversations.",
-    "ADD_NEW_FILTER": "Add Filter",
+    "ADD_NEW_FILTER": "Pridėti Filtrą",
     "FILTER_DELETE_ERROR": "You should have atleast one filter to save",
     "SUBMIT_BUTTON_LABEL": "Apply filters",
-    "CANCEL_BUTTON_LABEL": "Cancel",
+    "CANCEL_BUTTON_LABEL": "Atšaukti",
     "CLEAR_BUTTON_LABEL": "Clear Filters",
     "EMPTY_VALUE_ERROR": "Value is required",
     "TOOLTIP_LABEL": "Filter conversations",
     "QUERY_DROPDOWN_LABELS": {
-      "AND": "AND",
-      "OR": "OR"
+      "AND": "IR",
+      "OR": "AR"
     },
     "OPERATOR_LABELS": {
       "equal_to": "Equal to",
@@ -26,11 +26,11 @@
       "starts_with": "Starts with"
     },
     "ATTRIBUTE_LABELS": {
-      "TRUE": "True",
+      "TRUE": "Tiesa",
       "FALSE": "False"
     },
     "ATTRIBUTES": {
-      "STATUS": "Status",
+      "STATUS": "Būsena",
       "ASSIGNEE_NAME": "Assignee Name",
       "INBOX_NAME": "Inbox Name",
       "TEAM_NAME": "Team Name",
@@ -38,29 +38,30 @@
       "CAMPAIGN_NAME": "Campaign Name",
       "LABELS": "Labels",
       "BROWSER_LANGUAGE": "Browser Language",
+      "PRIORITY": "Priority",
       "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_LIST": "Sąrašas",
+      "CUSTOM_ATTRIBUTE_TEXT": "Tekstas",
+      "CUSTOM_ATTRIBUTE_NUMBER": "Numeris",
+      "CUSTOM_ATTRIBUTE_LINK": "Nuoroda",
       "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox",
       "CREATED_AT": "Created At",
       "LAST_ACTIVITY": "Last Activity"
     },
     "GROUPS": {
-      "STANDARD_FILTERS": "Standard Filters",
-      "ADDITIONAL_FILTERS": "Additional Filters",
+      "STANDARD_FILTERS": "Standartinis Filtras",
+      "ADDITIONAL_FILTERS": "Papildomas Filtras",
       "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",
-        "SAVE_BUTTON": "Save filter",
-        "CANCEL_BUTTON": "Cancel",
+        "TITLE": "Ar nori išsaugoti šį filtrą?",
+        "LABEL": "Suteikti filtrui pavadinimą",
+        "PLACEHOLDER": "Įveskti šio filtro vardą",
+        "ERROR_MESSAGE": "Yra reikalingas vardas",
+        "SAVE_BUTTON": "Išsaugoti filtrą",
+        "CANCEL_BUTTON": "Atšaukti",
         "API_FOLDERS": {
           "SUCCESS_MESSAGE": "Folder created successfully",
           "ERROR_MESSAGE": "Error while creating folder"
@@ -71,12 +72,12 @@
         }
       },
       "DELETE": {
-        "DELETE_BUTTON": "Delete filter",
+        "DELETE_BUTTON": "Trinti filtrą",
         "MODAL": {
           "CONFIRM": {
-            "TITLE": "Confirm Deletion",
+            "TITLE": "Patvirtinti Ištrynimą",
             "MESSAGE": "Are you sure to delete the filter ",
-            "YES": "Yes, Delete",
+            "YES": "Taip, Ištrinti",
             "NO": "No, Keep it"
           }
         },
diff --git a/app/javascript/dashboard/i18n/locale/lt/agentBots.json b/app/javascript/dashboard/i18n/locale/lt/agentBots.json
index 5403bb18c..81771901d 100644
--- a/app/javascript/dashboard/i18n/locale/lt/agentBots.json
+++ b/app/javascript/dashboard/i18n/locale/lt/agentBots.json
@@ -1,6 +1,6 @@
 {
   "AGENT_BOTS": {
-    "HEADER": "Bots",
+    "HEADER": "Botai",
     "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>",
@@ -33,7 +33,7 @@
     },
     "ADD": {
       "TITLE": "Configure new bot",
-      "CANCEL_BUTTON_TEXT": "Cancel",
+      "CANCEL_BUTTON_TEXT": "Atšaukti",
       "API": {
         "SUCCESS_MESSAGE": "Bot added successfully",
         "ERROR_MESSAGE": "Could not add bot, Please try again later"
@@ -45,10 +45,10 @@
       "TYPE": "Bot Type"
     },
     "DELETE": {
-      "BUTTON_TEXT": "Delete",
+      "BUTTON_TEXT": "Ištrinti",
       "TITLE": "Delete Bot",
-      "SUBMIT": "Delete",
-      "CANCEL_BUTTON_TEXT": "Cancel",
+      "SUBMIT": "Ištrinti",
+      "CANCEL_BUTTON_TEXT": "Atšaukti",
       "DESCRIPTION": "Are you sure you want to delete this bot? This action is irreversible",
       "API": {
         "SUCCESS_MESSAGE": "Bot deleted successfully",
@@ -56,10 +56,10 @@
       }
     },
     "EDIT": {
-      "BUTTON_TEXT": "Edit",
+      "BUTTON_TEXT": "Redaguoti",
       "LOADING": "Fetching Bots...",
       "TITLE": "Edit Bot",
-      "CANCEL_BUTTON_TEXT": "Cancel",
+      "CANCEL_BUTTON_TEXT": "Atšaukti",
       "API": {
         "SUCCESS_MESSAGE": "Bot updated successfully",
         "ERROR_MESSAGE": "Could not update bot, Please try again later"
diff --git a/app/javascript/dashboard/i18n/locale/lt/agentMgmt.json b/app/javascript/dashboard/i18n/locale/lt/agentMgmt.json
index b44e74542..e13d52eab 100644
--- a/app/javascript/dashboard/i18n/locale/lt/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/lt/agentMgmt.json
@@ -1,96 +1,96 @@
 {
   "AGENT_MGMT": {
-    "HEADER": "Agents",
-    "HEADER_BTN_TXT": "Add Agent",
-    "LOADING": "Fetching Agent List",
+    "HEADER": "Agentai",
+    "HEADER_BTN_TXT": "Pridėti Agentą",
+    "LOADING": "Gaunamas agentų sąrašas",
     "SIDEBAR_TXT": "<p><b>Agents</b></p> <p> An <b>Agent</b> is a member of your Customer Support team. </p><p> Agents will be able to view and reply to messages from your users. The list shows all agents currently in your account. </p><p> Click on <b>Add Agent</b> to add a new agent. Agent you add will receive an email with a confirmation link to activate their account, after which they can access Chatwoot and respond to messages. </p><p> Access to Chatwoot's features are based on following roles. </p><p> <b>Agent</b> - Agents with this role can only access inboxes, reports and conversations. They can assign conversations to other agents or themselves and resolve conversations.</p><p> <b>Administrator</b> - Administrator will have access to all Chatwoot features enabled for your account, including settings, along with all of a normal agents' privileges.</p>",
     "AGENT_TYPES": {
-      "ADMINISTRATOR": "Administrator",
-      "AGENT": "Agent"
+      "ADMINISTRATOR": "Administratorius",
+      "AGENT": "Agentas"
     },
     "LIST": {
-      "404": "There are no agents associated to this account",
-      "TITLE": "Manage agents in your team",
-      "DESC": "You can add/remove agents to/in your team.",
-      "NAME": "Name",
-      "EMAIL": "EMAIL",
-      "STATUS": "Status",
-      "ACTIONS": "Actions",
-      "VERIFIED": "Verified",
-      "VERIFICATION_PENDING": "Verification Pending"
+      "404": "Su šia paskyra nėra susietų agentų",
+      "TITLE": "Valdyti agentus jūsų komandoje",
+      "DESC": "Jūs galite įtraukti/pašalinti agentus į/iš savo komandos.",
+      "NAME": "Vardas",
+      "EMAIL": "El. paštas",
+      "STATUS": "Būsena",
+      "ACTIONS": "Veiksmai",
+      "VERIFIED": "Patikrinta",
+      "VERIFICATION_PENDING": "Laukiama patvirtinimo"
     },
     "ADD": {
-      "TITLE": "Add agent to your team",
+      "TITLE": "Pridėti agentą prie komandos",
       "DESC": "You can add people who will be able to handle support for your inboxes.",
-      "CANCEL_BUTTON_TEXT": "Cancel",
+      "CANCEL_BUTTON_TEXT": "Atšaukti",
       "FORM": {
         "NAME": {
-          "LABEL": "Agent Name",
-          "PLACEHOLDER": "Please enter a name of the agent"
+          "LABEL": "Agento Vardas",
+          "PLACEHOLDER": "Įveskite agento vardą"
         },
         "AGENT_TYPE": {
-          "LABEL": "Role",
-          "PLACEHOLDER": "Please select a role",
-          "ERROR": "Role is required"
+          "LABEL": "Agento tipas",
+          "PLACEHOLDER": "Prašau pasirinkti agento tipą",
+          "ERROR": "Yra reikalingas agento tipas"
         },
         "EMAIL": {
-          "LABEL": "Email Address",
-          "PLACEHOLDER": "Please enter an email address of the agent"
+          "LABEL": "El. pašto adresas",
+          "PLACEHOLDER": "Įveskite agento el. pašto adresą"
         },
-        "SUBMIT": "Add Agent"
+        "SUBMIT": "Pridėti Agentą"
       },
       "API": {
-        "SUCCESS_MESSAGE": "Agent added successfully",
+        "SUCCESS_MESSAGE": "Agentas pridėtas sėkmingai",
         "EXIST_MESSAGE": "Agent email already in use, Please try another email address",
         "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
       }
     },
     "DELETE": {
-      "BUTTON_TEXT": "Delete",
+      "BUTTON_TEXT": "Ištrinti",
       "API": {
-        "SUCCESS_MESSAGE": "Agent deleted successfully",
+        "SUCCESS_MESSAGE": "Agentas ištrintas sėkmingai",
         "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
       },
       "CONFIRM": {
-        "TITLE": "Confirm Deletion",
-        "MESSAGE": "Are you sure to delete ",
-        "YES": "Yes, Delete ",
-        "NO": "No, Keep "
+        "TITLE": "Patvirtinti Ištrynimą",
+        "MESSAGE": "Ar tikrai norite ištrinti ",
+        "YES": "Taip, Trinti ",
+        "NO": "Ne, Išsaugoti "
       }
     },
     "EDIT": {
-      "TITLE": "Edit agent",
+      "TITLE": "Keisti Agentą",
       "FORM": {
         "NAME": {
-          "LABEL": "Agent Name",
-          "PLACEHOLDER": "Please enter a name of the agent"
+          "LABEL": "Agento Vardas",
+          "PLACEHOLDER": "Įveskite agento vardą"
         },
         "AGENT_TYPE": {
-          "LABEL": "Role",
-          "PLACEHOLDER": "Please select a role",
-          "ERROR": "Role is required"
+          "LABEL": "Agento tipas",
+          "PLACEHOLDER": "Prašau pasirinkti agento tipą",
+          "ERROR": "Yra reikalingas agento tipas"
         },
         "EMAIL": {
-          "LABEL": "Email Address",
-          "PLACEHOLDER": "Please enter an email address of the agent"
+          "LABEL": "El. pašto adresas",
+          "PLACEHOLDER": "Įveskite agento el. pašto adresą"
         },
         "AGENT_AVAILABILITY": {
-          "LABEL": "Availability",
+          "LABEL": "Prieinamumas",
           "PLACEHOLDER": "Please select an availability status",
-          "ERROR": "Availability is required"
+          "ERROR": "Būtinas prieinamumas"
         },
-        "SUBMIT": "Edit Agent"
+        "SUBMIT": "Keisti Agentą"
       },
-      "BUTTON_TEXT": "Edit",
-      "CANCEL_BUTTON_TEXT": "Cancel",
+      "BUTTON_TEXT": "Redaguoti",
+      "CANCEL_BUTTON_TEXT": "Atšaukti",
       "API": {
-        "SUCCESS_MESSAGE": "Agent updated successfully",
+        "SUCCESS_MESSAGE": "Agentas atnaujintas sėkmingai",
         "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
       },
       "PASSWORD_RESET": {
-        "ADMIN_RESET_BUTTON": "Reset Password",
+        "ADMIN_RESET_BUTTON": "Atstatyti slaptažodį",
         "ADMIN_SUCCESS_MESSAGE": "An email with reset password instructions has been sent to the agent",
-        "SUCCESS_MESSAGE": "Agent password reset successfully",
+        "SUCCESS_MESSAGE": "Agento slaptažodis atstatytas sėkmingai",
         "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
       }
     },
@@ -98,19 +98,20 @@
       "NO_RESULTS": "No results found."
     },
     "MULTI_SELECTOR": {
-      "PLACEHOLDER": "None",
+      "PLACEHOLDER": "Nėra",
       "TITLE": {
-        "AGENT": "Select agent",
-        "TEAM": "Select team"
+        "AGENT": "Pasirinkti agentą",
+        "TEAM": "Pasirinkite komandą"
       },
       "SEARCH": {
         "NO_RESULTS": {
-          "AGENT": "No agents found",
-          "TEAM": "No teams found"
+          "AGENT": "Agentų nerasta",
+          "TEAM": "Komandų nerasta"
         },
         "PLACEHOLDER": {
-          "AGENT": "Search agents",
-          "TEAM": "Search teams"
+          "AGENT": "Ieškoti agentų",
+          "TEAM": "Ieškoti komandų",
+          "INPUT": "Ieškoti agentų"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/lt/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/lt/attributesMgmt.json
index 2a9ea7de3..5544caf74 100644
--- a/app/javascript/dashboard/i18n/locale/lt/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/lt/attributesMgmt.json
@@ -6,16 +6,16 @@
     "SIDEBAR_TXT": "<p><b>Custom Attributes</b> <p>A custom attribute tracks facts about your contacts/conversation — like the subscription plan, or when they ordered the first item etc. <br /><br />For creating a Custom Attribute, just click on the <b>Add Custom Attribute.</b> You can also edit or delete an existing  Custom Attribute by clicking on the Edit or Delete button.</p>",
     "ADD": {
       "TITLE": "Add Custom Attribute",
-      "SUBMIT": "Create",
-      "CANCEL_BUTTON_TEXT": "Cancel",
+      "SUBMIT": "Sukurti",
+      "CANCEL_BUTTON_TEXT": "Atšaukti",
       "FORM": {
         "NAME": {
           "LABEL": "Display Name",
           "PLACEHOLDER": "Enter custom attribute display name",
-          "ERROR": "Name is required"
+          "ERROR": "Yra reikalingas vardas"
         },
         "DESC": {
-          "LABEL": "Description",
+          "LABEL": "Aprašymas",
           "PLACEHOLDER": "Enter custom attribute description",
           "ERROR": "Description is required"
         },
@@ -25,9 +25,9 @@
           "ERROR": "Model is required"
         },
         "TYPE": {
-          "LABEL": "Type",
-          "PLACEHOLDER": "Please select a type",
-          "ERROR": "Type is required",
+          "LABEL": "Tipas",
+          "PLACEHOLDER": "Prašau pasirinkti tipą",
+          "ERROR": "Yra reikalingas tipas",
           "LIST": {
             "LABEL": "List Values",
             "PLACEHOLDER": "Please enter value and press enter key",
@@ -35,7 +35,7 @@
           }
         },
         "KEY": {
-          "LABEL": "Key",
+          "LABEL": "Raktas",
           "PLACEHOLDER": "Enter custom attribute key",
           "ERROR": "Key is required",
           "IN_VALID": "Invalid key"
@@ -47,7 +47,7 @@
       }
     },
     "DELETE": {
-      "BUTTON_TEXT": "Delete",
+      "BUTTON_TEXT": "Ištrinti",
       "API": {
         "SUCCESS_MESSAGE": "Custom Attribute deleted successfully.",
         "ERROR_MESSAGE": "Couldn't delete the custom attribute. Try again."
@@ -56,8 +56,8 @@
         "TITLE": "Are you sure want to delete - %{attributeName}",
         "PLACE_HOLDER": "Please type {attributeName} to confirm",
         "MESSAGE": "Deleting will remove the custom attribute",
-        "YES": "Delete ",
-        "NO": "Cancel"
+        "YES": "Ištrinti ",
+        "NO": "Atšaukti"
       }
     },
     "EDIT": {
@@ -81,14 +81,14 @@
     },
     "LIST": {
       "TABLE_HEADER": [
-        "Name",
-        "Description",
-        "Type",
-        "Key"
+        "Vardas",
+        "Aprašymas",
+        "Tipas",
+        "Raktas"
       ],
       "BUTTONS": {
-        "EDIT": "Edit",
-        "DELETE": "Delete"
+        "EDIT": "Redaguoti",
+        "DELETE": "Ištrinti"
       },
       "EMPTY_RESULT": {
         "404": "There are no custom attributes created",
diff --git a/app/javascript/dashboard/i18n/locale/lt/auditLogs.json b/app/javascript/dashboard/i18n/locale/lt/auditLogs.json
index e288e2959..c1f67fbbc 100644
--- a/app/javascript/dashboard/i18n/locale/lt/auditLogs.json
+++ b/app/javascript/dashboard/i18n/locale/lt/auditLogs.json
@@ -3,17 +3,17 @@
     "HEADER": "Audit Logs",
     "HEADER_BTN_TXT": "Add Audit Logs",
     "LOADING": "Fetching Audit Logs",
-    "SEARCH_404": "There are no items matching this query",
+    "SEARCH_404": "Šią užklausą atitinkančių elementų nėra",
     "SIDEBAR_TXT": "<p><b>Audit Logs</b> </p><p> Audit Logs are trails for events and actions in a Chatwoot System. </p>",
     "LIST": {
       "404": "There are no Audit Logs available in this account.",
       "TITLE": "Manage Audit Logs",
       "DESC": "Audit Logs are trails for events and actions in a Chatwoot System.",
       "TABLE_HEADER": [
-        "User",
+        "Vartotojas",
         "Action",
         "IP Address",
-        "Time"
+        "Laikas"
       ]
     },
     "API": {
diff --git a/app/javascript/dashboard/i18n/locale/lt/automation.json b/app/javascript/dashboard/i18n/locale/lt/automation.json
index 469df1c24..07dbfac01 100644
--- a/app/javascript/dashboard/i18n/locale/lt/automation.json
+++ b/app/javascript/dashboard/i18n/locale/lt/automation.json
@@ -6,21 +6,21 @@
     "SIDEBAR_TXT": "<p><b>Automation Rules</b> <p>Automation can replace and automate existing processes that require manual effort. You can do many things with automation, including adding labels and assigning conversation to the best agent. So the team focuses on what they do best and spends more little time on manual tasks.</p>",
     "ADD": {
       "TITLE": "Add Automation Rule",
-      "SUBMIT": "Create",
-      "CANCEL_BUTTON_TEXT": "Cancel",
+      "SUBMIT": "Sukurti",
+      "CANCEL_BUTTON_TEXT": "Atšaukti",
       "FORM": {
         "NAME": {
-          "LABEL": "Rule Name",
-          "PLACEHOLDER": "Enter rule name",
-          "ERROR": "Name is required"
+          "LABEL": "Taisyklės pavadinimas",
+          "PLACEHOLDER": "Įvesti taisyklės pavadinimą",
+          "ERROR": "Yra reikalingas vardas"
         },
         "DESC": {
-          "LABEL": "Description",
+          "LABEL": "Aprašymas",
           "PLACEHOLDER": "Enter rule description",
           "ERROR": "Description is required"
         },
         "EVENT": {
-          "LABEL": "Event",
+          "LABEL": "Įvykis",
           "PLACEHOLDER": "Please select one",
           "ERROR": "Event is required"
         },
@@ -28,7 +28,7 @@
           "LABEL": "Conditions"
         },
         "ACTIONS": {
-          "LABEL": "Actions"
+          "LABEL": "Veiksmai"
         }
       },
       "CONDITION_BUTTON_LABEL": "Add Condition",
@@ -40,22 +40,22 @@
     },
     "LIST": {
       "TABLE_HEADER": [
-        "Name",
-        "Description",
-        "Active",
+        "Vardas",
+        "Aprašymas",
+        "Aktyvus",
         "Created on"
       ],
       "404": "No automation rules found"
     },
     "DELETE": {
       "TITLE": "Delete Automation Rule",
-      "SUBMIT": "Delete",
-      "CANCEL_BUTTON_TEXT": "Cancel",
+      "SUBMIT": "Ištrinti",
+      "CANCEL_BUTTON_TEXT": "Atšaukti",
       "CONFIRM": {
-        "TITLE": "Confirm Deletion",
-        "MESSAGE": "Are you sure to delete ",
-        "YES": "Yes, Delete ",
-        "NO": "No, Keep "
+        "TITLE": "Patvirtinti Ištrynimą",
+        "MESSAGE": "Ar tikrai norite ištrinti ",
+        "YES": "Taip, Trinti ",
+        "NO": "Ne, Išsaugoti "
       },
       "API": {
         "SUCCESS_MESSAGE": "Automation rule deleted successfully",
@@ -65,24 +65,24 @@
     "EDIT": {
       "TITLE": "Edit Automation Rule",
       "SUBMIT": "Update",
-      "CANCEL_BUTTON_TEXT": "Cancel",
+      "CANCEL_BUTTON_TEXT": "Atšaukti",
       "API": {
         "SUCCESS_MESSAGE": "Automation rule updated successfully",
         "ERROR_MESSAGE": "Could not update automation rule, Please try again later"
       }
     },
     "CLONE": {
-      "TOOLTIP": "Clone",
+      "TOOLTIP": "Klonuoti",
       "API": {
         "SUCCESS_MESSAGE": "Automation cloned successfully",
         "ERROR_MESSAGE": "Could not clone automation rule, Please try again later"
       }
     },
     "FORM": {
-      "EDIT": "Edit",
-      "CREATE": "Create",
-      "DELETE": "Delete",
-      "CANCEL": "Cancel",
+      "EDIT": "Redaguoti",
+      "CREATE": "Sukurti",
+      "DELETE": "Ištrinti",
+      "CANCEL": "Atšaukti",
       "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below"
     },
     "CONDITION": {
diff --git a/app/javascript/dashboard/i18n/locale/lt/bulkActions.json b/app/javascript/dashboard/i18n/locale/lt/bulkActions.json
index d5145f1bb..267ae69dc 100644
--- a/app/javascript/dashboard/i18n/locale/lt/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/lt/bulkActions.json
@@ -4,10 +4,10 @@
     "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",
+    "GO_BACK_LABEL": "Grįžti",
+    "ASSIGN_LABEL": "Priskirti",
     "YES": "Yes",
-    "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
+    "ASSIGN_AGENT_TOOLTIP": "Priskirti Agentą",
     "ASSIGN_TEAM_TOOLTIP": "Assign team",
     "ASSIGN_SUCCESFUL": "Conversations assigned successfully",
     "ASSIGN_FAILED": "Failed to assign conversations, please try again",
diff --git a/app/javascript/dashboard/i18n/locale/lt/campaign.json b/app/javascript/dashboard/i18n/locale/lt/campaign.json
index bbcc463ee..64a49e016 100644
--- a/app/javascript/dashboard/i18n/locale/lt/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/lt/campaign.json
@@ -9,18 +9,18 @@
     "ADD": {
       "TITLE": "Create a campaign",
       "DESC": "Proactive messages allow the customer to send outbound messages to their contacts which would trigger more conversations.",
-      "CANCEL_BUTTON_TEXT": "Cancel",
-      "CREATE_BUTTON_TEXT": "Create",
+      "CANCEL_BUTTON_TEXT": "Atšaukti",
+      "CREATE_BUTTON_TEXT": "Sukurti",
       "FORM": {
         "TITLE": {
-          "LABEL": "Title",
+          "LABEL": "Pavadinimas",
           "PLACEHOLDER": "Please enter the title of campaign",
           "ERROR": "Title is required"
         },
         "SCHEDULED_AT": {
           "LABEL": "Scheduled time",
           "PLACEHOLDER": "Please select the time",
-          "CONFIRM": "Confirm",
+          "CONFIRM": "Patvirtinti",
           "ERROR": "Scheduled time is required"
         },
         "AUDIENCE": {
@@ -34,12 +34,12 @@
           "ERROR": "Inbox is required"
         },
         "MESSAGE": {
-          "LABEL": "Message",
+          "LABEL": "Žinutė",
           "PLACEHOLDER": "Please enter the message of campaign",
           "ERROR": "Message is required"
         },
         "SENT_BY": {
-          "LABEL": "Sent by",
+          "LABEL": "Siuntėjas",
           "PLACEHOLDER": "Please select the the content of campaign",
           "ERROR": "Sender is required"
         },
@@ -63,12 +63,12 @@
       }
     },
     "DELETE": {
-      "BUTTON_TEXT": "Delete",
+      "BUTTON_TEXT": "Ištrinti",
       "CONFIRM": {
-        "TITLE": "Confirm Deletion",
+        "TITLE": "Patvirtinti Ištrynimą",
         "MESSAGE": "Are you sure to delete?",
-        "YES": "Yes, Delete ",
-        "NO": "No, Keep "
+        "YES": "Taip, Trinti ",
+        "NO": "Ne, Išsaugoti "
       },
       "API": {
         "SUCCESS_MESSAGE": "Campaign deleted successfully",
@@ -87,29 +87,29 @@
       "LOADING_MESSAGE": "Loading campaigns...",
       "404": "There are no campaigns created for this inbox.",
       "TABLE_HEADER": {
-        "TITLE": "Title",
-        "MESSAGE": "Message",
+        "TITLE": "Pavadinimas",
+        "MESSAGE": "Žinutė",
         "INBOX": "Inbox",
-        "STATUS": "Status",
-        "SENDER": "Sender",
+        "STATUS": "Būsena",
+        "SENDER": "Siuntėjas",
         "URL": "URL",
         "SCHEDULED_AT": "Scheduled time",
-        "TIME_ON_PAGE": "Time(Seconds)",
+        "TIME_ON_PAGE": "Laikas(sekundės)",
         "CREATED_AT": "Created at"
       },
       "BUTTONS": {
         "ADD": "Add",
-        "EDIT": "Edit",
-        "DELETE": "Delete"
+        "EDIT": "Redaguoti",
+        "DELETE": "Ištrinti"
       },
       "STATUS": {
         "ENABLED": "Enabled",
         "DISABLED": "Disabled",
         "COMPLETED": "Completed",
-        "ACTIVE": "Active"
+        "ACTIVE": "Aktyvus"
       },
       "SENDER": {
-        "BOT": "Bot"
+        "BOT": "Botas"
       }
     },
     "ONE_OFF": {
diff --git a/app/javascript/dashboard/i18n/locale/lt/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/lt/cannedMgmt.json
index 9c14f5a52..9b65a48a1 100644
--- a/app/javascript/dashboard/i18n/locale/lt/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/lt/cannedMgmt.json
@@ -1,36 +1,36 @@
 {
   "CANNED_MGMT": {
-    "HEADER": "Canned Responses",
-    "HEADER_BTN_TXT": "Add Canned Response",
-    "LOADING": "Fetching Canned Responses",
-    "SEARCH_404": "There are no items matching this query",
+    "HEADER": "Atsakymų Ruošiniai",
+    "HEADER_BTN_TXT": "Pridėti Atsakymą Ruošinį",
+    "LOADING": "Atsakymų Ruošinių Gavimas",
+    "SEARCH_404": "Šią užklausą atitinkančių elementų nėra",
     "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>",
     "LIST": {
       "404": "There are no canned responses available in this account.",
-      "TITLE": "Manage canned responses",
+      "TITLE": "Tvarkyti atsakymų ruošinius",
       "DESC": "Canned Responses are predefined reply templates which can be used to quickly send out replies to tickets.",
       "TABLE_HEADER": [
-        "Short Code",
-        "Content",
-        "Actions"
+        "Trumpas Kodas",
+        "Turinys",
+        "Veiksmai"
       ]
     },
     "ADD": {
-      "TITLE": "Add Canned Response",
+      "TITLE": "Pridėti Atsakymą Ruošinį",
       "DESC": "Canned Responses are saved reply templates which can be used to quickly send out reply to conversation.",
-      "CANCEL_BUTTON_TEXT": "Cancel",
+      "CANCEL_BUTTON_TEXT": "Atšaukti",
       "FORM": {
         "SHORT_CODE": {
-          "LABEL": "Short Code",
+          "LABEL": "Trumpas Kodas",
           "PLACEHOLDER": "Please enter a short code",
           "ERROR": "Short Code is required"
         },
         "CONTENT": {
-          "LABEL": "Content",
+          "LABEL": "Turinys",
           "PLACEHOLDER": "Please enter a content",
           "ERROR": "Content is required"
         },
-        "SUBMIT": "Submit"
+        "SUBMIT": "Pateikti"
       },
       "API": {
         "SUCCESS_MESSAGE": "Canned Response added successfully",
@@ -39,37 +39,37 @@
     },
     "EDIT": {
       "TITLE": "Edit Canned Response",
-      "CANCEL_BUTTON_TEXT": "Cancel",
+      "CANCEL_BUTTON_TEXT": "Atšaukti",
       "FORM": {
         "SHORT_CODE": {
-          "LABEL": "Short Code",
+          "LABEL": "Trumpas Kodas",
           "PLACEHOLDER": "Please enter a shortcode",
           "ERROR": "Short Code is required"
         },
         "CONTENT": {
-          "LABEL": "Content",
-          "PLACEHOLDER": "Please enter a content",
+          "LABEL": "Turinys",
+          "PLACEHOLDER": "Prašome įrašyti turinį",
           "ERROR": "Content is required"
         },
-        "SUBMIT": "Submit"
+        "SUBMIT": "Pateikti"
       },
-      "BUTTON_TEXT": "Edit",
+      "BUTTON_TEXT": "Taisyti",
       "API": {
-        "SUCCESS_MESSAGE": "Canned Response updated successfully",
+        "SUCCESS_MESSAGE": "Atsakymų Ruošinys atnaujintas sėkmingai",
         "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
       }
     },
     "DELETE": {
-      "BUTTON_TEXT": "Delete",
+      "BUTTON_TEXT": "Ištrinti",
       "API": {
-        "SUCCESS_MESSAGE": "Canned response deleted successfully",
+        "SUCCESS_MESSAGE": "Atsakymų Ruošinys ištrintas sėkmingai",
         "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
       },
       "CONFIRM": {
-        "TITLE": "Confirm Deletion",
-        "MESSAGE": "Are you sure to delete ",
-        "YES": "Yes, Delete ",
-        "NO": "No, Keep "
+        "TITLE": "Patvirtinti Ištrynimą",
+        "MESSAGE": "Ar tikrai norite ištrinti ",
+        "YES": "Taip, Ištrinti ",
+        "NO": "Ne, Išsaugoti "
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/lt/chatlist.json b/app/javascript/dashboard/i18n/locale/lt/chatlist.json
index b96cfb976..78f77a3c0 100644
--- a/app/javascript/dashboard/i18n/locale/lt/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/lt/chatlist.json
@@ -6,33 +6,33 @@
     "LIST": {
       "404": "There are no active conversations in this group."
     },
-    "TAB_HEADING": "Conversations",
-    "MENTION_HEADING": "Mentions",
-    "UNATTENDED_HEADING": "Unattended",
+    "TAB_HEADING": "Pokalbiai",
+    "MENTION_HEADING": "Paminėjimai",
+    "UNATTENDED_HEADING": "Be priežiūros",
     "SEARCH": {
       "INPUT": "Search for People, Chats, Saved Replies .."
     },
-    "FILTER_ALL": "All",
+    "FILTER_ALL": "Visi",
     "ASSIGNEE_TYPE_TABS": {
-      "me": "Mine",
+      "me": "Mano",
       "unassigned": "Unassigned",
-      "all": "All"
+      "all": "Visi"
     },
     "CHAT_STATUS_FILTER_ITEMS": {
       "open": {
         "TEXT": "Open"
       },
       "resolved": {
-        "TEXT": "Resolved"
+        "TEXT": "Išspręsta"
       },
       "pending": {
-        "TEXT": "Pending"
+        "TEXT": "Laukiama"
       },
       "snoozed": {
-        "TEXT": "Snoozed"
+        "TEXT": "Atidėta"
       },
       "all": {
-        "TEXT": "All"
+        "TEXT": "Visi"
       }
     },
     "ATTACHMENTS": {
@@ -40,32 +40,32 @@
         "CONTENT": "Picture message"
       },
       "audio": {
-        "CONTENT": "Audio message"
+        "CONTENT": "Garso žinutė"
       },
       "video": {
-        "CONTENT": "Video message"
+        "CONTENT": "Vaizdo žinutė"
       },
       "file": {
         "CONTENT": "File Attachment"
       },
       "location": {
-        "CONTENT": "Location"
+        "CONTENT": "Vieta"
       },
       "fallback": {
         "CONTENT": "has shared a url"
       }
     },
-    "RECEIVED_VIA_EMAIL": "Received via email",
+    "RECEIVED_VIA_EMAIL": "Gauta el. paštu",
     "VIEW_TWEET_IN_TWITTER": "View tweet in Twitter",
     "REPLY_TO_TWEET": "Reply to this tweet",
     "LINK_TO_STORY": "Go to instagram story",
-    "SENT": "Sent successfully",
+    "SENT": "Išsiųsta sėkmingai",
     "READ": "Read successfully",
     "DELIVERED": "Delivered successfully",
-    "NO_MESSAGES": "No Messages",
+    "NO_MESSAGES": "Nėra Pranešimų",
     "NO_CONTENT": "No content available",
     "HIDE_QUOTED_TEXT": "Hide Quoted Text",
     "SHOW_QUOTED_TEXT": "Show Quoted Text",
-    "MESSAGE_READ": "Read"
+    "MESSAGE_READ": "Skaityti"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/lt/contact.json b/app/javascript/dashboard/i18n/locale/lt/contact.json
index 4d1736ed0..252a9f055 100644
--- a/app/javascript/dashboard/i18n/locale/lt/contact.json
+++ b/app/javascript/dashboard/i18n/locale/lt/contact.json
@@ -1,16 +1,16 @@
 {
   "CONTACT_PANEL": {
     "NOT_AVAILABLE": "Not Available",
-    "EMAIL_ADDRESS": "Email Address",
-    "PHONE_NUMBER": "Phone number",
+    "EMAIL_ADDRESS": "El. pašto adresas",
+    "PHONE_NUMBER": "Telefono numeris",
     "IDENTIFIER": "Identifier",
     "COPY_SUCCESSFUL": "Copied to clipboard successfully",
-    "COMPANY": "Company",
-    "LOCATION": "Location",
+    "COMPANY": "Įmonė",
+    "LOCATION": "Vieta",
     "BROWSER_LANGUAGE": "Browser Language",
     "CONVERSATION_TITLE": "Conversation Details",
     "VIEW_PROFILE": "View Profile",
-    "BROWSER": "Browser",
+    "BROWSER": "Naršyklė",
     "OS": "Operating System",
     "INITIATED_FROM": "Initiated from",
     "INITIATED_AT": "Initiated at",
@@ -43,7 +43,7 @@
     "MUTED_SUCCESS": "This conversation is muted for 6 hours",
     "UNMUTED_SUCCESS": "This conversation is unmuted",
     "SEND_TRANSCRIPT": "Send Transcript",
-    "EDIT_LABEL": "Edit",
+    "EDIT_LABEL": "Redaguoti",
     "SIDEBAR_SECTIONS": {
       "CUSTOM_ATTRIBUTES": "Custom Attributes",
       "CONTACT_LABELS": "Contact Labels",
@@ -66,29 +66,29 @@
     "DESC": "Import contacts through a CSV file.",
     "DOWNLOAD_LABEL": "Download a sample csv.",
     "FORM": {
-      "LABEL": "CSV File",
+      "LABEL": "CSV failas",
       "SUBMIT": "Import",
-      "CANCEL": "Cancel"
+      "CANCEL": "Atšaukti"
     },
     "SUCCESS_MESSAGE": "Contacts saved successfully",
     "ERROR_MESSAGE": "There was an error, please try again"
   },
   "DELETE_NOTE": {
     "CONFIRM": {
-      "TITLE": "Confirm Deletion",
+      "TITLE": "Patvirtinti Ištrynimą",
       "MESSAGE": "Are you want sure to delete this note?",
       "YES": "Yes, Delete it",
       "NO": "No, Keep it"
     }
   },
   "DELETE_CONTACT": {
-    "BUTTON_LABEL": "Delete Contact",
-    "TITLE": "Delete contact",
+    "BUTTON_LABEL": "Trinti kontaktą",
+    "TITLE": "Trinti kontaktą",
     "DESC": "Delete contact details",
     "CONFIRM": {
-      "TITLE": "Confirm Deletion",
-      "MESSAGE": "Are you sure to delete ",
-      "YES": "Yes, Delete",
+      "TITLE": "Patvirtinti Ištrynimą",
+      "MESSAGE": "Ar tikrai norite ištrinti ",
+      "YES": "Taip, Ištrinti",
       "NO": "No, Keep"
     },
     "API": {
@@ -98,14 +98,14 @@
   },
   "CONTACT_FORM": {
     "FORM": {
-      "SUBMIT": "Submit",
-      "CANCEL": "Cancel",
+      "SUBMIT": "Pateikti",
+      "CANCEL": "Atšaukti",
       "AVATAR": {
         "LABEL": "Contact Avatar"
       },
       "NAME": {
         "PLACEHOLDER": "Enter the full name of the contact",
-        "LABEL": "Full Name"
+        "LABEL": "Pilnas vardas"
       },
       "BIO": {
         "PLACEHOLDER": "Enter the bio of the contact",
@@ -113,7 +113,7 @@
       },
       "EMAIL_ADDRESS": {
         "PLACEHOLDER": "Enter the email address of the contact",
-        "LABEL": "Email Address",
+        "LABEL": "El. pašto adresas",
         "DUPLICATE": "This email address is in use for another contact.",
         "ERROR": "Please enter a valid email address."
       },
@@ -127,7 +127,7 @@
       },
       "LOCATION": {
         "PLACEHOLDER": "Enter the location of the contact",
-        "LABEL": "Location"
+        "LABEL": "Vieta"
       },
       "COMPANY_NAME": {
         "PLACEHOLDER": "Enter the company name",
@@ -142,7 +142,7 @@
       },
       "CITY": {
         "PLACEHOLDER": "Enter the city name",
-        "LABEL": "City Name"
+        "LABEL": "Miesto pavadinimas"
       },
       "SOCIAL_PROFILES": {
         "FACEBOOK": {
@@ -192,12 +192,12 @@
         "ERROR": "Subject can't be empty"
       },
       "MESSAGE": {
-        "LABEL": "Message",
+        "LABEL": "Žinutė",
         "PLACEHOLDER": "Write your message here",
         "ERROR": "Message can't be empty"
       },
       "SUBMIT": "Send message",
-      "CANCEL": "Cancel",
+      "CANCEL": "Atšaukti",
       "SUCCESS_MESSAGE": "Message sent!",
       "GO_TO_CONVERSATION": "View",
       "ERROR_MESSAGE": "Couldn't send! try again"
@@ -206,26 +206,26 @@
   "CONTACTS_PAGE": {
     "HEADER": "Contacts",
     "FIELDS": "Contact fields",
-    "SEARCH_BUTTON": "Search",
+    "SEARCH_BUTTON": "Ieškoti",
     "SEARCH_INPUT_PLACEHOLDER": "Search for contacts",
-    "FILTER_CONTACTS": "Filter",
-    "FILTER_CONTACTS_SAVE": "Save filter",
-    "FILTER_CONTACTS_DELETE": "Delete filter",
+    "FILTER_CONTACTS": "Filtruoti",
+    "FILTER_CONTACTS_SAVE": "Išsaugoti filtrą",
+    "FILTER_CONTACTS_DELETE": "Trinti filtrą",
     "LIST": {
       "LOADING_MESSAGE": "Loading contacts...",
       "404": "No contacts matches your search 🔍",
       "NO_CONTACTS": "There are no available contacts",
       "TABLE_HEADER": {
-        "NAME": "Name",
+        "NAME": "Vardas",
         "PHONE_NUMBER": "Phone Number",
-        "CONVERSATIONS": "Conversations",
+        "CONVERSATIONS": "Pokalbiai",
         "LAST_ACTIVITY": "Last Activity",
         "CREATED_AT": "Created At",
-        "COUNTRY": "Country",
-        "CITY": "City",
+        "COUNTRY": "Šalis",
+        "CITY": "Miestas",
         "SOCIAL_PROFILES": "Social Profiles",
-        "COMPANY": "Company",
-        "EMAIL_ADDRESS": "Email Address"
+        "COMPANY": "Įmonė",
+        "EMAIL_ADDRESS": "El. pašto adresas"
       },
       "VIEW_DETAILS": "View details"
     }
@@ -267,8 +267,8 @@
       "TITLE": "Activities"
     },
     "BUTTON": {
-      "PILL_BUTTON_NOTES": "notes",
-      "PILL_BUTTON_EVENTS": "events",
+      "PILL_BUTTON_NOTES": "pastabos",
+      "PILL_BUTTON_EVENTS": "įvykiai",
       "PILL_BUTTON_CONVO": "conversations"
     }
   },
@@ -288,7 +288,7 @@
     },
     "FORM": {
       "CREATE": "Add attribute",
-      "CANCEL": "Cancel",
+      "CANCEL": "Atšaukti",
       "NAME": {
         "LABEL": "Custom attribute name",
         "PLACEHOLDER": "Eg: shopify id",
@@ -333,7 +333,7 @@
     "TITLE": "Merge contacts",
     "DESCRIPTION": "Merge contacts to combine two profiles into one, including all attributes and conversations. In case of conflict, the Primary contact’ s attributes will take precedence.",
     "PRIMARY": {
-      "TITLE": "Primary contact",
+      "TITLE": "Pirminis kontaktas",
       "HELP_LABEL": "To be kept"
     },
     "CHILD": {
@@ -351,7 +351,7 @@
     },
     "FORM": {
       "SUBMIT": " Merge contacts",
-      "CANCEL": "Cancel",
+      "CANCEL": "Atšaukti",
       "CHILD_CONTACT": {
         "ERROR": "Select a child contact to merge"
       },
diff --git a/app/javascript/dashboard/i18n/locale/lt/contactFilters.json b/app/javascript/dashboard/i18n/locale/lt/contactFilters.json
index 3f84a8476..b8db02e73 100644
--- a/app/javascript/dashboard/i18n/locale/lt/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/lt/contactFilters.json
@@ -2,17 +2,17 @@
     "CONTACTS_FILTER": {
         "TITLE": "Filter Contacts",
         "SUBTITLE": "Add filters below and hit 'Submit' to filter contacts.",
-        "ADD_NEW_FILTER": "Add Filter",
+        "ADD_NEW_FILTER": "Pridėti Filtrą",
         "CLEAR_ALL_FILTERS": "Clear All Filters",
         "FILTER_DELETE_ERROR": "You should have atleast one filter to save",
-        "SUBMIT_BUTTON_LABEL": "Submit",
-        "CANCEL_BUTTON_LABEL": "Cancel",
+        "SUBMIT_BUTTON_LABEL": "Pateikti",
+        "CANCEL_BUTTON_LABEL": "Atšaukti",
         "CLEAR_BUTTON_LABEL": "Clear Filters",
         "EMPTY_VALUE_ERROR": "Value is required",
         "TOOLTIP_LABEL": "Filter contacts",
         "QUERY_DROPDOWN_LABELS": {
-            "AND": "AND",
-            "OR": "OR"
+            "AND": "IR",
+            "OR": "AR"
         },
         "OPERATOR_LABELS": {
             "equal_to": "Equal to",
@@ -26,24 +26,24 @@
             "days_before": "Is x days before"
         },
         "ATTRIBUTES": {
-            "NAME": "Name",
+            "NAME": "Vardas",
             "EMAIL": "Email",
             "PHONE_NUMBER": "Phone number",
             "IDENTIFIER": "Identifier",
-            "CITY": "City",
-            "COUNTRY": "Country",
-            "CUSTOM_ATTRIBUTE_LIST": "List",
-            "CUSTOM_ATTRIBUTE_TEXT": "Text",
-            "CUSTOM_ATTRIBUTE_NUMBER": "Number",
-            "CUSTOM_ATTRIBUTE_LINK": "Link",
+            "CITY": "Miestas",
+            "COUNTRY": "Šalis",
+            "CUSTOM_ATTRIBUTE_LIST": "Sąrašas",
+            "CUSTOM_ATTRIBUTE_TEXT": "Tekstas",
+            "CUSTOM_ATTRIBUTE_NUMBER": "Numeris",
+            "CUSTOM_ATTRIBUTE_LINK": "Nuoroda",
             "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox",
             "CREATED_AT": "Created At",
             "LAST_ACTIVITY": "Last Activity",
             "REFERER_LINK": "Referrer link"
         },
         "GROUPS": {
-            "STANDARD_FILTERS": "Standard Filters",
-            "ADDITIONAL_FILTERS": "Additional Filters",
+            "STANDARD_FILTERS": "Standartinis Filtras",
+            "ADDITIONAL_FILTERS": "Papildomas Filtras",
             "CUSTOM_ATTRIBUTES": "Custom Attributes"
         }
     }
diff --git a/app/javascript/dashboard/i18n/locale/lt/conversation.json b/app/javascript/dashboard/i18n/locale/lt/conversation.json
index 597799c15..b335f5805 100644
--- a/app/javascript/dashboard/i18n/locale/lt/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/lt/conversation.json
@@ -21,7 +21,7 @@
     },
     "UNREAD_MESSAGES": "Unread Messages",
     "UNREAD_MESSAGE": "Unread Message",
-    "CLICK_HERE": "Click here",
+    "CLICK_HERE": "Paspausti čia",
     "LOADING_INBOXES": "Loading inboxes",
     "LOADING_CONVERSATIONS": "Loading Conversations",
     "CANNOT_REPLY": "You cannot reply due to",
@@ -33,14 +33,15 @@
     "SELECT_A_TWEET_TO_REPLY": "Please select a tweet to reply to.",
     "REPLYING_TO": "You are replying to:",
     "REMOVE_SELECTION": "Remove Selection",
-    "DOWNLOAD": "Download",
-    "UNKNOWN_FILE_TYPE": "Unknown File",
-    "SAVE_CONTACT": "Save",
+    "DOWNLOAD": "Parsisiųsti",
+    "UNKNOWN_FILE_TYPE": "Nežinomas failas",
+    "SAVE_CONTACT": "Išsaugoti",
     "UPLOADING_ATTACHMENTS": "Uploading attachments...",
+    "REPLIED_TO_STORY": "Replied to your story",
     "SUCCESS_DELETE_MESSAGE": "Message deleted successfully",
     "FAIL_DELETE_MESSSAGE": "Couldn't delete message! Try again",
     "NO_RESPONSE": "No response",
-    "RATING_TITLE": "Rating",
+    "RATING_TITLE": "Reitingas",
     "FEEDBACK_TITLE": "Feedback",
     "CARD": {
       "SHOW_LABELS": "Show labels",
@@ -62,8 +63,25 @@
       "SNOOZE": {
         "TITLE": "Snooze until",
         "NEXT_REPLY": "Next reply",
-        "TOMORROW": "Tomorrow",
-        "NEXT_WEEK": "Next week"
+        "TOMORROW": "Rytoj",
+        "NEXT_WEEK": "Kitą savaitę"
+      }
+    },
+    "PRIORITY": {
+      "TITLE": "Priority",
+      "OPTIONS": {
+        "NONE": "None",
+        "URGENT": "Skubus",
+        "HIGH": "Aukštas",
+        "MEDIUM": "Vidutinis",
+        "LOW": "Žemas"
+      },
+      "CHANGE_PRIORITY": {
+        "SELECT_PLACEHOLDER": "None",
+        "INPUT_PLACEHOLDER": "Pasirinkti prioritetą",
+        "NO_RESULTS": "No results found",
+        "SUCCESSFUL": "Changed priority of conversation id %{conversationId} to %{priority}",
+        "FAILED": "Couldn't change priority. Please try again."
       }
     },
     "CARD_CONTEXT_MENU": {
@@ -106,9 +124,9 @@
       "CLICK_HERE": "Click here to update"
     },
     "REPLYBOX": {
-      "REPLY": "Reply",
+      "REPLY": "Atsakyti",
       "PRIVATE_NOTE": "Private Note",
-      "SEND": "Send",
+      "SEND": "Siųsti",
       "CREATE": "Add Note",
       "TWEET": "Tweet",
       "TIP_FORMAT_ICON": "Show rich text editor",
@@ -138,8 +156,8 @@
         "TITLE": "Undefined variables",
         "MESSAGE": "You have {undefinedVariablesCount} undefined variables in your message: {undefinedVariables}. Would you like to send the message anyway?",
         "CONFIRM": {
-          "YES": "Send",
-          "CANCEL": "Cancel"
+          "YES": "Siųsti",
+          "CANCEL": "Atšaukti"
         }
       }
     },
@@ -154,34 +172,34 @@
     "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_SUPPORTED_FILE_UPLOAD_SIZE} MB attachment limit",
     "MESSAGE_ERROR": "Unable to send this message, please try again later",
     "SENT_BY": "Sent by:",
-    "BOT": "Bot",
+    "BOT": "Botas",
     "SEND_FAILED": "Couldn't send message! Try again",
     "TRY_AGAIN": "retry",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Select Agent",
       "REMOVE": "Remove",
-      "ASSIGN": "Assign"
+      "ASSIGN": "Priskirti"
     },
     "CONTEXT_MENU": {
       "COPY": "Copy",
-      "DELETE": "Delete",
+      "DELETE": "Ištrinti",
       "CREATE_A_CANNED_RESPONSE": "Add to canned responses",
-      "TRANSLATE": "Translate",
+      "TRANSLATE": "Išversti",
       "COPY_PERMALINK": "Copy link to the message",
       "LINK_COPIED": "Message URL copied to the clipboard",
       "DELETE_CONFIRMATION": {
         "TITLE": "Are you sure you want to delete this message?",
         "MESSAGE": "You cannot undo this action",
-        "DELETE": "Delete",
-        "CANCEL": "Cancel"
+        "DELETE": "Ištrinti",
+        "CANCEL": "Atšaukti"
       }
     }
   },
   "EMAIL_TRANSCRIPT": {
     "TITLE": "Send conversation transcript",
     "DESC": "Send a copy of the conversation transcript to the specified email address",
-    "SUBMIT": "Submit",
-    "CANCEL": "Cancel",
+    "SUBMIT": "Pateikti",
+    "CANCEL": "Atšaukti",
     "SEND_EMAIL_SUCCESS": "The chat transcript was sent successfully",
     "SEND_EMAIL_ERROR": "There was an error, please try again",
     "FORM": {
diff --git a/app/javascript/dashboard/i18n/locale/lt/csatMgmt.json b/app/javascript/dashboard/i18n/locale/lt/csatMgmt.json
index d7d2efc2a..fd2bc6217 100644
--- a/app/javascript/dashboard/i18n/locale/lt/csatMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/lt/csatMgmt.json
@@ -1,6 +1,6 @@
 {
   "CSAT": {
     "TITLE": "Rate your conversation",
-    "PLACEHOLDER": "Tell us more..."
+    "PLACEHOLDER": "Papasakokit detaliau..."
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/lt/generalSettings.json b/app/javascript/dashboard/i18n/locale/lt/generalSettings.json
index 367b35b1c..6ac907b0e 100644
--- a/app/javascript/dashboard/i18n/locale/lt/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/lt/generalSettings.json
@@ -61,7 +61,7 @@
   "NOTIFICATIONS_PAGE": {
     "HEADER": "Notifications",
     "MARK_ALL_DONE": "Mark All Done",
-    "DELETE_TITLE": "deleted",
+    "DELETE_TITLE": "ištrinta",
     "UNREAD_NOTIFICATION": {
       "TITLE": "Unread Notifications",
       "ALL_NOTIFICATIONS": "View all notifications",
@@ -72,9 +72,9 @@
       "LOADING_MESSAGE": "Loading notifications...",
       "404": "No Notifications",
       "TABLE_HEADER": [
-        "Name",
+        "Vardas",
         "Phone Number",
-        "Conversations",
+        "Pokalbiai",
         "Last Contacted"
       ]
     },
@@ -101,6 +101,7 @@
       "REPORTS": "Reports",
       "CONVERSATION": "Conversation",
       "CHANGE_ASSIGNEE": "Change Assignee",
+      "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Change Team",
       "ADD_LABEL": "Add label to the conversation",
       "REMOVE_LABEL": "Remove label from the conversation",
@@ -126,6 +127,7 @@
       "GO_TO_NOTIFICATIONS": "Go to Notifications",
       "ADD_LABELS_TO_CONVERSATION": "Add label to the conversation",
       "ASSIGN_AN_AGENT": "Assign an agent",
+      "ASSIGN_PRIORITY": "Assign priority",
       "ASSIGN_A_TEAM": "Assign a team",
       "MUTE_CONVERSATION": "Mute conversation",
       "UNMUTE_CONVERSATION": "Unmute conversation",
diff --git a/app/javascript/dashboard/i18n/locale/lt/helpCenter.json b/app/javascript/dashboard/i18n/locale/lt/helpCenter.json
index 621a16ae8..067e7067d 100644
--- a/app/javascript/dashboard/i18n/locale/lt/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/lt/helpCenter.json
@@ -1,14 +1,14 @@
 {
   "HELP_CENTER": {
     "HEADER": {
-      "FILTER": "Filter by",
-      "SORT": "Sort by",
+      "FILTER": "Filtruoti pagal",
+      "SORT": "Rūšiuoti pagal",
       "SETTINGS_BUTTON": "Settings",
       "NEW_BUTTON": "New Article",
       "DROPDOWN_OPTIONS": {
-        "PUBLISHED": "Published",
-        "DRAFT": "Draft",
-        "ARCHIVED": "Archived"
+        "PUBLISHED": "Paskelbta",
+        "DRAFT": "Ruošinys",
+        "ARCHIVED": "Suarchyvuota"
       },
       "TITLES": {
         "ALL_ARTICLES": "All Articles",
@@ -19,14 +19,14 @@
     },
     "EDIT_HEADER": {
       "ALL_ARTICLES": "All Articles",
-      "PUBLISH_BUTTON": "Publish",
+      "PUBLISH_BUTTON": "Skelbti",
       "MOVE_TO_ARCHIVE_BUTTON": "Move to archived",
-      "PREVIEW": "Preview",
+      "PREVIEW": "Peržiūrėti",
       "ADD_TRANSLATION": "Add translation",
       "OPEN_SIDEBAR": "Open sidebar",
       "CLOSE_SIDEBAR": "Close sidebar",
-      "SAVING": "Saving...",
-      "SAVED": "Saved"
+      "SAVING": "Išsaugoma...",
+      "SAVED": "Išsaugota"
     },
     "ARTICLE_EDITOR": {
       "IMAGE_UPLOAD": {
@@ -43,14 +43,14 @@
       "TITLE": "Article Settings",
       "FORM": {
         "CATEGORY": {
-          "LABEL": "Category",
+          "LABEL": "Kategorija",
           "TITLE": "Select category",
           "PLACEHOLDER": "Select category",
           "NO_RESULT": "No category found",
           "SEARCH_PLACEHOLDER": "Search category"
         },
         "AUTHOR": {
-          "LABEL": "Author",
+          "LABEL": "Autorius",
           "TITLE": "Select author",
           "PLACEHOLDER": "Select author",
           "NO_RESULT": "No authors found",
@@ -88,7 +88,7 @@
         "TITLE": "Portals",
         "PORTAL_SETTINGS": "Portal settings",
         "SUBTITLE": "You have multiple portals and can have different locales for each portal.",
-        "CANCEL_BUTTON_LABEL": "Cancel",
+        "CANCEL_BUTTON_LABEL": "Atšaukti",
         "CHOOSE_LOCALE_BUTTON": "Choose Locale"
       },
       "PORTAL_SETTINGS": {
@@ -98,12 +98,12 @@
             "ADD": "Add locale",
             "VISIT": "Visit site",
             "SETTINGS": "Settings",
-            "DELETE": "Delete"
+            "DELETE": "Ištrinti"
           },
           "PORTAL_CONFIG": {
             "TITLE": "Portal Configurations",
             "ITEMS": {
-              "NAME": "Name",
+              "NAME": "Vardas",
               "DOMAIN": "Custom domain",
               "SLUG": "Slug",
               "TITLE": "Portal title",
@@ -118,8 +118,8 @@
               "CODE": "Locale code",
               "ARTICLE_COUNT": "No. of articles",
               "CATEGORIES": "No. of categories",
-              "SWAP": "Swap",
-              "DELETE": "Delete",
+              "SWAP": "Sukeisti",
+              "DELETE": "Ištrinti",
               "DEFAULT_LOCALE": "Default"
             }
           }
@@ -145,7 +145,7 @@
             "TITLE": "Portal customization"
           },
           "CATEGORY_SETTINGS": {
-            "TITLE": "Categories"
+            "TITLE": "Kategorijos"
           },
           "LOCALE_SETTINGS": {
             "TITLE": "Locales"
@@ -155,8 +155,8 @@
           "TITLE": "Categories in",
           "NEW_CATEGORY": "New category",
           "TABLE": {
-            "NAME": "Name",
-            "DESCRIPTION": "Description",
+            "NAME": "Vardas",
+            "DESCRIPTION": "Aprašymas",
             "LOCALE": "Locale",
             "ARTICLE_COUNT": "No. of articles",
             "ACTION_BUTTON": {
@@ -188,7 +188,7 @@
             "title": "Voila! 🎉",
             "route": "portal_finish",
             "body": "You're all set!",
-            "FINISH": "Finish"
+            "FINISH": "Pabaigti"
           }
         ],
         "CREATE_FLOW_PAGE": {
@@ -210,15 +210,15 @@
           }
         },
         "LOGO": {
-          "LABEL": "Logo",
+          "LABEL": "Logotipas",
           "UPLOAD_BUTTON": "Upload logo",
           "HELP_TEXT": "This logo will be displayed on the portal header."
         },
         "NAME": {
-          "LABEL": "Name",
+          "LABEL": "Vardas",
           "PLACEHOLDER": "Portal name",
           "HELP_TEXT": "The name will be used in the public facing portal internally.",
-          "ERROR": "Name is required"
+          "ERROR": "Yra reikalingas vardas"
         },
         "SLUG": {
           "LABEL": "Slug",
@@ -271,7 +271,7 @@
         },
         "BUTTONS": {
           "CREATE": "Create locale",
-          "CANCEL": "Cancel"
+          "CANCEL": "Atšaukti"
         },
         "API": {
           "SUCCESS_MESSAGE": "Locale added successfully",
@@ -296,10 +296,10 @@
       "404": "No articles matches your search 🔍",
       "NO_ARTICLES": "There are no available articles",
       "HEADERS": {
-        "TITLE": "Title",
-        "CATEGORY": "Category",
+        "TITLE": "Pavadinimas",
+        "CATEGORY": "Kategorija",
         "READ_COUNT": "Read count",
-        "STATUS": "Status",
+        "STATUS": "Būsena",
         "LAST_EDITED": "Last edited"
       },
       "COLUMNS": {
@@ -329,9 +329,9 @@
     "DELETE_ARTICLE": {
       "MODAL": {
         "CONFIRM": {
-          "TITLE": "Confirm Deletion",
+          "TITLE": "Patvirtinti Ištrynimą",
           "MESSAGE": "Are you sure to delete the article?",
-          "YES": "Yes, Delete",
+          "YES": "Taip, Ištrinti",
           "NO": "No, Keep it"
         }
       },
@@ -355,10 +355,10 @@
         "PORTAL": "Portal",
         "LOCALE": "Locale",
         "NAME": {
-          "LABEL": "Name",
+          "LABEL": "Vardas",
           "PLACEHOLDER": "Category name",
           "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
-          "ERROR": "Name is required"
+          "ERROR": "Yra reikalingas vardas"
         },
         "SLUG": {
           "LABEL": "Slug",
@@ -367,13 +367,13 @@
           "ERROR": "Slug is required"
         },
         "DESCRIPTION": {
-          "LABEL": "Description",
+          "LABEL": "Aprašymas",
           "PLACEHOLDER": "Give a short description about the category.",
           "ERROR": "Description is required"
         },
         "BUTTONS": {
           "CREATE": "Create category",
-          "CANCEL": "Cancel"
+          "CANCEL": "Atšaukti"
         },
         "API": {
           "SUCCESS_MESSAGE": "Category created successfully",
@@ -386,10 +386,10 @@
         "PORTAL": "Portal",
         "LOCALE": "Locale",
         "NAME": {
-          "LABEL": "Name",
+          "LABEL": "Vardas",
           "PLACEHOLDER": "Category name",
           "HELP_TEXT": "The category name will be used in the public facing portal to categorize articles.",
-          "ERROR": "Name is required"
+          "ERROR": "Yra reikalingas vardas"
         },
         "SLUG": {
           "LABEL": "Slug",
@@ -398,13 +398,13 @@
           "ERROR": "Slug is required"
         },
         "DESCRIPTION": {
-          "LABEL": "Description",
+          "LABEL": "Aprašymas",
           "PLACEHOLDER": "Give a short description about the category.",
           "ERROR": "Description is required"
         },
         "BUTTONS": {
           "CREATE": "Update category",
-          "CANCEL": "Cancel"
+          "CANCEL": "Atšaukti"
         },
         "API": {
           "SUCCESS_MESSAGE": "Category updated successfully",
diff --git a/app/javascript/dashboard/i18n/locale/lt/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/lt/inboxMgmt.json
index bed0ec0c9..e62c1a4a9 100644
--- a/app/javascript/dashboard/i18n/locale/lt/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/lt/inboxMgmt.json
@@ -332,7 +332,7 @@
         "DESC": "Chatwoot supports live-chat widgets, Facebook Messenger, Twitter profiles, WhatsApp, Emails, etc., as channels. If you want to build a custom channel, you can create it using the API channel. To get started, choose one of the channels below."
       },
       "AGENTS": {
-        "TITLE": "Agents",
+        "TITLE": "Agentai",
         "DESC": "Here you can add agents to manage your newly created inbox. Only these selected agents will have access to your inbox. Agents which are not part of this inbox will not be able to see or respond to messages in this inbox when they login. <br> <b>PS:</b> As an administrator, if you need access to all inboxes, you should add yourself as agent to all inboxes that you create.",
         "VALIDATION_ERROR": "Add atleast one agent to your new Inbox",
         "PICK_AGENTS": "Pick agents for the inbox"
@@ -408,14 +408,14 @@
       }
     },
     "DELETE": {
-      "BUTTON_TEXT": "Delete",
+      "BUTTON_TEXT": "Ištrinti",
       "AVATAR_DELETE_BUTTON_TEXT": "Delete Avatar",
       "CONFIRM": {
-        "TITLE": "Confirm Deletion",
-        "MESSAGE": "Are you sure to delete ",
+        "TITLE": "Patvirtinti Ištrynimą",
+        "MESSAGE": "Ar tikrai norite ištrinti ",
         "PLACE_HOLDER": "Please type {inboxName} to confirm",
-        "YES": "Yes, Delete ",
-        "NO": "No, Keep "
+        "YES": "Taip, Trinti ",
+        "NO": "Ne, Išsaugoti "
       },
       "API": {
         "SUCCESS_MESSAGE": "Inbox deleted successfully",
@@ -445,7 +445,7 @@
     "SETTINGS_POPUP": {
       "MESSENGER_HEADING": "Messenger Script",
       "MESSENGER_SUB_HEAD": "Place this button inside your body tag",
-      "INBOX_AGENTS": "Agents",
+      "INBOX_AGENTS": "Agentai",
       "INBOX_AGENTS_SUB_TEXT": "Add or remove agents from this inbox",
       "AGENT_ASSIGNMENT": "Conversation Assignment",
       "AGENT_ASSIGNMENT_SUB_TEXT": "Update conversation assignment settings",
@@ -482,6 +482,13 @@
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
+    "HELP_CENTER": {
+      "LABEL": "Help Center",
+      "PLACEHOLDER": "Select Help Center",
+      "SELECT_PLACEHOLDER": "Select Help Center",
+      "REMOVE": "Remove Help Center",
+      "SUB_TEXT": "Attach a Help Center with the inbox"
+    },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
       "MAX_ASSIGNMENT_LIMIT_RANGE_ERROR": "Please enter a value greater than 0",
@@ -500,8 +507,8 @@
         "FIELDS": "Fields",
         "LABEL": "Label",
         "PLACE_HOLDER": "Placeholder",
-        "KEY": "Key",
-        "TYPE": "Type",
+        "KEY": "Raktas",
+        "TYPE": "Tipas",
         "REQUIRED": "Required"
       },
       "ENABLE": {
@@ -654,7 +661,7 @@
           }
         },
         "WIDGET_VIEW_OPTION": {
-          "PREVIEW": "Preview",
+          "PREVIEW": "Peržiūrėti",
           "SCRIPT": "Script"
         },
         "WIDGET_BUBBLE_POSITION": {
diff --git a/app/javascript/dashboard/i18n/locale/lt/integrationApps.json b/app/javascript/dashboard/i18n/locale/lt/integrationApps.json
index a80ecb837..39784efc2 100644
--- a/app/javascript/dashboard/i18n/locale/lt/integrationApps.json
+++ b/app/javascript/dashboard/i18n/locale/lt/integrationApps.json
@@ -12,17 +12,17 @@
     "DELETE": {
       "TITLE": {
         "INBOX": "Confirm deletion",
-        "ACCOUNT": "Disconnect"
+        "ACCOUNT": "Atsijungti"
       },
       "MESSAGE": {
         "INBOX": "Are you sure to delete?",
         "ACCOUNT": "Are you sure to disconnect?"
       },
       "CONFIRM_BUTTON_TEXT": {
-        "INBOX": "Yes, Delete",
-        "ACCOUNT": "Yes, Disconnect"
+        "INBOX": "Taip, Ištrinti",
+        "ACCOUNT": "Taip, Atsijungti"
       },
-      "CANCEL_BUTTON_TEXT": "Cancel",
+      "CANCEL_BUTTON_TEXT": "Atšaukti",
       "API": {
         "SUCCESS_MESSAGE": "Hook deleted successfully",
         "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
@@ -32,7 +32,7 @@
       "FETCHING": "Fetching integration hooks",
       "INBOX": "Inbox",
       "DELETE": {
-        "BUTTON_TEXT": "Delete"
+        "BUTTON_TEXT": "Ištrinti"
       }
     },
     "ADD": {
@@ -41,8 +41,8 @@
           "LABEL": "Select Inbox",
           "PLACEHOLDER": "Select Inbox"
         },
-        "SUBMIT": "Create",
-        "CANCEL": "Cancel"
+        "SUBMIT": "Sukurti",
+        "CANCEL": "Atšaukti"
       },
       "API": {
         "SUCCESS_MESSAGE": "Integration hook added successfully",
@@ -53,7 +53,7 @@
       "BUTTON_TEXT": "Connect"
     },
     "DISCONNECT": {
-      "BUTTON_TEXT": "Disconnect"
+      "BUTTON_TEXT": "Atsijungti"
     },
     "SIDEBAR_DESCRIPTION": {
       "DIALOGFLOW": "Dialogflow is a natural language understanding platform that makes it easy to design and integrate a conversational user interface into your mobile app, web application, device, bot, interactive voice response system, and so on. <br /> <br /> Dialogflow integration with %{installationName} allows you to configure a Dialogflow bot with your inboxes which lets the bot handle the queries initially and hand them over to an agent when needed. Dialogflow can be used to qualifying the leads, reduce the workload of agents by providing frequently asked questions etc. <br /> <br /> To add Dialogflow, you need to create a Service Account in your Google project console and share the credentials. Please refer to the Dialogflow docs for more information."
diff --git a/app/javascript/dashboard/i18n/locale/lt/integrations.json b/app/javascript/dashboard/i18n/locale/lt/integrations.json
index 00d92f297..5fd4807b3 100644
--- a/app/javascript/dashboard/i18n/locale/lt/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/lt/integrations.json
@@ -4,7 +4,7 @@
     "WEBHOOK": {
       "SUBSCRIBED_EVENTS": "Subscribed Events",
       "FORM": {
-        "CANCEL": "Cancel",
+        "CANCEL": "Atšaukti",
         "DESC": "Webhook events provide you the realtime information about what's happening in your Chatwoot account. Please enter a valid URL to configure a callback.",
         "SUBSCRIPTIONS": {
           "LABEL": "Events",
@@ -32,18 +32,18 @@
       "HEADER": "Webhook settings",
       "HEADER_BTN_TXT": "Add new webhook",
       "LOADING": "Fetching attached webhooks",
-      "SEARCH_404": "There are no items matching this query",
+      "SEARCH_404": "Šią užklausą atitinkančių elementų nėra",
       "SIDEBAR_TXT": "<p><b>Webhooks</b> </p> <p>Webhooks are HTTP callbacks which can be defined for every account. They are triggered by events like message creation in Chatwoot. You can create more than one webhook for this account. <br /><br /> For creating a <b>webhook</b>, click on the <b>Add new webhook</b> button. You can also remove any existing webhook by clicking on the Delete button.</p>",
       "LIST": {
         "404": "There are no webhooks configured for this account.",
         "TITLE": "Manage webhooks",
         "TABLE_HEADER": [
           "Webhook endpoint",
-          "Actions"
+          "Veiksmai"
         ]
       },
       "EDIT": {
-        "BUTTON_TEXT": "Edit",
+        "BUTTON_TEXT": "Redaguoti",
         "TITLE": "Edit webhook",
         "API": {
           "SUCCESS_MESSAGE": "Webhook configuration updated successfully",
@@ -51,7 +51,7 @@
         }
       },
       "ADD": {
-        "CANCEL": "Cancel",
+        "CANCEL": "Atšaukti",
         "TITLE": "Add new webhook",
         "API": {
           "SUCCESS_MESSAGE": "Webhook configuration added successfully",
@@ -59,15 +59,15 @@
         }
       },
       "DELETE": {
-        "BUTTON_TEXT": "Delete",
+        "BUTTON_TEXT": "Ištrinti",
         "API": {
           "SUCCESS_MESSAGE": "Webhook deleted successfully",
           "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
         },
         "CONFIRM": {
-          "TITLE": "Confirm Deletion",
+          "TITLE": "Patvirtinti Ištrynimą",
           "MESSAGE": "Are you sure to delete the webhook? (%{webhookURL})",
-          "YES": "Yes, Delete ",
+          "YES": "Taip, Trinti ",
           "NO": "No, Keep it"
         }
       }
@@ -85,8 +85,25 @@
       "JOIN_ERROR": "There was an error joining the call, please try again",
       "CREATE_ERROR": "There was an error creating a meeting link, please try again"
     },
+    "OPEN_AI": {
+      "TITLE": "Improve With AI",
+      "SUBTITLE": "An improved reply will be generated using AI, based on your current draft.",
+      "TONE": {
+        "TITLE": "Tone",
+        "OPTIONS": {
+          "PROFESSIONAL": "Professional",
+          "FRIENDLY": "Friendly"
+        }
+      },
+      "BUTTONS": {
+        "GENERATE": "Generate",
+        "GENERATING": "Generating...",
+        "CANCEL": "Atšaukti"
+      },
+      "GENERATE_ERROR": "There was an error processing the content, please try again"
+    },
     "DELETE": {
-      "BUTTON_TEXT": "Delete",
+      "BUTTON_TEXT": "Ištrinti",
       "API": {
         "SUCCESS_MESSAGE": "Integration deleted successfully"
       }
@@ -103,14 +120,14 @@
         "404": "There are no dashboard apps configured on this account yet",
         "LOADING": "Fetching dashboard apps...",
         "TABLE_HEADER": [
-          "Name",
+          "Vardas",
           "Endpoint"
         ],
         "EDIT_TOOLTIP": "Edit app",
         "DELETE_TOOLTIP": "Delete app"
       },
       "FORM": {
-        "TITLE_LABEL": "Name",
+        "TITLE_LABEL": "Vardas",
         "TITLE_PLACEHOLDER": "Enter a name for your dashboard app",
         "TITLE_ERROR": "A name for the dashboard app is required",
         "URL_LABEL": "Endpoint",
@@ -119,15 +136,15 @@
       },
       "CREATE": {
         "HEADER": "Add a new dashboard app",
-        "FORM_SUBMIT": "Submit",
-        "FORM_CANCEL": "Cancel",
+        "FORM_SUBMIT": "Pateikti",
+        "FORM_CANCEL": "Atšaukti",
         "API_SUCCESS": "Dashboard app configured successfully",
         "API_ERROR": "We couldn't create an app. Please try again later"
       },
       "UPDATE": {
         "HEADER": "Edit dashboard app",
         "FORM_SUBMIT": "Update",
-        "FORM_CANCEL": "Cancel",
+        "FORM_CANCEL": "Atšaukti",
         "API_SUCCESS": "Dashboard app updated successfully",
         "API_ERROR": "We couldn't update the app. Please try again later"
       },
diff --git a/app/javascript/dashboard/i18n/locale/lt/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/lt/labelsMgmt.json
index db12fa32a..cc52d69bd 100644
--- a/app/javascript/dashboard/i18n/locale/lt/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/lt/labelsMgmt.json
@@ -3,16 +3,16 @@
     "HEADER": "Labels",
     "HEADER_BTN_TXT": "Add label",
     "LOADING": "Fetching labels",
-    "SEARCH_404": "There are no items matching this query",
+    "SEARCH_404": "Šią užklausą atitinkančių elementų nėra",
     "SIDEBAR_TXT": "<p><b>Labels</b> <p>Labels help you to categorize conversations and prioritize them. You can assign label to a conversation from the sidepanel. <br /><br />Labels are tied to the account and can be used to create custom workflows in your organization. You can assign custom color to a label, it makes it easier to identify the label. You will be able to display the label on the sidebar to filter the conversations easily.</p>",
     "LIST": {
       "404": "There are no labels available in this account.",
       "TITLE": "Manage labels",
       "DESC": "Labels let you group the conversations together.",
       "TABLE_HEADER": [
-        "Name",
-        "Description",
-        "Color"
+        "Vardas",
+        "Aprašymas",
+        "Spalva"
       ]
     },
     "FORM": {
@@ -24,19 +24,19 @@
         "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
       },
       "DESCRIPTION": {
-        "LABEL": "Description",
+        "LABEL": "Aprašymas",
         "PLACEHOLDER": "Label Description"
       },
       "COLOR": {
-        "LABEL": "Color"
+        "LABEL": "Spalva"
       },
       "SHOW_ON_SIDEBAR": {
         "LABEL": "Show label on sidebar"
       },
-      "EDIT": "Edit",
-      "CREATE": "Create",
-      "DELETE": "Delete",
-      "CANCEL": "Cancel"
+      "EDIT": "Redaguoti",
+      "CREATE": "Sukurti",
+      "DELETE": "Ištrinti",
+      "CANCEL": "Atšaukti"
     },
     "ADD": {
       "TITLE": "Add label",
@@ -54,16 +54,16 @@
       }
     },
     "DELETE": {
-      "BUTTON_TEXT": "Delete",
+      "BUTTON_TEXT": "Ištrinti",
       "API": {
         "SUCCESS_MESSAGE": "Label deleted successfully",
         "ERROR_MESSAGE": "There was an error, please try again"
       },
       "CONFIRM": {
-        "TITLE": "Confirm Deletion",
-        "MESSAGE": "Are you sure to delete ",
-        "YES": "Yes, Delete ",
-        "NO": "No, Keep "
+        "TITLE": "Patvirtinti Ištrynimą",
+        "MESSAGE": "Ar tikrai norite ištrinti ",
+        "YES": "Taip, Trinti ",
+        "NO": "Ne, Išsaugoti "
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/lt/login.json b/app/javascript/dashboard/i18n/locale/lt/login.json
index 25c956a81..f2b2f51b9 100644
--- a/app/javascript/dashboard/i18n/locale/lt/login.json
+++ b/app/javascript/dashboard/i18n/locale/lt/login.json
@@ -3,16 +3,16 @@
     "TITLE": "Login to Chatwoot",
     "EMAIL": {
       "LABEL": "Email",
-      "PLACEHOLDER": "Email eg: someone@example.com"
+      "PLACEHOLDER": "example@companyname.com"
     },
     "PASSWORD": {
       "LABEL": "Password",
       "PLACEHOLDER": "Password"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Login Successful",
-      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later",
-      "UNAUTH": "Username / Password Incorrect. Please try again"
+      "SUCCESS_MESSAGE": "Login successful",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again.",
+      "UNAUTH": "Username or password is incorrect. Please try again."
     },
     "OAUTH": {
       "GOOGLE_LOGIN": "Login with Google",
diff --git a/app/javascript/dashboard/i18n/locale/lt/macros.json b/app/javascript/dashboard/i18n/locale/lt/macros.json
index 3a59d4f26..2725064af 100644
--- a/app/javascript/dashboard/i18n/locale/lt/macros.json
+++ b/app/javascript/dashboard/i18n/locale/lt/macros.json
@@ -15,7 +15,7 @@
           "ERROR": "Name is required for creating a macro"
         },
         "ACTIONS": {
-          "LABEL": "Actions"
+          "LABEL": "Veiksmai"
         }
       },
       "API": {
@@ -25,7 +25,7 @@
     },
     "LIST": {
       "TABLE_HEADER": [
-        "Name",
+        "Vardas",
         "Created by",
         "Last updated by",
         "Visibility"
@@ -35,8 +35,8 @@
     "DELETE": {
       "TOOLTIP": "Delete macro",
       "CONFIRM": {
-        "MESSAGE": "Are you sure to delete ",
-        "YES": "Yes, Delete",
+        "MESSAGE": "Ar tikrai norite ištrinti ",
+        "YES": "Taip, Ištrinti",
         "NO": "No"
       },
       "API": {
@@ -60,17 +60,17 @@
       "VISIBILITY": {
         "LABEL": "Macro Visibility",
         "GLOBAL": {
-          "LABEL": "Public",
+          "LABEL": "Viešas",
           "DESCRIPTION": "This macro is available publicly for all agents in this account."
         },
         "PERSONAL": {
-          "LABEL": "Private",
+          "LABEL": "Privatus",
           "DESCRIPTION": "This macro will be private to you and not be available to others."
         }
       }
     },
     "EXECUTE": {
-      "BUTTON_TOOLTIP": "Execute",
+      "BUTTON_TOOLTIP": "Vykdyti",
       "PREVIEW": "Preview Macro",
       "EXECUTED_SUCCESSFULLY": "Macro executed successfully"
     }
diff --git a/app/javascript/dashboard/i18n/locale/lt/report.json b/app/javascript/dashboard/i18n/locale/lt/report.json
index 48dcccc2b..3b6a9221d 100644
--- a/app/javascript/dashboard/i18n/locale/lt/report.json
+++ b/app/javascript/dashboard/i18n/locale/lt/report.json
@@ -1,12 +1,12 @@
 {
   "REPORT": {
-    "HEADER": "Conversations",
+    "HEADER": "Pokalbiai",
     "LOADING_CHART": "Loading chart data...",
     "NO_ENOUGH_DATA": "We've not received enough data points to generate report, Please try again later.",
     "DOWNLOAD_AGENT_REPORTS": "Download agent reports",
     "METRICS": {
       "CONVERSATIONS": {
-        "NAME": "Conversations",
+        "NAME": "Pokalbiai",
         "DESC": "( Total )"
       },
       "INCOMING_MESSAGES": {
@@ -61,60 +61,60 @@
       }
     ],
     "CUSTOM_DATE_RANGE": {
-      "CONFIRM": "Apply",
+      "CONFIRM": "Taikyti",
       "PLACEHOLDER": "Select date range"
     },
     "GROUP_BY_FILTER_DROPDOWN_LABEL": "Group By",
-    "DURATION_FILTER_LABEL": "Duration",
+    "DURATION_FILTER_LABEL": "Trukmė",
     "GROUP_BY_DAY_OPTIONS": [
       {
         "id": 1,
-        "groupBy": "Day"
+        "groupBy": "Diena"
       }
     ],
     "GROUP_BY_WEEK_OPTIONS": [
       {
         "id": 1,
-        "groupBy": "Day"
+        "groupBy": "Diena"
       },
       {
         "id": 2,
-        "groupBy": "Week"
+        "groupBy": "Savaitė"
       }
     ],
     "GROUP_BY_MONTH_OPTIONS": [
       {
         "id": 1,
-        "groupBy": "Day"
+        "groupBy": "Diena"
       },
       {
         "id": 2,
-        "groupBy": "Week"
+        "groupBy": "Savaitė"
       },
       {
         "id": 3,
-        "groupBy": "Month"
+        "groupBy": "Mėnuo"
       }
     ],
     "GROUP_BY_YEAR_OPTIONS": [
       {
         "id": 1,
-        "groupBy": "Day"
+        "groupBy": "Diena"
       },
       {
         "id": 2,
-        "groupBy": "Week"
+        "groupBy": "Savaitė"
       },
       {
         "id": 3,
-        "groupBy": "Month"
+        "groupBy": "Mėnuo"
       },
       {
         "id": 4,
-        "groupBy": "Year"
+        "groupBy": "Metai"
       }
     ],
-    "BUSINESS_HOURS": "Business Hours"
+    "BUSINESS_HOURS": "Darbo valandos"
   },
   "AGENT_REPORTS": {
     "HEADER": "Agents Overview",
@@ -124,16 +124,16 @@
     "FILTER_DROPDOWN_LABEL": "Select Agent",
     "METRICS": {
       "CONVERSATIONS": {
-        "NAME": "Conversations",
-        "DESC": "( Total )"
+        "NAME": "Pokalbiai",
+        "DESC": "( Viso )"
       },
       "INCOMING_MESSAGES": {
         "NAME": "Incoming Messages",
-        "DESC": "( Total )"
+        "DESC": "( Viso )"
       },
       "OUTGOING_MESSAGES": {
         "NAME": "Outgoing Messages",
-        "DESC": "( Total )"
+        "DESC": "( Viso )"
       },
       "FIRST_RESPONSE_TIME": {
         "NAME": "First Response Time",
@@ -149,7 +149,7 @@
       },
       "RESOLUTION_COUNT": {
         "NAME": "Resolution Count",
-        "DESC": "( Total )"
+        "DESC": "( Viso )"
       }
     },
     "DATE_RANGE": [
@@ -179,7 +179,7 @@
       }
     ],
     "CUSTOM_DATE_RANGE": {
-      "CONFIRM": "Apply",
+      "CONFIRM": "Taikyti",
       "PLACEHOLDER": "Select date range"
     }
   },
@@ -191,7 +191,7 @@
     "FILTER_DROPDOWN_LABEL": "Select Label",
     "METRICS": {
       "CONVERSATIONS": {
-        "NAME": "Conversations",
+        "NAME": "Pokalbiai",
         "DESC": "( Total )"
       },
       "INCOMING_MESSAGES": {
@@ -216,7 +216,7 @@
       },
       "RESOLUTION_COUNT": {
         "NAME": "Resolution Count",
-        "DESC": "( Total )"
+        "DESC": "( Viso )"
       }
     },
     "DATE_RANGE": [
@@ -246,7 +246,7 @@
       }
     ],
     "CUSTOM_DATE_RANGE": {
-      "CONFIRM": "Apply",
+      "CONFIRM": "Taikyti",
       "PLACEHOLDER": "Select date range"
     }
   },
@@ -258,12 +258,12 @@
     "FILTER_DROPDOWN_LABEL": "Select Inbox",
     "METRICS": {
       "CONVERSATIONS": {
-        "NAME": "Conversations",
-        "DESC": "( Total )"
+        "NAME": "Pokalbiai",
+        "DESC": "( Viso )"
       },
       "INCOMING_MESSAGES": {
         "NAME": "Incoming Messages",
-        "DESC": "( Total )"
+        "DESC": "( Viso )"
       },
       "OUTGOING_MESSAGES": {
         "NAME": "Outgoing Messages",
@@ -283,7 +283,7 @@
       },
       "RESOLUTION_COUNT": {
         "NAME": "Resolution Count",
-        "DESC": "( Total )"
+        "DESC": "( Viso )"
       }
     },
     "DATE_RANGE": [
@@ -313,7 +313,7 @@
       }
     ],
     "CUSTOM_DATE_RANGE": {
-      "CONFIRM": "Apply",
+      "CONFIRM": "Taikyti",
       "PLACEHOLDER": "Select date range"
     }
   },
@@ -325,12 +325,12 @@
     "FILTER_DROPDOWN_LABEL": "Select Team",
     "METRICS": {
       "CONVERSATIONS": {
-        "NAME": "Conversations",
-        "DESC": "( Total )"
+        "NAME": "Pokalbiai",
+        "DESC": "( Viso )"
       },
       "INCOMING_MESSAGES": {
         "NAME": "Incoming Messages",
-        "DESC": "( Total )"
+        "DESC": "( Viso )"
       },
       "OUTGOING_MESSAGES": {
         "NAME": "Outgoing Messages",
@@ -350,7 +350,7 @@
       },
       "RESOLUTION_COUNT": {
         "NAME": "Resolution Count",
-        "DESC": "( Total )"
+        "DESC": "( Viso )"
       }
     },
     "DATE_RANGE": [
@@ -380,7 +380,7 @@
       }
     ],
     "CUSTOM_DATE_RANGE": {
-      "CONFIRM": "Apply",
+      "CONFIRM": "Taikyti",
       "PLACEHOLDER": "Select date range"
     }
   },
@@ -397,7 +397,7 @@
       "HEADER": {
         "CONTACT_NAME": "Contact",
         "AGENT_NAME": "Assigned agent",
-        "RATING": "Rating",
+        "RATING": "Reitingas",
         "FEEDBACK_TEXT": "Feedback comment"
       }
     },
@@ -437,26 +437,26 @@
       "LOADING_MESSAGE": "Loading agent metrics...",
       "NO_AGENTS": "There are no conversations by agents",
       "TABLE_HEADER": {
-        "AGENT": "Agent",
+        "AGENT": "Agentas",
         "OPEN": "OPEN",
         "UNATTENDED": "Unattended",
-        "STATUS": "Status"
+        "STATUS": "Būsena"
       }
     },
     "AGENT_STATUS": {
       "HEADER": "Agent status",
       "ONLINE": "Online",
-      "BUSY": "Busy",
+      "BUSY": "Užimta",
       "OFFLINE": "Offline"
     }
   },
   "DAYS_OF_WEEK": {
     "SUNDAY": "Sunday",
-    "MONDAY": "Monday",
+    "MONDAY": "Pirmadienis",
     "TUESDAY": "Tuesday",
     "WEDNESDAY": "Wednesday",
-    "THURSDAY": "Thursday",
-    "FRIDAY": "Friday",
+    "THURSDAY": "Ketvirtadienis",
+    "FRIDAY": "Penktadienis",
     "SATURDAY": "Saturday"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/lt/resetPassword.json b/app/javascript/dashboard/i18n/locale/lt/resetPassword.json
index bb678e809..a44f3d555 100644
--- a/app/javascript/dashboard/i18n/locale/lt/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/lt/resetPassword.json
@@ -1,15 +1,15 @@
 {
   "RESET_PASSWORD": {
-    "TITLE": "Reset Password",
+    "TITLE": "Reset password",
     "EMAIL": {
-      "LABEL": "Email",
-      "PLACEHOLDER": "Please enter your email",
-      "ERROR": "Please enter a valid email"
+      "LABEL": "El. paštas",
+      "PLACEHOLDER": "Please enter your email.",
+      "ERROR": "Please enter a valid email."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Password reset link has been sent to your email",
-      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      "SUCCESS_MESSAGE": "Password reset link has been sent to your email.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
-    "SUBMIT": "Submit"
+    "SUBMIT": "Pateikti"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/lt/search.json b/app/javascript/dashboard/i18n/locale/lt/search.json
index 418572c0c..804dc8aa3 100644
--- a/app/javascript/dashboard/i18n/locale/lt/search.json
+++ b/app/javascript/dashboard/i18n/locale/lt/search.json
@@ -1,23 +1,23 @@
 {
   "SEARCH": {
     "TABS": {
-      "ALL": "All",
+      "ALL": "Visi",
       "CONTACTS": "Contacts",
-      "CONVERSATIONS": "Conversations",
+      "CONVERSATIONS": "Pokalbiai",
       "MESSAGES": "Messages"
     },
     "SECTION": {
       "CONTACTS": "Contacts",
-      "CONVERSATIONS": "Conversations",
+      "CONVERSATIONS": "Pokalbiai",
       "MESSAGES": "Messages"
     },
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
-    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
-    "BOT_LABEL": "Bot",
-    "READ_MORE": "Read more",
+    "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
+    "BOT_LABEL": "Botas",
+    "READ_MORE": "Skaityti daugiau",
     "WROTE": "wrote:"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/lt/setNewPassword.json b/app/javascript/dashboard/i18n/locale/lt/setNewPassword.json
index ec2d94744..5d3a48035 100644
--- a/app/javascript/dashboard/i18n/locale/lt/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/lt/setNewPassword.json
@@ -1,23 +1,23 @@
 {
   "SET_NEW_PASSWORD": {
-    "TITLE": "Set New Password",
+    "TITLE": "Set new password",
     "PASSWORD": {
-      "LABEL": "Password",
-      "PLACEHOLDER": "Password",
-      "ERROR": "Password is too short"
+      "LABEL": "Slaptažodis",
+      "PLACEHOLDER": "Slaptažodis",
+      "ERROR": "Slaptažodis yra pertrumpas."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirm Password",
-      "PLACEHOLDER": "Confirm Password",
-      "ERROR": "Passwords do not match"
+      "LABEL": "Patvirtinti slaptažodį",
+      "PLACEHOLDER": "Patvirtinti slaptažodį",
+      "ERROR": "Slaptažodžiai nesutampa."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Successfully changed the password",
-      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      "SUCCESS_MESSAGE": "Successfully changed the password.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "CAPTCHA": {
       "ERROR": "Verification expired. Please solve captcha again."
     },
-    "SUBMIT": "Submit"
+    "SUBMIT": "Pateikti"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/lt/settings.json b/app/javascript/dashboard/i18n/locale/lt/settings.json
index ab850562b..c4f0a70e1 100644
--- a/app/javascript/dashboard/i18n/locale/lt/settings.json
+++ b/app/javascript/dashboard/i18n/locale/lt/settings.json
@@ -101,20 +101,20 @@
         "LABEL": "Profile Image"
       },
       "NAME": {
-        "LABEL": "Your full name",
+        "LABEL": "Jūsų pilnas vardas",
         "ERROR": "Please enter a valid full name",
         "PLACEHOLDER": "Please enter your full name"
       },
       "DISPLAY_NAME": {
-        "LABEL": "Display name",
+        "LABEL": "Rodomas vardas",
         "ERROR": "Please enter a valid display name",
         "PLACEHOLDER": "Please enter a display name, this would be displayed in conversations"
       },
       "AVAILABILITY": {
-        "LABEL": "Availability",
+        "LABEL": "Prieinamumas",
         "STATUSES_LIST": [
           "Online",
-          "Busy",
+          "Užimta",
           "Offline"
         ],
         "SET_AVAILABILITY_SUCCESS": "Availability has been set successfully",
@@ -143,7 +143,7 @@
     }
   },
   "SIDEBAR_ITEMS": {
-    "CHANGE_AVAILABILITY_STATUS": "Change",
+    "CHANGE_AVAILABILITY_STATUS": "Keisti",
     "CHANGE_ACCOUNTS": "Switch Account",
     "CONTACT_SUPPORT": "Contact Support",
     "SELECTOR_SUBTITLE": "Select an account from the following list",
@@ -172,7 +172,7 @@
       "SHOW_LESS": "Show Less"
     },
     "FILE_BUBBLE": {
-      "DOWNLOAD": "Download",
+      "DOWNLOAD": "Parsisiųsti",
       "UPLOADING": "Uploading...",
       "INSTAGRAM_STORY_UNAVAILABLE": "This story is no longer available."
     },
@@ -180,7 +180,7 @@
       "SEE_ON_MAP": "See on map"
     },
     "FORM_BUBBLE": {
-      "SUBMIT": "Submit"
+      "SUBMIT": "Pateikti"
     }
   },
   "CONFIRM_EMAIL": "Verifying...",
@@ -192,21 +192,21 @@
   "SIDEBAR": {
     "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
     "SWITCH": "Switch",
-    "CONVERSATIONS": "Conversations",
+    "CONVERSATIONS": "Pokalbiai",
     "ALL_CONVERSATIONS": "All Conversations",
-    "MENTIONED_CONVERSATIONS": "Mentions",
+    "MENTIONED_CONVERSATIONS": "Paminėjimai",
     "PARTICIPATING_CONVERSATIONS": "Participating",
     "UNATTENDED_CONVERSATIONS": "Unattended",
     "REPORTS": "Reports",
     "SETTINGS": "Settings",
     "CONTACTS": "Contacts",
     "HOME": "Home",
-    "AGENTS": "Agents",
-    "AGENT_BOTS": "Bots",
+    "AGENTS": "Agentai",
+    "AGENT_BOTS": "Botai",
     "AUDIT_LOGS": "Audit Logs",
     "INBOXES": "Inboxes",
     "NOTIFICATIONS": "Notifications",
-    "CANNED_RESPONSES": "Canned Responses",
+    "CANNED_RESPONSES": "Atsakymų Ruošiniai",
     "INTEGRATIONS": "Integrations",
     "PROFILE_SETTINGS": "Profile Settings",
     "ACCOUNT_SETTINGS": "Account Settings",
@@ -217,19 +217,19 @@
     "MACROS": "Macros",
     "TEAMS": "Teams",
     "BILLING": "Billing",
-    "CUSTOM_VIEWS_FOLDER": "Folders",
+    "CUSTOM_VIEWS_FOLDER": "Papkės",
     "CUSTOM_VIEWS_SEGMENTS": "Segments",
-    "ALL_CONTACTS": "All Contacts",
+    "ALL_CONTACTS": "Visi Kontaktai",
     "TAGGED_WITH": "Tagged with",
     "NEW_LABEL": "New label",
     "NEW_TEAM": "New team",
     "NEW_INBOX": "New inbox",
-    "REPORTS_CONVERSATION": "Conversations",
+    "REPORTS_CONVERSATION": "Pokalbiai",
     "CSAT": "CSAT",
     "CAMPAIGNS": "Campaigns",
     "ONGOING": "Ongoing",
-    "ONE_OFF": "One off",
-    "REPORTS_AGENT": "Agents",
+    "ONE_OFF": "Vienas iš",
+    "REPORTS_AGENT": "Agentai",
     "REPORTS_LABEL": "Labels",
     "REPORTS_INBOX": "Inbox",
     "REPORTS_TEAM": "Team",
@@ -241,9 +241,9 @@
       "TITLE": "Help Center (Beta)",
       "ALL_ARTICLES": "All Articles",
       "MY_ARTICLES": "My Articles",
-      "DRAFT": "Draft",
-      "ARCHIVED": "Archived",
-      "CATEGORY": "Category",
+      "DRAFT": "Ruošinys",
+      "ARCHIVED": "Suarchyvuota",
+      "CATEGORY": "Kategorija",
       "SETTINGS": "Settings",
       "CATEGORY_EMPTY_MESSAGE": "No categories found"
     },
@@ -265,7 +265,7 @@
       "BUTTON_TXT": "Go to the billing portal"
     },
     "CHAT_WITH_US": {
-      "TITLE": "Need help?",
+      "TITLE": "Reikia pagalbos?",
       "DESCRIPTION": "Do you face any issues in billing? We are here to help.",
       "BUTTON_TXT": "Chat with us"
     },
@@ -274,7 +274,7 @@
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
     "NEW_ACCOUNT": "New Account",
-    "SELECTOR_SUBTITLE": "Create a new account",
+    "SELECTOR_SUBTITLE": "Sukurti naują paskyrą",
     "API": {
       "SUCCESS_MESSAGE": "Account created successfully",
       "EXIST_MESSAGE": "Account already exists",
@@ -285,7 +285,7 @@
         "LABEL": "Company Name",
         "PLACEHOLDER": "Wayne Enterprises"
       },
-      "SUBMIT": "Submit"
+      "SUBMIT": "Pateikti"
     }
   },
   "KEYBOARD_SHORTCUTS": {
@@ -301,7 +301,7 @@
       "TOGGLE_SIDEBAR": "Toggle Sidebar",
       "GO_TO_REPORTS_SIDEBAR": "Go to Reports sidebar",
       "MOVE_TO_NEXT_TAB": "Move to next tab in conversation list",
-      "GO_TO_SETTINGS": "Go to Settings",
+      "GO_TO_SETTINGS": "Eiti į Nustatymus",
       "SWITCH_CONVERSATION_STATUS": "Switch to the next conversation status",
       "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
       "SWITCH_TO_REPLY": "Switch to Reply",
diff --git a/app/javascript/dashboard/i18n/locale/lt/signup.json b/app/javascript/dashboard/i18n/locale/lt/signup.json
index 10ddc5b86..32e089d74 100644
--- a/app/javascript/dashboard/i18n/locale/lt/signup.json
+++ b/app/javascript/dashboard/i18n/locale/lt/signup.json
@@ -1,44 +1,44 @@
 {
   "REGISTER": {
-    "TRY_WOOT": "Create an account",
-    "TITLE": "Register",
+    "TRY_WOOT": "Sukurti paskyrą",
+    "TITLE": "Registras",
     "TESTIMONIAL_HEADER": "All it takes is one step to move forward",
     "TESTIMONIAL_CONTENT": "You're one step away from engaging your customers, retaining them and finding new ones.",
     "TERMS_ACCEPT": "By creating an account, you agree to our <a href=\"https://www.chatwoot.com/terms\">T & C</a> and <a href=\"https://www.chatwoot.com/privacy-policy\">Privacy policy</a>",
     "OAUTH": {
-      "GOOGLE_SIGNUP": "Sign up with Google"
+      "GOOGLE_SIGNUP": "Užsiregistruoti su Google"
     },
     "COMPANY_NAME": {
-      "LABEL": "Company name",
-      "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
-      "ERROR": "Company name is too short"
+      "LABEL": "Įmonės pavadinimas",
+      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
+      "ERROR": "Įmonės vardas pertrumpas."
     },
     "FULL_NAME": {
-      "LABEL": "Full name",
-      "PLACEHOLDER": "Enter your full name. eg: Bruce Wayne",
-      "ERROR": "Full name is too short"
+      "LABEL": "Pilnas vardas",
+      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
+      "ERROR": "Pilnas vardas per trumpas."
     },
     "EMAIL": {
-      "LABEL": "Work email",
-      "PLACEHOLDER": "Enter your work email address. eg: bruce@wayne.enterprises",
-      "ERROR": "Please enter a valid work email address"
+      "LABEL": "Darbinis el. paštas",
+      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
+      "ERROR": "Please enter a valid work email address."
     },
     "PASSWORD": {
-      "LABEL": "Password",
-      "PLACEHOLDER": "Password",
-      "ERROR": "Password is too short",
-      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
+      "LABEL": "Slaptažodis",
+      "PLACEHOLDER": "Slaptažodis",
+      "ERROR": "Slaptažodis yra pertrumpas.",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirm Password",
-      "PLACEHOLDER": "Confirm Password",
-      "ERROR": "Password doesnot match"
+      "LABEL": "Patvirtinti slaptažodį",
+      "PLACEHOLDER": "Patvirtinti slaptažodį",
+      "ERROR": "Password doesnot match."
     },
     "API": {
       "SUCCESS_MESSAGE": "Registration Successfull",
-      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
-    "SUBMIT": "Create account",
-    "HAVE_AN_ACCOUNT": "Already have an account?"
+    "SUBMIT": "Sukurti paskyrą",
+    "HAVE_AN_ACCOUNT": "Jau turi prisijungimo paskyrą?"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/lt/teamsSettings.json b/app/javascript/dashboard/i18n/locale/lt/teamsSettings.json
index f9ecaaaae..e078283a1 100644
--- a/app/javascript/dashboard/i18n/locale/lt/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/lt/teamsSettings.json
@@ -19,7 +19,7 @@
       },
       "WIZARD": [
         {
-          "title": "Create",
+          "title": "Sukurti",
           "route": "settings_teams_new",
           "body": "Create a new team of agents."
         },
@@ -29,7 +29,7 @@
           "body": "Add agents to the team."
         },
         {
-          "title": "Finish",
+          "title": "Pabaigti",
           "route": "settings_teams_finish",
           "body": "You are all set to go!"
         }
@@ -58,7 +58,7 @@
           "body": "Edit agents in your team."
         },
         {
-          "title": "Finish",
+          "title": "Pabaigti",
           "route": "settings_teams_edit_finish",
           "body": "You are all set to go!"
         }
@@ -68,19 +68,19 @@
       "ERROR_MESSAGE": "Couldn't save the team details. Try again."
     },
     "AGENTS": {
-      "AGENT": "AGENT",
-      "EMAIL": "EMAIL",
+      "AGENT": "Agentas",
+      "EMAIL": "El. paštas",
       "BUTTON_TEXT": "Add agents",
       "ADD_AGENTS": "Adding Agents to your Team...",
-      "SELECT": "select",
-      "SELECT_ALL": "select all agents",
+      "SELECT": "pasirinkti",
+      "SELECT_ALL": "pasirinkti visus agentus",
       "SELECTED_COUNT": "%{selected} out of %{total} agents selected."
     },
     "ADD": {
       "TITLE": "Add agents to team - %{teamName}",
       "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation.",
-      "SELECT": "select",
-      "SELECT_ALL": "select all agents",
+      "SELECT": "pasirinkti",
+      "SELECT_ALL": "pasirinkti visus agentus",
       "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
       "BUTTON_TEXT": "Add agents",
       "AGENT_VALIDATION_ERROR": "Select at least one agent."
@@ -88,10 +88,10 @@
     "FINISH": {
       "TITLE": "Your team is ready!",
       "MESSAGE": "You can now collaborate as a team on conversations. Happy supporting ",
-      "BUTTON_TEXT": "Finish"
+      "BUTTON_TEXT": "Pabaigti"
     },
     "DELETE": {
-      "BUTTON_TEXT": "Delete",
+      "BUTTON_TEXT": "Ištrinti",
       "API": {
         "SUCCESS_MESSAGE": "Team deleted successfully.",
         "ERROR_MESSAGE": "Couldn't delete the team. Try again."
@@ -100,8 +100,8 @@
         "TITLE": "Are you sure want to delete - %{teamName}",
         "PLACE_HOLDER": "Please type {teamName} to confirm",
         "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
-        "YES": "Delete ",
-        "NO": "Cancel"
+        "YES": "Ištrinti ",
+        "NO": "Atšaukti"
       }
     },
     "SETTINGS": "Settings",
diff --git a/app/javascript/dashboard/i18n/locale/lt/whatsappTemplates.json b/app/javascript/dashboard/i18n/locale/lt/whatsappTemplates.json
index bbcf28156..3d21331a3 100644
--- a/app/javascript/dashboard/i18n/locale/lt/whatsappTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/lt/whatsappTemplates.json
@@ -9,15 +9,15 @@
             "SEARCH_PLACEHOLDER": "Search Templates",
             "NO_TEMPLATES_FOUND": "No templates found for",
             "LABELS": {
-                "LANGUAGE": "Language",
+                "LANGUAGE": "Kalba",
                 "TEMPLATE_BODY": "Template Body",
-                "CATEGORY": "Category"
+                "CATEGORY": "Kategorija"
             }
         },
         "PARSER": {
-            "VARIABLES_LABEL": "Variables",
+            "VARIABLES_LABEL": "Kintamieji",
             "VARIABLE_PLACEHOLDER": "Enter %{variable} value",
-            "GO_BACK_LABEL": "Go Back",
+            "GO_BACK_LABEL": "Grįžti",
             "SEND_MESSAGE_LABEL": "Send Message",
             "FORM_ERROR_MESSAGE": "Please fill all variables before sending"
         }
diff --git a/app/javascript/dashboard/i18n/locale/lv/advancedFilters.json b/app/javascript/dashboard/i18n/locale/lv/advancedFilters.json
index c4a98db3d..85651666b 100644
--- a/app/javascript/dashboard/i18n/locale/lv/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/lv/advancedFilters.json
@@ -38,6 +38,7 @@
       "CAMPAIGN_NAME": "Kampaņas Nosaukums",
       "LABELS": "Etiķetes",
       "BROWSER_LANGUAGE": "Pārlūkprogrammas Valoda",
+      "PRIORITY": "Prioritāte",
       "COUNTRY_NAME": "Valsts Nosaukums",
       "REFERER_LINK": "Atsauces saite",
       "CUSTOM_ATTRIBUTE_LIST": "Saraksts",
diff --git a/app/javascript/dashboard/i18n/locale/lv/agentMgmt.json b/app/javascript/dashboard/i18n/locale/lv/agentMgmt.json
index 125b72ff7..f8418bfbf 100644
--- a/app/javascript/dashboard/i18n/locale/lv/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/lv/agentMgmt.json
@@ -76,8 +76,8 @@
         },
         "AGENT_AVAILABILITY": {
           "LABEL": "Pieejamība",
-          "PLACEHOLDER": "Please select an availability status",
-          "ERROR": "Availability is required"
+          "PLACEHOLDER": "Lūdzu, izvēlieties pieejamības statusu",
+          "ERROR": "Nepieciešama pieejamība"
         },
         "SUBMIT": "Rediģēt Aģentu"
       },
@@ -110,7 +110,8 @@
         },
         "PLACEHOLDER": {
           "AGENT": "Meklēt aģentus",
-          "TEAM": "Meklēt komandas"
+          "TEAM": "Meklēt komandas",
+          "INPUT": "Meklēt aģentus"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/lv/contact.json b/app/javascript/dashboard/i18n/locale/lv/contact.json
index 5940a1f88..e940054ac 100644
--- a/app/javascript/dashboard/i18n/locale/lv/contact.json
+++ b/app/javascript/dashboard/i18n/locale/lv/contact.json
@@ -120,9 +120,9 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Ievadiet kontaktpersonas tālruņa numuru",
         "LABEL": "Telefona numurs",
-        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
+        "HELP": "Tālruņa numuram ir jābūt E.164 formātā, piemēram: +1415555555 [+][valsts kods][apgabala kods][vietējais tālruņa numurs]. Nolaižamajā izvēlnē varat izvēlēties numura sastādīšanas kodu.",
         "ERROR": "Tālruņa numuram ir jābūt tukšam, vai E.164 formātā",
-        "DIAL_CODE_ERROR": "Please select a dial code from the list",
+        "DIAL_CODE_ERROR": "Lūdzu, izvēlieties sastādīšanas kodu no saraksta",
         "DUPLICATE": "Šis tālruņa numurs tiek izmantots citai kontaktpersonai."
       },
       "LOCATION": {
@@ -134,15 +134,15 @@
         "LABEL": "Uzņēmuma Nosaukums"
       },
       "COUNTRY": {
-        "PLACEHOLDER": "Enter the country name",
+        "PLACEHOLDER": "Ievadiet valsts nosaukumu",
         "LABEL": "Valsts Nosaukums",
         "SELECT_PLACEHOLDER": "Izvēlieties",
         "REMOVE": "Noņemt",
-        "SELECT_COUNTRY": "Select Country"
+        "SELECT_COUNTRY": "Izvēlies valsti"
       },
       "CITY": {
-        "PLACEHOLDER": "Enter the city name",
-        "LABEL": "City Name"
+        "PLACEHOLDER": "Ievadiet pilsētas nosaukumu",
+        "LABEL": "Pilsētas nosaukums"
       },
       "SOCIAL_PROFILES": {
         "FACEBOOK": {
@@ -182,8 +182,8 @@
         "LABEL": "Kam"
       },
       "INBOX": {
-        "LABEL": "Via Inbox",
-        "PLACEHOLDER": "Choose source inbox",
+        "LABEL": "Izmantojot iesūtni",
+        "PLACEHOLDER": "Izvēlieties avota iesūtni",
         "ERROR": "Izvēlieties iesūtni"
       },
       "SUBJECT": {
diff --git a/app/javascript/dashboard/i18n/locale/lv/conversation.json b/app/javascript/dashboard/i18n/locale/lv/conversation.json
index 842a66dcd..7be501344 100644
--- a/app/javascript/dashboard/i18n/locale/lv/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/lv/conversation.json
@@ -37,6 +37,7 @@
     "UNKNOWN_FILE_TYPE": "Nezināms Fails",
     "SAVE_CONTACT": "Saglabāt",
     "UPLOADING_ATTACHMENTS": "Notiek pielikumu augšupielāde...",
+    "REPLIED_TO_STORY": "Atbildēja uz Jūsu stāstu",
     "SUCCESS_DELETE_MESSAGE": "Ziņojums veiksmīgi izdzēsts",
     "FAIL_DELETE_MESSSAGE": "Nevarēja izdzēst ziņojumu! Mēģiniet vēlreiz",
     "NO_RESPONSE": "Nav atbildes",
@@ -66,6 +67,23 @@
         "NEXT_WEEK": "Nākamā nedēļa"
       }
     },
+    "PRIORITY": {
+      "TITLE": "Prioritāte",
+      "OPTIONS": {
+        "NONE": "Nav",
+        "URGENT": "Steidzama",
+        "HIGH": "Augsta",
+        "MEDIUM": "Vidēja",
+        "LOW": "Zema"
+      },
+      "CHANGE_PRIORITY": {
+        "SELECT_PLACEHOLDER": "Nav",
+        "INPUT_PLACEHOLDER": "Izvēlieties prioritāti",
+        "NO_RESULTS": "Nav atrasts",
+        "SUCCESSFUL": "Sarunas Id %{conversationId} prioritāte nomainīta uz %{priority}",
+        "FAILED": "Nevarēja nomainīt prioritāti. Lūdzu, mēģiniet vēlreiz."
+      }
+    },
     "CARD_CONTEXT_MENU": {
       "PENDING": "Atzīmēt kā neapstiprinātu",
       "RESOLVED": "Atzīmēt kā atrisinātu",
diff --git a/app/javascript/dashboard/i18n/locale/lv/generalSettings.json b/app/javascript/dashboard/i18n/locale/lv/generalSettings.json
index a51724d61..2ad6c8f73 100644
--- a/app/javascript/dashboard/i18n/locale/lv/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/lv/generalSettings.json
@@ -101,6 +101,7 @@
       "REPORTS": "Pārskati",
       "CONVERSATION": "Saruna",
       "CHANGE_ASSIGNEE": "Mainīt Pilnvaroto",
+      "CHANGE_PRIORITY": "Mainīt prioritāti",
       "CHANGE_TEAM": "Mainīt Komandu",
       "ADD_LABEL": "Pievienot sarunai etiķeti",
       "REMOVE_LABEL": "Noņemt etiķeti no sarunas",
@@ -126,6 +127,7 @@
       "GO_TO_NOTIFICATIONS": "Doties uz Paziņojumiem",
       "ADD_LABELS_TO_CONVERSATION": "Pievienot sarunai etiķeti",
       "ASSIGN_AN_AGENT": "Piešķirt aģentu",
+      "ASSIGN_PRIORITY": "Piešķirt prioritāti",
       "ASSIGN_A_TEAM": "Piešķirt komandu",
       "MUTE_CONVERSATION": "Izslēgt sarunu",
       "UNMUTE_CONVERSATION": "Ieslēgt sarunu",
diff --git a/app/javascript/dashboard/i18n/locale/lv/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/lv/inboxMgmt.json
index 12c76e68f..6c2802644 100644
--- a/app/javascript/dashboard/i18n/locale/lv/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/lv/inboxMgmt.json
@@ -482,6 +482,13 @@
       "WHATSAPP_WEBHOOK_SUBHEADER": "Šis marķieris tiek izmantots, lai pārbaudītu webhook endpoint autentiskumu.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Atjaunināt pirms-tērzēšanas veidlapas iestatījumus"
     },
+    "HELP_CENTER": {
+      "LABEL": "Palīdzības centrs",
+      "PLACEHOLDER": "Izvēlēties Palīdzības Centru",
+      "SELECT_PLACEHOLDER": "Izvēlēties Palīdzības Centru",
+      "REMOVE": "Noņemt Palīdzības Centru",
+      "SUB_TEXT": "Pievienot Palīdzības Centru ar iesūtni"
+    },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Automātiskās piešķiršanas ierobežojums",
       "MAX_ASSIGNMENT_LIMIT_RANGE_ERROR": "Lūdzu, ievadiet vērtību, kas ir lielāka par 0",
diff --git a/app/javascript/dashboard/i18n/locale/lv/integrations.json b/app/javascript/dashboard/i18n/locale/lv/integrations.json
index ebc03b297..b8bc345e4 100644
--- a/app/javascript/dashboard/i18n/locale/lv/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/lv/integrations.json
@@ -85,6 +85,23 @@
       "JOIN_ERROR": "Pievienojoties zvanam, radās kļūda. Lūdzu, mēģiniet vēlreiz",
       "CREATE_ERROR": "Veidojot sapulces saiti, radās kļūda. Lūdzu, mēģiniet vēlreiz"
     },
+    "OPEN_AI": {
+      "TITLE": "Uzlabot ar AI",
+      "SUBTITLE": "Izmantojot AI, tiks ģenerēta uzlabota atbilde, pamatojoties uz jūsu pašreizējo melnrakstu.",
+      "TONE": {
+        "TITLE": "Tonis",
+        "OPTIONS": {
+          "PROFESSIONAL": "Profesionāls",
+          "FRIENDLY": "Draudzīgs"
+        }
+      },
+      "BUTTONS": {
+        "GENERATE": "Ģenerēt",
+        "GENERATING": "Notiek ģenerēšana...",
+        "CANCEL": "Atcelt"
+      },
+      "GENERATE_ERROR": "Apstrādājot saturu, radās kļūda. Lūdzu, mēģiniet vēlreiz"
+    },
     "DELETE": {
       "BUTTON_TEXT": "Dzēst",
       "API": {
diff --git a/app/javascript/dashboard/i18n/locale/lv/login.json b/app/javascript/dashboard/i18n/locale/lv/login.json
index 7cc74c8a0..a1ddf8695 100644
--- a/app/javascript/dashboard/i18n/locale/lv/login.json
+++ b/app/javascript/dashboard/i18n/locale/lv/login.json
@@ -3,16 +3,16 @@
     "TITLE": "Login to Chatwoot",
     "EMAIL": {
       "LABEL": "E-pasts",
-      "PLACEHOLDER": "E-pasts, piemēram: kāds@piemērs.com"
+      "PLACEHOLDER": "piemers@firmasnosaukums.com"
     },
     "PASSWORD": {
       "LABEL": "Parole",
       "PLACEHOLDER": "Parole"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Pierakstīšanās Veiksmīga",
-      "ERROR_MESSAGE": "Nevar izveidot savienojumu ar Woot serveri. Lūdzu, vēlāk pamēģiniet vēlreiz",
-      "UNAUTH": "Nepareizs lietotājvārds/parole. Lūdzu mēģiniet vēlreiz"
+      "SUCCESS_MESSAGE": "Pieteikšanās veiksmīga",
+      "ERROR_MESSAGE": "Nevarēja izveidot savienojumu ar Woot serveri. Lūdzu mēģiniet vēlreiz.",
+      "UNAUTH": "Lietotājvārds vai parole ir nepareiza. Lūdzu mēģiniet vēlreiz."
     },
     "OAUTH": {
       "GOOGLE_LOGIN": "Pieslēgties, izmantojot Google",
diff --git a/app/javascript/dashboard/i18n/locale/lv/resetPassword.json b/app/javascript/dashboard/i18n/locale/lv/resetPassword.json
index 4cca9bc79..f0de54f05 100644
--- a/app/javascript/dashboard/i18n/locale/lv/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/lv/resetPassword.json
@@ -1,14 +1,14 @@
 {
   "RESET_PASSWORD": {
-    "TITLE": "Atiestatīt Paroli",
+    "TITLE": "Atiestatīt paroli",
     "EMAIL": {
       "LABEL": "E-pasts",
-      "PLACEHOLDER": "Lūdzu, ievadiet savu e-pastu",
-      "ERROR": "Lūdzu, ievadiet derīgu e-pasta adresi"
+      "PLACEHOLDER": "Lūdzu, ievadiet savu e-pastu.",
+      "ERROR": "Lūdzu, ievadiet derīgu e-pasta adresi."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Paroles atiestatīšanas saite ir nosūtīta uz jūsu e-pastu",
-      "ERROR_MESSAGE": "Nevar izveidot savienojumu ar Woot serveri. Lūdzu, vēlāk pamēģiniet vēlreiz"
+      "SUCCESS_MESSAGE": "Paroles atiestatīšanas saite ir nosūtīta uz jūsu e-pastu.",
+      "ERROR_MESSAGE": "Nevarēja izveidot savienojumu ar Woot serveri. Lūdzu mēģiniet vēlreiz."
     },
     "SUBMIT": "Iesniegt"
   }
diff --git a/app/javascript/dashboard/i18n/locale/lv/search.json b/app/javascript/dashboard/i18n/locale/lv/search.json
index 8bd65d985..8583c3318 100644
--- a/app/javascript/dashboard/i18n/locale/lv/search.json
+++ b/app/javascript/dashboard/i18n/locale/lv/search.json
@@ -14,8 +14,8 @@
     "EMPTY_STATE": "Vaicājumam '%{query}' nav atrasts neviens %{item} vienums",
     "EMPTY_STATE_FULL": "Vaicājumam '%{query}' nav atrasts neviens rezultāts",
     "PLACEHOLDER_KEYBINDING": "/ fokusēt",
-    "INPUT_PLACEHOLDER": "Meklēt ziņas, kontaktpersonas vai sarunas",
-    "EMPTY_STATE_DEFAULT": "Lai iegūtu labākus meklēšanas rezultātus, meklējiet pēc sarunas Id, e-pasta, tālruņa numura vai ziņām.",
+    "INPUT_PLACEHOLDER": "Ievadiet 3, vai vairāk, rakstzīmes, lai meklētu",
+    "EMPTY_STATE_DEFAULT": "Lai iegūtu labākus meklēšanas rezultātus, meklējiet pēc sarunas Id, e-pasta, tālruņa numura vai ziņām. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Lasīt vairāk",
     "WROTE": "rakstīja:"
diff --git a/app/javascript/dashboard/i18n/locale/lv/setNewPassword.json b/app/javascript/dashboard/i18n/locale/lv/setNewPassword.json
index 4da6b70c3..1001e99e3 100644
--- a/app/javascript/dashboard/i18n/locale/lv/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/lv/setNewPassword.json
@@ -1,19 +1,19 @@
 {
   "SET_NEW_PASSWORD": {
-    "TITLE": "Iestatiet Jaunu Paroli",
+    "TITLE": "Ievadiet jauno paroli",
     "PASSWORD": {
       "LABEL": "Parole",
       "PLACEHOLDER": "Parole",
-      "ERROR": "Parole ir pārāk īsa"
+      "ERROR": "Parole ir pārāk īsa."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Apstipriniet Paroli",
+      "LABEL": "Apstipriniet paroli",
       "PLACEHOLDER": "Apstipriniet Paroli",
-      "ERROR": "Paroles nesakrīt"
+      "ERROR": "Paroles nesakrīt."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Parole ir veiksmīgi nomainīta",
-      "ERROR_MESSAGE": "Nevar izveidot savienojumu ar Woot serveri. Lūdzu, vēlāk pamēģiniet vēlreiz"
+      "SUCCESS_MESSAGE": "Parole ir veiksmīgi nomainīta.",
+      "ERROR_MESSAGE": "Nevarēja izveidot savienojumu ar Woot serveri. Lūdzu mēģiniet vēlreiz."
     },
     "CAPTCHA": {
       "ERROR": "Verifikācijas derīguma termiņš ir beidzies. Lūdzu, vēlreiz atrisiniet captcha."
diff --git a/app/javascript/dashboard/i18n/locale/lv/settings.json b/app/javascript/dashboard/i18n/locale/lv/settings.json
index f1a0441c0..04c4196e3 100644
--- a/app/javascript/dashboard/i18n/locale/lv/settings.json
+++ b/app/javascript/dashboard/i18n/locale/lv/settings.json
@@ -164,7 +164,7 @@
   "COMPONENTS": {
     "CODE": {
       "BUTTON_TEXT": "Kopēt",
-      "CODEPEN": "Open in CodePen",
+      "CODEPEN": "Atvērt programmā CodePen",
       "COPY_SUCCESSFUL": "Kopēts starpliktuvē"
     },
     "SHOW_MORE_BLOCK": {
diff --git a/app/javascript/dashboard/i18n/locale/lv/signup.json b/app/javascript/dashboard/i18n/locale/lv/signup.json
index 0f8bebdc2..b3ff56d4b 100644
--- a/app/javascript/dashboard/i18n/locale/lv/signup.json
+++ b/app/javascript/dashboard/i18n/locale/lv/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Uzņēmuma nosaukums",
-      "PLACEHOLDER": "Ievadiet sava uzņēmuma nosaukumu. Piemēram: Wayne Enterprises",
-      "ERROR": "Uzņēmuma nosaukums ir pārāk īss"
+      "PLACEHOLDER": "Ievadiet sava uzņēmuma nosaukumu. Piemēram, Wayne Enterprises",
+      "ERROR": "Uzņēmuma nosaukums ir pārāk īss."
     },
     "FULL_NAME": {
       "LABEL": "Pilnais vārds",
-      "PLACEHOLDER": "Ievadiet savu pilno vārdu. Piemēram: Bruce Wayne",
-      "ERROR": "Pilnais vārds ir pārāk īss"
+      "PLACEHOLDER": "Ievadiet savu pilno vārdu. Piemēram, Brūss Veins",
+      "ERROR": "Pilnais vārds ir pārāk īss."
     },
     "EMAIL": {
       "LABEL": "Darba e-pasts",
-      "PLACEHOLDER": "Ievadiet savu darba e-pasta adresi. Piemēram: bruce@wayne.enterprises",
-      "ERROR": "Lūdzu, ievadiet derīgu darba e-pasta adresi"
+      "PLACEHOLDER": "Ievadiet savu darba e-pasta adresi. Piemēram, bruce@wayne.enterprises",
+      "ERROR": "Lūdzu, ievadiet derīgu darba e-pasta adresi."
     },
     "PASSWORD": {
       "LABEL": "Parole",
       "PLACEHOLDER": "Parole",
-      "ERROR": "Parole ir pārāk īsa",
-      "IS_INVALID_PASSWORD": "Parolei ir jāsatur vismaz 1 lielais burts, 1 mazais burts, 1 cipars un 1 speciālā rakstzīme"
+      "ERROR": "Parole ir pārāk īsa.",
+      "IS_INVALID_PASSWORD": "Parolei ir jāsatur vismaz 1 lielais burts, 1 mazais burts, 1 cipars un 1 speciālā rakstzīme."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Apstipriniet Paroli",
-      "PLACEHOLDER": "Apstipriniet Paroli",
-      "ERROR": "Parole nesakrīt"
+      "LABEL": "Apstipriniet paroli",
+      "PLACEHOLDER": "Apstipriniet paroli",
+      "ERROR": "Parole nesakrīt."
     },
     "API": {
       "SUCCESS_MESSAGE": "Reģistrācija sekmīga",
-      "ERROR_MESSAGE": "Nevar izveidot savienojumu ar Woot serveri. Lūdzu, vēlāk pamēģiniet vēlreiz"
+      "ERROR_MESSAGE": "Nevarēja izveidot savienojumu ar Woot serveri. Lūdzu mēģiniet vēlreiz."
     },
     "SUBMIT": "Izveidot kontu",
     "HAVE_AN_ACCOUNT": "Jau ir konts?"
diff --git a/app/javascript/dashboard/i18n/locale/ml/advancedFilters.json b/app/javascript/dashboard/i18n/locale/ml/advancedFilters.json
index bf0899346..1809dc783 100644
--- a/app/javascript/dashboard/i18n/locale/ml/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/ml/advancedFilters.json
@@ -38,6 +38,7 @@
       "CAMPAIGN_NAME": "പ്രചാരണ നാമം",
       "LABELS": "ലേബലുകൾ",
       "BROWSER_LANGUAGE": "ബ്രൗസറിന്റെ ഭാഷ",
+      "PRIORITY": "Priority",
       "COUNTRY_NAME": "രാജ്യത്തിന്റെ പേര്",
       "REFERER_LINK": "റഫറർ ലിങ്ക്",
       "CUSTOM_ATTRIBUTE_LIST": "List",
diff --git a/app/javascript/dashboard/i18n/locale/ml/agentMgmt.json b/app/javascript/dashboard/i18n/locale/ml/agentMgmt.json
index fe7c43ad4..32825a222 100644
--- a/app/javascript/dashboard/i18n/locale/ml/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ml/agentMgmt.json
@@ -110,7 +110,8 @@
         },
         "PLACEHOLDER": {
           "AGENT": "ഏജന്റുകളെ തിരയുക",
-          "TEAM": "ടീമുകളെ തിരയുക"
+          "TEAM": "ടീമുകളെ തിരയുക",
+          "INPUT": "Search for agents"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/ml/conversation.json b/app/javascript/dashboard/i18n/locale/ml/conversation.json
index fc65b17ec..87cf27680 100644
--- a/app/javascript/dashboard/i18n/locale/ml/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ml/conversation.json
@@ -37,6 +37,7 @@
     "UNKNOWN_FILE_TYPE": "Unknown File",
     "SAVE_CONTACT": "Save",
     "UPLOADING_ATTACHMENTS": "Uploading attachments...",
+    "REPLIED_TO_STORY": "Replied to your story",
     "SUCCESS_DELETE_MESSAGE": "Message deleted successfully",
     "FAIL_DELETE_MESSSAGE": "Couldn't delete message! Try again",
     "NO_RESPONSE": "No response",
@@ -66,6 +67,23 @@
         "NEXT_WEEK": "Next week"
       }
     },
+    "PRIORITY": {
+      "TITLE": "Priority",
+      "OPTIONS": {
+        "NONE": "ഒന്നുമില്ല",
+        "URGENT": "Urgent",
+        "HIGH": "High",
+        "MEDIUM": "Medium",
+        "LOW": "Low"
+      },
+      "CHANGE_PRIORITY": {
+        "SELECT_PLACEHOLDER": "ഒന്നുമില്ല",
+        "INPUT_PLACEHOLDER": "Select priority",
+        "NO_RESULTS": "ഒരു ഫലവും കണ്ടെത്താനായില്ല",
+        "SUCCESSFUL": "Changed priority of conversation id %{conversationId} to %{priority}",
+        "FAILED": "Couldn't change priority. Please try again."
+      }
+    },
     "CARD_CONTEXT_MENU": {
       "PENDING": "Mark as pending",
       "RESOLVED": "Mark as resolved",
diff --git a/app/javascript/dashboard/i18n/locale/ml/generalSettings.json b/app/javascript/dashboard/i18n/locale/ml/generalSettings.json
index d34d43ecb..17d841f4f 100644
--- a/app/javascript/dashboard/i18n/locale/ml/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ml/generalSettings.json
@@ -101,6 +101,7 @@
       "REPORTS": "റിപ്പോർട്ടുകൾ",
       "CONVERSATION": "സംഭാഷണം",
       "CHANGE_ASSIGNEE": "Change Assignee",
+      "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Change Team",
       "ADD_LABEL": "Add label to the conversation",
       "REMOVE_LABEL": "Remove label from the conversation",
@@ -126,6 +127,7 @@
       "GO_TO_NOTIFICATIONS": "Go to Notifications",
       "ADD_LABELS_TO_CONVERSATION": "Add label to the conversation",
       "ASSIGN_AN_AGENT": "Assign an agent",
+      "ASSIGN_PRIORITY": "Assign priority",
       "ASSIGN_A_TEAM": "Assign a team",
       "MUTE_CONVERSATION": "Mute conversation",
       "UNMUTE_CONVERSATION": "Unmute conversation",
diff --git a/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json
index 62ecc1bb0..c4559f31d 100644
--- a/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json
@@ -482,6 +482,13 @@
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
+    "HELP_CENTER": {
+      "LABEL": "Help Center",
+      "PLACEHOLDER": "Select Help Center",
+      "SELECT_PLACEHOLDER": "Select Help Center",
+      "REMOVE": "Remove Help Center",
+      "SUB_TEXT": "Attach a Help Center with the inbox"
+    },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
       "MAX_ASSIGNMENT_LIMIT_RANGE_ERROR": "Please enter a value greater than 0",
diff --git a/app/javascript/dashboard/i18n/locale/ml/integrations.json b/app/javascript/dashboard/i18n/locale/ml/integrations.json
index 99e0ccc5d..cf446a476 100644
--- a/app/javascript/dashboard/i18n/locale/ml/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ml/integrations.json
@@ -85,6 +85,23 @@
       "JOIN_ERROR": "There was an error joining the call, please try again",
       "CREATE_ERROR": "There was an error creating a meeting link, please try again"
     },
+    "OPEN_AI": {
+      "TITLE": "Improve With AI",
+      "SUBTITLE": "An improved reply will be generated using AI, based on your current draft.",
+      "TONE": {
+        "TITLE": "Tone",
+        "OPTIONS": {
+          "PROFESSIONAL": "Professional",
+          "FRIENDLY": "Friendly"
+        }
+      },
+      "BUTTONS": {
+        "GENERATE": "Generate",
+        "GENERATING": "Generating...",
+        "CANCEL": "റദ്ദാക്കുക"
+      },
+      "GENERATE_ERROR": "There was an error processing the content, please try again"
+    },
     "DELETE": {
       "BUTTON_TEXT": "ഇല്ലാതാക്കുക",
       "API": {
diff --git a/app/javascript/dashboard/i18n/locale/ml/login.json b/app/javascript/dashboard/i18n/locale/ml/login.json
index 820979587..731a80c6e 100644
--- a/app/javascript/dashboard/i18n/locale/ml/login.json
+++ b/app/javascript/dashboard/i18n/locale/ml/login.json
@@ -3,16 +3,16 @@
     "TITLE": "ചാറ്റ് വൂട്ടിലേക്ക് ലോഗിൻ ചെയ്യുക",
     "EMAIL": {
       "LABEL": "ഇമെയിൽ",
-      "PLACEHOLDER": "ഇമെയിൽ ഉദാ: someone@example.com"
+      "PLACEHOLDER": "example@companyname.com"
     },
     "PASSWORD": {
       "LABEL": "പാസ്‌വേഡ്",
       "PLACEHOLDER": "പാസ്‌വേഡ്"
     },
     "API": {
-      "SUCCESS_MESSAGE": "ലോഗിൻ വിജയകരം",
-      "ERROR_MESSAGE": "വൂട്ട് സെർവറിലേക്ക് കണക്റ്റു ചെയ്യാനായില്ല, ദയവായി പിന്നീട് വീണ്ടും ശ്രമിക്കുക",
-      "UNAUTH": "ഉപയോക്തൃനാമം / പാസ്‌വേഡ് തെറ്റാണ്. ദയവായി വീണ്ടും ശ്രമിക്കുക"
+      "SUCCESS_MESSAGE": "Login successful",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again.",
+      "UNAUTH": "Username or password is incorrect. Please try again."
     },
     "OAUTH": {
       "GOOGLE_LOGIN": "Login with Google",
diff --git a/app/javascript/dashboard/i18n/locale/ml/resetPassword.json b/app/javascript/dashboard/i18n/locale/ml/resetPassword.json
index 66b59eec0..382cc8bcd 100644
--- a/app/javascript/dashboard/i18n/locale/ml/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/ml/resetPassword.json
@@ -1,14 +1,14 @@
 {
   "RESET_PASSWORD": {
-    "TITLE": "പാസ്‌വേഡ് പുനഃസജീകരിക്കുക",
+    "TITLE": "പാസ്‌വേഡ് പുനഃസജ്ജമാക്കുക",
     "EMAIL": {
       "LABEL": "ഇമെയിൽ",
-      "PLACEHOLDER": "ദയവായി നിങ്ങളുടെ ഇമെയിൽ നൽകുക",
-      "ERROR": "ദയവായി സാധുവായ ഒരു ഇമെയിൽ നൽകുക"
+      "PLACEHOLDER": "ദയവായി നിങ്ങളുടെ ഇമെയിൽ നൽകുക.",
+      "ERROR": "ദയവായി സാധുവായ ഒരു ഇമെയിൽ നൽകുക."
     },
     "API": {
-      "SUCCESS_MESSAGE": "പാസ്‌വേഡ് പുനഃസജ്ജീകരണ ലിങ്ക് നിങ്ങളുടെ ഇമെയിലിലേക്ക് അയച്ചു",
-      "ERROR_MESSAGE": "വൂട്ട് സെർവറിലേക്ക് കണക്റ്റുചെയ്യാനായില്ല, ദയവായി പിന്നീട് വീണ്ടും ശ്രമിക്കുക"
+      "SUCCESS_MESSAGE": "Password reset link has been sent to your email.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "സമർപ്പിക്കുക"
   }
diff --git a/app/javascript/dashboard/i18n/locale/ml/search.json b/app/javascript/dashboard/i18n/locale/ml/search.json
index 86dfcafd6..8c651dfab 100644
--- a/app/javascript/dashboard/i18n/locale/ml/search.json
+++ b/app/javascript/dashboard/i18n/locale/ml/search.json
@@ -14,8 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
-    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
+    "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "ബോട്ട്",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/ml/setNewPassword.json b/app/javascript/dashboard/i18n/locale/ml/setNewPassword.json
index 3a852f0d5..312a7a4df 100644
--- a/app/javascript/dashboard/i18n/locale/ml/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/ml/setNewPassword.json
@@ -1,19 +1,19 @@
 {
   "SET_NEW_PASSWORD": {
-    "TITLE": "പുതിയ പാസ്‌വേഡ് സജ്ജമാക്കുക",
+    "TITLE": "Set new password",
     "PASSWORD": {
       "LABEL": "പാസ്‌വേഡ്",
       "PLACEHOLDER": "പാസ്‌വേഡ്",
-      "ERROR": "പാസ്‌വേഡ് വളരെ ചെറുതാണ്"
+      "ERROR": "Password is too short."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "പാസ്‌വേഡ് സ്ഥിരീകരിക്കുക",
+      "LABEL": "Confirm password",
       "PLACEHOLDER": "പാസ്‌വേഡ് സ്ഥിരീകരിക്കുക",
-      "ERROR": "പാസ്‌വേഡുകൾ പൊരുത്തപ്പെടുന്നില്ല"
+      "ERROR": "പാസ്‌വേഡുകൾ പൊരുത്തപ്പെടുന്നില്ല."
     },
     "API": {
-      "SUCCESS_MESSAGE": "പാസ്‌വേഡ് വിജയകരമായി മാറ്റി",
-      "ERROR_MESSAGE": "സെർവറിലേക്ക് കണക്റ്റുചെയ്യാനായില്ല, ദയവായി പിന്നീട് വീണ്ടും ശ്രമിക്കുക"
+      "SUCCESS_MESSAGE": "Successfully changed the password.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "CAPTCHA": {
       "ERROR": "Verification expired. Please solve captcha again."
diff --git a/app/javascript/dashboard/i18n/locale/ml/signup.json b/app/javascript/dashboard/i18n/locale/ml/signup.json
index e4d2ef6b7..ed67990ba 100644
--- a/app/javascript/dashboard/i18n/locale/ml/signup.json
+++ b/app/javascript/dashboard/i18n/locale/ml/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Company name",
-      "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
-      "ERROR": "Company name is too short"
+      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
+      "ERROR": "Company name is too short."
     },
     "FULL_NAME": {
       "LABEL": "Full name",
-      "PLACEHOLDER": "Enter your full name. eg: Bruce Wayne",
-      "ERROR": "Full name is too short"
+      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
+      "ERROR": "Full name is too short."
     },
     "EMAIL": {
       "LABEL": "Work email",
-      "PLACEHOLDER": "Enter your work email address. eg: bruce@wayne.enterprises",
-      "ERROR": "Please enter a valid work email address"
+      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
+      "ERROR": "Please enter a valid work email address."
     },
     "PASSWORD": {
       "LABEL": "പാസ്‌വേഡ്",
       "PLACEHOLDER": "പാസ്‌വേഡ്",
-      "ERROR": "പാസ്‌വേഡ് വളരെ ചെറുതാണ്",
-      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
+      "ERROR": "Password is too short.",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "പാസ്‌വേഡ് സ്ഥിരീകരിക്കുക",
-      "PLACEHOLDER": "പാസ്‌വേഡ് സ്ഥിരീകരിക്കുക",
-      "ERROR": "പാസ്‌വേഡുകൾ പൊരുത്തപ്പെടുന്നില്ല"
+      "LABEL": "Confirm password",
+      "PLACEHOLDER": "Confirm password",
+      "ERROR": "പാസ്‌വേഡുകൾ പൊരുത്തപ്പെടുന്നില്ല."
     },
     "API": {
       "SUCCESS_MESSAGE": "രജിസ്ട്രേഷൻ വിജയകരമാണ്",
-      "ERROR_MESSAGE": "സെർവറിലേക്ക് കണക്റ്റുചെയ്യാനായില്ല, ദയവായി പിന്നീട് വീണ്ടും ശ്രമിക്കുക"
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Create account",
     "HAVE_AN_ACCOUNT": "Already have an account?"
diff --git a/app/javascript/dashboard/i18n/locale/ms/advancedFilters.json b/app/javascript/dashboard/i18n/locale/ms/advancedFilters.json
index c064b75f5..05f3cfee3 100644
--- a/app/javascript/dashboard/i18n/locale/ms/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/ms/advancedFilters.json
@@ -38,6 +38,7 @@
       "CAMPAIGN_NAME": "Nama Kempen",
       "LABELS": "Label",
       "BROWSER_LANGUAGE": "Bahasa Pelayar",
+      "PRIORITY": "Priority",
       "COUNTRY_NAME": "Nama Negara",
       "REFERER_LINK": "Perujuk pautan",
       "CUSTOM_ATTRIBUTE_LIST": "Senarai",
diff --git a/app/javascript/dashboard/i18n/locale/ms/agentMgmt.json b/app/javascript/dashboard/i18n/locale/ms/agentMgmt.json
index 31e811ea5..eb331f5f5 100644
--- a/app/javascript/dashboard/i18n/locale/ms/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ms/agentMgmt.json
@@ -110,7 +110,8 @@
         },
         "PLACEHOLDER": {
           "AGENT": "Cari ejen",
-          "TEAM": "Cari pasukan"
+          "TEAM": "Cari pasukan",
+          "INPUT": "Search for agents"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/ms/conversation.json b/app/javascript/dashboard/i18n/locale/ms/conversation.json
index 912511803..806957e16 100644
--- a/app/javascript/dashboard/i18n/locale/ms/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ms/conversation.json
@@ -37,6 +37,7 @@
     "UNKNOWN_FILE_TYPE": "Unknown File",
     "SAVE_CONTACT": "Save",
     "UPLOADING_ATTACHMENTS": "Uploading attachments...",
+    "REPLIED_TO_STORY": "Replied to your story",
     "SUCCESS_DELETE_MESSAGE": "Message deleted successfully",
     "FAIL_DELETE_MESSSAGE": "Couldn't delete message! Try again",
     "NO_RESPONSE": "No response",
@@ -66,6 +67,23 @@
         "NEXT_WEEK": "Next week"
       }
     },
+    "PRIORITY": {
+      "TITLE": "Priority",
+      "OPTIONS": {
+        "NONE": "Tiada",
+        "URGENT": "Urgent",
+        "HIGH": "High",
+        "MEDIUM": "Medium",
+        "LOW": "Low"
+      },
+      "CHANGE_PRIORITY": {
+        "SELECT_PLACEHOLDER": "Tiada",
+        "INPUT_PLACEHOLDER": "Select priority",
+        "NO_RESULTS": "Tiada dijumpa",
+        "SUCCESSFUL": "Changed priority of conversation id %{conversationId} to %{priority}",
+        "FAILED": "Couldn't change priority. Please try again."
+      }
+    },
     "CARD_CONTEXT_MENU": {
       "PENDING": "Mark as pending",
       "RESOLVED": "Mark as resolved",
diff --git a/app/javascript/dashboard/i18n/locale/ms/generalSettings.json b/app/javascript/dashboard/i18n/locale/ms/generalSettings.json
index 8b2f2017d..25178ae29 100644
--- a/app/javascript/dashboard/i18n/locale/ms/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ms/generalSettings.json
@@ -101,6 +101,7 @@
       "REPORTS": "Reports",
       "CONVERSATION": "Conversation",
       "CHANGE_ASSIGNEE": "Change Assignee",
+      "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Change Team",
       "ADD_LABEL": "Add label to the conversation",
       "REMOVE_LABEL": "Remove label from the conversation",
@@ -126,6 +127,7 @@
       "GO_TO_NOTIFICATIONS": "Go to Notifications",
       "ADD_LABELS_TO_CONVERSATION": "Add label to the conversation",
       "ASSIGN_AN_AGENT": "Assign an agent",
+      "ASSIGN_PRIORITY": "Assign priority",
       "ASSIGN_A_TEAM": "Assign a team",
       "MUTE_CONVERSATION": "Mute conversation",
       "UNMUTE_CONVERSATION": "Unmute conversation",
diff --git a/app/javascript/dashboard/i18n/locale/ms/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ms/inboxMgmt.json
index 7071700cf..776253f1e 100644
--- a/app/javascript/dashboard/i18n/locale/ms/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ms/inboxMgmt.json
@@ -482,6 +482,13 @@
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
+    "HELP_CENTER": {
+      "LABEL": "Help Center",
+      "PLACEHOLDER": "Select Help Center",
+      "SELECT_PLACEHOLDER": "Select Help Center",
+      "REMOVE": "Remove Help Center",
+      "SUB_TEXT": "Attach a Help Center with the inbox"
+    },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
       "MAX_ASSIGNMENT_LIMIT_RANGE_ERROR": "Please enter a value greater than 0",
diff --git a/app/javascript/dashboard/i18n/locale/ms/integrations.json b/app/javascript/dashboard/i18n/locale/ms/integrations.json
index c5728e00a..537720e15 100644
--- a/app/javascript/dashboard/i18n/locale/ms/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ms/integrations.json
@@ -85,6 +85,23 @@
       "JOIN_ERROR": "There was an error joining the call, please try again",
       "CREATE_ERROR": "There was an error creating a meeting link, please try again"
     },
+    "OPEN_AI": {
+      "TITLE": "Improve With AI",
+      "SUBTITLE": "An improved reply will be generated using AI, based on your current draft.",
+      "TONE": {
+        "TITLE": "Tone",
+        "OPTIONS": {
+          "PROFESSIONAL": "Professional",
+          "FRIENDLY": "Friendly"
+        }
+      },
+      "BUTTONS": {
+        "GENERATE": "Generate",
+        "GENERATING": "Generating...",
+        "CANCEL": "Batalkan"
+      },
+      "GENERATE_ERROR": "There was an error processing the content, please try again"
+    },
     "DELETE": {
       "BUTTON_TEXT": "Padamkan",
       "API": {
diff --git a/app/javascript/dashboard/i18n/locale/ms/login.json b/app/javascript/dashboard/i18n/locale/ms/login.json
index ca8d181b9..f2b2f51b9 100644
--- a/app/javascript/dashboard/i18n/locale/ms/login.json
+++ b/app/javascript/dashboard/i18n/locale/ms/login.json
@@ -3,16 +3,16 @@
     "TITLE": "Login to Chatwoot",
     "EMAIL": {
       "LABEL": "Email",
-      "PLACEHOLDER": "Email eg: someone@example.com"
+      "PLACEHOLDER": "example@companyname.com"
     },
     "PASSWORD": {
       "LABEL": "Password",
       "PLACEHOLDER": "Password"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Login Successful",
-      "ERROR_MESSAGE": "Masalah untuk hubungi Woot Server, Sila cuba sebentar lagi",
-      "UNAUTH": "Username / Password Incorrect. Please try again"
+      "SUCCESS_MESSAGE": "Login successful",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again.",
+      "UNAUTH": "Username or password is incorrect. Please try again."
     },
     "OAUTH": {
       "GOOGLE_LOGIN": "Login with Google",
diff --git a/app/javascript/dashboard/i18n/locale/ms/resetPassword.json b/app/javascript/dashboard/i18n/locale/ms/resetPassword.json
index b930d6e33..37aa1860a 100644
--- a/app/javascript/dashboard/i18n/locale/ms/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/ms/resetPassword.json
@@ -1,14 +1,14 @@
 {
   "RESET_PASSWORD": {
-    "TITLE": "Reset kata laluan",
+    "TITLE": "Reset password",
     "EMAIL": {
       "LABEL": "Email",
-      "PLACEHOLDER": "Please enter your email",
-      "ERROR": "Please enter a valid email"
+      "PLACEHOLDER": "Please enter your email.",
+      "ERROR": "Please enter a valid email."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Password reset link has been sent to your email",
-      "ERROR_MESSAGE": "Masalah untuk hubungi Woot Server, Sila cuba sebentar lagi"
+      "SUCCESS_MESSAGE": "Password reset link has been sent to your email.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Submit"
   }
diff --git a/app/javascript/dashboard/i18n/locale/ms/search.json b/app/javascript/dashboard/i18n/locale/ms/search.json
index 418572c0c..9044bf5f9 100644
--- a/app/javascript/dashboard/i18n/locale/ms/search.json
+++ b/app/javascript/dashboard/i18n/locale/ms/search.json
@@ -14,8 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
-    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
+    "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/ms/setNewPassword.json b/app/javascript/dashboard/i18n/locale/ms/setNewPassword.json
index 9781b25c0..4908dad02 100644
--- a/app/javascript/dashboard/i18n/locale/ms/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/ms/setNewPassword.json
@@ -1,19 +1,19 @@
 {
   "SET_NEW_PASSWORD": {
-    "TITLE": "Set New Password",
+    "TITLE": "Set new password",
     "PASSWORD": {
       "LABEL": "Password",
       "PLACEHOLDER": "Password",
-      "ERROR": "Password is too short"
+      "ERROR": "Password is too short."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirm Password",
+      "LABEL": "Confirm password",
       "PLACEHOLDER": "Confirm Password",
-      "ERROR": "Passwords do not match"
+      "ERROR": "Passwords do not match."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Successfully changed the password",
-      "ERROR_MESSAGE": "Masalah untuk hubungi Woot Server, Sila cuba sebentar lagi"
+      "SUCCESS_MESSAGE": "Successfully changed the password.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "CAPTCHA": {
       "ERROR": "Verification expired. Please solve captcha again."
diff --git a/app/javascript/dashboard/i18n/locale/ms/signup.json b/app/javascript/dashboard/i18n/locale/ms/signup.json
index dafa02ebc..1ad4865ff 100644
--- a/app/javascript/dashboard/i18n/locale/ms/signup.json
+++ b/app/javascript/dashboard/i18n/locale/ms/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Company name",
-      "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
-      "ERROR": "Company name is too short"
+      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
+      "ERROR": "Company name is too short."
     },
     "FULL_NAME": {
       "LABEL": "Full name",
-      "PLACEHOLDER": "Enter your full name. eg: Bruce Wayne",
-      "ERROR": "Full name is too short"
+      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
+      "ERROR": "Full name is too short."
     },
     "EMAIL": {
       "LABEL": "Work email",
-      "PLACEHOLDER": "Enter your work email address. eg: bruce@wayne.enterprises",
-      "ERROR": "Please enter a valid work email address"
+      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
+      "ERROR": "Please enter a valid work email address."
     },
     "PASSWORD": {
       "LABEL": "Password",
       "PLACEHOLDER": "Password",
-      "ERROR": "Password is too short",
-      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
+      "ERROR": "Password is too short.",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirm Password",
-      "PLACEHOLDER": "Confirm Password",
-      "ERROR": "Password doesnot match"
+      "LABEL": "Confirm password",
+      "PLACEHOLDER": "Confirm password",
+      "ERROR": "Password doesnot match."
     },
     "API": {
       "SUCCESS_MESSAGE": "Registration Successfull",
-      "ERROR_MESSAGE": "Masalah untuk hubungi Woot Server, Sila cuba sebentar lagi"
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Create account",
     "HAVE_AN_ACCOUNT": "Already have an account?"
diff --git a/app/javascript/dashboard/i18n/locale/ne/advancedFilters.json b/app/javascript/dashboard/i18n/locale/ne/advancedFilters.json
index a32c1bd9d..361c0c8ae 100644
--- a/app/javascript/dashboard/i18n/locale/ne/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/ne/advancedFilters.json
@@ -38,6 +38,7 @@
       "CAMPAIGN_NAME": "Campaign Name",
       "LABELS": "Labels",
       "BROWSER_LANGUAGE": "Browser Language",
+      "PRIORITY": "Priority",
       "COUNTRY_NAME": "Country Name",
       "REFERER_LINK": "Referer link",
       "CUSTOM_ATTRIBUTE_LIST": "List",
diff --git a/app/javascript/dashboard/i18n/locale/ne/agentMgmt.json b/app/javascript/dashboard/i18n/locale/ne/agentMgmt.json
index b44e74542..b563de61f 100644
--- a/app/javascript/dashboard/i18n/locale/ne/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ne/agentMgmt.json
@@ -110,7 +110,8 @@
         },
         "PLACEHOLDER": {
           "AGENT": "Search agents",
-          "TEAM": "Search teams"
+          "TEAM": "Search teams",
+          "INPUT": "Search for agents"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/ne/conversation.json b/app/javascript/dashboard/i18n/locale/ne/conversation.json
index b1519d4e2..e4eb4e5dd 100644
--- a/app/javascript/dashboard/i18n/locale/ne/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ne/conversation.json
@@ -37,6 +37,7 @@
     "UNKNOWN_FILE_TYPE": "Unknown File",
     "SAVE_CONTACT": "Save",
     "UPLOADING_ATTACHMENTS": "Uploading attachments...",
+    "REPLIED_TO_STORY": "Replied to your story",
     "SUCCESS_DELETE_MESSAGE": "Message deleted successfully",
     "FAIL_DELETE_MESSSAGE": "Couldn't delete message! Try again",
     "NO_RESPONSE": "No response",
@@ -66,6 +67,23 @@
         "NEXT_WEEK": "Next week"
       }
     },
+    "PRIORITY": {
+      "TITLE": "Priority",
+      "OPTIONS": {
+        "NONE": "None",
+        "URGENT": "Urgent",
+        "HIGH": "High",
+        "MEDIUM": "Medium",
+        "LOW": "Low"
+      },
+      "CHANGE_PRIORITY": {
+        "SELECT_PLACEHOLDER": "None",
+        "INPUT_PLACEHOLDER": "Select priority",
+        "NO_RESULTS": "No results found",
+        "SUCCESSFUL": "Changed priority of conversation id %{conversationId} to %{priority}",
+        "FAILED": "Couldn't change priority. Please try again."
+      }
+    },
     "CARD_CONTEXT_MENU": {
       "PENDING": "Mark as pending",
       "RESOLVED": "Mark as resolved",
diff --git a/app/javascript/dashboard/i18n/locale/ne/generalSettings.json b/app/javascript/dashboard/i18n/locale/ne/generalSettings.json
index 367b35b1c..7ed6d8925 100644
--- a/app/javascript/dashboard/i18n/locale/ne/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ne/generalSettings.json
@@ -101,6 +101,7 @@
       "REPORTS": "Reports",
       "CONVERSATION": "Conversation",
       "CHANGE_ASSIGNEE": "Change Assignee",
+      "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Change Team",
       "ADD_LABEL": "Add label to the conversation",
       "REMOVE_LABEL": "Remove label from the conversation",
@@ -126,6 +127,7 @@
       "GO_TO_NOTIFICATIONS": "Go to Notifications",
       "ADD_LABELS_TO_CONVERSATION": "Add label to the conversation",
       "ASSIGN_AN_AGENT": "Assign an agent",
+      "ASSIGN_PRIORITY": "Assign priority",
       "ASSIGN_A_TEAM": "Assign a team",
       "MUTE_CONVERSATION": "Mute conversation",
       "UNMUTE_CONVERSATION": "Unmute conversation",
diff --git a/app/javascript/dashboard/i18n/locale/ne/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ne/inboxMgmt.json
index 726687bff..db5a83f7f 100644
--- a/app/javascript/dashboard/i18n/locale/ne/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ne/inboxMgmt.json
@@ -482,6 +482,13 @@
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
+    "HELP_CENTER": {
+      "LABEL": "Help Center",
+      "PLACEHOLDER": "Select Help Center",
+      "SELECT_PLACEHOLDER": "Select Help Center",
+      "REMOVE": "Remove Help Center",
+      "SUB_TEXT": "Attach a Help Center with the inbox"
+    },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
       "MAX_ASSIGNMENT_LIMIT_RANGE_ERROR": "Please enter a value greater than 0",
diff --git a/app/javascript/dashboard/i18n/locale/ne/integrations.json b/app/javascript/dashboard/i18n/locale/ne/integrations.json
index 3a6591d09..74b7ad047 100644
--- a/app/javascript/dashboard/i18n/locale/ne/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ne/integrations.json
@@ -85,6 +85,23 @@
       "JOIN_ERROR": "There was an error joining the call, please try again",
       "CREATE_ERROR": "There was an error creating a meeting link, please try again"
     },
+    "OPEN_AI": {
+      "TITLE": "Improve With AI",
+      "SUBTITLE": "An improved reply will be generated using AI, based on your current draft.",
+      "TONE": {
+        "TITLE": "Tone",
+        "OPTIONS": {
+          "PROFESSIONAL": "Professional",
+          "FRIENDLY": "Friendly"
+        }
+      },
+      "BUTTONS": {
+        "GENERATE": "Generate",
+        "GENERATING": "Generating...",
+        "CANCEL": "Cancel"
+      },
+      "GENERATE_ERROR": "There was an error processing the content, please try again"
+    },
     "DELETE": {
       "BUTTON_TEXT": "Delete",
       "API": {
diff --git a/app/javascript/dashboard/i18n/locale/ne/login.json b/app/javascript/dashboard/i18n/locale/ne/login.json
index 25c956a81..f2b2f51b9 100644
--- a/app/javascript/dashboard/i18n/locale/ne/login.json
+++ b/app/javascript/dashboard/i18n/locale/ne/login.json
@@ -3,16 +3,16 @@
     "TITLE": "Login to Chatwoot",
     "EMAIL": {
       "LABEL": "Email",
-      "PLACEHOLDER": "Email eg: someone@example.com"
+      "PLACEHOLDER": "example@companyname.com"
     },
     "PASSWORD": {
       "LABEL": "Password",
       "PLACEHOLDER": "Password"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Login Successful",
-      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later",
-      "UNAUTH": "Username / Password Incorrect. Please try again"
+      "SUCCESS_MESSAGE": "Login successful",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again.",
+      "UNAUTH": "Username or password is incorrect. Please try again."
     },
     "OAUTH": {
       "GOOGLE_LOGIN": "Login with Google",
diff --git a/app/javascript/dashboard/i18n/locale/ne/resetPassword.json b/app/javascript/dashboard/i18n/locale/ne/resetPassword.json
index 8024cad1c..9a8c1fadf 100644
--- a/app/javascript/dashboard/i18n/locale/ne/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/ne/resetPassword.json
@@ -1,14 +1,14 @@
 {
   "RESET_PASSWORD": {
-    "TITLE": "Reset Password",
+    "TITLE": "Reset password",
     "EMAIL": {
       "LABEL": "Email",
-      "PLACEHOLDER": "कृपया तपाईंको ईमेल दिनुहोस्",
-      "ERROR": "Please enter a valid email"
+      "PLACEHOLDER": "Please enter your email.",
+      "ERROR": "Please enter a valid email."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Password reset link has been sent to your email",
-      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      "SUCCESS_MESSAGE": "Password reset link has been sent to your email.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "बुझाउनुहोस्"
   }
diff --git a/app/javascript/dashboard/i18n/locale/ne/search.json b/app/javascript/dashboard/i18n/locale/ne/search.json
index 418572c0c..9044bf5f9 100644
--- a/app/javascript/dashboard/i18n/locale/ne/search.json
+++ b/app/javascript/dashboard/i18n/locale/ne/search.json
@@ -14,8 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
-    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
+    "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/ne/setNewPassword.json b/app/javascript/dashboard/i18n/locale/ne/setNewPassword.json
index ecb3303c2..9144cf364 100644
--- a/app/javascript/dashboard/i18n/locale/ne/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/ne/setNewPassword.json
@@ -1,19 +1,19 @@
 {
   "SET_NEW_PASSWORD": {
-    "TITLE": "Set New Password",
+    "TITLE": "Set new password",
     "PASSWORD": {
       "LABEL": "Password",
       "PLACEHOLDER": "Password",
-      "ERROR": "Password is too short"
+      "ERROR": "Password is too short."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirm Password",
+      "LABEL": "Confirm password",
       "PLACEHOLDER": "Confirm Password",
-      "ERROR": "Passwords do not match"
+      "ERROR": "Passwords do not match."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Successfully changed the password",
-      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      "SUCCESS_MESSAGE": "Successfully changed the password.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "CAPTCHA": {
       "ERROR": "Verification expired. Please solve captcha again."
diff --git a/app/javascript/dashboard/i18n/locale/ne/signup.json b/app/javascript/dashboard/i18n/locale/ne/signup.json
index 10ddc5b86..1ad4865ff 100644
--- a/app/javascript/dashboard/i18n/locale/ne/signup.json
+++ b/app/javascript/dashboard/i18n/locale/ne/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Company name",
-      "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
-      "ERROR": "Company name is too short"
+      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
+      "ERROR": "Company name is too short."
     },
     "FULL_NAME": {
       "LABEL": "Full name",
-      "PLACEHOLDER": "Enter your full name. eg: Bruce Wayne",
-      "ERROR": "Full name is too short"
+      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
+      "ERROR": "Full name is too short."
     },
     "EMAIL": {
       "LABEL": "Work email",
-      "PLACEHOLDER": "Enter your work email address. eg: bruce@wayne.enterprises",
-      "ERROR": "Please enter a valid work email address"
+      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
+      "ERROR": "Please enter a valid work email address."
     },
     "PASSWORD": {
       "LABEL": "Password",
       "PLACEHOLDER": "Password",
-      "ERROR": "Password is too short",
-      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
+      "ERROR": "Password is too short.",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirm Password",
-      "PLACEHOLDER": "Confirm Password",
-      "ERROR": "Password doesnot match"
+      "LABEL": "Confirm password",
+      "PLACEHOLDER": "Confirm password",
+      "ERROR": "Password doesnot match."
     },
     "API": {
       "SUCCESS_MESSAGE": "Registration Successfull",
-      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Create account",
     "HAVE_AN_ACCOUNT": "Already have an account?"
diff --git a/app/javascript/dashboard/i18n/locale/nl/advancedFilters.json b/app/javascript/dashboard/i18n/locale/nl/advancedFilters.json
index a765fd026..9482bce5c 100644
--- a/app/javascript/dashboard/i18n/locale/nl/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/nl/advancedFilters.json
@@ -38,6 +38,7 @@
       "CAMPAIGN_NAME": "Campagne Naam",
       "LABELS": "Labelen",
       "BROWSER_LANGUAGE": "Browser Taal",
+      "PRIORITY": "Priority",
       "COUNTRY_NAME": "Land Naam",
       "REFERER_LINK": "Verwijzende link",
       "CUSTOM_ATTRIBUTE_LIST": "Lijst",
diff --git a/app/javascript/dashboard/i18n/locale/nl/agentMgmt.json b/app/javascript/dashboard/i18n/locale/nl/agentMgmt.json
index f2ca70cb1..b70e6fcf8 100644
--- a/app/javascript/dashboard/i18n/locale/nl/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/nl/agentMgmt.json
@@ -110,7 +110,8 @@
         },
         "PLACEHOLDER": {
           "AGENT": "Zoek agenten",
-          "TEAM": "Teams zoeken"
+          "TEAM": "Teams zoeken",
+          "INPUT": "Search for agents"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/nl/conversation.json b/app/javascript/dashboard/i18n/locale/nl/conversation.json
index 4cc12d255..6df5e2c49 100644
--- a/app/javascript/dashboard/i18n/locale/nl/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/nl/conversation.json
@@ -37,6 +37,7 @@
     "UNKNOWN_FILE_TYPE": "Unknown File",
     "SAVE_CONTACT": "Save",
     "UPLOADING_ATTACHMENTS": "Uploading attachments...",
+    "REPLIED_TO_STORY": "Replied to your story",
     "SUCCESS_DELETE_MESSAGE": "Message deleted successfully",
     "FAIL_DELETE_MESSSAGE": "Couldn't delete message! Try again",
     "NO_RESPONSE": "No response",
@@ -66,6 +67,23 @@
         "NEXT_WEEK": "Next week"
       }
     },
+    "PRIORITY": {
+      "TITLE": "Priority",
+      "OPTIONS": {
+        "NONE": "Geen",
+        "URGENT": "Urgent",
+        "HIGH": "High",
+        "MEDIUM": "Medium",
+        "LOW": "Low"
+      },
+      "CHANGE_PRIORITY": {
+        "SELECT_PLACEHOLDER": "Geen",
+        "INPUT_PLACEHOLDER": "Select priority",
+        "NO_RESULTS": "Geen resultaten gevonden",
+        "SUCCESSFUL": "Changed priority of conversation id %{conversationId} to %{priority}",
+        "FAILED": "Couldn't change priority. Please try again."
+      }
+    },
     "CARD_CONTEXT_MENU": {
       "PENDING": "Mark as pending",
       "RESOLVED": "Mark as resolved",
diff --git a/app/javascript/dashboard/i18n/locale/nl/generalSettings.json b/app/javascript/dashboard/i18n/locale/nl/generalSettings.json
index 8234ceee9..d0aee6bdb 100644
--- a/app/javascript/dashboard/i18n/locale/nl/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/nl/generalSettings.json
@@ -101,6 +101,7 @@
       "REPORTS": "Rapporten",
       "CONVERSATION": "Conversation",
       "CHANGE_ASSIGNEE": "Change Assignee",
+      "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Change Team",
       "ADD_LABEL": "Add label to the conversation",
       "REMOVE_LABEL": "Remove label from the conversation",
@@ -126,6 +127,7 @@
       "GO_TO_NOTIFICATIONS": "Go to Notifications",
       "ADD_LABELS_TO_CONVERSATION": "Add label to the conversation",
       "ASSIGN_AN_AGENT": "Assign an agent",
+      "ASSIGN_PRIORITY": "Assign priority",
       "ASSIGN_A_TEAM": "Assign a team",
       "MUTE_CONVERSATION": "Mute conversation",
       "UNMUTE_CONVERSATION": "Unmute conversation",
diff --git a/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json
index bd9715b71..0eafafb15 100644
--- a/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json
@@ -482,6 +482,13 @@
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
+    "HELP_CENTER": {
+      "LABEL": "Help Center",
+      "PLACEHOLDER": "Select Help Center",
+      "SELECT_PLACEHOLDER": "Select Help Center",
+      "REMOVE": "Remove Help Center",
+      "SUB_TEXT": "Attach a Help Center with the inbox"
+    },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
       "MAX_ASSIGNMENT_LIMIT_RANGE_ERROR": "Please enter a value greater than 0",
diff --git a/app/javascript/dashboard/i18n/locale/nl/integrations.json b/app/javascript/dashboard/i18n/locale/nl/integrations.json
index 7545c6f5f..c1c63eb04 100644
--- a/app/javascript/dashboard/i18n/locale/nl/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/nl/integrations.json
@@ -85,6 +85,23 @@
       "JOIN_ERROR": "There was an error joining the call, please try again",
       "CREATE_ERROR": "There was an error creating a meeting link, please try again"
     },
+    "OPEN_AI": {
+      "TITLE": "Improve With AI",
+      "SUBTITLE": "An improved reply will be generated using AI, based on your current draft.",
+      "TONE": {
+        "TITLE": "Tone",
+        "OPTIONS": {
+          "PROFESSIONAL": "Professional",
+          "FRIENDLY": "Friendly"
+        }
+      },
+      "BUTTONS": {
+        "GENERATE": "Generate",
+        "GENERATING": "Generating...",
+        "CANCEL": "Annuleren"
+      },
+      "GENERATE_ERROR": "There was an error processing the content, please try again"
+    },
     "DELETE": {
       "BUTTON_TEXT": "Verwijderen",
       "API": {
diff --git a/app/javascript/dashboard/i18n/locale/nl/login.json b/app/javascript/dashboard/i18n/locale/nl/login.json
index 2df202817..272c3e5ce 100644
--- a/app/javascript/dashboard/i18n/locale/nl/login.json
+++ b/app/javascript/dashboard/i18n/locale/nl/login.json
@@ -3,16 +3,16 @@
     "TITLE": "Inloggen bij Chatwoot",
     "EMAIL": {
       "LABEL": "E-mailadres",
-      "PLACEHOLDER": "E-mail bijvoorbeeld: iemone@voorbeeld.com"
+      "PLACEHOLDER": "example@companyname.com"
     },
     "PASSWORD": {
       "LABEL": "Wachtwoord",
       "PLACEHOLDER": "Wachtwoord"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Inloggen geslaagd",
-      "ERROR_MESSAGE": "Kan geen verbinding maken met Woot Server, probeer het later opnieuw",
-      "UNAUTH": "Gebruikersnaam/wachtwoord onjuist. Probeer het opnieuw\n"
+      "SUCCESS_MESSAGE": "Login successful",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again.",
+      "UNAUTH": "Username or password is incorrect. Please try again."
     },
     "OAUTH": {
       "GOOGLE_LOGIN": "Login with Google",
diff --git a/app/javascript/dashboard/i18n/locale/nl/resetPassword.json b/app/javascript/dashboard/i18n/locale/nl/resetPassword.json
index 0f0a063cc..6f9004456 100644
--- a/app/javascript/dashboard/i18n/locale/nl/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/nl/resetPassword.json
@@ -3,12 +3,12 @@
     "TITLE": "Wachtwoord opnieuw instellen",
     "EMAIL": {
       "LABEL": "E-mailadres",
-      "PLACEHOLDER": "Voer uw e-mailadres in",
-      "ERROR": "Voer een geldig e-mailadres in"
+      "PLACEHOLDER": "Voer uw e-mailadres in.",
+      "ERROR": "Voer een geldig e-mailadres in."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Wachtwoord reset link is verstuurd naar uw e-mail",
-      "ERROR_MESSAGE": "Kan geen verbinding maken met Woot Server, probeer het later opnieuw"
+      "SUCCESS_MESSAGE": "Wachtwoord reset link is verstuurd naar uw e-mail.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Bevestigen"
   }
diff --git a/app/javascript/dashboard/i18n/locale/nl/search.json b/app/javascript/dashboard/i18n/locale/nl/search.json
index 595cf3de3..504227272 100644
--- a/app/javascript/dashboard/i18n/locale/nl/search.json
+++ b/app/javascript/dashboard/i18n/locale/nl/search.json
@@ -14,8 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
-    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
+    "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/nl/setNewPassword.json b/app/javascript/dashboard/i18n/locale/nl/setNewPassword.json
index 8fe328f4d..b1356d5bd 100644
--- a/app/javascript/dashboard/i18n/locale/nl/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/nl/setNewPassword.json
@@ -1,19 +1,19 @@
 {
   "SET_NEW_PASSWORD": {
-    "TITLE": "Nieuw wachtwoord instellen",
+    "TITLE": "Set new password",
     "PASSWORD": {
       "LABEL": "Wachtwoord",
       "PLACEHOLDER": "Wachtwoord",
-      "ERROR": "Wachtwoord is te kort"
+      "ERROR": "Wachtwoord is te kort."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Bevestig wachtwoord",
+      "LABEL": "Confirm password",
       "PLACEHOLDER": "Bevestig wachtwoord",
-      "ERROR": "Wachtwoorden komen niet overeen"
+      "ERROR": "Wachtwoorden komen niet overeen."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Wachtwoord succesvol veranderd",
-      "ERROR_MESSAGE": "Kan geen verbinding maken met Woot Server, probeer het later opnieuw"
+      "SUCCESS_MESSAGE": "Wachtwoord succesvol veranderd.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "CAPTCHA": {
       "ERROR": "Verificatie verlopen. Los de captcha opnieuw op."
diff --git a/app/javascript/dashboard/i18n/locale/nl/signup.json b/app/javascript/dashboard/i18n/locale/nl/signup.json
index 7258af4b3..5d1f41be1 100644
--- a/app/javascript/dashboard/i18n/locale/nl/signup.json
+++ b/app/javascript/dashboard/i18n/locale/nl/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Company name",
-      "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
-      "ERROR": "Company name is too short"
+      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
+      "ERROR": "Company name is too short."
     },
     "FULL_NAME": {
       "LABEL": "Volledige naam",
-      "PLACEHOLDER": "Voer je volledige naam in, bijvoorbeeld Bruce Wayne",
-      "ERROR": "Volledige naam is te kort"
+      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
+      "ERROR": "Volledige naam is te kort."
     },
     "EMAIL": {
       "LABEL": "Werk e-mail",
-      "PLACEHOLDER": "Voer je werk-e-mailadres in, bijvoorbeeld: bruce@wayne.enterprises",
-      "ERROR": "Please enter a valid work email address"
+      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
+      "ERROR": "Please enter a valid work email address."
     },
     "PASSWORD": {
       "LABEL": "Wachtwoord",
       "PLACEHOLDER": "Wachtwoord",
-      "ERROR": "Wachtwoord is te kort",
-      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
+      "ERROR": "Wachtwoord is te kort.",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Bevestig wachtwoord",
-      "PLACEHOLDER": "Bevestig wachtwoord",
-      "ERROR": "Wachtwoord komt niet overeen"
+      "LABEL": "Confirm password",
+      "PLACEHOLDER": "Confirm password",
+      "ERROR": "Wachtwoord komt niet overeen."
     },
     "API": {
       "SUCCESS_MESSAGE": "Registratie geslaagd",
-      "ERROR_MESSAGE": "Kan geen verbinding maken met Woot Server, probeer het later opnieuw"
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Create account",
     "HAVE_AN_ACCOUNT": "Heeft u al een account?"
diff --git a/app/javascript/dashboard/i18n/locale/no/advancedFilters.json b/app/javascript/dashboard/i18n/locale/no/advancedFilters.json
index f93779ca4..8df726077 100644
--- a/app/javascript/dashboard/i18n/locale/no/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/no/advancedFilters.json
@@ -38,6 +38,7 @@
       "CAMPAIGN_NAME": "Campaign Name",
       "LABELS": "Etiketter",
       "BROWSER_LANGUAGE": "Browser Language",
+      "PRIORITY": "Priority",
       "COUNTRY_NAME": "Country Name",
       "REFERER_LINK": "Referer link",
       "CUSTOM_ATTRIBUTE_LIST": "List",
diff --git a/app/javascript/dashboard/i18n/locale/no/agentMgmt.json b/app/javascript/dashboard/i18n/locale/no/agentMgmt.json
index 291b0dbc6..bd720bed4 100644
--- a/app/javascript/dashboard/i18n/locale/no/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/no/agentMgmt.json
@@ -110,7 +110,8 @@
         },
         "PLACEHOLDER": {
           "AGENT": "Search agents",
-          "TEAM": "Search teams"
+          "TEAM": "Search teams",
+          "INPUT": "Search for agents"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/no/conversation.json b/app/javascript/dashboard/i18n/locale/no/conversation.json
index 65fb5c34e..3e7b0ad4b 100644
--- a/app/javascript/dashboard/i18n/locale/no/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/no/conversation.json
@@ -37,6 +37,7 @@
     "UNKNOWN_FILE_TYPE": "Unknown File",
     "SAVE_CONTACT": "Save",
     "UPLOADING_ATTACHMENTS": "Laster opp vedlegg...",
+    "REPLIED_TO_STORY": "Replied to your story",
     "SUCCESS_DELETE_MESSAGE": "Message deleted successfully",
     "FAIL_DELETE_MESSSAGE": "Couldn't delete message! Try again",
     "NO_RESPONSE": "No response",
@@ -66,6 +67,23 @@
         "NEXT_WEEK": "Next week"
       }
     },
+    "PRIORITY": {
+      "TITLE": "Priority",
+      "OPTIONS": {
+        "NONE": "None",
+        "URGENT": "Urgent",
+        "HIGH": "High",
+        "MEDIUM": "Medium",
+        "LOW": "Low"
+      },
+      "CHANGE_PRIORITY": {
+        "SELECT_PLACEHOLDER": "None",
+        "INPUT_PLACEHOLDER": "Select priority",
+        "NO_RESULTS": "No results found",
+        "SUCCESSFUL": "Changed priority of conversation id %{conversationId} to %{priority}",
+        "FAILED": "Couldn't change priority. Please try again."
+      }
+    },
     "CARD_CONTEXT_MENU": {
       "PENDING": "Mark as pending",
       "RESOLVED": "Mark as resolved",
diff --git a/app/javascript/dashboard/i18n/locale/no/generalSettings.json b/app/javascript/dashboard/i18n/locale/no/generalSettings.json
index 698ae10d2..3cdcfaaf0 100644
--- a/app/javascript/dashboard/i18n/locale/no/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/no/generalSettings.json
@@ -101,6 +101,7 @@
       "REPORTS": "Rapporter",
       "CONVERSATION": "Conversation",
       "CHANGE_ASSIGNEE": "Change Assignee",
+      "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Change Team",
       "ADD_LABEL": "Add label to the conversation",
       "REMOVE_LABEL": "Remove label from the conversation",
@@ -126,6 +127,7 @@
       "GO_TO_NOTIFICATIONS": "Go to Notifications",
       "ADD_LABELS_TO_CONVERSATION": "Add label to the conversation",
       "ASSIGN_AN_AGENT": "Assign an agent",
+      "ASSIGN_PRIORITY": "Assign priority",
       "ASSIGN_A_TEAM": "Assign a team",
       "MUTE_CONVERSATION": "Mute conversation",
       "UNMUTE_CONVERSATION": "Unmute conversation",
diff --git a/app/javascript/dashboard/i18n/locale/no/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/no/inboxMgmt.json
index 26907a930..9d38a5ab9 100644
--- a/app/javascript/dashboard/i18n/locale/no/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/no/inboxMgmt.json
@@ -482,6 +482,13 @@
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
+    "HELP_CENTER": {
+      "LABEL": "Help Center",
+      "PLACEHOLDER": "Select Help Center",
+      "SELECT_PLACEHOLDER": "Select Help Center",
+      "REMOVE": "Remove Help Center",
+      "SUB_TEXT": "Attach a Help Center with the inbox"
+    },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
       "MAX_ASSIGNMENT_LIMIT_RANGE_ERROR": "Please enter a value greater than 0",
diff --git a/app/javascript/dashboard/i18n/locale/no/integrations.json b/app/javascript/dashboard/i18n/locale/no/integrations.json
index 92ba6b1e1..50145ea7c 100644
--- a/app/javascript/dashboard/i18n/locale/no/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/no/integrations.json
@@ -85,6 +85,23 @@
       "JOIN_ERROR": "There was an error joining the call, please try again",
       "CREATE_ERROR": "There was an error creating a meeting link, please try again"
     },
+    "OPEN_AI": {
+      "TITLE": "Improve With AI",
+      "SUBTITLE": "An improved reply will be generated using AI, based on your current draft.",
+      "TONE": {
+        "TITLE": "Tone",
+        "OPTIONS": {
+          "PROFESSIONAL": "Professional",
+          "FRIENDLY": "Friendly"
+        }
+      },
+      "BUTTONS": {
+        "GENERATE": "Generate",
+        "GENERATING": "Generating...",
+        "CANCEL": "Avbryt"
+      },
+      "GENERATE_ERROR": "There was an error processing the content, please try again"
+    },
     "DELETE": {
       "BUTTON_TEXT": "Slett",
       "API": {
diff --git a/app/javascript/dashboard/i18n/locale/no/login.json b/app/javascript/dashboard/i18n/locale/no/login.json
index d01fea8d0..7bb4881c3 100644
--- a/app/javascript/dashboard/i18n/locale/no/login.json
+++ b/app/javascript/dashboard/i18n/locale/no/login.json
@@ -3,16 +3,16 @@
     "TITLE": "Logg inn i Chatwoot",
     "EMAIL": {
       "LABEL": "E-post",
-      "PLACEHOLDER": "Eksempel: ola@nordmann.no"
+      "PLACEHOLDER": "example@companyname.com"
     },
     "PASSWORD": {
       "LABEL": "Passord",
       "PLACEHOLDER": "Passord"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Innlogging vellykket",
-      "ERROR_MESSAGE": "Kunne ikke koble til Woot Server, vennligst prøv igjen senere",
-      "UNAUTH": "Brukernavn eller passord er feil. Prøv igjen"
+      "SUCCESS_MESSAGE": "Login successful",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again.",
+      "UNAUTH": "Username or password is incorrect. Please try again."
     },
     "OAUTH": {
       "GOOGLE_LOGIN": "Login with Google",
diff --git a/app/javascript/dashboard/i18n/locale/no/resetPassword.json b/app/javascript/dashboard/i18n/locale/no/resetPassword.json
index 511938490..cc653776b 100644
--- a/app/javascript/dashboard/i18n/locale/no/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/no/resetPassword.json
@@ -1,14 +1,14 @@
 {
   "RESET_PASSWORD": {
-    "TITLE": "Tilbakestill passord",
+    "TITLE": "Reset password",
     "EMAIL": {
       "LABEL": "E-post",
-      "PLACEHOLDER": "Skriv inn din e-post",
-      "ERROR": "Vennligst skriv inn en gyldig e-postadresse"
+      "PLACEHOLDER": "Skriv inn din e-post.",
+      "ERROR": "Vennligst skriv inn en gyldig e-postadresse."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Link for å tilbakestille passordet ditt er sendt til e-postadressen din",
-      "ERROR_MESSAGE": "Kunne ikke koble til Woot Server, vennligst prøv igjen senere"
+      "SUCCESS_MESSAGE": "Link for å tilbakestille passordet ditt er sendt til e-postadressen din.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Send"
   }
diff --git a/app/javascript/dashboard/i18n/locale/no/search.json b/app/javascript/dashboard/i18n/locale/no/search.json
index f5d1a62a4..341635a74 100644
--- a/app/javascript/dashboard/i18n/locale/no/search.json
+++ b/app/javascript/dashboard/i18n/locale/no/search.json
@@ -14,8 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
-    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
+    "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/no/setNewPassword.json b/app/javascript/dashboard/i18n/locale/no/setNewPassword.json
index 85464ab51..24332b67f 100644
--- a/app/javascript/dashboard/i18n/locale/no/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/no/setNewPassword.json
@@ -1,19 +1,19 @@
 {
   "SET_NEW_PASSWORD": {
-    "TITLE": "Angi nytt passord",
+    "TITLE": "Set new password",
     "PASSWORD": {
       "LABEL": "Passord",
       "PLACEHOLDER": "Passord",
-      "ERROR": "Passordet er for kort"
+      "ERROR": "Passordet er for kort."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Bekreft passord",
+      "LABEL": "Confirm password",
       "PLACEHOLDER": "Bekreft passord",
-      "ERROR": "Passordet stemmer ikke"
+      "ERROR": "Passordet stemmer ikke."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Passordet ble endret",
-      "ERROR_MESSAGE": "Kunne ikke koble til Woot Server, vennligst prøv igjen senere"
+      "SUCCESS_MESSAGE": "Passordet ble endret.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "CAPTCHA": {
       "ERROR": "Verification expired. Please solve captcha again."
diff --git a/app/javascript/dashboard/i18n/locale/no/signup.json b/app/javascript/dashboard/i18n/locale/no/signup.json
index 0028ddd43..37c018ca7 100644
--- a/app/javascript/dashboard/i18n/locale/no/signup.json
+++ b/app/javascript/dashboard/i18n/locale/no/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Company name",
-      "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
-      "ERROR": "Company name is too short"
+      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
+      "ERROR": "Company name is too short."
     },
     "FULL_NAME": {
       "LABEL": "Fullt navn",
-      "PLACEHOLDER": "Skriv inn fullt navn. F. eks: Ola Nordmann",
-      "ERROR": "Kontonavnet er for kort"
+      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
+      "ERROR": "Kontonavnet er for kort."
     },
     "EMAIL": {
       "LABEL": "Bedriftse-postadresse",
-      "PLACEHOLDER": "Skriv inn din profesjonelle e-postadresse. F.eks: ola@olasbedrift.no",
-      "ERROR": "Please enter a valid work email address"
+      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
+      "ERROR": "Please enter a valid work email address."
     },
     "PASSWORD": {
       "LABEL": "Passord",
       "PLACEHOLDER": "Passord",
-      "ERROR": "Passordet er for kort",
-      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
+      "ERROR": "Passordet er for kort.",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Bekreft passord",
-      "PLACEHOLDER": "Bekreft passord",
-      "ERROR": "Passordet stemmer ikke"
+      "LABEL": "Confirm password",
+      "PLACEHOLDER": "Confirm password",
+      "ERROR": "Passordet stemmer ikke."
     },
     "API": {
       "SUCCESS_MESSAGE": "Registrering fullført",
-      "ERROR_MESSAGE": "Kunne ikke koble til Woot Server, vennligst prøv igjen senere"
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Create account",
     "HAVE_AN_ACCOUNT": "Har du allerede en konto?"
diff --git a/app/javascript/dashboard/i18n/locale/pl/advancedFilters.json b/app/javascript/dashboard/i18n/locale/pl/advancedFilters.json
index 8be415413..43f0193fd 100644
--- a/app/javascript/dashboard/i18n/locale/pl/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/pl/advancedFilters.json
@@ -38,6 +38,7 @@
       "CAMPAIGN_NAME": "Nazwa kampanii",
       "LABELS": "Etykiety",
       "BROWSER_LANGUAGE": "Język przeglądarki",
+      "PRIORITY": "Priority",
       "COUNTRY_NAME": "Nazwa kraju",
       "REFERER_LINK": "Strona odsyłająca",
       "CUSTOM_ATTRIBUTE_LIST": "Lista",
diff --git a/app/javascript/dashboard/i18n/locale/pl/agentMgmt.json b/app/javascript/dashboard/i18n/locale/pl/agentMgmt.json
index 8e9546501..937b12d2a 100644
--- a/app/javascript/dashboard/i18n/locale/pl/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pl/agentMgmt.json
@@ -110,7 +110,8 @@
         },
         "PLACEHOLDER": {
           "AGENT": "Wyszukaj konsultantów",
-          "TEAM": "Wyszukaj zespoły"
+          "TEAM": "Wyszukaj zespoły",
+          "INPUT": "Search for agents"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/pl/conversation.json b/app/javascript/dashboard/i18n/locale/pl/conversation.json
index 61d046abe..73b925113 100644
--- a/app/javascript/dashboard/i18n/locale/pl/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/pl/conversation.json
@@ -37,6 +37,7 @@
     "UNKNOWN_FILE_TYPE": "Unknown File",
     "SAVE_CONTACT": "Save",
     "UPLOADING_ATTACHMENTS": "Przesyłanie załączników...",
+    "REPLIED_TO_STORY": "Replied to your story",
     "SUCCESS_DELETE_MESSAGE": "Wiadomość usunięta pomyślnie",
     "FAIL_DELETE_MESSSAGE": "Nie można usunąć wiadomości! Spróbuj ponownie",
     "NO_RESPONSE": "Brak odpowiedzi",
@@ -66,6 +67,23 @@
         "NEXT_WEEK": "Następny tydzień"
       }
     },
+    "PRIORITY": {
+      "TITLE": "Priority",
+      "OPTIONS": {
+        "NONE": "Brak",
+        "URGENT": "Urgent",
+        "HIGH": "High",
+        "MEDIUM": "Medium",
+        "LOW": "Low"
+      },
+      "CHANGE_PRIORITY": {
+        "SELECT_PLACEHOLDER": "Brak",
+        "INPUT_PLACEHOLDER": "Select priority",
+        "NO_RESULTS": "Brak wyników",
+        "SUCCESSFUL": "Changed priority of conversation id %{conversationId} to %{priority}",
+        "FAILED": "Couldn't change priority. Please try again."
+      }
+    },
     "CARD_CONTEXT_MENU": {
       "PENDING": "Oznacz jako oczekujące",
       "RESOLVED": "Mark as resolved",
diff --git a/app/javascript/dashboard/i18n/locale/pl/generalSettings.json b/app/javascript/dashboard/i18n/locale/pl/generalSettings.json
index beb68218e..c772efe65 100644
--- a/app/javascript/dashboard/i18n/locale/pl/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/pl/generalSettings.json
@@ -101,6 +101,7 @@
       "REPORTS": "Raporty",
       "CONVERSATION": "Rozmowa",
       "CHANGE_ASSIGNEE": "Zmień przypisaną osobę",
+      "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Zmień zespół",
       "ADD_LABEL": "Dodaj etykietę do rozmowy",
       "REMOVE_LABEL": "Usuń etykietę z rozmowy",
@@ -126,6 +127,7 @@
       "GO_TO_NOTIFICATIONS": "Przejdź do Powiadomień",
       "ADD_LABELS_TO_CONVERSATION": "Dodaj etykietę do rozmowy",
       "ASSIGN_AN_AGENT": "Przypisz przedstawiciela",
+      "ASSIGN_PRIORITY": "Assign priority",
       "ASSIGN_A_TEAM": "Przypisz zespół",
       "MUTE_CONVERSATION": "Wycisz rozmowę",
       "UNMUTE_CONVERSATION": "Wyłącz wyciszenie rozmowy",
diff --git a/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json
index dacdb0885..0394d91ab 100644
--- a/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json
@@ -482,6 +482,13 @@
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
+    "HELP_CENTER": {
+      "LABEL": "Help Center",
+      "PLACEHOLDER": "Select Help Center",
+      "SELECT_PLACEHOLDER": "Select Help Center",
+      "REMOVE": "Remove Help Center",
+      "SUB_TEXT": "Attach a Help Center with the inbox"
+    },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
       "MAX_ASSIGNMENT_LIMIT_RANGE_ERROR": "Please enter a value greater than 0",
diff --git a/app/javascript/dashboard/i18n/locale/pl/integrations.json b/app/javascript/dashboard/i18n/locale/pl/integrations.json
index 684cc3972..dfedd1a22 100644
--- a/app/javascript/dashboard/i18n/locale/pl/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/pl/integrations.json
@@ -85,6 +85,23 @@
       "JOIN_ERROR": "There was an error joining the call, please try again",
       "CREATE_ERROR": "There was an error creating a meeting link, please try again"
     },
+    "OPEN_AI": {
+      "TITLE": "Improve With AI",
+      "SUBTITLE": "An improved reply will be generated using AI, based on your current draft.",
+      "TONE": {
+        "TITLE": "Tone",
+        "OPTIONS": {
+          "PROFESSIONAL": "Professional",
+          "FRIENDLY": "Friendly"
+        }
+      },
+      "BUTTONS": {
+        "GENERATE": "Generate",
+        "GENERATING": "Generating...",
+        "CANCEL": "Anuluj"
+      },
+      "GENERATE_ERROR": "There was an error processing the content, please try again"
+    },
     "DELETE": {
       "BUTTON_TEXT": "Usuń",
       "API": {
diff --git a/app/javascript/dashboard/i18n/locale/pl/login.json b/app/javascript/dashboard/i18n/locale/pl/login.json
index 87dfb39e3..7b497a5bb 100644
--- a/app/javascript/dashboard/i18n/locale/pl/login.json
+++ b/app/javascript/dashboard/i18n/locale/pl/login.json
@@ -3,16 +3,16 @@
     "TITLE": "Zaloguj się do Chatwoot",
     "EMAIL": {
       "LABEL": "E-mail",
-      "PLACEHOLDER": "E-mail np. someone@example.com"
+      "PLACEHOLDER": "example@companyname.com"
     },
     "PASSWORD": {
       "LABEL": "Hasło",
       "PLACEHOLDER": "Hasło"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Logowanie powiodło się",
-      "ERROR_MESSAGE": "Nie można połączyć się z Woot Server, spróbuj ponownie później",
-      "UNAUTH": "Nieprawidłowa nazwa użytkownika / hasło. Spróbuj ponownie"
+      "SUCCESS_MESSAGE": "Login successful",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again.",
+      "UNAUTH": "Username or password is incorrect. Please try again."
     },
     "OAUTH": {
       "GOOGLE_LOGIN": "Login with Google",
diff --git a/app/javascript/dashboard/i18n/locale/pl/resetPassword.json b/app/javascript/dashboard/i18n/locale/pl/resetPassword.json
index 4900c42de..2841b722d 100644
--- a/app/javascript/dashboard/i18n/locale/pl/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/pl/resetPassword.json
@@ -1,14 +1,14 @@
 {
   "RESET_PASSWORD": {
-    "TITLE": "Resetuj hasło",
+    "TITLE": "Reset password",
     "EMAIL": {
       "LABEL": "E-mail",
-      "PLACEHOLDER": "Wprowadź swój adres e-mail",
-      "ERROR": "Wprowadź poprawny adres e-mail"
+      "PLACEHOLDER": "Wprowadź swój adres e-mail.",
+      "ERROR": "Wprowadź poprawny adres e-mail."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Link do resetowania hasła został wysłany na Twój adres e-mail",
-      "ERROR_MESSAGE": "Nie można połączyć się z Woot Server, spróbuj ponownie później"
+      "SUCCESS_MESSAGE": "Link do resetowania hasła został wysłany na Twój adres e-mail.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Prześlij"
   }
diff --git a/app/javascript/dashboard/i18n/locale/pl/search.json b/app/javascript/dashboard/i18n/locale/pl/search.json
index 3fed02781..ccfc887d2 100644
--- a/app/javascript/dashboard/i18n/locale/pl/search.json
+++ b/app/javascript/dashboard/i18n/locale/pl/search.json
@@ -14,8 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
-    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
+    "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/pl/setNewPassword.json b/app/javascript/dashboard/i18n/locale/pl/setNewPassword.json
index 9265b0288..3a725aaef 100644
--- a/app/javascript/dashboard/i18n/locale/pl/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/pl/setNewPassword.json
@@ -1,19 +1,19 @@
 {
   "SET_NEW_PASSWORD": {
-    "TITLE": "Ustaw nowe hasło",
+    "TITLE": "Set new password",
     "PASSWORD": {
       "LABEL": "Hasło",
       "PLACEHOLDER": "Hasło",
-      "ERROR": "Hasło jest zbyt krótkie"
+      "ERROR": "Hasło jest zbyt krótkie."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Potwierdź hasło",
+      "LABEL": "Confirm password",
       "PLACEHOLDER": "Potwierdź hasło",
-      "ERROR": "Hasła nie pasują"
+      "ERROR": "Hasła nie pasują."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Pomyślnie zmienione hasło",
-      "ERROR_MESSAGE": "Nie można połączyć się z Woot Server, spróbuj ponownie później"
+      "SUCCESS_MESSAGE": "Pomyślnie zmienione hasło.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "CAPTCHA": {
       "ERROR": "Verification expired. Please solve captcha again."
diff --git a/app/javascript/dashboard/i18n/locale/pl/signup.json b/app/javascript/dashboard/i18n/locale/pl/signup.json
index 35fb911ae..78795b96d 100644
--- a/app/javascript/dashboard/i18n/locale/pl/signup.json
+++ b/app/javascript/dashboard/i18n/locale/pl/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Company name",
-      "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
-      "ERROR": "Company name is too short"
+      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
+      "ERROR": "Company name is too short."
     },
     "FULL_NAME": {
       "LABEL": "Imię i nazwisko",
-      "PLACEHOLDER": "Wpisz swoje imię i nazwisko, np. Bruce Wayne",
-      "ERROR": "Imię i nazwisko jest zbyt krótkie"
+      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
+      "ERROR": "Imię i nazwisko jest zbyt krótkie."
     },
     "EMAIL": {
       "LABEL": "E-mail służbowy",
-      "PLACEHOLDER": "Podaj swój służbowy adres e-mail, np. bruce@wayne.enterprises",
-      "ERROR": "Please enter a valid work email address"
+      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
+      "ERROR": "Please enter a valid work email address."
     },
     "PASSWORD": {
       "LABEL": "Hasło",
       "PLACEHOLDER": "Hasło",
-      "ERROR": "Hasło jest zbyt krótkie",
-      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
+      "ERROR": "Hasło jest zbyt krótkie.",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Potwierdź hasło",
-      "PLACEHOLDER": "Potwierdź hasło",
-      "ERROR": "Hasło nie zgadza się"
+      "LABEL": "Confirm password",
+      "PLACEHOLDER": "Confirm password",
+      "ERROR": "Hasło nie zgadza się."
     },
     "API": {
       "SUCCESS_MESSAGE": "Rejestracja powiodła się",
-      "ERROR_MESSAGE": "Nie można połączyć się z Woot Server, spróbuj ponownie później"
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Create account",
     "HAVE_AN_ACCOUNT": "Masz już konto?"
diff --git a/app/javascript/dashboard/i18n/locale/pt/advancedFilters.json b/app/javascript/dashboard/i18n/locale/pt/advancedFilters.json
index d5f2bcf24..7f94ca4c7 100644
--- a/app/javascript/dashboard/i18n/locale/pt/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/pt/advancedFilters.json
@@ -38,6 +38,7 @@
       "CAMPAIGN_NAME": "Nome da Campanha",
       "LABELS": "Etiquetas",
       "BROWSER_LANGUAGE": "Idioma do Navegador",
+      "PRIORITY": "Priority",
       "COUNTRY_NAME": "Nome do País",
       "REFERER_LINK": "Link de referência",
       "CUSTOM_ATTRIBUTE_LIST": "Lista",
diff --git a/app/javascript/dashboard/i18n/locale/pt/agentMgmt.json b/app/javascript/dashboard/i18n/locale/pt/agentMgmt.json
index 54fdb46a2..d32fbc8b1 100644
--- a/app/javascript/dashboard/i18n/locale/pt/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt/agentMgmt.json
@@ -110,7 +110,8 @@
         },
         "PLACEHOLDER": {
           "AGENT": "Procurar Agentes",
-          "TEAM": "Procurar Equipas"
+          "TEAM": "Procurar Equipas",
+          "INPUT": "Search for agents"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/pt/conversation.json b/app/javascript/dashboard/i18n/locale/pt/conversation.json
index d310c3d3e..d1f0fda39 100644
--- a/app/javascript/dashboard/i18n/locale/pt/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/pt/conversation.json
@@ -37,6 +37,7 @@
     "UNKNOWN_FILE_TYPE": "Arquivo Desconhecido",
     "SAVE_CONTACT": "Salvar",
     "UPLOADING_ATTACHMENTS": "Carregando anexos...",
+    "REPLIED_TO_STORY": "Replied to your story",
     "SUCCESS_DELETE_MESSAGE": "Mensagem apagada com sucesso",
     "FAIL_DELETE_MESSSAGE": "Não foi possível apagar a mensagem! Tente novamente",
     "NO_RESPONSE": "Sem resposta",
@@ -66,6 +67,23 @@
         "NEXT_WEEK": "Próxima semana"
       }
     },
+    "PRIORITY": {
+      "TITLE": "Priority",
+      "OPTIONS": {
+        "NONE": "Nenhuma",
+        "URGENT": "Urgent",
+        "HIGH": "High",
+        "MEDIUM": "Medium",
+        "LOW": "Low"
+      },
+      "CHANGE_PRIORITY": {
+        "SELECT_PLACEHOLDER": "Nenhuma",
+        "INPUT_PLACEHOLDER": "Select priority",
+        "NO_RESULTS": "Nenhum resultado encontrado",
+        "SUCCESSFUL": "Changed priority of conversation id %{conversationId} to %{priority}",
+        "FAILED": "Couldn't change priority. Please try again."
+      }
+    },
     "CARD_CONTEXT_MENU": {
       "PENDING": "Marcar como pendente",
       "RESOLVED": "Marcar como resolvida",
diff --git a/app/javascript/dashboard/i18n/locale/pt/generalSettings.json b/app/javascript/dashboard/i18n/locale/pt/generalSettings.json
index 26edfa9c6..3f14afc52 100644
--- a/app/javascript/dashboard/i18n/locale/pt/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/pt/generalSettings.json
@@ -101,6 +101,7 @@
       "REPORTS": "relatórios",
       "CONVERSATION": "Conversa",
       "CHANGE_ASSIGNEE": "Alterar Responsável",
+      "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Alterar Equipa",
       "ADD_LABEL": "Adicionar etiqueta à conversa",
       "REMOVE_LABEL": "Remover etiqueta da conversa",
@@ -126,6 +127,7 @@
       "GO_TO_NOTIFICATIONS": "Ir para Notificações",
       "ADD_LABELS_TO_CONVERSATION": "Adicionar etiqueta à conversa",
       "ASSIGN_AN_AGENT": "Atribuir um agente",
+      "ASSIGN_PRIORITY": "Assign priority",
       "ASSIGN_A_TEAM": "Atribuir uma equipa",
       "MUTE_CONVERSATION": "Silenciar Conversa",
       "UNMUTE_CONVERSATION": "Reativar conversa",
diff --git a/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json
index 029049644..1a530a30e 100644
--- a/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json
@@ -482,6 +482,13 @@
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Atualizar configurações do Formulário Pre Chat"
     },
+    "HELP_CENTER": {
+      "LABEL": "Help Center",
+      "PLACEHOLDER": "Select Help Center",
+      "SELECT_PLACEHOLDER": "Select Help Center",
+      "REMOVE": "Remove Help Center",
+      "SUB_TEXT": "Attach a Help Center with the inbox"
+    },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
       "MAX_ASSIGNMENT_LIMIT_RANGE_ERROR": "Please enter a value greater than 0",
diff --git a/app/javascript/dashboard/i18n/locale/pt/integrations.json b/app/javascript/dashboard/i18n/locale/pt/integrations.json
index 5f5d8a9dc..2b1adf605 100644
--- a/app/javascript/dashboard/i18n/locale/pt/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/pt/integrations.json
@@ -85,6 +85,23 @@
       "JOIN_ERROR": "Houve um erro ao ingressar na chamada! Por favor, tente novamente",
       "CREATE_ERROR": "There was an error creating a meeting link, please try again"
     },
+    "OPEN_AI": {
+      "TITLE": "Improve With AI",
+      "SUBTITLE": "An improved reply will be generated using AI, based on your current draft.",
+      "TONE": {
+        "TITLE": "Tone",
+        "OPTIONS": {
+          "PROFESSIONAL": "Professional",
+          "FRIENDLY": "Friendly"
+        }
+      },
+      "BUTTONS": {
+        "GENERATE": "Generate",
+        "GENERATING": "Generating...",
+        "CANCEL": "cancelar"
+      },
+      "GENERATE_ERROR": "There was an error processing the content, please try again"
+    },
     "DELETE": {
       "BUTTON_TEXT": "excluir",
       "API": {
diff --git a/app/javascript/dashboard/i18n/locale/pt/login.json b/app/javascript/dashboard/i18n/locale/pt/login.json
index 0582e5153..954b347a3 100644
--- a/app/javascript/dashboard/i18n/locale/pt/login.json
+++ b/app/javascript/dashboard/i18n/locale/pt/login.json
@@ -3,7 +3,7 @@
     "TITLE": "Entrar no Chatwoot",
     "EMAIL": {
       "LABEL": "e-mail",
-      "PLACEHOLDER": "E-mail: alguém@exemplo.com"
+      "PLACEHOLDER": "exemplo@nomedaempresa.com.br"
     },
     "PASSWORD": {
       "LABEL": "Palavra-passe",
@@ -11,8 +11,8 @@
     },
     "API": {
       "SUCCESS_MESSAGE": "Login bem sucedido",
-      "ERROR_MESSAGE": "Não foi possível conectar ao servidor Woot, por favor tente novamente mais tarde",
-      "UNAUTH": "Nome de usuário / senha incorreta. Por favor, tente novamente"
+      "ERROR_MESSAGE": "Não foi possível conectar ao servidor Woot. Por favor, tente novamente.",
+      "UNAUTH": "Nome de usuário ou senha incorretos. Por favor, tente novamente."
     },
     "OAUTH": {
       "GOOGLE_LOGIN": "Entrar com o Google",
diff --git a/app/javascript/dashboard/i18n/locale/pt/resetPassword.json b/app/javascript/dashboard/i18n/locale/pt/resetPassword.json
index 66668f5a6..da466c1e7 100644
--- a/app/javascript/dashboard/i18n/locale/pt/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/pt/resetPassword.json
@@ -1,14 +1,14 @@
 {
   "RESET_PASSWORD": {
-    "TITLE": "Redefinir a senha",
+    "TITLE": "Redefinir senha",
     "EMAIL": {
       "LABEL": "e-mail",
-      "PLACEHOLDER": "Por favor, digite seu e-mail",
-      "ERROR": "Por favor, digite um e-mail válido"
+      "PLACEHOLDER": "Por favor, digite seu e-mail.",
+      "ERROR": "Por favor, digite um e-mail válido."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Link para redefinir a senha foi enviado para seu e-mail",
-      "ERROR_MESSAGE": "Não foi possível conectar ao servidor Woot, por favor tente novamente mais tarde"
+      "SUCCESS_MESSAGE": "Link para redefinir a senha foi enviado para seu e-mail.",
+      "ERROR_MESSAGE": "Não foi possível conectar ao servidor Woot. Por favor, tente novamente."
     },
     "SUBMIT": "submeter"
   }
diff --git a/app/javascript/dashboard/i18n/locale/pt/search.json b/app/javascript/dashboard/i18n/locale/pt/search.json
index 7d148d157..039060e40 100644
--- a/app/javascript/dashboard/i18n/locale/pt/search.json
+++ b/app/javascript/dashboard/i18n/locale/pt/search.json
@@ -14,8 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
-    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
+    "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/pt/setNewPassword.json b/app/javascript/dashboard/i18n/locale/pt/setNewPassword.json
index 36b65ee6f..56e9c6bd6 100644
--- a/app/javascript/dashboard/i18n/locale/pt/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/pt/setNewPassword.json
@@ -4,16 +4,16 @@
     "PASSWORD": {
       "LABEL": "Palavra-passe",
       "PLACEHOLDER": "Palavra-passe",
-      "ERROR": "A senha é muito curta"
+      "ERROR": "A senha é muito curta."
     },
     "CONFIRM_PASSWORD": {
       "LABEL": "Confirmar senha",
       "PLACEHOLDER": "Confirmar senha",
-      "ERROR": "As senhas não coincidem"
+      "ERROR": "As senhas não coincidem."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Senha alterada com sucesso",
-      "ERROR_MESSAGE": "Não foi possível conectar ao servidor Woot, por favor tente novamente mais tarde"
+      "SUCCESS_MESSAGE": "Senha alterada com sucesso.",
+      "ERROR_MESSAGE": "Não foi possível conectar ao servidor Woot. Por favor, tente novamente."
     },
     "CAPTCHA": {
       "ERROR": "Verification expired. Please solve captcha again."
diff --git a/app/javascript/dashboard/i18n/locale/pt/signup.json b/app/javascript/dashboard/i18n/locale/pt/signup.json
index 2d9efa5d4..41d45d57a 100644
--- a/app/javascript/dashboard/i18n/locale/pt/signup.json
+++ b/app/javascript/dashboard/i18n/locale/pt/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Nome da empresa",
-      "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
-      "ERROR": "Company name is too short"
+      "PLACEHOLDER": "Digite o nome da sua empresa. Exemplo: Wayne Enterprises",
+      "ERROR": "Nome da empresa é muito curto."
     },
     "FULL_NAME": {
       "LABEL": "Nome completo",
-      "PLACEHOLDER": "Digite o seu nome completo, por exemplo: António Almeida",
-      "ERROR": "O nome completo é muito pequeno"
+      "PLACEHOLDER": "Digite seu nome completo. Ex.: Wayne Bruce",
+      "ERROR": "O nome completo é muito pequeno."
     },
     "EMAIL": {
       "LABEL": "E-mail de trabalho",
-      "PLACEHOLDER": "Digite o seu endereço de e-mail profissional. Por exemplo: geral@informatico.pt",
-      "ERROR": "Please enter a valid work email address"
+      "PLACEHOLDER": "Digite seu endereço de e-mail profissional. Por exemplo, bruce@wayne.com.br",
+      "ERROR": "Por favor, insira um endereço de email profissional válido."
     },
     "PASSWORD": {
       "LABEL": "Palavra-passe",
       "PLACEHOLDER": "Palavra-passe",
-      "ERROR": "A senha é muito curta",
-      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
+      "ERROR": "A senha é muito curta.",
+      "IS_INVALID_PASSWORD": "A senha deve conter pelo menos 1 letra maiúscula, 1 letra minúscula, 1 número e 1 caractere especial."
     },
     "CONFIRM_PASSWORD": {
       "LABEL": "Confirmar senha",
       "PLACEHOLDER": "Confirmar senha",
-      "ERROR": "As senhas não conferem"
+      "ERROR": "As senhas não conferem."
     },
     "API": {
       "SUCCESS_MESSAGE": "Registro Bem Sucedido",
-      "ERROR_MESSAGE": "Não foi possível conectar ao servidor Woot, por favor tente novamente mais tarde"
+      "ERROR_MESSAGE": "Não foi possível conectar ao servidor Woot. Por favor, tente novamente."
     },
     "SUBMIT": "Create account",
     "HAVE_AN_ACCOUNT": "Já tem uma conta?"
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/advancedFilters.json b/app/javascript/dashboard/i18n/locale/pt_BR/advancedFilters.json
index d83fa12e1..22c63ae36 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/advancedFilters.json
@@ -38,6 +38,7 @@
       "CAMPAIGN_NAME": "Nome da Campanha",
       "LABELS": "Marcadores",
       "BROWSER_LANGUAGE": "Idioma do navegador",
+      "PRIORITY": "Priority",
       "COUNTRY_NAME": "Nome do País",
       "REFERER_LINK": "Link de origem",
       "CUSTOM_ATTRIBUTE_LIST": "Lista",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/agentMgmt.json b/app/javascript/dashboard/i18n/locale/pt_BR/agentMgmt.json
index 4ba866b9a..95d37a19a 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/agentMgmt.json
@@ -110,7 +110,8 @@
         },
         "PLACEHOLDER": {
           "AGENT": "Pesquisar agentes",
-          "TEAM": "Pesquisar times"
+          "TEAM": "Pesquisar times",
+          "INPUT": "Search for agents"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/pt_BR/attributesMgmt.json
index 0975b0790..25b837d2f 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/attributesMgmt.json
@@ -3,7 +3,7 @@
     "HEADER": "Atributos Personalizados",
     "HEADER_BTN_TXT": "Criar atributo personalizado",
     "LOADING": "Buscando atributos",
-    "SIDEBAR_TXT": "<p><b>Atributos personalizados</b> <p>Um atributo customizado rastreia fatos sobre seus contatos/conversa — como o plano de inscrição, ou quando eles compraram o primeiro item, etc. <br /><br />Para criar um atributo personalizado, basta clicar no<b>Adicionar atributo personalizado.</b> Você também pode editar ou apagar um atributo existente clicando em Editar ou Apagar botão.</p>",
+    "SIDEBAR_TXT": "<p><b>Atributos personalizados</b> <p>Um atributo personalizado rastreia fatos sobre seus contatos/conversa — como o plano de inscrição, ou quando eles compraram o primeiro item, etc. <br /><br />Para criar um atributo personalizado, basta clicar no <b>Criar atributo</b> Você também pode editar ou apagar um atributo já criado.</p>",
     "ADD": {
       "TITLE": "Adicionar atributo personalizado",
       "SUBMIT": "Criar",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json b/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json
index d9945f448..5644d343a 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json
@@ -37,6 +37,7 @@
     "UNKNOWN_FILE_TYPE": "Arquivo Desconhecido",
     "SAVE_CONTACT": "Salvar",
     "UPLOADING_ATTACHMENTS": "Enviando anexos...",
+    "REPLIED_TO_STORY": "Replied to your story",
     "SUCCESS_DELETE_MESSAGE": "Mensagem excluída com sucesso",
     "FAIL_DELETE_MESSSAGE": "Não foi possível excluir a mensagem! Tente novamente",
     "NO_RESPONSE": "Sem resposta",
@@ -66,6 +67,23 @@
         "NEXT_WEEK": "Próxima semana"
       }
     },
+    "PRIORITY": {
+      "TITLE": "Priority",
+      "OPTIONS": {
+        "NONE": "Nenhuma",
+        "URGENT": "Urgent",
+        "HIGH": "High",
+        "MEDIUM": "Medium",
+        "LOW": "Low"
+      },
+      "CHANGE_PRIORITY": {
+        "SELECT_PLACEHOLDER": "Nenhuma",
+        "INPUT_PLACEHOLDER": "Select priority",
+        "NO_RESULTS": "Nenhum resultado encontrado",
+        "SUCCESSFUL": "Changed priority of conversation id %{conversationId} to %{priority}",
+        "FAILED": "Couldn't change priority. Please try again."
+      }
+    },
     "CARD_CONTEXT_MENU": {
       "PENDING": "Marcar como pendente",
       "RESOLVED": "Marcar como resolvido",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/generalSettings.json b/app/javascript/dashboard/i18n/locale/pt_BR/generalSettings.json
index f2e4eb5cf..5987f9dca 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/generalSettings.json
@@ -101,6 +101,7 @@
       "REPORTS": "Relatórios",
       "CONVERSATION": "Conversas",
       "CHANGE_ASSIGNEE": "Alterar Responsável",
+      "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Alterar a Equipe",
       "ADD_LABEL": "Adicionar etiqueta à conversa",
       "REMOVE_LABEL": "Remover etiqueta da conversa",
@@ -126,6 +127,7 @@
       "GO_TO_NOTIFICATIONS": "Ir para Notificações",
       "ADD_LABELS_TO_CONVERSATION": "Adicionar etiqueta à conversa",
       "ASSIGN_AN_AGENT": "Atribuir um agente",
+      "ASSIGN_PRIORITY": "Assign priority",
       "ASSIGN_A_TEAM": "Atribuir uma equipe",
       "MUTE_CONVERSATION": "Silenciar conversa",
       "UNMUTE_CONVERSATION": "Não silenciar conversa",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
index 9afa834e2..4d4d87e8a 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
@@ -482,6 +482,13 @@
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Atualizar configurações do Formulário Pre Chat"
     },
+    "HELP_CENTER": {
+      "LABEL": "Help Center",
+      "PLACEHOLDER": "Select Help Center",
+      "SELECT_PLACEHOLDER": "Select Help Center",
+      "REMOVE": "Remove Help Center",
+      "SUB_TEXT": "Attach a Help Center with the inbox"
+    },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Limite de atribuição automática",
       "MAX_ASSIGNMENT_LIMIT_RANGE_ERROR": "Por favor, insira um valor maior que 0",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/integrations.json b/app/javascript/dashboard/i18n/locale/pt_BR/integrations.json
index 69d2dbbcd..b1af2fdee 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/integrations.json
@@ -85,6 +85,23 @@
       "JOIN_ERROR": "Houve um erro ao entrar na chamada, por favor tente novamente",
       "CREATE_ERROR": "Houve um erro ao criar o link da reunião, por favor tente novamente"
     },
+    "OPEN_AI": {
+      "TITLE": "Improve With AI",
+      "SUBTITLE": "An improved reply will be generated using AI, based on your current draft.",
+      "TONE": {
+        "TITLE": "Tone",
+        "OPTIONS": {
+          "PROFESSIONAL": "Professional",
+          "FRIENDLY": "Friendly"
+        }
+      },
+      "BUTTONS": {
+        "GENERATE": "Generate",
+        "GENERATING": "Generating...",
+        "CANCEL": "Cancelar"
+      },
+      "GENERATE_ERROR": "There was an error processing the content, please try again"
+    },
     "DELETE": {
       "BUTTON_TEXT": "Excluir",
       "API": {
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/login.json b/app/javascript/dashboard/i18n/locale/pt_BR/login.json
index f7df0e412..462b0fd3f 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/login.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/login.json
@@ -3,16 +3,16 @@
     "TITLE": "Entrar no Chatwoot",
     "EMAIL": {
       "LABEL": "e-mail",
-      "PLACEHOLDER": "E-mail: alguém@exemplo.com"
+      "PLACEHOLDER": "example@companyname.com"
     },
     "PASSWORD": {
       "LABEL": "Senha",
       "PLACEHOLDER": "Senha"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Acesso bem sucedido",
-      "ERROR_MESSAGE": "Não foi possível conectar ao servidor Woot, por favor tente novamente mais tarde",
-      "UNAUTH": "Nome de usuário / senha incorreta. Por favor, tente novamente"
+      "SUCCESS_MESSAGE": "Login successful",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again.",
+      "UNAUTH": "Username or password is incorrect. Please try again."
     },
     "OAUTH": {
       "GOOGLE_LOGIN": "Login com o Google",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/resetPassword.json b/app/javascript/dashboard/i18n/locale/pt_BR/resetPassword.json
index 5122ff6a2..a82a02031 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/resetPassword.json
@@ -1,14 +1,14 @@
 {
   "RESET_PASSWORD": {
-    "TITLE": "Alterar senha",
+    "TITLE": "Redefinir senha",
     "EMAIL": {
       "LABEL": "e-mail",
-      "PLACEHOLDER": "Por favor, insira seu e-mail",
-      "ERROR": "Por favor, insira um e-mail válido"
+      "PLACEHOLDER": "Por favor, digite seu e-mail.",
+      "ERROR": "Por favor, insira um e-mail válido."
     },
     "API": {
-      "SUCCESS_MESSAGE": "O link para alteração de senha foi enviado para seu e-mail",
-      "ERROR_MESSAGE": "Não foi possível conectar ao servidor Woot, por favor tente novamente mais tarde"
+      "SUCCESS_MESSAGE": "O link para alteração de senha foi enviado para seu e-mail.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Enviar"
   }
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/search.json b/app/javascript/dashboard/i18n/locale/pt_BR/search.json
index c44e6d910..57b3a569b 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/search.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/search.json
@@ -14,8 +14,8 @@
     "EMPTY_STATE": "Não foi encontrado %{item} para a consulta '%{query}'",
     "EMPTY_STATE_FULL": "Nenhum resultado encontrado para a consulta '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ para focar",
-    "INPUT_PLACEHOLDER": "Pesquisar mensagens, contatos ou conversas",
-    "EMPTY_STATE_DEFAULT": "Procurar por ID de conversa, e-mail, número de telefone, mensagens para melhores resultados de busca.",
+    "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "EMPTY_STATE_DEFAULT": "Procurar por ID de conversa, e-mail, número de telefone, mensagens para melhores resultados de busca. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Saiba mais",
     "WROTE": "escreveu:"
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/setNewPassword.json b/app/javascript/dashboard/i18n/locale/pt_BR/setNewPassword.json
index 5206b58f4..15d96fdad 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/setNewPassword.json
@@ -1,19 +1,19 @@
 {
   "SET_NEW_PASSWORD": {
-    "TITLE": "Definir nova senha",
+    "TITLE": "Set new password",
     "PASSWORD": {
       "LABEL": "Senha",
       "PLACEHOLDER": "Senha",
-      "ERROR": "A senha é muito curta"
+      "ERROR": "A senha é muito curta."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirme a senha",
+      "LABEL": "Confirm password",
       "PLACEHOLDER": "Confirme a senha",
-      "ERROR": "As senhas não coincidem"
+      "ERROR": "As senhas não coincidem."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Senha alterada com sucesso",
-      "ERROR_MESSAGE": "Não foi possível conectar ao servidor Woot, por favor tente novamente mais tarde"
+      "SUCCESS_MESSAGE": "Senha alterada com sucesso.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "CAPTCHA": {
       "ERROR": "Verificação expirada. Por favor, resolva o captcha novamente."
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/signup.json b/app/javascript/dashboard/i18n/locale/pt_BR/signup.json
index 7b080659f..ecc77bf3c 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/signup.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Nome Empresa",
-      "PLACEHOLDER": "Digite seu nome da empresa. por exemplo: Wayne Enterprises",
-      "ERROR": "O nome da empresa é muito curto"
+      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
+      "ERROR": "O nome da empresa é muito curto."
     },
     "FULL_NAME": {
       "LABEL": "Nome Completo",
-      "PLACEHOLDER": "Digite seu nome completo, por exemplo: Bruce Wayne",
-      "ERROR": "Nome completo é muito curto"
+      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
+      "ERROR": "Nome completo é muito curto."
     },
     "EMAIL": {
       "LABEL": "E-mail comercial",
-      "PLACEHOLDER": "Digite seu endereço de e-mail de trabalho. por exemplo: bruce@wayne.Business",
-      "ERROR": "Por favor, insira um endereço de e-mail de trabalho válido"
+      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
+      "ERROR": "Por favor, insira um endereço de e-mail de trabalho válido."
     },
     "PASSWORD": {
       "LABEL": "Senha",
       "PLACEHOLDER": "Senha",
-      "ERROR": "A senha é muito curta",
-      "IS_INVALID_PASSWORD": "A senha deve conter pelo menos 1 letra maiúscula, 1 letra minúscula, 1 número e 1 caractere especial"
+      "ERROR": "A senha é muito curta.",
+      "IS_INVALID_PASSWORD": "A senha deve conter pelo menos 1 letra maiúscula, 1 letra minúscula, 1 número e 1 caractere especial."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirme a senha",
-      "PLACEHOLDER": "Confirme a senha",
-      "ERROR": "As senhas não conferem"
+      "LABEL": "Confirm password",
+      "PLACEHOLDER": "Confirm password",
+      "ERROR": "As senhas não conferem."
     },
     "API": {
       "SUCCESS_MESSAGE": "Registro realizado com Sucesso",
-      "ERROR_MESSAGE": "Não foi possível conectar ao servidor Woot, por favor tente novamente mais tarde"
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Criar conta",
     "HAVE_AN_ACCOUNT": "Já possui uma conta?"
diff --git a/app/javascript/dashboard/i18n/locale/ro/advancedFilters.json b/app/javascript/dashboard/i18n/locale/ro/advancedFilters.json
index a0f80f109..76b753de8 100644
--- a/app/javascript/dashboard/i18n/locale/ro/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/ro/advancedFilters.json
@@ -23,7 +23,7 @@
       "is_greater_than": "Este mai mare decât",
       "is_less_than": "Este mai mică decât",
       "days_before": "Este x zile înainte",
-      "starts_with": "Starts with"
+      "starts_with": "Începe cu"
     },
     "ATTRIBUTE_LABELS": {
       "TRUE": "Adevărat",
@@ -38,6 +38,7 @@
       "CAMPAIGN_NAME": "Numele campaniei",
       "LABELS": "Etichete",
       "BROWSER_LANGUAGE": "Limba browserului",
+      "PRIORITY": "Prioritate",
       "COUNTRY_NAME": "Numele țării",
       "REFERER_LINK": "Link referer",
       "CUSTOM_ATTRIBUTE_LIST": "Listă",
diff --git a/app/javascript/dashboard/i18n/locale/ro/agentBots.json b/app/javascript/dashboard/i18n/locale/ro/agentBots.json
index 000279747..0ffe1f640 100644
--- a/app/javascript/dashboard/i18n/locale/ro/agentBots.json
+++ b/app/javascript/dashboard/i18n/locale/ro/agentBots.json
@@ -1,72 +1,72 @@
 {
   "AGENT_BOTS": {
     "HEADER": "Boți",
-    "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": "Editor de încărcare ...",
+    "HEADER_BTN_TXT": "Adăugați configurația botului",
+    "SIDEBAR_TXT": "<p><b>Agent boti</b> <p>Roboții de agent vă permit să automatizați conversațiile</p>",
     "CSML_BOT_EDITOR": {
       "NAME": {
-        "LABEL": "Bot Name",
-        "PLACEHOLDER": "Give your bot a name",
-        "ERROR": "Bot name is required"
+        "LABEL": "Numele botului",
+        "PLACEHOLDER": "Dă-i botului tău un nume",
+        "ERROR": "Numele botului este necesar"
       },
       "DESCRIPTION": {
-        "LABEL": "Bot Description",
-        "PLACEHOLDER": "What does this bot do?"
+        "LABEL": "Descrierea botului",
+        "PLACEHOLDER": "Ce face acest bot?"
       },
       "BOT_CONFIG": {
-        "ERROR": "Please enter your CSML bot configuration above",
-        "API_ERROR": "Your CSML configuration is invalid, please fix it and try again."
+        "ERROR": "Vă rugăm să introduceți configurația bot CSML de mai sus",
+        "API_ERROR": "Configurația CSML nu este validă, vă rugăm să o remediați și să încercați din nou."
       },
-      "SUBMIT": "Validate and save"
+      "SUBMIT": "Validați și salvați"
     },
     "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.",
+      "TITLE": "Selectați un bot de agent",
+      "DESC": "Puteți seta un bot de agent din listă în acest inbox. Botul se poate ocupa inițial de conversație și îl poate transfera unui agent atunci când este necesar.",
       "SUBMIT": "Actualizare",
-      "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": "Deconectați botul",
+      "SUCCESS_MESSAGE": "A actualizat cu succes botul agentului",
+      "DISCONNECTED_SUCCESS_MESSAGE": "Deconectat cu succes botul agentului",
+      "ERROR_MESSAGE": "Nu s-a putut actualiza botul agentului, încercați din nou mai târziu",
+      "DISCONNECTED_ERROR_MESSAGE": "Nu a putut deconecta botul agentului, vă rugăm să încercați din nou mai târziu",
+      "SELECT_PLACEHOLDER": "Selectați Bot"
     },
     "ADD": {
-      "TITLE": "Configure new bot",
+      "TITLE": "Configurați un bot nou",
       "CANCEL_BUTTON_TEXT": "Renunță",
       "API": {
-        "SUCCESS_MESSAGE": "Bot added successfully",
-        "ERROR_MESSAGE": "Could not add bot, Please try again later"
+        "SUCCESS_MESSAGE": "Bot adăugat cu succes",
+        "ERROR_MESSAGE": "Nu a putut adăuga bot, Vă rugăm să încercați din nou mai târziu"
       }
     },
     "LIST": {
-      "404": "No Bots found, you can create a bot by clicking the 'Configure new bot' Button ↗",
-      "LOADING": "Fetching Bots...",
-      "TYPE": "Bot Type"
+      "404": "Nu s-au găsit roboți, puteți crea un bot făcând clic pe butonul \"Configurați un bot nou\" ↗",
+      "LOADING": "Preluarea Bots ...",
+      "TYPE": "Tip bot"
     },
     "DELETE": {
       "BUTTON_TEXT": "Şterge",
-      "TITLE": "Delete Bot",
+      "TITLE": "Ștergeți botul",
       "SUBMIT": "Şterge",
       "CANCEL_BUTTON_TEXT": "Renunță",
-      "DESCRIPTION": "Are you sure you want to delete this bot? This action is irreversible",
+      "DESCRIPTION": "Sunteți sigur că doriți să ștergeți acest bot? Această acțiune este ireversibilă",
       "API": {
-        "SUCCESS_MESSAGE": "Bot deleted successfully",
-        "ERROR_MESSAGE": "Could not able to delete bot, Please try again later"
+        "SUCCESS_MESSAGE": "Agent sters cu succes",
+        "ERROR_MESSAGE": "Nu a putut șterge o regulă de automatizare, Încercați din nou mai târziu"
       }
     },
     "EDIT": {
       "BUTTON_TEXT": "Editare",
-      "LOADING": "Fetching Bots...",
-      "TITLE": "Edit Bot",
+      "LOADING": "Preluarea Bots ...",
+      "TITLE": "Editare bot",
       "CANCEL_BUTTON_TEXT": "Renunță",
       "API": {
-        "SUCCESS_MESSAGE": "Bot updated successfully",
-        "ERROR_MESSAGE": "Could not update bot, Please try again later"
+        "SUCCESS_MESSAGE": "Bot actualizat cu succes",
+        "ERROR_MESSAGE": "Nu s-a putut actualiza botul, Vă rugăm să încercați din nou mai târziu"
       }
     },
     "TYPES": {
-      "WEBHOOK": "Webhook Bot",
+      "WEBHOOK": "Webhook",
       "CSML": "CSML Bot"
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/ro/agentMgmt.json b/app/javascript/dashboard/i18n/locale/ro/agentMgmt.json
index 4bc47c5a8..cb2c1dd91 100644
--- a/app/javascript/dashboard/i18n/locale/ro/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ro/agentMgmt.json
@@ -110,7 +110,8 @@
         },
         "PLACEHOLDER": {
           "AGENT": "Agenți de căutare",
-          "TEAM": "Echipele de căutare"
+          "TEAM": "Echipele de căutare",
+          "INPUT": "Search for agents"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/ro/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/ro/attributesMgmt.json
index 7e3d61dbb..e78fad5c3 100644
--- a/app/javascript/dashboard/i18n/locale/ro/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ro/attributesMgmt.json
@@ -43,7 +43,7 @@
       },
       "API": {
         "SUCCESS_MESSAGE": "Atribut personalizat adăugat cu succes!",
-        "ERROR_MESSAGE": "Could not create a Custom Attribute. Please try again later."
+        "ERROR_MESSAGE": "Nu s-a putut crea un atribut particularizat. Încercați din nou mai târziu."
       }
     },
     "DELETE": {
diff --git a/app/javascript/dashboard/i18n/locale/ro/auditLogs.json b/app/javascript/dashboard/i18n/locale/ro/auditLogs.json
index 3b6b82852..9976e91c8 100644
--- a/app/javascript/dashboard/i18n/locale/ro/auditLogs.json
+++ b/app/javascript/dashboard/i18n/locale/ro/auditLogs.json
@@ -1,23 +1,23 @@
 {
   "AUDIT_LOGS": {
-    "HEADER": "Audit Logs",
-    "HEADER_BTN_TXT": "Add Audit Logs",
-    "LOADING": "Fetching Audit Logs",
+    "HEADER": "Jurnale de audit",
+    "HEADER_BTN_TXT": "Adăugarea jurnalelor de audit",
+    "LOADING": "Preluarea jurnalelor de audit",
     "SEARCH_404": "Nu există elemente care să corespundă acestei interogări",
-    "SIDEBAR_TXT": "<p><b>Audit Logs</b> </p><p> Audit Logs are trails for events and actions in a Chatwoot System. </p>",
+    "SIDEBAR_TXT": "<p><b>Jurnale de audit</b> </p><p> Jurnalele de audit sunt piste pentru evenimente și acțiuni într-un sistem Chatwoot. </p>",
     "LIST": {
-      "404": "There are no Audit Logs available in this account.",
-      "TITLE": "Manage Audit Logs",
-      "DESC": "Audit Logs are trails for events and actions in a Chatwoot System.",
+      "404": "Nu există jurnale de audit disponibile în acest cont.",
+      "TITLE": "Gestionarea jurnalelor de audit",
+      "DESC": "Jurnalele de audit sunt piste pentru evenimente și acțiuni într-un sistem Chatwoot.",
       "TABLE_HEADER": [
-        "User",
-        "Action",
+        "Utilizator",
+        "Acțiune",
         "Adresă IP",
-        "Time"
+        "Timp"
       ]
     },
     "API": {
-      "SUCCESS_MESSAGE": "AuditLogs retrieved successfully",
+      "SUCCESS_MESSAGE": "AuditLogs preluat cu succes",
       "ERROR_MESSAGE": "Nu s-a putut conecta la Woot Server, încercați din nou mai târziu"
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/ro/bulkActions.json b/app/javascript/dashboard/i18n/locale/ro/bulkActions.json
index 53892db64..f297ffc3e 100644
--- a/app/javascript/dashboard/i18n/locale/ro/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/ro/bulkActions.json
@@ -31,10 +31,10 @@
     "TEAMS": {
       "TEAM_SELECT_LABEL": "Selectați echipa",
       "NONE": "Nimic",
-      "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"
+      "NO_TEAMS_AVAILABLE": "Nu există încă echipe adăugate la acest cont.",
+      "ASSIGN_SELECTED_TEAMS": "Atribuirea echipei selectate",
+      "ASSIGN_SUCCESFUL": "Echipe assiged cu succes",
+      "ASSIGN_FAILED": "Nu a reușit să atribuie echipa, vă rugăm să încercați din nou"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ro/contact.json b/app/javascript/dashboard/i18n/locale/ro/contact.json
index 6ff634ce0..9f9748cb4 100644
--- a/app/javascript/dashboard/i18n/locale/ro/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ro/contact.json
@@ -182,8 +182,8 @@
         "LABEL": "Către"
       },
       "INBOX": {
-        "LABEL": "Via Inbox",
-        "PLACEHOLDER": "Choose source inbox",
+        "LABEL": "Prin Inbox",
+        "PLACEHOLDER": "Alegeți căsuța poștală sursă",
         "ERROR": "Selectați un inbox"
       },
       "SUBJECT": {
diff --git a/app/javascript/dashboard/i18n/locale/ro/conversation.json b/app/javascript/dashboard/i18n/locale/ro/conversation.json
index 7f24cf08f..bbd209364 100644
--- a/app/javascript/dashboard/i18n/locale/ro/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ro/conversation.json
@@ -37,6 +37,7 @@
     "UNKNOWN_FILE_TYPE": "Fișier necunoscut",
     "SAVE_CONTACT": "Salvează",
     "UPLOADING_ATTACHMENTS": "Se încarcă atașamentele...",
+    "REPLIED_TO_STORY": "Replied to your story",
     "SUCCESS_DELETE_MESSAGE": "Mesaj şters cu succes",
     "FAIL_DELETE_MESSSAGE": "Mesajul nu a putut fi șters! Încercați din nou",
     "NO_RESPONSE": "Niciun răspuns",
@@ -66,6 +67,23 @@
         "NEXT_WEEK": "Săptămâna viitoare"
       }
     },
+    "PRIORITY": {
+      "TITLE": "Prioritate",
+      "OPTIONS": {
+        "NONE": "Nimic",
+        "URGENT": "Urgent",
+        "HIGH": "High",
+        "MEDIUM": "Medium",
+        "LOW": "Low"
+      },
+      "CHANGE_PRIORITY": {
+        "SELECT_PLACEHOLDER": "Nimic",
+        "INPUT_PLACEHOLDER": "Select priority",
+        "NO_RESULTS": "Niciun rezultat găsit",
+        "SUCCESSFUL": "Changed priority of conversation id %{conversationId} to %{priority}",
+        "FAILED": "Couldn't change priority. Please try again."
+      }
+    },
     "CARD_CONTEXT_MENU": {
       "PENDING": "Marchează ca în așteptare",
       "RESOLVED": "Marcați ca rezolvat",
@@ -272,11 +290,11 @@
     "REMANING_PARTICIPANT_TEXT": "+%{count} altele",
     "TOTAL_PARTICIPANTS_TEXT": "%{count} participă oamenii.",
     "TOTAL_PARTICIPANT_TEXT": "%{count} persoană participă.",
-    "NO_PARTICIPANTS_TEXT": "Nimeni nu participă!",
+    "NO_PARTICIPANTS_TEXT": "Nimeni nu participă!.",
     "WATCH_CONVERSATION": "Începe conversația",
     "YOU_ARE_WATCHING": "Participați",
     "API": {
-      "ERROR_MESSAGE": "Nu a putut actualiza, încercați din nou",
+      "ERROR_MESSAGE": "Nu s-a putut actualiza, încercați din nou!",
       "SUCCESS_MESSAGE": "Participanții au actualizat!"
     }
   },
diff --git a/app/javascript/dashboard/i18n/locale/ro/emoji.json b/app/javascript/dashboard/i18n/locale/ro/emoji.json
index fd81268fb..aa23d7157 100644
--- a/app/javascript/dashboard/i18n/locale/ro/emoji.json
+++ b/app/javascript/dashboard/i18n/locale/ro/emoji.json
@@ -1,6 +1,6 @@
 {
   "EMOJI": {
-    "PLACEHOLDER": "Search emojis",
-    "NOT_FOUND": "No emoji match your search"
+    "PLACEHOLDER": "Caută emoji-uri",
+    "NOT_FOUND": "Niciun emoji nu corespunde căutării tale"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ro/generalSettings.json b/app/javascript/dashboard/i18n/locale/ro/generalSettings.json
index 2f6f71726..db67f7058 100644
--- a/app/javascript/dashboard/i18n/locale/ro/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ro/generalSettings.json
@@ -23,7 +23,7 @@
         "ERROR": "Te rugăm să introduci un nume de cont valid"
       },
       "LANGUAGE": {
-        "LABEL": "Site language",
+        "LABEL": "Limba site-ului",
         "PLACEHOLDER": "Numele contului tău",
         "ERROR": ""
       },
@@ -101,6 +101,7 @@
       "REPORTS": "Rapoarte",
       "CONVERSATION": "Conversație",
       "CHANGE_ASSIGNEE": "Modificarea cesionarului",
+      "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Schimbarea echipei",
       "ADD_LABEL": "Adăugarea etichetei la conversație",
       "REMOVE_LABEL": "Eliminarea etichetei din conversație",
@@ -126,6 +127,7 @@
       "GO_TO_NOTIFICATIONS": "Accesați Notificări",
       "ADD_LABELS_TO_CONVERSATION": "Adăugarea etichetei la conversație",
       "ASSIGN_AN_AGENT": "Atribuirea unui agent",
+      "ASSIGN_PRIORITY": "Assign priority",
       "ASSIGN_A_TEAM": "Atribuirea unei echipe",
       "MUTE_CONVERSATION": "Silențios conversația",
       "UNMUTE_CONVERSATION": "Sunet conversația",
diff --git a/app/javascript/dashboard/i18n/locale/ro/helpCenter.json b/app/javascript/dashboard/i18n/locale/ro/helpCenter.json
index b7474bb1d..f1a6e7000 100644
--- a/app/javascript/dashboard/i18n/locale/ro/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ro/helpCenter.json
@@ -32,11 +32,11 @@
       "IMAGE_UPLOAD": {
         "TITLE": "Încarcă imaginea",
         "UPLOADING": "Încărcare...",
-        "SUCCESS": "Image uploaded successfully",
-        "ERROR": "Error while uploading image",
-        "ERROR_FILE_SIZE": "Image size should be less than {size}MB",
-        "ERROR_FILE_FORMAT": "Image format should be jpg, jpeg or png",
-        "ERROR_FILE_DIMENSIONS": "Image dimensions should be less than 2000 x 2000"
+        "SUCCESS": "Imagine încărcată cu succes",
+        "ERROR": "Eroare la încărcarea imaginii",
+        "ERROR_FILE_SIZE": "Dimensiunea imaginii trebuie să fie mai mică de {size}MB",
+        "ERROR_FILE_FORMAT": "Formatul imaginii ar trebui să fie jpg, jpeg sau png",
+        "ERROR_FILE_DIMENSIONS": "Dimensiunile imaginii ar trebui să fie mai mici de 2000 x 2000"
       }
     },
     "ARTICLE_SETTINGS": {
diff --git a/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json
index 22c4ccf2a..a0e58f888 100644
--- a/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json
@@ -31,7 +31,7 @@
       "CHANNEL_NAME": {
         "LABEL": "Nume Inbox",
         "PLACEHOLDER": "Introduceți numele inboxului (de exemplu: Acme Inc)",
-        "ERROR": "Please enter a valid inbox name"
+        "ERROR": "Vă rugăm să introduceți un nume valid de inbox"
       },
       "WEBSITE_NAME": {
         "LABEL": "Nume website",
@@ -83,7 +83,7 @@
         },
         "CHANNEL_GREETING_TOGGLE": {
           "LABEL": "Activare salut canal",
-          "HELP_TEXT": "Automatically send a greeting message when a new conversation is created.",
+          "HELP_TEXT": "Trimiteți automat un mesaj de salut atunci când se creează o conversație nouă.",
           "ENABLED": "Activat",
           "DISABLED": "Dezactivat"
         },
@@ -100,7 +100,7 @@
         },
         "SUBMIT_BUTTON": "Crează inbox",
         "API": {
-          "ERROR_MESSAGE": "We were not able to create a website channel, please try again"
+          "ERROR_MESSAGE": "Nu am reușit să creăm un canal de site web, vă rugăm să încercați din nou"
         }
       },
       "TWILIO": {
@@ -112,10 +112,10 @@
           "ERROR": "Acest câmp este obligatoriu"
         },
         "MESSAGING_SERVICE_SID": {
-          "LABEL": "Messaging Service SID",
-          "PLACEHOLDER": "Please enter your Twilio Messaging Service SID",
+          "LABEL": "Serviciul de mesagerie SID",
+          "PLACEHOLDER": "Vă rugăm să introduceți Twilio Messaging Service SID",
           "ERROR": "Acest câmp este obligatoriu",
-          "USE_MESSAGING_SERVICE": "Use a Twilio Messaging Service"
+          "USE_MESSAGING_SERVICE": "Utilizați un serviciu de mesagerie Twilio"
         },
         "CHANNEL_TYPE": {
           "LABEL": "Tipul canalului",
@@ -134,7 +134,7 @@
         "PHONE_NUMBER": {
           "LABEL": "Număr de telefon",
           "PLACEHOLDER": "Introduceți numărul de telefon de la care va fi trimis mesajul.",
-          "ERROR": "Please provide a valid phone number that starts with a `+` sign and does not contain any spaces."
+          "ERROR": "Vă rugăm să furnizați un număr de telefon valid care începe cu semnul \"+\" și nu conține spații."
         },
         "API_CALLBACK": {
           "TITLE": "Callback URL",
@@ -185,7 +185,7 @@
           "PHONE_NUMBER": {
             "LABEL": "Număr de telefon",
             "PLACEHOLDER": "Introduceți numărul de telefon de la care va fi trimis mesajul.",
-            "ERROR": "Please provide a valid phone number that starts with a `+` sign and does not contain any spaces."
+            "ERROR": "Vă rugăm să furnizați un număr de telefon valid care începe cu semnul \"+\" și nu conține spații."
           },
           "SUBMIT_BUTTON": "Creați un canal de lățime de bandă",
           "API": {
@@ -214,21 +214,21 @@
         "PHONE_NUMBER": {
           "LABEL": "Număr de telefon",
           "PLACEHOLDER": "Introduceți numărul de telefon de la care va fi trimis mesajul.",
-          "ERROR": "Please provide a valid phone number that starts with a `+` sign and does not contain any spaces."
+          "ERROR": "Vă rugăm să furnizați un număr de telefon valid care începe cu semnul \"+\" și nu conține spații."
         },
         "PHONE_NUMBER_ID": {
-          "LABEL": "Phone number ID",
-          "PLACEHOLDER": "Please enter the Phone number ID obtained from Facebook developer dashboard.",
+          "LABEL": "ID-ul numărului de telefon",
+          "PLACEHOLDER": "Te rugăm să introduci ID-ul numărului de telefon obținut din tabloul de bord al dezvoltatorului Facebook.",
           "ERROR": "Vă rugăm să introduceți o valoare validă."
         },
         "BUSINESS_ACCOUNT_ID": {
-          "LABEL": "Business Account ID",
-          "PLACEHOLDER": "Please enter the Business Account ID obtained from Facebook developer dashboard.",
+          "LABEL": "ID-ul contului de companie",
+          "PLACEHOLDER": "Te rugăm să introduci ID-ul contului de companie obținut din tabloul de bord al dezvoltatorului Facebook.",
           "ERROR": "Vă rugăm să introduceți o valoare validă."
         },
         "WEBHOOK_VERIFY_TOKEN": {
-          "LABEL": "Webhook Verify Token",
-          "PLACEHOLDER": "Enter a verify token which you want to configure for facebook webhooks.",
+          "LABEL": "Webhook Verifica token-ul",
+          "PLACEHOLDER": "Introduceți un simbol verifica pe care doriți să configurați pentru webhooks Facebook.",
           "ERROR": "Vă rugăm să introduceți o valoare validă."
         },
         "API_KEY": {
@@ -239,9 +239,9 @@
         },
         "API_CALLBACK": {
           "TITLE": "Callback URL",
-          "SUBTITLE": "You have to configure the webhook URL and the verification token in the Facebook Developer portal with the values shown below.",
+          "SUBTITLE": "Trebuie să configurezi adresa URL webhook și simbolul de verificare în portalul Facebook pentru dezvoltatori cu valorile afișate mai jos.",
           "WEBHOOK_URL": "URL Webhook",
-          "WEBHOOK_VERIFICATION_TOKEN": "Webhook Verification Token"
+          "WEBHOOK_VERIFICATION_TOKEN": "Token de verificare Webhook"
         },
         "SUBMIT_BUTTON": "Creați canalul WhatsApp",
         "API": {
@@ -276,7 +276,7 @@
         },
         "EMAIL": {
           "LABEL": "Email",
-          "SUBTITLE": "E-mail unde clienții vă trimit bilete de suport",
+          "SUBTITLE": "Furnizați adresa de e-mail la care clienții trimit solicitări de asistență.",
           "PLACEHOLDER": "Email"
         },
         "SUBMIT_BUTTON": "Creare canal Email",
@@ -329,7 +329,7 @@
       },
       "AUTH": {
         "TITLE": "Alege un canal",
-        "DESC": "Chatwoot supports live-chat widgets, Facebook Messenger, Twitter profiles, WhatsApp, Emails, etc., as channels. If you want to build a custom channel, you can create it using the API channel. To get started, choose one of the channels below."
+        "DESC": "Chatwoot acceptă widget-uri live-chat, Facebook Messenger, profiluri Twitter, WhatsApp, e-mailuri etc., ca canale. Dacă doriți să construiți un canal personalizat, îl puteți crea folosind canalul API. Pentru a începe, alegeți unul dintre canalele de mai jos."
       },
       "AGENTS": {
         "TITLE": "Agenți",
@@ -346,15 +346,15 @@
         "DESC": "Ai reușit să integrezi pagina ta de Facebook cu Chatwoot. Data viitoare când un client trimite un mesaj paginii tale, conversația va apărea automat pe căsuța ta poștală.<br>Vă oferim și un script de widget pe care îl puteți adăuga cu ușurință la site-ul dvs. Odată ce aceasta este în direct pe site-ul tău, clienții vă pot trimite mesaje direct de pe site-ul dvs fără ajutorul niciunui instrument extern și conversația va apărea aici, pe Chatwoot.<br>Cool, nu? Păi, sigur că încercăm să fim :)"
       },
       "EMAIL_PROVIDER": {
-        "TITLE": "Select your email provider",
-        "DESCRIPTION": "Select an email provider from the list below. If you don't see your email provider in the list, you can select the other provider option and provide the IMAP and SMTP Credentials."
+        "TITLE": "Selectați furnizorul de e-mail",
+        "DESCRIPTION": "Selectați un furnizor de e-mail din lista de mai jos. Dacă nu vedeți furnizorul de e-mail în listă, puteți selecta opțiunea celuilalt furnizor și furniza acreditările IMAP și SMTP."
       },
       "MICROSOFT": {
-        "TITLE": "Microsoft Email",
-        "DESCRIPTION": "Click on the Sign in with Microsoft button to get started. You will redirected to the email sign in page. Once you accept the requested permissions, you would be redirected back to the inbox creation step.",
-        "EMAIL_PLACEHOLDER": "Enter email address",
-        "HELP": "To add your Microsoft account as a channel, you need to authenticate your Microsoft account by clicking on 'Sign in with Microsoft' ",
-        "ERROR_MESSAGE": "There was an error connecting to Microsoft, please try again"
+        "TITLE": "E-mail Microsoft",
+        "DESCRIPTION": "Faceți clic pe butonul Conectare cu Microsoft pentru a începe. Veți redirecționa către pagina de conectare la e-mail. După ce acceptați permisiunile solicitate, veți fi redirecționat înapoi la pasul de creare a inboxului.",
+        "EMAIL_PLACEHOLDER": "Introdu adresa de e-mail",
+        "HELP": "Pentru a vă adăuga contul Microsoft ca canal, trebuie să vă autentificați contul Microsoft făcând clic pe \"Conectați-vă cu Microsoft\" ",
+        "ERROR_MESSAGE": "A existat o eroare la conectarea la Microsoft, încercați din nou"
       }
     },
     "DETAILS": {
@@ -381,7 +381,7 @@
       "API": {
         "SUCCESS_MESSAGE": "Setări Inbox actualizate cu succes",
         "AUTO_ASSIGNMENT_SUCCESS_MESSAGE": "Atribuire automată actualizată cu succes",
-        "ERROR_MESSAGE": "We couldn't update inbox settings. Please try again later."
+        "ERROR_MESSAGE": "Nu am putut actualiza setările inboxului. Încercați din nou mai târziu."
       },
       "EMAIL_COLLECT_BOX": {
         "ENABLED": "Activat",
@@ -432,7 +432,7 @@
       "PRE_CHAT_FORM": "Formular pre chat",
       "BUSINESS_HOURS": "Program de lucru",
       "WIDGET_BUILDER": "Widget Builder",
-      "BOT_CONFIGURATION": "Bot Configuration"
+      "BOT_CONFIGURATION": "Configurarea botului"
     },
     "SETTINGS": "Setări",
     "FEATURES": {
@@ -440,15 +440,15 @@
       "DISPLAY_FILE_PICKER": "Afișarea selectorului de fișiere pe widget",
       "DISPLAY_EMOJI_PICKER": "Afișarea selectorului de emoji pe widget",
       "ALLOW_END_CONVERSATION": "Permite utilizatorilor să încheie conversația din widget",
-      "USE_INBOX_AVATAR_FOR_BOT": "Use inbox name and avatar for the bot"
+      "USE_INBOX_AVATAR_FOR_BOT": "Utilizați numele inboxului și avatarul pentru bot"
     },
     "SETTINGS_POPUP": {
       "MESSENGER_HEADING": "Script Messenger",
       "MESSENGER_SUB_HEAD": "Plasează acest buton în interiorul interiorul paginii web",
       "INBOX_AGENTS": "Agenți",
       "INBOX_AGENTS_SUB_TEXT": "Adaugă sau elimină agenți din acest inbox",
-      "AGENT_ASSIGNMENT": "Conversation Assignment",
-      "AGENT_ASSIGNMENT_SUB_TEXT": "Update conversation assignment settings",
+      "AGENT_ASSIGNMENT": "Atribuirea conversației",
+      "AGENT_ASSIGNMENT_SUB_TEXT": "Actualizarea setărilor de atribuire a conversațiilor",
       "UPDATE": "Actualizare",
       "ENABLE_EMAIL_COLLECT_BOX": "Caseta Activare colectare e-mail",
       "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Caseta Activarea sau dezactivarea colectării e-mailurilor în conversația nouă",
@@ -457,35 +457,42 @@
       "ENABLE_CSAT_SUB_TEXT": "Activați/dezactivați sondajul CSAT (Satisfacția clienților) după rezolvarea unei conversații",
       "ENABLE_CONTINUITY_VIA_EMAIL": "Activați continuitatea conversației prin e-mail",
       "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "Conversațiile vor continua prin e-mail dacă adresa de e-mail de contact este disponibilă.",
-      "LOCK_TO_SINGLE_CONVERSATION": "Lock to single conversation",
-      "LOCK_TO_SINGLE_CONVERSATION_SUB_TEXT": "Enable or disable multiple conversations for the same contact in this inbox",
+      "LOCK_TO_SINGLE_CONVERSATION": "Blocarea la o singură conversație",
+      "LOCK_TO_SINGLE_CONVERSATION_SUB_TEXT": "Activarea sau dezactivarea mai multor conversații pentru aceeași persoană de contact în acest inbox",
       "INBOX_UPDATE_TITLE": "Setări Inbox",
       "INBOX_UPDATE_SUB_TEXT": "Actualizează setările de inbox",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Activează sau dezactivează atribuirea automată a conversațiilor noi la agenții adăugați la această căsuță poștală.",
       "HMAC_VERIFICATION": "Validarea identității utilizatorului",
-      "HMAC_DESCRIPTION": "In order to validate the user's identity, you can pass an `identifier_hash` for each user. You can generate a HMAC sha256 hash using the `identifier` with the key shown here.",
+      "HMAC_DESCRIPTION": "Pentru a valida identitatea utilizatorului, puteți trece un \"identifier_hash\" pentru fiecare utilizator. Puteți genera un hash HMAC sha256 folosind \"identificatorul\" cu cheia afișată aici.",
       "HMAC_MANDATORY_VERIFICATION": "Impuneți validarea identității utilizatorului",
-      "HMAC_MANDATORY_DESCRIPTION": "If enabled, requests missing the `identifier_hash` will be rejected.",
+      "HMAC_MANDATORY_DESCRIPTION": "Dacă este activată, solicitările care lipsesc din \"identifier_hash\" vor fi respinse.",
       "INBOX_IDENTIFIER": "Identificator inbox",
       "INBOX_IDENTIFIER_SUB_TEXT": "Utilizați simbolul \"inbox_identifier\" afișat aici pentru a vă autentifica clienții API.",
       "FORWARD_EMAIL_TITLE": "Redirecționare către e-mail",
       "FORWARD_EMAIL_SUB_TEXT": "Începeți să vă trimiteți e-mailuri la următoarea adresă de e-mail.",
       "ALLOW_MESSAGES_AFTER_RESOLVED": "Permiteți rezolvarea mesajelor după ce conversația a fost rezolvată",
       "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Permiteți utilizatorilor finali să trimită mesaje chiar și după rezolvarea conversației.",
-      "WHATSAPP_SECTION_SUBHEADER": "This API Key is used for the integration with the WhatsApp APIs.",
-      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the updated key to be used for the integration with the WhatsApp APIs.",
+      "WHATSAPP_SECTION_SUBHEADER": "Această cheie API este utilizată pentru integrarea cu API-urile WhatsApp.",
+      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Introduceți cheia actualizată pentru a fi utilizată pentru integrarea cu API-urile WhatsApp.",
       "WHATSAPP_SECTION_TITLE": "Cheie API",
-      "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
-      "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
+      "WHATSAPP_SECTION_UPDATE_TITLE": "Actualizați cheia API",
+      "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Introduceți noua cheie API aici",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Actualizare",
-      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
-      "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
-      "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
+      "WHATSAPP_WEBHOOK_TITLE": "Webhook Verifica token-ul",
+      "WHATSAPP_WEBHOOK_SUBHEADER": "Acest simbol este utilizat pentru a verifica autenticitatea punctului final webhook.",
+      "UPDATE_PRE_CHAT_FORM_SETTINGS": "Actualizarea setărilor formularului pre-chat"
+    },
+    "HELP_CENTER": {
+      "LABEL": "Help Center",
+      "PLACEHOLDER": "Select Help Center",
+      "SELECT_PLACEHOLDER": "Select Help Center",
+      "REMOVE": "Remove Help Center",
+      "SUB_TEXT": "Attach a Help Center with the inbox"
     },
     "AUTO_ASSIGNMENT": {
-      "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
-      "MAX_ASSIGNMENT_LIMIT_RANGE_ERROR": "Please enter a value greater than 0",
-      "MAX_ASSIGNMENT_LIMIT_SUB_TEXT": "Limit the maximum number of conversations from this inbox that can be auto assigned to an agent"
+      "MAX_ASSIGNMENT_LIMIT": "Limita de atribuire automată",
+      "MAX_ASSIGNMENT_LIMIT_RANGE_ERROR": "Vă rugăm să introduceți o valoare mai mare de 0",
+      "MAX_ASSIGNMENT_LIMIT_SUB_TEXT": "Limitați numărul maxim de conversații din acest inbox care pot fi atribuite automat unui agent"
     },
     "FACEBOOK_REAUTHORIZE": {
       "TITLE": "Reautorizează",
@@ -495,14 +502,14 @@
     },
     "PRE_CHAT_FORM": {
       "DESCRIPTION": "Formularele pre-chat vă permit să capturați informații despre utilizatori înainte de a începe conversația cu dvs.",
-      "SET_FIELDS": "Pre chat form fields",
+      "SET_FIELDS": "Câmpuri de formular pre-chat",
       "SET_FIELDS_HEADER": {
-        "FIELDS": "Fields",
-        "LABEL": "Label",
-        "PLACE_HOLDER": "Placeholder",
+        "FIELDS": "Câmpuri",
+        "LABEL": "Etichetă",
+        "PLACE_HOLDER": "Înlocuitor",
         "KEY": "Cheie",
         "TYPE": "Tip",
-        "REQUIRED": "Required"
+        "REQUIRED": "Necesar"
       },
       "ENABLE": {
         "LABEL": "Activați formularul de pre chat",
@@ -541,7 +548,7 @@
     "IMAP": {
       "TITLE": "IMAP",
       "SUBTITLE": "Setarea detaliilor IMAP",
-      "NOTE_TEXT": "To enable SMTP, please configure IMAP.",
+      "NOTE_TEXT": "Pentru a activa SMTP, vă rugăm să configurați IMAP.",
       "UPDATE": "Actualizarea setărilor IMAP",
       "TOGGLE_AVAILABILITY": "Activarea configurației IMAP pentru acest inbox",
       "TOGGLE_HELP": "Activarea IMAP va ajuta utilizatorul să primească e-mailuri",
@@ -569,7 +576,7 @@
     },
     "MICROSOFT": {
       "TITLE": "Microsoft",
-      "SUBTITLE": "Reauthorize your MICROSOFT account"
+      "SUBTITLE": "Reautorizarea contului MICROSOFT"
     },
     "SMTP": {
       "TITLE": "SMTP",
@@ -605,16 +612,16 @@
       "SSL_TLS": "SSL/TLS",
       "START_TLS": "STARTTL-URI",
       "OPEN_SSL_VERIFY_MODE": "Deschideți modul de verificare SSL",
-      "AUTH_MECHANISM": "Authentication"
+      "AUTH_MECHANISM": "Autentificare"
     },
-    "NOTE": "Note: ",
+    "NOTE": "Observație: ",
     "WIDGET_BUILDER": {
       "WIDGET_OPTIONS": {
         "AVATAR": {
-          "LABEL": "Website Avatar",
+          "LABEL": "Avatar site-ul web",
           "DELETE": {
             "API": {
-              "SUCCESS_MESSAGE": "Avatar deleted successfully",
+              "SUCCESS_MESSAGE": "Avatar șters cu succes",
               "ERROR_MESSAGE": "A apărut o eroare, încercați din nou"
             }
           }
@@ -622,52 +629,52 @@
         "WEBSITE_NAME": {
           "LABEL": "Nume website",
           "PLACE_HOLDER": "Introduceți numele website-ului dvs. (de exemplu: Acme Inc)",
-          "ERROR": "Please enter a valid website name"
+          "ERROR": "Vă rugăm să introduceți un nume valid al site-ului web"
         },
         "WELCOME_HEADING": {
           "LABEL": "Titlu de salut",
-          "PLACE_HOLDER": "Hi there!"
+          "PLACE_HOLDER": "Bună!"
         },
         "WELCOME_TAGLINE": {
           "LABEL": "Tagline de Bun Venit",
           "PLACE_HOLDER": "Noi facem conectarea cu noi simplă. Întreabă-ne orice, sau partajează-ți feedback-ul."
         },
         "REPLY_TIME": {
-          "LABEL": "Reply Time",
+          "LABEL": "Timp de răspuns",
           "IN_A_FEW_MINUTES": "În câteva minute",
           "IN_A_FEW_HOURS": "În câteva ore",
           "IN_A_DAY": "Într-o zi"
         },
         "WIDGET_COLOR_LABEL": "Culoare widget",
-        "WIDGET_BUBBLE_POSITION_LABEL": "Widget Bubble Position",
-        "WIDGET_BUBBLE_TYPE_LABEL": "Widget Bubble Type",
+        "WIDGET_BUBBLE_POSITION_LABEL": "Widget Bubble Poziția",
+        "WIDGET_BUBBLE_TYPE_LABEL": "Widget Bubble Tip",
         "WIDGET_BUBBLE_LAUNCHER_TITLE": {
           "DEFAULT": "Discută cu noi",
-          "LABEL": "Widget Bubble Launcher Title",
+          "LABEL": "Widget Bubble Launcher Titlu",
           "PLACE_HOLDER": "Discută cu noi"
         },
         "UPDATE": {
-          "BUTTON_TEXT": "Update Widget Settings",
+          "BUTTON_TEXT": "Actualizați setările",
           "API": {
-            "SUCCESS_MESSAGE": "Widget settings updated successfully",
-            "ERROR_MESSAGE": "Unable to update widget settings"
+            "SUCCESS_MESSAGE": "Setările widget-ului actualizate cu succes",
+            "ERROR_MESSAGE": "Imposibil de actualizat setările IMAP"
           }
         },
         "WIDGET_VIEW_OPTION": {
           "PREVIEW": "Previzualizați",
-          "SCRIPT": "Script"
+          "SCRIPT": "Script Messenger"
         },
         "WIDGET_BUBBLE_POSITION": {
-          "LEFT": "Left",
-          "RIGHT": "Right"
+          "LEFT": "Stânga",
+          "RIGHT": "Dreapta"
         },
         "WIDGET_BUBBLE_TYPE": {
           "STANDARD": "Standard",
-          "EXPANDED_BUBBLE": "Expanded Bubble"
+          "EXPANDED_BUBBLE": "Bubble extins"
         }
       },
       "WIDGET_SCREEN": {
-        "DEFAULT": "Default",
+        "DEFAULT": "Implicit",
         "CHAT": "Chat"
       },
       "REPLY_TIME": {
@@ -681,18 +688,18 @@
       },
       "BODY": {
         "TEAM_AVAILABILITY": {
-          "ONLINE": "We are Online",
+          "ONLINE": "Suntem online",
           "OFFLINE": "Suntem plecați în acest moment"
         },
-        "USER_MESSAGE": "Hi",
-        "AGENT_MESSAGE": "Hello"
+        "USER_MESSAGE": "Salut",
+        "AGENT_MESSAGE": "Bună"
       },
       "BRANDING_TEXT": "Oferit de Chatwoot",
-      "SCRIPT_SETTINGS": "\n      window.chatwootSettings = {options};"
+      "SCRIPT_SETTINGS": "\nwindow.chatwootSettings = {options};"
     },
     "EMAIL_PROVIDERS": {
       "MICROSOFT": "Microsoft",
-      "OTHER_PROVIDERS": "Other Providers"
+      "OTHER_PROVIDERS": "Alți furnizori"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ro/integrations.json b/app/javascript/dashboard/i18n/locale/ro/integrations.json
index 6b9c8a960..4662b431a 100644
--- a/app/javascript/dashboard/i18n/locale/ro/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ro/integrations.json
@@ -2,21 +2,21 @@
   "INTEGRATION_SETTINGS": {
     "HEADER": "Integrări",
     "WEBHOOK": {
-      "SUBSCRIBED_EVENTS": "Subscribed Events",
+      "SUBSCRIBED_EVENTS": "Evenimente subscrise",
       "FORM": {
         "CANCEL": "Renunță",
         "DESC": "Evenimentele Webhook vă oferă informații în timp real despre ce se întâmplă în contul dvs. Chatwoot. Introduceți un URL valid pentru a configura un callback.",
         "SUBSCRIPTIONS": {
-          "LABEL": "Events",
+          "LABEL": "Evenimente",
           "EVENTS": {
-            "CONVERSATION_CREATED": "Conversation Created",
-            "CONVERSATION_STATUS_CHANGED": "Conversation Status Changed",
-            "CONVERSATION_UPDATED": "Conversation Updated",
-            "MESSAGE_CREATED": "Message created",
-            "MESSAGE_UPDATED": "Message updated",
-            "WEBWIDGET_TRIGGERED": "Live chat widget opened by the user",
-            "CONTACT_CREATED": "Contact created",
-            "CONTACT_UPDATED": "Contact updated"
+            "CONVERSATION_CREATED": "Conversație creată",
+            "CONVERSATION_STATUS_CHANGED": "Stare conversație schimbată",
+            "CONVERSATION_UPDATED": "Conversație actualizată",
+            "MESSAGE_CREATED": "Mesaj creat",
+            "MESSAGE_UPDATED": "Mesaj actualizat",
+            "WEBWIDGET_TRIGGERED": "Widget de chat live deschis de utilizator",
+            "CONTACT_CREATED": "Persoană de contact creată",
+            "CONTACT_UPDATED": "Persoană de contact actualizată"
           }
         },
         "END_POINT": {
@@ -24,7 +24,7 @@
           "PLACEHOLDER": "Exemplu: https://example/api/webhook",
           "ERROR": "Te rog introdu un URL valid"
         },
-        "EDIT_SUBMIT": "Update webhook",
+        "EDIT_SUBMIT": "Actualizați webhook",
         "ADD_SUBMIT": "Creează webhook"
       },
       "TITLE": "Webhook",
@@ -46,7 +46,7 @@
         "BUTTON_TEXT": "Editare",
         "TITLE": "Editare webhook",
         "API": {
-          "SUCCESS_MESSAGE": "Webhook configuration updated successfully",
+          "SUCCESS_MESSAGE": "Configurația Webhook actualizată cu succes",
           "ERROR_MESSAGE": "Nu s-a putut conecta la Woot Server, încercați din nou mai târziu"
         }
       },
@@ -54,7 +54,7 @@
         "CANCEL": "Renunță",
         "TITLE": "Adaugă un nou webhook",
         "API": {
-          "SUCCESS_MESSAGE": "Webhook configuration added successfully",
+          "SUCCESS_MESSAGE": "Configurare Webhook adăugată cu succes",
           "ERROR_MESSAGE": "Nu s-a putut conecta la Woot Server, încercați din nou mai târziu"
         }
       },
@@ -66,7 +66,7 @@
         },
         "CONFIRM": {
           "TITLE": "Confirmă ștergerea",
-          "MESSAGE": "Are you sure to delete the webhook? (%{webhookURL})",
+          "MESSAGE": "Sunteți sigur de a șterge webhook? (%{webhookURL})",
           "YES": "Da, șterge ",
           "NO": "Nu, păstreaza"
         }
@@ -79,11 +79,28 @@
       }
     },
     "DYTE": {
-      "CLICK_HERE_TO_JOIN": "Click here to join",
-      "LEAVE_THE_ROOM": "Leave the room",
-      "START_VIDEO_CALL_HELP_TEXT": "Start a new video call with the customer",
-      "JOIN_ERROR": "There was an error joining the call, please try again",
-      "CREATE_ERROR": "There was an error creating a meeting link, please try again"
+      "CLICK_HERE_TO_JOIN": "Click aici pentru a vă alătura",
+      "LEAVE_THE_ROOM": "Părăsiți camera",
+      "START_VIDEO_CALL_HELP_TEXT": "Inițierea unui nou apel video cu clientul",
+      "JOIN_ERROR": "A existat o eroare la aderarea la apel, vă rugăm să încercați din nou",
+      "CREATE_ERROR": "A existat o eroare la crearea unui link de întâlnire, încercați din nou"
+    },
+    "OPEN_AI": {
+      "TITLE": "Improve With AI",
+      "SUBTITLE": "An improved reply will be generated using AI, based on your current draft.",
+      "TONE": {
+        "TITLE": "Tone",
+        "OPTIONS": {
+          "PROFESSIONAL": "Professional",
+          "FRIENDLY": "Friendly"
+        }
+      },
+      "BUTTONS": {
+        "GENERATE": "Generate",
+        "GENERATING": "Generating...",
+        "CANCEL": "Renunță"
+      },
+      "GENERATE_ERROR": "There was an error processing the content, please try again"
     },
     "DELETE": {
       "BUTTON_TEXT": "Şterge",
@@ -95,49 +112,49 @@
       "BUTTON_TEXT": "Conectează-te"
     },
     "DASHBOARD_APPS": {
-      "TITLE": "Dashboard Apps",
-      "HEADER_BTN_TXT": "Add a new dashboard app",
-      "SIDEBAR_TXT": "<p><b>Dashboard Apps</b></p><p>Dashboard Apps allow organizations to embed an application inside the Chatwoot dashboard to provide the context for customer support agents. This feature allows you to create an application independently and embed that inside the dashboard to provide user information, their orders, or their previous payment history.</p><p>When you embed your application using the dashboard in Chatwoot, your application will get the context of the conversation and contact as a window event. Implement a listener for the message event on your page to receive the context.</p><p>To add a new dashboard app, click on the button 'Add a new dashboard app'.</p>",
-      "DESCRIPTION": "Dashboard Apps allow organizations to embed an application inside the dashboard to provide the context for customer support agents. This feature allows you to create an application independently and embed that to provide user information, their orders, or their previous payment history.",
+      "TITLE": "Aplicații tablou de bord",
+      "HEADER_BTN_TXT": "Adăugarea unei noi aplicații pentru tabloul de bord",
+      "SIDEBAR_TXT": "<p><b>Aplicații tablou de bord</b></p><p>Aplicațiile tablou de bord permit organizațiilor să încorporeze o aplicație în tabloul de bord Chatwoot pentru a oferi contextul pentru agenții de asistență pentru clienți. Această caracteristică vă permite să creați o aplicație independent și să o încorporați în interiorul tabloului de bord pentru a furniza informații despre utilizator, comenzile lor sau istoricul plăților anterioare.</p><p>Când încorporați aplicația utilizând tabloul de bord în Chatwoot, aplicația va primi contextul conversației și al contactului ca eveniment de fereastră. Implementați un ascultător pentru evenimentul mesajului de pe pagina dvs., pentru a primi contextul.</p><p>Pentru a adăuga o nouă aplicație de tablou de bord, faceți clic pe butonul \"Adăugați o nouă aplicație de tablou de bord\".</p>",
+      "DESCRIPTION": "Aplicațiile tablou de bord permit organizațiilor să încorporeze o aplicație în interiorul tabloului de bord pentru a oferi contextul agenților de asistență pentru clienți. Această caracteristică vă permite să creați o aplicație independent și să o încorporați pentru a furniza informații despre utilizator, comenzile lor sau istoricul plăților anterioare.",
       "LIST": {
-        "404": "There are no dashboard apps configured on this account yet",
-        "LOADING": "Fetching dashboard apps...",
+        "404": "Nu există încă aplicații de tablou de bord configurate pe acest cont",
+        "LOADING": "Preluarea aplicațiilor de tablou de bord...",
         "TABLE_HEADER": [
           "Nume",
-          "Endpoint"
+          "Punct final"
         ],
-        "EDIT_TOOLTIP": "Edit app",
-        "DELETE_TOOLTIP": "Delete app"
+        "EDIT_TOOLTIP": "Editarea aplicației",
+        "DELETE_TOOLTIP": "Ștergerea aplicației"
       },
       "FORM": {
         "TITLE_LABEL": "Nume",
-        "TITLE_PLACEHOLDER": "Enter a name for your dashboard app",
-        "TITLE_ERROR": "A name for the dashboard app is required",
-        "URL_LABEL": "Endpoint",
-        "URL_PLACEHOLDER": "Enter the endpoint URL where your app is hosted",
-        "URL_ERROR": "A valid URL is required"
+        "TITLE_PLACEHOLDER": "Introduceți un nume pentru aplicația tablou de bord",
+        "TITLE_ERROR": "Este necesar un nume pentru aplicația tabloul de bord",
+        "URL_LABEL": "Punct final",
+        "URL_PLACEHOLDER": "Introduceți adresa URL a punctului final în care este găzduită aplicația dvs.",
+        "URL_ERROR": "Este necesară o adresă URL validă"
       },
       "CREATE": {
-        "HEADER": "Add a new dashboard app",
+        "HEADER": "Adăugarea unei noi aplicații pentru tabloul de bord",
         "FORM_SUBMIT": "Trimite",
         "FORM_CANCEL": "Renunță",
-        "API_SUCCESS": "Dashboard app configured successfully",
-        "API_ERROR": "We couldn't create an app. Please try again later"
+        "API_SUCCESS": "Aplicația Tablou de bord configurată cu succes",
+        "API_ERROR": "Nu am putut crea o aplicație. Încercați din nou mai târziu"
       },
       "UPDATE": {
-        "HEADER": "Edit dashboard app",
+        "HEADER": "Accesați Tabloul de bord conversație",
         "FORM_SUBMIT": "Actualizare",
         "FORM_CANCEL": "Renunță",
-        "API_SUCCESS": "Dashboard app updated successfully",
-        "API_ERROR": "We couldn't update the app. Please try again later"
+        "API_SUCCESS": "Setările IMAP actualizate cu succes",
+        "API_ERROR": "Nu am putut actualiza aplicația. Încercați din nou mai târziu"
       },
       "DELETE": {
-        "CONFIRM_YES": "Yes, delete it",
-        "CONFIRM_NO": "No, keep it",
+        "CONFIRM_YES": "Da, ștergeți acest lucru",
+        "CONFIRM_NO": "Nu, păstreaza",
         "TITLE": "Confirmă ștergerea",
-        "MESSAGE": "Are you sure to delete the app - %{appName}?",
-        "API_SUCCESS": "Dashboard app deleted successfully",
-        "API_ERROR": "We couldn't delete the app. Please try again later"
+        "MESSAGE": "Sunteți sigur că ștergeți aplicația - %{appName}?",
+        "API_SUCCESS": "Aplicația Tablou de bord ștearsă cu succes",
+        "API_ERROR": "Nu am putut șterge aplicația. Încercați din nou mai târziu"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/ro/login.json b/app/javascript/dashboard/i18n/locale/ro/login.json
index 26759579a..680b8174c 100644
--- a/app/javascript/dashboard/i18n/locale/ro/login.json
+++ b/app/javascript/dashboard/i18n/locale/ro/login.json
@@ -3,21 +3,21 @@
     "TITLE": "Conectează-te la Chatwoot",
     "EMAIL": {
       "LABEL": "Email",
-      "PLACEHOLDER": "Email ex: someone@example.com"
+      "PLACEHOLDER": "example@companyname.com"
     },
     "PASSWORD": {
       "LABEL": "Parola",
       "PLACEHOLDER": "Parola"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Autentificare reușită",
-      "ERROR_MESSAGE": "Nu s-a putut conecta la Woot Server, încercați din nou mai târziu",
-      "UNAUTH": "Nume utilizator / parolă incorectă. Vă rugăm să încercaţi din nou"
+      "SUCCESS_MESSAGE": "Login successful",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again.",
+      "UNAUTH": "Username or password is incorrect. Please try again."
     },
     "OAUTH": {
-      "GOOGLE_LOGIN": "Login with Google",
-      "BUSINESS_ACCOUNTS_ONLY": "Please use your company email address to login",
-      "NO_ACCOUNT_FOUND": "We couldn't find an account for your email address."
+      "GOOGLE_LOGIN": "Autentifica-te cu Google+",
+      "BUSINESS_ACCOUNTS_ONLY": "Vă rugăm să utilizați adresa de e-mail a companiei pentru a vă autentifica",
+      "NO_ACCOUNT_FOUND": "Nu am putut găsi un cont pentru adresa ta de e-mail."
     },
     "FORGOT_PASSWORD": "Ai uitat parola?",
     "CREATE_NEW_ACCOUNT": "Creează un cont nou",
diff --git a/app/javascript/dashboard/i18n/locale/ro/macros.json b/app/javascript/dashboard/i18n/locale/ro/macros.json
index d19d94199..822caef8b 100644
--- a/app/javascript/dashboard/i18n/locale/ro/macros.json
+++ b/app/javascript/dashboard/i18n/locale/ro/macros.json
@@ -1,78 +1,78 @@
 {
   "MACROS": {
-    "HEADER": "Macros",
-    "HEADER_BTN_TXT": "Add a new macro",
-    "HEADER_BTN_TXT_SAVE": "Save macro",
-    "LOADING": "Fetching macros",
-    "SIDEBAR_TXT": "<p><b>Macros</b><p>A macro is a set of saved actions that help customer service agents easily complete tasks. The agents can define a set of actions like tagging a conversation with a label, sending an email transcript, updating a custom attribute, etc., and they can run these actions in a single click. When the agents run the macro, the actions would be performed sequentially in the order they are defined. Macros improve productivity and increase consistency in actions. </p><p>A macro can be helpful in 2 ways. </p><p><b>As an agent assist:</b> If an agent performs a set of actions multiple times, they can save it as a macro and execute all the actions together using a single click.</p><p><b>As an option to onboard a team member:</b> Every agent has to perform many different checks/actions during each conversation. Onboarding a new support team member will be easy if pre-defined macros are available on the account. Instead of describing each step in detail, the manager/team lead can point to the macros used in different scenarios.</p>",
-    "ERROR": "Something went wrong. Please try again",
-    "ORDER_INFO": "Macros will run in the order you add your actions. You can rearrange them by dragging them by the handle beside each node.",
+    "HEADER": "Macrocomenzi",
+    "HEADER_BTN_TXT": "Adaugă un nou webhook",
+    "HEADER_BTN_TXT_SAVE": "Salvarea macrocomenzii",
+    "LOADING": "Preluarea macrocomenzilor",
+    "SIDEBAR_TXT": "<p><b>Macrocomenzi</b><p>O macrocomandă este un set de acțiuni salvate care ajută agenții de servicii pentru clienți să finalizeze cu ușurință activitățile. Agenții pot defini un set de acțiuni, cum ar fi etichetarea unei conversații cu o etichetă, trimiterea unei transcrieri a e-mailului, actualizarea unui atribut particularizat etc., și pot rula aceste acțiuni cu un singur clic. Când agenții execută macrocomanda, acțiunile vor fi efectuate secvențial în ordinea în care sunt definite. Macrocomenzile îmbunătățesc productivitatea și cresc consecvența acțiunilor. </p><p>O macrocomandă poate fi utilă în 2 moduri. </p><p><b>În calitate de agent de asistență:</b> Dacă un agent efectuează un set de acțiuni de mai multe ori, îl poate salva ca macrocomandă și poate executa toate acțiunile împreună folosind un singur clic.</p><p><b>Ca opțiune de a înscrie un membru al echipei:</b> Fiecare agent trebuie să efectueze multe verificări / acțiuni diferite în timpul fiecărei conversații. Înscrierea unui nou membru al echipei de asistență va fi ușoară dacă macrocomenzi predefinite sunt disponibile în cont. În loc să descrie fiecare pas în detaliu, coordonatorul manager/echipă poate indica spre macrocomenzile utilizate în diferite scenarii.</p>",
+    "ERROR": "Ceva nu a mers bine. Vă rugăm să încercați din nou",
+    "ORDER_INFO": "Macrocomenzile vor rula în ordinea în care adăugați acțiunile. Le puteți rearanja trăgându-le de mânerul de lângă fiecare nod.",
     "ADD": {
       "FORM": {
         "NAME": {
-          "LABEL": "Macro name",
-          "PLACEHOLDER": "Enter a name for your macro",
-          "ERROR": "Name is required for creating a macro"
+          "LABEL": "Numele macrocomenzii",
+          "PLACEHOLDER": "Introducerea unui nume pentru macrocomandă",
+          "ERROR": "Numele este necesar pentru crearea unei macrocomenzi"
         },
         "ACTIONS": {
           "LABEL": "Actiuni"
         }
       },
       "API": {
-        "SUCCESS_MESSAGE": "Macro added successfully",
-        "ERROR_MESSAGE": "Unable to create macro, Please try again later"
+        "SUCCESS_MESSAGE": "Macrocomandă adăugată cu succes",
+        "ERROR_MESSAGE": "Imposibil de creat macrocomanda, încercați din nou mai târziu"
       }
     },
     "LIST": {
       "TABLE_HEADER": [
         "Nume",
-        "Created by",
-        "Last updated by",
-        "Visibility"
+        "Creat de",
+        "Ultima actualizare de către",
+        "Vizibilitate"
       ],
-      "404": "No macros found"
+      "404": "Nu s-au găsit macrocomenzi"
     },
     "DELETE": {
-      "TOOLTIP": "Delete macro",
+      "TOOLTIP": "Ștergerea macrocomenzii",
       "CONFIRM": {
         "MESSAGE": "Sigur doriți să ștergeți ",
         "YES": "Da, șterge",
         "NO": "Nu"
       },
       "API": {
-        "SUCCESS_MESSAGE": "Macro deleted successfully",
-        "ERROR_MESSAGE": "There was an error deleting the macro. Please try again later"
+        "SUCCESS_MESSAGE": "Macrocomanda ștearsă cu succes",
+        "ERROR_MESSAGE": "A existat o eroare la ștergerea macrocomenzii. Încercați din nou mai târziu"
       }
     },
     "EDIT": {
-      "TOOLTIP": "Edit macro",
+      "TOOLTIP": "Editarea macrocomenzii",
       "API": {
-        "SUCCESS_MESSAGE": "Macro updated successfully",
-        "ERROR_MESSAGE": "Could not update Macro, Please try again later"
+        "SUCCESS_MESSAGE": "Macrocomenzi actualizate cu succes",
+        "ERROR_MESSAGE": "Nu s-a putut actualiza macrocomanda, încercați din nou mai târziu"
       }
     },
     "EDITOR": {
-      "START_FLOW": "Start Flow",
-      "END_FLOW": "End Flow",
-      "LOADING": "Fetching macro",
-      "ADD_BTN_TOOLTIP": "Add new action",
-      "DELETE_BTN_TOOLTIP": "Delete Action",
+      "START_FLOW": "Flux de pornire",
+      "END_FLOW": "Fluxul final",
+      "LOADING": "Preluarea macrocomenzii",
+      "ADD_BTN_TOOLTIP": "Adăugarea unei acțiuni noi",
+      "DELETE_BTN_TOOLTIP": "Ștergere acțiune",
       "VISIBILITY": {
-        "LABEL": "Macro Visibility",
+        "LABEL": "Vizibilitatea macrocomenzilor",
         "GLOBAL": {
           "LABEL": "Public",
-          "DESCRIPTION": "This macro is available publicly for all agents in this account."
+          "DESCRIPTION": "Această macrocomandă este disponibilă public pentru toți agenții din acest cont."
         },
         "PERSONAL": {
-          "LABEL": "Private",
-          "DESCRIPTION": "This macro will be private to you and not be available to others."
+          "LABEL": "Privat",
+          "DESCRIPTION": "Această macrocomandă va fi privată pentru tine și nu va fi disponibilă pentru alte persoane."
         }
       }
     },
     "EXECUTE": {
-      "BUTTON_TOOLTIP": "Execute",
-      "PREVIEW": "Preview Macro",
-      "EXECUTED_SUCCESSFULLY": "Macro executed successfully"
+      "BUTTON_TOOLTIP": "Executa",
+      "PREVIEW": "Previzualizarea macrocomenzii",
+      "EXECUTED_SUCCESSFULLY": "Macrocomandă executată cu succes"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ro/report.json b/app/javascript/dashboard/i18n/locale/ro/report.json
index 3620f380d..31d08a846 100644
--- a/app/javascript/dashboard/i18n/locale/ro/report.json
+++ b/app/javascript/dashboard/i18n/locale/ro/report.json
@@ -21,13 +21,13 @@
         "NAME": "Primul timp de răspuns",
         "DESC": "(Medie)",
         "INFO_TEXT": "Numărul total de conversații utilizate pentru calcul:",
-        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
+        "TOOLTIP_TEXT": "Primul timp de răspuns este %{metricValue} (pe baza conversațiilor %{conversationCount})"
       },
       "RESOLUTION_TIME": {
         "NAME": "Timp Rezolutie",
         "DESC": "(Medie)",
         "INFO_TEXT": "Numărul total de conversații utilizate pentru calcul:",
-        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
+        "TOOLTIP_TEXT": "Timpul de rezolvare este %{metricValue} (pe baza conversațiilor %{conversationCount})"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Număr de rezoluții",
@@ -65,7 +65,7 @@
       "PLACEHOLDER": "Selectarea intervalului de date"
     },
     "GROUP_BY_FILTER_DROPDOWN_LABEL": "Nu sunt conversații active în acest grup.",
-    "DURATION_FILTER_LABEL": "Duration",
+    "DURATION_FILTER_LABEL": "Durata",
     "GROUP_BY_DAY_OPTIONS": [
       {
         "id": 1,
@@ -139,13 +139,13 @@
         "NAME": "Primul timp de răspuns",
         "DESC": "(Medie)",
         "INFO_TEXT": "Numărul total de conversații utilizate pentru calcul:",
-        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
+        "TOOLTIP_TEXT": "Primul timp de răspuns este %{metricValue} (pe baza conversațiilor %{conversationCount})"
       },
       "RESOLUTION_TIME": {
         "NAME": "Timp Rezolutie",
         "DESC": "(Medie)",
         "INFO_TEXT": "Numărul total de conversații utilizate pentru calcul:",
-        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
+        "TOOLTIP_TEXT": "Timpul de rezolvare este %{metricValue} (pe baza conversațiilor %{conversationCount})"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Număr de rezoluții",
@@ -206,13 +206,13 @@
         "NAME": "Primul timp de răspuns",
         "DESC": "(Medie)",
         "INFO_TEXT": "Numărul total de conversații utilizate pentru calcul:",
-        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
+        "TOOLTIP_TEXT": "Primul timp de răspuns este %{metricValue} (pe baza conversațiilor %{conversationCount})"
       },
       "RESOLUTION_TIME": {
         "NAME": "Timp Rezolutie",
         "DESC": "(Medie)",
         "INFO_TEXT": "Numărul total de conversații utilizate pentru calcul:",
-        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
+        "TOOLTIP_TEXT": "Timpul de rezolvare este %{metricValue} (pe baza conversațiilor %{conversationCount})"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Număr de rezoluții",
@@ -273,13 +273,13 @@
         "NAME": "Primul timp de răspuns",
         "DESC": "(Medie)",
         "INFO_TEXT": "Numărul total de conversații utilizate pentru calcul:",
-        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
+        "TOOLTIP_TEXT": "Primul timp de răspuns este %{metricValue} (pe baza conversațiilor %{conversationCount})"
       },
       "RESOLUTION_TIME": {
         "NAME": "Timp Rezolutie",
         "DESC": "(Medie)",
         "INFO_TEXT": "Numărul total de conversații utilizate pentru calcul:",
-        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
+        "TOOLTIP_TEXT": "Timpul de rezolvare este %{metricValue} (pe baza conversațiilor %{conversationCount})"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Număr de rezoluții",
@@ -340,13 +340,13 @@
         "NAME": "Primul timp de răspuns",
         "DESC": "(Medie)",
         "INFO_TEXT": "Numărul total de conversații utilizate pentru calcul:",
-        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
+        "TOOLTIP_TEXT": "Primul timp de răspuns este %{metricValue} (pe baza conversațiilor %{conversationCount})"
       },
       "RESOLUTION_TIME": {
         "NAME": "Timp Rezolutie",
         "DESC": "(Medie)",
         "INFO_TEXT": "Numărul total de conversații utilizate pentru calcul:",
-        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
+        "TOOLTIP_TEXT": "Timpul de rezolvare este %{metricValue} (pe baza conversațiilor %{conversationCount})"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Număr de rezoluții",
@@ -387,7 +387,7 @@
   "CSAT_REPORTS": {
     "HEADER": "Rapoarte CSAT",
     "NO_RECORDS": "Nu există răspunsuri predefinite disponibile în acest cont.",
-    "DOWNLOAD": "Download CSAT Reports",
+    "DOWNLOAD": "Descărcați rapoartele CSAT",
     "FILTERS": {
       "AGENTS": {
         "PLACEHOLDER": "Alege agenți"
@@ -420,43 +420,43 @@
     "HEADER": "Prezentare generală",
     "LIVE": "Live",
     "ACCOUNT_CONVERSATIONS": {
-      "HEADER": "Open Conversations",
-      "LOADING_MESSAGE": "Loading conversation metrics...",
+      "HEADER": "Deschiderea conversațiilor",
+      "LOADING_MESSAGE": "Încărcarea valorilor conversației...",
       "OPEN": "Deschide",
-      "UNATTENDED": "Unattended",
+      "UNATTENDED": "Neasistat",
       "UNASSIGNED": "Neatribuit"
     },
     "CONVERSATION_HEATMAP": {
-      "HEADER": "Conversation Traffic",
-      "NO_CONVERSATIONS": "No conversations",
-      "CONVERSATION": "%{count} conversation",
-      "CONVERSATIONS": "%{count} conversations"
+      "HEADER": "Trafic de conversație",
+      "NO_CONVERSATIONS": "Fără conversații",
+      "CONVERSATION": "%{count} conversație",
+      "CONVERSATIONS": "conversații %{count}"
     },
     "AGENT_CONVERSATIONS": {
-      "HEADER": "Conversations by agents",
-      "LOADING_MESSAGE": "Loading agent metrics...",
-      "NO_AGENTS": "There are no conversations by agents",
+      "HEADER": "Conversațiile agenților",
+      "LOADING_MESSAGE": "Măsurătorile agentului de încărcare...",
+      "NO_AGENTS": "Nu există conversații ale agenților",
       "TABLE_HEADER": {
         "AGENT": "Agent",
-        "OPEN": "OPEN",
-        "UNATTENDED": "Unattended",
+        "OPEN": "DESCHIS",
+        "UNATTENDED": "Neasistat",
         "STATUS": "Status"
       }
     },
     "AGENT_STATUS": {
-      "HEADER": "Agent status",
+      "HEADER": "Starea agentului",
       "ONLINE": "Online",
       "BUSY": "Ocupat",
       "OFFLINE": "Deconectat"
     }
   },
   "DAYS_OF_WEEK": {
-    "SUNDAY": "Sunday",
-    "MONDAY": "Monday",
-    "TUESDAY": "Tuesday",
-    "WEDNESDAY": "Wednesday",
-    "THURSDAY": "Thursday",
-    "FRIDAY": "Friday",
-    "SATURDAY": "Saturday"
+    "SUNDAY": "Duminică",
+    "MONDAY": "Luni",
+    "TUESDAY": "Marți",
+    "WEDNESDAY": "Miercuri",
+    "THURSDAY": "Joi",
+    "FRIDAY": "Vineri",
+    "SATURDAY": "Sâmbătă"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ro/resetPassword.json b/app/javascript/dashboard/i18n/locale/ro/resetPassword.json
index c7e30267a..44f63583b 100644
--- a/app/javascript/dashboard/i18n/locale/ro/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/ro/resetPassword.json
@@ -1,14 +1,14 @@
 {
   "RESET_PASSWORD": {
-    "TITLE": "Resetează Parola",
+    "TITLE": "Resetare parolă",
     "EMAIL": {
       "LABEL": "Email",
-      "PLACEHOLDER": "Te rugăm să introduci adresa de e-mail",
-      "ERROR": "Te rugăm să introduci adresa de e-mail"
+      "PLACEHOLDER": "Te rugăm să introduci adresa de e-mail.",
+      "ERROR": "Te rugăm să introduci adresa de e-mail."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Link-ul de resetare a parolei a fost trimis pe e-mail",
-      "ERROR_MESSAGE": "Nu s-a putut conecta la Woot Server, încercați din nou mai târziu"
+      "SUCCESS_MESSAGE": "Link-ul de resetare a parolei a fost trimis pe e-mail.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Trimite"
   }
diff --git a/app/javascript/dashboard/i18n/locale/ro/search.json b/app/javascript/dashboard/i18n/locale/ro/search.json
index 8f6d7b783..afee80937 100644
--- a/app/javascript/dashboard/i18n/locale/ro/search.json
+++ b/app/javascript/dashboard/i18n/locale/ro/search.json
@@ -11,13 +11,13 @@
       "CONVERSATIONS": "Conversații",
       "MESSAGES": "Mesaje"
     },
-    "EMPTY_STATE": "No %{item} found for query '%{query}'",
-    "EMPTY_STATE_FULL": "No results found for query '%{query}'",
-    "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
-    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
+    "EMPTY_STATE": "Nu există elemente care să corespundă acestei interogări",
+    "EMPTY_STATE_FULL": "Niciun rezultat găsit",
+    "PLACEHOLDER_KEYBINDING": "/ să se concentreze",
+    "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "EMPTY_STATE_DEFAULT": "Căutați după id-ul conversației, e-mail, numărul de telefon, mesajele pentru rezultate de căutare mai bune. ",
     "BOT_LABEL": "Bot",
-    "READ_MORE": "Read more",
-    "WROTE": "wrote:"
+    "READ_MORE": "Citeşte mai mult",
+    "WROTE": "Wrote:"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ro/setNewPassword.json b/app/javascript/dashboard/i18n/locale/ro/setNewPassword.json
index 72fc275bf..edd786d44 100644
--- a/app/javascript/dashboard/i18n/locale/ro/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/ro/setNewPassword.json
@@ -1,19 +1,19 @@
 {
   "SET_NEW_PASSWORD": {
-    "TITLE": "Setare parolă nouă",
+    "TITLE": "Set new password",
     "PASSWORD": {
       "LABEL": "Parola",
       "PLACEHOLDER": "Parola",
-      "ERROR": "Parola este prea scurta"
+      "ERROR": "Parola este prea scurta."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirmă parola",
+      "LABEL": "Confirm password",
       "PLACEHOLDER": "Confirmă parola",
-      "ERROR": "Parola nu coincide"
+      "ERROR": "Parola nu coincide."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Parola a fost schimbată cu succes",
-      "ERROR_MESSAGE": "Nu s-a putut conecta la Woot Server, încercați din nou mai târziu"
+      "SUCCESS_MESSAGE": "Parola a fost schimbată cu succes.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "CAPTCHA": {
       "ERROR": "Verificarea a expirat. Vă rugăm să rezolvați captcha din nou."
diff --git a/app/javascript/dashboard/i18n/locale/ro/settings.json b/app/javascript/dashboard/i18n/locale/ro/settings.json
index 00ca627f4..21384574a 100644
--- a/app/javascript/dashboard/i18n/locale/ro/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ro/settings.json
@@ -20,23 +20,23 @@
         "NOTE": "Adresa ta de email este identitatea ta și este folosită pentru a te autentifica."
       },
       "SEND_MESSAGE": {
-        "TITLE": "Hotkey to send messages",
-        "NOTE": "You can select a hotkey (either Enter or Cmd/Ctrl+Enter) based on your preference of writing.",
-        "UPDATE_SUCCESS": "Your settings have been updated successfully",
+        "TITLE": "Taste rapide pentru a trimite mesaje",
+        "NOTE": "Puteți selecta o tastă rapidă (enter sau Cmd/Ctrl+Enter) în funcție de preferințele dumneavoastră de a scrie.",
+        "UPDATE_SUCCESS": "Setările au fost actualizate cu succes",
         "CARD": {
           "ENTER_KEY": {
-            "HEADING": "Enter (↵)",
-            "CONTENT": "Send messages by pressing Enter key instead of clicking the send button."
+            "HEADING": "Introduceți (↵)",
+            "CONTENT": "Trimiteți mesaje apăsând tasta Enter în loc să faceți clic pe butonul trimitere."
           },
           "CMD_ENTER_KEY": {
             "HEADING": "Cmd/Ctrl + Enter (⌘ + ↵)",
-            "CONTENT": "Send messages by pressing Cmd/Ctrl + enter key instead of clicking the send button."
+            "CONTENT": "Trimiteți mesaje apăsând tasta Cmd/ Ctrl + enter în loc să faceți clic pe butonul trimitere."
           }
         }
       },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Semnătura mesajului personal",
-        "NOTE": "Create a personal message signature that would be added to all the messages you send from your email inbox. Use the rich content editor to create a highly personalised signature.",
+        "NOTE": "Creați o semnătură de mesaj personal care ar fi adăugată la toate mesajele pe care le trimiteți din inboxul de e-mail. Utilizați editorul de conținut îmbogățit pentru a crea o semnătură extrem de personalizată.",
         "BTN_TEXT": "Salvarea semnăturii mesajului",
         "API_ERROR": "Nu s-a putut trimite! Încearcă din nou",
         "API_SUCCESS": "Semnătura salvată cu succes"
@@ -59,18 +59,18 @@
         "TITLE": "Notificări audio",
         "NOTE": "Activați notificările audio în tabloul de bord pentru mesaje și conversații noi.",
         "ALERT_TYPE": {
-          "TITLE": "Alert events:",
+          "TITLE": "Evenimente de alertă:",
           "NONE": "Nimic",
           "ASSIGNED": "Conversații atribuite",
           "ALL_CONVERSATIONS": "Toate conversațiile"
         },
         "DEFAULT_TONE": {
-          "TITLE": "Alert tone:"
+          "TITLE": "Tonul de alertă:"
         },
         "CONDITIONS": {
-          "TITLE": "Alert conditions:",
-          "CONDITION_ONE": "Send audio alerts only if the browser window is not active",
-          "CONDITION_TWO": "Send alerts every 30s until all the assigned conversations are read"
+          "TITLE": "Condiții de alertă:",
+          "CONDITION_ONE": "Trimiteți alerte audio numai dacă fereastra browserului nu este activă",
+          "CONDITION_TWO": "Trimiteți alerte la fiecare 30 de ani până când toate conversațiile atribuite sunt citite"
         }
       },
       "EMAIL_NOTIFICATIONS_SECTION": {
@@ -80,7 +80,7 @@
         "CONVERSATION_CREATION": "Trimite notificări prin e-mail atunci când o conversație nouă este creată",
         "CONVERSATION_MENTION": "Trimiterea notificărilor prin e-mail atunci când sunteți menționat într-o conversație",
         "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Trimiterea notificărilor prin e-mail atunci când se creează un mesaj nou într-o conversație atribuită",
-        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in a participating conversation"
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Trimiterea notificărilor prin e-mail atunci când se creează un mesaj nou într-o conversație atribuită"
       },
       "API": {
         "UPDATE_SUCCESS": "Preferințele de notificare sunt actualizate cu succes",
@@ -93,7 +93,7 @@
         "CONVERSATION_CREATION": "Trimite notificări push atunci când o conversație nouă este creată",
         "CONVERSATION_MENTION": "Trimiterea notificărilor push atunci când sunteți menționat într-o conversație",
         "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Trimiterea notificărilor push atunci când se creează un mesaj nou într-o conversație atribuită",
-        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in a participating conversation",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Trimiterea notificărilor push atunci când se creează un mesaj nou într-o conversație participantă",
         "HAS_ENABLED_PUSH": "Ați activat apăsarea pentru acest browser.",
         "REQUEST_PUSH": "Activează notificările push"
       },
@@ -117,8 +117,8 @@
           "Ocupat",
           "Deconectat"
         ],
-        "SET_AVAILABILITY_SUCCESS": "Availability has been set successfully",
-        "SET_AVAILABILITY_ERROR": "Couldn't set availability, please try again"
+        "SET_AVAILABILITY_SUCCESS": "Avatar a fost șters cu succes",
+        "SET_AVAILABILITY_ERROR": "Nu s-a putut atribui agentul. Vă rugăm încercați din nou."
       },
       "EMAIL": {
         "LABEL": "Adresa ta de email",
@@ -149,7 +149,7 @@
     "SELECTOR_SUBTITLE": "Selectaţi un cont din următoarea listă",
     "PROFILE_SETTINGS": "Setări profil",
     "KEYBOARD_SHORTCUTS": "Scurtături Tastatură",
-    "SUPER_ADMIN_CONSOLE": "Super Admin Console",
+    "SUPER_ADMIN_CONSOLE": "Super Admin Consola",
     "LOGOUT": "Deconectare"
   },
   "APP_GLOBAL": {
@@ -157,19 +157,19 @@
     "TRAIL_BUTTON": "Cumpara acum",
     "DELETED_USER": "Utilizator șters",
     "ACCOUNT_SUSPENDED": {
-      "TITLE": "Account Suspended",
-      "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+      "TITLE": "Cont suspendat",
+      "MESSAGE": "Contul tău este suspendat. Vă rugăm să contactați echipa de asistență pentru mai multe informații."
     }
   },
   "COMPONENTS": {
     "CODE": {
       "BUTTON_TEXT": "Copiază",
-      "CODEPEN": "Open in CodePen",
+      "CODEPEN": "Deschis în CodePen",
       "COPY_SUCCESSFUL": "Cod copiat în clipboard cu succes"
     },
     "SHOW_MORE_BLOCK": {
-      "SHOW_MORE": "Show More",
-      "SHOW_LESS": "Show Less"
+      "SHOW_MORE": "Arată mai multe",
+      "SHOW_LESS": "Afișați mai puține"
     },
     "FILE_BUBBLE": {
       "DOWNLOAD": "Descărcare",
@@ -177,7 +177,7 @@
       "INSTAGRAM_STORY_UNAVAILABLE": "Această poveste nu mai este disponibilă."
     },
     "LOCATION_BUBBLE": {
-      "SEE_ON_MAP": "See on map"
+      "SEE_ON_MAP": "Vezi pe hartă"
     },
     "FORM_BUBBLE": {
       "SUBMIT": "Trimite"
@@ -191,19 +191,19 @@
   },
   "SIDEBAR": {
     "CURRENTLY_VIEWING_ACCOUNT": "În prezent, vizualizarea:",
-    "SWITCH": "Switch",
+    "SWITCH": "Comută contul",
     "CONVERSATIONS": "Conversații",
     "ALL_CONVERSATIONS": "Toate conversațiile",
     "MENTIONED_CONVERSATIONS": "Menţionări",
     "PARTICIPATING_CONVERSATIONS": "Participante",
-    "UNATTENDED_CONVERSATIONS": "Unattended",
+    "UNATTENDED_CONVERSATIONS": "Neasistat",
     "REPORTS": "Rapoarte",
     "SETTINGS": "Setări",
     "CONTACTS": "Contacte",
     "HOME": "Acasa",
     "AGENTS": "Agenți",
     "AGENT_BOTS": "Boți",
-    "AUDIT_LOGS": "Audit Logs",
+    "AUDIT_LOGS": "Jurnale de audit",
     "INBOXES": "Căsuțe",
     "NOTIFICATIONS": "Notificări",
     "CANNED_RESPONSES": "Răspunsuri predefinite",
@@ -214,9 +214,9 @@
     "LABELS": "Etichete",
     "CUSTOM_ATTRIBUTES": "Editează atribut personalizat",
     "AUTOMATION": "Automatizare",
-    "MACROS": "Macros",
+    "MACROS": "Macrocomenzi",
     "TEAMS": "Echipe",
-    "BILLING": "Billing",
+    "BILLING": "Facturare",
     "CUSTOM_VIEWS_FOLDER": "Foldere",
     "CUSTOM_VIEWS_SEGMENTS": "Segmente",
     "ALL_CONTACTS": "Toate persoanele de contact",
@@ -238,38 +238,38 @@
     "REPORTS_OVERVIEW": "Prezentare generală",
     "FACEBOOK_REAUTHORIZE": "Conexiunea ta de Facebook a expirat, te rugăm să-ți reconectezi pagina de Facebook pentru a continua serviciile",
     "HELP_CENTER": {
-      "TITLE": "Help Center (Beta)",
-      "ALL_ARTICLES": "All Articles",
-      "MY_ARTICLES": "My Articles",
-      "DRAFT": "Draft",
-      "ARCHIVED": "Archived",
-      "CATEGORY": "Category",
+      "TITLE": "Centrul de ajutor (Beta)",
+      "ALL_ARTICLES": "Toate articolele",
+      "MY_ARTICLES": "Articolele mele",
+      "DRAFT": "Schita",
+      "ARCHIVED": "Arhivate",
+      "CATEGORY": "Categorie",
       "SETTINGS": "Setări",
-      "CATEGORY_EMPTY_MESSAGE": "No categories found"
+      "CATEGORY_EMPTY_MESSAGE": "Nu s-au găsit categorii"
     },
     "SET_AUTO_OFFLINE": {
-      "TEXT": "Mark offline automatically",
-      "INFO_TEXT": "Let the system automatically mark you offline when you aren't using the app or dashboard."
+      "TEXT": "Marcarea automată a offline-ului",
+      "INFO_TEXT": "Permiteți sistemului să vă marcheze automat offline atunci când nu utilizați aplicația sau tabloul de bord."
     },
-    "DOCS": "Read docs"
+    "DOCS": "Citiți Documente"
   },
   "BILLING_SETTINGS": {
-    "TITLE": "Billing",
+    "TITLE": "Facturare",
     "CURRENT_PLAN": {
-      "TITLE": "Current Plan",
-      "PLAN_NOTE": "You are currently subscribed to the **%{plan}** plan with **%{quantity}** licenses"
+      "TITLE": "Pentru acest plan nu sunt disponibile extraoptiuni",
+      "PLAN_NOTE": "În prezent sunteți abonat la planul **%{plan}** cu licențe **%{quantity}**"
     },
     "MANAGE_SUBSCRIPTION": {
-      "TITLE": "Manage your subscription",
-      "DESCRIPTION": "View your previous invoices, edit your billing details, or cancel your subscription.",
-      "BUTTON_TXT": "Go to the billing portal"
+      "TITLE": "Gestionați-vă abonamentul",
+      "DESCRIPTION": "Vizualizați facturile anterioare, editați detaliile de facturare sau anulați abonamentul.",
+      "BUTTON_TXT": "Accesați portalul de facturare"
     },
     "CHAT_WITH_US": {
-      "TITLE": "Need help?",
-      "DESCRIPTION": "Do you face any issues in billing? We are here to help.",
+      "TITLE": "Aveţi nevoie de ajutor?",
+      "DESCRIPTION": "Vă confruntați cu probleme în facturare? Suntem aici pentru a vă ajuta.",
       "BUTTON_TXT": "Discută cu noi"
     },
-    "NO_BILLING_USER": "Your billing account is being configured. Please refresh the page and try again."
+    "NO_BILLING_USER": "Contul de facturare este configurat. Vă rugăm să reîmprospătați pagina și încercați din nou."
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! Nu am putut găsi niciun cont Chatwoot. Vă rugăm să creați un cont nou pentru a continua.",
@@ -289,7 +289,7 @@
     }
   },
   "KEYBOARD_SHORTCUTS": {
-    "TOGGLE_MODAL": "View all shortcuts",
+    "TOGGLE_MODAL": "Vizualizați toate comenzile rapide",
     "TITLE": {
       "OPEN_CONVERSATION": "Deschiderea conversației",
       "RESOLVE_AND_NEXT": "Rezolvarea și trecerea la următorul",
diff --git a/app/javascript/dashboard/i18n/locale/ro/signup.json b/app/javascript/dashboard/i18n/locale/ro/signup.json
index 5a6249265..ec468d798 100644
--- a/app/javascript/dashboard/i18n/locale/ro/signup.json
+++ b/app/javascript/dashboard/i18n/locale/ro/signup.json
@@ -1,44 +1,44 @@
 {
   "REGISTER": {
-    "TRY_WOOT": "Create an account",
+    "TRY_WOOT": "Creează cont",
     "TITLE": "Inregistrare",
-    "TESTIMONIAL_HEADER": "All it takes is one step to move forward",
-    "TESTIMONIAL_CONTENT": "You're one step away from engaging your customers, retaining them and finding new ones.",
-    "TERMS_ACCEPT": "By creating an account, you agree to our <a href=\"https://www.chatwoot.com/terms\">T & C</a> and <a href=\"https://www.chatwoot.com/privacy-policy\">Privacy policy</a>",
+    "TESTIMONIAL_HEADER": "Tot ce trebuie este un pas pentru a merge mai departe",
+    "TESTIMONIAL_CONTENT": "Ești la un pas de a-ți angaja clienții, de a-i păstra și de a găsi altele noi.",
+    "TERMS_ACCEPT": "Prin crearea unui cont, sunteți de acord cu <a href=\"https://www.chatwoot.com/terms\">T & C</a> și <a href=\"https://www.chatwoot.com/privacy-policy\">politica noastră de confidențialitate</a>",
     "OAUTH": {
-      "GOOGLE_SIGNUP": "Sign up with Google"
+      "GOOGLE_SIGNUP": "Înscrieți-vă cu Google"
     },
     "COMPANY_NAME": {
-      "LABEL": "Company name",
-      "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
-      "ERROR": "Company name is too short"
+      "LABEL": "Numele Companiei",
+      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
+      "ERROR": "Numele companiei este prea scurt."
     },
     "FULL_NAME": {
       "LABEL": "Nume complet",
-      "PLACEHOLDER": "Introduceți numele complet. de exemplu: Bruce Wayne",
-      "ERROR": "Numele complet este prea scurt"
+      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
+      "ERROR": "Numele complet este prea scurt."
     },
     "EMAIL": {
       "LABEL": "E-mail de lucru",
-      "PLACEHOLDER": "Introduceți adresa de e-mail de la locul de muncă. de exemplu: bruce@wayne.enterprises",
-      "ERROR": "Please enter a valid work email address"
+      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
+      "ERROR": "Vă rugăm să introduceți o adresă de e-mail validă de lucru."
     },
     "PASSWORD": {
       "LABEL": "Parola",
       "PLACEHOLDER": "Parola",
-      "ERROR": "Parola este prea scurta",
-      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
+      "ERROR": "Parola este prea scurta.",
+      "IS_INVALID_PASSWORD": "Parola trebuie să conțină atleast 1 literă mare, 1 literă mică, 1 număr și 1 caracter special."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirmă parola",
-      "PLACEHOLDER": "Confirmă parola",
-      "ERROR": "Parola nu coincide"
+      "LABEL": "Confirm password",
+      "PLACEHOLDER": "Confirm password",
+      "ERROR": "Parola nu coincide."
     },
     "API": {
       "SUCCESS_MESSAGE": "Înregistrare cu succes",
-      "ERROR_MESSAGE": "Nu s-a putut conecta la Woot Server, încercați din nou mai târziu"
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
-    "SUBMIT": "Create account",
+    "SUBMIT": "Creează cont",
     "HAVE_AN_ACCOUNT": "Ai deja un cont?"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ro/whatsappTemplates.json b/app/javascript/dashboard/i18n/locale/ro/whatsappTemplates.json
index bbcf28156..8443a412f 100644
--- a/app/javascript/dashboard/i18n/locale/ro/whatsappTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/ro/whatsappTemplates.json
@@ -1,25 +1,25 @@
 {
     "WHATSAPP_TEMPLATES": {
         "MODAL": {
-            "TITLE": "Whatsapp Templates",
-            "SUBTITLE": "Select the whatsapp template you want to send",
-            "TEMPLATE_SELECTED_SUBTITLE": "Process %{templateName}"
+            "TITLE": "Șabloane WhatsApp",
+            "SUBTITLE": "Selectați șablonul WhatsApp pe care doriți să trimiteți",
+            "TEMPLATE_SELECTED_SUBTITLE": "%{templateName} de proces"
         },
         "PICKER": {
-            "SEARCH_PLACEHOLDER": "Search Templates",
-            "NO_TEMPLATES_FOUND": "No templates found for",
+            "SEARCH_PLACEHOLDER": "Caută Șabloane",
+            "NO_TEMPLATES_FOUND": "Nu s-au găsit șabloane pentru",
             "LABELS": {
-                "LANGUAGE": "Language",
-                "TEMPLATE_BODY": "Template Body",
-                "CATEGORY": "Category"
+                "LANGUAGE": "Limbă",
+                "TEMPLATE_BODY": "Corpul șablonului",
+                "CATEGORY": "Categorie"
             }
         },
         "PARSER": {
-            "VARIABLES_LABEL": "Variables",
-            "VARIABLE_PLACEHOLDER": "Enter %{variable} value",
-            "GO_BACK_LABEL": "Go Back",
-            "SEND_MESSAGE_LABEL": "Send Message",
-            "FORM_ERROR_MESSAGE": "Please fill all variables before sending"
+            "VARIABLES_LABEL": "Variabile",
+            "VARIABLE_PLACEHOLDER": "Introducerea %{variable} valoare",
+            "GO_BACK_LABEL": "Înapoi",
+            "SEND_MESSAGE_LABEL": "Trimite mesaj",
+            "FORM_ERROR_MESSAGE": "Vă rugăm să completați toate variabilele înainte de a trimite"
         }
     }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ru/advancedFilters.json b/app/javascript/dashboard/i18n/locale/ru/advancedFilters.json
index c9efd268c..05fd115e1 100644
--- a/app/javascript/dashboard/i18n/locale/ru/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/ru/advancedFilters.json
@@ -38,6 +38,7 @@
       "CAMPAIGN_NAME": "Название Кампании",
       "LABELS": "Категории",
       "BROWSER_LANGUAGE": "Язык браузера",
+      "PRIORITY": "Priority",
       "COUNTRY_NAME": "Страна",
       "REFERER_LINK": "Ссылка реферера",
       "CUSTOM_ATTRIBUTE_LIST": "Список",
diff --git a/app/javascript/dashboard/i18n/locale/ru/agentMgmt.json b/app/javascript/dashboard/i18n/locale/ru/agentMgmt.json
index dc4a0897d..031ed4d7f 100644
--- a/app/javascript/dashboard/i18n/locale/ru/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ru/agentMgmt.json
@@ -110,7 +110,8 @@
         },
         "PLACEHOLDER": {
           "AGENT": "Поиск агентов",
-          "TEAM": "Поиск команд"
+          "TEAM": "Поиск команд",
+          "INPUT": "Search for agents"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/ru/conversation.json b/app/javascript/dashboard/i18n/locale/ru/conversation.json
index 20322cf50..923a2219e 100644
--- a/app/javascript/dashboard/i18n/locale/ru/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ru/conversation.json
@@ -37,6 +37,7 @@
     "UNKNOWN_FILE_TYPE": "Неизвестный файл",
     "SAVE_CONTACT": "Сохранить",
     "UPLOADING_ATTACHMENTS": "Загрузка вложений...",
+    "REPLIED_TO_STORY": "Replied to your story",
     "SUCCESS_DELETE_MESSAGE": "Сообщение успешно удалено",
     "FAIL_DELETE_MESSSAGE": "Не удалось удалить сообщение! Попробуйте еще раз",
     "NO_RESPONSE": "Нет ответа",
@@ -66,6 +67,23 @@
         "NEXT_WEEK": "На следующей неделе"
       }
     },
+    "PRIORITY": {
+      "TITLE": "Priority",
+      "OPTIONS": {
+        "NONE": "Ничего",
+        "URGENT": "Urgent",
+        "HIGH": "High",
+        "MEDIUM": "Medium",
+        "LOW": "Low"
+      },
+      "CHANGE_PRIORITY": {
+        "SELECT_PLACEHOLDER": "Ничего",
+        "INPUT_PLACEHOLDER": "Select priority",
+        "NO_RESULTS": "Результаты не найдены",
+        "SUCCESSFUL": "Changed priority of conversation id %{conversationId} to %{priority}",
+        "FAILED": "Couldn't change priority. Please try again."
+      }
+    },
     "CARD_CONTEXT_MENU": {
       "PENDING": "Отметить как ожидающие",
       "RESOLVED": "Пометить как разрешено",
diff --git a/app/javascript/dashboard/i18n/locale/ru/generalSettings.json b/app/javascript/dashboard/i18n/locale/ru/generalSettings.json
index e9b521d54..70ecbd01f 100644
--- a/app/javascript/dashboard/i18n/locale/ru/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ru/generalSettings.json
@@ -101,6 +101,7 @@
       "REPORTS": "Отчёты",
       "CONVERSATION": "Диалоги",
       "CHANGE_ASSIGNEE": "Изменить Назначенного",
+      "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Изменить команду",
       "ADD_LABEL": "Добавить метку в разговор",
       "REMOVE_LABEL": "Удалить метку из разговора",
@@ -126,6 +127,7 @@
       "GO_TO_NOTIFICATIONS": "Перейти к уведомлениям",
       "ADD_LABELS_TO_CONVERSATION": "Добавить метку в разговор",
       "ASSIGN_AN_AGENT": "Назначить сотрудника",
+      "ASSIGN_PRIORITY": "Assign priority",
       "ASSIGN_A_TEAM": "Назначить команду",
       "MUTE_CONVERSATION": "Заглушить диалог",
       "UNMUTE_CONVERSATION": "Включить диалог",
diff --git a/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json
index f4c93f689..66ecf7dce 100644
--- a/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json
@@ -482,6 +482,13 @@
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
+    "HELP_CENTER": {
+      "LABEL": "Help Center",
+      "PLACEHOLDER": "Select Help Center",
+      "SELECT_PLACEHOLDER": "Select Help Center",
+      "REMOVE": "Remove Help Center",
+      "SUB_TEXT": "Attach a Help Center with the inbox"
+    },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Авто распределение лимита",
       "MAX_ASSIGNMENT_LIMIT_RANGE_ERROR": "Пожалуйста, введите значение больше 0",
diff --git a/app/javascript/dashboard/i18n/locale/ru/integrations.json b/app/javascript/dashboard/i18n/locale/ru/integrations.json
index 25293495a..0cc285ddf 100644
--- a/app/javascript/dashboard/i18n/locale/ru/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ru/integrations.json
@@ -85,6 +85,23 @@
       "JOIN_ERROR": "Произошла ошибка при подключении к вызову, попробуйте еще раз",
       "CREATE_ERROR": "Произошла ошибка при создании ссылки на встречу, попробуйте еще раз"
     },
+    "OPEN_AI": {
+      "TITLE": "Improve With AI",
+      "SUBTITLE": "An improved reply will be generated using AI, based on your current draft.",
+      "TONE": {
+        "TITLE": "Tone",
+        "OPTIONS": {
+          "PROFESSIONAL": "Professional",
+          "FRIENDLY": "Friendly"
+        }
+      },
+      "BUTTONS": {
+        "GENERATE": "Generate",
+        "GENERATING": "Generating...",
+        "CANCEL": "Отменить"
+      },
+      "GENERATE_ERROR": "There was an error processing the content, please try again"
+    },
     "DELETE": {
       "BUTTON_TEXT": "Удалить",
       "API": {
diff --git a/app/javascript/dashboard/i18n/locale/ru/login.json b/app/javascript/dashboard/i18n/locale/ru/login.json
index 3ec6d96e5..0ce7fea96 100644
--- a/app/javascript/dashboard/i18n/locale/ru/login.json
+++ b/app/javascript/dashboard/i18n/locale/ru/login.json
@@ -3,16 +3,16 @@
     "TITLE": "Войти в Chatwoot",
     "EMAIL": {
       "LABEL": "Email",
-      "PLACEHOLDER": "Например: someone@example.com"
+      "PLACEHOLDER": "example@companyname.com"
     },
     "PASSWORD": {
       "LABEL": "Пароль",
       "PLACEHOLDER": "Пароль"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Вход выполнен",
-      "ERROR_MESSAGE": "Не удается соединиться с сервером Woot, попробуйте позже",
-      "UNAUTH": "Неверное имя пользователя / пароль. Пожалуйста, попробуйте еще раз"
+      "SUCCESS_MESSAGE": "Login successful",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again.",
+      "UNAUTH": "Username or password is incorrect. Please try again."
     },
     "OAUTH": {
       "GOOGLE_LOGIN": "Войти с помощью Google",
diff --git a/app/javascript/dashboard/i18n/locale/ru/resetPassword.json b/app/javascript/dashboard/i18n/locale/ru/resetPassword.json
index f68dd14bc..ad9aeaefe 100644
--- a/app/javascript/dashboard/i18n/locale/ru/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/ru/resetPassword.json
@@ -1,14 +1,14 @@
 {
   "RESET_PASSWORD": {
-    "TITLE": "Восстановить пароль",
+    "TITLE": "Сбросить пароль",
     "EMAIL": {
       "LABEL": "Email",
-      "PLACEHOLDER": "Пожалуйста, введите ваш email",
-      "ERROR": "Пожалуйста, введите правильный email"
+      "PLACEHOLDER": "Пожалуйста, введите ваш email.",
+      "ERROR": "Пожалуйста, введите правильный email."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Ссылка для сброса пароля была отправлена на ваш email",
-      "ERROR_MESSAGE": "Не удается соединиться с сервером Woot, попробуйте позже"
+      "SUCCESS_MESSAGE": "Ссылка для сброса пароля была отправлена на ваш email.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Отправить"
   }
diff --git a/app/javascript/dashboard/i18n/locale/ru/search.json b/app/javascript/dashboard/i18n/locale/ru/search.json
index 41a9b22a3..112a968ad 100644
--- a/app/javascript/dashboard/i18n/locale/ru/search.json
+++ b/app/javascript/dashboard/i18n/locale/ru/search.json
@@ -14,8 +14,8 @@
     "EMPTY_STATE": "Не найдено %{item} для запроса '%{query}'",
     "EMPTY_STATE_FULL": "Ничего не найдено по запросу '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ фокусироваться",
-    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
-    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
+    "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Бот",
     "READ_MORE": "Читать далее",
     "WROTE": "написал:"
diff --git a/app/javascript/dashboard/i18n/locale/ru/setNewPassword.json b/app/javascript/dashboard/i18n/locale/ru/setNewPassword.json
index 2eb18fe18..270652616 100644
--- a/app/javascript/dashboard/i18n/locale/ru/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/ru/setNewPassword.json
@@ -1,19 +1,19 @@
 {
   "SET_NEW_PASSWORD": {
-    "TITLE": "Установить новый пароль",
+    "TITLE": "Set new password",
     "PASSWORD": {
       "LABEL": "Пароль",
       "PLACEHOLDER": "Пароль",
-      "ERROR": "Пароль слишком короткий"
+      "ERROR": "Пароль слишком короткий."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Подтвердить пароль",
+      "LABEL": "Confirm password",
       "PLACEHOLDER": "Подтвердить пароль",
-      "ERROR": "Пароли не совпадают"
+      "ERROR": "Пароли не совпадают."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Пароль изменен",
-      "ERROR_MESSAGE": "Не удается соединиться с сервером Woot, попробуйте позже"
+      "SUCCESS_MESSAGE": "Пароль изменен.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "CAPTCHA": {
       "ERROR": "Время проверки истекло. Пожалуйста, решите задачу captcha еще раз."
diff --git a/app/javascript/dashboard/i18n/locale/ru/signup.json b/app/javascript/dashboard/i18n/locale/ru/signup.json
index 2d3104a4b..fa9516042 100644
--- a/app/javascript/dashboard/i18n/locale/ru/signup.json
+++ b/app/javascript/dashboard/i18n/locale/ru/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Название компании",
-      "PLACEHOLDER": "Введите имя вашей компании, например: Wayne Enterprises",
-      "ERROR": "Название компании слишком короткое"
+      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
+      "ERROR": "Название компании слишком короткое."
     },
     "FULL_NAME": {
       "LABEL": "Полное имя",
-      "PLACEHOLDER": "Введите полное имя, например: Bruce Wayne",
-      "ERROR": "Имя слишком короткое"
+      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
+      "ERROR": "Имя слишком короткое."
     },
     "EMAIL": {
       "LABEL": "Рабочий email",
-      "PLACEHOLDER": "Введите ваш рабочий email адрес. Например: bruce@wayne.enterprises",
-      "ERROR": "Пожалуйста, введите действительный адрес электронной почты"
+      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
+      "ERROR": "Пожалуйста, введите действительный адрес электронной почты."
     },
     "PASSWORD": {
       "LABEL": "Пароль",
       "PLACEHOLDER": "Пароль",
-      "ERROR": "Пароль слишком короткий",
-      "IS_INVALID_PASSWORD": "Пароль должен содержать хотя бы одну заглавную букву, одну строчную букву, 1 цифру и 1 специальный символ"
+      "ERROR": "Пароль слишком короткий.",
+      "IS_INVALID_PASSWORD": "Пароль должен содержать хотя бы одну заглавную букву, одну строчную букву, 1 цифру и 1 специальный символ."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Подтвердить пароль",
-      "PLACEHOLDER": "Подтвердить пароль",
-      "ERROR": "Пароли не совпадают"
+      "LABEL": "Confirm password",
+      "PLACEHOLDER": "Confirm password",
+      "ERROR": "Пароли не совпадают."
     },
     "API": {
       "SUCCESS_MESSAGE": "Успешная регистрация",
-      "ERROR_MESSAGE": "Не удается соединиться с сервером Woot, попробуйте позже"
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Создать новый аккаунт",
     "HAVE_AN_ACCOUNT": "Уже есть аккаунт?"
diff --git a/app/javascript/dashboard/i18n/locale/sh/advancedFilters.json b/app/javascript/dashboard/i18n/locale/sh/advancedFilters.json
index a32c1bd9d..361c0c8ae 100644
--- a/app/javascript/dashboard/i18n/locale/sh/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/sh/advancedFilters.json
@@ -38,6 +38,7 @@
       "CAMPAIGN_NAME": "Campaign Name",
       "LABELS": "Labels",
       "BROWSER_LANGUAGE": "Browser Language",
+      "PRIORITY": "Priority",
       "COUNTRY_NAME": "Country Name",
       "REFERER_LINK": "Referer link",
       "CUSTOM_ATTRIBUTE_LIST": "List",
diff --git a/app/javascript/dashboard/i18n/locale/sh/agentMgmt.json b/app/javascript/dashboard/i18n/locale/sh/agentMgmt.json
index b44e74542..b563de61f 100644
--- a/app/javascript/dashboard/i18n/locale/sh/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sh/agentMgmt.json
@@ -110,7 +110,8 @@
         },
         "PLACEHOLDER": {
           "AGENT": "Search agents",
-          "TEAM": "Search teams"
+          "TEAM": "Search teams",
+          "INPUT": "Search for agents"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/sh/conversation.json b/app/javascript/dashboard/i18n/locale/sh/conversation.json
index 597799c15..a20522108 100644
--- a/app/javascript/dashboard/i18n/locale/sh/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/sh/conversation.json
@@ -37,6 +37,7 @@
     "UNKNOWN_FILE_TYPE": "Unknown File",
     "SAVE_CONTACT": "Save",
     "UPLOADING_ATTACHMENTS": "Uploading attachments...",
+    "REPLIED_TO_STORY": "Replied to your story",
     "SUCCESS_DELETE_MESSAGE": "Message deleted successfully",
     "FAIL_DELETE_MESSSAGE": "Couldn't delete message! Try again",
     "NO_RESPONSE": "No response",
@@ -66,6 +67,23 @@
         "NEXT_WEEK": "Next week"
       }
     },
+    "PRIORITY": {
+      "TITLE": "Priority",
+      "OPTIONS": {
+        "NONE": "None",
+        "URGENT": "Urgent",
+        "HIGH": "High",
+        "MEDIUM": "Medium",
+        "LOW": "Low"
+      },
+      "CHANGE_PRIORITY": {
+        "SELECT_PLACEHOLDER": "None",
+        "INPUT_PLACEHOLDER": "Select priority",
+        "NO_RESULTS": "No results found",
+        "SUCCESSFUL": "Changed priority of conversation id %{conversationId} to %{priority}",
+        "FAILED": "Couldn't change priority. Please try again."
+      }
+    },
     "CARD_CONTEXT_MENU": {
       "PENDING": "Mark as pending",
       "RESOLVED": "Mark as resolved",
diff --git a/app/javascript/dashboard/i18n/locale/sh/generalSettings.json b/app/javascript/dashboard/i18n/locale/sh/generalSettings.json
index 367b35b1c..7ed6d8925 100644
--- a/app/javascript/dashboard/i18n/locale/sh/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/sh/generalSettings.json
@@ -101,6 +101,7 @@
       "REPORTS": "Reports",
       "CONVERSATION": "Conversation",
       "CHANGE_ASSIGNEE": "Change Assignee",
+      "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Change Team",
       "ADD_LABEL": "Add label to the conversation",
       "REMOVE_LABEL": "Remove label from the conversation",
@@ -126,6 +127,7 @@
       "GO_TO_NOTIFICATIONS": "Go to Notifications",
       "ADD_LABELS_TO_CONVERSATION": "Add label to the conversation",
       "ASSIGN_AN_AGENT": "Assign an agent",
+      "ASSIGN_PRIORITY": "Assign priority",
       "ASSIGN_A_TEAM": "Assign a team",
       "MUTE_CONVERSATION": "Mute conversation",
       "UNMUTE_CONVERSATION": "Unmute conversation",
diff --git a/app/javascript/dashboard/i18n/locale/sh/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/sh/inboxMgmt.json
index 14f60eac8..97a4ee2f6 100644
--- a/app/javascript/dashboard/i18n/locale/sh/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sh/inboxMgmt.json
@@ -482,6 +482,13 @@
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
+    "HELP_CENTER": {
+      "LABEL": "Help Center",
+      "PLACEHOLDER": "Select Help Center",
+      "SELECT_PLACEHOLDER": "Select Help Center",
+      "REMOVE": "Remove Help Center",
+      "SUB_TEXT": "Attach a Help Center with the inbox"
+    },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
       "MAX_ASSIGNMENT_LIMIT_RANGE_ERROR": "Please enter a value greater than 0",
diff --git a/app/javascript/dashboard/i18n/locale/sh/integrations.json b/app/javascript/dashboard/i18n/locale/sh/integrations.json
index 00d92f297..f0326fa78 100644
--- a/app/javascript/dashboard/i18n/locale/sh/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/sh/integrations.json
@@ -85,6 +85,23 @@
       "JOIN_ERROR": "There was an error joining the call, please try again",
       "CREATE_ERROR": "There was an error creating a meeting link, please try again"
     },
+    "OPEN_AI": {
+      "TITLE": "Improve With AI",
+      "SUBTITLE": "An improved reply will be generated using AI, based on your current draft.",
+      "TONE": {
+        "TITLE": "Tone",
+        "OPTIONS": {
+          "PROFESSIONAL": "Professional",
+          "FRIENDLY": "Friendly"
+        }
+      },
+      "BUTTONS": {
+        "GENERATE": "Generate",
+        "GENERATING": "Generating...",
+        "CANCEL": "Cancel"
+      },
+      "GENERATE_ERROR": "There was an error processing the content, please try again"
+    },
     "DELETE": {
       "BUTTON_TEXT": "Delete",
       "API": {
diff --git a/app/javascript/dashboard/i18n/locale/sh/login.json b/app/javascript/dashboard/i18n/locale/sh/login.json
index 25c956a81..f2b2f51b9 100644
--- a/app/javascript/dashboard/i18n/locale/sh/login.json
+++ b/app/javascript/dashboard/i18n/locale/sh/login.json
@@ -3,16 +3,16 @@
     "TITLE": "Login to Chatwoot",
     "EMAIL": {
       "LABEL": "Email",
-      "PLACEHOLDER": "Email eg: someone@example.com"
+      "PLACEHOLDER": "example@companyname.com"
     },
     "PASSWORD": {
       "LABEL": "Password",
       "PLACEHOLDER": "Password"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Login Successful",
-      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later",
-      "UNAUTH": "Username / Password Incorrect. Please try again"
+      "SUCCESS_MESSAGE": "Login successful",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again.",
+      "UNAUTH": "Username or password is incorrect. Please try again."
     },
     "OAUTH": {
       "GOOGLE_LOGIN": "Login with Google",
diff --git a/app/javascript/dashboard/i18n/locale/sh/resetPassword.json b/app/javascript/dashboard/i18n/locale/sh/resetPassword.json
index bb678e809..37aa1860a 100644
--- a/app/javascript/dashboard/i18n/locale/sh/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/sh/resetPassword.json
@@ -1,14 +1,14 @@
 {
   "RESET_PASSWORD": {
-    "TITLE": "Reset Password",
+    "TITLE": "Reset password",
     "EMAIL": {
       "LABEL": "Email",
-      "PLACEHOLDER": "Please enter your email",
-      "ERROR": "Please enter a valid email"
+      "PLACEHOLDER": "Please enter your email.",
+      "ERROR": "Please enter a valid email."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Password reset link has been sent to your email",
-      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      "SUCCESS_MESSAGE": "Password reset link has been sent to your email.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Submit"
   }
diff --git a/app/javascript/dashboard/i18n/locale/sh/search.json b/app/javascript/dashboard/i18n/locale/sh/search.json
index 418572c0c..9044bf5f9 100644
--- a/app/javascript/dashboard/i18n/locale/sh/search.json
+++ b/app/javascript/dashboard/i18n/locale/sh/search.json
@@ -14,8 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
-    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
+    "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/sh/setNewPassword.json b/app/javascript/dashboard/i18n/locale/sh/setNewPassword.json
index ec2d94744..4908dad02 100644
--- a/app/javascript/dashboard/i18n/locale/sh/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/sh/setNewPassword.json
@@ -1,19 +1,19 @@
 {
   "SET_NEW_PASSWORD": {
-    "TITLE": "Set New Password",
+    "TITLE": "Set new password",
     "PASSWORD": {
       "LABEL": "Password",
       "PLACEHOLDER": "Password",
-      "ERROR": "Password is too short"
+      "ERROR": "Password is too short."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirm Password",
+      "LABEL": "Confirm password",
       "PLACEHOLDER": "Confirm Password",
-      "ERROR": "Passwords do not match"
+      "ERROR": "Passwords do not match."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Successfully changed the password",
-      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      "SUCCESS_MESSAGE": "Successfully changed the password.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "CAPTCHA": {
       "ERROR": "Verification expired. Please solve captcha again."
diff --git a/app/javascript/dashboard/i18n/locale/sh/signup.json b/app/javascript/dashboard/i18n/locale/sh/signup.json
index 10ddc5b86..1ad4865ff 100644
--- a/app/javascript/dashboard/i18n/locale/sh/signup.json
+++ b/app/javascript/dashboard/i18n/locale/sh/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Company name",
-      "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
-      "ERROR": "Company name is too short"
+      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
+      "ERROR": "Company name is too short."
     },
     "FULL_NAME": {
       "LABEL": "Full name",
-      "PLACEHOLDER": "Enter your full name. eg: Bruce Wayne",
-      "ERROR": "Full name is too short"
+      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
+      "ERROR": "Full name is too short."
     },
     "EMAIL": {
       "LABEL": "Work email",
-      "PLACEHOLDER": "Enter your work email address. eg: bruce@wayne.enterprises",
-      "ERROR": "Please enter a valid work email address"
+      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
+      "ERROR": "Please enter a valid work email address."
     },
     "PASSWORD": {
       "LABEL": "Password",
       "PLACEHOLDER": "Password",
-      "ERROR": "Password is too short",
-      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
+      "ERROR": "Password is too short.",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirm Password",
-      "PLACEHOLDER": "Confirm Password",
-      "ERROR": "Password doesnot match"
+      "LABEL": "Confirm password",
+      "PLACEHOLDER": "Confirm password",
+      "ERROR": "Password doesnot match."
     },
     "API": {
       "SUCCESS_MESSAGE": "Registration Successfull",
-      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Create account",
     "HAVE_AN_ACCOUNT": "Already have an account?"
diff --git a/app/javascript/dashboard/i18n/locale/sk/advancedFilters.json b/app/javascript/dashboard/i18n/locale/sk/advancedFilters.json
index f6b1099ed..15be0bf7c 100644
--- a/app/javascript/dashboard/i18n/locale/sk/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/sk/advancedFilters.json
@@ -38,6 +38,7 @@
       "CAMPAIGN_NAME": "Campaign Name",
       "LABELS": "Labels",
       "BROWSER_LANGUAGE": "Browser Language",
+      "PRIORITY": "Priority",
       "COUNTRY_NAME": "Country Name",
       "REFERER_LINK": "Referer link",
       "CUSTOM_ATTRIBUTE_LIST": "List",
diff --git a/app/javascript/dashboard/i18n/locale/sk/agentMgmt.json b/app/javascript/dashboard/i18n/locale/sk/agentMgmt.json
index 14b18ca4d..9c0b2754d 100644
--- a/app/javascript/dashboard/i18n/locale/sk/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sk/agentMgmt.json
@@ -110,7 +110,8 @@
         },
         "PLACEHOLDER": {
           "AGENT": "Hľadať agentov",
-          "TEAM": "Hľadať tímy"
+          "TEAM": "Hľadať tímy",
+          "INPUT": "Search for agents"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/sk/conversation.json b/app/javascript/dashboard/i18n/locale/sk/conversation.json
index 324b49c44..b85fe0d98 100644
--- a/app/javascript/dashboard/i18n/locale/sk/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/sk/conversation.json
@@ -37,6 +37,7 @@
     "UNKNOWN_FILE_TYPE": "Unknown File",
     "SAVE_CONTACT": "Save",
     "UPLOADING_ATTACHMENTS": "Prílohy sa nahrávajú...",
+    "REPLIED_TO_STORY": "Replied to your story",
     "SUCCESS_DELETE_MESSAGE": "Správa bola úspešne odstránená",
     "FAIL_DELETE_MESSSAGE": "Správu sa nepodarilo vymazať! Skúste to znova",
     "NO_RESPONSE": "Žiadna odpoveď",
@@ -66,6 +67,23 @@
         "NEXT_WEEK": "Ďalší ťýždeň"
       }
     },
+    "PRIORITY": {
+      "TITLE": "Priority",
+      "OPTIONS": {
+        "NONE": "Žiadne",
+        "URGENT": "Urgent",
+        "HIGH": "High",
+        "MEDIUM": "Medium",
+        "LOW": "Low"
+      },
+      "CHANGE_PRIORITY": {
+        "SELECT_PLACEHOLDER": "Žiadne",
+        "INPUT_PLACEHOLDER": "Select priority",
+        "NO_RESULTS": "Žiadne výsledky neboli nájdené",
+        "SUCCESSFUL": "Changed priority of conversation id %{conversationId} to %{priority}",
+        "FAILED": "Couldn't change priority. Please try again."
+      }
+    },
     "CARD_CONTEXT_MENU": {
       "PENDING": "Označiť ako čakajúce na vybavenie",
       "RESOLVED": "Mark as resolved",
diff --git a/app/javascript/dashboard/i18n/locale/sk/generalSettings.json b/app/javascript/dashboard/i18n/locale/sk/generalSettings.json
index a04f32839..acd963a23 100644
--- a/app/javascript/dashboard/i18n/locale/sk/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/sk/generalSettings.json
@@ -101,6 +101,7 @@
       "REPORTS": "Reporty",
       "CONVERSATION": "Konverzácia",
       "CHANGE_ASSIGNEE": "Zmeniť prideleného agenta",
+      "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Zmeniť tím",
       "ADD_LABEL": "Pridať štítok do konverzácie",
       "REMOVE_LABEL": "Odstrániť štítok z konverzácie",
@@ -126,6 +127,7 @@
       "GO_TO_NOTIFICATIONS": "Go to Notifications",
       "ADD_LABELS_TO_CONVERSATION": "Pridať štítok do konverzácie",
       "ASSIGN_AN_AGENT": "Assign an agent",
+      "ASSIGN_PRIORITY": "Assign priority",
       "ASSIGN_A_TEAM": "Assign a team",
       "MUTE_CONVERSATION": "Mute conversation",
       "UNMUTE_CONVERSATION": "Unmute conversation",
diff --git a/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json
index 52004bc89..852aae4ee 100644
--- a/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json
@@ -482,6 +482,13 @@
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
+    "HELP_CENTER": {
+      "LABEL": "Help Center",
+      "PLACEHOLDER": "Select Help Center",
+      "SELECT_PLACEHOLDER": "Select Help Center",
+      "REMOVE": "Remove Help Center",
+      "SUB_TEXT": "Attach a Help Center with the inbox"
+    },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
       "MAX_ASSIGNMENT_LIMIT_RANGE_ERROR": "Please enter a value greater than 0",
diff --git a/app/javascript/dashboard/i18n/locale/sk/integrations.json b/app/javascript/dashboard/i18n/locale/sk/integrations.json
index 640befc2c..d919342f7 100644
--- a/app/javascript/dashboard/i18n/locale/sk/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/sk/integrations.json
@@ -85,6 +85,23 @@
       "JOIN_ERROR": "There was an error joining the call, please try again",
       "CREATE_ERROR": "There was an error creating a meeting link, please try again"
     },
+    "OPEN_AI": {
+      "TITLE": "Improve With AI",
+      "SUBTITLE": "An improved reply will be generated using AI, based on your current draft.",
+      "TONE": {
+        "TITLE": "Tone",
+        "OPTIONS": {
+          "PROFESSIONAL": "Professional",
+          "FRIENDLY": "Friendly"
+        }
+      },
+      "BUTTONS": {
+        "GENERATE": "Generate",
+        "GENERATING": "Generating...",
+        "CANCEL": "Zrušiť"
+      },
+      "GENERATE_ERROR": "There was an error processing the content, please try again"
+    },
     "DELETE": {
       "BUTTON_TEXT": "Vymazať",
       "API": {
diff --git a/app/javascript/dashboard/i18n/locale/sk/login.json b/app/javascript/dashboard/i18n/locale/sk/login.json
index 9a500cd7b..625ab92d0 100644
--- a/app/javascript/dashboard/i18n/locale/sk/login.json
+++ b/app/javascript/dashboard/i18n/locale/sk/login.json
@@ -3,16 +3,16 @@
     "TITLE": "Login to Chatwoot",
     "EMAIL": {
       "LABEL": "Email",
-      "PLACEHOLDER": "Email eg: someone@example.com"
+      "PLACEHOLDER": "example@companyname.com"
     },
     "PASSWORD": {
       "LABEL": "Password",
       "PLACEHOLDER": "Password"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Login Successful",
-      "ERROR_MESSAGE": "Nepodarilo sa pripojiť k serveru Woot, skúste to prosím neskôr",
-      "UNAUTH": "Username / Password Incorrect. Please try again"
+      "SUCCESS_MESSAGE": "Login successful",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again.",
+      "UNAUTH": "Username or password is incorrect. Please try again."
     },
     "OAUTH": {
       "GOOGLE_LOGIN": "Login with Google",
diff --git a/app/javascript/dashboard/i18n/locale/sk/resetPassword.json b/app/javascript/dashboard/i18n/locale/sk/resetPassword.json
index 260786f3a..83cfca332 100644
--- a/app/javascript/dashboard/i18n/locale/sk/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/sk/resetPassword.json
@@ -1,14 +1,14 @@
 {
   "RESET_PASSWORD": {
-    "TITLE": "Obnoviť heslo",
+    "TITLE": "Reset password",
     "EMAIL": {
       "LABEL": "Email",
-      "PLACEHOLDER": "Please enter your email",
-      "ERROR": "Please enter a valid email"
+      "PLACEHOLDER": "Zadajte svoj e-mail.",
+      "ERROR": "Please enter a valid email."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Password reset link has been sent to your email",
-      "ERROR_MESSAGE": "Nepodarilo sa pripojiť k serveru Woot, skúste to prosím neskôr"
+      "SUCCESS_MESSAGE": "Password reset link has been sent to your email.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Odoslať"
   }
diff --git a/app/javascript/dashboard/i18n/locale/sk/search.json b/app/javascript/dashboard/i18n/locale/sk/search.json
index b6b6230bc..ebe6a5877 100644
--- a/app/javascript/dashboard/i18n/locale/sk/search.json
+++ b/app/javascript/dashboard/i18n/locale/sk/search.json
@@ -14,8 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
-    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
+    "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/sk/setNewPassword.json b/app/javascript/dashboard/i18n/locale/sk/setNewPassword.json
index 8beaa9920..9b06d68fc 100644
--- a/app/javascript/dashboard/i18n/locale/sk/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/sk/setNewPassword.json
@@ -1,19 +1,19 @@
 {
   "SET_NEW_PASSWORD": {
-    "TITLE": "Set New Password",
+    "TITLE": "Set new password",
     "PASSWORD": {
       "LABEL": "Password",
       "PLACEHOLDER": "Password",
-      "ERROR": "Password is too short"
+      "ERROR": "Heslo je príliš krátke."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirm Password",
+      "LABEL": "Confirm password",
       "PLACEHOLDER": "Confirm Password",
-      "ERROR": "Passwords do not match"
+      "ERROR": "Passwords do not match."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Successfully changed the password",
-      "ERROR_MESSAGE": "Nepodarilo sa pripojiť k serveru Woot, skúste to prosím neskôr"
+      "SUCCESS_MESSAGE": "Successfully changed the password.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "CAPTCHA": {
       "ERROR": "Verification expired. Please solve captcha again."
diff --git a/app/javascript/dashboard/i18n/locale/sk/signup.json b/app/javascript/dashboard/i18n/locale/sk/signup.json
index 63e7160f7..38d86d16e 100644
--- a/app/javascript/dashboard/i18n/locale/sk/signup.json
+++ b/app/javascript/dashboard/i18n/locale/sk/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Company name",
-      "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
-      "ERROR": "Company name is too short"
+      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
+      "ERROR": "Company name is too short."
     },
     "FULL_NAME": {
       "LABEL": "Celé meno",
-      "PLACEHOLDER": "Zadajte svoje celé meno. Napr.: Bruce Wayne",
-      "ERROR": "Celé meno je príliš krátke"
+      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
+      "ERROR": "Celé meno je príliš krátke."
     },
     "EMAIL": {
       "LABEL": "Pracovný e-mail",
-      "PLACEHOLDER": "Zadajte svoju pracovnú e-mailovú adresu. Napr.: bruce@wayne.enterprises",
-      "ERROR": "Please enter a valid work email address"
+      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
+      "ERROR": "Please enter a valid work email address."
     },
     "PASSWORD": {
       "LABEL": "Heslo",
       "PLACEHOLDER": "Heslo",
-      "ERROR": "Heslo je príliš krátke",
-      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
+      "ERROR": "Heslo je príliš krátke.",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Potvrďte heslo",
-      "PLACEHOLDER": "Potvrďte heslo",
-      "ERROR": "Heslá sa nezhodujú"
+      "LABEL": "Confirm password",
+      "PLACEHOLDER": "Confirm password",
+      "ERROR": "Heslá sa nezhodujú."
     },
     "API": {
       "SUCCESS_MESSAGE": "Registrácia bola úspešná",
-      "ERROR_MESSAGE": "Nepodarilo sa pripojiť k serveru Woot, skúste to prosím neskôr"
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Create account",
     "HAVE_AN_ACCOUNT": "Už máte účet?"
diff --git a/app/javascript/dashboard/i18n/locale/sr/advancedFilters.json b/app/javascript/dashboard/i18n/locale/sr/advancedFilters.json
index 4f629339b..93b9f2bd8 100644
--- a/app/javascript/dashboard/i18n/locale/sr/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/sr/advancedFilters.json
@@ -38,6 +38,7 @@
       "CAMPAIGN_NAME": "Naziv kampanje",
       "LABELS": "Oznake",
       "BROWSER_LANGUAGE": "Jezik pregledača",
+      "PRIORITY": "Priority",
       "COUNTRY_NAME": "Naziv zemlje",
       "REFERER_LINK": "Veza reference",
       "CUSTOM_ATTRIBUTE_LIST": "Lista",
diff --git a/app/javascript/dashboard/i18n/locale/sr/agentMgmt.json b/app/javascript/dashboard/i18n/locale/sr/agentMgmt.json
index bf48b8bc0..f0df14c23 100644
--- a/app/javascript/dashboard/i18n/locale/sr/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sr/agentMgmt.json
@@ -110,7 +110,8 @@
         },
         "PLACEHOLDER": {
           "AGENT": "Traži agente",
-          "TEAM": "Traži tim"
+          "TEAM": "Traži tim",
+          "INPUT": "Search for agents"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/sr/conversation.json b/app/javascript/dashboard/i18n/locale/sr/conversation.json
index 1071a1e5b..772e6ff46 100644
--- a/app/javascript/dashboard/i18n/locale/sr/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/sr/conversation.json
@@ -37,6 +37,7 @@
     "UNKNOWN_FILE_TYPE": "Nepoznata datoteka",
     "SAVE_CONTACT": "Save",
     "UPLOADING_ATTACHMENTS": "Dodavanje priloga...",
+    "REPLIED_TO_STORY": "Replied to your story",
     "SUCCESS_DELETE_MESSAGE": "Poruka je uspešno obrisana",
     "FAIL_DELETE_MESSSAGE": "Nije bilo moguće obrisati poruku! Pokušajte ponovo",
     "NO_RESPONSE": "Nema odgovora",
@@ -66,6 +67,23 @@
         "NEXT_WEEK": "Sledeće nedelje"
       }
     },
+    "PRIORITY": {
+      "TITLE": "Priority",
+      "OPTIONS": {
+        "NONE": "Niko",
+        "URGENT": "Urgent",
+        "HIGH": "High",
+        "MEDIUM": "Medium",
+        "LOW": "Low"
+      },
+      "CHANGE_PRIORITY": {
+        "SELECT_PLACEHOLDER": "Niko",
+        "INPUT_PLACEHOLDER": "Select priority",
+        "NO_RESULTS": "Ništa nije pronađeno",
+        "SUCCESSFUL": "Changed priority of conversation id %{conversationId} to %{priority}",
+        "FAILED": "Couldn't change priority. Please try again."
+      }
+    },
     "CARD_CONTEXT_MENU": {
       "PENDING": "Označeno na čekanju",
       "RESOLVED": "Označi kao rešeno",
diff --git a/app/javascript/dashboard/i18n/locale/sr/generalSettings.json b/app/javascript/dashboard/i18n/locale/sr/generalSettings.json
index 079553d83..89c17b9c9 100644
--- a/app/javascript/dashboard/i18n/locale/sr/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/sr/generalSettings.json
@@ -101,6 +101,7 @@
       "REPORTS": "Izveštaji",
       "CONVERSATION": "Razgovor",
       "CHANGE_ASSIGNEE": "Promeni dodeljenog",
+      "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Promeni tim",
       "ADD_LABEL": "Dodaj oznaku razgovoru",
       "REMOVE_LABEL": "Ukloni oznaku sa razgovora",
@@ -126,6 +127,7 @@
       "GO_TO_NOTIFICATIONS": "Idi na obaveštenja",
       "ADD_LABELS_TO_CONVERSATION": "Dodaj oznaku razgovoru",
       "ASSIGN_AN_AGENT": "Dodeli agenta",
+      "ASSIGN_PRIORITY": "Assign priority",
       "ASSIGN_A_TEAM": "Dodeli tim",
       "MUTE_CONVERSATION": "Utišaj razgovor",
       "UNMUTE_CONVERSATION": "Poništi utišanje razgovora",
diff --git a/app/javascript/dashboard/i18n/locale/sr/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/sr/inboxMgmt.json
index b52910a57..89ccf5fc7 100644
--- a/app/javascript/dashboard/i18n/locale/sr/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sr/inboxMgmt.json
@@ -482,6 +482,13 @@
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
+    "HELP_CENTER": {
+      "LABEL": "Help Center",
+      "PLACEHOLDER": "Select Help Center",
+      "SELECT_PLACEHOLDER": "Select Help Center",
+      "REMOVE": "Remove Help Center",
+      "SUB_TEXT": "Attach a Help Center with the inbox"
+    },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Ograničenje automatskog dodeljivanja",
       "MAX_ASSIGNMENT_LIMIT_RANGE_ERROR": "Molim vas unesite vrednost veću od 0",
diff --git a/app/javascript/dashboard/i18n/locale/sr/integrations.json b/app/javascript/dashboard/i18n/locale/sr/integrations.json
index c9019eb58..6a974924a 100644
--- a/app/javascript/dashboard/i18n/locale/sr/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/sr/integrations.json
@@ -85,6 +85,23 @@
       "JOIN_ERROR": "There was an error joining the call, please try again",
       "CREATE_ERROR": "There was an error creating a meeting link, please try again"
     },
+    "OPEN_AI": {
+      "TITLE": "Improve With AI",
+      "SUBTITLE": "An improved reply will be generated using AI, based on your current draft.",
+      "TONE": {
+        "TITLE": "Tone",
+        "OPTIONS": {
+          "PROFESSIONAL": "Professional",
+          "FRIENDLY": "Friendly"
+        }
+      },
+      "BUTTONS": {
+        "GENERATE": "Generate",
+        "GENERATING": "Generating...",
+        "CANCEL": "Otkaži"
+      },
+      "GENERATE_ERROR": "There was an error processing the content, please try again"
+    },
     "DELETE": {
       "BUTTON_TEXT": "Izbriši",
       "API": {
diff --git a/app/javascript/dashboard/i18n/locale/sr/login.json b/app/javascript/dashboard/i18n/locale/sr/login.json
index 0e5bbb667..863d9428c 100644
--- a/app/javascript/dashboard/i18n/locale/sr/login.json
+++ b/app/javascript/dashboard/i18n/locale/sr/login.json
@@ -3,16 +3,16 @@
     "TITLE": "Login to Chatwoot",
     "EMAIL": {
       "LABEL": "E-pošta",
-      "PLACEHOLDER": "E-pošta npr.: ime.prezime@primer.com"
+      "PLACEHOLDER": "example@companyname.com"
     },
     "PASSWORD": {
       "LABEL": "Lozinka",
       "PLACEHOLDER": "Lozinka"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Prijava je uspešna",
-      "ERROR_MESSAGE": "Nije moguće se povezati sa Woot serverom, pokušajte ponovo kasnije",
-      "UNAUTH": "Korisničko ime / lozinka nije ispravna. Molim vas pokušajte ponovo"
+      "SUCCESS_MESSAGE": "Login successful",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again.",
+      "UNAUTH": "Username or password is incorrect. Please try again."
     },
     "OAUTH": {
       "GOOGLE_LOGIN": "Login with Google",
diff --git a/app/javascript/dashboard/i18n/locale/sr/resetPassword.json b/app/javascript/dashboard/i18n/locale/sr/resetPassword.json
index 1a76b2e1b..4848656b1 100644
--- a/app/javascript/dashboard/i18n/locale/sr/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/sr/resetPassword.json
@@ -1,14 +1,14 @@
 {
   "RESET_PASSWORD": {
-    "TITLE": "Resetuj šifru",
+    "TITLE": "Reset password",
     "EMAIL": {
       "LABEL": "E-pošta",
-      "PLACEHOLDER": "Molim vas unesite vašu e-poštu",
-      "ERROR": "Molim vas unesite ispravnu e-poštu"
+      "PLACEHOLDER": "Molim vas unesite vašu e-poštu.",
+      "ERROR": "Molim vas unesite ispravnu e-poštu."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Veza za resetovanje lozinke je poslata na vašu e-poštu",
-      "ERROR_MESSAGE": "Nije moguće se povezati sa Woot serverom, pokušajte ponovo kasnije"
+      "SUCCESS_MESSAGE": "Veza za resetovanje lozinke je poslata na vašu e-poštu.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Pošalji"
   }
diff --git a/app/javascript/dashboard/i18n/locale/sr/search.json b/app/javascript/dashboard/i18n/locale/sr/search.json
index 8bdc6ade8..ee1054b81 100644
--- a/app/javascript/dashboard/i18n/locale/sr/search.json
+++ b/app/javascript/dashboard/i18n/locale/sr/search.json
@@ -14,8 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
-    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
+    "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/sr/setNewPassword.json b/app/javascript/dashboard/i18n/locale/sr/setNewPassword.json
index 991e6c5ce..9ae7ebfe6 100644
--- a/app/javascript/dashboard/i18n/locale/sr/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/sr/setNewPassword.json
@@ -1,19 +1,19 @@
 {
   "SET_NEW_PASSWORD": {
-    "TITLE": "Postavite novu lozinku",
+    "TITLE": "Set new password",
     "PASSWORD": {
       "LABEL": "Lozinka",
       "PLACEHOLDER": "Lozinka",
-      "ERROR": "Lozinka je prekratka"
+      "ERROR": "Lozinka je prekratka."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Potvrdite lozinku",
+      "LABEL": "Confirm password",
       "PLACEHOLDER": "Potvrdite lozinku",
-      "ERROR": "Lozinke se ne poklapaju"
+      "ERROR": "Lozinke se ne poklapaju."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Lozinka je uspešno promenjena",
-      "ERROR_MESSAGE": "Nije moguće se povezati sa Woot serverom, pokušajte ponovo kasnije"
+      "SUCCESS_MESSAGE": "Lozinka je uspešno promenjena.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "CAPTCHA": {
       "ERROR": "Potvrda je istekla. Molim vas ponovo rešite captcha."
diff --git a/app/javascript/dashboard/i18n/locale/sr/signup.json b/app/javascript/dashboard/i18n/locale/sr/signup.json
index c6d4bfaaf..026564b26 100644
--- a/app/javascript/dashboard/i18n/locale/sr/signup.json
+++ b/app/javascript/dashboard/i18n/locale/sr/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Company name",
-      "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
-      "ERROR": "Company name is too short"
+      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
+      "ERROR": "Company name is too short."
     },
     "FULL_NAME": {
       "LABEL": "Puno ime",
-      "PLACEHOLDER": "Unesite vaše puno ime. npr.: Bruce Wayne",
-      "ERROR": "Puno ime je prekratko"
+      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
+      "ERROR": "Puno ime je prekratko."
     },
     "EMAIL": {
       "LABEL": "Poslovna e-pošta",
-      "PLACEHOLDER": "Unesite adresu vaše poslovne e-pošte. npr.: bruce@wayne.enterprises",
-      "ERROR": "Please enter a valid work email address"
+      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
+      "ERROR": "Please enter a valid work email address."
     },
     "PASSWORD": {
       "LABEL": "Lozinka",
       "PLACEHOLDER": "Lozinka",
-      "ERROR": "Lozinka je prekratka",
-      "IS_INVALID_PASSWORD": "Lozinka bi trebalo da sadrži najmanje 1 veliko slovo, 1 malo slovo, 1 broj i 1 specijalni karakter"
+      "ERROR": "Lozinka je prekratka.",
+      "IS_INVALID_PASSWORD": "Lozinka bi trebalo da sadrži najmanje 1 veliko slovo, 1 malo slovo, 1 broj i 1 specijalni karakter."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Potvrdite lozinku",
-      "PLACEHOLDER": "Potvrdite lozinku",
-      "ERROR": "Lozinka se ne poklapa"
+      "LABEL": "Confirm password",
+      "PLACEHOLDER": "Confirm password",
+      "ERROR": "Lozinka se ne poklapa."
     },
     "API": {
       "SUCCESS_MESSAGE": "Registracija je uspešna",
-      "ERROR_MESSAGE": "Nije moguće se povezati sa Woot serverom, pokušajte ponovo kasnije"
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Create account",
     "HAVE_AN_ACCOUNT": "Već imate nalog?"
diff --git a/app/javascript/dashboard/i18n/locale/sv/advancedFilters.json b/app/javascript/dashboard/i18n/locale/sv/advancedFilters.json
index a34e2aac9..242f1fd34 100644
--- a/app/javascript/dashboard/i18n/locale/sv/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/sv/advancedFilters.json
@@ -38,6 +38,7 @@
       "CAMPAIGN_NAME": "Campaign Name",
       "LABELS": "Etiketter",
       "BROWSER_LANGUAGE": "Browser Language",
+      "PRIORITY": "Priority",
       "COUNTRY_NAME": "Country Name",
       "REFERER_LINK": "Referer link",
       "CUSTOM_ATTRIBUTE_LIST": "List",
diff --git a/app/javascript/dashboard/i18n/locale/sv/agentMgmt.json b/app/javascript/dashboard/i18n/locale/sv/agentMgmt.json
index f576559b7..ab5fdffe9 100644
--- a/app/javascript/dashboard/i18n/locale/sv/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sv/agentMgmt.json
@@ -110,7 +110,8 @@
         },
         "PLACEHOLDER": {
           "AGENT": "Sök efter agenter",
-          "TEAM": "Sök efter team"
+          "TEAM": "Sök efter team",
+          "INPUT": "Search for agents"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/sv/conversation.json b/app/javascript/dashboard/i18n/locale/sv/conversation.json
index a4cadd9f3..a2c5d2e98 100644
--- a/app/javascript/dashboard/i18n/locale/sv/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/sv/conversation.json
@@ -37,6 +37,7 @@
     "UNKNOWN_FILE_TYPE": "Unknown File",
     "SAVE_CONTACT": "Save",
     "UPLOADING_ATTACHMENTS": "Laddar upp bilagor...",
+    "REPLIED_TO_STORY": "Replied to your story",
     "SUCCESS_DELETE_MESSAGE": "Meddelandet har tagits bort",
     "FAIL_DELETE_MESSSAGE": "Det gick inte att ta bort meddelande! Försök igen",
     "NO_RESPONSE": "Inget svar",
@@ -66,6 +67,23 @@
         "NEXT_WEEK": "Nästa vecka"
       }
     },
+    "PRIORITY": {
+      "TITLE": "Priority",
+      "OPTIONS": {
+        "NONE": "Inget",
+        "URGENT": "Urgent",
+        "HIGH": "High",
+        "MEDIUM": "Medium",
+        "LOW": "Low"
+      },
+      "CHANGE_PRIORITY": {
+        "SELECT_PLACEHOLDER": "Inget",
+        "INPUT_PLACEHOLDER": "Select priority",
+        "NO_RESULTS": "Inga resultat hittades",
+        "SUCCESSFUL": "Changed priority of conversation id %{conversationId} to %{priority}",
+        "FAILED": "Couldn't change priority. Please try again."
+      }
+    },
     "CARD_CONTEXT_MENU": {
       "PENDING": "Markera som väntande",
       "RESOLVED": "Mark as resolved",
diff --git a/app/javascript/dashboard/i18n/locale/sv/generalSettings.json b/app/javascript/dashboard/i18n/locale/sv/generalSettings.json
index 0cbc814c2..e8385b85a 100644
--- a/app/javascript/dashboard/i18n/locale/sv/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/sv/generalSettings.json
@@ -101,6 +101,7 @@
       "REPORTS": "Rapporter",
       "CONVERSATION": "Conversation",
       "CHANGE_ASSIGNEE": "Change Assignee",
+      "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Change Team",
       "ADD_LABEL": "Add label to the conversation",
       "REMOVE_LABEL": "Remove label from the conversation",
@@ -126,6 +127,7 @@
       "GO_TO_NOTIFICATIONS": "Go to Notifications",
       "ADD_LABELS_TO_CONVERSATION": "Add label to the conversation",
       "ASSIGN_AN_AGENT": "Assign an agent",
+      "ASSIGN_PRIORITY": "Assign priority",
       "ASSIGN_A_TEAM": "Assign a team",
       "MUTE_CONVERSATION": "Mute conversation",
       "UNMUTE_CONVERSATION": "Unmute conversation",
diff --git a/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json
index 4f649db05..a02d44dd8 100644
--- a/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json
@@ -482,6 +482,13 @@
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
+    "HELP_CENTER": {
+      "LABEL": "Help Center",
+      "PLACEHOLDER": "Select Help Center",
+      "SELECT_PLACEHOLDER": "Select Help Center",
+      "REMOVE": "Remove Help Center",
+      "SUB_TEXT": "Attach a Help Center with the inbox"
+    },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
       "MAX_ASSIGNMENT_LIMIT_RANGE_ERROR": "Please enter a value greater than 0",
diff --git a/app/javascript/dashboard/i18n/locale/sv/integrations.json b/app/javascript/dashboard/i18n/locale/sv/integrations.json
index 16788fb9d..ec4ca4c83 100644
--- a/app/javascript/dashboard/i18n/locale/sv/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/sv/integrations.json
@@ -85,6 +85,23 @@
       "JOIN_ERROR": "There was an error joining the call, please try again",
       "CREATE_ERROR": "There was an error creating a meeting link, please try again"
     },
+    "OPEN_AI": {
+      "TITLE": "Improve With AI",
+      "SUBTITLE": "An improved reply will be generated using AI, based on your current draft.",
+      "TONE": {
+        "TITLE": "Tone",
+        "OPTIONS": {
+          "PROFESSIONAL": "Professional",
+          "FRIENDLY": "Friendly"
+        }
+      },
+      "BUTTONS": {
+        "GENERATE": "Generate",
+        "GENERATING": "Generating...",
+        "CANCEL": "Avbryt"
+      },
+      "GENERATE_ERROR": "There was an error processing the content, please try again"
+    },
     "DELETE": {
       "BUTTON_TEXT": "Radera",
       "API": {
diff --git a/app/javascript/dashboard/i18n/locale/sv/login.json b/app/javascript/dashboard/i18n/locale/sv/login.json
index 459c6b659..30ef0072a 100644
--- a/app/javascript/dashboard/i18n/locale/sv/login.json
+++ b/app/javascript/dashboard/i18n/locale/sv/login.json
@@ -3,16 +3,16 @@
     "TITLE": "Logga in till Chatwoot",
     "EMAIL": {
       "LABEL": "E-post",
-      "PLACEHOLDER": "E-post t.ex.: someone@example.com"
+      "PLACEHOLDER": "example@companyname.com"
     },
     "PASSWORD": {
       "LABEL": "Lösenord",
       "PLACEHOLDER": "Lösenord"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Inloggning lyckades",
-      "ERROR_MESSAGE": "Kunde inte ansluta till Woot Server, försök igen senare",
-      "UNAUTH": "Användarnamn / lösenord felaktigt. Försök igen"
+      "SUCCESS_MESSAGE": "Login successful",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again.",
+      "UNAUTH": "Username or password is incorrect. Please try again."
     },
     "OAUTH": {
       "GOOGLE_LOGIN": "Login with Google",
diff --git a/app/javascript/dashboard/i18n/locale/sv/resetPassword.json b/app/javascript/dashboard/i18n/locale/sv/resetPassword.json
index c19bc843b..0b945d6f1 100644
--- a/app/javascript/dashboard/i18n/locale/sv/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/sv/resetPassword.json
@@ -3,12 +3,12 @@
     "TITLE": "Återställ lösenord",
     "EMAIL": {
       "LABEL": "E-post",
-      "PLACEHOLDER": "Ange din e-postadress",
-      "ERROR": "Ange en giltig e-postadress"
+      "PLACEHOLDER": "Ange din e-postadress.",
+      "ERROR": "Ange en giltig e-postadress."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Länken för återställning av lösenord har skickats till din e-post",
-      "ERROR_MESSAGE": "Kunde inte ansluta till Woot Server, försök igen senare"
+      "SUCCESS_MESSAGE": "Länken för återställning av lösenord har skickats till din e-post.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Skicka"
   }
diff --git a/app/javascript/dashboard/i18n/locale/sv/search.json b/app/javascript/dashboard/i18n/locale/sv/search.json
index 1bd9f2553..b47abcd2b 100644
--- a/app/javascript/dashboard/i18n/locale/sv/search.json
+++ b/app/javascript/dashboard/i18n/locale/sv/search.json
@@ -14,8 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
-    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
+    "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/sv/setNewPassword.json b/app/javascript/dashboard/i18n/locale/sv/setNewPassword.json
index eefdb1a29..00c5ed4f4 100644
--- a/app/javascript/dashboard/i18n/locale/sv/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/sv/setNewPassword.json
@@ -1,19 +1,19 @@
 {
   "SET_NEW_PASSWORD": {
-    "TITLE": "Ange nytt lösenord",
+    "TITLE": "Set new password",
     "PASSWORD": {
       "LABEL": "Lösenord",
       "PLACEHOLDER": "Lösenord",
-      "ERROR": "Lösenordet är för kort"
+      "ERROR": "Lösenordet är för kort."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Bekräfta lösenord",
+      "LABEL": "Confirm password",
       "PLACEHOLDER": "Bekräfta lösenord",
-      "ERROR": "Lösenorden matchar inte"
+      "ERROR": "Lösenorden matchar inte."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Lösenordet ändrat",
-      "ERROR_MESSAGE": "Kunde inte ansluta till Woot Server, försök igen senare"
+      "SUCCESS_MESSAGE": "Lösenordet ändrat.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "CAPTCHA": {
       "ERROR": "Verification expired. Please solve captcha again."
diff --git a/app/javascript/dashboard/i18n/locale/sv/signup.json b/app/javascript/dashboard/i18n/locale/sv/signup.json
index 6750a677e..1166b60e5 100644
--- a/app/javascript/dashboard/i18n/locale/sv/signup.json
+++ b/app/javascript/dashboard/i18n/locale/sv/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Company name",
-      "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
-      "ERROR": "Company name is too short"
+      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
+      "ERROR": "Company name is too short."
     },
     "FULL_NAME": {
       "LABEL": "Fullständigt namn",
-      "PLACEHOLDER": "Ange ditt fullständiga namn. t.ex.: Bruce Wayne",
-      "ERROR": "Fullständigt namn är för kort"
+      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
+      "ERROR": "Fullständigt namn är för kort."
     },
     "EMAIL": {
       "LABEL": "E-postadress, arbete",
-      "PLACEHOLDER": "Fyll i din e-postadress för arbete. t.ex.: bruce@wayne.enterprises",
-      "ERROR": "Please enter a valid work email address"
+      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
+      "ERROR": "Please enter a valid work email address."
     },
     "PASSWORD": {
       "LABEL": "Lösenord",
       "PLACEHOLDER": "Lösenord",
-      "ERROR": "Lösenordet är för kort",
-      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
+      "ERROR": "Lösenordet är för kort.",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Bekräfta lösenord",
-      "PLACEHOLDER": "Bekräfta lösenord",
-      "ERROR": "Lösenorden matchar inte"
+      "LABEL": "Confirm password",
+      "PLACEHOLDER": "Confirm password",
+      "ERROR": "Lösenorden matchar inte."
     },
     "API": {
       "SUCCESS_MESSAGE": "Registreringen lyckades",
-      "ERROR_MESSAGE": "Kunde inte ansluta till Woot Server, försök igen senare"
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Create account",
     "HAVE_AN_ACCOUNT": "Har du redan ett konto?"
diff --git a/app/javascript/dashboard/i18n/locale/ta/advancedFilters.json b/app/javascript/dashboard/i18n/locale/ta/advancedFilters.json
index a0ae9eec3..2b5dc5f16 100644
--- a/app/javascript/dashboard/i18n/locale/ta/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/ta/advancedFilters.json
@@ -38,6 +38,7 @@
       "CAMPAIGN_NAME": "Campaign Name",
       "LABELS": "Labels",
       "BROWSER_LANGUAGE": "Browser Language",
+      "PRIORITY": "Priority",
       "COUNTRY_NAME": "Country Name",
       "REFERER_LINK": "Referer link",
       "CUSTOM_ATTRIBUTE_LIST": "List",
diff --git a/app/javascript/dashboard/i18n/locale/ta/agentMgmt.json b/app/javascript/dashboard/i18n/locale/ta/agentMgmt.json
index 1526b5a9d..6cd62d27b 100644
--- a/app/javascript/dashboard/i18n/locale/ta/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ta/agentMgmt.json
@@ -110,7 +110,8 @@
         },
         "PLACEHOLDER": {
           "AGENT": "Search agents",
-          "TEAM": "Search teams"
+          "TEAM": "Search teams",
+          "INPUT": "Search for agents"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/ta/conversation.json b/app/javascript/dashboard/i18n/locale/ta/conversation.json
index 1aaf78bab..2773177c8 100644
--- a/app/javascript/dashboard/i18n/locale/ta/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ta/conversation.json
@@ -37,6 +37,7 @@
     "UNKNOWN_FILE_TYPE": "Unknown File",
     "SAVE_CONTACT": "Save",
     "UPLOADING_ATTACHMENTS": "Uploading attachments...",
+    "REPLIED_TO_STORY": "Replied to your story",
     "SUCCESS_DELETE_MESSAGE": "Message deleted successfully",
     "FAIL_DELETE_MESSSAGE": "Couldn't delete message! Try again",
     "NO_RESPONSE": "No response",
@@ -66,6 +67,23 @@
         "NEXT_WEEK": "Next week"
       }
     },
+    "PRIORITY": {
+      "TITLE": "Priority",
+      "OPTIONS": {
+        "NONE": "None",
+        "URGENT": "Urgent",
+        "HIGH": "High",
+        "MEDIUM": "Medium",
+        "LOW": "Low"
+      },
+      "CHANGE_PRIORITY": {
+        "SELECT_PLACEHOLDER": "None",
+        "INPUT_PLACEHOLDER": "Select priority",
+        "NO_RESULTS": "No results found",
+        "SUCCESSFUL": "Changed priority of conversation id %{conversationId} to %{priority}",
+        "FAILED": "Couldn't change priority. Please try again."
+      }
+    },
     "CARD_CONTEXT_MENU": {
       "PENDING": "Mark as pending",
       "RESOLVED": "Mark as resolved",
diff --git a/app/javascript/dashboard/i18n/locale/ta/generalSettings.json b/app/javascript/dashboard/i18n/locale/ta/generalSettings.json
index 8416ebe12..d2e6626b0 100644
--- a/app/javascript/dashboard/i18n/locale/ta/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ta/generalSettings.json
@@ -101,6 +101,7 @@
       "REPORTS": "அறிக்கைகள்",
       "CONVERSATION": "Conversation",
       "CHANGE_ASSIGNEE": "Change Assignee",
+      "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Change Team",
       "ADD_LABEL": "Add label to the conversation",
       "REMOVE_LABEL": "Remove label from the conversation",
@@ -126,6 +127,7 @@
       "GO_TO_NOTIFICATIONS": "Go to Notifications",
       "ADD_LABELS_TO_CONVERSATION": "Add label to the conversation",
       "ASSIGN_AN_AGENT": "Assign an agent",
+      "ASSIGN_PRIORITY": "Assign priority",
       "ASSIGN_A_TEAM": "Assign a team",
       "MUTE_CONVERSATION": "Mute conversation",
       "UNMUTE_CONVERSATION": "Unmute conversation",
diff --git a/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json
index d3e2f538c..dc59ed42a 100644
--- a/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json
@@ -482,6 +482,13 @@
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
+    "HELP_CENTER": {
+      "LABEL": "Help Center",
+      "PLACEHOLDER": "Select Help Center",
+      "SELECT_PLACEHOLDER": "Select Help Center",
+      "REMOVE": "Remove Help Center",
+      "SUB_TEXT": "Attach a Help Center with the inbox"
+    },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
       "MAX_ASSIGNMENT_LIMIT_RANGE_ERROR": "Please enter a value greater than 0",
diff --git a/app/javascript/dashboard/i18n/locale/ta/integrations.json b/app/javascript/dashboard/i18n/locale/ta/integrations.json
index 83b666842..4dffc43fe 100644
--- a/app/javascript/dashboard/i18n/locale/ta/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ta/integrations.json
@@ -85,6 +85,23 @@
       "JOIN_ERROR": "There was an error joining the call, please try again",
       "CREATE_ERROR": "There was an error creating a meeting link, please try again"
     },
+    "OPEN_AI": {
+      "TITLE": "Improve With AI",
+      "SUBTITLE": "An improved reply will be generated using AI, based on your current draft.",
+      "TONE": {
+        "TITLE": "Tone",
+        "OPTIONS": {
+          "PROFESSIONAL": "Professional",
+          "FRIENDLY": "Friendly"
+        }
+      },
+      "BUTTONS": {
+        "GENERATE": "Generate",
+        "GENERATING": "Generating...",
+        "CANCEL": "ரத்துசெய்"
+      },
+      "GENERATE_ERROR": "There was an error processing the content, please try again"
+    },
     "DELETE": {
       "BUTTON_TEXT": "Delete",
       "API": {
diff --git a/app/javascript/dashboard/i18n/locale/ta/login.json b/app/javascript/dashboard/i18n/locale/ta/login.json
index 7049de785..847cfd25a 100644
--- a/app/javascript/dashboard/i18n/locale/ta/login.json
+++ b/app/javascript/dashboard/i18n/locale/ta/login.json
@@ -3,16 +3,16 @@
     "TITLE": "சாட்வூட்டில் உள்நுழையவும்",
     "EMAIL": {
       "LABEL": "இமெயில்",
-      "PLACEHOLDER": "இமெயில் எ.கா:someone@example.com"
+      "PLACEHOLDER": "example@companyname.com"
     },
     "PASSWORD": {
       "LABEL": "பாஸ்வேர்ட்",
       "PLACEHOLDER": "பாஸ்வேர்ட்"
     },
     "API": {
-      "SUCCESS_MESSAGE": "வெற்றிகரமான உள்நுழைவு",
-      "ERROR_MESSAGE": "வூட் சர்வருடன் இணைக்க முடியவில்ல, மீண்டும் முயற்சிக்கவும்",
-      "UNAUTH": "பயனர்பெயர் / பாஸ்வேர்டு தவறானது. தயவு செய்து மீண்டும் முயற்சிக்கவும்"
+      "SUCCESS_MESSAGE": "Login successful",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again.",
+      "UNAUTH": "Username or password is incorrect. Please try again."
     },
     "OAUTH": {
       "GOOGLE_LOGIN": "Login with Google",
diff --git a/app/javascript/dashboard/i18n/locale/ta/resetPassword.json b/app/javascript/dashboard/i18n/locale/ta/resetPassword.json
index 7d3dc9bc6..d8310f518 100644
--- a/app/javascript/dashboard/i18n/locale/ta/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/ta/resetPassword.json
@@ -1,14 +1,14 @@
 {
   "RESET_PASSWORD": {
-    "TITLE": "பாஸ்வேர்ட்டை மீட்டமைக்க",
+    "TITLE": "பாஸ்வேர்ட்டை மீட்டமைக்கவும்",
     "EMAIL": {
       "LABEL": "ஈ-மெயில்",
-      "PLACEHOLDER": "உங்கள் இமெயில் முகவரியை பதிவிடவும்",
-      "ERROR": "சரியான இமெயில் முகவரியை பதிவிடவும்"
+      "PLACEHOLDER": "Please enter your email.",
+      "ERROR": "Please enter a valid email."
     },
     "API": {
-      "SUCCESS_MESSAGE": "பாஸ்வேர்டை மீட்டமைக்கும் இணைப்பு உங்கள் ஈ-மெயிலுக்கு அனுப்பப்பட்டுள்ளது",
-      "ERROR_MESSAGE": "வூட் சர்வருடன் இணைக்க முடியவில்ல, மீண்டும் முயற்சிக்கவும்"
+      "SUCCESS_MESSAGE": "Password reset link has been sent to your email.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "சமர்பிக்கவும்"
   }
diff --git a/app/javascript/dashboard/i18n/locale/ta/search.json b/app/javascript/dashboard/i18n/locale/ta/search.json
index 1237029e7..1c97153f6 100644
--- a/app/javascript/dashboard/i18n/locale/ta/search.json
+++ b/app/javascript/dashboard/i18n/locale/ta/search.json
@@ -14,8 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
-    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
+    "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/ta/setNewPassword.json b/app/javascript/dashboard/i18n/locale/ta/setNewPassword.json
index e21f0fcd2..da3995e8e 100644
--- a/app/javascript/dashboard/i18n/locale/ta/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/ta/setNewPassword.json
@@ -1,19 +1,19 @@
 {
   "SET_NEW_PASSWORD": {
-    "TITLE": "புதிய பாஸ்வேர்ட்டை அமைக்கவும்",
+    "TITLE": "Set new password",
     "PASSWORD": {
       "LABEL": "பாஸ்வேர்ட்",
       "PLACEHOLDER": "பாஸ்வேர்ட்",
-      "ERROR": "பாஸ்வேர்டு மிகவும் சிறியதாக உள்ளது"
+      "ERROR": "Password is too short."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "பாஸ்வேர்டை உறுதிப்படுத்தவும்",
+      "LABEL": "Confirm password",
       "PLACEHOLDER": "பாஸ்வேர்டை உறுதிப்படுத்தவும்",
-      "ERROR": "பாஸ்வேர்டுகள் பொருந்தவில்லை"
+      "ERROR": "Passwords do not match."
     },
     "API": {
-      "SUCCESS_MESSAGE": "பாஸ்வேர்டு வெற்றிகரமாக மாற்றப்பட்டது",
-      "ERROR_MESSAGE": "வூட் சர்வருடன் இணைக்க முடியவில்ல, மீண்டும் முயற்சிக்கவும்"
+      "SUCCESS_MESSAGE": "Successfully changed the password.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "CAPTCHA": {
       "ERROR": "Verification expired. Please solve captcha again."
diff --git a/app/javascript/dashboard/i18n/locale/ta/signup.json b/app/javascript/dashboard/i18n/locale/ta/signup.json
index 5b3de3c38..4e7829dc0 100644
--- a/app/javascript/dashboard/i18n/locale/ta/signup.json
+++ b/app/javascript/dashboard/i18n/locale/ta/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Company name",
-      "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
-      "ERROR": "Company name is too short"
+      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
+      "ERROR": "Company name is too short."
     },
     "FULL_NAME": {
       "LABEL": "Full name",
-      "PLACEHOLDER": "Enter your full name. eg: Bruce Wayne",
-      "ERROR": "Full name is too short"
+      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
+      "ERROR": "Full name is too short."
     },
     "EMAIL": {
       "LABEL": "Work email",
-      "PLACEHOLDER": "Enter your work email address. eg: bruce@wayne.enterprises",
-      "ERROR": "Please enter a valid work email address"
+      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
+      "ERROR": "Please enter a valid work email address."
     },
     "PASSWORD": {
       "LABEL": "பாஸ்வேர்ட்",
       "PLACEHOLDER": "பாஸ்வேர்ட்",
-      "ERROR": "பாஸ்வேர்டு மிகவும் சிறியதாக உள்ளது",
-      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
+      "ERROR": "Password is too short.",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "பாஸ்வேர்டை உறுதிப்படுத்தவும்",
-      "PLACEHOLDER": "பாஸ்வேர்டை உறுதிப்படுத்தவும்",
-      "ERROR": "பாஸ்வேர்டு பொருந்தவில்லை"
+      "LABEL": "Confirm password",
+      "PLACEHOLDER": "Confirm password",
+      "ERROR": "Password doesnot match."
     },
     "API": {
       "SUCCESS_MESSAGE": "வெற்றிகரமாக பதிவு செய்துவிட்டிர்கள்",
-      "ERROR_MESSAGE": "வூட் சர்வருடன் இணைக்க முடியவில்ல, மீண்டும் முயற்சிக்கவும்"
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Create account",
     "HAVE_AN_ACCOUNT": "Already have an account?"
diff --git a/app/javascript/dashboard/i18n/locale/th/advancedFilters.json b/app/javascript/dashboard/i18n/locale/th/advancedFilters.json
index d15bae9b5..0f6dd0550 100644
--- a/app/javascript/dashboard/i18n/locale/th/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/th/advancedFilters.json
@@ -38,6 +38,7 @@
       "CAMPAIGN_NAME": "ชื่อแคมเปญ",
       "LABELS": "ป้ายกำกับ",
       "BROWSER_LANGUAGE": "ภาษาของเบราว์เซอร์",
+      "PRIORITY": "Priority",
       "COUNTRY_NAME": "ชื่อประเทศ",
       "REFERER_LINK": "ลิงก์อ้างอิง",
       "CUSTOM_ATTRIBUTE_LIST": "รายการ",
diff --git a/app/javascript/dashboard/i18n/locale/th/agentMgmt.json b/app/javascript/dashboard/i18n/locale/th/agentMgmt.json
index 959a73bc9..3837533c8 100644
--- a/app/javascript/dashboard/i18n/locale/th/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/th/agentMgmt.json
@@ -110,7 +110,8 @@
         },
         "PLACEHOLDER": {
           "AGENT": "ค้นหาพนักงาน",
-          "TEAM": "ค้นหาทีม"
+          "TEAM": "ค้นหาทีม",
+          "INPUT": "Search for agents"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/th/conversation.json b/app/javascript/dashboard/i18n/locale/th/conversation.json
index c38f8b32f..6d2342da4 100644
--- a/app/javascript/dashboard/i18n/locale/th/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/th/conversation.json
@@ -37,6 +37,7 @@
     "UNKNOWN_FILE_TYPE": "Unknown File",
     "SAVE_CONTACT": "Save",
     "UPLOADING_ATTACHMENTS": "กำลังอัปโหลดไฟล์แนบ",
+    "REPLIED_TO_STORY": "Replied to your story",
     "SUCCESS_DELETE_MESSAGE": "ลบข้อความสำเร็จเเล้ว",
     "FAIL_DELETE_MESSSAGE": "ไม่สามารถลบข้อความได้ โปรดลองใหม่อีกครั้ง",
     "NO_RESPONSE": "ไม่มีการตอบกลับ",
@@ -66,6 +67,23 @@
         "NEXT_WEEK": "สัปดาห์หน้า"
       }
     },
+    "PRIORITY": {
+      "TITLE": "Priority",
+      "OPTIONS": {
+        "NONE": "ไม่มี",
+        "URGENT": "Urgent",
+        "HIGH": "High",
+        "MEDIUM": "Medium",
+        "LOW": "Low"
+      },
+      "CHANGE_PRIORITY": {
+        "SELECT_PLACEHOLDER": "ไม่มี",
+        "INPUT_PLACEHOLDER": "Select priority",
+        "NO_RESULTS": "No results found",
+        "SUCCESSFUL": "Changed priority of conversation id %{conversationId} to %{priority}",
+        "FAILED": "Couldn't change priority. Please try again."
+      }
+    },
     "CARD_CONTEXT_MENU": {
       "PENDING": "ทำเครื่องหมายว่าอยู่ระหว่างดำเนินการ",
       "RESOLVED": "Mark as resolved",
diff --git a/app/javascript/dashboard/i18n/locale/th/generalSettings.json b/app/javascript/dashboard/i18n/locale/th/generalSettings.json
index 422c87afc..d5b009aba 100644
--- a/app/javascript/dashboard/i18n/locale/th/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/th/generalSettings.json
@@ -101,6 +101,7 @@
       "REPORTS": "รายงาน",
       "CONVERSATION": "การสนทนา",
       "CHANGE_ASSIGNEE": "เปลี่ยนผู้รับมอบหมาย",
+      "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "เปลี่ยนทีม",
       "ADD_LABEL": "เพิ่มป้ายกำกับให้การสนทนา",
       "REMOVE_LABEL": "ลบป้ายกำกับออกจากการสนทนา",
@@ -126,6 +127,7 @@
       "GO_TO_NOTIFICATIONS": "ไปที่หน้าการแจ้งเตือน",
       "ADD_LABELS_TO_CONVERSATION": "เพิ่มป้ายกำกับให้บทสนทนา",
       "ASSIGN_AN_AGENT": "กำหนดพนักงาน",
+      "ASSIGN_PRIORITY": "Assign priority",
       "ASSIGN_A_TEAM": "กำหนดทีม",
       "MUTE_CONVERSATION": "ปิดการแจ้งเตือน",
       "UNMUTE_CONVERSATION": "เปิดการแจ้งเตือน",
diff --git a/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json
index 4daafc43a..04e72363a 100644
--- a/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json
@@ -482,6 +482,13 @@
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
+    "HELP_CENTER": {
+      "LABEL": "Help Center",
+      "PLACEHOLDER": "Select Help Center",
+      "SELECT_PLACEHOLDER": "Select Help Center",
+      "REMOVE": "Remove Help Center",
+      "SUB_TEXT": "Attach a Help Center with the inbox"
+    },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
       "MAX_ASSIGNMENT_LIMIT_RANGE_ERROR": "กรุณากรอกค่าที่มากกว่า 0",
diff --git a/app/javascript/dashboard/i18n/locale/th/integrations.json b/app/javascript/dashboard/i18n/locale/th/integrations.json
index e2bec30fb..26855a136 100644
--- a/app/javascript/dashboard/i18n/locale/th/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/th/integrations.json
@@ -85,6 +85,23 @@
       "JOIN_ERROR": "There was an error joining the call, please try again",
       "CREATE_ERROR": "There was an error creating a meeting link, please try again"
     },
+    "OPEN_AI": {
+      "TITLE": "Improve With AI",
+      "SUBTITLE": "An improved reply will be generated using AI, based on your current draft.",
+      "TONE": {
+        "TITLE": "Tone",
+        "OPTIONS": {
+          "PROFESSIONAL": "Professional",
+          "FRIENDLY": "Friendly"
+        }
+      },
+      "BUTTONS": {
+        "GENERATE": "Generate",
+        "GENERATING": "Generating...",
+        "CANCEL": "ยกเลิก"
+      },
+      "GENERATE_ERROR": "There was an error processing the content, please try again"
+    },
     "DELETE": {
       "BUTTON_TEXT": "ลบ",
       "API": {
diff --git a/app/javascript/dashboard/i18n/locale/th/login.json b/app/javascript/dashboard/i18n/locale/th/login.json
index 224d5ee8a..bc501b03e 100644
--- a/app/javascript/dashboard/i18n/locale/th/login.json
+++ b/app/javascript/dashboard/i18n/locale/th/login.json
@@ -3,16 +3,16 @@
     "TITLE": "Login to Chatwoot",
     "EMAIL": {
       "LABEL": "อีเมล์",
-      "PLACEHOLDER": "อีเมล เช่น someone@example.com"
+      "PLACEHOLDER": "example@companyname.com"
     },
     "PASSWORD": {
       "LABEL": "หรัสผ่าน",
       "PLACEHOLDER": "หรัสผ่าน"
     },
     "API": {
-      "SUCCESS_MESSAGE": "เข้าสู่ระบบสำเร็จ",
-      "ERROR_MESSAGE": "ไม่สามารถเชื่อมต่อเซิฟเวอร์ได้โปรดลองอีกครั้งในภายหลัง",
-      "UNAUTH": "ชื่อผู้ใช้งานหรือรหัสผ่านไม่ถูกต้อง โปรดลองใหม่อีกครั้ง"
+      "SUCCESS_MESSAGE": "Login successful",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again.",
+      "UNAUTH": "Username or password is incorrect. Please try again."
     },
     "OAUTH": {
       "GOOGLE_LOGIN": "Login with Google",
diff --git a/app/javascript/dashboard/i18n/locale/th/resetPassword.json b/app/javascript/dashboard/i18n/locale/th/resetPassword.json
index 54f30565e..85547ecea 100644
--- a/app/javascript/dashboard/i18n/locale/th/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/th/resetPassword.json
@@ -1,14 +1,14 @@
 {
   "RESET_PASSWORD": {
-    "TITLE": "กู้หรัสผ่าน",
+    "TITLE": "Reset password",
     "EMAIL": {
       "LABEL": "อีเมล์",
-      "PLACEHOLDER": "กรุณากรอกอีเมล์ของคุณ",
-      "ERROR": "กรุณากรอกอีเมล์ให้ถูกต้อง"
+      "PLACEHOLDER": "กรุณากรอกอีเมล์ของคุณ.",
+      "ERROR": "กรุณากรอกอีเมล์ให้ถูกต้อง."
     },
     "API": {
-      "SUCCESS_MESSAGE": "ลิ้งกู้หรัสผผ่านถูกส่งไปยังอีเมล์ของคุณเเล้ว",
-      "ERROR_MESSAGE": "ไม่สามารถเชื่อมต่อเซิฟเวอร์ได้โปรดลองอีกครั้งในภายหลัง"
+      "SUCCESS_MESSAGE": "ลิ้งกู้หรัสผผ่านถูกส่งไปยังอีเมล์ของคุณเเล้ว.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "ส่ง"
   }
diff --git a/app/javascript/dashboard/i18n/locale/th/search.json b/app/javascript/dashboard/i18n/locale/th/search.json
index 5fd7fa49f..7893d47c7 100644
--- a/app/javascript/dashboard/i18n/locale/th/search.json
+++ b/app/javascript/dashboard/i18n/locale/th/search.json
@@ -14,8 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
-    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
+    "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "บอท",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/th/setNewPassword.json b/app/javascript/dashboard/i18n/locale/th/setNewPassword.json
index 2ec30a2b3..6b56f455c 100644
--- a/app/javascript/dashboard/i18n/locale/th/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/th/setNewPassword.json
@@ -1,19 +1,19 @@
 {
   "SET_NEW_PASSWORD": {
-    "TITLE": "ตั้งหรัสผ่านใหม่",
+    "TITLE": "Set new password",
     "PASSWORD": {
       "LABEL": "หรัสผ่าน",
       "PLACEHOLDER": "หรัสผ่าน",
-      "ERROR": "หรัสผ่านนั้นสั้นเกินไป"
+      "ERROR": "หรัสผ่านนั้นสั้นเกินไป."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "ยืนยันหรัสผ่าน",
+      "LABEL": "Confirm password",
       "PLACEHOLDER": "ยืนยันหรัสผ่าน",
-      "ERROR": "หรัสผ่านไม่ตรงกัน"
+      "ERROR": "หรัสผ่านไม่ตรงกัน."
     },
     "API": {
-      "SUCCESS_MESSAGE": "เปลี่ยนหรัสผ่านเเล้ว",
-      "ERROR_MESSAGE": "ไม่สามารถเชื่อมต่อเซิฟเวอร์ได้โปรดลองอีกครั้งในภายหลัง"
+      "SUCCESS_MESSAGE": "เปลี่ยนหรัสผ่านเเล้ว.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "CAPTCHA": {
       "ERROR": "การยืนยันหมดอายุ โปรดแก้ไขแคปช่าอีกครั้ง"
diff --git a/app/javascript/dashboard/i18n/locale/th/signup.json b/app/javascript/dashboard/i18n/locale/th/signup.json
index 030ffd81d..3b158c57a 100644
--- a/app/javascript/dashboard/i18n/locale/th/signup.json
+++ b/app/javascript/dashboard/i18n/locale/th/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Company name",
-      "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
-      "ERROR": "Company name is too short"
+      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
+      "ERROR": "Company name is too short."
     },
     "FULL_NAME": {
       "LABEL": "ชื่อเต็ม",
-      "PLACEHOLDER": "ใส่ชื่อเต็มของคุณ",
-      "ERROR": "ชื่อเต็มสั้นเกินไป"
+      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
+      "ERROR": "ชื่อเต็มสั้นเกินไป."
     },
     "EMAIL": {
       "LABEL": "อีเมลบริษัท",
-      "PLACEHOLDER": "ใส่อีเมลบริษัทของคุณ",
-      "ERROR": "Please enter a valid work email address"
+      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
+      "ERROR": "Please enter a valid work email address."
     },
     "PASSWORD": {
       "LABEL": "หรัสผ่าน",
       "PLACEHOLDER": "หรัสผ่าน",
-      "ERROR": "หรัสผ่านนั้นสั้นเกินไป",
-      "IS_INVALID_PASSWORD": "รหัสผ่านต้องมีอย่างน้อย 1 ตัวอักษรภาษาอังกฤษพิมพ์เล็ก, 1 ตัวอักษรภาษาอังกฤษพิมพ์ใหญ่, 1 ตัวเลข และอักขระพิเศษ 1 ตัว"
+      "ERROR": "หรัสผ่านนั้นสั้นเกินไป.",
+      "IS_INVALID_PASSWORD": "รหัสผ่านต้องมีอย่างน้อย 1 ตัวอักษรภาษาอังกฤษพิมพ์เล็ก, 1 ตัวอักษรภาษาอังกฤษพิมพ์ใหญ่, 1 ตัวเลข และอักขระพิเศษ 1 ตัว."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "ยืนยันหรัสผ่าน",
-      "PLACEHOLDER": "ยืนยันหรัสผ่าน",
-      "ERROR": "รหัสผ่านไม่เหมือนกัน"
+      "LABEL": "Confirm password",
+      "PLACEHOLDER": "Confirm password",
+      "ERROR": "รหัสผ่านไม่เหมือนกัน."
     },
     "API": {
       "SUCCESS_MESSAGE": "ลงทะเบียนสำเร็จแล้ว",
-      "ERROR_MESSAGE": "ไม่สามารถเชื่อมต่อเซิฟเวอร์ได้โปรดลองอีกครั้งในภายหลัง"
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Create account",
     "HAVE_AN_ACCOUNT": "มีบัญชีอยู่แล้ว?"
diff --git a/app/javascript/dashboard/i18n/locale/tr/advancedFilters.json b/app/javascript/dashboard/i18n/locale/tr/advancedFilters.json
index f9ba216cd..7999c5002 100644
--- a/app/javascript/dashboard/i18n/locale/tr/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/tr/advancedFilters.json
@@ -38,6 +38,7 @@
       "CAMPAIGN_NAME": "Kampanya Adı",
       "LABELS": "Etiketler",
       "BROWSER_LANGUAGE": "Tarayıcı Dili",
+      "PRIORITY": "Priority",
       "COUNTRY_NAME": "Ülke Adı",
       "REFERER_LINK": "Yönlendirme bağlantısı",
       "CUSTOM_ATTRIBUTE_LIST": "Liste",
diff --git a/app/javascript/dashboard/i18n/locale/tr/agentMgmt.json b/app/javascript/dashboard/i18n/locale/tr/agentMgmt.json
index a108e09f0..71d9cd03a 100644
--- a/app/javascript/dashboard/i18n/locale/tr/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/tr/agentMgmt.json
@@ -110,7 +110,8 @@
         },
         "PLACEHOLDER": {
           "AGENT": "Temsilci ara",
-          "TEAM": "Takım ara"
+          "TEAM": "Takım ara",
+          "INPUT": "Search for agents"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/tr/conversation.json b/app/javascript/dashboard/i18n/locale/tr/conversation.json
index 06a9a5cde..cce09d484 100644
--- a/app/javascript/dashboard/i18n/locale/tr/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/tr/conversation.json
@@ -37,6 +37,7 @@
     "UNKNOWN_FILE_TYPE": "Bilinmeyen Dosya",
     "SAVE_CONTACT": "Save",
     "UPLOADING_ATTACHMENTS": "Dosyalar gönderiliyor...",
+    "REPLIED_TO_STORY": "Replied to your story",
     "SUCCESS_DELETE_MESSAGE": "Mesaj başarıyla silindi",
     "FAIL_DELETE_MESSSAGE": "Mesaj silinemiyor. Tekrar deneyin",
     "NO_RESPONSE": "Cevap Yok",
@@ -66,6 +67,23 @@
         "NEXT_WEEK": "Sonraki hafta"
       }
     },
+    "PRIORITY": {
+      "TITLE": "Priority",
+      "OPTIONS": {
+        "NONE": "Hiç",
+        "URGENT": "Urgent",
+        "HIGH": "High",
+        "MEDIUM": "Medium",
+        "LOW": "Low"
+      },
+      "CHANGE_PRIORITY": {
+        "SELECT_PLACEHOLDER": "Hiç",
+        "INPUT_PLACEHOLDER": "Select priority",
+        "NO_RESULTS": "Sonuç bulunamadı",
+        "SUCCESSFUL": "Changed priority of conversation id %{conversationId} to %{priority}",
+        "FAILED": "Couldn't change priority. Please try again."
+      }
+    },
     "CARD_CONTEXT_MENU": {
       "PENDING": "Beklemede olarak işaretle",
       "RESOLVED": "Çözüldü olarak işaretle",
diff --git a/app/javascript/dashboard/i18n/locale/tr/generalSettings.json b/app/javascript/dashboard/i18n/locale/tr/generalSettings.json
index 51dcd7356..fbcb8202f 100644
--- a/app/javascript/dashboard/i18n/locale/tr/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/tr/generalSettings.json
@@ -101,6 +101,7 @@
       "REPORTS": "Raporlar",
       "CONVERSATION": "Konuşma",
       "CHANGE_ASSIGNEE": "Atanan Kişiyi Değiştir",
+      "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Takım değiştir",
       "ADD_LABEL": "Konuşmaya etiket ekle",
       "REMOVE_LABEL": "Konuşmadan etiketi kaldır",
@@ -126,6 +127,7 @@
       "GO_TO_NOTIFICATIONS": "Go to Notifications",
       "ADD_LABELS_TO_CONVERSATION": "Konuşmaya etiket ekle",
       "ASSIGN_AN_AGENT": "Assign an agent",
+      "ASSIGN_PRIORITY": "Assign priority",
       "ASSIGN_A_TEAM": "Assign a team",
       "MUTE_CONVERSATION": "Mute conversation",
       "UNMUTE_CONVERSATION": "Unmute conversation",
diff --git a/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json
index 1fdc06c5e..838d29b28 100644
--- a/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json
@@ -482,6 +482,13 @@
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
+    "HELP_CENTER": {
+      "LABEL": "Help Center",
+      "PLACEHOLDER": "Select Help Center",
+      "SELECT_PLACEHOLDER": "Select Help Center",
+      "REMOVE": "Remove Help Center",
+      "SUB_TEXT": "Attach a Help Center with the inbox"
+    },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
       "MAX_ASSIGNMENT_LIMIT_RANGE_ERROR": "Please enter a value greater than 0",
diff --git a/app/javascript/dashboard/i18n/locale/tr/integrations.json b/app/javascript/dashboard/i18n/locale/tr/integrations.json
index 1a866ae56..91173fea1 100644
--- a/app/javascript/dashboard/i18n/locale/tr/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/tr/integrations.json
@@ -85,6 +85,23 @@
       "JOIN_ERROR": "There was an error joining the call, please try again",
       "CREATE_ERROR": "There was an error creating a meeting link, please try again"
     },
+    "OPEN_AI": {
+      "TITLE": "Improve With AI",
+      "SUBTITLE": "An improved reply will be generated using AI, based on your current draft.",
+      "TONE": {
+        "TITLE": "Tone",
+        "OPTIONS": {
+          "PROFESSIONAL": "Professional",
+          "FRIENDLY": "Friendly"
+        }
+      },
+      "BUTTONS": {
+        "GENERATE": "Generate",
+        "GENERATING": "Generating...",
+        "CANCEL": "İptal Et"
+      },
+      "GENERATE_ERROR": "There was an error processing the content, please try again"
+    },
     "DELETE": {
       "BUTTON_TEXT": "Sil",
       "API": {
diff --git a/app/javascript/dashboard/i18n/locale/tr/login.json b/app/javascript/dashboard/i18n/locale/tr/login.json
index 267933d03..ef2ba635b 100644
--- a/app/javascript/dashboard/i18n/locale/tr/login.json
+++ b/app/javascript/dashboard/i18n/locale/tr/login.json
@@ -3,16 +3,16 @@
     "TITLE": "Chatwoot'ta oturum açın",
     "EMAIL": {
       "LABEL": "E-Posta",
-      "PLACEHOLDER": "E-posta, örneğin: birisi@örnek.com"
+      "PLACEHOLDER": "example@companyname.com"
     },
     "PASSWORD": {
       "LABEL": "Parola",
       "PLACEHOLDER": "Parola"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Giriş başarılı",
-      "ERROR_MESSAGE": "Woot Sunucusuna bağlanılamadı, Lütfen daha sonra tekrar deneyin",
-      "UNAUTH": "Kullanıcı Adı / Parola Yanlış. Lütfen tekrar deneyin"
+      "SUCCESS_MESSAGE": "Login successful",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again.",
+      "UNAUTH": "Username or password is incorrect. Please try again."
     },
     "OAUTH": {
       "GOOGLE_LOGIN": "Login with Google",
diff --git a/app/javascript/dashboard/i18n/locale/tr/resetPassword.json b/app/javascript/dashboard/i18n/locale/tr/resetPassword.json
index 594ddc3b6..cc9ae6157 100644
--- a/app/javascript/dashboard/i18n/locale/tr/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/tr/resetPassword.json
@@ -1,14 +1,14 @@
 {
   "RESET_PASSWORD": {
-    "TITLE": "Şifreyi yenile",
+    "TITLE": "Parola yenile",
     "EMAIL": {
       "LABEL": "E-Posta",
-      "PLACEHOLDER": "Lütfen E-postanızı girin",
-      "ERROR": "lütfen geçerli e-posta adresini giriniz"
+      "PLACEHOLDER": "Lütfen E-postanızı girin.",
+      "ERROR": "lütfen geçerli e-posta adresini giriniz."
     },
     "API": {
-      "SUCCESS_MESSAGE": "E-postanıza parola sıfırlama bağlantısı gönderildi",
-      "ERROR_MESSAGE": "Woot Sunucusuna bağlanılamadı, Lütfen daha sonra tekrar deneyin"
+      "SUCCESS_MESSAGE": "E-postanıza parola sıfırlama bağlantısı gönderildi.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Yolla"
   }
diff --git a/app/javascript/dashboard/i18n/locale/tr/search.json b/app/javascript/dashboard/i18n/locale/tr/search.json
index 10df26c50..56ac34436 100644
--- a/app/javascript/dashboard/i18n/locale/tr/search.json
+++ b/app/javascript/dashboard/i18n/locale/tr/search.json
@@ -14,8 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
-    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
+    "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/tr/setNewPassword.json b/app/javascript/dashboard/i18n/locale/tr/setNewPassword.json
index 2b3c54a12..491328a01 100644
--- a/app/javascript/dashboard/i18n/locale/tr/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/tr/setNewPassword.json
@@ -1,19 +1,19 @@
 {
   "SET_NEW_PASSWORD": {
-    "TITLE": "Yeni Parola Belirleyin",
+    "TITLE": "Set new password",
     "PASSWORD": {
       "LABEL": "Parola",
       "PLACEHOLDER": "Parola",
-      "ERROR": "Parola çok kısa"
+      "ERROR": "Parola çok kısa."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Parolayı Onayla",
+      "LABEL": "Confirm password",
       "PLACEHOLDER": "Parolayı Onayla",
-      "ERROR": "Parola eşleşmiyor"
+      "ERROR": "Parola eşleşmiyor."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Parola başarıyla değiştirildi",
-      "ERROR_MESSAGE": "Woot Sunucusuna bağlanılamadı, Lütfen daha sonra tekrar deneyin"
+      "SUCCESS_MESSAGE": "Parola başarıyla değiştirildi.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "CAPTCHA": {
       "ERROR": "Doğrulama süresi sona erdi. Lütfen captchayı tekrar çözünüz."
diff --git a/app/javascript/dashboard/i18n/locale/tr/signup.json b/app/javascript/dashboard/i18n/locale/tr/signup.json
index d1b20e53c..4e8504df9 100644
--- a/app/javascript/dashboard/i18n/locale/tr/signup.json
+++ b/app/javascript/dashboard/i18n/locale/tr/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Company name",
-      "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
-      "ERROR": "Company name is too short"
+      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
+      "ERROR": "Company name is too short."
     },
     "FULL_NAME": {
       "LABEL": "Ad Soyad",
-      "PLACEHOLDER": "Ad Soyadınızı giriniz. örn: Bruce Wayne",
-      "ERROR": "Ad Soyad çok kısa"
+      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
+      "ERROR": "Ad Soyad çok kısa."
     },
     "EMAIL": {
       "LABEL": "İş emaili",
-      "PLACEHOLDER": "İş email adresinizi giriniz. örn: bruce@wayne.enterprises",
-      "ERROR": "Please enter a valid work email address"
+      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
+      "ERROR": "Please enter a valid work email address."
     },
     "PASSWORD": {
       "LABEL": "Parola",
       "PLACEHOLDER": "Parola",
-      "ERROR": "Parola çok kısa",
-      "IS_INVALID_PASSWORD": "Şifre en az 1 büyük harf, 1 küçük harf, 1 rakam ve 1 özel karakter içermelidir"
+      "ERROR": "Parola çok kısa.",
+      "IS_INVALID_PASSWORD": "Şifre en az 1 büyük harf, 1 küçük harf, 1 rakam ve 1 özel karakter içermelidir."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Parolayı Onayla",
-      "PLACEHOLDER": "Parolayı Onayla",
-      "ERROR": "Parola eşleşmiyor"
+      "LABEL": "Confirm password",
+      "PLACEHOLDER": "Confirm password",
+      "ERROR": "Parola eşleşmiyor."
     },
     "API": {
       "SUCCESS_MESSAGE": "Kayıt başarılı",
-      "ERROR_MESSAGE": "Woot Sunucusuna bağlanılamadı, Lütfen daha sonra tekrar deneyin"
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Create account",
     "HAVE_AN_ACCOUNT": "Hesabın var mı?"
diff --git a/app/javascript/dashboard/i18n/locale/uk/advancedFilters.json b/app/javascript/dashboard/i18n/locale/uk/advancedFilters.json
index ed94affd6..b98ddd312 100644
--- a/app/javascript/dashboard/i18n/locale/uk/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/uk/advancedFilters.json
@@ -38,6 +38,7 @@
       "CAMPAIGN_NAME": "Назва Кампанії",
       "LABELS": "Мітки",
       "BROWSER_LANGUAGE": "Мова браузера",
+      "PRIORITY": "Пріоритет",
       "COUNTRY_NAME": "Назва країни",
       "REFERER_LINK": "Посилання",
       "CUSTOM_ATTRIBUTE_LIST": "Список",
diff --git a/app/javascript/dashboard/i18n/locale/uk/agentMgmt.json b/app/javascript/dashboard/i18n/locale/uk/agentMgmt.json
index 1c3958abc..b40f0582f 100644
--- a/app/javascript/dashboard/i18n/locale/uk/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/uk/agentMgmt.json
@@ -110,7 +110,8 @@
         },
         "PLACEHOLDER": {
           "AGENT": "Пошук агентів",
-          "TEAM": "Пошук команд"
+          "TEAM": "Пошук команд",
+          "INPUT": "Пошук агентів"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/uk/conversation.json b/app/javascript/dashboard/i18n/locale/uk/conversation.json
index 87e57bf59..aa22dbc8d 100644
--- a/app/javascript/dashboard/i18n/locale/uk/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/uk/conversation.json
@@ -37,6 +37,7 @@
     "UNKNOWN_FILE_TYPE": "Невідомий файл",
     "SAVE_CONTACT": "Зберегти",
     "UPLOADING_ATTACHMENTS": "Завантаження вкладень...",
+    "REPLIED_TO_STORY": "Відповів(-ла) на вашу історію",
     "SUCCESS_DELETE_MESSAGE": "Повідомлення успішно видалено",
     "FAIL_DELETE_MESSSAGE": "Не вдалося видалити повідомлення! Спробуйте ще раз",
     "NO_RESPONSE": "Немає відповіді",
@@ -66,6 +67,23 @@
         "NEXT_WEEK": "Наступного тижня"
       }
     },
+    "PRIORITY": {
+      "TITLE": "Пріоритет",
+      "OPTIONS": {
+        "NONE": "Нiчого",
+        "URGENT": "Терміновий",
+        "HIGH": "Високий",
+        "MEDIUM": "Середній",
+        "LOW": "Низький"
+      },
+      "CHANGE_PRIORITY": {
+        "SELECT_PLACEHOLDER": "Нiчого",
+        "INPUT_PLACEHOLDER": "Оберіть пріоритет",
+        "NO_RESULTS": "Результатів не знайдено",
+        "SUCCESSFUL": "Змінено пріоритет для бесід з ID %{conversationId} на %{priority}",
+        "FAILED": "Не вдалося змінити пріоритет. Будь ласка, спробуйте ще раз."
+      }
+    },
     "CARD_CONTEXT_MENU": {
       "PENDING": "Позначити як \"В очікуванні\"",
       "RESOLVED": "Позначити як вирішене",
diff --git a/app/javascript/dashboard/i18n/locale/uk/generalSettings.json b/app/javascript/dashboard/i18n/locale/uk/generalSettings.json
index ad3583826..857a4adcf 100644
--- a/app/javascript/dashboard/i18n/locale/uk/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/uk/generalSettings.json
@@ -101,6 +101,7 @@
       "REPORTS": "Звіти",
       "CONVERSATION": "Діалог",
       "CHANGE_ASSIGNEE": "Змінити виконавця",
+      "CHANGE_PRIORITY": "Змінити пріоритет",
       "CHANGE_TEAM": "Змінити команду",
       "ADD_LABEL": "Додати мітку до діалогу",
       "REMOVE_LABEL": "Видалити мітку з діалогу",
@@ -126,6 +127,7 @@
       "GO_TO_NOTIFICATIONS": "Перейти до сповіщень",
       "ADD_LABELS_TO_CONVERSATION": "Додати мітку до діалогу",
       "ASSIGN_AN_AGENT": "Призначити агента",
+      "ASSIGN_PRIORITY": "Призначити пріоритет",
       "ASSIGN_A_TEAM": "Призначити команду",
       "MUTE_CONVERSATION": "Вимкнути звук для розмови",
       "UNMUTE_CONVERSATION": "Увімкнути звук для розмови",
diff --git a/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json
index e1fd8a914..75792f962 100644
--- a/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json
@@ -482,6 +482,13 @@
       "WHATSAPP_WEBHOOK_SUBHEADER": "Цей токен використовується для перевірки аутентифікації кінцевої точки вебхука.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Оновити параметри форми чату"
     },
+    "HELP_CENTER": {
+      "LABEL": "Довідковий центр",
+      "PLACEHOLDER": "Виберіть довідковий центр",
+      "SELECT_PLACEHOLDER": "Виберіть довідковий центр",
+      "REMOVE": "Видалити довідковий центр",
+      "SUB_TEXT": "Прикріпити Довідковий центр до папки Вхідні"
+    },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Ліміт автопризначення",
       "MAX_ASSIGNMENT_LIMIT_RANGE_ERROR": "Будь ласка, введіть значення, більше за 0",
diff --git a/app/javascript/dashboard/i18n/locale/uk/integrations.json b/app/javascript/dashboard/i18n/locale/uk/integrations.json
index 786608c81..da46d0ed4 100644
--- a/app/javascript/dashboard/i18n/locale/uk/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/uk/integrations.json
@@ -85,6 +85,23 @@
       "JOIN_ERROR": "Помилка при підключенні до дзвінка. Будь ласка, спробуйте ще раз",
       "CREATE_ERROR": "Помилка при створенні посилання на зустріч, будь ласка, спробуйте знову"
     },
+    "OPEN_AI": {
+      "TITLE": "Покращити з ШІ",
+      "SUBTITLE": "Поліпшена відповідь буде згенерована за допомогою AI, основана на вашій чернетці.",
+      "TONE": {
+        "TITLE": "Тон",
+        "OPTIONS": {
+          "PROFESSIONAL": "Професійний",
+          "FRIENDLY": "Дружній"
+        }
+      },
+      "BUTTONS": {
+        "GENERATE": "Згенерувати",
+        "GENERATING": "Генерація...",
+        "CANCEL": "Скасувати"
+      },
+      "GENERATE_ERROR": "Сталася помилка при обробці контенту, будь ласка, спробуйте ще раз"
+    },
     "DELETE": {
       "BUTTON_TEXT": "Видалити",
       "API": {
diff --git a/app/javascript/dashboard/i18n/locale/uk/login.json b/app/javascript/dashboard/i18n/locale/uk/login.json
index 9a6a2febc..7d19dcdf0 100644
--- a/app/javascript/dashboard/i18n/locale/uk/login.json
+++ b/app/javascript/dashboard/i18n/locale/uk/login.json
@@ -3,16 +3,16 @@
     "TITLE": "Увійти до Chatwoot",
     "EMAIL": {
       "LABEL": "Email",
-      "PLACEHOLDER": "Email як: someone@example.com"
+      "PLACEHOLDER": "example@companyname.com"
     },
     "PASSWORD": {
       "LABEL": "Пароль",
       "PLACEHOLDER": "Пароль"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Вхід успішно здійснено",
-      "ERROR_MESSAGE": "Не вдалося підключитися до Woot Server, спробуйте ще раз пізніше",
-      "UNAUTH": "Неправильне ім'я користувача / пароль. Будь ласка, спробуйте ще раз"
+      "SUCCESS_MESSAGE": "Вхід успішний",
+      "ERROR_MESSAGE": "Не вдалося підключитися до Woot сервера. Будь ласка, спробуйте ще раз.",
+      "UNAUTH": "Неправильне ім'я користувача / пароль. Будь ласка, спробуйте ще раз."
     },
     "OAUTH": {
       "GOOGLE_LOGIN": "Увійти через Google",
diff --git a/app/javascript/dashboard/i18n/locale/uk/resetPassword.json b/app/javascript/dashboard/i18n/locale/uk/resetPassword.json
index 3099952de..22eb2c5b3 100644
--- a/app/javascript/dashboard/i18n/locale/uk/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/uk/resetPassword.json
@@ -3,12 +3,12 @@
     "TITLE": "Скинути пароль",
     "EMAIL": {
       "LABEL": "Email",
-      "PLACEHOLDER": "Введіть адресу електронної пошти",
-      "ERROR": "Введіть дійсну адресу електронної пошти"
+      "PLACEHOLDER": "Введіть адресу електронної пошти.",
+      "ERROR": "Введіть дійсну адресу електронної пошти."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Посилання для зміни пароля було надіслано на вашу електронну пошту",
-      "ERROR_MESSAGE": "Не вдалося підключитися до Woot Server, спробуйте ще раз пізніше"
+      "SUCCESS_MESSAGE": "Посилання для зміни пароля було надіслано на вашу електронну пошту.",
+      "ERROR_MESSAGE": "Не вдалося підключитися до Woot сервера. Будь ласка, спробуйте ще раз."
     },
     "SUBMIT": "Додати"
   }
diff --git a/app/javascript/dashboard/i18n/locale/uk/search.json b/app/javascript/dashboard/i18n/locale/uk/search.json
index b9255eed9..8875bb8ed 100644
--- a/app/javascript/dashboard/i18n/locale/uk/search.json
+++ b/app/javascript/dashboard/i18n/locale/uk/search.json
@@ -14,8 +14,8 @@
     "EMPTY_STATE": "На запит '%{query} не знайдено %{item}",
     "EMPTY_STATE_FULL": "Немає результатів за запитом '%{query}",
     "PLACEHOLDER_KEYBINDING": "/ фокус",
-    "INPUT_PLACEHOLDER": "Пошук повідомлень, контактів або бесід",
-    "EMPTY_STATE_DEFAULT": "Пошук бесід по id, email, тел. номеру, повідомлень для кращого пошуку результатів.",
+    "INPUT_PLACEHOLDER": "Введіть 3 або більше символів для пошуку",
+    "EMPTY_STATE_DEFAULT": "Пошук бесід по id, email, тел. номеру, повідомлень для кращого пошуку результатів. ",
     "BOT_LABEL": "Бот",
     "READ_MORE": "Детальніше",
     "WROTE": "написав(ла):"
diff --git a/app/javascript/dashboard/i18n/locale/uk/setNewPassword.json b/app/javascript/dashboard/i18n/locale/uk/setNewPassword.json
index 62572c4d2..3c807ea00 100644
--- a/app/javascript/dashboard/i18n/locale/uk/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/uk/setNewPassword.json
@@ -4,16 +4,16 @@
     "PASSWORD": {
       "LABEL": "Пароль",
       "PLACEHOLDER": "Пароль",
-      "ERROR": "Пароль занадто короткий"
+      "ERROR": "Пароль занадто короткий."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Підтвердження пароля",
+      "LABEL": "Підтвердити пароль",
       "PLACEHOLDER": "Підтвердження пароля",
-      "ERROR": "Паролі не збігаються"
+      "ERROR": "Паролі не збігаються."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Пароль успішно змінено",
-      "ERROR_MESSAGE": "Не вдалося підключитися до Woot Server, спробуйте ще раз пізніше"
+      "SUCCESS_MESSAGE": "Пароль успішно змінено.",
+      "ERROR_MESSAGE": "Не вдалося підключитися до Woot сервера. Будь ласка, спробуйте ще раз."
     },
     "CAPTCHA": {
       "ERROR": "Верифікація закінчилася. Будь ласка, пройдіть captcha ще раз."
diff --git a/app/javascript/dashboard/i18n/locale/uk/signup.json b/app/javascript/dashboard/i18n/locale/uk/signup.json
index 816d89309..d79f96572 100644
--- a/app/javascript/dashboard/i18n/locale/uk/signup.json
+++ b/app/javascript/dashboard/i18n/locale/uk/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Назва компанії",
-      "PLACEHOLDER": "Введіть назву вашої компанії; наприклад: Уейн Enterprises",
-      "ERROR": "Назва компанії закоротка"
+      "PLACEHOLDER": "Введіть ім'я вашої компанії. Наприклад Wayne Enterprises",
+      "ERROR": "Назва компанії закоротка."
     },
     "FULL_NAME": {
       "LABEL": "Повне ім'я",
-      "PLACEHOLDER": "Введіть ваше повне ім'я. наприклад: Bruce Wayne",
-      "ERROR": "Повне ім’я занадто коротке"
+      "PLACEHOLDER": "Введіть ваше повне ім'я. Наприклад Брюс Вейн",
+      "ERROR": "Повне ім’я занадто коротке."
     },
     "EMAIL": {
       "LABEL": "Робоча електронна пошта",
-      "PLACEHOLDER": "Введіть робочу адресу електронної пошти; наприклад: bruce@wayne.enterprises",
-      "ERROR": "Будь ласка, введіть робочу адресу електронної пошти"
+      "PLACEHOLDER": "Введіть робочу адресу електронної пошти. Наприклад, bruce@wayne.enterprises",
+      "ERROR": "Будь ласка, введіть робочу адресу електронної пошти."
     },
     "PASSWORD": {
       "LABEL": "Пароль",
       "PLACEHOLDER": "Пароль",
-      "ERROR": "Пароль занадто короткий",
-      "IS_INVALID_PASSWORD": "Пароль повинен містити принаймні 1 велику літеру, хоча б 1 малу літеру, 1 цифру та 1 спеціальний символ"
+      "ERROR": "Пароль занадто короткий.",
+      "IS_INVALID_PASSWORD": "Пароль повинен містити принаймні 1 велику літеру, хоча б 1 малу літеру, 1 цифру та 1 спеціальний символ."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Підтвердження пароля",
-      "PLACEHOLDER": "Підтвердження пароля",
-      "ERROR": "Пароль не підходить"
+      "LABEL": "Підтвердити пароль",
+      "PLACEHOLDER": "Підтвердити пароль",
+      "ERROR": "Пароль не підходить."
     },
     "API": {
       "SUCCESS_MESSAGE": "Реєстрація пройшла успішно",
-      "ERROR_MESSAGE": "Не вдалося підключитися до Woot Server, спробуйте ще раз пізніше"
+      "ERROR_MESSAGE": "Не вдалося підключитися до Woot сервера. Будь ласка, спробуйте ще раз."
     },
     "SUBMIT": "Створити акаунт",
     "HAVE_AN_ACCOUNT": "Вже маєте обліковий запис?"
diff --git a/app/javascript/dashboard/i18n/locale/ur/advancedFilters.json b/app/javascript/dashboard/i18n/locale/ur/advancedFilters.json
index 404764cf8..2d58eff7f 100644
--- a/app/javascript/dashboard/i18n/locale/ur/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/ur/advancedFilters.json
@@ -38,6 +38,7 @@
       "CAMPAIGN_NAME": "Campaign Name",
       "LABELS": "Labels",
       "BROWSER_LANGUAGE": "Browser Language",
+      "PRIORITY": "Priority",
       "COUNTRY_NAME": "Country Name",
       "REFERER_LINK": "Referer link",
       "CUSTOM_ATTRIBUTE_LIST": "List",
diff --git a/app/javascript/dashboard/i18n/locale/ur/agentMgmt.json b/app/javascript/dashboard/i18n/locale/ur/agentMgmt.json
index 058b472f1..1ea47ccf1 100644
--- a/app/javascript/dashboard/i18n/locale/ur/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ur/agentMgmt.json
@@ -110,7 +110,8 @@
         },
         "PLACEHOLDER": {
           "AGENT": "ایجنٹوں کو تلاش کریں۔",
-          "TEAM": "ٹیمیں تلاش کریں۔"
+          "TEAM": "ٹیمیں تلاش کریں۔",
+          "INPUT": "Search for agents"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/ur/conversation.json b/app/javascript/dashboard/i18n/locale/ur/conversation.json
index 936527366..6036594c0 100644
--- a/app/javascript/dashboard/i18n/locale/ur/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ur/conversation.json
@@ -37,6 +37,7 @@
     "UNKNOWN_FILE_TYPE": "Unknown File",
     "SAVE_CONTACT": "Save",
     "UPLOADING_ATTACHMENTS": "منسلکات اپ لوڈ ہو رہی ہیں...",
+    "REPLIED_TO_STORY": "Replied to your story",
     "SUCCESS_DELETE_MESSAGE": "پیغام کامیابی سے حذف ہو گیا۔",
     "FAIL_DELETE_MESSSAGE": "پیغام کو حذف نہیں کیا جا سکا! دوبارہ کوشش کریں",
     "NO_RESPONSE": "کوئی ردعمل نہیں",
@@ -66,6 +67,23 @@
         "NEXT_WEEK": "Next week"
       }
     },
+    "PRIORITY": {
+      "TITLE": "Priority",
+      "OPTIONS": {
+        "NONE": "کوئی نہیں۔",
+        "URGENT": "Urgent",
+        "HIGH": "High",
+        "MEDIUM": "Medium",
+        "LOW": "Low"
+      },
+      "CHANGE_PRIORITY": {
+        "SELECT_PLACEHOLDER": "کوئی نہیں۔",
+        "INPUT_PLACEHOLDER": "Select priority",
+        "NO_RESULTS": "کوئی نتیجہ نہیں",
+        "SUCCESSFUL": "Changed priority of conversation id %{conversationId} to %{priority}",
+        "FAILED": "Couldn't change priority. Please try again."
+      }
+    },
     "CARD_CONTEXT_MENU": {
       "PENDING": "Mark as pending",
       "RESOLVED": "Mark as resolved",
diff --git a/app/javascript/dashboard/i18n/locale/ur/generalSettings.json b/app/javascript/dashboard/i18n/locale/ur/generalSettings.json
index bc290cddf..b8cce77e8 100644
--- a/app/javascript/dashboard/i18n/locale/ur/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ur/generalSettings.json
@@ -101,6 +101,7 @@
       "REPORTS": "Reports",
       "CONVERSATION": "Conversation",
       "CHANGE_ASSIGNEE": "Change Assignee",
+      "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Change Team",
       "ADD_LABEL": "Add label to the conversation",
       "REMOVE_LABEL": "Remove label from the conversation",
@@ -126,6 +127,7 @@
       "GO_TO_NOTIFICATIONS": "Go to Notifications",
       "ADD_LABELS_TO_CONVERSATION": "Add label to the conversation",
       "ASSIGN_AN_AGENT": "Assign an agent",
+      "ASSIGN_PRIORITY": "Assign priority",
       "ASSIGN_A_TEAM": "Assign a team",
       "MUTE_CONVERSATION": "Mute conversation",
       "UNMUTE_CONVERSATION": "Unmute conversation",
diff --git a/app/javascript/dashboard/i18n/locale/ur/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ur/inboxMgmt.json
index e4f97b79f..f24d7c197 100644
--- a/app/javascript/dashboard/i18n/locale/ur/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ur/inboxMgmt.json
@@ -482,6 +482,13 @@
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
+    "HELP_CENTER": {
+      "LABEL": "Help Center",
+      "PLACEHOLDER": "Select Help Center",
+      "SELECT_PLACEHOLDER": "Select Help Center",
+      "REMOVE": "Remove Help Center",
+      "SUB_TEXT": "Attach a Help Center with the inbox"
+    },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
       "MAX_ASSIGNMENT_LIMIT_RANGE_ERROR": "Please enter a value greater than 0",
diff --git a/app/javascript/dashboard/i18n/locale/ur/integrations.json b/app/javascript/dashboard/i18n/locale/ur/integrations.json
index 825c5ff5e..c49bd17d1 100644
--- a/app/javascript/dashboard/i18n/locale/ur/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ur/integrations.json
@@ -85,6 +85,23 @@
       "JOIN_ERROR": "There was an error joining the call, please try again",
       "CREATE_ERROR": "There was an error creating a meeting link, please try again"
     },
+    "OPEN_AI": {
+      "TITLE": "Improve With AI",
+      "SUBTITLE": "An improved reply will be generated using AI, based on your current draft.",
+      "TONE": {
+        "TITLE": "Tone",
+        "OPTIONS": {
+          "PROFESSIONAL": "Professional",
+          "FRIENDLY": "Friendly"
+        }
+      },
+      "BUTTONS": {
+        "GENERATE": "Generate",
+        "GENERATING": "Generating...",
+        "CANCEL": "منسوخ کریں۔"
+      },
+      "GENERATE_ERROR": "There was an error processing the content, please try again"
+    },
     "DELETE": {
       "BUTTON_TEXT": "حذف کریں۔",
       "API": {
diff --git a/app/javascript/dashboard/i18n/locale/ur/login.json b/app/javascript/dashboard/i18n/locale/ur/login.json
index d65635b15..f2b2f51b9 100644
--- a/app/javascript/dashboard/i18n/locale/ur/login.json
+++ b/app/javascript/dashboard/i18n/locale/ur/login.json
@@ -3,16 +3,16 @@
     "TITLE": "Login to Chatwoot",
     "EMAIL": {
       "LABEL": "Email",
-      "PLACEHOLDER": "Email eg: someone@example.com"
+      "PLACEHOLDER": "example@companyname.com"
     },
     "PASSWORD": {
       "LABEL": "Password",
       "PLACEHOLDER": "Password"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Login Successful",
-      "ERROR_MESSAGE": "ووٹ سرور کے ساتھ رابطہ ممکن نہی ہوسکا ، براہ کرم کچھ دیر بعد کوشش کریں",
-      "UNAUTH": "Username / Password Incorrect. Please try again"
+      "SUCCESS_MESSAGE": "Login successful",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again.",
+      "UNAUTH": "Username or password is incorrect. Please try again."
     },
     "OAUTH": {
       "GOOGLE_LOGIN": "Login with Google",
diff --git a/app/javascript/dashboard/i18n/locale/ur/resetPassword.json b/app/javascript/dashboard/i18n/locale/ur/resetPassword.json
index 1008b3ab0..cc9491eaa 100644
--- a/app/javascript/dashboard/i18n/locale/ur/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/ur/resetPassword.json
@@ -1,14 +1,14 @@
 {
   "RESET_PASSWORD": {
-    "TITLE": "پاس ورڈ دوبارہ مرتب کریں",
+    "TITLE": "Reset password",
     "EMAIL": {
       "LABEL": "Email",
-      "PLACEHOLDER": "Please enter your email",
-      "ERROR": "Please enter a valid email"
+      "PLACEHOLDER": "Please enter your email.",
+      "ERROR": "Please enter a valid email."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Password reset link has been sent to your email",
-      "ERROR_MESSAGE": "ووٹ سرور کے ساتھ رابطہ ممکن نہی ہوسکا ، براہ کرم کچھ دیر بعد کوشش کریں"
+      "SUCCESS_MESSAGE": "Password reset link has been sent to your email.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "جمع کرائیں"
   }
diff --git a/app/javascript/dashboard/i18n/locale/ur/search.json b/app/javascript/dashboard/i18n/locale/ur/search.json
index 92a67f207..70e76b0d2 100644
--- a/app/javascript/dashboard/i18n/locale/ur/search.json
+++ b/app/javascript/dashboard/i18n/locale/ur/search.json
@@ -14,8 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
-    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
+    "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/ur/setNewPassword.json b/app/javascript/dashboard/i18n/locale/ur/setNewPassword.json
index 1fafb2a96..575569bae 100644
--- a/app/javascript/dashboard/i18n/locale/ur/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/ur/setNewPassword.json
@@ -1,19 +1,19 @@
 {
   "SET_NEW_PASSWORD": {
-    "TITLE": "Set New Password",
+    "TITLE": "Set new password",
     "PASSWORD": {
       "LABEL": "Password",
       "PLACEHOLDER": "Password",
-      "ERROR": "Password is too short"
+      "ERROR": "Password is too short."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirm Password",
+      "LABEL": "Confirm password",
       "PLACEHOLDER": "Confirm Password",
-      "ERROR": "Passwords do not match"
+      "ERROR": "Passwords do not match."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Successfully changed the password",
-      "ERROR_MESSAGE": "ووٹ سرور کے ساتھ رابطہ ممکن نہی ہوسکا ، براہ کرم کچھ دیر بعد کوشش کریں"
+      "SUCCESS_MESSAGE": "Successfully changed the password.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "CAPTCHA": {
       "ERROR": "Verification expired. Please solve captcha again."
diff --git a/app/javascript/dashboard/i18n/locale/ur/signup.json b/app/javascript/dashboard/i18n/locale/ur/signup.json
index 66224b2fb..1ad4865ff 100644
--- a/app/javascript/dashboard/i18n/locale/ur/signup.json
+++ b/app/javascript/dashboard/i18n/locale/ur/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Company name",
-      "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
-      "ERROR": "Company name is too short"
+      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
+      "ERROR": "Company name is too short."
     },
     "FULL_NAME": {
       "LABEL": "Full name",
-      "PLACEHOLDER": "Enter your full name. eg: Bruce Wayne",
-      "ERROR": "Full name is too short"
+      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
+      "ERROR": "Full name is too short."
     },
     "EMAIL": {
       "LABEL": "Work email",
-      "PLACEHOLDER": "Enter your work email address. eg: bruce@wayne.enterprises",
-      "ERROR": "Please enter a valid work email address"
+      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
+      "ERROR": "Please enter a valid work email address."
     },
     "PASSWORD": {
       "LABEL": "Password",
       "PLACEHOLDER": "Password",
-      "ERROR": "Password is too short",
-      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
+      "ERROR": "Password is too short.",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirm Password",
-      "PLACEHOLDER": "Confirm Password",
-      "ERROR": "Password doesnot match"
+      "LABEL": "Confirm password",
+      "PLACEHOLDER": "Confirm password",
+      "ERROR": "Password doesnot match."
     },
     "API": {
       "SUCCESS_MESSAGE": "Registration Successfull",
-      "ERROR_MESSAGE": "ووٹ سرور کے ساتھ رابطہ ممکن نہی ہوسکا ، براہ کرم کچھ دیر بعد کوشش کریں"
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Create account",
     "HAVE_AN_ACCOUNT": "Already have an account?"
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/advancedFilters.json b/app/javascript/dashboard/i18n/locale/ur_IN/advancedFilters.json
index a32c1bd9d..361c0c8ae 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/advancedFilters.json
@@ -38,6 +38,7 @@
       "CAMPAIGN_NAME": "Campaign Name",
       "LABELS": "Labels",
       "BROWSER_LANGUAGE": "Browser Language",
+      "PRIORITY": "Priority",
       "COUNTRY_NAME": "Country Name",
       "REFERER_LINK": "Referer link",
       "CUSTOM_ATTRIBUTE_LIST": "List",
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/agentMgmt.json b/app/javascript/dashboard/i18n/locale/ur_IN/agentMgmt.json
index b44e74542..b563de61f 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/agentMgmt.json
@@ -110,7 +110,8 @@
         },
         "PLACEHOLDER": {
           "AGENT": "Search agents",
-          "TEAM": "Search teams"
+          "TEAM": "Search teams",
+          "INPUT": "Search for agents"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/conversation.json b/app/javascript/dashboard/i18n/locale/ur_IN/conversation.json
index 597799c15..a20522108 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/conversation.json
@@ -37,6 +37,7 @@
     "UNKNOWN_FILE_TYPE": "Unknown File",
     "SAVE_CONTACT": "Save",
     "UPLOADING_ATTACHMENTS": "Uploading attachments...",
+    "REPLIED_TO_STORY": "Replied to your story",
     "SUCCESS_DELETE_MESSAGE": "Message deleted successfully",
     "FAIL_DELETE_MESSSAGE": "Couldn't delete message! Try again",
     "NO_RESPONSE": "No response",
@@ -66,6 +67,23 @@
         "NEXT_WEEK": "Next week"
       }
     },
+    "PRIORITY": {
+      "TITLE": "Priority",
+      "OPTIONS": {
+        "NONE": "None",
+        "URGENT": "Urgent",
+        "HIGH": "High",
+        "MEDIUM": "Medium",
+        "LOW": "Low"
+      },
+      "CHANGE_PRIORITY": {
+        "SELECT_PLACEHOLDER": "None",
+        "INPUT_PLACEHOLDER": "Select priority",
+        "NO_RESULTS": "No results found",
+        "SUCCESSFUL": "Changed priority of conversation id %{conversationId} to %{priority}",
+        "FAILED": "Couldn't change priority. Please try again."
+      }
+    },
     "CARD_CONTEXT_MENU": {
       "PENDING": "Mark as pending",
       "RESOLVED": "Mark as resolved",
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/generalSettings.json b/app/javascript/dashboard/i18n/locale/ur_IN/generalSettings.json
index 367b35b1c..7ed6d8925 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/generalSettings.json
@@ -101,6 +101,7 @@
       "REPORTS": "Reports",
       "CONVERSATION": "Conversation",
       "CHANGE_ASSIGNEE": "Change Assignee",
+      "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Change Team",
       "ADD_LABEL": "Add label to the conversation",
       "REMOVE_LABEL": "Remove label from the conversation",
@@ -126,6 +127,7 @@
       "GO_TO_NOTIFICATIONS": "Go to Notifications",
       "ADD_LABELS_TO_CONVERSATION": "Add label to the conversation",
       "ASSIGN_AN_AGENT": "Assign an agent",
+      "ASSIGN_PRIORITY": "Assign priority",
       "ASSIGN_A_TEAM": "Assign a team",
       "MUTE_CONVERSATION": "Mute conversation",
       "UNMUTE_CONVERSATION": "Unmute conversation",
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ur_IN/inboxMgmt.json
index bed0ec0c9..407441618 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/inboxMgmt.json
@@ -482,6 +482,13 @@
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
+    "HELP_CENTER": {
+      "LABEL": "Help Center",
+      "PLACEHOLDER": "Select Help Center",
+      "SELECT_PLACEHOLDER": "Select Help Center",
+      "REMOVE": "Remove Help Center",
+      "SUB_TEXT": "Attach a Help Center with the inbox"
+    },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
       "MAX_ASSIGNMENT_LIMIT_RANGE_ERROR": "Please enter a value greater than 0",
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/integrations.json b/app/javascript/dashboard/i18n/locale/ur_IN/integrations.json
index 00d92f297..f0326fa78 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/integrations.json
@@ -85,6 +85,23 @@
       "JOIN_ERROR": "There was an error joining the call, please try again",
       "CREATE_ERROR": "There was an error creating a meeting link, please try again"
     },
+    "OPEN_AI": {
+      "TITLE": "Improve With AI",
+      "SUBTITLE": "An improved reply will be generated using AI, based on your current draft.",
+      "TONE": {
+        "TITLE": "Tone",
+        "OPTIONS": {
+          "PROFESSIONAL": "Professional",
+          "FRIENDLY": "Friendly"
+        }
+      },
+      "BUTTONS": {
+        "GENERATE": "Generate",
+        "GENERATING": "Generating...",
+        "CANCEL": "Cancel"
+      },
+      "GENERATE_ERROR": "There was an error processing the content, please try again"
+    },
     "DELETE": {
       "BUTTON_TEXT": "Delete",
       "API": {
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/login.json b/app/javascript/dashboard/i18n/locale/ur_IN/login.json
index 25c956a81..f2b2f51b9 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/login.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/login.json
@@ -3,16 +3,16 @@
     "TITLE": "Login to Chatwoot",
     "EMAIL": {
       "LABEL": "Email",
-      "PLACEHOLDER": "Email eg: someone@example.com"
+      "PLACEHOLDER": "example@companyname.com"
     },
     "PASSWORD": {
       "LABEL": "Password",
       "PLACEHOLDER": "Password"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Login Successful",
-      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later",
-      "UNAUTH": "Username / Password Incorrect. Please try again"
+      "SUCCESS_MESSAGE": "Login successful",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again.",
+      "UNAUTH": "Username or password is incorrect. Please try again."
     },
     "OAUTH": {
       "GOOGLE_LOGIN": "Login with Google",
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/resetPassword.json b/app/javascript/dashboard/i18n/locale/ur_IN/resetPassword.json
index bb678e809..37aa1860a 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/resetPassword.json
@@ -1,14 +1,14 @@
 {
   "RESET_PASSWORD": {
-    "TITLE": "Reset Password",
+    "TITLE": "Reset password",
     "EMAIL": {
       "LABEL": "Email",
-      "PLACEHOLDER": "Please enter your email",
-      "ERROR": "Please enter a valid email"
+      "PLACEHOLDER": "Please enter your email.",
+      "ERROR": "Please enter a valid email."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Password reset link has been sent to your email",
-      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      "SUCCESS_MESSAGE": "Password reset link has been sent to your email.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Submit"
   }
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/search.json b/app/javascript/dashboard/i18n/locale/ur_IN/search.json
index 418572c0c..9044bf5f9 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/search.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/search.json
@@ -14,8 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
-    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
+    "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/setNewPassword.json b/app/javascript/dashboard/i18n/locale/ur_IN/setNewPassword.json
index ec2d94744..4908dad02 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/setNewPassword.json
@@ -1,19 +1,19 @@
 {
   "SET_NEW_PASSWORD": {
-    "TITLE": "Set New Password",
+    "TITLE": "Set new password",
     "PASSWORD": {
       "LABEL": "Password",
       "PLACEHOLDER": "Password",
-      "ERROR": "Password is too short"
+      "ERROR": "Password is too short."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirm Password",
+      "LABEL": "Confirm password",
       "PLACEHOLDER": "Confirm Password",
-      "ERROR": "Passwords do not match"
+      "ERROR": "Passwords do not match."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Successfully changed the password",
-      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      "SUCCESS_MESSAGE": "Successfully changed the password.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "CAPTCHA": {
       "ERROR": "Verification expired. Please solve captcha again."
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/signup.json b/app/javascript/dashboard/i18n/locale/ur_IN/signup.json
index 10ddc5b86..1ad4865ff 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/signup.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Company name",
-      "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
-      "ERROR": "Company name is too short"
+      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
+      "ERROR": "Company name is too short."
     },
     "FULL_NAME": {
       "LABEL": "Full name",
-      "PLACEHOLDER": "Enter your full name. eg: Bruce Wayne",
-      "ERROR": "Full name is too short"
+      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
+      "ERROR": "Full name is too short."
     },
     "EMAIL": {
       "LABEL": "Work email",
-      "PLACEHOLDER": "Enter your work email address. eg: bruce@wayne.enterprises",
-      "ERROR": "Please enter a valid work email address"
+      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
+      "ERROR": "Please enter a valid work email address."
     },
     "PASSWORD": {
       "LABEL": "Password",
       "PLACEHOLDER": "Password",
-      "ERROR": "Password is too short",
-      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
+      "ERROR": "Password is too short.",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirm Password",
-      "PLACEHOLDER": "Confirm Password",
-      "ERROR": "Password doesnot match"
+      "LABEL": "Confirm password",
+      "PLACEHOLDER": "Confirm password",
+      "ERROR": "Password doesnot match."
     },
     "API": {
       "SUCCESS_MESSAGE": "Registration Successfull",
-      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Create account",
     "HAVE_AN_ACCOUNT": "Already have an account?"
diff --git a/app/javascript/dashboard/i18n/locale/vi/advancedFilters.json b/app/javascript/dashboard/i18n/locale/vi/advancedFilters.json
index 3a84d1e7a..55c6292ef 100644
--- a/app/javascript/dashboard/i18n/locale/vi/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/vi/advancedFilters.json
@@ -38,6 +38,7 @@
       "CAMPAIGN_NAME": "Tên Chiến dịch",
       "LABELS": "Nhãn",
       "BROWSER_LANGUAGE": "Ngôn ngữ của Trình duyệt",
+      "PRIORITY": "Priority",
       "COUNTRY_NAME": "Tên Nước",
       "REFERER_LINK": "Liên kết người giới thiệu",
       "CUSTOM_ATTRIBUTE_LIST": "Danh sách",
diff --git a/app/javascript/dashboard/i18n/locale/vi/agentMgmt.json b/app/javascript/dashboard/i18n/locale/vi/agentMgmt.json
index 9d0c79a9f..b9782e457 100644
--- a/app/javascript/dashboard/i18n/locale/vi/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/vi/agentMgmt.json
@@ -110,7 +110,8 @@
         },
         "PLACEHOLDER": {
           "AGENT": "Tìm kiếm tổng đài viên",
-          "TEAM": "Tìm kiếm nhóm"
+          "TEAM": "Tìm kiếm nhóm",
+          "INPUT": "Search for agents"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/vi/conversation.json b/app/javascript/dashboard/i18n/locale/vi/conversation.json
index d7422eb2c..4a46a2cb3 100644
--- a/app/javascript/dashboard/i18n/locale/vi/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/vi/conversation.json
@@ -37,6 +37,7 @@
     "UNKNOWN_FILE_TYPE": "Tập tin chưa xác định",
     "SAVE_CONTACT": "Save",
     "UPLOADING_ATTACHMENTS": "Đang tải file đính kèm...",
+    "REPLIED_TO_STORY": "Replied to your story",
     "SUCCESS_DELETE_MESSAGE": "Tin nhắn được xoá thành công",
     "FAIL_DELETE_MESSSAGE": "Không thể xoá tin nhắn! Thử lại",
     "NO_RESPONSE": "Không có phản hồi",
@@ -66,6 +67,23 @@
         "NEXT_WEEK": "Tuần sau"
       }
     },
+    "PRIORITY": {
+      "TITLE": "Priority",
+      "OPTIONS": {
+        "NONE": "Không có",
+        "URGENT": "Urgent",
+        "HIGH": "High",
+        "MEDIUM": "Medium",
+        "LOW": "Low"
+      },
+      "CHANGE_PRIORITY": {
+        "SELECT_PLACEHOLDER": "Không có",
+        "INPUT_PLACEHOLDER": "Select priority",
+        "NO_RESULTS": "Không tìm thấy kết quả",
+        "SUCCESSFUL": "Changed priority of conversation id %{conversationId} to %{priority}",
+        "FAILED": "Couldn't change priority. Please try again."
+      }
+    },
     "CARD_CONTEXT_MENU": {
       "PENDING": "Đánh dấu chưa giải quyết",
       "RESOLVED": "Đánh dấu là đã giải quyết",
diff --git a/app/javascript/dashboard/i18n/locale/vi/generalSettings.json b/app/javascript/dashboard/i18n/locale/vi/generalSettings.json
index f7c41e6d5..de9124c88 100644
--- a/app/javascript/dashboard/i18n/locale/vi/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/vi/generalSettings.json
@@ -101,6 +101,7 @@
       "REPORTS": "Báo cáo",
       "CONVERSATION": "Hội thoại",
       "CHANGE_ASSIGNEE": "Thay đổi người được phân công",
+      "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Thay đổi nhóm",
       "ADD_LABEL": "Thêm nhãn vào hội thoại",
       "REMOVE_LABEL": "Xoá nhãn khỏi hội thoại",
@@ -126,6 +127,7 @@
       "GO_TO_NOTIFICATIONS": "Đi đến Thông báo",
       "ADD_LABELS_TO_CONVERSATION": "Thêm nhãn vào hội thoại",
       "ASSIGN_AN_AGENT": "Gán cho tổng đài viên",
+      "ASSIGN_PRIORITY": "Assign priority",
       "ASSIGN_A_TEAM": "Phân công một nhóm",
       "MUTE_CONVERSATION": "Tắt tiếng hội thoại",
       "UNMUTE_CONVERSATION": "Bật tiếng hội thoại",
diff --git a/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json
index 58f5b1afc..e63ebdcea 100644
--- a/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json
@@ -482,6 +482,13 @@
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
+    "HELP_CENTER": {
+      "LABEL": "Help Center",
+      "PLACEHOLDER": "Select Help Center",
+      "SELECT_PLACEHOLDER": "Select Help Center",
+      "REMOVE": "Remove Help Center",
+      "SUB_TEXT": "Attach a Help Center with the inbox"
+    },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Giới hạn tự động phân công tối đa",
       "MAX_ASSIGNMENT_LIMIT_RANGE_ERROR": "Xin nhập vào một số lớn hơn 0",
diff --git a/app/javascript/dashboard/i18n/locale/vi/integrations.json b/app/javascript/dashboard/i18n/locale/vi/integrations.json
index e03807a9f..1e70c287e 100644
--- a/app/javascript/dashboard/i18n/locale/vi/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/vi/integrations.json
@@ -85,6 +85,23 @@
       "JOIN_ERROR": "There was an error joining the call, please try again",
       "CREATE_ERROR": "There was an error creating a meeting link, please try again"
     },
+    "OPEN_AI": {
+      "TITLE": "Improve With AI",
+      "SUBTITLE": "An improved reply will be generated using AI, based on your current draft.",
+      "TONE": {
+        "TITLE": "Tone",
+        "OPTIONS": {
+          "PROFESSIONAL": "Professional",
+          "FRIENDLY": "Friendly"
+        }
+      },
+      "BUTTONS": {
+        "GENERATE": "Generate",
+        "GENERATING": "Generating...",
+        "CANCEL": "Huỷ"
+      },
+      "GENERATE_ERROR": "There was an error processing the content, please try again"
+    },
     "DELETE": {
       "BUTTON_TEXT": "Xoá",
       "API": {
diff --git a/app/javascript/dashboard/i18n/locale/vi/login.json b/app/javascript/dashboard/i18n/locale/vi/login.json
index 19065cb27..fed24abcd 100644
--- a/app/javascript/dashboard/i18n/locale/vi/login.json
+++ b/app/javascript/dashboard/i18n/locale/vi/login.json
@@ -3,16 +3,16 @@
     "TITLE": "Đăng nhập Chatwoot",
     "EMAIL": {
       "LABEL": "Email",
-      "PLACEHOLDER": "Email : someone@example.com"
+      "PLACEHOLDER": "example@companyname.com"
     },
     "PASSWORD": {
       "LABEL": "Mật khẩu",
       "PLACEHOLDER": "Mật khẩu"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Đăng nhập thành công",
-      "ERROR_MESSAGE": "Không thể kết nối với Máy chủ Woot, Vui lòng thử lại sau",
-      "UNAUTH": "Tài khoản/Mật khẩu không đúng. Vui lòng thử lại"
+      "SUCCESS_MESSAGE": "Login successful",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again.",
+      "UNAUTH": "Username or password is incorrect. Please try again."
     },
     "OAUTH": {
       "GOOGLE_LOGIN": "Login with Google",
diff --git a/app/javascript/dashboard/i18n/locale/vi/resetPassword.json b/app/javascript/dashboard/i18n/locale/vi/resetPassword.json
index 730d8fad6..3678b73a1 100644
--- a/app/javascript/dashboard/i18n/locale/vi/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/vi/resetPassword.json
@@ -3,12 +3,12 @@
     "TITLE": "Đặt lại mật khẩu",
     "EMAIL": {
       "LABEL": "Thư điện tử",
-      "PLACEHOLDER": "Vui lòng nhập email",
-      "ERROR": "Vui lòng nhập email hợp lệ"
+      "PLACEHOLDER": "Vui lòng nhập email.",
+      "ERROR": "Vui lòng nhập email hợp lệ."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Liên kết đặt lại mật khẩu đã được gửi đến email của bạn",
-      "ERROR_MESSAGE": "Không thể kết nối với Máy chủ Woot, Vui lòng thử lại sau"
+      "SUCCESS_MESSAGE": "Liên kết đặt lại mật khẩu đã được gửi đến email của bạn.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Gửi"
   }
diff --git a/app/javascript/dashboard/i18n/locale/vi/search.json b/app/javascript/dashboard/i18n/locale/vi/search.json
index 4b34c58f7..d36731de7 100644
--- a/app/javascript/dashboard/i18n/locale/vi/search.json
+++ b/app/javascript/dashboard/i18n/locale/vi/search.json
@@ -14,8 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
-    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
+    "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/vi/setNewPassword.json b/app/javascript/dashboard/i18n/locale/vi/setNewPassword.json
index 47db18733..1a65e2e00 100644
--- a/app/javascript/dashboard/i18n/locale/vi/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/vi/setNewPassword.json
@@ -1,19 +1,19 @@
 {
   "SET_NEW_PASSWORD": {
-    "TITLE": "Cài đặt mật khẩu mới",
+    "TITLE": "Set new password",
     "PASSWORD": {
       "LABEL": "Mật khẩu",
       "PLACEHOLDER": "Mật khẩu",
-      "ERROR": "Mật khẩu quá ngắn"
+      "ERROR": "Mật khẩu quá ngắn."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Xác nhận mật khẩu",
+      "LABEL": "Confirm password",
       "PLACEHOLDER": "Xác nhận mật khẩu",
-      "ERROR": "Mật khẩu không khớp"
+      "ERROR": "Mật khẩu không khớp."
     },
     "API": {
-      "SUCCESS_MESSAGE": "Đổi mật khẩu thành công",
-      "ERROR_MESSAGE": "Không thể kết nối với Máy chủ Woot, Vui lòng thử lại sau"
+      "SUCCESS_MESSAGE": "Đổi mật khẩu thành công.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "CAPTCHA": {
       "ERROR": "Đã hết hạn xác minh. Vui lòng giải mã captcha một lần nữa."
diff --git a/app/javascript/dashboard/i18n/locale/vi/signup.json b/app/javascript/dashboard/i18n/locale/vi/signup.json
index de38793bb..0c1f2fdb6 100644
--- a/app/javascript/dashboard/i18n/locale/vi/signup.json
+++ b/app/javascript/dashboard/i18n/locale/vi/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Tên công ty",
-      "PLACEHOLDER": "Nhập tên công ty của bạn. ví dụ: Doanh nghiệp Wayne",
-      "ERROR": "Tên công ty quá ngắn"
+      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
+      "ERROR": "Tên công ty quá ngắn."
     },
     "FULL_NAME": {
       "LABEL": "Tên đầy đủ",
-      "PLACEHOLDER": "Nhập tên đầy đủ của bạn. ví dụ: Wayne Enterprises",
-      "ERROR": "Tên đầy đủ quá ngắn"
+      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
+      "ERROR": "Tên đầy đủ quá ngắn."
     },
     "EMAIL": {
       "LABEL": "Email công việc",
-      "PLACEHOLDER": "Nhập email công việc của bạn. ví dụ: bruce@wayne.enterprises",
-      "ERROR": "Vui lòng nhập địa chỉ email công việc hợp lệ"
+      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
+      "ERROR": "Vui lòng nhập địa chỉ email công việc hợp lệ."
     },
     "PASSWORD": {
       "LABEL": "Mật khẩu",
       "PLACEHOLDER": "Mật khẩu",
-      "ERROR": "Mật khẩu quá ngắn",
-      "IS_INVALID_PASSWORD": "Mật khẩu phải chứa ít nhất 1 chữ hoa, 1 chữ thường, 1 số và 1 ký tự đặc biệt"
+      "ERROR": "Mật khẩu quá ngắn.",
+      "IS_INVALID_PASSWORD": "Mật khẩu phải chứa ít nhất 1 chữ hoa, 1 chữ thường, 1 số và 1 ký tự đặc biệt."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Xác nhận mật khẩu",
-      "PLACEHOLDER": "Xác nhận mật khẩu",
-      "ERROR": "Mật khẩu không khớp"
+      "LABEL": "Confirm password",
+      "PLACEHOLDER": "Confirm password",
+      "ERROR": "Mật khẩu không khớp."
     },
     "API": {
       "SUCCESS_MESSAGE": "Đăng Kí Thành Công",
-      "ERROR_MESSAGE": "Không thể kết nối với Máy chủ Woot, Vui lòng thử lại sau."
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Create account",
     "HAVE_AN_ACCOUNT": "Đã có tài khoản?"
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/advancedFilters.json b/app/javascript/dashboard/i18n/locale/zh_CN/advancedFilters.json
index 9c94990fb..e1e750917 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/advancedFilters.json
@@ -38,6 +38,7 @@
       "CAMPAIGN_NAME": "活动名称",
       "LABELS": "标签",
       "BROWSER_LANGUAGE": "浏览器语言",
+      "PRIORITY": "Priority",
       "COUNTRY_NAME": "国家",
       "REFERER_LINK": "引用链接",
       "CUSTOM_ATTRIBUTE_LIST": "列表",
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/agentBots.json b/app/javascript/dashboard/i18n/locale/zh_CN/agentBots.json
index 5f16f8222..7aa759983 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/agentBots.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/agentBots.json
@@ -12,7 +12,7 @@
       },
       "DESCRIPTION": {
         "LABEL": "Bot Description",
-        "PLACEHOLDER": "What does this bot do?"
+        "PLACEHOLDER": "这个机器人的用途是？"
       },
       "BOT_CONFIG": {
         "ERROR": "Please enter your CSML bot configuration above",
@@ -21,7 +21,7 @@
       "SUBMIT": "Validate and save"
     },
     "BOT_CONFIGURATION": {
-      "TITLE": "Select an agent bot",
+      "TITLE": "选择一个代理机器人",
       "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.",
       "SUBMIT": "更新",
       "DISCONNECT": "Disconnect Bot",
@@ -35,7 +35,7 @@
       "TITLE": "Configure new bot",
       "CANCEL_BUTTON_TEXT": "取消",
       "API": {
-        "SUCCESS_MESSAGE": "Bot added successfully",
+        "SUCCESS_MESSAGE": "机器人添加成功",
         "ERROR_MESSAGE": "Could not add bot, Please try again later"
       }
     },
@@ -58,7 +58,7 @@
     "EDIT": {
       "BUTTON_TEXT": "编辑",
       "LOADING": "Fetching Bots...",
-      "TITLE": "Edit Bot",
+      "TITLE": "配置机器人",
       "CANCEL_BUTTON_TEXT": "取消",
       "API": {
         "SUCCESS_MESSAGE": "Bot updated successfully",
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/agentMgmt.json b/app/javascript/dashboard/i18n/locale/zh_CN/agentMgmt.json
index 39d65f29f..3f790c249 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/agentMgmt.json
@@ -110,7 +110,8 @@
         },
         "PLACEHOLDER": {
           "AGENT": "搜索客服代表",
-          "TEAM": "查找团队"
+          "TEAM": "查找团队",
+          "INPUT": "Search for agents"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/conversation.json b/app/javascript/dashboard/i18n/locale/zh_CN/conversation.json
index fafde9bd9..311971f10 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/conversation.json
@@ -37,6 +37,7 @@
     "UNKNOWN_FILE_TYPE": "未知文件",
     "SAVE_CONTACT": "Save",
     "UPLOADING_ATTACHMENTS": "正在上传附件...",
+    "REPLIED_TO_STORY": "Replied to your story",
     "SUCCESS_DELETE_MESSAGE": "已成功删除消息",
     "FAIL_DELETE_MESSSAGE": "无法删除消息，请重试！",
     "NO_RESPONSE": "No response",
@@ -66,6 +67,23 @@
         "NEXT_WEEK": "下周"
       }
     },
+    "PRIORITY": {
+      "TITLE": "Priority",
+      "OPTIONS": {
+        "NONE": "啥都没有",
+        "URGENT": "Urgent",
+        "HIGH": "High",
+        "MEDIUM": "Medium",
+        "LOW": "Low"
+      },
+      "CHANGE_PRIORITY": {
+        "SELECT_PLACEHOLDER": "啥都没有",
+        "INPUT_PLACEHOLDER": "Select priority",
+        "NO_RESULTS": "No results found",
+        "SUCCESSFUL": "Changed priority of conversation id %{conversationId} to %{priority}",
+        "FAILED": "Couldn't change priority. Please try again."
+      }
+    },
     "CARD_CONTEXT_MENU": {
       "PENDING": "标记为待处理",
       "RESOLVED": "标记为已解决",
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json b/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json
index f4555d7ee..867bacacc 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json
@@ -101,6 +101,7 @@
       "REPORTS": "报告",
       "CONVERSATION": "会话",
       "CHANGE_ASSIGNEE": "更改分配",
+      "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "更改团队",
       "ADD_LABEL": "为对话添加标签",
       "REMOVE_LABEL": "从对话移除标签",
@@ -126,6 +127,7 @@
       "GO_TO_NOTIFICATIONS": "转到通知",
       "ADD_LABELS_TO_CONVERSATION": "为对话添加标签",
       "ASSIGN_AN_AGENT": "分配一位客服代表",
+      "ASSIGN_PRIORITY": "Assign priority",
       "ASSIGN_A_TEAM": "分配一个团队",
       "MUTE_CONVERSATION": "静音对话",
       "UNMUTE_CONVERSATION": "取消静音对话",
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json
index a16d4c8f6..99bfeb01d 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json
@@ -482,6 +482,13 @@
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
+    "HELP_CENTER": {
+      "LABEL": "Help Center",
+      "PLACEHOLDER": "Select Help Center",
+      "SELECT_PLACEHOLDER": "Select Help Center",
+      "REMOVE": "Remove Help Center",
+      "SUB_TEXT": "Attach a Help Center with the inbox"
+    },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
       "MAX_ASSIGNMENT_LIMIT_RANGE_ERROR": "Please enter a value greater than 0",
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/integrations.json b/app/javascript/dashboard/i18n/locale/zh_CN/integrations.json
index 6bc7896d0..9a2563f1d 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/integrations.json
@@ -85,6 +85,23 @@
       "JOIN_ERROR": "There was an error joining the call, please try again",
       "CREATE_ERROR": "There was an error creating a meeting link, please try again"
     },
+    "OPEN_AI": {
+      "TITLE": "Improve With AI",
+      "SUBTITLE": "An improved reply will be generated using AI, based on your current draft.",
+      "TONE": {
+        "TITLE": "Tone",
+        "OPTIONS": {
+          "PROFESSIONAL": "Professional",
+          "FRIENDLY": "Friendly"
+        }
+      },
+      "BUTTONS": {
+        "GENERATE": "Generate",
+        "GENERATING": "Generating...",
+        "CANCEL": "取消"
+      },
+      "GENERATE_ERROR": "There was an error processing the content, please try again"
+    },
     "DELETE": {
       "BUTTON_TEXT": "删除",
       "API": {
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/login.json b/app/javascript/dashboard/i18n/locale/zh_CN/login.json
index 29e45e169..1c06ff79a 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/login.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/login.json
@@ -3,16 +3,16 @@
     "TITLE": "登录到Chatwoot",
     "EMAIL": {
       "LABEL": "Email",
-      "PLACEHOLDER": "电子邮址 例如：somone@example.com"
+      "PLACEHOLDER": "example@companyname.com"
     },
     "PASSWORD": {
       "LABEL": "密码",
       "PLACEHOLDER": "密码"
     },
     "API": {
-      "SUCCESS_MESSAGE": "登录成功",
-      "ERROR_MESSAGE": "无法连接服务器，请稍后再试",
-      "UNAUTH": "用户名/密码不正确。请重试"
+      "SUCCESS_MESSAGE": "Login successful",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again.",
+      "UNAUTH": "Username or password is incorrect. Please try again."
     },
     "OAUTH": {
       "GOOGLE_LOGIN": "Login with Google",
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/resetPassword.json b/app/javascript/dashboard/i18n/locale/zh_CN/resetPassword.json
index 25e909ab0..72bca96f4 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/resetPassword.json
@@ -3,12 +3,12 @@
     "TITLE": "重置密码",
     "EMAIL": {
       "LABEL": "Email",
-      "PLACEHOLDER": "请输入您的电子邮件",
-      "ERROR": "请输入一个有效的电子邮件"
+      "PLACEHOLDER": "请输入 Email 地址.",
+      "ERROR": "请输入一个有效的电子邮件."
     },
     "API": {
-      "SUCCESS_MESSAGE": "密码重置链接已发送到您的电子邮件",
-      "ERROR_MESSAGE": "无法连接服务器，请稍后再试"
+      "SUCCESS_MESSAGE": "密码重置链接已发送到您的电子邮件.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "提交"
   }
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/search.json b/app/javascript/dashboard/i18n/locale/zh_CN/search.json
index 0ca464482..bc2db4e70 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/search.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/search.json
@@ -14,8 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
-    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
+    "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "机器人",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/setNewPassword.json b/app/javascript/dashboard/i18n/locale/zh_CN/setNewPassword.json
index d479388e7..6f5d6d6c5 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/setNewPassword.json
@@ -1,19 +1,19 @@
 {
   "SET_NEW_PASSWORD": {
-    "TITLE": "设置新密码",
+    "TITLE": "Set new password",
     "PASSWORD": {
       "LABEL": "密码",
       "PLACEHOLDER": "密码",
-      "ERROR": "密码太短了"
+      "ERROR": "密码太短了."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "请确认密码",
+      "LABEL": "Confirm password",
       "PLACEHOLDER": "确认密码",
-      "ERROR": "密码不匹配"
+      "ERROR": "密码不匹配."
     },
     "API": {
-      "SUCCESS_MESSAGE": "成功修改密码",
-      "ERROR_MESSAGE": "无法连接服务器，请稍后再试"
+      "SUCCESS_MESSAGE": "成功修改密码.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "CAPTCHA": {
       "ERROR": "Verification expired. Please solve captcha again."
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/signup.json b/app/javascript/dashboard/i18n/locale/zh_CN/signup.json
index 29656868e..828faebf6 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/signup.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Company name",
-      "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
-      "ERROR": "Company name is too short"
+      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
+      "ERROR": "Company name is too short."
     },
     "FULL_NAME": {
       "LABEL": "名字",
-      "PLACEHOLDER": "输入您的全名，例如 Bruce Wayne",
-      "ERROR": "帐号名称太短了"
+      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
+      "ERROR": "帐号名称太短了."
     },
     "EMAIL": {
       "LABEL": "工作邮箱",
-      "PLACEHOLDER": "请输入您的工作电子邮件地址，例如 bruce@wayne.enterprises",
-      "ERROR": "Please enter a valid work email address"
+      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
+      "ERROR": "Please enter a valid work email address."
     },
     "PASSWORD": {
       "LABEL": "密码",
       "PLACEHOLDER": "密码",
-      "ERROR": "密码太短了",
-      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
+      "ERROR": "密码太短了.",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "请确认密码",
-      "PLACEHOLDER": "请确认密码",
-      "ERROR": "密码不匹配"
+      "LABEL": "Confirm password",
+      "PLACEHOLDER": "Confirm password",
+      "ERROR": "密码不匹配."
     },
     "API": {
       "SUCCESS_MESSAGE": "注册成功",
-      "ERROR_MESSAGE": "无法连接服务器，请稍后再试"
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Create account",
     "HAVE_AN_ACCOUNT": "已经有帐号？"
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/advancedFilters.json b/app/javascript/dashboard/i18n/locale/zh_TW/advancedFilters.json
index b510ad238..2364bbb7c 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/advancedFilters.json
@@ -38,6 +38,7 @@
       "CAMPAIGN_NAME": "Campaign Name",
       "LABELS": "標籤",
       "BROWSER_LANGUAGE": "瀏覽器語言",
+      "PRIORITY": "Priority",
       "COUNTRY_NAME": "國家名稱",
       "REFERER_LINK": "推薦人連結",
       "CUSTOM_ATTRIBUTE_LIST": "列表",
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/agentBots.json b/app/javascript/dashboard/i18n/locale/zh_TW/agentBots.json
index 6d426de09..e80af0899 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/agentBots.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/agentBots.json
@@ -42,7 +42,7 @@
     "LIST": {
       "404": "查無機器人，你可以點擊「設定新的機器人」按鈕設定一個機器人",
       "LOADING": "正在取得機器人",
-      "TYPE": "Bot Type"
+      "TYPE": "機器人類型"
     },
     "DELETE": {
       "BUTTON_TEXT": "刪除",
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/agentMgmt.json b/app/javascript/dashboard/i18n/locale/zh_TW/agentMgmt.json
index d32b0e9a8..0fe30a7a5 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/agentMgmt.json
@@ -110,7 +110,8 @@
         },
         "PLACEHOLDER": {
           "AGENT": "搜尋客服",
-          "TEAM": "搜尋團隊"
+          "TEAM": "搜尋團隊",
+          "INPUT": "Search for agents"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/contact.json b/app/javascript/dashboard/i18n/locale/zh_TW/contact.json
index ae407ad05..0f6ed9a79 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/contact.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/contact.json
@@ -136,7 +136,7 @@
       "COUNTRY": {
         "PLACEHOLDER": "Enter the country name",
         "LABEL": "國家名稱",
-        "SELECT_PLACEHOLDER": "Select",
+        "SELECT_PLACEHOLDER": "選擇",
         "REMOVE": "刪除",
         "SELECT_COUNTRY": "Select Country"
       },
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/conversation.json b/app/javascript/dashboard/i18n/locale/zh_TW/conversation.json
index 3d1158182..e7006a25a 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/conversation.json
@@ -37,6 +37,7 @@
     "UNKNOWN_FILE_TYPE": "Unknown File",
     "SAVE_CONTACT": "Save",
     "UPLOADING_ATTACHMENTS": "正在上傳附件...",
+    "REPLIED_TO_STORY": "Replied to your story",
     "SUCCESS_DELETE_MESSAGE": "已成功刪除訊息",
     "FAIL_DELETE_MESSSAGE": "無法刪除訊息！請再試一次",
     "NO_RESPONSE": "無回應",
@@ -66,11 +67,28 @@
         "NEXT_WEEK": "下週"
       }
     },
+    "PRIORITY": {
+      "TITLE": "Priority",
+      "OPTIONS": {
+        "NONE": "無",
+        "URGENT": "Urgent",
+        "HIGH": "High",
+        "MEDIUM": "Medium",
+        "LOW": "Low"
+      },
+      "CHANGE_PRIORITY": {
+        "SELECT_PLACEHOLDER": "無",
+        "INPUT_PLACEHOLDER": "Select priority",
+        "NO_RESULTS": "No results found",
+        "SUCCESSFUL": "Changed priority of conversation id %{conversationId} to %{priority}",
+        "FAILED": "Couldn't change priority. Please try again."
+      }
+    },
     "CARD_CONTEXT_MENU": {
       "PENDING": "標記為待處理",
       "RESOLVED": "Mark as resolved",
       "MARK_AS_UNREAD": "Mark as unread",
-      "REOPEN": "Reopen conversation",
+      "REOPEN": "重新開啟對話",
       "SNOOZE": {
         "TITLE": "Snooze",
         "NEXT_REPLY": "Until next reply",
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/generalSettings.json b/app/javascript/dashboard/i18n/locale/zh_TW/generalSettings.json
index 956892219..bb6a05759 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/generalSettings.json
@@ -55,17 +55,17 @@
       "ENTER_TO_SELECT": "按下 enter 以選擇",
       "ENTER_TO_REMOVE": "按下 enter 以移除",
       "SELECT_ONE": "選擇其中一項",
-      "SELECT": "Select"
+      "SELECT": "選擇"
     }
   },
   "NOTIFICATIONS_PAGE": {
     "HEADER": "通知",
     "MARK_ALL_DONE": "全部標記完成",
-    "DELETE_TITLE": "deleted",
+    "DELETE_TITLE": "刪除",
     "UNREAD_NOTIFICATION": {
-      "TITLE": "Unread Notifications",
-      "ALL_NOTIFICATIONS": "View all notifications",
-      "LOADING_UNREAD_MESSAGE": "Loading unread notifications...",
+      "TITLE": "未讀通知",
+      "ALL_NOTIFICATIONS": "查看所有通知",
+      "LOADING_UNREAD_MESSAGE": "正在讀取未讀通知",
       "EMPTY_MESSAGE": "You have no unread notifications"
     },
     "LIST": {
@@ -101,6 +101,7 @@
       "REPORTS": "報表",
       "CONVERSATION": "對話",
       "CHANGE_ASSIGNEE": "Change Assignee",
+      "CHANGE_PRIORITY": "Change Priority",
       "CHANGE_TEAM": "Change Team",
       "ADD_LABEL": "Add label to the conversation",
       "REMOVE_LABEL": "Remove label from the conversation",
@@ -125,13 +126,14 @@
       "GO_TO_SETTINGS_PROFILE": "Go to Profile Settings",
       "GO_TO_NOTIFICATIONS": "Go to Notifications",
       "ADD_LABELS_TO_CONVERSATION": "Add label to the conversation",
-      "ASSIGN_AN_AGENT": "Assign an agent",
-      "ASSIGN_A_TEAM": "Assign a team",
-      "MUTE_CONVERSATION": "Mute conversation",
-      "UNMUTE_CONVERSATION": "Unmute conversation",
+      "ASSIGN_AN_AGENT": "指派客服",
+      "ASSIGN_PRIORITY": "Assign priority",
+      "ASSIGN_A_TEAM": "指派團隊",
+      "MUTE_CONVERSATION": "將對話靜音",
+      "UNMUTE_CONVERSATION": "將對話解除靜音",
       "REMOVE_LABEL_FROM_CONVERSATION": "Remove label from the conversation",
-      "REOPEN_CONVERSATION": "Reopen conversation",
-      "RESOLVE_CONVERSATION": "Resolve conversation",
+      "REOPEN_CONVERSATION": "重新開啟對話",
+      "RESOLVE_CONVERSATION": "解決對話",
       "SEND_TRANSCRIPT": "Send an email transcript",
       "SNOOZE_CONVERSATION": "Snooze Conversation",
       "UNTIL_NEXT_REPLY": "Until next reply",
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json
index ff34b8695..0735e5584 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json
@@ -146,7 +146,7 @@
         }
       },
       "SMS": {
-        "TITLE": "SMS Channel",
+        "TITLE": "SMS 頻道",
         "DESC": "Start supporting your customers via SMS.",
         "PROVIDERS": {
           "LABEL": "API Provider",
@@ -324,11 +324,11 @@
         },
         "SUBMIT_BUTTON": "建立 Telegram Channel",
         "API": {
-          "ERROR_MESSAGE": "We were not able to save the telegram channel"
+          "ERROR_MESSAGE": "我們無法儲存 telegram 頻道"
         }
       },
       "AUTH": {
-        "TITLE": "Choose a channel",
+        "TITLE": "選擇一個頻道",
         "DESC": "Chatwoot supports live-chat widgets, Facebook Messenger, Twitter profiles, WhatsApp, Emails, etc., as channels. If you want to build a custom channel, you can create it using the API channel. To get started, choose one of the channels below."
       },
       "AGENTS": {
@@ -346,13 +346,13 @@
         "DESC": "您已成功地將您的 Facebook 頁面與 Chatwoot 整合。下次客户發送消息到您的頁面時，對話將自動出現在收件匣中。<br>我們還為您提供了一個小元件脚本，您可以輕鬆地建立到您的網站。 在您的網站上登入後， 客户可以在没有任何外部工具幫助的情况下，從您的網站向您發送消息，對話將會在這裡出現在 Chatwoot 上。<br>酷，對吧？好吧，我們很肯定 :)"
       },
       "EMAIL_PROVIDER": {
-        "TITLE": "Select your email provider",
+        "TITLE": "選擇你的電子郵件供應商",
         "DESCRIPTION": "Select an email provider from the list below. If you don't see your email provider in the list, you can select the other provider option and provide the IMAP and SMTP Credentials."
       },
       "MICROSOFT": {
         "TITLE": "Microsoft Email",
         "DESCRIPTION": "Click on the Sign in with Microsoft button to get started. You will redirected to the email sign in page. Once you accept the requested permissions, you would be redirected back to the inbox creation step.",
-        "EMAIL_PLACEHOLDER": "Enter email address",
+        "EMAIL_PLACEHOLDER": "輸入電子信箱",
         "HELP": "To add your Microsoft account as a channel, you need to authenticate your Microsoft account by clicking on 'Sign in with Microsoft' ",
         "ERROR_MESSAGE": "There was an error connecting to Microsoft, please try again"
       }
@@ -404,7 +404,7 @@
         "DISABLED": "已停用"
       },
       "ENABLE_HMAC": {
-        "LABEL": "Enable"
+        "LABEL": "啟用"
       }
     },
     "DELETE": {
@@ -413,7 +413,7 @@
       "CONFIRM": {
         "TITLE": "確認刪除",
         "MESSAGE": "您確定要刪除吗？ ",
-        "PLACE_HOLDER": "Please type {inboxName} to confirm",
+        "PLACE_HOLDER": "請輸入 {inboxName} 以確認",
         "YES": "是，刪除 ",
         "NO": "不，保留 "
       },
@@ -432,7 +432,7 @@
       "PRE_CHAT_FORM": "Pre Chat Form",
       "BUSINESS_HOURS": "服務時間",
       "WIDGET_BUILDER": "Widget Builder",
-      "BOT_CONFIGURATION": "Bot Configuration"
+      "BOT_CONFIGURATION": "增機器人設定"
     },
     "SETTINGS": "設定",
     "FEATURES": {
@@ -475,13 +475,20 @@
       "WHATSAPP_SECTION_SUBHEADER": "This API Key is used for the integration with the WhatsApp APIs.",
       "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the updated key to be used for the integration with the WhatsApp APIs.",
       "WHATSAPP_SECTION_TITLE": "API Key",
-      "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
-      "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
+      "WHATSAPP_SECTION_UPDATE_TITLE": "更新 API Key",
+      "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "在此輸入新的 API Key",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "更新",
       "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
+    "HELP_CENTER": {
+      "LABEL": "Help Center",
+      "PLACEHOLDER": "Select Help Center",
+      "SELECT_PLACEHOLDER": "Select Help Center",
+      "REMOVE": "Remove Help Center",
+      "SUB_TEXT": "Attach a Help Center with the inbox"
+    },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Auto assignment limit",
       "MAX_ASSIGNMENT_LIMIT_RANGE_ERROR": "Please enter a value greater than 0",
@@ -565,7 +572,7 @@
         "LABEL": "密碼",
         "PLACE_HOLDER": "密碼"
       },
-      "ENABLE_SSL": "Enable SSL"
+      "ENABLE_SSL": "啟用 SSL"
     },
     "MICROSOFT": {
       "TITLE": "Microsoft",
@@ -573,8 +580,8 @@
     },
     "SMTP": {
       "TITLE": "SMTP",
-      "SUBTITLE": "Set your SMTP details",
-      "UPDATE": "Update SMTP settings",
+      "SUBTITLE": "設定你的 SMTP",
+      "UPDATE": "更新 SMTP 設定",
       "TOGGLE_AVAILABILITY": "Enable SMTP configuration for this inbox",
       "TOGGLE_HELP": "Enabling SMTP will help the user to send email",
       "EDIT": {
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/integrations.json b/app/javascript/dashboard/i18n/locale/zh_TW/integrations.json
index 4c717e66e..530d09bdc 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/integrations.json
@@ -85,6 +85,23 @@
       "JOIN_ERROR": "There was an error joining the call, please try again",
       "CREATE_ERROR": "There was an error creating a meeting link, please try again"
     },
+    "OPEN_AI": {
+      "TITLE": "Improve With AI",
+      "SUBTITLE": "An improved reply will be generated using AI, based on your current draft.",
+      "TONE": {
+        "TITLE": "Tone",
+        "OPTIONS": {
+          "PROFESSIONAL": "Professional",
+          "FRIENDLY": "Friendly"
+        }
+      },
+      "BUTTONS": {
+        "GENERATE": "Generate",
+        "GENERATING": "Generating...",
+        "CANCEL": "取消"
+      },
+      "GENERATE_ERROR": "There was an error processing the content, please try again"
+    },
     "DELETE": {
       "BUTTON_TEXT": "刪除",
       "API": {
@@ -106,8 +123,8 @@
           "姓名",
           "Endpoint"
         ],
-        "EDIT_TOOLTIP": "Edit app",
-        "DELETE_TOOLTIP": "Delete app"
+        "EDIT_TOOLTIP": "編輯應用程式",
+        "DELETE_TOOLTIP": "刪除應用程式"
       },
       "FORM": {
         "TITLE_LABEL": "姓名",
@@ -129,13 +146,13 @@
         "FORM_SUBMIT": "更新",
         "FORM_CANCEL": "取消",
         "API_SUCCESS": "Dashboard app updated successfully",
-        "API_ERROR": "We couldn't update the app. Please try again later"
+        "API_ERROR": "無法更新應用程式，請稍後再試。"
       },
       "DELETE": {
-        "CONFIRM_YES": "Yes, delete it",
-        "CONFIRM_NO": "No, keep it",
+        "CONFIRM_YES": "是，刪除",
+        "CONFIRM_NO": "否，保留",
         "TITLE": "刪除確認",
-        "MESSAGE": "Are you sure to delete the app - %{appName}?",
+        "MESSAGE": "你確定要刪除應用程式 %{appName} 嗎？",
         "API_SUCCESS": "Dashboard app deleted successfully",
         "API_ERROR": "We couldn't delete the app. Please try again later"
       }
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/login.json b/app/javascript/dashboard/i18n/locale/zh_TW/login.json
index 30038bb33..c4a9ad26a 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/login.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/login.json
@@ -3,16 +3,16 @@
     "TITLE": "登入到 Chatwoot",
     "EMAIL": {
       "LABEL": "Email",
-      "PLACEHOLDER": "電子信箱 例如：somone@example.com"
+      "PLACEHOLDER": "example@companyname.com"
     },
     "PASSWORD": {
       "LABEL": "密碼",
       "PLACEHOLDER": "密碼"
     },
     "API": {
-      "SUCCESS_MESSAGE": "登入成功",
-      "ERROR_MESSAGE": "無法連接伺服器，請稍後再試",
-      "UNAUTH": "用户名/密碼不正確。請重試"
+      "SUCCESS_MESSAGE": "Login successful",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again.",
+      "UNAUTH": "Username or password is incorrect. Please try again."
     },
     "OAUTH": {
       "GOOGLE_LOGIN": "Login with Google",
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/resetPassword.json b/app/javascript/dashboard/i18n/locale/zh_TW/resetPassword.json
index 5a301dde3..9df177265 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/resetPassword.json
@@ -1,14 +1,14 @@
 {
   "RESET_PASSWORD": {
-    "TITLE": "重置密碼",
+    "TITLE": "Reset password",
     "EMAIL": {
       "LABEL": "Email",
-      "PLACEHOLDER": "請輸入您的電子信箱",
-      "ERROR": "請輸入一個有效的電子信箱"
+      "PLACEHOLDER": "請輸入您的電子信箱.",
+      "ERROR": "請輸入一個有效的電子信箱."
     },
     "API": {
-      "SUCCESS_MESSAGE": "密碼重置連結已發送到您的電子信箱",
-      "ERROR_MESSAGE": "無法連接伺服器，請稍後再試"
+      "SUCCESS_MESSAGE": "密碼重置連結已發送到您的電子信箱.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "送出"
   }
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/search.json b/app/javascript/dashboard/i18n/locale/zh_TW/search.json
index 5c9371aa9..fe5bb472c 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/search.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/search.json
@@ -14,8 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "查無 %{query} 條件的結果",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "根據訊息、聯絡人或是對話搜尋",
-    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
+    "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "機器人",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/setNewPassword.json b/app/javascript/dashboard/i18n/locale/zh_TW/setNewPassword.json
index 86743a16d..2707523dd 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/setNewPassword.json
@@ -1,19 +1,19 @@
 {
   "SET_NEW_PASSWORD": {
-    "TITLE": "設定新密碼",
+    "TITLE": "Set new password",
     "PASSWORD": {
       "LABEL": "密碼",
       "PLACEHOLDER": "密碼",
-      "ERROR": "密碼太短了"
+      "ERROR": "密碼太短了."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "請確認密碼",
+      "LABEL": "Confirm password",
       "PLACEHOLDER": "確認密碼",
-      "ERROR": "密碼不匹配"
+      "ERROR": "密碼不匹配."
     },
     "API": {
-      "SUCCESS_MESSAGE": "成功修改密碼",
-      "ERROR_MESSAGE": "無法連接伺服器，請稍後再試"
+      "SUCCESS_MESSAGE": "成功修改密碼.",
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "CAPTCHA": {
       "ERROR": "Verification expired. Please solve captcha again."
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/settings.json b/app/javascript/dashboard/i18n/locale/zh_TW/settings.json
index d1127e9e5..e1454cfd9 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/settings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/settings.json
@@ -20,9 +20,9 @@
         "NOTE": "您的電子信箱地址是您的身份並用於登入。"
       },
       "SEND_MESSAGE": {
-        "TITLE": "Hotkey to send messages",
+        "TITLE": "傳送訊息熱鍵",
         "NOTE": "You can select a hotkey (either Enter or Cmd/Ctrl+Enter) based on your preference of writing.",
-        "UPDATE_SUCCESS": "Your settings have been updated successfully",
+        "UPDATE_SUCCESS": "你的設定已經成功更新",
         "CARD": {
           "ENTER_KEY": {
             "HEADING": "Enter (↵)",
@@ -108,7 +108,7 @@
       "DISPLAY_NAME": {
         "LABEL": "顯示名稱",
         "ERROR": "請輸入一個有效的顯示名稱",
-        "PLACEHOLDER": "Please enter a display name, this would be displayed in conversations"
+        "PLACEHOLDER": "請輸入一個名字，這將會在對話中顯示"
       },
       "AVAILABILITY": {
         "LABEL": "有效的",
@@ -155,7 +155,7 @@
   "APP_GLOBAL": {
     "TRIAL_MESSAGE": "剩餘試用期天數",
     "TRAIL_BUTTON": "立即購買",
-    "DELETED_USER": "Deleted User",
+    "DELETED_USER": "刪除使用者",
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Account Suspended",
       "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
@@ -168,8 +168,8 @@
       "COPY_SUCCESSFUL": "Copied to clipboard"
     },
     "SHOW_MORE_BLOCK": {
-      "SHOW_MORE": "Show More",
-      "SHOW_LESS": "Show Less"
+      "SHOW_MORE": "顯示更多",
+      "SHOW_LESS": "顯示更少"
     },
     "FILE_BUBBLE": {
       "DOWNLOAD": "下載",
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/signup.json b/app/javascript/dashboard/i18n/locale/zh_TW/signup.json
index b8178336a..1ff33fb93 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/signup.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Company name",
-      "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
-      "ERROR": "Company name is too short"
+      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
+      "ERROR": "Company name is too short."
     },
     "FULL_NAME": {
       "LABEL": "姓名",
-      "PLACEHOLDER": "請輸入您的完整姓名，如：王大明",
-      "ERROR": "姓名太短了"
+      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
+      "ERROR": "姓名太短了."
     },
     "EMAIL": {
       "LABEL": "工作電子郵件",
-      "PLACEHOLDER": "輸入你的工作 Email。例如： bruce@wayne.enterprises",
-      "ERROR": "Please enter a valid work email address"
+      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
+      "ERROR": "Please enter a valid work email address."
     },
     "PASSWORD": {
       "LABEL": "密碼",
       "PLACEHOLDER": "密碼",
-      "ERROR": "密碼太短了",
-      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
+      "ERROR": "密碼太短了.",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "請確認密碼",
-      "PLACEHOLDER": "請確認密碼",
-      "ERROR": "密碼不匹配"
+      "LABEL": "Confirm password",
+      "PLACEHOLDER": "Confirm password",
+      "ERROR": "密碼不匹配."
     },
     "API": {
       "SUCCESS_MESSAGE": "註冊成功",
-      "ERROR_MESSAGE": "無法連接伺服器，請稍後再試"
+      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
     },
     "SUBMIT": "Create account",
     "HAVE_AN_ACCOUNT": "已經有帳號了嗎？"
diff --git a/app/javascript/widget/i18n/locale/lt.json b/app/javascript/widget/i18n/locale/lt.json
index 0c286263d..f5201ae61 100644
--- a/app/javascript/widget/i18n/locale/lt.json
+++ b/app/javascript/widget/i18n/locale/lt.json
@@ -1,11 +1,11 @@
 {
   "COMPONENTS": {
     "FILE_BUBBLE": {
-      "DOWNLOAD": "Download",
+      "DOWNLOAD": "Parsisiųsti",
       "UPLOADING": "Uploading..."
     },
     "FORM_BUBBLE": {
-      "SUBMIT": "Submit"
+      "SUBMIT": "Pateikti"
     },
     "MESSAGE_BUBBLE": {
       "RETRY": "Send message again",
@@ -27,9 +27,9 @@
   "START_NEW_CONVERSATION": "Start a new conversation",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "See new messages",
-    "CLOSE_MESSAGES_BUTTON": "Close",
-    "COMPANY_FROM": "from",
-    "BOT": "Bot"
+    "CLOSE_MESSAGES_BUTTON": "Uždaryti",
+    "COMPANY_FROM": "nuo",
+    "BOT": "Botas"
   },
   "BUBBLE": {
     "LABEL": "Chat with us"
@@ -37,29 +37,29 @@
   "POWERED_BY": "Powered by Chatwoot",
   "EMAIL_PLACEHOLDER": "Please enter your email",
   "CHAT_PLACEHOLDER": "Type your message",
-  "TODAY": "Today",
+  "TODAY": "Šiandien",
   "YESTERDAY": "Yesterday",
   "PRE_CHAT_FORM": {
     "FIELDS": {
       "FULL_NAME": {
-        "LABEL": "Full Name",
+        "LABEL": "Pilnas vardas",
         "PLACEHOLDER": "Please enter your full name",
-        "REQUIRED_ERROR": "Full Name is required"
+        "REQUIRED_ERROR": "Yra reikalingas pilnas vardas"
       },
       "EMAIL_ADDRESS": {
-        "LABEL": "Email Address",
-        "PLACEHOLDER": "Please enter your email address",
+        "LABEL": "El. pašto adresas",
+        "PLACEHOLDER": "Prašau įveskite jūsų el. pašto adresą",
         "REQUIRED_ERROR": "Email Address is required",
         "VALID_ERROR": "Please enter a valid email address"
       },
       "PHONE_NUMBER": {
         "LABEL": "Phone Number",
-        "PLACEHOLDER": "Please enter your phone number",
+        "PLACEHOLDER": "Prašau įveskite jūsų telefono numerį",
         "REQUIRED_ERROR": "Phone Number is required",
         "VALID_ERROR": "Phone number should be of E.164 format eg: +1415555555"
       },
       "MESSAGE": {
-        "LABEL": "Message",
+        "LABEL": "Žinutė",
         "PLACEHOLDER": "Please enter your message",
         "ERROR": "Message too short"
       }
@@ -81,7 +81,7 @@
   "CSAT": {
     "TITLE": "Rate your conversation",
     "SUBMITTED_TITLE": "Thank you for submitting the rating",
-    "PLACEHOLDER": "Tell us more..."
+    "PLACEHOLDER": "Papasakokit detaliau..."
   },
   "EMAIL_TRANSCRIPT": {
     "BUTTON_TEXT": "Request a conversation transcript",
diff --git a/app/javascript/widget/i18n/locale/ro.json b/app/javascript/widget/i18n/locale/ro.json
index 4e10e73f2..a4ac4008d 100644
--- a/app/javascript/widget/i18n/locale/ro.json
+++ b/app/javascript/widget/i18n/locale/ro.json
@@ -66,7 +66,7 @@
     },
     "CAMPAIGN_HEADER": "Vă rugăm să furnizați numele și e-mailul înainte de a începe conversația",
     "IS_REQUIRED": "este obligatoriu",
-    "REQUIRED": "Required"
+    "REQUIRED": "Necesar"
   },
   "FILE_SIZE_LIMIT": "Fisierul depaseste limita de {MAXIMUM_FILE_UPLOAD_SIZE} atasamente",
   "CHAT_FORM": {
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 3ebedceb5..0369a3f6c 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -113,6 +113,10 @@ ar:
         snoozed: "تم تأجيل المحادثة بواسطة %{user_name}"
         auto_resolved: "تم وضع علامة على المحادثة كمحلولة من قبل بالنظام بسبب %{duration} أيام من عدم النشاط"
         system_auto_open: System reopened the conversation due to a new incoming message.
+      priority:
+        added: '%{user_name} set the priority to %{new_priority}'
+        updated: '%{user_name} changed the priority from %{old_priority} to %{new_priority}'
+        removed: '%{user_name} removed the priority'
       assignee:
         self_assigned: "%{user_name} تم تعيينه تلقائياً لهذه المحادثة"
         assigned: "تم إسنادها إلى %{assignee_name} بواسطة %{user_name}"
@@ -167,6 +171,9 @@ ar:
     google_translate:
       name: "Google Translate"
       description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
+    openai:
+      name: "OpenAI"
+      description: "Integrate powerful AI features into Chatwoot by leveraging the GPT models from OpenAI."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 239f8b8c9..9d83a485f 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -113,6 +113,10 @@ bg:
         snoozed: "Conversation was snoozed by %{user_name}"
         auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
         system_auto_open: System reopened the conversation due to a new incoming message.
+      priority:
+        added: '%{user_name} set the priority to %{new_priority}'
+        updated: '%{user_name} changed the priority from %{old_priority} to %{new_priority}'
+        removed: '%{user_name} removed the priority'
       assignee:
         self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "Assigned to %{assignee_name} by %{user_name}"
@@ -167,6 +171,9 @@ bg:
     google_translate:
       name: "Google Translate"
       description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
+    openai:
+      name: "OpenAI"
+      description: "Integrate powerful AI features into Chatwoot by leveraging the GPT models from OpenAI."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 82569b375..c093a040c 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -113,6 +113,10 @@ ca:
         snoozed: "Conversation was snoozed by %{user_name}"
         auto_resolved: "El sistema ha marcat que la conversa s'ha resolt a causa de %{duration} dies d'inactivitat"
         system_auto_open: System reopened the conversation due to a new incoming message.
+      priority:
+        added: '%{user_name} set the priority to %{new_priority}'
+        updated: '%{user_name} changed the priority from %{old_priority} to %{new_priority}'
+        removed: '%{user_name} removed the priority'
       assignee:
         self_assigned: "%{user_name} s'ha auto assignat aquesta conversa"
         assigned: "Assignada a %{assignee_name} per %{user_name}"
@@ -167,6 +171,9 @@ ca:
     google_translate:
       name: "Google Translate"
       description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
+    openai:
+      name: "OpenAI"
+      description: "Integrate powerful AI features into Chatwoot by leveraging the GPT models from OpenAI."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index fdaa6f262..b6ae01a6a 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -113,6 +113,10 @@ cs:
         snoozed: "Conversation was snoozed by %{user_name}"
         auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
         system_auto_open: System reopened the conversation due to a new incoming message.
+      priority:
+        added: '%{user_name} set the priority to %{new_priority}'
+        updated: '%{user_name} changed the priority from %{old_priority} to %{new_priority}'
+        removed: '%{user_name} removed the priority'
       assignee:
         self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "Přiřazeno k %{assignee_name} uživatelem %{user_name}"
@@ -167,6 +171,9 @@ cs:
     google_translate:
       name: "Google Translate"
       description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
+    openai:
+      name: "OpenAI"
+      description: "Integrate powerful AI features into Chatwoot by leveraging the GPT models from OpenAI."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 889ffb109..54972a83e 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -113,6 +113,10 @@ da:
         snoozed: "Samtalen blev udskudt af %{user_name}"
         auto_resolved: "Samtalen blev markeret som løst af systemet på grund af %{duration} dages inaktivitet"
         system_auto_open: System reopened the conversation due to a new incoming message.
+      priority:
+        added: '%{user_name} set the priority to %{new_priority}'
+        updated: '%{user_name} changed the priority from %{old_priority} to %{new_priority}'
+        removed: '%{user_name} removed the priority'
       assignee:
         self_assigned: "%{user_name} selv-tildelte denne samtale"
         assigned: "Tildelt %{assignee_name} af %{user_name}"
@@ -167,6 +171,9 @@ da:
     google_translate:
       name: "Google Translate"
       description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
+    openai:
+      name: "OpenAI"
+      description: "Integrate powerful AI features into Chatwoot by leveraging the GPT models from OpenAI."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 84246ffd5..fc34c34a9 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -113,6 +113,10 @@ de:
         snoozed: "Das Gespräch wurde von %{user_name} zur Erinnerung markiert"
         auto_resolved: "Das Gespräch wurde vom System aufgrund von %{duration} Tagen Inaktivität gelöst"
         system_auto_open: System reopened the conversation due to a new incoming message.
+      priority:
+        added: '%{user_name} set the priority to %{new_priority}'
+        updated: '%{user_name} changed the priority from %{old_priority} to %{new_priority}'
+        removed: '%{user_name} removed the priority'
       assignee:
         self_assigned: "%{user_name} hat sich dieses Gespräch selbst zugewiesen"
         assigned: "%{user_name} von %{assignee_name} zugewiesen"
@@ -167,6 +171,9 @@ de:
     google_translate:
       name: "Google Translate"
       description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
+    openai:
+      name: "OpenAI"
+      description: "Integrate powerful AI features into Chatwoot by leveraging the GPT models from OpenAI."
   public_portal:
     search:
       search_placeholder: Artikel nach Titel oder Text suchen...
@@ -178,11 +185,11 @@ de:
     common:
       home: Hauptseite
       last_updated_on: Last updated on %{last_updated_on}
-      view_all_articles: View all articles
-      article: article
+      view_all_articles: Alle Artikel anzeigen
+      article: Artikel
       articles: Artikel
       no_articles: There are no articles here
     footer:
       made_with: Made with
     header:
-      go_to_homepage: Go to the main site
+      go_to_homepage: Zur Hauptseite wechseln
diff --git a/config/locales/devise.lt.yml b/config/locales/devise.lt.yml
index 15c8151fc..7f0611e55 100644
--- a/config/locales/devise.lt.yml
+++ b/config/locales/devise.lt.yml
@@ -7,9 +7,9 @@ lt:
       send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions for how to confirm your email address in a few minutes."
     failure:
       already_authenticated: "You are already signed in."
-      inactive: "Your account is not activated yet."
+      inactive: "Tavo prisijungimo paskyra dar neaktyvuota."
       invalid: "Invalid %{authentication_keys}/password or account is not verified yet."
-      locked: "Your account is locked."
+      locked: "Tavo prisijungimo paskyra užrakinta."
       last_attempt: "You have one more attempt before your account is locked."
       not_found_in_database: "Invalid %{authentication_keys} or password."
       timeout: "Your session expired. Please sign in again to continue."
@@ -23,7 +23,7 @@ lt:
       unlock_instructions:
         subject: "Unlock instructions"
       password_change:
-        subject: "Password Changed"
+        subject: "Slaptažodis pakeistas"
     omniauth_callbacks:
       failure: "Could not authenticate you from %{kind} because \"%{reason}\"."
       success: "Successfully authenticated from %{kind} account."
@@ -42,9 +42,9 @@ lt:
       update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and follow the confirm link to confirm your new email address."
       updated: "Your account has been updated successfully."
     sessions:
-      signed_in: "Signed in successfully."
-      signed_out: "Signed out successfully."
-      already_signed_out: "Signed out successfully."
+      signed_in: "Prisijungta sėkmingai."
+      signed_out: "Atsijungta sėkmingai."
+      already_signed_out: "Atsijungta sėkmingai."
     unlocks:
       send_instructions: "You will receive an email with instructions for how to unlock your account in a few minutes."
       send_paranoid_instructions: "If your account exists, you will receive an email with instructions for how to unlock it in a few minutes."
@@ -54,7 +54,7 @@ lt:
       already_confirmed: "was already confirmed, please try signing in"
       confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one"
       expired: "has expired, please request a new one"
-      not_found: "not found"
+      not_found: "nerasta"
       not_locked: "was not locked"
       not_saved:
         one: "1 error prohibited this %{resource} from being saved:"
diff --git a/config/locales/el.yml b/config/locales/el.yml
index e38bf7429..417bc9a43 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -113,6 +113,10 @@ el:
         snoozed: "Η συνομιλία σημάνθηκε ως \"καθυστερημένη\" (snoozed) από τον %{user_name}"
         auto_resolved: "Η συνομιλία σημάνθηκε επιλυθείσα από το σύστημα με την παρέλευση %{duration} ημερών άνευ δραστηριότητας"
         system_auto_open: System reopened the conversation due to a new incoming message.
+      priority:
+        added: '%{user_name} set the priority to %{new_priority}'
+        updated: '%{user_name} changed the priority from %{old_priority} to %{new_priority}'
+        removed: '%{user_name} removed the priority'
       assignee:
         self_assigned: "Ο χρήστης %{user_name} ανέλαβε αυτήν την συνομιλία"
         assigned: "Ανατέθηκε στον %{assignee_name} από τον %{user_name}"
@@ -167,6 +171,9 @@ el:
     google_translate:
       name: "Google Translate"
       description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
+    openai:
+      name: "OpenAI"
+      description: "Integrate powerful AI features into Chatwoot by leveraging the GPT models from OpenAI."
   public_portal:
     search:
       search_placeholder: Αναζήτηση άρθρου με τίτλο ή περιεχόμενο...
diff --git a/config/locales/es.yml b/config/locales/es.yml
index ff23dcd66..275ce134e 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -113,6 +113,10 @@ es:
         snoozed: "La conversación fue pospuesta por %{user_name}"
         auto_resolved: "La conversación fue marcada por el sistema debido a %{duration} días de inactividad"
         system_auto_open: System reopened the conversation due to a new incoming message.
+      priority:
+        added: '%{user_name} set the priority to %{new_priority}'
+        updated: '%{user_name} changed the priority from %{old_priority} to %{new_priority}'
+        removed: '%{user_name} removed the priority'
       assignee:
         self_assigned: "%{user_name} auto-asignado a esta conversación"
         assigned: "Asignado a %{assignee_name} por %{user_name}"
@@ -167,6 +171,9 @@ es:
     google_translate:
       name: "Traductor de Google"
       description: "Facilita a los agentes la traducción de mensajes añadiendo una integración de traducción de Google. Google Translate ayuda a identificar el idioma automáticamente y convertirlo al idioma elegido por el agente o administrador de la cuenta."
+    openai:
+      name: "OpenAI"
+      description: "Integrate powerful AI features into Chatwoot by leveraging the GPT models from OpenAI."
   public_portal:
     search:
       search_placeholder: Buscar artículo por título o cuerpo...
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index a3d233e70..9ade1710c 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -112,7 +112,11 @@ fa:
         pending: "مکالمه توسط %{user_name} به عنوان معلق علامت گذاری شد"
         snoozed: "مکالمه توسط %{user_name} به تعویق افتاد"
         auto_resolved: "به دلیل %{duration} روز عدم فعالیت ، مکالمه توسط سیستم بسته شد"
-        system_auto_open: System reopened the conversation due to a new incoming message.
+        system_auto_open: سیستم به دلیل یک پیام دریافتی جدید، مکالمه را دوباره باز کرد.
+      priority:
+        added: '%{user_name} اولویت را روی %{new_priority} تنظیم کرد'
+        updated: '%{user_name} اولویت را از %{old_priority} به %{new_priority} تغییر داد'
+        removed: '%{user_name} اولویت را حذف کرد'
       assignee:
         self_assigned: "%{user_name} این مکالمه را به خود اختصاص داد"
         assigned: "%{user_name} گفتگو را به %{assignee_name} اختصاص داد"
@@ -167,6 +171,9 @@ fa:
     google_translate:
       name: "مترجم گوگل"
       description: "با افزودن Google Translate یکپارچه سازی، ترجمه پیام ها را برای نمایندگان آسان تر کنید. Google translate به شناسایی خودکار زبان و تبدیل آن به زبان انتخاب شده توسط نماینده/مدیر حساب کمک می کند."
+    openai:
+      name: "OpenAI"
+      description: "Integrate powerful AI features into Chatwoot by leveraging the GPT models from OpenAI."
   public_portal:
     search:
       search_placeholder: جستجوی مقاله براساس عنوان یا متن...
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 0df1b47b8..f1cc130e9 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -113,6 +113,10 @@ fi:
         snoozed: "Conversation was snoozed by %{user_name}"
         auto_resolved: "Keskustelu merkittiin ratkaistuksi automaattisesti, sillä on kulunut %{duration} päivää viimeisestä viestistä"
         system_auto_open: System reopened the conversation due to a new incoming message.
+      priority:
+        added: '%{user_name} set the priority to %{new_priority}'
+        updated: '%{user_name} changed the priority from %{old_priority} to %{new_priority}'
+        removed: '%{user_name} removed the priority'
       assignee:
         self_assigned: "%{user_name} ilmottautui keskusteluun"
         assigned: "Delegoitu edustajalle %{assignee_name} edustajan %{user_name} toimesta"
@@ -167,6 +171,9 @@ fi:
     google_translate:
       name: "Google Translate"
       description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
+    openai:
+      name: "OpenAI"
+      description: "Integrate powerful AI features into Chatwoot by leveraging the GPT models from OpenAI."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 2c94ab384..7191208f0 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -113,6 +113,10 @@ fr:
         snoozed: "La conversation a été reportée par %{user_name}"
         auto_resolved: "La conversation a été marquée comme résolue par le système en raison de %{duration} jours d'inactivité"
         system_auto_open: System reopened the conversation due to a new incoming message.
+      priority:
+        added: '%{user_name} set the priority to %{new_priority}'
+        updated: '%{user_name} changed the priority from %{old_priority} to %{new_priority}'
+        removed: '%{user_name} removed the priority'
       assignee:
         self_assigned: "%{user_name} s'est auto-assigné cette conversation"
         assigned: "Assigné à %{assignee_name} par %{user_name}"
@@ -167,6 +171,9 @@ fr:
     google_translate:
       name: "Google Translate"
       description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
+    openai:
+      name: "OpenAI"
+      description: "Integrate powerful AI features into Chatwoot by leveraging the GPT models from OpenAI."
   public_portal:
     search:
       search_placeholder: Rechercher un article par titre ou contenu...
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 6fb4bf8c5..a735a8947 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -113,6 +113,10 @@ he:
         snoozed: "השיחה הושהה על ידי %{user_name}"
         auto_resolved: "השיחה סומנה כפתורה על ידי המערכת עקב חוסר פעילות של %{duration} ימים"
         system_auto_open: System reopened the conversation due to a new incoming message.
+      priority:
+        added: '%{user_name} set the priority to %{new_priority}'
+        updated: '%{user_name} changed the priority from %{old_priority} to %{new_priority}'
+        removed: '%{user_name} removed the priority'
       assignee:
         self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "הוקצה ל-%{assignee_name} על ידי %{user_name}"
@@ -167,6 +171,9 @@ he:
     google_translate:
       name: "גוגל תרגום"
       description: "הקל על סוכנים לתרגם הודעות על ידי הוספת שילוב של Google Translate. Google translate עוזר לזהות את השפה באופן אוטומטי ולהמיר אותה לשפה שנבחרה על ידי הסוכן/מנהל החשבון."
+    openai:
+      name: "OpenAI"
+      description: "Integrate powerful AI features into Chatwoot by leveraging the GPT models from OpenAI."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index 49d71814a..203e2ecb9 100644
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -113,6 +113,10 @@ hi:
         snoozed: "Conversation was snoozed by %{user_name}"
         auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
         system_auto_open: System reopened the conversation due to a new incoming message.
+      priority:
+        added: '%{user_name} set the priority to %{new_priority}'
+        updated: '%{user_name} changed the priority from %{old_priority} to %{new_priority}'
+        removed: '%{user_name} removed the priority'
       assignee:
         self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "Assigned to %{assignee_name} by %{user_name}"
@@ -167,6 +171,9 @@ hi:
     google_translate:
       name: "Google Translate"
       description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
+    openai:
+      name: "OpenAI"
+      description: "Integrate powerful AI features into Chatwoot by leveraging the GPT models from OpenAI."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 329904cfe..e12b86ff3 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -113,6 +113,10 @@ hr:
         snoozed: "Conversation was snoozed by %{user_name}"
         auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
         system_auto_open: Sustav je ponovno otvorio razgovor zbog pristigle nove poruke.
+      priority:
+        added: '%{user_name} je postavio prioritet na %{new_priority}'
+        updated: '%{user_name} je promijenio prioritet s %{old_priority} na %{new_priority}'
+        removed: '%{user_name} je maknuo prioritet'
       assignee:
         self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "Assigned to %{assignee_name} by %{user_name}"
@@ -167,6 +171,9 @@ hr:
     google_translate:
       name: "Google Translate"
       description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
+    openai:
+      name: "OpenAI"
+      description: "Integiraj napredne AI funkcionalnosti u Chatwoot koristeći GPT modele od OpenAI."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 8ef49c3d0..d3d53b3eb 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -113,6 +113,10 @@ hu:
         snoozed: "A beszélgetést %{user_name} elnémította"
         auto_resolved: "A beszélgetést lezárta a rendszer mivel %{duration} napja inaktív volt"
         system_auto_open: System reopened the conversation due to a new incoming message.
+      priority:
+        added: '%{user_name} set the priority to %{new_priority}'
+        updated: '%{user_name} changed the priority from %{old_priority} to %{new_priority}'
+        removed: '%{user_name} removed the priority'
       assignee:
         self_assigned: "%{user_name} magára osztotta ezt a beszélgetést"
         assigned: "%{user_name} ráosztotta a beszélgetést: %{assignee_name}"
@@ -167,6 +171,9 @@ hu:
     google_translate:
       name: "Google Translate"
       description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
+    openai:
+      name: "OpenAI"
+      description: "Integrate powerful AI features into Chatwoot by leveraging the GPT models from OpenAI."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
diff --git a/config/locales/hy.yml b/config/locales/hy.yml
index cb605ea99..210cdeb63 100644
--- a/config/locales/hy.yml
+++ b/config/locales/hy.yml
@@ -113,6 +113,10 @@ hy:
         snoozed: "Conversation was snoozed by %{user_name}"
         auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
         system_auto_open: System reopened the conversation due to a new incoming message.
+      priority:
+        added: '%{user_name} set the priority to %{new_priority}'
+        updated: '%{user_name} changed the priority from %{old_priority} to %{new_priority}'
+        removed: '%{user_name} removed the priority'
       assignee:
         self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "Assigned to %{assignee_name} by %{user_name}"
@@ -167,6 +171,9 @@ hy:
     google_translate:
       name: "Google Translate"
       description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
+    openai:
+      name: "OpenAI"
+      description: "Integrate powerful AI features into Chatwoot by leveraging the GPT models from OpenAI."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
diff --git a/config/locales/id.yml b/config/locales/id.yml
index ae585c6ab..46345db7a 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -113,6 +113,10 @@ id:
         snoozed: "Percakapan telah ditunda oleh %{user_name}"
         auto_resolved: "Percakapan ditandai terselesaikan oleh sistem karena tidak ada aktifitas dalam %{duration} hari"
         system_auto_open: System reopened the conversation due to a new incoming message.
+      priority:
+        added: '%{user_name} set the priority to %{new_priority}'
+        updated: '%{user_name} changed the priority from %{old_priority} to %{new_priority}'
+        removed: '%{user_name} removed the priority'
       assignee:
         self_assigned: "%{user_name} menetapkan sendiri percakapan ini"
         assigned: "Ditugaskan ke %{assignee_name} oleh %{user_name}"
@@ -167,6 +171,9 @@ id:
     google_translate:
       name: "Google Translate"
       description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
+    openai:
+      name: "OpenAI"
+      description: "Integrate powerful AI features into Chatwoot by leveraging the GPT models from OpenAI."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
diff --git a/config/locales/is.yml b/config/locales/is.yml
index b1d5f6857..7132d5e28 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -113,6 +113,10 @@ is:
         snoozed: "Conversation was snoozed by %{user_name}"
         auto_resolved: "Samtal var merkt sem leyst af kerfinu vegna óvirkni í %{duration} daga"
         system_auto_open: System reopened the conversation due to a new incoming message.
+      priority:
+        added: '%{user_name} set the priority to %{new_priority}'
+        updated: '%{user_name} changed the priority from %{old_priority} to %{new_priority}'
+        removed: '%{user_name} removed the priority'
       assignee:
         self_assigned: "%{user_name} úthlutaði þessu samtali á sig"
         assigned: "Úthlutað á %{assignee_name} af %{user_name}"
@@ -167,6 +171,9 @@ is:
     google_translate:
       name: "Google Translate"
       description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
+    openai:
+      name: "OpenAI"
+      description: "Integrate powerful AI features into Chatwoot by leveraging the GPT models from OpenAI."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
diff --git a/config/locales/it.yml b/config/locales/it.yml
index b1cf8ad0b..c1e0eb148 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -113,6 +113,10 @@ it:
         snoozed: "La conversazione è stata posticipata da %{user_name}"
         auto_resolved: "La conversazione è stata contrassegnata come risolta dal sistema a causa di %{duration} giorni d'inattività"
         system_auto_open: System reopened the conversation due to a new incoming message.
+      priority:
+        added: '%{user_name} set the priority to %{new_priority}'
+        updated: '%{user_name} changed the priority from %{old_priority} to %{new_priority}'
+        removed: '%{user_name} removed the priority'
       assignee:
         self_assigned: "%{user_name} si è assegnato a questa conversazione"
         assigned: "Assegnato a %{assignee_name} da %{user_name}"
@@ -167,6 +171,9 @@ it:
     google_translate:
       name: "Google Translate"
       description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
+    openai:
+      name: "OpenAI"
+      description: "Integrate powerful AI features into Chatwoot by leveraging the GPT models from OpenAI."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 266efcd87..a83e1d251 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -113,6 +113,10 @@ ja:
         snoozed: "Conversation was snoozed by %{user_name}"
         auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
         system_auto_open: System reopened the conversation due to a new incoming message.
+      priority:
+        added: '%{user_name} set the priority to %{new_priority}'
+        updated: '%{user_name} changed the priority from %{old_priority} to %{new_priority}'
+        removed: '%{user_name} removed the priority'
       assignee:
         self_assigned: "%{user_name} がこの会話を自身で割り当てました"
         assigned: "%{assignee_name} によって %{user_name} に割り当てられました"
@@ -167,6 +171,9 @@ ja:
     google_translate:
       name: "Google Translate"
       description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
+    openai:
+      name: "OpenAI"
+      description: "Integrate powerful AI features into Chatwoot by leveraging the GPT models from OpenAI."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index f48c80b04..50f09a5de 100644
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -113,6 +113,10 @@ ka:
         snoozed: "Conversation was snoozed by %{user_name}"
         auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
         system_auto_open: System reopened the conversation due to a new incoming message.
+      priority:
+        added: '%{user_name} set the priority to %{new_priority}'
+        updated: '%{user_name} changed the priority from %{old_priority} to %{new_priority}'
+        removed: '%{user_name} removed the priority'
       assignee:
         self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "Assigned to %{assignee_name} by %{user_name}"
@@ -167,6 +171,9 @@ ka:
     google_translate:
       name: "Google Translate"
       description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
+    openai:
+      name: "OpenAI"
+      description: "Integrate powerful AI features into Chatwoot by leveraging the GPT models from OpenAI."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 9d64be6b2..bbd4cdf98 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -113,6 +113,10 @@ ko:
         snoozed: "Conversation was snoozed by %{user_name}"
         auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
         system_auto_open: System reopened the conversation due to a new incoming message.
+      priority:
+        added: '%{user_name} set the priority to %{new_priority}'
+        updated: '%{user_name} changed the priority from %{old_priority} to %{new_priority}'
+        removed: '%{user_name} removed the priority'
       assignee:
         self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "Assigned to %{assignee_name} by %{user_name}"
@@ -167,6 +171,9 @@ ko:
     google_translate:
       name: "Google Translate"
       description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
+    openai:
+      name: "OpenAI"
+      description: "Integrate powerful AI features into Chatwoot by leveraging the GPT models from OpenAI."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index a18ac5bd9..7aab7961c 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -31,15 +31,15 @@ lt:
       disposable_email: We do not allow disposable emails
       invalid_email: You have entered an invalid email
       email_already_exists: "You have already signed up for an account with %{email}"
-      failed: Signup failed
+      failed: Prisijungimas nesėkmingas
     data_import:
       data_type:
         invalid: Invalid data type
     contacts:
       import:
-        failed: File is blank
+        failed: Failas yra tuščias
       email:
-        invalid: Invalid email
+        invalid: Neteisingas el. paštas
       phone_number:
         invalid: should be in e164 format
     categories:
@@ -60,7 +60,7 @@ lt:
     period: Reporting period %{since} to %{until}
     utc_warning: The report generated is in UTC timezone
     agent_csv:
-      agent_name: Agent name
+      agent_name: Agento Vardas
       conversations_count: Conversations count
       avg_first_response_time: Avg first response time (Minutes)
       avg_resolution_time: Avg resolution time (Minutes)
@@ -81,18 +81,18 @@ lt:
       avg_first_response_time: Avg first response time (Minutes)
       avg_resolution_time: Avg resolution time (Minutes)
     conversation_traffic_csv:
-      timezone: Timezone
-    default_group_by: day
+      timezone: Laiko zona
+    default_group_by: diena
     csat:
       headers:
         contact_name: Contact Name
         contact_email_address: Contact Email Address
         contact_phone_number: Contact Phone Number
         link_to_the_conversation: Link to the conversation
-        agent_name: Agent Name
-        rating: Rating
+        agent_name: Agento Vardas
+        rating: Reitingas
         feedback: Feedback Comment
-        recorded_at: Recorded date
+        recorded_at: Įrašo data
   notifications:
     notification_title:
       conversation_creation: "[New conversation] - #%{display_id} has been created in %{inbox_name}"
@@ -113,6 +113,10 @@ lt:
         snoozed: "Conversation was snoozed by %{user_name}"
         auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
         system_auto_open: System reopened the conversation due to a new incoming message.
+      priority:
+        added: '%{user_name} set the priority to %{new_priority}'
+        updated: '%{user_name} changed the priority from %{old_priority} to %{new_priority}'
+        removed: '%{user_name} removed the priority'
       assignee:
         self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "Assigned to %{assignee_name} by %{user_name}"
@@ -167,6 +171,9 @@ lt:
     google_translate:
       name: "Google Translate"
       description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
+    openai:
+      name: "OpenAI"
+      description: "Integrate powerful AI features into Chatwoot by leveraging the GPT models from OpenAI."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 201217953..8795b473b 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -81,7 +81,7 @@ lv:
       avg_first_response_time: Vidējais pirmās atbildes laiks (Minūtes)
       avg_resolution_time: Vidējais atrisinājuma laiks (Minūtes)
     conversation_traffic_csv:
-      timezone: Timezone
+      timezone: Laika zona
     default_group_by: diena
     csat:
       headers:
@@ -112,7 +112,11 @@ lv:
         pending: "%{user_name} sarunu atzīmēja kā neapstiprinātu"
         snoozed: "%{user_name} atlika sarunu"
         auto_resolved: "Sistēma sarunu atzīmēja kā atrisinātu %{duration} dienu neaktivitātes dēļ"
-        system_auto_open: System reopened the conversation due to a new incoming message.
+        system_auto_open: Sistēma atkārtoti atvēra sarunu jauna ienākoša ziņojuma dēļ.
+      priority:
+        added: '%{user_name} iestatīja prioritāti uz %{new_priority}'
+        updated: '%{user_name} nomainīja prioritāti no %{old_priority} uz %{new_priority}'
+        removed: '%{user_name} noņēma prioritāti'
       assignee:
         self_assigned: "%{user_name} sev piešķīra šo sarunu"
         assigned: "%{user_name} piešķīra sarunu %{assignee_name}"
@@ -167,6 +171,9 @@ lv:
     google_translate:
       name: "Google Tulkotājs"
       description: "Atvieglojiet aģentiem ziņojumu tulkošanu, pievienojot Google tulkotāja integrāciju. Google tulkotājs palīdz automātiski identificēt valodu un pārvērst to aģenta/konta administratora izvēlētajā valodā."
+    openai:
+      name: "OpenAI"
+      description: "Integrēt jaudīgas AI funkcijas programmā Chatwoot, izmantojot OpenAI GPT modeļus."
   public_portal:
     search:
       search_placeholder: Meklēt rakstu pēc nosaukuma vai pamatteksta...
diff --git a/config/locales/ml.yml b/config/locales/ml.yml
index fec2fdb9c..018820568 100644
--- a/config/locales/ml.yml
+++ b/config/locales/ml.yml
@@ -113,6 +113,10 @@ ml:
         snoozed: "Conversation was snoozed by %{user_name}"
         auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
         system_auto_open: System reopened the conversation due to a new incoming message.
+      priority:
+        added: '%{user_name} set the priority to %{new_priority}'
+        updated: '%{user_name} changed the priority from %{old_priority} to %{new_priority}'
+        removed: '%{user_name} removed the priority'
       assignee:
         self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "%{assignee_name} %{user_name}-നെ നിയുക്തനാക്കി "
@@ -167,6 +171,9 @@ ml:
     google_translate:
       name: "Google Translate"
       description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
+    openai:
+      name: "OpenAI"
+      description: "Integrate powerful AI features into Chatwoot by leveraging the GPT models from OpenAI."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index abc286eb7..a373bd3c9 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -113,6 +113,10 @@ ms:
         snoozed: "Conversation was snoozed by %{user_name}"
         auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
         system_auto_open: System reopened the conversation due to a new incoming message.
+      priority:
+        added: '%{user_name} set the priority to %{new_priority}'
+        updated: '%{user_name} changed the priority from %{old_priority} to %{new_priority}'
+        removed: '%{user_name} removed the priority'
       assignee:
         self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "Assigned to %{assignee_name} by %{user_name}"
@@ -167,6 +171,9 @@ ms:
     google_translate:
       name: "Google Translate"
       description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
+    openai:
+      name: "OpenAI"
+      description: "Integrate powerful AI features into Chatwoot by leveraging the GPT models from OpenAI."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
diff --git a/config/locales/ne.yml b/config/locales/ne.yml
index 7ace22deb..9ce441b5e 100644
--- a/config/locales/ne.yml
+++ b/config/locales/ne.yml
@@ -113,6 +113,10 @@ ne:
         snoozed: "Conversation was snoozed by %{user_name}"
         auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
         system_auto_open: System reopened the conversation due to a new incoming message.
+      priority:
+        added: '%{user_name} set the priority to %{new_priority}'
+        updated: '%{user_name} changed the priority from %{old_priority} to %{new_priority}'
+        removed: '%{user_name} removed the priority'
       assignee:
         self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "Assigned to %{assignee_name} by %{user_name}"
@@ -167,6 +171,9 @@ ne:
     google_translate:
       name: "Google Translate"
       description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
+    openai:
+      name: "OpenAI"
+      description: "Integrate powerful AI features into Chatwoot by leveraging the GPT models from OpenAI."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index bbabee5bb..dbfed9b91 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -113,6 +113,10 @@ nl:
         snoozed: "Gesprek werd gesluimerd door %{user_name}"
         auto_resolved: "Gesprek werd door systeem gemarkeerd als opgelost na %{duration} dagen inactiviteit"
         system_auto_open: System reopened the conversation due to a new incoming message.
+      priority:
+        added: '%{user_name} set the priority to %{new_priority}'
+        updated: '%{user_name} changed the priority from %{old_priority} to %{new_priority}'
+        removed: '%{user_name} removed the priority'
       assignee:
         self_assigned: "%{user_name} heeft dit gesprek aan zichzelf toegewezen"
         assigned: "Toegewezen aan %{assignee_name} door %{user_name}"
@@ -167,6 +171,9 @@ nl:
     google_translate:
       name: "Google Translate"
       description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
+    openai:
+      name: "OpenAI"
+      description: "Integrate powerful AI features into Chatwoot by leveraging the GPT models from OpenAI."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
diff --git a/config/locales/no.yml b/config/locales/no.yml
index e07474735..bbd96a0d5 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -113,6 +113,10 @@
         snoozed: "Conversation was snoozed by %{user_name}"
         auto_resolved: "Samtale ble automatisk merket løst på grunn av %{duration} dager med inaktivitet"
         system_auto_open: System reopened the conversation due to a new incoming message.
+      priority:
+        added: '%{user_name} set the priority to %{new_priority}'
+        updated: '%{user_name} changed the priority from %{old_priority} to %{new_priority}'
+        removed: '%{user_name} removed the priority'
       assignee:
         self_assigned: "%{user_name} tilordnet seg denne samtalen"
         assigned: "Tildelt til %{assignee_name} av %{user_name}"
@@ -167,6 +171,9 @@
     google_translate:
       name: "Google Translate"
       description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
+    openai:
+      name: "OpenAI"
+      description: "Integrate powerful AI features into Chatwoot by leveraging the GPT models from OpenAI."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index c87e0cf36..002dad610 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -113,6 +113,10 @@ pl:
         snoozed: "Rozmowa została uśpiona przez %{user_name}"
         auto_resolved: "Rozmowa została oznaczona przez system jako rozwiązana z powodu %{duration} dni bezczynności"
         system_auto_open: System reopened the conversation due to a new incoming message.
+      priority:
+        added: '%{user_name} set the priority to %{new_priority}'
+        updated: '%{user_name} changed the priority from %{old_priority} to %{new_priority}'
+        removed: '%{user_name} removed the priority'
       assignee:
         self_assigned: "%{user_name} przypisał się do tej rozmowy"
         assigned: "Przypisane do %{assignee_name} przez %{user_name}"
@@ -167,6 +171,9 @@ pl:
     google_translate:
       name: "Google Translate"
       description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
+    openai:
+      name: "OpenAI"
+      description: "Integrate powerful AI features into Chatwoot by leveraging the GPT models from OpenAI."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 51a7bb7a2..7454cf606 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -113,6 +113,10 @@ pt:
         snoozed: "Conversa adiada por %{user_name}"
         auto_resolved: "Conversa auto-resolvida pelo sistema por causa dos %{duration} dias sem inatividade"
         system_auto_open: System reopened the conversation due to a new incoming message.
+      priority:
+        added: '%{user_name} set the priority to %{new_priority}'
+        updated: '%{user_name} changed the priority from %{old_priority} to %{new_priority}'
+        removed: '%{user_name} removed the priority'
       assignee:
         self_assigned: "%{user_name} auto-atribuída esta conversa"
         assigned: "Atribuído a %{assignee_name} por %{user_name}"
@@ -167,6 +171,9 @@ pt:
     google_translate:
       name: "Google Translate"
       description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
+    openai:
+      name: "OpenAI"
+      description: "Integrate powerful AI features into Chatwoot by leveraging the GPT models from OpenAI."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
diff --git a/config/locales/pt_BR.yml b/config/locales/pt_BR.yml
index cd60243f3..c78234cbf 100644
--- a/config/locales/pt_BR.yml
+++ b/config/locales/pt_BR.yml
@@ -113,6 +113,10 @@ pt_BR:
         snoozed: "Conversa não atribuída por %{user_name}"
         auto_resolved: "Conversa foi marcada como resolvida pelo sistema por ter %{duration} dias de inatividade"
         system_auto_open: O sistema reabriu a conversa devido a uma nova mensagem recebida.
+      priority:
+        added: '%{user_name} set the priority to %{new_priority}'
+        updated: '%{user_name} changed the priority from %{old_priority} to %{new_priority}'
+        removed: '%{user_name} removed the priority'
       assignee:
         self_assigned: "%{user_name} atribuiu a si mesmo essa conversa"
         assigned: "Atribuído a %{assignee_name} por %{user_name}"
@@ -167,6 +171,9 @@ pt_BR:
     google_translate:
       name: "Tradutor do Google"
       description: "Torne isso mais fácil para agentes traduzirem mensagens adicionando uma integração com o Tradutor do Google. O Tradutor do Google ajuda a identificar automaticamente o idioma e convertê-lo para o idioma escolhido pelo administrador de conta/agente."
+    openai:
+      name: "OpenAI"
+      description: "Integrate powerful AI features into Chatwoot by leveraging the GPT models from OpenAI."
   public_portal:
     search:
       search_placeholder: Pesquisar por artigo por título ou corpo...
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 634061b15..2a07e0809 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -21,7 +21,7 @@ ro:
   messages:
     reset_password_success: Woot! Cererea de resetare a parolei a reusit. Verifica emailul pentru instructiuni.
     reset_password_failure: Nu am putut găsi niciun utilizator cu e-mailul specificat.
-    inbox_deletetion_response: Your inbox deletion request will be processed in some time.
+    inbox_deletetion_response: Solicitarea de ștergere a inboxului va fi procesată într-un anumit timp.
   errors:
     validations:
       presence: nu trebuie să fie gol
@@ -46,7 +46,7 @@ ro:
       locale:
         unique: ar trebui să fie unic în categorie și portal
     dyte:
-      invalid_message_type: "Invalid message type. Action not permitted"
+      invalid_message_type: "Tip de mesaj nevalid. Acțiune nepermisă"
     inboxes:
       imap:
         socket_error: Verificați conexiunea la rețea, adresa IMAP și încercați din nou.
@@ -58,7 +58,7 @@ ro:
         name: nu ar trebui să înceapă sau să se termine cu simboluri și nu ar trebui să aibă < > / \ @ caractere.
   reports:
     period: Perioada de raportare %{since}-%{until}
-    utc_warning: The report generated is in UTC timezone
+    utc_warning: Raportul generat este în fusul orar UTC
     agent_csv:
       agent_name: Nume agent
       conversations_count: Conversațiile contează
@@ -81,7 +81,7 @@ ro:
       avg_first_response_time: Avg primul timp de răspuns (minute)
       avg_resolution_time: Timp de rezoluție AVG (proces-verbal)
     conversation_traffic_csv:
-      timezone: Timezone
+      timezone: Fus orar
     default_group_by: zi
     csat:
       headers:
@@ -112,7 +112,11 @@ ro:
         pending: "Conversația a fost marcată ca fiind în așteptare de către %{user_name}"
         snoozed: "Conversația a fost snoozed de %{user_name}"
         auto_resolved: "Conversația a fost marcată de sistem din cauza %{duration} zile de inactivitate"
-        system_auto_open: System reopened the conversation due to a new incoming message.
+        system_auto_open: Sistemul a redeschis conversația din cauza unui nou mesaj de intrare.
+      priority:
+        added: '%{user_name} setați prioritatea pentru a %{new_priority}'
+        updated: '%{user_name} schimbat prioritatea de la %{old_priority} la %{new_priority}'
+        removed: '%{user_name} eliminat prioritatea'
       assignee:
         self_assigned: "%{user_name} auto-atribuit această conversație"
         assigned: "Atribuit lui %{assignee_name} de %{user_name}"
@@ -150,8 +154,8 @@ ro:
   integration_apps:
     dyte:
       name: "Dyte"
-      description: "Dyte is tool that helps you to add live audio & video to your application with just a few lines of code. This integration allows you to give an option to your agents to have a video or voice call with your customers from without leaving Chatwoot."
-      meeting_name: "%{agent_name} has started a meeting"
+      description: "Dyte este un instrument care vă ajută să adăugați audio și video live la aplicația dvs., cu doar câteva linii de cod. Această integrare vă permite să oferiți o opțiune agenților dumneavoastră de a efectua un apel video sau vocal cu clienții dvs., fără a părăsi Chatwoot."
+      meeting_name: "%{agent_name} a început o întâlnire"
     slack:
       name: "Slack"
       description: "Slack este un instrument de chat care vă reunește toate comunicările într-un singur loc. Prin integrarea Slack, puteți fi notificat cu privire la toate conversațiile noi din cont chiar în interiorul Slack-ului."
@@ -166,23 +170,26 @@ ro:
       description: "Integrarea FullContact ajută la îmbogățirea profilurilor vizitatorilor. Identificați utilizatorii imediat ce își partajează adresa de e-mail și oferiți-le servicii personalizate pentru clienți. Conectați FullContact la contul dvs., partajând cheia API FullContact."
     google_translate:
       name: "Google Translate"
-      description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
+      description: "Simplificați traducerea mesajelor de către agenți prin adăugarea unei integrări Google Translate. Google translate ajută la identificarea automată a limbii și la conversia acesteia în limba aleasă de agent/administratorul contului."
+    openai:
+      name: "OpenAI"
+      description: "Integrate powerful AI features into Chatwoot by leveraging the GPT models from OpenAI."
   public_portal:
     search:
-      search_placeholder: Search for article by title or body...
+      search_placeholder: Căutați articol după titlu sau corp...
       empty_placeholder: Niciun rezultat găsit.
-      loading_placeholder: Searching...
-      results_title: Search results
+      loading_placeholder: In căutare...
+      results_title: Rezultate căutare pentru
     hero:
-      sub_title: Search for the articles here or browse the categories below.
+      sub_title: Căutați articolele aici sau răsfoiți categoriile de mai jos.
     common:
       home: Acasa
-      last_updated_on: Last updated on %{last_updated_on}
-      view_all_articles: View all articles
-      article: article
+      last_updated_on: Participanții au actualizat!
+      view_all_articles: Vezi toate articolele
+      article: articol
       articles: articole
-      no_articles: There are no articles here
+      no_articles: Nu există articole aici
     footer:
-      made_with: Made with
+      made_with: Realizat cu
     header:
-      go_to_homepage: Go to the main site
+      go_to_homepage: Accesați site-ul principal
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 9c4054712..c12155406 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -113,6 +113,10 @@ ru:
         snoozed: "Разговор был помечен как отложенный %{user_name}"
         auto_resolved: "Разговор был помечен системой решённым из-за неактивности в течение %{duration} дней"
         system_auto_open: System reopened the conversation due to a new incoming message.
+      priority:
+        added: '%{user_name} set the priority to %{new_priority}'
+        updated: '%{user_name} changed the priority from %{old_priority} to %{new_priority}'
+        removed: '%{user_name} removed the priority'
       assignee:
         self_assigned: "%{user_name} назначил(а) разговор себе"
         assigned: "%{user_name} назначил %{assignee_name} ответственным"
@@ -167,6 +171,9 @@ ru:
     google_translate:
       name: "Google Перевод"
       description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
+    openai:
+      name: "OpenAI"
+      description: "Integrate powerful AI features into Chatwoot by leveraging the GPT models from OpenAI."
   public_portal:
     search:
       search_placeholder: Поиск статьи по названию или содержанию...
diff --git a/config/locales/sh.yml b/config/locales/sh.yml
index b8c0b5ad9..835a0ef75 100644
--- a/config/locales/sh.yml
+++ b/config/locales/sh.yml
@@ -113,6 +113,10 @@ sh:
         snoozed: "Conversation was snoozed by %{user_name}"
         auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
         system_auto_open: System reopened the conversation due to a new incoming message.
+      priority:
+        added: '%{user_name} set the priority to %{new_priority}'
+        updated: '%{user_name} changed the priority from %{old_priority} to %{new_priority}'
+        removed: '%{user_name} removed the priority'
       assignee:
         self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "Assigned to %{assignee_name} by %{user_name}"
@@ -167,6 +171,9 @@ sh:
     google_translate:
       name: "Google Translate"
       description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
+    openai:
+      name: "OpenAI"
+      description: "Integrate powerful AI features into Chatwoot by leveraging the GPT models from OpenAI."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 64a6061ec..54b8b28f9 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -113,6 +113,10 @@ sk:
         snoozed: "Conversation was snoozed by %{user_name}"
         auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
         system_auto_open: System reopened the conversation due to a new incoming message.
+      priority:
+        added: '%{user_name} set the priority to %{new_priority}'
+        updated: '%{user_name} changed the priority from %{old_priority} to %{new_priority}'
+        removed: '%{user_name} removed the priority'
       assignee:
         self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "Pridelené %{assignee_name} od %{user_name}"
@@ -167,6 +171,9 @@ sk:
     google_translate:
       name: "Google Translate"
       description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
+    openai:
+      name: "OpenAI"
+      description: "Integrate powerful AI features into Chatwoot by leveraging the GPT models from OpenAI."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 348ff17da..aa13cc466 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -113,6 +113,10 @@ sr-Latn:
         snoozed: "Razgovor je odložen od strane %{user_name}"
         auto_resolved: "Razgovor je označen kao rešen od strane sistema zbog %{duration} dana neaktivnosti"
         system_auto_open: System reopened the conversation due to a new incoming message.
+      priority:
+        added: '%{user_name} set the priority to %{new_priority}'
+        updated: '%{user_name} changed the priority from %{old_priority} to %{new_priority}'
+        removed: '%{user_name} removed the priority'
       assignee:
         self_assigned: "%{user_name} je samododelio sebe ovom razgovoru"
         assigned: "Dodeljeno %{assignee_name} od strane %{user_name}"
@@ -167,6 +171,9 @@ sr-Latn:
     google_translate:
       name: "Google Translate"
       description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
+    openai:
+      name: "OpenAI"
+      description: "Integrate powerful AI features into Chatwoot by leveraging the GPT models from OpenAI."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 34dd2f04a..ac8251e88 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -113,6 +113,10 @@ sv:
         snoozed: "Conversation was snoozed by %{user_name}"
         auto_resolved: "Konversationen har markerats som löst av systemet på grund av %{duration} dagars inaktivitet"
         system_auto_open: System reopened the conversation due to a new incoming message.
+      priority:
+        added: '%{user_name} set the priority to %{new_priority}'
+        updated: '%{user_name} changed the priority from %{old_priority} to %{new_priority}'
+        removed: '%{user_name} removed the priority'
       assignee:
         self_assigned: "%{user_name} har tilldelat sig denna konversation"
         assigned: "Tilldelad till %{assignee_name} av %{user_name}"
@@ -167,6 +171,9 @@ sv:
     google_translate:
       name: "Google Translate"
       description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
+    openai:
+      name: "OpenAI"
+      description: "Integrate powerful AI features into Chatwoot by leveraging the GPT models from OpenAI."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
diff --git a/config/locales/ta.yml b/config/locales/ta.yml
index aaf842bd9..654c38311 100644
--- a/config/locales/ta.yml
+++ b/config/locales/ta.yml
@@ -113,6 +113,10 @@ ta:
         snoozed: "Conversation was snoozed by %{user_name}"
         auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
         system_auto_open: System reopened the conversation due to a new incoming message.
+      priority:
+        added: '%{user_name} set the priority to %{new_priority}'
+        updated: '%{user_name} changed the priority from %{old_priority} to %{new_priority}'
+        removed: '%{user_name} removed the priority'
       assignee:
         self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "%{user_name} இதை %{assignee_name}க்கு ஒதுக்கியுள்ளார்"
@@ -167,6 +171,9 @@ ta:
     google_translate:
       name: "Google Translate"
       description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
+    openai:
+      name: "OpenAI"
+      description: "Integrate powerful AI features into Chatwoot by leveraging the GPT models from OpenAI."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
diff --git a/config/locales/th.yml b/config/locales/th.yml
index ac7ac5227..44f3f1cdb 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -113,6 +113,10 @@ th:
         snoozed: "Conversation was snoozed by %{user_name}"
         auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
         system_auto_open: System reopened the conversation due to a new incoming message.
+      priority:
+        added: '%{user_name} set the priority to %{new_priority}'
+        updated: '%{user_name} changed the priority from %{old_priority} to %{new_priority}'
+        removed: '%{user_name} removed the priority'
       assignee:
         self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "Assigned to %{assignee_name} by %{user_name}"
@@ -167,6 +171,9 @@ th:
     google_translate:
       name: "Google Translate"
       description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
+    openai:
+      name: "OpenAI"
+      description: "Integrate powerful AI features into Chatwoot by leveraging the GPT models from OpenAI."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 90b76d0cb..451e74692 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -113,6 +113,10 @@ tr:
         snoozed: "Conversation was snoozed by %{user_name}"
         auto_resolved: " %{duration} günlük hareketsizlik nedeniyle görüşme, sistem tarafından çözümlendi olarak işaretlendi"
         system_auto_open: System reopened the conversation due to a new incoming message.
+      priority:
+        added: '%{user_name} set the priority to %{new_priority}'
+        updated: '%{user_name} changed the priority from %{old_priority} to %{new_priority}'
+        removed: '%{user_name} removed the priority'
       assignee:
         self_assigned: "%{user_name} bu görüşmeyi kendisi atadı"
         assigned: "%{user_name} tarafından %{assignee_name} adına atandı"
@@ -167,6 +171,9 @@ tr:
     google_translate:
       name: "Google Translate"
       description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
+    openai:
+      name: "OpenAI"
+      description: "Integrate powerful AI features into Chatwoot by leveraging the GPT models from OpenAI."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 5d7d5ccfa..7d5eb12ee 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -113,6 +113,10 @@ uk:
         snoozed: "Розмова була відкладена %{user_name}"
         auto_resolved: "Діалог був закритий системою через %{duration} днів неактивності"
         system_auto_open: Система повторно відкрила розмову через нове вхідне повідомлення.
+      priority:
+        added: '%{user_name} встановив пріоритет %{new_priority}'
+        updated: '%{user_name} змінив пріоритет з %{old_priority} на %{new_priority}'
+        removed: '%{user_name} видалив пріоритет'
       assignee:
         self_assigned: "%{user_name} самостійно призначив цей діалог"
         assigned: "Призначено до %{assignee_name} користувачем %{user_name}"
@@ -167,6 +171,9 @@ uk:
     google_translate:
       name: "Google Translate"
       description: "Зробіть простішим життя агентів перекладаючи повідомлення за допомогою Google Translate. Google Translate сам ідентифікує та перекладає у обрану дміністратором чи агентом мову."
+    openai:
+      name: "OpenAI"
+      description: "Інтегруйте потужні AI функції в Chatwoot, використовуючи моделі GPT з OpenAI."
   public_portal:
     search:
       search_placeholder: Пошук статті за заголовком або змістом...
diff --git a/config/locales/ur.yml b/config/locales/ur.yml
index 7ca91ebe4..a1b3f912e 100644
--- a/config/locales/ur.yml
+++ b/config/locales/ur.yml
@@ -113,6 +113,10 @@ ur:
         snoozed: "Conversation was snoozed by %{user_name}"
         auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
         system_auto_open: System reopened the conversation due to a new incoming message.
+      priority:
+        added: '%{user_name} set the priority to %{new_priority}'
+        updated: '%{user_name} changed the priority from %{old_priority} to %{new_priority}'
+        removed: '%{user_name} removed the priority'
       assignee:
         self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "Assigned to %{assignee_name} by %{user_name}"
@@ -167,6 +171,9 @@ ur:
     google_translate:
       name: "Google Translate"
       description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
+    openai:
+      name: "OpenAI"
+      description: "Integrate powerful AI features into Chatwoot by leveraging the GPT models from OpenAI."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
diff --git a/config/locales/ur_IN.yml b/config/locales/ur_IN.yml
index 1797c52cd..7712abb19 100644
--- a/config/locales/ur_IN.yml
+++ b/config/locales/ur_IN.yml
@@ -113,6 +113,10 @@ ur:
         snoozed: "Conversation was snoozed by %{user_name}"
         auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
         system_auto_open: System reopened the conversation due to a new incoming message.
+      priority:
+        added: '%{user_name} set the priority to %{new_priority}'
+        updated: '%{user_name} changed the priority from %{old_priority} to %{new_priority}'
+        removed: '%{user_name} removed the priority'
       assignee:
         self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "Assigned to %{assignee_name} by %{user_name}"
@@ -167,6 +171,9 @@ ur:
     google_translate:
       name: "Google Translate"
       description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
+    openai:
+      name: "OpenAI"
+      description: "Integrate powerful AI features into Chatwoot by leveraging the GPT models from OpenAI."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 3f017f070..64f9a16a8 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -113,6 +113,10 @@ vi:
         snoozed: "Hội thoại đã được tạm dừng lại bởi %{user_name}"
         auto_resolved: "Hội thoại được đánh dấu là đã giải quyết bởi hệ thống vì %{duration} ngày không hoạt động"
         system_auto_open: System reopened the conversation due to a new incoming message.
+      priority:
+        added: '%{user_name} set the priority to %{new_priority}'
+        updated: '%{user_name} changed the priority from %{old_priority} to %{new_priority}'
+        removed: '%{user_name} removed the priority'
       assignee:
         self_assigned: "%{user_name} phân công chính mình vào hội thoại này"
         assigned: "Chỉ định %{assignee_name} bởi %{user_name}"
@@ -167,6 +171,9 @@ vi:
     google_translate:
       name: "Google Translate"
       description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
+    openai:
+      name: "OpenAI"
+      description: "Integrate powerful AI features into Chatwoot by leveraging the GPT models from OpenAI."
   public_portal:
     search:
       search_placeholder: Tìm bài viết theo tiêu đề hoặc nội dung...
diff --git a/config/locales/zh_CN.yml b/config/locales/zh_CN.yml
index f6ea8d232..a05a89b29 100644
--- a/config/locales/zh_CN.yml
+++ b/config/locales/zh_CN.yml
@@ -113,6 +113,10 @@ zh_CN:
         snoozed: "Conversation was snoozed by %{user_name}"
         auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
         system_auto_open: System reopened the conversation due to a new incoming message.
+      priority:
+        added: '%{user_name} set the priority to %{new_priority}'
+        updated: '%{user_name} changed the priority from %{old_priority} to %{new_priority}'
+        removed: '%{user_name} removed the priority'
       assignee:
         self_assigned: "%{user_name} self-assigned this conversation"
         assigned: "由 %{assignee_name} 分配给 %{user_name}"
@@ -167,6 +171,9 @@ zh_CN:
     google_translate:
       name: "Google Translate"
       description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
+    openai:
+      name: "OpenAI"
+      description: "Integrate powerful AI features into Chatwoot by leveraging the GPT models from OpenAI."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
diff --git a/config/locales/zh_TW.yml b/config/locales/zh_TW.yml
index bc4ce02dd..ea0df3746 100644
--- a/config/locales/zh_TW.yml
+++ b/config/locales/zh_TW.yml
@@ -113,6 +113,10 @@ zh_TW:
         snoozed: "Conversation was snoozed by %{user_name}"
         auto_resolved: "由於對話已經 %{duration} 天沒有新活動，已經被系統標記為完成"
         system_auto_open: System reopened the conversation due to a new incoming message.
+      priority:
+        added: '%{user_name} set the priority to %{new_priority}'
+        updated: '%{user_name} changed the priority from %{old_priority} to %{new_priority}'
+        removed: '%{user_name} removed the priority'
       assignee:
         self_assigned: "%{user_name} 將對話指派給自己"
         assigned: "被%{user_name}分配給%{assignee_name}。"
@@ -167,6 +171,9 @@ zh_TW:
     google_translate:
       name: "Google Translate"
       description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
+    openai:
+      name: "OpenAI"
+      description: "Integrate powerful AI features into Chatwoot by leveraging the GPT models from OpenAI."
   public_portal:
     search:
       search_placeholder: Search for article by title or body...

From c8041392dc4917811e6ff163cf5d5d3550936fa3 Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Tue, 2 May 2023 03:28:39 +0530
Subject: [PATCH 054/101] feat: Enable features on successful subscription
 (#6953)

* feat: Enable features on successful subscription

* fix: Add specs

* disable features for default plan

* Remove mark as cloud customers

---------

Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
---
 .../billing/handle_stripe_event_service.rb    | 20 +++++++++
 .../handle_stripe_event_service_spec.rb       | 43 +++++++++++++++++++
 2 files changed, 63 insertions(+)

diff --git a/enterprise/app/services/enterprise/billing/handle_stripe_event_service.rb b/enterprise/app/services/enterprise/billing/handle_stripe_event_service.rb
index 43b03da8a..e9101b22b 100644
--- a/enterprise/app/services/enterprise/billing/handle_stripe_event_service.rb
+++ b/enterprise/app/services/enterprise/billing/handle_stripe_event_service.rb
@@ -27,6 +27,7 @@ class Enterprise::Billing::HandleStripeEventService
         subscribed_quantity: subscription['quantity']
       }
     )
+    change_plan_features
   end
 
   def process_subscription_deleted
@@ -36,10 +37,23 @@ class Enterprise::Billing::HandleStripeEventService
     Enterprise::Billing::CreateStripeCustomerService.new(account: account).perform
   end
 
+  def change_plan_features
+    if default_plan?
+      account.disable_features(*features_to_update)
+    else
+      account.enable_features(*features_to_update)
+    end
+    account.save!
+  end
+
   def ensure_event_context(event)
     @event = event
   end
 
+  def features_to_update
+    %w[help_center campaigns team_management channel_twitter channel_facebook channel_email]
+  end
+
   def subscription
     @subscription ||= @event.data.object
   end
@@ -52,4 +66,10 @@ class Enterprise::Billing::HandleStripeEventService
     installation_config = InstallationConfig.find_by(name: 'CHATWOOT_CLOUD_PLANS')
     installation_config.value.find { |config| config['product_id'].include?(plan_id) }
   end
+
+  def default_plan?
+    installation_config = InstallationConfig.find_by(name: 'CHATWOOT_CLOUD_PLANS')
+    default_plan = installation_config.value.first
+    @account.custom_attributes['plan_name'] == default_plan['name']
+  end
 end
diff --git a/spec/enterprise/services/enterprise/billing/handle_stripe_event_service_spec.rb b/spec/enterprise/services/enterprise/billing/handle_stripe_event_service_spec.rb
index e3898ffec..0f9a932b1 100644
--- a/spec/enterprise/services/enterprise/billing/handle_stripe_event_service_spec.rb
+++ b/spec/enterprise/services/enterprise/billing/handle_stripe_event_service_spec.rb
@@ -48,6 +48,21 @@ describe Enterprise::Billing::HandleStripeEventService do
                                                      })
     end
 
+    it 'disable features on customer.subscription.updated for default plan' do
+      allow(event).to receive(:type).and_return('customer.subscription.updated')
+      allow(subscription).to receive(:customer).and_return('cus_123')
+      stripe_event_service.new.perform(event: event)
+      expect(account.reload.custom_attributes).to eq({
+                                                       'stripe_customer_id' => 'cus_123',
+                                                       'stripe_price_id' => 'test',
+                                                       'stripe_product_id' => 'plan_id',
+                                                       'plan_name' => 'Hacker',
+                                                       'subscribed_quantity' => '10'
+                                                     })
+      expect(account).not_to be_feature_enabled('channel_email')
+      expect(account).not_to be_feature_enabled('help_center')
+    end
+
     it 'handles customer.subscription.deleted' do
       stripe_customer_service = double
       allow(event).to receive(:type).and_return('customer.subscription.deleted')
@@ -57,4 +72,32 @@ describe Enterprise::Billing::HandleStripeEventService do
       expect(Enterprise::Billing::CreateStripeCustomerService).to have_received(:new).with(account: account)
     end
   end
+
+  describe '#perform for Startups plan' do
+    before do
+      allow(event).to receive(:data).and_return(data)
+      allow(data).to receive(:object).and_return(subscription)
+      allow(subscription).to receive(:[]).with('plan')
+                                         .and_return({
+                                                       'id' => 'test', 'product' => 'plan_id_2', 'name' => 'plan_name'
+                                                     })
+      allow(subscription).to receive(:[]).with('quantity').and_return('10')
+      allow(subscription).to receive(:customer).and_return('cus_123')
+    end
+
+    it 'enable features on customer.subscription.updated' do
+      allow(event).to receive(:type).and_return('customer.subscription.updated')
+      allow(subscription).to receive(:customer).and_return('cus_123')
+      stripe_event_service.new.perform(event: event)
+      expect(account.reload.custom_attributes).to eq({
+                                                       'stripe_customer_id' => 'cus_123',
+                                                       'stripe_price_id' => 'test',
+                                                       'stripe_product_id' => 'plan_id_2',
+                                                       'plan_name' => 'Startups',
+                                                       'subscribed_quantity' => '10'
+                                                     })
+      expect(account).to be_feature_enabled('channel_email')
+      expect(account).to be_feature_enabled('help_center')
+    end
+  end
 end

From 847d7ea082ac6761d3949fd6209f885c5925acf5 Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Tue, 2 May 2023 15:35:26 +0530
Subject: [PATCH 055/101] feat: Add support to uncategorized articles (#6912)

---
 .../api/v1/portals/articles_controller.rb     |  6 ++--
 .../public/api/v1/portals/base_controller.rb  | 13 +++++++
 .../dashboard/helper/portalHelper.js          |  4 +--
 .../helper/specs/portalHelper.spec.js         |  6 ++--
 .../helpcenter/pages/articles/EditArticle.vue |  2 +-
 .../portal/components/SearchSuggestions.vue   |  2 +-
 app/models/article.rb                         |  3 +-
 .../accounts/articles/_article.json.jbuilder  |  1 +
 .../api/v1/portals/_category-block.html.erb   |  6 ++--
 .../v1/portals/_uncategorized-block.html.erb  | 35 +++++++++++++++++++
 .../api/v1/portals/articles/show.html.erb     | 32 +++++++++--------
 .../categories/_category-block.html.erb       |  6 ++--
 .../api/v1/portals/categories/show.html.erb   |  2 +-
 app/views/public/api/v1/portals/show.html.erb |  6 ++++
 config/routes.rb                              |  6 ++--
 .../v1/portals/articles_controller_spec.rb    |  9 ++---
 .../v1/portals/categories_controller_spec.rb  |  8 +++--
 spec/models/article_spec.rb                   |  2 --
 18 files changed, 103 insertions(+), 46 deletions(-)
 create mode 100644 app/views/public/api/v1/portals/_uncategorized-block.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 af5410fc3..b4739e0d1 100644
--- a/app/controllers/public/api/v1/portals/articles_controller.rb
+++ b/app/controllers/public/api/v1/portals/articles_controller.rb
@@ -1,7 +1,7 @@
 class Public::Api::V1::Portals::ArticlesController < Public::Api::V1::Portals::BaseController
   before_action :ensure_custom_domain_request, only: [:show, :index]
   before_action :portal
-  before_action :set_category, except: [:index]
+  before_action :set_category, except: [:index, :show]
   before_action :set_article, only: [:show]
   layout 'portal'
 
@@ -16,7 +16,7 @@ class Public::Api::V1::Portals::ArticlesController < Public::Api::V1::Portals::B
   private
 
   def set_article
-    @article = @category.articles.find(permitted_params[:id])
+    @article = @portal.articles.find_by(slug: permitted_params[:article_slug])
     @article.increment_view_count
     @parsed_content = render_article_content(@article.content)
   end
@@ -39,7 +39,7 @@ class Public::Api::V1::Portals::ArticlesController < Public::Api::V1::Portals::B
   end
 
   def permitted_params
-    params.permit(:slug, :category_slug, :locale, :id)
+    params.permit(:slug, :category_slug, :locale, :id, :article_slug)
   end
 
   def render_article_content(content)
diff --git a/app/controllers/public/api/v1/portals/base_controller.rb b/app/controllers/public/api/v1/portals/base_controller.rb
index 35dbc3ff9..21b605396 100644
--- a/app/controllers/public/api/v1/portals/base_controller.rb
+++ b/app/controllers/public/api/v1/portals/base_controller.rb
@@ -5,6 +5,7 @@ class Public::Api::V1::Portals::BaseController < PublicController
 
   def set_locale(&)
     switch_locale_with_portal(&) if params[:locale].present?
+    switch_locale_with_article(&) if params[:article_slug].present?
   end
 
   def switch_locale_with_portal(&)
@@ -19,4 +20,16 @@ class Public::Api::V1::Portals::BaseController < PublicController
 
     I18n.with_locale(@locale, &)
   end
+
+  def switch_locale_with_article(&)
+    article = Article.find_by(slug: params[:article_slug])
+
+    @locale = if article.category.present?
+                article.category.locale
+              else
+                'en'
+              end
+
+    I18n.with_locale(@locale, &)
+  end
 end
diff --git a/app/javascript/dashboard/helper/portalHelper.js b/app/javascript/dashboard/helper/portalHelper.js
index d93aa9275..648891a0e 100644
--- a/app/javascript/dashboard/helper/portalHelper.js
+++ b/app/javascript/dashboard/helper/portalHelper.js
@@ -8,8 +8,8 @@ export const buildPortalArticleURL = (
   portalSlug,
   categorySlug,
   locale,
-  articleId
+  articleSlug
 ) => {
   const portalURL = buildPortalURL(portalSlug);
-  return `${portalURL}/${locale}/${categorySlug}/${articleId}`;
+  return `${portalURL}/articles/${articleSlug}`;
 };
diff --git a/app/javascript/dashboard/helper/specs/portalHelper.spec.js b/app/javascript/dashboard/helper/specs/portalHelper.spec.js
index 954bdbd58..9c1a47255 100644
--- a/app/javascript/dashboard/helper/specs/portalHelper.spec.js
+++ b/app/javascript/dashboard/helper/specs/portalHelper.spec.js
@@ -20,9 +20,9 @@ describe('PortalHelper', () => {
         hostURL: 'https://app.chatwoot.com',
         helpCenterURL: 'https://help.chatwoot.com',
       };
-      expect(buildPortalArticleURL('handbook', 'culture', 'fr', 1)).toEqual(
-        'https://help.chatwoot.com/hc/handbook/fr/culture/1'
-      );
+      expect(
+        buildPortalArticleURL('handbook', 'culture', 'fr', 'article-slug')
+      ).toEqual('https://help.chatwoot.com/hc/handbook/articles/article-slug');
       window.chatwootConfig = {};
     });
   });
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/articles/EditArticle.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/articles/EditArticle.vue
index a738c1df7..85d9e9700 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/articles/EditArticle.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/articles/EditArticle.vue
@@ -93,7 +93,7 @@ export default {
         slug,
         this.article.category.slug,
         this.article.category.locale,
-        this.article.id
+        this.article.slug
       );
     },
   },
diff --git a/app/javascript/portal/components/SearchSuggestions.vue b/app/javascript/portal/components/SearchSuggestions.vue
index 838d4ba7e..f39107e9e 100644
--- a/app/javascript/portal/components/SearchSuggestions.vue
+++ b/app/javascript/portal/components/SearchSuggestions.vue
@@ -86,7 +86,7 @@ export default {
 
   methods: {
     generateArticleUrl(article) {
-      return `/hc/${article.portal.slug}/${article.category.locale}/${article.category.slug}/${article.id}`;
+      return `/hc/${article.portal.slug}/articles/${article.slug}`;
     },
     handleKeyboardEvent(e) {
       this.processKeyDownEvent(e);
diff --git a/app/models/article.rb b/app/models/article.rb
index d5e33de1d..44fdc8ab4 100644
--- a/app/models/article.rb
+++ b/app/models/article.rb
@@ -41,7 +41,7 @@ class Article < ApplicationRecord
              inverse_of: :associated_articles,
              optional: true
   belongs_to :account
-  belongs_to :category
+  belongs_to :category, optional: true
   belongs_to :portal
   belongs_to :author, class_name: 'User'
 
@@ -49,7 +49,6 @@ class Article < ApplicationRecord
   before_validation :ensure_article_slug
 
   validates :account_id, presence: true
-  validates :category_id, presence: true
   validates :author_id, presence: true
   validates :title, presence: true
   validates :content, presence: true
diff --git a/app/views/api/v1/accounts/articles/_article.json.jbuilder b/app/views/api/v1/accounts/articles/_article.json.jbuilder
index 996b58590..0de240a1a 100644
--- a/app/views/api/v1/accounts/articles/_article.json.jbuilder
+++ b/app/views/api/v1/accounts/articles/_article.json.jbuilder
@@ -1,4 +1,5 @@
 json.id article.id
+json.slug article.slug
 json.title article.title
 json.content article.content
 json.description article.description
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 c309b85e4..b147f27d2 100644
--- a/app/views/public/api/v1/portals/_category-block.html.erb
+++ b/app/views/public/api/v1/portals/_category-block.html.erb
@@ -1,7 +1,7 @@
 <section class="bg-white 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 font-semibold subpixel-antialiased leading-relaxed hover:underline">
-      <a href="/hc/<%= portal.slug %>/<%= category.locale %>/<%= category.slug %>">
+      <a href="/hc/<%= portal.slug %>/<%= category.locale %>/categories/<%= category.slug %>">
         <%= category.name %>
       </a>
     </h3>
@@ -18,7 +18,7 @@
       <% category.articles.published.order(position: :asc).take(5).each do |article| %>
       <a
         class="text-slate-800 hover:underline leading-8"
-        href="/hc/<%= portal.slug %>/<%= category.locale %>/<%= category.slug %>/<%= article.id %>"
+        href="/hc/<%= portal.slug %>/articles/<%= article.slug %>"
       >
         <div class="flex justify-between content-center my-1 -mx-1 p-1 rounded-lg hover:bg-slate-25">
           <%= article.title %>
@@ -42,7 +42,7 @@
   </div>
   <div>
     <a
-      href="/hc/<%= portal.slug %>/<%= category.locale %>/<%= category.slug %>"
+      href="/hc/<%= portal.slug %>/<%= category.locale %>/categories/<%= category.slug %>"
       class="flex flex-row items-center text-base font-medium text-woot-500 hover:underline mt-4"
       style="color: <%= portal.color %>"
     >
diff --git a/app/views/public/api/v1/portals/_uncategorized-block.html.erb b/app/views/public/api/v1/portals/_uncategorized-block.html.erb
new file mode 100644
index 000000000..15cfb6004
--- /dev/null
+++ b/app/views/public/api/v1/portals/_uncategorized-block.html.erb
@@ -0,0 +1,35 @@
+<section class="bg-white 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 font-semibold subpixel-antialiased leading-relaxed hover:underline">
+      <%= category %>
+    </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>
+  <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 hover:underline leading-8"
+      href="/hc/<%= portal.slug %>/articles/<%= article.slug %>"
+    >
+      <div class="flex justify-between content-center my-1 -mx-1 p-1 rounded-lg hover:bg-slate-25">
+        <%= article.title %>
+        <span class="flex items-center">
+          <svg
+            class="w-4 h-4 fill-current text-slate-700"
+            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>
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 3b7d06f7b..3ad8b5e9a 100644
--- a/app/views/public/api/v1/portals/articles/show.html.erb
+++ b/app/views/public/api/v1/portals/articles/show.html.erb
@@ -13,21 +13,23 @@
 
 <div class="bg-gradient-to-b from-white to-slate-50">
   <div class="max-w-5xl px-8 lg:px-4 pt-8 pb-16 mx-auto space-y-4 w-full">
-    <div>
-      <a
-        class="text-slate-700 hover:underline leading-8 text-sm font-medium"
-        href="/hc/<%= @portal.slug %>/<%= @article.category.locale %>"
-      >
-        <%= I18n.t('public_portal.common.home') %>
-      </a>
-      <span class="text-xs text-slate-600 px-1">/</span>
-      <a
-        class="text-slate-700 hover:underline leading-8 text-sm font-medium"
-        href="/hc/<%= @portal.slug %>/<%= @article.category.locale %>/<%= @article.category.slug %>"
-      >
-        <%= @article.category.name %>
-      </a>
-    </div>
+    <% if @article.category.present? %>
+      <div>
+        <a
+          class="text-slate-700 hover:underline leading-8 text-sm font-medium"
+          href="/hc/<%= @portal.slug %>/<%= @article.category.locale %>"
+        >
+          <%= I18n.t('public_portal.common.home') %>
+        </a>
+        <span class="text-xs text-slate-600 px-1">/</span>
+        <a
+          class="text-slate-700 hover:underline leading-8 text-sm font-medium"
+          href="/hc/<%= @portal.slug %>/<%= @article.category.locale %>/categories/<%= @article.category.slug %>"
+        >
+          <%= @article.category.name %>
+        </a>
+      </div>
+    <% end %>
     <h1 class="text-3xl font-bold md:tracking-normal leading-snug md:text-5xl text-slate-900">
       <%= @article.title %>
     </h1>
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 16db2c13c..7c8eced44 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="bg-white 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 font-semibold subpixel-antialiased leading-relaxed hover:underline"">
-     <a href="/hc/<%= portal.slug %>/<%= category.locale %>/<%= category.slug %>">
+     <a href="/hc/<%= portal.slug %>/<%= category.locale %>/categories/<%= category.slug %>">
       <%= category.name %>
     </a>
     </h3>
@@ -20,7 +20,7 @@
         <div class="flex justify-between content-center h-8 my-1">
           <a
             class="text-slate-800 hover:underline leading-8"
-            href="/hc/<%= portal.slug %>/<%= category.locale %>/<%= category.slug %>/<%= article.id %>"
+            href="/hc/<%= portal.slug %>/articles/<%= article.slug %>"
           >
             <%= article.title %>
           </a>
@@ -45,7 +45,7 @@
   </div>
   <div>
     <a
-      href="/hc/<%= portal.slug %>/<%= category.locale %>/<%= category.slug %>"
+      href="/hc/<%= portal.slug %>/<%= category.locale %>/categories/<%= category.slug %>"
       class="flex flex-row items-center text-base font-medium text-woot-600 hover:text-slate-900 hover:underline mt-4"
     >
       <%= I18n.t('public_portal.common.view_all_articles') %>
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 5ca709719..f8b36e4da 100644
--- a/app/views/public/api/v1/portals/categories/show.html.erb
+++ b/app/views/public/api/v1/portals/categories/show.html.erb
@@ -35,7 +35,7 @@
     <% @category.articles.published.order(:position).each do |article| %>
       <a
         class="text-slate-800 flex justify-between content-center mb-4 py-2"
-        href="/hc/<%= @portal.slug %>/<%= @category.locale %>/<%= @category.slug %>/<%= article.id %>"
+        href="/hc/<%= @portal.slug %>/articles/<%= article.slug %>"
       >
         <div>
           <p class="font-medium mb-2 hover:underline"><%= article.title %></p>
diff --git a/app/views/public/api/v1/portals/show.html.erb b/app/views/public/api/v1/portals/show.html.erb
index fe3cf5d9d..a5f9f43fa 100644
--- a/app/views/public/api/v1/portals/show.html.erb
+++ b/app/views/public/api/v1/portals/show.html.erb
@@ -5,4 +5,10 @@
       <%= 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">
+    <% if @portal.articles.where(status: :published, category_id: nil).order(position: :asc) %>
+      <%= render "public/api/v1/portals/uncategorized-block", category: "Uncategorized", portal: @portal %>
+    <% end %>
+  </div>
 </div>
diff --git a/config/routes.rb b/config/routes.rb
index 590522844..3cb03a1de 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -338,9 +338,9 @@ Rails.application.routes.draw do
   get 'hc/:slug/:locale', to: 'public/api/v1/portals#show'
   get 'hc/:slug/:locale/articles', to: 'public/api/v1/portals/articles#index'
   get 'hc/:slug/:locale/categories', to: 'public/api/v1/portals/categories#index'
-  get 'hc/:slug/:locale/:category_slug', to: 'public/api/v1/portals/categories#show'
-  get 'hc/:slug/:locale/:category_slug/articles', to: 'public/api/v1/portals/articles#index'
-  get 'hc/:slug/:locale/:category_slug/:id', to: 'public/api/v1/portals/articles#show'
+  get 'hc/:slug/:locale/categories/:category_slug', to: 'public/api/v1/portals/categories#show'
+  get 'hc/:slug/:locale/categories/:category_slug/articles', to: 'public/api/v1/portals/articles#index'
+  get 'hc/:slug/articles/:article_slug', to: 'public/api/v1/portals/articles#show'
 
   # ----------------------------------------------------------------------
   # Used in mailer templates
diff --git a/spec/controllers/public/api/v1/portals/articles_controller_spec.rb b/spec/controllers/public/api/v1/portals/articles_controller_spec.rb
index a51b7365e..079a85bc1 100644
--- a/spec/controllers/public/api/v1/portals/articles_controller_spec.rb
+++ b/spec/controllers/public/api/v1/portals/articles_controller_spec.rb
@@ -9,6 +9,7 @@ RSpec.describe 'Public Articles API', type: :request do
   let!(:article) { create(:article, category: category, portal: portal, account_id: account.id, author_id: agent.id) }
 
   before do
+    ENV['HELPCENTER_URL'] = ENV.fetch('FRONTEND_URL', nil)
     create(:article, category: category, portal: portal, account_id: account.id, author_id: agent.id)
     create(:article, category: category, portal: portal, account_id: account.id, author_id: agent.id, associated_article_id: article.id)
     create(:article, category: category_2, portal: portal, account_id: account.id, author_id: agent.id, associated_article_id: article.id)
@@ -17,7 +18,7 @@ RSpec.describe 'Public Articles API', type: :request do
 
   describe 'GET /public/api/v1/portals/:slug/articles' do
     it 'Fetch all articles in the portal' do
-      get "/hc/#{portal.slug}/#{category.locale}/#{category.slug}/articles"
+      get "/hc/#{portal.slug}/#{category.locale}/categories/#{category.slug}/articles"
 
       expect(response).to have_http_status(:success)
     end
@@ -31,7 +32,7 @@ RSpec.describe 'Public Articles API', type: :request do
                         content: 'this is some test and funny content')
       expect(article2.id).not_to be_nil
 
-      get "/hc/#{portal.slug}/#{category.locale}/#{category.slug}/articles",
+      get "/hc/#{portal.slug}/#{category.locale}/categories/#{category.slug}/articles",
           headers: agent.create_new_auth_token,
           params: { query: 'funny' }
       expect(response).to have_http_status(:success)
@@ -40,14 +41,14 @@ RSpec.describe 'Public Articles API', type: :request do
 
   describe 'GET /public/api/v1/portals/:slug/articles/:id' do
     it 'Fetch article with the id' do
-      get "/hc/#{portal.slug}/#{category.locale}/#{category.slug}/#{article.id}"
+      get "/hc/#{portal.slug}/articles/#{article.slug}"
       expect(response).to have_http_status(:success)
       expect(article.reload.views).to eq 1
     end
 
     it 'returns the article with the id with a different locale' do
       article_in_locale = create(:article, category: category_2, portal: portal, account_id: account.id, author_id: agent.id)
-      get "/hc/#{portal.slug}/#{category_2.locale}/#{category_2.slug}/#{article_in_locale.id}"
+      get "/hc/#{portal.slug}/articles/#{article_in_locale.slug}"
       expect(response).to have_http_status(:success)
     end
   end
diff --git a/spec/controllers/public/api/v1/portals/categories_controller_spec.rb b/spec/controllers/public/api/v1/portals/categories_controller_spec.rb
index db3c9230f..2e1d83eea 100644
--- a/spec/controllers/public/api/v1/portals/categories_controller_spec.rb
+++ b/spec/controllers/public/api/v1/portals/categories_controller_spec.rb
@@ -12,7 +12,9 @@ RSpec.describe 'Public Categories API', type: :request do
 
   describe 'GET /public/api/v1/portals/:portal_slug/categories' do
     it 'Fetch all categories in the portal' do
-      get "/hc/#{portal.slug}/categories"
+      category = portal.categories.first
+
+      get "/hc/#{portal.slug}/#{category.locale}/categories"
 
       expect(response).to have_http_status(:success)
     end
@@ -20,9 +22,9 @@ RSpec.describe 'Public Categories API', type: :request do
 
   describe 'GET /public/api/v1/portals/:portal_slug/categories/:slug' do
     it 'Fetch category with the slug' do
-      category_locale = 'en'
+      category = portal.categories.first
 
-      get "/hc/#{portal.slug}/#{category_locale}/categories"
+      get "/hc/#{portal.slug}/#{category.locale}/categories/#{category.slug}"
 
       expect(response).to have_http_status(:success)
     end
diff --git a/spec/models/article_spec.rb b/spec/models/article_spec.rb
index dac5a3d52..1520b86a7 100644
--- a/spec/models/article_spec.rb
+++ b/spec/models/article_spec.rb
@@ -3,7 +3,6 @@ require 'rails_helper'
 RSpec.describe Article, type: :model do
   context 'with validations' do
     it { is_expected.to validate_presence_of(:account_id) }
-    it { is_expected.to validate_presence_of(:category_id) }
     it { is_expected.to validate_presence_of(:author_id) }
     it { is_expected.to validate_presence_of(:title) }
     it { is_expected.to validate_presence_of(:content) }
@@ -11,7 +10,6 @@ RSpec.describe Article, type: :model do
 
   describe 'associations' do
     it { is_expected.to belong_to(:account) }
-    it { is_expected.to belong_to(:category) }
     it { is_expected.to belong_to(:author) }
   end
 

From 937338e3eaf1339400badf5eea40d932e5109758 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 May 2023 14:13:04 +0530
Subject: [PATCH 056/101] chore(deps): bump audited from 5.2.0 to 5.3.3 (#7016)

Bumps [audited](https://github.com/collectiveidea/audited) from 5.2.0 to 5.3.3.
- [Release notes](https://github.com/collectiveidea/audited/releases)
- [Changelog](https://github.com/collectiveidea/audited/blob/main/CHANGELOG.md)
- [Commits](https://github.com/collectiveidea/audited/compare/v5.2.0...v5.3.3)

---
updated-dependencies:
- dependency-name: audited
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Gemfile      | 2 +-
 Gemfile.lock | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 7a61c39fe..da18bcc00 100644
--- a/Gemfile
+++ b/Gemfile
@@ -155,7 +155,7 @@ gem 'lograge', '~> 0.12.0', require: false
 # worked with microsoft refresh token
 gem 'omniauth-oauth2'
 
-gem 'audited', '~> 5.2'
+gem 'audited', '~> 5.3'
 
 # need for google auth
 gem 'omniauth'
diff --git a/Gemfile.lock b/Gemfile.lock
index 3fa0dddca..4c71e271b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -90,8 +90,9 @@ GEM
       rake (>= 10.4, < 14.0)
     ast (2.4.2)
     attr_extras (6.2.5)
-    audited (5.2.0)
+    audited (5.3.3)
       activerecord (>= 5.0, < 7.1)
+      request_store (~> 1.2)
     aws-eventstream (1.2.0)
     aws-partitions (1.605.0)
     aws-sdk-core (3.131.2)
@@ -355,7 +356,7 @@ GEM
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
     httpclient (2.8.3)
-    i18n (1.12.0)
+    i18n (1.13.0)
       concurrent-ruby (~> 1.0)
     image_processing (1.12.2)
       mini_magick (>= 4.9.5, < 5)
@@ -764,7 +765,7 @@ GEM
     working_hours (1.4.1)
       activesupport (>= 3.2)
       tzinfo
-    zeitwerk (2.6.7)
+    zeitwerk (2.6.8)
 
 PLATFORMS
   arm64-darwin-20
@@ -781,7 +782,7 @@ DEPENDENCIES
   administrate
   annotate
   attr_extras
-  audited (~> 5.2)
+  audited (~> 5.3)
   aws-sdk-s3
   azure-storage-blob
   barnes

From 0d014d5d4b98450ca810d691362b7df860e7174c Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Wed, 3 May 2023 14:36:55 +0530
Subject: [PATCH 057/101] chore: Bump utils from `0.0.15` to `0.0.16` (#7022)

---
 .../dashboard/helper/messageHelper.js         |  66 -------
 .../helper/specs/messageHelper.spec.js        | 169 ------------------
 package.json                                  |   2 +-
 yarn.lock                                     |   8 +-
 4 files changed, 5 insertions(+), 240 deletions(-)
 delete mode 100644 app/javascript/dashboard/helper/messageHelper.js
 delete mode 100644 app/javascript/dashboard/helper/specs/messageHelper.spec.js

diff --git a/app/javascript/dashboard/helper/messageHelper.js b/app/javascript/dashboard/helper/messageHelper.js
deleted file mode 100644
index eb2042066..000000000
--- a/app/javascript/dashboard/helper/messageHelper.js
+++ /dev/null
@@ -1,66 +0,0 @@
-const MESSAGE_VARIABLES_REGEX = /{{(.*?)}}/g;
-export const replaceVariablesInMessage = ({ message, variables }) => {
-  return message.replace(MESSAGE_VARIABLES_REGEX, (match, replace) => {
-    return variables[replace.trim()]
-      ? variables[replace.trim().toLowerCase()]
-      : '';
-  });
-};
-
-export const capitalizeName = name => {
-  return (name || '').replace(/\b(\w)/g, s => s.toUpperCase());
-};
-
-const skipCodeBlocks = str => str.replace(/```(?:.|\n)+?```/g, '');
-
-export const getFirstName = ({ user }) => {
-  const firstName = user?.name ? user.name.split(' ').shift() : '';
-  return capitalizeName(firstName);
-};
-
-export const getLastName = ({ user }) => {
-  if (user && user.name) {
-    const lastName =
-      user.name.split(' ').length > 1 ? user.name.split(' ').pop() : '';
-    return capitalizeName(lastName);
-  }
-  return '';
-};
-
-export const getMessageVariables = ({ conversation }) => {
-  const {
-    meta: { assignee = {}, sender = {} },
-    id,
-  } = conversation;
-
-  return {
-    'contact.name': capitalizeName(sender?.name),
-    'contact.first_name': getFirstName({ user: sender }),
-    'contact.last_name': getLastName({ user: sender }),
-    'contact.email': sender?.email,
-    'contact.phone': sender?.phone_number,
-    'contact.id': sender?.id,
-    'conversation.id': id,
-    'agent.name': capitalizeName(assignee?.name || ''),
-    'agent.first_name': getFirstName({ user: assignee }),
-    'agent.last_name': getLastName({ user: assignee }),
-    'agent.email': assignee?.email ?? '',
-  };
-};
-
-export const getUndefinedVariablesInMessage = ({ message, variables }) => {
-  const messageWithOutCodeBlocks = skipCodeBlocks(message);
-  const matches = messageWithOutCodeBlocks.match(MESSAGE_VARIABLES_REGEX);
-  if (!matches) return [];
-
-  return matches
-    .map(match => {
-      return match
-        .replace('{{', '')
-        .replace('}}', '')
-        .trim();
-    })
-    .filter(variable => {
-      return !variables[variable];
-    });
-};
diff --git a/app/javascript/dashboard/helper/specs/messageHelper.spec.js b/app/javascript/dashboard/helper/specs/messageHelper.spec.js
deleted file mode 100644
index 5aa29f616..000000000
--- a/app/javascript/dashboard/helper/specs/messageHelper.spec.js
+++ /dev/null
@@ -1,169 +0,0 @@
-import {
-  replaceVariablesInMessage,
-  getFirstName,
-  getLastName,
-  getMessageVariables,
-  getUndefinedVariablesInMessage,
-  capitalizeName,
-} from '../messageHelper';
-
-const variables = {
-  'contact.name': 'John Doe',
-  'contact.first_name': 'John',
-  'contact.last_name': 'Doe',
-  'contact.email': 'john.p@example.com',
-  'contact.phone': '1234567890',
-  'conversation.id': 1,
-  'agent.first_name': 'Samuel',
-  'agent.last_name': 'Smith',
-  'agent.email': 'samuel@gmail.com',
-};
-
-describe('#replaceVariablesInMessage', () => {
-  it('returns the message with variable name', () => {
-    const message =
-      'No issues. Hey {{contact.first_name}}, we will send the reset instructions to your email {{ contact.email}}. The {{ agent.first_name }} {{ agent.last_name }} will take care of everything. Your conversation id is {{ conversation.id }}.';
-    expect(replaceVariablesInMessage({ message, variables })).toBe(
-      'No issues. Hey John, we will send the reset instructions to your email john.p@example.com. The Samuel Smith will take care of everything. Your conversation id is 1.'
-    );
-  });
-
-  it('returns the message with variable name having white space', () => {
-    const message = 'hey {{contact.name}} how may I help you?';
-    expect(replaceVariablesInMessage({ message, variables })).toBe(
-      'hey John Doe how may I help you?'
-    );
-  });
-
-  it('returns the message with variable email', () => {
-    const message =
-      'No issues. We will send the reset instructions to your email at {{contact.email}}';
-    expect(replaceVariablesInMessage({ message, variables })).toBe(
-      'No issues. We will send the reset instructions to your email at john.p@example.com'
-    );
-  });
-
-  it('returns the message with multiple variables', () => {
-    const message =
-      'hey {{ contact.name }}, no issues. We will send the reset instructions to your email at {{contact.email}}';
-    expect(replaceVariablesInMessage({ message, variables })).toBe(
-      'hey John Doe, no issues. We will send the reset instructions to your email at john.p@example.com'
-    );
-  });
-
-  it('returns the message if the variable is not present in variables', () => {
-    const message = 'Please dm me at {{contact.twitter}}';
-    expect(replaceVariablesInMessage({ message, variables })).toBe(
-      'Please dm me at '
-    );
-  });
-});
-
-describe('#getFirstName', () => {
-  it('returns the first name of the contact', () => {
-    const assignee = { name: 'John Doe' };
-    expect(getFirstName({ user: assignee })).toBe('John');
-  });
-
-  it('returns the first name of the contact with multiple names', () => {
-    const assignee = { name: 'John Doe Smith' };
-    expect(getFirstName({ user: assignee })).toBe('John');
-  });
-});
-
-describe('#getLastName', () => {
-  it('returns the last name of the contact', () => {
-    const assignee = { name: 'John Doe' };
-    expect(getLastName({ user: assignee })).toBe('Doe');
-  });
-
-  it('returns the last name of the contact with multiple names', () => {
-    const assignee = { name: 'John Doe Smith' };
-    expect(getLastName({ user: assignee })).toBe('Smith');
-  });
-});
-
-describe('#getMessageVariables', () => {
-  it('returns the variables', () => {
-    const conversation = {
-      meta: {
-        assignee: {
-          name: 'samuel Smith',
-          email: 'samuel@example.com',
-        },
-        sender: {
-          name: 'john Doe',
-          email: 'john.doe@gmail.com',
-          phone_number: '1234567890',
-        },
-      },
-      id: 1,
-    };
-    expect(getMessageVariables({ conversation })).toEqual({
-      'contact.name': 'John Doe',
-      'contact.first_name': 'John',
-      'contact.last_name': 'Doe',
-      'contact.email': 'john.doe@gmail.com',
-      'contact.phone': '1234567890',
-      'conversation.id': 1,
-      'agent.name': 'Samuel Smith',
-      'agent.first_name': 'Samuel',
-      'agent.last_name': 'Smith',
-      'agent.email': 'samuel@example.com',
-    });
-  });
-});
-
-describe('#getUndefinedVariablesInMessage', () => {
-  it('returns the undefined variables', () => {
-    const message = 'Please dm me at {{contact.twitter}}';
-    expect(
-      getUndefinedVariablesInMessage({ message, variables }).length
-    ).toEqual(1);
-    expect(getUndefinedVariablesInMessage({ message, variables })).toEqual(
-      expect.arrayContaining(['contact.twitter'])
-    );
-  });
-  it('skip variables in string with code blocks', () => {
-    const message =
-      'hey {{contact_name}} how are you? ``` code: {{contact_name}} ```';
-    const undefinedVariables = getUndefinedVariablesInMessage({
-      message,
-      variables,
-    });
-    expect(undefinedVariables.length).toEqual(1);
-    expect(undefinedVariables).toEqual(
-      expect.arrayContaining(['contact_name'])
-    );
-  });
-});
-
-describe('#capitalizeName', () => {
-  it('capitalize name if name is passed', () => {
-    const string = 'john peter';
-    expect(capitalizeName(string)).toBe('John Peter');
-  });
-  it('returns empty string if the name is null', () => {
-    expect(capitalizeName(null)).toBe('');
-  });
-  it('capitalize first name if full name is passed', () => {
-    const string = 'john Doe';
-    expect(capitalizeName(string)).toBe('John Doe');
-  });
-  it('returns empty string if the string is empty', () => {
-    const string = '';
-    expect(capitalizeName(string)).toBe('');
-  });
-  it('capitalize last name if last name is passed', () => {
-    const string = 'john doe';
-    expect(capitalizeName(string)).toBe('John Doe');
-  });
-  it('capitalize first name if first name is passed', () => {
-    const string = 'john';
-    expect(capitalizeName(string)).toBe('John');
-  });
-  it('capitalize last name if last name is passed', () => {
-    const string = 'doe';
-    expect(capitalizeName(string)).toBe('Doe');
-  });
-});
diff --git a/package.json b/package.json
index 25d72e596..be78d6cc2 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
   "dependencies": {
     "@braid/vue-formulate": "^2.5.2",
     "@chatwoot/prosemirror-schema": "https://github.com/chatwoot/prosemirror-schema.git",
-    "@chatwoot/utils": "^0.0.15",
+    "@chatwoot/utils": "^0.0.16",
     "@hcaptcha/vue-hcaptcha": "^0.3.2",
     "@june-so/analytics-next": "^1.36.5",
     "@rails/actioncable": "6.1.3",
diff --git a/yarn.lock b/yarn.lock
index da92bf82c..fe2a55f3f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1410,10 +1410,10 @@
     prosemirror-utils "^0.9.6"
     prosemirror-view "^1.17.2"
 
-"@chatwoot/utils@^0.0.15":
-  version "0.0.15"
-  resolved "https://registry.yarnpkg.com/@chatwoot/utils/-/utils-0.0.15.tgz#7de3055c3ec269201679aef2351f43a2a250baad"
-  integrity sha512-JYH6cEaiPVjXHTbSAyPkrS3gOyR0W7vpn/9uJfBcWg2m8d5uWi0LXmvX77pq/IsMNK0KK7zqUUkbT0E8VKJDlQ==
+"@chatwoot/utils@^0.0.16":
+  version "0.0.16"
+  resolved "https://registry.yarnpkg.com/@chatwoot/utils/-/utils-0.0.16.tgz#84a0ade7f0377a3c7a95b2e5fa3c3b3d7d045339"
+  integrity sha512-PcWEJ+LeJlDkjOOCHyi7wLaaBsPpedDh1jBblkqOYnt8PvKHSttq/Fusi6u6EcxPhIw1umgq5A/k8sWozmZ4iQ==
   dependencies:
     date-fns "^2.29.1"
 

From b081fe08b8ca9d9a768f98371d252a2a99475fef Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Wed, 3 May 2023 15:18:20 +0530
Subject: [PATCH 058/101] feat: whatsapp duplicate message (#7004)

---
 .../whatsapp/incoming_message_base_service.rb | 11 +++----
 .../incoming_message_service_helpers.rb       | 17 ++++++++++
 lib/redis/redis_keys.rb                       |  2 ++
 .../whatsapp/incoming_message_service_spec.rb | 31 +++++++++++++++++++
 4 files changed, 55 insertions(+), 6 deletions(-)

diff --git a/app/services/whatsapp/incoming_message_base_service.rb b/app/services/whatsapp/incoming_message_base_service.rb
index 15357f75b..4bbc2f206 100644
--- a/app/services/whatsapp/incoming_message_base_service.rb
+++ b/app/services/whatsapp/incoming_message_base_service.rb
@@ -20,13 +20,15 @@ class Whatsapp::IncomingMessageBaseService
 
   def process_messages
     # message allready exists so we don't need to process
-    return if find_message_by_source_id(@processed_params[:messages].first[:id])
+    return if find_message_by_source_id(@processed_params[:messages].first[:id]) || message_under_process?
 
+    cache_message_source_id_in_redis
     set_contact
     return unless @contact
 
     set_conversation
     create_messages
+    clear_message_source_id_from_redis
   end
 
   def process_statuses
@@ -53,11 +55,8 @@ class Whatsapp::IncomingMessageBaseService
     log_error(message) && return if error_webhook_event?(message)
 
     process_in_reply_to(message)
-    if message_type == 'contacts'
-      create_contact_messages(message)
-    else
-      create_regular_message(message)
-    end
+
+    message_type == 'contacts' ? create_contact_messages(message) : create_regular_message(message)
   end
 
   def create_contact_messages(message)
diff --git a/app/services/whatsapp/incoming_message_service_helpers.rb b/app/services/whatsapp/incoming_message_service_helpers.rb
index a5226fbab..ad2fccd03 100644
--- a/app/services/whatsapp/incoming_message_service_helpers.rb
+++ b/app/services/whatsapp/incoming_message_service_helpers.rb
@@ -104,4 +104,21 @@ module Whatsapp::IncomingMessageServiceHelpers
 
     @message = Message.find_by(source_id: source_id)
   end
+
+  def message_under_process?
+    key = format(Redis::RedisKeys::MESSAGE_SOURCE_KEY, id: @processed_params[:messages].first[:id])
+    Redis::Alfred.get(key)
+  end
+
+  def cache_message_source_id_in_redis
+    return if @processed_params.try(:[], :messages).blank?
+
+    key = format(Redis::RedisKeys::MESSAGE_SOURCE_KEY, id: @processed_params[:messages].first[:id])
+    ::Redis::Alfred.setex(key, true)
+  end
+
+  def clear_message_source_id_from_redis
+    key = format(Redis::RedisKeys::MESSAGE_SOURCE_KEY, id: @processed_params[:messages].first[:id])
+    ::Redis::Alfred.delete(key)
+  end
 end
diff --git a/lib/redis/redis_keys.rb b/lib/redis/redis_keys.rb
index 13c24cdb4..67e709e52 100644
--- a/lib/redis/redis_keys.rb
+++ b/lib/redis/redis_keys.rb
@@ -29,4 +29,6 @@ module Redis::RedisKeys
   ## Internal Installation related keys
   CHATWOOT_INSTALLATION_ONBOARDING = 'CHATWOOT_INSTALLATION_ONBOARDING'.freeze
   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
 end
diff --git a/spec/services/whatsapp/incoming_message_service_spec.rb b/spec/services/whatsapp/incoming_message_service_spec.rb
index b2bd87d18..c141f869e 100644
--- a/spec/services/whatsapp/incoming_message_service_spec.rb
+++ b/spec/services/whatsapp/incoming_message_service_spec.rb
@@ -308,5 +308,36 @@ describe Whatsapp::IncomingMessageService do
         end
       end
     end
+
+    describe 'when message processing is in progress' do
+      it 'ignores the current message creation request' do
+        params = { 'contacts' => [{ 'profile' => { 'name' => 'Kedar' }, 'wa_id' => '919746334593' }],
+                   'messages' => [{ 'from' => '919446284490',
+                                    'id' => 'wamid.SDFADSf23sfasdafasdfa',
+                                    'timestamp' => '1675823265',
+                                    'type' => 'contacts',
+                                    'contacts' => [
+                                      {
+                                        'name' => { 'formatted_name' => 'Apple Inc.' },
+                                        'phones' => [{ 'phone' => '+911800', 'type' => 'MAIN' }]
+                                      },
+                                      { 'name' => { 'first_name' => 'Chatwoot', 'formatted_name' => 'Chatwoot' },
+                                        'phones' => [{ 'phone' => '+1 (415) 341-8386' }] }
+                                    ] }] }.with_indifferent_access
+
+        expect(Message.find_by(source_id: 'wamid.SDFADSf23sfasdafasdfa')).not_to be_present
+        key = format(Redis::RedisKeys::MESSAGE_SOURCE_KEY, id: 'wamid.SDFADSf23sfasdafasdfa')
+
+        ::Redis::Alfred.setex(key, true)
+        expect(::Redis::Alfred.get(key)).to be_truthy
+
+        described_class.new(inbox: whatsapp_channel.inbox, params: params).perform
+        expect(whatsapp_channel.inbox.messages.count).to eq(0)
+        expect(Message.find_by(source_id: 'wamid.SDFADSf23sfasdafasdfa')).not_to be_present
+
+        expect(::Redis::Alfred.get(key)).to be_truthy
+        ::Redis::Alfred.delete(key)
+      end
+    end
   end
 end

From 85e57c2e94efcd5e39a1f93911463ec3d14696a7 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Thu, 4 May 2023 15:44:16 +0530
Subject: [PATCH 059/101] chore: Reorganize Sidekiq Queues (#6976)

- Rearrange and reprioritize current sidekiq queues
- Trim the unnecessary queues

ref: https://linear.app/chatwoot/issue/CW-1480/chore-run-all-sidekiq-jobs-async
---
 app/jobs/action_cable_broadcast_job.rb        |  2 +-
 app/jobs/agent_bots/csml_job.rb               |  2 +-
 app/jobs/agent_bots/webhook_job.rb            |  2 +-
 app/jobs/agents/destroy_job.rb                |  2 +-
 app/jobs/avatar/avatar_from_url_job.rb        |  2 +-
 .../conversations/activity_message_job.rb     |  2 +-
 app/jobs/delete_object_job.rb                 |  2 +-
 app/jobs/event_dispatcher_job.rb              |  2 +-
 app/jobs/hook_job.rb                          |  2 +-
 .../inboxes/fetch_imap_email_inboxes_job.rb   |  2 +-
 app/jobs/inboxes/fetch_imap_emails_job.rb     |  2 +-
 app/jobs/webhook_job.rb                       |  2 +-
 app/models/custom_attribute_definition.rb     |  4 +--
 config/sidekiq.yml                            | 31 +++++++++----------
 spec/jobs/agent_bots/webhook_job_spec.rb      |  2 +-
 spec/jobs/agents/destroy_job_spec.rb          |  2 +-
 spec/jobs/avatar/avatar_from_url_job_spec.rb  |  2 +-
 spec/jobs/delete_object_job_spec.rb           |  2 +-
 spec/jobs/event_dispatcher_job_spec.rb        |  2 +-
 spec/jobs/hook_job_spec.rb                    |  2 +-
 .../fetch_imap_email_inboxes_job_spec.rb      |  2 +-
 .../inboxes/fetch_imap_emails_job_spec.rb     |  2 +-
 spec/jobs/webhook_job_spec.rb                 |  2 +-
 23 files changed, 38 insertions(+), 39 deletions(-)

diff --git a/app/jobs/action_cable_broadcast_job.rb b/app/jobs/action_cable_broadcast_job.rb
index aedae2c46..b1208a97c 100644
--- a/app/jobs/action_cable_broadcast_job.rb
+++ b/app/jobs/action_cable_broadcast_job.rb
@@ -1,5 +1,5 @@
 class ActionCableBroadcastJob < ApplicationJob
-  queue_as :default
+  queue_as :critical
 
   def perform(members, event_name, data)
     members.each do |member|
diff --git a/app/jobs/agent_bots/csml_job.rb b/app/jobs/agent_bots/csml_job.rb
index 1a65bf713..d0975e364 100644
--- a/app/jobs/agent_bots/csml_job.rb
+++ b/app/jobs/agent_bots/csml_job.rb
@@ -1,5 +1,5 @@
 class AgentBots::CsmlJob < ApplicationJob
-  queue_as :bots
+  queue_as :high
 
   def perform(event, agent_bot, message)
     event_data = { message: message }
diff --git a/app/jobs/agent_bots/webhook_job.rb b/app/jobs/agent_bots/webhook_job.rb
index bfad365bc..d0c4e7959 100644
--- a/app/jobs/agent_bots/webhook_job.rb
+++ b/app/jobs/agent_bots/webhook_job.rb
@@ -1,3 +1,3 @@
 class AgentBots::WebhookJob < WebhookJob
-  queue_as :bots
+  queue_as :high
 end
diff --git a/app/jobs/agents/destroy_job.rb b/app/jobs/agents/destroy_job.rb
index 1c40827b6..8596ca1cc 100644
--- a/app/jobs/agents/destroy_job.rb
+++ b/app/jobs/agents/destroy_job.rb
@@ -1,5 +1,5 @@
 class Agents::DestroyJob < ApplicationJob
-  queue_as :default
+  queue_as :low
 
   def perform(account, user)
     ActiveRecord::Base.transaction do
diff --git a/app/jobs/avatar/avatar_from_url_job.rb b/app/jobs/avatar/avatar_from_url_job.rb
index a25698bc1..f1efea225 100644
--- a/app/jobs/avatar/avatar_from_url_job.rb
+++ b/app/jobs/avatar/avatar_from_url_job.rb
@@ -1,5 +1,5 @@
 class Avatar::AvatarFromUrlJob < ApplicationJob
-  queue_as :default
+  queue_as :low
 
   def perform(avatarable, avatar_url)
     return unless avatarable.respond_to?(:avatar)
diff --git a/app/jobs/conversations/activity_message_job.rb b/app/jobs/conversations/activity_message_job.rb
index 54f631ee6..aa532e5b2 100644
--- a/app/jobs/conversations/activity_message_job.rb
+++ b/app/jobs/conversations/activity_message_job.rb
@@ -1,5 +1,5 @@
 class Conversations::ActivityMessageJob < ApplicationJob
-  queue_as :default
+  queue_as :high
 
   def perform(conversation, message_params)
     conversation.messages.create!(message_params)
diff --git a/app/jobs/delete_object_job.rb b/app/jobs/delete_object_job.rb
index e478cd374..6f6e13a01 100644
--- a/app/jobs/delete_object_job.rb
+++ b/app/jobs/delete_object_job.rb
@@ -1,5 +1,5 @@
 class DeleteObjectJob < ApplicationJob
-  queue_as :default
+  queue_as :low
 
   def perform(object)
     object.destroy!
diff --git a/app/jobs/event_dispatcher_job.rb b/app/jobs/event_dispatcher_job.rb
index c08d52d74..2e6c807ea 100644
--- a/app/jobs/event_dispatcher_job.rb
+++ b/app/jobs/event_dispatcher_job.rb
@@ -1,5 +1,5 @@
 class EventDispatcherJob < ApplicationJob
-  queue_as :events
+  queue_as :critical
 
   def perform(event_name, timestamp, data)
     Rails.configuration.dispatcher.async_dispatcher.publish_event(event_name, timestamp, data)
diff --git a/app/jobs/hook_job.rb b/app/jobs/hook_job.rb
index bf0c7a1f9..9d54462e2 100644
--- a/app/jobs/hook_job.rb
+++ b/app/jobs/hook_job.rb
@@ -1,5 +1,5 @@
 class HookJob < ApplicationJob
-  queue_as :integrations
+  queue_as :medium
 
   def perform(hook, event_name, event_data = {})
     case hook.app_id
diff --git a/app/jobs/inboxes/fetch_imap_email_inboxes_job.rb b/app/jobs/inboxes/fetch_imap_email_inboxes_job.rb
index 190714c1e..b360940e3 100644
--- a/app/jobs/inboxes/fetch_imap_email_inboxes_job.rb
+++ b/app/jobs/inboxes/fetch_imap_email_inboxes_job.rb
@@ -1,5 +1,5 @@
 class Inboxes::FetchImapEmailInboxesJob < ApplicationJob
-  queue_as :low
+  queue_as :scheduled_jobs
 
   def perform
     Inbox.where(channel_type: 'Channel::Email').all.find_each(batch_size: 100) do |inbox|
diff --git a/app/jobs/inboxes/fetch_imap_emails_job.rb b/app/jobs/inboxes/fetch_imap_emails_job.rb
index b84e79ee6..1072e7ba6 100644
--- a/app/jobs/inboxes/fetch_imap_emails_job.rb
+++ b/app/jobs/inboxes/fetch_imap_emails_job.rb
@@ -1,7 +1,7 @@
 require 'net/imap'
 
 class Inboxes::FetchImapEmailsJob < ApplicationJob
-  queue_as :low
+  queue_as :scheduled_jobs
 
   def perform(channel)
     return unless should_fetch_email?(channel)
diff --git a/app/jobs/webhook_job.rb b/app/jobs/webhook_job.rb
index 9f4d96a10..61b5e8daf 100644
--- a/app/jobs/webhook_job.rb
+++ b/app/jobs/webhook_job.rb
@@ -1,5 +1,5 @@
 class WebhookJob < ApplicationJob
-  queue_as :webhooks
+  queue_as :medium
 
   def perform(url, payload)
     Webhooks::Trigger.execute(url, payload)
diff --git a/app/models/custom_attribute_definition.rb b/app/models/custom_attribute_definition.rb
index 59a314da6..71aab06f8 100644
--- a/app/models/custom_attribute_definition.rb
+++ b/app/models/custom_attribute_definition.rb
@@ -40,10 +40,10 @@ class CustomAttributeDefinition < ApplicationRecord
   private
 
   def sync_widget_pre_chat_custom_fields
-    ::Inboxes::SyncWidgetPreChatCustomFieldsJob.perform_now(account, attribute_key)
+    ::Inboxes::SyncWidgetPreChatCustomFieldsJob.perform_later(account, attribute_key)
   end
 
   def update_widget_pre_chat_custom_fields
-    ::Inboxes::UpdateWidgetPreChatCustomFieldsJob.perform_now(account, self)
+    ::Inboxes::UpdateWidgetPreChatCustomFieldsJob.perform_later(account, self)
   end
 end
diff --git a/config/sidekiq.yml b/config/sidekiq.yml
index c9bf96300..4bc3d1cb8 100644
--- a/config/sidekiq.yml
+++ b/config/sidekiq.yml
@@ -11,23 +11,22 @@
 # Sidekiq will run this file through ERB when reading it so you can
 # even put in dynamic logic, like a host-specific queue.
 # http://www.mikeperham.com/2013/11/13/advanced-sidekiq-host-specific-queues/
+# https://github.com/sidekiq/sidekiq/wiki/Advanced-Options
+# Since queues are declared without waits, the jobs in lower ranking queues will only be processed
+# if there are no jobs in higher ranking queues.
 :queues:
-  - [async_database_migration, 1]
-  - [low, 2]
-  - [scheduled_jobs, 2]
-  - [webhooks, 2]
-  - [bots, 2]
-  - [active_storage_analysis, 2]
-  - [action_mailbox_incineration, 2]
-  - [active_storage_purge, 2]
-  - [integrations, 3]
-  - [default, 3]
-  - [mailers, 3]
-  - [medium, 4]
-  - [events, 4]
-  - [action_mailbox_routing, 4]
-  - [high, 5]
-  - [critical, 10]
+  - critical
+  - high
+  - medium
+  - default
+  - mailers
+  - action_mailbox_routing
+  - low
+  - scheduled_jobs
+  - async_database_migration
+  - active_storage_analysis
+  - active_storage_purge
+  - action_mailbox_incineration
 
 # you can override concurrency based on environment
 production:
diff --git a/spec/jobs/agent_bots/webhook_job_spec.rb b/spec/jobs/agent_bots/webhook_job_spec.rb
index 3c4fdce7a..c642d88fc 100644
--- a/spec/jobs/agent_bots/webhook_job_spec.rb
+++ b/spec/jobs/agent_bots/webhook_job_spec.rb
@@ -11,7 +11,7 @@ RSpec.describe AgentBots::WebhookJob, type: :job do
   it 'queues the job' do
     expect { job }.to have_enqueued_job(described_class)
       .with(url, payload)
-      .on_queue('bots')
+      .on_queue('high')
   end
 
   it 'executes perform' do
diff --git a/spec/jobs/agents/destroy_job_spec.rb b/spec/jobs/agents/destroy_job_spec.rb
index 38786dbc0..7d7f6c036 100644
--- a/spec/jobs/agents/destroy_job_spec.rb
+++ b/spec/jobs/agents/destroy_job_spec.rb
@@ -17,7 +17,7 @@ RSpec.describe Agents::DestroyJob, type: :job do
   it 'enqueues the job' do
     expect { job }.to have_enqueued_job(described_class)
       .with(account, user)
-      .on_queue('default')
+      .on_queue('low')
   end
 
   describe '#perform' do
diff --git a/spec/jobs/avatar/avatar_from_url_job_spec.rb b/spec/jobs/avatar/avatar_from_url_job_spec.rb
index 9a4ebd646..11e43de64 100644
--- a/spec/jobs/avatar/avatar_from_url_job_spec.rb
+++ b/spec/jobs/avatar/avatar_from_url_job_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe Avatar::AvatarFromUrlJob, type: :job do
 
   it 'enqueues the job' do
     expect { described_class.perform_later(avatarable, avatar_url) }.to have_enqueued_job(described_class)
-      .on_queue('default')
+      .on_queue('low')
   end
 
   it 'will attach avatar from url' do
diff --git a/spec/jobs/delete_object_job_spec.rb b/spec/jobs/delete_object_job_spec.rb
index 7ed623bd4..15f19bdb0 100644
--- a/spec/jobs/delete_object_job_spec.rb
+++ b/spec/jobs/delete_object_job_spec.rb
@@ -8,7 +8,7 @@ RSpec.describe DeleteObjectJob, type: :job do
   it 'enqueues the job' do
     expect { job }.to have_enqueued_job(described_class)
       .with(account)
-      .on_queue('default')
+      .on_queue('low')
   end
 
   context 'when an object is passed to the job' do
diff --git a/spec/jobs/event_dispatcher_job_spec.rb b/spec/jobs/event_dispatcher_job_spec.rb
index 14da570b2..a0297785a 100644
--- a/spec/jobs/event_dispatcher_job_spec.rb
+++ b/spec/jobs/event_dispatcher_job_spec.rb
@@ -11,7 +11,7 @@ RSpec.describe EventDispatcherJob, type: :job do
   it 'queues the job' do
     expect { job }.to have_enqueued_job(described_class)
       .with(event_name, timestamp, event_data)
-      .on_queue('events')
+      .on_queue('critical')
   end
 
   it 'publishes event' do
diff --git a/spec/jobs/hook_job_spec.rb b/spec/jobs/hook_job_spec.rb
index 85517d51c..8275bfa31 100644
--- a/spec/jobs/hook_job_spec.rb
+++ b/spec/jobs/hook_job_spec.rb
@@ -12,7 +12,7 @@ RSpec.describe HookJob, type: :job do
   it 'enqueues the job' do
     expect { job }.to have_enqueued_job(described_class)
       .with(hook, event_name, event_data)
-      .on_queue('integrations')
+      .on_queue('medium')
   end
 
   context 'when handleable events like message.created' do
diff --git a/spec/jobs/inboxes/fetch_imap_email_inboxes_job_spec.rb b/spec/jobs/inboxes/fetch_imap_email_inboxes_job_spec.rb
index df0b34aca..33f516e42 100644
--- a/spec/jobs/inboxes/fetch_imap_email_inboxes_job_spec.rb
+++ b/spec/jobs/inboxes/fetch_imap_email_inboxes_job_spec.rb
@@ -10,7 +10,7 @@ RSpec.describe Inboxes::FetchImapEmailInboxesJob, type: :job do
 
   it 'enqueues the job' do
     expect { described_class.perform_later }.to have_enqueued_job(described_class)
-      .on_queue('low')
+      .on_queue('scheduled_jobs')
   end
 
   context 'when called' do
diff --git a/spec/jobs/inboxes/fetch_imap_emails_job_spec.rb b/spec/jobs/inboxes/fetch_imap_emails_job_spec.rb
index 329574535..14efa2031 100644
--- a/spec/jobs/inboxes/fetch_imap_emails_job_spec.rb
+++ b/spec/jobs/inboxes/fetch_imap_emails_job_spec.rb
@@ -19,7 +19,7 @@ RSpec.describe Inboxes::FetchImapEmailsJob, type: :job do
 
   it 'enqueues the job' do
     expect { described_class.perform_later }.to have_enqueued_job(described_class)
-      .on_queue('low')
+      .on_queue('scheduled_jobs')
   end
 
   context 'when imap fetch new emails' do
diff --git a/spec/jobs/webhook_job_spec.rb b/spec/jobs/webhook_job_spec.rb
index 4a10762f4..f5b8d9dd8 100644
--- a/spec/jobs/webhook_job_spec.rb
+++ b/spec/jobs/webhook_job_spec.rb
@@ -11,7 +11,7 @@ RSpec.describe WebhookJob, type: :job do
   it 'queues the job' do
     expect { job }.to have_enqueued_job(described_class)
       .with(url, payload)
-      .on_queue('webhooks')
+      .on_queue('medium')
   end
 
   it 'executes perform' do

From 59433d9d3cdf3e6da837ecc21531e71502beec50 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Sat, 6 May 2023 05:38:32 +0530
Subject: [PATCH 060/101] feat: Adds the ability to sort conversations (#6853)

* Add sort filter

* Change UI

* Change filter

* Complete sort by filters

* Style fixes

* Fix default sort

* Update app/javascript/dashboard/components/widgets/conversation/ConversationBasicFilter.vue

Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>

* Update app/javascript/dashboard/components/widgets/conversation/ConversationBasicFilter.vue

Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>

* Update app/javascript/dashboard/components/ChatList.vue

Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>

* Added translation

* Added review fixes

* Add more updates

* Code cleanups

* Update last_activity_at on message received event

* Cleans up the design for chatlist and icons

* Fix sort

* Remove inline styles

* Add tag along with the title

---------

Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
Co-authored-by: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
---
 .../dashboard/api/inbox/conversation.js       |   2 +
 .../scss/widgets/_conversation-view.scss      |   4 -
 .../dashboard/components/ChatList.vue         |  69 +++++++---
 .../widgets/conversation/ChatFilter.vue       |   4 +-
 .../conversation/ConversationBasicFilter.vue  | 122 ++++++++++++++++++
 .../widgets/conversation/FilterItem.vue       |  55 ++++++++
 app/javascript/dashboard/constants/globals.js |   4 +
 .../dashboard/helper/actionCable.js           |   8 ++
 .../dashboard/i18n/locale/en/chatlist.json    |  32 +++++
 .../conversation/search/PopOverSearch.vue     |   4 +-
 .../store/modules/conversations/actions.js    |  16 ++-
 .../store/modules/conversations/getters.js    |  13 +-
 .../store/modules/conversations/index.js      |  12 ++
 .../dashboard/store/mutation-types.js         |   2 +
 .../shared/assets/stylesheets/colors.scss     |   3 +
 .../FluentIcon/dashboard-icons.json           |   1 +
 .../ui/dropdown/DropdownSubMenu.vue           |   2 +-
 app/models/message.rb                         |   3 +-
 .../partials/_conversation.json.jbuilder      |   1 +
 19 files changed, 326 insertions(+), 31 deletions(-)
 create mode 100644 app/javascript/dashboard/components/widgets/conversation/ConversationBasicFilter.vue
 create mode 100644 app/javascript/dashboard/components/widgets/conversation/FilterItem.vue

diff --git a/app/javascript/dashboard/api/inbox/conversation.js b/app/javascript/dashboard/api/inbox/conversation.js
index 93dc884f9..bee3cd23b 100644
--- a/app/javascript/dashboard/api/inbox/conversation.js
+++ b/app/javascript/dashboard/api/inbox/conversation.js
@@ -14,6 +14,7 @@ class ConversationApi extends ApiClient {
     labels,
     teamId,
     conversationType,
+    sortBy,
   }) {
     return axios.get(this.url, {
       params: {
@@ -24,6 +25,7 @@ class ConversationApi extends ApiClient {
         page,
         labels,
         conversation_type: conversationType,
+        sort_by: sortBy,
       },
     });
   }
diff --git a/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss b/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss
index 97adeed4c..6c37e5677 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss
@@ -95,10 +95,6 @@
     align-items: center;
     justify-content: space-between;
     padding: 0 var(--space-normal);
-
-    .page-title {
-      margin-bottom: 0;
-    }
   }
 
   .content-box {
diff --git a/app/javascript/dashboard/components/ChatList.vue b/app/javascript/dashboard/components/ChatList.vue
index ecf0557e1..7995c91fd 100644
--- a/app/javascript/dashboard/components/ChatList.vue
+++ b/app/javascript/dashboard/components/ChatList.vue
@@ -11,15 +11,23 @@
       class="chat-list__top"
       :class="{ filter__applied: hasAppliedFiltersOrActiveFolders }"
     >
-      <h1 class="page-title text-truncate" :title="pageTitle">
-        {{ pageTitle }}
-      </h1>
-
-      <div class="filter--actions">
-        <chat-filter
+      <div class="flex-center chat-list__title">
+        <h1
+          class="page-sub-title text-truncate margin-bottom-0"
+          :title="pageTitle"
+        >
+          {{ pageTitle }}
+        </h1>
+        <span
           v-if="!hasAppliedFiltersOrActiveFolders"
-          @statusFilterChange="updateStatusType"
-        />
+          class="conversation--status-pill"
+        >
+          {{
+            this.$t(`CHAT_LIST.CHAT_STATUS_FILTER_ITEMS.${activeStatus}.TEXT`)
+          }}
+        </span>
+      </div>
+      <div class="filter--actions">
         <div v-if="hasAppliedFilters && !hasActiveFolders">
           <woot-button
             v-tooltip.top-end="$t('FILTER.CUSTOM_VIEWS.ADD.SAVE_BUTTON')"
@@ -48,7 +56,6 @@
             @click="onClickOpenDeleteFoldersModal"
           />
         </div>
-
         <woot-button
           v-else
           v-tooltip.right="$t('FILTER.TOOLTIP_LABEL')"
@@ -58,6 +65,10 @@
           size="tiny"
           @click="onToggleAdvanceFiltersModal"
         />
+        <conversation-basic-filter
+          v-if="!hasAppliedFiltersOrActiveFolders"
+          @changeFilter="onBasicFilterChange"
+        />
       </div>
     </div>
 
@@ -167,8 +178,8 @@
 <script>
 import { mapGetters } from 'vuex';
 
-import ChatFilter from './widgets/conversation/ChatFilter';
 import ConversationAdvancedFilter from './widgets/conversation/ConversationAdvancedFilter';
+import ConversationBasicFilter from './widgets/conversation/ConversationBasicFilter';
 import ChatTypeTabs from './widgets/ChatTypeTabs';
 import ConversationCard from './widgets/conversation/ConversationCard';
 import timeMixin from '../mixins/time';
@@ -199,10 +210,10 @@ export default {
     AddCustomViews,
     ChatTypeTabs,
     ConversationCard,
-    ChatFilter,
     ConversationAdvancedFilter,
     DeleteCustomViews,
     ConversationBulkActions,
+    ConversationBasicFilter,
   },
   mixins: [
     timeMixin,
@@ -245,6 +256,7 @@ export default {
     return {
       activeAssigneeTab: wootConstants.ASSIGNEE_TYPE.ME,
       activeStatus: wootConstants.STATUS_TYPE.OPEN,
+      activeSortBy: wootConstants.SORT_BY_TYPE.LATEST,
       showAdvancedFilters: false,
       advancedFilterTypes: advancedFilterTypes.map(filter => ({
         ...filter,
@@ -364,6 +376,7 @@ export default {
         inboxId: this.conversationInbox ? this.conversationInbox : undefined,
         assigneeType: this.activeAssigneeTab,
         status: this.activeStatus,
+        sortBy: this.activeSortBy,
         page: this.conversationListPagination,
         labels: this.label ? [this.label] : undefined,
         teamId: this.teamId || undefined,
@@ -479,7 +492,8 @@ export default {
     },
   },
   mounted() {
-    this.$store.dispatch('setChatFilter', this.activeStatus);
+    this.$store.dispatch('setChatStatusFilter', this.activeStatus);
+    this.$store.dispatch('setChatSortFilter', this.activeSortBy);
     this.resetAndFetchData();
 
     bus.$on('fetch_conversation_stats', () => {
@@ -625,11 +639,13 @@ export default {
       this.selectedConversations = [];
       this.selectedInboxes = [];
     },
-    updateStatusType(index) {
-      if (this.activeStatus !== index) {
-        this.activeStatus = index;
-        this.resetAndFetchData();
+    onBasicFilterChange(value, type) {
+      if (type === 'status') {
+        this.activeStatus = value;
+      } else {
+        this.activeSortBy = value;
       }
+      this.resetAndFetchData();
     },
     openLastSavedItemInFolder() {
       const lastItemOfFolder = this.folders[this.folders.length - 1];
@@ -878,11 +894,15 @@ export default {
   &.list--full-width {
     flex-basis: 100%;
   }
+
+  .page-sub-title {
+    font-size: var(--font-size-two);
+  }
 }
 .filter--actions {
   display: flex;
   align-items: center;
-  gap: var(--space-micro);
+  gap: var(--space-smaller);
 }
 
 .filter__applied {
@@ -899,4 +919,19 @@ export default {
     }
   }
 }
+
+.conversation--status-pill {
+  background: var(--color-background);
+  border-radius: var(--border-radius-small);
+  color: var(--color-medium-gray);
+  font-size: var(--font-size-micro);
+  font-weight: var(--font-weight-medium);
+  margin: var(--space-micro) var(--space-small) 0;
+  padding: var(--space-smaller);
+  text-transform: capitalize;
+}
+
+.chat-list__title {
+  max-width: 85%;
+}
 </style>
diff --git a/app/javascript/dashboard/components/widgets/conversation/ChatFilter.vue b/app/javascript/dashboard/components/widgets/conversation/ChatFilter.vue
index e5e51f0c1..2bbc2865b 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ChatFilter.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ChatFilter.vue
@@ -38,8 +38,8 @@ export default {
       this.onTabChange();
     },
     onTabChange() {
-      this.$store.dispatch('setChatFilter', this.activeStatus);
-      this.$emit('statusFilterChange', this.activeStatus);
+      this.$store.dispatch('setChatStatusFilter', this.activeStatus);
+      this.$emit('onChangeFilter', this.activeStatus);
     },
   },
 };
diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationBasicFilter.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationBasicFilter.vue
new file mode 100644
index 000000000..0e66684a8
--- /dev/null
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationBasicFilter.vue
@@ -0,0 +1,122 @@
+<template>
+  <div class="position-relative">
+    <woot-button
+      v-tooltip.right="$t('CHAT_LIST.SORT_TOOLTIP_LABEL')"
+      variant="smooth"
+      size="tiny"
+      color-scheme="secondary"
+      class="selector-button"
+      icon="sort-icon"
+      @click="toggleDropdown"
+    />
+    <div
+      v-if="showActionsDropdown"
+      v-on-clickaway="closeDropdown"
+      class="dropdown-pane dropdown-pane--open basic-filter"
+    >
+      <div class="filter__item">
+        <span>{{ this.$t('CHAT_LIST.CHAT_SORT.STATUS') }}</span>
+        <filter-item
+          type="status"
+          :selected-value="chatStatus"
+          :items="chatStatusItems"
+          path-prefix="CHAT_LIST.CHAT_STATUS_FILTER_ITEMS"
+          @onChangeFilter="onChangeFilter"
+        />
+      </div>
+      <div class="filter__item">
+        <span>{{ this.$t('CHAT_LIST.CHAT_SORT.ORDER_BY') }}</span>
+        <filter-item
+          type="sort"
+          :selected-value="chatSortFilter"
+          :items="chatSortItems"
+          path-prefix="CHAT_LIST.CHAT_SORT_FILTER_ITEMS"
+          @onChangeFilter="onChangeFilter"
+        />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import wootConstants from 'dashboard/constants/globals';
+import { mapGetters } from 'vuex';
+import { mixin as clickaway } from 'vue-clickaway';
+import FilterItem from './FilterItem';
+
+export default {
+  components: {
+    FilterItem,
+  },
+  mixins: [clickaway],
+  data() {
+    return {
+      showActionsDropdown: false,
+      chatStatusItems: this.$t('CHAT_LIST.CHAT_STATUS_FILTER_ITEMS'),
+      chatSortItems: this.$t('CHAT_LIST.CHAT_SORT_FILTER_ITEMS'),
+    };
+  },
+  computed: {
+    ...mapGetters({
+      chatStatusFilter: 'getChatStatusFilter',
+      chatSortFilter: 'getChatSortFilter',
+    }),
+    chatStatus() {
+      return this.chatStatusFilter || wootConstants.STATUS_TYPE.OPEN;
+    },
+    sortFilter() {
+      return this.chatSortFilter || wootConstants.SORT_BY_TYPE.LATEST;
+    },
+  },
+  methods: {
+    onTabChange(value) {
+      this.$emit('changeFilter', value);
+      this.closeDropdown();
+    },
+    toggleDropdown() {
+      this.showActionsDropdown = !this.showActionsDropdown;
+    },
+    closeDropdown() {
+      this.showActionsDropdown = false;
+    },
+    onChangeFilter(type, value) {
+      this.$emit('changeFilter', type, value);
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.basic-filter {
+  margin-top: var(--space-smaller);
+  padding: var(--space-normal);
+  right: 0;
+  width: 21rem;
+
+  span {
+    font-size: var(--font-size-small);
+    font-weight: var(--font-weight-medium);
+  }
+
+  .filter__item {
+    align-items: center;
+    display: flex;
+    justify-content: space-between;
+
+    &:last-child {
+      margin-top: var(--space-normal);
+    }
+
+    span {
+      font-size: var(--font-size-mini);
+    }
+  }
+}
+
+.icon {
+  margin-right: var(--space-smaller);
+}
+
+.dropdown-icon {
+  margin-left: var(--space-smaller);
+}
+</style>
diff --git a/app/javascript/dashboard/components/widgets/conversation/FilterItem.vue b/app/javascript/dashboard/components/widgets/conversation/FilterItem.vue
new file mode 100644
index 000000000..efd68134b
--- /dev/null
+++ b/app/javascript/dashboard/components/widgets/conversation/FilterItem.vue
@@ -0,0 +1,55 @@
+<template>
+  <select v-model="activeValue" class="status--filter" @change="onTabChange()">
+    <option v-for="(value, status) in items" :key="status" :value="status">
+      {{ $t(`${pathPrefix}.${status}.TEXT`) }}
+    </option>
+  </select>
+</template>
+<script>
+export default {
+  props: {
+    selectedValue: {
+      type: String,
+      required: true,
+    },
+    items: {
+      type: Object,
+      required: true,
+    },
+    type: {
+      type: String,
+      required: true,
+    },
+    pathPrefix: {
+      type: String,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      activeValue: this.selectedValue,
+    };
+  },
+  methods: {
+    onTabChange() {
+      if (this.type === 'status') {
+        this.$store.dispatch('setChatStatusFilter', this.activeValue);
+      } else {
+        this.$store.dispatch('setChatSortFilter', this.activeValue);
+      }
+      this.$emit('onChangeFilter', this.activeValue, this.type);
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.status--filter {
+  background-color: var(--color-background-light);
+  border: 1px solid var(--color-border);
+  font-size: var(--font-size-mini);
+  height: var(--space-medium);
+  margin: 0 var(--space-smaller);
+  padding: 0 var(--space-medium) 0 var(--space-small);
+  width: 126px;
+}
+</style>
diff --git a/app/javascript/dashboard/constants/globals.js b/app/javascript/dashboard/constants/globals.js
index 71dd68051..20497b039 100644
--- a/app/javascript/dashboard/constants/globals.js
+++ b/app/javascript/dashboard/constants/globals.js
@@ -12,6 +12,10 @@ export default {
     SNOOZED: 'snoozed',
     ALL: 'all',
   },
+  SORT_BY_TYPE: {
+    LATEST: 'latest',
+    CREATED_AT: 'sort_on_created_at',
+  },
   ARTICLE_STATUS_TYPES: {
     DRAFT: 0,
     PUBLISH: 1,
diff --git a/app/javascript/dashboard/helper/actionCable.js b/app/javascript/dashboard/helper/actionCable.js
index 9f6a7c6fe..bf15aa9c5 100644
--- a/app/javascript/dashboard/helper/actionCable.js
+++ b/app/javascript/dashboard/helper/actionCable.js
@@ -105,8 +105,16 @@ class ActionCableConnector extends BaseActionCableConnector {
   onLogout = () => AuthAPI.logout();
 
   onMessageCreated = data => {
+    const {
+      conversation: { last_activity_at: lastActivityAt },
+      conversation_id: conversationId,
+    } = data;
     DashboardAudioNotificationHelper.onNewMessage(data);
     this.app.$store.dispatch('addMessage', data);
+    this.app.$store.dispatch('updateConversationLastActivity', {
+      lastActivityAt,
+      conversationId,
+    });
   };
 
   onReload = () => window.location.reload();
diff --git a/app/javascript/dashboard/i18n/locale/en/chatlist.json b/app/javascript/dashboard/i18n/locale/en/chatlist.json
index b96cfb976..6312d4c9f 100644
--- a/app/javascript/dashboard/i18n/locale/en/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/en/chatlist.json
@@ -35,6 +35,20 @@
         "TEXT": "All"
       }
     },
+    "VIEW_FILTER": "View",
+    "SORT_TOOLTIP_LABEL": "Sort conversations",
+    "CHAT_SORT": {
+      "STATUS": "Status",
+      "ORDER_BY": "Order by"
+    },
+    "CHAT_SORT_FILTER_ITEMS": {
+      "latest": {
+        "TEXT": "Last activity"
+      },
+      "sort_on_created_at": {
+        "TEXT": "Created at"
+      }
+    },
     "ATTACHMENTS": {
       "image": {
         "CONTENT": "Picture message"
@@ -55,6 +69,24 @@
         "CONTENT": "has shared a url"
       }
     },
+    "CHAT_SORT_BY_FILTER": {
+      "TITLE": "Sort conversation",
+      "DROPDOWN_TITLE": "Sort by",
+      "ITEMS": {
+        "LATEST": {
+          "NAME": "Last activity at",
+          "LABEL": "Last activity"
+        },
+        "CREATED_AT": {
+          "NAME": "Created at",
+          "LABEL": "Created at"
+        },
+        "LAST_USER_MESSAGE_AT": {
+          "NAME": "Last user message at",
+          "LABEL": "Last message"
+        }
+      }
+    },
     "RECEIVED_VIA_EMAIL": "Received via email",
     "VIEW_TWEET_IN_TWITTER": "View tweet in Twitter",
     "REPLY_TO_TWEET": "Reply to this tweet",
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/search/PopOverSearch.vue b/app/javascript/dashboard/routes/dashboard/conversation/search/PopOverSearch.vue
index 7979e6832..372e6b812 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/search/PopOverSearch.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/search/PopOverSearch.vue
@@ -6,7 +6,9 @@
         <div class="icon">
           <fluent-icon icon="search" class="search--icon" size="16" />
         </div>
-        <p class="search--label">{{ $t('CONVERSATION.SEARCH_MESSAGES') }}</p>
+        <p class="search--label text-ellipsis">
+          {{ $t('CONVERSATION.SEARCH_MESSAGES') }}
+        </p>
       </router-link>
       <switch-layout
         :is-on-expanded-layout="isOnExpandedLayout"
diff --git a/app/javascript/dashboard/store/modules/conversations/actions.js b/app/javascript/dashboard/store/modules/conversations/actions.js
index c801e6162..a5d4a25df 100644
--- a/app/javascript/dashboard/store/modules/conversations/actions.js
+++ b/app/javascript/dashboard/store/modules/conversations/actions.js
@@ -335,10 +335,24 @@ const actions = {
     dispatch('contacts/setContact', sender);
   },
 
-  setChatFilter({ commit }, data) {
+  updateConversationLastActivity(
+    { commit },
+    { conversationId, lastActivityAt }
+  ) {
+    commit(types.UPDATE_CONVERSATION_LAST_ACTIVITY, {
+      lastActivityAt,
+      conversationId,
+    });
+  },
+
+  setChatStatusFilter({ commit }, data) {
     commit(types.CHANGE_CHAT_STATUS_FILTER, data);
   },
 
+  setChatSortFilter({ commit }, data) {
+    commit(types.CHANGE_CHAT_SORT_FILTER, data);
+  },
+
   updateAssignee({ commit }, data) {
     commit(types.UPDATE_ASSIGNEE, data);
   },
diff --git a/app/javascript/dashboard/store/modules/conversations/getters.js b/app/javascript/dashboard/store/modules/conversations/getters.js
index e02fa7c40..d3a848d09 100644
--- a/app/javascript/dashboard/store/modules/conversations/getters.js
+++ b/app/javascript/dashboard/store/modules/conversations/getters.js
@@ -9,10 +9,14 @@ export const getSelectedChatConversation = ({
 
 // getters
 const getters = {
-  getAllConversations: ({ allConversations }) =>
-    allConversations.sort(
-      (a, b) => b.messages.last()?.created_at - a.messages.last()?.created_at
-    ),
+  getAllConversations: ({ allConversations, chatSortFilter }) => {
+    const comparator = {
+      latest: (a, b) => b.last_activity_at - a.last_activity_at,
+      sort_on_created_at: (a, b) => a.created_at - b.created_at,
+    };
+
+    return allConversations.sort(comparator[chatSortFilter]);
+  },
   getSelectedChat: ({ selectedChatId, allConversations }) => {
     const selectedChat = allConversations.find(
       conversation => conversation.id === selectedChatId
@@ -85,6 +89,7 @@ const getters = {
     ).length;
   },
   getChatStatusFilter: ({ chatStatusFilter }) => chatStatusFilter,
+  getChatSortFilter: ({ chatSortFilter }) => chatSortFilter,
   getSelectedInbox: ({ currentInbox }) => currentInbox,
   getConversationById: _state => conversationId => {
     return _state.allConversations.find(
diff --git a/app/javascript/dashboard/store/modules/conversations/index.js b/app/javascript/dashboard/store/modules/conversations/index.js
index 8e68071ef..04db1fddf 100644
--- a/app/javascript/dashboard/store/modules/conversations/index.js
+++ b/app/javascript/dashboard/store/modules/conversations/index.js
@@ -10,6 +10,7 @@ const state = {
   allConversations: [],
   listLoadingStatus: true,
   chatStatusFilter: wootConstants.STATUS_TYPE.OPEN,
+  chatSortFilter: wootConstants.SORT_BY_TYPE.LATEST,
   currentInbox: null,
   selectedChatId: null,
   appliedFilters: [],
@@ -77,6 +78,13 @@ export const mutations = {
     Vue.set(chat.meta, 'team', team);
   },
 
+  [types.UPDATE_CONVERSATION_LAST_ACTIVITY](
+    _state,
+    { lastActivityAt, conversationId }
+  ) {
+    const [chat] = _state.allConversations.filter(c => c.id === conversationId);
+    Vue.set(chat, 'last_activity_at', lastActivityAt);
+  },
   [types.ASSIGN_PRIORITY](_state, { priority, conversationId }) {
     const [chat] = _state.allConversations.filter(c => c.id === conversationId);
     Vue.set(chat, 'priority', priority);
@@ -175,6 +183,10 @@ export const mutations = {
     _state.chatStatusFilter = data;
   },
 
+  [types.CHANGE_CHAT_SORT_FILTER](_state, data) {
+    _state.chatSortFilter = data;
+  },
+
   // Update assignee on action cable message
   [types.UPDATE_ASSIGNEE](_state, payload) {
     const [chat] = _state.allConversations.filter(c => c.id === payload.id);
diff --git a/app/javascript/dashboard/store/mutation-types.js b/app/javascript/dashboard/store/mutation-types.js
index 3938061b9..ae15ff572 100644
--- a/app/javascript/dashboard/store/mutation-types.js
+++ b/app/javascript/dashboard/store/mutation-types.js
@@ -16,6 +16,7 @@ export default {
   SET_ALL_MESSAGES_LOADED: 'SET_ALL_MESSAGES_LOADED',
   CLEAR_ALL_MESSAGES_LOADED: 'CLEAR_ALL_MESSAGES_LOADED',
   CHANGE_CHAT_STATUS_FILTER: 'CHANGE_CHAT_STATUS_FILTER',
+  CHANGE_CHAT_SORT_FILTER: 'CHANGE_CHAT_SORT_FILTER',
   UPDATE_ASSIGNEE: 'UPDATE_ASSIGNEE',
   UPDATE_CONVERSATION_CONTACT: 'UPDATE_CONVERSATION_CONTACT',
   CLEAR_CONTACT_CONVERSATIONS: 'CLEAR_CONTACT_CONVERSATIONS',
@@ -45,6 +46,7 @@ export default {
   SET_ACTIVE_INBOX: 'SET_ACTIVE_INBOX',
   UPDATE_CONVERSATION_CUSTOM_ATTRIBUTES:
     'UPDATE_CONVERSATION_CUSTOM_ATTRIBUTES',
+  UPDATE_CONVERSATION_LAST_ACTIVITY: 'UPDATE_CONVERSATION_LAST_ACTIVITY',
   SET_MISSING_MESSAGES: 'SET_MISSING_MESSAGES',
 
   SET_CONVERSATION_CAN_REPLY: 'SET_CONVERSATION_CAN_REPLY',
diff --git a/app/javascript/shared/assets/stylesheets/colors.scss b/app/javascript/shared/assets/stylesheets/colors.scss
index 5e45d264f..c80f52427 100644
--- a/app/javascript/shared/assets/stylesheets/colors.scss
+++ b/app/javascript/shared/assets/stylesheets/colors.scss
@@ -103,4 +103,7 @@
   --color-whatsapp-brand: #25d366;
   --color-sms-twilio: #f42f46;
   --color-cloud-generic: #18b7b0;
+
+  // Tech-debt
+  --color-medium-gray: #8492a6;
 }
diff --git a/app/javascript/shared/components/FluentIcon/dashboard-icons.json b/app/javascript/shared/components/FluentIcon/dashboard-icons.json
index 94679eb9f..42514a8fb 100644
--- a/app/javascript/shared/components/FluentIcon/dashboard-icons.json
+++ b/app/javascript/shared/components/FluentIcon/dashboard-icons.json
@@ -178,6 +178,7 @@
   "translate-outline": "M16.953 5.303a1 1 0 0 0-1.906-.606c-.124.389-.236.899-.324 1.344-.565.012-1.12 0-1.652-.038a1 1 0 1 0-.142 1.995c.46.032.934.048 1.416.047a25.649 25.649 0 0 0-.24 1.698c-1.263.716-2.142 1.684-2.636 2.7-.624 1.283-.7 2.857.239 3.883.675.736 1.704.758 2.499.588.322-.068.654-.176.988-.32a1 1 0 0 0 1.746-.93 13.17 13.17 0 0 0-.041-.115 8.404 8.404 0 0 0 2.735-4.06c.286.251.507.55.658.864.284.594.334 1.271.099 1.91-.234.633-.78 1.313-1.84 1.843a1 1 0 0 0 .895 1.789c1.44-.72 2.385-1.758 2.821-2.94a4.436 4.436 0 0 0-.17-3.464 4.752 4.752 0 0 0-2.104-2.165C19.998 9.22 20 9.11 20 9a1 1 0 0 0-1.974-.23 5.984 5.984 0 0 0-1.796.138c.047-.305.102-.626.166-.964a20.142 20.142 0 0 0 2.842-.473 1 1 0 0 0-.476-1.942c-.622.152-1.286.272-1.964.358.048-.208.1-.409.155-.584Zm-3.686 8.015c.166-.34.414-.697.758-1.037.02.348.053.67.098.973.083.56.207 1.048.341 1.477a3.41 3.41 0 0 1-.674.227c-.429.092-.588.019-.614.006l-.004-.001c-.162-.193-.329-.774.095-1.645Zm4.498-2.562a6.362 6.362 0 0 1-1.568 2.73 7.763 7.763 0 0 1-.095-.525 10.294 10.294 0 0 1-.088-1.904c.033-.013.067-.024.1-.036l1.651-.265Zm0 0-1.651.265c.602-.212 1.155-.29 1.651-.265ZM7.536 6.29a6.342 6.342 0 0 0-4.456.331 1 1 0 0 0 .848 1.811 4.342 4.342 0 0 1 3.049-.222c.364.107.568.248.69.37.12.123.203.27.257.454.067.225.087.446.09.69a8.195 8.195 0 0 0-.555-.117c-1.146-.199-2.733-.215-4.262.64-1.271.713-1.796 2.168-1.682 3.448.12 1.326.94 2.679 2.572 3.136 1.48.414 2.913-.045 3.877-.507l.08-.04a1 1 0 0 0 1.96-.281V10.5c0-.053.002-.12.005-.2.012-.417.034-1.16-.168-1.838a3.043 3.043 0 0 0-.755-1.29c-.394-.398-.91-.694-1.547-.881h-.003Zm-.419 5.288c.344.06.647.143.887.222v2.197a7.021 7.021 0 0 1-.905.524c-.792.38-1.682.605-2.473.384-.698-.195-1.06-.742-1.119-1.389-.062-.693.243-1.286.667-1.523.987-.553 2.06-.569 2.943-.415Z",
   "eye-show-outline": "M12 9.005a4 4 0 1 1 0 8 4 4 0 0 1 0-8Zm0 1.5a2.5 2.5 0 1 0 0 5 2.5 2.5 0 0 0 0-5ZM12 5.5c4.613 0 8.596 3.15 9.701 7.564a.75.75 0 1 1-1.455.365 8.503 8.503 0 0 0-16.493.004.75.75 0 0 1-1.455-.363A10.003 10.003 0 0 1 12 5.5Z",
   "eye-hide-outline": "M2.22 2.22a.75.75 0 0 0-.073.976l.073.084 4.034 4.035a9.986 9.986 0 0 0-3.955 5.75.75.75 0 0 0 1.455.364 8.49 8.49 0 0 1 3.58-5.034l1.81 1.81A4 4 0 0 0 14.8 15.86l5.919 5.92a.75.75 0 0 0 1.133-.977l-.073-.084-6.113-6.114.001-.002-1.2-1.198-2.87-2.87h.002L8.719 7.658l.001-.002-1.133-1.13L3.28 2.22a.75.75 0 0 0-1.06 0Zm7.984 9.045 3.535 3.536a2.5 2.5 0 0 1-3.535-3.535ZM12 5.5c-1 0-1.97.148-2.889.425l1.237 1.236a8.503 8.503 0 0 1 9.899 6.272.75.75 0 0 0 1.455-.363A10.003 10.003 0 0 0 12 5.5Zm.195 3.51 3.801 3.8a4.003 4.003 0 0 0-3.801-3.8Z",
+  "sort-icon-outline": "m17.25 4l-.1.007a.75.75 0 0 0-.65.743v12.692l-3.22-3.218l-.084-.072a.75.75 0 0 0-.976 1.134l4.504 4.5l.084.072a.75.75 0 0 0 .976-.073l4.497-4.5l.072-.084a.75.75 0 0 0-.073-.977l-.084-.072a.75.75 0 0 0-.977.073L18 17.446V4.75l-.006-.102A.75.75 0 0 0 17.251 4Zm-11.036.22L1.72 8.715l-.073.084a.75.75 0 0 0 .073.976l.084.073a.75.75 0 0 0 .976-.073l3.217-3.218v12.698l.008.102a.75.75 0 0 0 .743.648l.101-.007a.75.75 0 0 0 .649-.743L7.497 6.559l3.223 3.217l.084.072a.75.75 0 0 0 .975-1.134L7.275 4.22l-.085-.072a.75.75 0 0 0-.976.073Z",
   "wand-outline": "m13.314 7.565l-.136.126l-10.48 10.488a2.27 2.27 0 0 0 3.211 3.208L16.388 10.9a2.251 2.251 0 0 0-.001-3.182l-.157-.146a2.25 2.25 0 0 0-2.916-.007Zm-.848 2.961l1.088 1.088l-8.706 8.713a.77.77 0 1 1-1.089-1.088l8.707-8.713Zm4.386 4.48L16.75 15a.75.75 0 0 0-.743.648L16 15.75v.75h-.75a.75.75 0 0 0-.743.648l-.007.102c0 .38.282.694.648.743l.102.007H16v.75c0 .38.282.694.648.743l.102.007a.75.75 0 0 0 .743-.648l.007-.102V18h.75a.75.75 0 0 0 .743-.648L19 17.25a.75.75 0 0 0-.648-.743l-.102-.007h-.75v-.75a.75.75 0 0 0-.648-.743L16.75 15l.102.007Zm-1.553-6.254l.027.027a.751.751 0 0 1 0 1.061l-.711.713l-1.089-1.089l.73-.73a.75.75 0 0 1 1.043.018ZM6.852 5.007L6.75 5a.75.75 0 0 0-.743.648L6 5.75v.75h-.75a.75.75 0 0 0-.743.648L4.5 7.25c0 .38.282.693.648.743L5.25 8H6v.75c0 .38.282.693.648.743l.102.007a.75.75 0 0 0 .743-.648L7.5 8.75V8h.75a.75.75 0 0 0 .743-.648L9 7.25a.75.75 0 0 0-.648-.743L8.25 6.5H7.5v-.75a.75.75 0 0 0-.648-.743L6.75 5l.102.007Zm12-2L18.75 3a.75.75 0 0 0-.743.648L18 3.75v.75h-.75a.75.75 0 0 0-.743.648l-.007.102c0 .38.282.693.648.743L17.25 6H18v.75c0 .38.282.693.648.743l.102.007a.75.75 0 0 0 .743-.648l.007-.102V6h.75a.75.75 0 0 0 .743-.648L21 5.25a.75.75 0 0 0-.648-.743L20.25 4.5h-.75v-.75a.75.75 0 0 0-.648-.743L18.75 3l.102.007Z",
   "grab-handle-outline": [
     "M5 4C5 3.44772 5.44772 3 6 3H10C10.5523 3 11 3.44772 11 4V7C11 7.55228 10.5523 8 10 8H6C5.44772 8 5 7.55228 5 7V4Z",
diff --git a/app/javascript/shared/components/ui/dropdown/DropdownSubMenu.vue b/app/javascript/shared/components/ui/dropdown/DropdownSubMenu.vue
index 7a1318404..aa3a3134f 100644
--- a/app/javascript/shared/components/ui/dropdown/DropdownSubMenu.vue
+++ b/app/javascript/shared/components/ui/dropdown/DropdownSubMenu.vue
@@ -1,7 +1,7 @@
 <template>
   <li class="sub-menu-container">
     <ul class="sub-menu-li-container">
-      <woot-dropdown-header :title="title" />
+      <woot-dropdown-header v-if="title" :title="title" />
       <slot />
     </ul>
   </li>
diff --git a/app/models/message.rb b/app/models/message.rb
index 9000af0ec..3b1ddda11 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -136,7 +136,8 @@ class Message < ApplicationRecord
       conversation_id: conversation.display_id,
       conversation: {
         assignee_id: conversation.assignee_id,
-        unread_count: conversation.unread_incoming_messages.count
+        unread_count: conversation.unread_incoming_messages.count,
+        last_activity_at: conversation.last_activity_at.to_i
       }
     )
     data.merge!(echo_id: echo_id) if echo_id.present?
diff --git a/app/views/api/v1/conversations/partials/_conversation.json.jbuilder b/app/views/api/v1/conversations/partials/_conversation.json.jbuilder
index 15cae0b07..9ea7df4e6 100644
--- a/app/views/api/v1/conversations/partials/_conversation.json.jbuilder
+++ b/app/views/api/v1/conversations/partials/_conversation.json.jbuilder
@@ -42,4 +42,5 @@ json.timestamp conversation.last_activity_at.to_i
 json.first_reply_created_at conversation.first_reply_created_at.to_i
 json.unread_count conversation.unread_incoming_messages.count
 json.last_non_activity_message conversation.messages.non_activity_messages.first.try(:push_event_data)
+json.last_activity_at conversation.last_activity_at.to_i
 json.priority conversation.priority

From 022383d9424ff8052c620c823a383d93b6bb2731 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Sat, 6 May 2023 10:44:52 +0530
Subject: [PATCH 061/101] chore: Upgrade to Rails 7 (#6719)

fixes: #6736
---
 .circleci/config.yml                          |    2 +-
 .devcontainer/Dockerfile.base                 |    2 +-
 .gitignore                                    |    7 +
 .rubocop.yml                                  |   33 +
 .ruby-version                                 |    2 +-
 .slugignore                                   |    1 +
 Gemfile                                       |   46 +-
 Gemfile.lock                                  |  647 +++++-----
 app/controllers/api_controller.rb             |    2 +-
 app/controllers/widgets_controller.rb         |    2 +-
 .../conversationBulkActions/AgentSelector.vue |    7 +-
 .../conversationBulkActions/Index.vue         |   21 +-
 .../conversationBulkActions/LabelActions.vue  |    7 +-
 .../conversationBulkActions/TeamActions.vue   |    7 +-
 .../conversationBulkActions/UpdateActions.vue |    7 +-
 app/mailboxes/application_mailbox.rb          |    2 +-
 app/models/attachment.rb                      |    2 +-
 app/models/concerns/avatarable.rb             |    2 +-
 app/models/concerns/pubsubable.rb             |    2 +-
 .../public/api/v1/inboxes/show.json.jbuilder  |    2 +-
 .../api/v1/models/_category.json.jbuilder     |    6 +-
 .../v1/portals/articles/index.json.jbuilder   |    2 +-
 .../v1/portals/categories/index.json.jbuilder |    2 +-
 .../public/api/v1/portals/index.json.jbuilder |    2 +-
 bin/validate_push                             |    0
 config/application.rb                         |    4 +-
 config/database.yml                           |    2 +-
 config/initializers/01_redis.rb               |    4 +-
 .../new_framework_defaults_6_0.rb             |   45 -
 config/initializers/permissions_policy.rb     |   11 +
 config/sidekiq.yml                            |    4 +-
 ...e_storage_blobs_checksum.active_storage.rb |    8 +
 db/schema.rb                                  |  283 +++--
 deployment/chatwoot-web.1.service             |    6 +-
 deployment/chatwoot-worker.1.service          |    6 +-
 deployment/setup_20.04.sh                     |    4 +-
 docker/Dockerfile                             |    8 +-
 lib/config_loader.rb                          |    2 +-
 .../dialogflow/processor_service.rb           |   14 +-
 .../detect_language_service.rb                |    3 +-
 .../google_translate/processor_service.rb     |    3 +-
 lib/redis/config.rb                           |    2 +-
 lib/tasks/db_enhancements.rake                |    3 +-
 lib/tasks/yarn.rake                           |   10 +
 package.json                                  |    8 +-
 .../v1/accounts/articles_controller_spec.rb   |    4 +-
 .../dialogflow/processor_service_spec.rb      |    5 +-
 .../detect_language_service_spec.rb           |    2 +-
 spec/lib/redis/config_spec.rb                 |    8 +-
 spec/listeners/action_cable_listener_spec.rb  |   24 +-
 spec/mailboxes/support_mailbox_spec.rb        |    1 +
 spec/rails_helper.rb                          |    2 +-
 yarn.lock                                     | 1087 ++++++++++++++++-
 53 files changed, 1696 insertions(+), 682 deletions(-)
 create mode 100644 .slugignore
 mode change 100644 => 100755 bin/validate_push
 delete mode 100644 config/initializers/new_framework_defaults_6_0.rb
 create mode 100644 config/initializers/permissions_policy.rb
 create mode 100644 db/migrate/20230321073727_remove_not_null_on_active_storage_blobs_checksum.active_storage.rb
 create mode 100644 lib/tasks/yarn.rake

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 69ceb2772..e287574e9 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -7,7 +7,7 @@ defaults: &defaults
   working_directory: ~/build
   docker:
     # specify the version you desire here
-    - image: cimg/ruby:3.1.3-browsers
+    - image: cimg/ruby:3.2.2-browsers
 
     # Specify service dependencies here if necessary
     # CircleCI maintains a library of pre-built images
diff --git a/.devcontainer/Dockerfile.base b/.devcontainer/Dockerfile.base
index c0beb9eed..c9e3c8fcf 100644
--- a/.devcontainer/Dockerfile.base
+++ b/.devcontainer/Dockerfile.base
@@ -30,7 +30,7 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
     npm
 
 # Install rbenv and ruby
-ARG RUBY_VERSION="3.1.3"
+ARG RUBY_VERSION="3.2.2"
 RUN git clone https://github.com/rbenv/rbenv.git ~/.rbenv \
     &&  echo 'export PATH="$HOME/.rbenv/bin:$PATH"' >> ~/.bashrc \
     &&  echo 'eval "$(rbenv init -)"' >> ~/.bashrc
diff --git a/.gitignore b/.gitignore
index e59f13b8f..82f4a4df5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -67,3 +67,10 @@ test/cypress/videos/*
 # yalc for local testing
 .yalc
 yalc.lock
+
+/public/packs
+/public/packs-test
+/node_modules
+/yarn-error.log
+yarn-debug.log*
+.yarn-integrity
diff --git a/.rubocop.yml b/.rubocop.yml
index e66d0bc16..70c927242 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -164,6 +164,39 @@ Performance/CollectionLiteralInLoop:
     - 'db/migrate/20210315101919_enable_email_channel.rb'
 RSpec/NamedSubject:
   Enabled: false
+Style/RedundantConstantBase:
+  Enabled: false
+Rails/RootPathnameMethods:
+  Enabled: false
+RSpec/Rails/MinitestAssertions:
+  Enabled: false
+RSpec/Rails/InferredSpecType:
+  Enabled: false
+RSpec/IndexedLet:
+  Enabled: false
+RSpec/MatchArray:
+  Enabled: false
+Rails/ResponseParsedBody:
+  Enabled: false
+RSpec/FactoryBot/ConsistentParenthesesStyle:
+  Enabled: false
+Rails/ThreeStateBooleanColumn:
+  Enabled: false
+Rails/Pluck:
+  Enabled: false
+Rails/TopLevelHashWithIndifferentAccess:
+  Enabled: false
+Rails/ActionOrder:
+  Enabled: false
+Style/ArrayIntersect:
+  Enabled: false
+RSpec/NoExpectationExample:
+  Enabled: false
+Style/RedundantReturn:
+  Enabled: false
+Rails/I18nLocaleTexts:
+  Enabled: false
+
 # we should bring this down
 RSpec/MultipleMemoizedHelpers:
   Max: 14
diff --git a/.ruby-version b/.ruby-version
index ff365e06b..be94e6f53 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-3.1.3
+3.2.2
diff --git a/.slugignore b/.slugignore
new file mode 100644
index 000000000..eaecc7e34
--- /dev/null
+++ b/.slugignore
@@ -0,0 +1 @@
+/spec
diff --git a/Gemfile b/Gemfile
index da18bcc00..995406a90 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,10 +1,10 @@
 source 'https://rubygems.org'
 
-ruby '3.1.3'
+ruby '3.2.2'
 
 ##-- base gems for rails --##
 gem 'rack-cors', require: 'rack/cors'
-gem 'rails', '~> 6.1', '>= 6.1.7.3'
+gem 'rails', '~> 7'
 # Reduces boot times through caching; required in config/boot.rb
 gem 'bootsnap', require: false
 
@@ -36,19 +36,19 @@ gem 'json_schemer'
 # Rack middleware for blocking & throttling abusive requests
 gem 'rack-attack'
 # a utility tool for streaming, flexible and safe downloading of remote files
-gem 'down', '~> 5.0'
+gem 'down'
 # authentication type to fetch and send mail over oauth2.0
 gem 'gmail_xoauth'
 # Prevent CSV injection
 gem 'csv-safe'
-# Support message translation
-gem 'google-cloud-translate'
 
 ##-- for active storage --##
 gem 'aws-sdk-s3', require: false
-gem 'azure-storage-blob', require: false
+# original gem isn't maintained actively
+# we wanted updated version of faraday which is a dependency for slack-ruby-client
+gem 'azure-storage-blob', git: 'https://github.com/chatwoot/azure-storage-ruby', branch: 'chatwoot', require: false
 gem 'google-cloud-storage', require: false
-gem 'image_processing', '~> 1.12.2'
+gem 'image_processing'
 
 ##-- gems for database --#
 gem 'groupdate'
@@ -62,13 +62,13 @@ gem 'activerecord-import'
 gem 'dotenv-rails'
 gem 'foreman'
 gem 'puma'
-gem 'webpacker', '~> 5.4', '>= 5.4.3'
+gem 'webpacker'
 # metrics on heroku
 gem 'barnes'
 
 ##--- gems for authentication & authorization ---##
 gem 'devise'
-gem 'devise-secure_password', '~> 2.0', git: 'https://github.com/chatwoot/devise-secure_password'
+gem 'devise-secure_password', git: 'https://github.com/chatwoot/devise-secure_password', branch: 'chatwoot'
 gem 'devise_token_auth'
 # authorization
 gem 'jwt'
@@ -81,7 +81,6 @@ gem 'administrate'
 gem 'wisper', '2.0.0'
 
 ##--- gems for channels ---##
-# TODO: bump up gem to 2.0
 gem 'facebook-messenger'
 gem 'line-bot-api'
 gem 'twilio-ruby', '~> 5.66'
@@ -91,9 +90,14 @@ gem 'twitty', '~> 0.1.5'
 # facebook client
 gem 'koala'
 # slack client
-gem 'slack-ruby-client'
+gem 'slack-ruby-client', '~> 2.0.0'
 # for dialogflow integrations
-gem 'google-cloud-dialogflow'
+gem 'google-cloud-dialogflow-v2'
+gem 'grpc'
+# Translate integrations
+# 'google-cloud-translate' gem depends on faraday 2.0 version
+# this dependency breaks the slack-ruby-client gem
+gem 'google-cloud-translate-v3'
 
 ##-- apm and error monitoring ---#
 # loaded only when environment variables are set.
@@ -108,9 +112,9 @@ gem 'sentry-ruby', require: false
 gem 'sentry-sidekiq', require: false
 
 ##-- background job processing --##
-gem 'sidekiq', '~> 6.4.2'
+gem 'sidekiq'
 # We want cron jobs
-gem 'sidekiq-cron', '~> 1.6', '>= 1.6.0'
+gem 'sidekiq-cron'
 
 ##-- Push notification service --##
 gem 'fcm'
@@ -129,7 +133,10 @@ gem 'procore-sift'
 
 # parse email
 gem 'email_reply_trimmer'
-gem 'html2text'
+
+# TODO: we might have to fork this gem since 0.3.1 has hard depency on nokogir 1.10.
+# and this gem hasn't been updated for a while.
+gem 'html2text', git: 'https://github.com/chatwoot/html2text_ruby', branch: 'chatwoot'
 
 # to calculate working hours
 gem 'working_hours'
@@ -144,11 +151,6 @@ gem 'stripe'
 ## to populate db with sample data
 gem 'faker'
 
-# Can remove this in rails 7
-gem 'net-imap', require: false
-gem 'net-pop', require: false
-gem 'net-smtp', require: false
-
 # Include logrange conditionally in intializer using env variable
 gem 'lograge', '~> 0.12.0', require: false
 
@@ -189,7 +191,7 @@ end
 
 group :test do
   # Cypress in rails.
-  gem 'cypress-on-rails', '~> 1.13', '>= 1.13.1'
+  gem 'cypress-on-rails'
   # fast cleaning of database
   gem 'database_cleaner'
   # mock http calls
@@ -211,7 +213,7 @@ group :development, :test do
   gem 'mock_redis'
   gem 'pry-rails'
   gem 'rspec_junit_formatter'
-  gem 'rspec-rails', '~> 5.0.3'
+  gem 'rspec-rails'
   gem 'rubocop', require: false
   gem 'rubocop-performance', require: false
   gem 'rubocop-rails', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 4c71e271b..10b99ea5b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,133 +1,153 @@
+GIT
+  remote: https://github.com/chatwoot/azure-storage-ruby
+  revision: 9957cf899d33a285b5dfe15bdb875292398e392b
+  branch: chatwoot
+  specs:
+    azure-storage-blob (2.0.3)
+      azure-storage-common (~> 2.0)
+      nokogiri (~> 1, >= 1.10.8)
+    azure-storage-common (2.0.4)
+      faraday (~> 2.0)
+      faraday-follow_redirects (~> 0.3.0)
+      faraday-net_http_persistent (~> 2.0)
+      net-http-persistent (~> 4.0)
+      nokogiri (~> 1, >= 1.10.8)
+
 GIT
   remote: https://github.com/chatwoot/devise-secure_password
-  revision: d777b04f12652d576b1272b8f39857e3e0b3fc26
+  revision: adcc85fe1babfe40feae73dbcae64d14fff86e69
+  branch: chatwoot
   specs:
     devise-secure_password (2.0.1)
       devise (>= 4.0.0, < 5.0.0)
-      railties (>= 5.0.0, < 7.0.0)
+      railties (>= 5.0.0, < 8.0.0)
+
+GIT
+  remote: https://github.com/chatwoot/html2text_ruby
+  revision: cdbdbbbf898d846d0136d69d688a003c6b26074b
+  branch: chatwoot
+  specs:
+    html2text (0.3.1)
+      nokogiri (>= 1.13.6)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.1.7.3)
-      actionpack (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
+    actioncable (7.0.4.3)
+      actionpack (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.7.3)
-      actionpack (= 6.1.7.3)
-      activejob (= 6.1.7.3)
-      activerecord (= 6.1.7.3)
-      activestorage (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
+    actionmailbox (7.0.4.3)
+      actionpack (= 7.0.4.3)
+      activejob (= 7.0.4.3)
+      activerecord (= 7.0.4.3)
+      activestorage (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
       mail (>= 2.7.1)
-    actionmailer (6.1.7.3)
-      actionpack (= 6.1.7.3)
-      actionview (= 6.1.7.3)
-      activejob (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
+      net-imap
+      net-pop
+      net-smtp
+    actionmailer (7.0.4.3)
+      actionpack (= 7.0.4.3)
+      actionview (= 7.0.4.3)
+      activejob (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
       mail (~> 2.5, >= 2.5.4)
+      net-imap
+      net-pop
+      net-smtp
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.7.3)
-      actionview (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
-      rack (~> 2.0, >= 2.0.9)
+    actionpack (7.0.4.3)
+      actionview (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
+      rack (~> 2.0, >= 2.2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.7.3)
-      actionpack (= 6.1.7.3)
-      activerecord (= 6.1.7.3)
-      activestorage (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
+    actiontext (7.0.4.3)
+      actionpack (= 7.0.4.3)
+      activerecord (= 7.0.4.3)
+      activestorage (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
+      globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (6.1.7.3)
-      activesupport (= 6.1.7.3)
+    actionview (7.0.4.3)
+      activesupport (= 7.0.4.3)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
     active_record_query_trace (1.8)
-    activejob (6.1.7.3)
-      activesupport (= 6.1.7.3)
+    activejob (7.0.4.3)
+      activesupport (= 7.0.4.3)
       globalid (>= 0.3.6)
-    activemodel (6.1.7.3)
-      activesupport (= 6.1.7.3)
-    activerecord (6.1.7.3)
-      activemodel (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
-    activerecord-import (1.4.0)
+    activemodel (7.0.4.3)
+      activesupport (= 7.0.4.3)
+    activerecord (7.0.4.3)
+      activemodel (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
+    activerecord-import (1.4.1)
       activerecord (>= 4.2)
-    activestorage (6.1.7.3)
-      actionpack (= 6.1.7.3)
-      activejob (= 6.1.7.3)
-      activerecord (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
+    activestorage (7.0.4.3)
+      actionpack (= 7.0.4.3)
+      activejob (= 7.0.4.3)
+      activerecord (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (6.1.7.3)
+    activesupport (7.0.4.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     acts-as-taggable-on (9.0.1)
       activerecord (>= 6.0, < 7.1)
-    addressable (2.8.1)
+    addressable (2.8.4)
       public_suffix (>= 2.0.2, < 6.0)
-    administrate (0.17.0)
+    administrate (0.18.0)
       actionpack (>= 5.0)
       actionview (>= 5.0)
       activerecord (>= 5.0)
-      datetime_picker_rails (~> 0.0.7)
       jquery-rails (>= 4.0)
       kaminari (>= 1.0)
-      momentjs-rails (~> 2.8)
       sassc-rails (~> 2.1)
       selectize-rails (~> 0.6)
     annotate (3.2.0)
       activerecord (>= 3.2, < 8.0)
       rake (>= 10.4, < 14.0)
     ast (2.4.2)
-    attr_extras (6.2.5)
+    attr_extras (7.1.0)
     audited (5.3.3)
       activerecord (>= 5.0, < 7.1)
       request_store (~> 1.2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.605.0)
-    aws-sdk-core (3.131.2)
+    aws-partitions (1.760.0)
+    aws-sdk-core (3.171.1)
       aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.525.0)
-      aws-sigv4 (~> 1.1)
+      aws-partitions (~> 1, >= 1.651.0)
+      aws-sigv4 (~> 1.5)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.57.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-kms (1.64.0)
+      aws-sdk-core (~> 3, >= 3.165.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.114.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-s3 (1.122.0)
+      aws-sdk-core (~> 3, >= 3.165.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.5.0)
+    aws-sigv4 (1.5.2)
       aws-eventstream (~> 1, >= 1.0.2)
-    azure-storage-blob (2.0.3)
-      azure-storage-common (~> 2.0)
-      nokogiri (~> 1, >= 1.10.8)
-    azure-storage-common (2.0.4)
-      faraday (~> 1.0)
-      faraday_middleware (~> 1.0, >= 1.0.0.rc1)
-      net-http-persistent (~> 4.0)
-      nokogiri (~> 1, >= 1.10.8)
     barnes (0.0.9)
       multi_json (~> 1)
       statsd-ruby (~> 1.1)
     bcrypt (3.1.18)
     bindex (0.8.1)
-    bootsnap (1.12.0)
+    bootsnap (1.16.0)
       msgpack (~> 1.2)
-    brakeman (5.2.3)
+    brakeman (5.4.1)
     browser (5.3.1)
     builder (3.2.4)
-    bullet (7.0.2)
+    bullet (7.0.7)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     bundle-audit (0.1.0)
@@ -136,59 +156,59 @@ GEM
       bundler (>= 1.2.0, < 3)
       thor (~> 1.0)
     byebug (11.1.3)
-    climate_control (1.1.1)
+    climate_control (1.2.0)
     coderay (1.1.3)
     commonmarker (0.23.9)
     concurrent-ruby (1.2.2)
-    connection_pool (2.2.5)
+    connection_pool (2.4.0)
     crack (0.4.5)
       rexml
     crass (1.0.6)
-    csv-safe (3.1.1)
+    csv-safe (3.2.1)
     cypress-on-rails (1.13.1)
       rack
-    database_cleaner (2.0.1)
-      database_cleaner-active_record (~> 2.0.0)
-    database_cleaner-active_record (2.0.1)
+    database_cleaner (2.0.2)
+      database_cleaner-active_record (>= 2, < 3)
+    database_cleaner-active_record (2.1.0)
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
-    datetime_picker_rails (0.0.7)
-      momentjs-rails (>= 2.8.1)
-    ddtrace (1.2.0)
-      debase-ruby_core_source (= 0.10.16)
-      libddprof (~> 0.6.0.1.0)
-      libddwaf (~> 1.3.0.2.0)
+    date (3.3.3)
+    ddtrace (1.11.1)
+      debase-ruby_core_source (>= 0.10.16, <= 3.2.0)
+      libdatadog (~> 2.0.0.1.0)
+      libddwaf (~> 1.8.2.0.0)
       msgpack
-    debase-ruby_core_source (0.10.16)
+    debase-ruby_core_source (3.2.0)
     declarative (0.0.20)
-    devise (4.8.1)
+    devise (4.9.2)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
-    devise_token_auth (1.2.0)
+    devise_token_auth (1.2.1)
       bcrypt (~> 3.0)
       devise (> 3.5.2, < 5)
-      rails (>= 4.2.0, < 6.2)
+      rails (>= 4.2.0, < 7.1)
     diff-lcs (1.5.0)
     digest-crc (0.6.4)
       rake (>= 12.0.0, < 14.0.0)
     docile (1.4.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    dotenv (2.7.6)
-    dotenv-rails (2.7.6)
-      dotenv (= 2.7.6)
+    dotenv (2.8.1)
+    dotenv-rails (2.8.1)
+      dotenv (= 2.8.1)
       railties (>= 3.2)
-    down (5.3.1)
+    down (5.4.0)
       addressable (~> 2.8)
     ecma-re-validator (0.4.0)
       regexp_parser (~> 2.2)
-    elastic-apm (4.5.1)
+    elastic-apm (4.6.2)
       concurrent-ruby (~> 1.0)
       http (>= 3.0)
+      ruby2_keywords
     email_reply_trimmer (0.1.13)
     erubi (1.12.0)
     et-orbi (1.2.7)
@@ -202,33 +222,24 @@ GEM
     factory_bot_rails (6.2.0)
       factory_bot (~> 6.2.0)
       railties (>= 5.0.0)
-    faker (2.21.0)
+    faker (3.2.0)
       i18n (>= 1.8.11, < 2)
-    faraday (1.10.0)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0)
-      faraday-multipart (~> 1.0)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.0)
-      faraday-patron (~> 1.0)
-      faraday-rack (~> 1.0)
-      faraday-retry (~> 1.0)
+    faraday (2.7.4)
+      faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
-    faraday-excon (1.1.0)
-    faraday-httpclient (1.0.1)
+    faraday-follow_redirects (0.3.0)
+      faraday (>= 1, < 3)
+    faraday-mashify (0.1.1)
+      faraday (~> 2.0)
+      hashie
     faraday-multipart (1.0.4)
       multipart-post (~> 2)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.2.0)
-    faraday-patron (1.0.0)
-    faraday-rack (1.0.0)
-    faraday-retry (1.0.3)
-    faraday_middleware (1.2.0)
-      faraday (~> 1.0)
+    faraday-net_http (3.0.2)
+    faraday-net_http_persistent (2.1.0)
+      faraday (~> 2.5)
+      net-http-persistent (~> 4.0)
+    faraday-retry (2.1.0)
+      faraday (~> 2.0)
     fcm (1.0.8)
       faraday (>= 1.0.0, < 3.0)
       googleauth (~> 1)
@@ -238,10 +249,10 @@ GEM
       rake
     flag_shih_tzu (0.3.23)
     foreman (0.87.2)
-    fugit (1.5.3)
+    fugit (1.8.1)
       et-orbi (~> 1, >= 1.2.7)
       raabro (~> 1.4)
-    gapic-common (0.10.0)
+    gapic-common (0.18.0)
       faraday (>= 1.9, < 3.a)
       faraday-retry (>= 1.0, < 3.a)
       google-protobuf (~> 3.14)
@@ -249,13 +260,13 @@ GEM
       googleapis-common-protos-types (>= 1.3.1, < 2.a)
       googleauth (~> 1.0)
       grpc (~> 1.36)
-    geocoder (1.8.0)
+    geocoder (1.8.1)
     gli (2.21.0)
     globalid (1.1.0)
       activesupport (>= 5.0)
     gmail_xoauth (0.4.2)
       oauth (>= 0.3.6)
-    google-apis-core (0.7.0)
+    google-apis-core (0.11.0)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -264,86 +275,71 @@ GEM
       retriable (>= 2.0, < 4.a)
       rexml
       webrick
-    google-apis-iamcredentials_v1 (0.13.0)
-      google-apis-core (>= 0.7, < 2.a)
-    google-apis-storage_v1 (0.18.0)
-      google-apis-core (>= 0.7, < 2.a)
+    google-apis-iamcredentials_v1 (0.17.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-storage_v1 (0.19.0)
+      google-apis-core (>= 0.9.0, < 2.a)
     google-cloud-core (1.6.0)
       google-cloud-env (~> 1.0)
       google-cloud-errors (~> 1.0)
-    google-cloud-dialogflow (1.5.0)
-      google-cloud-core (~> 1.6)
-      google-cloud-dialogflow-v2 (>= 0.15, < 2.a)
-    google-cloud-dialogflow-v2 (0.17.0)
-      gapic-common (>= 0.10, < 2.a)
+    google-cloud-dialogflow-v2 (0.23.0)
+      gapic-common (>= 0.18.0, < 2.a)
       google-cloud-errors (~> 1.0)
-      google-cloud-location (>= 0.0, < 2.a)
+      google-cloud-location (>= 0.4, < 2.a)
     google-cloud-env (1.6.0)
       faraday (>= 0.17.3, < 3.0)
-    google-cloud-errors (1.2.0)
-    google-cloud-location (0.2.0)
-      gapic-common (>= 0.10, < 2.a)
+    google-cloud-errors (1.3.1)
+    google-cloud-location (0.4.0)
+      gapic-common (>= 0.17.1, < 2.a)
       google-cloud-errors (~> 1.0)
-    google-cloud-storage (1.37.0)
+    google-cloud-storage (1.44.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
       google-apis-iamcredentials_v1 (~> 0.1)
-      google-apis-storage_v1 (~> 0.1)
+      google-apis-storage_v1 (~> 0.19.0)
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
-    google-cloud-translate (3.3.0)
-      google-cloud-core (~> 1.6)
-      google-cloud-translate-v2 (>= 0.0, < 2.a)
-      google-cloud-translate-v3 (>= 0.0, < 2.a)
-    google-cloud-translate-v2 (0.4.0)
-      faraday (>= 0.17.3, < 2.a)
-      google-cloud-core (~> 1.6)
-      googleapis-common-protos (>= 1.3.10, < 2.a)
-      googleapis-common-protos-types (>= 1.0.5, < 2.a)
-      googleauth (>= 0.16.2, < 2.a)
-    google-cloud-translate-v3 (0.5.0)
-      gapic-common (>= 0.10, < 2.a)
+    google-cloud-translate-v3 (0.6.0)
+      gapic-common (>= 0.17.1, < 2.a)
       google-cloud-errors (~> 1.0)
-    google-protobuf (3.21.7)
-    google-protobuf (3.21.7-x86_64-darwin)
-    google-protobuf (3.21.7-x86_64-linux)
-    googleapis-common-protos (1.3.12)
+    google-protobuf (3.22.3-arm64-darwin)
+    google-protobuf (3.22.3-x86_64-darwin)
+    google-protobuf (3.22.3-x86_64-linux)
+    googleapis-common-protos (1.4.0)
       google-protobuf (~> 3.14)
       googleapis-common-protos-types (~> 1.2)
       grpc (~> 1.27)
-    googleapis-common-protos-types (1.3.2)
+    googleapis-common-protos-types (1.6.0)
       google-protobuf (~> 3.14)
-    googleauth (1.2.0)
+    googleauth (1.5.2)
       faraday (>= 0.17.3, < 3.a)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
-    groupdate (6.1.0)
+    groupdate (6.2.1)
       activesupport (>= 5.2)
-    grpc (1.47.0)
-      google-protobuf (~> 3.19)
+    grpc (1.54.0)
+      google-protobuf (~> 3.21)
       googleapis-common-protos-types (~> 1.0)
-    grpc (1.47.0-x86_64-darwin)
-      google-protobuf (~> 3.19)
+    grpc (1.54.0-x86_64-darwin)
+      google-protobuf (~> 3.21)
       googleapis-common-protos-types (~> 1.0)
-    grpc (1.47.0-x86_64-linux)
-      google-protobuf (~> 3.19)
+    grpc (1.54.0-x86_64-linux)
+      google-protobuf (~> 3.21)
       googleapis-common-protos-types (~> 1.0)
     haikunator (1.1.1)
-    hairtrigger (0.2.25)
-      activerecord (>= 5.0, < 8)
+    hairtrigger (1.0.0)
+      activerecord (>= 6.0, < 8)
       ruby2ruby (~> 2.4)
       ruby_parser (~> 3.10)
     hana (1.3.7)
     hashdiff (1.0.1)
     hashie (5.0.0)
     hkdf (1.0.0)
-    html2text (0.2.1)
-      nokogiri (~> 1.6)
-    http (5.1.0)
+    http (5.1.1)
       addressable (~> 2.8)
       http-cookie (~> 1.0)
       http-form_data (~> 2.2)
@@ -364,20 +360,20 @@ GEM
     jbuilder (2.11.5)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
-    jmespath (1.6.1)
-    jquery-rails (4.5.0)
+    jmespath (1.6.2)
+    jquery-rails (4.5.1)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (2.6.2)
-    json_refs (0.1.7)
+    json (2.6.3)
+    json_refs (0.1.8)
       hana
-    json_schemer (0.2.21)
+    json_schemer (0.2.24)
       ecma-re-validator (~> 0.3)
       hana (~> 1.3)
       regexp_parser (~> 2.0)
       uri_template (~> 0.7)
-    jwt (2.5.0)
+    jwt (2.7.0)
     kaminari (1.2.2)
       activesupport (>= 4.1.0)
       kaminari-actionview (= 1.2.2)
@@ -390,28 +386,27 @@ GEM
       activerecord
       kaminari-core (= 1.2.2)
     kaminari-core (1.2.2)
-    koala (3.2.0)
+    koala (3.4.0)
       addressable
-      faraday (< 2)
+      faraday
+      faraday-multipart
       json (>= 1.8)
       rexml
-    launchy (2.5.0)
-      addressable (~> 2.7)
+    launchy (2.5.2)
+      addressable (~> 2.8)
     letter_opener (1.8.1)
       launchy (>= 2.2, < 3)
-    libddprof (0.6.0.1.0)
-    libddprof (0.6.0.1.0-x86_64-linux)
-    libddwaf (1.3.0.2.0)
+    libdatadog (2.0.0.1.0)
+    libdatadog (2.0.0.1.0-x86_64-linux)
+    libddwaf (1.8.2.0.0-arm64-darwin)
       ffi (~> 1.0)
-    libddwaf (1.3.0.2.0-arm64-darwin)
+    libddwaf (1.8.2.0.0-x86_64-darwin)
       ffi (~> 1.0)
-    libddwaf (1.3.0.2.0-x86_64-darwin)
+    libddwaf (1.8.2.0.0-x86_64-linux)
       ffi (~> 1.0)
-    libddwaf (1.3.0.2.0-x86_64-linux)
-      ffi (~> 1.0)
-    line-bot-api (1.25.0)
-    liquid (5.3.0)
-    listen (3.7.1)
+    line-bot-api (1.28.0)
+    liquid (5.4.0)
+    listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     llhttp-ffi (0.4.0)
@@ -422,7 +417,7 @@ GEM
       activesupport (>= 4)
       railties (>= 4)
       request_store (~> 1.0)
-    loofah (2.19.1)
+    loofah (2.20.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.8.1)
@@ -436,22 +431,20 @@ GEM
     method_source (1.0.0)
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2022.0105)
-    mini_magick (4.11.0)
+    mime-types-data (3.2023.0218.1)
+    mini_magick (4.12.0)
     mini_mime (1.1.2)
-    mini_portile2 (2.8.1)
     minitest (5.18.0)
-    mock_redis (0.32.0)
+    mock_redis (0.36.0)
       ruby2_keywords
-    momentjs-rails (2.29.1.1)
-      railties (>= 3.1)
-    msgpack (1.5.3)
+    msgpack (1.7.0)
     multi_json (1.15.0)
     multi_xml (0.6.0)
-    multipart-post (2.2.3)
-    net-http-persistent (4.0.1)
+    multipart-post (2.3.0)
+    net-http-persistent (4.0.2)
       connection_pool (~> 2.2)
-    net-imap (0.3.1)
+    net-imap (0.3.4)
+      date
       net-protocol
     net-pop (0.1.2)
       net-protocol
@@ -463,18 +456,20 @@ GEM
     newrelic-sidekiq-metrics (1.6.1)
       newrelic_rpm (~> 8)
       sidekiq
-    newrelic_rpm (8.15.0)
-    nio4r (2.5.8)
-    nokogiri (1.14.3)
-      mini_portile2 (~> 2.8.0)
-      racc (~> 1.4)
+    newrelic_rpm (8.16.0)
+    nio4r (2.5.9)
     nokogiri (1.14.3-arm64-darwin)
       racc (~> 1.4)
     nokogiri (1.14.3-x86_64-darwin)
       racc (~> 1.4)
     nokogiri (1.14.3-x86_64-linux)
       racc (~> 1.4)
-    oauth (0.5.10)
+    oauth (1.1.0)
+      oauth-tty (~> 1.0, >= 1.0.1)
+      snaky_hash (~> 2.0)
+      version_gem (~> 1.1)
+    oauth-tty (1.0.5)
+      version_gem (~> 1.1, >= 1.1.1)
     oauth2 (2.0.9)
       faraday (>= 0.17.3, < 3.0)
       jwt (>= 1.0, < 3.0)
@@ -482,7 +477,7 @@ GEM
       rack (>= 1.2, < 4)
       snaky_hash (~> 2.0)
       version_gem (~> 1.1)
-    omniauth (2.1.0)
+    omniauth (2.1.1)
       hashie (>= 3.4.6)
       rack (>= 2.2.3)
       rack-protection
@@ -500,85 +495,88 @@ GEM
     openssl (3.1.0)
     orm_adapter (0.5.0)
     os (1.1.4)
-    parallel (1.22.1)
-    parser (3.1.2.0)
+    parallel (1.23.0)
+    parser (3.2.2.1)
       ast (~> 2.4.1)
-    pg (1.4.1)
+    pg (1.5.3)
     pg_search (2.3.6)
       activerecord (>= 5.2)
       activesupport (>= 5.2)
-    procore-sift (0.16.0)
-      rails (> 4.2.0)
-    pry (0.14.1)
+    procore-sift (1.0.0)
+      activerecord (>= 6.1)
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
     pry-rails (0.3.9)
       pry (>= 0.10.4)
     public_suffix (5.0.1)
-    puma (5.6.4)
+    puma (6.2.2)
       nio4r (~> 2.0)
-    pundit (2.2.0)
+    pundit (2.3.0)
       activesupport (>= 3.0.0)
     raabro (1.4.0)
     racc (1.6.2)
-    rack (2.2.6.4)
+    rack (2.2.7)
     rack-attack (6.6.1)
       rack (>= 1.0, < 3)
-    rack-cors (1.1.1)
+    rack-cors (2.0.1)
       rack (>= 2.0.0)
-    rack-mini-profiler (3.0.0)
+    rack-mini-profiler (3.1.0)
       rack (>= 1.2.0)
-    rack-protection (3.0.5)
+    rack-protection (3.0.6)
       rack
-    rack-proxy (0.7.2)
+    rack-proxy (0.7.6)
       rack
     rack-test (2.1.0)
       rack (>= 1.3)
     rack-timeout (0.6.3)
-    rails (6.1.7.3)
-      actioncable (= 6.1.7.3)
-      actionmailbox (= 6.1.7.3)
-      actionmailer (= 6.1.7.3)
-      actionpack (= 6.1.7.3)
-      actiontext (= 6.1.7.3)
-      actionview (= 6.1.7.3)
-      activejob (= 6.1.7.3)
-      activemodel (= 6.1.7.3)
-      activerecord (= 6.1.7.3)
-      activestorage (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
+    rails (7.0.4.3)
+      actioncable (= 7.0.4.3)
+      actionmailbox (= 7.0.4.3)
+      actionmailer (= 7.0.4.3)
+      actionpack (= 7.0.4.3)
+      actiontext (= 7.0.4.3)
+      actionview (= 7.0.4.3)
+      activejob (= 7.0.4.3)
+      activemodel (= 7.0.4.3)
+      activerecord (= 7.0.4.3)
+      activestorage (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
       bundler (>= 1.15.0)
-      railties (= 6.1.7.3)
-      sprockets-rails (>= 2.0.0)
+      railties (= 7.0.4.3)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.5.0)
       loofah (~> 2.19, >= 2.19.1)
-    railties (6.1.7.3)
-      actionpack (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
+    railties (7.0.4.3)
+      actionpack (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
+      zeitwerk (~> 2.5)
     rainbow (3.1.1)
     rake (13.0.6)
-    rb-fsevent (0.11.1)
+    rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    redis (4.7.1)
-    redis-namespace (1.8.2)
-      redis (>= 3.0.4)
-    regexp_parser (2.5.0)
+    redis (5.0.6)
+      redis-client (>= 0.9.0)
+    redis-client (0.14.1)
+      connection_pool
+    redis-namespace (1.10.0)
+      redis (>= 4)
+    regexp_parser (2.8.0)
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     request_store (1.5.1)
       rack (>= 1.4)
-    responders (3.0.1)
-      actionpack (>= 5.0)
-      railties (>= 5.0)
+    responders (3.1.0)
+      actionpack (>= 5.2)
+      railties (>= 5.2)
     rest-client (2.1.0)
       http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
@@ -586,54 +584,57 @@ GEM
       netrc (~> 0.8)
     retriable (3.1.2)
     rexml (3.2.5)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.5)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-rails (5.0.3)
-      actionpack (>= 5.2)
-      activesupport (>= 5.2)
-      railties (>= 5.2)
-      rspec-core (~> 3.10)
-      rspec-expectations (~> 3.10)
-      rspec-mocks (~> 3.10)
-      rspec-support (~> 3.10)
-    rspec-support (3.11.0)
+      rspec-support (~> 3.12.0)
+    rspec-rails (6.0.2)
+      actionpack (>= 6.1)
+      activesupport (>= 6.1)
+      railties (>= 6.1)
+      rspec-core (~> 3.12)
+      rspec-expectations (~> 3.12)
+      rspec-mocks (~> 3.12)
+      rspec-support (~> 3.12)
+    rspec-support (3.12.0)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.31.2)
+    rubocop (1.50.2)
       json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.1.0.0)
+      parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.18.0, < 2.0)
+      rubocop-ast (>= 1.28.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.19.1)
-      parser (>= 3.1.1.0)
-    rubocop-performance (1.14.2)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.28.1)
+      parser (>= 3.2.1.0)
+    rubocop-capybara (2.18.0)
+      rubocop (~> 1.41)
+    rubocop-performance (1.17.1)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.15.2)
+    rubocop-rails (2.19.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 1.7.0, < 2.0)
-    rubocop-rspec (2.12.1)
-      rubocop (~> 1.31)
-    ruby-progressbar (1.11.0)
+      rubocop (>= 1.33.0, < 2.0)
+    rubocop-rspec (2.21.0)
+      rubocop (~> 1.33)
+      rubocop-capybara (~> 2.17)
+    ruby-progressbar (1.13.0)
     ruby-vips (2.1.4)
       ffi (~> 1.12)
     ruby2_keywords (0.0.5)
-    ruby2ruby (2.4.4)
+    ruby2ruby (2.5.0)
       ruby_parser (~> 3.1)
       sexp_processor (~> 4.6)
-    ruby_parser (3.19.1)
+    ruby_parser (3.20.0)
       sexp_processor (~> 4.16)
     sassc (2.4.0)
       ffi (~> 1.9)
@@ -643,34 +644,33 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    scout_apm (5.2.0)
+    scout_apm (5.3.3)
       parser
     seed_dump (3.3.1)
       activerecord (>= 4)
       activesupport (>= 4)
     selectize-rails (0.12.6)
     semantic_range (3.0.0)
-    sentry-rails (5.3.1)
+    sentry-rails (5.9.0)
       railties (>= 5.0)
-      sentry-ruby-core (~> 5.3.1)
-    sentry-ruby (5.3.1)
+      sentry-ruby (~> 5.9.0)
+    sentry-ruby (5.9.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      sentry-ruby-core (= 5.3.1)
-    sentry-ruby-core (5.3.1)
-      concurrent-ruby
-    sentry-sidekiq (5.3.1)
-      sentry-ruby-core (~> 5.3.1)
+    sentry-sidekiq (5.9.0)
+      sentry-ruby (~> 5.9.0)
       sidekiq (>= 3.0)
-    sexp_processor (4.16.1)
-    shoulda-matchers (5.1.0)
+    sexp_processor (4.17.0)
+    shoulda-matchers (5.3.0)
       activesupport (>= 5.2.0)
-    sidekiq (6.4.2)
-      connection_pool (>= 2.2.2)
-      rack (~> 2.0)
-      redis (>= 4.2.0)
-    sidekiq-cron (1.6.0)
-      fugit (~> 1)
-      sidekiq (>= 4.2.1)
+    sidekiq (7.1.0)
+      concurrent-ruby (< 2)
+      connection_pool (>= 2.3.0)
+      rack (>= 2.2.4)
+      redis-client (>= 0.14.0)
+    sidekiq-cron (1.10.0)
+      fugit (~> 1.8)
+      globalid (>= 1.0.1)
+      sidekiq (>= 6)
     signet (0.17.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
@@ -681,19 +681,20 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    slack-ruby-client (1.0.0)
-      faraday (>= 1.0)
-      faraday_middleware
+    slack-ruby-client (2.0.0)
+      faraday (>= 2.0)
+      faraday-mashify
+      faraday-multipart
       gli
       hashie
       websocket-driver
     snaky_hash (2.0.1)
       hashie
       version_gem (~> 1.1, >= 1.1.1)
-    spring (2.1.1)
-    spring-watcher-listen (2.0.1)
+    spring (4.1.1)
+    spring-watcher-listen (2.1.0)
       listen (>= 2.7, < 4.0)
-      spring (>= 1.2, < 3.0)
+      spring (>= 4)
     sprockets (4.2.0)
       concurrent-ruby (~> 1.0)
       rack (>= 2.2.4, < 4)
@@ -701,28 +702,28 @@ GEM
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    squasher (0.6.2)
-    stackprof (0.2.24)
+    squasher (0.7.2)
+    stackprof (0.2.25)
     statsd-ruby (1.5.0)
-    stripe (6.5.0)
-    telephone_number (1.4.16)
-    test-prof (1.0.11)
+    stripe (8.5.0)
+    telephone_number (1.4.20)
+    test-prof (1.2.1)
     thor (1.2.1)
-    tilt (2.0.10)
+    tilt (2.1.0)
     time_diff (0.3.0)
       activesupport
       i18n
-    timeout (0.3.1)
+    timeout (0.3.2)
     trailblazer-option (0.1.2)
-    twilio-ruby (5.68.0)
+    twilio-ruby (5.77.0)
       faraday (>= 0.9, < 3.0)
-      jwt (>= 1.5, <= 2.5)
+      jwt (>= 1.5, < 3.0)
       nokogiri (>= 1.6, < 2.0)
     twitty (0.1.5)
       oauth
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2022.1)
+    tzinfo-data (1.2023.3)
       tzinfo (>= 1.0.0)
     uber (0.1.0)
     uglifier (4.2.0)
@@ -730,13 +731,13 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.8.2)
-    unicode-display_width (2.2.0)
+    unicode-display_width (2.4.2)
     uniform_notifier (1.16.0)
     uri_template (0.7.0)
-    valid_email2 (4.0.3)
+    valid_email2 (4.0.6)
       activemodel (>= 3.2)
       mail (~> 2.5)
-    version_gem (1.1.1)
+    version_gem (1.1.2)
     warden (1.2.9)
       rack (>= 2.0.9)
     web-console (4.2.0)
@@ -752,12 +753,12 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    webpacker (5.4.3)
+    webpacker (5.4.4)
       activesupport (>= 5.2)
       rack-proxy (>= 0.6.1)
       railties (>= 5.2)
       semantic_range (>= 2.3.0)
-    webrick (1.7.0)
+    webrick (1.8.1)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -769,10 +770,10 @@ GEM
 
 PLATFORMS
   arm64-darwin-20
-  ruby
   x86_64-darwin-18
   x86_64-darwin-20
   x86_64-darwin-21
+  x86_64-darwin-22
   x86_64-linux
 
 DEPENDENCIES
@@ -784,7 +785,7 @@ DEPENDENCIES
   attr_extras
   audited (~> 5.3)
   aws-sdk-s3
-  azure-storage-blob
+  azure-storage-blob!
   barnes
   bootsnap
   brakeman
@@ -795,14 +796,14 @@ DEPENDENCIES
   climate_control
   commonmarker
   csv-safe
-  cypress-on-rails (~> 1.13, >= 1.13.1)
+  cypress-on-rails
   database_cleaner
   ddtrace
   devise
-  devise-secure_password (~> 2.0)!
+  devise-secure_password!
   devise_token_auth
   dotenv-rails
-  down (~> 5.0)
+  down
   elastic-apm
   email_reply_trimmer
   facebook-messenger
@@ -813,15 +814,16 @@ DEPENDENCIES
   foreman
   geocoder
   gmail_xoauth
-  google-cloud-dialogflow
+  google-cloud-dialogflow-v2
   google-cloud-storage
-  google-cloud-translate
+  google-cloud-translate-v3
   groupdate
+  grpc
   haikunator
   hairtrigger
   hashie
-  html2text
-  image_processing (~> 1.12.2)
+  html2text!
+  image_processing
   jbuilder
   json_refs
   json_schemer
@@ -835,9 +837,6 @@ DEPENDENCIES
   lograge (~> 0.12.0)
   maxminddb
   mock_redis
-  net-imap
-  net-pop
-  net-smtp
   newrelic-sidekiq-metrics
   newrelic_rpm
   omniauth
@@ -854,12 +853,12 @@ DEPENDENCIES
   rack-cors
   rack-mini-profiler
   rack-timeout
-  rails (~> 6.1, >= 6.1.7.3)
+  rails (~> 7)
   redis
   redis-namespace
   responders
   rest-client
-  rspec-rails (~> 5.0.3)
+  rspec-rails
   rspec_junit_formatter
   rubocop
   rubocop-performance
@@ -871,10 +870,10 @@ DEPENDENCIES
   sentry-ruby
   sentry-sidekiq
   shoulda-matchers
-  sidekiq (~> 6.4.2)
-  sidekiq-cron (~> 1.6, >= 1.6.0)
+  sidekiq
+  sidekiq-cron
   simplecov (= 0.17.1)
-  slack-ruby-client
+  slack-ruby-client (~> 2.0.0)
   spring
   spring-watcher-listen
   squasher
@@ -891,12 +890,12 @@ DEPENDENCIES
   web-console
   web-push
   webmock
-  webpacker (~> 5.4, >= 5.4.3)
+  webpacker
   wisper (= 2.0.0)
   working_hours
 
 RUBY VERSION
-   ruby 3.1.3p185
+   ruby 3.2.2p185
 
 BUNDLED WITH
-   2.3.26
+   2.4.10
diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
index 23178b5f3..eb6f776f1 100644
--- a/app/controllers/api_controller.rb
+++ b/app/controllers/api_controller.rb
@@ -3,7 +3,7 @@ class ApiController < ApplicationController
 
   def index
     render json: { version: Chatwoot.config[:version],
-                   timestamp: Time.now.utc.to_formatted_s(:db),
+                   timestamp: Time.now.utc.to_fs(:db),
                    queue_services: redis_status,
                    data_services: postgres_status }
   end
diff --git a/app/controllers/widgets_controller.rb b/app/controllers/widgets_controller.rb
index a4e40eb9c..70e4c967b 100644
--- a/app/controllers/widgets_controller.rb
+++ b/app/controllers/widgets_controller.rb
@@ -41,7 +41,7 @@ class WidgetsController < ActionController::Base
       source_id: @auth_token_params[:source_id]
     )
 
-    @contact = @contact_inbox ? @contact_inbox.contact : nil
+    @contact = @contact_inbox&.contact
   end
 
   def build_contact
diff --git a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/AgentSelector.vue b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/AgentSelector.vue
index 578b6e821..64ef6473a 100644
--- a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/AgentSelector.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/AgentSelector.vue
@@ -1,6 +1,6 @@
 <template>
   <div v-on-clickaway="onCloseAgentList" class="bulk-action__agents">
-    <div class="triangle" :style="cssVars">
+    <div class="triangle">
       <svg height="12" viewBox="0 0 24 12" width="24">
         <path
           d="M20 12l-8-8-12 12"
@@ -104,14 +104,13 @@ import { mapGetters } from 'vuex';
 import Thumbnail from 'dashboard/components/widgets/Thumbnail.vue';
 import Spinner from 'shared/components/Spinner';
 import { mixin as clickaway } from 'vue-clickaway';
-import bulkActionsMixin from 'dashboard/mixins/bulkActionsMixin.js';
 
 export default {
   components: {
     Thumbnail,
     Spinner,
   },
-  mixins: [clickaway, bulkActionsMixin],
+  mixins: [clickaway],
   props: {
     selectedInboxes: {
       type: Array,
@@ -240,7 +239,7 @@ export default {
     display: block;
     z-index: var(--z-index-one);
     position: absolute;
-    top: calc(var(--space-slab) * -1);
+    top: var(--space-minus-slab);
     right: var(--triangle-position);
     text-align: left;
   }
diff --git a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/Index.vue b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/Index.vue
index d10a0bb82..a6e1c3897 100644
--- a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/Index.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/Index.vue
@@ -58,7 +58,7 @@
       <transition name="popover-animation">
         <label-actions
           v-if="showLabelActions"
-          triangle-position="8.5"
+          class="label-actions-box"
           @assign="assignLabels"
           @close="showLabelActions = false"
         />
@@ -66,12 +66,12 @@
       <transition name="popover-animation">
         <update-actions
           v-if="showUpdateActions"
+          class="update-actions-box"
           :selected-inboxes="selectedInboxes"
           :conversation-count="conversations.length"
           :show-resolve="!showResolvedAction"
           :show-reopen="!showOpenAction"
           :show-snooze="!showSnoozedAction"
-          triangle-position="5.6"
           @update="updateConversations"
           @close="showUpdateActions = false"
         />
@@ -79,9 +79,9 @@
       <transition name="popover-animation">
         <agent-selector
           v-if="showAgentsList"
+          class="agent-actions-box"
           :selected-inboxes="selectedInboxes"
           :conversation-count="conversations.length"
-          triangle-position="2.8"
           @select="submit"
           @close="showAgentsList = false"
         />
@@ -89,7 +89,7 @@
       <transition name="popover-animation">
         <team-actions
           v-if="showTeamsList"
-          triangle-position="0.2"
+          class="team-actions-box"
           @assign-team="assignTeam"
           @close="showTeamsList = false"
         />
@@ -247,4 +247,17 @@ export default {
   opacity: 0;
   transform: scale(0.95);
 }
+
+.label-actions-box {
+  --triangle-position: 8.5rem;
+}
+.update-actions-box {
+  --triangle-position: 5.6rem;
+}
+.agent-actions-box {
+  --triangle-position: 2.8rem;
+}
+.team-actions-box {
+  --triangle-position: 0.2rem;
+}
 </style>
diff --git a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/LabelActions.vue b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/LabelActions.vue
index f7a70e578..74e02c69f 100644
--- a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/LabelActions.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/LabelActions.vue
@@ -1,6 +1,6 @@
 <template>
   <div v-on-clickaway="onClose" class="labels-container">
-    <div class="triangle" :style="cssVars">
+    <div class="triangle">
       <svg height="12" viewBox="0 0 24 12" width="24">
         <path
           d="M20 12l-8-8-12 12"
@@ -75,10 +75,9 @@
 <script>
 import { mixin as clickaway } from 'vue-clickaway';
 import { mapGetters } from 'vuex';
-import bulkActionsMixin from 'dashboard/mixins/bulkActionsMixin.js';
 
 export default {
-  mixins: [clickaway, bulkActionsMixin],
+  mixins: [clickaway],
   data() {
     return {
       query: '',
@@ -207,7 +206,7 @@ export default {
     position: absolute;
     right: var(--triangle-position);
     text-align: left;
-    top: calc(var(--space-slab) * -1);
+    top: var(--space-minus-slab);
     z-index: var(--z-index-one);
   }
 }
diff --git a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/TeamActions.vue b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/TeamActions.vue
index 2417a782d..757ff05f8 100644
--- a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/TeamActions.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/TeamActions.vue
@@ -1,6 +1,6 @@
 <template>
   <div v-on-clickaway="onClose" class="bulk-action__teams">
-    <div class="triangle" :style="cssVars">
+    <div class="triangle">
       <svg height="12" viewBox="0 0 24 12" width="24">
         <path
           d="M20 12l-8-8-12 12"
@@ -59,9 +59,8 @@
 <script>
 import { mixin as clickaway } from 'vue-clickaway';
 import { mapGetters } from 'vuex';
-import bulkActionsMixin from 'dashboard/mixins/bulkActionsMixin.js';
 export default {
-  mixins: [clickaway, bulkActionsMixin],
+  mixins: [clickaway],
   data() {
     return {
       query: '',
@@ -141,7 +140,7 @@ export default {
     display: block;
     z-index: var(--z-index-one);
     position: absolute;
-    top: calc(var(--space-slab) * -1);
+    top: var(--space-minus-slab);
     right: var(--triangle-position);
     text-align: left;
   }
diff --git a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/UpdateActions.vue b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/UpdateActions.vue
index c9d988d3f..0908455a4 100644
--- a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/UpdateActions.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/UpdateActions.vue
@@ -1,6 +1,6 @@
 <template>
   <div v-on-clickaway="onClose" class="actions-container">
-    <div class="triangle" :style="cssVars">
+    <div class="triangle">
       <svg height="12" viewBox="0 0 24 12" width="24">
         <path
           d="M20 12l-8-8-12 12"
@@ -45,14 +45,13 @@
 import { mixin as clickaway } from 'vue-clickaway';
 import WootDropdownItem from 'shared/components/ui/dropdown/DropdownItem.vue';
 import WootDropdownMenu from 'shared/components/ui/dropdown/DropdownMenu.vue';
-import bulkActionsMixin from 'dashboard/mixins/bulkActionsMixin.js';
 
 export default {
   components: {
     WootDropdownItem,
     WootDropdownMenu,
   },
-  mixins: [clickaway, bulkActionsMixin],
+  mixins: [clickaway],
   props: {
     selectedInboxes: {
       type: Array,
@@ -156,7 +155,7 @@ export default {
     position: absolute;
     right: var(--triangle-position);
     text-align: left;
-    top: calc(var(--space-slab) * -1);
+    top: var(--space-minus-slab);
     z-index: var(--z-index-one);
   }
 }
diff --git a/app/mailboxes/application_mailbox.rb b/app/mailboxes/application_mailbox.rb
index 9af5aa876..c1e273e70 100644
--- a/app/mailboxes/application_mailbox.rb
+++ b/app/mailboxes/application_mailbox.rb
@@ -4,7 +4,7 @@ class ApplicationMailbox < ActionMailbox::Base
   # Last part is the regex for the UUID
   # Eg: email should be something like : reply+6bdc3f4d-0bec-4515-a284-5d916fdde489@domain.com
   REPLY_EMAIL_UUID_PATTERN = /^reply\+([0-9a-f]{8}\b-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-\b[0-9a-f]{12})$/i
-  CONVERSATION_MESSAGE_ID_PATTERN = %r{conversation/([a-zA-Z0-9\-]*?)/messages/(\d+?)@(\w+\.\w+)}
+  CONVERSATION_MESSAGE_ID_PATTERN = %r{conversation/([a-zA-Z0-9-]*?)/messages/(\d+?)@(\w+\.\w+)}
 
   # routes as a reply to existing conversations
   routing(
diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index a9732662b..b9272d9f0 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -62,7 +62,7 @@ class Attachment < ApplicationRecord
 
   def thumb_url
     if file.attached? && file.representable?
-      url_for(file.representation(resize: '250x250'))
+      url_for(file.representation(resize_to_fill: [250, nil]))
     else
       ''
     end
diff --git a/app/models/concerns/avatarable.rb b/app/models/concerns/avatarable.rb
index 852dd311d..94ca55037 100644
--- a/app/models/concerns/avatarable.rb
+++ b/app/models/concerns/avatarable.rb
@@ -11,7 +11,7 @@ module Avatarable
   end
 
   def avatar_url
-    return url_for(avatar.representation(resize: '250x250')) if avatar.attached? && avatar.representable?
+    return url_for(avatar.representation(resize_to_fill: [250, nil])) if avatar.attached? && avatar.representable?
 
     ''
   end
diff --git a/app/models/concerns/pubsubable.rb b/app/models/concerns/pubsubable.rb
index 21b42899c..7da99ea14 100644
--- a/app/models/concerns/pubsubable.rb
+++ b/app/models/concerns/pubsubable.rb
@@ -10,7 +10,7 @@ module Pubsubable
 
   def pubsub_token
     # backfills tokens for existing records
-    regenerate_pubsub_token if self[:pubsub_token].blank?
+    regenerate_pubsub_token if self[:pubsub_token].blank? && persisted?
     self[:pubsub_token]
   end
 end
diff --git a/app/views/public/api/v1/inboxes/show.json.jbuilder b/app/views/public/api/v1/inboxes/show.json.jbuilder
index e85fcf215..ba882aa3e 100644
--- a/app/views/public/api/v1/inboxes/show.json.jbuilder
+++ b/app/views/public/api/v1/inboxes/show.json.jbuilder
@@ -1,3 +1,3 @@
 json.identifier @inbox_channel.identifier
 json.identity_validation_enabled @inbox_channel.hmac_mandatory
-json.partial! 'public/api/v1/models/inbox.json.jbuilder', resource: @inbox_channel.inbox
+json.partial! 'public/api/v1/models/inbox', formats: [:json], resource: @inbox_channel.inbox
diff --git a/app/views/public/api/v1/models/_category.json.jbuilder b/app/views/public/api/v1/models/_category.json.jbuilder
index 39828c981..915914e57 100644
--- a/app/views/public/api/v1/models/_category.json.jbuilder
+++ b/app/views/public/api/v1/models/_category.json.jbuilder
@@ -7,20 +7,20 @@ json.position category.position
 json.related_categories do
   if category.related_categories.any?
     json.array! category.related_categories.each do |related_category|
-      json.partial! partial: 'public/api/v1/models/associated_category.json.jbuilder', category: related_category
+      json.partial! partial: 'public/api/v1/models/associated_category', formats: [:json], category: related_category
     end
   end
 end
 
 if category.parent_category.present?
   json.parent_category do
-    json.partial! partial: 'public/api/v1/models/associated_category.json.jbuilder', category: category.parent_category
+    json.partial! partial: 'public/api/v1/models/associated_category', formats: [:json], category: category.parent_category
   end
 end
 
 if category.root_category.present?
   json.root_category do
-    json.partial! partial: 'public/api/v1/models/associated_category.json.jbuilder', category: category.root_category
+    json.partial! partial: 'public/api/v1/models/associated_category', formats: [:json], category: category.root_category
   end
 end
 
diff --git a/app/views/public/api/v1/portals/articles/index.json.jbuilder b/app/views/public/api/v1/portals/articles/index.json.jbuilder
index 00d271834..596b3ed6b 100644
--- a/app/views/public/api/v1/portals/articles/index.json.jbuilder
+++ b/app/views/public/api/v1/portals/articles/index.json.jbuilder
@@ -1,5 +1,5 @@
 json.payload do
-  json.array! @articles, partial: 'public/api/v1/models/article.json.jbuilder', as: :article
+  json.array! @articles, partial: 'public/api/v1/models/article', formats: [:json], as: :article
 end
 
 json.meta do
diff --git a/app/views/public/api/v1/portals/categories/index.json.jbuilder b/app/views/public/api/v1/portals/categories/index.json.jbuilder
index f28416dd5..820d5dfc5 100644
--- a/app/views/public/api/v1/portals/categories/index.json.jbuilder
+++ b/app/views/public/api/v1/portals/categories/index.json.jbuilder
@@ -1,3 +1,3 @@
 json.payload do
-  json.array! @categories, partial: 'public/api/v1/models/category.json.jbuilder', as: :category
+  json.array! @categories, partial: 'public/api/v1/models/category', formats: [:json], as: :category
 end
diff --git a/app/views/public/api/v1/portals/index.json.jbuilder b/app/views/public/api/v1/portals/index.json.jbuilder
index 41f359789..4f90a4b8c 100644
--- a/app/views/public/api/v1/portals/index.json.jbuilder
+++ b/app/views/public/api/v1/portals/index.json.jbuilder
@@ -1 +1 @@
-json.array! @portals, partial: 'public/api/v1/models/portal.json.jbuilder', as: :portal
+json.array! @portals, partial: 'public/api/v1/models/portal', formats: [:json], as: :portal
diff --git a/bin/validate_push b/bin/validate_push
old mode 100644
new mode 100755
diff --git a/config/application.rb b/config/application.rb
index ed9d9a9b4..1aedfc860 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -30,7 +30,7 @@ end
 module Chatwoot
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 6.0
+    config.load_defaults 7.0
 
     config.eager_load_paths << Rails.root.join('lib')
     config.eager_load_paths << Rails.root.join('enterprise/lib')
@@ -51,7 +51,7 @@ module Chatwoot
     # https://stackoverflow.com/questions/72970170/upgrading-to-rails-6-1-6-1-causes-psychdisallowedclass-tried-to-load-unspecif
     # https://discuss.rubyonrails.org/t/cve-2022-32224-possible-rce-escalation-bug-with-serialized-columns-in-active-record/81017
     # FIX ME : fixes breakage of installation config. we need to migrate.
-    config.active_record.yaml_column_permitted_classes = [HashWithIndifferentAccess]
+    config.active_record.yaml_column_permitted_classes = [ActiveSupport::HashWithIndifferentAccess]
   end
 
   def self.config
diff --git a/config/database.yml b/config/database.yml
index 1001eedd7..5dfaa14b1 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -4,7 +4,7 @@ default: &default
   host: <%= ENV.fetch('POSTGRES_HOST', 'localhost') %>
   port: <%= ENV.fetch('POSTGRES_PORT', '5432') %>
    # ref: https://github.com/mperham/sidekiq/issues/2985#issuecomment-531097962
-  pool: <%= Sidekiq.server? ? Sidekiq.options[:concurrency] : ENV.fetch('RAILS_MAX_THREADS', 5) %>
+  pool: <%= Sidekiq.server? ? ENV.fetch('SIDEKIQ_CONCURRENCY', 10) : ENV.fetch('RAILS_MAX_THREADS', 5) %>
   variables:
     # we are setting this value to be close to the racktimeout value. we will iterate and reduce this value going forward
     statement_timeout: <%= ENV["POSTGRES_STATEMENT_TIMEOUT"] || "14s" %>
diff --git a/config/initializers/01_redis.rb b/config/initializers/01_redis.rb
index ccbf02b4d..664dcd435 100644
--- a/config/initializers/01_redis.rb
+++ b/config/initializers/01_redis.rb
@@ -1,14 +1,14 @@
 # Alfred
 # Add here as you use it for more features
 # Used for Round Robin, Conversation Emails & Online Presence
-$alfred = ConnectionPool.new(size: 5, timeout: 3) do
+$alfred = ConnectionPool.new(size: 5, timeout: 1) do
   redis = Rails.env.test? ? MockRedis.new : Redis.new(Redis::Config.app)
   Redis::Namespace.new('alfred', redis: redis, warning: true)
 end
 
 # Velma : Determined protector
 # used in rack attack
-$velma = ConnectionPool.new(size: 5, timeout: 3) do
+$velma = ConnectionPool.new(size: 5, timeout: 1) do
   config = Rails.env.test? ? MockRedis.new : Redis.new(Redis::Config.app)
   Redis::Namespace.new('velma', redis: config, warning: true)
 end
diff --git a/config/initializers/new_framework_defaults_6_0.rb b/config/initializers/new_framework_defaults_6_0.rb
deleted file mode 100644
index 92240ef5f..000000000
--- a/config/initializers/new_framework_defaults_6_0.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-# Be sure to restart your server when you modify this file.
-#
-# This file contains migration options to ease your Rails 6.0 upgrade.
-#
-# Once upgraded flip defaults one by one to migrate to the new default.
-#
-# Read the Guide for Upgrading Ruby on Rails for more info on each option.
-
-# Don't force requests from old versions of IE to be UTF-8 encoded.
-# Rails.application.config.action_view.default_enforce_utf8 = false
-
-# Embed purpose and expiry metadata inside signed and encrypted
-# cookies for increased security.
-#
-# This option is not backwards compatible with earlier Rails versions.
-# It's best enabled when your entire app is migrated and stable on 6.0.
-# Rails.application.config.action_dispatch.use_cookies_with_metadata = true
-
-# Change the return value of `ActionDispatch::Response#content_type` to Content-Type header without modification.
-# Rails.application.config.action_dispatch.return_only_media_type_on_content_type = false
-
-# Return false instead of self when enqueuing is aborted from a callback.
-# Rails.application.config.active_job.return_false_on_aborted_enqueue = true
-
-# Send Active Storage analysis and purge jobs to dedicated queues.
-# Rails.application.config.active_storage.queues.analysis = :active_storage_analysis
-# Rails.application.config.active_storage.queues.purge    = :active_storage_purge
-
-# When assigning to a collection of attachments declared via `has_many_attached`, replace existing
-# attachments instead of appending. Use #attach to add new attachments without replacing existing ones.
-# Rails.application.config.active_storage.replace_on_assign_to_many = true
-
-# Use ActionMailer::MailDeliveryJob for sending parameterized and normal mail.
-#
-# The default delivery jobs (ActionMailer::Parameterized::DeliveryJob, ActionMailer::DeliveryJob),
-# will be removed in Rails 6.1. This setting is not backwards compatible with earlier Rails versions.
-# If you send mail in the background, job workers need to have a copy of
-# MailDeliveryJob to ensure all delivery jobs are processed properly.
-# Make sure your entire app is migrated and stable on 6.0 before using this setting.
-# Rails.application.config.action_mailer.delivery_job = "ActionMailer::MailDeliveryJob"
-
-# Enable the same cache key to be reused when the object being cached of type
-# `ActiveRecord::Relation` changes by moving the volatile information (max updated at and count)
-# of the relation's cache key into the cache version to support recycling cache key.
-# Rails.application.config.active_record.collection_cache_versioning = true
diff --git a/config/initializers/permissions_policy.rb b/config/initializers/permissions_policy.rb
new file mode 100644
index 000000000..00f64d71b
--- /dev/null
+++ b/config/initializers/permissions_policy.rb
@@ -0,0 +1,11 @@
+# Define an application-wide HTTP permissions policy. For further
+# information see https://developers.google.com/web/updates/2018/06/feature-policy
+#
+# Rails.application.config.permissions_policy do |f|
+#   f.camera      :none
+#   f.gyroscope   :none
+#   f.microphone  :none
+#   f.usb         :none
+#   f.fullscreen  :self
+#   f.payment     :self, "https://secure.example.com"
+# end
diff --git a/config/sidekiq.yml b/config/sidekiq.yml
index 4bc3d1cb8..4d2abed9c 100644
--- a/config/sidekiq.yml
+++ b/config/sidekiq.yml
@@ -4,7 +4,7 @@
 # pick it up automatically.
 ---
 :verbose: false
-:concurrency: <%= ENV.fetch("SIDEKIQ_CONCURRENCY", 5) %>
+:concurrency: <%= ENV.fetch("SIDEKIQ_CONCURRENCY", 10) %>
 :timeout: 25
 :max_retries: 3
 
@@ -32,4 +32,4 @@
 production:
   :concurrency: <%= ENV.fetch("SIDEKIQ_CONCURRENCY", 10) %>
 staging:
-  :concurrency: <%= ENV.fetch("SIDEKIQ_CONCURRENCY", 5) %>
+  :concurrency: <%= ENV.fetch("SIDEKIQ_CONCURRENCY", 10) %>
diff --git a/db/migrate/20230321073727_remove_not_null_on_active_storage_blobs_checksum.active_storage.rb b/db/migrate/20230321073727_remove_not_null_on_active_storage_blobs_checksum.active_storage.rb
new file mode 100644
index 000000000..93c8b85ad
--- /dev/null
+++ b/db/migrate/20230321073727_remove_not_null_on_active_storage_blobs_checksum.active_storage.rb
@@ -0,0 +1,8 @@
+# This migration comes from active_storage (originally 20211119233751)
+class RemoveNotNullOnActiveStorageBlobsChecksum < ActiveRecord::Migration[6.0]
+  def change
+    return unless table_exists?(:active_storage_blobs)
+
+    change_column_null(:active_storage_blobs, :checksum, true)
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index ef989dd14..d3753968a 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,8 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2023_04_26_130150) do
-
+ActiveRecord::Schema[7.0].define(version: 2023_04_26_130150) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_stat_statements"
   enable_extension "pg_trgm"
@@ -22,8 +21,8 @@ ActiveRecord::Schema.define(version: 2023_04_26_130150) do
     t.string "owner_type"
     t.bigint "owner_id"
     t.string "token"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["owner_type", "owner_id"], name: "index_access_tokens_on_owner_type_and_owner_id"
     t.index ["token"], name: "index_access_tokens_on_token", unique: true
   end
@@ -33,9 +32,9 @@ ActiveRecord::Schema.define(version: 2023_04_26_130150) do
     t.bigint "user_id"
     t.integer "role", default: 0
     t.bigint "inviter_id"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
-    t.datetime "active_at"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.datetime "active_at", precision: nil
     t.integer "availability", default: 0, null: false
     t.boolean "auto_offline", default: true, null: false
     t.index ["account_id", "user_id"], name: "uniq_user_id_per_account_id", unique: true
@@ -45,8 +44,8 @@ ActiveRecord::Schema.define(version: 2023_04_26_130150) do
 
   create_table "accounts", id: :serial, force: :cascade do |t|
     t.string "name", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.integer "locale", default: 0
     t.string "domain", limit: 100
     t.string "support_email", limit: 100
@@ -62,8 +61,8 @@ ActiveRecord::Schema.define(version: 2023_04_26_130150) do
     t.integer "status", default: 0, null: false
     t.string "message_id", null: false
     t.string "message_checksum", null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["message_id", "message_checksum"], name: "index_action_mailbox_inbound_emails_uniqueness", unique: true
   end
 
@@ -72,7 +71,7 @@ ActiveRecord::Schema.define(version: 2023_04_26_130150) do
     t.string "record_type", null: false
     t.bigint "record_id", null: false
     t.bigint "blob_id", null: false
-    t.datetime "created_at", null: false
+    t.datetime "created_at", precision: nil, null: false
     t.index ["blob_id"], name: "index_active_storage_attachments_on_blob_id"
     t.index ["record_type", "record_id", "name", "blob_id"], name: "index_active_storage_attachments_uniqueness", unique: true
   end
@@ -83,8 +82,8 @@ ActiveRecord::Schema.define(version: 2023_04_26_130150) do
     t.string "content_type"
     t.text "metadata"
     t.bigint "byte_size", null: false
-    t.string "checksum", null: false
-    t.datetime "created_at", null: false
+    t.string "checksum"
+    t.datetime "created_at", precision: nil, null: false
     t.string "service_name", null: false
     t.index ["key"], name: "index_active_storage_blobs_on_key", unique: true
   end
@@ -99,8 +98,8 @@ ActiveRecord::Schema.define(version: 2023_04_26_130150) do
     t.integer "inbox_id"
     t.integer "agent_bot_id"
     t.integer "status", default: 0
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.integer "account_id"
   end
 
@@ -108,8 +107,8 @@ ActiveRecord::Schema.define(version: 2023_04_26_130150) do
     t.string "name"
     t.string "description"
     t.string "outgoing_url"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.bigint "account_id"
     t.integer "bot_type", default: 0
     t.jsonb "bot_config", default: {}
@@ -126,8 +125,8 @@ ActiveRecord::Schema.define(version: 2023_04_26_130150) do
     t.text "content"
     t.integer "status"
     t.integer "views"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.bigint "author_id"
     t.bigint "associated_article_id"
     t.jsonb "meta", default: {}
@@ -145,8 +144,8 @@ ActiveRecord::Schema.define(version: 2023_04_26_130150) do
     t.float "coordinates_long", default: 0.0
     t.integer "message_id", null: false
     t.integer "account_id", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.string "fallback_title"
     t.string "extension"
     t.index ["account_id"], name: "index_attachments_on_account_id"
@@ -167,7 +166,7 @@ ActiveRecord::Schema.define(version: 2023_04_26_130150) do
     t.string "comment"
     t.string "remote_address"
     t.string "request_uuid"
-    t.datetime "created_at"
+    t.datetime "created_at", precision: nil
     t.index ["associated_type", "associated_id"], name: "associated_index"
     t.index ["auditable_type", "auditable_id", "version"], name: "auditable_index"
     t.index ["created_at"], name: "index_audits_on_created_at"
@@ -182,8 +181,8 @@ ActiveRecord::Schema.define(version: 2023_04_26_130150) do
     t.string "event_name", null: false
     t.jsonb "conditions", default: "{}", null: false
     t.jsonb "actions", default: "{}", null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.boolean "active", default: true, null: false
     t.index ["account_id"], name: "index_automation_rules_on_account_id"
   end
@@ -198,12 +197,12 @@ ActiveRecord::Schema.define(version: 2023_04_26_130150) do
     t.bigint "account_id", null: false
     t.bigint "inbox_id", null: false
     t.jsonb "trigger_rules", default: {}
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.integer "campaign_type", default: 0, null: false
     t.integer "campaign_status", default: 0, null: false
     t.jsonb "audience", default: []
-    t.datetime "scheduled_at"
+    t.datetime "scheduled_at", precision: nil
     t.boolean "trigger_only_during_business_hours", default: false
     t.index ["account_id"], name: "index_campaigns_on_account_id"
     t.index ["campaign_status"], name: "index_campaigns_on_campaign_status"
@@ -216,8 +215,8 @@ ActiveRecord::Schema.define(version: 2023_04_26_130150) do
     t.integer "account_id", null: false
     t.string "short_code"
     t.text "content"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
   end
 
   create_table "categories", force: :cascade do |t|
@@ -226,8 +225,8 @@ ActiveRecord::Schema.define(version: 2023_04_26_130150) do
     t.string "name"
     t.text "description"
     t.integer "position"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.string "locale", default: "en"
     t.string "slug", null: false
     t.bigint "parent_category_id"
@@ -242,8 +241,8 @@ ActiveRecord::Schema.define(version: 2023_04_26_130150) do
   create_table "channel_api", force: :cascade do |t|
     t.integer "account_id", null: false
     t.string "webhook_url"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.string "identifier"
     t.string "hmac_token"
     t.boolean "hmac_mandatory", default: false
@@ -256,15 +255,15 @@ ActiveRecord::Schema.define(version: 2023_04_26_130150) do
     t.integer "account_id", null: false
     t.string "email", null: false
     t.string "forward_to_email", null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.boolean "imap_enabled", default: false
     t.string "imap_address", default: ""
     t.integer "imap_port", default: 0
     t.string "imap_login", default: ""
     t.string "imap_password", default: ""
     t.boolean "imap_enable_ssl", default: true
-    t.datetime "imap_inbox_synced_at"
+    t.datetime "imap_inbox_synced_at", precision: nil
     t.boolean "smtp_enabled", default: false
     t.string "smtp_address", default: ""
     t.integer "smtp_port", default: 0
@@ -286,8 +285,8 @@ ActiveRecord::Schema.define(version: 2023_04_26_130150) do
     t.string "user_access_token", null: false
     t.string "page_access_token", null: false
     t.integer "account_id", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.string "instagram_id"
     t.index ["page_id", "account_id"], name: "index_channel_facebook_pages_on_page_id_and_account_id", unique: true
     t.index ["page_id"], name: "index_channel_facebook_pages_on_page_id"
@@ -298,8 +297,8 @@ ActiveRecord::Schema.define(version: 2023_04_26_130150) do
     t.string "line_channel_id", null: false
     t.string "line_channel_secret", null: false
     t.string "line_channel_token", null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["line_channel_id"], name: "index_channel_line_on_line_channel_id", unique: true
   end
 
@@ -308,8 +307,8 @@ ActiveRecord::Schema.define(version: 2023_04_26_130150) do
     t.string "phone_number", null: false
     t.string "provider", default: "default"
     t.jsonb "provider_config", default: {}
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["phone_number"], name: "index_channel_sms_on_phone_number", unique: true
   end
 
@@ -317,8 +316,8 @@ ActiveRecord::Schema.define(version: 2023_04_26_130150) do
     t.string "bot_name"
     t.integer "account_id", null: false
     t.string "bot_token", null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["bot_token"], name: "index_channel_telegram_on_bot_token", unique: true
   end
 
@@ -327,8 +326,8 @@ ActiveRecord::Schema.define(version: 2023_04_26_130150) do
     t.string "auth_token", null: false
     t.string "account_sid", null: false
     t.integer "account_id", null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.integer "medium", default: 0
     t.string "messaging_service_sid"
     t.index ["account_sid", "phone_number"], name: "index_channel_twilio_sms_on_account_sid_and_phone_number", unique: true
@@ -341,8 +340,8 @@ ActiveRecord::Schema.define(version: 2023_04_26_130150) do
     t.string "twitter_access_token", null: false
     t.string "twitter_access_token_secret", null: false
     t.integer "account_id", null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.boolean "tweets_enabled", default: true
     t.index ["account_id", "profile_id"], name: "index_channel_twitter_profiles_on_account_id_and_profile_id", unique: true
   end
@@ -350,8 +349,8 @@ ActiveRecord::Schema.define(version: 2023_04_26_130150) do
   create_table "channel_web_widgets", id: :serial, force: :cascade do |t|
     t.string "website_url"
     t.integer "account_id"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.string "website_token"
     t.string "widget_color", default: "#1f93ff"
     t.string "welcome_title"
@@ -372,10 +371,10 @@ ActiveRecord::Schema.define(version: 2023_04_26_130150) do
     t.string "phone_number", null: false
     t.string "provider", default: "default"
     t.jsonb "provider_config", default: {}
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.jsonb "message_templates", default: {}
-    t.datetime "message_templates_last_updated"
+    t.datetime "message_templates_last_updated", precision: nil
     t.index ["phone_number"], name: "index_channel_whatsapp_on_phone_number", unique: true
   end
 
@@ -383,8 +382,8 @@ ActiveRecord::Schema.define(version: 2023_04_26_130150) do
     t.bigint "contact_id"
     t.bigint "inbox_id"
     t.string "source_id", null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.boolean "hmac_verified", default: false
     t.string "pubsub_token"
     t.index ["contact_id"], name: "index_contact_inboxes_on_contact_id"
@@ -399,12 +398,12 @@ ActiveRecord::Schema.define(version: 2023_04_26_130150) do
     t.string "email"
     t.string "phone_number"
     t.integer "account_id", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.jsonb "additional_attributes", default: {}
     t.string "identifier"
     t.jsonb "custom_attributes", default: {}
-    t.datetime "last_activity_at"
+    t.datetime "last_activity_at", precision: nil
     t.index "lower((email)::text), account_id", name: "index_contacts_on_lower_email_account_id"
     t.index ["account_id"], name: "index_contacts_on_account_id"
     t.index ["email", "account_id"], name: "uniq_email_per_account_contact", unique: true
@@ -417,8 +416,8 @@ ActiveRecord::Schema.define(version: 2023_04_26_130150) do
     t.bigint "account_id", null: false
     t.bigint "user_id", null: false
     t.bigint "conversation_id", null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["account_id"], name: "index_conversation_participants_on_account_id"
     t.index ["conversation_id"], name: "index_conversation_participants_on_conversation_id"
     t.index ["user_id", "conversation_id"], name: "index_conversation_participants_on_user_id_and_conversation_id", unique: true
@@ -430,23 +429,23 @@ ActiveRecord::Schema.define(version: 2023_04_26_130150) do
     t.integer "inbox_id", null: false
     t.integer "status", default: 0, null: false
     t.integer "assignee_id"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.bigint "contact_id"
     t.integer "display_id", null: false
-    t.datetime "contact_last_seen_at"
-    t.datetime "agent_last_seen_at"
+    t.datetime "contact_last_seen_at", precision: nil
+    t.datetime "agent_last_seen_at", precision: nil
     t.jsonb "additional_attributes", default: {}
     t.bigint "contact_inbox_id"
     t.uuid "uuid", default: -> { "gen_random_uuid()" }, null: false
     t.string "identifier"
-    t.datetime "last_activity_at", default: -> { "CURRENT_TIMESTAMP" }, null: false
+    t.datetime "last_activity_at", precision: nil, default: -> { "CURRENT_TIMESTAMP" }, null: false
     t.bigint "team_id"
     t.bigint "campaign_id"
-    t.datetime "snoozed_until"
+    t.datetime "snoozed_until", precision: nil
     t.jsonb "custom_attributes", default: {}
-    t.datetime "assignee_last_seen_at"
-    t.datetime "first_reply_created_at"
+    t.datetime "assignee_last_seen_at", precision: nil
+    t.datetime "first_reply_created_at", precision: nil
     t.integer "priority"
     t.index ["account_id", "display_id"], name: "index_conversations_on_account_id_and_display_id", unique: true
     t.index ["account_id", "id"], name: "index_conversations_on_id_and_account_id"
@@ -474,8 +473,8 @@ ActiveRecord::Schema.define(version: 2023_04_26_130150) do
     t.text "feedback_message"
     t.bigint "contact_id", null: false
     t.bigint "assigned_agent_id"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["account_id"], name: "index_csat_survey_responses_on_account_id"
     t.index ["assigned_agent_id"], name: "index_csat_survey_responses_on_assigned_agent_id"
     t.index ["contact_id"], name: "index_csat_survey_responses_on_contact_id"
@@ -490,8 +489,8 @@ ActiveRecord::Schema.define(version: 2023_04_26_130150) do
     t.integer "default_value"
     t.integer "attribute_model", default: 0
     t.bigint "account_id"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.text "attribute_description"
     t.jsonb "attribute_values", default: []
     t.index ["account_id"], name: "index_custom_attribute_definitions_on_account_id"
@@ -504,8 +503,8 @@ ActiveRecord::Schema.define(version: 2023_04_26_130150) do
     t.jsonb "query", default: "{}", null: false
     t.bigint "account_id", null: false
     t.bigint "user_id", null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["account_id"], name: "index_custom_filters_on_account_id"
     t.index ["user_id"], name: "index_custom_filters_on_user_id"
   end
@@ -515,8 +514,8 @@ ActiveRecord::Schema.define(version: 2023_04_26_130150) do
     t.jsonb "content", default: []
     t.bigint "account_id", null: false
     t.bigint "user_id"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["account_id"], name: "index_dashboard_apps_on_account_id"
     t.index ["user_id"], name: "index_dashboard_apps_on_user_id"
   end
@@ -528,8 +527,8 @@ ActiveRecord::Schema.define(version: 2023_04_26_130150) do
     t.text "processing_errors"
     t.integer "total_records"
     t.integer "processed_records"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["account_id"], name: "index_data_imports_on_account_id"
   end
 
@@ -539,8 +538,8 @@ ActiveRecord::Schema.define(version: 2023_04_26_130150) do
     t.integer "account_id"
     t.integer "template_type", default: 1
     t.integer "locale", default: 0, null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["name", "account_id"], name: "index_email_templates_on_name_and_account_id", unique: true
   end
 
@@ -548,15 +547,15 @@ ActiveRecord::Schema.define(version: 2023_04_26_130150) do
     t.integer "account_id", null: false
     t.integer "category_id", null: false
     t.string "name"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
   create_table "inbox_members", id: :serial, force: :cascade do |t|
     t.integer "user_id", null: false
     t.integer "inbox_id", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.index ["inbox_id", "user_id"], name: "index_inbox_members_on_inbox_id_and_user_id", unique: true
     t.index ["inbox_id"], name: "index_inbox_members_on_inbox_id"
   end
@@ -565,8 +564,8 @@ ActiveRecord::Schema.define(version: 2023_04_26_130150) do
     t.integer "channel_id", null: false
     t.integer "account_id", null: false
     t.string "name", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.string "channel_type"
     t.boolean "enable_auto_assignment", default: true
     t.boolean "greeting_enabled", default: false
@@ -589,8 +588,8 @@ ActiveRecord::Schema.define(version: 2023_04_26_130150) do
   create_table "installation_configs", force: :cascade do |t|
     t.string "name", null: false
     t.jsonb "serialized_value", default: {}, null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.boolean "locked", default: true, null: false
     t.index ["name", "created_at"], name: "index_installation_configs_on_name_and_created_at", unique: true
     t.index ["name"], name: "index_installation_configs_on_name", unique: true
@@ -604,8 +603,8 @@ ActiveRecord::Schema.define(version: 2023_04_26_130150) do
     t.integer "hook_type", default: 0
     t.string "reference_id"
     t.string "access_token"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.jsonb "settings", default: {}
   end
 
@@ -615,8 +614,8 @@ ActiveRecord::Schema.define(version: 2023_04_26_130150) do
     t.string "color", default: "#1f93ff", null: false
     t.boolean "show_on_sidebar"
     t.bigint "account_id"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["account_id"], name: "index_labels_on_account_id"
     t.index ["title", "account_id"], name: "index_labels_on_title_and_account_id", unique: true
   end
@@ -628,8 +627,8 @@ ActiveRecord::Schema.define(version: 2023_04_26_130150) do
     t.bigint "created_by_id"
     t.bigint "updated_by_id"
     t.jsonb "actions", default: {}, null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["account_id"], name: "index_macros_on_account_id"
   end
 
@@ -637,9 +636,9 @@ ActiveRecord::Schema.define(version: 2023_04_26_130150) do
     t.bigint "user_id", null: false
     t.bigint "conversation_id", null: false
     t.bigint "account_id", null: false
-    t.datetime "mentioned_at", null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "mentioned_at", precision: nil, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["account_id"], name: "index_mentions_on_account_id"
     t.index ["conversation_id"], name: "index_mentions_on_conversation_id"
     t.index ["user_id", "conversation_id"], name: "index_mentions_on_user_id_and_conversation_id", unique: true
@@ -652,8 +651,8 @@ ActiveRecord::Schema.define(version: 2023_04_26_130150) do
     t.integer "inbox_id", null: false
     t.integer "conversation_id", null: false
     t.integer "message_type", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.boolean "private", default: false
     t.integer "status", default: 0
     t.string "source_id"
@@ -678,8 +677,8 @@ ActiveRecord::Schema.define(version: 2023_04_26_130150) do
     t.bigint "account_id", null: false
     t.bigint "contact_id", null: false
     t.bigint "user_id"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["account_id"], name: "index_notes_on_account_id"
     t.index ["contact_id"], name: "index_notes_on_contact_id"
     t.index ["user_id"], name: "index_notes_on_user_id"
@@ -689,8 +688,8 @@ ActiveRecord::Schema.define(version: 2023_04_26_130150) do
     t.integer "account_id"
     t.integer "user_id"
     t.integer "email_flags", default: 0, null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.integer "push_flags", default: 0, null: false
     t.index ["account_id", "user_id"], name: "by_account_user", unique: true
   end
@@ -699,8 +698,8 @@ ActiveRecord::Schema.define(version: 2023_04_26_130150) do
     t.bigint "user_id", null: false
     t.integer "subscription_type", null: false
     t.jsonb "subscription_attributes", default: {}, null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.string "identifier"
     t.index ["identifier"], name: "index_notification_subscriptions_on_identifier", unique: true
     t.index ["user_id"], name: "index_notification_subscriptions_on_user_id"
@@ -714,9 +713,9 @@ ActiveRecord::Schema.define(version: 2023_04_26_130150) do
     t.bigint "primary_actor_id", null: false
     t.string "secondary_actor_type"
     t.bigint "secondary_actor_id"
-    t.datetime "read_at"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "read_at", precision: nil
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["account_id"], name: "index_notifications_on_account_id"
     t.index ["primary_actor_type", "primary_actor_id"], name: "uniq_primary_actor_per_account_notifications"
     t.index ["secondary_actor_type", "secondary_actor_id"], name: "uniq_secondary_actor_per_account_notifications"
@@ -727,8 +726,8 @@ ActiveRecord::Schema.define(version: 2023_04_26_130150) do
     t.bigint "platform_app_id", null: false
     t.string "permissible_type", null: false
     t.bigint "permissible_id", null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["permissible_type", "permissible_id"], name: "index_platform_app_permissibles_on_permissibles"
     t.index ["platform_app_id", "permissible_id", "permissible_type"], name: "unique_permissibles_index", unique: true
     t.index ["platform_app_id"], name: "index_platform_app_permissibles_on_platform_app_id"
@@ -736,15 +735,15 @@ ActiveRecord::Schema.define(version: 2023_04_26_130150) do
 
   create_table "platform_apps", force: :cascade do |t|
     t.string "name", null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
   create_table "portal_members", force: :cascade do |t|
     t.bigint "portal_id"
     t.bigint "user_id"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["portal_id", "user_id"], name: "index_portal_members_on_portal_id_and_user_id", unique: true
     t.index ["user_id", "portal_id"], name: "index_portal_members_on_user_id_and_portal_id", unique: true
   end
@@ -758,8 +757,8 @@ ActiveRecord::Schema.define(version: 2023_04_26_130150) do
     t.string "homepage_link"
     t.string "page_title"
     t.text "header_text"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.jsonb "config", default: {"allowed_locales"=>["en"]}
     t.boolean "archived", default: false
     t.index ["custom_domain"], name: "index_portals_on_custom_domain", unique: true
@@ -777,8 +776,8 @@ ActiveRecord::Schema.define(version: 2023_04_26_130150) do
   create_table "related_categories", force: :cascade do |t|
     t.bigint "category_id"
     t.bigint "related_category_id"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["category_id", "related_category_id"], name: "index_related_categories_on_category_id_and_related_category_id", unique: true
     t.index ["related_category_id", "category_id"], name: "index_related_categories_on_related_category_id_and_category_id", unique: true
   end
@@ -790,11 +789,11 @@ ActiveRecord::Schema.define(version: 2023_04_26_130150) do
     t.integer "inbox_id"
     t.integer "user_id"
     t.integer "conversation_id"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.float "value_in_business_hours"
-    t.datetime "event_start_time"
-    t.datetime "event_end_time"
+    t.datetime "event_start_time", precision: nil
+    t.datetime "event_end_time", precision: nil
     t.index ["account_id"], name: "index_reporting_events_on_account_id"
     t.index ["conversation_id"], name: "index_reporting_events_on_conversation_id"
     t.index ["created_at"], name: "index_reporting_events_on_created_at"
@@ -810,7 +809,7 @@ ActiveRecord::Schema.define(version: 2023_04_26_130150) do
     t.string "tagger_type"
     t.integer "tagger_id"
     t.string "context", limit: 128
-    t.datetime "created_at"
+    t.datetime "created_at", precision: nil
     t.index ["context"], name: "index_taggings_on_context"
     t.index ["tag_id", "taggable_id", "taggable_type", "context", "tagger_id", "tagger_type"], name: "taggings_idx", unique: true
     t.index ["tag_id"], name: "index_taggings_on_tag_id"
@@ -832,8 +831,8 @@ ActiveRecord::Schema.define(version: 2023_04_26_130150) do
   create_table "team_members", force: :cascade do |t|
     t.bigint "team_id", null: false
     t.bigint "user_id", null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["team_id", "user_id"], name: "index_team_members_on_team_id_and_user_id", unique: true
     t.index ["team_id"], name: "index_team_members_on_team_id"
     t.index ["user_id"], name: "index_team_members_on_user_id"
@@ -844,8 +843,8 @@ ActiveRecord::Schema.define(version: 2023_04_26_130150) do
     t.text "description"
     t.boolean "allow_auto_assign", default: true
     t.bigint "account_id", null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["account_id"], name: "index_teams_on_account_id"
     t.index ["name", "account_id"], name: "index_teams_on_name_and_account_id", unique: true
   end
@@ -854,8 +853,8 @@ ActiveRecord::Schema.define(version: 2023_04_26_130150) do
     t.string "name"
     t.string "auth_key"
     t.integer "account_id"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
   end
 
   create_table "users", id: :serial, force: :cascade do |t|
@@ -863,23 +862,23 @@ ActiveRecord::Schema.define(version: 2023_04_26_130150) do
     t.string "uid", default: "", null: false
     t.string "encrypted_password", default: "", null: false
     t.string "reset_password_token"
-    t.datetime "reset_password_sent_at"
-    t.datetime "remember_created_at"
+    t.datetime "reset_password_sent_at", precision: nil
+    t.datetime "remember_created_at", precision: nil
     t.integer "sign_in_count", default: 0, null: false
-    t.datetime "current_sign_in_at"
-    t.datetime "last_sign_in_at"
+    t.datetime "current_sign_in_at", precision: nil
+    t.datetime "last_sign_in_at", precision: nil
     t.string "current_sign_in_ip"
     t.string "last_sign_in_ip"
     t.string "confirmation_token"
-    t.datetime "confirmed_at"
-    t.datetime "confirmation_sent_at"
+    t.datetime "confirmed_at", precision: nil
+    t.datetime "confirmation_sent_at", precision: nil
     t.string "unconfirmed_email"
     t.string "name", null: false
     t.string "display_name"
     t.string "email"
     t.json "tokens"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.string "pubsub_token"
     t.integer "availability", default: 0
     t.jsonb "ui_settings", default: {}
@@ -896,8 +895,8 @@ ActiveRecord::Schema.define(version: 2023_04_26_130150) do
     t.integer "account_id"
     t.integer "inbox_id"
     t.string "url"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.integer "webhook_type", default: 0
     t.jsonb "subscriptions", default: ["conversation_status_changed", "conversation_updated", "conversation_created", "contact_created", "contact_updated", "message_created", "message_updated", "webwidget_triggered"]
     t.index ["account_id", "url"], name: "index_webhooks_on_account_id_and_url", unique: true
@@ -912,8 +911,8 @@ ActiveRecord::Schema.define(version: 2023_04_26_130150) do
     t.integer "open_minutes"
     t.integer "close_hour"
     t.integer "close_minutes"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.boolean "open_all_day", default: false
     t.index ["account_id"], name: "index_working_hours_on_account_id"
     t.index ["inbox_id"], name: "index_working_hours_on_inbox_id"
diff --git a/deployment/chatwoot-web.1.service b/deployment/chatwoot-web.1.service
index d3650b977..37889b1aa 100644
--- a/deployment/chatwoot-web.1.service
+++ b/deployment/chatwoot-web.1.service
@@ -16,10 +16,10 @@ KillMode=mixed
 StandardInput=null
 SyslogIdentifier=%p
 
-Environment="PATH=/home/chatwoot/.rvm/gems/ruby-3.1.3/bin:/home/chatwoot/.rvm/gems/ruby-3.1.3@global/bin:/home/chatwoot/.rvm/rubies/ruby-3.1.3/bin:/home/chatwoot/.rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin:/home/chatwoot/.rvm/bin:/home/chatwoot/.rvm/bin"
+Environment="PATH=/home/chatwoot/.rvm/gems/ruby-3.2.2/bin:/home/chatwoot/.rvm/gems/ruby-3.2.2@global/bin:/home/chatwoot/.rvm/rubies/ruby-3.2.2/bin:/home/chatwoot/.rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin:/home/chatwoot/.rvm/bin:/home/chatwoot/.rvm/bin"
 Environment="PORT=3000"
 Environment="RAILS_ENV=production"
 Environment="NODE_ENV=production"
 Environment="RAILS_LOG_TO_STDOUT=true"
-Environment="GEM_HOME=/home/chatwoot/.rvm/gems/ruby-3.1.3"
-Environment="GEM_PATH=/home/chatwoot/.rvm/gems/ruby-3.1.3:/home/chatwoot/.rvm/gems/ruby-3.1.3@global"
+Environment="GEM_HOME=/home/chatwoot/.rvm/gems/ruby-3.2.2"
+Environment="GEM_PATH=/home/chatwoot/.rvm/gems/ruby-3.2.2:/home/chatwoot/.rvm/gems/ruby-3.2.2@global"
diff --git a/deployment/chatwoot-worker.1.service b/deployment/chatwoot-worker.1.service
index 5d4ac9512..8000743c4 100644
--- a/deployment/chatwoot-worker.1.service
+++ b/deployment/chatwoot-worker.1.service
@@ -16,10 +16,10 @@ KillMode=mixed
 StandardInput=null
 SyslogIdentifier=%p
 
-Environment="PATH=/home/chatwoot/.rvm/gems/ruby-3.1.3/bin:/home/chatwoot/.rvm/gems/ruby-3.1.3@global/bin:/home/chatwoot/.rvm/rubies/ruby-3.1.3/bin:/home/chatwoot/.rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin:/home/chatwoot/.rvm/bin:/home/chatwoot/.rvm/bin"
+Environment="PATH=/home/chatwoot/.rvm/gems/ruby-3.2.2/bin:/home/chatwoot/.rvm/gems/ruby-3.2.2@global/bin:/home/chatwoot/.rvm/rubies/ruby-3.2.2/bin:/home/chatwoot/.rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin:/home/chatwoot/.rvm/bin:/home/chatwoot/.rvm/bin"
 Environment="PORT=3000"
 Environment="RAILS_ENV=production"
 Environment="NODE_ENV=production"
 Environment="RAILS_LOG_TO_STDOUT=true"
-Environment="GEM_HOME=/home/chatwoot/.rvm/gems/ruby-3.1.3"
-Environment="GEM_PATH=/home/chatwoot/.rvm/gems/ruby-3.1.3:/home/chatwoot/.rvm/gems/ruby-3.1.3@global"
+Environment="GEM_HOME=/home/chatwoot/.rvm/gems/ruby-3.2.2"
+Environment="GEM_PATH=/home/chatwoot/.rvm/gems/ruby-3.2.2:/home/chatwoot/.rvm/gems/ruby-3.2.2@global"
diff --git a/deployment/setup_20.04.sh b/deployment/setup_20.04.sh
index d10a6e789..20cc672df 100644
--- a/deployment/setup_20.04.sh
+++ b/deployment/setup_20.04.sh
@@ -328,8 +328,8 @@ function setup_chatwoot() {
   sudo -i -u chatwoot << EOF
   rvm --version
   rvm autolibs disable
-  rvm install "ruby-3.1.3"
-  rvm use 3.1.3 --default
+  rvm install "ruby-3.2.2"
+  rvm use 3.2.2 --default
 
   git clone https://github.com/chatwoot/chatwoot.git
   cd chatwoot
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 4ff968674..39a7b157d 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,5 +1,5 @@
 # pre-build stage
-FROM ruby:3.1.3-alpine3.16 AS pre-builder
+FROM ruby:3.2.2-alpine3.16 AS pre-builder
 
 # ARG default to production settings
 # For development docker-compose file overrides ARGS
@@ -64,13 +64,13 @@ RUN if [ "$RAILS_ENV" = "production" ]; then \
 RUN git rev-parse HEAD > /app/.git_sha
 
 # Remove unnecessary files
-RUN rm -rf /gems/ruby/3.1.0/cache/*.gem \
-  && find /gems/ruby/3.1.0/gems/ \( -name "*.c" -o -name "*.o" \) -delete \
+RUN rm -rf /gems/ruby/3.2.0/cache/*.gem \
+  && find /gems/ruby/3.2.0/gems/ \( -name "*.c" -o -name "*.o" \) -delete \
   && rm -rf .git \
   && rm .gitignore
 
 # final build stage
-FROM ruby:3.1.3-alpine3.16
+FROM ruby:3.2.2-alpine3.16
 
 
 ARG BUNDLE_WITHOUT="development:test"
diff --git a/lib/config_loader.rb b/lib/config_loader.rb
index 7c7933934..dedef425d 100644
--- a/lib/config_loader.rb
+++ b/lib/config_loader.rb
@@ -59,7 +59,7 @@ class ConfigLoader
   end
 
   def save_as_new_config(latest)
-    config = InstallationConfig.find_or_create_by(name: latest[:name])
+    config = InstallationConfig.find_or_initialize_by(name: latest[:name])
     config.value = latest[:value]
     config.locked = latest[:locked]
     config.save!
diff --git a/lib/integrations/dialogflow/processor_service.rb b/lib/integrations/dialogflow/processor_service.rb
index 11fdc8f88..3e7f1cdf6 100644
--- a/lib/integrations/dialogflow/processor_service.rb
+++ b/lib/integrations/dialogflow/processor_service.rb
@@ -1,3 +1,5 @@
+require 'google/cloud/dialogflow/v2'
+
 class Integrations::Dialogflow::ProcessorService < Integrations::BotProcessorService
   pattr_initialize [:event_name!, :hook!, :event_data!]
 
@@ -17,11 +19,15 @@ 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.configure { |config| config.credentials = hook.settings['credentials'] }
-    session_client = Google::Cloud::Dialogflow.sessions
-    session = session_client.session_path project: hook.settings['project_id'], session: session_id
+    ::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' } }
-    session_client.detect_intent session: session, query_input: query_input
+    client.detect_intent session: session, query_input: query_input
   end
 
   def process_response(message, response)
diff --git a/lib/integrations/google_translate/detect_language_service.rb b/lib/integrations/google_translate/detect_language_service.rb
index 265c1d5be..a7cdc32cd 100644
--- a/lib/integrations/google_translate/detect_language_service.rb
+++ b/lib/integrations/google_translate/detect_language_service.rb
@@ -1,3 +1,4 @@
+require 'google/cloud/translate/v3'
 class Integrations::GoogleTranslate::DetectLanguageService
   pattr_initialize [:hook!, :message!]
 
@@ -33,7 +34,7 @@ class Integrations::GoogleTranslate::DetectLanguageService
   end
 
   def client
-    @client ||= Google::Cloud::Translate.translation_service do |config|
+    @client ||= ::Google::Cloud::Translate::V3::TranslationService::Client.new do |config|
       config.credentials = hook.settings['credentials']
     end
   end
diff --git a/lib/integrations/google_translate/processor_service.rb b/lib/integrations/google_translate/processor_service.rb
index 5c0be7545..a1a3e6401 100644
--- a/lib/integrations/google_translate/processor_service.rb
+++ b/lib/integrations/google_translate/processor_service.rb
@@ -1,3 +1,4 @@
+require 'google/cloud/translate/v3'
 class Integrations::GoogleTranslate::ProcessorService
   pattr_initialize [:message!, :target_language!]
 
@@ -23,7 +24,7 @@ class Integrations::GoogleTranslate::ProcessorService
   end
 
   def client
-    @client ||= Google::Cloud::Translate.translation_service do |config|
+    @client ||= ::Google::Cloud::Translate::V3::TranslationService::Client.new do |config|
       config.credentials = hook.settings['credentials']
     end
   end
diff --git a/lib/redis/config.rb b/lib/redis/config.rb
index f35c32c24..c3859d263 100644
--- a/lib/redis/config.rb
+++ b/lib/redis/config.rb
@@ -15,7 +15,7 @@ module Redis::Config
         password: ENV.fetch('REDIS_PASSWORD', nil).presence,
         ssl_params: { verify_mode: Chatwoot.redis_ssl_verify_mode },
         reconnect_attempts: 2,
-        network_timeout: 5
+        timeout: 1
       }
     end
 
diff --git a/lib/tasks/db_enhancements.rake b/lib/tasks/db_enhancements.rake
index 656d1ef0b..d9cc22334 100644
--- a/lib/tasks/db_enhancements.rake
+++ b/lib/tasks/db_enhancements.rake
@@ -16,8 +16,7 @@ db_namespace = namespace :db do
   desc 'Runs setup if database does not exist, or runs migrations if it does'
   task chatwoot_prepare: :load_config do
     ActiveRecord::Base.configurations.configs_for(env_name: Rails.env).each do |db_config|
-      ActiveRecord::Base.establish_connection(db_config.config)
-      # handling case where database was created by the provider, with out running db:setup
+      ActiveRecord::Base.establish_connection(db_config.configuration_hash)
       unless ActiveRecord::Base.connection.table_exists? 'ar_internal_metadata'
         db_namespace['load_config'].invoke if ActiveRecord::Base.schema_format == :ruby
         ActiveRecord::Tasks::DatabaseTasks.load_schema_current(:ruby, ENV.fetch('SCHEMA', nil))
diff --git a/lib/tasks/yarn.rake b/lib/tasks/yarn.rake
new file mode 100644
index 000000000..791807391
--- /dev/null
+++ b/lib/tasks/yarn.rake
@@ -0,0 +1,10 @@
+# ref: https://github.com/rails/rails/issues/43906#issuecomment-1094380699
+# https://github.com/rails/rails/issues/43906#issuecomment-1099992310
+task before_assets_precompile: :environment do
+  # run a command which starts your packaging
+  system('yarn')
+end
+
+# every time you execute 'rake assets:precompile'
+# run 'before_assets_precompile' first
+Rake::Task['assets:precompile'].enhance ['before_assets_precompile']
diff --git a/package.json b/package.json
index be78d6cc2..9b739c030 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
     "@june-so/analytics-next": "^1.36.5",
     "@rails/actioncable": "6.1.3",
     "@rails/ujs": "^7.0.3-1",
-    "@rails/webpacker": "5.3.0",
+    "@rails/webpacker": "5.4.4",
     "@sentry/tracing": "^6.19.7",
     "@sentry/vue": "^6.19.7",
     "@tailwindcss/typography": "0.2.0",
@@ -78,7 +78,9 @@
     "vuelidate": "0.7.7",
     "vuex": "~2.1.1",
     "vuex-router-sync": "~4.1.2",
-    "wavesurfer.js": "^6.0.4"
+    "wavesurfer.js": "^6.0.4",
+    "webpack": "^4.46.0",
+    "webpack-cli": "^3.3.12"
   },
   "devDependencies": {
     "@babel/core": "7.13.16",
@@ -119,7 +121,7 @@
     "prettier": "^1.16.4",
     "rimraf": "^3.0.0",
     "vue-jest": "4",
-    "webpack-dev-server": "3.11.2"
+    "webpack-dev-server": "^3"
   },
   "engines": {
     "node": ">=10.x",
diff --git a/spec/controllers/api/v1/accounts/articles_controller_spec.rb b/spec/controllers/api/v1/accounts/articles_controller_spec.rb
index 6e4a7733a..e204a346a 100644
--- a/spec/controllers/api/v1/accounts/articles_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/articles_controller_spec.rb
@@ -231,8 +231,8 @@ RSpec.describe 'Api::V1::Accounts::Articles', type: :request do
         json_response = JSON.parse(response.body)
 
         expect(json_response['payload']['associated_articles'].length).to eq(2)
-        expect(json_response['payload']['associated_articles'][0]['id']).to eq(child_article_1.id)
-        expect(json_response['payload']['associated_articles'][1]['id']).to eq(child_article_2.id)
+        associated_articles_ids = json_response['payload']['associated_articles'].map { |article| article['id'] }
+        expect(associated_articles_ids).to match_array([child_article_1.id, child_article_2.id])
         expect(json_response['payload']['id']).to eq(root_article.id)
       end
     end
diff --git a/spec/lib/integrations/dialogflow/processor_service_spec.rb b/spec/lib/integrations/dialogflow/processor_service_spec.rb
index 2f260be7f..379339f32 100644
--- a/spec/lib/integrations/dialogflow/processor_service_spec.rb
+++ b/spec/lib/integrations/dialogflow/processor_service_spec.rb
@@ -150,7 +150,7 @@ describe Integrations::Dialogflow::ProcessorService do
   end
 
   describe '#get_response' do
-    let(:google_dialogflow) { Google::Cloud::Dialogflow }
+    let(:google_dialogflow) { ::Google::Cloud::Dialogflow::V2::Sessions::Client }
     let(:session_client) { double }
     let(:session) { double }
     let(:query_input) { { text: { text: message, language_code: 'en-US' } } }
@@ -158,8 +158,7 @@ describe Integrations::Dialogflow::ProcessorService do
 
     before do
       hook.update(settings: { 'project_id' => 'test', 'credentials' => 'creds' })
-      allow(google_dialogflow).to receive(:sessions).and_return(session_client)
-      allow(session_client).to receive(:session_path).and_return(session)
+      allow(google_dialogflow).to receive(:new).and_return(session_client)
       allow(session_client).to receive(:detect_intent).and_return({ session: session, query_input: query_input })
     end
 
diff --git a/spec/lib/integrations/google_translate/detect_language_service_spec.rb b/spec/lib/integrations/google_translate/detect_language_service_spec.rb
index 6768e9a33..c71ec074f 100644
--- a/spec/lib/integrations/google_translate/detect_language_service_spec.rb
+++ b/spec/lib/integrations/google_translate/detect_language_service_spec.rb
@@ -8,7 +8,7 @@ describe Integrations::GoogleTranslate::DetectLanguageService do
   let(:translate_client) { double }
 
   before do
-    allow(::Google::Cloud::Translate).to receive(:translation_service).and_return(translate_client)
+    allow(::Google::Cloud::Translate::V3::TranslationService::Client).to receive(:new).and_return(translate_client)
     allow(translate_client).to receive(:detect_language).and_return(::Google::Cloud::Translate::V3::DetectLanguageResponse
       .new({ languages: [{ language_code: 'es', confidence: 0.71875 }] }))
   end
diff --git a/spec/lib/redis/config_spec.rb b/spec/lib/redis/config_spec.rb
index 02e31339c..cd6d444a6 100644
--- a/spec/lib/redis/config_spec.rb
+++ b/spec/lib/redis/config_spec.rb
@@ -14,7 +14,7 @@ describe ::Redis::Config do
 
     it 'checks for app redis config' do
       app_config = described_class.app
-      expect(app_config.keys).to match_array([:url, :password, :network_timeout, :reconnect_attempts, :ssl_params])
+      expect(app_config.keys).to match_array([:url, :password, :timeout, :reconnect_attempts, :ssl_params])
       expect(app_config[:url]).to eq(redis_url)
       expect(app_config[:password]).to eq(redis_pasword)
     end
@@ -43,7 +43,7 @@ describe ::Redis::Config do
     end
 
     it 'checks for app redis config' do
-      expect(described_class.app.keys).to match_array([:url, :password, :sentinels, :network_timeout, :reconnect_attempts, :ssl_params])
+      expect(described_class.app.keys).to match_array([:url, :password, :sentinels, :timeout, :reconnect_attempts, :ssl_params])
       expect(described_class.app[:url]).to eq("redis://#{redis_master_name}")
       expect(described_class.app[:sentinels]).to match_array(expected_sentinels)
     end
@@ -60,7 +60,7 @@ describe ::Redis::Config do
       end
 
       it 'checks for app redis config and sentinel passwords will be empty' do
-        expect(described_class.app.keys).to match_array([:url, :password, :sentinels, :network_timeout, :reconnect_attempts, :ssl_params])
+        expect(described_class.app.keys).to match_array([:url, :password, :sentinels, :timeout, :reconnect_attempts, :ssl_params])
         expect(described_class.app[:url]).to eq("redis://#{redis_master_name}")
         expect(described_class.app[:sentinels]).to match_array(expected_sentinels.map { |s| s.except(:password) })
       end
@@ -78,7 +78,7 @@ describe ::Redis::Config do
       end
 
       it 'checks for app redis config and redis password is replaced in sentinel config' do
-        expect(described_class.app.keys).to match_array([:url, :password, :sentinels, :network_timeout, :reconnect_attempts, :ssl_params])
+        expect(described_class.app.keys).to match_array([:url, :password, :sentinels, :timeout, :reconnect_attempts, :ssl_params])
         expect(described_class.app[:url]).to eq("redis://#{redis_master_name}")
         expect(described_class.app[:sentinels]).to match_array(expected_sentinels.map { |s| s.merge(password: redis_sentinel_password) })
       end
diff --git a/spec/listeners/action_cable_listener_spec.rb b/spec/listeners/action_cable_listener_spec.rb
index ef3d104ad..bca0b16f1 100644
--- a/spec/listeners/action_cable_listener_spec.rb
+++ b/spec/listeners/action_cable_listener_spec.rb
@@ -63,10 +63,10 @@ describe ActionCableListener do
         a_collection_containing_exactly(
           admin.pubsub_token, conversation.contact_inbox.pubsub_token
         ),
-        'conversation.typing_on', conversation: conversation.push_event_data,
-                                  user: agent.push_event_data,
-                                  account_id: account.id,
-                                  is_private: false
+        'conversation.typing_on', { conversation: conversation.push_event_data,
+                                    user: agent.push_event_data,
+                                    account_id: account.id,
+                                    is_private: false }
       )
       listener.conversation_typing_on(event)
     end
@@ -83,10 +83,10 @@ describe ActionCableListener do
         a_collection_containing_exactly(
           admin.pubsub_token, agent.pubsub_token
         ),
-        'conversation.typing_on', conversation: conversation.push_event_data,
-                                  user: conversation.contact.push_event_data,
-                                  account_id: account.id,
-                                  is_private: false
+        'conversation.typing_on', { conversation: conversation.push_event_data,
+                                    user: conversation.contact.push_event_data,
+                                    account_id: account.id,
+                                    is_private: false }
       )
       listener.conversation_typing_on(event)
     end
@@ -103,10 +103,10 @@ describe ActionCableListener do
         a_collection_containing_exactly(
           admin.pubsub_token, conversation.contact_inbox.pubsub_token
         ),
-        'conversation.typing_off', conversation: conversation.push_event_data,
-                                   user: agent.push_event_data,
-                                   account_id: account.id,
-                                   is_private: false
+        'conversation.typing_off', { conversation: conversation.push_event_data,
+                                     user: agent.push_event_data,
+                                     account_id: account.id,
+                                     is_private: false }
       )
       listener.conversation_typing_off(event)
     end
diff --git a/spec/mailboxes/support_mailbox_spec.rb b/spec/mailboxes/support_mailbox_spec.rb
index a3a85de9e..c0501cff4 100644
--- a/spec/mailboxes/support_mailbox_spec.rb
+++ b/spec/mailboxes/support_mailbox_spec.rb
@@ -245,6 +245,7 @@ RSpec.describe SupportMailbox, type: :mailbox do
         expect(conversation.messages.last.content_attributes['email']['html_content']['reply']).to include(
           <<~BODY.chomp
             Hi,
+
             We are providing you platform from here you can sell paid posts on your website.
 
             Chatwoot | CS team | [C](https://d33wubrfki0l68.cloudfront.net/973467c532160fd8b940300a43fa85fa2d060307/dc9a0/static/brand-73f58cdefae282ae74cebfa74c1d7003.svg)
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 1c78cb93c..99aaee26a 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -41,7 +41,7 @@ end
 RSpec.configure do |config|
   config.include FactoryBot::Syntax::Methods
   # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
-  config.fixture_path = "#{::Rails.root}/spec/fixtures"
+  config.fixture_path = Rails.root.join('spec/fixtures')
 
   # If you're not using ActiveRecord, or you'd prefer not to run each of your
   # examples within a transaction, remove the following line or assign false
diff --git a/yarn.lock b/yarn.lock
index fe2a55f3f..cd0c7560a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,6 +2,14 @@
 # yarn lockfile v1
 
 
+"@ampproject/remapping@^2.2.0":
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.1.tgz#99e8e11851128b8702cd57c33684f1d0f260b630"
+  integrity sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==
+  dependencies:
+    "@jridgewell/gen-mapping" "^0.3.0"
+    "@jridgewell/trace-mapping" "^0.3.9"
+
 "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.5.5", "@babel/code-frame@^7.8.3":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658"
@@ -23,11 +31,23 @@
   dependencies:
     "@babel/highlight" "^7.18.6"
 
+"@babel/code-frame@^7.21.4":
+  version "7.21.4"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.21.4.tgz#d0fa9e4413aca81f2b23b9442797bda1826edb39"
+  integrity sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==
+  dependencies:
+    "@babel/highlight" "^7.18.6"
+
 "@babel/compat-data@^7.13.11", "@babel/compat-data@^7.13.15", "@babel/compat-data@^7.13.8":
   version "7.13.15"
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.13.15.tgz#7e8eea42d0b64fda2b375b22d06c605222e848f4"
   integrity sha512-ltnibHKR1VnrU4ymHyQ/CXtNXI6yZC0oJThyW78Hft8XndANwi+9H+UIklBDraIjFEJzw8wmcM427oDd9KS5wA==
 
+"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.20.5", "@babel/compat-data@^7.21.4":
+  version "7.21.4"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.21.4.tgz#457ffe647c480dff59c2be092fc3acf71195c87f"
+  integrity sha512-/DYyDpeCfaVinT40FPGdkkb+lYSKvsVuMjDAG7jPOWWiM1ibOaB9CXJAlc4d1QpP/U2q2P9jbrSlClKSErd55g==
+
 "@babel/core@7.12.9":
   version "7.12.9"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.9.tgz#fd450c4ec10cdbb980e2928b7aa7a28484593fc8"
@@ -50,7 +70,7 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/core@7.13.16", "@babel/core@^7.1.0", "@babel/core@^7.1.6", "@babel/core@^7.12.10", "@babel/core@^7.13.16", "@babel/core@^7.7.5":
+"@babel/core@7.13.16", "@babel/core@^7.1.0", "@babel/core@^7.1.6", "@babel/core@^7.12.10", "@babel/core@^7.7.5":
   version "7.13.16"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.13.16.tgz#7756ab24396cc9675f1c3fcd5b79fcce192ea96a"
   integrity sha512-sXHpixBiWWFti0AV2Zq7avpTasr6sIAu7Y396c608541qAU2ui4a193m0KSQmfPSKFZLnQ3cvlKDOm3XkuXm3Q==
@@ -71,6 +91,27 @@
     semver "^6.3.0"
     source-map "^0.5.0"
 
+"@babel/core@^7.15.0":
+  version "7.21.4"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.21.4.tgz#c6dc73242507b8e2a27fd13a9c1814f9fa34a659"
+  integrity sha512-qt/YV149Jman/6AfmlxJ04LMIu8bMoyl3RB91yTFrxQmgbrSvQMy7cI8Q62FHx1t8wJ8B5fu0UDoLwHAhUo1QA==
+  dependencies:
+    "@ampproject/remapping" "^2.2.0"
+    "@babel/code-frame" "^7.21.4"
+    "@babel/generator" "^7.21.4"
+    "@babel/helper-compilation-targets" "^7.21.4"
+    "@babel/helper-module-transforms" "^7.21.2"
+    "@babel/helpers" "^7.21.0"
+    "@babel/parser" "^7.21.4"
+    "@babel/template" "^7.20.7"
+    "@babel/traverse" "^7.21.4"
+    "@babel/types" "^7.21.4"
+    convert-source-map "^1.7.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.2"
+    json5 "^2.2.2"
+    semver "^6.3.0"
+
 "@babel/generator@^7.12.11", "@babel/generator@^7.12.5", "@babel/generator@^7.13.16":
   version "7.13.16"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.13.16.tgz#0befc287031a201d84cdfc173b46b320ae472d14"
@@ -98,6 +139,16 @@
     "@jridgewell/gen-mapping" "^0.3.2"
     jsesc "^2.5.1"
 
+"@babel/generator@^7.21.4":
+  version "7.21.4"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.21.4.tgz#64a94b7448989f421f919d5239ef553b37bb26bc"
+  integrity sha512-NieM3pVIYW2SwGzKoqfPrQsf4xGs9M9AIG3ThppsSRmO+m7eQhmI6amajKMUeIO37wFfsvnvcxQFx6x6iqxDnA==
+  dependencies:
+    "@babel/types" "^7.21.4"
+    "@jridgewell/gen-mapping" "^0.3.2"
+    "@jridgewell/trace-mapping" "^0.3.17"
+    jsesc "^2.5.1"
+
 "@babel/helper-annotate-as-pure@^7.10.4", "@babel/helper-annotate-as-pure@^7.12.13":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.13.tgz#0f58e86dfc4bb3b1fcd7db806570e177d439b6ab"
@@ -120,6 +171,14 @@
     "@babel/helper-explode-assignable-expression" "^7.12.13"
     "@babel/types" "^7.12.13"
 
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.18.6":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz#acd4edfd7a566d1d51ea975dff38fd52906981bb"
+  integrity sha512-yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw==
+  dependencies:
+    "@babel/helper-explode-assignable-expression" "^7.18.6"
+    "@babel/types" "^7.18.9"
+
 "@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.13.13", "@babel/helper-compilation-targets@^7.13.16", "@babel/helper-compilation-targets@^7.13.8":
   version "7.13.16"
   resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.16.tgz#6e91dccf15e3f43e5556dffe32d860109887563c"
@@ -130,6 +189,17 @@
     browserslist "^4.14.5"
     semver "^6.3.0"
 
+"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.20.7", "@babel/helper-compilation-targets@^7.21.4":
+  version "7.21.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.21.4.tgz#770cd1ce0889097ceacb99418ee6934ef0572656"
+  integrity sha512-Fa0tTuOXZ1iL8IeDFUWCzjZcn+sJGd9RZdH9esYVjEejGmzf+FFYQpMi/kZUk2kPy/q1H3/GPw7np8qar/stfg==
+  dependencies:
+    "@babel/compat-data" "^7.21.4"
+    "@babel/helper-validator-option" "^7.21.0"
+    browserslist "^4.21.3"
+    lru-cache "^5.1.1"
+    semver "^6.3.0"
+
 "@babel/helper-create-class-features-plugin@^7.13.0", "@babel/helper-create-class-features-plugin@^7.13.11":
   version "7.13.11"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.13.11.tgz#30d30a005bca2c953f5653fc25091a492177f4f6"
@@ -154,6 +224,20 @@
     "@babel/helper-replace-supers" "^7.18.6"
     "@babel/helper-split-export-declaration" "^7.18.6"
 
+"@babel/helper-create-class-features-plugin@^7.21.0":
+  version "7.21.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.21.4.tgz#3a017163dc3c2ba7deb9a7950849a9586ea24c18"
+  integrity sha512-46QrX2CQlaFRF4TkwfTt6nJD7IHq8539cCL7SDpqWSDeJKY1xylKKY5F/33mJhLZ3mFvKv2gGrVS6NkyF6qs+Q==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.18.6"
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-function-name" "^7.21.0"
+    "@babel/helper-member-expression-to-functions" "^7.21.0"
+    "@babel/helper-optimise-call-expression" "^7.18.6"
+    "@babel/helper-replace-supers" "^7.20.7"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
+    "@babel/helper-split-export-declaration" "^7.18.6"
+
 "@babel/helper-create-regexp-features-plugin@^7.12.13":
   version "7.12.17"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.17.tgz#a2ac87e9e319269ac655b8d4415e94d38d663cb7"
@@ -162,6 +246,14 @@
     "@babel/helper-annotate-as-pure" "^7.12.13"
     regexpu-core "^4.7.1"
 
+"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.20.5":
+  version "7.21.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.21.4.tgz#40411a8ab134258ad2cf3a3d987ec6aa0723cee5"
+  integrity sha512-M00OuhU+0GyZ5iBBN9czjugzWrEq2vDpf/zCYHxxf93ul/Q5rv+a5h+/+0WnI1AebHNVtl5bFV0qsJoH23DbfA==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.18.6"
+    regexpu-core "^5.3.1"
+
 "@babel/helper-define-polyfill-provider@^0.1.5":
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.1.5.tgz#3c2f91b7971b9fc11fe779c945c014065dea340e"
@@ -190,6 +282,18 @@
     resolve "^1.14.2"
     semver "^6.1.2"
 
+"@babel/helper-define-polyfill-provider@^0.3.3":
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz#8612e55be5d51f0cd1f36b4a5a83924e89884b7a"
+  integrity sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==
+  dependencies:
+    "@babel/helper-compilation-targets" "^7.17.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
+    debug "^4.1.1"
+    lodash.debounce "^4.0.8"
+    resolve "^1.14.2"
+    semver "^6.1.2"
+
 "@babel/helper-environment-visitor@^7.16.7", "@babel/helper-environment-visitor@^7.18.2":
   version "7.18.2"
   resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.2.tgz#8a6d2dedb53f6bf248e31b4baf38739ee4a637bd"
@@ -200,6 +304,11 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.6.tgz#b7eee2b5b9d70602e59d1a6cad7dd24de7ca6cd7"
   integrity sha512-8n6gSfn2baOY+qlp+VSzsosjCVGFqWKmDF0cCWOybh52Dw3SEyoWR1KrhMJASjLwIEkkAufZ0xvr+SxLHSpy2Q==
 
+"@babel/helper-environment-visitor@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be"
+  integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==
+
 "@babel/helper-explode-assignable-expression@^7.12.13":
   version "7.13.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.13.0.tgz#17b5c59ff473d9f956f40ef570cf3a76ca12657f"
@@ -207,6 +316,13 @@
   dependencies:
     "@babel/types" "^7.13.0"
 
+"@babel/helper-explode-assignable-expression@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz#41f8228ef0a6f1a036b8dfdfec7ce94f9a6bc096"
+  integrity sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg==
+  dependencies:
+    "@babel/types" "^7.18.6"
+
 "@babel/helper-function-name@^7.12.13":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz#93ad656db3c3c2232559fd7b2c3dbdcbe0eb377a"
@@ -232,6 +348,14 @@
     "@babel/template" "^7.18.6"
     "@babel/types" "^7.18.6"
 
+"@babel/helper-function-name@^7.18.9", "@babel/helper-function-name@^7.19.0", "@babel/helper-function-name@^7.21.0":
+  version "7.21.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz#d552829b10ea9f120969304023cd0645fa00b1b4"
+  integrity sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==
+  dependencies:
+    "@babel/template" "^7.20.7"
+    "@babel/types" "^7.21.0"
+
 "@babel/helper-get-function-arity@^7.12.13":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz#bc63451d403a3b3082b97e1d8b3fe5bd4091e583"
@@ -275,6 +399,13 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
+"@babel/helper-member-expression-to-functions@^7.20.7", "@babel/helper-member-expression-to-functions@^7.21.0":
+  version "7.21.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.21.0.tgz#319c6a940431a133897148515877d2f3269c3ba5"
+  integrity sha512-Muu8cdZwNN6mRRNG6lAYErJ5X3bRevgYR2O8wN0yn7jJSnGDu6eG59RfT29JHxGUovyfrh6Pj0XzmR7drNVL3Q==
+  dependencies:
+    "@babel/types" "^7.21.0"
+
 "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.13.12":
   version "7.13.12"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz#c6a369a6f3621cb25da014078684da9196b61977"
@@ -289,6 +420,13 @@
   dependencies:
     "@babel/types" "^7.16.7"
 
+"@babel/helper-module-imports@^7.18.6", "@babel/helper-module-imports@^7.21.4":
+  version "7.21.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.21.4.tgz#ac88b2f76093637489e718a90cec6cf8a9b029af"
+  integrity sha512-orajc5T2PsRYUN3ZryCEFeMDYwyw09c/pZeaQEZPH0MpKzSvn3e0uXsDBu3k03VI+9DBiRo+l22BfKTpKwa/Wg==
+  dependencies:
+    "@babel/types" "^7.21.4"
+
 "@babel/helper-module-transforms@^7.12.1", "@babel/helper-module-transforms@^7.13.0", "@babel/helper-module-transforms@^7.13.14":
   version "7.13.14"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.13.14.tgz#e600652ba48ccb1641775413cb32cfa4e8b495ef"
@@ -317,6 +455,20 @@
     "@babel/traverse" "^7.18.0"
     "@babel/types" "^7.18.0"
 
+"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.20.11", "@babel/helper-module-transforms@^7.21.2":
+  version "7.21.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.21.2.tgz#160caafa4978ac8c00ac66636cb0fa37b024e2d2"
+  integrity sha512-79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ==
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-module-imports" "^7.18.6"
+    "@babel/helper-simple-access" "^7.20.2"
+    "@babel/helper-split-export-declaration" "^7.18.6"
+    "@babel/helper-validator-identifier" "^7.19.1"
+    "@babel/template" "^7.20.7"
+    "@babel/traverse" "^7.21.2"
+    "@babel/types" "^7.21.2"
+
 "@babel/helper-optimise-call-expression@^7.12.13":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz#5c02d171b4c8615b1e7163f888c1c81c30a2aaea"
@@ -346,6 +498,11 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.18.6.tgz#9448974dd4fb1d80fefe72e8a0af37809cd30d6d"
   integrity sha512-gvZnm1YAAxh13eJdkb9EWHBnF3eAub3XTLCZEehHT2kWxiKVRL64+ae5Y6Ivne0mVHmMYKT+xWgZO+gQhuLUBg==
 
+"@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.19.0", "@babel/helper-plugin-utils@^7.20.2":
+  version "7.20.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz#d1b9000752b18d0877cff85a5c376ce5c3121629"
+  integrity sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==
+
 "@babel/helper-plugin-utils@^7.17.12":
   version "7.17.12"
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.17.12.tgz#86c2347da5acbf5583ba0a10aed4c9bf9da9cf96"
@@ -360,6 +517,16 @@
     "@babel/helper-wrap-function" "^7.13.0"
     "@babel/types" "^7.13.0"
 
+"@babel/helper-remap-async-to-generator@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz#997458a0e3357080e54e1d79ec347f8a8cd28519"
+  integrity sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.18.6"
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-wrap-function" "^7.18.9"
+    "@babel/types" "^7.18.9"
+
 "@babel/helper-replace-supers@^7.12.13", "@babel/helper-replace-supers@^7.13.0", "@babel/helper-replace-supers@^7.13.12":
   version "7.13.12"
   resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.13.12.tgz#6442f4c1ad912502481a564a7386de0c77ff3804"
@@ -381,6 +548,18 @@
     "@babel/traverse" "^7.18.6"
     "@babel/types" "^7.18.6"
 
+"@babel/helper-replace-supers@^7.20.7":
+  version "7.20.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.20.7.tgz#243ecd2724d2071532b2c8ad2f0f9f083bcae331"
+  integrity sha512-vujDMtB6LVfNW13jhlCrp48QNslK6JXi7lQG736HVbHz/mbf4Dc7tIRh1Xf5C0rF7BP8iiSxGMCmY6Ci1ven3A==
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-member-expression-to-functions" "^7.20.7"
+    "@babel/helper-optimise-call-expression" "^7.18.6"
+    "@babel/template" "^7.20.7"
+    "@babel/traverse" "^7.20.7"
+    "@babel/types" "^7.20.7"
+
 "@babel/helper-simple-access@^7.12.13", "@babel/helper-simple-access@^7.13.12":
   version "7.13.12"
   resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz#dd6c538afb61819d205a012c31792a39c7a5eaf6"
@@ -395,6 +574,13 @@
   dependencies:
     "@babel/types" "^7.18.2"
 
+"@babel/helper-simple-access@^7.20.2":
+  version "7.20.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz#0ab452687fe0c2cfb1e2b9e0015de07fc2d62dd9"
+  integrity sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==
+  dependencies:
+    "@babel/types" "^7.20.2"
+
 "@babel/helper-skip-transparent-expression-wrappers@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz#462dc63a7e435ade8468385c63d2b84cce4b3cbf"
@@ -402,6 +588,13 @@
   dependencies:
     "@babel/types" "^7.12.1"
 
+"@babel/helper-skip-transparent-expression-wrappers@^7.20.0":
+  version "7.20.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz#fbe4c52f60518cab8140d77101f0e63a8a230684"
+  integrity sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg==
+  dependencies:
+    "@babel/types" "^7.20.0"
+
 "@babel/helper-split-export-declaration@^7.12.13":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz#e9430be00baf3e88b0e13e6f9d4eaf2136372b05"
@@ -423,6 +616,11 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
+"@babel/helper-string-parser@^7.19.4":
+  version "7.19.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63"
+  integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==
+
 "@babel/helper-validator-identifier@^7.12.11":
   version "7.12.11"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed"
@@ -438,11 +636,21 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz#9c97e30d31b2b8c72a1d08984f2ca9b574d7a076"
   integrity sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g==
 
+"@babel/helper-validator-identifier@^7.19.1":
+  version "7.19.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2"
+  integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==
+
 "@babel/helper-validator-option@^7.12.17":
   version "7.12.17"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz#d1fbf012e1a79b7eebbfdc6d270baaf8d9eb9831"
   integrity sha512-TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw==
 
+"@babel/helper-validator-option@^7.21.0":
+  version "7.21.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz#8224c7e13ace4bafdc4004da2cf064ef42673180"
+  integrity sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ==
+
 "@babel/helper-wrap-function@^7.13.0":
   version "7.13.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.13.0.tgz#bdb5c66fda8526ec235ab894ad53a1235c79fcc4"
@@ -453,6 +661,16 @@
     "@babel/traverse" "^7.13.0"
     "@babel/types" "^7.13.0"
 
+"@babel/helper-wrap-function@^7.18.9":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.20.5.tgz#75e2d84d499a0ab3b31c33bcfe59d6b8a45f62e3"
+  integrity sha512-bYMxIWK5mh+TgXGVqAtnu5Yn1un+v8DDZtqyzKRLUzrh70Eal2O3aZ7aPYiMADO4uKlkzOiRiZ6GX5q3qxvW9Q==
+  dependencies:
+    "@babel/helper-function-name" "^7.19.0"
+    "@babel/template" "^7.18.10"
+    "@babel/traverse" "^7.20.5"
+    "@babel/types" "^7.20.5"
+
 "@babel/helpers@^7.12.5", "@babel/helpers@^7.13.16":
   version "7.13.17"
   resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.13.17.tgz#b497c7a00e9719d5b613b8982bda6ed3ee94caf6"
@@ -462,6 +680,15 @@
     "@babel/traverse" "^7.13.17"
     "@babel/types" "^7.13.17"
 
+"@babel/helpers@^7.21.0":
+  version "7.21.0"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.21.0.tgz#9dd184fb5599862037917cdc9eecb84577dc4e7e"
+  integrity sha512-XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA==
+  dependencies:
+    "@babel/template" "^7.20.7"
+    "@babel/traverse" "^7.21.0"
+    "@babel/types" "^7.21.0"
+
 "@babel/highlight@^7.12.13":
   version "7.13.10"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.13.10.tgz#a8b2a66148f5b27d666b15d81774347a731d52d1"
@@ -504,6 +731,18 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.3.tgz#39e99c7b0c4c56cef4d1eed8de9f506411c2ebc2"
   integrity sha512-rL50YcEuHbbauAFAysNsJA4/f89fGTOBRNs9P81sniKnKAr4xULe5AecolcsKbi88xu0ByWYDj/S1AJ3FSFuSQ==
 
+"@babel/parser@^7.20.7", "@babel/parser@^7.21.4":
+  version "7.21.4"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.4.tgz#94003fdfc520bbe2875d4ae557b43ddb6d880f17"
+  integrity sha512-alVJj7k7zIxqBZ7BTRhz0IqJFxW1VJbm6N8JbcYhQ186df9ZBPbZBmWSqAMXwHGsCJdYks7z/voa3ibiS5bCIw==
+
+"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz#da5b8f9a580acdfbe53494dba45ea389fb09a4d2"
+  integrity sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.18.6"
+
 "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.13.12":
   version "7.13.12"
   resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12.tgz#a3484d84d0b549f3fc916b99ee4783f26fabad2a"
@@ -513,6 +752,15 @@
     "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
     "@babel/plugin-proposal-optional-chaining" "^7.13.12"
 
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.20.7":
+  version "7.20.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.20.7.tgz#d9c85589258539a22a901033853101a6198d4ef1"
+  integrity sha512-sbr9+wNE5aXMBBFBICk01tt7sBf2Oc9ikRFEcem/ZORup9IMUdNhW7/wVLEbbtlWOsEubJet46mHAL2C8+2jKQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
+    "@babel/plugin-proposal-optional-chaining" "^7.20.7"
+
 "@babel/plugin-proposal-async-generator-functions@^7.13.15":
   version "7.13.15"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.13.15.tgz#80e549df273a3b3050431b148c892491df1bcc5b"
@@ -522,6 +770,16 @@
     "@babel/helper-remap-async-to-generator" "^7.13.0"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
 
+"@babel/plugin-proposal-async-generator-functions@^7.20.7":
+  version "7.20.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.7.tgz#bfb7276d2d573cb67ba379984a2334e262ba5326"
+  integrity sha512-xMbiLsn/8RK7Wq7VeVytytS2L6qE69bXPB10YCmMdDZbKF4okCqY74pI/jJQ/8U0b/F6NrT2+14b8/P9/3AMGA==
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-remap-async-to-generator" "^7.18.9"
+    "@babel/plugin-syntax-async-generators" "^7.8.4"
+
 "@babel/plugin-proposal-class-properties@7.13.0", "@babel/plugin-proposal-class-properties@^7.1.0", "@babel/plugin-proposal-class-properties@^7.12.1", "@babel/plugin-proposal-class-properties@^7.13.0":
   version "7.13.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.13.0.tgz#146376000b94efd001e57a40a88a525afaab9f37"
@@ -530,6 +788,23 @@
     "@babel/helper-create-class-features-plugin" "^7.13.0"
     "@babel/helper-plugin-utils" "^7.13.0"
 
+"@babel/plugin-proposal-class-properties@^7.14.5", "@babel/plugin-proposal-class-properties@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz#b110f59741895f7ec21a6fff696ec46265c446a3"
+  integrity sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
+
+"@babel/plugin-proposal-class-static-block@^7.21.0":
+  version "7.21.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.21.0.tgz#77bdd66fb7b605f3a61302d224bdfacf5547977d"
+  integrity sha512-XP5G9MWNUskFuP30IfFSEFB0Z6HzLIUcjYM4bYOPHXl7eiJ9HFv8tWj6TXTN5QODiEhDZAeI4hLok2iHFFV4hw==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.21.0"
+    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/plugin-syntax-class-static-block" "^7.14.5"
+
 "@babel/plugin-proposal-decorators@^7.12.12":
   version "7.13.15"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.13.15.tgz#e91ccfef2dc24dd5bd5dcc9fc9e2557c684ecfb8"
@@ -547,6 +822,14 @@
     "@babel/helper-plugin-utils" "^7.13.0"
     "@babel/plugin-syntax-dynamic-import" "^7.8.3"
 
+"@babel/plugin-proposal-dynamic-import@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz#72bcf8d408799f547d759298c3c27c7e7faa4d94"
+  integrity sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
+
 "@babel/plugin-proposal-export-default-from@^7.12.1":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.12.13.tgz#f110284108a9b2b96f01b15b3be9e54c2610a989"
@@ -563,6 +846,14 @@
     "@babel/helper-plugin-utils" "^7.12.13"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
 
+"@babel/plugin-proposal-export-namespace-from@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz#5f7313ab348cdb19d590145f9247540e94761203"
+  integrity sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
+
 "@babel/plugin-proposal-json-strings@^7.13.8":
   version "7.13.8"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.13.8.tgz#bf1fb362547075afda3634ed31571c5901afef7b"
@@ -571,6 +862,14 @@
     "@babel/helper-plugin-utils" "^7.13.0"
     "@babel/plugin-syntax-json-strings" "^7.8.3"
 
+"@babel/plugin-proposal-json-strings@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz#7e8788c1811c393aff762817e7dbf1ebd0c05f0b"
+  integrity sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/plugin-syntax-json-strings" "^7.8.3"
+
 "@babel/plugin-proposal-logical-assignment-operators@^7.13.8":
   version "7.13.8"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.13.8.tgz#93fa78d63857c40ce3c8c3315220fd00bfbb4e1a"
@@ -579,6 +878,14 @@
     "@babel/helper-plugin-utils" "^7.13.0"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
 
+"@babel/plugin-proposal-logical-assignment-operators@^7.20.7":
+  version "7.20.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.20.7.tgz#dfbcaa8f7b4d37b51e8bfb46d94a5aea2bb89d83"
+  integrity sha512-y7C7cZgpMIjWlKE5T7eJwp+tnRYM89HmRvWM5EQuB5BoHEONjmQ8lSNmBUwOyy/GFRsohJED51YBF79hE1djug==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
+
 "@babel/plugin-proposal-nullish-coalescing-operator@^7.12.1", "@babel/plugin-proposal-nullish-coalescing-operator@^7.13.8":
   version "7.13.8"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.13.8.tgz#3730a31dafd3c10d8ccd10648ed80a2ac5472ef3"
@@ -587,6 +894,14 @@
     "@babel/helper-plugin-utils" "^7.13.0"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
 
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz#fdd940a99a740e577d6c753ab6fbb43fdb9467e1"
+  integrity sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
+
 "@babel/plugin-proposal-numeric-separator@^7.12.13":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.13.tgz#bd9da3188e787b5120b4f9d465a8261ce67ed1db"
@@ -595,6 +910,14 @@
     "@babel/helper-plugin-utils" "^7.12.13"
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
+"@babel/plugin-proposal-numeric-separator@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz#899b14fbafe87f053d2c5ff05b36029c62e13c75"
+  integrity sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
+
 "@babel/plugin-proposal-object-rest-spread@7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz#def9bd03cea0f9b72283dac0ec22d289c7691069"
@@ -615,6 +938,17 @@
     "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
     "@babel/plugin-transform-parameters" "^7.13.0"
 
+"@babel/plugin-proposal-object-rest-spread@^7.14.7", "@babel/plugin-proposal-object-rest-spread@^7.20.7":
+  version "7.20.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz#aa662940ef425779c75534a5c41e9d936edc390a"
+  integrity sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==
+  dependencies:
+    "@babel/compat-data" "^7.20.5"
+    "@babel/helper-compilation-targets" "^7.20.7"
+    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
+    "@babel/plugin-transform-parameters" "^7.20.7"
+
 "@babel/plugin-proposal-optional-catch-binding@^7.13.8":
   version "7.13.8"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.13.8.tgz#3ad6bd5901506ea996fc31bdcf3ccfa2bed71107"
@@ -623,6 +957,14 @@
     "@babel/helper-plugin-utils" "^7.13.0"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
 
+"@babel/plugin-proposal-optional-catch-binding@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz#f9400d0e6a3ea93ba9ef70b09e72dd6da638a2cb"
+  integrity sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
+
 "@babel/plugin-proposal-optional-chaining@^7.12.7", "@babel/plugin-proposal-optional-chaining@^7.13.12":
   version "7.13.12"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.13.12.tgz#ba9feb601d422e0adea6760c2bd6bbb7bfec4866"
@@ -632,6 +974,15 @@
     "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
+"@babel/plugin-proposal-optional-chaining@^7.20.7", "@babel/plugin-proposal-optional-chaining@^7.21.0":
+  version "7.21.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz#886f5c8978deb7d30f678b2e24346b287234d3ea"
+  integrity sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
+
 "@babel/plugin-proposal-private-methods@^7.12.1", "@babel/plugin-proposal-private-methods@^7.13.0":
   version "7.13.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.13.0.tgz#04bd4c6d40f6e6bbfa2f57e2d8094bad900ef787"
@@ -640,6 +991,14 @@
     "@babel/helper-create-class-features-plugin" "^7.13.0"
     "@babel/helper-plugin-utils" "^7.13.0"
 
+"@babel/plugin-proposal-private-methods@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz#5209de7d213457548a98436fa2882f52f4be6bea"
+  integrity sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
+
 "@babel/plugin-proposal-private-property-in-object@^7.12.1":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.18.6.tgz#a64137b232f0aca3733a67eb1a144c192389c503"
@@ -650,6 +1009,16 @@
     "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
 
+"@babel/plugin-proposal-private-property-in-object@^7.21.0":
+  version "7.21.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0.tgz#19496bd9883dd83c23c7d7fc45dcd9ad02dfa1dc"
+  integrity sha512-ha4zfehbJjc5MmXBlHec1igel5TJXXLDDRbuJ4+XT2TJcyD9/V1919BA8gMvsdHcNMBy4WBUBiRb3nw/EQUtBw==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.18.6"
+    "@babel/helper-create-class-features-plugin" "^7.21.0"
+    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
+
 "@babel/plugin-proposal-unicode-property-regex@^7.12.13", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.13.tgz#bebde51339be829c17aaaaced18641deb62b39ba"
@@ -658,6 +1027,14 @@
     "@babel/helper-create-regexp-features-plugin" "^7.12.13"
     "@babel/helper-plugin-utils" "^7.12.13"
 
+"@babel/plugin-proposal-unicode-property-regex@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz#af613d2cd5e643643b65cded64207b15c85cb78e"
+  integrity sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
+
 "@babel/plugin-syntax-async-generators@^7.8.4":
   version "7.8.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
@@ -679,6 +1056,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.12.13"
 
+"@babel/plugin-syntax-class-static-block@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz#195df89b146b4b78b3bf897fd7a257c84659d406"
+  integrity sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-syntax-decorators@^7.12.13":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.12.13.tgz#fac829bf3c7ef4a1bc916257b403e58c6bdaf648"
@@ -714,6 +1098,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.12.13"
 
+"@babel/plugin-syntax-import-assertions@^7.20.0":
+  version "7.20.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.20.0.tgz#bb50e0d4bea0957235390641209394e87bdb9cc4"
+  integrity sha512-IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.19.0"
+
 "@babel/plugin-syntax-import-meta@^7.8.3":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51"
@@ -798,6 +1189,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.12.13"
 
+"@babel/plugin-syntax-top-level-await@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c"
+  integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-syntax-typescript@^7.12.13":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.12.13.tgz#9dff111ca64154cef0f4dc52cf843d9f12ce4474"
@@ -812,6 +1210,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.13.0"
 
+"@babel/plugin-transform-arrow-functions@^7.20.7":
+  version "7.20.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.20.7.tgz#bea332b0e8b2dab3dafe55a163d8227531ab0551"
+  integrity sha512-3poA5E7dzDomxj9WXWwuD6A5F3kc7VXwIJO+E+J8qtDtS+pXPAhrgEyh+9GBwBgPq1Z+bB+/JD60lp5jsN7JPQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.20.2"
+
 "@babel/plugin-transform-async-to-generator@^7.13.0":
   version "7.13.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.13.0.tgz#8e112bf6771b82bf1e974e5e26806c5c99aa516f"
@@ -821,6 +1226,15 @@
     "@babel/helper-plugin-utils" "^7.13.0"
     "@babel/helper-remap-async-to-generator" "^7.13.0"
 
+"@babel/plugin-transform-async-to-generator@^7.20.7":
+  version "7.20.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.20.7.tgz#dfee18623c8cb31deb796aa3ca84dda9cea94354"
+  integrity sha512-Uo5gwHPT9vgnSXQxqGtpdufUiWp96gk7yiP4Mp5bm1QMkEmLXBO7PAGYbKoJ6DhAwiNkcHFBol/x5zZZkL/t0Q==
+  dependencies:
+    "@babel/helper-module-imports" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-remap-async-to-generator" "^7.18.9"
+
 "@babel/plugin-transform-block-scoped-functions@^7.12.13":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.13.tgz#a9bf1836f2a39b4eb6cf09967739de29ea4bf4c4"
@@ -828,6 +1242,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.12.13"
 
+"@babel/plugin-transform-block-scoped-functions@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz#9187bf4ba302635b9d70d986ad70f038726216a8"
+  integrity sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.18.6"
+
 "@babel/plugin-transform-block-scoping@^7.12.12", "@babel/plugin-transform-block-scoping@^7.12.13":
   version "7.13.16"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.13.16.tgz#a9c0f10794855c63b1d629914c7dcfeddd185892"
@@ -835,6 +1256,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.13.0"
 
+"@babel/plugin-transform-block-scoping@^7.21.0":
+  version "7.21.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.21.0.tgz#e737b91037e5186ee16b76e7ae093358a5634f02"
+  integrity sha512-Mdrbunoh9SxwFZapeHVrwFmri16+oYotcZysSzhNIVDwIAb1UV+kvnxULSYq9J3/q5MDG+4X6w8QVgD1zhBXNQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.20.2"
+
 "@babel/plugin-transform-classes@^7.12.1", "@babel/plugin-transform-classes@^7.13.0":
   version "7.13.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.13.0.tgz#0265155075c42918bf4d3a4053134176ad9b533b"
@@ -848,6 +1276,21 @@
     "@babel/helper-split-export-declaration" "^7.12.13"
     globals "^11.1.0"
 
+"@babel/plugin-transform-classes@^7.21.0":
+  version "7.21.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.21.0.tgz#f469d0b07a4c5a7dbb21afad9e27e57b47031665"
+  integrity sha512-RZhbYTCEUAe6ntPehC4hlslPWosNHDox+vAs4On/mCLRLfoDVHf6hVEd7kuxr1RnHwJmxFfUM3cZiZRmPxJPXQ==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.18.6"
+    "@babel/helper-compilation-targets" "^7.20.7"
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-function-name" "^7.21.0"
+    "@babel/helper-optimise-call-expression" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-replace-supers" "^7.20.7"
+    "@babel/helper-split-export-declaration" "^7.18.6"
+    globals "^11.1.0"
+
 "@babel/plugin-transform-computed-properties@^7.13.0":
   version "7.13.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.13.0.tgz#845c6e8b9bb55376b1fa0b92ef0bdc8ea06644ed"
@@ -855,13 +1298,28 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.13.0"
 
-"@babel/plugin-transform-destructuring@^7.12.1", "@babel/plugin-transform-destructuring@^7.13.0", "@babel/plugin-transform-destructuring@^7.13.17":
+"@babel/plugin-transform-computed-properties@^7.20.7":
+  version "7.20.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.20.7.tgz#704cc2fd155d1c996551db8276d55b9d46e4d0aa"
+  integrity sha512-Lz7MvBK6DTjElHAmfu6bfANzKcxpyNPeYBGEafyA6E5HtRpjpZwU+u7Qrgz/2OR0z+5TvKYbPdphfSaAcZBrYQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/template" "^7.20.7"
+
+"@babel/plugin-transform-destructuring@^7.12.1", "@babel/plugin-transform-destructuring@^7.13.0":
   version "7.13.17"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.13.17.tgz#678d96576638c19d5b36b332504d3fd6e06dea27"
   integrity sha512-UAUqiLv+uRLO+xuBKKMEpC+t7YRNVRqBsWWq1yKXbBZBje/t3IXCiSinZhjn/DC3qzBfICeYd2EFGEbHsh5RLA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.13.0"
 
+"@babel/plugin-transform-destructuring@^7.14.7", "@babel/plugin-transform-destructuring@^7.21.3":
+  version "7.21.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.21.3.tgz#73b46d0fd11cd6ef57dea8a381b1215f4959d401"
+  integrity sha512-bp6hwMFzuiE4HqYEyoGJ/V2LeIWn+hLVKc4pnj++E5XQptwhtcGmSayM029d/j2X1bPKGTlsyPwAubuU22KhMA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.20.2"
+
 "@babel/plugin-transform-dotall-regex@^7.12.13", "@babel/plugin-transform-dotall-regex@^7.4.4":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.13.tgz#3f1601cc29905bfcb67f53910f197aeafebb25ad"
@@ -870,6 +1328,14 @@
     "@babel/helper-create-regexp-features-plugin" "^7.12.13"
     "@babel/helper-plugin-utils" "^7.12.13"
 
+"@babel/plugin-transform-dotall-regex@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz#b286b3e7aae6c7b861e45bed0a2fafd6b1a4fef8"
+  integrity sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
+
 "@babel/plugin-transform-duplicate-keys@^7.12.13":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.13.tgz#6f06b87a8b803fd928e54b81c258f0a0033904de"
@@ -877,6 +1343,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.12.13"
 
+"@babel/plugin-transform-duplicate-keys@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz#687f15ee3cdad6d85191eb2a372c4528eaa0ae0e"
+  integrity sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.18.9"
+
 "@babel/plugin-transform-exponentiation-operator@^7.12.13":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.13.tgz#4d52390b9a273e651e4aba6aee49ef40e80cd0a1"
@@ -885,6 +1358,14 @@
     "@babel/helper-builder-binary-assignment-operator-visitor" "^7.12.13"
     "@babel/helper-plugin-utils" "^7.12.13"
 
+"@babel/plugin-transform-exponentiation-operator@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz#421c705f4521888c65e91fdd1af951bfefd4dacd"
+  integrity sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==
+  dependencies:
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
+
 "@babel/plugin-transform-flow-strip-types@^7.13.0":
   version "7.13.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.13.0.tgz#58177a48c209971e8234e99906cb6bd1122addd3"
@@ -900,6 +1381,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.13.0"
 
+"@babel/plugin-transform-for-of@^7.21.0":
+  version "7.21.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.21.0.tgz#964108c9988de1a60b4be2354a7d7e245f36e86e"
+  integrity sha512-LlUYlydgDkKpIY7mcBWvyPPmMcOphEyYA27Ef4xpbh1IiDNLr0kZsos2nf92vz3IccvJI25QUwp86Eo5s6HmBQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.20.2"
+
 "@babel/plugin-transform-function-name@^7.12.13":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.13.tgz#bb024452f9aaed861d374c8e7a24252ce3a50051"
@@ -908,6 +1396,15 @@
     "@babel/helper-function-name" "^7.12.13"
     "@babel/helper-plugin-utils" "^7.12.13"
 
+"@babel/plugin-transform-function-name@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz#cc354f8234e62968946c61a46d6365440fc764e0"
+  integrity sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ==
+  dependencies:
+    "@babel/helper-compilation-targets" "^7.18.9"
+    "@babel/helper-function-name" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.18.9"
+
 "@babel/plugin-transform-literals@^7.12.13":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.13.tgz#2ca45bafe4a820197cf315794a4d26560fe4bdb9"
@@ -915,6 +1412,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.12.13"
 
+"@babel/plugin-transform-literals@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz#72796fdbef80e56fba3c6a699d54f0de557444bc"
+  integrity sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.18.9"
+
 "@babel/plugin-transform-member-expression-literals@^7.12.13":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.13.tgz#5ffa66cd59b9e191314c9f1f803b938e8c081e40"
@@ -922,6 +1426,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.12.13"
 
+"@babel/plugin-transform-member-expression-literals@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz#ac9fdc1a118620ac49b7e7a5d2dc177a1bfee88e"
+  integrity sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.18.6"
+
 "@babel/plugin-transform-modules-amd@^7.13.0":
   version "7.13.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.13.0.tgz#19f511d60e3d8753cc5a6d4e775d3a5184866cc3"
@@ -931,6 +1442,14 @@
     "@babel/helper-plugin-utils" "^7.13.0"
     babel-plugin-dynamic-import-node "^2.3.3"
 
+"@babel/plugin-transform-modules-amd@^7.20.11":
+  version "7.20.11"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.20.11.tgz#3daccca8e4cc309f03c3a0c4b41dc4b26f55214a"
+  integrity sha512-NuzCt5IIYOW0O30UvqktzHYR2ud5bOWbY0yaxWZ6G+aFzOMJvrs5YHNikrbdaT15+KNO31nPOy5Fim3ku6Zb5g==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.20.11"
+    "@babel/helper-plugin-utils" "^7.20.2"
+
 "@babel/plugin-transform-modules-commonjs@^7.13.8":
   version "7.13.8"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.13.8.tgz#7b01ad7c2dcf2275b06fa1781e00d13d420b3e1b"
@@ -951,6 +1470,15 @@
     "@babel/helper-simple-access" "^7.18.2"
     babel-plugin-dynamic-import-node "^2.3.3"
 
+"@babel/plugin-transform-modules-commonjs@^7.21.2":
+  version "7.21.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.21.2.tgz#6ff5070e71e3192ef2b7e39820a06fb78e3058e7"
+  integrity sha512-Cln+Yy04Gxua7iPdj6nOV96smLGjpElir5YwzF0LBPKoPlLDNJePNlrGGaybAJkd0zKRnOVXOgizSqPYMNYkzA==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.21.2"
+    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-simple-access" "^7.20.2"
+
 "@babel/plugin-transform-modules-systemjs@^7.13.8":
   version "7.13.8"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.13.8.tgz#6d066ee2bff3c7b3d60bf28dec169ad993831ae3"
@@ -962,6 +1490,16 @@
     "@babel/helper-validator-identifier" "^7.12.11"
     babel-plugin-dynamic-import-node "^2.3.3"
 
+"@babel/plugin-transform-modules-systemjs@^7.20.11":
+  version "7.20.11"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.20.11.tgz#467ec6bba6b6a50634eea61c9c232654d8a4696e"
+  integrity sha512-vVu5g9BPQKSFEmvt2TA4Da5N+QVS66EX21d8uoOihC+OCpUoGvzVsXeqFdtAEfVa5BILAeFt+U7yVmLbQnAJmw==
+  dependencies:
+    "@babel/helper-hoist-variables" "^7.18.6"
+    "@babel/helper-module-transforms" "^7.20.11"
+    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-validator-identifier" "^7.19.1"
+
 "@babel/plugin-transform-modules-umd@^7.13.0":
   version "7.13.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.13.0.tgz#8a3d96a97d199705b9fd021580082af81c06e70b"
@@ -970,6 +1508,14 @@
     "@babel/helper-module-transforms" "^7.13.0"
     "@babel/helper-plugin-utils" "^7.13.0"
 
+"@babel/plugin-transform-modules-umd@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz#81d3832d6034b75b54e62821ba58f28ed0aab4b9"
+  integrity sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
+
 "@babel/plugin-transform-named-capturing-groups-regex@^7.12.13":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.13.tgz#2213725a5f5bbbe364b50c3ba5998c9599c5c9d9"
@@ -977,6 +1523,14 @@
   dependencies:
     "@babel/helper-create-regexp-features-plugin" "^7.12.13"
 
+"@babel/plugin-transform-named-capturing-groups-regex@^7.20.5":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.20.5.tgz#626298dd62ea51d452c3be58b285d23195ba69a8"
+  integrity sha512-mOW4tTzi5iTLnw+78iEq3gr8Aoq4WNRGpmSlrogqaiCBoR1HFhpU4JkpQFOHfeYx3ReVIFWOQJS4aZBRvuZ6mA==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.20.5"
+    "@babel/helper-plugin-utils" "^7.20.2"
+
 "@babel/plugin-transform-new-target@^7.12.13":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.13.tgz#e22d8c3af24b150dd528cbd6e685e799bf1c351c"
@@ -984,6 +1538,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.12.13"
 
+"@babel/plugin-transform-new-target@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz#d128f376ae200477f37c4ddfcc722a8a1b3246a8"
+  integrity sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.18.6"
+
 "@babel/plugin-transform-object-super@^7.12.13":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.13.tgz#b4416a2d63b8f7be314f3d349bd55a9c1b5171f7"
@@ -992,6 +1553,14 @@
     "@babel/helper-plugin-utils" "^7.12.13"
     "@babel/helper-replace-supers" "^7.12.13"
 
+"@babel/plugin-transform-object-super@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz#fb3c6ccdd15939b6ff7939944b51971ddc35912c"
+  integrity sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-replace-supers" "^7.18.6"
+
 "@babel/plugin-transform-parameters@^7.12.1", "@babel/plugin-transform-parameters@^7.13.0":
   version "7.13.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.13.0.tgz#8fa7603e3097f9c0b7ca1a4821bc2fb52e9e5007"
@@ -999,6 +1568,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.13.0"
 
+"@babel/plugin-transform-parameters@^7.20.7", "@babel/plugin-transform-parameters@^7.21.3":
+  version "7.21.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.21.3.tgz#18fc4e797cf6d6d972cb8c411dbe8a809fa157db"
+  integrity sha512-Wxc+TvppQG9xWFYatvCGPvZ6+SIUxQ2ZdiBP+PHYMIjnPXD+uThCshaz4NZOnODAtBjjcVQQ/3OKs9LW28purQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.20.2"
+
 "@babel/plugin-transform-property-literals@^7.12.13":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.13.tgz#4e6a9e37864d8f1b3bc0e2dce7bf8857db8b1a81"
@@ -1006,6 +1582,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.12.13"
 
+"@babel/plugin-transform-property-literals@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz#e22498903a483448e94e032e9bbb9c5ccbfc93a3"
+  integrity sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.18.6"
+
 "@babel/plugin-transform-react-display-name@^7.12.13":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.12.13.tgz#c28effd771b276f4647411c9733dbb2d2da954bd"
@@ -1046,6 +1629,14 @@
   dependencies:
     regenerator-transform "^0.14.2"
 
+"@babel/plugin-transform-regenerator@^7.14.5", "@babel/plugin-transform-regenerator@^7.20.5":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.20.5.tgz#57cda588c7ffb7f4f8483cc83bdcea02a907f04d"
+  integrity sha512-kW/oO7HPBtntbsahzQ0qSE3tFvkFwnbozz3NWFhLGqH75vLEg+sCGngLlhVkePlCs3Jv0dBBHDzCHxNiFAQKCQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.20.2"
+    regenerator-transform "^0.15.1"
+
 "@babel/plugin-transform-reserved-words@^7.12.13":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.13.tgz#7d9988d4f06e0fe697ea1d9803188aa18b472695"
@@ -1053,16 +1644,23 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.12.13"
 
-"@babel/plugin-transform-runtime@^7.13.15":
-  version "7.13.15"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.13.15.tgz#2eddf585dd066b84102517e10a577f24f76a9cd7"
-  integrity sha512-d+ezl76gx6Jal08XngJUkXM4lFXK/5Ikl9Mh4HKDxSfGJXmZ9xG64XT2oivBzfxb/eQ62VfvoMkaCZUKJMVrBA==
+"@babel/plugin-transform-reserved-words@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz#b1abd8ebf8edaa5f7fe6bbb8d2133d23b6a6f76a"
+  integrity sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA==
   dependencies:
-    "@babel/helper-module-imports" "^7.13.12"
-    "@babel/helper-plugin-utils" "^7.13.0"
-    babel-plugin-polyfill-corejs2 "^0.2.0"
-    babel-plugin-polyfill-corejs3 "^0.2.0"
-    babel-plugin-polyfill-regenerator "^0.2.0"
+    "@babel/helper-plugin-utils" "^7.18.6"
+
+"@babel/plugin-transform-runtime@^7.15.0":
+  version "7.21.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.21.4.tgz#2e1da21ca597a7d01fc96b699b21d8d2023191aa"
+  integrity sha512-1J4dhrw1h1PqnNNpzwxQ2UBymJUF8KuPjAAnlLwZcGhHAIqUigFW7cdK6GHoB64ubY4qXQNYknoUeks4Wz7CUA==
+  dependencies:
+    "@babel/helper-module-imports" "^7.21.4"
+    "@babel/helper-plugin-utils" "^7.20.2"
+    babel-plugin-polyfill-corejs2 "^0.3.3"
+    babel-plugin-polyfill-corejs3 "^0.6.0"
+    babel-plugin-polyfill-regenerator "^0.4.1"
     semver "^6.3.0"
 
 "@babel/plugin-transform-shorthand-properties@^7.12.1", "@babel/plugin-transform-shorthand-properties@^7.12.13":
@@ -1072,6 +1670,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.12.13"
 
+"@babel/plugin-transform-shorthand-properties@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz#6d6df7983d67b195289be24909e3f12a8f664dc9"
+  integrity sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.18.6"
+
 "@babel/plugin-transform-spread@^7.12.1", "@babel/plugin-transform-spread@^7.13.0":
   version "7.13.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.13.0.tgz#84887710e273c1815ace7ae459f6f42a5d31d5fd"
@@ -1080,6 +1685,14 @@
     "@babel/helper-plugin-utils" "^7.13.0"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
 
+"@babel/plugin-transform-spread@^7.20.7":
+  version "7.20.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.20.7.tgz#c2d83e0b99d3bf83e07b11995ee24bf7ca09401e"
+  integrity sha512-ewBbHQ+1U/VnH1fxltbJqDeWBU1oNLG8Dj11uIv3xVf7nrQu0bPGe5Rf716r7K5Qz+SqtAOVswoVunoiBtGhxw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
+
 "@babel/plugin-transform-sticky-regex@^7.12.13":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.13.tgz#760ffd936face73f860ae646fb86ee82f3d06d1f"
@@ -1087,6 +1700,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.12.13"
 
+"@babel/plugin-transform-sticky-regex@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz#c6706eb2b1524028e317720339583ad0f444adcc"
+  integrity sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.18.6"
+
 "@babel/plugin-transform-template-literals@^7.12.1", "@babel/plugin-transform-template-literals@^7.13.0":
   version "7.13.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.13.0.tgz#a36049127977ad94438dee7443598d1cefdf409d"
@@ -1094,6 +1714,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.13.0"
 
+"@babel/plugin-transform-template-literals@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz#04ec6f10acdaa81846689d63fae117dd9c243a5e"
+  integrity sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.18.9"
+
 "@babel/plugin-transform-typeof-symbol@^7.12.13":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.13.tgz#785dd67a1f2ea579d9c2be722de8c84cb85f5a7f"
@@ -1101,6 +1728,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.12.13"
 
+"@babel/plugin-transform-typeof-symbol@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz#c8cea68263e45addcd6afc9091429f80925762c0"
+  integrity sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.18.9"
+
 "@babel/plugin-transform-typescript@^7.13.0":
   version "7.13.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.13.0.tgz#4a498e1f3600342d2a9e61f60131018f55774853"
@@ -1117,6 +1751,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.12.13"
 
+"@babel/plugin-transform-unicode-escapes@^7.18.10":
+  version "7.18.10"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz#1ecfb0eda83d09bbcb77c09970c2dd55832aa246"
+  integrity sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.18.9"
+
 "@babel/plugin-transform-unicode-regex@^7.12.13":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.13.tgz#b52521685804e155b1202e83fc188d34bb70f5ac"
@@ -1125,7 +1766,15 @@
     "@babel/helper-create-regexp-features-plugin" "^7.12.13"
     "@babel/helper-plugin-utils" "^7.12.13"
 
-"@babel/preset-env@7.13.15", "@babel/preset-env@^7.1.6", "@babel/preset-env@^7.12.11", "@babel/preset-env@^7.13.15":
+"@babel/plugin-transform-unicode-regex@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz#194317225d8c201bbae103364ffe9e2cea36cdca"
+  integrity sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
+
+"@babel/preset-env@7.13.15", "@babel/preset-env@^7.1.6", "@babel/preset-env@^7.12.11":
   version "7.13.15"
   resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.13.15.tgz#c8a6eb584f96ecba183d3d414a83553a599f478f"
   integrity sha512-D4JAPMXcxk69PKe81jRJ21/fP/uYdcTZ3hJDF5QX2HSI9bBxxYw/dumdR6dGumhjxlprHPE4XWoPaqzZUVy2MA==
@@ -1200,6 +1849,87 @@
     core-js-compat "^3.9.0"
     semver "^6.3.0"
 
+"@babel/preset-env@^7.15.0":
+  version "7.21.4"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.21.4.tgz#a952482e634a8dd8271a3fe5459a16eb10739c58"
+  integrity sha512-2W57zHs2yDLm6GD5ZpvNn71lZ0B/iypSdIeq25OurDKji6AdzV07qp4s3n1/x5BqtiGaTrPN3nerlSCaC5qNTw==
+  dependencies:
+    "@babel/compat-data" "^7.21.4"
+    "@babel/helper-compilation-targets" "^7.21.4"
+    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-validator-option" "^7.21.0"
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.18.6"
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.20.7"
+    "@babel/plugin-proposal-async-generator-functions" "^7.20.7"
+    "@babel/plugin-proposal-class-properties" "^7.18.6"
+    "@babel/plugin-proposal-class-static-block" "^7.21.0"
+    "@babel/plugin-proposal-dynamic-import" "^7.18.6"
+    "@babel/plugin-proposal-export-namespace-from" "^7.18.9"
+    "@babel/plugin-proposal-json-strings" "^7.18.6"
+    "@babel/plugin-proposal-logical-assignment-operators" "^7.20.7"
+    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.18.6"
+    "@babel/plugin-proposal-numeric-separator" "^7.18.6"
+    "@babel/plugin-proposal-object-rest-spread" "^7.20.7"
+    "@babel/plugin-proposal-optional-catch-binding" "^7.18.6"
+    "@babel/plugin-proposal-optional-chaining" "^7.21.0"
+    "@babel/plugin-proposal-private-methods" "^7.18.6"
+    "@babel/plugin-proposal-private-property-in-object" "^7.21.0"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.18.6"
+    "@babel/plugin-syntax-async-generators" "^7.8.4"
+    "@babel/plugin-syntax-class-properties" "^7.12.13"
+    "@babel/plugin-syntax-class-static-block" "^7.14.5"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
+    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
+    "@babel/plugin-syntax-import-assertions" "^7.20.0"
+    "@babel/plugin-syntax-json-strings" "^7.8.3"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
+    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
+    "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
+    "@babel/plugin-syntax-top-level-await" "^7.14.5"
+    "@babel/plugin-transform-arrow-functions" "^7.20.7"
+    "@babel/plugin-transform-async-to-generator" "^7.20.7"
+    "@babel/plugin-transform-block-scoped-functions" "^7.18.6"
+    "@babel/plugin-transform-block-scoping" "^7.21.0"
+    "@babel/plugin-transform-classes" "^7.21.0"
+    "@babel/plugin-transform-computed-properties" "^7.20.7"
+    "@babel/plugin-transform-destructuring" "^7.21.3"
+    "@babel/plugin-transform-dotall-regex" "^7.18.6"
+    "@babel/plugin-transform-duplicate-keys" "^7.18.9"
+    "@babel/plugin-transform-exponentiation-operator" "^7.18.6"
+    "@babel/plugin-transform-for-of" "^7.21.0"
+    "@babel/plugin-transform-function-name" "^7.18.9"
+    "@babel/plugin-transform-literals" "^7.18.9"
+    "@babel/plugin-transform-member-expression-literals" "^7.18.6"
+    "@babel/plugin-transform-modules-amd" "^7.20.11"
+    "@babel/plugin-transform-modules-commonjs" "^7.21.2"
+    "@babel/plugin-transform-modules-systemjs" "^7.20.11"
+    "@babel/plugin-transform-modules-umd" "^7.18.6"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.20.5"
+    "@babel/plugin-transform-new-target" "^7.18.6"
+    "@babel/plugin-transform-object-super" "^7.18.6"
+    "@babel/plugin-transform-parameters" "^7.21.3"
+    "@babel/plugin-transform-property-literals" "^7.18.6"
+    "@babel/plugin-transform-regenerator" "^7.20.5"
+    "@babel/plugin-transform-reserved-words" "^7.18.6"
+    "@babel/plugin-transform-shorthand-properties" "^7.18.6"
+    "@babel/plugin-transform-spread" "^7.20.7"
+    "@babel/plugin-transform-sticky-regex" "^7.18.6"
+    "@babel/plugin-transform-template-literals" "^7.18.9"
+    "@babel/plugin-transform-typeof-symbol" "^7.18.9"
+    "@babel/plugin-transform-unicode-escapes" "^7.18.10"
+    "@babel/plugin-transform-unicode-regex" "^7.18.6"
+    "@babel/preset-modules" "^0.1.5"
+    "@babel/types" "^7.21.4"
+    babel-plugin-polyfill-corejs2 "^0.3.3"
+    babel-plugin-polyfill-corejs3 "^0.6.0"
+    babel-plugin-polyfill-regenerator "^0.4.1"
+    core-js-compat "^3.25.1"
+    semver "^6.3.0"
+
 "@babel/preset-flow@^7.0.0":
   version "7.13.13"
   resolved "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.13.13.tgz#a61a1c149b3f77589d795287744393444d5cdd9e"
@@ -1220,6 +1950,17 @@
     "@babel/types" "^7.4.4"
     esutils "^2.0.2"
 
+"@babel/preset-modules@^0.1.5":
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.5.tgz#ef939d6e7f268827e1841638dc6ff95515e115d9"
+  integrity sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.4.4"
+    "@babel/plugin-transform-dotall-regex" "^7.4.4"
+    "@babel/types" "^7.4.4"
+    esutils "^2.0.2"
+
 "@babel/preset-react@^7.12.10":
   version "7.13.13"
   resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.13.13.tgz#fa6895a96c50763fe693f9148568458d5a839761"
@@ -1252,6 +1993,11 @@
     pirates "^4.0.0"
     source-map-support "^0.5.16"
 
+"@babel/regjsgen@^0.8.0":
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310"
+  integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==
+
 "@babel/runtime-corejs3@^7.10.2":
   version "7.13.17"
   resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.13.17.tgz#9baf45f03d4d013f021760b992d6349a9d27deaf"
@@ -1260,13 +2006,20 @@
     core-js-pure "^3.0.0"
     regenerator-runtime "^0.13.4"
 
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.13.17", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4":
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4":
   version "7.13.17"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.13.17.tgz#8966d1fc9593bf848602f0662d6b4d0069e3a7ec"
   integrity sha512-NCdgJEelPTSh+FEFylhnP1ylq848l1z9t9N0j1Lfbcw0+KXGjsTvUmkxy+voLLXB5SOKMbLLx4jxYliGrYQseA==
   dependencies:
     regenerator-runtime "^0.13.4"
 
+"@babel/runtime@^7.15.3":
+  version "7.21.0"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.21.0.tgz#5b55c9d394e5fcf304909a8b00c07dc217b56673"
+  integrity sha512-xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw==
+  dependencies:
+    regenerator-runtime "^0.13.11"
+
 "@babel/runtime@^7.17.8":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.18.6.tgz#6a1ef59f838debd670421f8c7f2cbb8da9751580"
@@ -1292,6 +2045,15 @@
     "@babel/parser" "^7.16.7"
     "@babel/types" "^7.16.7"
 
+"@babel/template@^7.18.10", "@babel/template@^7.20.7":
+  version "7.20.7"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8"
+  integrity sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==
+  dependencies:
+    "@babel/code-frame" "^7.18.6"
+    "@babel/parser" "^7.20.7"
+    "@babel/types" "^7.20.7"
+
 "@babel/template@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.18.6.tgz#1283f4993e00b929d6e2d3c72fdc9168a2977a31"
@@ -1347,6 +2109,22 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
+"@babel/traverse@^7.20.5", "@babel/traverse@^7.20.7", "@babel/traverse@^7.21.0", "@babel/traverse@^7.21.2", "@babel/traverse@^7.21.4":
+  version "7.21.4"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.21.4.tgz#a836aca7b116634e97a6ed99976236b3282c9d36"
+  integrity sha512-eyKrRHKdyZxqDm+fV1iqL9UAHMoIg0nDaGqfIOd8rKH17m5snv7Gn4qgjBoFfLz9APvjFU/ICT00NVCv1Epp8Q==
+  dependencies:
+    "@babel/code-frame" "^7.21.4"
+    "@babel/generator" "^7.21.4"
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-function-name" "^7.21.0"
+    "@babel/helper-hoist-variables" "^7.18.6"
+    "@babel/helper-split-export-declaration" "^7.18.6"
+    "@babel/parser" "^7.21.4"
+    "@babel/types" "^7.21.4"
+    debug "^4.1.0"
+    globals "^11.1.0"
+
 "@babel/types@^7.0.0", "@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.12.7", "@babel/types@^7.13.0", "@babel/types@^7.13.12", "@babel/types@^7.13.14", "@babel/types@^7.13.16", "@babel/types@^7.13.17", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.6.1", "@babel/types@^7.7.0", "@babel/types@^7.9.6":
   version "7.13.17"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.13.17.tgz#48010a115c9fba7588b4437dd68c9469012b38b4"
@@ -1371,6 +2149,15 @@
     "@babel/helper-validator-identifier" "^7.16.7"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.18.9", "@babel/types@^7.20.0", "@babel/types@^7.20.2", "@babel/types@^7.20.5", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.2", "@babel/types@^7.21.4":
+  version "7.21.4"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.21.4.tgz#2d5d6bb7908699b3b416409ffd3b5daa25b030d4"
+  integrity sha512-rU2oY501qDxE8Pyo7i/Orqma4ziCOrby0/9mvbDUGEfvZjb279Nk9k19e2fiCxHbRRpY2ZyrgW1eq22mvmOIzA==
+  dependencies:
+    "@babel/helper-string-parser" "^7.19.4"
+    "@babel/helper-validator-identifier" "^7.19.1"
+    to-fast-properties "^2.0.0"
+
 "@bcoe/v8-coverage@^0.2.3":
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
@@ -1743,6 +2530,11 @@
     "@jridgewell/sourcemap-codec" "^1.4.10"
     "@jridgewell/trace-mapping" "^0.3.9"
 
+"@jridgewell/resolve-uri@3.1.0":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78"
+  integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==
+
 "@jridgewell/resolve-uri@^3.0.3":
   version "3.0.7"
   resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.7.tgz#30cd49820a962aff48c8fffc5cd760151fca61fe"
@@ -1766,11 +2558,24 @@
     "@jridgewell/gen-mapping" "^0.3.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
+"@jridgewell/sourcemap-codec@1.4.14":
+  version "1.4.14"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24"
+  integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
+
 "@jridgewell/sourcemap-codec@^1.4.10":
   version "1.4.13"
   resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz#b6461fb0c2964356c469e115f504c95ad97ab88c"
   integrity sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w==
 
+"@jridgewell/trace-mapping@^0.3.17":
+  version "0.3.18"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz#25783b2086daf6ff1dcb53c9249ae480e4dd4cd6"
+  integrity sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==
+  dependencies:
+    "@jridgewell/resolve-uri" "3.1.0"
+    "@jridgewell/sourcemap-codec" "1.4.14"
+
 "@jridgewell/trace-mapping@^0.3.7":
   version "0.3.14"
   resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz#b231a081d8f66796e475ad588a1ef473112701ed"
@@ -1916,42 +2721,42 @@
   resolved "https://registry.yarnpkg.com/@rails/ujs/-/ujs-7.0.3-1.tgz#0a0f4f2b22b887bcbf6e0b0a72b8c86665cd31d9"
   integrity sha512-g3LgpBAsWmW97xFxh5OTDgyEJLt63fEENJUYb/iNFRXY6aKLI/by6MjFw7x492DSP/+vKQa3oMEdNnjI9+yZgQ==
 
-"@rails/webpacker@5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@rails/webpacker/-/webpacker-5.3.0.tgz#9d7a615735f850572b9c5e2ad4c57f4af70d70fd"
-  integrity sha512-cpzrtrsMVi6WgRUzL63bMF+oa98DiL8cKXUZzDFLeElRu7qArG+cxU8grmaPbTmFqQEqVGsbJT0c6fubbFtwVA==
+"@rails/webpacker@5.4.4":
+  version "5.4.4"
+  resolved "https://registry.yarnpkg.com/@rails/webpacker/-/webpacker-5.4.4.tgz#971a41b987c096c908ce4088accd57c1a9a7e2f7"
+  integrity sha512-hp9myb2MChYFPfE5Fd/3gF4q2m4wpxC+WWCkxcg6My3HYCptWuqMVXRwrBZ5EJHYiL/WRyMLvVNWwlFV47xhUw==
   dependencies:
-    "@babel/core" "^7.13.16"
-    "@babel/plugin-proposal-class-properties" "^7.13.0"
-    "@babel/plugin-proposal-object-rest-spread" "^7.13.8"
+    "@babel/core" "^7.15.0"
+    "@babel/plugin-proposal-class-properties" "^7.14.5"
+    "@babel/plugin-proposal-object-rest-spread" "^7.14.7"
     "@babel/plugin-syntax-dynamic-import" "^7.8.3"
-    "@babel/plugin-transform-destructuring" "^7.13.17"
-    "@babel/plugin-transform-regenerator" "^7.13.15"
-    "@babel/plugin-transform-runtime" "^7.13.15"
-    "@babel/preset-env" "^7.13.15"
-    "@babel/runtime" "^7.13.17"
+    "@babel/plugin-transform-destructuring" "^7.14.7"
+    "@babel/plugin-transform-regenerator" "^7.14.5"
+    "@babel/plugin-transform-runtime" "^7.15.0"
+    "@babel/preset-env" "^7.15.0"
+    "@babel/runtime" "^7.15.3"
     babel-loader "^8.2.2"
     babel-plugin-dynamic-import-node "^2.3.3"
     babel-plugin-macros "^2.8.0"
     case-sensitive-paths-webpack-plugin "^2.4.0"
     compression-webpack-plugin "^4.0.1"
-    core-js "^3.11.0"
+    core-js "^3.16.2"
     css-loader "^3.6.0"
     file-loader "^6.2.0"
-    flatted "^3.1.1"
-    glob "^7.1.6"
+    flatted "^3.2.2"
+    glob "^7.1.7"
     js-yaml "^3.14.1"
     mini-css-extract-plugin "^0.9.0"
-    optimize-css-assets-webpack-plugin "^5.0.4"
+    optimize-css-assets-webpack-plugin "^5.0.8"
     path-complete-extname "^1.0.0"
-    pnp-webpack-plugin "^1.6.4"
+    pnp-webpack-plugin "^1.7.0"
     postcss-flexbugs-fixes "^4.2.1"
     postcss-import "^12.0.1"
     postcss-loader "^3.0.0"
     postcss-preset-env "^6.7.0"
     postcss-safe-parser "^4.0.2"
-    regenerator-runtime "^0.13.7"
-    sass "^1.32.11"
+    regenerator-runtime "^0.13.9"
+    sass "^1.38.0"
     sass-loader "10.1.1"
     style-loader "^1.3.0"
     terser-webpack-plugin "^4.2.3"
@@ -4711,11 +5516,6 @@ ansi-html-community@0.0.8:
   resolved "https://registry.yarnpkg.com/ansi-html-community/-/ansi-html-community-0.0.8.tgz#69fbc4d6ccbe383f9736934ae34c3f8290f1bf41"
   integrity sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==
 
-ansi-html@0.0.7:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
-  integrity sha1-gTWEAhliqenm/QOflA0S9WynhZ4=
-
 ansi-regex@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
@@ -5251,6 +6051,15 @@ babel-plugin-polyfill-corejs2@^0.2.0:
     "@babel/helper-define-polyfill-provider" "^0.2.0"
     semver "^6.1.1"
 
+babel-plugin-polyfill-corejs2@^0.3.3:
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz#5d1bd3836d0a19e1b84bbf2d9640ccb6f951c122"
+  integrity sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==
+  dependencies:
+    "@babel/compat-data" "^7.17.7"
+    "@babel/helper-define-polyfill-provider" "^0.3.3"
+    semver "^6.1.1"
+
 babel-plugin-polyfill-corejs3@^0.1.0:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.1.7.tgz#80449d9d6f2274912e05d9e182b54816904befd0"
@@ -5267,6 +6076,14 @@ babel-plugin-polyfill-corejs3@^0.2.0:
     "@babel/helper-define-polyfill-provider" "^0.2.0"
     core-js-compat "^3.9.1"
 
+babel-plugin-polyfill-corejs3@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz#56ad88237137eade485a71b52f72dbed57c6230a"
+  integrity sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==
+  dependencies:
+    "@babel/helper-define-polyfill-provider" "^0.3.3"
+    core-js-compat "^3.25.1"
+
 babel-plugin-polyfill-regenerator@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.0.tgz#853f5f5716f4691d98c84f8069c7636ea8da7ab8"
@@ -5274,6 +6091,13 @@ babel-plugin-polyfill-regenerator@^0.2.0:
   dependencies:
     "@babel/helper-define-polyfill-provider" "^0.2.0"
 
+babel-plugin-polyfill-regenerator@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz#390f91c38d90473592ed43351e801a9d3e0fd747"
+  integrity sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==
+  dependencies:
+    "@babel/helper-define-polyfill-provider" "^0.3.3"
+
 babel-plugin-syntax-jsx@^6.18.0:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946"
@@ -5618,6 +6442,16 @@ browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4
     escalade "^3.1.1"
     node-releases "^1.1.71"
 
+browserslist@^4.21.3, browserslist@^4.21.5:
+  version "4.21.5"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.5.tgz#75c5dae60063ee641f977e00edd3cfb2fb7af6a7"
+  integrity sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==
+  dependencies:
+    caniuse-lite "^1.0.30001449"
+    electron-to-chromium "^1.4.284"
+    node-releases "^2.0.8"
+    update-browserslist-db "^1.0.10"
+
 bser@2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05"
@@ -5831,6 +6665,11 @@ caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, can
   resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001271.tgz"
   integrity sha512-BBruZFWmt3HFdVPS8kceTBIguKxu4f99n5JNp06OlPD/luoAMIaIK5ieV5YjnBLH3Nysai9sxj9rpJj4ZisXOA==
 
+caniuse-lite@^1.0.30001449:
+  version "1.0.30001481"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001481.tgz#f58a717afe92f9e69d0e35ff64df596bfad93912"
+  integrity sha512-KCqHwRnaa1InZBtqXzP98LPg0ajCVujMKjqKDhZEthIpAsJl/YEIa3YvXjGXPVqzZVguccuu7ga9KOE1J9rKPQ==
+
 capture-exit@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4"
@@ -6446,6 +7285,13 @@ copy-descriptor@^0.1.0:
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
+core-js-compat@^3.25.1:
+  version "3.30.1"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.30.1.tgz#961541e22db9c27fc48bfc13a3cafa8734171dfe"
+  integrity sha512-d690npR7MC6P0gq4npTl5n2VQeNAmUrJ90n+MHiKS7W2+xno4o3F5GDEuylSdi6EJ3VssibSGXOa1r3YXD3Mhw==
+  dependencies:
+    browserslist "^4.21.5"
+
 core-js-compat@^3.8.1, core-js-compat@^3.9.0, core-js-compat@^3.9.1:
   version "3.11.0"
   resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.11.0.tgz#635683f43480a0b41e3f6be3b1c648dadb8b4390"
@@ -6459,11 +7305,16 @@ core-js-pure@^3.0.0:
   resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.11.0.tgz#e07f25a8f616d178ec16b0354b008ad28b20b2f0"
   integrity sha512-PxEiQGjzC+5qbvE7ZIs5Zn6BynNeZO9zHhrrWmkRff2SZLq0CE/H5LuZOJHhmOQ8L38+eMzEHAmPYWrUtDfuDQ==
 
-core-js@3.11.0, core-js@^3.0.4, core-js@^3.11.0, core-js@^3.6.5, core-js@^3.8.2:
+core-js@3.11.0, core-js@^3.0.4, core-js@^3.6.5, core-js@^3.8.2:
   version "3.11.0"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.11.0.tgz#05dac6aa70c0a4ad842261f8957b961d36eb8926"
   integrity sha512-bd79DPpx+1Ilh9+30aT5O1sgpQd4Ttg8oqkqi51ZzhedMM1omD2e6IOF48Z/DzDCZ2svp49tN/3vneTK6ZBkXw==
 
+core-js@^3.16.2:
+  version "3.30.1"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.30.1.tgz#fc9c5adcc541d8e9fa3e381179433cbf795628ba"
+  integrity sha512-ZNS5nbiSwDTq4hFosEDqm65izl2CWmLz0hARJMyNQBgkUZMIF51cQiMvIQKA6hvuaeWxQDP3hEedM1JZIgTldQ==
+
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
@@ -7388,6 +8239,11 @@ electron-to-chromium@^1.3.719:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.723.tgz#52769a75635342a4db29af5f1e40bd3dad02c877"
   integrity sha512-L+WXyXI7c7+G1V8ANzRsPI5giiimLAUDC6Zs1ojHHPhYXb3k/iTABFmWjivEtsWrRQymjnO66/rO2ZTABGdmWg==
 
+electron-to-chromium@^1.4.284:
+  version "1.4.374"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.374.tgz#091b2de9d80b970f9b5e689675ea62622cd1d74b"
+  integrity sha512-dNP9tQNTrjgVlSXMqGaj0BdrCS+9pcUvy5/emB6x8kh0YwCoDZ0Z4ce1+7aod+KhybHUd5o5LgKrc5al4kVmzQ==
+
 elegant-spinner@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e"
@@ -8410,10 +9266,10 @@ flatted@^2.0.0:
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.1.tgz#69e57caa8f0eacbc281d2e2cb458d46fdb449e08"
   integrity sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==
 
-flatted@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz#c4b489e80096d9df1dfc97c79871aea7c617c469"
-  integrity sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==
+flatted@^3.2.2:
+  version "3.2.7"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787"
+  integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==
 
 flatten@^1.0.2:
   version "1.0.3"
@@ -8779,6 +9635,18 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, gl
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+glob@^7.1.7:
+  version "7.2.3"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
+  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.1.1"
+    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"
@@ -9386,6 +10254,11 @@ ignore@^5.2.0:
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a"
   integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==
 
+immutable@^4.0.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.3.0.tgz#eb1738f14ffb39fd068b1dbe1296117484dd34be"
+  integrity sha512-0AOCmOip+xgJwEVTQj1EfiDDOkPmuyllDuTuEX+DDXUgapLAsBIfkg3sxCYyCEA8mQqZrrxPUGjcOQ2JS3WLkg==
+
 import-cwd@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-2.1.0.tgz#aa6cf36e722761285cb371ec6519f53e2435b0a9"
@@ -10785,6 +11658,11 @@ json5@^2.1.2, json5@^2.1.3:
   dependencies:
     minimist "^1.2.5"
 
+json5@^2.2.2:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
+  integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
+
 jsonfile@^2.1.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
@@ -11683,7 +12561,7 @@ minimalistic-crypto-utils@^1.0.1:
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
   integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
 
-minimatch@^3.0.2, minimatch@^3.0.4:
+minimatch@^3.0.2, minimatch@^3.0.4, minimatch@^3.1.1:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
   integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
@@ -12008,6 +12886,11 @@ node-releases@^1.1.71:
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.71.tgz#cb1334b179896b1c89ecfdd4b725fb7bbdfc7dbb"
   integrity sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg==
 
+node-releases@^2.0.8:
+  version "2.0.10"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.10.tgz#c311ebae3b6a148c89b1813fd7c4d3c024ef537f"
+  integrity sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w==
+
 nopt@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88"
@@ -12285,10 +13168,10 @@ opn@^5.5.0:
   dependencies:
     is-wsl "^1.1.0"
 
-optimize-css-assets-webpack-plugin@^5.0.4:
-  version "5.0.4"
-  resolved "https://registry.yarnpkg.com/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-5.0.4.tgz#85883c6528aaa02e30bbad9908c92926bb52dc90"
-  integrity sha512-wqd6FdI2a5/FdoiCNNkEvLeA//lHHfG24Ln2Xm2qqdIk4aOlsR18jwpyOihqQ8849W3qu2DX8fOYxpvTMj+93A==
+optimize-css-assets-webpack-plugin@^5.0.8:
+  version "5.0.8"
+  resolved "https://registry.yarnpkg.com/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-5.0.8.tgz#cbccdcf5a6ef61d4f8cc78cf083a67446e5f402a"
+  integrity sha512-mgFS1JdOtEGzD8l+EuISqL57cKO+We9GcoiQEmdCWRqqck+FGNmYJtx9qfAPzEz+lRrlThWMuGDaRkI/yWNx/Q==
   dependencies:
     cssnano "^4.1.10"
     last-call-webpack-plugin "^3.0.0"
@@ -12691,6 +13574,11 @@ picocolors@^0.2.1:
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f"
   integrity sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==
 
+picocolors@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
+  integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
+
 picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.3.tgz#465547f359ccc206d3c48e46a1bcb89bf7ee619d"
@@ -12777,13 +13665,20 @@ please-upgrade-node@^3.2.0:
   dependencies:
     semver-compare "^1.0.0"
 
-pnp-webpack-plugin@1.6.4, pnp-webpack-plugin@^1.6.4:
+pnp-webpack-plugin@1.6.4:
   version "1.6.4"
   resolved "https://registry.yarnpkg.com/pnp-webpack-plugin/-/pnp-webpack-plugin-1.6.4.tgz#c9711ac4dc48a685dabafc86f8b6dd9f8df84149"
   integrity sha512-7Wjy+9E3WwLOEL30D+m8TSTF7qJJUJLONBnwQp0518siuMxUQUbgZwssaFX+QKlZkjHZcw/IpZCt/H0srrntSg==
   dependencies:
     ts-pnp "^1.1.6"
 
+pnp-webpack-plugin@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/pnp-webpack-plugin/-/pnp-webpack-plugin-1.7.0.tgz#65741384f6d8056f36e2255a8d67ffc20866f5c9"
+  integrity sha512-2Rb3vm+EXble/sMXNSu6eoBx8e79gKqhNq9F5ZWW6ERNCTE/Q0wQNne5541tE5vKjfM8hpNCYL+LGc1YTfI0dg==
+  dependencies:
+    ts-pnp "^1.1.6"
+
 polished@^4.2.2:
   version "4.2.2"
   resolved "https://registry.yarnpkg.com/polished/-/polished-4.2.2.tgz#2529bb7c3198945373c52e34618c8fe7b1aa84d1"
@@ -14352,6 +15247,13 @@ refractor@^3.6.0:
     parse-entities "^2.0.0"
     prismjs "~1.27.0"
 
+regenerate-unicode-properties@^10.1.0:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz#7c3192cab6dd24e21cb4461e5ddd7dd24fa8374c"
+  integrity sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==
+  dependencies:
+    regenerate "^1.4.2"
+
 regenerate-unicode-properties@^8.2.0:
   version "8.2.0"
   resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz#e5de7111d655e7ba60c057dbe9ff37c87e65cdec"
@@ -14359,11 +15261,16 @@ regenerate-unicode-properties@^8.2.0:
   dependencies:
     regenerate "^1.4.0"
 
-regenerate@^1.4.0:
+regenerate@^1.4.0, regenerate@^1.4.2:
   version "1.4.2"
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a"
   integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
 
+regenerator-runtime@^0.13.11, regenerator-runtime@^0.13.9:
+  version "0.13.11"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9"
+  integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==
+
 regenerator-runtime@^0.13.4, regenerator-runtime@^0.13.7:
   version "0.13.7"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55"
@@ -14376,6 +15283,13 @@ regenerator-transform@^0.14.2:
   dependencies:
     "@babel/runtime" "^7.8.4"
 
+regenerator-transform@^0.15.1:
+  version "0.15.1"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.1.tgz#f6c4e99fc1b4591f780db2586328e4d9a9d8dc56"
+  integrity sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg==
+  dependencies:
+    "@babel/runtime" "^7.8.4"
+
 regex-not@^1.0.0, regex-not@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
@@ -14409,6 +15323,18 @@ regexpu-core@^4.7.1:
     unicode-match-property-ecmascript "^1.0.4"
     unicode-match-property-value-ecmascript "^1.2.0"
 
+regexpu-core@^5.3.1:
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.3.2.tgz#11a2b06884f3527aec3e93dbbf4a3b958a95546b"
+  integrity sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==
+  dependencies:
+    "@babel/regjsgen" "^0.8.0"
+    regenerate "^1.4.2"
+    regenerate-unicode-properties "^10.1.0"
+    regjsparser "^0.9.1"
+    unicode-match-property-ecmascript "^2.0.0"
+    unicode-match-property-value-ecmascript "^2.1.0"
+
 regjsgen@^0.5.1:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz#92ff295fb1deecbf6ecdab2543d207e91aa33733"
@@ -14421,6 +15347,13 @@ regjsparser@^0.6.4:
   dependencies:
     jsesc "~0.5.0"
 
+regjsparser@^0.9.1:
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.9.1.tgz#272d05aa10c7c1f67095b1ff0addae8442fc5709"
+  integrity sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==
+  dependencies:
+    jsesc "~0.5.0"
+
 relateurl@^0.2.7:
   version "0.2.7"
   resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
@@ -14834,12 +15767,14 @@ sass-loader@10.1.1:
     schema-utils "^3.0.0"
     semver "^7.3.2"
 
-sass@^1.32.11:
-  version "1.32.11"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.32.11.tgz#b236b3ea55c76602c2ef2bd0445f0db581baa218"
-  integrity sha512-O9tRcob/fegUVSIV1ihLLZcftIOh0AF1VpKgusUfLqnb2jQ0GLDwI5ivv1FYWivGv8eZ/AwntTyTzjcHu0c/qw==
+sass@^1.38.0:
+  version "1.62.1"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.62.1.tgz#caa8d6bf098935bc92fc73fa169fb3790cacd029"
+  integrity sha512-NHpxIzN29MXvWiuswfc1W3I0N8SXBd8UR26WntmDlRYf0bSADnwnOjsyMZ3lMezSlArD33Vs3YFhp7dWvL770A==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
+    immutable "^4.0.0"
+    source-map-js ">=0.6.2 <2.0.0"
 
 sax@~1.2.4:
   version "1.2.4"
@@ -15251,6 +16186,11 @@ source-list-map@^2.0.0:
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
   integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
 
+"source-map-js@>=0.6.2 <2.0.0":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
+  integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
+
 source-map-resolve@^0.5.0, source-map-resolve@^0.5.2:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
@@ -16341,6 +17281,11 @@ unicode-canonical-property-names-ecmascript@^1.0.4:
   resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"
   integrity sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==
 
+unicode-canonical-property-names-ecmascript@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc"
+  integrity sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==
+
 unicode-match-property-ecmascript@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz#8ed2a32569961bce9227d09cd3ffbb8fed5f020c"
@@ -16349,16 +17294,34 @@ unicode-match-property-ecmascript@^1.0.4:
     unicode-canonical-property-names-ecmascript "^1.0.4"
     unicode-property-aliases-ecmascript "^1.0.4"
 
+unicode-match-property-ecmascript@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz#54fd16e0ecb167cf04cf1f756bdcc92eba7976c3"
+  integrity sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==
+  dependencies:
+    unicode-canonical-property-names-ecmascript "^2.0.0"
+    unicode-property-aliases-ecmascript "^2.0.0"
+
 unicode-match-property-value-ecmascript@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz#0d91f600eeeb3096aa962b1d6fc88876e64ea531"
   integrity sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==
 
+unicode-match-property-value-ecmascript@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz#cb5fffdcd16a05124f5a4b0bf7c3770208acbbe0"
+  integrity sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==
+
 unicode-property-aliases-ecmascript@^1.0.4:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz#dd57a99f6207bedff4628abefb94c50db941c8f4"
   integrity sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==
 
+unicode-property-aliases-ecmascript@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz#43d41e3be698bd493ef911077c9b131f827e8ccd"
+  integrity sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==
+
 unified@9.2.0:
   version "9.2.0"
   resolved "https://registry.yarnpkg.com/unified/-/unified-9.2.0.tgz#67a62c627c40589edebbf60f53edfd4d822027f8"
@@ -16508,6 +17471,14 @@ upath@^1.1.1:
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
   integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==
 
+update-browserslist-db@^1.0.10:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz#9a2a641ad2907ae7b3616506f4b977851db5b940"
+  integrity sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==
+  dependencies:
+    escalade "^3.1.1"
+    picocolors "^1.0.0"
+
 uri-js@^4.2.2:
   version "4.4.1"
   resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
@@ -17105,12 +18076,12 @@ webpack-dev-middleware@^3.7.2, webpack-dev-middleware@^3.7.3:
     range-parser "^1.2.1"
     webpack-log "^2.0.0"
 
-webpack-dev-server@3.11.2:
-  version "3.11.2"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.11.2.tgz#695ebced76a4929f0d5de7fd73fafe185fe33708"
-  integrity sha512-A80BkuHRQfCiNtGBS1EMf2ChTUs0x+B3wGDFmOeT4rmJOHhHTCH2naNxIHhmkr0/UillP4U3yeIyv1pNp+QDLQ==
+webpack-dev-server@^3:
+  version "3.11.3"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.11.3.tgz#8c86b9d2812bf135d3c9bce6f07b718e30f7c3d3"
+  integrity sha512-3x31rjbEQWKMNzacUZRE6wXvUFuGpH7vr0lIEbYpMAG9BOxi0928QU1BBswOAP3kg3H1O4hiS+sq4YyAn6ANnA==
   dependencies:
-    ansi-html "0.0.7"
+    ansi-html-community "0.0.8"
     bonjour "^3.5.0"
     chokidar "^2.1.8"
     compression "^1.7.4"

From 3dedfee3508fa54805e78a9881b2faf59b8d830f Mon Sep 17 00:00:00 2001
From: Chatwoot Bot <92152627+chatwoot-bot@users.noreply.github.com>
Date: Sat, 6 May 2023 02:40:50 -0700
Subject: [PATCH 062/101] chore: Update translations (#7033)

Co-authored-by: Sojan Jose <sojan@pepalo.com>
---
 .../dashboard/i18n/locale/ar/chatlist.json    |  32 ++
 .../dashboard/i18n/locale/ar/inboxMgmt.json   |   1 +
 .../dashboard/i18n/locale/bg/chatlist.json    |  32 ++
 .../dashboard/i18n/locale/bg/inboxMgmt.json   |   1 +
 .../dashboard/i18n/locale/ca/chatlist.json    |  32 ++
 .../dashboard/i18n/locale/ca/inboxMgmt.json   |   1 +
 .../dashboard/i18n/locale/cs/chatlist.json    |  32 ++
 .../dashboard/i18n/locale/cs/inboxMgmt.json   |   1 +
 .../dashboard/i18n/locale/da/chatlist.json    |  32 ++
 .../dashboard/i18n/locale/da/contact.json     |   4 +-
 .../dashboard/i18n/locale/da/inboxMgmt.json   |   1 +
 .../dashboard/i18n/locale/da/login.json       |   8 +-
 .../i18n/locale/da/resetPassword.json         |   2 +-
 .../dashboard/i18n/locale/da/search.json      |   4 +-
 .../i18n/locale/da/setNewPassword.json        |   2 +-
 .../dashboard/i18n/locale/da/signup.json      |  24 +-
 .../dashboard/i18n/locale/de/chatlist.json    |  32 ++
 .../dashboard/i18n/locale/de/contact.json     |   4 +-
 .../dashboard/i18n/locale/de/inboxMgmt.json   |   1 +
 .../dashboard/i18n/locale/de/login.json       |   8 +-
 .../i18n/locale/de/resetPassword.json         |   2 +-
 .../dashboard/i18n/locale/de/search.json      |   4 +-
 .../i18n/locale/de/setNewPassword.json        |   2 +-
 .../dashboard/i18n/locale/de/signup.json      |  24 +-
 .../dashboard/i18n/locale/el/chatlist.json    |  32 ++
 .../dashboard/i18n/locale/el/contact.json     |   4 +-
 .../dashboard/i18n/locale/el/inboxMgmt.json   |   1 +
 .../dashboard/i18n/locale/el/login.json       |   8 +-
 .../i18n/locale/el/resetPassword.json         |   2 +-
 .../dashboard/i18n/locale/el/search.json      |   4 +-
 .../i18n/locale/el/setNewPassword.json        |   2 +-
 .../dashboard/i18n/locale/el/signup.json      |  24 +-
 .../dashboard/i18n/locale/es/chatlist.json    |  32 ++
 .../dashboard/i18n/locale/es/inboxMgmt.json   |   1 +
 .../dashboard/i18n/locale/fa/chatlist.json    |  32 ++
 .../dashboard/i18n/locale/fa/contact.json     |   4 +-
 .../dashboard/i18n/locale/fa/inboxMgmt.json   |   1 +
 .../dashboard/i18n/locale/fa/login.json       |   8 +-
 .../i18n/locale/fa/resetPassword.json         |   2 +-
 .../dashboard/i18n/locale/fa/search.json      |   4 +-
 .../i18n/locale/fa/setNewPassword.json        |   2 +-
 .../dashboard/i18n/locale/fa/signup.json      |  24 +-
 .../dashboard/i18n/locale/fi/chatlist.json    |  32 ++
 .../dashboard/i18n/locale/fi/contact.json     |   4 +-
 .../dashboard/i18n/locale/fi/inboxMgmt.json   |   1 +
 .../dashboard/i18n/locale/fi/login.json       |   8 +-
 .../i18n/locale/fi/resetPassword.json         |   2 +-
 .../dashboard/i18n/locale/fi/search.json      |   4 +-
 .../i18n/locale/fi/setNewPassword.json        |   2 +-
 .../dashboard/i18n/locale/fi/signup.json      |  24 +-
 .../dashboard/i18n/locale/fr/chatlist.json    |  32 ++
 .../dashboard/i18n/locale/fr/inboxMgmt.json   |   1 +
 .../dashboard/i18n/locale/he/chatlist.json    |  32 ++
 .../dashboard/i18n/locale/he/contact.json     |   4 +-
 .../dashboard/i18n/locale/he/inboxMgmt.json   |   5 +-
 .../dashboard/i18n/locale/he/login.json       |   8 +-
 .../i18n/locale/he/resetPassword.json         |   2 +-
 .../dashboard/i18n/locale/he/search.json      |   4 +-
 .../i18n/locale/he/setNewPassword.json        |  12 +-
 .../dashboard/i18n/locale/he/signup.json      |  24 +-
 .../dashboard/i18n/locale/hi/chatlist.json    |  32 ++
 .../dashboard/i18n/locale/hi/contact.json     |   4 +-
 .../dashboard/i18n/locale/hi/inboxMgmt.json   |   1 +
 .../dashboard/i18n/locale/hi/login.json       |   8 +-
 .../i18n/locale/hi/resetPassword.json         |   2 +-
 .../dashboard/i18n/locale/hi/search.json      |   4 +-
 .../i18n/locale/hi/setNewPassword.json        |   2 +-
 .../dashboard/i18n/locale/hi/signup.json      |  24 +-
 .../dashboard/i18n/locale/hr/chatlist.json    |  32 ++
 .../dashboard/i18n/locale/hr/contact.json     |   4 +-
 .../dashboard/i18n/locale/hr/inboxMgmt.json   |   1 +
 .../dashboard/i18n/locale/hr/login.json       |   8 +-
 .../i18n/locale/hr/resetPassword.json         |  10 +-
 .../dashboard/i18n/locale/hr/search.json      |   4 +-
 .../i18n/locale/hr/setNewPassword.json        |  12 +-
 .../dashboard/i18n/locale/hr/signup.json      |  24 +-
 .../dashboard/i18n/locale/hu/chatlist.json    |  32 ++
 .../dashboard/i18n/locale/hu/contact.json     |   4 +-
 .../dashboard/i18n/locale/hu/inboxMgmt.json   |   1 +
 .../dashboard/i18n/locale/hu/login.json       |   8 +-
 .../i18n/locale/hu/resetPassword.json         |   2 +-
 .../dashboard/i18n/locale/hu/search.json      |   4 +-
 .../i18n/locale/hu/setNewPassword.json        |   2 +-
 .../dashboard/i18n/locale/hu/signup.json      |  24 +-
 .../dashboard/i18n/locale/hy/chatlist.json    |  32 ++
 .../dashboard/i18n/locale/hy/contact.json     |   4 +-
 .../dashboard/i18n/locale/hy/inboxMgmt.json   |   1 +
 .../dashboard/i18n/locale/hy/login.json       |   8 +-
 .../i18n/locale/hy/resetPassword.json         |  10 +-
 .../dashboard/i18n/locale/hy/search.json      |   4 +-
 .../i18n/locale/hy/setNewPassword.json        |  12 +-
 .../dashboard/i18n/locale/hy/signup.json      |  24 +-
 .../dashboard/i18n/locale/id/chatlist.json    |  32 ++
 .../dashboard/i18n/locale/id/contact.json     |   4 +-
 .../dashboard/i18n/locale/id/inboxMgmt.json   |   1 +
 .../dashboard/i18n/locale/id/login.json       |   8 +-
 .../i18n/locale/id/resetPassword.json         |   2 +-
 .../dashboard/i18n/locale/id/search.json      |   4 +-
 .../i18n/locale/id/setNewPassword.json        |   2 +-
 .../dashboard/i18n/locale/id/signup.json      |  24 +-
 .../dashboard/i18n/locale/is/chatlist.json    |  32 ++
 .../dashboard/i18n/locale/is/contact.json     |   4 +-
 .../dashboard/i18n/locale/is/inboxMgmt.json   |   1 +
 .../dashboard/i18n/locale/is/login.json       |   8 +-
 .../i18n/locale/is/resetPassword.json         |   2 +-
 .../dashboard/i18n/locale/is/search.json      |   4 +-
 .../i18n/locale/is/setNewPassword.json        |   2 +-
 .../dashboard/i18n/locale/is/signup.json      |  24 +-
 .../i18n/locale/it/advancedFilters.json       |   4 +-
 .../dashboard/i18n/locale/it/agentBots.json   |   6 +-
 .../dashboard/i18n/locale/it/chatlist.json    |  32 ++
 .../dashboard/i18n/locale/it/contact.json     |   4 +-
 .../i18n/locale/it/conversation.json          |   4 +-
 .../dashboard/i18n/locale/it/helpCenter.json  |  14 +-
 .../dashboard/i18n/locale/it/inboxMgmt.json   |   3 +-
 .../i18n/locale/it/integrations.json          |   8 +-
 .../dashboard/i18n/locale/it/login.json       |   8 +-
 .../i18n/locale/it/resetPassword.json         |   2 +-
 .../i18n/locale/it/setNewPassword.json        |   2 +-
 .../dashboard/i18n/locale/it/signup.json      |  16 +-
 .../dashboard/i18n/locale/ja/chatlist.json    |  32 ++
 .../dashboard/i18n/locale/ja/contact.json     |   4 +-
 .../dashboard/i18n/locale/ja/inboxMgmt.json   |   1 +
 .../dashboard/i18n/locale/ja/signup.json      |  24 +-
 .../dashboard/i18n/locale/ka/chatlist.json    |  32 ++
 .../dashboard/i18n/locale/ka/contact.json     |   4 +-
 .../dashboard/i18n/locale/ka/inboxMgmt.json   |   1 +
 .../dashboard/i18n/locale/ka/signup.json      |  24 +-
 .../dashboard/i18n/locale/ko/chatlist.json    |  32 ++
 .../dashboard/i18n/locale/ko/contact.json     |   4 +-
 .../dashboard/i18n/locale/ko/inboxMgmt.json   |   1 +
 .../dashboard/i18n/locale/ko/signup.json      |  20 +-
 .../i18n/locale/lt/advancedFilters.json       |  20 +-
 .../dashboard/i18n/locale/lt/agentBots.json   |  16 +-
 .../dashboard/i18n/locale/lt/agentMgmt.json   |  18 +-
 .../i18n/locale/lt/attributesMgmt.json        |  12 +-
 .../dashboard/i18n/locale/lt/auditLogs.json   |   4 +-
 .../dashboard/i18n/locale/lt/automation.json  |  12 +-
 .../dashboard/i18n/locale/lt/bulkActions.json |  30 +-
 .../dashboard/i18n/locale/lt/campaign.json    |  20 +-
 .../dashboard/i18n/locale/lt/cannedMgmt.json  |  32 +-
 .../dashboard/i18n/locale/lt/chatlist.json    |  66 +++-
 .../dashboard/i18n/locale/lt/contact.json     | 328 +++++++++---------
 .../i18n/locale/lt/contactFilters.json        |  14 +-
 .../i18n/locale/lt/conversation.json          | 290 ++++++++--------
 .../i18n/locale/lt/generalSettings.json       | 110 +++---
 .../dashboard/i18n/locale/lt/helpCenter.json  |  76 ++--
 .../dashboard/i18n/locale/lt/inboxMgmt.json   | 215 ++++++------
 .../i18n/locale/lt/integrationApps.json       |   8 +-
 .../i18n/locale/lt/integrations.json          |  16 +-
 .../dashboard/i18n/locale/lt/labelsMgmt.json  |  36 +-
 .../dashboard/i18n/locale/lt/login.json       |   8 +-
 .../dashboard/i18n/locale/lt/macros.json      |  14 +-
 .../dashboard/i18n/locale/lt/report.json      |  32 +-
 .../i18n/locale/lt/resetPassword.json         |   6 +-
 .../dashboard/i18n/locale/lt/search.json      |   8 +-
 .../i18n/locale/lt/setNewPassword.json        |   2 +-
 .../dashboard/i18n/locale/lt/settings.json    | 112 +++---
 .../dashboard/i18n/locale/lt/signup.json      |  24 +-
 .../i18n/locale/lt/teamsSettings.json         |  38 +-
 .../dashboard/i18n/locale/lt/webhooks.json    |   2 +-
 .../dashboard/i18n/locale/lv/chatlist.json    |  32 ++
 .../dashboard/i18n/locale/lv/contact.json     |   4 +-
 .../dashboard/i18n/locale/lv/inboxMgmt.json   |   5 +-
 .../dashboard/i18n/locale/lv/signup.json      |   2 +-
 .../dashboard/i18n/locale/ml/chatlist.json    |  32 ++
 .../dashboard/i18n/locale/ml/contact.json     |   4 +-
 .../dashboard/i18n/locale/ml/inboxMgmt.json   |   1 +
 .../dashboard/i18n/locale/ml/signup.json      |  24 +-
 .../dashboard/i18n/locale/ms/chatlist.json    |  32 ++
 .../dashboard/i18n/locale/ms/contact.json     |   4 +-
 .../dashboard/i18n/locale/ms/inboxMgmt.json   |   1 +
 .../dashboard/i18n/locale/ms/signup.json      |  24 +-
 .../dashboard/i18n/locale/ne/chatlist.json    |  32 ++
 .../dashboard/i18n/locale/ne/contact.json     |   4 +-
 .../dashboard/i18n/locale/ne/inboxMgmt.json   |   1 +
 .../dashboard/i18n/locale/ne/signup.json      |  24 +-
 .../dashboard/i18n/locale/nl/chatlist.json    |  32 ++
 .../dashboard/i18n/locale/nl/contact.json     |   4 +-
 .../dashboard/i18n/locale/nl/inboxMgmt.json   |   1 +
 .../dashboard/i18n/locale/nl/signup.json      |  24 +-
 .../dashboard/i18n/locale/no/chatlist.json    |  32 ++
 .../dashboard/i18n/locale/no/contact.json     |   4 +-
 .../dashboard/i18n/locale/no/inboxMgmt.json   |   1 +
 .../dashboard/i18n/locale/no/signup.json      |  24 +-
 .../dashboard/i18n/locale/pl/chatlist.json    |  32 ++
 .../dashboard/i18n/locale/pl/contact.json     |   4 +-
 .../dashboard/i18n/locale/pl/inboxMgmt.json   |   1 +
 .../dashboard/i18n/locale/pl/signup.json      |  24 +-
 .../dashboard/i18n/locale/pt/chatlist.json    |  32 ++
 .../dashboard/i18n/locale/pt/contact.json     |   4 +-
 .../dashboard/i18n/locale/pt/inboxMgmt.json   |   1 +
 .../dashboard/i18n/locale/pt/signup.json      |  20 +-
 .../i18n/locale/pt_BR/advancedFilters.json    |   2 +-
 .../i18n/locale/pt_BR/agentMgmt.json          |   2 +-
 .../i18n/locale/pt_BR/auditLogs.json          |  22 +-
 .../dashboard/i18n/locale/pt_BR/chatlist.json |  32 ++
 .../dashboard/i18n/locale/pt_BR/contact.json  |   6 +-
 .../i18n/locale/pt_BR/conversation.json       |  18 +-
 .../i18n/locale/pt_BR/generalSettings.json    |   4 +-
 .../i18n/locale/pt_BR/inboxMgmt.json          |  13 +-
 .../i18n/locale/pt_BR/integrations.json       |  16 +-
 .../dashboard/i18n/locale/pt_BR/login.json    |   8 +-
 .../i18n/locale/pt_BR/resetPassword.json      |   2 +-
 .../dashboard/i18n/locale/pt_BR/search.json   |   2 +-
 .../i18n/locale/pt_BR/setNewPassword.json     |   6 +-
 .../dashboard/i18n/locale/pt_BR/settings.json |   2 +-
 .../dashboard/i18n/locale/pt_BR/signup.json   |  12 +-
 .../dashboard/i18n/locale/ro/chatlist.json    |  32 ++
 .../dashboard/i18n/locale/ro/inboxMgmt.json   |   5 +-
 .../i18n/locale/ru/advancedFilters.json       |   2 +-
 .../dashboard/i18n/locale/ru/agentMgmt.json   |   4 +-
 .../dashboard/i18n/locale/ru/auditLogs.json   |  22 +-
 .../dashboard/i18n/locale/ru/automation.json  |   4 +-
 .../dashboard/i18n/locale/ru/chatlist.json    |  32 ++
 .../dashboard/i18n/locale/ru/contact.json     |   8 +-
 .../i18n/locale/ru/conversation.json          |  36 +-
 .../dashboard/i18n/locale/ru/emoji.json       |   4 +-
 .../i18n/locale/ru/generalSettings.json       |   4 +-
 .../dashboard/i18n/locale/ru/inboxMgmt.json   |  29 +-
 .../i18n/locale/ru/integrations.json          |  16 +-
 .../dashboard/i18n/locale/ru/login.json       |  12 +-
 .../dashboard/i18n/locale/ru/macros.json      |  58 ++--
 .../dashboard/i18n/locale/ru/report.json      |   8 +-
 .../i18n/locale/ru/resetPassword.json         |   2 +-
 .../dashboard/i18n/locale/ru/search.json      |   4 +-
 .../i18n/locale/ru/setNewPassword.json        |   6 +-
 .../dashboard/i18n/locale/ru/settings.json    |  12 +-
 .../dashboard/i18n/locale/ru/signup.json      |  14 +-
 .../dashboard/i18n/locale/sh/chatlist.json    |  32 ++
 .../dashboard/i18n/locale/sh/inboxMgmt.json   |   5 +-
 .../dashboard/i18n/locale/sk/chatlist.json    |  32 ++
 .../dashboard/i18n/locale/sk/inboxMgmt.json   |   5 +-
 .../dashboard/i18n/locale/sr/chatlist.json    |  32 ++
 .../dashboard/i18n/locale/sr/inboxMgmt.json   |   5 +-
 .../dashboard/i18n/locale/sv/chatlist.json    |  32 ++
 .../dashboard/i18n/locale/sv/inboxMgmt.json   |   5 +-
 .../dashboard/i18n/locale/ta/chatlist.json    |  32 ++
 .../dashboard/i18n/locale/ta/inboxMgmt.json   |   5 +-
 .../dashboard/i18n/locale/th/chatlist.json    |  32 ++
 .../dashboard/i18n/locale/th/inboxMgmt.json   |   5 +-
 .../dashboard/i18n/locale/tr/chatlist.json    |  32 ++
 .../dashboard/i18n/locale/tr/inboxMgmt.json   |   5 +-
 .../dashboard/i18n/locale/uk/chatlist.json    |  32 ++
 .../dashboard/i18n/locale/uk/inboxMgmt.json   |   5 +-
 .../dashboard/i18n/locale/ur/chatlist.json    |  32 ++
 .../dashboard/i18n/locale/ur/inboxMgmt.json   |   5 +-
 .../dashboard/i18n/locale/ur_IN/chatlist.json |  32 ++
 .../i18n/locale/ur_IN/inboxMgmt.json          |   5 +-
 .../dashboard/i18n/locale/vi/chatlist.json    |  32 ++
 .../dashboard/i18n/locale/vi/inboxMgmt.json   |   5 +-
 .../dashboard/i18n/locale/zh_CN/chatlist.json |  32 ++
 .../i18n/locale/zh_CN/inboxMgmt.json          |   5 +-
 .../dashboard/i18n/locale/zh_TW/chatlist.json |  32 ++
 .../i18n/locale/zh_TW/inboxMgmt.json          |   5 +-
 app/javascript/survey/i18n/locale/lt.json     |   4 +-
 app/javascript/widget/i18n/locale/fr.json     |   2 +-
 app/javascript/widget/i18n/locale/lt.json     |  24 +-
 config/locales/fr.yml                         |  18 +-
 config/locales/lt.yml                         |  40 +--
 config/locales/pt_BR.yml                      |  12 +-
 config/locales/ru.yml                         |  20 +-
 262 files changed, 3051 insertions(+), 1500 deletions(-)

diff --git a/app/javascript/dashboard/i18n/locale/ar/chatlist.json b/app/javascript/dashboard/i18n/locale/ar/chatlist.json
index 1c06378e3..a942c59e2 100644
--- a/app/javascript/dashboard/i18n/locale/ar/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/ar/chatlist.json
@@ -35,6 +35,20 @@
         "TEXT": "الكل"
       }
     },
+    "VIEW_FILTER": "عرض",
+    "SORT_TOOLTIP_LABEL": "Sort conversations",
+    "CHAT_SORT": {
+      "STATUS": "الحالة",
+      "ORDER_BY": "Order by"
+    },
+    "CHAT_SORT_FILTER_ITEMS": {
+      "latest": {
+        "TEXT": "Last activity"
+      },
+      "sort_on_created_at": {
+        "TEXT": "تم إنشاؤها في"
+      }
+    },
     "ATTACHMENTS": {
       "image": {
         "CONTENT": "رسالة صورة"
@@ -55,6 +69,24 @@
         "CONTENT": "قام بمشاركة رابط"
       }
     },
+    "CHAT_SORT_BY_FILTER": {
+      "TITLE": "Sort conversation",
+      "DROPDOWN_TITLE": "ترتيب حسب",
+      "ITEMS": {
+        "LATEST": {
+          "NAME": "Last activity at",
+          "LABEL": "Last activity"
+        },
+        "CREATED_AT": {
+          "NAME": "تم إنشاؤها في",
+          "LABEL": "تم إنشاؤها في"
+        },
+        "LAST_USER_MESSAGE_AT": {
+          "NAME": "Last user message at",
+          "LABEL": "Last message"
+        }
+      }
+    },
     "RECEIVED_VIA_EMAIL": "تم تلقيه عبر البريد الإلكتروني",
     "VIEW_TWEET_IN_TWITTER": "عرض التغريدة في تويتر",
     "REPLY_TO_TWEET": "الرد على هذه التغريدة",
diff --git a/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json
index 8ae9bd735..bff78654d 100644
--- a/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json
@@ -464,6 +464,7 @@
       "AUTO_ASSIGNMENT_SUB_TEXT": "تمكين أو تعطيل الإسناد التلقائي للمحادثات الجديدة إلى الموظفين المضافين إلى قناة التواصل هذه.",
       "HMAC_VERIFICATION": "التحقق من هوية المستخدم",
       "HMAC_DESCRIPTION": "من أجل التحقق من هوية المستخدم، يمكنك تمرير 'IDer_hash` لكل مستخدم. يمكنك إنشاء تجزئة HMAC sha256 باستخدام \"المعرف\" مع المفتاح المعروض هنا.",
+      "HMAC_LINK_TO_DOCS": "You can read more here.",
       "HMAC_MANDATORY_VERIFICATION": "فرض التحقق من هوية المستخدم",
       "HMAC_MANDATORY_DESCRIPTION": "في حالة التمكين، سيتم رفض الطلبات المفقودة 'IDer_hash'.",
       "INBOX_IDENTIFIER": "معرف صندوق الوارد",
diff --git a/app/javascript/dashboard/i18n/locale/bg/chatlist.json b/app/javascript/dashboard/i18n/locale/bg/chatlist.json
index 4e7f7807b..c5b62088b 100644
--- a/app/javascript/dashboard/i18n/locale/bg/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/bg/chatlist.json
@@ -35,6 +35,20 @@
         "TEXT": "Всички"
       }
     },
+    "VIEW_FILTER": "View",
+    "SORT_TOOLTIP_LABEL": "Sort conversations",
+    "CHAT_SORT": {
+      "STATUS": "Статус",
+      "ORDER_BY": "Order by"
+    },
+    "CHAT_SORT_FILTER_ITEMS": {
+      "latest": {
+        "TEXT": "Last activity"
+      },
+      "sort_on_created_at": {
+        "TEXT": "Създаден в"
+      }
+    },
     "ATTACHMENTS": {
       "image": {
         "CONTENT": "Съобщение със снимка"
@@ -55,6 +69,24 @@
         "CONTENT": "сподели линк"
       }
     },
+    "CHAT_SORT_BY_FILTER": {
+      "TITLE": "Sort conversation",
+      "DROPDOWN_TITLE": "Sort by",
+      "ITEMS": {
+        "LATEST": {
+          "NAME": "Last activity at",
+          "LABEL": "Last activity"
+        },
+        "CREATED_AT": {
+          "NAME": "Създаден в",
+          "LABEL": "Създаден в"
+        },
+        "LAST_USER_MESSAGE_AT": {
+          "NAME": "Last user message at",
+          "LABEL": "Last message"
+        }
+      }
+    },
     "RECEIVED_VIA_EMAIL": "Получено чрез имейл",
     "VIEW_TWEET_IN_TWITTER": "Виж туита в Twitter",
     "REPLY_TO_TWEET": "Отговори на този туит",
diff --git a/app/javascript/dashboard/i18n/locale/bg/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/bg/inboxMgmt.json
index 24293eee2..19b093973 100644
--- a/app/javascript/dashboard/i18n/locale/bg/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/bg/inboxMgmt.json
@@ -464,6 +464,7 @@
       "AUTO_ASSIGNMENT_SUB_TEXT": "Enable or disable the automatic assignment of new conversations to the agents added to this inbox.",
       "HMAC_VERIFICATION": "User Identity Validation",
       "HMAC_DESCRIPTION": "In order to validate the user's identity, you can pass an `identifier_hash` for each user. You can generate a HMAC sha256 hash using the `identifier` with the key shown here.",
+      "HMAC_LINK_TO_DOCS": "You can read more here.",
       "HMAC_MANDATORY_VERIFICATION": "Enforce User Identity Validation",
       "HMAC_MANDATORY_DESCRIPTION": "If enabled, requests missing the `identifier_hash` will be rejected.",
       "INBOX_IDENTIFIER": "Inbox Identifier",
diff --git a/app/javascript/dashboard/i18n/locale/ca/chatlist.json b/app/javascript/dashboard/i18n/locale/ca/chatlist.json
index eafd11156..2bef09fc8 100644
--- a/app/javascript/dashboard/i18n/locale/ca/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/ca/chatlist.json
@@ -35,6 +35,20 @@
         "TEXT": "Totes"
       }
     },
+    "VIEW_FILTER": "Veure",
+    "SORT_TOOLTIP_LABEL": "Sort conversations",
+    "CHAT_SORT": {
+      "STATUS": "Estat",
+      "ORDER_BY": "Order by"
+    },
+    "CHAT_SORT_FILTER_ITEMS": {
+      "latest": {
+        "TEXT": "Last activity"
+      },
+      "sort_on_created_at": {
+        "TEXT": "Created at"
+      }
+    },
     "ATTACHMENTS": {
       "image": {
         "CONTENT": "Missatge d'imatge"
@@ -55,6 +69,24 @@
         "CONTENT": "ha compartit una URL"
       }
     },
+    "CHAT_SORT_BY_FILTER": {
+      "TITLE": "Sort conversation",
+      "DROPDOWN_TITLE": "Sort by",
+      "ITEMS": {
+        "LATEST": {
+          "NAME": "Last activity at",
+          "LABEL": "Last activity"
+        },
+        "CREATED_AT": {
+          "NAME": "Created at",
+          "LABEL": "Created at"
+        },
+        "LAST_USER_MESSAGE_AT": {
+          "NAME": "Last user message at",
+          "LABEL": "Last message"
+        }
+      }
+    },
     "RECEIVED_VIA_EMAIL": "Rebut per correu electrònic",
     "VIEW_TWEET_IN_TWITTER": "Veure el tuit a Twitter",
     "REPLY_TO_TWEET": "Respon a aquest tuit",
diff --git a/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json
index 60ea5f001..89d5dde97 100644
--- a/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json
@@ -464,6 +464,7 @@
       "AUTO_ASSIGNMENT_SUB_TEXT": "Activa o desactiva l'assignació automàtica d'agents disponibles a les noves converses",
       "HMAC_VERIFICATION": "Validació de la Identitat del Usuari",
       "HMAC_DESCRIPTION": "In order to validate the user's identity, you can pass an `identifier_hash` for each user. You can generate a HMAC sha256 hash using the `identifier` with the key shown here.",
+      "HMAC_LINK_TO_DOCS": "You can read more here.",
       "HMAC_MANDATORY_VERIFICATION": "Enforce User Identity Validation",
       "HMAC_MANDATORY_DESCRIPTION": "If enabled, requests missing the `identifier_hash` will be rejected.",
       "INBOX_IDENTIFIER": "Inbox Identifier",
diff --git a/app/javascript/dashboard/i18n/locale/cs/chatlist.json b/app/javascript/dashboard/i18n/locale/cs/chatlist.json
index 2c83e95b8..eb7c140c5 100644
--- a/app/javascript/dashboard/i18n/locale/cs/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/cs/chatlist.json
@@ -35,6 +35,20 @@
         "TEXT": "Vše"
       }
     },
+    "VIEW_FILTER": "Zobrazit",
+    "SORT_TOOLTIP_LABEL": "Sort conversations",
+    "CHAT_SORT": {
+      "STATUS": "Stav",
+      "ORDER_BY": "Order by"
+    },
+    "CHAT_SORT_FILTER_ITEMS": {
+      "latest": {
+        "TEXT": "Last activity"
+      },
+      "sort_on_created_at": {
+        "TEXT": "Created at"
+      }
+    },
     "ATTACHMENTS": {
       "image": {
         "CONTENT": "Zpráva obrázku"
@@ -55,6 +69,24 @@
         "CONTENT": "sdílel URL"
       }
     },
+    "CHAT_SORT_BY_FILTER": {
+      "TITLE": "Sort conversation",
+      "DROPDOWN_TITLE": "Seřadit podle",
+      "ITEMS": {
+        "LATEST": {
+          "NAME": "Last activity at",
+          "LABEL": "Last activity"
+        },
+        "CREATED_AT": {
+          "NAME": "Created at",
+          "LABEL": "Created at"
+        },
+        "LAST_USER_MESSAGE_AT": {
+          "NAME": "Last user message at",
+          "LABEL": "Last message"
+        }
+      }
+    },
     "RECEIVED_VIA_EMAIL": "Obdrženo e-mailem",
     "VIEW_TWEET_IN_TWITTER": "Zobrazit tweet na Twitteru",
     "REPLY_TO_TWEET": "Odpovědět na tento tweet",
diff --git a/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json
index b229b4a39..0dca2594d 100644
--- a/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json
@@ -464,6 +464,7 @@
       "AUTO_ASSIGNMENT_SUB_TEXT": "Povolit nebo zakázat automatické přiřazování nových konverzací agentům přidaným do této schránky.",
       "HMAC_VERIFICATION": "User Identity Validation",
       "HMAC_DESCRIPTION": "In order to validate the user's identity, you can pass an `identifier_hash` for each user. You can generate a HMAC sha256 hash using the `identifier` with the key shown here.",
+      "HMAC_LINK_TO_DOCS": "You can read more here.",
       "HMAC_MANDATORY_VERIFICATION": "Enforce User Identity Validation",
       "HMAC_MANDATORY_DESCRIPTION": "If enabled, requests missing the `identifier_hash` will be rejected.",
       "INBOX_IDENTIFIER": "Inbox Identifier",
diff --git a/app/javascript/dashboard/i18n/locale/da/chatlist.json b/app/javascript/dashboard/i18n/locale/da/chatlist.json
index e7edf5c5a..3ebdf62cb 100644
--- a/app/javascript/dashboard/i18n/locale/da/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/da/chatlist.json
@@ -35,6 +35,20 @@
         "TEXT": "Alle"
       }
     },
+    "VIEW_FILTER": "Vis",
+    "SORT_TOOLTIP_LABEL": "Sort conversations",
+    "CHAT_SORT": {
+      "STATUS": "Status",
+      "ORDER_BY": "Order by"
+    },
+    "CHAT_SORT_FILTER_ITEMS": {
+      "latest": {
+        "TEXT": "Last activity"
+      },
+      "sort_on_created_at": {
+        "TEXT": "Oprettet den"
+      }
+    },
     "ATTACHMENTS": {
       "image": {
         "CONTENT": "Billedbesked"
@@ -55,6 +69,24 @@
         "CONTENT": "har delt en URL"
       }
     },
+    "CHAT_SORT_BY_FILTER": {
+      "TITLE": "Sort conversation",
+      "DROPDOWN_TITLE": "Sorter efter",
+      "ITEMS": {
+        "LATEST": {
+          "NAME": "Last activity at",
+          "LABEL": "Last activity"
+        },
+        "CREATED_AT": {
+          "NAME": "Oprettet den",
+          "LABEL": "Oprettet den"
+        },
+        "LAST_USER_MESSAGE_AT": {
+          "NAME": "Last user message at",
+          "LABEL": "Last message"
+        }
+      }
+    },
     "RECEIVED_VIA_EMAIL": "Modtaget via e-mail",
     "VIEW_TWEET_IN_TWITTER": "Se tweet på Twitter",
     "REPLY_TO_TWEET": "Svar på dette tweet",
diff --git a/app/javascript/dashboard/i18n/locale/da/contact.json b/app/javascript/dashboard/i18n/locale/da/contact.json
index 102650de4..dba322a79 100644
--- a/app/javascript/dashboard/i18n/locale/da/contact.json
+++ b/app/javascript/dashboard/i18n/locale/da/contact.json
@@ -120,7 +120,7 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Indtast telefonnummeret på kontaktpersonen",
         "LABEL": "Telefonnummer",
-        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
+        "HELP": "Telefonnummer skal være af E.164 format fx: +1415555555 [+] [landekode] [områdekode] [lokalt telefonnummer]",
         "ERROR": "Telefonnummer skal være enten tomt eller i E.164-format",
         "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "Dette telefonnummer er i brug for en anden kontakt."
@@ -182,7 +182,7 @@
         "LABEL": "Til"
       },
       "INBOX": {
-        "LABEL": "Via Inbox",
+        "LABEL": "Indbakke",
         "PLACEHOLDER": "Choose source inbox",
         "ERROR": "Vælg en indbakke"
       },
diff --git a/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json
index 5348f1fe4..b3b4be638 100644
--- a/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json
@@ -464,6 +464,7 @@
       "AUTO_ASSIGNMENT_SUB_TEXT": "Aktiver eller deaktiver automatisk tildeling af nye samtaler til agenter tilføjet til denne indbakke.",
       "HMAC_VERIFICATION": "Bruger Identitetsvalidering",
       "HMAC_DESCRIPTION": "For at validere brugerens identitet, kan du passere en `identifier_hash` for hver bruger. Du kan generere en HMAC sha256 hash ved hjælp af 'identifier' med nøglen vist her.",
+      "HMAC_LINK_TO_DOCS": "You can read more here.",
       "HMAC_MANDATORY_VERIFICATION": "Gennemtving Validering Af Bruger Identitet",
       "HMAC_MANDATORY_DESCRIPTION": "Hvis aktiveret, vil forespørgsler der mangler 'identifier_hash' blive afvist.",
       "INBOX_IDENTIFIER": "Identifikator For Indbakke",
diff --git a/app/javascript/dashboard/i18n/locale/da/login.json b/app/javascript/dashboard/i18n/locale/da/login.json
index 5f0104238..6f5f123eb 100644
--- a/app/javascript/dashboard/i18n/locale/da/login.json
+++ b/app/javascript/dashboard/i18n/locale/da/login.json
@@ -3,16 +3,16 @@
     "TITLE": "Log ind på Chatwoot",
     "EMAIL": {
       "LABEL": "E-mail",
-      "PLACEHOLDER": "example@companyname.com"
+      "PLACEHOLDER": "E-mail, fx: navn@eksempel.dk"
     },
     "PASSWORD": {
       "LABEL": "Adgangskode",
       "PLACEHOLDER": "Adgangskode"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Login successful",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again.",
-      "UNAUTH": "Username or password is incorrect. Please try again."
+      "SUCCESS_MESSAGE": "Login Lykkedes",
+      "ERROR_MESSAGE": "Kunne ikke oprette forbindelse til Woot Server, Prøv igen senere",
+      "UNAUTH": "Brugernavn / adgangskode forkert. Prøv igen"
     },
     "OAUTH": {
       "GOOGLE_LOGIN": "Login with Google",
diff --git a/app/javascript/dashboard/i18n/locale/da/resetPassword.json b/app/javascript/dashboard/i18n/locale/da/resetPassword.json
index b77d9e020..e955d5a27 100644
--- a/app/javascript/dashboard/i18n/locale/da/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/da/resetPassword.json
@@ -8,7 +8,7 @@
     },
     "API": {
       "SUCCESS_MESSAGE": "Link til nulstilling af adgangskode er blevet sendt til din e-mail.",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
+      "ERROR_MESSAGE": "Kunne ikke oprette forbindelse til Woot Server, Prøv igen senere"
     },
     "SUBMIT": "Send"
   }
diff --git a/app/javascript/dashboard/i18n/locale/da/search.json b/app/javascript/dashboard/i18n/locale/da/search.json
index 84570b52d..a87685f4b 100644
--- a/app/javascript/dashboard/i18n/locale/da/search.json
+++ b/app/javascript/dashboard/i18n/locale/da/search.json
@@ -14,8 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
-    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
+    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/da/setNewPassword.json b/app/javascript/dashboard/i18n/locale/da/setNewPassword.json
index c46bca700..be9f398a6 100644
--- a/app/javascript/dashboard/i18n/locale/da/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/da/setNewPassword.json
@@ -13,7 +13,7 @@
     },
     "API": {
       "SUCCESS_MESSAGE": "Adgangskoden blev ændret.",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
+      "ERROR_MESSAGE": "Kunne ikke oprette forbindelse til Woot Server, Prøv igen senere"
     },
     "CAPTCHA": {
       "ERROR": "Bekræftelse er udløbet. Løs captcha igen."
diff --git a/app/javascript/dashboard/i18n/locale/da/signup.json b/app/javascript/dashboard/i18n/locale/da/signup.json
index 87fb06faf..dd9206bd0 100644
--- a/app/javascript/dashboard/i18n/locale/da/signup.json
+++ b/app/javascript/dashboard/i18n/locale/da/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Firmanavn",
-      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
-      "ERROR": "Firmanavn er for kort."
+      "PLACEHOLDER": "Indtast dit firmanavn, fx: Wayne Enterprises",
+      "ERROR": "Firmanavn er for kort"
     },
     "FULL_NAME": {
       "LABEL": "Fulde navn",
-      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
-      "ERROR": "Fulde navn er for kort."
+      "PLACEHOLDER": "Indtast dit fulde navn. fx: Bruce Wayne",
+      "ERROR": "Fulde navn er for kort"
     },
     "EMAIL": {
       "LABEL": "Arbejde e-mail",
-      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
-      "ERROR": "Indtast venligst en gyldig arbejdsmail."
+      "PLACEHOLDER": "Indtast din arbejdsmailadresse fx: bruce@wayne.enterprises",
+      "ERROR": "Indtast venligst en gyldig arbejdsmail"
     },
     "PASSWORD": {
       "LABEL": "Adgangskode",
       "PLACEHOLDER": "Adgangskode",
-      "ERROR": "Adgangskoden er for kort.",
-      "IS_INVALID_PASSWORD": "Adgangskoden skal indeholde mindst 1 stort bogstav, 1 lille bogstav, 1 nummer og 1 specialtegn."
+      "ERROR": "Adgangskoden er for kort",
+      "IS_INVALID_PASSWORD": "Adgangskoden skal indeholde mindst 1 stort bogstav, 1 lille bogstav, 1 nummer og 1 specialtegn"
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirm password",
-      "PLACEHOLDER": "Confirm password",
-      "ERROR": "Adgangskode stemmer ikke overens."
+      "LABEL": "Bekræft Adgangskode",
+      "PLACEHOLDER": "Bekræft Adgangskode",
+      "ERROR": "Adgangskode stemmer ikke overens"
     },
     "API": {
       "SUCCESS_MESSAGE": "Registrering Succesfuld",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
+      "ERROR_MESSAGE": "Kunne ikke oprette forbindelse til Woot Server, Prøv igen senere"
     },
     "SUBMIT": "Create account",
     "HAVE_AN_ACCOUNT": "Har du allerede en konto?"
diff --git a/app/javascript/dashboard/i18n/locale/de/chatlist.json b/app/javascript/dashboard/i18n/locale/de/chatlist.json
index 17ca87488..9aa68a52b 100644
--- a/app/javascript/dashboard/i18n/locale/de/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/de/chatlist.json
@@ -35,6 +35,20 @@
         "TEXT": "Alle"
       }
     },
+    "VIEW_FILTER": "Aussicht",
+    "SORT_TOOLTIP_LABEL": "Sort conversations",
+    "CHAT_SORT": {
+      "STATUS": "Status",
+      "ORDER_BY": "Order by"
+    },
+    "CHAT_SORT_FILTER_ITEMS": {
+      "latest": {
+        "TEXT": "Last activity"
+      },
+      "sort_on_created_at": {
+        "TEXT": "Erstellt am"
+      }
+    },
     "ATTACHMENTS": {
       "image": {
         "CONTENT": "Bildnachricht"
@@ -55,6 +69,24 @@
         "CONTENT": "hat eine URL geteilt"
       }
     },
+    "CHAT_SORT_BY_FILTER": {
+      "TITLE": "Sort conversation",
+      "DROPDOWN_TITLE": "Sortieren nach",
+      "ITEMS": {
+        "LATEST": {
+          "NAME": "Last activity at",
+          "LABEL": "Last activity"
+        },
+        "CREATED_AT": {
+          "NAME": "Erstellt am",
+          "LABEL": "Erstellt am"
+        },
+        "LAST_USER_MESSAGE_AT": {
+          "NAME": "Last user message at",
+          "LABEL": "Last message"
+        }
+      }
+    },
     "RECEIVED_VIA_EMAIL": "Per E-Mail empfangen",
     "VIEW_TWEET_IN_TWITTER": "Tweet auf Twitter anzeigen",
     "REPLY_TO_TWEET": "Auf diesen Tweet antworten",
diff --git a/app/javascript/dashboard/i18n/locale/de/contact.json b/app/javascript/dashboard/i18n/locale/de/contact.json
index f532a3546..2ffcfb5a3 100644
--- a/app/javascript/dashboard/i18n/locale/de/contact.json
+++ b/app/javascript/dashboard/i18n/locale/de/contact.json
@@ -120,7 +120,7 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Geben Sie die Telefonnummer des Kontakts ein",
         "LABEL": "Telefonnummer",
-        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
+        "HELP": "Telefonnummer sollte im E.164-Format sein, z. B.: +1415555555 [+][Landesvorwahl][Landesvorwahl][Ortsvorwahl]",
         "ERROR": "Telefonnummer muss leer sein oder im E.164-Format",
         "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "Diese Telefonnummer wird für einen anderen Kontakt verwendet."
@@ -182,7 +182,7 @@
         "LABEL": "An"
       },
       "INBOX": {
-        "LABEL": "Via Inbox",
+        "LABEL": "Posteingang",
         "PLACEHOLDER": "Choose source inbox",
         "ERROR": "Posteingang auswählen"
       },
diff --git a/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
index ff6da5db0..ee4649bde 100644
--- a/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
@@ -464,6 +464,7 @@
       "AUTO_ASSIGNMENT_SUB_TEXT": "Aktivieren oder deaktivieren Sie die automatische Zuweisung verfügbarer Agenten für neue Konversationen",
       "HMAC_VERIFICATION": "Benutzeridentitätsüberprüfung",
       "HMAC_DESCRIPTION": "Um die Identität des Benutzers zu validieren, können Sie für jeden Benutzer einen `identifier_hash` übergeben. Sie können einen HMAC sha256-Hash generieren, indem Sie den 'Bezeichner' mit dem hier gezeigten Schlüssel verwenden.",
+      "HMAC_LINK_TO_DOCS": "You can read more here.",
       "HMAC_MANDATORY_VERIFICATION": "Erzwinge Benutzer-Identitätsüberprüfung",
       "HMAC_MANDATORY_DESCRIPTION": "Wenn aktiviert, werden Anfragen, denen der `identifier_hash` fehlt, abgelehnt.",
       "INBOX_IDENTIFIER": "Identifizierung für Posteingang",
diff --git a/app/javascript/dashboard/i18n/locale/de/login.json b/app/javascript/dashboard/i18n/locale/de/login.json
index b6d13ed39..37542c323 100644
--- a/app/javascript/dashboard/i18n/locale/de/login.json
+++ b/app/javascript/dashboard/i18n/locale/de/login.json
@@ -3,16 +3,16 @@
     "TITLE": "Melden Sie sich bei Chatwoot an",
     "EMAIL": {
       "LABEL": "E-Mail",
-      "PLACEHOLDER": "example@companyname.com"
+      "PLACEHOLDER": "E-Mail zB: jemand@example.com"
     },
     "PASSWORD": {
       "LABEL": "Passwort",
       "PLACEHOLDER": "Passwort"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Login successful",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again.",
-      "UNAUTH": "Username or password is incorrect. Please try again."
+      "SUCCESS_MESSAGE": "Anmeldung erfolgreich",
+      "ERROR_MESSAGE": "Es konnte keine Verbindung zum Woot Server hergestellt werden. Bitte versuchen Sie es später erneut",
+      "UNAUTH": "Benutzername / Passwort falsch. Bitte versuche es erneut"
     },
     "OAUTH": {
       "GOOGLE_LOGIN": "Login with Google",
diff --git a/app/javascript/dashboard/i18n/locale/de/resetPassword.json b/app/javascript/dashboard/i18n/locale/de/resetPassword.json
index 7a527749c..6a8f932b4 100644
--- a/app/javascript/dashboard/i18n/locale/de/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/de/resetPassword.json
@@ -8,7 +8,7 @@
     },
     "API": {
       "SUCCESS_MESSAGE": "Der Link zum Zurücksetzen des Passworts wurde an Ihre E-Mail gesendet.",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
+      "ERROR_MESSAGE": "Es konnte keine Verbindung zum Woot Server hergestellt werden. Bitte versuchen Sie es später erneut"
     },
     "SUBMIT": "Einreichen"
   }
diff --git a/app/javascript/dashboard/i18n/locale/de/search.json b/app/javascript/dashboard/i18n/locale/de/search.json
index ca32126c3..b7ce03892 100644
--- a/app/javascript/dashboard/i18n/locale/de/search.json
+++ b/app/javascript/dashboard/i18n/locale/de/search.json
@@ -14,8 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
-    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
+    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/de/setNewPassword.json b/app/javascript/dashboard/i18n/locale/de/setNewPassword.json
index f0bf0c581..84b612339 100644
--- a/app/javascript/dashboard/i18n/locale/de/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/de/setNewPassword.json
@@ -13,7 +13,7 @@
     },
     "API": {
       "SUCCESS_MESSAGE": "Das Passwort wurde erfolgreich geändert.",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
+      "ERROR_MESSAGE": "Es konnte keine Verbindung zum Woot Server hergestellt werden. Bitte versuchen Sie es später erneut"
     },
     "CAPTCHA": {
       "ERROR": "Verifizierung abgelaufen. Bitte Captcha erneut lösen."
diff --git a/app/javascript/dashboard/i18n/locale/de/signup.json b/app/javascript/dashboard/i18n/locale/de/signup.json
index 07c6f96be..1107b6e4a 100644
--- a/app/javascript/dashboard/i18n/locale/de/signup.json
+++ b/app/javascript/dashboard/i18n/locale/de/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Firmenname",
-      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
-      "ERROR": "Firmenname ist zu kurz."
+      "PLACEHOLDER": "Geben Sie Ihren Firmennamen ein, z. B.: Wayne Enterprises",
+      "ERROR": "Firmenname ist zu kurz"
     },
     "FULL_NAME": {
       "LABEL": "Vollständiger Name",
-      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
-      "ERROR": "Vollständiger Name ist zu kurz."
+      "PLACEHOLDER": "Geben Sie Ihren vollständigen Namen ein, z. B.: Bruce Wayne",
+      "ERROR": "Vollständiger Name ist zu kurz"
     },
     "EMAIL": {
       "LABEL": "Geschäftliche E-Mail-Adresse",
-      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
-      "ERROR": "Bitte geben Sie eine gültige Arbeits-E-Mail-Adresse ein."
+      "PLACEHOLDER": "Geben Sie Ihre geschäftliche E-Mail-Adresse ein, z. B.: bruce@wayne.enterprises",
+      "ERROR": "Bitte geben Sie eine gültige Arbeits-E-Mail-Adresse ein"
     },
     "PASSWORD": {
       "LABEL": "Passwort",
       "PLACEHOLDER": "Passwort",
-      "ERROR": "Das Passwort ist zu kurz.",
-      "IS_INVALID_PASSWORD": "Das Passwort sollte mindestens 1 Großbuchstaben, 1 Kleinbuchstaben, 1 Ziffer und 1 Sonderzeichen enthalten."
+      "ERROR": "Das Passwort ist zu kurz",
+      "IS_INVALID_PASSWORD": "Das Passwort sollte mindestens 1 Großbuchstaben, 1 Kleinbuchstaben, 1 Ziffer und 1 Sonderzeichen enthalten"
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirm password",
-      "PLACEHOLDER": "Confirm password",
-      "ERROR": "Passwort stimmt nicht überein."
+      "LABEL": "Bestätige das Passwort",
+      "PLACEHOLDER": "Bestätige das Passwort",
+      "ERROR": "Passwort stimmt nicht überein"
     },
     "API": {
       "SUCCESS_MESSAGE": "Registrierung erfolgreich",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
+      "ERROR_MESSAGE": "Es konnte keine Verbindung zum Woot Server hergestellt werden. Bitte versuchen Sie es später erneut"
     },
     "SUBMIT": "Konto erstellen",
     "HAVE_AN_ACCOUNT": "Haben Sie bereits ein Konto?"
diff --git a/app/javascript/dashboard/i18n/locale/el/chatlist.json b/app/javascript/dashboard/i18n/locale/el/chatlist.json
index b23b93e88..5444c90a4 100644
--- a/app/javascript/dashboard/i18n/locale/el/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/el/chatlist.json
@@ -35,6 +35,20 @@
         "TEXT": "Όλες"
       }
     },
+    "VIEW_FILTER": "Προβολή",
+    "SORT_TOOLTIP_LABEL": "Sort conversations",
+    "CHAT_SORT": {
+      "STATUS": "Κατάσταση",
+      "ORDER_BY": "Order by"
+    },
+    "CHAT_SORT_FILTER_ITEMS": {
+      "latest": {
+        "TEXT": "Last activity"
+      },
+      "sort_on_created_at": {
+        "TEXT": "Δημιουργήθηκε στις"
+      }
+    },
     "ATTACHMENTS": {
       "image": {
         "CONTENT": "Μήνυμα εικόνας"
@@ -55,6 +69,24 @@
         "CONTENT": "έχει μοιράσει ένα σύνδεσμο"
       }
     },
+    "CHAT_SORT_BY_FILTER": {
+      "TITLE": "Sort conversation",
+      "DROPDOWN_TITLE": "Ταξινόμηση κατά",
+      "ITEMS": {
+        "LATEST": {
+          "NAME": "Last activity at",
+          "LABEL": "Last activity"
+        },
+        "CREATED_AT": {
+          "NAME": "Δημιουργήθηκε στις",
+          "LABEL": "Δημιουργήθηκε στις"
+        },
+        "LAST_USER_MESSAGE_AT": {
+          "NAME": "Last user message at",
+          "LABEL": "Last message"
+        }
+      }
+    },
     "RECEIVED_VIA_EMAIL": "Παραλήφθηκε από email",
     "VIEW_TWEET_IN_TWITTER": "Προβολή του tweet στο Twitter",
     "REPLY_TO_TWEET": "Απάντηση στο tweet",
diff --git a/app/javascript/dashboard/i18n/locale/el/contact.json b/app/javascript/dashboard/i18n/locale/el/contact.json
index f25a2b5a9..6940d2f20 100644
--- a/app/javascript/dashboard/i18n/locale/el/contact.json
+++ b/app/javascript/dashboard/i18n/locale/el/contact.json
@@ -120,7 +120,7 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Εισάγετε τον αριθμό τηλεφώνου της επαφής",
         "LABEL": "Αριθμός Τηλεφώνου",
-        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
+        "HELP": "Ο αριθμός τηλεφώνου πρέπει να έχει μορφή E.164 π.χ.: +14155555 [+][κωδικός χώρας][κωδικός περιοχής][αριθμός τοπικού τηλεφώνου]",
         "ERROR": "Ο αριθμός τηλεφώνου πρέπει να είναι είτε άδειος είτε με μορφή E.164",
         "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "Αυτός ο αριθμός τηλεφώνου χρησιμοποιείται σε άλλη επαφή."
@@ -182,7 +182,7 @@
         "LABEL": "Προς"
       },
       "INBOX": {
-        "LABEL": "Via Inbox",
+        "LABEL": "Εισερχόμενα",
         "PLACEHOLDER": "Choose source inbox",
         "ERROR": "Επιλέξτε ένα κιβώτιο εισερχόμενων"
       },
diff --git a/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json
index e35e42ecc..4c2796477 100644
--- a/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json
@@ -464,6 +464,7 @@
       "AUTO_ASSIGNMENT_SUB_TEXT": "Ενεργοποιήστε ή απενεργοποιήστε την αυτόματη αντιστοίχιση των νέων συζητήσεων στους πράκτορες αυτού του κιβωτίου.",
       "HMAC_VERIFICATION": "Επικύρωση Ταυτότητας Χρήστη",
       "HMAC_DESCRIPTION": "Για λόγους επικύρωσης της ταυτότητας των χρηστών, το SDK σας επιτρέπει να περάσετε ένα `identity_hash` για κάθε χρήστη. Μπορείτε να δημιουργήσετε HMAC χρησιμοποιώντας το 'sha256' με το κλειδί που εμφανίζεται εδώ.",
+      "HMAC_LINK_TO_DOCS": "You can read more here.",
       "HMAC_MANDATORY_VERIFICATION": "Επιβολή Επαλήθευσης Ταυτότητας Χρήστη",
       "HMAC_MANDATORY_DESCRIPTION": "Αν ενεργοποιηθεί, τα αιτήματα που χωρίς το `identifier_hash` θα απορριφθούν.",
       "INBOX_IDENTIFIER": "Αναγνωριστικό Εισερχόμενων",
diff --git a/app/javascript/dashboard/i18n/locale/el/login.json b/app/javascript/dashboard/i18n/locale/el/login.json
index e27d474a4..d4f6a9185 100644
--- a/app/javascript/dashboard/i18n/locale/el/login.json
+++ b/app/javascript/dashboard/i18n/locale/el/login.json
@@ -3,16 +3,16 @@
     "TITLE": "Είσοδος στο Chatwoot",
     "EMAIL": {
       "LABEL": "Email",
-      "PLACEHOLDER": "example@companyname.com"
+      "PLACEHOLDER": "Email π.χ.: someone@example.com"
     },
     "PASSWORD": {
       "LABEL": "Κωδικός",
       "PLACEHOLDER": "Κωδικός"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Login successful",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again.",
-      "UNAUTH": "Username or password is incorrect. Please try again."
+      "SUCCESS_MESSAGE": "Επιτυχής είσοδος",
+      "ERROR_MESSAGE": "Αδυναμία σύνδεσης με τον Woot Server, Παρακαλώ προσπαθήστε αργότερα",
+      "UNAUTH": "Το όνομα χρήστη ή ο κωδικός δεν είναι σωστός. Παρακαλώ ξαναπροσπαθήστε"
     },
     "OAUTH": {
       "GOOGLE_LOGIN": "Login with Google",
diff --git a/app/javascript/dashboard/i18n/locale/el/resetPassword.json b/app/javascript/dashboard/i18n/locale/el/resetPassword.json
index 492ea506d..b857ad8a8 100644
--- a/app/javascript/dashboard/i18n/locale/el/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/el/resetPassword.json
@@ -8,7 +8,7 @@
     },
     "API": {
       "SUCCESS_MESSAGE": "Σύνδεσμος για την επαναφορά του κωδικού έχει αποσταλεί στο email σας.",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
+      "ERROR_MESSAGE": "Αδυναμία σύνδεσης με τον Woot Server, Παρακαλώ προσπαθήστε αργότερα"
     },
     "SUBMIT": "Καταχώρηση"
   }
diff --git a/app/javascript/dashboard/i18n/locale/el/search.json b/app/javascript/dashboard/i18n/locale/el/search.json
index e95ca251b..0fc63cfd2 100644
--- a/app/javascript/dashboard/i18n/locale/el/search.json
+++ b/app/javascript/dashboard/i18n/locale/el/search.json
@@ -14,8 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
-    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
+    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/el/setNewPassword.json b/app/javascript/dashboard/i18n/locale/el/setNewPassword.json
index e3914ffee..7fda2c4b5 100644
--- a/app/javascript/dashboard/i18n/locale/el/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/el/setNewPassword.json
@@ -13,7 +13,7 @@
     },
     "API": {
       "SUCCESS_MESSAGE": "Ο κωδικός άλλαξε με επιτυχία.",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
+      "ERROR_MESSAGE": "Αδυναμία σύνδεσης με τον Woot Server, Παρακαλώ προσπαθήστε αργότερα"
     },
     "CAPTCHA": {
       "ERROR": "Η επαλήθευση έληξε. Παρακαλώ λύστε ξανά captcha."
diff --git a/app/javascript/dashboard/i18n/locale/el/signup.json b/app/javascript/dashboard/i18n/locale/el/signup.json
index f4d4f2bcc..c610bb125 100644
--- a/app/javascript/dashboard/i18n/locale/el/signup.json
+++ b/app/javascript/dashboard/i18n/locale/el/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Επωνυμία εταιρείας",
-      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
-      "ERROR": "Το όνομα της εταιρείας είναι πολύ σύντομο."
+      "PLACEHOLDER": "Εισάγετε το όνομα της εταιρείας σας. π. χ.: Wayne Enterprises",
+      "ERROR": "Το όνομα της εταιρείας είναι πολύ σύντομο"
     },
     "FULL_NAME": {
       "LABEL": "Πλήρες όνομα",
-      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
-      "ERROR": "Το πλήρες όνομα είναι πολύ σύντομο."
+      "PLACEHOLDER": "Συμπληρώστε το πλήρες σας όνομα: πχ: Χρήστος Παπαδόπουλος",
+      "ERROR": "Το πλήρες όνομα είναι πολύ σύντομο"
     },
     "EMAIL": {
       "LABEL": "email εργασίας",
-      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
-      "ERROR": "Παρακαλώ εισάγετε μια έγκυρη διεύθυνση email."
+      "PLACEHOLDER": "συμπληρώστε το email εργασίας πχ: papadopoulos@wyane.com",
+      "ERROR": "Παρακαλώ εισάγετε μια έγκυρη διεύθυνση email"
     },
     "PASSWORD": {
       "LABEL": "Κωδικός",
       "PLACEHOLDER": "Κωδικός",
-      "ERROR": "Ο κωδικός είναι πολύ σύντομος.",
-      "IS_INVALID_PASSWORD": "Ο κωδικός πρόσβασης πρέπει να περιέχει τουλάχιστον 1 κεφαλαίο γράμμα, 1 πεζό γράμμα, 1 αριθμό και 1 ειδικό χαρακτήρα."
+      "ERROR": "Ο κωδικός είναι πολύ σύντομος",
+      "IS_INVALID_PASSWORD": "Ο κωδικός πρόσβασης πρέπει να περιέχει τουλάχιστον 1 κεφαλαίο γράμμα, 1 πεζό γράμμα, 1 αριθμό και 1 ειδικό χαρακτήρα"
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirm password",
-      "PLACEHOLDER": "Confirm password",
-      "ERROR": "Οι κωδικοί δεν συμφωνούν."
+      "LABEL": "Επιβεβαίωση κωδικού",
+      "PLACEHOLDER": "Επιβεβαίωση κωδικού",
+      "ERROR": "Οι κωδικοί δεν συμφωνούν"
     },
     "API": {
       "SUCCESS_MESSAGE": "Επιτυχής καταχώρηση",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
+      "ERROR_MESSAGE": "Αδυναμία σύνδεσης με τον Woot Server, Παρακαλώ προσπαθήστε αργότερα"
     },
     "SUBMIT": "Create account",
     "HAVE_AN_ACCOUNT": "Έχετε ήδη ένα λογαριασμό?"
diff --git a/app/javascript/dashboard/i18n/locale/es/chatlist.json b/app/javascript/dashboard/i18n/locale/es/chatlist.json
index 9e06ae7fe..7dc926551 100644
--- a/app/javascript/dashboard/i18n/locale/es/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/es/chatlist.json
@@ -35,6 +35,20 @@
         "TEXT": "Todos"
       }
     },
+    "VIEW_FILTER": "Ver",
+    "SORT_TOOLTIP_LABEL": "Sort conversations",
+    "CHAT_SORT": {
+      "STATUS": "Estado",
+      "ORDER_BY": "Order by"
+    },
+    "CHAT_SORT_FILTER_ITEMS": {
+      "latest": {
+        "TEXT": "Last activity"
+      },
+      "sort_on_created_at": {
+        "TEXT": "Creado el"
+      }
+    },
     "ATTACHMENTS": {
       "image": {
         "CONTENT": "Mensaje de imagen"
@@ -55,6 +69,24 @@
         "CONTENT": "ha compartido una url"
       }
     },
+    "CHAT_SORT_BY_FILTER": {
+      "TITLE": "Sort conversation",
+      "DROPDOWN_TITLE": "Ordenar por",
+      "ITEMS": {
+        "LATEST": {
+          "NAME": "Last activity at",
+          "LABEL": "Last activity"
+        },
+        "CREATED_AT": {
+          "NAME": "Creado el",
+          "LABEL": "Creado el"
+        },
+        "LAST_USER_MESSAGE_AT": {
+          "NAME": "Last user message at",
+          "LABEL": "Last message"
+        }
+      }
+    },
     "RECEIVED_VIA_EMAIL": "Recibido por correo electrónico",
     "VIEW_TWEET_IN_TWITTER": "Ver trino en Twitter",
     "REPLY_TO_TWEET": "Responder a éste trino",
diff --git a/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json
index 52da031ae..6efd9248c 100644
--- a/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json
@@ -464,6 +464,7 @@
       "AUTO_ASSIGNMENT_SUB_TEXT": "Activar o desactivar la asignación automática de nuevas conversaciones a los agentes añadidos a esta bandeja de entrada.",
       "HMAC_VERIFICATION": "Validación de identidad de usuario",
       "HMAC_DESCRIPTION": "Para validar la identidad del usuario, puede pasar un `identifier_hash` para cada usuario. Puedes generar un hash HMAC sha256 usando el `identifier` con la clave que se muestra aquí.",
+      "HMAC_LINK_TO_DOCS": "You can read more here.",
       "HMAC_MANDATORY_VERIFICATION": "Forzar validación de identidad de usuario",
       "HMAC_MANDATORY_DESCRIPTION": "Si está activado, las peticiones que no tengan el `identifier_hash` serán rechazadas.",
       "INBOX_IDENTIFIER": "Identificador de bandeja de entrada",
diff --git a/app/javascript/dashboard/i18n/locale/fa/chatlist.json b/app/javascript/dashboard/i18n/locale/fa/chatlist.json
index 94325f1c8..91cac4dc8 100644
--- a/app/javascript/dashboard/i18n/locale/fa/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/fa/chatlist.json
@@ -35,6 +35,20 @@
         "TEXT": "همه"
       }
     },
+    "VIEW_FILTER": "نمایش",
+    "SORT_TOOLTIP_LABEL": "Sort conversations",
+    "CHAT_SORT": {
+      "STATUS": "وضعیت",
+      "ORDER_BY": "Order by"
+    },
+    "CHAT_SORT_FILTER_ITEMS": {
+      "latest": {
+        "TEXT": "Last activity"
+      },
+      "sort_on_created_at": {
+        "TEXT": "ایجاد شده در"
+      }
+    },
     "ATTACHMENTS": {
       "image": {
         "CONTENT": "پیام تصویری"
@@ -55,6 +69,24 @@
         "CONTENT": "یک آدرس URL به اشتراک گذاشته شده"
       }
     },
+    "CHAT_SORT_BY_FILTER": {
+      "TITLE": "Sort conversation",
+      "DROPDOWN_TITLE": "مرتب‌سازی براساس",
+      "ITEMS": {
+        "LATEST": {
+          "NAME": "Last activity at",
+          "LABEL": "Last activity"
+        },
+        "CREATED_AT": {
+          "NAME": "ایجاد شده در",
+          "LABEL": "ایجاد شده در"
+        },
+        "LAST_USER_MESSAGE_AT": {
+          "NAME": "Last user message at",
+          "LABEL": "Last message"
+        }
+      }
+    },
     "RECEIVED_VIA_EMAIL": "از طریق ایمیل دریافت شد",
     "VIEW_TWEET_IN_TWITTER": "مشاهده توییت در توییتر",
     "REPLY_TO_TWEET": "پاسخ به این توییت",
diff --git a/app/javascript/dashboard/i18n/locale/fa/contact.json b/app/javascript/dashboard/i18n/locale/fa/contact.json
index b81e15748..42f1a7bb0 100644
--- a/app/javascript/dashboard/i18n/locale/fa/contact.json
+++ b/app/javascript/dashboard/i18n/locale/fa/contact.json
@@ -120,7 +120,7 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "شماره تلفن مخاطب را وارد کنید",
         "LABEL": "شماره تلفن",
-        "HELP": "شماره تلفن باید از قالب E.164 باشد، به عنوان مثال: +1415555555 [+][کد کشور][کد منطقه][شماره تلفن محلی]. می توانید کد شماره گیری را از منوی بازشو انتخاب کنید.",
+        "HELP": "شماره تلفن باید با فرمت E.164 باشد به عنوان مثال: +98415555555 [+] [کد کشور] [کد منطقه] [شماره تلفن محلی]",
         "ERROR": "شماره تلفن باید یا خالی باشد و یا با فرمت E.164",
         "DIAL_CODE_ERROR": "لطفاً یک کد شماره گیری را از لیست انتخاب کنید",
         "DUPLICATE": "این شماره تلفن برای مخاطب دیگری در حال استفاده است."
@@ -182,7 +182,7 @@
         "LABEL": "به"
       },
       "INBOX": {
-        "LABEL": "از طریق صندوق ورودی",
+        "LABEL": "صندوق ورودی",
         "PLACEHOLDER": "صندوق ورودی منبع را انتخاب کنید",
         "ERROR": "انتخاب صندوق ورودی"
       },
diff --git a/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json
index 66d90ce2c..243ff1d63 100644
--- a/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json
@@ -464,6 +464,7 @@
       "AUTO_ASSIGNMENT_SUB_TEXT": "فعال کردن یا غیرفعال کردن واگذاری خودکار گفتگوها به ایجنت های عضو این صندوق ورودی.",
       "HMAC_VERIFICATION": "اعتبار سنجی کاربر",
       "HMAC_DESCRIPTION": "به منظور اعتبارسنجی هویت کاربر، می‌توانید یک «شناسه_هش» برای هر کاربر ارسال کنید. می‌توانید با استفاده از «شناسه» با کلید نشان داده شده در اینجا یک هش HMAC sha256 ایجاد کنید.",
+      "HMAC_LINK_TO_DOCS": "You can read more here.",
       "HMAC_MANDATORY_VERIFICATION": "مجبور کردن تأیید اعتبار هویت کاربر",
       "HMAC_MANDATORY_DESCRIPTION": "اگر فعال باشد، درخواست‌هایی که «identifier_hash» را ندارند رد می‌شوند.",
       "INBOX_IDENTIFIER": "شناسه صندوق ورودی",
diff --git a/app/javascript/dashboard/i18n/locale/fa/login.json b/app/javascript/dashboard/i18n/locale/fa/login.json
index 3ea5715a2..0d75f9b03 100644
--- a/app/javascript/dashboard/i18n/locale/fa/login.json
+++ b/app/javascript/dashboard/i18n/locale/fa/login.json
@@ -3,16 +3,16 @@
     "TITLE": "ورود به چت ووت",
     "EMAIL": {
       "LABEL": "ایمیل",
-      "PLACEHOLDER": "example@companyname.com"
+      "PLACEHOLDER": "ایمیل به عنوان مثال: someone@example.com"
     },
     "PASSWORD": {
       "LABEL": "رمز عبور",
       "PLACEHOLDER": "رمز عبور"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Login successful",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again.",
-      "UNAUTH": "Username or password is incorrect. Please try again."
+      "SUCCESS_MESSAGE": "ورود موفق",
+      "ERROR_MESSAGE": "متاسفانه ارتباط با سرور برقرار نشد، مجددا امتحان کنید",
+      "UNAUTH": "این نام کاربری و رمز عبور صحیح نیست"
     },
     "OAUTH": {
       "GOOGLE_LOGIN": "با گوگل وارد شوید",
diff --git a/app/javascript/dashboard/i18n/locale/fa/resetPassword.json b/app/javascript/dashboard/i18n/locale/fa/resetPassword.json
index f8cdf3b2e..427d40add 100644
--- a/app/javascript/dashboard/i18n/locale/fa/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/fa/resetPassword.json
@@ -8,7 +8,7 @@
     },
     "API": {
       "SUCCESS_MESSAGE": "لینک ریست کردن رمز عبور به ایمیلتان ارسال شد.",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
+      "ERROR_MESSAGE": "متاسفانه ارتباط با سرور برقرار نشد، مجددا امتحان کنید"
     },
     "SUBMIT": "ثبت"
   }
diff --git a/app/javascript/dashboard/i18n/locale/fa/search.json b/app/javascript/dashboard/i18n/locale/fa/search.json
index 68f391cbf..b695bc8b0 100644
--- a/app/javascript/dashboard/i18n/locale/fa/search.json
+++ b/app/javascript/dashboard/i18n/locale/fa/search.json
@@ -14,8 +14,8 @@
     "EMPTY_STATE": "هیچ %{item} برای درخواست '%{query}' یافت نشد",
     "EMPTY_STATE_FULL": "هیچ نتیجه ای برای پرس و جو «%{query}» یافت نشد",
     "PLACEHOLDER_KEYBINDING": "/ برای تمرکز",
-    "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
-    "EMPTY_STATE_DEFAULT": "جستجو بر اساس شناسه گفتگو، ایمیل، شماره تلفن، پیام‌ها برای نتایج جستجوی بهتر. ",
+    "INPUT_PLACEHOLDER": "جستجوی پیام‌ها، مخاطبین یا گفتگوها",
+    "EMPTY_STATE_DEFAULT": "جستجو بر اساس شناسه گفتگو، ایمیل، شماره تلفن، پیام‌ها برای نتایج جستجوی بهتر.",
     "BOT_LABEL": "ربات",
     "READ_MORE": "ادامه مطلب",
     "WROTE": "نوشت:"
diff --git a/app/javascript/dashboard/i18n/locale/fa/setNewPassword.json b/app/javascript/dashboard/i18n/locale/fa/setNewPassword.json
index d9f253aad..860b03759 100644
--- a/app/javascript/dashboard/i18n/locale/fa/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/fa/setNewPassword.json
@@ -13,7 +13,7 @@
     },
     "API": {
       "SUCCESS_MESSAGE": "رمز عوض شد.",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
+      "ERROR_MESSAGE": "متاسفانه ارتباط با سرور برقرار نشد، مجددا امتحان کنید"
     },
     "CAPTCHA": {
       "ERROR": "تأیید اعتبار منقضی شد. لطفا دوباره کپچا را حل کنید."
diff --git a/app/javascript/dashboard/i18n/locale/fa/signup.json b/app/javascript/dashboard/i18n/locale/fa/signup.json
index 705a52edb..fef19a0cb 100644
--- a/app/javascript/dashboard/i18n/locale/fa/signup.json
+++ b/app/javascript/dashboard/i18n/locale/fa/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "نام شرکت",
-      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
-      "ERROR": "نام شرکت خیلی کوتاه است."
+      "PLACEHOLDER": "نام شرکت خود را وارد کنید. به عنوان مثال: شرکت وین",
+      "ERROR": "نام شرکت خیلی کوتاه است"
     },
     "FULL_NAME": {
       "LABEL": "نام کامل",
-      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
-      "ERROR": "نام کامل خیلی کوتاه است."
+      "PLACEHOLDER": "نام کامل خود را وارد کنید به عنوان مثال: گودرز جعفری",
+      "ERROR": "نام کامل خیلی کوتاه است"
     },
     "EMAIL": {
       "LABEL": "ایمیل کاری",
-      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
-      "ERROR": "لطفا یک آدرس ایمیل کاری معتبر وارد کنید."
+      "PLACEHOLDER": "ایمیل کاری خود را وارد کنید به عنوان مثال: jafari@wayne.enterprises",
+      "ERROR": "لطفا یک آدرس ایمیل کاری معتبر وارد کنید"
     },
     "PASSWORD": {
       "LABEL": "رمز عبور",
       "PLACEHOLDER": "رمز عبور",
-      "ERROR": "رمز عبور خیلی کوتاه است.",
-      "IS_INVALID_PASSWORD": "رمز عبور باید شامل حداقل ۱ حرف بزرگ، ۱ حرف کوچک، ۱ عدد و ۱ کاراکتر خاص باشد."
+      "ERROR": "رمز عبور خیلی کوتاه است",
+      "IS_INVALID_PASSWORD": "رمز عبور باید شامل حداقل ۱ حرف بزرگ، ۱ حرف کوچک، ۱ عدد و ۱ کاراکتر خاص باشد"
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirm password",
-      "PLACEHOLDER": "Confirm password",
-      "ERROR": "رمز عبور و تکرار رمز عبور یکسان نیستند."
+      "LABEL": "تکرار رمز عبور",
+      "PLACEHOLDER": "تکرار رمز عبور",
+      "ERROR": "رمز عبور و تکرار رمز عبور یکسان نیستند"
     },
     "API": {
       "SUCCESS_MESSAGE": "ثبت نام با موفقیت انجام شد",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
+      "ERROR_MESSAGE": "ارتباط با سرور برقرار نشد، لطفا بعدا امتحان کنید"
     },
     "SUBMIT": "ایجاد حساب کاربری",
     "HAVE_AN_ACCOUNT": "از قبل حساب‌کاربری دارید؟"
diff --git a/app/javascript/dashboard/i18n/locale/fi/chatlist.json b/app/javascript/dashboard/i18n/locale/fi/chatlist.json
index 0c04b2401..2cdec797d 100644
--- a/app/javascript/dashboard/i18n/locale/fi/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/fi/chatlist.json
@@ -35,6 +35,20 @@
         "TEXT": "Kaikki"
       }
     },
+    "VIEW_FILTER": "Näytä",
+    "SORT_TOOLTIP_LABEL": "Sort conversations",
+    "CHAT_SORT": {
+      "STATUS": "Tila",
+      "ORDER_BY": "Order by"
+    },
+    "CHAT_SORT_FILTER_ITEMS": {
+      "latest": {
+        "TEXT": "Last activity"
+      },
+      "sort_on_created_at": {
+        "TEXT": "Created at"
+      }
+    },
     "ATTACHMENTS": {
       "image": {
         "CONTENT": "Kuvaviesti"
@@ -55,6 +69,24 @@
         "CONTENT": "on jakanut URL-osoitteen"
       }
     },
+    "CHAT_SORT_BY_FILTER": {
+      "TITLE": "Sort conversation",
+      "DROPDOWN_TITLE": "Sort by",
+      "ITEMS": {
+        "LATEST": {
+          "NAME": "Last activity at",
+          "LABEL": "Last activity"
+        },
+        "CREATED_AT": {
+          "NAME": "Created at",
+          "LABEL": "Created at"
+        },
+        "LAST_USER_MESSAGE_AT": {
+          "NAME": "Last user message at",
+          "LABEL": "Last message"
+        }
+      }
+    },
     "RECEIVED_VIA_EMAIL": "Vastaanotettu sähköpostitse",
     "VIEW_TWEET_IN_TWITTER": "Näytä twiitti Twitterissä",
     "REPLY_TO_TWEET": "Vastaa tähän twiittiin",
diff --git a/app/javascript/dashboard/i18n/locale/fi/contact.json b/app/javascript/dashboard/i18n/locale/fi/contact.json
index 274c5f9b5..1609f6f0b 100644
--- a/app/javascript/dashboard/i18n/locale/fi/contact.json
+++ b/app/javascript/dashboard/i18n/locale/fi/contact.json
@@ -120,7 +120,7 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Anna yhteystiedon puhelinnumero",
         "LABEL": "Puhelinnumero",
-        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
+        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]",
         "ERROR": "Phone number should be either empty or of E.164 format",
         "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "This phone number is in use for another contact."
@@ -182,7 +182,7 @@
         "LABEL": "To"
       },
       "INBOX": {
-        "LABEL": "Via Inbox",
+        "LABEL": "Inbox",
         "PLACEHOLDER": "Choose source inbox",
         "ERROR": "Select an inbox"
       },
diff --git a/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json
index 33ef27a92..7cb4b449d 100644
--- a/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json
@@ -464,6 +464,7 @@
       "AUTO_ASSIGNMENT_SUB_TEXT": "Ota käyttöön tai poista käytöstä automaattinen keskusteluiden delegointi edustajille.",
       "HMAC_VERIFICATION": "User Identity Validation",
       "HMAC_DESCRIPTION": "In order to validate the user's identity, you can pass an `identifier_hash` for each user. You can generate a HMAC sha256 hash using the `identifier` with the key shown here.",
+      "HMAC_LINK_TO_DOCS": "You can read more here.",
       "HMAC_MANDATORY_VERIFICATION": "Enforce User Identity Validation",
       "HMAC_MANDATORY_DESCRIPTION": "If enabled, requests missing the `identifier_hash` will be rejected.",
       "INBOX_IDENTIFIER": "Inbox Identifier",
diff --git a/app/javascript/dashboard/i18n/locale/fi/login.json b/app/javascript/dashboard/i18n/locale/fi/login.json
index 6eada62c0..c807d305a 100644
--- a/app/javascript/dashboard/i18n/locale/fi/login.json
+++ b/app/javascript/dashboard/i18n/locale/fi/login.json
@@ -3,16 +3,16 @@
     "TITLE": "Kirjaudu sisään Chatwootiin",
     "EMAIL": {
       "LABEL": "Sähköposti",
-      "PLACEHOLDER": "example@companyname.com"
+      "PLACEHOLDER": "Sähköposti, esim: someone@example.fi"
     },
     "PASSWORD": {
       "LABEL": "Salasana",
       "PLACEHOLDER": "Salasana"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Login successful",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again.",
-      "UNAUTH": "Username or password is incorrect. Please try again."
+      "SUCCESS_MESSAGE": "Kirjautuminen Onnistui",
+      "ERROR_MESSAGE": "Yhteyden muodostaminen Woot-palvelimelle ei onnistunut, yritä myöhemmin uudelleen",
+      "UNAUTH": "Käyttäjätunnus / salasana virheellinen. Yritä uudelleen"
     },
     "OAUTH": {
       "GOOGLE_LOGIN": "Login with Google",
diff --git a/app/javascript/dashboard/i18n/locale/fi/resetPassword.json b/app/javascript/dashboard/i18n/locale/fi/resetPassword.json
index 4739c9b02..58c45627f 100644
--- a/app/javascript/dashboard/i18n/locale/fi/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/fi/resetPassword.json
@@ -8,7 +8,7 @@
     },
     "API": {
       "SUCCESS_MESSAGE": "Salasanan palautuslinkki on lähetetty sähköpostiisi.",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
+      "ERROR_MESSAGE": "Yhteyden muodostaminen Woot-palvelimelle ei onnistunut, yritä myöhemmin uudelleen"
     },
     "SUBMIT": "Lähetä"
   }
diff --git a/app/javascript/dashboard/i18n/locale/fi/search.json b/app/javascript/dashboard/i18n/locale/fi/search.json
index 1b7aed36c..c9924167c 100644
--- a/app/javascript/dashboard/i18n/locale/fi/search.json
+++ b/app/javascript/dashboard/i18n/locale/fi/search.json
@@ -14,8 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
-    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
+    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Botti",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/fi/setNewPassword.json b/app/javascript/dashboard/i18n/locale/fi/setNewPassword.json
index 2d36ad65c..a2a6949d9 100644
--- a/app/javascript/dashboard/i18n/locale/fi/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/fi/setNewPassword.json
@@ -13,7 +13,7 @@
     },
     "API": {
       "SUCCESS_MESSAGE": "Salasanan vaihtaminen onnistui.",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
+      "ERROR_MESSAGE": "Yhteyden muodostaminen Woot-palvelimelle ei onnistunut, yritä myöhemmin uudelleen"
     },
     "CAPTCHA": {
       "ERROR": "Verification expired. Please solve captcha again."
diff --git a/app/javascript/dashboard/i18n/locale/fi/signup.json b/app/javascript/dashboard/i18n/locale/fi/signup.json
index a4b60728a..717809d30 100644
--- a/app/javascript/dashboard/i18n/locale/fi/signup.json
+++ b/app/javascript/dashboard/i18n/locale/fi/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Company name",
-      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
-      "ERROR": "Company name is too short."
+      "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
+      "ERROR": "Company name is too short"
     },
     "FULL_NAME": {
       "LABEL": "Koko nimi",
-      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
-      "ERROR": "Koko nimi on liian lyhyt."
+      "PLACEHOLDER": "Anna koko nimesi, esim: Bruce Wayne",
+      "ERROR": "Koko nimi on liian lyhyt"
     },
     "EMAIL": {
       "LABEL": "Työsähköposti",
-      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
-      "ERROR": "Please enter a valid work email address."
+      "PLACEHOLDER": "Anna työsi sähköpostiosoite, esim: bruce@wayne.enterprises",
+      "ERROR": "Please enter a valid work email address"
     },
     "PASSWORD": {
       "LABEL": "Salasana",
       "PLACEHOLDER": "Salasana",
-      "ERROR": "Salasana on liian lyhyt.",
-      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character."
+      "ERROR": "Salasana on liian lyhyt",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirm password",
-      "PLACEHOLDER": "Confirm password",
-      "ERROR": "Salasanat eivät täsmää."
+      "LABEL": "Vahvista salasana",
+      "PLACEHOLDER": "Vahvista salasana",
+      "ERROR": "Salasanat eivät täsmää"
     },
     "API": {
       "SUCCESS_MESSAGE": "Rekisteröinti onnistui",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
+      "ERROR_MESSAGE": "Yhteyden muodostaminen Woot-palvelimelle ei onnistunut, yritä myöhemmin uudelleen"
     },
     "SUBMIT": "Create account",
     "HAVE_AN_ACCOUNT": "Onko sinulla jo tili?"
diff --git a/app/javascript/dashboard/i18n/locale/fr/chatlist.json b/app/javascript/dashboard/i18n/locale/fr/chatlist.json
index f77e2f173..c9e4cd361 100644
--- a/app/javascript/dashboard/i18n/locale/fr/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/fr/chatlist.json
@@ -35,6 +35,20 @@
         "TEXT": "Tous"
       }
     },
+    "VIEW_FILTER": "Voir",
+    "SORT_TOOLTIP_LABEL": "Sort conversations",
+    "CHAT_SORT": {
+      "STATUS": "État",
+      "ORDER_BY": "Order by"
+    },
+    "CHAT_SORT_FILTER_ITEMS": {
+      "latest": {
+        "TEXT": "Last activity"
+      },
+      "sort_on_created_at": {
+        "TEXT": "Créé le"
+      }
+    },
     "ATTACHMENTS": {
       "image": {
         "CONTENT": "Message image"
@@ -55,6 +69,24 @@
         "CONTENT": "a partagé une URL"
       }
     },
+    "CHAT_SORT_BY_FILTER": {
+      "TITLE": "Sort conversation",
+      "DROPDOWN_TITLE": "Sort by",
+      "ITEMS": {
+        "LATEST": {
+          "NAME": "Last activity at",
+          "LABEL": "Last activity"
+        },
+        "CREATED_AT": {
+          "NAME": "Créé le",
+          "LABEL": "Créé le"
+        },
+        "LAST_USER_MESSAGE_AT": {
+          "NAME": "Last user message at",
+          "LABEL": "Last message"
+        }
+      }
+    },
     "RECEIVED_VIA_EMAIL": "Reçu par courriel",
     "VIEW_TWEET_IN_TWITTER": "Voir le tweet sur Twitter",
     "REPLY_TO_TWEET": "Répondre à ce tweet",
diff --git a/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json
index e20beab54..b7be888ac 100644
--- a/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json
@@ -464,6 +464,7 @@
       "AUTO_ASSIGNMENT_SUB_TEXT": "Activer ou désactiver l'affectation automatique de nouvelles conversations aux agents ajoutés à cette boîte de réception.",
       "HMAC_VERIFICATION": "Validation de l'identité de l'utilisateur",
       "HMAC_DESCRIPTION": "In order to validate the user's identity, you can pass an `identifier_hash` for each user. You can generate a HMAC sha256 hash using the `identifier` with the key shown here.",
+      "HMAC_LINK_TO_DOCS": "You can read more here.",
       "HMAC_MANDATORY_VERIFICATION": "Forcer la validation de l'identité de l'utilisateur",
       "HMAC_MANDATORY_DESCRIPTION": "If enabled, requests missing the `identifier_hash` will be rejected.",
       "INBOX_IDENTIFIER": "Identificateur de la boîte de réception",
diff --git a/app/javascript/dashboard/i18n/locale/he/chatlist.json b/app/javascript/dashboard/i18n/locale/he/chatlist.json
index 32a42b910..18658d4bb 100644
--- a/app/javascript/dashboard/i18n/locale/he/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/he/chatlist.json
@@ -35,6 +35,20 @@
         "TEXT": "הכל"
       }
     },
+    "VIEW_FILTER": "צפה",
+    "SORT_TOOLTIP_LABEL": "Sort conversations",
+    "CHAT_SORT": {
+      "STATUS": "מצב",
+      "ORDER_BY": "Order by"
+    },
+    "CHAT_SORT_FILTER_ITEMS": {
+      "latest": {
+        "TEXT": "Last activity"
+      },
+      "sort_on_created_at": {
+        "TEXT": "נוצר בזמן"
+      }
+    },
     "ATTACHMENTS": {
       "image": {
         "CONTENT": "הודעת תמונה"
@@ -55,6 +69,24 @@
         "CONTENT": "שיתף קישור"
       }
     },
+    "CHAT_SORT_BY_FILTER": {
+      "TITLE": "Sort conversation",
+      "DROPDOWN_TITLE": "מיין לפי",
+      "ITEMS": {
+        "LATEST": {
+          "NAME": "Last activity at",
+          "LABEL": "Last activity"
+        },
+        "CREATED_AT": {
+          "NAME": "נוצר בזמן",
+          "LABEL": "נוצר בזמן"
+        },
+        "LAST_USER_MESSAGE_AT": {
+          "NAME": "Last user message at",
+          "LABEL": "Last message"
+        }
+      }
+    },
     "RECEIVED_VIA_EMAIL": "התקבל בדואר אלקטרוני",
     "VIEW_TWEET_IN_TWITTER": "צפה בציוץ בטוויטר",
     "REPLY_TO_TWEET": "הגב לציוץ זה",
diff --git a/app/javascript/dashboard/i18n/locale/he/contact.json b/app/javascript/dashboard/i18n/locale/he/contact.json
index 0496b6def..678f2d649 100644
--- a/app/javascript/dashboard/i18n/locale/he/contact.json
+++ b/app/javascript/dashboard/i18n/locale/he/contact.json
@@ -120,7 +120,7 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "הזן את מספר הטלפון של איש הקשר",
         "LABEL": "מספר טלפון",
-        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
+        "HELP": "מספר הטלפון צריך להיות בפורמט E.164, למשל: +1415555555 [+][קוד מדינה][אזור חיוג][מספר טלפון מקומי]",
         "ERROR": "מספר הטלפון צריך להיות ריק או בפורמט E.164",
         "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "מספר טלפון זה נמצאת בשימוש עבור איש קשר אחר."
@@ -182,7 +182,7 @@
         "LABEL": "אל"
       },
       "INBOX": {
-        "LABEL": "Via Inbox",
+        "LABEL": "תיבת הדואר הנכנס",
         "PLACEHOLDER": "Choose source inbox",
         "ERROR": "בחר תיבת דואר נכנס"
       },
diff --git a/app/javascript/dashboard/i18n/locale/he/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/he/inboxMgmt.json
index 783383ebe..0ffcbe036 100644
--- a/app/javascript/dashboard/i18n/locale/he/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/he/inboxMgmt.json
@@ -463,9 +463,10 @@
       "INBOX_UPDATE_SUB_TEXT": "עדכן את הגדרות תיבת הדואר הנכנס שלך",
       "AUTO_ASSIGNMENT_SUB_TEXT": "אפשר או השבת את ההקצאה האוטומטית של שיחות חדשות לסוכנים שנוספו לתיבת הדואר הנכנס הזו.",
       "HMAC_VERIFICATION": "אימות זהות משתמש",
-      "HMAC_DESCRIPTION": "על מנת לאמת את זהות המשתמש, אתה יכול להעביר `מזהה_hash` עבור כל משתמש. אתה יכול ליצור hash HMAC sha256 באמצעות `מזהה` עם המפתח המוצג כאן.",
+      "HMAC_DESCRIPTION": "In order to validate the user's identity, you can pass an `identifier_hash` for each user. You can generate a HMAC sha256 hash using the `identifier` with the key shown here.",
+      "HMAC_LINK_TO_DOCS": "You can read more here.",
       "HMAC_MANDATORY_VERIFICATION": "אכיפת אימות זהות משתמש",
-      "HMAC_MANDATORY_DESCRIPTION": "אם מופעל, בקשות חסרות 'מזהה_hash' יידחו.",
+      "HMAC_MANDATORY_DESCRIPTION": "If enabled, requests missing the `identifier_hash` will be rejected.",
       "INBOX_IDENTIFIER": "מזהה תיבת דואר נכנס",
       "INBOX_IDENTIFIER_SUB_TEXT": "השתמש ב-'inbox_identifier' המוצג כאן כדי לאמת את לקוחות ה-API שלך.",
       "FORWARD_EMAIL_TITLE": "העבר לדואר אלקטרוני",
diff --git a/app/javascript/dashboard/i18n/locale/he/login.json b/app/javascript/dashboard/i18n/locale/he/login.json
index 16a9732d5..bc76228a5 100644
--- a/app/javascript/dashboard/i18n/locale/he/login.json
+++ b/app/javascript/dashboard/i18n/locale/he/login.json
@@ -3,16 +3,16 @@
     "TITLE": "התחבר ל Woot",
     "EMAIL": {
       "LABEL": "אימייל",
-      "PLACEHOLDER": "example@companyname.com"
+      "PLACEHOLDER": "מייל לדוגמא: someone@example.com"
     },
     "PASSWORD": {
       "LABEL": "סיסמה",
       "PLACEHOLDER": "סיסמה"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Login successful",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again.",
-      "UNAUTH": "Username or password is incorrect. Please try again."
+      "SUCCESS_MESSAGE": "נכנסת בהצלחה",
+      "ERROR_MESSAGE": "לא ניתן להתחבר לשרת Woot, נסה שוב מאוחר יותר",
+      "UNAUTH": "שם משתמש / סיסמה שגויים. נסה שוב"
     },
     "OAUTH": {
       "GOOGLE_LOGIN": "התחבר עם גוגל",
diff --git a/app/javascript/dashboard/i18n/locale/he/resetPassword.json b/app/javascript/dashboard/i18n/locale/he/resetPassword.json
index 10da8c2e9..b4bcd669a 100644
--- a/app/javascript/dashboard/i18n/locale/he/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/he/resetPassword.json
@@ -8,7 +8,7 @@
     },
     "API": {
       "SUCCESS_MESSAGE": "הקישור לאיפוס הסיסמה נשלח לדוא\"ל שלך.",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
+      "ERROR_MESSAGE": "לא ניתן להתחבר לשרת Woot, נסה שוב מאוחר יותר"
     },
     "SUBMIT": "שלח"
   }
diff --git a/app/javascript/dashboard/i18n/locale/he/search.json b/app/javascript/dashboard/i18n/locale/he/search.json
index b9ad4038c..dd211513c 100644
--- a/app/javascript/dashboard/i18n/locale/he/search.json
+++ b/app/javascript/dashboard/i18n/locale/he/search.json
@@ -14,8 +14,8 @@
     "EMPTY_STATE": "לא נמצא %{item} עבור השאילתה '%{query}'",
     "EMPTY_STATE_FULL": "לא נמצאו תוצאות עבור השאילתה '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ להתמקד",
-    "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
-    "EMPTY_STATE_DEFAULT": "חפש לפי מזהה שיחה, אימייל, מספר טלפון, הודעות לתוצאות חיפוש טובות יותר. ",
+    "INPUT_PLACEHOLDER": "חפש הודעות, אנשי קשר או שיחות",
+    "EMPTY_STATE_DEFAULT": "חפש לפי מזהה שיחה, אימייל, מספר טלפון, הודעות לתוצאות חיפוש טובות יותר.",
     "BOT_LABEL": "בוט",
     "READ_MORE": "קרא עוד",
     "WROTE": "נכתב:"
diff --git a/app/javascript/dashboard/i18n/locale/he/setNewPassword.json b/app/javascript/dashboard/i18n/locale/he/setNewPassword.json
index 2d0b71229..59175d871 100644
--- a/app/javascript/dashboard/i18n/locale/he/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/he/setNewPassword.json
@@ -1,19 +1,19 @@
 {
   "SET_NEW_PASSWORD": {
-    "TITLE": "Set new password",
+    "TITLE": "הגדר סיסמה חדשה",
     "PASSWORD": {
       "LABEL": "סיסמה",
       "PLACEHOLDER": "סיסמה",
-      "ERROR": "הסיסמה קצרה מדי."
+      "ERROR": "הסיסמה קצרה מדי"
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirm password",
+      "LABEL": "אמת סיסמה",
       "PLACEHOLDER": "אמת סיסמה",
-      "ERROR": "סיסמאות לא תואמות."
+      "ERROR": "סיסמאות לא תואמות"
     },
     "API": {
-      "SUCCESS_MESSAGE": "שינתה את הסיסמה בהצלחה.",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
+      "SUCCESS_MESSAGE": "שינתה את הסיסמה בהצלחה",
+      "ERROR_MESSAGE": "לא ניתן להתחבר לשרת Woot, נסה שוב מאוחר יותר"
     },
     "CAPTCHA": {
       "ERROR": "פג תוקף האימות. נא לפתור שוב את ה-captcha."
diff --git a/app/javascript/dashboard/i18n/locale/he/signup.json b/app/javascript/dashboard/i18n/locale/he/signup.json
index 17dc4ed65..a8d580aa4 100644
--- a/app/javascript/dashboard/i18n/locale/he/signup.json
+++ b/app/javascript/dashboard/i18n/locale/he/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "שם החברה",
-      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
-      "ERROR": "שם החברה קצר מדי."
+      "PLACEHOLDER": "הזן את שם החברה שלך. למשל: Wayne Enterprises",
+      "ERROR": "שם החברה קצר מדי"
     },
     "FULL_NAME": {
       "LABEL": "שם מלא",
-      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
-      "ERROR": "השם המלא קצר מדי."
+      "PLACEHOLDER": "הזן את שמך המלא. למשל: ברוס וויין",
+      "ERROR": "השם המלא קצר מדי"
     },
     "EMAIL": {
       "LABEL": "מייל עבודה",
-      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
-      "ERROR": "אנא הזן כתובת דוא\"ל חוקית לעבודה."
+      "PLACEHOLDER": "הזן את כתובת הדוא\"ל שלך בעבודה. למשל: bruce@wayne.enterprises",
+      "ERROR": "אנא הזן כתובת דוא\"ל חוקית לעבודה"
     },
     "PASSWORD": {
       "LABEL": "סיסמה",
       "PLACEHOLDER": "סיסמה",
-      "ERROR": "הסיסמה קצרה מדי.",
-      "IS_INVALID_PASSWORD": "הסיסמה צריכה להכיל לפחות אות אחת גדולה, אות קטנה אחת, מספר אחד ותו מיוחד אחד."
+      "ERROR": "הסיסמה קצרה מדי",
+      "IS_INVALID_PASSWORD": "הסיסמה צריכה להכיל לפחות אות אחת גדולה, אות קטנה אחת, מספר אחד ותו מיוחד אחד"
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirm password",
-      "PLACEHOLDER": "Confirm password",
-      "ERROR": "סיסמה לא מתאימה."
+      "LABEL": "אמת סיסמה",
+      "PLACEHOLDER": "אמת סיסמה",
+      "ERROR": "סיסמה לא מתאימה"
     },
     "API": {
       "SUCCESS_MESSAGE": "ההרשמה הצליחה",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
+      "ERROR_MESSAGE": "לא ניתן להתחבר לשרת Woot, נסה שוב מאוחר יותר"
     },
     "SUBMIT": "צור חשבון",
     "HAVE_AN_ACCOUNT": "כבר יש לך חשבון?"
diff --git a/app/javascript/dashboard/i18n/locale/hi/chatlist.json b/app/javascript/dashboard/i18n/locale/hi/chatlist.json
index b96cfb976..6312d4c9f 100644
--- a/app/javascript/dashboard/i18n/locale/hi/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/hi/chatlist.json
@@ -35,6 +35,20 @@
         "TEXT": "All"
       }
     },
+    "VIEW_FILTER": "View",
+    "SORT_TOOLTIP_LABEL": "Sort conversations",
+    "CHAT_SORT": {
+      "STATUS": "Status",
+      "ORDER_BY": "Order by"
+    },
+    "CHAT_SORT_FILTER_ITEMS": {
+      "latest": {
+        "TEXT": "Last activity"
+      },
+      "sort_on_created_at": {
+        "TEXT": "Created at"
+      }
+    },
     "ATTACHMENTS": {
       "image": {
         "CONTENT": "Picture message"
@@ -55,6 +69,24 @@
         "CONTENT": "has shared a url"
       }
     },
+    "CHAT_SORT_BY_FILTER": {
+      "TITLE": "Sort conversation",
+      "DROPDOWN_TITLE": "Sort by",
+      "ITEMS": {
+        "LATEST": {
+          "NAME": "Last activity at",
+          "LABEL": "Last activity"
+        },
+        "CREATED_AT": {
+          "NAME": "Created at",
+          "LABEL": "Created at"
+        },
+        "LAST_USER_MESSAGE_AT": {
+          "NAME": "Last user message at",
+          "LABEL": "Last message"
+        }
+      }
+    },
     "RECEIVED_VIA_EMAIL": "Received via email",
     "VIEW_TWEET_IN_TWITTER": "View tweet in Twitter",
     "REPLY_TO_TWEET": "Reply to this tweet",
diff --git a/app/javascript/dashboard/i18n/locale/hi/contact.json b/app/javascript/dashboard/i18n/locale/hi/contact.json
index 4d1736ed0..80c8878e1 100644
--- a/app/javascript/dashboard/i18n/locale/hi/contact.json
+++ b/app/javascript/dashboard/i18n/locale/hi/contact.json
@@ -120,7 +120,7 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Enter the phone number of the contact",
         "LABEL": "Phone Number",
-        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
+        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]",
         "ERROR": "Phone number should be either empty or of E.164 format",
         "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "This phone number is in use for another contact."
@@ -182,7 +182,7 @@
         "LABEL": "To"
       },
       "INBOX": {
-        "LABEL": "Via Inbox",
+        "LABEL": "Inbox",
         "PLACEHOLDER": "Choose source inbox",
         "ERROR": "Select an inbox"
       },
diff --git a/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json
index 407441618..d4efb200c 100644
--- a/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json
@@ -464,6 +464,7 @@
       "AUTO_ASSIGNMENT_SUB_TEXT": "Enable or disable the automatic assignment of new conversations to the agents added to this inbox.",
       "HMAC_VERIFICATION": "User Identity Validation",
       "HMAC_DESCRIPTION": "In order to validate the user's identity, you can pass an `identifier_hash` for each user. You can generate a HMAC sha256 hash using the `identifier` with the key shown here.",
+      "HMAC_LINK_TO_DOCS": "You can read more here.",
       "HMAC_MANDATORY_VERIFICATION": "Enforce User Identity Validation",
       "HMAC_MANDATORY_DESCRIPTION": "If enabled, requests missing the `identifier_hash` will be rejected.",
       "INBOX_IDENTIFIER": "Inbox Identifier",
diff --git a/app/javascript/dashboard/i18n/locale/hi/login.json b/app/javascript/dashboard/i18n/locale/hi/login.json
index f2b2f51b9..25c956a81 100644
--- a/app/javascript/dashboard/i18n/locale/hi/login.json
+++ b/app/javascript/dashboard/i18n/locale/hi/login.json
@@ -3,16 +3,16 @@
     "TITLE": "Login to Chatwoot",
     "EMAIL": {
       "LABEL": "Email",
-      "PLACEHOLDER": "example@companyname.com"
+      "PLACEHOLDER": "Email eg: someone@example.com"
     },
     "PASSWORD": {
       "LABEL": "Password",
       "PLACEHOLDER": "Password"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Login successful",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again.",
-      "UNAUTH": "Username or password is incorrect. Please try again."
+      "SUCCESS_MESSAGE": "Login Successful",
+      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later",
+      "UNAUTH": "Username / Password Incorrect. Please try again"
     },
     "OAUTH": {
       "GOOGLE_LOGIN": "Login with Google",
diff --git a/app/javascript/dashboard/i18n/locale/hi/resetPassword.json b/app/javascript/dashboard/i18n/locale/hi/resetPassword.json
index 37aa1860a..6158ddf54 100644
--- a/app/javascript/dashboard/i18n/locale/hi/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/hi/resetPassword.json
@@ -8,7 +8,7 @@
     },
     "API": {
       "SUCCESS_MESSAGE": "Password reset link has been sent to your email.",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
+      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
     },
     "SUBMIT": "Submit"
   }
diff --git a/app/javascript/dashboard/i18n/locale/hi/search.json b/app/javascript/dashboard/i18n/locale/hi/search.json
index 9044bf5f9..418572c0c 100644
--- a/app/javascript/dashboard/i18n/locale/hi/search.json
+++ b/app/javascript/dashboard/i18n/locale/hi/search.json
@@ -14,8 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
-    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
+    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/hi/setNewPassword.json b/app/javascript/dashboard/i18n/locale/hi/setNewPassword.json
index 4908dad02..a8a259dec 100644
--- a/app/javascript/dashboard/i18n/locale/hi/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/hi/setNewPassword.json
@@ -13,7 +13,7 @@
     },
     "API": {
       "SUCCESS_MESSAGE": "Successfully changed the password.",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
+      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
     },
     "CAPTCHA": {
       "ERROR": "Verification expired. Please solve captcha again."
diff --git a/app/javascript/dashboard/i18n/locale/hi/signup.json b/app/javascript/dashboard/i18n/locale/hi/signup.json
index 1ad4865ff..10ddc5b86 100644
--- a/app/javascript/dashboard/i18n/locale/hi/signup.json
+++ b/app/javascript/dashboard/i18n/locale/hi/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Company name",
-      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
-      "ERROR": "Company name is too short."
+      "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
+      "ERROR": "Company name is too short"
     },
     "FULL_NAME": {
       "LABEL": "Full name",
-      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
-      "ERROR": "Full name is too short."
+      "PLACEHOLDER": "Enter your full name. eg: Bruce Wayne",
+      "ERROR": "Full name is too short"
     },
     "EMAIL": {
       "LABEL": "Work email",
-      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
-      "ERROR": "Please enter a valid work email address."
+      "PLACEHOLDER": "Enter your work email address. eg: bruce@wayne.enterprises",
+      "ERROR": "Please enter a valid work email address"
     },
     "PASSWORD": {
       "LABEL": "Password",
       "PLACEHOLDER": "Password",
-      "ERROR": "Password is too short.",
-      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character."
+      "ERROR": "Password is too short",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirm password",
-      "PLACEHOLDER": "Confirm password",
-      "ERROR": "Password doesnot match."
+      "LABEL": "Confirm Password",
+      "PLACEHOLDER": "Confirm Password",
+      "ERROR": "Password doesnot match"
     },
     "API": {
       "SUCCESS_MESSAGE": "Registration Successfull",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
+      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
     },
     "SUBMIT": "Create account",
     "HAVE_AN_ACCOUNT": "Already have an account?"
diff --git a/app/javascript/dashboard/i18n/locale/hr/chatlist.json b/app/javascript/dashboard/i18n/locale/hr/chatlist.json
index b96cfb976..6312d4c9f 100644
--- a/app/javascript/dashboard/i18n/locale/hr/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/hr/chatlist.json
@@ -35,6 +35,20 @@
         "TEXT": "All"
       }
     },
+    "VIEW_FILTER": "View",
+    "SORT_TOOLTIP_LABEL": "Sort conversations",
+    "CHAT_SORT": {
+      "STATUS": "Status",
+      "ORDER_BY": "Order by"
+    },
+    "CHAT_SORT_FILTER_ITEMS": {
+      "latest": {
+        "TEXT": "Last activity"
+      },
+      "sort_on_created_at": {
+        "TEXT": "Created at"
+      }
+    },
     "ATTACHMENTS": {
       "image": {
         "CONTENT": "Picture message"
@@ -55,6 +69,24 @@
         "CONTENT": "has shared a url"
       }
     },
+    "CHAT_SORT_BY_FILTER": {
+      "TITLE": "Sort conversation",
+      "DROPDOWN_TITLE": "Sort by",
+      "ITEMS": {
+        "LATEST": {
+          "NAME": "Last activity at",
+          "LABEL": "Last activity"
+        },
+        "CREATED_AT": {
+          "NAME": "Created at",
+          "LABEL": "Created at"
+        },
+        "LAST_USER_MESSAGE_AT": {
+          "NAME": "Last user message at",
+          "LABEL": "Last message"
+        }
+      }
+    },
     "RECEIVED_VIA_EMAIL": "Received via email",
     "VIEW_TWEET_IN_TWITTER": "View tweet in Twitter",
     "REPLY_TO_TWEET": "Reply to this tweet",
diff --git a/app/javascript/dashboard/i18n/locale/hr/contact.json b/app/javascript/dashboard/i18n/locale/hr/contact.json
index a7767f8f4..a7d6e1d88 100644
--- a/app/javascript/dashboard/i18n/locale/hr/contact.json
+++ b/app/javascript/dashboard/i18n/locale/hr/contact.json
@@ -120,7 +120,7 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Enter the phone number of the contact",
         "LABEL": "Phone Number",
-        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
+        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]",
         "ERROR": "Phone number should be either empty or of E.164 format",
         "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "This phone number is in use for another contact."
@@ -182,7 +182,7 @@
         "LABEL": "To"
       },
       "INBOX": {
-        "LABEL": "Kroz Inbox",
+        "LABEL": "Inbox",
         "PLACEHOLDER": "Izaberi izvorišni inbox",
         "ERROR": "Select an inbox"
       },
diff --git a/app/javascript/dashboard/i18n/locale/hr/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/hr/inboxMgmt.json
index 5887669b2..31e72a817 100644
--- a/app/javascript/dashboard/i18n/locale/hr/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hr/inboxMgmt.json
@@ -464,6 +464,7 @@
       "AUTO_ASSIGNMENT_SUB_TEXT": "Enable or disable the automatic assignment of new conversations to the agents added to this inbox.",
       "HMAC_VERIFICATION": "User Identity Validation",
       "HMAC_DESCRIPTION": "In order to validate the user's identity, you can pass an `identifier_hash` for each user. You can generate a HMAC sha256 hash using the `identifier` with the key shown here.",
+      "HMAC_LINK_TO_DOCS": "Ovdje možete pročitati više.",
       "HMAC_MANDATORY_VERIFICATION": "Enforce User Identity Validation",
       "HMAC_MANDATORY_DESCRIPTION": "If enabled, requests missing the `identifier_hash` will be rejected.",
       "INBOX_IDENTIFIER": "Inbox Identifier",
diff --git a/app/javascript/dashboard/i18n/locale/hr/login.json b/app/javascript/dashboard/i18n/locale/hr/login.json
index e8b8494a0..25c956a81 100644
--- a/app/javascript/dashboard/i18n/locale/hr/login.json
+++ b/app/javascript/dashboard/i18n/locale/hr/login.json
@@ -3,16 +3,16 @@
     "TITLE": "Login to Chatwoot",
     "EMAIL": {
       "LABEL": "Email",
-      "PLACEHOLDER": "primjer@imetvrtke.com"
+      "PLACEHOLDER": "Email eg: someone@example.com"
     },
     "PASSWORD": {
       "LABEL": "Password",
       "PLACEHOLDER": "Password"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Prijava uspješna",
-      "ERROR_MESSAGE": "Nije uspjelo spajanje na Woot server. Molimo pokušajte ponovno.",
-      "UNAUTH": "Korisničko ime ili lozinka je pogrešno. Molimo, pokušajte ponovno."
+      "SUCCESS_MESSAGE": "Login Successful",
+      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later",
+      "UNAUTH": "Username / Password Incorrect. Please try again"
     },
     "OAUTH": {
       "GOOGLE_LOGIN": "Login with Google",
diff --git a/app/javascript/dashboard/i18n/locale/hr/resetPassword.json b/app/javascript/dashboard/i18n/locale/hr/resetPassword.json
index 9208731c8..bb678e809 100644
--- a/app/javascript/dashboard/i18n/locale/hr/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/hr/resetPassword.json
@@ -1,14 +1,14 @@
 {
   "RESET_PASSWORD": {
-    "TITLE": "Reset lozinke",
+    "TITLE": "Reset Password",
     "EMAIL": {
       "LABEL": "Email",
-      "PLACEHOLDER": "Molimo, unesite e-mail.",
-      "ERROR": "Molimo, unesite validan e-mail."
+      "PLACEHOLDER": "Please enter your email",
+      "ERROR": "Please enter a valid email"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Link za reset lozinke je poslan na zadani e-mail.",
-      "ERROR_MESSAGE": "Nije uspjelo spajanje na Woot server. Molimo pokušajte ponovno."
+      "SUCCESS_MESSAGE": "Password reset link has been sent to your email",
+      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
     },
     "SUBMIT": "Submit"
   }
diff --git a/app/javascript/dashboard/i18n/locale/hr/search.json b/app/javascript/dashboard/i18n/locale/hr/search.json
index 2e2c9994d..418572c0c 100644
--- a/app/javascript/dashboard/i18n/locale/hr/search.json
+++ b/app/javascript/dashboard/i18n/locale/hr/search.json
@@ -14,8 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Unesi 3 ili više znakova za pretragu",
-    "EMPTY_STATE_DEFAULT": "Traži po conversation id, e-mail, broj telefona, poruke za bolje rezultate pretrage. ",
+    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/hr/setNewPassword.json b/app/javascript/dashboard/i18n/locale/hr/setNewPassword.json
index 84575c6a1..ec2d94744 100644
--- a/app/javascript/dashboard/i18n/locale/hr/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/hr/setNewPassword.json
@@ -1,19 +1,19 @@
 {
   "SET_NEW_PASSWORD": {
-    "TITLE": "Postavi novu lozinku",
+    "TITLE": "Set New Password",
     "PASSWORD": {
       "LABEL": "Password",
       "PLACEHOLDER": "Password",
-      "ERROR": "Lozinka je prekratka."
+      "ERROR": "Password is too short"
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Potvrdi lozinku",
+      "LABEL": "Confirm Password",
       "PLACEHOLDER": "Confirm Password",
-      "ERROR": "Lozinke se ne poklapaju."
+      "ERROR": "Passwords do not match"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Lozinka je uspješno promijenjena.",
-      "ERROR_MESSAGE": "Nije uspjelo spajanje na Woot server. Molimo pokušajte ponovno."
+      "SUCCESS_MESSAGE": "Successfully changed the password",
+      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
     },
     "CAPTCHA": {
       "ERROR": "Verification expired. Please solve captcha again."
diff --git a/app/javascript/dashboard/i18n/locale/hr/signup.json b/app/javascript/dashboard/i18n/locale/hr/signup.json
index a9fec9396..10ddc5b86 100644
--- a/app/javascript/dashboard/i18n/locale/hr/signup.json
+++ b/app/javascript/dashboard/i18n/locale/hr/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Company name",
-      "PLACEHOLDER": "Unesi ime svoje tvrtke. Npr., Wayne Enterprises",
-      "ERROR": "Ime tvrtke je prekratko."
+      "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
+      "ERROR": "Company name is too short"
     },
     "FULL_NAME": {
       "LABEL": "Full name",
-      "PLACEHOLDER": "Unesi svoje puno ime. Npr, Bruce Wayne",
-      "ERROR": "Puno ime je prekratko."
+      "PLACEHOLDER": "Enter your full name. eg: Bruce Wayne",
+      "ERROR": "Full name is too short"
     },
     "EMAIL": {
       "LABEL": "Work email",
-      "PLACEHOLDER": "Unesi svoju poslovnu e-mail adresu. Npr., bruce@wayne.enterprises",
-      "ERROR": "Unesi validnu poslovnu e-mail adresu."
+      "PLACEHOLDER": "Enter your work email address. eg: bruce@wayne.enterprises",
+      "ERROR": "Please enter a valid work email address"
     },
     "PASSWORD": {
       "LABEL": "Password",
       "PLACEHOLDER": "Password",
-      "ERROR": "Lozinka je prekratka.",
-      "IS_INVALID_PASSWORD": "Lozinka mora sadržavati barem 1 veliko slovo, 1 malo slovo, 1 broj i 1 posebni znak."
+      "ERROR": "Password is too short",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Potvrdi lozinku",
-      "PLACEHOLDER": "Potvrdi lozinku",
-      "ERROR": "Lozinke se ne poklapaju."
+      "LABEL": "Confirm Password",
+      "PLACEHOLDER": "Confirm Password",
+      "ERROR": "Password doesnot match"
     },
     "API": {
       "SUCCESS_MESSAGE": "Registration Successfull",
-      "ERROR_MESSAGE": "Nije uspjelo spajanje na Woot server. Molimo pokušajte ponovno."
+      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
     },
     "SUBMIT": "Create account",
     "HAVE_AN_ACCOUNT": "Already have an account?"
diff --git a/app/javascript/dashboard/i18n/locale/hu/chatlist.json b/app/javascript/dashboard/i18n/locale/hu/chatlist.json
index 189899d1f..47dba0c43 100644
--- a/app/javascript/dashboard/i18n/locale/hu/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/hu/chatlist.json
@@ -35,6 +35,20 @@
         "TEXT": "Mind"
       }
     },
+    "VIEW_FILTER": "Megtekintés",
+    "SORT_TOOLTIP_LABEL": "Sort conversations",
+    "CHAT_SORT": {
+      "STATUS": "Státusz",
+      "ORDER_BY": "Order by"
+    },
+    "CHAT_SORT_FILTER_ITEMS": {
+      "latest": {
+        "TEXT": "Last activity"
+      },
+      "sort_on_created_at": {
+        "TEXT": "Created at"
+      }
+    },
     "ATTACHMENTS": {
       "image": {
         "CONTENT": "Képüzenet"
@@ -55,6 +69,24 @@
         "CONTENT": "megosztott URL-t tartalmaz"
       }
     },
+    "CHAT_SORT_BY_FILTER": {
+      "TITLE": "Sort conversation",
+      "DROPDOWN_TITLE": "Sort by",
+      "ITEMS": {
+        "LATEST": {
+          "NAME": "Last activity at",
+          "LABEL": "Last activity"
+        },
+        "CREATED_AT": {
+          "NAME": "Created at",
+          "LABEL": "Created at"
+        },
+        "LAST_USER_MESSAGE_AT": {
+          "NAME": "Last user message at",
+          "LABEL": "Last message"
+        }
+      }
+    },
     "RECEIVED_VIA_EMAIL": "E-mailen keresztül érkezett",
     "VIEW_TWEET_IN_TWITTER": "Üzenet megtekintése Twitteren",
     "REPLY_TO_TWEET": "Válasz",
diff --git a/app/javascript/dashboard/i18n/locale/hu/contact.json b/app/javascript/dashboard/i18n/locale/hu/contact.json
index d2c773dbe..8e48dffa9 100644
--- a/app/javascript/dashboard/i18n/locale/hu/contact.json
+++ b/app/javascript/dashboard/i18n/locale/hu/contact.json
@@ -120,7 +120,7 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "A kontakt telefonszámának megadása",
         "LABEL": "Telefonszám",
-        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
+        "HELP": "A telefonszámnak E.164 formátumúnak kell lennie, pl: +[+][országkód][körzetszám][helyi telefonszám]",
         "ERROR": "A telefonszámnak üresnek vagy E.164 formátumúnak kell lennie",
         "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "Ez a telefonszám már egy másik kontakthoz tartozik."
@@ -182,7 +182,7 @@
         "LABEL": "Ide"
       },
       "INBOX": {
-        "LABEL": "Via Inbox",
+        "LABEL": "Fiók",
         "PLACEHOLDER": "Choose source inbox",
         "ERROR": "Válassz egy fiókot"
       },
diff --git a/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json
index 8865e5966..11b349ca3 100644
--- a/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json
@@ -464,6 +464,7 @@
       "AUTO_ASSIGNMENT_SUB_TEXT": "Bekapcsolása vagy kikapcsolása az inboxhoz kapcsolódó automatikus ügynökhozzárendelésnek új beszélgetések esetén.",
       "HMAC_VERIFICATION": "Felhasználói fiók validálás",
       "HMAC_DESCRIPTION": "In order to validate the user's identity, you can pass an `identifier_hash` for each user. You can generate a HMAC sha256 hash using the `identifier` with the key shown here.",
+      "HMAC_LINK_TO_DOCS": "You can read more here.",
       "HMAC_MANDATORY_VERIFICATION": "Enforce User Identity Validation",
       "HMAC_MANDATORY_DESCRIPTION": "If enabled, requests missing the `identifier_hash` will be rejected.",
       "INBOX_IDENTIFIER": "Inbox Identifier",
diff --git a/app/javascript/dashboard/i18n/locale/hu/login.json b/app/javascript/dashboard/i18n/locale/hu/login.json
index f03db3997..c99045ffd 100644
--- a/app/javascript/dashboard/i18n/locale/hu/login.json
+++ b/app/javascript/dashboard/i18n/locale/hu/login.json
@@ -3,16 +3,16 @@
     "TITLE": "Chatwoot belépés",
     "EMAIL": {
       "LABEL": "E-mail",
-      "PLACEHOLDER": "example@companyname.com"
+      "PLACEHOLDER": "E-mail pl.: valaki@példa.hu"
     },
     "PASSWORD": {
       "LABEL": "Jelszó",
       "PLACEHOLDER": "Jelszó"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Login successful",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again.",
-      "UNAUTH": "Username or password is incorrect. Please try again."
+      "SUCCESS_MESSAGE": "Bejelentkezés sikeres",
+      "ERROR_MESSAGE": "Nem sikerült csatlakozni a Woot szerverhez, kérjük próbáld később",
+      "UNAUTH": "A felhasználó / jelszó helytelen. Kérjük próbálja újra"
     },
     "OAUTH": {
       "GOOGLE_LOGIN": "Login with Google",
diff --git a/app/javascript/dashboard/i18n/locale/hu/resetPassword.json b/app/javascript/dashboard/i18n/locale/hu/resetPassword.json
index acb9f3193..b60382a4d 100644
--- a/app/javascript/dashboard/i18n/locale/hu/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/hu/resetPassword.json
@@ -8,7 +8,7 @@
     },
     "API": {
       "SUCCESS_MESSAGE": "A jelszó helyreállító linket e-mailben elküldtük.",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
+      "ERROR_MESSAGE": "Nem sikerült csatlakozni a Woot szerverhez, kérjük próbáld később"
     },
     "SUBMIT": "Elküldés"
   }
diff --git a/app/javascript/dashboard/i18n/locale/hu/search.json b/app/javascript/dashboard/i18n/locale/hu/search.json
index 739bc8c77..21d4522e5 100644
--- a/app/javascript/dashboard/i18n/locale/hu/search.json
+++ b/app/javascript/dashboard/i18n/locale/hu/search.json
@@ -14,8 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
-    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
+    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/hu/setNewPassword.json b/app/javascript/dashboard/i18n/locale/hu/setNewPassword.json
index b3ff813ea..3b2bc6844 100644
--- a/app/javascript/dashboard/i18n/locale/hu/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/hu/setNewPassword.json
@@ -13,7 +13,7 @@
     },
     "API": {
       "SUCCESS_MESSAGE": "Jelszó sikeresen megváltoztatva.",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
+      "ERROR_MESSAGE": "Nem sikerült csatlakozni a Woot szerverhez, kérjük próbáld később"
     },
     "CAPTCHA": {
       "ERROR": "Verification expired. Please solve captcha again."
diff --git a/app/javascript/dashboard/i18n/locale/hu/signup.json b/app/javascript/dashboard/i18n/locale/hu/signup.json
index e43d2f960..13453510b 100644
--- a/app/javascript/dashboard/i18n/locale/hu/signup.json
+++ b/app/javascript/dashboard/i18n/locale/hu/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Company name",
-      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
-      "ERROR": "Company name is too short."
+      "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
+      "ERROR": "Company name is too short"
     },
     "FULL_NAME": {
       "LABEL": "Teljes név",
-      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
-      "ERROR": "A teljes név túl rövid."
+      "PLACEHOLDER": "Add meg a teljes neved. Pl.: Kovács János",
+      "ERROR": "A teljes név túl rövid"
     },
     "EMAIL": {
       "LABEL": "Munkahelyi e-mail",
-      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
-      "ERROR": "Please enter a valid work email address."
+      "PLACEHOLDER": "Add meg munkahelyi e-mailcímed. Pl. kovacs.janos@email.hu",
+      "ERROR": "Please enter a valid work email address"
     },
     "PASSWORD": {
       "LABEL": "Jelszó",
       "PLACEHOLDER": "Jelszó",
-      "ERROR": "A jelszó túl rövid.",
-      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character."
+      "ERROR": "A jelszó túl rövid",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirm password",
-      "PLACEHOLDER": "Confirm password",
-      "ERROR": "A jelszavak nem egyeznek."
+      "LABEL": "Jelszó megerősítése",
+      "PLACEHOLDER": "Jelszó megerősítése",
+      "ERROR": "A jelszavak nem egyeznek"
     },
     "API": {
       "SUCCESS_MESSAGE": "Sikeres regisztráció",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
+      "ERROR_MESSAGE": "Nem sikerült csatlakozni a Woot szerverhez, kérjük próbáld később"
     },
     "SUBMIT": "Create account",
     "HAVE_AN_ACCOUNT": "Már van fiókod?"
diff --git a/app/javascript/dashboard/i18n/locale/hy/chatlist.json b/app/javascript/dashboard/i18n/locale/hy/chatlist.json
index b96cfb976..6312d4c9f 100644
--- a/app/javascript/dashboard/i18n/locale/hy/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/hy/chatlist.json
@@ -35,6 +35,20 @@
         "TEXT": "All"
       }
     },
+    "VIEW_FILTER": "View",
+    "SORT_TOOLTIP_LABEL": "Sort conversations",
+    "CHAT_SORT": {
+      "STATUS": "Status",
+      "ORDER_BY": "Order by"
+    },
+    "CHAT_SORT_FILTER_ITEMS": {
+      "latest": {
+        "TEXT": "Last activity"
+      },
+      "sort_on_created_at": {
+        "TEXT": "Created at"
+      }
+    },
     "ATTACHMENTS": {
       "image": {
         "CONTENT": "Picture message"
@@ -55,6 +69,24 @@
         "CONTENT": "has shared a url"
       }
     },
+    "CHAT_SORT_BY_FILTER": {
+      "TITLE": "Sort conversation",
+      "DROPDOWN_TITLE": "Sort by",
+      "ITEMS": {
+        "LATEST": {
+          "NAME": "Last activity at",
+          "LABEL": "Last activity"
+        },
+        "CREATED_AT": {
+          "NAME": "Created at",
+          "LABEL": "Created at"
+        },
+        "LAST_USER_MESSAGE_AT": {
+          "NAME": "Last user message at",
+          "LABEL": "Last message"
+        }
+      }
+    },
     "RECEIVED_VIA_EMAIL": "Received via email",
     "VIEW_TWEET_IN_TWITTER": "View tweet in Twitter",
     "REPLY_TO_TWEET": "Reply to this tweet",
diff --git a/app/javascript/dashboard/i18n/locale/hy/contact.json b/app/javascript/dashboard/i18n/locale/hy/contact.json
index 4d1736ed0..80c8878e1 100644
--- a/app/javascript/dashboard/i18n/locale/hy/contact.json
+++ b/app/javascript/dashboard/i18n/locale/hy/contact.json
@@ -120,7 +120,7 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Enter the phone number of the contact",
         "LABEL": "Phone Number",
-        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
+        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]",
         "ERROR": "Phone number should be either empty or of E.164 format",
         "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "This phone number is in use for another contact."
@@ -182,7 +182,7 @@
         "LABEL": "To"
       },
       "INBOX": {
-        "LABEL": "Via Inbox",
+        "LABEL": "Inbox",
         "PLACEHOLDER": "Choose source inbox",
         "ERROR": "Select an inbox"
       },
diff --git a/app/javascript/dashboard/i18n/locale/hy/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/hy/inboxMgmt.json
index 97a4ee2f6..ff1781a92 100644
--- a/app/javascript/dashboard/i18n/locale/hy/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hy/inboxMgmt.json
@@ -464,6 +464,7 @@
       "AUTO_ASSIGNMENT_SUB_TEXT": "Enable or disable the automatic assignment of new conversations to the agents added to this inbox.",
       "HMAC_VERIFICATION": "User Identity Validation",
       "HMAC_DESCRIPTION": "In order to validate the user's identity, you can pass an `identifier_hash` for each user. You can generate a HMAC sha256 hash using the `identifier` with the key shown here.",
+      "HMAC_LINK_TO_DOCS": "You can read more here.",
       "HMAC_MANDATORY_VERIFICATION": "Enforce User Identity Validation",
       "HMAC_MANDATORY_DESCRIPTION": "If enabled, requests missing the `identifier_hash` will be rejected.",
       "INBOX_IDENTIFIER": "Inbox Identifier",
diff --git a/app/javascript/dashboard/i18n/locale/hy/login.json b/app/javascript/dashboard/i18n/locale/hy/login.json
index f2b2f51b9..25c956a81 100644
--- a/app/javascript/dashboard/i18n/locale/hy/login.json
+++ b/app/javascript/dashboard/i18n/locale/hy/login.json
@@ -3,16 +3,16 @@
     "TITLE": "Login to Chatwoot",
     "EMAIL": {
       "LABEL": "Email",
-      "PLACEHOLDER": "example@companyname.com"
+      "PLACEHOLDER": "Email eg: someone@example.com"
     },
     "PASSWORD": {
       "LABEL": "Password",
       "PLACEHOLDER": "Password"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Login successful",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again.",
-      "UNAUTH": "Username or password is incorrect. Please try again."
+      "SUCCESS_MESSAGE": "Login Successful",
+      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later",
+      "UNAUTH": "Username / Password Incorrect. Please try again"
     },
     "OAUTH": {
       "GOOGLE_LOGIN": "Login with Google",
diff --git a/app/javascript/dashboard/i18n/locale/hy/resetPassword.json b/app/javascript/dashboard/i18n/locale/hy/resetPassword.json
index 37aa1860a..bb678e809 100644
--- a/app/javascript/dashboard/i18n/locale/hy/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/hy/resetPassword.json
@@ -1,14 +1,14 @@
 {
   "RESET_PASSWORD": {
-    "TITLE": "Reset password",
+    "TITLE": "Reset Password",
     "EMAIL": {
       "LABEL": "Email",
-      "PLACEHOLDER": "Please enter your email.",
-      "ERROR": "Please enter a valid email."
+      "PLACEHOLDER": "Please enter your email",
+      "ERROR": "Please enter a valid email"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Password reset link has been sent to your email.",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
+      "SUCCESS_MESSAGE": "Password reset link has been sent to your email",
+      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
     },
     "SUBMIT": "Submit"
   }
diff --git a/app/javascript/dashboard/i18n/locale/hy/search.json b/app/javascript/dashboard/i18n/locale/hy/search.json
index 9044bf5f9..418572c0c 100644
--- a/app/javascript/dashboard/i18n/locale/hy/search.json
+++ b/app/javascript/dashboard/i18n/locale/hy/search.json
@@ -14,8 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
-    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
+    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/hy/setNewPassword.json b/app/javascript/dashboard/i18n/locale/hy/setNewPassword.json
index 4908dad02..ec2d94744 100644
--- a/app/javascript/dashboard/i18n/locale/hy/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/hy/setNewPassword.json
@@ -1,19 +1,19 @@
 {
   "SET_NEW_PASSWORD": {
-    "TITLE": "Set new password",
+    "TITLE": "Set New Password",
     "PASSWORD": {
       "LABEL": "Password",
       "PLACEHOLDER": "Password",
-      "ERROR": "Password is too short."
+      "ERROR": "Password is too short"
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirm password",
+      "LABEL": "Confirm Password",
       "PLACEHOLDER": "Confirm Password",
-      "ERROR": "Passwords do not match."
+      "ERROR": "Passwords do not match"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Successfully changed the password.",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
+      "SUCCESS_MESSAGE": "Successfully changed the password",
+      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
     },
     "CAPTCHA": {
       "ERROR": "Verification expired. Please solve captcha again."
diff --git a/app/javascript/dashboard/i18n/locale/hy/signup.json b/app/javascript/dashboard/i18n/locale/hy/signup.json
index 1ad4865ff..10ddc5b86 100644
--- a/app/javascript/dashboard/i18n/locale/hy/signup.json
+++ b/app/javascript/dashboard/i18n/locale/hy/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Company name",
-      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
-      "ERROR": "Company name is too short."
+      "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
+      "ERROR": "Company name is too short"
     },
     "FULL_NAME": {
       "LABEL": "Full name",
-      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
-      "ERROR": "Full name is too short."
+      "PLACEHOLDER": "Enter your full name. eg: Bruce Wayne",
+      "ERROR": "Full name is too short"
     },
     "EMAIL": {
       "LABEL": "Work email",
-      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
-      "ERROR": "Please enter a valid work email address."
+      "PLACEHOLDER": "Enter your work email address. eg: bruce@wayne.enterprises",
+      "ERROR": "Please enter a valid work email address"
     },
     "PASSWORD": {
       "LABEL": "Password",
       "PLACEHOLDER": "Password",
-      "ERROR": "Password is too short.",
-      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character."
+      "ERROR": "Password is too short",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirm password",
-      "PLACEHOLDER": "Confirm password",
-      "ERROR": "Password doesnot match."
+      "LABEL": "Confirm Password",
+      "PLACEHOLDER": "Confirm Password",
+      "ERROR": "Password doesnot match"
     },
     "API": {
       "SUCCESS_MESSAGE": "Registration Successfull",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
+      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
     },
     "SUBMIT": "Create account",
     "HAVE_AN_ACCOUNT": "Already have an account?"
diff --git a/app/javascript/dashboard/i18n/locale/id/chatlist.json b/app/javascript/dashboard/i18n/locale/id/chatlist.json
index b7db094ba..82d67c984 100644
--- a/app/javascript/dashboard/i18n/locale/id/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/id/chatlist.json
@@ -35,6 +35,20 @@
         "TEXT": "Semua"
       }
     },
+    "VIEW_FILTER": "Lihat",
+    "SORT_TOOLTIP_LABEL": "Sort conversations",
+    "CHAT_SORT": {
+      "STATUS": "Status",
+      "ORDER_BY": "Order by"
+    },
+    "CHAT_SORT_FILTER_ITEMS": {
+      "latest": {
+        "TEXT": "Last activity"
+      },
+      "sort_on_created_at": {
+        "TEXT": "Dibuat pada"
+      }
+    },
     "ATTACHMENTS": {
       "image": {
         "CONTENT": "Pesan gambar"
@@ -55,6 +69,24 @@
         "CONTENT": "telah membagikan url"
       }
     },
+    "CHAT_SORT_BY_FILTER": {
+      "TITLE": "Sort conversation",
+      "DROPDOWN_TITLE": "Sort by",
+      "ITEMS": {
+        "LATEST": {
+          "NAME": "Last activity at",
+          "LABEL": "Last activity"
+        },
+        "CREATED_AT": {
+          "NAME": "Dibuat pada",
+          "LABEL": "Dibuat pada"
+        },
+        "LAST_USER_MESSAGE_AT": {
+          "NAME": "Last user message at",
+          "LABEL": "Last message"
+        }
+      }
+    },
     "RECEIVED_VIA_EMAIL": "Diterima melalui email",
     "VIEW_TWEET_IN_TWITTER": "Lihat tweet di Twitter",
     "REPLY_TO_TWEET": "Balas tweet ini",
diff --git a/app/javascript/dashboard/i18n/locale/id/contact.json b/app/javascript/dashboard/i18n/locale/id/contact.json
index ef47b63c0..686221b8f 100644
--- a/app/javascript/dashboard/i18n/locale/id/contact.json
+++ b/app/javascript/dashboard/i18n/locale/id/contact.json
@@ -120,7 +120,7 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Masukkan nomor telepon kontak tersebut",
         "LABEL": "Nomor Telpon",
-        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
+        "HELP": "Nomer telepon harus dalam format E.164 misalnya: +1415555555 [+][kode negara][kode area][nomer telepon]",
         "ERROR": "Nomer telepon harus kosong atau dalam format E. 164",
         "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "Nomer ini sudah dipakai dengan kontak lain."
@@ -182,7 +182,7 @@
         "LABEL": "Ke"
       },
       "INBOX": {
-        "LABEL": "Via Inbox",
+        "LABEL": "Kotak masuk",
         "PLACEHOLDER": "Choose source inbox",
         "ERROR": "Pilih kotak masuk"
       },
diff --git a/app/javascript/dashboard/i18n/locale/id/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/id/inboxMgmt.json
index 6953bb126..fe9ab40e2 100644
--- a/app/javascript/dashboard/i18n/locale/id/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/id/inboxMgmt.json
@@ -464,6 +464,7 @@
       "AUTO_ASSIGNMENT_SUB_TEXT": "Mengaktifkan atau menonaktifkan penugasan otomatis percakapan baru ke agen yang ditambahkan ke kotak masuk ini.",
       "HMAC_VERIFICATION": "Validasi Identitas Pengguna",
       "HMAC_DESCRIPTION": "In order to validate the user's identity, you can pass an `identifier_hash` for each user. You can generate a HMAC sha256 hash using the `identifier` with the key shown here.",
+      "HMAC_LINK_TO_DOCS": "You can read more here.",
       "HMAC_MANDATORY_VERIFICATION": "Enforce User Identity Validation",
       "HMAC_MANDATORY_DESCRIPTION": "If enabled, requests missing the `identifier_hash` will be rejected.",
       "INBOX_IDENTIFIER": "Pengenal Kotak Masuk",
diff --git a/app/javascript/dashboard/i18n/locale/id/login.json b/app/javascript/dashboard/i18n/locale/id/login.json
index ebb72c2b5..b9d216d61 100644
--- a/app/javascript/dashboard/i18n/locale/id/login.json
+++ b/app/javascript/dashboard/i18n/locale/id/login.json
@@ -3,16 +3,16 @@
     "TITLE": "Masuk ke Chatwoot",
     "EMAIL": {
       "LABEL": "Email",
-      "PLACEHOLDER": "example@companyname.com"
+      "PLACEHOLDER": "Email cth: someone@example.com"
     },
     "PASSWORD": {
       "LABEL": "Kata Sandi",
       "PLACEHOLDER": "Kata Sandi"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Login successful",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again.",
-      "UNAUTH": "Username or password is incorrect. Please try again."
+      "SUCCESS_MESSAGE": "Berhasil Masuk",
+      "ERROR_MESSAGE": "Tidak dapat terhubung ke Server Woot, Silahkan coba lagi nanti",
+      "UNAUTH": "Nama Pengguna / Kata Sandi Salah. Silahkan coba lagi"
     },
     "OAUTH": {
       "GOOGLE_LOGIN": "Login with Google",
diff --git a/app/javascript/dashboard/i18n/locale/id/resetPassword.json b/app/javascript/dashboard/i18n/locale/id/resetPassword.json
index 99693c5f6..0c2fcb268 100644
--- a/app/javascript/dashboard/i18n/locale/id/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/id/resetPassword.json
@@ -8,7 +8,7 @@
     },
     "API": {
       "SUCCESS_MESSAGE": "Link pengaturan ulang kata sandi telah dikirim ke email Anda.",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
+      "ERROR_MESSAGE": "Tidak dapat terhubung ke Server Woot, Silahkan coba lagi nanti"
     },
     "SUBMIT": "Kirim"
   }
diff --git a/app/javascript/dashboard/i18n/locale/id/search.json b/app/javascript/dashboard/i18n/locale/id/search.json
index 0a57ae342..e79e2ee85 100644
--- a/app/javascript/dashboard/i18n/locale/id/search.json
+++ b/app/javascript/dashboard/i18n/locale/id/search.json
@@ -14,8 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
-    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
+    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/id/setNewPassword.json b/app/javascript/dashboard/i18n/locale/id/setNewPassword.json
index e965fe73d..6fb9464a5 100644
--- a/app/javascript/dashboard/i18n/locale/id/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/id/setNewPassword.json
@@ -13,7 +13,7 @@
     },
     "API": {
       "SUCCESS_MESSAGE": "Berhasil mengubah kata sandi.",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
+      "ERROR_MESSAGE": "Tidak dapat terhubung ke Server Woot, Silahkan coba lagi nanti"
     },
     "CAPTCHA": {
       "ERROR": "Verification expired. Please solve captcha again."
diff --git a/app/javascript/dashboard/i18n/locale/id/signup.json b/app/javascript/dashboard/i18n/locale/id/signup.json
index a8f7e0292..3253f778a 100644
--- a/app/javascript/dashboard/i18n/locale/id/signup.json
+++ b/app/javascript/dashboard/i18n/locale/id/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Company name",
-      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
-      "ERROR": "Company name is too short."
+      "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
+      "ERROR": "Company name is too short"
     },
     "FULL_NAME": {
       "LABEL": "Nama Lengkap",
-      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
-      "ERROR": "Nama lengkap terlalu pendek."
+      "PLACEHOLDER": "Masukkan nama lengkap Anda. cth: Bruce Wayne",
+      "ERROR": "Nama lengkap terlalu pendek"
     },
     "EMAIL": {
       "LABEL": "Email kantor",
-      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
-      "ERROR": "Please enter a valid work email address."
+      "PLACEHOLDER": "Masukkan alamat email kantor Anda. cth: bruce@wayne.enterprises",
+      "ERROR": "Please enter a valid work email address"
     },
     "PASSWORD": {
       "LABEL": "Kata Sandi",
       "PLACEHOLDER": "Kata Sandi",
-      "ERROR": "Kata sandi terlalu pendek.",
-      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character."
+      "ERROR": "Kata sandi terlalu pendek",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirm password",
-      "PLACEHOLDER": "Confirm password",
-      "ERROR": "Kata Sandi tidak cocok."
+      "LABEL": "Konfirmasi Kata Sandi",
+      "PLACEHOLDER": "Konfirmasi Kata Sandi",
+      "ERROR": "Kata Sandi tidak cocok"
     },
     "API": {
       "SUCCESS_MESSAGE": "Pendaftaran Berhasil",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
+      "ERROR_MESSAGE": "Tidak dapat terhubung ke Server Woot, Silahkan coba lagi nanti"
     },
     "SUBMIT": "Create account",
     "HAVE_AN_ACCOUNT": "Sudah punya akun?"
diff --git a/app/javascript/dashboard/i18n/locale/is/chatlist.json b/app/javascript/dashboard/i18n/locale/is/chatlist.json
index 835cd02d1..37803dc81 100644
--- a/app/javascript/dashboard/i18n/locale/is/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/is/chatlist.json
@@ -35,6 +35,20 @@
         "TEXT": "Allt"
       }
     },
+    "VIEW_FILTER": "Skoða",
+    "SORT_TOOLTIP_LABEL": "Sort conversations",
+    "CHAT_SORT": {
+      "STATUS": "Staða",
+      "ORDER_BY": "Order by"
+    },
+    "CHAT_SORT_FILTER_ITEMS": {
+      "latest": {
+        "TEXT": "Last activity"
+      },
+      "sort_on_created_at": {
+        "TEXT": "Created at"
+      }
+    },
     "ATTACHMENTS": {
       "image": {
         "CONTENT": "Myndaskilaboð"
@@ -55,6 +69,24 @@
         "CONTENT": "hefur deilt vefslóð"
       }
     },
+    "CHAT_SORT_BY_FILTER": {
+      "TITLE": "Sort conversation",
+      "DROPDOWN_TITLE": "Sort by",
+      "ITEMS": {
+        "LATEST": {
+          "NAME": "Last activity at",
+          "LABEL": "Last activity"
+        },
+        "CREATED_AT": {
+          "NAME": "Created at",
+          "LABEL": "Created at"
+        },
+        "LAST_USER_MESSAGE_AT": {
+          "NAME": "Last user message at",
+          "LABEL": "Last message"
+        }
+      }
+    },
     "RECEIVED_VIA_EMAIL": "Móttekið í tölvupósti",
     "VIEW_TWEET_IN_TWITTER": "Opna tíst á Twitter",
     "REPLY_TO_TWEET": "Svara þessu tísti",
diff --git a/app/javascript/dashboard/i18n/locale/is/contact.json b/app/javascript/dashboard/i18n/locale/is/contact.json
index 581bc4e93..bc0699906 100644
--- a/app/javascript/dashboard/i18n/locale/is/contact.json
+++ b/app/javascript/dashboard/i18n/locale/is/contact.json
@@ -120,7 +120,7 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Sláðu inn símanúmer tengiliðs",
         "LABEL": "Símanúmer",
-        "HELP": "Símanúmer skal fylgja E.164 sniðmátinu. Dæmi: +3541112222 [+][landsnúmer][svæðisnúmer][símanúmer]. Þú getur valið landsnúmer úr valmyndinni.",
+        "HELP": "Símanúmer ætti að vera á E.164 sniði, td: +3541234567 [+][landsnúmer][svæðisnúmer][staðbundið símanúmer]",
         "ERROR": "Símanúmer ætti að vera annað hvort autt eða á E.164 sniði",
         "DIAL_CODE_ERROR": "Vinsamlegast veldu landsnúmer úr listanum",
         "DUPLICATE": "Þetta símanúmer er í notkun fyrir annan tengilið."
@@ -182,7 +182,7 @@
         "LABEL": "Til"
       },
       "INBOX": {
-        "LABEL": "Via Inbox",
+        "LABEL": "Inbox",
         "PLACEHOLDER": "Choose source inbox",
         "ERROR": "Veldu innhólf"
       },
diff --git a/app/javascript/dashboard/i18n/locale/is/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/is/inboxMgmt.json
index 6dcfe152b..41bb51842 100644
--- a/app/javascript/dashboard/i18n/locale/is/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/is/inboxMgmt.json
@@ -464,6 +464,7 @@
       "AUTO_ASSIGNMENT_SUB_TEXT": "Virkja eða slökkva á sjálfvirkri úthlutun nýrra samtöla til umboðsmanna sem bætt er við þetta innhólf.",
       "HMAC_VERIFICATION": "User Identity Validation",
       "HMAC_DESCRIPTION": "Til að sannreyna auðkenni notandans geturðu sent `identifier_hash` fyrir hvern notanda. Þú getur búið til HMAC sha256 hash með því að nota 'identifier' með lyklinum sem sýndur er hér.",
+      "HMAC_LINK_TO_DOCS": "You can read more here.",
       "HMAC_MANDATORY_VERIFICATION": "Enforce User Identity Validation",
       "HMAC_MANDATORY_DESCRIPTION": "Ef það er virkt verður beiðnum sem vantar ‘identifier_hash’ hafnað.",
       "INBOX_IDENTIFIER": "Inbox Identifier",
diff --git a/app/javascript/dashboard/i18n/locale/is/login.json b/app/javascript/dashboard/i18n/locale/is/login.json
index 622c97658..06cd997da 100644
--- a/app/javascript/dashboard/i18n/locale/is/login.json
+++ b/app/javascript/dashboard/i18n/locale/is/login.json
@@ -3,16 +3,16 @@
     "TITLE": "Login to Chatwoot",
     "EMAIL": {
       "LABEL": "Tölvupóstfang",
-      "PLACEHOLDER": "example@companyname.com"
+      "PLACEHOLDER": "Tölvupóstfang t.d. someone@example.com"
     },
     "PASSWORD": {
       "LABEL": "Lykilorð",
       "PLACEHOLDER": "Lykilorð"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Login successful",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again.",
-      "UNAUTH": "Username or password is incorrect. Please try again."
+      "SUCCESS_MESSAGE": "Innskráning tókst",
+      "ERROR_MESSAGE": "Náði ekki að tengjast við netþjóna Woot, vinsamlegast reynið aftur",
+      "UNAUTH": "Notandanafn / lykilorð rangt. Vinsamlegast reyndu aftur"
     },
     "OAUTH": {
       "GOOGLE_LOGIN": "Login with Google",
diff --git a/app/javascript/dashboard/i18n/locale/is/resetPassword.json b/app/javascript/dashboard/i18n/locale/is/resetPassword.json
index cb36d45d1..fcfaa4420 100644
--- a/app/javascript/dashboard/i18n/locale/is/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/is/resetPassword.json
@@ -8,7 +8,7 @@
     },
     "API": {
       "SUCCESS_MESSAGE": "Tengill til að endurstilla lykilorð hefur verið sendur á netfangið þitt.",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
+      "ERROR_MESSAGE": "Náði ekki að tengjast við netþjóna Woot, vinsamlegast reynið aftur"
     },
     "SUBMIT": "Senda"
   }
diff --git a/app/javascript/dashboard/i18n/locale/is/search.json b/app/javascript/dashboard/i18n/locale/is/search.json
index b7529bebb..6ea79ef5f 100644
--- a/app/javascript/dashboard/i18n/locale/is/search.json
+++ b/app/javascript/dashboard/i18n/locale/is/search.json
@@ -14,8 +14,8 @@
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
-    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
+    "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
     "WROTE": "wrote:"
diff --git a/app/javascript/dashboard/i18n/locale/is/setNewPassword.json b/app/javascript/dashboard/i18n/locale/is/setNewPassword.json
index e1969d343..06068781d 100644
--- a/app/javascript/dashboard/i18n/locale/is/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/is/setNewPassword.json
@@ -13,7 +13,7 @@
     },
     "API": {
       "SUCCESS_MESSAGE": "Successfully changed the password.",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
+      "ERROR_MESSAGE": "Náði ekki að tengjast við netþjóna Woot, vinsamlegast reynið aftur"
     },
     "CAPTCHA": {
       "ERROR": "Staðfesting rann út. Vinsamlegast leystu captcha aftur."
diff --git a/app/javascript/dashboard/i18n/locale/is/signup.json b/app/javascript/dashboard/i18n/locale/is/signup.json
index ec290250f..7aeb485eb 100644
--- a/app/javascript/dashboard/i18n/locale/is/signup.json
+++ b/app/javascript/dashboard/i18n/locale/is/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Nafn fyrirtækis",
-      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
-      "ERROR": "Nafn fyrirtækis er of stutt."
+      "PLACEHOLDER": "Sláðu inn nafn fyrirtækisins þíns. Dæmi: Wayne Enterprises",
+      "ERROR": "Nafn fyrirtækis er of stutt"
     },
     "FULL_NAME": {
       "LABEL": "Fullt nafn",
-      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
-      "ERROR": "Fullt nafn er of stutt."
+      "PLACEHOLDER": "Skráðu inn fullt nafn. Dæmi: Bruce Wayne",
+      "ERROR": "Fullt nafn er of stutt"
     },
     "EMAIL": {
       "LABEL": "Vinnu netfang",
-      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
-      "ERROR": "Vinsamlegast sláðu inn gilt vinnu netfang."
+      "PLACEHOLDER": "Sláðu inn vinnunetfangið þitt. td: bruce@wayne.enterprises",
+      "ERROR": "Vinsamlegast sláðu inn gilt vinnu netfang"
     },
     "PASSWORD": {
       "LABEL": "Lykilorð",
       "PLACEHOLDER": "Lykilorð",
-      "ERROR": "Lykilorið er of stutt.",
-      "IS_INVALID_PASSWORD": "Lykilorð ætti að innihalda að minnsta kosti 1 hástaf, 1 lágstaf, 1 tölustaf og 1 tákn."
+      "ERROR": "Lykilorið er of stutt",
+      "IS_INVALID_PASSWORD": "Lykilorð ætti að innihalda að minnsta kosti 1 hástaf, 1 lágstaf, 1 tölustaf og 1 tákn"
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirm password",
-      "PLACEHOLDER": "Confirm password",
-      "ERROR": "Lykilorðin stemma ekki."
+      "LABEL": "Staðfesta Lykilorð",
+      "PLACEHOLDER": "Staðfesta Lykilorð",
+      "ERROR": "Lykilorðin stemma ekki"
     },
     "API": {
       "SUCCESS_MESSAGE": "Nýskráning tókst",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
+      "ERROR_MESSAGE": "Náði ekki að tengjast við netþjóna Woot, vinsamlegast reynið aftur"
     },
     "SUBMIT": "Create account",
     "HAVE_AN_ACCOUNT": "Ertu nú þegar með aðgang?"
diff --git a/app/javascript/dashboard/i18n/locale/it/advancedFilters.json b/app/javascript/dashboard/i18n/locale/it/advancedFilters.json
index 8f94e4915..47deeaa83 100644
--- a/app/javascript/dashboard/i18n/locale/it/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/it/advancedFilters.json
@@ -23,7 +23,7 @@
       "is_greater_than": "È maggiore di",
       "is_less_than": "È minore di",
       "days_before": "È x giorni prima",
-      "starts_with": "Starts with"
+      "starts_with": "Inizia con"
     },
     "ATTRIBUTE_LABELS": {
       "TRUE": "Vero",
@@ -38,7 +38,7 @@
       "CAMPAIGN_NAME": "Nome campagna",
       "LABELS": "Etichette",
       "BROWSER_LANGUAGE": "Lingua del browser",
-      "PRIORITY": "Priority",
+      "PRIORITY": "Priorità",
       "COUNTRY_NAME": "Nome del paese",
       "REFERER_LINK": "Link referente",
       "CUSTOM_ATTRIBUTE_LIST": "Elenco",
diff --git a/app/javascript/dashboard/i18n/locale/it/agentBots.json b/app/javascript/dashboard/i18n/locale/it/agentBots.json
index 36250c300..ab25b9ce4 100644
--- a/app/javascript/dashboard/i18n/locale/it/agentBots.json
+++ b/app/javascript/dashboard/i18n/locale/it/agentBots.json
@@ -33,7 +33,7 @@
     },
     "ADD": {
       "TITLE": "Configure new bot",
-      "CANCEL_BUTTON_TEXT": "annulla",
+      "CANCEL_BUTTON_TEXT": "Annulla",
       "API": {
         "SUCCESS_MESSAGE": "Bot added successfully",
         "ERROR_MESSAGE": "Could not add bot, Please try again later"
@@ -48,7 +48,7 @@
       "BUTTON_TEXT": "Elimina",
       "TITLE": "Delete Bot",
       "SUBMIT": "Elimina",
-      "CANCEL_BUTTON_TEXT": "annulla",
+      "CANCEL_BUTTON_TEXT": "Annulla",
       "DESCRIPTION": "Are you sure you want to delete this bot? This action is irreversible",
       "API": {
         "SUCCESS_MESSAGE": "Bot deleted successfully",
@@ -59,7 +59,7 @@
       "BUTTON_TEXT": "Modifica",
       "LOADING": "Fetching Bots...",
       "TITLE": "Edit Bot",
-      "CANCEL_BUTTON_TEXT": "annulla",
+      "CANCEL_BUTTON_TEXT": "Annulla",
       "API": {
         "SUCCESS_MESSAGE": "Bot updated successfully",
         "ERROR_MESSAGE": "Could not update bot, Please try again later"
diff --git a/app/javascript/dashboard/i18n/locale/it/chatlist.json b/app/javascript/dashboard/i18n/locale/it/chatlist.json
index b2fbe355b..ee2b6d10d 100644
--- a/app/javascript/dashboard/i18n/locale/it/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/it/chatlist.json
@@ -35,6 +35,20 @@
         "TEXT": "Tutti"
       }
     },
+    "VIEW_FILTER": "Visualizza",
+    "SORT_TOOLTIP_LABEL": "Sort conversations",
+    "CHAT_SORT": {
+      "STATUS": "Stato",
+      "ORDER_BY": "Order by"
+    },
+    "CHAT_SORT_FILTER_ITEMS": {
+      "latest": {
+        "TEXT": "Last activity"
+      },
+      "sort_on_created_at": {
+        "TEXT": "Creato il"
+      }
+    },
     "ATTACHMENTS": {
       "image": {
         "CONTENT": "Messaggio immagine"
@@ -55,6 +69,24 @@
         "CONTENT": "ha condiviso un url"
       }
     },
+    "CHAT_SORT_BY_FILTER": {
+      "TITLE": "Sort conversation",
+      "DROPDOWN_TITLE": "Ordina per",
+      "ITEMS": {
+        "LATEST": {
+          "NAME": "Last activity at",
+          "LABEL": "Last activity"
+        },
+        "CREATED_AT": {
+          "NAME": "Creato il",
+          "LABEL": "Creato il"
+        },
+        "LAST_USER_MESSAGE_AT": {
+          "NAME": "Last user message at",
+          "LABEL": "Last message"
+        }
+      }
+    },
     "RECEIVED_VIA_EMAIL": "Ricevuto via email",
     "VIEW_TWEET_IN_TWITTER": "Visualizza tweet su Twitter",
     "REPLY_TO_TWEET": "Rispondi a questo tweet",
diff --git a/app/javascript/dashboard/i18n/locale/it/contact.json b/app/javascript/dashboard/i18n/locale/it/contact.json
index e4831c951..883468ddd 100644
--- a/app/javascript/dashboard/i18n/locale/it/contact.json
+++ b/app/javascript/dashboard/i18n/locale/it/contact.json
@@ -120,7 +120,7 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Inserisci il numero di telefono del contatto",
         "LABEL": "Numero di telefono",
-        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
+        "HELP": "Il numero di telefono dovrebbe essere di formato E.164 es.: +3915555555 [+][codice nazione][codice zona][numero di telefono locale]",
         "ERROR": "Il numero di telefono deve essere vuoto o di formato E.164",
         "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "Questo numero di telefono è in uso per un altro contatto."
@@ -182,7 +182,7 @@
         "LABEL": "A"
       },
       "INBOX": {
-        "LABEL": "Via Inbox",
+        "LABEL": "Casella",
         "PLACEHOLDER": "Choose source inbox",
         "ERROR": "Seleziona una casella"
       },
diff --git a/app/javascript/dashboard/i18n/locale/it/conversation.json b/app/javascript/dashboard/i18n/locale/it/conversation.json
index 4f1ca6903..b05204405 100644
--- a/app/javascript/dashboard/i18n/locale/it/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/it/conversation.json
@@ -68,7 +68,7 @@
       }
     },
     "PRIORITY": {
-      "TITLE": "Priority",
+      "TITLE": "Priorità",
       "OPTIONS": {
         "NONE": "Nessuno",
         "URGENT": "Urgent",
@@ -191,7 +191,7 @@
         "TITLE": "Are you sure you want to delete this message?",
         "MESSAGE": "You cannot undo this action",
         "DELETE": "Elimina",
-        "CANCEL": "annulla"
+        "CANCEL": "Annulla"
       }
     }
   },
diff --git a/app/javascript/dashboard/i18n/locale/it/helpCenter.json b/app/javascript/dashboard/i18n/locale/it/helpCenter.json
index 4782525dc..999ce2cf7 100644
--- a/app/javascript/dashboard/i18n/locale/it/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/it/helpCenter.json
@@ -88,7 +88,7 @@
         "TITLE": "Portali",
         "PORTAL_SETTINGS": "Impostazioni del portale",
         "SUBTITLE": "Hai più portali e puoi avere diverse lingue per ogni portale.",
-        "CANCEL_BUTTON_LABEL": "annulla",
+        "CANCEL_BUTTON_LABEL": "Annulla",
         "CHOOSE_LOCALE_BUTTON": "Scegli lingua"
       },
       "PORTAL_SETTINGS": {
@@ -108,7 +108,7 @@
               "SLUG": "Slug",
               "TITLE": "Titolo del portale",
               "THEME": "Colore del tema",
-              "SUB_TEXT": "Sotto-testo del portale"
+              "SUB_TEXT": "Sottotesto del portale"
             }
           },
           "AVAILABLE_LOCALES": {
@@ -148,7 +148,7 @@
             "TITLE": "Categorie"
           },
           "LOCALE_SETTINGS": {
-            "TITLE": "Locales"
+            "TITLE": "Lingue"
           }
         },
         "CATEGORIES": {
@@ -222,7 +222,7 @@
         },
         "SLUG": {
           "LABEL": "Slug",
-          "PLACEHOLDER": "Slug portale per URLs",
+          "PLACEHOLDER": "Slug portale per URL",
           "ERROR": "Slug è obbligatorio"
         },
         "DOMAIN": {
@@ -271,7 +271,7 @@
         },
         "BUTTONS": {
           "CREATE": "Crea lingua",
-          "CANCEL": "annulla"
+          "CANCEL": "Annulla"
         },
         "API": {
           "SUCCESS_MESSAGE": "Lingua aggiunta con successo",
@@ -373,7 +373,7 @@
         },
         "BUTTONS": {
           "CREATE": "Crea categoria",
-          "CANCEL": "annulla"
+          "CANCEL": "Annulla"
         },
         "API": {
           "SUCCESS_MESSAGE": "Categoria creata con successo",
@@ -404,7 +404,7 @@
         },
         "BUTTONS": {
           "CREATE": "Aggiorna categoria",
-          "CANCEL": "annulla"
+          "CANCEL": "Annulla"
         },
         "API": {
           "SUCCESS_MESSAGE": "Categoria aggiornata con successo",
diff --git a/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json
index f3cc154f5..d4f8c0ae5 100644
--- a/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json
@@ -276,7 +276,7 @@
         },
         "EMAIL": {
           "LABEL": "email",
-          "SUBTITLE": "Email dove i tuoi clienti ti inviano i ticket di supporto",
+          "SUBTITLE": "Email dove i tuoi clienti inviano i ticket di supporto.",
           "PLACEHOLDER": "email"
         },
         "SUBMIT_BUTTON": "Crea un canale email",
@@ -464,6 +464,7 @@
       "AUTO_ASSIGNMENT_SUB_TEXT": "Abilita o disabilita l'assegnazione automatica di nuove conversazioni agli agenti aggiunti a questa casella.",
       "HMAC_VERIFICATION": "Convalida identità utente",
       "HMAC_DESCRIPTION": "Al fine di convalidare l'identità dell'utente, è possibile passare un `identifier_hash` per ogni utente. Puoi generare un hash HMAC sha256 usando il `identificatore` con la chiave mostrata qui.",
+      "HMAC_LINK_TO_DOCS": "You can read more here.",
       "HMAC_MANDATORY_VERIFICATION": "Forza la convalida identità utente",
       "HMAC_MANDATORY_DESCRIPTION": "Se abilitata, le richieste mancanti del file `identifier_hash` saranno respinte.",
       "INBOX_IDENTIFIER": "Identificatore casella",
diff --git a/app/javascript/dashboard/i18n/locale/it/integrations.json b/app/javascript/dashboard/i18n/locale/it/integrations.json
index 09ebb59de..580b9e123 100644
--- a/app/javascript/dashboard/i18n/locale/it/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/it/integrations.json
@@ -4,7 +4,7 @@
     "WEBHOOK": {
       "SUBSCRIBED_EVENTS": "Eventi iscritti",
       "FORM": {
-        "CANCEL": "annulla",
+        "CANCEL": "Annulla",
         "DESC": "Gli eventi Webhook ti forniscono le informazioni in tempo reale su ciò che sta accadendo nel tuo account Chatwoot. Per favore inserisci un URL valido per configurare un callback.",
         "SUBSCRIPTIONS": {
           "LABEL": "Eventi",
@@ -98,7 +98,7 @@
       "BUTTONS": {
         "GENERATE": "Generate",
         "GENERATING": "Generating...",
-        "CANCEL": "annulla"
+        "CANCEL": "Annulla"
       },
       "GENERATE_ERROR": "There was an error processing the content, please try again"
     },
@@ -137,14 +137,14 @@
       "CREATE": {
         "HEADER": "Aggiungi una nuova app dashboard",
         "FORM_SUBMIT": "Invia",
-        "FORM_CANCEL": "annulla",
+        "FORM_CANCEL": "Annulla",
         "API_SUCCESS": "App dashboard configurata con successo",
         "API_ERROR": "Non siamo riusciti a creare un'app. Riprova più tardi"
       },
       "UPDATE": {
         "HEADER": "Modifica app dashboard",
         "FORM_SUBMIT": "Aggiorna",
-        "FORM_CANCEL": "annulla",
+        "FORM_CANCEL": "Annulla",
         "API_SUCCESS": "App dashboard aggiornata con successo",
         "API_ERROR": "Non è stato possibile aggiornare l'app. Riprova più tardi"
       },
diff --git a/app/javascript/dashboard/i18n/locale/it/login.json b/app/javascript/dashboard/i18n/locale/it/login.json
index ce6435422..a4d43ed0b 100644
--- a/app/javascript/dashboard/i18n/locale/it/login.json
+++ b/app/javascript/dashboard/i18n/locale/it/login.json
@@ -3,16 +3,16 @@
     "TITLE": "Accedi a Chatwoot",
     "EMAIL": {
       "LABEL": "Email",
-      "PLACEHOLDER": "example@companyname.com"
+      "PLACEHOLDER": "Email es.: qualcuno@esempio.com"
     },
     "PASSWORD": {
       "LABEL": "Password",
       "PLACEHOLDER": "Password"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Login successful",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again.",
-      "UNAUTH": "Username or password is incorrect. Please try again."
+      "SUCCESS_MESSAGE": "Accesso riuscito",
+      "ERROR_MESSAGE": "Impossibile connettersi al server Woot, riprova più tardi",
+      "UNAUTH": "Nome utente / Password errati. Riprova"
     },
     "OAUTH": {
       "GOOGLE_LOGIN": "Login with Google",
diff --git a/app/javascript/dashboard/i18n/locale/it/resetPassword.json b/app/javascript/dashboard/i18n/locale/it/resetPassword.json
index 004fe7b6f..ed9c952ce 100644
--- a/app/javascript/dashboard/i18n/locale/it/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/it/resetPassword.json
@@ -8,7 +8,7 @@
     },
     "API": {
       "SUCCESS_MESSAGE": "Il link per reimpostare la password è stato inviato alla tua email.",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
+      "ERROR_MESSAGE": "Impossibile connettersi al server Woot, riprova più tardi"
     },
     "SUBMIT": "Invia"
   }
diff --git a/app/javascript/dashboard/i18n/locale/it/setNewPassword.json b/app/javascript/dashboard/i18n/locale/it/setNewPassword.json
index fe066733b..2d8765627 100644
--- a/app/javascript/dashboard/i18n/locale/it/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/it/setNewPassword.json
@@ -13,7 +13,7 @@
     },
     "API": {
       "SUCCESS_MESSAGE": "Password cambiata con successo.",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
+      "ERROR_MESSAGE": "Impossibile connettersi al server Woot, riprova più tardi"
     },
     "CAPTCHA": {
       "ERROR": "Verifica scaduta. Si prega di risolvere nuovamente il captcha."
diff --git a/app/javascript/dashboard/i18n/locale/it/signup.json b/app/javascript/dashboard/i18n/locale/it/signup.json
index 7a04fe9a2..f1700158a 100644
--- a/app/javascript/dashboard/i18n/locale/it/signup.json
+++ b/app/javascript/dashboard/i18n/locale/it/signup.json
@@ -10,18 +10,18 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Company name",
-      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
-      "ERROR": "Company name is too short."
+      "PLACEHOLDER": "Inserisci il nome della tua azienda. Ad esempio: Wayne Enterprises",
+      "ERROR": "Il nome dell'azienda è troppo corto."
     },
     "FULL_NAME": {
       "LABEL": "Nome completo",
-      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
+      "PLACEHOLDER": "Inserisci il tuo nome completo, es.: Bruce Wayne",
       "ERROR": "Nome account troppo corto."
     },
     "EMAIL": {
       "LABEL": "Email di lavoro",
-      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
-      "ERROR": "Please enter a valid work email address."
+      "PLACEHOLDER": "Inserisci il tuo indirizzo email di lavoro. es.: bruce@wayne.enterprises",
+      "ERROR": "Si prega di inserire un indirizzo email di lavoro valido."
     },
     "PASSWORD": {
       "LABEL": "Password",
@@ -30,13 +30,13 @@
       "IS_INVALID_PASSWORD": "La password dovrebbe contenere almeno 1 lettera maiuscola, 1 lettera minuscola, 1 numero e 1 carattere speciale."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirm password",
-      "PLACEHOLDER": "Confirm password",
+      "LABEL": "Conferma password",
+      "PLACEHOLDER": "Conferma password",
       "ERROR": "La password non corrisponde."
     },
     "API": {
       "SUCCESS_MESSAGE": "Registrazione riuscita",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
+      "ERROR_MESSAGE": "Impossibile connettersi al server Woot, riprova più tardi."
     },
     "SUBMIT": "Create account",
     "HAVE_AN_ACCOUNT": "Hai già un account?"
diff --git a/app/javascript/dashboard/i18n/locale/ja/chatlist.json b/app/javascript/dashboard/i18n/locale/ja/chatlist.json
index b6c03b288..8bceb8acb 100644
--- a/app/javascript/dashboard/i18n/locale/ja/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/ja/chatlist.json
@@ -35,6 +35,20 @@
         "TEXT": "すべて"
       }
     },
+    "VIEW_FILTER": "表示",
+    "SORT_TOOLTIP_LABEL": "Sort conversations",
+    "CHAT_SORT": {
+      "STATUS": "状況",
+      "ORDER_BY": "Order by"
+    },
+    "CHAT_SORT_FILTER_ITEMS": {
+      "latest": {
+        "TEXT": "Last activity"
+      },
+      "sort_on_created_at": {
+        "TEXT": "Created at"
+      }
+    },
     "ATTACHMENTS": {
       "image": {
         "CONTENT": "画像メッセージ"
@@ -55,6 +69,24 @@
         "CONTENT": "URLを共有しています"
       }
     },
+    "CHAT_SORT_BY_FILTER": {
+      "TITLE": "Sort conversation",
+      "DROPDOWN_TITLE": "Sort by",
+      "ITEMS": {
+        "LATEST": {
+          "NAME": "Last activity at",
+          "LABEL": "Last activity"
+        },
+        "CREATED_AT": {
+          "NAME": "Created at",
+          "LABEL": "Created at"
+        },
+        "LAST_USER_MESSAGE_AT": {
+          "NAME": "Last user message at",
+          "LABEL": "Last message"
+        }
+      }
+    },
     "RECEIVED_VIA_EMAIL": "メールで受信しました",
     "VIEW_TWEET_IN_TWITTER": "ツイートをTwitterで見る",
     "REPLY_TO_TWEET": "このつぶやきに返信",
diff --git a/app/javascript/dashboard/i18n/locale/ja/contact.json b/app/javascript/dashboard/i18n/locale/ja/contact.json
index 1a34ba8f5..8da22d610 100644
--- a/app/javascript/dashboard/i18n/locale/ja/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ja/contact.json
@@ -120,7 +120,7 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "連絡先の電話番号を入力してください",
         "LABEL": "電話番号",
-        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
+        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]",
         "ERROR": "Phone number should be either empty or of E.164 format",
         "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "This phone number is in use for another contact."
@@ -182,7 +182,7 @@
         "LABEL": "To"
       },
       "INBOX": {
-        "LABEL": "Via Inbox",
+        "LABEL": "Inbox",
         "PLACEHOLDER": "Choose source inbox",
         "ERROR": "Select an inbox"
       },
diff --git a/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json
index 83323ba93..8b4b6deb4 100644
--- a/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json
@@ -464,6 +464,7 @@
       "AUTO_ASSIGNMENT_SUB_TEXT": "この受信トレイに追加された担当者への新しい会話の自動割り当てを有効または無効にします。",
       "HMAC_VERIFICATION": "User Identity Validation",
       "HMAC_DESCRIPTION": "In order to validate the user's identity, you can pass an `identifier_hash` for each user. You can generate a HMAC sha256 hash using the `identifier` with the key shown here.",
+      "HMAC_LINK_TO_DOCS": "You can read more here.",
       "HMAC_MANDATORY_VERIFICATION": "Enforce User Identity Validation",
       "HMAC_MANDATORY_DESCRIPTION": "If enabled, requests missing the `identifier_hash` will be rejected.",
       "INBOX_IDENTIFIER": "Inbox Identifier",
diff --git a/app/javascript/dashboard/i18n/locale/ja/signup.json b/app/javascript/dashboard/i18n/locale/ja/signup.json
index 24d32f1b6..26461ba8e 100644
--- a/app/javascript/dashboard/i18n/locale/ja/signup.json
+++ b/app/javascript/dashboard/i18n/locale/ja/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Company name",
-      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
-      "ERROR": "Company name is too short."
+      "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
+      "ERROR": "Company name is too short"
     },
     "FULL_NAME": {
       "LABEL": "Full name",
-      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
-      "ERROR": "Full name is too short."
+      "PLACEHOLDER": "Enter your full name. eg: Bruce Wayne",
+      "ERROR": "Full name is too short"
     },
     "EMAIL": {
       "LABEL": "Work email",
-      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
-      "ERROR": "Please enter a valid work email address."
+      "PLACEHOLDER": "Enter your work email address. eg: bruce@wayne.enterprises",
+      "ERROR": "Please enter a valid work email address"
     },
     "PASSWORD": {
       "LABEL": "パスワード",
       "PLACEHOLDER": "パスワード",
-      "ERROR": "パスワードが短すぎます.",
-      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character."
+      "ERROR": "パスワードが短すぎます",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirm password",
-      "PLACEHOLDER": "Confirm password",
-      "ERROR": "パスワードが一致しません."
+      "LABEL": "パスワードの確認",
+      "PLACEHOLDER": "パスワードの確認",
+      "ERROR": "パスワードが一致しません"
     },
     "API": {
       "SUCCESS_MESSAGE": "登録に成功しました",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
+      "ERROR_MESSAGE": "Woot Serverに接続できませんでした。後でもう一度お試しください。"
     },
     "SUBMIT": "Create account",
     "HAVE_AN_ACCOUNT": "Already have an account?"
diff --git a/app/javascript/dashboard/i18n/locale/ka/chatlist.json b/app/javascript/dashboard/i18n/locale/ka/chatlist.json
index b96cfb976..6312d4c9f 100644
--- a/app/javascript/dashboard/i18n/locale/ka/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/ka/chatlist.json
@@ -35,6 +35,20 @@
         "TEXT": "All"
       }
     },
+    "VIEW_FILTER": "View",
+    "SORT_TOOLTIP_LABEL": "Sort conversations",
+    "CHAT_SORT": {
+      "STATUS": "Status",
+      "ORDER_BY": "Order by"
+    },
+    "CHAT_SORT_FILTER_ITEMS": {
+      "latest": {
+        "TEXT": "Last activity"
+      },
+      "sort_on_created_at": {
+        "TEXT": "Created at"
+      }
+    },
     "ATTACHMENTS": {
       "image": {
         "CONTENT": "Picture message"
@@ -55,6 +69,24 @@
         "CONTENT": "has shared a url"
       }
     },
+    "CHAT_SORT_BY_FILTER": {
+      "TITLE": "Sort conversation",
+      "DROPDOWN_TITLE": "Sort by",
+      "ITEMS": {
+        "LATEST": {
+          "NAME": "Last activity at",
+          "LABEL": "Last activity"
+        },
+        "CREATED_AT": {
+          "NAME": "Created at",
+          "LABEL": "Created at"
+        },
+        "LAST_USER_MESSAGE_AT": {
+          "NAME": "Last user message at",
+          "LABEL": "Last message"
+        }
+      }
+    },
     "RECEIVED_VIA_EMAIL": "Received via email",
     "VIEW_TWEET_IN_TWITTER": "View tweet in Twitter",
     "REPLY_TO_TWEET": "Reply to this tweet",
diff --git a/app/javascript/dashboard/i18n/locale/ka/contact.json b/app/javascript/dashboard/i18n/locale/ka/contact.json
index 4d1736ed0..80c8878e1 100644
--- a/app/javascript/dashboard/i18n/locale/ka/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ka/contact.json
@@ -120,7 +120,7 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Enter the phone number of the contact",
         "LABEL": "Phone Number",
-        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
+        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]",
         "ERROR": "Phone number should be either empty or of E.164 format",
         "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "This phone number is in use for another contact."
@@ -182,7 +182,7 @@
         "LABEL": "To"
       },
       "INBOX": {
-        "LABEL": "Via Inbox",
+        "LABEL": "Inbox",
         "PLACEHOLDER": "Choose source inbox",
         "ERROR": "Select an inbox"
       },
diff --git a/app/javascript/dashboard/i18n/locale/ka/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ka/inboxMgmt.json
index 407441618..d4efb200c 100644
--- a/app/javascript/dashboard/i18n/locale/ka/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ka/inboxMgmt.json
@@ -464,6 +464,7 @@
       "AUTO_ASSIGNMENT_SUB_TEXT": "Enable or disable the automatic assignment of new conversations to the agents added to this inbox.",
       "HMAC_VERIFICATION": "User Identity Validation",
       "HMAC_DESCRIPTION": "In order to validate the user's identity, you can pass an `identifier_hash` for each user. You can generate a HMAC sha256 hash using the `identifier` with the key shown here.",
+      "HMAC_LINK_TO_DOCS": "You can read more here.",
       "HMAC_MANDATORY_VERIFICATION": "Enforce User Identity Validation",
       "HMAC_MANDATORY_DESCRIPTION": "If enabled, requests missing the `identifier_hash` will be rejected.",
       "INBOX_IDENTIFIER": "Inbox Identifier",
diff --git a/app/javascript/dashboard/i18n/locale/ka/signup.json b/app/javascript/dashboard/i18n/locale/ka/signup.json
index 1ad4865ff..10ddc5b86 100644
--- a/app/javascript/dashboard/i18n/locale/ka/signup.json
+++ b/app/javascript/dashboard/i18n/locale/ka/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Company name",
-      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
-      "ERROR": "Company name is too short."
+      "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
+      "ERROR": "Company name is too short"
     },
     "FULL_NAME": {
       "LABEL": "Full name",
-      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
-      "ERROR": "Full name is too short."
+      "PLACEHOLDER": "Enter your full name. eg: Bruce Wayne",
+      "ERROR": "Full name is too short"
     },
     "EMAIL": {
       "LABEL": "Work email",
-      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
-      "ERROR": "Please enter a valid work email address."
+      "PLACEHOLDER": "Enter your work email address. eg: bruce@wayne.enterprises",
+      "ERROR": "Please enter a valid work email address"
     },
     "PASSWORD": {
       "LABEL": "Password",
       "PLACEHOLDER": "Password",
-      "ERROR": "Password is too short.",
-      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character."
+      "ERROR": "Password is too short",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirm password",
-      "PLACEHOLDER": "Confirm password",
-      "ERROR": "Password doesnot match."
+      "LABEL": "Confirm Password",
+      "PLACEHOLDER": "Confirm Password",
+      "ERROR": "Password doesnot match"
     },
     "API": {
       "SUCCESS_MESSAGE": "Registration Successfull",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
+      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
     },
     "SUBMIT": "Create account",
     "HAVE_AN_ACCOUNT": "Already have an account?"
diff --git a/app/javascript/dashboard/i18n/locale/ko/chatlist.json b/app/javascript/dashboard/i18n/locale/ko/chatlist.json
index 273528880..73016ec31 100644
--- a/app/javascript/dashboard/i18n/locale/ko/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/ko/chatlist.json
@@ -35,6 +35,20 @@
         "TEXT": "모두"
       }
     },
+    "VIEW_FILTER": "보기",
+    "SORT_TOOLTIP_LABEL": "Sort conversations",
+    "CHAT_SORT": {
+      "STATUS": "상태",
+      "ORDER_BY": "Order by"
+    },
+    "CHAT_SORT_FILTER_ITEMS": {
+      "latest": {
+        "TEXT": "Last activity"
+      },
+      "sort_on_created_at": {
+        "TEXT": "Created at"
+      }
+    },
     "ATTACHMENTS": {
       "image": {
         "CONTENT": "사진 메시지"
@@ -55,6 +69,24 @@
         "CONTENT": "URL을 공유함"
       }
     },
+    "CHAT_SORT_BY_FILTER": {
+      "TITLE": "Sort conversation",
+      "DROPDOWN_TITLE": "Sort by",
+      "ITEMS": {
+        "LATEST": {
+          "NAME": "Last activity at",
+          "LABEL": "Last activity"
+        },
+        "CREATED_AT": {
+          "NAME": "Created at",
+          "LABEL": "Created at"
+        },
+        "LAST_USER_MESSAGE_AT": {
+          "NAME": "Last user message at",
+          "LABEL": "Last message"
+        }
+      }
+    },
     "RECEIVED_VIA_EMAIL": "이메일을 통해 수신됨",
     "VIEW_TWEET_IN_TWITTER": "트위터에서 트윗 보기",
     "REPLY_TO_TWEET": "트윗에 응답하기",
diff --git a/app/javascript/dashboard/i18n/locale/ko/contact.json b/app/javascript/dashboard/i18n/locale/ko/contact.json
index b6ae1aa93..637d001ba 100644
--- a/app/javascript/dashboard/i18n/locale/ko/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ko/contact.json
@@ -120,7 +120,7 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "연락처의 전화 번호 입력",
         "LABEL": "전화 번호",
-        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
+        "HELP": "전화번호는 E.164 형식이여야 합니다. 예: +1415555555 [+][국가 코드][지역 코드][전화번호]",
         "ERROR": "전화번호는 비어있거나 E.164 형식이여야 합니다",
         "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "이 전화번호는 다른 연락처에 사용 중입니다."
@@ -182,7 +182,7 @@
         "LABEL": "~~에게"
       },
       "INBOX": {
-        "LABEL": "Via Inbox",
+        "LABEL": "받은 메시지함",
         "PLACEHOLDER": "Choose source inbox",
         "ERROR": "받은 메시지함 선택"
       },
diff --git a/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json
index 41ec1bb10..f47a7ac22 100644
--- a/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json
@@ -464,6 +464,7 @@
       "AUTO_ASSIGNMENT_SUB_TEXT": "받은 메시지에 추가된 에이전트에 새 대화를 자동으로 할당하거나 할당하지 않도록 설정하십시오.",
       "HMAC_VERIFICATION": "사용자 신원 검증",
       "HMAC_DESCRIPTION": "In order to validate the user's identity, you can pass an `identifier_hash` for each user. You can generate a HMAC sha256 hash using the `identifier` with the key shown here.",
+      "HMAC_LINK_TO_DOCS": "You can read more here.",
       "HMAC_MANDATORY_VERIFICATION": "Enforce User Identity Validation",
       "HMAC_MANDATORY_DESCRIPTION": "If enabled, requests missing the `identifier_hash` will be rejected.",
       "INBOX_IDENTIFIER": "Inbox Identifier",
diff --git a/app/javascript/dashboard/i18n/locale/ko/signup.json b/app/javascript/dashboard/i18n/locale/ko/signup.json
index cc1e38503..e38ef41f6 100644
--- a/app/javascript/dashboard/i18n/locale/ko/signup.json
+++ b/app/javascript/dashboard/i18n/locale/ko/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Company name",
-      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
-      "ERROR": "Company name is too short."
+      "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
+      "ERROR": "Company name is too short"
     },
     "FULL_NAME": {
       "LABEL": "전체 이름",
-      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
-      "ERROR": "계정 이름이 너무 짧음."
+      "PLACEHOLDER": "전체 이름을 입력합니다. 예: Taeyeon Kim",
+      "ERROR": "계정 이름이 너무 짧음"
     },
     "EMAIL": {
       "LABEL": "회사 이메일",
-      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
-      "ERROR": "Please enter a valid work email address."
+      "PLACEHOLDER": "회사 이메일 주소를 입력하세요. 예: taeyeon@girls.generation",
+      "ERROR": "Please enter a valid work email address"
     },
     "PASSWORD": {
       "LABEL": "비밀번호",
       "PLACEHOLDER": "비밀번호",
-      "ERROR": "비밀번호가 너무 짧음.",
-      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character."
+      "ERROR": "비밀번호가 너무 짧음",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
     },
     "CONFIRM_PASSWORD": {
       "LABEL": "비밀번호 확인",
       "PLACEHOLDER": "비밀번호 확인",
-      "ERROR": "비밀번호가 일치하지 않음."
+      "ERROR": "비밀번호가 일치하지 않음"
     },
     "API": {
       "SUCCESS_MESSAGE": "등록 성공",
-      "ERROR_MESSAGE": "Woot 서버에 연결할 수 없습니다. 나중에 다시 시도해 주세요."
+      "ERROR_MESSAGE": "Woot Server에 연결할 수 없음. 나중에 다시 시도하십시오."
     },
     "SUBMIT": "Create account",
     "HAVE_AN_ACCOUNT": "이미 계정이 있습니까?"
diff --git a/app/javascript/dashboard/i18n/locale/lt/advancedFilters.json b/app/javascript/dashboard/i18n/locale/lt/advancedFilters.json
index d8f4af8eb..372491d12 100644
--- a/app/javascript/dashboard/i18n/locale/lt/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/lt/advancedFilters.json
@@ -14,9 +14,9 @@
       "OR": "AR"
     },
     "OPERATOR_LABELS": {
-      "equal_to": "Equal to",
-      "not_equal_to": "Not equal to",
-      "contains": "Contains",
+      "equal_to": "Lygu",
+      "not_equal_to": "Nelygu",
+      "contains": "Sudėtyje yra",
       "does_not_contain": "Does not contain",
       "is_present": "Is present",
       "is_not_present": "Is not present",
@@ -33,13 +33,13 @@
       "STATUS": "Būsena",
       "ASSIGNEE_NAME": "Assignee Name",
       "INBOX_NAME": "Inbox Name",
-      "TEAM_NAME": "Team Name",
+      "TEAM_NAME": "Komandos Pavadinimas",
       "CONVERSATION_IDENTIFIER": "Conversation Identifier",
       "CAMPAIGN_NAME": "Campaign Name",
-      "LABELS": "Labels",
-      "BROWSER_LANGUAGE": "Browser Language",
-      "PRIORITY": "Priority",
-      "COUNTRY_NAME": "Country Name",
+      "LABELS": "Etiketės",
+      "BROWSER_LANGUAGE": "Naršyklės Kalba",
+      "PRIORITY": "Prioritetas",
+      "COUNTRY_NAME": "Šalies Pavadinimas",
       "REFERER_LINK": "Referer link",
       "CUSTOM_ATTRIBUTE_LIST": "Sąrašas",
       "CUSTOM_ATTRIBUTE_TEXT": "Tekstas",
@@ -47,12 +47,12 @@
       "CUSTOM_ATTRIBUTE_LINK": "Nuoroda",
       "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox",
       "CREATED_AT": "Created At",
-      "LAST_ACTIVITY": "Last Activity"
+      "LAST_ACTIVITY": "Paskutiniai veiksmai"
     },
     "GROUPS": {
       "STANDARD_FILTERS": "Standartinis Filtras",
       "ADDITIONAL_FILTERS": "Papildomas Filtras",
-      "CUSTOM_ATTRIBUTES": "Custom Attributes"
+      "CUSTOM_ATTRIBUTES": "Personalizuoti Požymiai"
     },
     "CUSTOM_VIEWS": {
       "ADD": {
diff --git a/app/javascript/dashboard/i18n/locale/lt/agentBots.json b/app/javascript/dashboard/i18n/locale/lt/agentBots.json
index 81771901d..e4a6a4f01 100644
--- a/app/javascript/dashboard/i18n/locale/lt/agentBots.json
+++ b/app/javascript/dashboard/i18n/locale/lt/agentBots.json
@@ -6,12 +6,12 @@
     "SIDEBAR_TXT": "<p><b>Agent Bots</b> <p>Agent bots allows you to automate the conversations</p>",
     "CSML_BOT_EDITOR": {
       "NAME": {
-        "LABEL": "Bot Name",
+        "LABEL": "Boto Pavadinimas",
         "PLACEHOLDER": "Give your bot a name",
-        "ERROR": "Bot name is required"
+        "ERROR": "Yra reikalingas Boto vardas"
       },
       "DESCRIPTION": {
-        "LABEL": "Bot Description",
+        "LABEL": "Boto Aprašymas",
         "PLACEHOLDER": "What does this bot do?"
       },
       "BOT_CONFIG": {
@@ -23,13 +23,13 @@
     "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.",
-      "SUBMIT": "Update",
+      "SUBMIT": "Atnaujinti",
       "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"
+      "SELECT_PLACEHOLDER": "Pasirinkti Botą"
     },
     "ADD": {
       "TITLE": "Configure new bot",
@@ -42,11 +42,11 @@
     "LIST": {
       "404": "No Bots found, you can create a bot by clicking the 'Configure new bot' Button ↗",
       "LOADING": "Fetching Bots...",
-      "TYPE": "Bot Type"
+      "TYPE": "Boto Tipas"
     },
     "DELETE": {
       "BUTTON_TEXT": "Ištrinti",
-      "TITLE": "Delete Bot",
+      "TITLE": "Ištrinti Botą",
       "SUBMIT": "Ištrinti",
       "CANCEL_BUTTON_TEXT": "Atšaukti",
       "DESCRIPTION": "Are you sure you want to delete this bot? This action is irreversible",
@@ -58,7 +58,7 @@
     "EDIT": {
       "BUTTON_TEXT": "Redaguoti",
       "LOADING": "Fetching Bots...",
-      "TITLE": "Edit Bot",
+      "TITLE": "Keisti Botą",
       "CANCEL_BUTTON_TEXT": "Atšaukti",
       "API": {
         "SUCCESS_MESSAGE": "Bot updated successfully",
diff --git a/app/javascript/dashboard/i18n/locale/lt/agentMgmt.json b/app/javascript/dashboard/i18n/locale/lt/agentMgmt.json
index e13d52eab..f390034ad 100644
--- a/app/javascript/dashboard/i18n/locale/lt/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/lt/agentMgmt.json
@@ -3,7 +3,7 @@
     "HEADER": "Agentai",
     "HEADER_BTN_TXT": "Pridėti Agentą",
     "LOADING": "Gaunamas agentų sąrašas",
-    "SIDEBAR_TXT": "<p><b>Agents</b></p> <p> An <b>Agent</b> is a member of your Customer Support team. </p><p> Agents will be able to view and reply to messages from your users. The list shows all agents currently in your account. </p><p> Click on <b>Add Agent</b> to add a new agent. Agent you add will receive an email with a confirmation link to activate their account, after which they can access Chatwoot and respond to messages. </p><p> Access to Chatwoot's features are based on following roles. </p><p> <b>Agent</b> - Agents with this role can only access inboxes, reports and conversations. They can assign conversations to other agents or themselves and resolve conversations.</p><p> <b>Administrator</b> - Administrator will have access to all Chatwoot features enabled for your account, including settings, along with all of a normal agents' privileges.</p>",
+    "SIDEBAR_TXT": "<p><b>Makrokomandos</b><p>Makrokomandos yra išsaugotų veiksmų rinkinys, padedantis klientų aptarnavimo agentams lengvai atlikti užduotis. Agentai gali apibrėžti veiksmų rinkinį, pvz., pokalbio žymėjimą etikete, el. laiško nuorašo siuntimą, tinkinto atributo atnaujinimą ir pan., ir jie gali atlikti šiuos veiksmus vienu paspaudimu. Kai agentai vykdo makrokomandą, veiksmai bus atliekami nuosekliai tokia tvarka, kokia jie yra apibrėžti. Makrokomandos pagerina produktyvumą ir padidina veiksmų nuoseklumą. </p><p>Makrokomandas gali būti naudingas dviem būdais. </p><p><b>Kaip agento pagalba:</b> jei agentas kelis kartus atlieka veiksmų rinkinį, jis gali išsaugoti jį kaip makrokomandą ir atlikti visus veiksmus kartu vienu spustelėjimu.</b> p><p><b>Kaip galimybė įtraukti komandos narį:</b> kiekvienas agentas kiekvieno pokalbio metu turi atlikti daugybę skirtingų patikrinimų / veiksmų. Priimti naują palaikymo komandos narį bus lengva, jei paskyroje bus iš anksto nustatytų makrokomandų. Užuot išsamiai aprašęs kiekvieną veiksmą, vadovas / komandos vadovas gali nurodyti įvairiuose scenarijuose naudojamas makrokomandas.</p>",
     "AGENT_TYPES": {
       "ADMINISTRATOR": "Administratorius",
       "AGENT": "Agentas"
@@ -41,15 +41,15 @@
       },
       "API": {
         "SUCCESS_MESSAGE": "Agentas pridėtas sėkmingai",
-        "EXIST_MESSAGE": "Agent email already in use, Please try another email address",
-        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        "EXIST_MESSAGE": "Agento el. pašto adresas jau naudojamas. Bandykite kitą el. pašto adresą",
+        "ERROR_MESSAGE": "Nepavyko prisijungti prie Woot serverio, bandykite dar kartą vėliau"
       }
     },
     "DELETE": {
       "BUTTON_TEXT": "Ištrinti",
       "API": {
         "SUCCESS_MESSAGE": "Agentas ištrintas sėkmingai",
-        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        "ERROR_MESSAGE": "Nepavyko prisijungti prie Woot serverio, bandykite dar kartą vėliau"
       },
       "CONFIRM": {
         "TITLE": "Patvirtinti Ištrynimą",
@@ -76,7 +76,7 @@
         },
         "AGENT_AVAILABILITY": {
           "LABEL": "Prieinamumas",
-          "PLACEHOLDER": "Please select an availability status",
+          "PLACEHOLDER": "Prašome pasirinkti prieinamumo būseną",
           "ERROR": "Būtinas prieinamumas"
         },
         "SUBMIT": "Keisti Agentą"
@@ -85,17 +85,17 @@
       "CANCEL_BUTTON_TEXT": "Atšaukti",
       "API": {
         "SUCCESS_MESSAGE": "Agentas atnaujintas sėkmingai",
-        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        "ERROR_MESSAGE": "Nepavyko prisijungti prie Woot serverio, bandykite dar kartą vėliau"
       },
       "PASSWORD_RESET": {
         "ADMIN_RESET_BUTTON": "Atstatyti slaptažodį",
-        "ADMIN_SUCCESS_MESSAGE": "An email with reset password instructions has been sent to the agent",
+        "ADMIN_SUCCESS_MESSAGE": "El. laiškas su slaptažodžio atstatymo instrukcijomis buvo išsiųstas agentui",
         "SUCCESS_MESSAGE": "Agento slaptažodis atstatytas sėkmingai",
-        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        "ERROR_MESSAGE": "Nepavyko prisijungti prie Woot serverio, bandykite dar kartą vėliau"
       }
     },
     "SEARCH": {
-      "NO_RESULTS": "No results found."
+      "NO_RESULTS": "Nieko nerasta."
     },
     "MULTI_SELECTOR": {
       "PLACEHOLDER": "Nėra",
diff --git a/app/javascript/dashboard/i18n/locale/lt/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/lt/attributesMgmt.json
index 5544caf74..6ad1386af 100644
--- a/app/javascript/dashboard/i18n/locale/lt/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/lt/attributesMgmt.json
@@ -1,6 +1,6 @@
 {
   "ATTRIBUTES_MGMT": {
-    "HEADER": "Custom Attributes",
+    "HEADER": "Personalizuoti Požymiai",
     "HEADER_BTN_TXT": "Add Custom Attribute",
     "LOADING": "Fetching custom attributes",
     "SIDEBAR_TXT": "<p><b>Custom Attributes</b> <p>A custom attribute tracks facts about your contacts/conversation — like the subscription plan, or when they ordered the first item etc. <br /><br />For creating a Custom Attribute, just click on the <b>Add Custom Attribute.</b> You can also edit or delete an existing  Custom Attribute by clicking on the Edit or Delete button.</p>",
@@ -38,7 +38,7 @@
           "LABEL": "Raktas",
           "PLACEHOLDER": "Enter custom attribute key",
           "ERROR": "Key is required",
-          "IN_VALID": "Invalid key"
+          "IN_VALID": "Neteisingas raktas"
         }
       },
       "API": {
@@ -62,7 +62,7 @@
     },
     "EDIT": {
       "TITLE": "Edit Custom Attribute",
-      "UPDATE_BUTTON_TEXT": "Update",
+      "UPDATE_BUTTON_TEXT": "Atnaujinti",
       "TYPE": {
         "LIST": {
           "LABEL": "List Values",
@@ -75,9 +75,9 @@
       }
     },
     "TABS": {
-      "HEADER": "Custom Attributes",
-      "CONVERSATION": "Conversation",
-      "CONTACT": "Contact"
+      "HEADER": "Personalizuoti Požymiai",
+      "CONVERSATION": "Pokalbis",
+      "CONTACT": "Kontaktas"
     },
     "LIST": {
       "TABLE_HEADER": [
diff --git a/app/javascript/dashboard/i18n/locale/lt/auditLogs.json b/app/javascript/dashboard/i18n/locale/lt/auditLogs.json
index c1f67fbbc..478f77157 100644
--- a/app/javascript/dashboard/i18n/locale/lt/auditLogs.json
+++ b/app/javascript/dashboard/i18n/locale/lt/auditLogs.json
@@ -12,13 +12,13 @@
       "TABLE_HEADER": [
         "Vartotojas",
         "Action",
-        "IP Address",
+        "IP Adresas",
         "Laikas"
       ]
     },
     "API": {
       "SUCCESS_MESSAGE": "AuditLogs retrieved successfully",
-      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      "ERROR_MESSAGE": "Nepavyko prisijungti prie Woot serverio, bandykite dar kartą vėliau"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/lt/automation.json b/app/javascript/dashboard/i18n/locale/lt/automation.json
index 07dbfac01..e288473ac 100644
--- a/app/javascript/dashboard/i18n/locale/lt/automation.json
+++ b/app/javascript/dashboard/i18n/locale/lt/automation.json
@@ -3,7 +3,7 @@
     "HEADER": "Automations",
     "HEADER_BTN_TXT": "Add Automation Rule",
     "LOADING": "Fetching automation rules",
-    "SIDEBAR_TXT": "<p><b>Automation Rules</b> <p>Automation can replace and automate existing processes that require manual effort. You can do many things with automation, including adding labels and assigning conversation to the best agent. So the team focuses on what they do best and spends more little time on manual tasks.</p>",
+    "SIDEBAR_TXT": "<p><b>Automatizavimo taisyklės</b> <p>Automatizacija gali pakeisti ir automatizuoti esamus procesus, kuriems reikia rankinių pastangų. Automatizuodami galite atlikti daugybę dalykų, įskaitant etikečių pridėjimą ir pokalbio priskyrimą geriausiam agentui. Taigi komanda sutelkia dėmesį į tai, ką moka geriausiai, ir mažiau laiko skiria rankinėms užduotims.</p>",
     "ADD": {
       "TITLE": "Add Automation Rule",
       "SUBMIT": "Sukurti",
@@ -25,14 +25,14 @@
           "ERROR": "Event is required"
         },
         "CONDITIONS": {
-          "LABEL": "Conditions"
+          "LABEL": "Sąlygos"
         },
         "ACTIONS": {
           "LABEL": "Veiksmai"
         }
       },
-      "CONDITION_BUTTON_LABEL": "Add Condition",
-      "ACTION_BUTTON_LABEL": "Add Action",
+      "CONDITION_BUTTON_LABEL": "Pridėti Sąlygas",
+      "ACTION_BUTTON_LABEL": "Pridėti Veiksmą",
       "API": {
         "SUCCESS_MESSAGE": "Automation rule added successfully",
         "ERROR_MESSAGE": "Could not able to create a automation rule, Please try again later"
@@ -64,7 +64,7 @@
     },
     "EDIT": {
       "TITLE": "Edit Automation Rule",
-      "SUBMIT": "Update",
+      "SUBMIT": "Atnaujinti",
       "CANCEL_BUTTON_TEXT": "Atšaukti",
       "API": {
         "SUCCESS_MESSAGE": "Automation rule updated successfully",
@@ -93,7 +93,7 @@
     "ACTION": {
       "DELETE_MESSAGE": "You need to have atleast one action to save",
       "TEAM_MESSAGE_INPUT_PLACEHOLDER": "Enter your message here",
-      "TEAM_DROPDOWN_PLACEHOLDER": "Select teams"
+      "TEAM_DROPDOWN_PLACEHOLDER": "Pasirinkite komandas"
     },
     "TOGGLE": {
       "ACTIVATION_TITLE": "Activate Automation Rule",
diff --git a/app/javascript/dashboard/i18n/locale/lt/bulkActions.json b/app/javascript/dashboard/i18n/locale/lt/bulkActions.json
index 267ae69dc..9fe545de5 100644
--- a/app/javascript/dashboard/i18n/locale/lt/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/lt/bulkActions.json
@@ -1,39 +1,39 @@
 {
   "BULK_ACTION": {
     "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
-    "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}?",
+    "AGENT_SELECT_LABEL": "Pasirinkti agentą",
+    "ASSIGN_CONFIRMATION_LABEL": "Ar tikrai priskirsite %{conversationCount} %{conversationLabel}",
+    "UNASSIGN_CONFIRMATION_LABEL": "Ar tikrai atšauksite priskyrimą %{conversationCount} %{conversationLabel}?",
     "GO_BACK_LABEL": "Grįžti",
     "ASSIGN_LABEL": "Priskirti",
     "YES": "Yes",
     "ASSIGN_AGENT_TOOLTIP": "Priskirti Agentą",
-    "ASSIGN_TEAM_TOOLTIP": "Assign team",
+    "ASSIGN_TEAM_TOOLTIP": "Priskirti komandą",
     "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": "Agentai Užkraunami",
     "UPDATE": {
-      "CHANGE_STATUS": "Change status",
+      "CHANGE_STATUS": "Pakeisti būseną",
       "SNOOZE_UNTIL_NEXT_REPLY": "Snooze until next reply",
-      "UPDATE_SUCCESFUL": "Conversation status updated successfully.",
+      "UPDATE_SUCCESFUL": "Pokalbio būsena atnaujinta sėkmingai.",
       "UPDATE_FAILED": "Failed to update conversations, please try again"
     },
     "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_LABELS": "Priskirti etiketes",
+      "NO_LABELS_FOUND": "Etikečių nerasta",
+      "ASSIGN_SELECTED_LABELS": "Priskirti pažymėtas etiketes",
+      "ASSIGN_SUCCESFUL": "Etiketės sėkmingai priskirtos",
+      "ASSIGN_FAILED": "Nepavyko priskirti etikečių. Prašau, pabandykite dar kartą"
     },
     "TEAMS": {
       "TEAM_SELECT_LABEL": "Select Team",
-      "NONE": "None",
+      "NONE": "Nėra",
       "NO_TEAMS_AVAILABLE": "There are no teams added to this account yet.",
-      "ASSIGN_SELECTED_TEAMS": "Assign selected team",
-      "ASSIGN_SUCCESFUL": "Teams assiged successfully",
+      "ASSIGN_SELECTED_TEAMS": "Priskirti pažymėtą komandą",
+      "ASSIGN_SUCCESFUL": "Komandos sėkmingai priskirtos",
       "ASSIGN_FAILED": "Failed to assign team, please try again"
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/lt/campaign.json b/app/javascript/dashboard/i18n/locale/lt/campaign.json
index 64a49e016..38f2e078e 100644
--- a/app/javascript/dashboard/i18n/locale/lt/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/lt/campaign.json
@@ -24,8 +24,8 @@
           "ERROR": "Scheduled time is required"
         },
         "AUDIENCE": {
-          "LABEL": "Audience",
-          "PLACEHOLDER": "Select the customer labels",
+          "LABEL": "Auditorija",
+          "PLACEHOLDER": "Pažymėti klieto etiketes",
           "ERROR": "Audience is required"
         },
         "INBOX": {
@@ -45,12 +45,12 @@
         },
         "END_POINT": {
           "LABEL": "URL",
-          "PLACEHOLDER": "Please enter the URL",
-          "ERROR": "Please enter a valid URL"
+          "PLACEHOLDER": "Prašome įvesti URL adresą",
+          "ERROR": "Prašome įvesti tesingą URL adresą"
         },
         "TIME_ON_PAGE": {
           "LABEL": "Time on page(Seconds)",
-          "PLACEHOLDER": "Please enter the time",
+          "PLACEHOLDER": "Prašome įvesti laiką",
           "ERROR": "Time on page is required"
         },
         "ENABLED": "Enable campaign",
@@ -77,7 +77,7 @@
     },
     "EDIT": {
       "TITLE": "Edit campaign",
-      "UPDATE_BUTTON_TEXT": "Update",
+      "UPDATE_BUTTON_TEXT": "Atnaujinti",
       "API": {
         "SUCCESS_MESSAGE": "Campaign updated successfully",
         "ERROR_MESSAGE": "There was an error, please try again"
@@ -98,14 +98,14 @@
         "CREATED_AT": "Created at"
       },
       "BUTTONS": {
-        "ADD": "Add",
+        "ADD": "Pridėti",
         "EDIT": "Redaguoti",
         "DELETE": "Ištrinti"
       },
       "STATUS": {
-        "ENABLED": "Enabled",
-        "DISABLED": "Disabled",
-        "COMPLETED": "Completed",
+        "ENABLED": "Leisti",
+        "DISABLED": "Išjungta",
+        "COMPLETED": "Užbaigta",
         "ACTIVE": "Aktyvus"
       },
       "SENDER": {
diff --git a/app/javascript/dashboard/i18n/locale/lt/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/lt/cannedMgmt.json
index 9b65a48a1..8607ac1b1 100644
--- a/app/javascript/dashboard/i18n/locale/lt/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/lt/cannedMgmt.json
@@ -4,11 +4,11 @@
     "HEADER_BTN_TXT": "Pridėti Atsakymą Ruošinį",
     "LOADING": "Atsakymų Ruošinių Gavimas",
     "SEARCH_404": "Šią užklausą atitinkančių elementų nėra",
-    "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>",
+    "SIDEBAR_TXT": "<p><b>Atsakymų Ruošiniai</b> </p><p> Atsakymų Ruošiniai yra išsaugoti atsakymų šablonai, kuriuos galima naudoti norint greitai išsiųsti atsakymą į pokalbį. </p><p> Norėdami sukurti Atsakymų Ruošinį, tiesiog spustelėkite <b>Pridėti Atsakymo Ruošinį</b>. Taip pat galite redaguoti arba ištrinti esamą paruoštą Atsakymo Ruošinį spustelėdami mygtuką Redaguoti arba Trinti </p><p> Atsakymų Ruošiniai naudojami naudojant <b>trumpuosius kodus</b>. Agentai gali pasiekti paruoštus atsakymus dalyvaudami pokalbyje įvesdami <b>'/'</b> ir trumpąjį kodą. </p>",
     "LIST": {
-      "404": "There are no canned responses available in this account.",
+      "404": "Šioje paskyroje nėra galimų atsakymų ruošinių.",
       "TITLE": "Tvarkyti atsakymų ruošinius",
-      "DESC": "Canned Responses are predefined reply templates which can be used to quickly send out replies to tickets.",
+      "DESC": "Atsakymų ruošiniai yra iš anksto nustatyti atsakymų šablonai, kuriuos galima naudoti norint greitai išsiųsti atsakymus į užklausas.",
       "TABLE_HEADER": [
         "Trumpas Kodas",
         "Turinys",
@@ -17,53 +17,53 @@
     },
     "ADD": {
       "TITLE": "Pridėti Atsakymą Ruošinį",
-      "DESC": "Canned Responses are saved reply templates which can be used to quickly send out reply to conversation.",
+      "DESC": "Atsakymų Ruošiniai yra išsaugoti atsakym yra išsaugoti atsakymų šablonai, kurie gali būti naudojami norint greitai išsiųsti atsakymą į pokalbį.",
       "CANCEL_BUTTON_TEXT": "Atšaukti",
       "FORM": {
         "SHORT_CODE": {
           "LABEL": "Trumpas Kodas",
-          "PLACEHOLDER": "Please enter a short code",
-          "ERROR": "Short Code is required"
+          "PLACEHOLDER": "Prašome įvesti trumpą kodą",
+          "ERROR": "Trumpasis Kodas yra būtinas"
         },
         "CONTENT": {
           "LABEL": "Turinys",
-          "PLACEHOLDER": "Please enter a content",
-          "ERROR": "Content is required"
+          "PLACEHOLDER": "Įveskite prašau tekstą",
+          "ERROR": "Tekstas yra būtinas"
         },
         "SUBMIT": "Pateikti"
       },
       "API": {
-        "SUCCESS_MESSAGE": "Canned Response added successfully",
-        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        "SUCCESS_MESSAGE": "Atsakymų Ruošinys pridėtas sėkmingai",
+        "ERROR_MESSAGE": "Nepavyko prisijungti prie Woot serverio, bandykite dar kartą vėliau"
       }
     },
     "EDIT": {
-      "TITLE": "Edit Canned Response",
+      "TITLE": "Taisyti atsakymo ruošinį",
       "CANCEL_BUTTON_TEXT": "Atšaukti",
       "FORM": {
         "SHORT_CODE": {
           "LABEL": "Trumpas Kodas",
-          "PLACEHOLDER": "Please enter a shortcode",
-          "ERROR": "Short Code is required"
+          "PLACEHOLDER": "Prašome įvesti trumpą kodą",
+          "ERROR": "Trumpasis Kodas yra būtinas"
         },
         "CONTENT": {
           "LABEL": "Turinys",
           "PLACEHOLDER": "Prašome įrašyti turinį",
-          "ERROR": "Content is required"
+          "ERROR": "Tekstas yra būtinas"
         },
         "SUBMIT": "Pateikti"
       },
       "BUTTON_TEXT": "Taisyti",
       "API": {
         "SUCCESS_MESSAGE": "Atsakymų Ruošinys atnaujintas sėkmingai",
-        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        "ERROR_MESSAGE": "Nepavyko prisijungti prie Woot serverio, bandykite dar kartą vėliau"
       }
     },
     "DELETE": {
       "BUTTON_TEXT": "Ištrinti",
       "API": {
         "SUCCESS_MESSAGE": "Atsakymų Ruošinys ištrintas sėkmingai",
-        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        "ERROR_MESSAGE": "Nepavyko prisijungti prie Woot serverio, bandykite dar kartą vėliau"
       },
       "CONFIRM": {
         "TITLE": "Patvirtinti Ištrynimą",
diff --git a/app/javascript/dashboard/i18n/locale/lt/chatlist.json b/app/javascript/dashboard/i18n/locale/lt/chatlist.json
index 78f77a3c0..c41ec2b66 100644
--- a/app/javascript/dashboard/i18n/locale/lt/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/lt/chatlist.json
@@ -1,16 +1,16 @@
 {
   "CHAT_LIST": {
-    "LOADING": "Fetching conversations",
-    "LOAD_MORE_CONVERSATIONS": "Load more conversations",
-    "EOF": "All conversations loaded 🎉",
+    "LOADING": "Pokalbiai parsiunčiami",
+    "LOAD_MORE_CONVERSATIONS": "Parsiųsti daugiau pokalbių",
+    "EOF": "Visi poklabiai parsiųsti",
     "LIST": {
-      "404": "There are no active conversations in this group."
+      "404": "Šioje grupėje nėra aktyvių pokalbių."
     },
     "TAB_HEADING": "Pokalbiai",
     "MENTION_HEADING": "Paminėjimai",
     "UNATTENDED_HEADING": "Be priežiūros",
     "SEARCH": {
-      "INPUT": "Search for People, Chats, Saved Replies .."
+      "INPUT": "Ieškoti Žmonių, Pokalbių, Išsaugotų Atsakymų.."
     },
     "FILTER_ALL": "Visi",
     "ASSIGNEE_TYPE_TABS": {
@@ -20,7 +20,7 @@
     },
     "CHAT_STATUS_FILTER_ITEMS": {
       "open": {
-        "TEXT": "Open"
+        "TEXT": "Atidaryti"
       },
       "resolved": {
         "TEXT": "Išspręsta"
@@ -35,37 +35,69 @@
         "TEXT": "Visi"
       }
     },
+    "VIEW_FILTER": "Paržiūra",
+    "SORT_TOOLTIP_LABEL": "Sort conversations",
+    "CHAT_SORT": {
+      "STATUS": "Būsena",
+      "ORDER_BY": "Order by"
+    },
+    "CHAT_SORT_FILTER_ITEMS": {
+      "latest": {
+        "TEXT": "Last activity"
+      },
+      "sort_on_created_at": {
+        "TEXT": "Created at"
+      }
+    },
     "ATTACHMENTS": {
       "image": {
-        "CONTENT": "Picture message"
+        "CONTENT": "Vaizdinė žinutė"
       },
       "audio": {
         "CONTENT": "Garso žinutė"
       },
       "video": {
-        "CONTENT": "Vaizdo žinutė"
+        "CONTENT": "Video žinutė"
       },
       "file": {
-        "CONTENT": "File Attachment"
+        "CONTENT": "Failas pridėtas"
       },
       "location": {
         "CONTENT": "Vieta"
       },
       "fallback": {
-        "CONTENT": "has shared a url"
+        "CONTENT": "pasidalino URL"
+      }
+    },
+    "CHAT_SORT_BY_FILTER": {
+      "TITLE": "Sort conversation",
+      "DROPDOWN_TITLE": "Rūšiuoti pagal",
+      "ITEMS": {
+        "LATEST": {
+          "NAME": "Last activity at",
+          "LABEL": "Last activity"
+        },
+        "CREATED_AT": {
+          "NAME": "Created at",
+          "LABEL": "Created at"
+        },
+        "LAST_USER_MESSAGE_AT": {
+          "NAME": "Last user message at",
+          "LABEL": "Last message"
+        }
       }
     },
     "RECEIVED_VIA_EMAIL": "Gauta el. paštu",
     "VIEW_TWEET_IN_TWITTER": "View tweet in Twitter",
-    "REPLY_TO_TWEET": "Reply to this tweet",
-    "LINK_TO_STORY": "Go to instagram story",
+    "REPLY_TO_TWEET": "Atsakyti į šitą tweetą",
+    "LINK_TO_STORY": "Eikite į Instagram istoriją",
     "SENT": "Išsiųsta sėkmingai",
-    "READ": "Read successfully",
-    "DELIVERED": "Delivered successfully",
+    "READ": "Perskaityta sėkmingai",
+    "DELIVERED": "Pristatyta sėkmingai",
     "NO_MESSAGES": "Nėra Pranešimų",
-    "NO_CONTENT": "No content available",
-    "HIDE_QUOTED_TEXT": "Hide Quoted Text",
-    "SHOW_QUOTED_TEXT": "Show Quoted Text",
+    "NO_CONTENT": "Nėra turinio",
+    "HIDE_QUOTED_TEXT": "Slėpti cituojamą tekstą",
+    "SHOW_QUOTED_TEXT": "Rodyti cituojamą tekstą",
     "MESSAGE_READ": "Skaityti"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/lt/contact.json b/app/javascript/dashboard/i18n/locale/lt/contact.json
index 252a9f055..4a9251901 100644
--- a/app/javascript/dashboard/i18n/locale/lt/contact.json
+++ b/app/javascript/dashboard/i18n/locale/lt/contact.json
@@ -1,99 +1,99 @@
 {
   "CONTACT_PANEL": {
-    "NOT_AVAILABLE": "Not Available",
+    "NOT_AVAILABLE": "Nepasiekiamas",
     "EMAIL_ADDRESS": "El. pašto adresas",
     "PHONE_NUMBER": "Telefono numeris",
     "IDENTIFIER": "Identifier",
-    "COPY_SUCCESSFUL": "Copied to clipboard successfully",
+    "COPY_SUCCESSFUL": "Sėkmingai nukopijuota į iškarpinę",
     "COMPANY": "Įmonė",
     "LOCATION": "Vieta",
-    "BROWSER_LANGUAGE": "Browser Language",
-    "CONVERSATION_TITLE": "Conversation Details",
-    "VIEW_PROFILE": "View Profile",
+    "BROWSER_LANGUAGE": "Naršyklės Kalba",
+    "CONVERSATION_TITLE": "Pokalbio detalės",
+    "VIEW_PROFILE": "Rodyti Profilį",
     "BROWSER": "Naršyklė",
-    "OS": "Operating System",
-    "INITIATED_FROM": "Initiated from",
-    "INITIATED_AT": "Initiated at",
-    "IP_ADDRESS": "IP Address",
-    "CREATED_AT_LABEL": "Created",
-    "NEW_MESSAGE": "New message",
+    "OS": "Operacinė Sistema",
+    "INITIATED_FROM": "Pradėta iš",
+    "INITIATED_AT": "Prasidėjo",
+    "IP_ADDRESS": "IP Adresas",
+    "CREATED_AT_LABEL": "Sukurta",
+    "NEW_MESSAGE": "Naujas pranešimas",
     "CONVERSATIONS": {
-      "NO_RECORDS_FOUND": "There are no previous conversations associated to this contact.",
-      "TITLE": "Previous Conversations"
+      "NO_RECORDS_FOUND": "Su šiuo kontaktu nėra susietų ankstesnių pokalbių.",
+      "TITLE": "Ankstesni pokalbiai"
     },
     "LABELS": {
       "CONTACT": {
-        "TITLE": "Contact Labels",
-        "ERROR": "Couldn't update labels"
+        "TITLE": "Kontakto Žymeklis",
+        "ERROR": "Nepavyko atnaujinti etikečių"
       },
       "CONVERSATION": {
-        "TITLE": "Conversation Labels",
-        "ADD_BUTTON": "Add Labels"
+        "TITLE": "Pokalbio Etiketės",
+        "ADD_BUTTON": "Pridėti Etiketę"
       },
       "LABEL_SELECT": {
-        "TITLE": "Add Labels",
-        "PLACEHOLDER": "Search labels",
-        "NO_RESULT": "No labels found"
+        "TITLE": "Pridėti Etiketę",
+        "PLACEHOLDER": "Ieškoti etikečių",
+        "NO_RESULT": "Etikečių nerasta"
       }
     },
-    "MERGE_CONTACT": "Merge contact",
-    "CONTACT_ACTIONS": "Contact actions",
-    "MUTE_CONTACT": "Mute Conversation",
-    "UNMUTE_CONTACT": "Unmute Conversation",
-    "MUTED_SUCCESS": "This conversation is muted for 6 hours",
-    "UNMUTED_SUCCESS": "This conversation is unmuted",
-    "SEND_TRANSCRIPT": "Send Transcript",
+    "MERGE_CONTACT": "Sujungti kontaktą",
+    "CONTACT_ACTIONS": "Kontakto veiksmai",
+    "MUTE_CONTACT": "Tildyti pokalbį",
+    "UNMUTE_CONTACT": "Įjungti pokalbio garsą",
+    "MUTED_SUCCESS": "Šis pokalbis nutildytas 6 valandoms",
+    "UNMUTED_SUCCESS": "Įjungtas šio pokalbio garsas",
+    "SEND_TRANSCRIPT": "Siųsti stenogramą",
     "EDIT_LABEL": "Redaguoti",
     "SIDEBAR_SECTIONS": {
-      "CUSTOM_ATTRIBUTES": "Custom Attributes",
-      "CONTACT_LABELS": "Contact Labels",
-      "PREVIOUS_CONVERSATIONS": "Previous Conversations"
+      "CUSTOM_ATTRIBUTES": "Personalizuoti Požymiai",
+      "CONTACT_LABELS": "Kontakto Žymeklis",
+      "PREVIOUS_CONVERSATIONS": "Ankstesni pokalbiai"
     }
   },
   "EDIT_CONTACT": {
-    "BUTTON_LABEL": "Edit Contact",
-    "TITLE": "Edit contact",
-    "DESC": "Edit contact details"
+    "BUTTON_LABEL": "Keisti Kontaktą",
+    "TITLE": "Keisti Kontaktą",
+    "DESC": "Tvarkyti kontakto informaciją"
   },
   "CREATE_CONTACT": {
-    "BUTTON_LABEL": "New Contact",
-    "TITLE": "Create new contact",
-    "DESC": "Add basic information details about the contact."
+    "BUTTON_LABEL": "Naujas Kontaktas",
+    "TITLE": "Sukurti naują kontaktą",
+    "DESC": "Pridėkite pagrindinę informaciją apie kontaktą."
   },
   "IMPORT_CONTACTS": {
-    "BUTTON_LABEL": "Import",
-    "TITLE": "Import Contacts",
-    "DESC": "Import contacts through a CSV file.",
-    "DOWNLOAD_LABEL": "Download a sample csv.",
+    "BUTTON_LABEL": "Importuoti",
+    "TITLE": "Importuoti Kontaktus",
+    "DESC": "Importuoti kontaktus CSV failo pagalba.",
+    "DOWNLOAD_LABEL": "Užkrauti csv. pavyzdį.",
     "FORM": {
       "LABEL": "CSV failas",
-      "SUBMIT": "Import",
+      "SUBMIT": "Importuoti",
       "CANCEL": "Atšaukti"
     },
-    "SUCCESS_MESSAGE": "Contacts saved successfully",
+    "SUCCESS_MESSAGE": "Kontaktas išsaugotas sėkmingai",
     "ERROR_MESSAGE": "There was an error, please try again"
   },
   "DELETE_NOTE": {
     "CONFIRM": {
       "TITLE": "Patvirtinti Ištrynimą",
-      "MESSAGE": "Are you want sure to delete this note?",
-      "YES": "Yes, Delete it",
+      "MESSAGE": "Ar tikrai norite ištrinti šią pastabą?",
+      "YES": "Taip, Trinti",
       "NO": "No, Keep it"
     }
   },
   "DELETE_CONTACT": {
     "BUTTON_LABEL": "Trinti kontaktą",
     "TITLE": "Trinti kontaktą",
-    "DESC": "Delete contact details",
+    "DESC": "Trinti kontakto informaciją",
     "CONFIRM": {
       "TITLE": "Patvirtinti Ištrynimą",
       "MESSAGE": "Ar tikrai norite ištrinti ",
       "YES": "Taip, Ištrinti",
-      "NO": "No, Keep"
+      "NO": "Ne, Išsaugoti"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Contact deleted successfully",
-      "ERROR_MESSAGE": "Could not delete contact. Please try again later."
+      "SUCCESS_MESSAGE": "Agentas ištrintas sėkmingai",
+      "ERROR_MESSAGE": "Nepavyko ištrinti kontakto. Pabandykite dar kartą vėliau."
     }
   },
   "CONTACT_FORM": {
@@ -101,262 +101,262 @@
       "SUBMIT": "Pateikti",
       "CANCEL": "Atšaukti",
       "AVATAR": {
-        "LABEL": "Contact Avatar"
+        "LABEL": "Kontakto Avataras"
       },
       "NAME": {
-        "PLACEHOLDER": "Enter the full name of the contact",
+        "PLACEHOLDER": "Įveskite pilną kontakto vardą",
         "LABEL": "Pilnas vardas"
       },
       "BIO": {
-        "PLACEHOLDER": "Enter the bio of the contact",
-        "LABEL": "Bio"
+        "PLACEHOLDER": "Įveskite kontakto biografiją",
+        "LABEL": "Biografija"
       },
       "EMAIL_ADDRESS": {
-        "PLACEHOLDER": "Enter the email address of the contact",
+        "PLACEHOLDER": "Įveskite kontakto el. pašto adresą",
         "LABEL": "El. pašto adresas",
-        "DUPLICATE": "This email address is in use for another contact.",
-        "ERROR": "Please enter a valid email address."
+        "DUPLICATE": "Šis el. pašto adresas naudojamas kitam kontaktui.",
+        "ERROR": "Prašau įveskite teisingą el. pašto adresą."
       },
       "PHONE_NUMBER": {
-        "PLACEHOLDER": "Enter the phone number of the contact",
-        "LABEL": "Phone Number",
-        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
-        "ERROR": "Phone number should be either empty or of E.164 format",
-        "DIAL_CODE_ERROR": "Please select a dial code from the list",
-        "DUPLICATE": "This phone number is in use for another contact."
+        "PLACEHOLDER": "Įveskite kontakto telefono numerį",
+        "LABEL": "Telefono numeris",
+        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]",
+        "ERROR": "Telefono numeris turi būti tuščias arba E.164 formato",
+        "DIAL_CODE_ERROR": "Sąraše pasirinkite skambinimo kodą",
+        "DUPLICATE": "Šis telefono numeris naudojamas kitam kontaktui."
       },
       "LOCATION": {
-        "PLACEHOLDER": "Enter the location of the contact",
+        "PLACEHOLDER": "Įveskite kontakto buvimo vietą",
         "LABEL": "Vieta"
       },
       "COMPANY_NAME": {
-        "PLACEHOLDER": "Enter the company name",
-        "LABEL": "Company Name"
+        "PLACEHOLDER": "Įveskite įmonės pavadinimą",
+        "LABEL": "Įmonės pavadinimas"
       },
       "COUNTRY": {
-        "PLACEHOLDER": "Enter the country name",
-        "LABEL": "Country Name",
-        "SELECT_PLACEHOLDER": "Select",
-        "REMOVE": "Remove",
-        "SELECT_COUNTRY": "Select Country"
+        "PLACEHOLDER": "Įveskite šalies pavadinimą",
+        "LABEL": "Šalies Pavadinimas",
+        "SELECT_PLACEHOLDER": "Pasirinkti",
+        "REMOVE": "Pašalinti",
+        "SELECT_COUNTRY": "Pasirinkti Šalį"
       },
       "CITY": {
-        "PLACEHOLDER": "Enter the city name",
+        "PLACEHOLDER": "Įveskite miesto pavadinimą",
         "LABEL": "Miesto pavadinimas"
       },
       "SOCIAL_PROFILES": {
         "FACEBOOK": {
-          "PLACEHOLDER": "Enter the Facebook username",
+          "PLACEHOLDER": "Įveskite Facebook vartotojo vardą",
           "LABEL": "Facebook"
         },
         "TWITTER": {
-          "PLACEHOLDER": "Enter the Twitter username",
+          "PLACEHOLDER": "Įveskite Twitter vartotojo vardą",
           "LABEL": "Twitter"
         },
         "LINKEDIN": {
-          "PLACEHOLDER": "Enter the LinkedIn username",
+          "PLACEHOLDER": "Įveskite LinkedIn vartotojo vardą",
           "LABEL": "LinkedIn"
         },
         "GITHUB": {
-          "PLACEHOLDER": "Enter the Github username",
+          "PLACEHOLDER": "Įveskite Github vartotojo vardą",
           "LABEL": "Github"
         }
       }
     },
     "DELETE_AVATAR": {
       "API": {
-        "SUCCESS_MESSAGE": "Contact avatar deleted successfully",
-        "ERROR_MESSAGE": "Could not delete the contact avatar. Please try again later."
+        "SUCCESS_MESSAGE": "Kontakto avataras ištrintas sėkmingai",
+        "ERROR_MESSAGE": "Nepavyko ištrinti kontakto avataro. Pabandykite dar kartą vėliau."
       }
     },
-    "SUCCESS_MESSAGE": "Contact saved successfully",
+    "SUCCESS_MESSAGE": "Kontaktas išsaugotas sėkmingai",
     "ERROR_MESSAGE": "There was an error, please try again"
   },
   "NEW_CONVERSATION": {
-    "BUTTON_LABEL": "Start conversation",
-    "TITLE": "New conversation",
-    "DESC": "Start a new conversation by sending a new message.",
-    "NO_INBOX": "Couldn't find an inbox to initiate a new conversation with this contact.",
+    "BUTTON_LABEL": "Pradėti pokalbį",
+    "TITLE": "Naujas pokalbis",
+    "DESC": "Pradėkite naują pokalbį išsiųsdami naują pranešimą.",
+    "NO_INBOX": "Nepavyko rasti gautų laiškų aplanko, kad būtų galima pradėti naują pokalbį su šiuo kontaktu.",
     "FORM": {
       "TO": {
-        "LABEL": "To"
+        "LABEL": "Kam"
       },
       "INBOX": {
-        "LABEL": "Via Inbox",
-        "PLACEHOLDER": "Choose source inbox",
-        "ERROR": "Select an inbox"
+        "LABEL": "Gautų laiškų aplankas",
+        "PLACEHOLDER": "Pasirinkti gautų laiškų aplanką",
+        "ERROR": "Pasirinkti gautų laiškų aplanką"
       },
       "SUBJECT": {
-        "LABEL": "Subject",
-        "PLACEHOLDER": "Subject",
-        "ERROR": "Subject can't be empty"
+        "LABEL": "Tema",
+        "PLACEHOLDER": "Tema",
+        "ERROR": "Tema negali būti palikta tuščia"
       },
       "MESSAGE": {
         "LABEL": "Žinutė",
-        "PLACEHOLDER": "Write your message here",
-        "ERROR": "Message can't be empty"
+        "PLACEHOLDER": "Rašykite pranešimą čia",
+        "ERROR": "Pranešimas negali būti tuščias"
       },
-      "SUBMIT": "Send message",
+      "SUBMIT": "Išsiųsti pranešimą",
       "CANCEL": "Atšaukti",
-      "SUCCESS_MESSAGE": "Message sent!",
-      "GO_TO_CONVERSATION": "View",
-      "ERROR_MESSAGE": "Couldn't send! try again"
+      "SUCCESS_MESSAGE": "Pranešimas įšsiųstas!",
+      "GO_TO_CONVERSATION": "Paržiūra",
+      "ERROR_MESSAGE": "Nepavyko išsiųsti! bandykite dar kartą"
     }
   },
   "CONTACTS_PAGE": {
-    "HEADER": "Contacts",
-    "FIELDS": "Contact fields",
+    "HEADER": "Kontaktai",
+    "FIELDS": "Kontakto laukai",
     "SEARCH_BUTTON": "Ieškoti",
-    "SEARCH_INPUT_PLACEHOLDER": "Search for contacts",
+    "SEARCH_INPUT_PLACEHOLDER": "Ieškoti kontaktų",
     "FILTER_CONTACTS": "Filtruoti",
     "FILTER_CONTACTS_SAVE": "Išsaugoti filtrą",
     "FILTER_CONTACTS_DELETE": "Trinti filtrą",
     "LIST": {
-      "LOADING_MESSAGE": "Loading contacts...",
-      "404": "No contacts matches your search 🔍",
-      "NO_CONTACTS": "There are no available contacts",
+      "LOADING_MESSAGE": "Kontaktai užkraunami...",
+      "404": "Nė vienas kontaktas neatitinka jūsų paieškos 🔍",
+      "NO_CONTACTS": "Nėra pasiekiamų kontaktų",
       "TABLE_HEADER": {
         "NAME": "Vardas",
-        "PHONE_NUMBER": "Phone Number",
+        "PHONE_NUMBER": "Telefono numeris",
         "CONVERSATIONS": "Pokalbiai",
-        "LAST_ACTIVITY": "Last Activity",
+        "LAST_ACTIVITY": "Paskutiniai veiksmai",
         "CREATED_AT": "Created At",
         "COUNTRY": "Šalis",
         "CITY": "Miestas",
-        "SOCIAL_PROFILES": "Social Profiles",
+        "SOCIAL_PROFILES": "Socialinių tinklų profiliai",
         "COMPANY": "Įmonė",
         "EMAIL_ADDRESS": "El. pašto adresas"
       },
-      "VIEW_DETAILS": "View details"
+      "VIEW_DETAILS": "Pažiūrėti detaliau"
     }
   },
   "CONTACT_PROFILE": {
-    "BACK_BUTTON": "Contacts",
-    "LOADING": "Loading contact profile..."
+    "BACK_BUTTON": "Kontaktai",
+    "LOADING": "Parsisiųsti kontakto profilį..."
   },
   "REMINDER": {
     "ADD_BUTTON": {
-      "BUTTON": "Add",
-      "TITLE": "Shift + Enter to create a task"
+      "BUTTON": "Pridėti",
+      "TITLE": "Spauskite Shift + Enter kad sukurti užduotį"
     },
     "FOOTER": {
-      "DUE_DATE": "Due date",
-      "LABEL_TITLE": "Set type"
+      "DUE_DATE": "Užbaigimo data",
+      "LABEL_TITLE": "Nustatyti tipą"
     }
   },
   "NOTES": {
-    "FETCHING_NOTES": "Fetching notes...",
-    "NOT_AVAILABLE": "There are no notes created for this contact",
+    "FETCHING_NOTES": "Gaunamos pastabos...",
+    "NOT_AVAILABLE": "Nėra pastabų sukurtų šiam profiliui",
     "HEADER": {
-      "TITLE": "Notes"
+      "TITLE": "Pastabos"
     },
     "LIST": {
-      "LABEL": "added a note"
+      "LABEL": "pridėta pastabą"
     },
     "ADD": {
-      "BUTTON": "Add",
-      "PLACEHOLDER": "Add a note",
-      "TITLE": "Shift + Enter to create a note"
+      "BUTTON": "Pridėti",
+      "PLACEHOLDER": "Pridėti pastabą",
+      "TITLE": "Spauskite Shift + Enter kad sukurti pastabą"
     },
     "CONTENT_HEADER": {
-      "DELETE": "Delete note"
+      "DELETE": "Trinti pastabą"
     }
   },
   "EVENTS": {
     "HEADER": {
-      "TITLE": "Activities"
+      "TITLE": "Užsiėmimai"
     },
     "BUTTON": {
       "PILL_BUTTON_NOTES": "pastabos",
       "PILL_BUTTON_EVENTS": "įvykiai",
-      "PILL_BUTTON_CONVO": "conversations"
+      "PILL_BUTTON_CONVO": "pokalbiai"
     }
   },
   "CUSTOM_ATTRIBUTES": {
-    "ADD_BUTTON_TEXT": "Add attributes",
-    "BUTTON": "Add custom attribute",
-    "NOT_AVAILABLE": "There are no custom attributes available for this contact.",
-    "COPY_SUCCESSFUL": "Copied to clipboard successfully",
+    "ADD_BUTTON_TEXT": "Pridėti požymius",
+    "BUTTON": "Pridėti personalizuotą požymį",
+    "NOT_AVAILABLE": "Nėra personalizuotų požymių šiam kontaktui.",
+    "COPY_SUCCESSFUL": "Sėkmingai nukopijuota į iškarpinę",
     "ACTIONS": {
-      "COPY": "Copy attribute",
-      "DELETE": "Delete attribute",
-      "EDIT": "Edit attribute"
+      "COPY": "Kopijuoti požymį",
+      "DELETE": "Ištrinti požymį",
+      "EDIT": "Taisyti požymį"
     },
     "ADD": {
-      "TITLE": "Create custom attribute",
-      "DESC": "Add custom information to this contact."
+      "TITLE": "Sukurti personalizuotą požymį",
+      "DESC": "Pridėti personalizuotą informaciją šiam kontaktui."
     },
     "FORM": {
-      "CREATE": "Add attribute",
+      "CREATE": "Pridėti požymį",
       "CANCEL": "Atšaukti",
       "NAME": {
-        "LABEL": "Custom attribute name",
-        "PLACEHOLDER": "Eg: shopify id",
-        "ERROR": "Invalid custom attribute name"
+        "LABEL": "Personalizuoto požymio pavadinimas",
+        "PLACEHOLDER": "Pvz: shopify id",
+        "ERROR": "Neteisingas prsonalizuoto požymio pavadinimas"
       },
       "VALUE": {
-        "LABEL": "Attribute value",
-        "PLACEHOLDER": "Eg: 11901 "
+        "LABEL": "Požymio reikšmė",
+        "PLACEHOLDER": "Pvz: 11901 "
       },
       "ADD": {
-        "TITLE": "Create new attribute ",
-        "SUCCESS": "Attribute added successfully",
-        "ERROR": "Unable to add attribute. Please try again later"
+        "TITLE": "Sukurti naują požymį ",
+        "SUCCESS": "Požymis pridėtas sėkmingai",
+        "ERROR": "Nepavyko pridėti požymį. Pabandykite dar kartą vėliau"
       },
       "UPDATE": {
-        "SUCCESS": "Attribute updated successfully",
-        "ERROR": "Unable to update attribute. Please try again later"
+        "SUCCESS": "Požymis atnaujintas sėkmingai",
+        "ERROR": "Nepavyko atnaujinti požymio. Pabandykite dar kartą vėliau"
       },
       "DELETE": {
-        "SUCCESS": "Attribute deleted successfully",
-        "ERROR": "Unable to delete attribute. Please try again later"
+        "SUCCESS": "Požymis ištrintas sėkmingai",
+        "ERROR": "Nepavyko ištrinti požymio. Pabandykite dar kartą vėliau"
       },
       "ATTRIBUTE_SELECT": {
-        "TITLE": "Add attributes",
-        "PLACEHOLDER": "Search attributes",
-        "NO_RESULT": "No attributes found"
+        "TITLE": "Pridėti požymius",
+        "PLACEHOLDER": "Ieškoti požymių",
+        "NO_RESULT": "Požymių nerasta"
       },
       "ATTRIBUTE_TYPE": {
         "LIST": {
-          "PLACEHOLDER": "Select value",
-          "SEARCH_INPUT_PLACEHOLDER": "Search value",
-          "NO_RESULT": "No result found"
+          "PLACEHOLDER": "Pasirinkti reikšmę",
+          "SEARCH_INPUT_PLACEHOLDER": "Ieškoti reikšmės",
+          "NO_RESULT": "Nieko nerasta"
         }
       }
     },
     "VALIDATIONS": {
-      "REQUIRED": "Valid value is required",
-      "INVALID_URL": "Invalid URL"
+      "REQUIRED": "Reikalinga tinkama vertė",
+      "INVALID_URL": "Neteisingas URL"
     }
   },
   "MERGE_CONTACTS": {
-    "TITLE": "Merge contacts",
-    "DESCRIPTION": "Merge contacts to combine two profiles into one, including all attributes and conversations. In case of conflict, the Primary contact’ s attributes will take precedence.",
+    "TITLE": "Sujungti kontaktus",
+    "DESCRIPTION": "Dviejų profilių sujungimui į vieną sujunkite kontaktus, įskaitant visus požymius ir pokalbius. Kilus nesuderinamumui, pirmenybė bus teikiama pirminio kontakto požymiams.",
     "PRIMARY": {
       "TITLE": "Pirminis kontaktas",
-      "HELP_LABEL": "To be kept"
+      "HELP_LABEL": "Turi būti saugoma"
     },
     "CHILD": {
-      "TITLE": "Contact to merge",
-      "PLACEHOLDER": "Search for a contact",
-      "HELP_LABEL": "To be deleted"
+      "TITLE": "Kontaktas sujungimui",
+      "PLACEHOLDER": "Ieškoti kontakto",
+      "HELP_LABEL": "Turi būti ištrinta"
     },
     "SUMMARY": {
-      "TITLE": "Summary",
-      "DELETE_WARNING": "Contact of <strong>%{childContactName}</strong> will be deleted.",
-      "ATTRIBUTE_WARNING": "Contact details of <strong>%{childContactName}</strong> will be copied to <strong>%{primaryContactName}</strong>."
+      "TITLE": "Santrauka",
+      "DELETE_WARNING": "Kontaktas <strong>%{childContactName}</strong> bus ištrintas.",
+      "ATTRIBUTE_WARNING": "Kontakto informacija <strong>%{childContactName}</strong> bus nukopijuota į <strong>%{primaryContactName}</strong>."
     },
     "SEARCH": {
-      "ERROR": "ERROR_MESSAGE"
+      "ERROR": "KLAIDOS_PRANEŠIMAS"
     },
     "FORM": {
-      "SUBMIT": " Merge contacts",
+      "SUBMIT": " Apjungti kontaktus",
       "CANCEL": "Atšaukti",
       "CHILD_CONTACT": {
-        "ERROR": "Select a child contact to merge"
+        "ERROR": "Pažymėkite kontaktą apjungimui"
       },
-      "SUCCESS_MESSAGE": "Contact merged successfully",
-      "ERROR_MESSAGE": "Could not merge contacts, try again!"
+      "SUCCESS_MESSAGE": "Kontaktas apjungtas sėkmingai",
+      "ERROR_MESSAGE": "Nepavyko apjungti kontaktų, bandykite dar kartą!"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/lt/contactFilters.json b/app/javascript/dashboard/i18n/locale/lt/contactFilters.json
index b8db02e73..0afbe130b 100644
--- a/app/javascript/dashboard/i18n/locale/lt/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/lt/contactFilters.json
@@ -15,9 +15,9 @@
             "OR": "AR"
         },
         "OPERATOR_LABELS": {
-            "equal_to": "Equal to",
-            "not_equal_to": "Not equal to",
-            "contains": "Contains",
+            "equal_to": "Lygu",
+            "not_equal_to": "Nelygu",
+            "contains": "Sudėtyje yra",
             "does_not_contain": "Does not contain",
             "is_present": "Is present",
             "is_not_present": "Is not present",
@@ -27,8 +27,8 @@
         },
         "ATTRIBUTES": {
             "NAME": "Vardas",
-            "EMAIL": "Email",
-            "PHONE_NUMBER": "Phone number",
+            "EMAIL": "El. paštas",
+            "PHONE_NUMBER": "Telefono numeris",
             "IDENTIFIER": "Identifier",
             "CITY": "Miestas",
             "COUNTRY": "Šalis",
@@ -38,13 +38,13 @@
             "CUSTOM_ATTRIBUTE_LINK": "Nuoroda",
             "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox",
             "CREATED_AT": "Created At",
-            "LAST_ACTIVITY": "Last Activity",
+            "LAST_ACTIVITY": "Paskutiniai veiksmai",
             "REFERER_LINK": "Referrer link"
         },
         "GROUPS": {
             "STANDARD_FILTERS": "Standartinis Filtras",
             "ADDITIONAL_FILTERS": "Papildomas Filtras",
-            "CUSTOM_ATTRIBUTES": "Custom Attributes"
+            "CUSTOM_ATTRIBUTES": "Personalizuoti Požymiai"
         }
     }
 }
diff --git a/app/javascript/dashboard/i18n/locale/lt/conversation.json b/app/javascript/dashboard/i18n/locale/lt/conversation.json
index b335f5805..d32fc62c6 100644
--- a/app/javascript/dashboard/i18n/locale/lt/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/lt/conversation.json
@@ -1,159 +1,159 @@
 {
   "CONVERSATION": {
-    "SELECT_A_CONVERSATION": "Please select a conversation from left pane",
+    "SELECT_A_CONVERSATION": "Kairiojoje srityje pasirinkite pokalbį",
     "CSAT_REPLY_MESSAGE": "Please rate the conversation",
-    "404": "Sorry, we cannot find the conversation. Please try again",
-    "SWITCH_VIEW_LAYOUT": "Switch the layout",
-    "DASHBOARD_APP_TAB_MESSAGES": "Messages",
-    "UNVERIFIED_SESSION": "The identity of this user is not verified",
-    "NO_MESSAGE_1": "Uh oh! Looks like there are no messages from customers in your inbox.",
-    "NO_MESSAGE_2": " to send a message to your page!",
-    "NO_INBOX_1": "Hola! Looks like you haven't added any inboxes yet.",
-    "NO_INBOX_2": " to get started",
-    "NO_INBOX_AGENT": "Uh Oh! Looks like you are not part of any inbox. Please contact your administrator",
+    "404": "Atsiprašome, negalime rasti pokalbio. Prašau, pabandykite dar kartą",
+    "SWITCH_VIEW_LAYOUT": "Perjunkite išdėstymą",
+    "DASHBOARD_APP_TAB_MESSAGES": "Pranešimai",
+    "UNVERIFIED_SESSION": "Šio vartotojo tapatybė nepatvirtinta",
+    "NO_MESSAGE_1": "Oi! Panašu, kad jūsų gautų laiškų aplanke nėra pranešimų iš klientų.",
+    "NO_MESSAGE_2": " norėdami išsiųsti žinutę į savo puslapį!",
+    "NO_INBOX_1": "Sveiki! Panašu, kad dar nepridėjote jokių gautųjų laiškų aplanko.",
+    "NO_INBOX_2": " norint pradėti",
+    "NO_INBOX_AGENT": "Oi! Atrodo, kad nesate jokio gautų laiškų aplanko dalis. Susisiekite su administratoriumi",
     "SEARCH_MESSAGES": "Search for messages in conversations",
     "SEARCH": {
-      "TITLE": "Search messages",
-      "RESULT_TITLE": "Search Results",
-      "LOADING_MESSAGE": "Crunching data...",
-      "PLACEHOLDER": "Type any text to search messages",
-      "NO_MATCHING_RESULTS": "No results found."
+      "TITLE": "Ieškoti pranešimų",
+      "RESULT_TITLE": "Rezultatų Paieška",
+      "LOADING_MESSAGE": "Duomenys apdorojami...",
+      "PLACEHOLDER": "Parašykite tekstą pranešimų paieškai",
+      "NO_MATCHING_RESULTS": "Nieko nerasta."
     },
-    "UNREAD_MESSAGES": "Unread Messages",
-    "UNREAD_MESSAGE": "Unread Message",
+    "UNREAD_MESSAGES": "Neperskaitytos žinutės",
+    "UNREAD_MESSAGE": "Neperskaityta žinutė",
     "CLICK_HERE": "Paspausti čia",
-    "LOADING_INBOXES": "Loading inboxes",
-    "LOADING_CONVERSATIONS": "Loading Conversations",
-    "CANNOT_REPLY": "You cannot reply due to",
-    "24_HOURS_WINDOW": "24 hour message window restriction",
-    "NOT_ASSIGNED_TO_YOU": "This conversation is not assigned to you. Would you like to assign this conversation to yourself?",
-    "ASSIGN_TO_ME": "Assign to me",
-    "TWILIO_WHATSAPP_CAN_REPLY": "You can only reply to this conversation using a template message due to",
-    "TWILIO_WHATSAPP_24_HOURS_WINDOW": "24 hour message window restriction",
-    "SELECT_A_TWEET_TO_REPLY": "Please select a tweet to reply to.",
-    "REPLYING_TO": "You are replying to:",
-    "REMOVE_SELECTION": "Remove Selection",
+    "LOADING_INBOXES": "Įkeliami gautų laiškų aplankai",
+    "LOADING_CONVERSATIONS": "Pokalbiai parsiunčiami",
+    "CANNOT_REPLY": "Jūs negalite atsakyti dėl",
+    "24_HOURS_WINDOW": "Pranešimų apribojimas 24 valandoms",
+    "NOT_ASSIGNED_TO_YOU": "Šis pokalbis jums nepriskirtas. Ar norėtumėte priskirti šį pokalbį sau?",
+    "ASSIGN_TO_ME": "Priskirti man",
+    "TWILIO_WHATSAPP_CAN_REPLY": "Į šį pokalbį galite atsakyti tik naudodami šablono pranešimą, nes",
+    "TWILIO_WHATSAPP_24_HOURS_WINDOW": "Pranešimų apribojimas 24 valandoms",
+    "SELECT_A_TWEET_TO_REPLY": "Pasirinkite tweetą, į kurį norite atsakyti.",
+    "REPLYING_TO": "Jūs atsakote į:",
+    "REMOVE_SELECTION": "Pašalinti Pasirinkimą",
     "DOWNLOAD": "Parsisiųsti",
     "UNKNOWN_FILE_TYPE": "Nežinomas failas",
     "SAVE_CONTACT": "Išsaugoti",
-    "UPLOADING_ATTACHMENTS": "Uploading attachments...",
-    "REPLIED_TO_STORY": "Replied to your story",
-    "SUCCESS_DELETE_MESSAGE": "Message deleted successfully",
-    "FAIL_DELETE_MESSSAGE": "Couldn't delete message! Try again",
-    "NO_RESPONSE": "No response",
+    "UPLOADING_ATTACHMENTS": "Įkeliami priedai...",
+    "REPLIED_TO_STORY": "Atsakė į tavo pasakojimą",
+    "SUCCESS_DELETE_MESSAGE": "Pranešimas ištrintas sėkmingai",
+    "FAIL_DELETE_MESSSAGE": "Nepavyko ištrinti pranešimo! Bandykite dar kartą",
+    "NO_RESPONSE": "Nėra atsakymo",
     "RATING_TITLE": "Reitingas",
-    "FEEDBACK_TITLE": "Feedback",
+    "FEEDBACK_TITLE": "Grįžtamasis ryšys",
     "CARD": {
-      "SHOW_LABELS": "Show labels",
-      "HIDE_LABELS": "Hide labels"
+      "SHOW_LABELS": "Rodyti etiketes",
+      "HIDE_LABELS": "Slėpti etiketes"
     },
     "HEADER": {
-      "RESOLVE_ACTION": "Resolve",
-      "REOPEN_ACTION": "Reopen",
-      "OPEN_ACTION": "Open",
-      "OPEN": "More",
-      "CLOSE": "Close",
-      "DETAILS": "details",
-      "SNOOZED_UNTIL_TOMORROW": "Snoozed until tomorrow",
-      "SNOOZED_UNTIL_NEXT_WEEK": "Snoozed until next week",
-      "SNOOZED_UNTIL_NEXT_REPLY": "Snoozed until next reply"
+      "RESOLVE_ACTION": "Išspręsti",
+      "REOPEN_ACTION": "Atidarykite iš naujo",
+      "OPEN_ACTION": "Atidaryti",
+      "OPEN": "Daugiau",
+      "CLOSE": "Uždaryti",
+      "DETAILS": "smulkesnė informacija",
+      "SNOOZED_UNTIL_TOMORROW": "Atidėta iki rytojaus",
+      "SNOOZED_UNTIL_NEXT_WEEK": "Atidėta iki kitos savaitės",
+      "SNOOZED_UNTIL_NEXT_REPLY": "Atidėta iki kito atsakymo"
     },
     "RESOLVE_DROPDOWN": {
-      "MARK_PENDING": "Mark as pending",
+      "MARK_PENDING": "Pažymėti kaip laukiantį",
       "SNOOZE": {
-        "TITLE": "Snooze until",
-        "NEXT_REPLY": "Next reply",
+        "TITLE": "Atidėti iki",
+        "NEXT_REPLY": "Kitas atsakymas",
         "TOMORROW": "Rytoj",
         "NEXT_WEEK": "Kitą savaitę"
       }
     },
     "PRIORITY": {
-      "TITLE": "Priority",
+      "TITLE": "Prioritetas",
       "OPTIONS": {
-        "NONE": "None",
+        "NONE": "Nėra",
         "URGENT": "Skubus",
         "HIGH": "Aukštas",
         "MEDIUM": "Vidutinis",
         "LOW": "Žemas"
       },
       "CHANGE_PRIORITY": {
-        "SELECT_PLACEHOLDER": "None",
+        "SELECT_PLACEHOLDER": "Nėra",
         "INPUT_PLACEHOLDER": "Pasirinkti prioritetą",
-        "NO_RESULTS": "No results found",
-        "SUCCESSFUL": "Changed priority of conversation id %{conversationId} to %{priority}",
+        "NO_RESULTS": "Nieko nerasta",
+        "SUCCESSFUL": "Prioritetas pokalbiui id %{conversationId} pakeistas į %{priority}",
         "FAILED": "Couldn't change priority. Please try again."
       }
     },
     "CARD_CONTEXT_MENU": {
-      "PENDING": "Mark as pending",
-      "RESOLVED": "Mark as resolved",
-      "MARK_AS_UNREAD": "Mark as unread",
+      "PENDING": "Pažymėti kaip laukiantį",
+      "RESOLVED": "Pažymėti kaip išspręstą",
+      "MARK_AS_UNREAD": "Pažymėti kaip neperskaitytą",
       "REOPEN": "Reopen conversation",
       "SNOOZE": {
-        "TITLE": "Snooze",
+        "TITLE": "Atidėti",
         "NEXT_REPLY": "Until next reply",
         "TOMORROW": "Until tomorrow",
         "NEXT_WEEK": "Until next week"
       },
-      "ASSIGN_AGENT": "Assign agent",
-      "ASSIGN_LABEL": "Assign label",
-      "AGENTS_LOADING": "Loading agents...",
-      "ASSIGN_TEAM": "Assign team",
+      "ASSIGN_AGENT": "Priskirti Agentą",
+      "ASSIGN_LABEL": "Priskirti etiketę",
+      "AGENTS_LOADING": "Agentai užkraunami...",
+      "ASSIGN_TEAM": "Priskirti komandą",
       "API": {
         "AGENT_ASSIGNMENT": {
-          "SUCCESFUL": "Conversation id %{conversationId} assigned to \"%{agentName}\"",
-          "FAILED": "Couldn't assign agent. Please try again."
+          "SUCCESFUL": "Pokalbis id %{conversationId} priskirtas \"%{agentName}\"",
+          "FAILED": "Nepavyko priskirti agento. Prašau, pabandykite dar kartą."
         },
         "LABEL_ASSIGNMENT": {
-          "SUCCESFUL": "Assigned label #%{labelName} to conversation id %{conversationId}",
-          "FAILED": "Couldn't assign label. Please try again."
+          "SUCCESFUL": "Priskirta etiketė #%{labelName} pokalbiui id %{conversationId}",
+          "FAILED": "Nepavyko priskirti etiketės. Prašau, pabandykite dar kartą."
         },
         "TEAM_ASSIGNMENT": {
-          "SUCCESFUL": "Assigned team \"%{team}\" to conversation id %{conversationId}",
-          "FAILED": "Couldn't assign team. Please try again."
+          "SUCCESFUL": "Priskirta komanda #%{team} pokalbiui id %{conversationId}",
+          "FAILED": "Nepavyko priskirti komandos. Prašau, pabandykite dar kartą."
         }
       }
     },
     "FOOTER": {
-      "MESSAGE_SIGN_TOOLTIP": "Message signature",
-      "ENABLE_SIGN_TOOLTIP": "Enable signature",
-      "DISABLE_SIGN_TOOLTIP": "Disable signature",
-      "MSG_INPUT": "Shift + enter for new line. Start with '/' to select a Canned Response.",
-      "PRIVATE_MSG_INPUT": "Shift + enter for new line. This will be visible only to Agents",
-      "MESSAGE_SIGNATURE_NOT_CONFIGURED": "Message signature is not configured, please configure it in profile settings.",
-      "CLICK_HERE": "Click here to update"
+      "MESSAGE_SIGN_TOOLTIP": "Pranešimo parašas",
+      "ENABLE_SIGN_TOOLTIP": "Įjungti parašą",
+      "DISABLE_SIGN_TOOLTIP": "Išjungti parašą",
+      "MSG_INPUT": "Spauksite Shift + Enter, pradėjimui iš naujos eilutės. Pradėkite nuo „/“, kad pasirinktumėte Atsakymo Ruošinį.",
+      "PRIVATE_MSG_INPUT": "Spauksite Shift + Enter, pradėjimui iš naujos eilutės. Tai bus matoma tik Agentams",
+      "MESSAGE_SIGNATURE_NOT_CONFIGURED": "Pranešimo parašas nesukonfigūruotas, sukonfigūruokite jį profilio nustatymuose.",
+      "CLICK_HERE": "Spausti čia kad atnaujinti"
     },
     "REPLYBOX": {
       "REPLY": "Atsakyti",
-      "PRIVATE_NOTE": "Private Note",
+      "PRIVATE_NOTE": "Privati pastaba",
       "SEND": "Siųsti",
-      "CREATE": "Add Note",
-      "TWEET": "Tweet",
-      "TIP_FORMAT_ICON": "Show rich text editor",
-      "TIP_EMOJI_ICON": "Show emoji selector",
-      "TIP_ATTACH_ICON": "Attach files",
-      "TIP_AUDIORECORDER_ICON": "Record audio",
-      "TIP_AUDIORECORDER_PERMISSION": "Allow access to audio",
-      "TIP_AUDIORECORDER_ERROR": "Could not open the audio",
-      "DRAG_DROP": "Drag and drop here to attach",
-      "START_AUDIO_RECORDING": "Start audio recording",
-      "STOP_AUDIO_RECORDING": "Stop audio recording",
+      "CREATE": "Pridėti pastabą",
+      "TWEET": "Tweetinti",
+      "TIP_FORMAT_ICON": "Rodyti raiškiojo teksto redagavimo priemonę",
+      "TIP_EMOJI_ICON": "Parodyti emodžio parinkiklį",
+      "TIP_ATTACH_ICON": "Pridėti failus",
+      "TIP_AUDIORECORDER_ICON": "Įrašyti audio",
+      "TIP_AUDIORECORDER_PERMISSION": "Leisti prieiti prie audio",
+      "TIP_AUDIORECORDER_ERROR": "Nepavyko atidaryti audio",
+      "DRAG_DROP": "Norėdami pridėti, vilkite ir numeskite čia",
+      "START_AUDIO_RECORDING": "Pradėti audio įrašymą",
+      "STOP_AUDIO_RECORDING": "Baigti audio įrašymą",
       "": "",
       "EMAIL_HEAD": {
-        "ADD_BCC": "Add bcc",
+        "ADD_BCC": "Pridėti bcc",
         "CC": {
           "LABEL": "CC",
-          "PLACEHOLDER": "Emails separated by commas",
-          "ERROR": "Please enter valid email addresses"
+          "PLACEHOLDER": "El. laiškai atskirti kableliais",
+          "ERROR": "Prašau įveskite teisingą el. pašto adresą"
         },
         "BCC": {
           "LABEL": "BCC",
-          "PLACEHOLDER": "Emails separated by commas",
-          "ERROR": "Please enter valid email addresses"
+          "PLACEHOLDER": "El. laiškai atskirti kableliais",
+          "ERROR": "Prašau įveskite teisingą el. pašto adresą"
         }
       },
       "UNDEFINED_VARIABLES": {
-        "TITLE": "Undefined variables",
+        "TITLE": "Neapibrėžti kintamieji",
         "MESSAGE": "You have {undefinedVariablesCount} undefined variables in your message: {undefinedVariables}. Would you like to send the message anyway?",
         "CONFIRM": {
           "YES": "Siųsti",
@@ -161,31 +161,31 @@
         }
       }
     },
-    "VISIBLE_TO_AGENTS": "Private Note: Only visible to you and your team",
-    "CHANGE_STATUS": "Conversation status changed",
-    "CHANGE_STATUS_FAILED": "Conversation status change failed",
+    "VISIBLE_TO_AGENTS": "Privati ​​pastaba: matoma tik jums ir jūsų komandai",
+    "CHANGE_STATUS": "Pokalbio būsena pakeista",
+    "CHANGE_STATUS_FAILED": "Pokalbio būsenos nepavyko pakeisti",
     "CHANGE_AGENT": "Conversation Assignee changed",
     "CHANGE_AGENT_FAILED": "Assignee change failed",
-    "ASSIGN_LABEL_SUCCESFUL": "Label assigned successfully",
-    "ASSIGN_LABEL_FAILED": "Label assignment failed",
-    "CHANGE_TEAM": "Conversation team changed",
-    "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_SUPPORTED_FILE_UPLOAD_SIZE} MB attachment limit",
-    "MESSAGE_ERROR": "Unable to send this message, please try again later",
-    "SENT_BY": "Sent by:",
+    "ASSIGN_LABEL_SUCCESFUL": "Etiketė sėkmingai priskirta",
+    "ASSIGN_LABEL_FAILED": "Etiketės priskirti nepavyko",
+    "CHANGE_TEAM": "Pasikeitė pokalbių komanda",
+    "FILE_SIZE_LIMIT": "Failas viršija {MAXIMUM_SUPPORTED_FILE_UPLOAD_SIZE} MB priedo apribojimą",
+    "MESSAGE_ERROR": "Nepavyko išsiųsti šio pranešimo, bandykite dar kartą vėliau",
+    "SENT_BY": "Siuntėjas:",
     "BOT": "Botas",
-    "SEND_FAILED": "Couldn't send message! Try again",
-    "TRY_AGAIN": "retry",
+    "SEND_FAILED": "Nepavyko išsiųsti pranešimo! Bandykite dar kartą",
+    "TRY_AGAIN": "kartoti",
     "ASSIGNMENT": {
-      "SELECT_AGENT": "Select Agent",
-      "REMOVE": "Remove",
+      "SELECT_AGENT": "Pasirinkti agentą",
+      "REMOVE": "Pašalinti",
       "ASSIGN": "Priskirti"
     },
     "CONTEXT_MENU": {
       "COPY": "Copy",
       "DELETE": "Ištrinti",
-      "CREATE_A_CANNED_RESPONSE": "Add to canned responses",
+      "CREATE_A_CANNED_RESPONSE": "Pridėti Atsakymų Ruošinius",
       "TRANSLATE": "Išversti",
-      "COPY_PERMALINK": "Copy link to the message",
+      "COPY_PERMALINK": "Nukopijuoti nuorodą į pranešimą",
       "LINK_COPIED": "Message URL copied to the clipboard",
       "DELETE_CONFIRMATION": {
         "TITLE": "Are you sure you want to delete this message?",
@@ -218,7 +218,7 @@
     "READ_LATEST_UPDATES": "Read our latest updates",
     "ALL_CONVERSATION": {
       "TITLE": "All your conversations in one place",
-      "DESCRIPTION": "View all the conversations from your customers in one single dashboard. You can filter the conversations by the incoming channel, label and status."
+      "DESCRIPTION": "Peržiūrėkite visus savo klientų pokalbius vienoje informacijos suvestinėje. Galite filtruoti pokalbius pagal gaunamą kanalą, etiketę ir būseną."
     },
     "TEAM_MEMBERS": {
       "TITLE": "Invite your team members",
@@ -231,78 +231,78 @@
       "NEW_LINK": "Click here to create an inbox"
     },
     "LABELS": {
-      "TITLE": "Organize conversations with labels",
-      "DESCRIPTION": "Labels provide an easier way to categorize your conversation. Create some labels like #support-enquiry, #billing-question etc., so that you can use them in a conversation later.",
-      "NEW_LINK": "Click here to create tags"
+      "TITLE": "Tvarkykite pokalbius etiketėmis",
+      "DESCRIPTION": "Etiketės suteikia lengvesnį būdą suskirstyti pokalbį į kategorijas. Sukurkite keletą etikečių, pvz., #palaikymo-klausimas, #atsiskaitymo-klausimas ir kt., kad vėliau galėtumėte jas naudoti pokalbyje.",
+      "NEW_LINK": "Spustelėkite čia, kad sukurtumėte žymas"
     }
   },
   "CONVERSATION_SIDEBAR": {
-    "ASSIGNEE_LABEL": "Assigned Agent",
-    "SELF_ASSIGN": "Assign to me",
-    "TEAM_LABEL": "Assigned Team",
+    "ASSIGNEE_LABEL": "Priskirtas Agentas",
+    "SELF_ASSIGN": "Priskirti man",
+    "TEAM_LABEL": "Priskirta komanda",
     "SELECT": {
-      "PLACEHOLDER": "None"
+      "PLACEHOLDER": "Nėra"
     },
     "ACCORDION": {
-      "CONTACT_DETAILS": "Contact Details",
-      "CONVERSATION_ACTIONS": "Conversation Actions",
-      "CONVERSATION_LABELS": "Conversation Labels",
-      "CONVERSATION_INFO": "Conversation Information",
-      "CONTACT_ATTRIBUTES": "Contact Attributes",
-      "PREVIOUS_CONVERSATION": "Previous Conversations",
+      "CONTACT_DETAILS": "Kontakto detali informacija",
+      "CONVERSATION_ACTIONS": "Pokalbio veiksmai",
+      "CONVERSATION_LABELS": "Pokalbio Etiketės",
+      "CONVERSATION_INFO": "Pokalbio Informacija",
+      "CONTACT_ATTRIBUTES": "Kontakto Požymiai",
+      "PREVIOUS_CONVERSATION": "Ankstesni pokalbiai",
       "MACROS": "Macros"
     }
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
-    "ADD_BUTTON_TEXT": "Create attribute",
+    "ADD_BUTTON_TEXT": "Sukurti požymį",
     "UPDATE": {
-      "SUCCESS": "Attribute updated successfully",
-      "ERROR": "Unable to update attribute. Please try again later"
+      "SUCCESS": "Požymis atnaujintas sėkmingai",
+      "ERROR": "Nepavyko atnaujinti požymio. Pabandykite dar kartą vėliau"
     },
     "ADD": {
-      "TITLE": "Add",
-      "SUCCESS": "Attribute added successfully",
-      "ERROR": "Unable to add attribute. Please try again later"
+      "TITLE": "Pridėti",
+      "SUCCESS": "Požymis pridėtas sėkmingai",
+      "ERROR": "Nepavyko pridėti požymį. Pabandykite dar kartą vėliau"
     },
     "DELETE": {
-      "SUCCESS": "Attribute deleted successfully",
-      "ERROR": "Unable to delete attribute. Please try again later"
+      "SUCCESS": "Požymis ištrintas sėkmingai",
+      "ERROR": "Nepavyko ištrinti požymio. Pabandykite dar kartą vėliau"
     },
     "ATTRIBUTE_SELECT": {
-      "TITLE": "Add attributes",
-      "PLACEHOLDER": "Search attributes",
-      "NO_RESULT": "No attributes found"
+      "TITLE": "Pridėti požymius",
+      "PLACEHOLDER": "Ieškoti požymių",
+      "NO_RESULT": "Požymių nerasta"
     }
   },
   "EMAIL_HEADER": {
-    "FROM": "From",
-    "TO": "To",
+    "FROM": "Nuo",
+    "TO": "Kam",
     "BCC": "Bcc",
     "CC": "Cc",
-    "SUBJECT": "Subject"
+    "SUBJECT": "Tema"
   },
   "CONVERSATION_PARTICIPANTS": {
-    "SIDEBAR_MENU_TITLE": "Participating",
-    "SIDEBAR_TITLE": "Conversation participants",
-    "NO_RECORDS_FOUND": "No results found",
-    "ADD_PARTICIPANTS": "Select participants",
+    "SIDEBAR_MENU_TITLE": "Dalyvaujantys",
+    "SIDEBAR_TITLE": "Pokalbio dalyviai",
+    "NO_RECORDS_FOUND": "Nieko nerasta",
+    "ADD_PARTICIPANTS": "Pasirinkti dalyvius",
     "REMANING_PARTICIPANTS_TEXT": "+%{count} others",
     "REMANING_PARTICIPANT_TEXT": "+%{count} other",
     "TOTAL_PARTICIPANTS_TEXT": "%{count} people are participating.",
     "TOTAL_PARTICIPANT_TEXT": "%{count} person is participating.",
     "NO_PARTICIPANTS_TEXT": "No one is participating!.",
-    "WATCH_CONVERSATION": "Join conversation",
-    "YOU_ARE_WATCHING": "You are participating",
+    "WATCH_CONVERSATION": "Prisijungti pire pokalbio",
+    "YOU_ARE_WATCHING": "Jūs dalyvaujate",
     "API": {
       "ERROR_MESSAGE": "Could not update, try again!",
-      "SUCCESS_MESSAGE": "Participants updated!"
+      "SUCCESS_MESSAGE": "Dalyviai atnaujinti!"
     }
   },
   "TRANSLATE_MODAL": {
-    "TITLE": "View translated content",
+    "TITLE": "Rodyti išverstą turinį",
     "DESC": "You can view the translated content in each langauge.",
-    "ORIGINAL_CONTENT": "Original Content",
-    "TRANSLATED_CONTENT": "Translated Content",
+    "ORIGINAL_CONTENT": "Originalus turinys",
+    "TRANSLATED_CONTENT": "Išverstas turinys",
     "NO_TRANSLATIONS_AVAILABLE": "No translations are available for this content"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/lt/generalSettings.json b/app/javascript/dashboard/i18n/locale/lt/generalSettings.json
index 6ac907b0e..ee286e030 100644
--- a/app/javascript/dashboard/i18n/locale/lt/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/lt/generalSettings.json
@@ -1,8 +1,8 @@
 {
   "GENERAL_SETTINGS": {
-    "TITLE": "Account settings",
-    "SUBMIT": "Update settings",
-    "BACK": "Back",
+    "TITLE": "Paskyros nustatymai",
+    "SUBMIT": "Atnaujinti nustatymai",
+    "BACK": "Atgal",
     "UPDATE": {
       "ERROR": "Could not update settings, try again!",
       "SUCCESS": "Successfully updated account settings"
@@ -10,31 +10,31 @@
     "FORM": {
       "ERROR": "Please fix form errors",
       "GENERAL_SECTION": {
-        "TITLE": "General settings",
+        "TITLE": "Pagrindiniai nustatymai",
         "NOTE": ""
       },
       "ACCOUNT_ID": {
-        "TITLE": "Account ID",
+        "TITLE": "Paskyros ID",
         "NOTE": "This ID is required if you are building an API based integration"
       },
       "NAME": {
-        "LABEL": "Account name",
-        "PLACEHOLDER": "Your account name",
-        "ERROR": "Please enter a valid account name"
+        "LABEL": "Paskyros vardas",
+        "PLACEHOLDER": "Tavo paskyros vardas",
+        "ERROR": "Įveskite galiojantį paskyros vardą"
       },
       "LANGUAGE": {
-        "LABEL": "Site language",
-        "PLACEHOLDER": "Your account name",
+        "LABEL": "Pasirinkti kalbą",
+        "PLACEHOLDER": "Tavo paskyros vardas",
         "ERROR": ""
       },
       "DOMAIN": {
-        "LABEL": "Incoming Email Domain",
-        "PLACEHOLDER": "The domain where you will receive the emails",
+        "LABEL": "Įeinančio el. pašto domenas",
+        "PLACEHOLDER": "Domenas, kuriuo gausite el. laiškus",
         "ERROR": ""
       },
       "SUPPORT_EMAIL": {
-        "LABEL": "Support Email",
-        "PLACEHOLDER": "Your company's support email",
+        "LABEL": "Pagalbos el. paštas",
+        "PLACEHOLDER": "Jūsų įmonės pagalbos el. paštas",
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
@@ -48,90 +48,90 @@
       }
     },
     "UPDATE_CHATWOOT": "An update %{latestChatwootVersion} for Chatwoot is available. Please update your instance.",
-    "LEARN_MORE": "Learn more"
+    "LEARN_MORE": "Sužinoti daugiau"
   },
   "FORMS": {
     "MULTISELECT": {
-      "ENTER_TO_SELECT": "Press enter to select",
-      "ENTER_TO_REMOVE": "Press enter to remove",
-      "SELECT_ONE": "Select one",
-      "SELECT": "Select"
+      "ENTER_TO_SELECT": "Paspauskite Enter, kad pasirinktumėte",
+      "ENTER_TO_REMOVE": "Paspausti Enter, kad pašalintumėte",
+      "SELECT_ONE": "Pasirinkti vieną",
+      "SELECT": "Pasirinkti"
     }
   },
   "NOTIFICATIONS_PAGE": {
-    "HEADER": "Notifications",
-    "MARK_ALL_DONE": "Mark All Done",
+    "HEADER": "Pranešimai",
+    "MARK_ALL_DONE": "Pažymėti viską kaip atliktą",
     "DELETE_TITLE": "ištrinta",
     "UNREAD_NOTIFICATION": {
-      "TITLE": "Unread Notifications",
-      "ALL_NOTIFICATIONS": "View all notifications",
-      "LOADING_UNREAD_MESSAGE": "Loading unread notifications...",
-      "EMPTY_MESSAGE": "You have no unread notifications"
+      "TITLE": "Neperskaityti Pranešimai",
+      "ALL_NOTIFICATIONS": "Rodyti visus pranešimus",
+      "LOADING_UNREAD_MESSAGE": "Neperskaityti pranešimai parsiunčiami...",
+      "EMPTY_MESSAGE": "Turite neperskaitytų pranešimų"
     },
     "LIST": {
-      "LOADING_MESSAGE": "Loading notifications...",
-      "404": "No Notifications",
+      "LOADING_MESSAGE": "Pranešimai parsiunčiami...",
+      "404": "Nėra Pranešimų",
       "TABLE_HEADER": [
         "Vardas",
-        "Phone Number",
+        "Telefono numeris",
         "Pokalbiai",
-        "Last Contacted"
+        "Paskutinį kartą susisiekta"
       ]
     },
     "TYPE_LABEL": {
-      "conversation_creation": "New conversation",
-      "conversation_assignment": "Conversation Assigned",
-      "assigned_conversation_new_message": "New Message",
-      "participating_conversation_new_message": "New Message",
-      "conversation_mention": "Mention"
+      "conversation_creation": "Naujas pokalbis",
+      "conversation_assignment": "Pokalbis priskirtas",
+      "assigned_conversation_new_message": "Naujas pranešimas",
+      "participating_conversation_new_message": "Naujas pranešimas",
+      "conversation_mention": "Paminėjimas"
     }
   },
   "NETWORK": {
     "NOTIFICATION": {
-      "TEXT": "Disconnected from Chatwoot"
+      "TEXT": "Atsijungti nuo Chatwoot"
     },
     "BUTTON": {
-      "REFRESH": "Refresh"
+      "REFRESH": "Atnaujinti"
     }
   },
   "COMMAND_BAR": {
-    "SEARCH_PLACEHOLDER": "Search or jump to",
+    "SEARCH_PLACEHOLDER": "Ieškoti ar pereiti į",
     "SECTIONS": {
-      "GENERAL": "General",
+      "GENERAL": "Pagrindinis",
       "REPORTS": "Reports",
-      "CONVERSATION": "Conversation",
-      "CHANGE_ASSIGNEE": "Change Assignee",
-      "CHANGE_PRIORITY": "Change Priority",
-      "CHANGE_TEAM": "Change Team",
-      "ADD_LABEL": "Add label to the conversation",
-      "REMOVE_LABEL": "Remove label from the conversation",
-      "SETTINGS": "Settings"
+      "CONVERSATION": "Pokalbis",
+      "CHANGE_ASSIGNEE": "Pakeisti Priskirtąjį",
+      "CHANGE_PRIORITY": "Pakeisti Prioritetą",
+      "CHANGE_TEAM": "Pakeisti Komandą",
+      "ADD_LABEL": "Pridėti etiketę pokalbiui",
+      "REMOVE_LABEL": "Pašalinti pokalbio etiketę",
+      "SETTINGS": "Nustatymai"
     },
     "COMMANDS": {
       "GO_TO_CONVERSATION_DASHBOARD": "Go to Conversation Dashboard",
       "GO_TO_CONTACTS_DASHBOARD": "Go to Contacts Dashboard",
-      "GO_TO_REPORTS_OVERVIEW": "Go to Reports Overview",
-      "GO_TO_CONVERSATION_REPORTS": "Go to Conversation Reports",
-      "GO_TO_AGENT_REPORTS": "Go to Agent Reports",
-      "GO_TO_LABEL_REPORTS": "Go to Label Reports",
+      "GO_TO_REPORTS_OVERVIEW": "Eiti į Ataskaitų apžvalgą",
+      "GO_TO_CONVERSATION_REPORTS": "Eiti į Pokalbių Ataskaitas",
+      "GO_TO_AGENT_REPORTS": "Eiti į Agento Ataskaitas",
+      "GO_TO_LABEL_REPORTS": "Eiti į Etiketės Ataskaitas",
       "GO_TO_INBOX_REPORTS": "Go to Inbox Reports",
-      "GO_TO_TEAM_REPORTS": "Go to Team Reports",
-      "GO_TO_SETTINGS_AGENTS": "Go to Agent Settings",
-      "GO_TO_SETTINGS_TEAMS": "Go to Team Settings",
+      "GO_TO_TEAM_REPORTS": "Eiti į Komandos Ataskaitas",
+      "GO_TO_SETTINGS_AGENTS": "Eiti į Agento Nustatymus",
+      "GO_TO_SETTINGS_TEAMS": "Eiti į Komandos Nustatymus",
       "GO_TO_SETTINGS_INBOXES": "Go to Inbox Settings",
-      "GO_TO_SETTINGS_LABELS": "Go to Label Settings",
+      "GO_TO_SETTINGS_LABELS": "Eiti į Etiketės Nustatymus",
       "GO_TO_SETTINGS_CANNED_RESPONSES": "Go to Canned Response Settings",
       "GO_TO_SETTINGS_APPLICATIONS": "Go to Application Settings",
       "GO_TO_SETTINGS_ACCOUNT": "Go to Account Settings",
       "GO_TO_SETTINGS_PROFILE": "Go to Profile Settings",
       "GO_TO_NOTIFICATIONS": "Go to Notifications",
-      "ADD_LABELS_TO_CONVERSATION": "Add label to the conversation",
+      "ADD_LABELS_TO_CONVERSATION": "Pridėti etiketę pokalbiui",
       "ASSIGN_AN_AGENT": "Assign an agent",
       "ASSIGN_PRIORITY": "Assign priority",
       "ASSIGN_A_TEAM": "Assign a team",
       "MUTE_CONVERSATION": "Mute conversation",
       "UNMUTE_CONVERSATION": "Unmute conversation",
-      "REMOVE_LABEL_FROM_CONVERSATION": "Remove label from the conversation",
+      "REMOVE_LABEL_FROM_CONVERSATION": "Pašalinti pokalbio etiketę",
       "REOPEN_CONVERSATION": "Reopen conversation",
       "RESOLVE_CONVERSATION": "Resolve conversation",
       "SEND_TRANSCRIPT": "Send an email transcript",
diff --git a/app/javascript/dashboard/i18n/locale/lt/helpCenter.json b/app/javascript/dashboard/i18n/locale/lt/helpCenter.json
index 067e7067d..3ac692329 100644
--- a/app/javascript/dashboard/i18n/locale/lt/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/lt/helpCenter.json
@@ -3,7 +3,7 @@
     "HEADER": {
       "FILTER": "Filtruoti pagal",
       "SORT": "Rūšiuoti pagal",
-      "SETTINGS_BUTTON": "Settings",
+      "SETTINGS_BUTTON": "Nustatymai",
       "NEW_BUTTON": "New Article",
       "DROPDOWN_OPTIONS": {
         "PUBLISHED": "Paskelbta",
@@ -11,18 +11,18 @@
         "ARCHIVED": "Suarchyvuota"
       },
       "TITLES": {
-        "ALL_ARTICLES": "All Articles",
-        "MINE": "My Articles",
+        "ALL_ARTICLES": "Visi Straipsniai",
+        "MINE": "Mano Straipsniai",
         "DRAFT": "Draft Articles",
-        "ARCHIVED": "Archived Articles"
+        "ARCHIVED": "Suarchyvuoti Straipsniai"
       }
     },
     "EDIT_HEADER": {
-      "ALL_ARTICLES": "All Articles",
+      "ALL_ARTICLES": "Visi Straipsniai",
       "PUBLISH_BUTTON": "Skelbti",
       "MOVE_TO_ARCHIVE_BUTTON": "Move to archived",
       "PREVIEW": "Peržiūrėti",
-      "ADD_TRANSLATION": "Add translation",
+      "ADD_TRANSLATION": "Pridėti vertimą",
       "OPEN_SIDEBAR": "Open sidebar",
       "CLOSE_SIDEBAR": "Close sidebar",
       "SAVING": "Išsaugoma...",
@@ -30,7 +30,7 @@
     },
     "ARTICLE_EDITOR": {
       "IMAGE_UPLOAD": {
-        "TITLE": "Upload image",
+        "TITLE": "Įkelti paveikslėlį",
         "UPLOADING": "Uploading...",
         "SUCCESS": "Image uploaded successfully",
         "ERROR": "Error while uploading image",
@@ -40,14 +40,14 @@
       }
     },
     "ARTICLE_SETTINGS": {
-      "TITLE": "Article Settings",
+      "TITLE": "Straipsnio Nustatymai",
       "FORM": {
         "CATEGORY": {
           "LABEL": "Kategorija",
-          "TITLE": "Select category",
-          "PLACEHOLDER": "Select category",
-          "NO_RESULT": "No category found",
-          "SEARCH_PLACEHOLDER": "Search category"
+          "TITLE": "Pasirinkti kategoriją",
+          "PLACEHOLDER": "Pasirinkti kategoriją",
+          "NO_RESULT": "Kategorijų nerasta",
+          "SEARCH_PLACEHOLDER": "Ieškoti kategorijos"
         },
         "AUTHOR": {
           "LABEL": "Autorius",
@@ -75,18 +75,18 @@
       }
     },
     "PORTAL": {
-      "HEADER": "Portals",
+      "HEADER": "Portalas",
       "DEFAULT": "Default",
       "NEW_BUTTON": "New Portal",
-      "ACTIVE_BADGE": "active",
+      "ACTIVE_BADGE": "aktyvus",
       "CHOOSE_LOCALE_LABEL": "Choose a locale",
       "LOADING_MESSAGE": "Loading portals...",
-      "ARTICLES_LABEL": "articles",
+      "ARTICLES_LABEL": "straipsniai",
       "NO_PORTALS_MESSAGE": "There are no available portals",
       "ADD_NEW_LOCALE": "Add a new locale",
       "POPOVER": {
-        "TITLE": "Portals",
-        "PORTAL_SETTINGS": "Portal settings",
+        "TITLE": "Portalas",
+        "PORTAL_SETTINGS": "Portalo nustatymai",
         "SUBTITLE": "You have multiple portals and can have different locales for each portal.",
         "CANCEL_BUTTON_LABEL": "Atšaukti",
         "CHOOSE_LOCALE_BUTTON": "Choose Locale"
@@ -94,10 +94,10 @@
       "PORTAL_SETTINGS": {
         "LIST_ITEM": {
           "HEADER": {
-            "COUNT_LABEL": "articles",
+            "COUNT_LABEL": "straipsniai",
             "ADD": "Add locale",
             "VISIT": "Visit site",
-            "SETTINGS": "Settings",
+            "SETTINGS": "Nustatymai",
             "DELETE": "Ištrinti"
           },
           "PORTAL_CONFIG": {
@@ -125,12 +125,12 @@
           }
         },
         "DELETE_PORTAL": {
-          "TITLE": "Delete portal",
+          "TITLE": "Trinti portalą",
           "MESSAGE": "Are you sure you want to delete this portal",
-          "YES": "Yes, delete portal",
+          "YES": "Taip, trinti portalą",
           "NO": "No, keep portal",
           "API": {
-            "DELETE_SUCCESS": "Portal deleted successfully",
+            "DELETE_SUCCESS": "Portalas ištrintas sėkmingai",
             "DELETE_ERROR": "Error while deleting portal"
           }
         }
@@ -139,7 +139,7 @@
         "HEADER_TEXT": "Edit portal",
         "TABS": {
           "BASIC_SETTINGS": {
-            "TITLE": "Basic information"
+            "TITLE": "Pagrindinė informacija"
           },
           "CUSTOMIZATION_SETTINGS": {
             "TITLE": "Portal customization"
@@ -153,17 +153,17 @@
         },
         "CATEGORIES": {
           "TITLE": "Categories in",
-          "NEW_CATEGORY": "New category",
+          "NEW_CATEGORY": "Nauja kategorija",
           "TABLE": {
             "NAME": "Vardas",
             "DESCRIPTION": "Aprašymas",
             "LOCALE": "Locale",
             "ARTICLE_COUNT": "No. of articles",
             "ACTION_BUTTON": {
-              "EDIT": "Edit category",
-              "DELETE": "Delete category"
+              "EDIT": "Keisti kategoriją",
+              "DELETE": "Ištrinti kategoriją"
             },
-            "EMPTY_TEXT": "No categories found"
+            "EMPTY_TEXT": "Kategorijų nerasta"
           }
         },
         "EDIT_BASIC_INFO": {
@@ -192,7 +192,7 @@
           }
         ],
         "CREATE_FLOW_PAGE": {
-          "BACK_BUTTON": "Back",
+          "BACK_BUTTON": "Atgal",
           "BASIC_SETTINGS_PAGE": {
             "HEADER": "Create Portal",
             "TITLE": "Help center information",
@@ -211,12 +211,12 @@
         },
         "LOGO": {
           "LABEL": "Logotipas",
-          "UPLOAD_BUTTON": "Upload logo",
+          "UPLOAD_BUTTON": "Įkelti logotipą",
           "HELP_TEXT": "This logo will be displayed on the portal header."
         },
         "NAME": {
           "LABEL": "Vardas",
-          "PLACEHOLDER": "Portal name",
+          "PLACEHOLDER": "Portalo pavadinimas",
           "HELP_TEXT": "The name will be used in the public facing portal internally.",
           "ERROR": "Yra reikalingas vardas"
         },
@@ -242,7 +242,7 @@
           "HELP_TEXT": "This color will show as the theme color for the portal."
         },
         "PAGE_TITLE": {
-          "LABEL": "Page Title",
+          "LABEL": "Puslapio Antraštė",
           "PLACEHOLDER": "Portal page title",
           "HELP_TEXT": "The page title will be used in the public facing portal.",
           "ERROR": "Page title is required"
@@ -263,7 +263,7 @@
       "ADD_LOCALE": {
         "TITLE": "Add a new locale",
         "SUB_TITLE": "This adds a new locale to your available translation list.",
-        "PORTAL": "Portal",
+        "PORTAL": "Portalas",
         "LOCALE": {
           "LABEL": "Locale",
           "PLACEHOLDER": "Choose a locale",
@@ -345,14 +345,14 @@
     },
     "SIDEBAR": {
       "SEARCH": {
-        "PLACEHOLDER": "Search for articles"
+        "PLACEHOLDER": "Ieškoti straipsnių"
       }
     },
     "CATEGORY": {
       "ADD": {
-        "TITLE": "Create a category",
+        "TITLE": "Sukurti kategoriją",
         "SUB_TITLE": "The category will be used in the public facing portal to categorize articles.",
-        "PORTAL": "Portal",
+        "PORTAL": "Portalas",
         "LOCALE": "Locale",
         "NAME": {
           "LABEL": "Vardas",
@@ -381,9 +381,9 @@
         }
       },
       "EDIT": {
-        "TITLE": "Edit a category",
+        "TITLE": "Keisti kategoriją",
         "SUB_TITLE": "Editing a category will update the category in the public facing portal.",
-        "PORTAL": "Portal",
+        "PORTAL": "Portalas",
         "LOCALE": "Locale",
         "NAME": {
           "LABEL": "Vardas",
@@ -403,7 +403,7 @@
           "ERROR": "Description is required"
         },
         "BUTTONS": {
-          "CREATE": "Update category",
+          "CREATE": "Keisti kategoriją",
           "CANCEL": "Atšaukti"
         },
         "API": {
diff --git a/app/javascript/dashboard/i18n/locale/lt/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/lt/inboxMgmt.json
index e62c1a4a9..321d2d6f6 100644
--- a/app/javascript/dashboard/i18n/locale/lt/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/lt/inboxMgmt.json
@@ -63,7 +63,7 @@
         "CHANNEL_WEBHOOK_URL": {
           "LABEL": "Webhook URL",
           "PLACEHOLDER": "Enter your Webhook URL",
-          "ERROR": "Please enter a valid URL"
+          "ERROR": "Prašome įvesti tesingą URL adresą"
         },
         "CHANNEL_DOMAIN": {
           "LABEL": "Website Domain",
@@ -71,27 +71,27 @@
         },
         "CHANNEL_WELCOME_TITLE": {
           "LABEL": "Welcome Heading",
-          "PLACEHOLDER": "Hi there !"
+          "PLACEHOLDER": "Sveiki!"
         },
         "CHANNEL_WELCOME_TAGLINE": {
           "LABEL": "Welcome Tagline",
           "PLACEHOLDER": "We make it simple to connect with us. Ask us anything, or share your feedback."
         },
         "CHANNEL_GREETING_MESSAGE": {
-          "LABEL": "Channel greeting message",
+          "LABEL": "Kanalo pasisveikinimo pranešimas",
           "PLACEHOLDER": "Acme Inc typically replies in a few hours."
         },
         "CHANNEL_GREETING_TOGGLE": {
-          "LABEL": "Enable channel greeting",
+          "LABEL": "Leisti kanalo pasisveikinimą",
           "HELP_TEXT": "Automatically send a greeting message when a new conversation is created.",
-          "ENABLED": "Enabled",
-          "DISABLED": "Disabled"
+          "ENABLED": "Leisti",
+          "DISABLED": "Išjungta"
         },
         "REPLY_TIME": {
           "TITLE": "Set Reply time",
-          "IN_A_FEW_MINUTES": "In a few minutes",
-          "IN_A_FEW_HOURS": "In a few hours",
-          "IN_A_DAY": "In a day",
+          "IN_A_FEW_MINUTES": "Per kelias minutes",
+          "IN_A_FEW_HOURS": "Per kelias minutes",
+          "IN_A_DAY": "Per dieną",
           "HELP_TEXT": "This reply time will be displayed on the live chat widget"
         },
         "WIDGET_COLOR": {
@@ -118,7 +118,7 @@
           "USE_MESSAGING_SERVICE": "Use a Twilio Messaging Service"
         },
         "CHANNEL_TYPE": {
-          "LABEL": "Channel Type",
+          "LABEL": "Kanalo tipas",
           "ERROR": "Please select your Channel Type"
         },
         "AUTH_TOKEN": {
@@ -132,7 +132,7 @@
           "ERROR": "This field is required"
         },
         "PHONE_NUMBER": {
-          "LABEL": "Phone number",
+          "LABEL": "Telefono numeris",
           "PLACEHOLDER": "Please enter the phone number from which message will be sent.",
           "ERROR": "Please provide a valid phone number that starts with a `+` sign and does not contain any spaces."
         },
@@ -140,30 +140,30 @@
           "TITLE": "Callback URL",
           "SUBTITLE": "You have to configure the message callback URL in Twilio with the URL mentioned here."
         },
-        "SUBMIT_BUTTON": "Create Twilio Channel",
+        "SUBMIT_BUTTON": "Sukurti Twilio kanalą",
         "API": {
           "ERROR_MESSAGE": "We were not able to authenticate Twilio credentials, please try again"
         }
       },
       "SMS": {
-        "TITLE": "SMS Channel",
+        "TITLE": "SMS kanalas",
         "DESC": "Start supporting your customers via SMS.",
         "PROVIDERS": {
-          "LABEL": "API Provider",
+          "LABEL": "API tiekėjas",
           "TWILIO": "Twilio",
-          "BANDWIDTH": "Bandwidth"
+          "BANDWIDTH": "Pralaidumas"
         },
         "API": {
           "ERROR_MESSAGE": "We were not able to save the SMS channel"
         },
         "BANDWIDTH": {
           "ACCOUNT_ID": {
-            "LABEL": "Account ID",
+            "LABEL": "Paskyros ID",
             "PLACEHOLDER": "Please enter your Bandwidth Account ID",
             "ERROR": "This field is required"
           },
           "API_KEY": {
-            "LABEL": "API Key",
+            "LABEL": "API raktas",
             "PLACEHOLDER": "Please enter your Bandwith API Key",
             "ERROR": "This field is required"
           },
@@ -183,7 +183,7 @@
             "ERROR": "This field is required"
           },
           "PHONE_NUMBER": {
-            "LABEL": "Phone number",
+            "LABEL": "Telefono numeris",
             "PLACEHOLDER": "Please enter the phone number from which message will be sent.",
             "ERROR": "Please provide a valid phone number that starts with a `+` sign and does not contain any spaces."
           },
@@ -198,10 +198,10 @@
         }
       },
       "WHATSAPP": {
-        "TITLE": "WhatsApp Channel",
+        "TITLE": "WhatsApp Kanalas",
         "DESC": "Start supporting your customers via WhatsApp.",
         "PROVIDERS": {
-          "LABEL": "API Provider",
+          "LABEL": "API tiekėjas",
           "TWILIO": "Twilio",
           "WHATSAPP_CLOUD": "WhatsApp Cloud",
           "360_DIALOG": "360Dialog"
@@ -212,12 +212,12 @@
           "ERROR": "This field is required"
         },
         "PHONE_NUMBER": {
-          "LABEL": "Phone number",
+          "LABEL": "Telefono numeris",
           "PLACEHOLDER": "Please enter the phone number from which message will be sent.",
           "ERROR": "Please provide a valid phone number that starts with a `+` sign and does not contain any spaces."
         },
         "PHONE_NUMBER_ID": {
-          "LABEL": "Phone number ID",
+          "LABEL": "Telefono numerio ID",
           "PLACEHOLDER": "Please enter the Phone number ID obtained from Facebook developer dashboard.",
           "ERROR": "Please enter a valid value."
         },
@@ -232,9 +232,9 @@
           "ERROR": "Please enter a valid value."
         },
         "API_KEY": {
-          "LABEL": "API key",
+          "LABEL": "API raktas",
           "SUBTITLE": "Configure the WhatsApp API key.",
-          "PLACEHOLDER": "API key",
+          "PLACEHOLDER": "API raktas",
           "ERROR": "Please enter a valid value."
         },
         "API_CALLBACK": {
@@ -249,11 +249,11 @@
         }
       },
       "API_CHANNEL": {
-        "TITLE": "API Channel",
+        "TITLE": "API kanalas",
         "DESC": "Integrate with API channel and start supporting your customers.",
         "CHANNEL_NAME": {
-          "LABEL": "Channel Name",
-          "PLACEHOLDER": "Please enter a channel name",
+          "LABEL": "Kanalo Pavadinimas",
+          "PLACEHOLDER": "Prašome įrašyti kanalo pavadinimą",
           "ERROR": "This field is required"
         },
         "WEBHOOK_URL": {
@@ -261,23 +261,23 @@
           "SUBTITLE": "Configure the URL where you want to recieve callbacks on events.",
           "PLACEHOLDER": "Webhook URL"
         },
-        "SUBMIT_BUTTON": "Create API Channel",
+        "SUBMIT_BUTTON": "Sukurti API kanalą",
         "API": {
           "ERROR_MESSAGE": "We were not able to save the api channel"
         }
       },
       "EMAIL_CHANNEL": {
-        "TITLE": "Email Channel",
+        "TITLE": "El. pašto kanalas",
         "DESC": "Integrate you email inbox.",
         "CHANNEL_NAME": {
-          "LABEL": "Channel Name",
-          "PLACEHOLDER": "Please enter a channel name",
+          "LABEL": "Kanalo Pavadinimas",
+          "PLACEHOLDER": "Prašome įrašyti kanalo pavadinimą",
           "ERROR": "This field is required"
         },
         "EMAIL": {
-          "LABEL": "Email",
+          "LABEL": "El. paštas",
           "SUBTITLE": "Email where your customers sends you support tickets",
-          "PLACEHOLDER": "Email"
+          "PLACEHOLDER": "El. paštas"
         },
         "SUBMIT_BUTTON": "Create Email Channel",
         "API": {
@@ -286,16 +286,16 @@
         "FINISH_MESSAGE": "Start forwarding your emails to the following email address."
       },
       "LINE_CHANNEL": {
-        "TITLE": "LINE Channel",
+        "TITLE": "LINE kanalas",
         "DESC": "Integrate with LINE channel and start supporting your customers.",
         "CHANNEL_NAME": {
-          "LABEL": "Channel Name",
-          "PLACEHOLDER": "Please enter a channel name",
+          "LABEL": "Kanalo Pavadinimas",
+          "PLACEHOLDER": "Prašome įrašyti kanalo pavadinimą",
           "ERROR": "This field is required"
         },
         "LINE_CHANNEL_ID": {
-          "LABEL": "LINE Channel ID",
-          "PLACEHOLDER": "LINE Channel ID"
+          "LABEL": "LINE kanalo ID",
+          "PLACEHOLDER": "LINE kanalo ID"
         },
         "LINE_CHANNEL_SECRET": {
           "LABEL": "LINE Channel Secret",
@@ -305,7 +305,7 @@
           "LABEL": "LINE Channel Token",
           "PLACEHOLDER": "LINE Channel Token"
         },
-        "SUBMIT_BUTTON": "Create LINE Channel",
+        "SUBMIT_BUTTON": "Sukurti LINE kanalą",
         "API": {
           "ERROR_MESSAGE": "We were not able to save the LINE channel"
         },
@@ -315,14 +315,14 @@
         }
       },
       "TELEGRAM_CHANNEL": {
-        "TITLE": "Telegram Channel",
+        "TITLE": "Telegram Kanalas",
         "DESC": "Integrate with Telegram channel and start supporting your customers.",
         "BOT_TOKEN": {
           "LABEL": "Bot Token",
           "SUBTITLE": "Configure the bot token you have obtained from Telegram BotFather.",
           "PLACEHOLDER": "Bot Token"
         },
-        "SUBMIT_BUTTON": "Create Telegram Channel",
+        "SUBMIT_BUTTON": "Sukurti Telegram kanalą",
         "API": {
           "ERROR_MESSAGE": "We were not able to save the telegram channel"
         }
@@ -342,7 +342,7 @@
         "DESC": "From the dropdown below, select the Facebook Page you want to connect to Chatwoot. You can also give a custom name to your inbox for better identification."
       },
       "FINISH": {
-        "TITLE": "Nailed It!",
+        "TITLE": "Atlikta!",
         "DESC": "You have successfully finished integrating your Facebook Page with Chatwoot. Next time a customer messages your Page, the conversation will automatically appear on your inbox.<br>We are also providing you with a widget script that you can easily add to your website. Once this is live on your website, customers can message you right from your website without the help of any external tool and the conversation will appear right here, on Chatwoot.<br>Cool, huh? Well, we sure try to be :)"
       },
       "EMAIL_PROVIDER": {
@@ -350,9 +350,9 @@
         "DESCRIPTION": "Select an email provider from the list below. If you don't see your email provider in the list, you can select the other provider option and provide the IMAP and SMTP Credentials."
       },
       "MICROSOFT": {
-        "TITLE": "Microsoft Email",
+        "TITLE": "Microsoft El. paštas",
         "DESCRIPTION": "Click on the Sign in with Microsoft button to get started. You will redirected to the email sign in page. Once you accept the requested permissions, you would be redirected back to the inbox creation step.",
-        "EMAIL_PLACEHOLDER": "Enter email address",
+        "EMAIL_PLACEHOLDER": "Įvesti el. pašto adresą",
         "HELP": "To add your Microsoft account as a channel, you need to authenticate your Microsoft account by clicking on 'Sign in with Microsoft' ",
         "ERROR_MESSAGE": "There was an error connecting to Microsoft, please try again"
       }
@@ -365,18 +365,18 @@
       "DESC": ""
     },
     "AGENTS": {
-      "BUTTON_TEXT": "Add agents",
+      "BUTTON_TEXT": "Pridėti agentus",
       "ADD_AGENTS": "Adding Agents to your Inbox..."
     },
     "FINISH": {
       "TITLE": "Your Inbox is ready!",
       "MESSAGE": "You can now engage with your customers through your new Channel. Happy supporting",
-      "BUTTON_TEXT": "Take me there",
-      "MORE_SETTINGS": "More settings",
+      "BUTTON_TEXT": "Nuvesk mane ten",
+      "MORE_SETTINGS": "Daugiau nustatymų",
       "WEBSITE_SUCCESS": "You have successfully finished creating a website channel. Copy the code shown below and paste it on your website. Next time a customer use the live chat, the conversation will automatically appear on your inbox."
     },
-    "REAUTH": "Reauthorize",
-    "VIEW": "View",
+    "REAUTH": "Pakartotinai autorizuoti",
+    "VIEW": "Paržiūra",
     "EDIT": {
       "API": {
         "SUCCESS_MESSAGE": "Inbox settings updated successfully",
@@ -384,32 +384,32 @@
         "ERROR_MESSAGE": "We couldn't update inbox settings. Please try again later."
       },
       "EMAIL_COLLECT_BOX": {
-        "ENABLED": "Enabled",
-        "DISABLED": "Disabled"
+        "ENABLED": "Leisti",
+        "DISABLED": "Išjungta"
       },
       "ENABLE_CSAT": {
-        "ENABLED": "Enabled",
-        "DISABLED": "Disabled"
+        "ENABLED": "Leisti",
+        "DISABLED": "Išjungta"
       },
       "ALLOW_MESSAGES_AFTER_RESOLVED": {
-        "ENABLED": "Enabled",
-        "DISABLED": "Disabled"
+        "ENABLED": "Leisti",
+        "DISABLED": "Išjungta"
       },
       "ENABLE_CONTINUITY_VIA_EMAIL": {
-        "ENABLED": "Enabled",
-        "DISABLED": "Disabled"
+        "ENABLED": "Leisti",
+        "DISABLED": "Išjungta"
       },
       "LOCK_TO_SINGLE_CONVERSATION": {
-        "ENABLED": "Enabled",
-        "DISABLED": "Disabled"
+        "ENABLED": "Leisti",
+        "DISABLED": "Išjungta"
       },
       "ENABLE_HMAC": {
-        "LABEL": "Enable"
+        "LABEL": "Leisti"
       }
     },
     "DELETE": {
       "BUTTON_TEXT": "Ištrinti",
-      "AVATAR_DELETE_BUTTON_TEXT": "Delete Avatar",
+      "AVATAR_DELETE_BUTTON_TEXT": "Ištrinti Avatarą",
       "CONFIRM": {
         "TITLE": "Patvirtinti Ištrynimą",
         "MESSAGE": "Ar tikrai norite ištrinti ",
@@ -425,35 +425,35 @@
       }
     },
     "TABS": {
-      "SETTINGS": "Settings",
-      "COLLABORATORS": "Collaborators",
-      "CONFIGURATION": "Configuration",
+      "SETTINGS": "Nustatymai",
+      "COLLABORATORS": "Bendradarbiai",
+      "CONFIGURATION": "Konfiguracija",
       "CAMPAIGN": "Campaigns",
       "PRE_CHAT_FORM": "Pre Chat Form",
-      "BUSINESS_HOURS": "Business Hours",
-      "WIDGET_BUILDER": "Widget Builder",
-      "BOT_CONFIGURATION": "Bot Configuration"
+      "BUSINESS_HOURS": "Darbo valandos",
+      "WIDGET_BUILDER": "Valdiklių kūrimo priemonė",
+      "BOT_CONFIGURATION": "Boto konfiguracija"
     },
-    "SETTINGS": "Settings",
+    "SETTINGS": "Nustatymai",
     "FEATURES": {
-      "LABEL": "Features",
+      "LABEL": "Funkcijos",
       "DISPLAY_FILE_PICKER": "Display file picker on the widget",
       "DISPLAY_EMOJI_PICKER": "Display emoji picker on the widget",
       "ALLOW_END_CONVERSATION": "Allow users to end conversation from the widget",
       "USE_INBOX_AVATAR_FOR_BOT": "Use inbox name and avatar for the bot"
     },
     "SETTINGS_POPUP": {
-      "MESSENGER_HEADING": "Messenger Script",
+      "MESSENGER_HEADING": "Messenger scenarijus",
       "MESSENGER_SUB_HEAD": "Place this button inside your body tag",
       "INBOX_AGENTS": "Agentai",
       "INBOX_AGENTS_SUB_TEXT": "Add or remove agents from this inbox",
       "AGENT_ASSIGNMENT": "Conversation Assignment",
       "AGENT_ASSIGNMENT_SUB_TEXT": "Update conversation assignment settings",
-      "UPDATE": "Update",
+      "UPDATE": "Atnaujinti",
       "ENABLE_EMAIL_COLLECT_BOX": "Enable email collect box",
       "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Enable or disable email collect box on new conversation",
       "AUTO_ASSIGNMENT": "Enable auto assignment",
-      "ENABLE_CSAT": "Enable CSAT",
+      "ENABLE_CSAT": "Leisti CSAT",
       "ENABLE_CSAT_SUB_TEXT": "Enable/Disable CSAT(Customer satisfaction) survey after resolving a conversation",
       "ENABLE_CONTINUITY_VIA_EMAIL": "Enable conversation continuity via email",
       "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "Conversations will continue over email if the contact email address is available.",
@@ -464,6 +464,7 @@
       "AUTO_ASSIGNMENT_SUB_TEXT": "Enable or disable the automatic assignment of new conversations to the agents added to this inbox.",
       "HMAC_VERIFICATION": "User Identity Validation",
       "HMAC_DESCRIPTION": "In order to validate the user's identity, you can pass an `identifier_hash` for each user. You can generate a HMAC sha256 hash using the `identifier` with the key shown here.",
+      "HMAC_LINK_TO_DOCS": "You can read more here.",
       "HMAC_MANDATORY_VERIFICATION": "Enforce User Identity Validation",
       "HMAC_MANDATORY_DESCRIPTION": "If enabled, requests missing the `identifier_hash` will be rejected.",
       "INBOX_IDENTIFIER": "Inbox Identifier",
@@ -474,19 +475,19 @@
       "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved.",
       "WHATSAPP_SECTION_SUBHEADER": "This API Key is used for the integration with the WhatsApp APIs.",
       "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the updated key to be used for the integration with the WhatsApp APIs.",
-      "WHATSAPP_SECTION_TITLE": "API Key",
-      "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
+      "WHATSAPP_SECTION_TITLE": "API raktas",
+      "WHATSAPP_SECTION_UPDATE_TITLE": "Atnaujinti API raktą",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
-      "WHATSAPP_SECTION_UPDATE_BUTTON": "Update",
+      "WHATSAPP_SECTION_UPDATE_BUTTON": "Atnaujinti",
       "WHATSAPP_WEBHOOK_TITLE": "Webhook Verify Token",
       "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "HELP_CENTER": {
-      "LABEL": "Help Center",
-      "PLACEHOLDER": "Select Help Center",
-      "SELECT_PLACEHOLDER": "Select Help Center",
-      "REMOVE": "Remove Help Center",
+      "LABEL": "Palaikymo centras",
+      "PLACEHOLDER": "Pasirinkti Pagalbos Centrą",
+      "SELECT_PLACEHOLDER": "Pasirinkti Pagalbos Centrą",
+      "REMOVE": "Pašalinti Pagalbos Centrą",
       "SUB_TEXT": "Attach a Help Center with the inbox"
     },
     "AUTO_ASSIGNMENT": {
@@ -495,7 +496,7 @@
       "MAX_ASSIGNMENT_LIMIT_SUB_TEXT": "Limit the maximum number of conversations from this inbox that can be auto assigned to an agent"
     },
     "FACEBOOK_REAUTHORIZE": {
-      "TITLE": "Reauthorize",
+      "TITLE": "Pakartotinai autorizuoti",
       "SUBTITLE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
       "MESSAGE_SUCCESS": "Reconnection successful",
       "MESSAGE_ERROR": "There was an error, please try again"
@@ -504,8 +505,8 @@
       "DESCRIPTION": "Pre chat forms enable you to capture user information before they start conversation with you.",
       "SET_FIELDS": "Pre chat form fields",
       "SET_FIELDS_HEADER": {
-        "FIELDS": "Fields",
-        "LABEL": "Label",
+        "FIELDS": "Laukai",
+        "LABEL": "Etiketė",
         "PLACE_HOLDER": "Placeholder",
         "KEY": "Raktas",
         "TYPE": "Tipas",
@@ -539,9 +540,9 @@
       "DAY": {
         "ENABLE": "Enable availability for this day",
         "UNAVAILABLE": "Unavailable",
-        "HOURS": "hours",
+        "HOURS": "valandos",
         "VALIDATION_ERROR": "Starting time should be before closing time.",
-        "CHOOSE": "Choose"
+        "CHOOSE": "Pasirinkti"
       },
       "ALL_DAY": "All-Day"
     },
@@ -557,22 +558,22 @@
         "ERROR_MESSAGE": "Unable to update IMAP settings"
       },
       "ADDRESS": {
-        "LABEL": "Address",
+        "LABEL": "Adresas",
         "PLACE_HOLDER": "Address (Eg: imap.gmail.com)"
       },
       "PORT": {
-        "LABEL": "Port",
-        "PLACE_HOLDER": "Port"
+        "LABEL": "Portas",
+        "PLACE_HOLDER": "Portas"
       },
       "LOGIN": {
-        "LABEL": "Login",
-        "PLACE_HOLDER": "Login"
+        "LABEL": "Prisijungti",
+        "PLACE_HOLDER": "Prisijungti"
       },
       "PASSWORD": {
-        "LABEL": "Password",
-        "PLACE_HOLDER": "Password"
+        "LABEL": "Slaptažodis",
+        "PLACE_HOLDER": "Slaptažodis"
       },
-      "ENABLE_SSL": "Enable SSL"
+      "ENABLE_SSL": "Leisti SSL"
     },
     "MICROSOFT": {
       "TITLE": "Microsoft",
@@ -589,30 +590,30 @@
         "ERROR_MESSAGE": "Unable to update SMTP settings"
       },
       "ADDRESS": {
-        "LABEL": "Address",
+        "LABEL": "Adresas",
         "PLACE_HOLDER": "Address (Eg: smtp.gmail.com)"
       },
       "PORT": {
-        "LABEL": "Port",
-        "PLACE_HOLDER": "Port"
+        "LABEL": "Portas",
+        "PLACE_HOLDER": "Portas"
       },
       "LOGIN": {
-        "LABEL": "Login",
-        "PLACE_HOLDER": "Login"
+        "LABEL": "Prisijungti",
+        "PLACE_HOLDER": "Prisijungti"
       },
       "PASSWORD": {
-        "LABEL": "Password",
-        "PLACE_HOLDER": "Password"
+        "LABEL": "Slaptažodis",
+        "PLACE_HOLDER": "Slaptažodis"
       },
       "DOMAIN": {
-        "LABEL": "Domain",
-        "PLACE_HOLDER": "Domain"
+        "LABEL": "Domenas",
+        "PLACE_HOLDER": "Domenas"
       },
       "ENCRYPTION": "Encryption",
       "SSL_TLS": "SSL/TLS",
       "START_TLS": "STARTTLS",
       "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode",
-      "AUTH_MECHANISM": "Authentication"
+      "AUTH_MECHANISM": "Autentifikacija"
     },
     "NOTE": "Note: ",
     "WIDGET_BUILDER": {
@@ -641,9 +642,9 @@
         },
         "REPLY_TIME": {
           "LABEL": "Reply Time",
-          "IN_A_FEW_MINUTES": "In a few minutes",
-          "IN_A_FEW_HOURS": "In a few hours",
-          "IN_A_DAY": "In a day"
+          "IN_A_FEW_MINUTES": "Per kelias minutes",
+          "IN_A_FEW_HOURS": "Per kelias minutes",
+          "IN_A_DAY": "Per dieną"
         },
         "WIDGET_COLOR_LABEL": "Widget Color",
         "WIDGET_BUBBLE_POSITION_LABEL": "Widget Bubble Position",
@@ -683,7 +684,7 @@
         "IN_A_DAY": "Typically replies in a day"
       },
       "FOOTER": {
-        "START_CONVERSATION_BUTTON_TEXT": "Start Conversation",
+        "START_CONVERSATION_BUTTON_TEXT": "Pradėti Pokalbį",
         "CHAT_INPUT_PLACEHOLDER": "Type your message"
       },
       "BODY": {
@@ -694,7 +695,7 @@
         "USER_MESSAGE": "Hi",
         "AGENT_MESSAGE": "Hello"
       },
-      "BRANDING_TEXT": "Powered by Chatwoot",
+      "BRANDING_TEXT": "Parengta pagal Chatwoot",
       "SCRIPT_SETTINGS": "\n      window.chatwootSettings = {options};"
     },
     "EMAIL_PROVIDERS": {
diff --git a/app/javascript/dashboard/i18n/locale/lt/integrationApps.json b/app/javascript/dashboard/i18n/locale/lt/integrationApps.json
index 39784efc2..1c2897869 100644
--- a/app/javascript/dashboard/i18n/locale/lt/integrationApps.json
+++ b/app/javascript/dashboard/i18n/locale/lt/integrationApps.json
@@ -4,8 +4,8 @@
     "NO_HOOK_CONFIGURED": "There are no %{integrationId} integrations configured in this account.",
     "HEADER": "Applications",
     "STATUS": {
-      "ENABLED": "Enabled",
-      "DISABLED": "Disabled"
+      "ENABLED": "Leisti",
+      "DISABLED": "Išjungta"
     },
     "CONFIGURE": "Configure",
     "ADD_BUTTON": "Add a new hook",
@@ -25,7 +25,7 @@
       "CANCEL_BUTTON_TEXT": "Atšaukti",
       "API": {
         "SUCCESS_MESSAGE": "Hook deleted successfully",
-        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        "ERROR_MESSAGE": "Nepavyko prisijungti prie Woot serverio, bandykite dar kartą vėliau"
       }
     },
     "LIST": {
@@ -46,7 +46,7 @@
       },
       "API": {
         "SUCCESS_MESSAGE": "Integration hook added successfully",
-        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        "ERROR_MESSAGE": "Nepavyko prisijungti prie Woot serverio, bandykite dar kartą vėliau"
       }
     },
     "CONNECT": {
diff --git a/app/javascript/dashboard/i18n/locale/lt/integrations.json b/app/javascript/dashboard/i18n/locale/lt/integrations.json
index 5fd4807b3..a28096126 100644
--- a/app/javascript/dashboard/i18n/locale/lt/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/lt/integrations.json
@@ -10,7 +10,7 @@
           "LABEL": "Events",
           "EVENTS": {
             "CONVERSATION_CREATED": "Conversation Created",
-            "CONVERSATION_STATUS_CHANGED": "Conversation Status Changed",
+            "CONVERSATION_STATUS_CHANGED": "Pokalbio būsena pakeista",
             "CONVERSATION_UPDATED": "Conversation Updated",
             "MESSAGE_CREATED": "Message created",
             "MESSAGE_UPDATED": "Message updated",
@@ -22,7 +22,7 @@
         "END_POINT": {
           "LABEL": "Webhook URL",
           "PLACEHOLDER": "Example: https://example/api/webhook",
-          "ERROR": "Please enter a valid URL"
+          "ERROR": "Prašome įvesti tesingą URL adresą"
         },
         "EDIT_SUBMIT": "Update webhook",
         "ADD_SUBMIT": "Create webhook"
@@ -47,7 +47,7 @@
         "TITLE": "Edit webhook",
         "API": {
           "SUCCESS_MESSAGE": "Webhook configuration updated successfully",
-          "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+          "ERROR_MESSAGE": "Nepavyko prisijungti prie Woot serverio, bandykite dar kartą vėliau"
         }
       },
       "ADD": {
@@ -55,14 +55,14 @@
         "TITLE": "Add new webhook",
         "API": {
           "SUCCESS_MESSAGE": "Webhook configuration added successfully",
-          "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+          "ERROR_MESSAGE": "Nepavyko prisijungti prie Woot serverio, bandykite dar kartą vėliau"
         }
       },
       "DELETE": {
         "BUTTON_TEXT": "Ištrinti",
         "API": {
           "SUCCESS_MESSAGE": "Webhook deleted successfully",
-          "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+          "ERROR_MESSAGE": "Nepavyko prisijungti prie Woot serverio, bandykite dar kartą vėliau"
         },
         "CONFIRM": {
           "TITLE": "Patvirtinti Ištrynimą",
@@ -143,14 +143,14 @@
       },
       "UPDATE": {
         "HEADER": "Edit dashboard app",
-        "FORM_SUBMIT": "Update",
+        "FORM_SUBMIT": "Atnaujinti",
         "FORM_CANCEL": "Atšaukti",
         "API_SUCCESS": "Dashboard app updated successfully",
         "API_ERROR": "We couldn't update the app. Please try again later"
       },
       "DELETE": {
-        "CONFIRM_YES": "Yes, delete it",
-        "CONFIRM_NO": "No, keep it",
+        "CONFIRM_YES": "Taip, Trinti",
+        "CONFIRM_NO": "Ne, Išsaugoti",
         "TITLE": "Confirm deletion",
         "MESSAGE": "Are you sure to delete the app - %{appName}?",
         "API_SUCCESS": "Dashboard app deleted successfully",
diff --git a/app/javascript/dashboard/i18n/locale/lt/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/lt/labelsMgmt.json
index cc52d69bd..9b9640c5c 100644
--- a/app/javascript/dashboard/i18n/locale/lt/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/lt/labelsMgmt.json
@@ -1,14 +1,14 @@
 {
   "LABEL_MGMT": {
-    "HEADER": "Labels",
-    "HEADER_BTN_TXT": "Add label",
-    "LOADING": "Fetching labels",
+    "HEADER": "Etiketės",
+    "HEADER_BTN_TXT": "Pridėti Etiketę",
+    "LOADING": "Gaunamos etiketės",
     "SEARCH_404": "Šią užklausą atitinkančių elementų nėra",
-    "SIDEBAR_TXT": "<p><b>Labels</b> <p>Labels help you to categorize conversations and prioritize them. You can assign label to a conversation from the sidepanel. <br /><br />Labels are tied to the account and can be used to create custom workflows in your organization. You can assign custom color to a label, it makes it easier to identify the label. You will be able to display the label on the sidebar to filter the conversations easily.</p>",
+    "SIDEBAR_TXT": "<p><b>Etiketės</b> <p>Etiketės padeda suskirstyti pokalbius į kategorijas ir nustatyti jiems prioritetus. Galite priskirti etiketę pokalbiui iš šoninio skydelio. <br /><br />Etiketės susietos su paskyra ir gali būti naudojamos kuriant supaprastintus darbo procesus jūsų organizacijoje. Etiketei galite priskirti pasirinktą spalvą, kad būtų lengviau atpažinti etiketę. Galėsite rodyti etiketę šoninėje juostoje, kad galėtumėte lengvai filtruoti pokalbius.</p>",
     "LIST": {
-      "404": "There are no labels available in this account.",
-      "TITLE": "Manage labels",
-      "DESC": "Labels let you group the conversations together.",
+      "404": "Šioje paskyroje nėra galimų etikečių.",
+      "TITLE": "Tvarkyti etiketes",
+      "DESC": "Etiketės leidžia grupuoti pokalbius kartu.",
       "TABLE_HEADER": [
         "Vardas",
         "Aprašymas",
@@ -17,21 +17,21 @@
     },
     "FORM": {
       "NAME": {
-        "LABEL": "Label Name",
-        "PLACEHOLDER": "Label name",
-        "REQUIRED_ERROR": "Label name is required",
+        "LABEL": "Etiketės pavadinimas",
+        "PLACEHOLDER": "Etiketės pavadinimas",
+        "REQUIRED_ERROR": "Yra reikalingas etiketės pavadinimas",
         "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
         "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
       },
       "DESCRIPTION": {
         "LABEL": "Aprašymas",
-        "PLACEHOLDER": "Label Description"
+        "PLACEHOLDER": "Etiketės aprašymas"
       },
       "COLOR": {
         "LABEL": "Spalva"
       },
       "SHOW_ON_SIDEBAR": {
-        "LABEL": "Show label on sidebar"
+        "LABEL": "Rodyti etiketę šoninėje juostoje"
       },
       "EDIT": "Redaguoti",
       "CREATE": "Sukurti",
@@ -39,24 +39,24 @@
       "CANCEL": "Atšaukti"
     },
     "ADD": {
-      "TITLE": "Add label",
-      "DESC": "Labels let you group the conversations together.",
+      "TITLE": "Pridėti Etiketę",
+      "DESC": "Etiketės leidžia grupuoti pokalbius kartu.",
       "API": {
-        "SUCCESS_MESSAGE": "Label added successfully",
+        "SUCCESS_MESSAGE": "Etiketė sėkmingai priskirta",
         "ERROR_MESSAGE": "There was an error, please try again"
       }
     },
     "EDIT": {
-      "TITLE": "Edit label",
+      "TITLE": "Tvarkyti Etiketę",
       "API": {
-        "SUCCESS_MESSAGE": "Label updated successfully",
+        "SUCCESS_MESSAGE": "Etiketė sėkmingai atnaujinta",
         "ERROR_MESSAGE": "There was an error, please try again"
       }
     },
     "DELETE": {
       "BUTTON_TEXT": "Ištrinti",
       "API": {
-        "SUCCESS_MESSAGE": "Label deleted successfully",
+        "SUCCESS_MESSAGE": "Etiketė sėkmingai ištrinta",
         "ERROR_MESSAGE": "There was an error, please try again"
       },
       "CONFIRM": {
diff --git a/app/javascript/dashboard/i18n/locale/lt/login.json b/app/javascript/dashboard/i18n/locale/lt/login.json
index f2b2f51b9..aca6a6fe8 100644
--- a/app/javascript/dashboard/i18n/locale/lt/login.json
+++ b/app/javascript/dashboard/i18n/locale/lt/login.json
@@ -2,12 +2,12 @@
   "LOGIN": {
     "TITLE": "Login to Chatwoot",
     "EMAIL": {
-      "LABEL": "Email",
+      "LABEL": "El. paštas",
       "PLACEHOLDER": "example@companyname.com"
     },
     "PASSWORD": {
-      "LABEL": "Password",
-      "PLACEHOLDER": "Password"
+      "LABEL": "Slaptažodis",
+      "PLACEHOLDER": "Slaptažodis"
     },
     "API": {
       "SUCCESS_MESSAGE": "Login successful",
@@ -21,6 +21,6 @@
     },
     "FORGOT_PASSWORD": "Forgot your password?",
     "CREATE_NEW_ACCOUNT": "Create new account",
-    "SUBMIT": "Login"
+    "SUBMIT": "Prisijungti"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/lt/macros.json b/app/javascript/dashboard/i18n/locale/lt/macros.json
index 2725064af..e4f407cde 100644
--- a/app/javascript/dashboard/i18n/locale/lt/macros.json
+++ b/app/javascript/dashboard/i18n/locale/lt/macros.json
@@ -4,7 +4,7 @@
     "HEADER_BTN_TXT": "Add a new macro",
     "HEADER_BTN_TXT_SAVE": "Save macro",
     "LOADING": "Fetching macros",
-    "SIDEBAR_TXT": "<p><b>Macros</b><p>A macro is a set of saved actions that help customer service agents easily complete tasks. The agents can define a set of actions like tagging a conversation with a label, sending an email transcript, updating a custom attribute, etc., and they can run these actions in a single click. When the agents run the macro, the actions would be performed sequentially in the order they are defined. Macros improve productivity and increase consistency in actions. </p><p>A macro can be helpful in 2 ways. </p><p><b>As an agent assist:</b> If an agent performs a set of actions multiple times, they can save it as a macro and execute all the actions together using a single click.</p><p><b>As an option to onboard a team member:</b> Every agent has to perform many different checks/actions during each conversation. Onboarding a new support team member will be easy if pre-defined macros are available on the account. Instead of describing each step in detail, the manager/team lead can point to the macros used in different scenarios.</p>",
+    "SIDEBAR_TXT": "<p><b>Makrokomandos</b><p>Makrokomandos yra išsaugotų veiksmų rinkinys, padedantis klientų aptarnavimo agentams lengvai atlikti užduotis. Agentai gali apibrėžti veiksmų rinkinį, pvz., pokalbio žymėjimą etikete, el. laiško nuorašo siuntimą, atributo atnaujinimą ir pan., ir jie gali atlikti šiuos veiksmus vienu paspaudimu. Kai agentai vykdo makrokomandą, veiksmai bus atliekami nuosekliai tokia tvarka, kokia jie yra apibrėžti. Makrokomandos pagerina produktyvumą ir padidina veiksmų nuoseklumą. </p><p>Makrokomandas gali būti naudingas dviem būdais. </p><p><b>Kaip agento pagalba:</b> jei agentas kelis kartus atlieka veiksmų rinkinį, jis gali išsaugoti jį kaip makrokomandą ir atlikti visus veiksmus kartu vienu spustelėjimu.</b> p><p><b>Kaip galimybė įtraukti komandos narį:</b> kiekvienas agentas kiekvieno pokalbio metu turi atlikti daugybę skirtingų patikrinimų / veiksmų. Priimant naują komandos narį bus lengva, jei paskyroje bus iš anksto nustatytų makrokomandų. Užuot išsamiai aprašęs kiekvieną veiksmą, vadovas / komandos vadovas gali nurodyti įvairiuose scenarijuose naudojamas makrokomandas.</p>",
     "ERROR": "Something went wrong. Please try again",
     "ORDER_INFO": "Macros will run in the order you add your actions. You can rearrange them by dragging them by the handle beside each node.",
     "ADD": {
@@ -26,9 +26,9 @@
     "LIST": {
       "TABLE_HEADER": [
         "Vardas",
-        "Created by",
+        "Sukurtas",
         "Last updated by",
-        "Visibility"
+        "Matomumas"
       ],
       "404": "No macros found"
     },
@@ -52,11 +52,11 @@
       }
     },
     "EDITOR": {
-      "START_FLOW": "Start Flow",
-      "END_FLOW": "End Flow",
+      "START_FLOW": "Pradėti srautą",
+      "END_FLOW": "Baigti srautą",
       "LOADING": "Fetching macro",
-      "ADD_BTN_TOOLTIP": "Add new action",
-      "DELETE_BTN_TOOLTIP": "Delete Action",
+      "ADD_BTN_TOOLTIP": "Pridėti naują veiksmą",
+      "DELETE_BTN_TOOLTIP": "Ištrinti Veiksmą",
       "VISIBILITY": {
         "LABEL": "Macro Visibility",
         "GLOBAL": {
diff --git a/app/javascript/dashboard/i18n/locale/lt/report.json b/app/javascript/dashboard/i18n/locale/lt/report.json
index 3b6a9221d..c2e505be9 100644
--- a/app/javascript/dashboard/i18n/locale/lt/report.json
+++ b/app/javascript/dashboard/i18n/locale/lt/report.json
@@ -121,7 +121,7 @@
     "LOADING_CHART": "Loading chart data...",
     "NO_ENOUGH_DATA": "We've not received enough data points to generate report, Please try again later.",
     "DOWNLOAD_AGENT_REPORTS": "Download agent reports",
-    "FILTER_DROPDOWN_LABEL": "Select Agent",
+    "FILTER_DROPDOWN_LABEL": "Pasirinkti agentą",
     "METRICS": {
       "CONVERSATIONS": {
         "NAME": "Pokalbiai",
@@ -184,11 +184,11 @@
     }
   },
   "LABEL_REPORTS": {
-    "HEADER": "Labels Overview",
+    "HEADER": "Etikečių Peržiūra",
     "LOADING_CHART": "Loading chart data...",
     "NO_ENOUGH_DATA": "We've not received enough data points to generate report, Please try again later.",
-    "DOWNLOAD_LABEL_REPORTS": "Download label reports",
-    "FILTER_DROPDOWN_LABEL": "Select Label",
+    "DOWNLOAD_LABEL_REPORTS": "Parsisiųsti etiketės ataskaitas",
+    "FILTER_DROPDOWN_LABEL": "Pažymėti Etiketę",
     "METRICS": {
       "CONVERSATIONS": {
         "NAME": "Pokalbiai",
@@ -395,8 +395,8 @@
     },
     "TABLE": {
       "HEADER": {
-        "CONTACT_NAME": "Contact",
-        "AGENT_NAME": "Assigned agent",
+        "CONTACT_NAME": "Kontaktas",
+        "AGENT_NAME": "Priskirtas agentas",
         "RATING": "Reitingas",
         "FEEDBACK_TEXT": "Feedback comment"
       }
@@ -417,12 +417,12 @@
     }
   },
   "OVERVIEW_REPORTS": {
-    "HEADER": "Overview",
+    "HEADER": "Apžvalga",
     "LIVE": "Live",
     "ACCOUNT_CONVERSATIONS": {
       "HEADER": "Open Conversations",
       "LOADING_MESSAGE": "Loading conversation metrics...",
-      "OPEN": "Open",
+      "OPEN": "Atidaryti",
       "UNATTENDED": "Unattended",
       "UNASSIGNED": "Unassigned"
     },
@@ -438,25 +438,25 @@
       "NO_AGENTS": "There are no conversations by agents",
       "TABLE_HEADER": {
         "AGENT": "Agentas",
-        "OPEN": "OPEN",
+        "OPEN": "ATIDARYTI",
         "UNATTENDED": "Unattended",
         "STATUS": "Būsena"
       }
     },
     "AGENT_STATUS": {
-      "HEADER": "Agent status",
-      "ONLINE": "Online",
+      "HEADER": "Agento būsena",
+      "ONLINE": "Prisijungęs",
       "BUSY": "Užimta",
-      "OFFLINE": "Offline"
+      "OFFLINE": "Atsijungęs"
     }
   },
   "DAYS_OF_WEEK": {
-    "SUNDAY": "Sunday",
+    "SUNDAY": "Sekmadienis",
     "MONDAY": "Pirmadienis",
-    "TUESDAY": "Tuesday",
-    "WEDNESDAY": "Wednesday",
+    "TUESDAY": "Antradienis",
+    "WEDNESDAY": "Trečiadienis",
     "THURSDAY": "Ketvirtadienis",
     "FRIDAY": "Penktadienis",
-    "SATURDAY": "Saturday"
+    "SATURDAY": "Šeštadienis"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/lt/resetPassword.json b/app/javascript/dashboard/i18n/locale/lt/resetPassword.json
index a44f3d555..79c1cc0fc 100644
--- a/app/javascript/dashboard/i18n/locale/lt/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/lt/resetPassword.json
@@ -1,10 +1,10 @@
 {
   "RESET_PASSWORD": {
-    "TITLE": "Reset password",
+    "TITLE": "Atstatyti slaptažodį",
     "EMAIL": {
       "LABEL": "El. paštas",
-      "PLACEHOLDER": "Please enter your email.",
-      "ERROR": "Please enter a valid email."
+      "PLACEHOLDER": "Prašau įveskite jūsų el. paštą.",
+      "ERROR": "Prašau įveskite teisingą el. paštą."
     },
     "API": {
       "SUCCESS_MESSAGE": "Password reset link has been sent to your email.",
diff --git a/app/javascript/dashboard/i18n/locale/lt/search.json b/app/javascript/dashboard/i18n/locale/lt/search.json
index 804dc8aa3..17d1e641e 100644
--- a/app/javascript/dashboard/i18n/locale/lt/search.json
+++ b/app/javascript/dashboard/i18n/locale/lt/search.json
@@ -2,14 +2,14 @@
   "SEARCH": {
     "TABS": {
       "ALL": "Visi",
-      "CONTACTS": "Contacts",
+      "CONTACTS": "Kontaktai",
       "CONVERSATIONS": "Pokalbiai",
-      "MESSAGES": "Messages"
+      "MESSAGES": "Pranešimai"
     },
     "SECTION": {
-      "CONTACTS": "Contacts",
+      "CONTACTS": "Kontaktai",
       "CONVERSATIONS": "Pokalbiai",
-      "MESSAGES": "Messages"
+      "MESSAGES": "Pranešimai"
     },
     "EMPTY_STATE": "No %{item} found for query '%{query}'",
     "EMPTY_STATE_FULL": "No results found for query '%{query}'",
diff --git a/app/javascript/dashboard/i18n/locale/lt/setNewPassword.json b/app/javascript/dashboard/i18n/locale/lt/setNewPassword.json
index 5d3a48035..d7475df98 100644
--- a/app/javascript/dashboard/i18n/locale/lt/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/lt/setNewPassword.json
@@ -1,6 +1,6 @@
 {
   "SET_NEW_PASSWORD": {
-    "TITLE": "Set new password",
+    "TITLE": "Nustatyti naują slaptažodį",
     "PASSWORD": {
       "LABEL": "Slaptažodis",
       "PLACEHOLDER": "Slaptažodis",
diff --git a/app/javascript/dashboard/i18n/locale/lt/settings.json b/app/javascript/dashboard/i18n/locale/lt/settings.json
index c4f0a70e1..bddd34aa5 100644
--- a/app/javascript/dashboard/i18n/locale/lt/settings.json
+++ b/app/javascript/dashboard/i18n/locale/lt/settings.json
@@ -1,22 +1,22 @@
 {
   "PROFILE_SETTINGS": {
-    "LINK": "Profile Settings",
-    "TITLE": "Profile Settings",
-    "BTN_TEXT": "Update Profile",
-    "DELETE_AVATAR": "Delete Avatar",
-    "AVATAR_DELETE_SUCCESS": "Avatar has been deleted successfully",
+    "LINK": "Profilio Nustatymai",
+    "TITLE": "Profilio Nustatymai",
+    "BTN_TEXT": "Atnaujinti Profilį",
+    "DELETE_AVATAR": "Ištrinti Avatarą",
+    "AVATAR_DELETE_SUCCESS": "Avataras buvo ištrintas sėkmingai",
     "AVATAR_DELETE_FAILED": "There is an error while deleting avatar, please try again",
     "UPDATE_SUCCESS": "Your profile has been updated successfully",
     "PASSWORD_UPDATE_SUCCESS": "Your password has been changed successfully",
     "AFTER_EMAIL_CHANGED": "Your profile has been updated successfully, please login again as your login credentials are changed",
     "FORM": {
-      "AVATAR": "Profile Image",
+      "AVATAR": "Profilio paveikslėlis",
       "ERROR": "Please fix form errors",
-      "REMOVE_IMAGE": "Remove",
-      "UPLOAD_IMAGE": "Upload image",
-      "UPDATE_IMAGE": "Update image",
+      "REMOVE_IMAGE": "Pašalinti",
+      "UPLOAD_IMAGE": "Įkelti paveikslėlį",
+      "UPDATE_IMAGE": "Atnaujinti paveikslėlį",
       "PROFILE_SECTION": {
-        "TITLE": "Profile",
+        "TITLE": "Profilis",
         "NOTE": "Your email address is your identity and is used to log in."
       },
       "SEND_MESSAGE": {
@@ -37,19 +37,19 @@
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Personal message signature",
         "NOTE": "Create a personal message signature that would be added to all the messages you send from your email inbox. Use the rich content editor to create a highly personalised signature.",
-        "BTN_TEXT": "Save message signature",
+        "BTN_TEXT": "Išsaugoti pranešimo parašą",
         "API_ERROR": "Couldn't save signature! Try again",
-        "API_SUCCESS": "Signature saved successfully"
+        "API_SUCCESS": "Parašas išsaugotas sėkmingai"
       },
       "MESSAGE_SIGNATURE": {
-        "LABEL": "Message Signature",
+        "LABEL": "Pranešimo parašas",
         "ERROR": "Message Signature cannot be empty",
         "PLACEHOLDER": "Insert your personal message signature here."
       },
       "PASSWORD_SECTION": {
-        "TITLE": "Password",
+        "TITLE": "Slaptažodis",
         "NOTE": "Updating your password would reset your logins in multiple devices.",
-        "BTN_TEXT": "Change password"
+        "BTN_TEXT": "Keisti slaptažodį"
       },
       "ACCESS_TOKEN": {
         "TITLE": "Access Token",
@@ -60,9 +60,9 @@
         "NOTE": "Enable audio notifications in dashboard for new messages and conversations.",
         "ALERT_TYPE": {
           "TITLE": "Alert events:",
-          "NONE": "None",
-          "ASSIGNED": "Assigned Conversations",
-          "ALL_CONVERSATIONS": "All Conversations"
+          "NONE": "Nėra",
+          "ASSIGNED": "Priskirti Pokalbiai",
+          "ALL_CONVERSATIONS": "Visi Pokalbiai"
         },
         "DEFAULT_TONE": {
           "TITLE": "Alert tone:"
@@ -98,7 +98,7 @@
         "REQUEST_PUSH": "Enable push notifications"
       },
       "PROFILE_IMAGE": {
-        "LABEL": "Profile Image"
+        "LABEL": "Profilio paveikslėlis"
       },
       "NAME": {
         "LABEL": "Jūsų pilnas vardas",
@@ -113,9 +113,9 @@
       "AVAILABILITY": {
         "LABEL": "Prieinamumas",
         "STATUSES_LIST": [
-          "Online",
+          "Prisijungęs",
           "Užimta",
-          "Offline"
+          "Atsijungęs"
         ],
         "SET_AVAILABILITY_SUCCESS": "Availability has been set successfully",
         "SET_AVAILABILITY_ERROR": "Couldn't set availability, please try again"
@@ -126,17 +126,17 @@
         "PLACEHOLDER": "Please enter your email address, this would be displayed in conversations"
       },
       "CURRENT_PASSWORD": {
-        "LABEL": "Current password",
+        "LABEL": "Dabartinis slaptažodis",
         "ERROR": "Please enter the current password",
         "PLACEHOLDER": "Please enter the current password"
       },
       "PASSWORD": {
-        "LABEL": "New password",
+        "LABEL": "Naujas slaptažodis",
         "ERROR": "Please enter a password of length 6 or more",
         "PLACEHOLDER": "Please enter a new password"
       },
       "PASSWORD_CONFIRMATION": {
-        "LABEL": "Confirm new password",
+        "LABEL": "Patvirtinti naują slaptažodį",
         "ERROR": "Confirm password should match the password",
         "PLACEHOLDER": "Please re-enter your new password"
       }
@@ -147,10 +147,10 @@
     "CHANGE_ACCOUNTS": "Switch Account",
     "CONTACT_SUPPORT": "Contact Support",
     "SELECTOR_SUBTITLE": "Select an account from the following list",
-    "PROFILE_SETTINGS": "Profile Settings",
+    "PROFILE_SETTINGS": "Profilio Nustatymai",
     "KEYBOARD_SHORTCUTS": "Keyboard Shortcuts",
     "SUPER_ADMIN_CONSOLE": "Super Admin Console",
-    "LOGOUT": "Logout"
+    "LOGOUT": "Atsijungti"
   },
   "APP_GLOBAL": {
     "TRIAL_MESSAGE": "days trial remaining.",
@@ -168,8 +168,8 @@
       "COPY_SUCCESSFUL": "Code copied to clipboard successfully"
     },
     "SHOW_MORE_BLOCK": {
-      "SHOW_MORE": "Show More",
-      "SHOW_LESS": "Show Less"
+      "SHOW_MORE": "Rodyti Daugiau",
+      "SHOW_LESS": "Rodyti Mažiau"
     },
     "FILE_BUBBLE": {
       "DOWNLOAD": "Parsisiųsti",
@@ -183,7 +183,7 @@
       "SUBMIT": "Pateikti"
     }
   },
-  "CONFIRM_EMAIL": "Verifying...",
+  "CONFIRM_EMAIL": "Tikrinama...",
   "SETTINGS": {
     "INBOXES": {
       "NEW_INBOX": "Add Inbox"
@@ -191,38 +191,38 @@
   },
   "SIDEBAR": {
     "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
-    "SWITCH": "Switch",
+    "SWITCH": "Perjungti",
     "CONVERSATIONS": "Pokalbiai",
-    "ALL_CONVERSATIONS": "All Conversations",
+    "ALL_CONVERSATIONS": "Visi Pokalbiai",
     "MENTIONED_CONVERSATIONS": "Paminėjimai",
-    "PARTICIPATING_CONVERSATIONS": "Participating",
+    "PARTICIPATING_CONVERSATIONS": "Dalyvaujantys",
     "UNATTENDED_CONVERSATIONS": "Unattended",
     "REPORTS": "Reports",
-    "SETTINGS": "Settings",
-    "CONTACTS": "Contacts",
+    "SETTINGS": "Nustatymai",
+    "CONTACTS": "Kontaktai",
     "HOME": "Home",
     "AGENTS": "Agentai",
     "AGENT_BOTS": "Botai",
     "AUDIT_LOGS": "Audit Logs",
     "INBOXES": "Inboxes",
-    "NOTIFICATIONS": "Notifications",
+    "NOTIFICATIONS": "Pranešimai",
     "CANNED_RESPONSES": "Atsakymų Ruošiniai",
     "INTEGRATIONS": "Integrations",
-    "PROFILE_SETTINGS": "Profile Settings",
-    "ACCOUNT_SETTINGS": "Account Settings",
+    "PROFILE_SETTINGS": "Profilio Nustatymai",
+    "ACCOUNT_SETTINGS": "Paskyros Nustatymai",
     "APPLICATIONS": "Applications",
-    "LABELS": "Labels",
-    "CUSTOM_ATTRIBUTES": "Custom Attributes",
+    "LABELS": "Etiketės",
+    "CUSTOM_ATTRIBUTES": "Personalizuoti Požymiai",
     "AUTOMATION": "Automation",
     "MACROS": "Macros",
-    "TEAMS": "Teams",
+    "TEAMS": "Komandos",
     "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "Papkės",
     "CUSTOM_VIEWS_SEGMENTS": "Segments",
     "ALL_CONTACTS": "Visi Kontaktai",
     "TAGGED_WITH": "Tagged with",
-    "NEW_LABEL": "New label",
-    "NEW_TEAM": "New team",
+    "NEW_LABEL": "Nauja etiketė",
+    "NEW_TEAM": "Nauja komanda",
     "NEW_INBOX": "New inbox",
     "REPORTS_CONVERSATION": "Pokalbiai",
     "CSAT": "CSAT",
@@ -230,28 +230,28 @@
     "ONGOING": "Ongoing",
     "ONE_OFF": "Vienas iš",
     "REPORTS_AGENT": "Agentai",
-    "REPORTS_LABEL": "Labels",
+    "REPORTS_LABEL": "Etiketės",
     "REPORTS_INBOX": "Inbox",
-    "REPORTS_TEAM": "Team",
+    "REPORTS_TEAM": "Komanda",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
     "BETA": "Beta",
-    "REPORTS_OVERVIEW": "Overview",
+    "REPORTS_OVERVIEW": "Apžvalga",
     "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
     "HELP_CENTER": {
       "TITLE": "Help Center (Beta)",
-      "ALL_ARTICLES": "All Articles",
-      "MY_ARTICLES": "My Articles",
+      "ALL_ARTICLES": "Visi Straipsniai",
+      "MY_ARTICLES": "Mano Straipsniai",
       "DRAFT": "Ruošinys",
       "ARCHIVED": "Suarchyvuota",
       "CATEGORY": "Kategorija",
-      "SETTINGS": "Settings",
-      "CATEGORY_EMPTY_MESSAGE": "No categories found"
+      "SETTINGS": "Nustatymai",
+      "CATEGORY_EMPTY_MESSAGE": "Kategorijų nerasta"
     },
     "SET_AUTO_OFFLINE": {
       "TEXT": "Mark offline automatically",
       "INFO_TEXT": "Let the system automatically mark you offline when you aren't using the app or dashboard."
     },
-    "DOCS": "Read docs"
+    "DOCS": "Skaityti dokumentus"
   },
   "BILLING_SETTINGS": {
     "TITLE": "Billing",
@@ -273,16 +273,16 @@
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
-    "NEW_ACCOUNT": "New Account",
+    "NEW_ACCOUNT": "Nauja Paskyra",
     "SELECTOR_SUBTITLE": "Sukurti naują paskyrą",
     "API": {
       "SUCCESS_MESSAGE": "Account created successfully",
       "EXIST_MESSAGE": "Account already exists",
-      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      "ERROR_MESSAGE": "Nepavyko prisijungti prie Woot serverio, bandykite dar kartą vėliau"
     },
     "FORM": {
       "NAME": {
-        "LABEL": "Company Name",
+        "LABEL": "Įmonės pavadinimas",
         "PLACEHOLDER": "Wayne Enterprises"
       },
       "SUBMIT": "Pateikti"
@@ -291,18 +291,18 @@
   "KEYBOARD_SHORTCUTS": {
     "TOGGLE_MODAL": "View all shortcuts",
     "TITLE": {
-      "OPEN_CONVERSATION": "Open conversation",
+      "OPEN_CONVERSATION": "Atidaryti pokalbį",
       "RESOLVE_AND_NEXT": "Resolve and move to next",
       "NAVIGATE_DROPDOWN": "Navigate dropdown items",
       "RESOLVE_CONVERSATION": "Resolve Conversation",
       "GO_TO_CONVERSATION_DASHBOARD": "Go to Conversation Dashboard",
-      "ADD_ATTACHMENT": "Add Attachment",
+      "ADD_ATTACHMENT": "Pridėti Priedą",
       "GO_TO_CONTACTS_DASHBOARD": "Go to Contacts Dashboard",
       "TOGGLE_SIDEBAR": "Toggle Sidebar",
       "GO_TO_REPORTS_SIDEBAR": "Go to Reports sidebar",
       "MOVE_TO_NEXT_TAB": "Move to next tab in conversation list",
       "GO_TO_SETTINGS": "Eiti į Nustatymus",
-      "SWITCH_CONVERSATION_STATUS": "Switch to the next conversation status",
+      "SWITCH_CONVERSATION_STATUS": "Perjungti į kitą pokalbio būseną",
       "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
       "SWITCH_TO_REPLY": "Switch to Reply",
       "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
diff --git a/app/javascript/dashboard/i18n/locale/lt/signup.json b/app/javascript/dashboard/i18n/locale/lt/signup.json
index 32e089d74..1263fb987 100644
--- a/app/javascript/dashboard/i18n/locale/lt/signup.json
+++ b/app/javascript/dashboard/i18n/locale/lt/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Įmonės pavadinimas",
-      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
-      "ERROR": "Įmonės vardas pertrumpas."
+      "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
+      "ERROR": "Company name is too short"
     },
     "FULL_NAME": {
       "LABEL": "Pilnas vardas",
-      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
-      "ERROR": "Pilnas vardas per trumpas."
+      "PLACEHOLDER": "Enter your full name. eg: Bruce Wayne",
+      "ERROR": "Full name is too short"
     },
     "EMAIL": {
       "LABEL": "Darbinis el. paštas",
-      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
-      "ERROR": "Please enter a valid work email address."
+      "PLACEHOLDER": "Enter your work email address. eg: bruce@wayne.enterprises",
+      "ERROR": "Please enter a valid work email address"
     },
     "PASSWORD": {
       "LABEL": "Slaptažodis",
       "PLACEHOLDER": "Slaptažodis",
-      "ERROR": "Slaptažodis yra pertrumpas.",
-      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character."
+      "ERROR": "Password is too short",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Patvirtinti slaptažodį",
-      "PLACEHOLDER": "Patvirtinti slaptažodį",
-      "ERROR": "Password doesnot match."
+      "LABEL": "Confirm Password",
+      "PLACEHOLDER": "Confirm Password",
+      "ERROR": "Password doesnot match"
     },
     "API": {
       "SUCCESS_MESSAGE": "Registration Successfull",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
+      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
     },
     "SUBMIT": "Sukurti paskyrą",
     "HAVE_AN_ACCOUNT": "Jau turi prisijungimo paskyrą?"
diff --git a/app/javascript/dashboard/i18n/locale/lt/teamsSettings.json b/app/javascript/dashboard/i18n/locale/lt/teamsSettings.json
index e078283a1..c33849f5b 100644
--- a/app/javascript/dashboard/i18n/locale/lt/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/lt/teamsSettings.json
@@ -1,7 +1,7 @@
 {
   "TEAMS_SETTINGS": {
-    "NEW_TEAM": "Create new team",
-    "HEADER": "Teams",
+    "NEW_TEAM": "Sukurti naują komandą",
+    "HEADER": "Komandos",
     "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> An agent can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
     "LIST": {
       "404": "There are no teams created on this account.",
@@ -9,12 +9,12 @@
     },
     "CREATE_FLOW": {
       "CREATE": {
-        "TITLE": "Create a new team",
+        "TITLE": "Sukurti naują komandą",
         "DESC": "Add a title and description to your new team."
       },
       "AGENTS": {
-        "BUTTON_TEXT": "Add agents to team",
-        "TITLE": "Add agents to team - %{teamName}",
+        "BUTTON_TEXT": "Pridėti agentus prie komandos",
+        "TITLE": "Pridėti agentus prie komandos - %{teamName}",
         "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation."
       },
       "WIZARD": [
@@ -39,11 +39,11 @@
       "CREATE": {
         "TITLE": "Edit your team details",
         "DESC": "Edit title and description to your team.",
-        "BUTTON_TEXT": "Update team"
+        "BUTTON_TEXT": "Atnaujinti komandą"
       },
       "AGENTS": {
         "BUTTON_TEXT": "Update agents in team",
-        "TITLE": "Add agents to team - %{teamName}",
+        "TITLE": "Pridėti agentus prie komandos - %{teamName}",
         "DESC": "Add Agents to your newly created team. All the added agents will be notified when a conversation is assigned to this team."
       },
       "WIZARD": [
@@ -53,7 +53,7 @@
           "body": "Change name, description and other details."
         },
         {
-          "title": "Edit Agents",
+          "title": "Keisti Agentus",
           "route": "settings_teams_edit_members",
           "body": "Edit agents in your team."
         },
@@ -70,30 +70,30 @@
     "AGENTS": {
       "AGENT": "Agentas",
       "EMAIL": "El. paštas",
-      "BUTTON_TEXT": "Add agents",
+      "BUTTON_TEXT": "Pridėti agentus",
       "ADD_AGENTS": "Adding Agents to your Team...",
       "SELECT": "pasirinkti",
       "SELECT_ALL": "pasirinkti visus agentus",
       "SELECTED_COUNT": "%{selected} out of %{total} agents selected."
     },
     "ADD": {
-      "TITLE": "Add agents to team - %{teamName}",
+      "TITLE": "Pridėti agentus prie komandos - %{teamName}",
       "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation.",
       "SELECT": "pasirinkti",
       "SELECT_ALL": "pasirinkti visus agentus",
       "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
-      "BUTTON_TEXT": "Add agents",
+      "BUTTON_TEXT": "Pridėti agentus",
       "AGENT_VALIDATION_ERROR": "Select at least one agent."
     },
     "FINISH": {
-      "TITLE": "Your team is ready!",
+      "TITLE": "Jūsų komanda yra pasiruošusi!",
       "MESSAGE": "You can now collaborate as a team on conversations. Happy supporting ",
       "BUTTON_TEXT": "Pabaigti"
     },
     "DELETE": {
       "BUTTON_TEXT": "Ištrinti",
       "API": {
-        "SUCCESS_MESSAGE": "Team deleted successfully.",
+        "SUCCESS_MESSAGE": "Komanda ištrinta sėkmingai.",
         "ERROR_MESSAGE": "Couldn't delete the team. Try again."
       },
       "CONFIRM": {
@@ -104,22 +104,22 @@
         "NO": "Atšaukti"
       }
     },
-    "SETTINGS": "Settings",
+    "SETTINGS": "Nustatymai",
     "FORM": {
-      "UPDATE": "Update team",
-      "CREATE": "Create team",
+      "UPDATE": "Atnaujinti komandą",
+      "CREATE": "Sukurti komandą",
       "NAME": {
-        "LABEL": "Team name",
+        "LABEL": "Komandos pavadinimas",
         "PLACEHOLDER": "Example: Sales, Customer Support"
       },
       "DESCRIPTION": {
-        "LABEL": "Team Description",
+        "LABEL": "Komandos Aprašymas",
         "PLACEHOLDER": "Short description about this team."
       },
       "AUTO_ASSIGN": {
         "LABEL": "Allow auto assign for this team."
       },
-      "SUBMIT_CREATE": "Create team"
+      "SUBMIT_CREATE": "Sukurti komandą"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/lt/webhooks.json b/app/javascript/dashboard/i18n/locale/lt/webhooks.json
index 347c96893..925f4480e 100644
--- a/app/javascript/dashboard/i18n/locale/lt/webhooks.json
+++ b/app/javascript/dashboard/i18n/locale/lt/webhooks.json
@@ -1,5 +1,5 @@
 {
   "WEBHOOKS_SETTINGS": {
-    "HEADER": "Webhook Settings"
+    "HEADER": "Webhook nustatymai"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/lv/chatlist.json b/app/javascript/dashboard/i18n/locale/lv/chatlist.json
index dd9bea8fb..78ed2171f 100644
--- a/app/javascript/dashboard/i18n/locale/lv/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/lv/chatlist.json
@@ -35,6 +35,20 @@
         "TEXT": "Visi"
       }
     },
+    "VIEW_FILTER": "Apskatīt",
+    "SORT_TOOLTIP_LABEL": "Sort conversations",
+    "CHAT_SORT": {
+      "STATUS": "Statuss",
+      "ORDER_BY": "Order by"
+    },
+    "CHAT_SORT_FILTER_ITEMS": {
+      "latest": {
+        "TEXT": "Last activity"
+      },
+      "sort_on_created_at": {
+        "TEXT": "Izveidots plkst"
+      }
+    },
     "ATTACHMENTS": {
       "image": {
         "CONTENT": "Attēla ziņojums"
@@ -55,6 +69,24 @@
         "CONTENT": "ir kopīgojis URL"
       }
     },
+    "CHAT_SORT_BY_FILTER": {
+      "TITLE": "Sort conversation",
+      "DROPDOWN_TITLE": "Kārtot pēc",
+      "ITEMS": {
+        "LATEST": {
+          "NAME": "Last activity at",
+          "LABEL": "Last activity"
+        },
+        "CREATED_AT": {
+          "NAME": "Izveidots plkst",
+          "LABEL": "Izveidots plkst"
+        },
+        "LAST_USER_MESSAGE_AT": {
+          "NAME": "Last user message at",
+          "LABEL": "Last message"
+        }
+      }
+    },
     "RECEIVED_VIA_EMAIL": "Saņemts pa e-pastu",
     "VIEW_TWEET_IN_TWITTER": "Skatīt tvītu pakalpojumā Twitter",
     "REPLY_TO_TWEET": "Atbildēt uz šo tvītu",
diff --git a/app/javascript/dashboard/i18n/locale/lv/contact.json b/app/javascript/dashboard/i18n/locale/lv/contact.json
index e940054ac..f42ef3a51 100644
--- a/app/javascript/dashboard/i18n/locale/lv/contact.json
+++ b/app/javascript/dashboard/i18n/locale/lv/contact.json
@@ -120,7 +120,7 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Ievadiet kontaktpersonas tālruņa numuru",
         "LABEL": "Telefona numurs",
-        "HELP": "Tālruņa numuram ir jābūt E.164 formātā, piemēram: +1415555555 [+][valsts kods][apgabala kods][vietējais tālruņa numurs]. Nolaižamajā izvēlnē varat izvēlēties numura sastādīšanas kodu.",
+        "HELP": "Tālruņa numuram ir jābūt E.164 formātā, piemēram: +37155555555",
         "ERROR": "Tālruņa numuram ir jābūt tukšam, vai E.164 formātā",
         "DIAL_CODE_ERROR": "Lūdzu, izvēlieties sastādīšanas kodu no saraksta",
         "DUPLICATE": "Šis tālruņa numurs tiek izmantots citai kontaktpersonai."
@@ -182,7 +182,7 @@
         "LABEL": "Kam"
       },
       "INBOX": {
-        "LABEL": "Izmantojot iesūtni",
+        "LABEL": "Iesūtne",
         "PLACEHOLDER": "Izvēlieties avota iesūtni",
         "ERROR": "Izvēlieties iesūtni"
       },
diff --git a/app/javascript/dashboard/i18n/locale/lv/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/lv/inboxMgmt.json
index 6c2802644..f03a751b8 100644
--- a/app/javascript/dashboard/i18n/locale/lv/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/lv/inboxMgmt.json
@@ -463,9 +463,10 @@
       "INBOX_UPDATE_SUB_TEXT": "Atjaunināt Jūsu iesūtnes iestatījumus",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Iespējot vai atspējot jaunu sarunu automātisku piešķiršanu šai iesūtnei pievienotajiem aģentiem.",
       "HMAC_VERIFICATION": "Lietotāja Identitātes Apstiprināšana",
-      "HMAC_DESCRIPTION": "Lai apstiprinātu lietotāja identitāti, katram lietotājam var izmantot `identifier_hash`. Jūs varat ģenerēt HMAC sha256 hash, izmantojot 'identifier' ar šeit uzrādīto atslēgu.",
+      "HMAC_DESCRIPTION": "Izmantojot šo atslēgu, varat ģenerēt slepeno marķieri, ko var izmantot, lai pārbaudītu Jūsu lietotāju identitāti.",
+      "HMAC_LINK_TO_DOCS": "Papildu informācija ir pieejama šeit.",
       "HMAC_MANDATORY_VERIFICATION": "Īstenot Lietotāja Identitātes Validāciju",
-      "HMAC_MANDATORY_DESCRIPTION": "Ja iespējots, pieprasījumi, kuros trūkst `identifier_hash`, tiks noraidīti.",
+      "HMAC_MANDATORY_DESCRIPTION": "Ja iespējots, pieprasījumi, kurus nevar pārbaudīt, tiks noraidīti.",
       "INBOX_IDENTIFIER": "Iesūtnes identifikators",
       "INBOX_IDENTIFIER_SUB_TEXT": "Izmantojiet šeit uzrādīto `inbox_identifier` token, lai autentificētu savus API klientus.",
       "FORWARD_EMAIL_TITLE": "Pārsūtīt uz E-pastu",
diff --git a/app/javascript/dashboard/i18n/locale/lv/signup.json b/app/javascript/dashboard/i18n/locale/lv/signup.json
index b3ff56d4b..7374b9abd 100644
--- a/app/javascript/dashboard/i18n/locale/lv/signup.json
+++ b/app/javascript/dashboard/i18n/locale/lv/signup.json
@@ -26,7 +26,7 @@
     "PASSWORD": {
       "LABEL": "Parole",
       "PLACEHOLDER": "Parole",
-      "ERROR": "Parole ir pārāk īsa.",
+      "ERROR": "Parole ir pārāk īsa",
       "IS_INVALID_PASSWORD": "Parolei ir jāsatur vismaz 1 lielais burts, 1 mazais burts, 1 cipars un 1 speciālā rakstzīme."
     },
     "CONFIRM_PASSWORD": {
diff --git a/app/javascript/dashboard/i18n/locale/ml/chatlist.json b/app/javascript/dashboard/i18n/locale/ml/chatlist.json
index 9cd47e78e..bd3d148ee 100644
--- a/app/javascript/dashboard/i18n/locale/ml/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/ml/chatlist.json
@@ -35,6 +35,20 @@
         "TEXT": "എല്ലാം"
       }
     },
+    "VIEW_FILTER": "കാണുക",
+    "SORT_TOOLTIP_LABEL": "Sort conversations",
+    "CHAT_SORT": {
+      "STATUS": "സ്റ്റാറ്റസ്",
+      "ORDER_BY": "Order by"
+    },
+    "CHAT_SORT_FILTER_ITEMS": {
+      "latest": {
+        "TEXT": "Last activity"
+      },
+      "sort_on_created_at": {
+        "TEXT": "എന്ന സ്ഥലത്ത് സൃഷ്ടിച്ചു"
+      }
+    },
     "ATTACHMENTS": {
       "image": {
         "CONTENT": "ചിത്ര സന്ദേശം"
@@ -55,6 +69,24 @@
         "CONTENT": "ഒരു യു. ആർ. എൽ പങ്കിട്ടു"
       }
     },
+    "CHAT_SORT_BY_FILTER": {
+      "TITLE": "Sort conversation",
+      "DROPDOWN_TITLE": "Sort by",
+      "ITEMS": {
+        "LATEST": {
+          "NAME": "Last activity at",
+          "LABEL": "Last activity"
+        },
+        "CREATED_AT": {
+          "NAME": "എന്ന സ്ഥലത്ത് സൃഷ്ടിച്ചു",
+          "LABEL": "എന്ന സ്ഥലത്ത് സൃഷ്ടിച്ചു"
+        },
+        "LAST_USER_MESSAGE_AT": {
+          "NAME": "Last user message at",
+          "LABEL": "Last message"
+        }
+      }
+    },
     "RECEIVED_VIA_EMAIL": "ഇമെയിൽ വഴി ലഭിച്ചു",
     "VIEW_TWEET_IN_TWITTER": "ട്വിറ്ററിൽ ട്വീറ്റ് കാണുക",
     "REPLY_TO_TWEET": "ഈ ട്വീറ്റിന് മറുപടി നൽകുക",
diff --git a/app/javascript/dashboard/i18n/locale/ml/contact.json b/app/javascript/dashboard/i18n/locale/ml/contact.json
index 1051069d0..dbea9d941 100644
--- a/app/javascript/dashboard/i18n/locale/ml/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ml/contact.json
@@ -120,7 +120,7 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "കോൺടാക്റ്റിന്റെ ഫോൺ നമ്പർ നൽകുക",
         "LABEL": "ഫോൺ നമ്പർ",
-        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
+        "HELP": "ഫോൺ നമ്പർ E.164 ഫോർമാറ്റ് ആയിരിക്കണം ഉദാ: +1415555555 [+][രാജ്യ കോഡ്][ഏരിയ കോഡ്][പ്രാദേശിക ഫോൺ നമ്പർ]",
         "ERROR": "ഫോൺ നമ്പർ ശൂന്യമോ E.164 ഫോർമാറ്റിലുള്ളതോ ആയിരിക്കണം",
         "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "ഈ ഫോൺ നമ്പർ മറ്റൊരു കോൺടാക്റ്റിനായി ഉപയോഗിക്കുന്നു."
@@ -182,7 +182,7 @@
         "LABEL": "To"
       },
       "INBOX": {
-        "LABEL": "Via Inbox",
+        "LABEL": "ഇൻബോക്സ്",
         "PLACEHOLDER": "Choose source inbox",
         "ERROR": "ഒരു ഇൻബോക്സ് തിരഞ്ഞെടുക്കുക"
       },
diff --git a/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json
index c4559f31d..561f817ef 100644
--- a/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json
@@ -464,6 +464,7 @@
       "AUTO_ASSIGNMENT_SUB_TEXT": "പുതിയ സംഭാഷണങ്ങളിൽ ലഭ്യമായ ഏജന്റുമാരുടെ ഓട്ടോമാറ്റിക് അസൈൻമെന്റ് പ്രാപ്തമാക്കുകയോ അപ്രാപ്തമാക്കുകയോ ചെയ്യുക",
       "HMAC_VERIFICATION": "User Identity Validation",
       "HMAC_DESCRIPTION": "In order to validate the user's identity, you can pass an `identifier_hash` for each user. You can generate a HMAC sha256 hash using the `identifier` with the key shown here.",
+      "HMAC_LINK_TO_DOCS": "You can read more here.",
       "HMAC_MANDATORY_VERIFICATION": "Enforce User Identity Validation",
       "HMAC_MANDATORY_DESCRIPTION": "If enabled, requests missing the `identifier_hash` will be rejected.",
       "INBOX_IDENTIFIER": "Inbox Identifier",
diff --git a/app/javascript/dashboard/i18n/locale/ml/signup.json b/app/javascript/dashboard/i18n/locale/ml/signup.json
index ed67990ba..e4d2ef6b7 100644
--- a/app/javascript/dashboard/i18n/locale/ml/signup.json
+++ b/app/javascript/dashboard/i18n/locale/ml/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Company name",
-      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
-      "ERROR": "Company name is too short."
+      "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
+      "ERROR": "Company name is too short"
     },
     "FULL_NAME": {
       "LABEL": "Full name",
-      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
-      "ERROR": "Full name is too short."
+      "PLACEHOLDER": "Enter your full name. eg: Bruce Wayne",
+      "ERROR": "Full name is too short"
     },
     "EMAIL": {
       "LABEL": "Work email",
-      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
-      "ERROR": "Please enter a valid work email address."
+      "PLACEHOLDER": "Enter your work email address. eg: bruce@wayne.enterprises",
+      "ERROR": "Please enter a valid work email address"
     },
     "PASSWORD": {
       "LABEL": "പാസ്‌വേഡ്",
       "PLACEHOLDER": "പാസ്‌വേഡ്",
-      "ERROR": "Password is too short.",
-      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character."
+      "ERROR": "പാസ്‌വേഡ് വളരെ ചെറുതാണ്",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirm password",
-      "PLACEHOLDER": "Confirm password",
-      "ERROR": "പാസ്‌വേഡുകൾ പൊരുത്തപ്പെടുന്നില്ല."
+      "LABEL": "പാസ്‌വേഡ് സ്ഥിരീകരിക്കുക",
+      "PLACEHOLDER": "പാസ്‌വേഡ് സ്ഥിരീകരിക്കുക",
+      "ERROR": "പാസ്‌വേഡുകൾ പൊരുത്തപ്പെടുന്നില്ല"
     },
     "API": {
       "SUCCESS_MESSAGE": "രജിസ്ട്രേഷൻ വിജയകരമാണ്",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
+      "ERROR_MESSAGE": "സെർവറിലേക്ക് കണക്റ്റുചെയ്യാനായില്ല, ദയവായി പിന്നീട് വീണ്ടും ശ്രമിക്കുക"
     },
     "SUBMIT": "Create account",
     "HAVE_AN_ACCOUNT": "Already have an account?"
diff --git a/app/javascript/dashboard/i18n/locale/ms/chatlist.json b/app/javascript/dashboard/i18n/locale/ms/chatlist.json
index b96cfb976..6312d4c9f 100644
--- a/app/javascript/dashboard/i18n/locale/ms/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/ms/chatlist.json
@@ -35,6 +35,20 @@
         "TEXT": "All"
       }
     },
+    "VIEW_FILTER": "View",
+    "SORT_TOOLTIP_LABEL": "Sort conversations",
+    "CHAT_SORT": {
+      "STATUS": "Status",
+      "ORDER_BY": "Order by"
+    },
+    "CHAT_SORT_FILTER_ITEMS": {
+      "latest": {
+        "TEXT": "Last activity"
+      },
+      "sort_on_created_at": {
+        "TEXT": "Created at"
+      }
+    },
     "ATTACHMENTS": {
       "image": {
         "CONTENT": "Picture message"
@@ -55,6 +69,24 @@
         "CONTENT": "has shared a url"
       }
     },
+    "CHAT_SORT_BY_FILTER": {
+      "TITLE": "Sort conversation",
+      "DROPDOWN_TITLE": "Sort by",
+      "ITEMS": {
+        "LATEST": {
+          "NAME": "Last activity at",
+          "LABEL": "Last activity"
+        },
+        "CREATED_AT": {
+          "NAME": "Created at",
+          "LABEL": "Created at"
+        },
+        "LAST_USER_MESSAGE_AT": {
+          "NAME": "Last user message at",
+          "LABEL": "Last message"
+        }
+      }
+    },
     "RECEIVED_VIA_EMAIL": "Received via email",
     "VIEW_TWEET_IN_TWITTER": "View tweet in Twitter",
     "REPLY_TO_TWEET": "Reply to this tweet",
diff --git a/app/javascript/dashboard/i18n/locale/ms/contact.json b/app/javascript/dashboard/i18n/locale/ms/contact.json
index 9ced03c8f..60d7579f7 100644
--- a/app/javascript/dashboard/i18n/locale/ms/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ms/contact.json
@@ -120,7 +120,7 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Enter the phone number of the contact",
         "LABEL": "Phone Number",
-        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
+        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]",
         "ERROR": "Phone number should be either empty or of E.164 format",
         "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "This phone number is in use for another contact."
@@ -182,7 +182,7 @@
         "LABEL": "To"
       },
       "INBOX": {
-        "LABEL": "Via Inbox",
+        "LABEL": "Inbox",
         "PLACEHOLDER": "Choose source inbox",
         "ERROR": "Select an inbox"
       },
diff --git a/app/javascript/dashboard/i18n/locale/ms/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ms/inboxMgmt.json
index 776253f1e..6f387c3c2 100644
--- a/app/javascript/dashboard/i18n/locale/ms/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ms/inboxMgmt.json
@@ -464,6 +464,7 @@
       "AUTO_ASSIGNMENT_SUB_TEXT": "Enable or disable the automatic assignment of new conversations to the agents added to this inbox.",
       "HMAC_VERIFICATION": "User Identity Validation",
       "HMAC_DESCRIPTION": "In order to validate the user's identity, you can pass an `identifier_hash` for each user. You can generate a HMAC sha256 hash using the `identifier` with the key shown here.",
+      "HMAC_LINK_TO_DOCS": "You can read more here.",
       "HMAC_MANDATORY_VERIFICATION": "Enforce User Identity Validation",
       "HMAC_MANDATORY_DESCRIPTION": "If enabled, requests missing the `identifier_hash` will be rejected.",
       "INBOX_IDENTIFIER": "Inbox Identifier",
diff --git a/app/javascript/dashboard/i18n/locale/ms/signup.json b/app/javascript/dashboard/i18n/locale/ms/signup.json
index 1ad4865ff..dafa02ebc 100644
--- a/app/javascript/dashboard/i18n/locale/ms/signup.json
+++ b/app/javascript/dashboard/i18n/locale/ms/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Company name",
-      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
-      "ERROR": "Company name is too short."
+      "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
+      "ERROR": "Company name is too short"
     },
     "FULL_NAME": {
       "LABEL": "Full name",
-      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
-      "ERROR": "Full name is too short."
+      "PLACEHOLDER": "Enter your full name. eg: Bruce Wayne",
+      "ERROR": "Full name is too short"
     },
     "EMAIL": {
       "LABEL": "Work email",
-      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
-      "ERROR": "Please enter a valid work email address."
+      "PLACEHOLDER": "Enter your work email address. eg: bruce@wayne.enterprises",
+      "ERROR": "Please enter a valid work email address"
     },
     "PASSWORD": {
       "LABEL": "Password",
       "PLACEHOLDER": "Password",
-      "ERROR": "Password is too short.",
-      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character."
+      "ERROR": "Password is too short",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirm password",
-      "PLACEHOLDER": "Confirm password",
-      "ERROR": "Password doesnot match."
+      "LABEL": "Confirm Password",
+      "PLACEHOLDER": "Confirm Password",
+      "ERROR": "Password doesnot match"
     },
     "API": {
       "SUCCESS_MESSAGE": "Registration Successfull",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
+      "ERROR_MESSAGE": "Masalah untuk hubungi Woot Server, Sila cuba sebentar lagi"
     },
     "SUBMIT": "Create account",
     "HAVE_AN_ACCOUNT": "Already have an account?"
diff --git a/app/javascript/dashboard/i18n/locale/ne/chatlist.json b/app/javascript/dashboard/i18n/locale/ne/chatlist.json
index b96cfb976..6312d4c9f 100644
--- a/app/javascript/dashboard/i18n/locale/ne/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/ne/chatlist.json
@@ -35,6 +35,20 @@
         "TEXT": "All"
       }
     },
+    "VIEW_FILTER": "View",
+    "SORT_TOOLTIP_LABEL": "Sort conversations",
+    "CHAT_SORT": {
+      "STATUS": "Status",
+      "ORDER_BY": "Order by"
+    },
+    "CHAT_SORT_FILTER_ITEMS": {
+      "latest": {
+        "TEXT": "Last activity"
+      },
+      "sort_on_created_at": {
+        "TEXT": "Created at"
+      }
+    },
     "ATTACHMENTS": {
       "image": {
         "CONTENT": "Picture message"
@@ -55,6 +69,24 @@
         "CONTENT": "has shared a url"
       }
     },
+    "CHAT_SORT_BY_FILTER": {
+      "TITLE": "Sort conversation",
+      "DROPDOWN_TITLE": "Sort by",
+      "ITEMS": {
+        "LATEST": {
+          "NAME": "Last activity at",
+          "LABEL": "Last activity"
+        },
+        "CREATED_AT": {
+          "NAME": "Created at",
+          "LABEL": "Created at"
+        },
+        "LAST_USER_MESSAGE_AT": {
+          "NAME": "Last user message at",
+          "LABEL": "Last message"
+        }
+      }
+    },
     "RECEIVED_VIA_EMAIL": "Received via email",
     "VIEW_TWEET_IN_TWITTER": "View tweet in Twitter",
     "REPLY_TO_TWEET": "Reply to this tweet",
diff --git a/app/javascript/dashboard/i18n/locale/ne/contact.json b/app/javascript/dashboard/i18n/locale/ne/contact.json
index ac4d4686c..d9a5ee166 100644
--- a/app/javascript/dashboard/i18n/locale/ne/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ne/contact.json
@@ -120,7 +120,7 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Enter the phone number of the contact",
         "LABEL": "Phone Number",
-        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
+        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]",
         "ERROR": "Phone number should be either empty or of E.164 format",
         "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "This phone number is in use for another contact."
@@ -182,7 +182,7 @@
         "LABEL": "To"
       },
       "INBOX": {
-        "LABEL": "Via Inbox",
+        "LABEL": "Inbox",
         "PLACEHOLDER": "Choose source inbox",
         "ERROR": "Select an inbox"
       },
diff --git a/app/javascript/dashboard/i18n/locale/ne/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ne/inboxMgmt.json
index db5a83f7f..4a06e9d7c 100644
--- a/app/javascript/dashboard/i18n/locale/ne/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ne/inboxMgmt.json
@@ -464,6 +464,7 @@
       "AUTO_ASSIGNMENT_SUB_TEXT": "Enable or disable the automatic assignment of new conversations to the agents added to this inbox.",
       "HMAC_VERIFICATION": "User Identity Validation",
       "HMAC_DESCRIPTION": "In order to validate the user's identity, you can pass an `identifier_hash` for each user. You can generate a HMAC sha256 hash using the `identifier` with the key shown here.",
+      "HMAC_LINK_TO_DOCS": "You can read more here.",
       "HMAC_MANDATORY_VERIFICATION": "Enforce User Identity Validation",
       "HMAC_MANDATORY_DESCRIPTION": "If enabled, requests missing the `identifier_hash` will be rejected.",
       "INBOX_IDENTIFIER": "Inbox Identifier",
diff --git a/app/javascript/dashboard/i18n/locale/ne/signup.json b/app/javascript/dashboard/i18n/locale/ne/signup.json
index 1ad4865ff..10ddc5b86 100644
--- a/app/javascript/dashboard/i18n/locale/ne/signup.json
+++ b/app/javascript/dashboard/i18n/locale/ne/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Company name",
-      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
-      "ERROR": "Company name is too short."
+      "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
+      "ERROR": "Company name is too short"
     },
     "FULL_NAME": {
       "LABEL": "Full name",
-      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
-      "ERROR": "Full name is too short."
+      "PLACEHOLDER": "Enter your full name. eg: Bruce Wayne",
+      "ERROR": "Full name is too short"
     },
     "EMAIL": {
       "LABEL": "Work email",
-      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
-      "ERROR": "Please enter a valid work email address."
+      "PLACEHOLDER": "Enter your work email address. eg: bruce@wayne.enterprises",
+      "ERROR": "Please enter a valid work email address"
     },
     "PASSWORD": {
       "LABEL": "Password",
       "PLACEHOLDER": "Password",
-      "ERROR": "Password is too short.",
-      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character."
+      "ERROR": "Password is too short",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirm password",
-      "PLACEHOLDER": "Confirm password",
-      "ERROR": "Password doesnot match."
+      "LABEL": "Confirm Password",
+      "PLACEHOLDER": "Confirm Password",
+      "ERROR": "Password doesnot match"
     },
     "API": {
       "SUCCESS_MESSAGE": "Registration Successfull",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
+      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
     },
     "SUBMIT": "Create account",
     "HAVE_AN_ACCOUNT": "Already have an account?"
diff --git a/app/javascript/dashboard/i18n/locale/nl/chatlist.json b/app/javascript/dashboard/i18n/locale/nl/chatlist.json
index f2163e945..3ca17c8e7 100644
--- a/app/javascript/dashboard/i18n/locale/nl/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/nl/chatlist.json
@@ -35,6 +35,20 @@
         "TEXT": "Allemaal"
       }
     },
+    "VIEW_FILTER": "Bekijken",
+    "SORT_TOOLTIP_LABEL": "Sort conversations",
+    "CHAT_SORT": {
+      "STATUS": "Status",
+      "ORDER_BY": "Order by"
+    },
+    "CHAT_SORT_FILTER_ITEMS": {
+      "latest": {
+        "TEXT": "Last activity"
+      },
+      "sort_on_created_at": {
+        "TEXT": "Created at"
+      }
+    },
     "ATTACHMENTS": {
       "image": {
         "CONTENT": "Bericht met foto"
@@ -55,6 +69,24 @@
         "CONTENT": "heeft een url gedeeld"
       }
     },
+    "CHAT_SORT_BY_FILTER": {
+      "TITLE": "Sort conversation",
+      "DROPDOWN_TITLE": "Sort by",
+      "ITEMS": {
+        "LATEST": {
+          "NAME": "Last activity at",
+          "LABEL": "Last activity"
+        },
+        "CREATED_AT": {
+          "NAME": "Created at",
+          "LABEL": "Created at"
+        },
+        "LAST_USER_MESSAGE_AT": {
+          "NAME": "Last user message at",
+          "LABEL": "Last message"
+        }
+      }
+    },
     "RECEIVED_VIA_EMAIL": "Ontvangen via e-mail",
     "VIEW_TWEET_IN_TWITTER": "Bekijk tweet op Twitter",
     "REPLY_TO_TWEET": "Antwoord op deze tweet",
diff --git a/app/javascript/dashboard/i18n/locale/nl/contact.json b/app/javascript/dashboard/i18n/locale/nl/contact.json
index 70d87f736..7c1c86021 100644
--- a/app/javascript/dashboard/i18n/locale/nl/contact.json
+++ b/app/javascript/dashboard/i18n/locale/nl/contact.json
@@ -120,7 +120,7 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Voer het telefoonnummer van de contactpersoon in",
         "LABEL": "Telefoonnummer",
-        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
+        "HELP": "Telefoonnummer moet van het E.164 formaat zijn: +14155555 [+][landcode][gebiedscode][lokaal telefoonnummer]",
         "ERROR": "Telefoonnummer moet leeg of in E.164-formaat zijn",
         "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "Dit telefoonnummer wordt reeds gebruikt voor een ander contactpersoon."
@@ -182,7 +182,7 @@
         "LABEL": "Aan"
       },
       "INBOX": {
-        "LABEL": "Via Inbox",
+        "LABEL": "Postvak In",
         "PLACEHOLDER": "Choose source inbox",
         "ERROR": "Selecteer een inbox"
       },
diff --git a/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json
index 0eafafb15..92fbd9245 100644
--- a/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json
@@ -464,6 +464,7 @@
       "AUTO_ASSIGNMENT_SUB_TEXT": "In- of uitschakelen van de automatische toewijzing van nieuwe gesprekken aan de agenten die aan deze inbox zijn toegevoegd.",
       "HMAC_VERIFICATION": "User Identity Validation",
       "HMAC_DESCRIPTION": "In order to validate the user's identity, you can pass an `identifier_hash` for each user. You can generate a HMAC sha256 hash using the `identifier` with the key shown here.",
+      "HMAC_LINK_TO_DOCS": "You can read more here.",
       "HMAC_MANDATORY_VERIFICATION": "Enforce User Identity Validation",
       "HMAC_MANDATORY_DESCRIPTION": "If enabled, requests missing the `identifier_hash` will be rejected.",
       "INBOX_IDENTIFIER": "Inbox Identifier",
diff --git a/app/javascript/dashboard/i18n/locale/nl/signup.json b/app/javascript/dashboard/i18n/locale/nl/signup.json
index 5d1f41be1..7258af4b3 100644
--- a/app/javascript/dashboard/i18n/locale/nl/signup.json
+++ b/app/javascript/dashboard/i18n/locale/nl/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Company name",
-      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
-      "ERROR": "Company name is too short."
+      "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
+      "ERROR": "Company name is too short"
     },
     "FULL_NAME": {
       "LABEL": "Volledige naam",
-      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
-      "ERROR": "Volledige naam is te kort."
+      "PLACEHOLDER": "Voer je volledige naam in, bijvoorbeeld Bruce Wayne",
+      "ERROR": "Volledige naam is te kort"
     },
     "EMAIL": {
       "LABEL": "Werk e-mail",
-      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
-      "ERROR": "Please enter a valid work email address."
+      "PLACEHOLDER": "Voer je werk-e-mailadres in, bijvoorbeeld: bruce@wayne.enterprises",
+      "ERROR": "Please enter a valid work email address"
     },
     "PASSWORD": {
       "LABEL": "Wachtwoord",
       "PLACEHOLDER": "Wachtwoord",
-      "ERROR": "Wachtwoord is te kort.",
-      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character."
+      "ERROR": "Wachtwoord is te kort",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirm password",
-      "PLACEHOLDER": "Confirm password",
-      "ERROR": "Wachtwoord komt niet overeen."
+      "LABEL": "Bevestig wachtwoord",
+      "PLACEHOLDER": "Bevestig wachtwoord",
+      "ERROR": "Wachtwoord komt niet overeen"
     },
     "API": {
       "SUCCESS_MESSAGE": "Registratie geslaagd",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
+      "ERROR_MESSAGE": "Kan geen verbinding maken met Woot Server, probeer het later opnieuw"
     },
     "SUBMIT": "Create account",
     "HAVE_AN_ACCOUNT": "Heeft u al een account?"
diff --git a/app/javascript/dashboard/i18n/locale/no/chatlist.json b/app/javascript/dashboard/i18n/locale/no/chatlist.json
index bcb0f9cf3..a4ddbc546 100644
--- a/app/javascript/dashboard/i18n/locale/no/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/no/chatlist.json
@@ -35,6 +35,20 @@
         "TEXT": "Alle"
       }
     },
+    "VIEW_FILTER": "Vis",
+    "SORT_TOOLTIP_LABEL": "Sort conversations",
+    "CHAT_SORT": {
+      "STATUS": "Satus",
+      "ORDER_BY": "Order by"
+    },
+    "CHAT_SORT_FILTER_ITEMS": {
+      "latest": {
+        "TEXT": "Last activity"
+      },
+      "sort_on_created_at": {
+        "TEXT": "Created at"
+      }
+    },
     "ATTACHMENTS": {
       "image": {
         "CONTENT": "Bildemelding"
@@ -55,6 +69,24 @@
         "CONTENT": "har delt en URL"
       }
     },
+    "CHAT_SORT_BY_FILTER": {
+      "TITLE": "Sort conversation",
+      "DROPDOWN_TITLE": "Sort by",
+      "ITEMS": {
+        "LATEST": {
+          "NAME": "Last activity at",
+          "LABEL": "Last activity"
+        },
+        "CREATED_AT": {
+          "NAME": "Created at",
+          "LABEL": "Created at"
+        },
+        "LAST_USER_MESSAGE_AT": {
+          "NAME": "Last user message at",
+          "LABEL": "Last message"
+        }
+      }
+    },
     "RECEIVED_VIA_EMAIL": "Mottatt via e-post",
     "VIEW_TWEET_IN_TWITTER": "Vis tweet i Twitter",
     "REPLY_TO_TWEET": "Svar på denne tweeten",
diff --git a/app/javascript/dashboard/i18n/locale/no/contact.json b/app/javascript/dashboard/i18n/locale/no/contact.json
index d676aa9fe..4dd406229 100644
--- a/app/javascript/dashboard/i18n/locale/no/contact.json
+++ b/app/javascript/dashboard/i18n/locale/no/contact.json
@@ -120,7 +120,7 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Skriv inn telefonnummeret til kontakten",
         "LABEL": "Telefonnummer",
-        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
+        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]",
         "ERROR": "Phone number should be either empty or of E.164 format",
         "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "This phone number is in use for another contact."
@@ -182,7 +182,7 @@
         "LABEL": "To"
       },
       "INBOX": {
-        "LABEL": "Via Inbox",
+        "LABEL": "Inbox",
         "PLACEHOLDER": "Choose source inbox",
         "ERROR": "Select an inbox"
       },
diff --git a/app/javascript/dashboard/i18n/locale/no/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/no/inboxMgmt.json
index 9d38a5ab9..d62c57169 100644
--- a/app/javascript/dashboard/i18n/locale/no/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/no/inboxMgmt.json
@@ -464,6 +464,7 @@
       "AUTO_ASSIGNMENT_SUB_TEXT": "Aktiver eller deaktiver automatisk tildeling av nye samtaler til agenter som er lagt til i denne innboksen.",
       "HMAC_VERIFICATION": "Brukeridentitetsvalidering",
       "HMAC_DESCRIPTION": "In order to validate the user's identity, you can pass an `identifier_hash` for each user. You can generate a HMAC sha256 hash using the `identifier` with the key shown here.",
+      "HMAC_LINK_TO_DOCS": "You can read more here.",
       "HMAC_MANDATORY_VERIFICATION": "Enforce User Identity Validation",
       "HMAC_MANDATORY_DESCRIPTION": "If enabled, requests missing the `identifier_hash` will be rejected.",
       "INBOX_IDENTIFIER": "Inbox Identifier",
diff --git a/app/javascript/dashboard/i18n/locale/no/signup.json b/app/javascript/dashboard/i18n/locale/no/signup.json
index 37c018ca7..0028ddd43 100644
--- a/app/javascript/dashboard/i18n/locale/no/signup.json
+++ b/app/javascript/dashboard/i18n/locale/no/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Company name",
-      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
-      "ERROR": "Company name is too short."
+      "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
+      "ERROR": "Company name is too short"
     },
     "FULL_NAME": {
       "LABEL": "Fullt navn",
-      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
-      "ERROR": "Kontonavnet er for kort."
+      "PLACEHOLDER": "Skriv inn fullt navn. F. eks: Ola Nordmann",
+      "ERROR": "Kontonavnet er for kort"
     },
     "EMAIL": {
       "LABEL": "Bedriftse-postadresse",
-      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
-      "ERROR": "Please enter a valid work email address."
+      "PLACEHOLDER": "Skriv inn din profesjonelle e-postadresse. F.eks: ola@olasbedrift.no",
+      "ERROR": "Please enter a valid work email address"
     },
     "PASSWORD": {
       "LABEL": "Passord",
       "PLACEHOLDER": "Passord",
-      "ERROR": "Passordet er for kort.",
-      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character."
+      "ERROR": "Passordet er for kort",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirm password",
-      "PLACEHOLDER": "Confirm password",
-      "ERROR": "Passordet stemmer ikke."
+      "LABEL": "Bekreft passord",
+      "PLACEHOLDER": "Bekreft passord",
+      "ERROR": "Passordet stemmer ikke"
     },
     "API": {
       "SUCCESS_MESSAGE": "Registrering fullført",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
+      "ERROR_MESSAGE": "Kunne ikke koble til Woot Server, vennligst prøv igjen senere"
     },
     "SUBMIT": "Create account",
     "HAVE_AN_ACCOUNT": "Har du allerede en konto?"
diff --git a/app/javascript/dashboard/i18n/locale/pl/chatlist.json b/app/javascript/dashboard/i18n/locale/pl/chatlist.json
index 2485bbd8c..c12bca7bd 100644
--- a/app/javascript/dashboard/i18n/locale/pl/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/pl/chatlist.json
@@ -35,6 +35,20 @@
         "TEXT": "Wszystkie"
       }
     },
+    "VIEW_FILTER": "Widok",
+    "SORT_TOOLTIP_LABEL": "Sort conversations",
+    "CHAT_SORT": {
+      "STATUS": "Status",
+      "ORDER_BY": "Order by"
+    },
+    "CHAT_SORT_FILTER_ITEMS": {
+      "latest": {
+        "TEXT": "Last activity"
+      },
+      "sort_on_created_at": {
+        "TEXT": "Utworzono"
+      }
+    },
     "ATTACHMENTS": {
       "image": {
         "CONTENT": "Wiadomość obrazkowa"
@@ -55,6 +69,24 @@
         "CONTENT": "udostępnił adres url"
       }
     },
+    "CHAT_SORT_BY_FILTER": {
+      "TITLE": "Sort conversation",
+      "DROPDOWN_TITLE": "Sort by",
+      "ITEMS": {
+        "LATEST": {
+          "NAME": "Last activity at",
+          "LABEL": "Last activity"
+        },
+        "CREATED_AT": {
+          "NAME": "Utworzono",
+          "LABEL": "Utworzono"
+        },
+        "LAST_USER_MESSAGE_AT": {
+          "NAME": "Last user message at",
+          "LABEL": "Last message"
+        }
+      }
+    },
     "RECEIVED_VIA_EMAIL": "Otrzymano przez e-mail",
     "VIEW_TWEET_IN_TWITTER": "Zobacz tweet na Twitterze",
     "REPLY_TO_TWEET": "Odpowiedz na ten tweet",
diff --git a/app/javascript/dashboard/i18n/locale/pl/contact.json b/app/javascript/dashboard/i18n/locale/pl/contact.json
index 169c25bc9..dab1d3ced 100644
--- a/app/javascript/dashboard/i18n/locale/pl/contact.json
+++ b/app/javascript/dashboard/i18n/locale/pl/contact.json
@@ -120,7 +120,7 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Wprowadź numer telefonu kontaktu",
         "LABEL": "Numer telefonu",
-        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
+        "HELP": "Numer telefonu powinien mieć format E.164, np. +1415555555 [+][kod krajowy][kod kierunkowy][numer telefonu]",
         "ERROR": "Numer telefonu powinien być pusty lub w formacie E.164",
         "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "Ten numer telefonu jest już zajęty przez inny kontakt."
@@ -182,7 +182,7 @@
         "LABEL": "Do"
       },
       "INBOX": {
-        "LABEL": "Via Inbox",
+        "LABEL": "Skrzynka odbiorcza",
         "PLACEHOLDER": "Choose source inbox",
         "ERROR": "Wybierz skrzynkę odbiorczą"
       },
diff --git a/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json
index 0394d91ab..780e651f4 100644
--- a/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json
@@ -464,6 +464,7 @@
       "AUTO_ASSIGNMENT_SUB_TEXT": "Włącz lub wyłącz automatyczne przypisywanie nowych rozmów do agentów dodanych do tej skrzynki odbiorczej.",
       "HMAC_VERIFICATION": "Weryfikacja tożsamości użytkownika",
       "HMAC_DESCRIPTION": "In order to validate the user's identity, you can pass an `identifier_hash` for each user. You can generate a HMAC sha256 hash using the `identifier` with the key shown here.",
+      "HMAC_LINK_TO_DOCS": "You can read more here.",
       "HMAC_MANDATORY_VERIFICATION": "Wymuś sprawdzanie tożsamości użytkownika",
       "HMAC_MANDATORY_DESCRIPTION": "If enabled, requests missing the `identifier_hash` will be rejected.",
       "INBOX_IDENTIFIER": "Identyfikator skrzynki odbiorczej",
diff --git a/app/javascript/dashboard/i18n/locale/pl/signup.json b/app/javascript/dashboard/i18n/locale/pl/signup.json
index 78795b96d..35fb911ae 100644
--- a/app/javascript/dashboard/i18n/locale/pl/signup.json
+++ b/app/javascript/dashboard/i18n/locale/pl/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Company name",
-      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
-      "ERROR": "Company name is too short."
+      "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
+      "ERROR": "Company name is too short"
     },
     "FULL_NAME": {
       "LABEL": "Imię i nazwisko",
-      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
-      "ERROR": "Imię i nazwisko jest zbyt krótkie."
+      "PLACEHOLDER": "Wpisz swoje imię i nazwisko, np. Bruce Wayne",
+      "ERROR": "Imię i nazwisko jest zbyt krótkie"
     },
     "EMAIL": {
       "LABEL": "E-mail służbowy",
-      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
-      "ERROR": "Please enter a valid work email address."
+      "PLACEHOLDER": "Podaj swój służbowy adres e-mail, np. bruce@wayne.enterprises",
+      "ERROR": "Please enter a valid work email address"
     },
     "PASSWORD": {
       "LABEL": "Hasło",
       "PLACEHOLDER": "Hasło",
-      "ERROR": "Hasło jest zbyt krótkie.",
-      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character."
+      "ERROR": "Hasło jest zbyt krótkie",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirm password",
-      "PLACEHOLDER": "Confirm password",
-      "ERROR": "Hasło nie zgadza się."
+      "LABEL": "Potwierdź hasło",
+      "PLACEHOLDER": "Potwierdź hasło",
+      "ERROR": "Hasło nie zgadza się"
     },
     "API": {
       "SUCCESS_MESSAGE": "Rejestracja powiodła się",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
+      "ERROR_MESSAGE": "Nie można połączyć się z Woot Server, spróbuj ponownie później"
     },
     "SUBMIT": "Create account",
     "HAVE_AN_ACCOUNT": "Masz już konto?"
diff --git a/app/javascript/dashboard/i18n/locale/pt/chatlist.json b/app/javascript/dashboard/i18n/locale/pt/chatlist.json
index a2d8cc6e9..45510344f 100644
--- a/app/javascript/dashboard/i18n/locale/pt/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/pt/chatlist.json
@@ -35,6 +35,20 @@
         "TEXT": "TODOS"
       }
     },
+    "VIEW_FILTER": "Visualizar",
+    "SORT_TOOLTIP_LABEL": "Sort conversations",
+    "CHAT_SORT": {
+      "STATUS": "SItuação",
+      "ORDER_BY": "Order by"
+    },
+    "CHAT_SORT_FILTER_ITEMS": {
+      "latest": {
+        "TEXT": "Last activity"
+      },
+      "sort_on_created_at": {
+        "TEXT": "Criada em"
+      }
+    },
     "ATTACHMENTS": {
       "image": {
         "CONTENT": "Mensagem de imagem"
@@ -55,6 +69,24 @@
         "CONTENT": "compartilhou uma url"
       }
     },
+    "CHAT_SORT_BY_FILTER": {
+      "TITLE": "Sort conversation",
+      "DROPDOWN_TITLE": "Sort by",
+      "ITEMS": {
+        "LATEST": {
+          "NAME": "Last activity at",
+          "LABEL": "Last activity"
+        },
+        "CREATED_AT": {
+          "NAME": "Criada em",
+          "LABEL": "Criada em"
+        },
+        "LAST_USER_MESSAGE_AT": {
+          "NAME": "Last user message at",
+          "LABEL": "Last message"
+        }
+      }
+    },
     "RECEIVED_VIA_EMAIL": "Recebido por e-mail",
     "VIEW_TWEET_IN_TWITTER": "Ver mensagem no Twitter",
     "REPLY_TO_TWEET": "Responder à mensagem",
diff --git a/app/javascript/dashboard/i18n/locale/pt/contact.json b/app/javascript/dashboard/i18n/locale/pt/contact.json
index 8d1f02874..51c9fbd62 100644
--- a/app/javascript/dashboard/i18n/locale/pt/contact.json
+++ b/app/javascript/dashboard/i18n/locale/pt/contact.json
@@ -120,7 +120,7 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Digite o número de telefone do contato",
         "LABEL": "Número de Telefone",
-        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
+        "HELP": "O número de telefone deve ter o formato E.164, por exemplo: +1415555555 [+][código do país][código de área] [número de telefone local]",
         "ERROR": "O número de telefone deve estar vazio ou no formato E.164",
         "DIAL_CODE_ERROR": "Please select a dial code from the list",
         "DUPLICATE": "Este número está a ser usado por outro contacto."
@@ -182,7 +182,7 @@
         "LABEL": "Para"
       },
       "INBOX": {
-        "LABEL": "Via Inbox",
+        "LABEL": "Caixa de Entrada",
         "PLACEHOLDER": "Choose source inbox",
         "ERROR": "Selecione uma caixa de entrada"
       },
diff --git a/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json
index 1a530a30e..f041759a6 100644
--- a/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json
@@ -464,6 +464,7 @@
       "AUTO_ASSIGNMENT_SUB_TEXT": "Ativar ou desativar a atribuição automática de novas conversas aos agentes adicionados a essa caixa de entrada.",
       "HMAC_VERIFICATION": "Validação da identidade do utilizador",
       "HMAC_DESCRIPTION": "In order to validate the user's identity, you can pass an `identifier_hash` for each user. You can generate a HMAC sha256 hash using the `identifier` with the key shown here.",
+      "HMAC_LINK_TO_DOCS": "You can read more here.",
       "HMAC_MANDATORY_VERIFICATION": "Forçar Validação de Identidade do Usuário",
       "HMAC_MANDATORY_DESCRIPTION": "If enabled, requests missing the `identifier_hash` will be rejected.",
       "INBOX_IDENTIFIER": "Identificador da Caixa de Entrada",
diff --git a/app/javascript/dashboard/i18n/locale/pt/signup.json b/app/javascript/dashboard/i18n/locale/pt/signup.json
index 41d45d57a..2d9efa5d4 100644
--- a/app/javascript/dashboard/i18n/locale/pt/signup.json
+++ b/app/javascript/dashboard/i18n/locale/pt/signup.json
@@ -10,33 +10,33 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Nome da empresa",
-      "PLACEHOLDER": "Digite o nome da sua empresa. Exemplo: Wayne Enterprises",
-      "ERROR": "Nome da empresa é muito curto."
+      "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
+      "ERROR": "Company name is too short"
     },
     "FULL_NAME": {
       "LABEL": "Nome completo",
-      "PLACEHOLDER": "Digite seu nome completo. Ex.: Wayne Bruce",
-      "ERROR": "O nome completo é muito pequeno."
+      "PLACEHOLDER": "Digite o seu nome completo, por exemplo: António Almeida",
+      "ERROR": "O nome completo é muito pequeno"
     },
     "EMAIL": {
       "LABEL": "E-mail de trabalho",
-      "PLACEHOLDER": "Digite seu endereço de e-mail profissional. Por exemplo, bruce@wayne.com.br",
-      "ERROR": "Por favor, insira um endereço de email profissional válido."
+      "PLACEHOLDER": "Digite o seu endereço de e-mail profissional. Por exemplo: geral@informatico.pt",
+      "ERROR": "Please enter a valid work email address"
     },
     "PASSWORD": {
       "LABEL": "Palavra-passe",
       "PLACEHOLDER": "Palavra-passe",
-      "ERROR": "A senha é muito curta.",
-      "IS_INVALID_PASSWORD": "A senha deve conter pelo menos 1 letra maiúscula, 1 letra minúscula, 1 número e 1 caractere especial."
+      "ERROR": "A senha é muito curta",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
     },
     "CONFIRM_PASSWORD": {
       "LABEL": "Confirmar senha",
       "PLACEHOLDER": "Confirmar senha",
-      "ERROR": "As senhas não conferem."
+      "ERROR": "As senhas não conferem"
     },
     "API": {
       "SUCCESS_MESSAGE": "Registro Bem Sucedido",
-      "ERROR_MESSAGE": "Não foi possível conectar ao servidor Woot. Por favor, tente novamente."
+      "ERROR_MESSAGE": "Não foi possível conectar ao servidor Woot, por favor tente novamente mais tarde"
     },
     "SUBMIT": "Create account",
     "HAVE_AN_ACCOUNT": "Já tem uma conta?"
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/advancedFilters.json b/app/javascript/dashboard/i18n/locale/pt_BR/advancedFilters.json
index 22c63ae36..95c9636b1 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/advancedFilters.json
@@ -38,7 +38,7 @@
       "CAMPAIGN_NAME": "Nome da Campanha",
       "LABELS": "Marcadores",
       "BROWSER_LANGUAGE": "Idioma do navegador",
-      "PRIORITY": "Priority",
+      "PRIORITY": "Prioridade",
       "COUNTRY_NAME": "Nome do País",
       "REFERER_LINK": "Link de origem",
       "CUSTOM_ATTRIBUTE_LIST": "Lista",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/agentMgmt.json b/app/javascript/dashboard/i18n/locale/pt_BR/agentMgmt.json
index 95d37a19a..edc9d5baa 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/agentMgmt.json
@@ -111,7 +111,7 @@
         "PLACEHOLDER": {
           "AGENT": "Pesquisar agentes",
           "TEAM": "Pesquisar times",
-          "INPUT": "Search for agents"
+          "INPUT": "Pesquisar por agentes"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/auditLogs.json b/app/javascript/dashboard/i18n/locale/pt_BR/auditLogs.json
index 1c376a7a2..302f1622d 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/auditLogs.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/auditLogs.json
@@ -1,23 +1,23 @@
 {
   "AUDIT_LOGS": {
-    "HEADER": "Audit Logs",
-    "HEADER_BTN_TXT": "Add Audit Logs",
-    "LOADING": "Fetching Audit Logs",
-    "SEARCH_404": "Não existem itens correspondentes a esta consulta",
-    "SIDEBAR_TXT": "<p><b>Audit Logs</b> </p><p> Audit Logs are trails for events and actions in a Chatwoot System. </p>",
+    "HEADER": "Registros de Auditoria",
+    "HEADER_BTN_TXT": "Adicionar Registros de Auditoria",
+    "LOADING": "Buscando Logs de Auditoria",
+    "SEARCH_404": "Não há itens correspondentes a esta consulta",
+    "SIDEBAR_TXT": "<p><b>Registros de Auditoria</b> </p><p> Registros de Auditoria são trilhas para eventos e ações em um Sistema Chatwoot. </p>",
     "LIST": {
-      "404": "There are no Audit Logs available in this account.",
-      "TITLE": "Manage Audit Logs",
-      "DESC": "Audit Logs are trails for events and actions in a Chatwoot System.",
+      "404": "Não há Registros de Auditoria disponíveis nesta conta.",
+      "TITLE": "Gerenciar Registros de Auditoria",
+      "DESC": "Registros de Auditoria são trilhas para eventos e ações em um Sistema Chatwoot.",
       "TABLE_HEADER": [
         "Usuário",
-        "Action",
+        "Ação",
         "Endereço IP",
-        "Time"
+        "Hora"
       ]
     },
     "API": {
-      "SUCCESS_MESSAGE": "AuditLogs retrieved successfully",
+      "SUCCESS_MESSAGE": "AuditLogs recuperados com sucesso",
       "ERROR_MESSAGE": "Não foi possível conectar ao servidor Woot, por favor tente novamente mais tarde"
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/chatlist.json b/app/javascript/dashboard/i18n/locale/pt_BR/chatlist.json
index 9bb6b8181..84b287a10 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/chatlist.json
@@ -35,6 +35,20 @@
         "TEXT": "Todos"
       }
     },
+    "VIEW_FILTER": "Visualizar",
+    "SORT_TOOLTIP_LABEL": "Sort conversations",
+    "CHAT_SORT": {
+      "STATUS": "SItuação",
+      "ORDER_BY": "Order by"
+    },
+    "CHAT_SORT_FILTER_ITEMS": {
+      "latest": {
+        "TEXT": "Last activity"
+      },
+      "sort_on_created_at": {
+        "TEXT": "Criado em"
+      }
+    },
     "ATTACHMENTS": {
       "image": {
         "CONTENT": "Mensagem de imagem"
@@ -55,6 +69,24 @@
         "CONTENT": "compartilhou uma URL"
       }
     },
+    "CHAT_SORT_BY_FILTER": {
+      "TITLE": "Sort conversation",
+      "DROPDOWN_TITLE": "Ordenar por",
+      "ITEMS": {
+        "LATEST": {
+          "NAME": "Last activity at",
+          "LABEL": "Last activity"
+        },
+        "CREATED_AT": {
+          "NAME": "Criado em",
+          "LABEL": "Criado em"
+        },
+        "LAST_USER_MESSAGE_AT": {
+          "NAME": "Last user message at",
+          "LABEL": "Last message"
+        }
+      }
+    },
     "RECEIVED_VIA_EMAIL": "Recebido por e-mail",
     "VIEW_TWEET_IN_TWITTER": "Ver tweet no Twitter",
     "REPLY_TO_TWEET": "Responder a este tweet",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/contact.json b/app/javascript/dashboard/i18n/locale/pt_BR/contact.json
index 8ce895c0a..dbfcc1b8c 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/contact.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/contact.json
@@ -120,7 +120,7 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Adicione o número de telefone do contato",
         "LABEL": "Número de Telefone",
-        "HELP": "O número de telefone deve ter o formato E.164, por exemplo: +1415555555 [+][código do país][código de área][número de telefone local]. Você pode selecionar o código de discagem no menu suspenso.",
+        "HELP": "O número de telefone deve ser do formato E.164, por exemplo: +1415555555 [+][código do país][código de área][número de telefone local]",
         "ERROR": "O número de telefone deve estar vazio ou no formato E.164",
         "DIAL_CODE_ERROR": "Por favor, selecione um código de discagem da lista",
         "DUPLICATE": "Este número de telefone está em uso para outro contato."
@@ -182,8 +182,8 @@
         "LABEL": "Para"
       },
       "INBOX": {
-        "LABEL": "Via Inbox",
-        "PLACEHOLDER": "Choose source inbox",
+        "LABEL": "Caixa de Entrada",
+        "PLACEHOLDER": "Escolher a caixa de entrada de origem",
         "ERROR": "Selecione uma caixa de entrada"
       },
       "SUBJECT": {
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json b/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json
index 5644d343a..9598fcb1e 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json
@@ -37,7 +37,7 @@
     "UNKNOWN_FILE_TYPE": "Arquivo Desconhecido",
     "SAVE_CONTACT": "Salvar",
     "UPLOADING_ATTACHMENTS": "Enviando anexos...",
-    "REPLIED_TO_STORY": "Replied to your story",
+    "REPLIED_TO_STORY": "Respondido ao seu story",
     "SUCCESS_DELETE_MESSAGE": "Mensagem excluída com sucesso",
     "FAIL_DELETE_MESSSAGE": "Não foi possível excluir a mensagem! Tente novamente",
     "NO_RESPONSE": "Sem resposta",
@@ -68,20 +68,20 @@
       }
     },
     "PRIORITY": {
-      "TITLE": "Priority",
+      "TITLE": "Prioridade",
       "OPTIONS": {
         "NONE": "Nenhuma",
-        "URGENT": "Urgent",
-        "HIGH": "High",
-        "MEDIUM": "Medium",
-        "LOW": "Low"
+        "URGENT": "Urgente",
+        "HIGH": "Alta",
+        "MEDIUM": "Média",
+        "LOW": "Baixa"
       },
       "CHANGE_PRIORITY": {
         "SELECT_PLACEHOLDER": "Nenhuma",
-        "INPUT_PLACEHOLDER": "Select priority",
+        "INPUT_PLACEHOLDER": "Selecionar prioridade",
         "NO_RESULTS": "Nenhum resultado encontrado",
-        "SUCCESSFUL": "Changed priority of conversation id %{conversationId} to %{priority}",
-        "FAILED": "Couldn't change priority. Please try again."
+        "SUCCESSFUL": "Alterada a prioridade do ID da conversa %{conversationId} para %{priority}",
+        "FAILED": "Não foi possível alterar a prioridade. Por favor, tente novamente."
       }
     },
     "CARD_CONTEXT_MENU": {
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/generalSettings.json b/app/javascript/dashboard/i18n/locale/pt_BR/generalSettings.json
index 5987f9dca..378f63216 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/generalSettings.json
@@ -101,7 +101,7 @@
       "REPORTS": "Relatórios",
       "CONVERSATION": "Conversas",
       "CHANGE_ASSIGNEE": "Alterar Responsável",
-      "CHANGE_PRIORITY": "Change Priority",
+      "CHANGE_PRIORITY": "Alterar Prioridade",
       "CHANGE_TEAM": "Alterar a Equipe",
       "ADD_LABEL": "Adicionar etiqueta à conversa",
       "REMOVE_LABEL": "Remover etiqueta da conversa",
@@ -127,7 +127,7 @@
       "GO_TO_NOTIFICATIONS": "Ir para Notificações",
       "ADD_LABELS_TO_CONVERSATION": "Adicionar etiqueta à conversa",
       "ASSIGN_AN_AGENT": "Atribuir um agente",
-      "ASSIGN_PRIORITY": "Assign priority",
+      "ASSIGN_PRIORITY": "Atribuir prioridade",
       "ASSIGN_A_TEAM": "Atribuir uma equipe",
       "MUTE_CONVERSATION": "Silenciar conversa",
       "UNMUTE_CONVERSATION": "Não silenciar conversa",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
index 4d4d87e8a..c6b2db74c 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
@@ -464,6 +464,7 @@
       "AUTO_ASSIGNMENT_SUB_TEXT": "Ativar ou desativar a atribuição automática de novas conversas aos agentes adicionados a essa caixa de entrada.",
       "HMAC_VERIFICATION": "Validação de Identidade do Usuário",
       "HMAC_DESCRIPTION": "Para validar a identidade do usuário, você pode passar um `identifier_hash` para cada usuário. Você pode gerar um hash HMAC sha256 usando o `identifier` com a chave mostrada aqui.",
+      "HMAC_LINK_TO_DOCS": "Você pode ler mais aqui.",
       "HMAC_MANDATORY_VERIFICATION": "Forçar validação de identidade do usuário",
       "HMAC_MANDATORY_DESCRIPTION": "Se ativado, as solicitações sem o 'identifier_hash' serão rejeitadas.",
       "INBOX_IDENTIFIER": "Identificador da caixa de entrada",
@@ -479,15 +480,15 @@
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Digite a nova chave de API aqui",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Atualizar",
       "WHATSAPP_WEBHOOK_TITLE": "Token de verificação do Webhook",
-      "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
+      "WHATSAPP_WEBHOOK_SUBHEADER": "Este token é usado para verificar a autenticidade do webhook endpoint.",
       "UPDATE_PRE_CHAT_FORM_SETTINGS": "Atualizar configurações do Formulário Pre Chat"
     },
     "HELP_CENTER": {
-      "LABEL": "Help Center",
-      "PLACEHOLDER": "Select Help Center",
-      "SELECT_PLACEHOLDER": "Select Help Center",
-      "REMOVE": "Remove Help Center",
-      "SUB_TEXT": "Attach a Help Center with the inbox"
+      "LABEL": "Centro de Ajuda",
+      "PLACEHOLDER": "Selecionar Centro de Ajuda",
+      "SELECT_PLACEHOLDER": "Selecionar Centro de Ajuda",
+      "REMOVE": "Remover Centro de Ajuda",
+      "SUB_TEXT": "Anexe um Centro de Ajuda com a caixa de entrada"
     },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Limite de atribuição automática",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/integrations.json b/app/javascript/dashboard/i18n/locale/pt_BR/integrations.json
index b1af2fdee..5c19c6187 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/integrations.json
@@ -86,21 +86,21 @@
       "CREATE_ERROR": "Houve um erro ao criar o link da reunião, por favor tente novamente"
     },
     "OPEN_AI": {
-      "TITLE": "Improve With AI",
-      "SUBTITLE": "An improved reply will be generated using AI, based on your current draft.",
+      "TITLE": "Melhore com IA",
+      "SUBTITLE": "Uma resposta melhor será gerada usando AI, com base no seu rascunho atual.",
       "TONE": {
-        "TITLE": "Tone",
+        "TITLE": "Tom",
         "OPTIONS": {
-          "PROFESSIONAL": "Professional",
-          "FRIENDLY": "Friendly"
+          "PROFESSIONAL": "Profissional",
+          "FRIENDLY": "Amigável"
         }
       },
       "BUTTONS": {
-        "GENERATE": "Generate",
-        "GENERATING": "Generating...",
+        "GENERATE": "Gerar",
+        "GENERATING": "Gerando...",
         "CANCEL": "Cancelar"
       },
-      "GENERATE_ERROR": "There was an error processing the content, please try again"
+      "GENERATE_ERROR": "Ocorreu um erro ao processar o conteúdo, por favor, tente novamente"
     },
     "DELETE": {
       "BUTTON_TEXT": "Excluir",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/login.json b/app/javascript/dashboard/i18n/locale/pt_BR/login.json
index 462b0fd3f..88772b27a 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/login.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/login.json
@@ -3,16 +3,16 @@
     "TITLE": "Entrar no Chatwoot",
     "EMAIL": {
       "LABEL": "e-mail",
-      "PLACEHOLDER": "example@companyname.com"
+      "PLACEHOLDER": "exemplo@nomedaempresa.com"
     },
     "PASSWORD": {
       "LABEL": "Senha",
       "PLACEHOLDER": "Senha"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Login successful",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again.",
-      "UNAUTH": "Username or password is incorrect. Please try again."
+      "SUCCESS_MESSAGE": "Acesso bem sucedido",
+      "ERROR_MESSAGE": "Não foi possível conectar ao servidor Woot. Por favor, tente novamente.",
+      "UNAUTH": "Nome de usuário ou senha incorretos. Por favor, tente novamente."
     },
     "OAUTH": {
       "GOOGLE_LOGIN": "Login com o Google",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/resetPassword.json b/app/javascript/dashboard/i18n/locale/pt_BR/resetPassword.json
index a82a02031..a142d8435 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/resetPassword.json
@@ -8,7 +8,7 @@
     },
     "API": {
       "SUCCESS_MESSAGE": "O link para alteração de senha foi enviado para seu e-mail.",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
+      "ERROR_MESSAGE": "Não foi possível conectar ao servidor Woot. Por favor, tente novamente."
     },
     "SUBMIT": "Enviar"
   }
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/search.json b/app/javascript/dashboard/i18n/locale/pt_BR/search.json
index 57b3a569b..767336911 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/search.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/search.json
@@ -14,7 +14,7 @@
     "EMPTY_STATE": "Não foi encontrado %{item} para a consulta '%{query}'",
     "EMPTY_STATE_FULL": "Nenhum resultado encontrado para a consulta '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ para focar",
-    "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "INPUT_PLACEHOLDER": "Digite 3 ou mais caracteres para pesquisar",
     "EMPTY_STATE_DEFAULT": "Procurar por ID de conversa, e-mail, número de telefone, mensagens para melhores resultados de busca. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Saiba mais",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/setNewPassword.json b/app/javascript/dashboard/i18n/locale/pt_BR/setNewPassword.json
index 15d96fdad..463b39100 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/setNewPassword.json
@@ -1,19 +1,19 @@
 {
   "SET_NEW_PASSWORD": {
-    "TITLE": "Set new password",
+    "TITLE": "Definir nova senha",
     "PASSWORD": {
       "LABEL": "Senha",
       "PLACEHOLDER": "Senha",
       "ERROR": "A senha é muito curta."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirm password",
+      "LABEL": "Confirmar senha",
       "PLACEHOLDER": "Confirme a senha",
       "ERROR": "As senhas não coincidem."
     },
     "API": {
       "SUCCESS_MESSAGE": "Senha alterada com sucesso.",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
+      "ERROR_MESSAGE": "Não foi possível conectar ao servidor Woot. Por favor, tente novamente."
     },
     "CAPTCHA": {
       "ERROR": "Verificação expirada. Por favor, resolva o captcha novamente."
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/settings.json b/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
index 9ea0b9c98..1fba30ac7 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
@@ -203,7 +203,7 @@
     "HOME": "Principal",
     "AGENTS": "Agentes",
     "AGENT_BOTS": "Bots",
-    "AUDIT_LOGS": "Audit Logs",
+    "AUDIT_LOGS": "Registros de Auditoria",
     "INBOXES": "Caixas de Entrada",
     "NOTIFICATIONS": "Notificações",
     "CANNED_RESPONSES": "Atalhos",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/signup.json b/app/javascript/dashboard/i18n/locale/pt_BR/signup.json
index ecc77bf3c..36b7b83f2 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/signup.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/signup.json
@@ -10,17 +10,17 @@
     },
     "COMPANY_NAME": {
       "LABEL": "Nome Empresa",
-      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
+      "PLACEHOLDER": "Digite seu nome da sua empresa. Ex: Empresas Wayne",
       "ERROR": "O nome da empresa é muito curto."
     },
     "FULL_NAME": {
       "LABEL": "Nome Completo",
-      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
+      "PLACEHOLDER": "Digite seu nome completo. Ex.: Bruce Wayne",
       "ERROR": "Nome completo é muito curto."
     },
     "EMAIL": {
       "LABEL": "E-mail comercial",
-      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
+      "PLACEHOLDER": "Digite seu e-mail de trabalho. Ex.: bruce@wayne.com.br",
       "ERROR": "Por favor, insira um endereço de e-mail de trabalho válido."
     },
     "PASSWORD": {
@@ -30,13 +30,13 @@
       "IS_INVALID_PASSWORD": "A senha deve conter pelo menos 1 letra maiúscula, 1 letra minúscula, 1 número e 1 caractere especial."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirm password",
-      "PLACEHOLDER": "Confirm password",
+      "LABEL": "Confirmar senha",
+      "PLACEHOLDER": "Confirmar senha",
       "ERROR": "As senhas não conferem."
     },
     "API": {
       "SUCCESS_MESSAGE": "Registro realizado com Sucesso",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
+      "ERROR_MESSAGE": "Não foi possível conectar ao servidor Woot. Por favor, tente novamente."
     },
     "SUBMIT": "Criar conta",
     "HAVE_AN_ACCOUNT": "Já possui uma conta?"
diff --git a/app/javascript/dashboard/i18n/locale/ro/chatlist.json b/app/javascript/dashboard/i18n/locale/ro/chatlist.json
index 1f0b9edc9..bf93b9f25 100644
--- a/app/javascript/dashboard/i18n/locale/ro/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/ro/chatlist.json
@@ -35,6 +35,20 @@
         "TEXT": "Toate"
       }
     },
+    "VIEW_FILTER": "Vizualizare",
+    "SORT_TOOLTIP_LABEL": "Sort conversations",
+    "CHAT_SORT": {
+      "STATUS": "Status",
+      "ORDER_BY": "Order by"
+    },
+    "CHAT_SORT_FILTER_ITEMS": {
+      "latest": {
+        "TEXT": "Last activity"
+      },
+      "sort_on_created_at": {
+        "TEXT": "Creat la"
+      }
+    },
     "ATTACHMENTS": {
       "image": {
         "CONTENT": "Mesaj imagine"
@@ -55,6 +69,24 @@
         "CONTENT": "a partajat un URL"
       }
     },
+    "CHAT_SORT_BY_FILTER": {
+      "TITLE": "Sort conversation",
+      "DROPDOWN_TITLE": "Sortați după",
+      "ITEMS": {
+        "LATEST": {
+          "NAME": "Last activity at",
+          "LABEL": "Last activity"
+        },
+        "CREATED_AT": {
+          "NAME": "Creat la",
+          "LABEL": "Creat la"
+        },
+        "LAST_USER_MESSAGE_AT": {
+          "NAME": "Last user message at",
+          "LABEL": "Last message"
+        }
+      }
+    },
     "RECEIVED_VIA_EMAIL": "Primit prin e-mail",
     "VIEW_TWEET_IN_TWITTER": "Vezi tweet pe Twitter",
     "REPLY_TO_TWEET": "Răspunde la acest tweet",
diff --git a/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json
index a0e58f888..9a862bc40 100644
--- a/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json
@@ -463,9 +463,10 @@
       "INBOX_UPDATE_SUB_TEXT": "Actualizează setările de inbox",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Activează sau dezactivează atribuirea automată a conversațiilor noi la agenții adăugați la această căsuță poștală.",
       "HMAC_VERIFICATION": "Validarea identității utilizatorului",
-      "HMAC_DESCRIPTION": "Pentru a valida identitatea utilizatorului, puteți trece un \"identifier_hash\" pentru fiecare utilizator. Puteți genera un hash HMAC sha256 folosind \"identificatorul\" cu cheia afișată aici.",
+      "HMAC_DESCRIPTION": "With this key you can generate a secret token that can be used to verify the identity of your users.",
+      "HMAC_LINK_TO_DOCS": "You can read more here.",
       "HMAC_MANDATORY_VERIFICATION": "Impuneți validarea identității utilizatorului",
-      "HMAC_MANDATORY_DESCRIPTION": "Dacă este activată, solicitările care lipsesc din \"identifier_hash\" vor fi respinse.",
+      "HMAC_MANDATORY_DESCRIPTION": "If enabled, requests that cannot be verified will be rejected.",
       "INBOX_IDENTIFIER": "Identificator inbox",
       "INBOX_IDENTIFIER_SUB_TEXT": "Utilizați simbolul \"inbox_identifier\" afișat aici pentru a vă autentifica clienții API.",
       "FORWARD_EMAIL_TITLE": "Redirecționare către e-mail",
diff --git a/app/javascript/dashboard/i18n/locale/ru/advancedFilters.json b/app/javascript/dashboard/i18n/locale/ru/advancedFilters.json
index 05fd115e1..59f259c4d 100644
--- a/app/javascript/dashboard/i18n/locale/ru/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/ru/advancedFilters.json
@@ -38,7 +38,7 @@
       "CAMPAIGN_NAME": "Название Кампании",
       "LABELS": "Категории",
       "BROWSER_LANGUAGE": "Язык браузера",
-      "PRIORITY": "Priority",
+      "PRIORITY": "Приоритет",
       "COUNTRY_NAME": "Страна",
       "REFERER_LINK": "Ссылка реферера",
       "CUSTOM_ATTRIBUTE_LIST": "Список",
diff --git a/app/javascript/dashboard/i18n/locale/ru/agentMgmt.json b/app/javascript/dashboard/i18n/locale/ru/agentMgmt.json
index 031ed4d7f..70b74a6f1 100644
--- a/app/javascript/dashboard/i18n/locale/ru/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ru/agentMgmt.json
@@ -77,7 +77,7 @@
         "AGENT_AVAILABILITY": {
           "LABEL": "Доступность",
           "PLACEHOLDER": "Пожалуйста, выберите статус доступности",
-          "ERROR": "Availability is required"
+          "ERROR": "Необходимо наличие данных"
         },
         "SUBMIT": "Редактировать оператора"
       },
@@ -111,7 +111,7 @@
         "PLACEHOLDER": {
           "AGENT": "Поиск агентов",
           "TEAM": "Поиск команд",
-          "INPUT": "Search for agents"
+          "INPUT": "Поиск агентов"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/ru/auditLogs.json b/app/javascript/dashboard/i18n/locale/ru/auditLogs.json
index c1b5617f2..ed0937137 100644
--- a/app/javascript/dashboard/i18n/locale/ru/auditLogs.json
+++ b/app/javascript/dashboard/i18n/locale/ru/auditLogs.json
@@ -1,23 +1,23 @@
 {
   "AUDIT_LOGS": {
-    "HEADER": "Audit Logs",
-    "HEADER_BTN_TXT": "Add Audit Logs",
-    "LOADING": "Fetching Audit Logs",
+    "HEADER": "Журнал аудита",
+    "HEADER_BTN_TXT": "Добавить журнал аудита",
+    "LOADING": "Получение журналов аудита",
     "SEARCH_404": "Нет шаблонных ответов, соответствующих запросу",
-    "SIDEBAR_TXT": "<p><b>Audit Logs</b> </p><p> Audit Logs are trails for events and actions in a Chatwoot System. </p>",
+    "SIDEBAR_TXT": "<p><b>Журналы аудита</b> </p><p> Логи аудита являются следами событий и действий в системе Chatwoot. </p>",
     "LIST": {
-      "404": "There are no Audit Logs available in this account.",
-      "TITLE": "Manage Audit Logs",
-      "DESC": "Audit Logs are trails for events and actions in a Chatwoot System.",
+      "404": "В этой учетной записи нет журналов аудита.",
+      "TITLE": "Управление журналами аудита",
+      "DESC": "Журналы аудита - это следы событий и действий в системе Chatwoot.",
       "TABLE_HEADER": [
-        "User",
-        "Action",
+        "Пользователь",
+        "Действия",
         "IP адрес",
-        "Time"
+        "Время"
       ]
     },
     "API": {
-      "SUCCESS_MESSAGE": "AuditLogs retrieved successfully",
+      "SUCCESS_MESSAGE": "Журналы успешно загружены",
       "ERROR_MESSAGE": "Не удается соединиться с сервером Woot, попробуйте позже"
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/ru/automation.json b/app/javascript/dashboard/i18n/locale/ru/automation.json
index dc4d8b9fb..e579f53f5 100644
--- a/app/javascript/dashboard/i18n/locale/ru/automation.json
+++ b/app/javascript/dashboard/i18n/locale/ru/automation.json
@@ -87,8 +87,8 @@
     },
     "CONDITION": {
       "DELETE_MESSAGE": "Вам нужно иметь по крайней мере одно условие для сохранения",
-      "CONTACT_CUSTOM_ATTR_LABEL": "Contact Custom Attributes",
-      "CONVERSATION_CUSTOM_ATTR_LABEL": "Conversation Custom Attributes"
+      "CONTACT_CUSTOM_ATTR_LABEL": "Контактные пользовательские атрибуты",
+      "CONVERSATION_CUSTOM_ATTR_LABEL": "Пользовательские атрибуты разговора"
     },
     "ACTION": {
       "DELETE_MESSAGE": "Вам нужно иметь по крайней мере одно условие для сохранения",
diff --git a/app/javascript/dashboard/i18n/locale/ru/chatlist.json b/app/javascript/dashboard/i18n/locale/ru/chatlist.json
index 520fc55f9..c6ed9cdb5 100644
--- a/app/javascript/dashboard/i18n/locale/ru/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/ru/chatlist.json
@@ -35,6 +35,20 @@
         "TEXT": "Все"
       }
     },
+    "VIEW_FILTER": "Просмотр",
+    "SORT_TOOLTIP_LABEL": "Sort conversations",
+    "CHAT_SORT": {
+      "STATUS": "Статус",
+      "ORDER_BY": "Order by"
+    },
+    "CHAT_SORT_FILTER_ITEMS": {
+      "latest": {
+        "TEXT": "Last activity"
+      },
+      "sort_on_created_at": {
+        "TEXT": "Дата создания"
+      }
+    },
     "ATTACHMENTS": {
       "image": {
         "CONTENT": "Изображение"
@@ -55,6 +69,24 @@
         "CONTENT": "поделился ссылкой"
       }
     },
+    "CHAT_SORT_BY_FILTER": {
+      "TITLE": "Sort conversation",
+      "DROPDOWN_TITLE": "Сортировать по",
+      "ITEMS": {
+        "LATEST": {
+          "NAME": "Last activity at",
+          "LABEL": "Last activity"
+        },
+        "CREATED_AT": {
+          "NAME": "Дата создания",
+          "LABEL": "Дата создания"
+        },
+        "LAST_USER_MESSAGE_AT": {
+          "NAME": "Last user message at",
+          "LABEL": "Last message"
+        }
+      }
+    },
     "RECEIVED_VIA_EMAIL": "Получено по email",
     "VIEW_TWEET_IN_TWITTER": "Просмотреть твит в Twitter",
     "REPLY_TO_TWEET": "Ответить на этот твит",
diff --git a/app/javascript/dashboard/i18n/locale/ru/contact.json b/app/javascript/dashboard/i18n/locale/ru/contact.json
index 5fc2c4248..d7a4a4310 100644
--- a/app/javascript/dashboard/i18n/locale/ru/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ru/contact.json
@@ -120,9 +120,9 @@
       "PHONE_NUMBER": {
         "PLACEHOLDER": "Введите номер телефона контакта",
         "LABEL": "Номер телефона",
-        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]. You can select the dial code from the dropdown.",
+        "HELP": "Номер телефона должен быть в формате E.164, например: +1415555555 [+] [код страны][код города][локальный номер телефона]. Вы можете выбрать код набора из выпадающего списка.",
         "ERROR": "Номер телефона должен быть пустым или в формате E.164",
-        "DIAL_CODE_ERROR": "Please select a dial code from the list",
+        "DIAL_CODE_ERROR": "Пожалуйста, выберите код набора из списка",
         "DUPLICATE": "Этот номер телефона используется для другого контакта."
       },
       "LOCATION": {
@@ -182,8 +182,8 @@
         "LABEL": "Кому"
       },
       "INBOX": {
-        "LABEL": "Via Inbox",
-        "PLACEHOLDER": "Choose source inbox",
+        "LABEL": "Через «Входящие»",
+        "PLACEHOLDER": "Выберите источник входящих",
         "ERROR": "Выберите электронную почту"
       },
       "SUBJECT": {
diff --git a/app/javascript/dashboard/i18n/locale/ru/conversation.json b/app/javascript/dashboard/i18n/locale/ru/conversation.json
index 923a2219e..d2f036b3c 100644
--- a/app/javascript/dashboard/i18n/locale/ru/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ru/conversation.json
@@ -37,7 +37,7 @@
     "UNKNOWN_FILE_TYPE": "Неизвестный файл",
     "SAVE_CONTACT": "Сохранить",
     "UPLOADING_ATTACHMENTS": "Загрузка вложений...",
-    "REPLIED_TO_STORY": "Replied to your story",
+    "REPLIED_TO_STORY": "Ответил на вашу историю",
     "SUCCESS_DELETE_MESSAGE": "Сообщение успешно удалено",
     "FAIL_DELETE_MESSSAGE": "Не удалось удалить сообщение! Попробуйте еще раз",
     "NO_RESPONSE": "Нет ответа",
@@ -68,20 +68,20 @@
       }
     },
     "PRIORITY": {
-      "TITLE": "Priority",
+      "TITLE": "Приоритет",
       "OPTIONS": {
         "NONE": "Ничего",
-        "URGENT": "Urgent",
-        "HIGH": "High",
-        "MEDIUM": "Medium",
-        "LOW": "Low"
+        "URGENT": "Срочность",
+        "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": "Изменен приоритет разговора id %{conversationId} на %{priority}",
+        "FAILED": "Не удалось изменить приоритет. Пожалуйста, попробуйте еще раз."
       }
     },
     "CARD_CONTEXT_MENU": {
@@ -282,17 +282,17 @@
     "SUBJECT": "Тема"
   },
   "CONVERSATION_PARTICIPANTS": {
-    "SIDEBAR_MENU_TITLE": "Participating",
+    "SIDEBAR_MENU_TITLE": "Участвующие",
     "SIDEBAR_TITLE": "Участники диалога",
     "NO_RECORDS_FOUND": "Результаты не найдены",
     "ADD_PARTICIPANTS": "Выберите участников",
-    "REMANING_PARTICIPANTS_TEXT": "+%{count} others",
-    "REMANING_PARTICIPANT_TEXT": "+%{count} other",
-    "TOTAL_PARTICIPANTS_TEXT": "%{count} people are participating.",
-    "TOTAL_PARTICIPANT_TEXT": "%{count} person is participating.",
-    "NO_PARTICIPANTS_TEXT": "No one is participating!.",
+    "REMANING_PARTICIPANTS_TEXT": "+%{count} другие",
+    "REMANING_PARTICIPANT_TEXT": "+%{count} другие",
+    "TOTAL_PARTICIPANTS_TEXT": "%{count} человек участвуют.",
+    "TOTAL_PARTICIPANT_TEXT": "%{count} человек участвуют.",
+    "NO_PARTICIPANTS_TEXT": "Никто не участвует!.",
     "WATCH_CONVERSATION": "Присоединиться к диалогу",
-    "YOU_ARE_WATCHING": "You are participating",
+    "YOU_ARE_WATCHING": "Вы участвуете",
     "API": {
       "ERROR_MESSAGE": "Не удалось обновить, попробуйте снова!",
       "SUCCESS_MESSAGE": "Участники обновлены!"
@@ -300,9 +300,9 @@
   },
   "TRANSLATE_MODAL": {
     "TITLE": "Просмотреть перевод",
-    "DESC": "You can view the translated content in each langauge.",
+    "DESC": "Вы можете просмотреть содержимое перевода в каждом языке.",
     "ORIGINAL_CONTENT": "Оригинальное содержимое",
     "TRANSLATED_CONTENT": "Перевод",
-    "NO_TRANSLATIONS_AVAILABLE": "No translations are available for this content"
+    "NO_TRANSLATIONS_AVAILABLE": "Для этого содержимого нет доступных переводов"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ru/emoji.json b/app/javascript/dashboard/i18n/locale/ru/emoji.json
index fd81268fb..cb7dd8e47 100644
--- a/app/javascript/dashboard/i18n/locale/ru/emoji.json
+++ b/app/javascript/dashboard/i18n/locale/ru/emoji.json
@@ -1,6 +1,6 @@
 {
   "EMOJI": {
-    "PLACEHOLDER": "Search emojis",
-    "NOT_FOUND": "No emoji match your search"
+    "PLACEHOLDER": "Поиск эмодзи",
+    "NOT_FOUND": "Эмодзи не соответствуют вашему запросу"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ru/generalSettings.json b/app/javascript/dashboard/i18n/locale/ru/generalSettings.json
index 70ecbd01f..c9066feaf 100644
--- a/app/javascript/dashboard/i18n/locale/ru/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ru/generalSettings.json
@@ -101,7 +101,7 @@
       "REPORTS": "Отчёты",
       "CONVERSATION": "Диалоги",
       "CHANGE_ASSIGNEE": "Изменить Назначенного",
-      "CHANGE_PRIORITY": "Change Priority",
+      "CHANGE_PRIORITY": "Изменить приоритет",
       "CHANGE_TEAM": "Изменить команду",
       "ADD_LABEL": "Добавить метку в разговор",
       "REMOVE_LABEL": "Удалить метку из разговора",
@@ -127,7 +127,7 @@
       "GO_TO_NOTIFICATIONS": "Перейти к уведомлениям",
       "ADD_LABELS_TO_CONVERSATION": "Добавить метку в разговор",
       "ASSIGN_AN_AGENT": "Назначить сотрудника",
-      "ASSIGN_PRIORITY": "Assign priority",
+      "ASSIGN_PRIORITY": "Назначить приоритет",
       "ASSIGN_A_TEAM": "Назначить команду",
       "MUTE_CONVERSATION": "Заглушить диалог",
       "UNMUTE_CONVERSATION": "Включить диалог",
diff --git a/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json
index 66ecf7dce..833cd9e21 100644
--- a/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json
@@ -239,7 +239,7 @@
         },
         "API_CALLBACK": {
           "TITLE": "URL",
-          "SUBTITLE": "You have to configure the webhook URL and the verification token in the Facebook Developer portal with the values shown below.",
+          "SUBTITLE": "Вы должны настроить URL-адрес webhook и токен проверки на портале разработчика Facebook с значениями, показанными ниже.",
           "WEBHOOK_URL": "URL вебхука",
           "WEBHOOK_VERIFICATION_TOKEN": "Токен авторизации Webhook"
         },
@@ -347,11 +347,11 @@
       },
       "EMAIL_PROVIDER": {
         "TITLE": "Выберите почтового провайдера",
-        "DESCRIPTION": "Select an email provider from the list below. If you don't see your email provider in the list, you can select the other provider option and provide the IMAP and SMTP Credentials."
+        "DESCRIPTION": "Выберите поставщика электронной почты из списка ниже. Если вы не видите вашего почтового провайдера в списке, вы можете выбрать другую опцию провайдера и предоставить учетные данные IMAP и SMTP."
       },
       "MICROSOFT": {
         "TITLE": "Почта Microsoft",
-        "DESCRIPTION": "Click on the Sign in with Microsoft button to get started. You will redirected to the email sign in page. Once you accept the requested permissions, you would be redirected back to the inbox creation step.",
+        "DESCRIPTION": "Нажмите на кнопку Войти с помощью Microsoft, чтобы начать. Вы будете перенаправлены на страницу входа по электронной почте. Как только вы согласитесь с запрошенными правами, вы будете перенаправлены обратно на этап создания входящих сообщений.",
         "EMAIL_PLACEHOLDER": "Введите адрес электронной почты",
         "HELP": "Чтобы добавить учетную запись Microsoft в качестве канала, вам нужно авторизоваться в учетной записи Майкрософт, нажав на кнопку \"Войти с помощью Microsoft\" ",
         "ERROR_MESSAGE": "Произошла ошибка при подключении к Microsoft, попробуйте еще раз"
@@ -440,7 +440,7 @@
       "DISPLAY_FILE_PICKER": "Показывать выбор файла на виджете",
       "DISPLAY_EMOJI_PICKER": "Показывать эмодзи на виджете",
       "ALLOW_END_CONVERSATION": "Разрешить пользователям завершать разговор из виджета",
-      "USE_INBOX_AVATAR_FOR_BOT": "Use inbox name and avatar for the bot"
+      "USE_INBOX_AVATAR_FOR_BOT": "Использовать имя папки \"Входящие\" и аватар для бота"
     },
     "SETTINGS_POPUP": {
       "MESSENGER_HEADING": "Скрипт",
@@ -463,9 +463,10 @@
       "INBOX_UPDATE_SUB_TEXT": "Изменить настройки источника",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Включить или отключить автоматическое назначение новых разговоров к агентам, добавленным к этому источнику.",
       "HMAC_VERIFICATION": "Проверка личности пользователя",
-      "HMAC_DESCRIPTION": "Для проверки личности пользователя SDK предлагает вам передать параметр `identity_hash` для каждого пользователя. Вы можете сгенерировать HMAC с помощью шифрования методом 'sha256' с ключом, который указан ниже.",
+      "HMAC_DESCRIPTION": "С помощью этого ключа вы можете сгенерировать секретный токен, который может быть использован для проверки личности ваших пользователей.",
+      "HMAC_LINK_TO_DOCS": "Подробнее читайте здесь.",
       "HMAC_MANDATORY_VERIFICATION": "Принудительная проверка личности пользователя",
-      "HMAC_MANDATORY_DESCRIPTION": "Если этот параметр включен, запросы на пропуск `identifier_hash` будут отклонены.",
+      "HMAC_MANDATORY_DESCRIPTION": "Если этот параметр включен, запросы, которые не могут быть проверены, будут отклонены.",
       "INBOX_IDENTIFIER": "Идентификатор входящего канала",
       "INBOX_IDENTIFIER_SUB_TEXT": "Используйте токен `inbox_identifier` для аутентификации ваших клиентов API.",
       "FORWARD_EMAIL_TITLE": "Переслать на Email",
@@ -473,21 +474,21 @@
       "ALLOW_MESSAGES_AFTER_RESOLVED": "Разрешить отправлять сообщения после завершения разговора",
       "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Разрешить пользователям отправлять сообщения даже после того, как разговор будет завершен.",
       "WHATSAPP_SECTION_SUBHEADER": "Этот ключ API используется для интеграции с API WhatsApp.",
-      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the updated key to be used for the integration with the WhatsApp APIs.",
+      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Введите обновленный ключ для интеграции с WhatsApp API.",
       "WHATSAPP_SECTION_TITLE": "Ключ API",
       "WHATSAPP_SECTION_UPDATE_TITLE": "Обновить ключ API",
       "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Введите сюда новый ключ API",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "Обновить",
       "WHATSAPP_WEBHOOK_TITLE": "Вебхук верифицировать токен",
-      "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
-      "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
+      "WHATSAPP_WEBHOOK_SUBHEADER": "Этот токен используется для проверки подлинности конечной точки веб-хука.",
+      "UPDATE_PRE_CHAT_FORM_SETTINGS": "Обновить настройки формы для чата"
     },
     "HELP_CENTER": {
-      "LABEL": "Help Center",
-      "PLACEHOLDER": "Select Help Center",
-      "SELECT_PLACEHOLDER": "Select Help Center",
-      "REMOVE": "Remove Help Center",
-      "SUB_TEXT": "Attach a Help Center with the inbox"
+      "LABEL": "Центр поддержки",
+      "PLACEHOLDER": "Выберите справочный центр",
+      "SELECT_PLACEHOLDER": "Выберите справочный центр",
+      "REMOVE": "Удалить справочный центр",
+      "SUB_TEXT": "Прикрепить справочный центр с помощью папки \"Входящие\""
     },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "Авто распределение лимита",
diff --git a/app/javascript/dashboard/i18n/locale/ru/integrations.json b/app/javascript/dashboard/i18n/locale/ru/integrations.json
index 0cc285ddf..8f5234880 100644
--- a/app/javascript/dashboard/i18n/locale/ru/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ru/integrations.json
@@ -86,21 +86,21 @@
       "CREATE_ERROR": "Произошла ошибка при создании ссылки на встречу, попробуйте еще раз"
     },
     "OPEN_AI": {
-      "TITLE": "Improve With AI",
-      "SUBTITLE": "An improved reply will be generated using AI, based on your current draft.",
+      "TITLE": "Улучшить с ИИ",
+      "SUBTITLE": "Улучшенный ответ будет создан с помощью AI, основанный на текущем проекте.",
       "TONE": {
-        "TITLE": "Tone",
+        "TITLE": "Тон",
         "OPTIONS": {
-          "PROFESSIONAL": "Professional",
-          "FRIENDLY": "Friendly"
+          "PROFESSIONAL": "Профессиональный",
+          "FRIENDLY": "Дружелюбный"
         }
       },
       "BUTTONS": {
-        "GENERATE": "Generate",
-        "GENERATING": "Generating...",
+        "GENERATE": "Создать",
+        "GENERATING": "Создание...",
         "CANCEL": "Отменить"
       },
-      "GENERATE_ERROR": "There was an error processing the content, please try again"
+      "GENERATE_ERROR": "При сохранении настроек произошла ошибка, пожалуйста, попробуйте еще раз"
     },
     "DELETE": {
       "BUTTON_TEXT": "Удалить",
diff --git a/app/javascript/dashboard/i18n/locale/ru/login.json b/app/javascript/dashboard/i18n/locale/ru/login.json
index 0ce7fea96..79fcba3a1 100644
--- a/app/javascript/dashboard/i18n/locale/ru/login.json
+++ b/app/javascript/dashboard/i18n/locale/ru/login.json
@@ -3,21 +3,21 @@
     "TITLE": "Войти в Chatwoot",
     "EMAIL": {
       "LABEL": "Email",
-      "PLACEHOLDER": "example@companyname.com"
+      "PLACEHOLDER": "пример @companyname.com"
     },
     "PASSWORD": {
       "LABEL": "Пароль",
       "PLACEHOLDER": "Пароль"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Login successful",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again.",
-      "UNAUTH": "Username or password is incorrect. Please try again."
+      "SUCCESS_MESSAGE": "Вход выполнен",
+      "ERROR_MESSAGE": "Не удалось подключиться к Woot серверу. Пожалуйста, попробуйте еще раз.",
+      "UNAUTH": "Неверное имя пользователя или пароль. Пожалуйста, попробуйте еще раз."
     },
     "OAUTH": {
       "GOOGLE_LOGIN": "Войти с помощью Google",
-      "BUSINESS_ACCOUNTS_ONLY": "Please use your company email address to login",
-      "NO_ACCOUNT_FOUND": "We couldn't find an account for your email address."
+      "BUSINESS_ACCOUNTS_ONLY": "Пожалуйста, используйте адрес электронной почты вашей компании для входа",
+      "NO_ACCOUNT_FOUND": "Мы не смогли найти учетную запись для вашего адреса электронной почты."
     },
     "FORGOT_PASSWORD": "Забыли пароль?",
     "CREATE_NEW_ACCOUNT": "Создать новый аккаунт",
diff --git a/app/javascript/dashboard/i18n/locale/ru/macros.json b/app/javascript/dashboard/i18n/locale/ru/macros.json
index bd8c23aea..342b21d29 100644
--- a/app/javascript/dashboard/i18n/locale/ru/macros.json
+++ b/app/javascript/dashboard/i18n/locale/ru/macros.json
@@ -1,26 +1,26 @@
 {
   "MACROS": {
-    "HEADER": "Macros",
-    "HEADER_BTN_TXT": "Add a new macro",
-    "HEADER_BTN_TXT_SAVE": "Save macro",
-    "LOADING": "Fetching macros",
-    "SIDEBAR_TXT": "<p><b>Macros</b><p>A macro is a set of saved actions that help customer service agents easily complete tasks. The agents can define a set of actions like tagging a conversation with a label, sending an email transcript, updating a custom attribute, etc., and they can run these actions in a single click. When the agents run the macro, the actions would be performed sequentially in the order they are defined. Macros improve productivity and increase consistency in actions. </p><p>A macro can be helpful in 2 ways. </p><p><b>As an agent assist:</b> If an agent performs a set of actions multiple times, they can save it as a macro and execute all the actions together using a single click.</p><p><b>As an option to onboard a team member:</b> Every agent has to perform many different checks/actions during each conversation. Onboarding a new support team member will be easy if pre-defined macros are available on the account. Instead of describing each step in detail, the manager/team lead can point to the macros used in different scenarios.</p>",
-    "ERROR": "Something went wrong. Please try again",
-    "ORDER_INFO": "Macros will run in the order you add your actions. You can rearrange them by dragging them by the handle beside each node.",
+    "HEADER": "Макрос",
+    "HEADER_BTN_TXT": "Добавить новый макрос",
+    "HEADER_BTN_TXT_SAVE": "Сохранить макрос",
+    "LOADING": "Получение макроса",
+    "SIDEBAR_TXT": "<p><b>Макросы</b><p>Макрос - это набор сохраненных действий, которые помогают агентам обслуживания клиентов легко выполнять задачи. Агенты могут определить набор действий, таких как метка разговора с меткой, отправка субтитров электронной почты, обновление пользовательских атрибутов и т.д. и они могут выполнить эти действия одним щелчком. Когда агенты запускают макрос, действия будут выполняться последовательно в порядке их определения. Макросы повышают производительность и последовательность действий. </p><p>Макро может быть полезен двумя способами. </p><p><b>Как помощник агента:</b> Если агент выполняет набор действий несколько раз, они могут сохранить его в виде макроса и выполнить все действия вместе одним щелчком мыши.</p><p><b>Как вариант на борту члена команды:</b> Во время каждого разговора каждый агент должен выполнять много различных чеков/действий. Создание нового участника службы поддержки будет легко, если предварительно заданные макросы будут доступны на аккаунте. Вместо подробного описания каждого шага, менеджер / команда может указывать на макросы, используемые в различных сценариях.</p>",
+    "ERROR": "Что-то пошло не так. Попробуйте еще раз",
+    "ORDER_INFO": "Макросы будут выполняться в том порядке, в котором вы добавите ваши действия. Вы можете изменить их порядок, перетаскивая их ручкой рядом с каждым узлом.",
     "ADD": {
       "FORM": {
         "NAME": {
-          "LABEL": "Macro name",
-          "PLACEHOLDER": "Enter a name for your macro",
-          "ERROR": "Name is required for creating a macro"
+          "LABEL": "Название макроса",
+          "PLACEHOLDER": "Введите имя для макроса",
+          "ERROR": "Имя обязательно для создания макроса"
         },
         "ACTIONS": {
           "LABEL": "Действия"
         }
       },
       "API": {
-        "SUCCESS_MESSAGE": "Macro added successfully",
-        "ERROR_MESSAGE": "Unable to create macro, Please try again later"
+        "SUCCESS_MESSAGE": "Макрос успешно добавлен",
+        "ERROR_MESSAGE": "Не удается создать макрос, пожалуйста, повторите попытку позже"
       }
     },
     "LIST": {
@@ -30,42 +30,42 @@
         "Обновлено",
         "Видимость"
       ],
-      "404": "No macros found"
+      "404": "Макросы не найдены"
     },
     "DELETE": {
-      "TOOLTIP": "Delete macro",
+      "TOOLTIP": "Удалить макрос",
       "CONFIRM": {
         "MESSAGE": "Вы точно хотите удалить ",
         "YES": "Да, удалить",
         "NO": "Нет"
       },
       "API": {
-        "SUCCESS_MESSAGE": "Macro deleted successfully",
-        "ERROR_MESSAGE": "There was an error deleting the macro. Please try again later"
+        "SUCCESS_MESSAGE": "Макрос успешно удален",
+        "ERROR_MESSAGE": "Произошла ошибка при удалении макроса. Пожалуйста, повторите попытку позже"
       }
     },
     "EDIT": {
-      "TOOLTIP": "Edit macro",
+      "TOOLTIP": "Изменить макрос",
       "API": {
-        "SUCCESS_MESSAGE": "Macro updated successfully",
-        "ERROR_MESSAGE": "Could not update Macro, Please try again later"
+        "SUCCESS_MESSAGE": "Макрос успешно обновлен",
+        "ERROR_MESSAGE": "Не удалось обновить Macro, пожалуйста, повторите попытку позже"
       }
     },
     "EDITOR": {
-      "START_FLOW": "Start Flow",
-      "END_FLOW": "End Flow",
-      "LOADING": "Fetching macro",
-      "ADD_BTN_TOOLTIP": "Add new action",
-      "DELETE_BTN_TOOLTIP": "Delete Action",
+      "START_FLOW": "Начало потока",
+      "END_FLOW": "Конец потока",
+      "LOADING": "Получение макроса",
+      "ADD_BTN_TOOLTIP": "Добавить новое действие",
+      "DELETE_BTN_TOOLTIP": "Удалить действие",
       "VISIBILITY": {
-        "LABEL": "Macro Visibility",
+        "LABEL": "Видимость макроса",
         "GLOBAL": {
-          "LABEL": "Public",
-          "DESCRIPTION": "This macro is available publicly for all agents in this account."
+          "LABEL": "Публичный",
+          "DESCRIPTION": "Этот макрос доступен всем агентам на этом аккаунте."
         },
         "PERSONAL": {
-          "LABEL": "Private",
-          "DESCRIPTION": "This macro will be private to you and not be available to others."
+          "LABEL": "Приватный",
+          "DESCRIPTION": "Этот макрос будет приватным для вас и не будет доступен для других."
         }
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/ru/report.json b/app/javascript/dashboard/i18n/locale/ru/report.json
index 10b725d84..b0a4c979a 100644
--- a/app/javascript/dashboard/i18n/locale/ru/report.json
+++ b/app/javascript/dashboard/i18n/locale/ru/report.json
@@ -427,10 +427,10 @@
       "UNASSIGNED": "Неназначен"
     },
     "CONVERSATION_HEATMAP": {
-      "HEADER": "Conversation Traffic",
-      "NO_CONVERSATIONS": "No conversations",
-      "CONVERSATION": "%{count} conversation",
-      "CONVERSATIONS": "%{count} conversations"
+      "HEADER": "Трафик сообщений",
+      "NO_CONVERSATIONS": "Нет сообщений",
+      "CONVERSATION": "%{count} разговор",
+      "CONVERSATIONS": "%{count} разговоров"
     },
     "AGENT_CONVERSATIONS": {
       "HEADER": "Диалоги по операторам",
diff --git a/app/javascript/dashboard/i18n/locale/ru/resetPassword.json b/app/javascript/dashboard/i18n/locale/ru/resetPassword.json
index ad9aeaefe..fdd22e934 100644
--- a/app/javascript/dashboard/i18n/locale/ru/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/ru/resetPassword.json
@@ -8,7 +8,7 @@
     },
     "API": {
       "SUCCESS_MESSAGE": "Ссылка для сброса пароля была отправлена на ваш email.",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
+      "ERROR_MESSAGE": "Не удалось подключиться к Woot серверу. Пожалуйста, попробуйте еще раз."
     },
     "SUBMIT": "Отправить"
   }
diff --git a/app/javascript/dashboard/i18n/locale/ru/search.json b/app/javascript/dashboard/i18n/locale/ru/search.json
index 112a968ad..3fe578801 100644
--- a/app/javascript/dashboard/i18n/locale/ru/search.json
+++ b/app/javascript/dashboard/i18n/locale/ru/search.json
@@ -14,8 +14,8 @@
     "EMPTY_STATE": "Не найдено %{item} для запроса '%{query}'",
     "EMPTY_STATE_FULL": "Ничего не найдено по запросу '%{query}'",
     "PLACEHOLDER_KEYBINDING": "/ фокусироваться",
-    "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
-    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
+    "INPUT_PLACEHOLDER": "Введите 3 или более символов для поиска",
+    "EMPTY_STATE_DEFAULT": "Поиск по идентификатору разговора, электронной почте, номеру телефона, сообщениям для улучшения результатов поиска. ",
     "BOT_LABEL": "Бот",
     "READ_MORE": "Читать далее",
     "WROTE": "написал:"
diff --git a/app/javascript/dashboard/i18n/locale/ru/setNewPassword.json b/app/javascript/dashboard/i18n/locale/ru/setNewPassword.json
index 270652616..c1e14d64d 100644
--- a/app/javascript/dashboard/i18n/locale/ru/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/ru/setNewPassword.json
@@ -1,19 +1,19 @@
 {
   "SET_NEW_PASSWORD": {
-    "TITLE": "Set new password",
+    "TITLE": "Установить новый пароль",
     "PASSWORD": {
       "LABEL": "Пароль",
       "PLACEHOLDER": "Пароль",
       "ERROR": "Пароль слишком короткий."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirm password",
+      "LABEL": "Подтвердите пароль",
       "PLACEHOLDER": "Подтвердить пароль",
       "ERROR": "Пароли не совпадают."
     },
     "API": {
       "SUCCESS_MESSAGE": "Пароль изменен.",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
+      "ERROR_MESSAGE": "Не удалось подключиться к Woot серверу. Пожалуйста, попробуйте еще раз."
     },
     "CAPTCHA": {
       "ERROR": "Время проверки истекло. Пожалуйста, решите задачу captcha еще раз."
diff --git a/app/javascript/dashboard/i18n/locale/ru/settings.json b/app/javascript/dashboard/i18n/locale/ru/settings.json
index 9afc4532c..c87acb244 100644
--- a/app/javascript/dashboard/i18n/locale/ru/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ru/settings.json
@@ -80,7 +80,7 @@
         "CONVERSATION_CREATION": "Отправлять email уведомление, когда новый диалог создан",
         "CONVERSATION_MENTION": "Отправлять email уведомление, когда вас упоминают в диалоге",
         "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Отправлять email уведомления при создании нового сообщения в назначенном диалоге",
-        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in a participating conversation"
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Отправлять уведомления по электронной почте, когда в разговоре создается новое сообщение"
       },
       "API": {
         "UPDATE_SUCCESS": "Настройки уведомлений сохранены",
@@ -93,7 +93,7 @@
         "CONVERSATION_CREATION": "Отправлять push уведомление, когда новый диалог создан",
         "CONVERSATION_MENTION": "Отправлять уведомления при упоминании в разговоре",
         "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Отправлять push уведомления при создании нового сообщения в назначенном диалоге",
-        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in a participating conversation",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Отправлять push-уведомления при создании нового сообщения в участвующем разговоре",
         "HAS_ENABLED_PUSH": "Вы включили push уведомления для этого браузера.",
         "REQUEST_PUSH": "Включить push-уведомления"
       },
@@ -195,7 +195,7 @@
     "CONVERSATIONS": "Диалоги",
     "ALL_CONVERSATIONS": "Диалоги",
     "MENTIONED_CONVERSATIONS": "Упоминания",
-    "PARTICIPATING_CONVERSATIONS": "Participating",
+    "PARTICIPATING_CONVERSATIONS": "Участвующие",
     "UNATTENDED_CONVERSATIONS": "Несвязанные",
     "REPORTS": "Отчёты",
     "SETTINGS": "Настройки",
@@ -203,7 +203,7 @@
     "HOME": "Главная",
     "AGENTS": "Операторы",
     "AGENT_BOTS": "Боты",
-    "AUDIT_LOGS": "Audit Logs",
+    "AUDIT_LOGS": "Журнал аудита",
     "INBOXES": "Источники",
     "NOTIFICATIONS": "Уведомления",
     "CANNED_RESPONSES": "Шаблонные ответы",
@@ -214,7 +214,7 @@
     "LABELS": "Категории",
     "CUSTOM_ATTRIBUTES": "Пользовательские атрибуты",
     "AUTOMATION": "Автоматизация",
-    "MACROS": "Macros",
+    "MACROS": "Макрос",
     "TEAMS": "Команды",
     "BILLING": "Платёж",
     "CUSTOM_VIEWS_FOLDER": "Папки",
@@ -289,7 +289,7 @@
     }
   },
   "KEYBOARD_SHORTCUTS": {
-    "TOGGLE_MODAL": "View all shortcuts",
+    "TOGGLE_MODAL": "Показать все ярлыки",
     "TITLE": {
       "OPEN_CONVERSATION": "Открыть беседу",
       "RESOLVE_AND_NEXT": "Решить и перейти к следующему",
diff --git a/app/javascript/dashboard/i18n/locale/ru/signup.json b/app/javascript/dashboard/i18n/locale/ru/signup.json
index fa9516042..13e0555a2 100644
--- a/app/javascript/dashboard/i18n/locale/ru/signup.json
+++ b/app/javascript/dashboard/i18n/locale/ru/signup.json
@@ -4,23 +4,23 @@
     "TITLE": "Регистрация",
     "TESTIMONIAL_HEADER": "Все, что нужно сделать, это один шаг для продвижения вперед",
     "TESTIMONIAL_CONTENT": "Вы находитесь на расстоянии всего одного шага от привлечения своих клиентов, удержав их и находя новые.",
-    "TERMS_ACCEPT": "By creating an account, you agree to our <a href=\"https://www.chatwoot.com/terms\">T & C</a> and <a href=\"https://www.chatwoot.com/privacy-policy\">Privacy policy</a>",
+    "TERMS_ACCEPT": "Создавая учетную запись, вы соглашаетесь с нашими <a href=\"https://www.chatwoot.com/terms\">Т и С</a> и <a href=\"https://www.chatwoot.com/privacy-policy\">политикой конфиденциальности</a>",
     "OAUTH": {
       "GOOGLE_SIGNUP": "Регистрация через Google"
     },
     "COMPANY_NAME": {
       "LABEL": "Название компании",
-      "PLACEHOLDER": "Enter your company name. E.g., Wayne Enterprises",
+      "PLACEHOLDER": "Введите название вашей компании например Wayne Enterprises",
       "ERROR": "Название компании слишком короткое."
     },
     "FULL_NAME": {
       "LABEL": "Полное имя",
-      "PLACEHOLDER": "Enter your full name. E.g., Bruce Wayne",
+      "PLACEHOLDER": "Введите ваше полное имя. Например: Брюс Уэйн",
       "ERROR": "Имя слишком короткое."
     },
     "EMAIL": {
       "LABEL": "Рабочий email",
-      "PLACEHOLDER": "Enter your work email address. E.g., bruce@wayne.enterprises",
+      "PLACEHOLDER": "Введите ваш рабочий адрес электронной почты. Например: bruce@wayne.enterprises",
       "ERROR": "Пожалуйста, введите действительный адрес электронной почты."
     },
     "PASSWORD": {
@@ -30,13 +30,13 @@
       "IS_INVALID_PASSWORD": "Пароль должен содержать хотя бы одну заглавную букву, одну строчную букву, 1 цифру и 1 специальный символ."
     },
     "CONFIRM_PASSWORD": {
-      "LABEL": "Confirm password",
-      "PLACEHOLDER": "Confirm password",
+      "LABEL": "Подтвердите пароль",
+      "PLACEHOLDER": "Подтвердите пароль",
       "ERROR": "Пароли не совпадают."
     },
     "API": {
       "SUCCESS_MESSAGE": "Успешная регистрация",
-      "ERROR_MESSAGE": "Could not connect to Woot server. Please try again."
+      "ERROR_MESSAGE": "Не удалось подключиться к Woot серверу. Пожалуйста, попробуйте еще раз."
     },
     "SUBMIT": "Создать новый аккаунт",
     "HAVE_AN_ACCOUNT": "Уже есть аккаунт?"
diff --git a/app/javascript/dashboard/i18n/locale/sh/chatlist.json b/app/javascript/dashboard/i18n/locale/sh/chatlist.json
index b96cfb976..6312d4c9f 100644
--- a/app/javascript/dashboard/i18n/locale/sh/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/sh/chatlist.json
@@ -35,6 +35,20 @@
         "TEXT": "All"
       }
     },
+    "VIEW_FILTER": "View",
+    "SORT_TOOLTIP_LABEL": "Sort conversations",
+    "CHAT_SORT": {
+      "STATUS": "Status",
+      "ORDER_BY": "Order by"
+    },
+    "CHAT_SORT_FILTER_ITEMS": {
+      "latest": {
+        "TEXT": "Last activity"
+      },
+      "sort_on_created_at": {
+        "TEXT": "Created at"
+      }
+    },
     "ATTACHMENTS": {
       "image": {
         "CONTENT": "Picture message"
@@ -55,6 +69,24 @@
         "CONTENT": "has shared a url"
       }
     },
+    "CHAT_SORT_BY_FILTER": {
+      "TITLE": "Sort conversation",
+      "DROPDOWN_TITLE": "Sort by",
+      "ITEMS": {
+        "LATEST": {
+          "NAME": "Last activity at",
+          "LABEL": "Last activity"
+        },
+        "CREATED_AT": {
+          "NAME": "Created at",
+          "LABEL": "Created at"
+        },
+        "LAST_USER_MESSAGE_AT": {
+          "NAME": "Last user message at",
+          "LABEL": "Last message"
+        }
+      }
+    },
     "RECEIVED_VIA_EMAIL": "Received via email",
     "VIEW_TWEET_IN_TWITTER": "View tweet in Twitter",
     "REPLY_TO_TWEET": "Reply to this tweet",
diff --git a/app/javascript/dashboard/i18n/locale/sh/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/sh/inboxMgmt.json
index 97a4ee2f6..afe22286f 100644
--- a/app/javascript/dashboard/i18n/locale/sh/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sh/inboxMgmt.json
@@ -463,9 +463,10 @@
       "INBOX_UPDATE_SUB_TEXT": "Update your inbox settings",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Enable or disable the automatic assignment of new conversations to the agents added to this inbox.",
       "HMAC_VERIFICATION": "User Identity Validation",
-      "HMAC_DESCRIPTION": "In order to validate the user's identity, you can pass an `identifier_hash` for each user. You can generate a HMAC sha256 hash using the `identifier` with the key shown here.",
+      "HMAC_DESCRIPTION": "With this key you can generate a secret token that can be used to verify the identity of your users.",
+      "HMAC_LINK_TO_DOCS": "You can read more here.",
       "HMAC_MANDATORY_VERIFICATION": "Enforce User Identity Validation",
-      "HMAC_MANDATORY_DESCRIPTION": "If enabled, requests missing the `identifier_hash` will be rejected.",
+      "HMAC_MANDATORY_DESCRIPTION": "If enabled, requests that cannot be verified will be rejected.",
       "INBOX_IDENTIFIER": "Inbox Identifier",
       "INBOX_IDENTIFIER_SUB_TEXT": "Use the `inbox_identifier` token shown here to authentication your API clients.",
       "FORWARD_EMAIL_TITLE": "Forward to Email",
diff --git a/app/javascript/dashboard/i18n/locale/sk/chatlist.json b/app/javascript/dashboard/i18n/locale/sk/chatlist.json
index f4c58276b..ff82ad411 100644
--- a/app/javascript/dashboard/i18n/locale/sk/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/sk/chatlist.json
@@ -35,6 +35,20 @@
         "TEXT": "Všetko"
       }
     },
+    "VIEW_FILTER": "Zobraziť",
+    "SORT_TOOLTIP_LABEL": "Sort conversations",
+    "CHAT_SORT": {
+      "STATUS": "Status",
+      "ORDER_BY": "Order by"
+    },
+    "CHAT_SORT_FILTER_ITEMS": {
+      "latest": {
+        "TEXT": "Last activity"
+      },
+      "sort_on_created_at": {
+        "TEXT": "Created at"
+      }
+    },
     "ATTACHMENTS": {
       "image": {
         "CONTENT": "Obrázková správa"
@@ -55,6 +69,24 @@
         "CONTENT": "zdieľal/a url"
       }
     },
+    "CHAT_SORT_BY_FILTER": {
+      "TITLE": "Sort conversation",
+      "DROPDOWN_TITLE": "Sort by",
+      "ITEMS": {
+        "LATEST": {
+          "NAME": "Last activity at",
+          "LABEL": "Last activity"
+        },
+        "CREATED_AT": {
+          "NAME": "Created at",
+          "LABEL": "Created at"
+        },
+        "LAST_USER_MESSAGE_AT": {
+          "NAME": "Last user message at",
+          "LABEL": "Last message"
+        }
+      }
+    },
     "RECEIVED_VIA_EMAIL": "Prijaté emailom",
     "VIEW_TWEET_IN_TWITTER": "Zobraz tweet na Twitteri",
     "REPLY_TO_TWEET": "Odpovedať na tento Tweet",
diff --git a/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json
index 852aae4ee..ef25a7713 100644
--- a/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json
@@ -463,9 +463,10 @@
       "INBOX_UPDATE_SUB_TEXT": "Update your inbox settings",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Enable or disable the automatic assignment of new conversations to the agents added to this inbox.",
       "HMAC_VERIFICATION": "User Identity Validation",
-      "HMAC_DESCRIPTION": "In order to validate the user's identity, you can pass an `identifier_hash` for each user. You can generate a HMAC sha256 hash using the `identifier` with the key shown here.",
+      "HMAC_DESCRIPTION": "With this key you can generate a secret token that can be used to verify the identity of your users.",
+      "HMAC_LINK_TO_DOCS": "You can read more here.",
       "HMAC_MANDATORY_VERIFICATION": "Vynucovanie overovania totožnosti používateľa",
-      "HMAC_MANDATORY_DESCRIPTION": "If enabled, requests missing the `identifier_hash` will be rejected.",
+      "HMAC_MANDATORY_DESCRIPTION": "If enabled, requests that cannot be verified will be rejected.",
       "INBOX_IDENTIFIER": "Indetifikátor schránky",
       "INBOX_IDENTIFIER_SUB_TEXT": "Na overenie klientov API použite tu uvedený token `inbox_identifier`.",
       "FORWARD_EMAIL_TITLE": "Preposlanť na e-mail",
diff --git a/app/javascript/dashboard/i18n/locale/sr/chatlist.json b/app/javascript/dashboard/i18n/locale/sr/chatlist.json
index d2ffdefaa..c3efe4359 100644
--- a/app/javascript/dashboard/i18n/locale/sr/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/sr/chatlist.json
@@ -35,6 +35,20 @@
         "TEXT": "Sve"
       }
     },
+    "VIEW_FILTER": "Pregled",
+    "SORT_TOOLTIP_LABEL": "Sort conversations",
+    "CHAT_SORT": {
+      "STATUS": "Status",
+      "ORDER_BY": "Order by"
+    },
+    "CHAT_SORT_FILTER_ITEMS": {
+      "latest": {
+        "TEXT": "Last activity"
+      },
+      "sort_on_created_at": {
+        "TEXT": "Napravljena u"
+      }
+    },
     "ATTACHMENTS": {
       "image": {
         "CONTENT": "Slikovita poruka"
@@ -55,6 +69,24 @@
         "CONTENT": "je podelio link"
       }
     },
+    "CHAT_SORT_BY_FILTER": {
+      "TITLE": "Sort conversation",
+      "DROPDOWN_TITLE": "Sortirajte prema",
+      "ITEMS": {
+        "LATEST": {
+          "NAME": "Last activity at",
+          "LABEL": "Last activity"
+        },
+        "CREATED_AT": {
+          "NAME": "Napravljena u",
+          "LABEL": "Napravljena u"
+        },
+        "LAST_USER_MESSAGE_AT": {
+          "NAME": "Last user message at",
+          "LABEL": "Last message"
+        }
+      }
+    },
     "RECEIVED_VIA_EMAIL": "Primljeno putem e-maila",
     "VIEW_TWEET_IN_TWITTER": "Pogledaj tweet na Twitteru",
     "REPLY_TO_TWEET": "Odgovori na tweet",
diff --git a/app/javascript/dashboard/i18n/locale/sr/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/sr/inboxMgmt.json
index 89ccf5fc7..0a835514e 100644
--- a/app/javascript/dashboard/i18n/locale/sr/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sr/inboxMgmt.json
@@ -463,9 +463,10 @@
       "INBOX_UPDATE_SUB_TEXT": "Izmenite podešavanja vašeg prijemnog sandučeta",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Omogući ili onemogući automatsku dodelu novih razgovora agentima dodatih ovom prijemnom sandučetu.",
       "HMAC_VERIFICATION": "Potvrda identiteta korisnika",
-      "HMAC_DESCRIPTION": "Da bi se potvrdio identitet korisnika, morate proslediti `identifier_hash` za svakog korisnika. Možete generisti HMAC sha256 heš koristeći `identifier` sa ključem prikazanim ovde.",
+      "HMAC_DESCRIPTION": "With this key you can generate a secret token that can be used to verify the identity of your users.",
+      "HMAC_LINK_TO_DOCS": "You can read more here.",
       "HMAC_MANDATORY_VERIFICATION": "Primoraj potvrdu identiteta korisnika",
-      "HMAC_MANDATORY_DESCRIPTION": "Ukoliko je omogućeno, zahtevi kojima nedostaje `identifier_hash` će biti odbijeni.",
+      "HMAC_MANDATORY_DESCRIPTION": "If enabled, requests that cannot be verified will be rejected.",
       "INBOX_IDENTIFIER": "Identifikator prijemnog sandučeta",
       "INBOX_IDENTIFIER_SUB_TEXT": "Koristite `inbox_identifier` token prikazan ovde za autentifikaciju vaših API klijenata.",
       "FORWARD_EMAIL_TITLE": "Prosledi na e-poštu",
diff --git a/app/javascript/dashboard/i18n/locale/sv/chatlist.json b/app/javascript/dashboard/i18n/locale/sv/chatlist.json
index 6a7de94f5..2cd17dcd0 100644
--- a/app/javascript/dashboard/i18n/locale/sv/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/sv/chatlist.json
@@ -35,6 +35,20 @@
         "TEXT": "Alla"
       }
     },
+    "VIEW_FILTER": "Visa",
+    "SORT_TOOLTIP_LABEL": "Sort conversations",
+    "CHAT_SORT": {
+      "STATUS": "Status",
+      "ORDER_BY": "Order by"
+    },
+    "CHAT_SORT_FILTER_ITEMS": {
+      "latest": {
+        "TEXT": "Last activity"
+      },
+      "sort_on_created_at": {
+        "TEXT": "Created at"
+      }
+    },
     "ATTACHMENTS": {
       "image": {
         "CONTENT": "Bildmeddelande"
@@ -55,6 +69,24 @@
         "CONTENT": "har delat en webbadress"
       }
     },
+    "CHAT_SORT_BY_FILTER": {
+      "TITLE": "Sort conversation",
+      "DROPDOWN_TITLE": "Sort by",
+      "ITEMS": {
+        "LATEST": {
+          "NAME": "Last activity at",
+          "LABEL": "Last activity"
+        },
+        "CREATED_AT": {
+          "NAME": "Created at",
+          "LABEL": "Created at"
+        },
+        "LAST_USER_MESSAGE_AT": {
+          "NAME": "Last user message at",
+          "LABEL": "Last message"
+        }
+      }
+    },
     "RECEIVED_VIA_EMAIL": "Mottaget via e-post",
     "VIEW_TWEET_IN_TWITTER": "Visa tweet i Twitter",
     "REPLY_TO_TWEET": "Svara på detta tweet",
diff --git a/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json
index a02d44dd8..89c8923d0 100644
--- a/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json
@@ -463,9 +463,10 @@
       "INBOX_UPDATE_SUB_TEXT": "Uppdatera inställningarna för din inkorg",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Aktivera eller inaktivera automatisk tilldelning av nya konversationer till de agenter som lagts till den här inkorgen.",
       "HMAC_VERIFICATION": "Validering av användaridentitet",
-      "HMAC_DESCRIPTION": "In order to validate the user's identity, you can pass an `identifier_hash` for each user. You can generate a HMAC sha256 hash using the `identifier` with the key shown here.",
+      "HMAC_DESCRIPTION": "With this key you can generate a secret token that can be used to verify the identity of your users.",
+      "HMAC_LINK_TO_DOCS": "You can read more here.",
       "HMAC_MANDATORY_VERIFICATION": "Validering av användaridentitet",
-      "HMAC_MANDATORY_DESCRIPTION": "If enabled, requests missing the `identifier_hash` will be rejected.",
+      "HMAC_MANDATORY_DESCRIPTION": "If enabled, requests that cannot be verified will be rejected.",
       "INBOX_IDENTIFIER": "Identifierare för inkorgen",
       "INBOX_IDENTIFIER_SUB_TEXT": "Använd `inbox_identifier`-token som visas här för att autentisera dina API-klienter.",
       "FORWARD_EMAIL_TITLE": "Vidarebefordra till e-post",
diff --git a/app/javascript/dashboard/i18n/locale/ta/chatlist.json b/app/javascript/dashboard/i18n/locale/ta/chatlist.json
index 9f5e4667e..e62d450fd 100644
--- a/app/javascript/dashboard/i18n/locale/ta/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/ta/chatlist.json
@@ -35,6 +35,20 @@
         "TEXT": "எல்லாம்"
       }
     },
+    "VIEW_FILTER": "காண்க",
+    "SORT_TOOLTIP_LABEL": "Sort conversations",
+    "CHAT_SORT": {
+      "STATUS": "நிலை",
+      "ORDER_BY": "Order by"
+    },
+    "CHAT_SORT_FILTER_ITEMS": {
+      "latest": {
+        "TEXT": "Last activity"
+      },
+      "sort_on_created_at": {
+        "TEXT": "Created at"
+      }
+    },
     "ATTACHMENTS": {
       "image": {
         "CONTENT": "பட செய்தி"
@@ -55,6 +69,24 @@
         "CONTENT": "ஒரு URL ஐப் பகிர்ந்துள்ளார்"
       }
     },
+    "CHAT_SORT_BY_FILTER": {
+      "TITLE": "Sort conversation",
+      "DROPDOWN_TITLE": "Sort by",
+      "ITEMS": {
+        "LATEST": {
+          "NAME": "Last activity at",
+          "LABEL": "Last activity"
+        },
+        "CREATED_AT": {
+          "NAME": "Created at",
+          "LABEL": "Created at"
+        },
+        "LAST_USER_MESSAGE_AT": {
+          "NAME": "Last user message at",
+          "LABEL": "Last message"
+        }
+      }
+    },
     "RECEIVED_VIA_EMAIL": "Received via email",
     "VIEW_TWEET_IN_TWITTER": "View tweet in Twitter",
     "REPLY_TO_TWEET": "Reply to this tweet",
diff --git a/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json
index dc59ed42a..9d45b1432 100644
--- a/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json
@@ -463,9 +463,10 @@
       "INBOX_UPDATE_SUB_TEXT": "உங்கள் இன்பாக்ஸ் அமைப்புகளைப் புதுப்பிக்கவும்",
       "AUTO_ASSIGNMENT_SUB_TEXT": "இந்த இன்பாக்ஸில் சேர்க்கப்பட்ட ஏஜென்ட்களுக்கு புதிய உரையாடல்களின் தானியங்கி ஒதுக்கீட்டை இயக்கவும் அல்லது முடக்கவும்.",
       "HMAC_VERIFICATION": "User Identity Validation",
-      "HMAC_DESCRIPTION": "In order to validate the user's identity, you can pass an `identifier_hash` for each user. You can generate a HMAC sha256 hash using the `identifier` with the key shown here.",
+      "HMAC_DESCRIPTION": "With this key you can generate a secret token that can be used to verify the identity of your users.",
+      "HMAC_LINK_TO_DOCS": "You can read more here.",
       "HMAC_MANDATORY_VERIFICATION": "Enforce User Identity Validation",
-      "HMAC_MANDATORY_DESCRIPTION": "If enabled, requests missing the `identifier_hash` will be rejected.",
+      "HMAC_MANDATORY_DESCRIPTION": "If enabled, requests that cannot be verified will be rejected.",
       "INBOX_IDENTIFIER": "Inbox Identifier",
       "INBOX_IDENTIFIER_SUB_TEXT": "Use the `inbox_identifier` token shown here to authentication your API clients.",
       "FORWARD_EMAIL_TITLE": "Forward to Email",
diff --git a/app/javascript/dashboard/i18n/locale/th/chatlist.json b/app/javascript/dashboard/i18n/locale/th/chatlist.json
index bb43c79b1..1c71a1053 100644
--- a/app/javascript/dashboard/i18n/locale/th/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/th/chatlist.json
@@ -35,6 +35,20 @@
         "TEXT": "ทั้งหมด"
       }
     },
+    "VIEW_FILTER": "ดู",
+    "SORT_TOOLTIP_LABEL": "Sort conversations",
+    "CHAT_SORT": {
+      "STATUS": "สถานะ",
+      "ORDER_BY": "Order by"
+    },
+    "CHAT_SORT_FILTER_ITEMS": {
+      "latest": {
+        "TEXT": "Last activity"
+      },
+      "sort_on_created_at": {
+        "TEXT": "สร้างเมื่อ"
+      }
+    },
     "ATTACHMENTS": {
       "image": {
         "CONTENT": "ข้อความภาพ"
@@ -55,6 +69,24 @@
         "CONTENT": "ได้เเชร์ลิ้ง"
       }
     },
+    "CHAT_SORT_BY_FILTER": {
+      "TITLE": "Sort conversation",
+      "DROPDOWN_TITLE": "เรียงด้วย",
+      "ITEMS": {
+        "LATEST": {
+          "NAME": "Last activity at",
+          "LABEL": "Last activity"
+        },
+        "CREATED_AT": {
+          "NAME": "สร้างเมื่อ",
+          "LABEL": "สร้างเมื่อ"
+        },
+        "LAST_USER_MESSAGE_AT": {
+          "NAME": "Last user message at",
+          "LABEL": "Last message"
+        }
+      }
+    },
     "RECEIVED_VIA_EMAIL": "ได้รับทางอีเมลล์",
     "VIEW_TWEET_IN_TWITTER": "ดูทวิตในทวิตเตอร์",
     "REPLY_TO_TWEET": "ตอบกลับทวิตนี้",
diff --git a/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json
index 04e72363a..0482f09a3 100644
--- a/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json
@@ -463,9 +463,10 @@
       "INBOX_UPDATE_SUB_TEXT": "อัปเดตกล่องข้อความ",
       "AUTO_ASSIGNMENT_SUB_TEXT": "เปิดหรือปิดระบบมอบหมายงานอัตโนมัติสำหรับข้อความใหม่ให้กับพนักงานในกล่องสนทนานี้",
       "HMAC_VERIFICATION": "การตรวจสอบตัวตนผู้ใช้งาน",
-      "HMAC_DESCRIPTION": "In order to validate the user's identity, you can pass an `identifier_hash` for each user. You can generate a HMAC sha256 hash using the `identifier` with the key shown here.",
+      "HMAC_DESCRIPTION": "With this key you can generate a secret token that can be used to verify the identity of your users.",
+      "HMAC_LINK_TO_DOCS": "You can read more here.",
       "HMAC_MANDATORY_VERIFICATION": "บังคับใช้การตรวจสอบตัวตนผู้ใช้งาน",
-      "HMAC_MANDATORY_DESCRIPTION": "If enabled, requests missing the `identifier_hash` will be rejected.",
+      "HMAC_MANDATORY_DESCRIPTION": "If enabled, requests that cannot be verified will be rejected.",
       "INBOX_IDENTIFIER": "ตัวระบุกล่องข้อความ",
       "INBOX_IDENTIFIER_SUB_TEXT": "ใช้ 'ตัวระบุกล่องข้อความ' ที่ปรากฎที่นี่เพื่อรับรองสิทธิ์ API clients ของคุณ",
       "FORWARD_EMAIL_TITLE": "ส่งต่อไปยังอีเมล",
diff --git a/app/javascript/dashboard/i18n/locale/tr/chatlist.json b/app/javascript/dashboard/i18n/locale/tr/chatlist.json
index fae9c6af5..e260f3f7e 100644
--- a/app/javascript/dashboard/i18n/locale/tr/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/tr/chatlist.json
@@ -35,6 +35,20 @@
         "TEXT": "Hepsi"
       }
     },
+    "VIEW_FILTER": "Görünüm",
+    "SORT_TOOLTIP_LABEL": "Sort conversations",
+    "CHAT_SORT": {
+      "STATUS": "Durum",
+      "ORDER_BY": "Order by"
+    },
+    "CHAT_SORT_FILTER_ITEMS": {
+      "latest": {
+        "TEXT": "Last activity"
+      },
+      "sort_on_created_at": {
+        "TEXT": "Oluşturma zamanı"
+      }
+    },
     "ATTACHMENTS": {
       "image": {
         "CONTENT": "Görsel mesaj"
@@ -55,6 +69,24 @@
         "CONTENT": "bir url paylaştı"
       }
     },
+    "CHAT_SORT_BY_FILTER": {
+      "TITLE": "Sort conversation",
+      "DROPDOWN_TITLE": "Sort by",
+      "ITEMS": {
+        "LATEST": {
+          "NAME": "Last activity at",
+          "LABEL": "Last activity"
+        },
+        "CREATED_AT": {
+          "NAME": "Oluşturma zamanı",
+          "LABEL": "Oluşturma zamanı"
+        },
+        "LAST_USER_MESSAGE_AT": {
+          "NAME": "Last user message at",
+          "LABEL": "Last message"
+        }
+      }
+    },
     "RECEIVED_VIA_EMAIL": "E-posta ile alındı",
     "VIEW_TWEET_IN_TWITTER": "Twitter'da tweet'i görüntüleyin",
     "REPLY_TO_TWEET": "Bu tweet'i yanıtla",
diff --git a/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json
index 838d29b28..a50807151 100644
--- a/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json
@@ -463,9 +463,10 @@
       "INBOX_UPDATE_SUB_TEXT": "Gelen kutusu ayarlarınızı güncelleyin",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Bu gelen kutusuna eklenen aracılara yeni görüşmelerin otomatik olarak atanmasını etkinleştirin veya devre dışı bırakın.",
       "HMAC_VERIFICATION": "User Identity Validation",
-      "HMAC_DESCRIPTION": "In order to validate the user's identity, you can pass an `identifier_hash` for each user. You can generate a HMAC sha256 hash using the `identifier` with the key shown here.",
+      "HMAC_DESCRIPTION": "With this key you can generate a secret token that can be used to verify the identity of your users.",
+      "HMAC_LINK_TO_DOCS": "You can read more here.",
       "HMAC_MANDATORY_VERIFICATION": "Enforce User Identity Validation",
-      "HMAC_MANDATORY_DESCRIPTION": "If enabled, requests missing the `identifier_hash` will be rejected.",
+      "HMAC_MANDATORY_DESCRIPTION": "If enabled, requests that cannot be verified will be rejected.",
       "INBOX_IDENTIFIER": "Inbox Identifier",
       "INBOX_IDENTIFIER_SUB_TEXT": "Use the `inbox_identifier` token shown here to authentication your API clients.",
       "FORWARD_EMAIL_TITLE": "Forward to Email",
diff --git a/app/javascript/dashboard/i18n/locale/uk/chatlist.json b/app/javascript/dashboard/i18n/locale/uk/chatlist.json
index 14181c92c..69b7ce6f8 100644
--- a/app/javascript/dashboard/i18n/locale/uk/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/uk/chatlist.json
@@ -35,6 +35,20 @@
         "TEXT": "Всі"
       }
     },
+    "VIEW_FILTER": "Вигляд",
+    "SORT_TOOLTIP_LABEL": "Sort conversations",
+    "CHAT_SORT": {
+      "STATUS": "Статус",
+      "ORDER_BY": "Order by"
+    },
+    "CHAT_SORT_FILTER_ITEMS": {
+      "latest": {
+        "TEXT": "Last activity"
+      },
+      "sort_on_created_at": {
+        "TEXT": "Створений в"
+      }
+    },
     "ATTACHMENTS": {
       "image": {
         "CONTENT": "Повідомлення з картинкою"
@@ -55,6 +69,24 @@
         "CONTENT": "поділився посиланням"
       }
     },
+    "CHAT_SORT_BY_FILTER": {
+      "TITLE": "Sort conversation",
+      "DROPDOWN_TITLE": "Сортувати за",
+      "ITEMS": {
+        "LATEST": {
+          "NAME": "Last activity at",
+          "LABEL": "Last activity"
+        },
+        "CREATED_AT": {
+          "NAME": "Створений в",
+          "LABEL": "Створений в"
+        },
+        "LAST_USER_MESSAGE_AT": {
+          "NAME": "Last user message at",
+          "LABEL": "Last message"
+        }
+      }
+    },
     "RECEIVED_VIA_EMAIL": "Отримано електронною поштою",
     "VIEW_TWEET_IN_TWITTER": "Переглянути твіт у Twitter",
     "REPLY_TO_TWEET": "Відповісти на цей твіт",
diff --git a/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json
index 75792f962..a30e5dd22 100644
--- a/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json
@@ -463,9 +463,10 @@
       "INBOX_UPDATE_SUB_TEXT": "Оновіть параметри каналу",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Увімкнення або вимкнення автоматичного призначення нових розмов до агентів, доданих до цього каналу.",
       "HMAC_VERIFICATION": "Перевірка ідентифікації користувача",
-      "HMAC_DESCRIPTION": "Щоб підтвердити ідентифікацію користувача, ви можете передати `identifier_hash` для кожного користувача. Ви можете згенерувати хеш HMAC sha256 за допомогою `identifier` з ключем, який показано тут.",
+      "HMAC_DESCRIPTION": "З цим ключем можна створити секретний токен, який можна використовувати для підтвердження особи ваших користувачів.",
+      "HMAC_LINK_TO_DOCS": "Детальніше тут...",
       "HMAC_MANDATORY_VERIFICATION": "Застосувати примусову перевірку особистості користувача",
-      "HMAC_MANDATORY_DESCRIPTION": "Якщо увімкнено, запити де не знайдено `identifier_hash`, буде відхилено.",
+      "HMAC_MANDATORY_DESCRIPTION": "Якщо увімкнено, заявки, які не можна підтвердити, будуть відхилені.",
       "INBOX_IDENTIFIER": "Ідентифікатор каналу",
       "INBOX_IDENTIFIER_SUB_TEXT": "Використовуйте токен `inbox_identifier`, показаний тут для аутентифікації ваших API клієнтів.",
       "FORWARD_EMAIL_TITLE": "Переслати на ел. пошту",
diff --git a/app/javascript/dashboard/i18n/locale/ur/chatlist.json b/app/javascript/dashboard/i18n/locale/ur/chatlist.json
index 7a201a1b0..cd1648efa 100644
--- a/app/javascript/dashboard/i18n/locale/ur/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/ur/chatlist.json
@@ -35,6 +35,20 @@
         "TEXT": "تمام"
       }
     },
+    "VIEW_FILTER": "دیکھیں",
+    "SORT_TOOLTIP_LABEL": "Sort conversations",
+    "CHAT_SORT": {
+      "STATUS": "اسٹیٹس",
+      "ORDER_BY": "Order by"
+    },
+    "CHAT_SORT_FILTER_ITEMS": {
+      "latest": {
+        "TEXT": "Last activity"
+      },
+      "sort_on_created_at": {
+        "TEXT": "Created at"
+      }
+    },
     "ATTACHMENTS": {
       "image": {
         "CONTENT": "تصویری پیغام"
@@ -55,6 +69,24 @@
         "CONTENT": "نے ایک یو آر ایل بھیجا"
       }
     },
+    "CHAT_SORT_BY_FILTER": {
+      "TITLE": "Sort conversation",
+      "DROPDOWN_TITLE": "Sort by",
+      "ITEMS": {
+        "LATEST": {
+          "NAME": "Last activity at",
+          "LABEL": "Last activity"
+        },
+        "CREATED_AT": {
+          "NAME": "Created at",
+          "LABEL": "Created at"
+        },
+        "LAST_USER_MESSAGE_AT": {
+          "NAME": "Last user message at",
+          "LABEL": "Last message"
+        }
+      }
+    },
     "RECEIVED_VIA_EMAIL": "ای میل کے ذریعے موصول ہوا۔",
     "VIEW_TWEET_IN_TWITTER": "ٹویٹر میں ٹویٹ دیکھیں",
     "REPLY_TO_TWEET": "اس ٹویٹ کا جواب دیں۔",
diff --git a/app/javascript/dashboard/i18n/locale/ur/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ur/inboxMgmt.json
index f24d7c197..bcd83b8f4 100644
--- a/app/javascript/dashboard/i18n/locale/ur/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ur/inboxMgmt.json
@@ -463,9 +463,10 @@
       "INBOX_UPDATE_SUB_TEXT": "Update your inbox settings",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Enable or disable the automatic assignment of new conversations to the agents added to this inbox.",
       "HMAC_VERIFICATION": "User Identity Validation",
-      "HMAC_DESCRIPTION": "In order to validate the user's identity, you can pass an `identifier_hash` for each user. You can generate a HMAC sha256 hash using the `identifier` with the key shown here.",
+      "HMAC_DESCRIPTION": "With this key you can generate a secret token that can be used to verify the identity of your users.",
+      "HMAC_LINK_TO_DOCS": "You can read more here.",
       "HMAC_MANDATORY_VERIFICATION": "Enforce User Identity Validation",
-      "HMAC_MANDATORY_DESCRIPTION": "If enabled, requests missing the `identifier_hash` will be rejected.",
+      "HMAC_MANDATORY_DESCRIPTION": "If enabled, requests that cannot be verified will be rejected.",
       "INBOX_IDENTIFIER": "Inbox Identifier",
       "INBOX_IDENTIFIER_SUB_TEXT": "Use the `inbox_identifier` token shown here to authentication your API clients.",
       "FORWARD_EMAIL_TITLE": "Forward to Email",
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/chatlist.json b/app/javascript/dashboard/i18n/locale/ur_IN/chatlist.json
index b96cfb976..6312d4c9f 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/chatlist.json
@@ -35,6 +35,20 @@
         "TEXT": "All"
       }
     },
+    "VIEW_FILTER": "View",
+    "SORT_TOOLTIP_LABEL": "Sort conversations",
+    "CHAT_SORT": {
+      "STATUS": "Status",
+      "ORDER_BY": "Order by"
+    },
+    "CHAT_SORT_FILTER_ITEMS": {
+      "latest": {
+        "TEXT": "Last activity"
+      },
+      "sort_on_created_at": {
+        "TEXT": "Created at"
+      }
+    },
     "ATTACHMENTS": {
       "image": {
         "CONTENT": "Picture message"
@@ -55,6 +69,24 @@
         "CONTENT": "has shared a url"
       }
     },
+    "CHAT_SORT_BY_FILTER": {
+      "TITLE": "Sort conversation",
+      "DROPDOWN_TITLE": "Sort by",
+      "ITEMS": {
+        "LATEST": {
+          "NAME": "Last activity at",
+          "LABEL": "Last activity"
+        },
+        "CREATED_AT": {
+          "NAME": "Created at",
+          "LABEL": "Created at"
+        },
+        "LAST_USER_MESSAGE_AT": {
+          "NAME": "Last user message at",
+          "LABEL": "Last message"
+        }
+      }
+    },
     "RECEIVED_VIA_EMAIL": "Received via email",
     "VIEW_TWEET_IN_TWITTER": "View tweet in Twitter",
     "REPLY_TO_TWEET": "Reply to this tweet",
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ur_IN/inboxMgmt.json
index 407441618..528d8d8ff 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/inboxMgmt.json
@@ -463,9 +463,10 @@
       "INBOX_UPDATE_SUB_TEXT": "Update your inbox settings",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Enable or disable the automatic assignment of new conversations to the agents added to this inbox.",
       "HMAC_VERIFICATION": "User Identity Validation",
-      "HMAC_DESCRIPTION": "In order to validate the user's identity, you can pass an `identifier_hash` for each user. You can generate a HMAC sha256 hash using the `identifier` with the key shown here.",
+      "HMAC_DESCRIPTION": "With this key you can generate a secret token that can be used to verify the identity of your users.",
+      "HMAC_LINK_TO_DOCS": "You can read more here.",
       "HMAC_MANDATORY_VERIFICATION": "Enforce User Identity Validation",
-      "HMAC_MANDATORY_DESCRIPTION": "If enabled, requests missing the `identifier_hash` will be rejected.",
+      "HMAC_MANDATORY_DESCRIPTION": "If enabled, requests that cannot be verified will be rejected.",
       "INBOX_IDENTIFIER": "Inbox Identifier",
       "INBOX_IDENTIFIER_SUB_TEXT": "Use the `inbox_identifier` token shown here to authentication your API clients.",
       "FORWARD_EMAIL_TITLE": "Forward to Email",
diff --git a/app/javascript/dashboard/i18n/locale/vi/chatlist.json b/app/javascript/dashboard/i18n/locale/vi/chatlist.json
index d5f42187a..cbcbb8af9 100644
--- a/app/javascript/dashboard/i18n/locale/vi/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/vi/chatlist.json
@@ -35,6 +35,20 @@
         "TEXT": "Tất cả"
       }
     },
+    "VIEW_FILTER": "Xem",
+    "SORT_TOOLTIP_LABEL": "Sort conversations",
+    "CHAT_SORT": {
+      "STATUS": "Trạng thái",
+      "ORDER_BY": "Order by"
+    },
+    "CHAT_SORT_FILTER_ITEMS": {
+      "latest": {
+        "TEXT": "Last activity"
+      },
+      "sort_on_created_at": {
+        "TEXT": "Tạo vào lúc"
+      }
+    },
     "ATTACHMENTS": {
       "image": {
         "CONTENT": "Tin nhắn hình ảnh"
@@ -55,6 +69,24 @@
         "CONTENT": "có một đường dẫn chia sẻ"
       }
     },
+    "CHAT_SORT_BY_FILTER": {
+      "TITLE": "Sort conversation",
+      "DROPDOWN_TITLE": "Sắp bởi",
+      "ITEMS": {
+        "LATEST": {
+          "NAME": "Last activity at",
+          "LABEL": "Last activity"
+        },
+        "CREATED_AT": {
+          "NAME": "Tạo vào lúc",
+          "LABEL": "Tạo vào lúc"
+        },
+        "LAST_USER_MESSAGE_AT": {
+          "NAME": "Last user message at",
+          "LABEL": "Last message"
+        }
+      }
+    },
     "RECEIVED_VIA_EMAIL": "Nhận được từ email",
     "VIEW_TWEET_IN_TWITTER": "Xem tweet trên Twitter",
     "REPLY_TO_TWEET": "Trả lời cho tweet này",
diff --git a/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json
index e63ebdcea..993f90bf9 100644
--- a/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json
@@ -463,9 +463,10 @@
       "INBOX_UPDATE_SUB_TEXT": "Cập nhật cài đặt hộp thư đến của bạn",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Bật hoặc tắt tính năng tự động gán các cuộc hội thoại mới cho các tác nhân được thêm vào hộp thư đến này.",
       "HMAC_VERIFICATION": "Xác thực danh tính người dùng",
-      "HMAC_DESCRIPTION": "Để xác thực danh tính của người dùng, bạn có thể chuyển một `mã định danh_hash` cho mỗi người dùng. Bạn có thể tạo mã băm HMAC sha256 bằng cách sử dụng `mã định danh' với khóa được hiển thị ở đây.",
+      "HMAC_DESCRIPTION": "With this key you can generate a secret token that can be used to verify the identity of your users.",
+      "HMAC_LINK_TO_DOCS": "You can read more here.",
       "HMAC_MANDATORY_VERIFICATION": "Bắt buộc Xác thực danh tính người dùng",
-      "HMAC_MANDATORY_DESCRIPTION": "Nếu được bật, các yêu cầu thiếu `ID_hash` sẽ bị từ chối.",
+      "HMAC_MANDATORY_DESCRIPTION": "If enabled, requests that cannot be verified will be rejected.",
       "INBOX_IDENTIFIER": "Định danh hộp thư đến",
       "INBOX_IDENTIFIER_SUB_TEXT": "Dùng token định danh hộp thư đến hiện ở đây để xác thực các ứng dụng khách API của bạn.",
       "FORWARD_EMAIL_TITLE": "Chuyển tiếp đến Email",
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/chatlist.json b/app/javascript/dashboard/i18n/locale/zh_CN/chatlist.json
index b0bd71953..2eb415f40 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/chatlist.json
@@ -35,6 +35,20 @@
         "TEXT": "所有的"
       }
     },
+    "VIEW_FILTER": "查看",
+    "SORT_TOOLTIP_LABEL": "Sort conversations",
+    "CHAT_SORT": {
+      "STATUS": "状态",
+      "ORDER_BY": "Order by"
+    },
+    "CHAT_SORT_FILTER_ITEMS": {
+      "latest": {
+        "TEXT": "Last activity"
+      },
+      "sort_on_created_at": {
+        "TEXT": "Created at"
+      }
+    },
     "ATTACHMENTS": {
       "image": {
         "CONTENT": "图片消息"
@@ -55,6 +69,24 @@
         "CONTENT": "分享了一个网址"
       }
     },
+    "CHAT_SORT_BY_FILTER": {
+      "TITLE": "Sort conversation",
+      "DROPDOWN_TITLE": "排序方式",
+      "ITEMS": {
+        "LATEST": {
+          "NAME": "Last activity at",
+          "LABEL": "Last activity"
+        },
+        "CREATED_AT": {
+          "NAME": "Created at",
+          "LABEL": "Created at"
+        },
+        "LAST_USER_MESSAGE_AT": {
+          "NAME": "Last user message at",
+          "LABEL": "Last message"
+        }
+      }
+    },
     "RECEIVED_VIA_EMAIL": "通过电子邮件接收",
     "VIEW_TWEET_IN_TWITTER": "在 Twitter 中查看 tweet",
     "REPLY_TO_TWEET": "回复此推文",
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json
index 99bfeb01d..f1aa77d7d 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json
@@ -463,9 +463,10 @@
       "INBOX_UPDATE_SUB_TEXT": "更新收件箱设置",
       "AUTO_ASSIGNMENT_SUB_TEXT": "启用或禁用添加到此收件箱的代理人自动分配新的会话。",
       "HMAC_VERIFICATION": "User Identity Validation",
-      "HMAC_DESCRIPTION": "In order to validate the user's identity, you can pass an `identifier_hash` for each user. You can generate a HMAC sha256 hash using the `identifier` with the key shown here.",
+      "HMAC_DESCRIPTION": "With this key you can generate a secret token that can be used to verify the identity of your users.",
+      "HMAC_LINK_TO_DOCS": "You can read more here.",
       "HMAC_MANDATORY_VERIFICATION": "Enforce User Identity Validation",
-      "HMAC_MANDATORY_DESCRIPTION": "If enabled, requests missing the `identifier_hash` will be rejected.",
+      "HMAC_MANDATORY_DESCRIPTION": "If enabled, requests that cannot be verified will be rejected.",
       "INBOX_IDENTIFIER": "Inbox Identifier",
       "INBOX_IDENTIFIER_SUB_TEXT": "Use the `inbox_identifier` token shown here to authentication your API clients.",
       "FORWARD_EMAIL_TITLE": "Forward to Email",
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/chatlist.json b/app/javascript/dashboard/i18n/locale/zh_TW/chatlist.json
index 111dacb12..4de890681 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/chatlist.json
@@ -35,6 +35,20 @@
         "TEXT": "所有的"
       }
     },
+    "VIEW_FILTER": "查看",
+    "SORT_TOOLTIP_LABEL": "Sort conversations",
+    "CHAT_SORT": {
+      "STATUS": "狀態",
+      "ORDER_BY": "Order by"
+    },
+    "CHAT_SORT_FILTER_ITEMS": {
+      "latest": {
+        "TEXT": "Last activity"
+      },
+      "sort_on_created_at": {
+        "TEXT": "建立於"
+      }
+    },
     "ATTACHMENTS": {
       "image": {
         "CONTENT": "圖片訊息"
@@ -55,6 +69,24 @@
         "CONTENT": "分享了一個網址"
       }
     },
+    "CHAT_SORT_BY_FILTER": {
+      "TITLE": "Sort conversation",
+      "DROPDOWN_TITLE": "Sort by",
+      "ITEMS": {
+        "LATEST": {
+          "NAME": "Last activity at",
+          "LABEL": "Last activity"
+        },
+        "CREATED_AT": {
+          "NAME": "建立於",
+          "LABEL": "建立於"
+        },
+        "LAST_USER_MESSAGE_AT": {
+          "NAME": "Last user message at",
+          "LABEL": "Last message"
+        }
+      }
+    },
     "RECEIVED_VIA_EMAIL": "使用電子郵件接收",
     "VIEW_TWEET_IN_TWITTER": "View tweet in Twitter",
     "REPLY_TO_TWEET": "Reply to this tweet",
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json
index 0735e5584..b3c0c6bfb 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json
@@ -463,9 +463,10 @@
       "INBOX_UPDATE_SUB_TEXT": "更新收件匣設定",
       "AUTO_ASSIGNMENT_SUB_TEXT": "啟用或停用此收件匣客服的對話自動分配。",
       "HMAC_VERIFICATION": "使用者身份驗證",
-      "HMAC_DESCRIPTION": "In order to validate the user's identity, you can pass an `identifier_hash` for each user. You can generate a HMAC sha256 hash using the `identifier` with the key shown here.",
+      "HMAC_DESCRIPTION": "With this key you can generate a secret token that can be used to verify the identity of your users.",
+      "HMAC_LINK_TO_DOCS": "You can read more here.",
       "HMAC_MANDATORY_VERIFICATION": "Enforce User Identity Validation",
-      "HMAC_MANDATORY_DESCRIPTION": "If enabled, requests missing the `identifier_hash` will be rejected.",
+      "HMAC_MANDATORY_DESCRIPTION": "If enabled, requests that cannot be verified will be rejected.",
       "INBOX_IDENTIFIER": "Inbox Identifier",
       "INBOX_IDENTIFIER_SUB_TEXT": "Use the `inbox_identifier` token shown here to authentication your API clients.",
       "FORWARD_EMAIL_TITLE": "Forward to Email",
diff --git a/app/javascript/survey/i18n/locale/lt.json b/app/javascript/survey/i18n/locale/lt.json
index 2473f114e..df5c902f4 100644
--- a/app/javascript/survey/i18n/locale/lt.json
+++ b/app/javascript/survey/i18n/locale/lt.json
@@ -12,8 +12,8 @@
     },
     "API": {
       "SUCCESS_MESSAGE": "Survey updated successfully",
-      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      "ERROR_MESSAGE": "Nepavyko prisijungti prie Woot serverio, bandykite dar kartą vėliau"
     }
   },
-  "POWERED_BY": "Powered by Chatwoot"
+  "POWERED_BY": "Parengta pagal Chatwoot"
 }
diff --git a/app/javascript/widget/i18n/locale/fr.json b/app/javascript/widget/i18n/locale/fr.json
index 1ad8e6c50..cb45de7ec 100644
--- a/app/javascript/widget/i18n/locale/fr.json
+++ b/app/javascript/widget/i18n/locale/fr.json
@@ -66,7 +66,7 @@
     },
     "CAMPAIGN_HEADER": "Veuillez fournir votre nom et votre courriel avant de commencer la conversation",
     "IS_REQUIRED": "est requis",
-    "REQUIRED": "Required"
+    "REQUIRED": "Nécessaire"
   },
   "FILE_SIZE_LIMIT": "Le fichier dépasse la limite de {MAXIMUM_FILE_UPLOAD_SIZE} pour les pièces jointes",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/lt.json b/app/javascript/widget/i18n/locale/lt.json
index f5201ae61..710a38d32 100644
--- a/app/javascript/widget/i18n/locale/lt.json
+++ b/app/javascript/widget/i18n/locale/lt.json
@@ -21,10 +21,10 @@
     "IN_A_FEW_HOURS": "Typically replies in a few hours",
     "IN_A_DAY": "Typically replies in a day"
   },
-  "START_CONVERSATION": "Start Conversation",
-  "END_CONVERSATION": "End Conversation",
-  "CONTINUE_CONVERSATION": "Continue conversation",
-  "START_NEW_CONVERSATION": "Start a new conversation",
+  "START_CONVERSATION": "Pradėti Pokalbį",
+  "END_CONVERSATION": "Užbaigti Pokalbį",
+  "CONTINUE_CONVERSATION": "Tęsti pokalbį",
+  "START_NEW_CONVERSATION": "Pradėti naują pokalbį",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "See new messages",
     "CLOSE_MESSAGES_BUTTON": "Uždaryti",
@@ -34,11 +34,11 @@
   "BUBBLE": {
     "LABEL": "Chat with us"
   },
-  "POWERED_BY": "Powered by Chatwoot",
-  "EMAIL_PLACEHOLDER": "Please enter your email",
+  "POWERED_BY": "Parengta pagal Chatwoot",
+  "EMAIL_PLACEHOLDER": "Prašau įveskite jūsų el. paštą",
   "CHAT_PLACEHOLDER": "Type your message",
   "TODAY": "Šiandien",
-  "YESTERDAY": "Yesterday",
+  "YESTERDAY": "Vakar",
   "PRE_CHAT_FORM": {
     "FIELDS": {
       "FULL_NAME": {
@@ -49,19 +49,19 @@
       "EMAIL_ADDRESS": {
         "LABEL": "El. pašto adresas",
         "PLACEHOLDER": "Prašau įveskite jūsų el. pašto adresą",
-        "REQUIRED_ERROR": "Email Address is required",
+        "REQUIRED_ERROR": "El. pašto Adresas yra reikalingas",
         "VALID_ERROR": "Please enter a valid email address"
       },
       "PHONE_NUMBER": {
-        "LABEL": "Phone Number",
+        "LABEL": "Telefono numeris",
         "PLACEHOLDER": "Prašau įveskite jūsų telefono numerį",
-        "REQUIRED_ERROR": "Phone Number is required",
+        "REQUIRED_ERROR": "Telefono Numeris yra reikalingas",
         "VALID_ERROR": "Phone number should be of E.164 format eg: +1415555555"
       },
       "MESSAGE": {
         "LABEL": "Žinutė",
-        "PLACEHOLDER": "Please enter your message",
-        "ERROR": "Message too short"
+        "PLACEHOLDER": "Prašau įveskite jūsų pranešimą",
+        "ERROR": "Pranešimas pertrumpas"
       }
     },
     "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation",
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 7191208f0..37a918241 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -21,7 +21,7 @@ fr:
   messages:
     reset_password_success: Super ! La demande de réinitialisation du mot de passe a réussi. Consultez vos e-mails pour obtenir des instructions.
     reset_password_failure: Oh oh ! Nous n'avons trouvé aucun utilisateur avec le courriel spécifié.
-    inbox_deletetion_response: Your inbox deletion request will be processed in some time.
+    inbox_deletetion_response: Votre demande de suppression de la boîte de réception sera traitée dans un certain délai.
   errors:
     validations:
       presence: Ne peut être vide
@@ -58,7 +58,7 @@ fr:
         name: 'ne doit pas commencer ou se terminer par des symboles, et ne doit pas comporter les caractères suivants : "< > / \ @".'
   reports:
     period: Période de rapport %{since} à %{until}
-    utc_warning: The report generated is in UTC timezone
+    utc_warning: Le rapport généré est dans le fuseau horaire UTC
     agent_csv:
       agent_name: Nom de l'agent
       conversations_count: Nombre de conversations
@@ -81,7 +81,7 @@ fr:
       avg_first_response_time: Temps de réponse moyen (Minutes)
       avg_resolution_time: Temps moyen de résolution (Minutes)
     conversation_traffic_csv:
-      timezone: Timezone
+      timezone: Fuseau horaire
     default_group_by: jour
     csat:
       headers:
@@ -112,11 +112,11 @@ fr:
         pending: "La conversation a été marquée comme en attente par %{user_name}"
         snoozed: "La conversation a été reportée par %{user_name}"
         auto_resolved: "La conversation a été marquée comme résolue par le système en raison de %{duration} jours d'inactivité"
-        system_auto_open: System reopened the conversation due to a new incoming message.
+        system_auto_open: Le système a rouvert la conversation en raison d'un nouveau message entrant.
       priority:
-        added: '%{user_name} set the priority to %{new_priority}'
-        updated: '%{user_name} changed the priority from %{old_priority} to %{new_priority}'
-        removed: '%{user_name} removed the priority'
+        added: '%{user_name} fixe la priorité à %{new_priority}'
+        updated: '%{user_name} a modifié la priorité de %{old_priority} à %{new_priority}'
+        removed: '%{user_name} a supprimé la priorité'
       assignee:
         self_assigned: "%{user_name} s'est auto-assigné cette conversation"
         assigned: "Assigné à %{assignee_name} par %{user_name}"
@@ -170,10 +170,10 @@ fr:
       description: "L'intégration FullContact permet d'enrichir les profils de visiteurs. Identifiez les utilisateurs dès qu'ils partagent leur adresse de courriel et offrez-leur un service client sur mesure. Connectez FullContact à votre compte en partageant la clé API FullContact."
     google_translate:
       name: "Google Translate"
-      description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
+      description: "Facilitez la traduction des messages par les agents en ajoutant une intégration de Google Translate. Google Translate permet d'identifier automatiquement la langue et de la convertir dans la langue choisie par l'agent/administrateur du compte."
     openai:
       name: "OpenAI"
-      description: "Integrate powerful AI features into Chatwoot by leveraging the GPT models from OpenAI."
+      description: "Intégrez de puissantes fonctions d'IA dans Chatwoot en exploitant les modèles GPT d'OpenAI."
   public_portal:
     search:
       search_placeholder: Rechercher un article par titre ou contenu...
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 7aab7961c..9e1b321b3 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -34,7 +34,7 @@ lt:
       failed: Prisijungimas nesėkmingas
     data_import:
       data_type:
-        invalid: Invalid data type
+        invalid: Neteisingas duomenų tipas
     contacts:
       import:
         failed: Failas yra tuščias
@@ -53,7 +53,7 @@ lt:
         no_response_error: Please check the IMAP credentials and try again.
         host_unreachable_error: Host unreachable, Please check the IMAP address, IMAP port and try again.
         connection_timed_out_error: Connection timed out for %{address}:%{port}
-        connection_closed_error: Connection closed.
+        connection_closed_error: Sujungimas uždarytas.
       validations:
         name: should not start or end with symbols, and it should not have < > / \ @ characters.
   reports:
@@ -71,12 +71,12 @@ lt:
       avg_first_response_time: Avg first response time (Minutes)
       avg_resolution_time: Avg resolution time (Minutes)
     label_csv:
-      label_title: Label
+      label_title: Etiketė
       conversations_count: No. of conversations
       avg_first_response_time: Avg first response time (Minutes)
       avg_resolution_time: Avg resolution time (Minutes)
     team_csv:
-      team_name: Team name
+      team_name: Komandos pavadinimas
       conversations_count: Conversations count
       avg_first_response_time: Avg first response time (Minutes)
       avg_resolution_time: Avg resolution time (Minutes)
@@ -85,8 +85,8 @@ lt:
     default_group_by: diena
     csat:
       headers:
-        contact_name: Contact Name
-        contact_email_address: Contact Email Address
+        contact_name: Kontakto Vardas
+        contact_email_address: Kontakto El. pašto Adresas
         contact_phone_number: Contact Phone Number
         link_to_the_conversation: Link to the conversation
         agent_name: Agento Vardas
@@ -106,13 +106,13 @@ lt:
       deleted: This message was deleted
     activity:
       status:
-        resolved: "Conversation was marked resolved by %{user_name}"
-        contact_resolved: "Conversation was resolved by %{contact_name}"
-        open: "Conversation was reopened by %{user_name}"
-        pending: "Conversation was marked as pending by %{user_name}"
-        snoozed: "Conversation was snoozed by %{user_name}"
-        auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
-        system_auto_open: System reopened the conversation due to a new incoming message.
+        resolved: "Pokalbį pažymėjo %{user_name} kaip baigtą"
+        contact_resolved: "Pokalbį užbaigė %{contact_name}"
+        open: "Pokalbį iš naujo pradėjo %{user_name}"
+        pending: "Pokalbį pažymėjo %{user_name} kaip laukiantį"
+        snoozed: "Pokalbį atidėjo %{user_name}"
+        auto_resolved: "Sistema pokalbį pažymėjo kaip baigtą dėl %{duration} neaktyvumo dienų"
+        system_auto_open: Sistema vėl atidarė pokalbį dėl naujo gaunamo pranešimo.
       priority:
         added: '%{user_name} set the priority to %{new_priority}'
         updated: '%{user_name} changed the priority from %{old_priority} to %{new_priority}'
@@ -126,8 +126,8 @@ lt:
         assigned_with_assignee: "Assigned to %{assignee_name} via %{team_name} by %{user_name}"
         removed: "Unassigned from %{team_name} by %{user_name}"
       labels:
-        added: "%{user_name} added %{labels}"
-        removed: "%{user_name} removed %{labels}"
+        added: "%{user_name} pridėjo %{labels}"
+        removed: "%{user_name} pašalino %{labels}"
       muted: "%{user_name} has muted the conversation"
       unmuted: "%{user_name} has unmuted the conversation"
     templates:
@@ -177,17 +177,17 @@ lt:
   public_portal:
     search:
       search_placeholder: Search for article by title or body...
-      empty_placeholder: No results found.
-      loading_placeholder: Searching...
-      results_title: Search results
+      empty_placeholder: Nieko nerasta.
+      loading_placeholder: Ieškoma...
+      results_title: Paieškos rezultatai
     hero:
       sub_title: Search for the articles here or browse the categories below.
     common:
       home: Home
       last_updated_on: Last updated on %{last_updated_on}
       view_all_articles: View all articles
-      article: article
-      articles: articles
+      article: straipsnis
+      articles: straipsniai
       no_articles: There are no articles here
     footer:
       made_with: Made with
diff --git a/config/locales/pt_BR.yml b/config/locales/pt_BR.yml
index c78234cbf..595ab798e 100644
--- a/config/locales/pt_BR.yml
+++ b/config/locales/pt_BR.yml
@@ -49,7 +49,7 @@ pt_BR:
       invalid_message_type: "Tipo de mensagem inválido. Ação não permitida"
     inboxes:
       imap:
-        socket_error: Por favor, verifique a conexão de rede, endereço de IMAP e tente novamente.
+        socket_error: Por favor, verifique a conexão de rede, endereço IMAP e tente novamente.
         no_response_error: Por favor, verifique as credenciais de IMAP e tente novamente.
         host_unreachable_error: Servidor inacessível, por favor, verifique o endereço e a porta de IMAP e tente novamente.
         connection_timed_out_error: Tempo esgotado de conexão para %{address}:%{port}
@@ -114,9 +114,9 @@ pt_BR:
         auto_resolved: "Conversa foi marcada como resolvida pelo sistema por ter %{duration} dias de inatividade"
         system_auto_open: O sistema reabriu a conversa devido a uma nova mensagem recebida.
       priority:
-        added: '%{user_name} set the priority to %{new_priority}'
-        updated: '%{user_name} changed the priority from %{old_priority} to %{new_priority}'
-        removed: '%{user_name} removed the priority'
+        added: '%{user_name} definiu a prioridade para %{new_priority}'
+        updated: '%{user_name} mudou a prioridade de %{old_priority} para %{new_priority}'
+        removed: '%{user_name} removeu a prioridade'
       assignee:
         self_assigned: "%{user_name} atribuiu a si mesmo essa conversa"
         assigned: "Atribuído a %{assignee_name} por %{user_name}"
@@ -169,11 +169,11 @@ pt_BR:
       name: "Contato completo"
       description: "A integração de contatos completos ajuda a enriquecer perfis de visitantes. Identifique os usuários assim que eles compartilham seu endereço de e-mail e ofereça um atendimento ao cliente personalizado. Conecte seu FullContact à sua conta compartilhando a chave de API de Contato Fullcot."
     google_translate:
-      name: "Tradutor do Google"
+      name: "Google Tradutor"
       description: "Torne isso mais fácil para agentes traduzirem mensagens adicionando uma integração com o Tradutor do Google. O Tradutor do Google ajuda a identificar automaticamente o idioma e convertê-lo para o idioma escolhido pelo administrador de conta/agente."
     openai:
       name: "OpenAI"
-      description: "Integrate powerful AI features into Chatwoot by leveraging the GPT models from OpenAI."
+      description: "Integre os poderosos recursos de IA ao Chatwoot aproveitando os modelos GPT da OpenAI."
   public_portal:
     search:
       search_placeholder: Pesquisar por artigo por título ou corpo...
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index c12155406..50e8bbfbb 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -21,7 +21,7 @@ ru:
   messages:
     reset_password_success: Круто! Запрос на сброс пароля удался. Проверьте почту для получения инструкций.
     reset_password_failure: Ой! Мы не смогли найти пользователя с указанным email.
-    inbox_deletetion_response: Your inbox deletion request will be processed in some time.
+    inbox_deletetion_response: Ваш запрос на удаление входящих сообщений будет обработан через некоторое время.
   errors:
     validations:
       presence: Не должен быть пустым
@@ -46,7 +46,7 @@ ru:
       locale:
         unique: Должны быть уникальными в категории и портале
     dyte:
-      invalid_message_type: "Invalid message type. Action not permitted"
+      invalid_message_type: "Недопустимый тип сообщения. Действие запрещено"
     inboxes:
       imap:
         socket_error: Пожалуйста, проверьте сетевое подключение, адрес IMAP и повторите попытку.
@@ -112,11 +112,11 @@ ru:
         pending: "Разговор был помечен как ожидающий %{user_name}"
         snoozed: "Разговор был помечен как отложенный %{user_name}"
         auto_resolved: "Разговор был помечен системой решённым из-за неактивности в течение %{duration} дней"
-        system_auto_open: System reopened the conversation due to a new incoming message.
+        system_auto_open: Система переоткрыла разговор из-за нового входящего сообщения.
       priority:
-        added: '%{user_name} set the priority to %{new_priority}'
-        updated: '%{user_name} changed the priority from %{old_priority} to %{new_priority}'
-        removed: '%{user_name} removed the priority'
+        added: '%{user_name} установил приоритет на %{new_priority}'
+        updated: '%{user_name} изменил приоритет с %{old_priority} на %{new_priority}'
+        removed: '%{user_name} удалил приоритет'
       assignee:
         self_assigned: "%{user_name} назначил(а) разговор себе"
         assigned: "%{user_name} назначил %{assignee_name} ответственным"
@@ -154,8 +154,8 @@ ru:
   integration_apps:
     dyte:
       name: "Dyte"
-      description: "Dyte is tool that helps you to add live audio & video to your application with just a few lines of code. This integration allows you to give an option to your agents to have a video or voice call with your customers from without leaving Chatwoot."
-      meeting_name: "%{agent_name} has started a meeting"
+      description: "Dyte это инструмент, который поможет вам добавить живое аудио и видео в ваше приложение всего несколько строк кода. Эта интеграция позволяет вашим агентам совершать видеосвязь или голосовой звонок со своими клиентами не выходя из Чатвута."
+      meeting_name: "%{agent_name} приступил к встрече"
     slack:
       name: "Slack"
       description: "Slack это сервис, который позволяет объединить рабочие коммуникации в одном месте. При интеграции с Slack вы будете получать уведомления обо всех новых разговорах прямо в Slack."
@@ -170,10 +170,10 @@ ru:
       description: "Интеграция с FullContact помогает получить всю информацию о профиле посетителей. Определяйте пользователей как только они поделится своим электронным адресом и предложите им индивидуальное обслуживание клиентов. Подключите ваш FullContact к своей учетной записи, поделившись API ключом FullContact."
     google_translate:
       name: "Google Перевод"
-      description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin."
+      description: "Чтобы агентам было легче переводить сообщения, добавляя интеграцию с переводом Google Translate Integration. Перевод Google помогает идентифицировать язык автоматически и конвертировать его на язык, выбранный администратором/сотрудником."
     openai:
       name: "OpenAI"
-      description: "Integrate powerful AI features into Chatwoot by leveraging the GPT models from OpenAI."
+      description: "Интеграция мощных функций AI в Chatwoot путем использования моделей GPT из OpenAI."
   public_portal:
     search:
       search_placeholder: Поиск статьи по названию или содержанию...

From 51fb3b7e8e24cb8d0d52d2f757cc8ba5e6cdc0ad Mon Sep 17 00:00:00 2001
From: Vishnu Narayanan <vishnu@chatwoot.com>
Date: Mon, 8 May 2023 13:43:55 +0530
Subject: [PATCH 063/101] fix: enable lograge in superadmin path (#7026)

* fix: lograge superadmin path
* chore: add spec for superadmin devise session controller
* chore: address review comment
---
 Gemfile.lock                                         |  1 +
 config/initializers/lograge.rb                       |  5 +++--
 .../super_admin/devise/sessions_controller_spec.rb   | 12 ++++++++++++
 3 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 spec/controllers/super_admin/devise/sessions_controller_spec.rb

diff --git a/Gemfile.lock b/Gemfile.lock
index 10b99ea5b..595477803 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -770,6 +770,7 @@ GEM
 
 PLATFORMS
   arm64-darwin-20
+  arm64-darwin-21
   x86_64-darwin-18
   x86_64-darwin-20
   x86_64-darwin-21
diff --git a/config/initializers/lograge.rb b/config/initializers/lograge.rb
index 98e77622e..6d9ad831c 100644
--- a/config/initializers/lograge.rb
+++ b/config/initializers/lograge.rb
@@ -4,12 +4,13 @@ if ActiveModel::Type::Boolean.new.cast(ENV.fetch('LOGRAGE_ENABLED', false)).pres
   Rails.application.configure do
     config.lograge.enabled = true
     config.lograge.formatter = Lograge::Formatters::Json.new
-
     config.lograge.custom_payload do |controller|
+      # Fixes https://github.com/chatwoot/chatwoot/issues/6922
+      user_id = controller.try(:current_user).try(:id) unless controller.is_a?(SuperAdmin::Devise::SessionsController)
       {
         host: controller.request.host,
         remote_ip: controller.request.remote_ip,
-        user_id: controller.current_user.try(:id)
+        user_id: user_id
       }
     end
 
diff --git a/spec/controllers/super_admin/devise/sessions_controller_spec.rb b/spec/controllers/super_admin/devise/sessions_controller_spec.rb
new file mode 100644
index 000000000..7b2c79faa
--- /dev/null
+++ b/spec/controllers/super_admin/devise/sessions_controller_spec.rb
@@ -0,0 +1,12 @@
+require 'rails_helper'
+
+RSpec.describe 'Super Admin', type: :request do
+  describe '/super_admin' do
+    it 'renders the login page' do
+      with_modified_env LOGRAGE_ENABLED: 'true' do
+        get '/super_admin/sign_in'
+        expect(response).to have_http_status(:ok)
+      end
+    end
+  end
+end

From 683f2597716323ee789ee4d633a1a0ede2382c34 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Mon, 8 May 2023 12:23:26 -0700
Subject: [PATCH 064/101] fix: Fix rendering issues in Help Center (#7042)

---
 Gemfile.lock                                     | 8 ++++++++
 app/views/public/api/v1/portals/_header.html.erb | 2 +-
 app/views/public/api/v1/portals/show.html.erb    | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 595477803..d980d4a40 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -303,6 +303,7 @@ GEM
     google-cloud-translate-v3 (0.6.0)
       gapic-common (>= 0.17.1, < 2.a)
       google-cloud-errors (~> 1.0)
+    google-protobuf (3.22.3)
     google-protobuf (3.22.3-arm64-darwin)
     google-protobuf (3.22.3-x86_64-darwin)
     google-protobuf (3.22.3-x86_64-linux)
@@ -398,6 +399,8 @@ GEM
       launchy (>= 2.2, < 3)
     libdatadog (2.0.0.1.0)
     libdatadog (2.0.0.1.0-x86_64-linux)
+    libddwaf (1.8.2.0.0)
+      ffi (~> 1.0)
     libddwaf (1.8.2.0.0-arm64-darwin)
       ffi (~> 1.0)
     libddwaf (1.8.2.0.0-x86_64-darwin)
@@ -434,6 +437,7 @@ GEM
     mime-types-data (3.2023.0218.1)
     mini_magick (4.12.0)
     mini_mime (1.1.2)
+    mini_portile2 (2.8.2)
     minitest (5.18.0)
     mock_redis (0.36.0)
       ruby2_keywords
@@ -458,6 +462,9 @@ GEM
       sidekiq
     newrelic_rpm (8.16.0)
     nio4r (2.5.9)
+    nokogiri (1.14.3)
+      mini_portile2 (~> 2.8.0)
+      racc (~> 1.4)
     nokogiri (1.14.3-arm64-darwin)
       racc (~> 1.4)
     nokogiri (1.14.3-x86_64-darwin)
@@ -771,6 +778,7 @@ GEM
 PLATFORMS
   arm64-darwin-20
   arm64-darwin-21
+  ruby
   x86_64-darwin-18
   x86_64-darwin-20
   x86_64-darwin-21
diff --git a/app/views/public/api/v1/portals/_header.html.erb b/app/views/public/api/v1/portals/_header.html.erb
index 539aa8e64..a532b9430 100644
--- a/app/views/public/api/v1/portals/_header.html.erb
+++ b/app/views/public/api/v1/portals/_header.html.erb
@@ -2,7 +2,7 @@
 <header class="bg-white mx-auto px-4 max-w-5xl w-full">
   <nav class="px-0 flex" aria-label="Top">
     <div class="w-full py-8 flex items-center">
-      <a href="/hc/<%= @portal.slug %>/<%= params[:locale] %>/" class="text-base font-semibold">
+      <a href="/hc/<%= @portal.slug %>/<%= @portal.config['default_locale'] || params[:locale] %>/" class="text-base font-semibold">
         <%= @portal.name %>
       </a>
       <% if @portal.homepage_link %>
diff --git a/app/views/public/api/v1/portals/show.html.erb b/app/views/public/api/v1/portals/show.html.erb
index a5f9f43fa..9c151333d 100644
--- a/app/views/public/api/v1/portals/show.html.erb
+++ b/app/views/public/api/v1/portals/show.html.erb
@@ -7,7 +7,7 @@
   </div>
 
   <div class="grid grid-cols-1 lg:grid-cols-2 gap-x-32 gap-y-0 lg:gap-y-12">
-    <% if @portal.articles.where(status: :published, category_id: nil).order(position: :asc) %>
+    <% if @portal.articles.where(status: :published, category_id: nil).count > 0 %>
       <%= render "public/api/v1/portals/uncategorized-block", category: "Uncategorized", portal: @portal %>
     <% end %>
   </div>

From 2b88ecdfc49ef5c7c05bb0540f31673aebb7187d Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 9 May 2023 01:14:15 +0530
Subject: [PATCH 065/101] feat: Add a feature flag for Audit Log UI (#7035)

Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
---
 .../layout/config/sidebarItems/settings.js          |  1 +
 app/javascript/dashboard/featureFlags.js            |  1 +
 config/features.yml                                 |  2 ++
 .../api/v1/accounts/audit_logs_controller.rb        | 10 +++++++++-
 .../api/v1/accounts/audit_logs_controller_spec.rb   | 13 +++++++++++++
 5 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/app/javascript/dashboard/components/layout/config/sidebarItems/settings.js b/app/javascript/dashboard/components/layout/config/sidebarItems/settings.js
index 94997ac4b..c0d80932d 100644
--- a/app/javascript/dashboard/components/layout/config/sidebarItems/settings.js
+++ b/app/javascript/dashboard/components/layout/config/sidebarItems/settings.js
@@ -157,6 +157,7 @@ const settings = accountId => ({
       hasSubMenu: false,
       toState: frontendURL(`accounts/${accountId}/settings/audit-log/list`),
       toStateName: 'auditlogs_list',
+      featureFlag: FEATURE_FLAGS.AUDIT_LOGS,
       beta: true,
     },
   ],
diff --git a/app/javascript/dashboard/featureFlags.js b/app/javascript/dashboard/featureFlags.js
index 2358a2731..5f3a9ccbd 100644
--- a/app/javascript/dashboard/featureFlags.js
+++ b/app/javascript/dashboard/featureFlags.js
@@ -15,4 +15,5 @@ export const FEATURE_FLAGS = {
   REPORTS: 'reports',
   TEAM_MANAGEMENT: 'team_management',
   VOICE_RECORDER: 'voice_recorder',
+  AUDIT_LOGS: 'audit_logs',
 };
diff --git a/config/features.yml b/config/features.yml
index adecba7b5..6132bda68 100644
--- a/config/features.yml
+++ b/config/features.yml
@@ -53,3 +53,5 @@
   enabled: false
 - name: custom_reply_domain
   enabled: false
+- name: audit_logs
+  enabled: false
diff --git a/enterprise/app/controllers/api/v1/accounts/audit_logs_controller.rb b/enterprise/app/controllers/api/v1/accounts/audit_logs_controller.rb
index 26a0d2c6e..d1e6b9287 100644
--- a/enterprise/app/controllers/api/v1/accounts/audit_logs_controller.rb
+++ b/enterprise/app/controllers/api/v1/accounts/audit_logs_controller.rb
@@ -21,6 +21,14 @@ class Api::V1::Accounts::AuditLogsController < Api::V1::Accounts::BaseController
   private
 
   def fetch_audit
-    @audit_logs = Current.account.associated_audits.order(created_at: :desc)
+    @audit_logs = if audit_logs_enabled?
+                    Current.account.associated_audits.order(created_at: :desc)
+                  else
+                    Current.account.associated_audits.none
+                  end
+  end
+
+  def audit_logs_enabled?
+    Current.account.feature_enabled?(:audit_logs)
   end
 end
diff --git a/spec/enterprise/controllers/api/v1/accounts/audit_logs_controller_spec.rb b/spec/enterprise/controllers/api/v1/accounts/audit_logs_controller_spec.rb
index 88ca5891e..53721c5c5 100644
--- a/spec/enterprise/controllers/api/v1/accounts/audit_logs_controller_spec.rb
+++ b/spec/enterprise/controllers/api/v1/accounts/audit_logs_controller_spec.rb
@@ -27,7 +27,20 @@ RSpec.describe 'Enterprise Audit API', type: :request do
 
     # check for response in parse
     context 'when it is an authenticated admin user' do
+      it 'returns empty array if feature is not enabled' do
+        get "/api/v1/accounts/#{account.id}/audit_logs",
+            headers: admin.create_new_auth_token,
+            as: :json
+
+        expect(response).to have_http_status(:success)
+        json_response = JSON.parse(response.body)
+        expect(json_response['audit_logs']).to eql([])
+      end
+
       it 'fetches audit logs associated with the account' do
+        account.enable_features(:audit_logs)
+        account.save!
+
         get "/api/v1/accounts/#{account.id}/audit_logs",
             headers: admin.create_new_auth_token,
             as: :json

From ce3e38df0f58d47ca76ba3981c58e1f90765210a Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Mon, 8 May 2023 15:31:38 -0700
Subject: [PATCH 066/101] chore: Update the design of the help center portal
 (#6775)

---
 Gemfile                                       |  1 +
 Gemfile.lock                                  |  8 ++++
 .../api/v1/accounts/portals_controller.rb     |  2 +-
 app/javascript/portal/application.scss        |  2 +-
 .../portal/components/PublicArticleSearch.vue | 12 +----
 .../portal/components/PublicSearchInput.vue   |  9 ++--
 .../shared/assets/stylesheets/shadows.scss    |  2 +-
 .../api/v1/models/_article.json.jbuilder      |  1 +
 .../api/v1/portals/_category-block.html.erb   |  2 +-
 .../public/api/v1/portals/_header.html.erb    | 11 +++--
 .../public/api/v1/portals/_hero.html.erb      | 10 ++---
 .../v1/portals/_uncategorized-block.html.erb  |  2 +-
 .../api/v1/portals/articles/index.html.erb    |  8 ++--
 .../api/v1/portals/articles/show.html.erb     | 45 +++++++++----------
 .../categories/_category-block.html.erb       |  2 +-
 .../api/v1/portals/categories/_hero.html.erb  |  2 +-
 .../api/v1/portals/categories/index.html.erb  |  2 +-
 .../api/v1/portals/categories/show.html.erb   | 12 ++---
 app/views/public/api/v1/portals/show.html.erb |  2 +-
 public/assets/images/hc/grid.svg              |  4 ++
 20 files changed, 73 insertions(+), 66 deletions(-)
 create mode 100644 public/assets/images/hc/grid.svg

diff --git a/Gemfile b/Gemfile
index 995406a90..86fdf1993 100644
--- a/Gemfile
+++ b/Gemfile
@@ -177,6 +177,7 @@ group :development do
   gem 'bullet'
   gem 'letter_opener'
   gem 'web-console'
+  gem 'scss_lint', require: false
 
   # used in swagger build
   gem 'json_refs'
diff --git a/Gemfile.lock b/Gemfile.lock
index d980d4a40..3723a738c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -643,6 +643,11 @@ GEM
       sexp_processor (~> 4.6)
     ruby_parser (3.20.0)
       sexp_processor (~> 4.16)
+    sass (3.7.4)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
     sassc (2.4.0)
       ffi (~> 1.9)
     sassc-rails (2.1.2)
@@ -653,6 +658,8 @@ GEM
       tilt
     scout_apm (5.3.3)
       parser
+    scss_lint (0.60.0)
+      sass (~> 3.5, >= 3.5.5)
     seed_dump (3.3.1)
       activerecord (>= 4)
       activesupport (>= 4)
@@ -874,6 +881,7 @@ DEPENDENCIES
   rubocop-rails
   rubocop-rspec
   scout_apm
+  scss_lint
   seed_dump
   sentry-rails
   sentry-ruby
diff --git a/app/controllers/api/v1/accounts/portals_controller.rb b/app/controllers/api/v1/accounts/portals_controller.rb
index b1837acbd..fcc02c6ec 100644
--- a/app/controllers/api/v1/accounts/portals_controller.rb
+++ b/app/controllers/api/v1/accounts/portals_controller.rb
@@ -30,7 +30,7 @@ class Api::V1::Accounts::PortalsController < Api::V1::Accounts::BaseController
     ActiveRecord::Base.transaction do
       @portal.update!(portal_params) if params[:portal].present?
       # @portal.custom_domain = parsed_custom_domain
-      process_attached_logo
+      process_attached_logo if params[:blob_id].present?
     rescue StandardError => e
       Rails.logger.error e
       render json: { error: @portal.errors.messages }.to_json, status: :unprocessable_entity
diff --git a/app/javascript/portal/application.scss b/app/javascript/portal/application.scss
index 0c4703e0e..b657e2249 100644
--- a/app/javascript/portal/application.scss
+++ b/app/javascript/portal/application.scss
@@ -11,7 +11,7 @@
 
 html,
 body {
-  font-family: $font-family;
+  font-family: ui-sans-serif,system-ui,-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,Noto Sans,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol,Noto Color Emoji;
   -moz-osx-font-smoothing: grayscale;
   -webkit-font-smoothing: antialiased;
   height: 100%;
diff --git a/app/javascript/portal/components/PublicArticleSearch.vue b/app/javascript/portal/components/PublicArticleSearch.vue
index 4ced0665b..6827c4762 100644
--- a/app/javascript/portal/components/PublicArticleSearch.vue
+++ b/app/javascript/portal/components/PublicArticleSearch.vue
@@ -1,8 +1,5 @@
 <template>
-  <div
-    v-on-clickaway="closeSearch"
-    class="mx-auto max-w-md w-full relative my-4"
-  >
+  <div v-on-clickaway="closeSearch" class="max-w-2xl w-full relative my-4">
     <public-search-input
       v-model="searchTerm"
       :search-placeholder="searchTranslations.searchPlaceholder"
@@ -10,7 +7,7 @@
     />
     <div
       v-if="shouldShowSearchBox"
-      class="absolute show-search-box w-full"
+      class="absolute top-16 w-full"
       @mouseover="openSearch"
     >
       <search-suggestions
@@ -122,8 +119,3 @@ export default {
   },
 };
 </script>
-<style lang="scss" scoped>
-.show-search-box {
-  top: 4rem;
-}
-</style>
diff --git a/app/javascript/portal/components/PublicSearchInput.vue b/app/javascript/portal/components/PublicSearchInput.vue
index 5183f3293..a1b36fd66 100644
--- a/app/javascript/portal/components/PublicSearchInput.vue
+++ b/app/javascript/portal/components/PublicSearchInput.vue
@@ -1,17 +1,16 @@
 <template>
   <div
-    class="w-full flex items-center rounded-md border-solid  h-16 bg-white px-4 py-2 text-slate-600"
+    class="w-full flex items-center rounded-md border-solid border-2 h-16 bg-white px-4 py-2 text-slate-600"
     :class="{
-      'shadow border-2 border-woot-100': isFocused,
-      'border border-slate-50 shadow-sm': !isFocused,
+      'shadow border-woot-100': isFocused,
+      'border-slate-50 shadow-sm': !isFocused,
     }"
   >
     <fluent-icon icon="search" />
     <input
       :value="value"
       type="text"
-      class="w-full search-input focus:outline-none text-base h-full bg-white px-2 py-2
-    text-slate-700 placeholder-slate-500 sm:text-sm"
+      class="w-full focus:outline-none text-base h-full bg-white px-2 py-2 text-slate-700 placeholder-slate-500"
       :placeholder="searchPlaceholder"
       role="search"
       @input="onChange"
diff --git a/app/javascript/shared/assets/stylesheets/shadows.scss b/app/javascript/shared/assets/stylesheets/shadows.scss
index 5eebc6f32..1fe65aa20 100644
--- a/app/javascript/shared/assets/stylesheets/shadows.scss
+++ b/app/javascript/shared/assets/stylesheets/shadows.scss
@@ -13,7 +13,7 @@
         0 0.4rem 1.2rem rgb(0 0 0 / 7%);
     --shadow-bulk-action-container:
         6px 3px 22px 9px rgb(181 181 181 / 25%);
-    --shadow-context-menu: rgb(22 23 24 / 35%) 0px 10px 38px -10px,
+    --shadow-context-menu: rgb(22 23 24 / 30%) 0px 10px 38px -10px,
     rgb(22 23 24 / 20%) 0px 10px 20px -15px;
     --shadow-widget-builder: 0 0px 20px 5px rgb(0 0 0 / 10%);
 }
diff --git a/app/views/public/api/v1/models/_article.json.jbuilder b/app/views/public/api/v1/models/_article.json.jbuilder
index 0fcdf2ed3..1660f7914 100644
--- a/app/views/public/api/v1/models/_article.json.jbuilder
+++ b/app/views/public/api/v1/models/_article.json.jbuilder
@@ -7,6 +7,7 @@ json.status article.status
 json.position article.position
 json.account_id article.account_id
 json.last_updated_at article.updated_at
+json.slug article.slug
 
 if article.portal.present?
   json.portal do
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 b147f27d2..aa1fbbd22 100644
--- a/app/views/public/api/v1/portals/_category-block.html.erb
+++ b/app/views/public/api/v1/portals/_category-block.html.erb
@@ -1,6 +1,6 @@
 <section class="bg-white 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 font-semibold subpixel-antialiased leading-relaxed hover:underline">
+    <h3 class="text-xl text-slate-800 font-medium font-semibold leading-relaxed hover:underline">
       <a href="/hc/<%= portal.slug %>/<%= category.locale %>/categories/<%= category.slug %>">
         <%= category.name %>
       </a>
diff --git a/app/views/public/api/v1/portals/_header.html.erb b/app/views/public/api/v1/portals/_header.html.erb
index a532b9430..80880c2b9 100644
--- a/app/views/public/api/v1/portals/_header.html.erb
+++ b/app/views/public/api/v1/portals/_header.html.erb
@@ -1,8 +1,11 @@
 
-<header class="bg-white mx-auto px-4 max-w-5xl w-full">
-  <nav class="px-0 flex" aria-label="Top">
-    <div class="w-full py-8 flex items-center">
-      <a href="/hc/<%= @portal.slug %>/<%= @portal.config['default_locale'] || params[:locale] %>/" class="text-base font-semibold">
+<header class="bg-white w-full shadow-sm sticky top-0 z-50">
+  <nav class=" flex bg-white mx-auto max-w-6xl 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] %>/" class="h-10 text-lg flex items-center text-slate-900 font-semibold">
+        <% if @portal.logo.present? %>
+          <img src="<%= url_for(@portal.logo) %>" class="h-10 w-auto mr-2" />
+        <% end %>
         <%= @portal.name %>
       </a>
       <% if @portal.homepage_link %>
diff --git a/app/views/public/api/v1/portals/_hero.html.erb b/app/views/public/api/v1/portals/_hero.html.erb
index 7976f61e6..c4ec18e2b 100644
--- a/app/views/public/api/v1/portals/_hero.html.erb
+++ b/app/views/public/api/v1/portals/_hero.html.erb
@@ -1,10 +1,10 @@
-
-<section class="bg-gradient-to-b from-white to-slate-75 pt-8 pb-16 md:py-16 flex flex-col items-center justify-center">
-  <div class="mx-auto w-full max-w-2xl flex flex-col items-center">
-    <h1 class="text-2xl px-5 md:text-4xl text-slate-900 font-semibold subpixel-antialiased leading-normal text-center">
+<!-- The inline styles are intentional, migrate it to classes after upgrading to tailwind v3 -->
+<section class="pt-8 pb-16 md:py-20 w-full bg-woot-50 shadow-inner" style="background: url(/assets/images/hc/grid.svg) color-mix(in srgb, <%= @portal.color %> 10%, white)">
+  <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 font-semibold leading-normal">
       <%= portal.header_text %>
     </h1>
-    <p class="text-slate-600 py-2 text-center my-2 max-w-sm leading-normal"><%= I18n.t('public_portal.hero.sub_title') %></p>
+    <p class="text-slate-600 text-center text-lg leading-normal pt-4 pb-4"><%= I18n.t('public_portal.hero.sub_title') %></p>
     <div id="search-wrap"></div>
   </div>
 </section>
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 15cfb6004..47842a9ff 100644
--- a/app/views/public/api/v1/portals/_uncategorized-block.html.erb
+++ b/app/views/public/api/v1/portals/_uncategorized-block.html.erb
@@ -1,6 +1,6 @@
 <section class="bg-white 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 font-semibold subpixel-antialiased leading-relaxed hover:underline">
+    <h3 class="text-xl text-slate-900 font-semibold leading-relaxed hover:underline">
       <%= category %>
     </h3>
     <span class="text-slate-500">
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 c505d6663..8709b3b00 100644
--- a/app/views/public/api/v1/portals/articles/index.html.erb
+++ b/app/views/public/api/v1/portals/articles/index.html.erb
@@ -12,7 +12,7 @@
 		<span>/</span>
 		</div>
 			<% @articles.each do |article| %>
-				<h1 class="text-4xl font-bold md:tracking-normal leading-snug md:text-5xl text-slate-900">
+				<h1 class="text-4xl font-semibold md:tracking-normal leading-snug md:text-5xl text-slate-900">
 				<%= 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">
@@ -28,9 +28,9 @@
 		</div>
 	</div>
 </div>
-<div class="max-w-4xl flex-grow w-full px-6 py-16 mx-auto space-y-12">
-	<article class="space-y-8 ">
-		<div class="text-slate-800 font-sans leading-8 text-lg subpixel-antialiased max-w-3xl blog-content">
+<div class="max-w-4xl flex-grow w-full px-8 py-16 mx-auto space-y-12">
+	<article class="space-y-8">
+		<div class="text-slate-800 font-sans leading-8 text-lg max-w-3xl blog-content">
 		</div>
 	</article>
 </div>
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 3ad8b5e9a..bea1a20e8 100644
--- a/app/views/public/api/v1/portals/articles/show.html.erb
+++ b/app/views/public/api/v1/portals/articles/show.html.erb
@@ -11,26 +11,25 @@
   <% end %>
 <% end %>
 
-<div class="bg-gradient-to-b from-white to-slate-50">
-  <div class="max-w-5xl px-8 lg:px-4 pt-8 pb-16 mx-auto space-y-4 w-full">
-    <% if @article.category.present? %>
-      <div>
-        <a
-          class="text-slate-700 hover:underline leading-8 text-sm font-medium"
-          href="/hc/<%= @portal.slug %>/<%= @article.category.locale %>"
-        >
-          <%= I18n.t('public_portal.common.home') %>
-        </a>
-        <span class="text-xs text-slate-600 px-1">/</span>
-        <a
-          class="text-slate-700 hover:underline leading-8 text-sm font-medium"
-          href="/hc/<%= @portal.slug %>/<%= @article.category.locale %>/categories/<%= @article.category.slug %>"
-        >
-          <%= @article.category.name %>
-        </a>
-      </div>
-    <% end %>
-    <h1 class="text-3xl font-bold md:tracking-normal leading-snug md:text-5xl text-slate-900">
+<!-- The inline styles are intentional, migrate it to classes after upgrading to tailwind v3 -->
+<div class="bg-woot-50 py-8 shadow-inner" style="background: url(/assets/images/hc/grid.svg) color-mix(in srgb, <%= @portal.color %> 10%, white)">
+  <div class="max-w-6xl px-8 pt-8 pb-16 mx-auto space-y-4 w-full">
+    <div>
+      <a
+        class="text-slate-700 hover:underline leading-8 text-sm font-semibold"
+        href="/hc/<%= @portal.slug %>/<%= @article.category.locale %>"
+      >
+        Home
+      </a>
+      <span class="text-xs text-slate-600 px-1">/</span>
+      <a
+        class="text-slate-700 hover:underline leading-8 text-sm font-semibold"
+        href="/hc/<%= @portal.slug %>/<%= @article.category.locale %>/categories/<%= @article.category.slug %>"
+      >
+        <%= @article.category.name %>
+      </a>
+    </div>
+    <h1 class="text-3xl font-semibold md:tracking-normal leading-snug md:text-4xl text-slate-900">
       <%= @article.title %>
     </h1>
     <div class="flex flex-col items-start justify-between w-full md:flex-row md:items-center pt-2">
@@ -47,9 +46,9 @@
     </div>
   </div>
 </div>
-<div class="max-w-5xl flex-grow w-full px-6 py-8 mx-auto space-y-12">
-  <article class="space-y-8 ">
-    <div class="text-slate-800 leading-8 text-lg subpixel-antialiased max-w-3xl prose break-words">
+<div class="max-w-6xl flex-grow w-full px-8 py-8 mx-auto space-y-12">
+  <article class="space-y-8">
+    <div class="text-slate-800 text-lg max-w-3xl prose break-words">
       <p><%= @parsed_content %></p>
     </div>
   </article>
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 7c8eced44..171b8ce97 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
@@ -1,7 +1,7 @@
 
 <section class="bg-white 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 font-semibold subpixel-antialiased leading-relaxed hover:underline"">
+    <h3 class="text-xl text-slate-900 font-semibold leading-relaxed hover:underline"">
      <a href="/hc/<%= portal.slug %>/<%= category.locale %>/categories/<%= category.slug %>">
       <%= category.name %>
     </a>
diff --git a/app/views/public/api/v1/portals/categories/_hero.html.erb b/app/views/public/api/v1/portals/categories/_hero.html.erb
index f9a78c958..3529c08ac 100644
--- a/app/views/public/api/v1/portals/categories/_hero.html.erb
+++ b/app/views/public/api/v1/portals/categories/_hero.html.erb
@@ -1,7 +1,7 @@
 
 <section class="bg-slate-50 py-16 flex flex-col items-center justify-center">
   <div class="mx-auto max-w-2xl">
-    <h1 class="text-4xl text-slate-900 font-semibold subpixel-antialiased leading-relaxed text-center"><%= portal.header_text %></h1>
+    <h1 class="text-4xl text-slate-900 font-semibold leading-relaxed text-center"><%= portal.header_text %></h1>
     <p class="text-slate-700 py-2 text-center"><%= I18n.t('public_portal.hero.sub_title') %></p>
   </div>
 </section>
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 3780b14ce..d27f5f1a7 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-4xl w-full flex-grow mx-auto py-16">
+<div class="max-w-6xl 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 f8b36e4da..0a30f44d9 100644
--- a/app/views/public/api/v1/portals/categories/show.html.erb
+++ b/app/views/public/api/v1/portals/categories/show.html.erb
@@ -5,17 +5,17 @@
   <% end %>
 <% end %>
 
-<div class="bg-gradient-to-b from-white to-black-50 pt-8 pb-16">
-  <div class="max-w-5xl px-4 mx-auto space-y-2">
+<div class="bg-woot-50 pt-16 pb-20" style="background: url(/assets/images/hc/grid.svg) color-mix(in srgb, <%= @portal.color %> 10%, white)">
+  <div class="max-w-6xl px-8 mx-auto space-y-2">
     <a
-      class="text-slate-700 text-sm hover:underline leading-8"
+      class="text-slate-700 text-sm hover:underline leading-8 font-semibold"
       href="/hc/<%= @portal.slug %>/<%= @category.locale %>"
     >
       <%= I18n.t('public_portal.common.home') %>
     </a>
     <span class="text-xs text-slate-600 px-1">/</span>
     <div class="flex justify-start items-center w-full">
-      <h1 class="text-3xl font-bold leading-snug md:tracking-normal text-slate-900">
+      <h1 class="text-3xl font-semibold leading-snug md:tracking-normal text-slate-900">
         <%= @category.name %>
       </h1>
       <div class="text-slate-500 px-8 mt-2">
@@ -25,7 +25,7 @@
   </div>
 </div>
 
-<section class="bg-white max-w-5xl w-full mx-auto py-6 px-4 flex flex-col items-center justify-center flex-grow">
+<section class="bg-white 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">
     <% if @category.articles.published.size == 0 %>
     <div class="h-full flex items-center justify-center bg-slate-50 rounded-xl py-6">
@@ -38,7 +38,7 @@
         href="/hc/<%= @portal.slug %>/articles/<%= article.slug %>"
       >
         <div>
-          <p class="font-medium mb-2 hover:underline"><%= article.title %></p>
+          <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>
diff --git a/app/views/public/api/v1/portals/show.html.erb b/app/views/public/api/v1/portals/show.html.erb
index 9c151333d..339610045 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-grow mx-auto py-8 px-4">
+<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">
     <% @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 %>
diff --git a/public/assets/images/hc/grid.svg b/public/assets/images/hc/grid.svg
new file mode 100644
index 000000000..3fcabbb6e
--- /dev/null
+++ b/public/assets/images/hc/grid.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32" width="32" height="32" fill="none" stroke="#0f172a"
+  stroke-opacity="0.04">
+  <path d="M0 .5H31.5V32" />
+</svg>

From 5e0ce7793c03cc2a6a05a9f9fed16b28897e0999 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Mon, 8 May 2023 16:15:27 -0700
Subject: [PATCH 067/101] fix: Re-order gem list to fix rubocop errors (#7043)

---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 86fdf1993..d635d3809 100644
--- a/Gemfile
+++ b/Gemfile
@@ -176,8 +176,8 @@ group :development do
   gem 'annotate'
   gem 'bullet'
   gem 'letter_opener'
-  gem 'web-console'
   gem 'scss_lint', require: false
+  gem 'web-console'
 
   # used in swagger build
   gem 'json_refs'

From 6137a45214c39685b72a146b0989f8c82c12fbb9 Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Wed, 10 May 2023 06:09:09 +0530
Subject: [PATCH 068/101] chore: Update link in the reply summary email (#7024)

Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
---
 app/models/conversation.rb                    |  4 ++++
 .../reply_with_summary.html.erb               | 22 +++++++++++++------
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/app/models/conversation.rb b/app/models/conversation.rb
index fa59e8d24..e01fb3863 100644
--- a/app/models/conversation.rb
+++ b/app/models/conversation.rb
@@ -195,6 +195,10 @@ class Conversation < ApplicationRecord
     messages.chat.last(5)
   end
 
+  def csat_survey_link
+    "#{ENV.fetch('FRONTEND_URL', nil)}/survey/responses/#{uuid}"
+  end
+
   private
 
   def execute_after_update_commit_callbacks
diff --git a/app/views/mailers/conversation_reply_mailer/reply_with_summary.html.erb b/app/views/mailers/conversation_reply_mailer/reply_with_summary.html.erb
index 34665b777..c6cb77ad2 100644
--- a/app/views/mailers/conversation_reply_mailer/reply_with_summary.html.erb
+++ b/app/views/mailers/conversation_reply_mailer/reply_with_summary.html.erb
@@ -5,18 +5,26 @@
 <% @messages.each do |message| %>
   <tr>
     <td>
-      <b><%= message.incoming? ? 'You' : message.sender&.available_name || message.sender&.name %></b>
+      <b><%= message.incoming? ? 'You' : message.sender&.available_name || message.sender&.name || 'Bot' %></b>
     </td>
   </tr>
   <tr>
-    <td style="padding: 10px 20px; margin: 5px 0 20px 0; background: #F2F3F7; border-radius: 10px; display: inline-block; font-family: 'Helvetica Neue',Tahoma,Arial,sans-serif; text-align: start; unicode-bidi: plaintext;">
-      <% if message.content %>
+    <td style="padding: 0px 16px; margin: 4px 0 8px 0; background: #F5FAFF; border-radius: 5px; display: inline-block; font-family: 'Helvetica Neue',Tahoma,Arial,sans-serif; text-align: start; unicode-bidi: plaintext;">
+      <% if (message.content_type == 'input_csat' && message.message_type == 'template') %>
+        <p>Click <a href="<%= message.conversation.csat_survey_link %>" _target="blank">here</a> to rate the conversation.</p>
+      <% elsif message.content.present? %>
         <%= CommonMarker.render_html(message.content).html_safe %>
       <% end %>
-      <% if message.attachments %>
-        <% message.attachments.each do |attachment| %>
-          Attachment [<a href="<%= attachment.file_url %>" _target="blank">Click here to view</a>]
-        <% end %>
+      <% if message.attachments.count.positive? %>
+        <p>
+          <% if message.content.present? %>
+            <hr style="border: 0; border-bottom: 1px solid #AEC3D5;"/>
+          <% end %>
+          This message contains <%= message.attachments.count > 1 ? 'attachments' : 'an attachment' %>.
+          <% message.attachments.each do |attachment| %>
+            <br />- View the attachment <a href="<%= attachment.file_url %>" _target="blank">here</a>.
+          <% end %>
+        </p>
       <% end %>
     </td>
   </tr>

From 662967b5d384bda8359e9d00c5570015ce847ffd Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Wed, 10 May 2023 11:34:49 +0530
Subject: [PATCH 069/101] feat(perf): add index to messages created at (#7044)

* feat: add index to messages created at

* feat: run migration
---
 app/models/message.rb                                       | 1 +
 .../20230509101256_add_index_to_messages_created_at.rb      | 6 ++++++
 db/schema.rb                                                | 3 ++-
 3 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 db/migrate/20230509101256_add_index_to_messages_created_at.rb

diff --git a/app/models/message.rb b/app/models/message.rb
index 3b1ddda11..a73cbfd66 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -27,6 +27,7 @@
 #  index_messages_on_additional_attributes_campaign_id  (((additional_attributes -> 'campaign_id'::text))) USING gin
 #  index_messages_on_content                            (content) USING gin
 #  index_messages_on_conversation_id                    (conversation_id)
+#  index_messages_on_created_at                         (created_at)
 #  index_messages_on_inbox_id                           (inbox_id)
 #  index_messages_on_sender_type_and_sender_id          (sender_type,sender_id)
 #  index_messages_on_source_id                          (source_id)
diff --git a/db/migrate/20230509101256_add_index_to_messages_created_at.rb b/db/migrate/20230509101256_add_index_to_messages_created_at.rb
new file mode 100644
index 000000000..0bee32749
--- /dev/null
+++ b/db/migrate/20230509101256_add_index_to_messages_created_at.rb
@@ -0,0 +1,6 @@
+class AddIndexToMessagesCreatedAt < ActiveRecord::Migration[7.0]
+  disable_ddl_transaction!
+  def change
+    add_index :messages, [:created_at], name: 'index_messages_on_created_at', algorithm: :concurrently
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index d3753968a..84f3af8fc 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_04_26_130150) do
+ActiveRecord::Schema[7.0].define(version: 2023_05_09_101256) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_stat_statements"
   enable_extension "pg_trgm"
@@ -667,6 +667,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_04_26_130150) do
     t.index ["account_id"], name: "index_messages_on_account_id"
     t.index ["content"], name: "index_messages_on_content", opclass: :gin_trgm_ops, using: :gin
     t.index ["conversation_id"], name: "index_messages_on_conversation_id"
+    t.index ["created_at"], name: "index_messages_on_created_at"
     t.index ["inbox_id"], name: "index_messages_on_inbox_id"
     t.index ["sender_type", "sender_id"], name: "index_messages_on_sender_type_and_sender_id"
     t.index ["source_id"], name: "index_messages_on_source_id"

From 520bdabefe8867d1bae2a8e5be9b0040ffcd97e8 Mon Sep 17 00:00:00 2001
From: giquieu <giquieu@gmail.com>
Date: Wed, 10 May 2023 03:59:56 -0300
Subject: [PATCH 070/101] fix: Record audio in wav format for web/facebook
 (#7046)

---
 .../widgets/WootWriter/AudioRecorder.vue      | 39 ++++++++++---------
 .../widgets/conversation/ReplyBox.vue         |  6 +--
 app/javascript/shared/constants/messages.js   |  1 +
 3 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/app/javascript/dashboard/components/widgets/WootWriter/AudioRecorder.vue b/app/javascript/dashboard/components/widgets/WootWriter/AudioRecorder.vue
index 68072c846..55db1aad8 100644
--- a/app/javascript/dashboard/components/widgets/WootWriter/AudioRecorder.vue
+++ b/app/javascript/dashboard/components/widgets/WootWriter/AudioRecorder.vue
@@ -13,15 +13,19 @@ import videojs from 'video.js';
 import alertMixin from '../../../../shared/mixins/alertMixin';
 
 import Recorder from 'opus-recorder';
+
+// Workers to record Audio .ogg and .wav
 import encoderWorker from 'opus-recorder/dist/encoderWorker.min';
 import waveWorker from 'opus-recorder/dist/waveWorker.min';
 
 import WaveSurfer from 'wavesurfer.js';
 import MicrophonePlugin from 'wavesurfer.js/dist/plugin/wavesurfer.microphone.js';
-import 'videojs-wavesurfer/dist/videojs.wavesurfer.js';
 
+import 'videojs-wavesurfer/dist/videojs.wavesurfer.js';
 import 'videojs-record/dist/videojs.record.js';
-import 'videojs-record/dist/plugins/videojs.record.opus-recorder.js';
+
+import OpusRecorderEngine from 'videojs-record/dist/plugins/videojs.record.opus-recorder.js';
+
 import { format, addSeconds } from 'date-fns';
 import { AUDIO_FORMATS } from 'shared/constants/messages';
 
@@ -33,7 +37,7 @@ export default {
   props: {
     audioRecordFormat: {
       type: String,
-      default: AUDIO_FORMATS.WEBM,
+      default: AUDIO_FORMATS.WAV,
     },
   },
   data() {
@@ -79,24 +83,18 @@ export default {
             maxLength: 900,
             timeSlice: 1000,
             maxFileSize: 15 * 1024 * 1024,
-            ...(this.audioRecordFormat === AUDIO_FORMATS.WEBM && {
-              monitorGain: 0,
-              recordingGain: 1,
-              numberOfChannels: 1,
-              encoderSampleRate: 16000,
-              originalSampleRateOverride: 16000,
-              streamPages: true,
-              maxFramesPerPage: 1,
-              encoderFrameSize: 1,
-              encoderPath: waveWorker,
+            displayMilliseconds: false,
+            audioChannels: 1,
+            audioSampleRate: 48000,
+            audioBitRate: 128,
+            audioEngine: 'opus-recorder',
+            ...(this.audioRecordFormat === AUDIO_FORMATS.WAV && {
+              audioMimeType: 'audio/wav',
+              audioWorkerURL: waveWorker,
             }),
             ...(this.audioRecordFormat === AUDIO_FORMATS.OGG && {
-              displayMilliseconds: false,
-              audioEngine: 'opus-recorder',
+              audioMimeType: 'audio/ogg',
               audioWorkerURL: encoderWorker,
-              audioChannels: 1,
-              audioSampleRate: 48000,
-              audioBitRate: 128,
             }),
           },
         },
@@ -134,6 +132,11 @@ export default {
   },
   methods: {
     deviceReady() {
+      if (this.player.record().engine instanceof OpusRecorderEngine) {
+        if (this.audioRecordFormat === AUDIO_FORMATS.WAV) {
+          this.player.record().engine.audioType = 'audio/wav';
+        }
+      }
       this.player.record().start();
     },
     startRecord() {
diff --git a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
index bae30d407..1c6f4f796 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
@@ -501,10 +501,10 @@ export default {
       return `draft-${this.conversationIdByRoute}-${this.replyType}`;
     },
     audioRecordFormat() {
-      if (this.isAWebWidgetInbox) {
-        return AUDIO_FORMATS.WEBM;
+      if (this.isAWhatsAppChannel) {
+        return AUDIO_FORMATS.OGG;
       }
-      return AUDIO_FORMATS.OGG;
+      return AUDIO_FORMATS.WAV;
     },
     messageVariables() {
       const variables = getMessageVariables({
diff --git a/app/javascript/shared/constants/messages.js b/app/javascript/shared/constants/messages.js
index 63ca99afc..77501cb76 100644
--- a/app/javascript/shared/constants/messages.js
+++ b/app/javascript/shared/constants/messages.js
@@ -84,6 +84,7 @@ export const CSAT_RATINGS = [
 export const AUDIO_FORMATS = {
   WEBM: 'audio/webm',
   OGG: 'audio/ogg',
+  WAV: 'audio/wav',
 };
 
 export const MESSAGE_VARIABLES = [

From 07aaa046c17d50617ea95ad85a867941aa40183f Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Date: Wed, 10 May 2023 15:55:48 +0530
Subject: [PATCH 071/101] fix: Welcome email copy changes and canned response
 API error handling [cw-1290] (#6905)

* fix: Welcome email copy changes and canned response API error handling

* Review fixes

* Uses mixin for alerts in canned page

* Typo fixes

* Copy changes

* Fixes broken tests

* Fixes review comments

* Fixes typo errors with mail template

* Removes unwanted case

* Fixes repetitive texts

---------

Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
---
 .../dashboard/i18n/locale/en/cannedMgmt.json  |  6 +++---
 .../dashboard/settings/canned/AddCanned.vue   | 10 +++++----
 .../dashboard/settings/canned/EditCanned.vue  | 20 +++++++-----------
 .../dashboard/settings/canned/Index.vue       |  6 ++++--
 .../dashboard/store/modules/cannedResponse.js |  7 +++++++
 .../mailer/confirmation_instructions.html.erb | 21 ++++++++++++-------
 .../mailers/confirmation_instructions_spec.rb |  4 ++--
 7 files changed, 42 insertions(+), 32 deletions(-)

diff --git a/app/javascript/dashboard/i18n/locale/en/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/en/cannedMgmt.json
index 9c14f5a52..e3391967d 100644
--- a/app/javascript/dashboard/i18n/locale/en/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/en/cannedMgmt.json
@@ -34,7 +34,7 @@
       },
       "API": {
         "SUCCESS_MESSAGE": "Canned Response added successfully",
-        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        "ERROR_MESSAGE": "Could not create canned response, Please try again later"
       }
     },
     "EDIT": {
@@ -56,14 +56,14 @@
       "BUTTON_TEXT": "Edit",
       "API": {
         "SUCCESS_MESSAGE": "Canned Response updated successfully",
-        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        "ERROR_MESSAGE": "Could not update canned response, Please try again later"
       }
     },
     "DELETE": {
       "BUTTON_TEXT": "Delete",
       "API": {
         "SUCCESS_MESSAGE": "Canned response deleted successfully",
-        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        "ERROR_MESSAGE": "Could not delete canned response, Please try again later"
       },
       "CONFIRM": {
         "TITLE": "Confirm Deletion",
diff --git a/app/javascript/dashboard/routes/dashboard/settings/canned/AddCanned.vue b/app/javascript/dashboard/routes/dashboard/settings/canned/AddCanned.vue
index 1f117eb81..10c17a003 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/canned/AddCanned.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/canned/AddCanned.vue
@@ -5,7 +5,7 @@
         :header-title="$t('CANNED_MGMT.ADD.TITLE')"
         :header-content="$t('CANNED_MGMT.ADD.DESC')"
       />
-      <form class="row" @submit.prevent="addAgent()">
+      <form class="row" @submit.prevent="addCannedResponse()">
         <div class="medium-12 columns">
           <label :class="{ error: $v.shortCode.$error }">
             {{ $t('CANNED_MGMT.ADD.FORM.SHORT_CODE.LABEL') }}
@@ -107,7 +107,7 @@ export default {
       this.$v.shortCode.$reset();
       this.$v.content.$reset();
     },
-    addAgent() {
+    addCannedResponse() {
       // Show loading on button
       this.addCanned.showLoading = true;
       // Make API Calls
@@ -123,9 +123,11 @@ export default {
           this.resetForm();
           this.onClose();
         })
-        .catch(() => {
+        .catch(error => {
           this.addCanned.showLoading = false;
-          this.showAlert(this.$t('CANNED_MGMT.ADD.API.ERROR_MESSAGE'));
+          const errorMessage =
+            error?.message || this.$t('CANNED_MGMT.ADD.API.ERROR_MESSAGE');
+          this.showAlert(errorMessage);
         });
     },
   },
diff --git a/app/javascript/dashboard/routes/dashboard/settings/canned/EditCanned.vue b/app/javascript/dashboard/routes/dashboard/settings/canned/EditCanned.vue
index 2ab51653c..063fba23b 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/canned/EditCanned.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/canned/EditCanned.vue
@@ -57,6 +57,7 @@
 import { required, minLength } from 'vuelidate/lib/validators';
 import WootMessageEditor from 'dashboard/components/widgets/WootWriter/Editor';
 import WootSubmitButton from '../../../../components/buttons/FormSubmitButton';
+import alertMixin from 'shared/mixins/alertMixin';
 import Modal from '../../../../components/Modal';
 
 export default {
@@ -65,6 +66,7 @@ export default {
     Modal,
     WootMessageEditor,
   },
+  mixins: [alertMixin],
   props: {
     id: { type: Number, default: null },
     edcontent: { type: String, default: '' },
@@ -76,7 +78,6 @@ export default {
       editCanned: {
         showAlert: false,
         showLoading: false,
-        message: '',
       },
       shortCode: this.edshortCode,
       content: this.edcontent,
@@ -102,9 +103,6 @@ export default {
       this.$v.content.$touch();
       this.content = name;
     },
-    showAlert() {
-      bus.$emit('newToastMessage', this.editCanned.message);
-    },
     resetForm() {
       this.shortCode = '';
       this.content = '';
@@ -124,21 +122,17 @@ export default {
         .then(() => {
           // Reset Form, Show success message
           this.editCanned.showLoading = false;
-          this.editCanned.message = this.$t(
-            'CANNED_MGMT.EDIT.API.SUCCESS_MESSAGE'
-          );
-          this.showAlert();
+          this.showAlert(this.$t('CANNED_MGMT.EDIT.API.SUCCESS_MESSAGE'));
           this.resetForm();
           setTimeout(() => {
             this.onClose();
           }, 10);
         })
-        .catch(() => {
+        .catch(error => {
           this.editCanned.showLoading = false;
-          this.editCanned.message = this.$t(
-            'CANNED_MGMT.EDIT.API.ERROR_MESSAGE'
-          );
-          this.showAlert();
+          const errorMessage =
+            error?.message || this.$t('CANNED_MGMT.EDIT.API.ERROR_MESSAGE');
+          this.showAlert(errorMessage);
         });
     },
   },
diff --git a/app/javascript/dashboard/routes/dashboard/settings/canned/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/canned/Index.vue
index 6e8b1165f..4912ea03f 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/canned/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/canned/Index.vue
@@ -198,8 +198,10 @@ export default {
         .then(() => {
           this.showAlert(this.$t('CANNED_MGMT.DELETE.API.SUCCESS_MESSAGE'));
         })
-        .catch(() => {
-          this.showAlert(this.$t('CANNED_MGMT.DELETE.API.ERROR_MESSAGE'));
+        .catch(error => {
+          const errorMessage =
+            error?.message || this.$t('CANNED_MGMT.DELETE.API.ERROR_MESSAGE');
+          this.showAlert(errorMessage);
         });
     },
   },
diff --git a/app/javascript/dashboard/store/modules/cannedResponse.js b/app/javascript/dashboard/store/modules/cannedResponse.js
index 24f53a170..7b24d1171 100644
--- a/app/javascript/dashboard/store/modules/cannedResponse.js
+++ b/app/javascript/dashboard/store/modules/cannedResponse.js
@@ -1,3 +1,4 @@
+import { throwErrorMessage } from 'dashboard/store/utils/api';
 import * as MutationHelpers from 'shared/helpers/vuex/mutationHelpers';
 import * as types from '../mutation-types';
 import CannedResponseAPI from '../../api/cannedResponse';
@@ -46,8 +47,10 @@ const actions = {
       const response = await CannedResponseAPI.create(cannedObj);
       commit(types.default.ADD_CANNED, response.data);
       commit(types.default.SET_CANNED_UI_FLAG, { creatingItem: false });
+      return response.data;
     } catch (error) {
       commit(types.default.SET_CANNED_UI_FLAG, { creatingItem: false });
+      return throwErrorMessage(error);
     }
   },
 
@@ -60,8 +63,10 @@ const actions = {
       const response = await CannedResponseAPI.update(id, updateObj);
       commit(types.default.EDIT_CANNED, response.data);
       commit(types.default.SET_CANNED_UI_FLAG, { updatingItem: false });
+      return response.data;
     } catch (error) {
       commit(types.default.SET_CANNED_UI_FLAG, { updatingItem: false });
+      return throwErrorMessage(error);
     }
   },
 
@@ -71,8 +76,10 @@ const actions = {
       await CannedResponseAPI.delete(id);
       commit(types.default.DELETE_CANNED, id);
       commit(types.default.SET_CANNED_UI_FLAG, { deletingItem: true });
+      return id;
     } catch (error) {
       commit(types.default.SET_CANNED_UI_FLAG, { deletingItem: true });
+      return throwErrorMessage(error);
     }
   },
 };
diff --git a/app/views/devise/mailer/confirmation_instructions.html.erb b/app/views/devise/mailer/confirmation_instructions.html.erb
index 7e1338b19..41168a2d0 100644
--- a/app/views/devise/mailer/confirmation_instructions.html.erb
+++ b/app/views/devise/mailer/confirmation_instructions.html.erb
@@ -1,22 +1,27 @@
-<p>Welcome, <%= @resource.name %>!</p>
+<p>Hi, <%= @resource.name %>!</p>
 
 <% account_user = @resource&.account_users&.first %>
+
 <% if account_user&.inviter.present? && @resource.unconfirmed_email.blank? %>
-  <p><%= account_user.inviter.name %>, with <%= account_user.account.name %>, has invited you to try out <%= global_config['BRAND_NAME'] || 'Chatwoot' %>! </p>
+  <p><%= account_user.inviter.name %>, with <%= account_user.account.name %>, has invited you to try out <%= global_config['BRAND_NAME'] || 'Chatwoot' %>.</p>
 <% end %>
 
 <% if @resource.confirmed? %>
-<p>You can login to your account through the link below:</p>
+  <p>You can login to your <%= global_config['BRAND_NAME'] || 'Chatwoot' %> account through the link below:</p>
 <% else %>
-<p>You can confirm your account email through the link below:</p>
+  <p>
+    Welcome to <%= global_config['BRAND_NAME'] || 'Chatwoot' %>! We have a suite of powerful tools ready for you to explore. Before that we quickly need to verify your email address to know it's really you.
+  </p>
+  <p>Please take a moment and click the link below and activate your account.</p>
 <% end %>
 
+
 <% if @resource.unconfirmed_email.present? %>
-<p><%= link_to 'Confirm my account', frontend_url('auth/confirmation', confirmation_token: @token) %></p>
+  <p><%= link_to 'Confirm my account', frontend_url('auth/confirmation', confirmation_token: @token) %></p>
 <% elsif @resource.confirmed? %>
-<p><%= link_to 'Login to my account', frontend_url('auth/sign_in') %></p>
+  <p><%= link_to 'Login to my account', frontend_url('auth/sign_in') %></p>
 <% elsif account_user&.inviter.present? %>
-<p><%= link_to 'Confirm my account', frontend_url('auth/password/edit', reset_password_token: @resource.send(:set_reset_password_token)) %></p>
+  <p><%= link_to 'Confirm my account', frontend_url('auth/password/edit', reset_password_token: @resource.send(:set_reset_password_token)) %></p>
 <% else %>
-<p><%= link_to 'Confirm my account', frontend_url('auth/confirmation', confirmation_token: @token) %></p>
+  <p><%= link_to 'Confirm my account', frontend_url('auth/confirmation', confirmation_token: @token) %></p>
 <% end %>
diff --git a/spec/mailers/confirmation_instructions_spec.rb b/spec/mailers/confirmation_instructions_spec.rb
index a6f3f63af..9eeed85d2 100644
--- a/spec/mailers/confirmation_instructions_spec.rb
+++ b/spec/mailers/confirmation_instructions_spec.rb
@@ -22,7 +22,7 @@ RSpec.describe 'Confirmation Instructions', type: :mailer do
     end
 
     it 'uses the user\'s name' do
-      expect(mail.body).to match("Welcome, #{CGI.escapeHTML(confirmable_user.name)}!")
+      expect(mail.body).to match("Hi #{CGI.escapeHTML(confirmable_user.name)},")
     end
 
     it 'does not refer to the inviter and their account' do
@@ -39,7 +39,7 @@ RSpec.describe 'Confirmation Instructions', type: :mailer do
 
       it 'refers to the inviter and their account' do
         expect(mail.body).to match(
-          "#{CGI.escapeHTML(inviter_val.name)}, with #{CGI.escapeHTML(account.name)}, has invited you to try out Chatwoot!"
+          "#{CGI.escapeHTML(inviter_val.name)}, with #{CGI.escapeHTML(account.name)}, has invited you to try out Chatwoot."
         )
       end
 

From 65bad90b69d4e6ee8ded96d77c8d121765fbf6c5 Mon Sep 17 00:00:00 2001
From: Sojan <sojan@pepalo.com>
Date: Wed, 10 May 2023 16:43:18 +0530
Subject: [PATCH 072/101] Revert "fix: Welcome email copy changes and canned
 response API error handling [cw-1290] (#6905)"

This reverts commit 07aaa046c17d50617ea95ad85a867941aa40183f.
---
 .../dashboard/i18n/locale/en/cannedMgmt.json  |  6 +++---
 .../dashboard/settings/canned/AddCanned.vue   | 10 ++++-----
 .../dashboard/settings/canned/EditCanned.vue  | 20 +++++++++++-------
 .../dashboard/settings/canned/Index.vue       |  6 ++----
 .../dashboard/store/modules/cannedResponse.js |  7 -------
 .../mailer/confirmation_instructions.html.erb | 21 +++++++------------
 .../mailers/confirmation_instructions_spec.rb |  4 ++--
 7 files changed, 32 insertions(+), 42 deletions(-)

diff --git a/app/javascript/dashboard/i18n/locale/en/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/en/cannedMgmt.json
index e3391967d..9c14f5a52 100644
--- a/app/javascript/dashboard/i18n/locale/en/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/en/cannedMgmt.json
@@ -34,7 +34,7 @@
       },
       "API": {
         "SUCCESS_MESSAGE": "Canned Response added successfully",
-        "ERROR_MESSAGE": "Could not create canned response, Please try again later"
+        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
       }
     },
     "EDIT": {
@@ -56,14 +56,14 @@
       "BUTTON_TEXT": "Edit",
       "API": {
         "SUCCESS_MESSAGE": "Canned Response updated successfully",
-        "ERROR_MESSAGE": "Could not update canned response, Please try again later"
+        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
       }
     },
     "DELETE": {
       "BUTTON_TEXT": "Delete",
       "API": {
         "SUCCESS_MESSAGE": "Canned response deleted successfully",
-        "ERROR_MESSAGE": "Could not delete canned response, Please try again later"
+        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
       },
       "CONFIRM": {
         "TITLE": "Confirm Deletion",
diff --git a/app/javascript/dashboard/routes/dashboard/settings/canned/AddCanned.vue b/app/javascript/dashboard/routes/dashboard/settings/canned/AddCanned.vue
index 10c17a003..1f117eb81 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/canned/AddCanned.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/canned/AddCanned.vue
@@ -5,7 +5,7 @@
         :header-title="$t('CANNED_MGMT.ADD.TITLE')"
         :header-content="$t('CANNED_MGMT.ADD.DESC')"
       />
-      <form class="row" @submit.prevent="addCannedResponse()">
+      <form class="row" @submit.prevent="addAgent()">
         <div class="medium-12 columns">
           <label :class="{ error: $v.shortCode.$error }">
             {{ $t('CANNED_MGMT.ADD.FORM.SHORT_CODE.LABEL') }}
@@ -107,7 +107,7 @@ export default {
       this.$v.shortCode.$reset();
       this.$v.content.$reset();
     },
-    addCannedResponse() {
+    addAgent() {
       // Show loading on button
       this.addCanned.showLoading = true;
       // Make API Calls
@@ -123,11 +123,9 @@ export default {
           this.resetForm();
           this.onClose();
         })
-        .catch(error => {
+        .catch(() => {
           this.addCanned.showLoading = false;
-          const errorMessage =
-            error?.message || this.$t('CANNED_MGMT.ADD.API.ERROR_MESSAGE');
-          this.showAlert(errorMessage);
+          this.showAlert(this.$t('CANNED_MGMT.ADD.API.ERROR_MESSAGE'));
         });
     },
   },
diff --git a/app/javascript/dashboard/routes/dashboard/settings/canned/EditCanned.vue b/app/javascript/dashboard/routes/dashboard/settings/canned/EditCanned.vue
index 063fba23b..2ab51653c 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/canned/EditCanned.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/canned/EditCanned.vue
@@ -57,7 +57,6 @@
 import { required, minLength } from 'vuelidate/lib/validators';
 import WootMessageEditor from 'dashboard/components/widgets/WootWriter/Editor';
 import WootSubmitButton from '../../../../components/buttons/FormSubmitButton';
-import alertMixin from 'shared/mixins/alertMixin';
 import Modal from '../../../../components/Modal';
 
 export default {
@@ -66,7 +65,6 @@ export default {
     Modal,
     WootMessageEditor,
   },
-  mixins: [alertMixin],
   props: {
     id: { type: Number, default: null },
     edcontent: { type: String, default: '' },
@@ -78,6 +76,7 @@ export default {
       editCanned: {
         showAlert: false,
         showLoading: false,
+        message: '',
       },
       shortCode: this.edshortCode,
       content: this.edcontent,
@@ -103,6 +102,9 @@ export default {
       this.$v.content.$touch();
       this.content = name;
     },
+    showAlert() {
+      bus.$emit('newToastMessage', this.editCanned.message);
+    },
     resetForm() {
       this.shortCode = '';
       this.content = '';
@@ -122,17 +124,21 @@ export default {
         .then(() => {
           // Reset Form, Show success message
           this.editCanned.showLoading = false;
-          this.showAlert(this.$t('CANNED_MGMT.EDIT.API.SUCCESS_MESSAGE'));
+          this.editCanned.message = this.$t(
+            'CANNED_MGMT.EDIT.API.SUCCESS_MESSAGE'
+          );
+          this.showAlert();
           this.resetForm();
           setTimeout(() => {
             this.onClose();
           }, 10);
         })
-        .catch(error => {
+        .catch(() => {
           this.editCanned.showLoading = false;
-          const errorMessage =
-            error?.message || this.$t('CANNED_MGMT.EDIT.API.ERROR_MESSAGE');
-          this.showAlert(errorMessage);
+          this.editCanned.message = this.$t(
+            'CANNED_MGMT.EDIT.API.ERROR_MESSAGE'
+          );
+          this.showAlert();
         });
     },
   },
diff --git a/app/javascript/dashboard/routes/dashboard/settings/canned/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/canned/Index.vue
index 4912ea03f..6e8b1165f 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/canned/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/canned/Index.vue
@@ -198,10 +198,8 @@ export default {
         .then(() => {
           this.showAlert(this.$t('CANNED_MGMT.DELETE.API.SUCCESS_MESSAGE'));
         })
-        .catch(error => {
-          const errorMessage =
-            error?.message || this.$t('CANNED_MGMT.DELETE.API.ERROR_MESSAGE');
-          this.showAlert(errorMessage);
+        .catch(() => {
+          this.showAlert(this.$t('CANNED_MGMT.DELETE.API.ERROR_MESSAGE'));
         });
     },
   },
diff --git a/app/javascript/dashboard/store/modules/cannedResponse.js b/app/javascript/dashboard/store/modules/cannedResponse.js
index 7b24d1171..24f53a170 100644
--- a/app/javascript/dashboard/store/modules/cannedResponse.js
+++ b/app/javascript/dashboard/store/modules/cannedResponse.js
@@ -1,4 +1,3 @@
-import { throwErrorMessage } from 'dashboard/store/utils/api';
 import * as MutationHelpers from 'shared/helpers/vuex/mutationHelpers';
 import * as types from '../mutation-types';
 import CannedResponseAPI from '../../api/cannedResponse';
@@ -47,10 +46,8 @@ const actions = {
       const response = await CannedResponseAPI.create(cannedObj);
       commit(types.default.ADD_CANNED, response.data);
       commit(types.default.SET_CANNED_UI_FLAG, { creatingItem: false });
-      return response.data;
     } catch (error) {
       commit(types.default.SET_CANNED_UI_FLAG, { creatingItem: false });
-      return throwErrorMessage(error);
     }
   },
 
@@ -63,10 +60,8 @@ const actions = {
       const response = await CannedResponseAPI.update(id, updateObj);
       commit(types.default.EDIT_CANNED, response.data);
       commit(types.default.SET_CANNED_UI_FLAG, { updatingItem: false });
-      return response.data;
     } catch (error) {
       commit(types.default.SET_CANNED_UI_FLAG, { updatingItem: false });
-      return throwErrorMessage(error);
     }
   },
 
@@ -76,10 +71,8 @@ const actions = {
       await CannedResponseAPI.delete(id);
       commit(types.default.DELETE_CANNED, id);
       commit(types.default.SET_CANNED_UI_FLAG, { deletingItem: true });
-      return id;
     } catch (error) {
       commit(types.default.SET_CANNED_UI_FLAG, { deletingItem: true });
-      return throwErrorMessage(error);
     }
   },
 };
diff --git a/app/views/devise/mailer/confirmation_instructions.html.erb b/app/views/devise/mailer/confirmation_instructions.html.erb
index 41168a2d0..7e1338b19 100644
--- a/app/views/devise/mailer/confirmation_instructions.html.erb
+++ b/app/views/devise/mailer/confirmation_instructions.html.erb
@@ -1,27 +1,22 @@
-<p>Hi, <%= @resource.name %>!</p>
+<p>Welcome, <%= @resource.name %>!</p>
 
 <% account_user = @resource&.account_users&.first %>
-
 <% if account_user&.inviter.present? && @resource.unconfirmed_email.blank? %>
-  <p><%= account_user.inviter.name %>, with <%= account_user.account.name %>, has invited you to try out <%= global_config['BRAND_NAME'] || 'Chatwoot' %>.</p>
+  <p><%= account_user.inviter.name %>, with <%= account_user.account.name %>, has invited you to try out <%= global_config['BRAND_NAME'] || 'Chatwoot' %>! </p>
 <% end %>
 
 <% if @resource.confirmed? %>
-  <p>You can login to your <%= global_config['BRAND_NAME'] || 'Chatwoot' %> account through the link below:</p>
+<p>You can login to your account through the link below:</p>
 <% else %>
-  <p>
-    Welcome to <%= global_config['BRAND_NAME'] || 'Chatwoot' %>! We have a suite of powerful tools ready for you to explore. Before that we quickly need to verify your email address to know it's really you.
-  </p>
-  <p>Please take a moment and click the link below and activate your account.</p>
+<p>You can confirm your account email through the link below:</p>
 <% end %>
 
-
 <% if @resource.unconfirmed_email.present? %>
-  <p><%= link_to 'Confirm my account', frontend_url('auth/confirmation', confirmation_token: @token) %></p>
+<p><%= link_to 'Confirm my account', frontend_url('auth/confirmation', confirmation_token: @token) %></p>
 <% elsif @resource.confirmed? %>
-  <p><%= link_to 'Login to my account', frontend_url('auth/sign_in') %></p>
+<p><%= link_to 'Login to my account', frontend_url('auth/sign_in') %></p>
 <% elsif account_user&.inviter.present? %>
-  <p><%= link_to 'Confirm my account', frontend_url('auth/password/edit', reset_password_token: @resource.send(:set_reset_password_token)) %></p>
+<p><%= link_to 'Confirm my account', frontend_url('auth/password/edit', reset_password_token: @resource.send(:set_reset_password_token)) %></p>
 <% else %>
-  <p><%= link_to 'Confirm my account', frontend_url('auth/confirmation', confirmation_token: @token) %></p>
+<p><%= link_to 'Confirm my account', frontend_url('auth/confirmation', confirmation_token: @token) %></p>
 <% end %>
diff --git a/spec/mailers/confirmation_instructions_spec.rb b/spec/mailers/confirmation_instructions_spec.rb
index 9eeed85d2..a6f3f63af 100644
--- a/spec/mailers/confirmation_instructions_spec.rb
+++ b/spec/mailers/confirmation_instructions_spec.rb
@@ -22,7 +22,7 @@ RSpec.describe 'Confirmation Instructions', type: :mailer do
     end
 
     it 'uses the user\'s name' do
-      expect(mail.body).to match("Hi #{CGI.escapeHTML(confirmable_user.name)},")
+      expect(mail.body).to match("Welcome, #{CGI.escapeHTML(confirmable_user.name)}!")
     end
 
     it 'does not refer to the inviter and their account' do
@@ -39,7 +39,7 @@ RSpec.describe 'Confirmation Instructions', type: :mailer do
 
       it 'refers to the inviter and their account' do
         expect(mail.body).to match(
-          "#{CGI.escapeHTML(inviter_val.name)}, with #{CGI.escapeHTML(account.name)}, has invited you to try out Chatwoot."
+          "#{CGI.escapeHTML(inviter_val.name)}, with #{CGI.escapeHTML(account.name)}, has invited you to try out Chatwoot!"
         )
       end
 

From 55e5fa220570a8f1bc5c45c101c737e9e07357f6 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Wed, 10 May 2023 17:49:17 +0530
Subject: [PATCH 073/101] chore: Add the specs for sort conversation (#7047)

---
 .../specs/conversations/actions.spec.js       |  27 +++++
 .../specs/conversations/getters.spec.js       | 110 +++++++++++++++---
 .../specs/conversations/mutations.spec.js     |  23 ++++
 3 files changed, 147 insertions(+), 13 deletions(-)

diff --git a/app/javascript/dashboard/store/modules/specs/conversations/actions.spec.js b/app/javascript/dashboard/store/modules/specs/conversations/actions.spec.js
index d25b70589..b2d68c94f 100644
--- a/app/javascript/dashboard/store/modules/specs/conversations/actions.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/conversations/actions.spec.js
@@ -404,6 +404,33 @@ describe('#actions', () => {
       expect(commit.mock.calls).toEqual([[types.CLEAR_CONVERSATION_FILTERS]]);
     });
   });
+
+  describe('#updateConversationLastActivity', () => {
+    it('sends correct action', async () => {
+      await actions.updateConversationLastActivity(
+        { commit },
+        { conversationId: 1, lastActivityAt: 12121212 }
+      );
+      expect(commit.mock.calls).toEqual([
+        [
+          'UPDATE_CONVERSATION_LAST_ACTIVITY',
+          { conversationId: 1, lastActivityAt: 12121212 },
+        ],
+      ]);
+    });
+  });
+
+  describe('#setChatSortFilter', () => {
+    it('sends correct action', async () => {
+      await actions.setChatSortFilter(
+        { commit },
+        { data: 'sort_on_created_at' }
+      );
+      expect(commit.mock.calls).toEqual([
+        ['CHANGE_CHAT_SORT_FILTER', { data: 'sort_on_created_at' }],
+      ]);
+    });
+  });
 });
 
 describe('#deleteMessage', () => {
diff --git a/app/javascript/dashboard/store/modules/specs/conversations/getters.spec.js b/app/javascript/dashboard/store/modules/specs/conversations/getters.spec.js
index 7dc0dade5..f9d775df2 100644
--- a/app/javascript/dashboard/store/modules/specs/conversations/getters.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/conversations/getters.spec.js
@@ -6,43 +6,127 @@ commonHelpers();
 
 describe('#getters', () => {
   describe('#getAllConversations', () => {
-    it('order conversations based on last message date', () => {
+    it('order conversations based on last activity', () => {
       const state = {
         allConversations: [
           {
             id: 1,
             messages: [
               {
-                created_at: 1466424480,
+                content: 'test1',
               },
             ],
+            created_at: 2466424490,
+            last_activity_at: 2466424490,
           },
           {
             id: 2,
-            messages: [
-              {
-                created_at: 2466424490,
-              },
-            ],
+            messages: [{ content: 'test2' }],
+            created_at: 1466424480,
+            last_activity_at: 1466424480,
           },
         ],
       };
+
+      expect(getters.getAllConversations(state)).toEqual([
+        {
+          id: 1,
+          messages: [
+            {
+              content: 'test1',
+            },
+          ],
+          created_at: 2466424490,
+          last_activity_at: 2466424490,
+        },
+        {
+          id: 2,
+          messages: [{ content: 'test2' }],
+          created_at: 1466424480,
+          last_activity_at: 1466424480,
+        },
+      ]);
+    });
+    it('order conversations based on created at', () => {
+      const state = {
+        allConversations: [
+          {
+            id: 1,
+            messages: [
+              {
+                content: 'test1',
+              },
+            ],
+            created_at: 1683645801, // Tuesday, 9 May 2023
+            last_activity_at: 2466424490,
+          },
+          {
+            id: 2,
+            messages: [{ content: 'test2' }],
+            created_at: 1652109801, // Monday, 9 May 2022
+            last_activity_at: 1466424480,
+          },
+        ],
+        chatSortFilter: 'sort_on_created_at',
+      };
+
       expect(getters.getAllConversations(state)).toEqual([
         {
           id: 2,
-          messages: [
-            {
-              created_at: 2466424490,
-            },
-          ],
+          messages: [{ content: 'test2' }],
+          created_at: 1652109801,
+          last_activity_at: 1466424480,
         },
         {
           id: 1,
           messages: [
             {
-              created_at: 1466424480,
+              content: 'test1',
             },
           ],
+          created_at: 1683645801,
+          last_activity_at: 2466424490,
+        },
+      ]);
+    });
+    it('order conversations based on default order', () => {
+      const state = {
+        allConversations: [
+          {
+            id: 1,
+            messages: [
+              {
+                content: 'test1',
+              },
+            ],
+            created_at: 2466424490,
+            last_activity_at: 2466424490,
+          },
+          {
+            id: 2,
+            messages: [{ content: 'test2' }],
+            created_at: 1466424480,
+            last_activity_at: 1466424480,
+          },
+        ],
+      };
+
+      expect(getters.getAllConversations(state)).toEqual([
+        {
+          id: 1,
+          messages: [
+            {
+              content: 'test1',
+            },
+          ],
+          created_at: 2466424490,
+          last_activity_at: 2466424490,
+        },
+        {
+          id: 2,
+          messages: [{ content: 'test2' }],
+          created_at: 1466424480,
+          last_activity_at: 1466424480,
         },
       ]);
     });
diff --git a/app/javascript/dashboard/store/modules/specs/conversations/mutations.spec.js b/app/javascript/dashboard/store/modules/specs/conversations/mutations.spec.js
index 738de5c55..2c4bdb2cc 100644
--- a/app/javascript/dashboard/store/modules/specs/conversations/mutations.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/conversations/mutations.spec.js
@@ -39,6 +39,19 @@ describe('#mutations', () => {
 
   describe('#ASSIGN_TEAM', () => {
     it('clears current chat window', () => {
+      const state = { allConversations: [{ id: 1, meta: {} }] };
+      mutations[types.UPDATE_CONVERSATION_LAST_ACTIVITY](state, {
+        lastActivityAt: 1602256198,
+        conversationId: 1,
+      });
+
+      expect(state.allConversations).toEqual([
+        { id: 1, meta: {}, last_activity_at: 1602256198 },
+      ]);
+    });
+  });
+  describe('#UPDATE_CONVERSATION_LAST_ACTIVITY', () => {
+    it('update conversation last activity', () => {
       const state = { allConversations: [{ id: 1, meta: {} }] };
       mutations[types.ASSIGN_TEAM](state, {
         team: { id: 1, name: 'Team 1' },
@@ -50,6 +63,16 @@ describe('#mutations', () => {
     });
   });
 
+  describe('#CHANGE_CHAT_SORT_FILTER', () => {
+    it('update conversation sort filter', () => {
+      const state = { chatSortFilter: 'latest' };
+      mutations[types.CHANGE_CHAT_SORT_FILTER](state, {
+        data: 'sort_on_created_at',
+      });
+      expect(state.chatSortFilter).toEqual({ data: 'sort_on_created_at' });
+    });
+  });
+
   describe('#SET_CURRENT_CHAT_WINDOW', () => {
     it('set current chat window', () => {
       const state = { selectedChatId: 1 };

From 86384bf876d12f157418782694d3b14cf5f7d5d3 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Wed, 10 May 2023 17:50:37 +0530
Subject: [PATCH 074/101] feat: Reply suggestion and summary generation using
 OpenAI (#7029)

Add `reply_suggestions` and `summary_generation` options for OpenAI integration

Fixes: https://linear.app/chatwoot/issue/CW-1595/frontend-for-generating-conversation-summary

Co-authored-by: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Co-authored-by: Sojan Jose <sojan@pepalo.com>
---
 .../dashboard/api/integrations/openapi.js     |  20 ++-
 .../assets/scss/_foundation-settings.scss     |   2 +-
 .../dashboard/components/ui/WootButton.vue    |  14 +-
 .../components/widgets/AIAssistanceButton.vue | 126 +++++++++++-------
 .../widgets/WootWriter/ReplyBottomPanel.vue   |   4 +-
 .../i18n/locale/en/integrations.json          |   2 +
 .../FluentIcon/dashboard-icons.json           |   8 ++
 app/javascript/shared/components/Spinner.vue  |  15 ++-
 .../specs/__snapshots__/Spinner.spec.js.snap  |   2 +-
 lib/integrations/openai/processor_service.rb  |  44 ++++--
 10 files changed, 169 insertions(+), 68 deletions(-)

diff --git a/app/javascript/dashboard/api/integrations/openapi.js b/app/javascript/dashboard/api/integrations/openapi.js
index 88507bf81..641cfcfbd 100644
--- a/app/javascript/dashboard/api/integrations/openapi.js
+++ b/app/javascript/dashboard/api/integrations/openapi.js
@@ -7,14 +7,22 @@ class OpenAIAPI extends ApiClient {
     super('integrations', { accountScoped: true });
   }
 
-  processEvent({ name = 'rephrase', content, tone, hookId }) {
+  processEvent({ type = 'rephrase', content, tone, conversationId, hookId }) {
+    let data = {
+      tone,
+      content,
+    };
+
+    if (type === 'reply_suggestion' || type === 'summarize') {
+      data = {
+        conversation_display_id: conversationId,
+      };
+    }
+
     return axios.post(`${this.url}/hooks/${hookId}/process_event`, {
       event: {
-        name: name,
-        data: {
-          tone,
-          content,
-        },
+        name: type,
+        data,
       },
     });
   }
diff --git a/app/javascript/dashboard/assets/scss/_foundation-settings.scss b/app/javascript/dashboard/assets/scss/_foundation-settings.scss
index 28defb4fd..a6e0b1aa3 100644
--- a/app/javascript/dashboard/assets/scss/_foundation-settings.scss
+++ b/app/javascript/dashboard/assets/scss/_foundation-settings.scss
@@ -254,7 +254,7 @@ $button-sizes: (tiny: var(--font-size-micro),
   default: var(--font-size-small),
   large: var(--font-size-medium));
 $button-palette: $foundation-palette;
-$button-opacity-disabled: 0.25;
+$button-opacity-disabled: 0.4;
 $button-background-hover-lightness: -20%;
 $button-hollow-hover-lightness: -50%;
 $button-transition: background-color 0.25s ease-out,
diff --git a/app/javascript/dashboard/components/ui/WootButton.vue b/app/javascript/dashboard/components/ui/WootButton.vue
index 1571109c8..254f12d2f 100644
--- a/app/javascript/dashboard/components/ui/WootButton.vue
+++ b/app/javascript/dashboard/components/ui/WootButton.vue
@@ -6,7 +6,11 @@
     :disabled="isDisabled || isLoading"
     @click="handleClick"
   >
-    <spinner v-if="isLoading" size="small" />
+    <spinner
+      v-if="isLoading"
+      size="small"
+      :color-scheme="showDarkSpinner ? 'dark' : ''"
+    />
     <emoji-or-icon
       v-else-if="icon || emoji"
       class="icon"
@@ -108,6 +112,14 @@ export default {
           return 16;
       }
     },
+    showDarkSpinner() {
+      return (
+        this.colorScheme === 'secondary' ||
+        this.variant === 'clear' ||
+        this.variant === 'link' ||
+        this.variant === 'hollow'
+      );
+    },
   },
   methods: {
     handleClick(evt) {
diff --git a/app/javascript/dashboard/components/widgets/AIAssistanceButton.vue b/app/javascript/dashboard/components/widgets/AIAssistanceButton.vue
index 7c58f2aeb..98629edf3 100644
--- a/app/javascript/dashboard/components/widgets/AIAssistanceButton.vue
+++ b/app/javascript/dashboard/components/widgets/AIAssistanceButton.vue
@@ -1,45 +1,70 @@
 <template>
   <div v-if="isAIIntegrationEnabled" class="position-relative">
-    <woot-button
-      v-tooltip.top-end="$t('INTEGRATION_SETTINGS.OPEN_AI.TITLE')"
-      icon="wand"
-      color-scheme="secondary"
-      variant="smooth"
-      size="small"
-      @click="toggleDropdown"
-    />
-    <div
-      v-if="showDropdown"
-      v-on-clickaway="closeDropdown"
-      class="dropdown-pane dropdown-pane--open ai-modal"
-    >
-      <h4 class="sub-block-title margin-top-1">
-        {{ $t('INTEGRATION_SETTINGS.OPEN_AI.TITLE') }}
-      </h4>
-      <p>
-        {{ $t('INTEGRATION_SETTINGS.OPEN_AI.SUBTITLE') }}
-      </p>
-      <label>
-        {{ $t('INTEGRATION_SETTINGS.OPEN_AI.TONE.TITLE') }}
-      </label>
-      <div class="tone__item">
-        <select v-model="activeTone" class="status--filter small">
-          <option v-for="tone in tones" :key="tone.key" :value="tone.key">
-            {{ tone.value }}
-          </option>
-        </select>
-      </div>
-      <div class="modal-footer flex-container align-right">
-        <woot-button variant="clear" size="small" @click="closeDropdown">
-          {{ $t('INTEGRATION_SETTINGS.OPEN_AI.BUTTONS.CANCEL') }}
-        </woot-button>
-        <woot-button
-          :is-loading="isGenerating"
-          size="small"
-          @click="processText"
-        >
-          {{ buttonText }}
-        </woot-button>
+    <div v-if="!message">
+      <woot-button
+        v-if="isPrivateNote"
+        v-tooltip.top-end="$t('INTEGRATION_SETTINGS.OPEN_AI.SUMMARY_TITLE')"
+        icon="book-pulse"
+        color-scheme="secondary"
+        variant="smooth"
+        size="small"
+        :is-loading="uiFlags.summarize"
+        @click="processEvent('summarize')"
+      />
+      <woot-button
+        v-else
+        v-tooltip.top-end="$t('INTEGRATION_SETTINGS.OPEN_AI.REPLY_TITLE')"
+        icon="wand"
+        color-scheme="secondary"
+        variant="smooth"
+        size="small"
+        :is-loading="uiFlags.reply_suggestion"
+        @click="processEvent('reply_suggestion')"
+      />
+    </div>
+
+    <div v-else>
+      <woot-button
+        v-tooltip.top-end="$t('INTEGRATION_SETTINGS.OPEN_AI.TITLE')"
+        icon="text-grammar-wand"
+        color-scheme="secondary"
+        variant="smooth"
+        size="small"
+        @click="toggleDropdown"
+      />
+      <div
+        v-if="showDropdown"
+        v-on-clickaway="closeDropdown"
+        class="dropdown-pane dropdown-pane--open ai-modal"
+      >
+        <h4 class="sub-block-title margin-top-1">
+          {{ $t('INTEGRATION_SETTINGS.OPEN_AI.TITLE') }}
+        </h4>
+        <p>
+          {{ $t('INTEGRATION_SETTINGS.OPEN_AI.SUBTITLE') }}
+        </p>
+        <label>
+          {{ $t('INTEGRATION_SETTINGS.OPEN_AI.TONE.TITLE') }}
+        </label>
+        <div class="tone__item">
+          <select v-model="activeTone" class="status--filter small">
+            <option v-for="tone in tones" :key="tone.key" :value="tone.key">
+              {{ tone.value }}
+            </option>
+          </select>
+        </div>
+        <div class="modal-footer flex-container align-right">
+          <woot-button variant="clear" size="small" @click="closeDropdown">
+            {{ $t('INTEGRATION_SETTINGS.OPEN_AI.BUTTONS.CANCEL') }}
+          </woot-button>
+          <woot-button
+            :is-loading="uiFlags.rephrase"
+            size="small"
+            @click="processEvent('rephrase')"
+          >
+            {{ buttonText }}
+          </woot-button>
+        </div>
       </div>
     </div>
   </div>
@@ -61,10 +86,18 @@ export default {
       type: String,
       default: '',
     },
+    isPrivateNote: {
+      type: Boolean,
+      default: false,
+    },
   },
   data() {
     return {
-      isGenerating: false,
+      uiFlags: {
+        rephrase: false,
+        reply_suggestion: false,
+        summarize: false,
+      },
       showDropdown: false,
       activeTone: 'professional',
       tones: [
@@ -94,7 +127,7 @@ export default {
       ).hooks[0].id;
     },
     buttonText() {
-      return this.isGenerating
+      return this.uiFlags.isRephrasing
         ? this.$t('INTEGRATION_SETTINGS.OPEN_AI.BUTTONS.GENERATING')
         : this.$t('INTEGRATION_SETTINGS.OPEN_AI.BUTTONS.GENERATE');
     },
@@ -111,14 +144,15 @@ export default {
     closeDropdown() {
       this.showDropdown = false;
     },
-    async processText() {
-      this.isGenerating = true;
+    async processEvent(type = 'rephrase') {
+      this.uiFlags[type] = true;
       try {
         const result = await OpenAPI.processEvent({
           hookId: this.hookId,
-          type: 'rephrase',
+          type,
           content: this.message,
           tone: this.activeTone,
+          conversationId: this.conversationId,
         });
         const {
           data: { message: generatedMessage },
@@ -128,7 +162,7 @@ export default {
       } catch (error) {
         this.showAlert(this.$t('INTEGRATION_SETTINGS.OPEN_AI.GENERATE_ERROR'));
       } finally {
-        this.isGenerating = false;
+        this.uiFlags[type] = false;
       }
     },
   },
diff --git a/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue b/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue
index 5f638d6dc..ccac0cd93 100644
--- a/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue
+++ b/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue
@@ -38,12 +38,12 @@
       </file-upload>
       <woot-button
         v-if="showAudioRecorderButton"
+        v-tooltip.top-end="$t('CONVERSATION.REPLYBOX.TIP_AUDIORECORDER_ICON')"
         :icon="!isRecordingAudio ? 'microphone' : 'microphone-off'"
         emoji="🎤"
         :color-scheme="!isRecordingAudio ? 'secondary' : 'alert'"
         variant="smooth"
         size="small"
-        :title="$t('CONVERSATION.REPLYBOX.TIP_AUDIORECORDER_ICON')"
         @click="toggleAudioRecorder"
       />
       <woot-button
@@ -92,8 +92,8 @@
         :conversation-id="conversationId"
       />
       <AIAssistanceButton
-        v-if="message"
         :conversation-id="conversationId"
+        :is-private-note="isOnPrivateNote"
         :message="message"
         @replace-text="replaceText"
       />
diff --git a/app/javascript/dashboard/i18n/locale/en/integrations.json b/app/javascript/dashboard/i18n/locale/en/integrations.json
index f37054878..3821fe6e8 100644
--- a/app/javascript/dashboard/i18n/locale/en/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/en/integrations.json
@@ -84,6 +84,8 @@
     },
     "OPEN_AI": {
       "TITLE": "Improve With AI",
+      "SUMMARY_TITLE": "Summary with AI",
+      "REPLY_TITLE": "Reply suggestion with AI",
       "SUBTITLE": "An improved reply will be generated using AI, based on your current draft.",
       "TONE": {
         "TITLE": "Tone",
diff --git a/app/javascript/shared/components/FluentIcon/dashboard-icons.json b/app/javascript/shared/components/FluentIcon/dashboard-icons.json
index 42514a8fb..f19a9e57c 100644
--- a/app/javascript/shared/components/FluentIcon/dashboard-icons.json
+++ b/app/javascript/shared/components/FluentIcon/dashboard-icons.json
@@ -32,6 +32,10 @@
   "book-contacts-outline": "M15.5 12.25a.75.75 0 0 0-.75-.75h-5a.75.75 0 0 0-.75.75v.5c0 1 1.383 1.75 3.25 1.75s3.25-.75 3.25-1.75v-.5ZM14 8.745C14 7.78 13.217 7 12.25 7s-1.75.779-1.75 1.745a1.75 1.75 0 1 0 3.5 0ZM4 4.5A2.5 2.5 0 0 1 6.5 2H18a2.5 2.5 0 0 1 2.5 2.5v14.25a.75.75 0 0 1-.75.75H5.5a1 1 0 0 0 1 1h13.25a.75.75 0 0 1 0 1.5H6.5A2.5 2.5 0 0 1 4 19.5v-15Zm1.5 0V18H19V4.5a1 1 0 0 0-1-1H6.5a1 1 0 0 0-1 1Z",
   "book-open-globe-outline": "M3.5 5.75a.25.25 0 0 1 .25-.25H10c.69 0 1.25.56 1.25 1.25v8.959a6.49 6.49 0 0 1 1.5-2.646V6.75c0-.69.56-1.25 1.25-1.25h6.25a.25.25 0 0 1 .25.25v5.982A6.518 6.518 0 0 1 22 12.81V5.75A1.75 1.75 0 0 0 20.25 4H14c-.788 0-1.499.331-2 .863A2.742 2.742 0 0 0 10 4H3.75A1.75 1.75 0 0 0 2 5.75v12.5c0 .966.784 1.75 1.75 1.75H10c.495 0 .96-.13 1.36-.36a6.473 6.473 0 0 1-.343-1.663A1.248 1.248 0 0 1 10 18.5H3.75a.25.25 0 0 1-.25-.25V5.75ZM16.007 17c.04-1.415.248-2.669.553-3.585.171-.513.364-.893.554-1.134.195-.247.329-.281.386-.281.057 0 .192.034.386.281.19.241.383.62.554 1.134.305.916.513 2.17.553 3.585h-2.986Zm-.396-3.9c.108-.323.23-.622.368-.887A5.504 5.504 0 0 0 12.023 17h2.984c.04-1.5.26-2.866.604-3.9Zm3.778 0a6.133 6.133 0 0 0-.368-.887A5.504 5.504 0 0 1 22.978 17h-2.985c-.04-1.5-.26-2.866-.604-3.9Zm.604 4.9h2.985a5.504 5.504 0 0 1-3.957 4.787c.138-.265.26-.564.368-.886.345-1.035.564-2.4.604-3.901Zm-2.107 4.719c-.194.247-.329.281-.386.281-.057 0-.191-.034-.386-.281-.19-.241-.383-.62-.554-1.135-.305-.915-.513-2.17-.553-3.584h2.986c-.04 1.415-.248 2.669-.553 3.584-.171.514-.364.894-.554 1.135ZM12.023 18a5.504 5.504 0 0 0 3.956 4.787 6.133 6.133 0 0 1-.367-.886c-.346-1.035-.565-2.4-.605-3.901h-2.984Z",
   "book-outline": "M4 4.5A2.5 2.5 0 0 1 6.5 2H18a2.5 2.5 0 0 1 2.5 2.5v14.25a.75.75 0 0 1-.75.75H5.5a1 1 0 0 0 1 1h13.25a.75.75 0 0 1 0 1.5H6.5A2.5 2.5 0 0 1 4 19.5v-15ZM5.5 18H19V4.5a1 1 0 0 0-1-1H6.5a1 1 0 0 0-1 1V18Z",
+  "book-pulse-outline": [
+    "M11.69 7.458a.75.75 0 0 0-1.36-.043L8.785 10.5H7.75a.75.75 0 0 0 0 1.5h1.5a.75.75 0 0 0 .67-.415l1.023-2.044 2.116 5.001a.75.75 0 0 0 1.339.086L15.93 12h.819a.75.75 0 0 0 0-1.5H15.5a.75.75 0 0 0-.648.372l-.995 1.706-2.166-5.12Z",
+    "M6.5 2A2.5 2.5 0 0 0 4 4.5v15A2.5 2.5 0 0 0 6.5 22h13.25a.75.75 0 0 0 0-1.5H6.5a1 1 0 0 1-1-1h14.25a.75.75 0 0 0 .75-.75V4.5A2.5 2.5 0 0 0 18 2H6.5ZM19 18H5.5V4.5a1 1 0 0 1 1-1H18a1 1 0 0 1 1 1V18Z"
+  ],
   "bot-outline": "M17.753 14a2.25 2.25 0 0 1 2.25 2.25v.905a3.75 3.75 0 0 1-1.307 2.846C17.13 21.345 14.89 22 12 22c-2.89 0-5.128-.656-6.691-2a3.75 3.75 0 0 1-1.306-2.843v-.908A2.25 2.25 0 0 1 6.253 14h11.5Zm0 1.5h-11.5a.75.75 0 0 0-.75.75v.908c0 .655.286 1.278.784 1.706C7.545 19.945 9.44 20.502 12 20.502c2.56 0 4.458-.557 5.719-1.64a2.25 2.25 0 0 0 .784-1.706v-.906a.75.75 0 0 0-.75-.75ZM11.898 2.008 12 2a.75.75 0 0 1 .743.648l.007.102V3.5h3.5a2.25 2.25 0 0 1 2.25 2.25v4.505a2.25 2.25 0 0 1-2.25 2.25h-8.5a2.25 2.25 0 0 1-2.25-2.25V5.75A2.25 2.25 0 0 1 7.75 3.5h3.5v-.749a.75.75 0 0 1 .648-.743L12 2l-.102.007ZM16.25 5h-8.5a.75.75 0 0 0-.75.75v4.505c0 .414.336.75.75.75h8.5a.75.75 0 0 0 .75-.75V5.75a.75.75 0 0 0-.75-.75Zm-6.5 1.5a1.25 1.25 0 1 1 0 2.5 1.25 1.25 0 0 1 0-2.5Zm4.492 0a1.25 1.25 0 1 1 0 2.499 1.25 1.25 0 0 1 0-2.499Z",
   "brand-facebook-outline": "M24 12.073c0-6.627-5.373-12-12-12s-12 5.373-12 12c0 5.99 4.388 10.954 10.125 11.854v-8.385H7.078v-3.47h3.047V9.43c0-3.007 1.792-4.669 4.533-4.669 1.312 0 2.686.235 2.686.235v2.953H15.83c-1.491 0-1.956.925-1.956 1.874v2.25h3.328l-.532 3.47h-2.796v8.385C19.612 23.027 24 18.062 24 12.073z",
   "brand-instagram-outline": "M 8 3 C 5.243 3 3 5.243 3 8 L 3 16 C 3 18.757 5.243 21 8 21 L 16 21 C 18.757 21 21 18.757 21 16 L 21 8 C 21 5.243 18.757 3 16 3 L 8 3 z M 8 5 L 16 5 C 17.654 5 19 6.346 19 8 L 19 16 C 19 17.654 17.654 19 16 19 L 8 19 C 6.346 19 5 17.654 5 16 L 5 8 C 5 6.346 6.346 5 8 5 z M 17 6 A 1 1 0 0 0 16 7 A 1 1 0 0 0 17 8 A 1 1 0 0 0 18 7 A 1 1 0 0 0 17 6 z M 12 7 C 9.243 7 7 9.243 7 12 C 7 14.757 9.243 17 12 17 C 14.757 17 17 14.757 17 12 C 17 9.243 14.757 7 12 7 z M 12 9 C 13.654 9 15 10.346 15 12 C 15 13.654 13.654 15 12 15 C 10.346 15 9 13.654 9 12 C 9 10.346 10.346 9 12 9 z",
@@ -175,6 +179,10 @@
     "M8.78 1.22a.75.75 0 0 0-1.06 1.06l.72.72H6.25A3.25 3.25 0 0 0 3 6.25v2.19l-.72-.72a.75.75 0 0 0-1.06 1.06l2 2a.748.748 0 0 0 1.06 0l2-2a.747.747 0 0 0 0-1.06.75.75 0 0 0-1.06 0l-.72.72V6.25c0-.966.784-1.75 1.75-1.75h2.19l-.72.72a.75.75 0 0 0 .78 1.237.75.75 0 0 0 .28-.177l2-2a.75.75 0 0 0 0-1.06l-2-2Z",
     "M11.832 3a1.755 1.755 0 0 1 0 1.5H14v4h-4V6.475l-.513.512a1.742 1.742 0 0 1-.987.495V8.5H7.482c-.052.361-.217.71-.495.987L6.475 10H8.5v4h-4v-2.168a1.755 1.755 0 0 1-1.5 0v5.918A3.25 3.25 0 0 0 6.25 21h11.5A3.25 3.25 0 0 0 21 17.75V6.25A3.25 3.25 0 0 0 17.75 3h-5.918ZM10 14v-4h4v4h-4Zm5.5 0v-4h4v4h-4ZM14 15.5v4h-4v-4h4Zm1.5 4v-4h4v2.25a1.75 1.75 0 0 1-1.75 1.75H15.5Zm0-11v-4h2.25c.966 0 1.75.784 1.75 1.75V8.5h-4Zm-11 7h4v4H6.25a1.75 1.75 0 0 1-1.75-1.75V15.5Z"
   ],
+  "text-grammar-wand-outline": [
+    "M2.75 17h7.775l-1.5 1.5H2.75a.75.75 0 0 1-.102-1.493L2.75 17ZM2.75 14.5h7.564a1.745 1.745 0 0 1-.241-1.5H2.75l-.102.007A.75.75 0 0 0 2.75 14.5ZM12.72 16.22a.75.75 0 1 1 1.06 1.06l-4.5 4.5a.75.75 0 0 1-1.06-1.06l4.5-4.5ZM2.75 9h10.5a.75.75 0 0 1 .102 1.493l-.102.007H2.75a.75.75 0 0 1-.102-1.493L2.75 9ZM2.75 5h18.5a.75.75 0 0 1 .102 1.493l-.102.007H2.75a.75.75 0 0 1-.102-1.493L2.75 5Z",
+    "M16.5 8a.75.75 0 0 1 .744.658l.14 1.13a3.25 3.25 0 0 0 2.828 2.829l1.13.139a.75.75 0 0 1 0 1.488l-1.13.14a3.25 3.25 0 0 0-2.829 2.828l-.139 1.13a.75.75 0 0 1-1.488 0l-.14-1.13a3.25 3.25 0 0 0-2.828-2.829l-1.13-.139a.75.75 0 0 1 0-1.488l1.13-.14a3.25 3.25 0 0 0 2.829-2.828l.139-1.13A.75.75 0 0 1 16.5 8Zm0 3.774a4.761 4.761 0 0 1-1.726 1.726 4.761 4.761 0 0 1 1.726 1.726 4.761 4.761 0 0 1 1.726-1.726 4.761 4.761 0 0 1-1.726-1.726Z"
+  ],
   "translate-outline": "M16.953 5.303a1 1 0 0 0-1.906-.606c-.124.389-.236.899-.324 1.344-.565.012-1.12 0-1.652-.038a1 1 0 1 0-.142 1.995c.46.032.934.048 1.416.047a25.649 25.649 0 0 0-.24 1.698c-1.263.716-2.142 1.684-2.636 2.7-.624 1.283-.7 2.857.239 3.883.675.736 1.704.758 2.499.588.322-.068.654-.176.988-.32a1 1 0 0 0 1.746-.93 13.17 13.17 0 0 0-.041-.115 8.404 8.404 0 0 0 2.735-4.06c.286.251.507.55.658.864.284.594.334 1.271.099 1.91-.234.633-.78 1.313-1.84 1.843a1 1 0 0 0 .895 1.789c1.44-.72 2.385-1.758 2.821-2.94a4.436 4.436 0 0 0-.17-3.464 4.752 4.752 0 0 0-2.104-2.165C19.998 9.22 20 9.11 20 9a1 1 0 0 0-1.974-.23 5.984 5.984 0 0 0-1.796.138c.047-.305.102-.626.166-.964a20.142 20.142 0 0 0 2.842-.473 1 1 0 0 0-.476-1.942c-.622.152-1.286.272-1.964.358.048-.208.1-.409.155-.584Zm-3.686 8.015c.166-.34.414-.697.758-1.037.02.348.053.67.098.973.083.56.207 1.048.341 1.477a3.41 3.41 0 0 1-.674.227c-.429.092-.588.019-.614.006l-.004-.001c-.162-.193-.329-.774.095-1.645Zm4.498-2.562a6.362 6.362 0 0 1-1.568 2.73 7.763 7.763 0 0 1-.095-.525 10.294 10.294 0 0 1-.088-1.904c.033-.013.067-.024.1-.036l1.651-.265Zm0 0-1.651.265c.602-.212 1.155-.29 1.651-.265ZM7.536 6.29a6.342 6.342 0 0 0-4.456.331 1 1 0 0 0 .848 1.811 4.342 4.342 0 0 1 3.049-.222c.364.107.568.248.69.37.12.123.203.27.257.454.067.225.087.446.09.69a8.195 8.195 0 0 0-.555-.117c-1.146-.199-2.733-.215-4.262.64-1.271.713-1.796 2.168-1.682 3.448.12 1.326.94 2.679 2.572 3.136 1.48.414 2.913-.045 3.877-.507l.08-.04a1 1 0 0 0 1.96-.281V10.5c0-.053.002-.12.005-.2.012-.417.034-1.16-.168-1.838a3.043 3.043 0 0 0-.755-1.29c-.394-.398-.91-.694-1.547-.881h-.003Zm-.419 5.288c.344.06.647.143.887.222v2.197a7.021 7.021 0 0 1-.905.524c-.792.38-1.682.605-2.473.384-.698-.195-1.06-.742-1.119-1.389-.062-.693.243-1.286.667-1.523.987-.553 2.06-.569 2.943-.415Z",
   "eye-show-outline": "M12 9.005a4 4 0 1 1 0 8 4 4 0 0 1 0-8Zm0 1.5a2.5 2.5 0 1 0 0 5 2.5 2.5 0 0 0 0-5ZM12 5.5c4.613 0 8.596 3.15 9.701 7.564a.75.75 0 1 1-1.455.365 8.503 8.503 0 0 0-16.493.004.75.75 0 0 1-1.455-.363A10.003 10.003 0 0 1 12 5.5Z",
   "eye-hide-outline": "M2.22 2.22a.75.75 0 0 0-.073.976l.073.084 4.034 4.035a9.986 9.986 0 0 0-3.955 5.75.75.75 0 0 0 1.455.364 8.49 8.49 0 0 1 3.58-5.034l1.81 1.81A4 4 0 0 0 14.8 15.86l5.919 5.92a.75.75 0 0 0 1.133-.977l-.073-.084-6.113-6.114.001-.002-1.2-1.198-2.87-2.87h.002L8.719 7.658l.001-.002-1.133-1.13L3.28 2.22a.75.75 0 0 0-1.06 0Zm7.984 9.045 3.535 3.536a2.5 2.5 0 0 1-3.535-3.535ZM12 5.5c-1 0-1.97.148-2.889.425l1.237 1.236a8.503 8.503 0 0 1 9.899 6.272.75.75 0 0 0 1.455-.363A10.003 10.003 0 0 0 12 5.5Zm.195 3.51 3.801 3.8a4.003 4.003 0 0 0-3.801-3.8Z",
diff --git a/app/javascript/shared/components/Spinner.vue b/app/javascript/shared/components/Spinner.vue
index de60b680b..ec02b05cb 100644
--- a/app/javascript/shared/components/Spinner.vue
+++ b/app/javascript/shared/components/Spinner.vue
@@ -1,5 +1,5 @@
 <template>
-  <span class="spinner" :class="size" />
+  <span class="spinner" :class="`${size} ${colorScheme}`" />
 </template>
 <script>
 export default {
@@ -8,6 +8,10 @@ export default {
       type: String,
       default: 'small',
     },
+    colorScheme: {
+      type: String,
+      default: '',
+    },
   },
 };
 </script>
@@ -32,8 +36,8 @@ export default {
     margin-top: -$space-one;
     margin-left: -$space-one;
     border-radius: 50%;
-    border: 2px solid rgba(255, 255, 255, 0.7);
-    border-top-color: rgba(255, 255, 255, 0.2);
+    border: 2px solid rgba(255, 255, 255, 0.8);
+    border-top-color: rgba(255, 255, 255, 0.3);
     animation: spinner 0.9s linear infinite;
   }
 }
@@ -84,5 +88,10 @@ export default {
       margin-top: -$space-small + $space-micro;
     }
   }
+
+  &.dark::before {
+    border-color: rgba(0, 0, 0, 0.7);
+    border-top-color: rgba(0, 0, 0, 0.2);
+  }
 }
 </style>
diff --git a/app/javascript/shared/components/specs/__snapshots__/Spinner.spec.js.snap b/app/javascript/shared/components/specs/__snapshots__/Spinner.spec.js.snap
index 4c2f77a5d..9eccfc523 100644
--- a/app/javascript/shared/components/specs/__snapshots__/Spinner.spec.js.snap
+++ b/app/javascript/shared/components/specs/__snapshots__/Spinner.spec.js.snap
@@ -2,6 +2,6 @@
 
 exports[`Spinner matches snapshot 1`] = `
 <span
-  class="spinner small"
+  class="spinner small "
 />
 `;
diff --git a/lib/integrations/openai/processor_service.rb b/lib/integrations/openai/processor_service.rb
index 54d2e5ac5..84afad27a 100644
--- a/lib/integrations/openai/processor_service.rb
+++ b/lib/integrations/openai/processor_service.rb
@@ -35,20 +35,48 @@ class Integrations::Openai::ProcessorService
   end
 
   def conversation_messages(in_array_format: false)
-    conversation = hook.account.conversations.find_by(display_id: event['data']['conversation_display_id'])
-    messages = in_array_format ? [] : ''
+    conversation = find_conversation
+    messages = init_messages_body(in_array_format)
+
+    add_messages_until_token_limit(conversation, messages, in_array_format)
+  end
+
+  def find_conversation
+    hook.account.conversations.find_by(display_id: event['data']['conversation_display_id'])
+  end
+
+  def add_messages_until_token_limit(conversation, messages, in_array_format)
     character_count = 0
-
     conversation.messages.chat.reorder('id desc').each do |message|
-      character_count += message.content.length
-      break if character_count > TOKEN_LIMIT
-
-      formatted_message = format_message(message, in_array_format)
-      messages.prepend(formatted_message)
+      character_count, message_added = add_message_if_within_limit(character_count, message, messages, in_array_format)
+      break unless message_added
     end
     messages
   end
 
+  def add_message_if_within_limit(character_count, message, messages, in_array_format)
+    if valid_message?(message, character_count)
+      add_message_to_list(message, messages, in_array_format)
+      character_count += message.content.length
+      [character_count, true]
+    else
+      [character_count, false]
+    end
+  end
+
+  def valid_message?(message, character_count)
+    message.content.present? && character_count + message.content.length <= TOKEN_LIMIT
+  end
+
+  def add_message_to_list(message, messages, in_array_format)
+    formatted_message = format_message(message, in_array_format)
+    messages.prepend(formatted_message)
+  end
+
+  def init_messages_body(in_array_format)
+    in_array_format ? [] : ''
+  end
+
   def format_message(message, in_array_format)
     in_array_format ? format_message_in_array(message) : format_message_in_string(message)
   end

From d0a1ad746a082949f45589c895a88695fcfb4571 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Wed, 10 May 2023 17:55:14 +0530
Subject: [PATCH 075/101] feat: add index migration (#7050)

---
 app/models/message.rb                                      | 1 +
 .../20230510060828_add_index_to_messages_for_reportings.rb | 7 +++++++
 db/schema.rb                                               | 3 ++-
 3 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 db/migrate/20230510060828_add_index_to_messages_for_reportings.rb

diff --git a/app/models/message.rb b/app/models/message.rb
index a73cbfd66..cea70e835 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -26,6 +26,7 @@
 #  index_messages_on_account_id_and_inbox_id            (account_id,inbox_id)
 #  index_messages_on_additional_attributes_campaign_id  (((additional_attributes -> 'campaign_id'::text))) USING gin
 #  index_messages_on_content                            (content) USING gin
+#  index_messages_on_conversation_account_type_created  (conversation_id,account_id,message_type,created_at)
 #  index_messages_on_conversation_id                    (conversation_id)
 #  index_messages_on_created_at                         (created_at)
 #  index_messages_on_inbox_id                           (inbox_id)
diff --git a/db/migrate/20230510060828_add_index_to_messages_for_reportings.rb b/db/migrate/20230510060828_add_index_to_messages_for_reportings.rb
new file mode 100644
index 000000000..50f2a36d7
--- /dev/null
+++ b/db/migrate/20230510060828_add_index_to_messages_for_reportings.rb
@@ -0,0 +1,7 @@
+class AddIndexToMessagesForReportings < ActiveRecord::Migration[7.0]
+  disable_ddl_transaction!
+  def change
+    add_index :messages, [:conversation_id, :account_id, :message_type, :created_at], name: 'index_messages_on_conversation_account_type_created',
+                                                                                      algorithm: :concurrently
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 84f3af8fc..d76da249a 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_05_09_101256) do
+ActiveRecord::Schema[7.0].define(version: 2023_05_10_060828) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_stat_statements"
   enable_extension "pg_trgm"
@@ -666,6 +666,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_05_09_101256) do
     t.index ["account_id", "inbox_id"], name: "index_messages_on_account_id_and_inbox_id"
     t.index ["account_id"], name: "index_messages_on_account_id"
     t.index ["content"], name: "index_messages_on_content", opclass: :gin_trgm_ops, using: :gin
+    t.index ["conversation_id", "account_id", "message_type", "created_at"], name: "index_messages_on_conversation_account_type_created"
     t.index ["conversation_id"], name: "index_messages_on_conversation_id"
     t.index ["created_at"], name: "index_messages_on_created_at"
     t.index ["inbox_id"], name: "index_messages_on_inbox_id"

From 87f758ee1f7ce39869a40902b315c08a2133686b Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Thu, 11 May 2023 12:56:43 +0530
Subject: [PATCH 076/101] feat: Order conversations by priority (#7053)

---
 app/finders/conversation_finder.rb            |  3 +-
 app/javascript/dashboard/constants/globals.js |  1 +
 .../dashboard/i18n/locale/en/chatlist.json    |  3 +
 .../dashboard/mixins/specs/time.spec.js       |  1 +
 .../store/modules/conversations/getters.js    | 11 +++-
 .../specs/conversations/getters.spec.js       | 60 +++++++++++++++++++
 app/javascript/shared/constants/messages.js   |  8 +++
 7 files changed, 85 insertions(+), 2 deletions(-)

diff --git a/app/finders/conversation_finder.rb b/app/finders/conversation_finder.rb
index 9472dc623..074eed461 100644
--- a/app/finders/conversation_finder.rb
+++ b/app/finders/conversation_finder.rb
@@ -5,7 +5,8 @@ class ConversationFinder
   SORT_OPTIONS = {
     latest: 'latest',
     sort_on_created_at: 'sort_on_created_at',
-    last_user_message_at: 'last_user_message_at'
+    last_user_message_at: 'last_user_message_at',
+    sort_on_priority: 'sort_on_priority'
   }.with_indifferent_access
 
   # assumptions
diff --git a/app/javascript/dashboard/constants/globals.js b/app/javascript/dashboard/constants/globals.js
index 20497b039..e5aaf7814 100644
--- a/app/javascript/dashboard/constants/globals.js
+++ b/app/javascript/dashboard/constants/globals.js
@@ -15,6 +15,7 @@ export default {
   SORT_BY_TYPE: {
     LATEST: 'latest',
     CREATED_AT: 'sort_on_created_at',
+    PRIORITY: 'sort_on_priority',
   },
   ARTICLE_STATUS_TYPES: {
     DRAFT: 0,
diff --git a/app/javascript/dashboard/i18n/locale/en/chatlist.json b/app/javascript/dashboard/i18n/locale/en/chatlist.json
index 6312d4c9f..731748696 100644
--- a/app/javascript/dashboard/i18n/locale/en/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/en/chatlist.json
@@ -47,6 +47,9 @@
       },
       "sort_on_created_at": {
         "TEXT": "Created at"
+      },
+      "sort_on_priority": {
+        "TEXT": "Priority"
       }
     },
     "ATTACHMENTS": {
diff --git a/app/javascript/dashboard/mixins/specs/time.spec.js b/app/javascript/dashboard/mixins/specs/time.spec.js
index 56b70ec8a..b1cd46d31 100644
--- a/app/javascript/dashboard/mixins/specs/time.spec.js
+++ b/app/javascript/dashboard/mixins/specs/time.spec.js
@@ -24,6 +24,7 @@ describe('#messageTimestamp', () => {
 
 describe('#dynamicTime', () => {
   it('returns correct value', () => {
+    Date.now = jest.fn(() => new Date(Date.UTC(2023, 1, 14)).valueOf());
     expect(TimeMixin.methods.dynamicTime(1612971343)).toEqual(
       'about 2 years ago'
     );
diff --git a/app/javascript/dashboard/store/modules/conversations/getters.js b/app/javascript/dashboard/store/modules/conversations/getters.js
index d3a848d09..b5b38da0f 100644
--- a/app/javascript/dashboard/store/modules/conversations/getters.js
+++ b/app/javascript/dashboard/store/modules/conversations/getters.js
@@ -1,4 +1,7 @@
-import { MESSAGE_TYPE } from 'shared/constants/messages';
+import {
+  MESSAGE_TYPE,
+  CONVERSATION_PRIORITY_ORDER,
+} from 'shared/constants/messages';
 import { applyPageFilters } from './helpers';
 
 export const getSelectedChatConversation = ({
@@ -13,6 +16,12 @@ const getters = {
     const comparator = {
       latest: (a, b) => b.last_activity_at - a.last_activity_at,
       sort_on_created_at: (a, b) => a.created_at - b.created_at,
+      sort_on_priority: (a, b) => {
+        return (
+          CONVERSATION_PRIORITY_ORDER[a.priority] -
+          CONVERSATION_PRIORITY_ORDER[b.priority]
+        );
+      },
     };
 
     return allConversations.sort(comparator[chatSortFilter]);
diff --git a/app/javascript/dashboard/store/modules/specs/conversations/getters.spec.js b/app/javascript/dashboard/store/modules/specs/conversations/getters.spec.js
index f9d775df2..2a012fd53 100644
--- a/app/javascript/dashboard/store/modules/specs/conversations/getters.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/conversations/getters.spec.js
@@ -130,6 +130,66 @@ describe('#getters', () => {
         },
       ]);
     });
+    it('order conversations based on priority', () => {
+      const state = {
+        allConversations: [
+          {
+            id: 1,
+            messages: [
+              {
+                content: 'test1',
+              },
+            ],
+            priority: 'low',
+            created_at: 1683645801,
+            last_activity_at: 2466424490,
+          },
+          {
+            id: 2,
+            messages: [{ content: 'test2' }],
+            priority: 'urgent',
+            created_at: 1652109801,
+            last_activity_at: 1466424480,
+          },
+          {
+            id: 3,
+            messages: [{ content: 'test3' }],
+            priority: 'medium',
+            created_at: 1652109801,
+            last_activity_at: 1466421280,
+          },
+        ],
+        chatSortFilter: 'sort_on_priority',
+      };
+
+      expect(getters.getAllConversations(state)).toEqual([
+        {
+          id: 2,
+          messages: [{ content: 'test2' }],
+          priority: 'urgent',
+          created_at: 1652109801,
+          last_activity_at: 1466424480,
+        },
+        {
+          id: 3,
+          messages: [{ content: 'test3' }],
+          priority: 'medium',
+          created_at: 1652109801,
+          last_activity_at: 1466421280,
+        },
+        {
+          id: 1,
+          messages: [
+            {
+              content: 'test1',
+            },
+          ],
+          priority: 'low',
+          created_at: 1683645801,
+          last_activity_at: 2466424490,
+        },
+      ]);
+    });
   });
   describe('#getUnAssignedChats', () => {
     it('order returns only chats assigned to user', () => {
diff --git a/app/javascript/shared/constants/messages.js b/app/javascript/shared/constants/messages.js
index 77501cb76..c21248607 100644
--- a/app/javascript/shared/constants/messages.js
+++ b/app/javascript/shared/constants/messages.js
@@ -27,6 +27,14 @@ export const CONVERSATION_PRIORITY = {
   MEDIUM: 'medium',
 };
 
+export const CONVERSATION_PRIORITY_ORDER = {
+  urgent: 1,
+  high: 2,
+  medium: 3,
+  low: 4,
+  null: 5,
+};
+
 // Size in mega bytes
 export const MAXIMUM_FILE_UPLOAD_SIZE = 40;
 export const MAXIMUM_FILE_UPLOAD_SIZE_TWILIO_SMS_CHANNEL = 5;

From 9c5d062efc7d769635dd079064df664cb952f68d Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Thu, 11 May 2023 17:30:07 +0530
Subject: [PATCH 077/101] fix: Fix greeting message label in settings (#7056)

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

diff --git a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
index afe22286f..06af3794e 100644
--- a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
@@ -83,7 +83,7 @@
         },
         "CHANNEL_GREETING_TOGGLE": {
           "LABEL": "Enable channel greeting",
-          "HELP_TEXT": "Automatically send a greeting message when a new conversation is created.",
+          "HELP_TEXT": "Automatically send a greeting message after the contact's first message in a conversation.",
           "ENABLED": "Enabled",
           "DISABLED": "Disabled"
         },

From d99997d17de90739e8b0ab4b559d195c99480f53 Mon Sep 17 00:00:00 2001
From: Jamie Wood <jamie@cool.studio>
Date: Thu, 11 May 2023 13:02:29 +0100
Subject: [PATCH 078/101] feat: Add ability to filter Conversations by
 underlying `source_id` (#6979)

This change adds the ability to include a `source_id` param when querying the `/api/v1/accounts/{account_id}/conversations/search` endpoint. It restricts to results to only conversations related to a contact_inbox with the provided parameter. My motivation for adding this feature was to allow an external API to communicate with a specific conversation with only an awareness of the conversation `source_id` from the client.


Co-authored-by: Sojan Jose <sojan@pepalo.com>
---
 app/finders/conversation_finder.rb       | 20 +++++++++++++++++---
 spec/finders/conversation_finder_spec.rb | 21 ++++++++++++++++++++-
 2 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/app/finders/conversation_finder.rb b/app/finders/conversation_finder.rb
index 074eed461..7ec0a6d30 100644
--- a/app/finders/conversation_finder.rb
+++ b/app/finders/conversation_finder.rb
@@ -54,9 +54,10 @@ class ConversationFinder
 
     find_all_conversations
     filter_by_status unless params[:q]
-    filter_by_team if @team
-    filter_by_labels if params[:labels]
-    filter_by_query if params[:q]
+    filter_by_team
+    filter_by_labels
+    filter_by_query
+    filter_by_source_id
   end
 
   def set_inboxes
@@ -107,6 +108,8 @@ class ConversationFinder
   end
 
   def filter_by_query
+    return unless params[:q]
+
     allowed_message_types = [Message.message_types[:incoming], Message.message_types[:outgoing]]
     @conversations = conversations.joins(:messages).where('messages.content ILIKE :search', search: "%#{params[:q]}%")
                                   .where(messages: { message_type: allowed_message_types }).includes(:messages)
@@ -121,13 +124,24 @@ class ConversationFinder
   end
 
   def filter_by_team
+    return unless @team
+
     @conversations = @conversations.where(team: @team)
   end
 
   def filter_by_labels
+    return unless params[:labels]
+
     @conversations = @conversations.tagged_with(params[:labels], any: true)
   end
 
+  def filter_by_source_id
+    return unless params[:source_id]
+
+    @conversations = @conversations.joins(:contact_inbox)
+    @conversations = @conversations.where(contact_inboxes: { source_id: params[:source_id] })
+  end
+
   def set_count_for_all_conversations
     [
       @conversations.assigned_to(current_user).count,
diff --git a/spec/finders/conversation_finder_spec.rb b/spec/finders/conversation_finder_spec.rb
index 15e4ff127..91a257e13 100644
--- a/spec/finders/conversation_finder_spec.rb
+++ b/spec/finders/conversation_finder_spec.rb
@@ -8,6 +8,7 @@ describe ::ConversationFinder do
   let!(:user_2) { create(:user, account: account) }
   let!(:admin) { create(:user, account: account, role: :administrator) }
   let!(:inbox) { create(:inbox, account: account, enable_auto_assignment: false) }
+  let!(:contact_inbox) { create(:contact_inbox, inbox: inbox, source_id: 'testing_source_id') }
   let!(:restricted_inbox) { create(:inbox, account: account) }
 
   before do
@@ -16,7 +17,7 @@ describe ::ConversationFinder do
     create(:conversation, account: account, inbox: inbox, assignee: user_1)
     create(:conversation, account: account, inbox: inbox, assignee: user_1)
     create(:conversation, account: account, inbox: inbox, assignee: user_1, status: 'resolved')
-    create(:conversation, account: account, inbox: inbox, assignee: user_2)
+    create(:conversation, account: account, inbox: inbox, assignee: user_2, contact_inbox: contact_inbox)
     # unassigned conversation
     create(:conversation, account: account, inbox: inbox)
     Current.account = account
@@ -127,6 +128,24 @@ describe ::ConversationFinder do
       end
     end
 
+    context 'with source_id' do
+      let(:params) { { source_id: 'testing_source_id' } }
+
+      it 'filter conversations by source id' do
+        result = conversation_finder.perform
+        expect(result[:conversations].length).to be 1
+      end
+    end
+
+    context 'without source' do
+      let(:params) { {} }
+
+      it 'returns conversations with any source' do
+        result = conversation_finder.perform
+        expect(result[:conversations].length).to be 4
+      end
+    end
+
     context 'with pagination' do
       let(:params) { { status: 'open', assignee_type: 'me', page: 1 } }
 

From c97d6021e009a4639f3cc697cb4f514d3f8ae3cc Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Thu, 11 May 2023 17:35:19 +0530
Subject: [PATCH 079/101] chore: Add migration to set the default empty string
 value for contact name (#7052)

Fixes: https://linear.app/chatwoot/issue/CW-1650/issue-with-the-contact-name
---
 app/models/contact.rb                                        | 2 +-
 ...230510113208_set_default_empty_string_for_contact_name.rb | 5 +++++
 db/schema.rb                                                 | 4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 db/migrate/20230510113208_set_default_empty_string_for_contact_name.rb

diff --git a/app/models/contact.rb b/app/models/contact.rb
index 4f7832ac8..934fbd387 100644
--- a/app/models/contact.rb
+++ b/app/models/contact.rb
@@ -8,7 +8,7 @@
 #  email                 :string
 #  identifier            :string
 #  last_activity_at      :datetime
-#  name                  :string
+#  name                  :string           default("")
 #  phone_number          :string
 #  created_at            :datetime         not null
 #  updated_at            :datetime         not null
diff --git a/db/migrate/20230510113208_set_default_empty_string_for_contact_name.rb b/db/migrate/20230510113208_set_default_empty_string_for_contact_name.rb
new file mode 100644
index 000000000..ae28c4318
--- /dev/null
+++ b/db/migrate/20230510113208_set_default_empty_string_for_contact_name.rb
@@ -0,0 +1,5 @@
+class SetDefaultEmptyStringForContactName < ActiveRecord::Migration[7.0]
+  def change
+    change_column_default :contacts, :name, from: nil, to: ''
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index d76da249a..459e97320 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_05_10_060828) do
+ActiveRecord::Schema[7.0].define(version: 2023_05_10_113208) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_stat_statements"
   enable_extension "pg_trgm"
@@ -394,7 +394,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_05_10_060828) do
   end
 
   create_table "contacts", id: :serial, force: :cascade do |t|
-    t.string "name"
+    t.string "name", default: ""
     t.string "email"
     t.string "phone_number"
     t.integer "account_id", null: false

From 271263bcc21c80c2441e2728387515c7ab88521e Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Thu, 11 May 2023 22:42:56 +0530
Subject: [PATCH 080/101] feat: SLA CRUD APIs (EE) (#7027)

Fixes: https://linear.app/chatwoot/issue/CW-1613/sla-api

Co-authored-by: Sojan Jose <sojan@pepalo.com>
---
 app/models/account.rb                         |   1 +
 config/routes.rb                              |   1 +
 .../20230503101201_create_sla_policies.rb     |  13 ++
 db/schema.rb                                  |  11 +
 .../api/v1/accounts/audit_logs_controller.rb  |   9 +-
 .../enterprise_accounts_controller.rb         |   8 +
 .../v1/accounts/sla_policies_controller.rb    |  31 +++
 .../enterprise/enterprise_account_concern.rb  |   7 +
 enterprise/app/models/sla_policy.rb           |  21 ++
 enterprise/app/policies/sla_policy_policy.rb  |  21 ++
 .../sla_policies/create.json.jbuilder         |   3 +
 .../accounts/sla_policies/index.json.jbuilder |   5 +
 .../accounts/sla_policies/show.json.jbuilder  |   3 +
 .../sla_policies/update.json.jbuilder         |   3 +
 .../api/v1/models/_sla_policy.json.jbuilder   |   5 +
 .../accounts/sla_policies_controller_spec.rb  | 189 ++++++++++++++++++
 spec/enterprise/models/account_spec.rb        |  18 ++
 spec/enterprise/models/sla_policy_spec.rb     |  22 ++
 spec/factories/sla_policies.rb                |   9 +
 19 files changed, 372 insertions(+), 8 deletions(-)
 create mode 100644 db/migrate/20230503101201_create_sla_policies.rb
 create mode 100644 enterprise/app/controllers/api/v1/accounts/enterprise_accounts_controller.rb
 create mode 100644 enterprise/app/controllers/api/v1/accounts/sla_policies_controller.rb
 create mode 100644 enterprise/app/models/enterprise/enterprise_account_concern.rb
 create mode 100644 enterprise/app/models/sla_policy.rb
 create mode 100644 enterprise/app/policies/sla_policy_policy.rb
 create mode 100644 enterprise/app/views/api/v1/accounts/sla_policies/create.json.jbuilder
 create mode 100644 enterprise/app/views/api/v1/accounts/sla_policies/index.json.jbuilder
 create mode 100644 enterprise/app/views/api/v1/accounts/sla_policies/show.json.jbuilder
 create mode 100644 enterprise/app/views/api/v1/accounts/sla_policies/update.json.jbuilder
 create mode 100644 enterprise/app/views/api/v1/models/_sla_policy.json.jbuilder
 create mode 100644 spec/enterprise/controllers/api/v1/accounts/sla_policies_controller_spec.rb
 create mode 100644 spec/enterprise/models/sla_policy_spec.rb
 create mode 100644 spec/factories/sla_policies.rb

diff --git a/app/models/account.rb b/app/models/account.rb
index b415680ee..331343de1 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -149,4 +149,5 @@ class Account < ApplicationRecord
 end
 
 Account.prepend_mod_with('Account')
+Account.include_mod_with('EnterpriseAccountConcern')
 Account.include_mod_with('Audit::Account')
diff --git a/config/routes.rb b/config/routes.rb
index 3cb03a1de..bdad7c1bf 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -64,6 +64,7 @@ Rails.application.routes.draw do
             post :execute, on: :member
             post :attach_file, on: :collection
           end
+          resources :sla_policies, only: [:index, :create, :show, :update, :destroy]
           resources :campaigns, only: [:index, :create, :show, :update, :destroy]
           resources :dashboard_apps, only: [:index, :show, :create, :update, :destroy]
           namespace :channels do
diff --git a/db/migrate/20230503101201_create_sla_policies.rb b/db/migrate/20230503101201_create_sla_policies.rb
new file mode 100644
index 000000000..9c0abce25
--- /dev/null
+++ b/db/migrate/20230503101201_create_sla_policies.rb
@@ -0,0 +1,13 @@
+class CreateSlaPolicies < ActiveRecord::Migration[6.1]
+  def change
+    create_table :sla_policies do |t|
+      t.string :name, null: false
+      t.float :frt_threshold, default: nil
+      t.float :rt_threshold, default: nil
+      t.boolean 'only_during_business_hours', default: false
+      t.references :account, index: true, null: false
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 459e97320..befec82f7 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -804,6 +804,17 @@ ActiveRecord::Schema[7.0].define(version: 2023_05_10_113208) do
     t.index ["user_id"], name: "index_reporting_events_on_user_id"
   end
 
+  create_table "sla_policies", force: :cascade do |t|
+    t.string "name", null: false
+    t.float "frt_threshold"
+    t.float "rt_threshold"
+    t.boolean "only_during_business_hours", default: false
+    t.bigint "account_id", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["account_id"], name: "index_sla_policies_on_account_id"
+  end
+
   create_table "taggings", id: :serial, force: :cascade do |t|
     t.integer "tag_id"
     t.string "taggable_type"
diff --git a/enterprise/app/controllers/api/v1/accounts/audit_logs_controller.rb b/enterprise/app/controllers/api/v1/accounts/audit_logs_controller.rb
index d1e6b9287..b2dca5ce6 100644
--- a/enterprise/app/controllers/api/v1/accounts/audit_logs_controller.rb
+++ b/enterprise/app/controllers/api/v1/accounts/audit_logs_controller.rb
@@ -1,16 +1,9 @@
-# module Enterprise::Api::V1::Accounts::AuditLogsController < Api::V1::Accounts::BaseController
-class Api::V1::Accounts::AuditLogsController < Api::V1::Accounts::BaseController
+class Api::V1::Accounts::AuditLogsController < Api::V1::Accounts::EnterpriseAccountsController
   before_action :check_admin_authorization?
   before_action :fetch_audit
-  before_action :prepend_view_paths
 
   RESULTS_PER_PAGE = 15
 
-  # Prepend the view path to the enterprise/app/views won't be available by default
-  def prepend_view_paths
-    prepend_view_path 'enterprise/app/views/'
-  end
-
   def show
     @audit_logs = @audit_logs.page(params[:page]).per(RESULTS_PER_PAGE)
     @current_page = @audit_logs.current_page
diff --git a/enterprise/app/controllers/api/v1/accounts/enterprise_accounts_controller.rb b/enterprise/app/controllers/api/v1/accounts/enterprise_accounts_controller.rb
new file mode 100644
index 000000000..f3028721c
--- /dev/null
+++ b/enterprise/app/controllers/api/v1/accounts/enterprise_accounts_controller.rb
@@ -0,0 +1,8 @@
+class Api::V1::Accounts::EnterpriseAccountsController < Api::V1::Accounts::BaseController
+  before_action :prepend_view_paths
+
+  # Prepend the view path to the enterprise/app/views won't be available by default
+  def prepend_view_paths
+    prepend_view_path 'enterprise/app/views/'
+  end
+end
diff --git a/enterprise/app/controllers/api/v1/accounts/sla_policies_controller.rb b/enterprise/app/controllers/api/v1/accounts/sla_policies_controller.rb
new file mode 100644
index 000000000..fa79c5362
--- /dev/null
+++ b/enterprise/app/controllers/api/v1/accounts/sla_policies_controller.rb
@@ -0,0 +1,31 @@
+class Api::V1::Accounts::SlaPoliciesController < Api::V1::Accounts::EnterpriseAccountsController
+  before_action :fetch_sla, only: [:show, :update, :destroy]
+  before_action :check_authorization
+
+  def index
+    @sla_policies = Current.account.sla_policies
+  end
+
+  def create
+    @sla_policy = Current.account.sla_policies.create!(permitted_params)
+  end
+
+  def show; end
+
+  def update
+    @sla_policy.update!(permitted_params)
+  end
+
+  def destroy
+    @sla_policy.destroy!
+    head :ok
+  end
+
+  def permitted_params
+    params.require(:sla_policy).permit(:name, :rt_threshold, :frt_threshold, :only_during_business_hours)
+  end
+
+  def fetch_sla
+    @sla_policy = Current.account.sla_policies.find_by(id: params[:id])
+  end
+end
diff --git a/enterprise/app/models/enterprise/enterprise_account_concern.rb b/enterprise/app/models/enterprise/enterprise_account_concern.rb
new file mode 100644
index 000000000..8e430dbe7
--- /dev/null
+++ b/enterprise/app/models/enterprise/enterprise_account_concern.rb
@@ -0,0 +1,7 @@
+module Enterprise::EnterpriseAccountConcern
+  extend ActiveSupport::Concern
+
+  included do
+    has_many :sla_policies, dependent: :destroy_async
+  end
+end
diff --git a/enterprise/app/models/sla_policy.rb b/enterprise/app/models/sla_policy.rb
new file mode 100644
index 000000000..042cc2444
--- /dev/null
+++ b/enterprise/app/models/sla_policy.rb
@@ -0,0 +1,21 @@
+# == Schema Information
+#
+# Table name: sla_policies
+#
+#  id                         :bigint           not null, primary key
+#  frt_threshold              :float
+#  name                       :string           not null
+#  only_during_business_hours :boolean          default(FALSE)
+#  rt_threshold               :float
+#  created_at                 :datetime         not null
+#  updated_at                 :datetime         not null
+#  account_id                 :bigint           not null
+#
+# Indexes
+#
+#  index_sla_policies_on_account_id  (account_id)
+#
+class SlaPolicy < ApplicationRecord
+  belongs_to :account
+  validates :name, presence: true
+end
diff --git a/enterprise/app/policies/sla_policy_policy.rb b/enterprise/app/policies/sla_policy_policy.rb
new file mode 100644
index 000000000..4a2ca6503
--- /dev/null
+++ b/enterprise/app/policies/sla_policy_policy.rb
@@ -0,0 +1,21 @@
+class SlaPolicyPolicy < ApplicationPolicy
+  def index?
+    @account_user.administrator? || @account_user.agent?
+  end
+
+  def update?
+    @account_user.administrator?
+  end
+
+  def show?
+    @account_user.administrator? || @account_user.agent?
+  end
+
+  def create?
+    @account_user.administrator?
+  end
+
+  def destroy?
+    @account_user.administrator?
+  end
+end
diff --git a/enterprise/app/views/api/v1/accounts/sla_policies/create.json.jbuilder b/enterprise/app/views/api/v1/accounts/sla_policies/create.json.jbuilder
new file mode 100644
index 000000000..5ecafcd2c
--- /dev/null
+++ b/enterprise/app/views/api/v1/accounts/sla_policies/create.json.jbuilder
@@ -0,0 +1,3 @@
+json.payload do
+  json.partial! 'api/v1/models/sla_policy', formats: [:json], sla_policy: @sla_policy
+end
diff --git a/enterprise/app/views/api/v1/accounts/sla_policies/index.json.jbuilder b/enterprise/app/views/api/v1/accounts/sla_policies/index.json.jbuilder
new file mode 100644
index 000000000..45534cc86
--- /dev/null
+++ b/enterprise/app/views/api/v1/accounts/sla_policies/index.json.jbuilder
@@ -0,0 +1,5 @@
+json.payload do
+  json.array! @sla_policies do |sla_policy|
+    json.partial! 'api/v1/models/sla_policy', formats: [:json], sla_policy: sla_policy
+  end
+end
diff --git a/enterprise/app/views/api/v1/accounts/sla_policies/show.json.jbuilder b/enterprise/app/views/api/v1/accounts/sla_policies/show.json.jbuilder
new file mode 100644
index 000000000..5ecafcd2c
--- /dev/null
+++ b/enterprise/app/views/api/v1/accounts/sla_policies/show.json.jbuilder
@@ -0,0 +1,3 @@
+json.payload do
+  json.partial! 'api/v1/models/sla_policy', formats: [:json], sla_policy: @sla_policy
+end
diff --git a/enterprise/app/views/api/v1/accounts/sla_policies/update.json.jbuilder b/enterprise/app/views/api/v1/accounts/sla_policies/update.json.jbuilder
new file mode 100644
index 000000000..5ecafcd2c
--- /dev/null
+++ b/enterprise/app/views/api/v1/accounts/sla_policies/update.json.jbuilder
@@ -0,0 +1,3 @@
+json.payload do
+  json.partial! 'api/v1/models/sla_policy', formats: [:json], sla_policy: @sla_policy
+end
diff --git a/enterprise/app/views/api/v1/models/_sla_policy.json.jbuilder b/enterprise/app/views/api/v1/models/_sla_policy.json.jbuilder
new file mode 100644
index 000000000..cd03d50ad
--- /dev/null
+++ b/enterprise/app/views/api/v1/models/_sla_policy.json.jbuilder
@@ -0,0 +1,5 @@
+json.id sla_policy.id
+json.name sla_policy.name
+json.frt_threshold sla_policy.frt_threshold
+json.rt_threshold sla_policy.rt_threshold
+json.only_during_business_hours sla_policy.only_during_business_hours
diff --git a/spec/enterprise/controllers/api/v1/accounts/sla_policies_controller_spec.rb b/spec/enterprise/controllers/api/v1/accounts/sla_policies_controller_spec.rb
new file mode 100644
index 000000000..99a3bf0f0
--- /dev/null
+++ b/spec/enterprise/controllers/api/v1/accounts/sla_policies_controller_spec.rb
@@ -0,0 +1,189 @@
+require 'rails_helper'
+
+RSpec.describe 'Enterprise SLA API', type: :request do
+  let(:account) { create(:account) }
+  let(:administrator) { create(:user, account: account, role: :administrator) }
+  let(:agent) { create(:user, account: account, role: :agent) }
+
+  before do
+    create(:sla_policy, account: account, name: 'SLA 1')
+  end
+
+  describe 'GET #index' do
+    context 'when it is an authenticated user' do
+      it 'returns all slas in the account' do
+        get "/api/v1/accounts/#{account.id}/sla_policies",
+            headers: administrator.create_new_auth_token
+        expect(response).to have_http_status(:success)
+        body = JSON.parse(response.body)
+
+        expect(body['payload'][0]).to include('name' => 'SLA 1')
+      end
+    end
+
+    context 'when the user is an agent' do
+      it 'returns slas in the account' do
+        get "/api/v1/accounts/#{account.id}/sla_policies",
+            headers: administrator.create_new_auth_token
+        expect(response).to have_http_status(:success)
+        body = JSON.parse(response.body)
+
+        expect(body['payload'][0]).to include('name' => 'SLA 1')
+      end
+    end
+
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        post "/api/v1/accounts/#{account.id}/sla_policies"
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+  end
+
+  describe 'GET #show' do
+    let(:sla_policy) { create(:sla_policy, account: account) }
+
+    context 'when it is an authenticated user' do
+      it 'shows the sla' do
+        get "/api/v1/accounts/#{account.id}/sla_policies/#{sla_policy.id}",
+            headers: administrator.create_new_auth_token
+
+        expect(response).to have_http_status(:success)
+        body = JSON.parse(response.body)
+
+        expect(body['payload']).to include('name' => sla_policy.name)
+      end
+    end
+
+    context 'when the user is an agent' do
+      it 'shows the sla details' do
+        get "/api/v1/accounts/#{account.id}/sla_policies/#{sla_policy.id}",
+            headers: agent.create_new_auth_token
+
+        expect(response).to have_http_status(:success)
+        body = JSON.parse(response.body)
+
+        expect(body['payload']).to include('name' => sla_policy.name)
+      end
+    end
+
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        post "/api/v1/accounts/#{account.id}/sla_policies"
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+  end
+
+  describe 'POST #create' do
+    let(:valid_params) do
+      { sla_policy: { name: 'SLA 2',
+                      frt_threshold: 1000,
+                      rt_threshold: 1000,
+                      only_during_business_hours: false } }
+    end
+
+    context 'when it is an authenticated user' do
+      it 'creates the sla_policy' do
+        expect do
+          post "/api/v1/accounts/#{account.id}/sla_policies", params: valid_params,
+                                                              headers: administrator.create_new_auth_token
+        end.to change(SlaPolicy, :count).by(1)
+
+        expect(response).to have_http_status(:success)
+        body = JSON.parse(response.body)
+
+        expect(body['payload']).to include('name' => 'SLA 2')
+      end
+    end
+
+    context 'when the user is an agent' do
+      it 'returns unauthorized' do
+        post "/api/v1/accounts/#{account.id}/sla_policies",
+             params: valid_params,
+             headers: agent.create_new_auth_token,
+             as: :json
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        post "/api/v1/accounts/#{account.id}/sla_policies"
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+  end
+
+  describe 'PUT #update' do
+    let(:sla_policy) { create(:sla_policy, account: account) }
+
+    context 'when it is an authenticated user' do
+      it 'updates the sla_policy' do
+        put "/api/v1/accounts/#{account.id}/sla_policies/#{sla_policy.id}",
+            params: { sla_policy: { name: 'SLA 2' } },
+            headers: administrator.create_new_auth_token
+
+        expect(response).to have_http_status(:success)
+        body = JSON.parse(response.body)
+
+        expect(body['payload']).to include('name' => 'SLA 2')
+      end
+    end
+
+    context 'when the user is an agent' do
+      it 'returns unauthorized' do
+        put "/api/v1/accounts/#{account.id}/sla_policies/#{sla_policy.id}",
+            params: { sla_policy: { name: 'SLA 2' } },
+            headers: agent.create_new_auth_token,
+            as: :json
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        put "/api/v1/accounts/#{account.id}/sla_policies/#{sla_policy.id}"
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+  end
+
+  describe 'DELETE #destroy' do
+    let(:sla_policy) { create(:sla_policy, account: account) }
+
+    context 'when it is an authenticated user' do
+      it 'deletes the sla_policy' do
+        delete "/api/v1/accounts/#{account.id}/sla_policies/#{sla_policy.id}",
+               headers: administrator.create_new_auth_token
+
+        expect(response).to have_http_status(:success)
+        expect(SlaPolicy.count).to eq(1)
+      end
+    end
+
+    context 'when the user is an agent' do
+      it 'returns unauthorized' do
+        delete "/api/v1/accounts/#{account.id}/sla_policies/#{sla_policy.id}",
+               headers: agent.create_new_auth_token,
+               as: :json
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        delete "/api/v1/accounts/#{account.id}/sla_policies/#{sla_policy.id}"
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+  end
+end
diff --git a/spec/enterprise/models/account_spec.rb b/spec/enterprise/models/account_spec.rb
index 4c84e3465..af73da48f 100644
--- a/spec/enterprise/models/account_spec.rb
+++ b/spec/enterprise/models/account_spec.rb
@@ -3,6 +3,24 @@
 require 'rails_helper'
 
 RSpec.describe Account do
+  include ActiveJob::TestHelper
+
+  describe 'sla_policies' do
+    let!(:account) { create(:account) }
+    let!(:sla_policy) { create(:sla_policy, account: account) }
+
+    it 'returns associated sla policies' do
+      expect(account.sla_policies).to eq([sla_policy])
+    end
+
+    it 'deletes associated sla policies' do
+      perform_enqueued_jobs do
+        account.destroy!
+      end
+      expect { sla_policy.reload }.to raise_error(ActiveRecord::RecordNotFound)
+    end
+  end
+
   describe 'usage_limits' do
     before do
       create(:installation_config, name: 'ACCOUNT_AGENTS_LIMIT', value: 20)
diff --git a/spec/enterprise/models/sla_policy_spec.rb b/spec/enterprise/models/sla_policy_spec.rb
new file mode 100644
index 000000000..6be1f4e45
--- /dev/null
+++ b/spec/enterprise/models/sla_policy_spec.rb
@@ -0,0 +1,22 @@
+require 'rails_helper'
+
+RSpec.describe SlaPolicy, type: :model do
+  include ActiveJob::TestHelper
+  let(:account) { create(:account) }
+  let(:admin) { create(:user, account: account, role: :administrator) }
+
+  describe 'validations' do
+    it { is_expected.to validate_presence_of(:name) }
+  end
+
+  describe 'associations' do
+    it { is_expected.to belong_to(:account) }
+  end
+
+  describe 'validates_factory' do
+    it 'creates valid sla policy object' do
+      sla_policy = create(:sla_policy)
+      expect(sla_policy.name).to eq 'sla_1'
+    end
+  end
+end
diff --git a/spec/factories/sla_policies.rb b/spec/factories/sla_policies.rb
new file mode 100644
index 000000000..3f1d33b43
--- /dev/null
+++ b/spec/factories/sla_policies.rb
@@ -0,0 +1,9 @@
+FactoryBot.define do
+  factory :sla_policy do
+    account
+    name { 'sla_1' }
+    rt_threshold { 1000 }
+    frt_threshold { 2000 }
+    only_during_business_hours { false }
+  end
+end

From 020dcc4dc7accb9416a6bdd6fdfbfd44e6b11fea Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Thu, 11 May 2023 12:14:56 -0700
Subject: [PATCH 081/101] fix: Avoid audio URLs getting cached at the frontend
 (#7062)

---
 .../dashboard/components/widgets/conversation/Message.vue       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/dashboard/components/widgets/conversation/Message.vue b/app/javascript/dashboard/components/widgets/conversation/Message.vue
index 985c1ce11..6f20cac7c 100644
--- a/app/javascript/dashboard/components/widgets/conversation/Message.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/Message.vue
@@ -59,7 +59,7 @@
               controls
               class="skip-context-menu"
             >
-              <source :src="attachment.data_url" />
+              <source :src="`${attachment.data_url}?t=${Date.now()}`" />
             </audio>
             <bubble-video
               v-else-if="attachment.file_type === 'video'"

From 708bddf4dba6793fd24a7c5722a45277581ae6c1 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Fri, 12 May 2023 14:05:22 +0530
Subject: [PATCH 082/101] feat: Refetch the latest messages on action cable
 reconnect in widget (#6996)

---
 .../api/v1/widget/messages_controller.rb      |   5 +-
 app/javascript/widget/api/conversation.js     |   4 +-
 app/javascript/widget/api/endPoints.js        |   4 +-
 .../widget/api/specs/endPoints.spec.js        |  23 ++
 app/javascript/widget/helpers/actionCable.js  |  16 ++
 .../store/modules/conversation/actions.js     |  34 +++
 .../store/modules/conversation/index.js       |   1 +
 .../store/modules/conversation/mutations.js   |  12 +
 .../specs/conversation/actions.spec.js        | 205 ++++++++++++++++++
 .../specs/conversation/mutations.spec.js      |  68 ++++++
 10 files changed, 366 insertions(+), 6 deletions(-)

diff --git a/app/controllers/api/v1/widget/messages_controller.rb b/app/controllers/api/v1/widget/messages_controller.rb
index 6287c94ee..76efb2c42 100644
--- a/app/controllers/api/v1/widget/messages_controller.rb
+++ b/app/controllers/api/v1/widget/messages_controller.rb
@@ -48,7 +48,8 @@ class Api::V1::Widget::MessagesController < Api::V1::Widget::BaseController
   def message_finder_params
     {
       filter_internal_messages: true,
-      before: permitted_params[:before]
+      before: permitted_params[:before],
+      after: permitted_params[:after]
     }
   end
 
@@ -62,7 +63,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, :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])
   end
 
   def set_message
diff --git a/app/javascript/widget/api/conversation.js b/app/javascript/widget/api/conversation.js
index 78e4fe382..ded771316 100755
--- a/app/javascript/widget/api/conversation.js
+++ b/app/javascript/widget/api/conversation.js
@@ -16,8 +16,8 @@ const sendAttachmentAPI = async attachment => {
   return API.post(urlData.url, urlData.params);
 };
 
-const getMessagesAPI = async ({ before }) => {
-  const urlData = endPoints.getConversation({ before });
+const getMessagesAPI = async ({ before, after }) => {
+  const urlData = endPoints.getConversation({ before, after });
   return API.get(urlData.url, { params: urlData.params });
 };
 
diff --git a/app/javascript/widget/api/endPoints.js b/app/javascript/widget/api/endPoints.js
index 298196a43..3839a8e82 100755
--- a/app/javascript/widget/api/endPoints.js
+++ b/app/javascript/widget/api/endPoints.js
@@ -57,9 +57,9 @@ const sendAttachment = ({ attachment }) => {
   };
 };
 
-const getConversation = ({ before }) => ({
+const getConversation = ({ before, after }) => ({
   url: `/api/v1/widget/messages${window.location.search}`,
-  params: { before },
+  params: { before, after },
 });
 
 const updateMessage = id => ({
diff --git a/app/javascript/widget/api/specs/endPoints.spec.js b/app/javascript/widget/api/specs/endPoints.spec.js
index 21ed98a5a..13e57a034 100644
--- a/app/javascript/widget/api/specs/endPoints.spec.js
+++ b/app/javascript/widget/api/specs/endPoints.spec.js
@@ -79,3 +79,26 @@ describe('#triggerCampaign', () => {
     spy.mockRestore();
   });
 });
+
+describe('#getConversation', () => {
+  it('should returns correct payload', () => {
+    const spy = jest.spyOn(global, 'Date').mockImplementation(() => ({
+      toString: () => 'mock date',
+    }));
+    const windowSpy = jest.spyOn(window, 'window', 'get');
+    expect(
+      endPoints.getConversation({
+        after: 123,
+      })
+    ).toEqual({
+      url: `/api/v1/widget/messages`,
+      params: {
+        after: 123,
+        before: undefined,
+      },
+    });
+    windowSpy.mockRestore();
+
+    spy.mockRestore();
+  });
+});
diff --git a/app/javascript/widget/helpers/actionCable.js b/app/javascript/widget/helpers/actionCable.js
index 40f95c342..6d7af376c 100644
--- a/app/javascript/widget/helpers/actionCable.js
+++ b/app/javascript/widget/helpers/actionCable.js
@@ -25,6 +25,22 @@ class ActionCableConnector extends BaseActionCableConnector {
     };
   }
 
+  onDisconnected = () => {
+    this.setLastMessageId();
+  };
+
+  onReconnect = () => {
+    this.syncLatestMessages();
+  };
+
+  setLastMessageId = () => {
+    this.app.$store.dispatch('conversation/setLastMessageId');
+  };
+
+  syncLatestMessages = () => {
+    this.app.$store.dispatch('conversation/syncLatestMessages');
+  };
+
   onStatusChange = data => {
     if (data.status === 'resolved') {
       this.app.$store.dispatch('campaign/resetCampaign');
diff --git a/app/javascript/widget/store/modules/conversation/actions.js b/app/javascript/widget/store/modules/conversation/actions.js
index ec29ea13c..526e1d5aa 100644
--- a/app/javascript/widget/store/modules/conversation/actions.js
+++ b/app/javascript/widget/store/modules/conversation/actions.js
@@ -52,6 +52,10 @@ export const actions = {
     }
   },
 
+  setLastMessageId: async ({ commit }) => {
+    commit('setLastMessageId');
+  },
+
   sendAttachment: async ({ commit }, params) => {
     const {
       attachment: { thumbUrl, fileType },
@@ -99,6 +103,36 @@ export const actions = {
     }
   },
 
+  syncLatestMessages: async ({ state, commit }) => {
+    try {
+      const { lastMessageId, conversations } = state;
+
+      const {
+        data: { payload, meta },
+      } = await getMessagesAPI({ after: lastMessageId });
+
+      const { contact_last_seen_at: lastSeen } = meta;
+      const formattedMessages = getNonDeletedMessages({ messages: payload });
+      const missingMessages = formattedMessages.filter(
+        message => conversations?.[message.id] === undefined
+      );
+      if (!missingMessages.length) return;
+      missingMessages.forEach(message => {
+        conversations[message.id] = message;
+      });
+      // Sort conversation messages by created_at
+      const updatedConversation = Object.fromEntries(
+        Object.entries(conversations).sort(
+          (a, b) => a[1].created_at - b[1].created_at
+        )
+      );
+      commit('conversation/setMetaUserLastSeenAt', lastSeen, { root: true });
+      commit('setMissingMessagesInConversation', updatedConversation);
+    } catch (error) {
+      // IgnoreError
+    }
+  },
+
   clearConversations: ({ commit }) => {
     commit('clearConversations');
   },
diff --git a/app/javascript/widget/store/modules/conversation/index.js b/app/javascript/widget/store/modules/conversation/index.js
index d8bf30d04..9869b6a87 100755
--- a/app/javascript/widget/store/modules/conversation/index.js
+++ b/app/javascript/widget/store/modules/conversation/index.js
@@ -13,6 +13,7 @@ const state = {
     isAgentTyping: false,
     isCreating: false,
   },
+  lastMessageId: null,
 };
 
 export default {
diff --git a/app/javascript/widget/store/modules/conversation/mutations.js b/app/javascript/widget/store/modules/conversation/mutations.js
index ca6dafada..04b4987ff 100644
--- a/app/javascript/widget/store/modules/conversation/mutations.js
+++ b/app/javascript/widget/store/modules/conversation/mutations.js
@@ -62,6 +62,10 @@ export const mutations = {
     payload.map(message => Vue.set($state.conversations, message.id, message));
   },
 
+  setMissingMessagesInConversation($state, payload) {
+    Vue.set($state, 'conversation', payload);
+  },
+
   updateMessage($state, { id, content_attributes }) {
     $state.conversations[id] = {
       ...$state.conversations[id],
@@ -94,4 +98,12 @@ export const mutations = {
   setMetaUserLastSeenAt($state, lastSeen) {
     $state.meta.userLastSeenAt = lastSeen;
   },
+
+  setLastMessageId($state) {
+    const { conversations } = $state;
+    const lastMessage = Object.values(conversations).pop();
+    if (!lastMessage) return;
+    const { id } = lastMessage;
+    $state.lastMessageId = id;
+  },
 };
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 82e03d38a..81d0d7694 100644
--- a/app/javascript/widget/store/modules/specs/conversation/actions.spec.js
+++ b/app/javascript/widget/store/modules/specs/conversation/actions.spec.js
@@ -217,4 +217,209 @@ describe('#actions', () => {
       ]);
     });
   });
+
+  describe('#syncLatestMessages', () => {
+    it('latest message should append to end of list', async () => {
+      const state = {
+        uiFlags: { allMessagesLoaded: false },
+        conversations: {
+          '454': {
+            id: 454,
+            content: 'hi',
+            message_type: 0,
+            content_type: 'text',
+            content_attributes: {},
+            created_at: 1682244355, //  Sunday, 23 April 2023 10:05:55
+            conversation_id: 20,
+          },
+          '463': {
+            id: 463,
+            content: 'ss',
+            message_type: 0,
+            content_type: 'text',
+            content_attributes: {},
+            created_at: 1682490729, // Wednesday, 26 April 2023 06:32:09
+            conversation_id: 20,
+          },
+        },
+        lastMessageId: 463,
+      };
+      API.get.mockResolvedValue({
+        data: {
+          payload: [
+            {
+              id: 465,
+              content: 'hi',
+              message_type: 0,
+              content_type: 'text',
+              content_attributes: {},
+              created_at: 1682504326, // Wednesday, 26 April 2023 10:18:46
+              conversation_id: 20,
+            },
+          ],
+          meta: {
+            contact_last_seen_at: 1466424490,
+          },
+        },
+      });
+      await actions.syncLatestMessages({ state, commit }, {});
+      expect(commit.mock.calls).toEqual([
+        ['conversation/setMetaUserLastSeenAt', 1466424490, { root: true }],
+        [
+          'setMissingMessagesInConversation',
+
+          {
+            '454': {
+              id: 454,
+              content: 'hi',
+              message_type: 0,
+              content_type: 'text',
+              content_attributes: {},
+              created_at: 1682244355,
+              conversation_id: 20,
+            },
+            '463': {
+              id: 463,
+              content: 'ss',
+              message_type: 0,
+              content_type: 'text',
+              content_attributes: {},
+              created_at: 1682490729,
+              conversation_id: 20,
+            },
+            '465': {
+              id: 465,
+              content: 'hi',
+              message_type: 0,
+              content_type: 'text',
+              content_attributes: {},
+              created_at: 1682504326,
+              conversation_id: 20,
+            },
+          },
+        ],
+      ]);
+    });
+
+    it('old message should insert to exact position', async () => {
+      const state = {
+        uiFlags: { allMessagesLoaded: false },
+        conversations: {
+          '454': {
+            id: 454,
+            content: 'hi',
+            message_type: 0,
+            content_type: 'text',
+            content_attributes: {},
+            created_at: 1682244355, //  Sunday, 23 April 2023 10:05:55
+            conversation_id: 20,
+          },
+          '463': {
+            id: 463,
+            content: 'ss',
+            message_type: 0,
+            content_type: 'text',
+            content_attributes: {},
+            created_at: 1682490729, // Wednesday, 26 April 2023 06:32:09
+            conversation_id: 20,
+          },
+        },
+        lastMessageId: 463,
+      };
+      API.get.mockResolvedValue({
+        data: {
+          payload: [
+            {
+              id: 460,
+              content: 'Hi how are you',
+              message_type: 0,
+              content_type: 'text',
+              content_attributes: {},
+              created_at: 1682417926, // Tuesday, 25 April 2023 10:18:46
+              conversation_id: 20,
+            },
+          ],
+          meta: {
+            contact_last_seen_at: 14664223490,
+          },
+        },
+      });
+      await actions.syncLatestMessages({ state, commit }, {});
+
+      expect(commit.mock.calls).toEqual([
+        ['conversation/setMetaUserLastSeenAt', 14664223490, { root: true }],
+        [
+          'setMissingMessagesInConversation',
+
+          {
+            '454': {
+              id: 454,
+              content: 'hi',
+              message_type: 0,
+              content_type: 'text',
+              content_attributes: {},
+              created_at: 1682244355,
+              conversation_id: 20,
+            },
+            '460': {
+              id: 460,
+              content: 'Hi how are you',
+              message_type: 0,
+              content_type: 'text',
+              content_attributes: {},
+              created_at: 1682417926,
+              conversation_id: 20,
+            },
+            '463': {
+              id: 463,
+              content: 'ss',
+              message_type: 0,
+              content_type: 'text',
+              content_attributes: {},
+              created_at: 1682490729,
+              conversation_id: 20,
+            },
+          },
+        ],
+      ]);
+    });
+
+    it('abort syncing if there is no missing messages ', async () => {
+      const state = {
+        uiFlags: { allMessagesLoaded: false },
+        conversation: {
+          '454': {
+            id: 454,
+            content: 'hi',
+            message_type: 0,
+            content_type: 'text',
+            content_attributes: {},
+            created_at: 1682244355, //  Sunday, 23 April 2023 10:05:55
+            conversation_id: 20,
+          },
+          '463': {
+            id: 463,
+            content: 'ss',
+            message_type: 0,
+            content_type: 'text',
+            content_attributes: {},
+            created_at: 1682490729, // Wednesday, 26 April 2023 06:32:09
+            conversation_id: 20,
+          },
+        },
+        lastMessageId: 463,
+      };
+      API.get.mockResolvedValue({
+        data: {
+          payload: [],
+          meta: {
+            contact_last_seen_at: 14664223490,
+          },
+        },
+      });
+      await actions.syncLatestMessages({ state, commit }, {});
+
+      expect(commit.mock.calls).toEqual([]);
+    });
+  });
 });
diff --git a/app/javascript/widget/store/modules/specs/conversation/mutations.spec.js b/app/javascript/widget/store/modules/specs/conversation/mutations.spec.js
index 96d2e8da8..0b96c6e20 100644
--- a/app/javascript/widget/store/modules/specs/conversation/mutations.spec.js
+++ b/app/javascript/widget/store/modules/specs/conversation/mutations.spec.js
@@ -183,4 +183,72 @@ describe('#mutations', () => {
       expect(state.conversations).toEqual({});
     });
   });
+
+  describe('#setMissingMessages', () => {
+    it('sets messages if payload is not empty', () => {
+      const state = {
+        uiFlags: { allMessagesLoaded: false },
+        conversations: {
+          '454': {
+            id: 454,
+            content: 'hi',
+            message_type: 0,
+            content_type: 'text',
+            content_attributes: {},
+            created_at: 1682432667,
+            conversation_id: 20,
+          },
+          '464': {
+            id: 464,
+            content: 'hey will be back soon',
+            message_type: 3,
+            content_type: 'text',
+            content_attributes: {},
+            created_at: 1682490729,
+            conversation_id: 20,
+          },
+        },
+      };
+      mutations.setMessagesInConversation(state, [
+        {
+          id: 455,
+          content: 'Hey billowing-grass-423 how are you?',
+          message_type: 3,
+          content_type: 'text',
+          content_attributes: {},
+          created_at: 1682432667,
+          conversation_id: 20,
+        },
+      ]);
+      expect(state.conversations).toEqual({
+        '454': {
+          id: 454,
+          content: 'hi',
+          message_type: 0,
+          content_type: 'text',
+          content_attributes: {},
+          created_at: 1682432667,
+          conversation_id: 20,
+        },
+        '455': {
+          id: 455,
+          content: 'Hey billowing-grass-423 how are you?',
+          message_type: 3,
+          content_type: 'text',
+          content_attributes: {},
+          created_at: 1682432667,
+          conversation_id: 20,
+        },
+        '464': {
+          id: 464,
+          content: 'hey will be back soon',
+          message_type: 3,
+          content_type: 'text',
+          content_attributes: {},
+          created_at: 1682490729,
+          conversation_id: 20,
+        },
+      });
+    });
+  });
 });

From 2c3160cfee7cdeff1106691a1a3dcdc8ed13c689 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Fri, 12 May 2023 15:48:06 +0530
Subject: [PATCH 083/101] feat: API to list all attachments for a conversation
 (#7059)

Fixes: https://linear.app/chatwoot/issue/CW-1678/api-to-list-all-attachments-for-a-conversation
---
 .../v1/accounts/conversations_controller.rb   |  4 ++
 app/models/conversation.rb                    |  1 +
 .../conversations/attachments.json.jbuilder   |  1 +
 config/routes.rb                              |  1 +
 .../accounts/conversations_controller_spec.rb | 49 +++++++++++++++++++
 spec/factories/messages.rb                    |  7 +++
 6 files changed, 63 insertions(+)
 create mode 100644 app/views/api/v1/accounts/conversations/attachments.json.jbuilder

diff --git a/app/controllers/api/v1/accounts/conversations_controller.rb b/app/controllers/api/v1/accounts/conversations_controller.rb
index 6e580a497..ebd673d6f 100644
--- a/app/controllers/api/v1/accounts/conversations_controller.rb
+++ b/app/controllers/api/v1/accounts/conversations_controller.rb
@@ -22,6 +22,10 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
     @conversations_count = result[:count]
   end
 
+  def attachments
+    @attachments = @conversation.attachments
+  end
+
   def create
     ActiveRecord::Base.transaction do
       @conversation = ConversationBuilder.new(params: params, contact_inbox: @contact_inbox).perform
diff --git a/app/models/conversation.rb b/app/models/conversation.rb
index e01fb3863..becb0a639 100644
--- a/app/models/conversation.rb
+++ b/app/models/conversation.rb
@@ -95,6 +95,7 @@ class Conversation < ApplicationRecord
   has_one :csat_survey_response, dependent: :destroy_async
   has_many :conversation_participants, dependent: :destroy_async
   has_many :notifications, as: :primary_actor, dependent: :destroy_async
+  has_many :attachments, through: :messages
 
   before_save :ensure_snooze_until_reset
   before_create :mark_conversation_pending_if_bot
diff --git a/app/views/api/v1/accounts/conversations/attachments.json.jbuilder b/app/views/api/v1/accounts/conversations/attachments.json.jbuilder
new file mode 100644
index 000000000..e31980ea2
--- /dev/null
+++ b/app/views/api/v1/accounts/conversations/attachments.json.jbuilder
@@ -0,0 +1 @@
+json.payload @attachments.map(&:push_event_data)
diff --git a/config/routes.rb b/config/routes.rb
index bdad7c1bf..650f8a64c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -97,6 +97,7 @@ Rails.application.routes.draw do
               post :update_last_seen
               post :unread
               post :custom_attributes
+              get :attachments
             end
           end
 
diff --git a/spec/controllers/api/v1/accounts/conversations_controller_spec.rb b/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
index 9689bdd4d..bf73cd0ce 100644
--- a/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
@@ -731,4 +731,53 @@ RSpec.describe 'Conversations API', type: :request do
       end
     end
   end
+
+  describe 'GET /api/v1/accounts/{account.id}/conversations/:id/attachments' do
+    let(:conversation) { create(:conversation, account: account) }
+
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        get "/api/v1/accounts/#{account.id}/conversations/#{conversation.display_id}/attachments"
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated user' do
+      let(:agent) { create(:user, account: account, role: :agent) }
+      let(:administrator) { create(:user, account: account, role: :administrator) }
+
+      before do
+        create(:message, :with_attachment, conversation: conversation, account: account, inbox: conversation.inbox, message_type: 'incoming')
+      end
+
+      it 'does not return the attachments if you do not have access to it' do
+        get "/api/v1/accounts/#{account.id}/conversations/#{conversation.display_id}/attachments",
+            headers: agent.create_new_auth_token,
+            as: :json
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+
+      it 'return the attachments if you are an administrator' do
+        get "/api/v1/accounts/#{account.id}/conversations/#{conversation.display_id}/attachments",
+            headers: administrator.create_new_auth_token,
+            as: :json
+
+        expect(response).to have_http_status(:success)
+        response_body = JSON.parse(response.body)
+        expect(response_body['payload'].first['file_type']).to eq('image')
+      end
+
+      it 'return the attachments if you are an agent with access to inbox' do
+        get "/api/v1/accounts/#{account.id}/conversations/#{conversation.display_id}/attachments",
+            headers: administrator.create_new_auth_token,
+            as: :json
+
+        expect(response).to have_http_status(:success)
+        response_body = JSON.parse(response.body)
+        expect(response_body['payload'].length).to eq(1)
+      end
+    end
+  end
 end
diff --git a/spec/factories/messages.rb b/spec/factories/messages.rb
index e14a8000d..3e51f2b35 100644
--- a/spec/factories/messages.rb
+++ b/spec/factories/messages.rb
@@ -20,6 +20,13 @@ FactoryBot.define do
       end
     end
 
+    trait :with_attachment do
+      after(:build) do |message|
+        attachment = message.attachments.new(account_id: message.account_id, file_type: :image)
+        attachment.file.attach(io: File.open(Rails.root.join('spec/assets/avatar.png')), filename: 'avatar.png', content_type: 'image/png')
+      end
+    end
+
     after(:build) do |message|
       message.sender ||= message.outgoing? ? create(:user, account: message.account) : create(:contact, account: message.account)
       message.inbox ||= message.conversation&.inbox || create(:inbox, account: message.account)

From abdf00d2cfc3e26ccef8b892b73edf46ed3a56a1 Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Date: Fri, 12 May 2023 16:39:18 +0530
Subject: [PATCH 084/101] fixes: Editor adding slash char while creating block
 quotes [cw-1505] (#7069)

* fixes: Editor adding slash char while creating block quotes [cw-1505]

* Update with latest package
---
 yarn.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yarn.lock b/yarn.lock
index cd0c7560a..6cdb92044 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2180,7 +2180,7 @@
 
 "@chatwoot/prosemirror-schema@https://github.com/chatwoot/prosemirror-schema.git":
   version "1.0.0"
-  resolved "https://github.com/chatwoot/prosemirror-schema.git#3306cdb220797090ce41ea607174e940330177e1"
+  resolved "https://github.com/chatwoot/prosemirror-schema.git#b937c3cb44210b7d251daf766988758975befec7"
   dependencies:
     prosemirror-commands "^1.1.4"
     prosemirror-dropcursor "^1.3.2"

From 198cd9b28d5137e9069f749e6d9b7f9b3809fba3 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Fri, 12 May 2023 19:25:51 +0530
Subject: [PATCH 085/101] feat: Show next available day/hour and minutes on
 widget (#6902)

* feat: Show next available hour and minutes on widget

* chore: Adds spec

* chore: Show days

* chore: Code clean up

* chore: Review fixes

* chore: Minor fixes

* chore: Review suggestion fixes

* chore: Minor fixes

* Added timezone to widget payload

* chore: Adds time zone

* chore: Review fixes

* chore: Adds comments

* chore: Rounded up min with nearest multiple of 5

* chore: Review fixes

* chore: Review fixes

* chore: Review fixes

* chore: Review fixes

* chore: Fix specs

* chore: Review fixes

* chore: Fix specs

* chore: Review fixes

* chore: Moved day names to i18n

* chore: Review fixes

* chore: Fix specs

---------

Co-authored-by: Tejaswini Chile <tejaswini@chatwoot.com>
Co-authored-by: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Co-authored-by: Shivam Mishra <scm.mymail@gmail.com>
---
 app/javascript/shared/helpers/DateHelper.js   |   7 +
 .../shared/helpers/specs/DateHelper.spec.js   |  14 +
 .../widget/components/ChatHeader.vue          |   8 +-
 .../widget/components/TeamAvailability.vue    |  14 +-
 app/javascript/widget/i18n/locale/en.json     |  12 +-
 app/javascript/widget/mixins/availability.js  |  11 +
 .../widget/mixins/nextAvailabilityTime.js     | 242 ++++++++
 .../mixins/specs/nextAvailabilityTime.spec.js | 544 ++++++++++++++++++
 app/views/widgets/show.html.erb               |   1 +
 9 files changed, 834 insertions(+), 19 deletions(-)
 create mode 100644 app/javascript/widget/mixins/nextAvailabilityTime.js
 create mode 100644 app/javascript/widget/mixins/specs/nextAvailabilityTime.spec.js

diff --git a/app/javascript/shared/helpers/DateHelper.js b/app/javascript/shared/helpers/DateHelper.js
index 15638c5a8..c8b0f231b 100644
--- a/app/javascript/shared/helpers/DateHelper.js
+++ b/app/javascript/shared/helpers/DateHelper.js
@@ -30,3 +30,10 @@ export const isTimeAfter = (h1, m1, h2, m2) => {
 
   return true;
 };
+
+export const generateRelativeTime = (value, unit, languageCode) => {
+  const rtf = new Intl.RelativeTimeFormat(languageCode, {
+    numeric: 'auto',
+  });
+  return rtf.format(value, unit);
+};
diff --git a/app/javascript/shared/helpers/specs/DateHelper.spec.js b/app/javascript/shared/helpers/specs/DateHelper.spec.js
index c67c1a27b..030910a3d 100644
--- a/app/javascript/shared/helpers/specs/DateHelper.spec.js
+++ b/app/javascript/shared/helpers/specs/DateHelper.spec.js
@@ -3,6 +3,7 @@ import {
   formatUnixDate,
   formatDigitToString,
   isTimeAfter,
+  generateRelativeTime,
 } from '../DateHelper';
 
 describe('#DateHelper', () => {
@@ -62,3 +63,16 @@ describe('#isTimeAfter', () => {
     expect(isTimeAfter(11, 59, 12, 0)).toEqual(false);
   });
 });
+
+describe('#generateRelativeTime', () => {
+  it('should return correct relative time', () => {
+    expect(generateRelativeTime(-1, 'day', 'en')).toEqual('yesterday');
+    expect(generateRelativeTime(1, 'day', 'en')).toEqual('tomorrow');
+    expect(generateRelativeTime(1, 'hour', 'en')).toEqual('in 1 hour');
+    expect(generateRelativeTime(-1, 'hour', 'en')).toEqual('1 hour ago');
+    expect(generateRelativeTime(1, 'minute', 'en')).toEqual('in 1 minute');
+    expect(generateRelativeTime(-1, 'minute', 'en')).toEqual('1 minute ago');
+    expect(generateRelativeTime(1, 'second', 'en')).toEqual('in 1 second');
+    expect(generateRelativeTime(-1, 'second', 'en')).toEqual('1 second ago');
+  });
+});
diff --git a/app/javascript/widget/components/ChatHeader.vue b/app/javascript/widget/components/ChatHeader.vue
index 906c98d14..f6a8aecd8 100644
--- a/app/javascript/widget/components/ChatHeader.vue
+++ b/app/javascript/widget/components/ChatHeader.vue
@@ -46,6 +46,7 @@
 import { mapGetters } from 'vuex';
 
 import availabilityMixin from 'widget/mixins/availability';
+import nextAvailabilityTime from 'widget/mixins/nextAvailabilityTime';
 import FluentIcon from 'shared/components/FluentIcon/Index.vue';
 import HeaderActions from './HeaderActions';
 import routerMixin from 'widget/mixins/routerMixin';
@@ -57,7 +58,7 @@ export default {
     FluentIcon,
     HeaderActions,
   },
-  mixins: [availabilityMixin, routerMixin, darkMixin],
+  mixins: [nextAvailabilityTime, availabilityMixin, routerMixin, darkMixin],
   props: {
     avatarUrl: {
       type: String,
@@ -93,11 +94,6 @@ export default {
       }
       return anyAgentOnline;
     },
-    replyWaitMessage() {
-      return this.isOnline
-        ? this.replyTimeStatus
-        : this.$t('TEAM_AVAILABILITY.OFFLINE');
-    },
   },
   methods: {
     onBackButtonClick() {
diff --git a/app/javascript/widget/components/TeamAvailability.vue b/app/javascript/widget/components/TeamAvailability.vue
index a3a6b0c02..8305c7a4e 100644
--- a/app/javascript/widget/components/TeamAvailability.vue
+++ b/app/javascript/widget/components/TeamAvailability.vue
@@ -35,6 +35,7 @@
 <script>
 import { mapGetters } from 'vuex';
 import { getContrastingTextColor } from '@chatwoot/utils';
+import nextAvailabilityTime from 'widget/mixins/nextAvailabilityTime';
 import AvailableAgents from 'widget/components/AvailableAgents.vue';
 import CustomButton from 'shared/components/Button';
 import configMixin from 'widget/mixins/configMixin';
@@ -47,7 +48,7 @@ export default {
     AvailableAgents,
     CustomButton,
   },
-  mixins: [configMixin, availabilityMixin, darkMixin],
+  mixins: [configMixin, nextAvailabilityTime, availabilityMixin, darkMixin],
   props: {
     availableAgents: {
       type: Array,
@@ -75,17 +76,6 @@ export default {
       }
       return anyAgentOnline;
     },
-    replyWaitMessage() {
-      const { workingHoursEnabled } = this.channelConfig;
-
-      if (this.isOnline) {
-        return this.replyTimeStatus;
-      }
-      if (workingHoursEnabled) {
-        return this.outOfOfficeMessage;
-      }
-      return '';
-    },
   },
   methods: {
     startConversation() {
diff --git a/app/javascript/widget/i18n/locale/en.json b/app/javascript/widget/i18n/locale/en.json
index 0c286263d..de94b33a3 100644
--- a/app/javascript/widget/i18n/locale/en.json
+++ b/app/javascript/widget/i18n/locale/en.json
@@ -19,8 +19,18 @@
   "REPLY_TIME": {
     "IN_A_FEW_MINUTES": "Typically replies in a few minutes",
     "IN_A_FEW_HOURS": "Typically replies in a few hours",
-    "IN_A_DAY": "Typically replies in a day"
+    "IN_A_DAY": "Typically replies in a day",
+    "BACK_IN": "We will be back online"
   },
+  "DAY_NAMES": [
+    "Sunday",
+    "Monday",
+    "Tuesday",
+    "Wednesday",
+    "Thursday",
+    "Friday",
+    "Saturday"
+  ],
   "START_CONVERSATION": "Start Conversation",
   "END_CONVERSATION": "End Conversation",
   "CONTINUE_CONVERSATION": "Continue conversation",
diff --git a/app/javascript/widget/mixins/availability.js b/app/javascript/widget/mixins/availability.js
index 56f33b214..746a5e095 100644
--- a/app/javascript/widget/mixins/availability.js
+++ b/app/javascript/widget/mixins/availability.js
@@ -21,6 +21,17 @@ export default {
           return this.$t('REPLY_TIME.IN_A_FEW_HOURS');
       }
     },
+    replyWaitMessage() {
+      const { workingHoursEnabled } = this.channelConfig;
+      if (workingHoursEnabled) {
+        return this.isOnline
+          ? this.replyTimeStatus
+          : `${this.$t('REPLY_TIME.BACK_IN')} ${this.timeLeftToBackInOnline}`;
+      }
+      return this.isOnline
+        ? this.replyTimeStatus
+        : this.$t('TEAM_AVAILABILITY.OFFLINE');
+    },
     outOfOfficeMessage() {
       return this.channelConfig.outOfOfficeMessage;
     },
diff --git a/app/javascript/widget/mixins/nextAvailabilityTime.js b/app/javascript/widget/mixins/nextAvailabilityTime.js
new file mode 100644
index 000000000..55797d282
--- /dev/null
+++ b/app/javascript/widget/mixins/nextAvailabilityTime.js
@@ -0,0 +1,242 @@
+import {
+  timeSlotParse,
+  defaultTimeSlot,
+} from 'dashboard/routes/dashboard/settings/inbox/helpers/businessHour.js';
+import { utcToZonedTime } from 'date-fns-tz';
+import { generateRelativeTime } from 'shared/helpers/DateHelper';
+
+const MINUTE_ROUNDING_FACTOR = 5;
+
+export default {
+  data() {
+    return {
+      dayNames: this.$t('DAY_NAMES'),
+      timeSlots: [...defaultTimeSlot],
+      timeSlot: {},
+    };
+  },
+  computed: {
+    channelConfig() {
+      return window.chatwootWebChannel;
+    },
+    workingHours() {
+      return this.channelConfig.workingHours;
+    },
+    newDateWithTimeZone() {
+      return utcToZonedTime(new Date(), this.timeZoneValue);
+    },
+    presentHour() {
+      return this.newDateWithTimeZone.getHours();
+    },
+    presentMinute() {
+      return this.newDateWithTimeZone.getMinutes();
+    },
+    currentDay() {
+      const date = this.newDateWithTimeZone;
+      const day = date.getDay();
+      const currentDay = Object.keys(this.dayNames).find(
+        key => this.dayNames[key] === this.dayNames[day]
+      );
+      return Number(currentDay);
+    },
+    timeZoneValue() {
+      return this.channelConfig.timezone;
+    },
+    languageCode() {
+      return window.chatwootWebChannel.locale;
+    },
+    currentDayWorkingHours() {
+      return this.workingHours.find(
+        slot => slot.day_of_week === this.currentDay
+      );
+    },
+    nextDayWorkingHours() {
+      let nextDay = this.getNextDay(this.currentDay);
+      let nextWorkingHour = this.getNextWorkingHour(nextDay);
+
+      // It gets the next working hour for the next day. If there is no working hour for the next day,
+      // it keeps iterating through the days of the week until it finds the next working hour.
+      while (!nextWorkingHour) {
+        nextDay = this.getNextDay(nextDay);
+        nextWorkingHour = this.getNextWorkingHour(nextDay);
+      }
+      return nextWorkingHour;
+    },
+    currentDayTimings() {
+      const {
+        open_hour: openHour,
+        open_minutes: openMinute,
+        close_hour: closeHour,
+      } = this.currentDayWorkingHours ?? {};
+      return {
+        openHour,
+        openMinute,
+        closeHour,
+      };
+    },
+    nextDayTimings() {
+      const { open_hour: openHour, open_minutes: openMinute } =
+        this.nextDayWorkingHours ?? {};
+      return {
+        openHour,
+        openMinute,
+      };
+    },
+    dayDiff() {
+      // Here this is used to get the difference between current day and next working day
+      const nextDay = this.nextDayWorkingHours.day_of_week;
+      const totalDays = 6;
+      return nextDay > this.currentDay
+        ? nextDay - this.currentDay - 1
+        : totalDays - this.currentDay + nextDay;
+    },
+    dayNameOfNextWorkingDay() {
+      return this.dayNames[this.nextDayWorkingHours.day_of_week];
+    },
+    hoursAndMinutesBackInOnline() {
+      if (this.presentHour >= this.currentDayTimings.closeHour) {
+        return this.getHoursAndMinutesUntilNextDayOpen(
+          this.nextDayWorkingHours.open_all_day
+            ? 0
+            : this.nextDayTimings.openHour,
+          this.nextDayTimings.openMinute,
+          this.currentDayTimings.closeHour
+        );
+      }
+      return this.getHoursAndMinutesUntilNextDayOpen(
+        this.currentDayTimings.openHour,
+        this.currentDayTimings.openMinute,
+        this.currentDayTimings.closeHour
+      );
+    },
+    exactTimeInAmPm() {
+      return `${
+        this.timeSlot.day === this.currentDay ? `at ${this.timeSlot.from}` : ''
+      }`;
+    },
+    hoursAndMinutesLeft() {
+      const { hoursLeft, minutesLeft } = this.hoursAndMinutesBackInOnline;
+
+      const timeLeftChars = [];
+
+      if (hoursLeft > 0) {
+        const roundedUpHoursLeft = minutesLeft > 0 ? hoursLeft + 1 : hoursLeft;
+        const hourRelative = generateRelativeTime(
+          roundedUpHoursLeft,
+          'hour',
+          this.languageCode
+        );
+        timeLeftChars.push(`${hourRelative}`);
+      }
+
+      if (minutesLeft > 0 && hoursLeft === 0) {
+        const roundedUpMinLeft =
+          Math.ceil(minutesLeft / MINUTE_ROUNDING_FACTOR) *
+          MINUTE_ROUNDING_FACTOR;
+        const minRelative = generateRelativeTime(
+          roundedUpMinLeft,
+          'minutes',
+          this.languageCode
+        );
+        timeLeftChars.push(`${minRelative}`);
+      }
+
+      return timeLeftChars.join(' ');
+    },
+    hoursAndMinutesToBack() {
+      const { hoursLeft, minutesLeft } = this.hoursAndMinutesBackInOnline;
+      if (hoursLeft >= 3) {
+        return this.exactTimeInAmPm;
+      }
+      if (hoursLeft > 0 || minutesLeft > 0) {
+        return this.hoursAndMinutesLeft;
+      }
+      return 'in some time';
+    },
+    timeLeftToBackInOnline() {
+      if (
+        this.hoursAndMinutesBackInOnline.hoursLeft >= 24 ||
+        (this.timeSlot.day !== this.currentDay && this.dayDiff === 0)
+      ) {
+        const hourRelative = generateRelativeTime(
+          this.dayDiff + 1,
+          'days',
+          this.languageCode
+        );
+        return `${hourRelative}`;
+      }
+      if (
+        this.dayDiff >= 1 &&
+        this.presentHour >= this.currentDayTimings.closeHour
+      ) {
+        return `on ${this.dayNameOfNextWorkingDay}`;
+      }
+      return this.hoursAndMinutesToBack;
+    },
+  },
+  mounted() {
+    this.setTimeSlot();
+  },
+  methods: {
+    getNextDay(day) {
+      // This code calculates the next day of the week based on the current day. If the current day is Saturday (6), then the next day will be Sunday (0).
+      return (day + 1) % 7;
+    },
+    getNextWorkingHour(day) {
+      const workingHour = this.workingHours.find(
+        slot => slot.day_of_week === day
+      );
+      if (workingHour && !workingHour.closed_all_day) {
+        return workingHour;
+      }
+      return null;
+    },
+    getHoursAndMinutesUntilNextDayOpen(
+      openHour, // If the present time is after the closing time of the current day, then the openHour will be the opening hour of the next day else it will be the opening hour of the current day.
+      openMinutes, // If the present time is after the closing time of the current day, then the openMinutes will be the opening minutes of the next day else it will be the opening minutes of the current day.
+      closeHour // The closeHour will be the closing hour of the current day. It will be used to calculate the time remaining until the next day's opening hours.
+    ) {
+      // This code calculates the time remaining until the next day's opening hours,
+      // given the current time, the opening hours, and the closing hours of the current day.
+      if (closeHour < openHour) {
+        openHour += 24;
+      }
+      let diffMinutes =
+        openHour * 60 +
+        openMinutes -
+        (this.presentHour * 60 + this.presentMinute);
+      diffMinutes = diffMinutes < 0 ? diffMinutes + 24 * 60 : diffMinutes;
+      const [hoursLeft, minutesLeft] = [
+        Math.floor(diffMinutes / 60),
+        diffMinutes % 60,
+      ];
+
+      // It returns the remaining time in hours and minutes as an object with keys hours and minutes.
+      return { hoursLeft, minutesLeft };
+    },
+    setTimeSlot() {
+      // It checks if the working hours feature is enabled for the store.
+
+      const timeSlots = this.workingHours;
+
+      // If the present hour is after the closing hour of the current day,
+      // then the next day's working hours will be used to calculate the time remaining until the next day's opening hours,
+      // else the current day's working hours will be used
+      const currentSlot =
+        this.presentHour >= this.currentDayTimings.closeHour
+          ? this.nextDayWorkingHours
+          : this.currentDayWorkingHours;
+
+      // It parses the working hours to get the time slots in AM/PM format.
+      const slots = timeSlotParse(timeSlots).length
+        ? timeSlotParse(timeSlots)
+        : defaultTimeSlot;
+      this.timeSlots = slots;
+
+      // It finds the time slot for the current slot.
+      this.timeSlot = this.timeSlots.find(
+        slot => slot.day === currentSlot.day_of_week
+      );
+    },
+  },
+};
diff --git a/app/javascript/widget/mixins/specs/nextAvailabilityTime.spec.js b/app/javascript/widget/mixins/specs/nextAvailabilityTime.spec.js
new file mode 100644
index 000000000..149fdba59
--- /dev/null
+++ b/app/javascript/widget/mixins/specs/nextAvailabilityTime.spec.js
@@ -0,0 +1,544 @@
+import { createWrapper } from '@vue/test-utils';
+import nextAvailabilityTimeMixin from '../nextAvailabilityTime';
+import Vue from 'vue';
+
+describe('nextAvailabilityTimeMixin', () => {
+  const chatwootWebChannel = {
+    workingHoursEnabled: true,
+    workingHours: [
+      {
+        day_of_week: 0,
+        open_hour: 9,
+        closed_all_day: false,
+        open_minutes: 0,
+        close_hour: 17,
+      },
+      {
+        day_of_week: 1,
+        open_hour: 9,
+        closed_all_day: false,
+        open_minutes: 0,
+        close_hour: 17,
+      },
+      {
+        day_of_week: 2,
+        open_hour: 9,
+        closed_all_day: false,
+        open_minutes: 0,
+        close_hour: 17,
+      },
+      {
+        day_of_week: 3,
+        open_hour: 9,
+        closed_all_day: false,
+        open_minutes: 0,
+        close_hour: 17,
+      },
+      {
+        day_of_week: 4,
+        open_hour: 9,
+        closed_all_day: false,
+        open_minutes: 0,
+        close_hour: 17,
+      },
+      {
+        day_of_week: 5,
+        open_hour: 9,
+        closed_all_day: false,
+        open_minutes: 0,
+        close_hour: 17,
+      },
+      {
+        day_of_week: 6,
+        open_hour: 9,
+        closed_all_day: false,
+        open_minutes: 0,
+        close_hour: 17,
+      },
+    ],
+  };
+
+  beforeAll(() => {
+    window.chatwootWebChannel = chatwootWebChannel;
+  });
+
+  afterAll(() => {
+    delete window.chatwootWebChannel;
+  });
+
+  beforeEach(() => {
+    jest.useRealTimers();
+  });
+
+  it('should return day names', () => {
+    const Component = {
+      render() {},
+      mixins: [nextAvailabilityTimeMixin],
+    };
+    const Constructor = Vue.extend(Component);
+    const vm = new Constructor().$mount();
+    const wrapper = createWrapper(vm);
+    wrapper.vm.dayNames = [
+      'Sunday',
+      'Monday',
+      'Tuesday',
+      'Wednesday',
+      'Thursday',
+      'Friday',
+      'Saturday',
+    ];
+    expect(wrapper.vm.dayNames).toEqual([
+      'Sunday',
+      'Monday',
+      'Tuesday',
+      'Wednesday',
+      'Thursday',
+      'Friday',
+      'Saturday',
+    ]);
+  });
+
+  it('should return channelConfig', () => {
+    const Component = {
+      render() {},
+      mixins: [nextAvailabilityTimeMixin],
+    };
+    const Constructor = Vue.extend(Component);
+    const vm = new Constructor().$mount();
+    const wrapper = createWrapper(vm);
+    expect(wrapper.vm.channelConfig).toEqual(chatwootWebChannel);
+  });
+
+  it('should return workingHours', () => {
+    const Component = {
+      render() {},
+      mixins: [nextAvailabilityTimeMixin],
+    };
+    const Constructor = Vue.extend(Component);
+    const vm = new Constructor().$mount();
+    const wrapper = createWrapper(vm);
+    expect(wrapper.vm.workingHours).toEqual(chatwootWebChannel.workingHours);
+  });
+
+  it('should return currentDayWorkingHours', () => {
+    const Component = {
+      render() {},
+      mixins: [nextAvailabilityTimeMixin],
+    };
+    const currentDay = new Date().getDay();
+    const expectedWorkingHours = chatwootWebChannel.workingHours.find(
+      slot => slot.day_of_week === currentDay
+    );
+    const Constructor = Vue.extend(Component);
+    const vm = new Constructor().$mount();
+    const wrapper = createWrapper(vm);
+    wrapper.vm.dayNames = [
+      'Sunday',
+      'Monday',
+      'Tuesday',
+      'Wednesday',
+      'Thursday',
+      'Friday',
+      'Saturday',
+    ];
+    expect(wrapper.vm.currentDayWorkingHours).toEqual(expectedWorkingHours);
+  });
+
+  it('should return nextDayWorkingHours', () => {
+    const Component = {
+      render() {},
+      mixins: [nextAvailabilityTimeMixin],
+    };
+    const currentDay = new Date().getDay();
+    const nextDay = currentDay === 6 ? 0 : currentDay + 1;
+    const expectedWorkingHours = chatwootWebChannel.workingHours.find(
+      slot => slot.day_of_week === nextDay
+    );
+    const Constructor = Vue.extend(Component);
+    const vm = new Constructor().$mount();
+    const wrapper = createWrapper(vm);
+    wrapper.vm.dayNames = [
+      'Sunday',
+      'Monday',
+      'Tuesday',
+      'Wednesday',
+      'Thursday',
+      'Friday',
+      'Saturday',
+    ];
+    expect(wrapper.vm.nextDayWorkingHours).toEqual(expectedWorkingHours);
+  });
+
+  it('should return presentHour', () => {
+    const Component = {
+      render() {},
+      mixins: [nextAvailabilityTimeMixin],
+    };
+    const Constructor = Vue.extend(Component);
+    const vm = new Constructor().$mount();
+    const wrapper = createWrapper(vm);
+    expect(wrapper.vm.presentHour).toBe(new Date().getHours());
+  });
+
+  it('should return presentMinute', () => {
+    const Component = {
+      render() {},
+      mixins: [nextAvailabilityTimeMixin],
+    };
+    const Constructor = Vue.extend(Component);
+    const vm = new Constructor().$mount();
+    const wrapper = createWrapper(vm);
+    wrapper.vm.dayNames = [
+      'Sunday',
+      'Monday',
+      'Tuesday',
+      'Wednesday',
+      'Thursday',
+      'Friday',
+      'Saturday',
+    ];
+    expect(wrapper.vm.presentMinute).toBe(new Date().getMinutes());
+  });
+
+  it('should return currentDay', () => {
+    const Component = {
+      render() {},
+      mixins: [nextAvailabilityTimeMixin],
+    };
+    const Constructor = Vue.extend(Component);
+    const vm = new Constructor().$mount();
+    const wrapper = createWrapper(vm);
+    wrapper.vm.dayNames = [
+      'Sunday',
+      'Monday',
+      'Tuesday',
+      'Wednesday',
+      'Thursday',
+      'Friday',
+      'Saturday',
+    ];
+    const date = new Date();
+    const day = date.getDay();
+    const currentDay = Object.keys(wrapper.vm.dayNames).find(
+      key => wrapper.vm.dayNames[key] === wrapper.vm.dayNames[day]
+    );
+    expect(wrapper.vm.currentDay).toBe(Number(currentDay));
+  });
+
+  it('should return currentDayTimings', () => {
+    const Component = {
+      render() {},
+      mixins: [nextAvailabilityTimeMixin],
+    };
+    const Constructor = Vue.extend(Component);
+    const vm = new Constructor().$mount();
+    const wrapper = createWrapper(vm);
+    wrapper.vm.dayNames = [
+      'Sunday',
+      'Monday',
+      'Tuesday',
+      'Wednesday',
+      'Thursday',
+      'Friday',
+      'Saturday',
+    ];
+    const {
+      open_hour: openHour,
+      open_minutes: openMinute,
+      close_hour: closeHour,
+    } = wrapper.vm.currentDayWorkingHours;
+    expect(wrapper.vm.currentDayTimings).toEqual({
+      openHour,
+      openMinute,
+      closeHour,
+    });
+  });
+
+  it('should return nextDayTimings', () => {
+    const Component = {
+      render() {},
+      mixins: [nextAvailabilityTimeMixin],
+    };
+    const Constructor = Vue.extend(Component);
+    const vm = new Constructor().$mount();
+    const wrapper = createWrapper(vm);
+    wrapper.vm.dayNames = [
+      'Sunday',
+      'Monday',
+      'Tuesday',
+      'Wednesday',
+      'Thursday',
+      'Friday',
+      'Saturday',
+    ];
+    const {
+      open_hour: openHour,
+      open_minutes: openMinute,
+    } = wrapper.vm.nextDayWorkingHours;
+
+    expect(wrapper.vm.nextDayTimings).toEqual({
+      openHour,
+      openMinute,
+    });
+  });
+
+  it('should return dayDiff', () => {
+    const Component = {
+      render() {},
+      mixins: [nextAvailabilityTimeMixin],
+    };
+    const Constructor = Vue.extend(Component);
+    const vm = new Constructor().$mount();
+    const wrapper = createWrapper(vm);
+    wrapper.vm.dayNames = [
+      'Sunday',
+      'Monday',
+      'Tuesday',
+      'Wednesday',
+      'Thursday',
+      'Friday',
+      'Saturday',
+    ];
+    const currentDay = wrapper.vm.currentDay;
+    const nextDay = wrapper.vm.nextDayWorkingHours.day_of_week;
+    const totalDays = 6;
+    const expectedDayDiff =
+      nextDay > currentDay
+        ? nextDay - currentDay - 1
+        : totalDays - currentDay + nextDay;
+
+    expect(wrapper.vm.dayDiff).toEqual(expectedDayDiff);
+  });
+
+  it('should return dayNameOfNextWorkingDay', () => {
+    const Component = {
+      render() {},
+      mixins: [nextAvailabilityTimeMixin],
+    };
+    const Constructor = Vue.extend(Component);
+    const vm = new Constructor().$mount();
+    const wrapper = createWrapper(vm);
+    wrapper.vm.dayNames = [
+      'Sunday',
+      'Monday',
+      'Tuesday',
+      'Wednesday',
+      'Thursday',
+      'Friday',
+      'Saturday',
+    ];
+    const nextDay = wrapper.vm.nextDayWorkingHours.day_of_week;
+    const expectedDayName = wrapper.vm.dayNames[nextDay];
+    expect(wrapper.vm.dayNameOfNextWorkingDay).toEqual(expectedDayName);
+  });
+
+  it('should return hoursAndMinutesBackInOnline', () => {
+    const Component = {
+      render() {},
+      mixins: [nextAvailabilityTimeMixin],
+    };
+    const Constructor = Vue.extend(Component);
+    const vm = new Constructor().$mount();
+    const wrapper = createWrapper(vm);
+    wrapper.vm.dayNames = [
+      'Sunday',
+      'Monday',
+      'Tuesday',
+      'Wednesday',
+      'Thursday',
+      'Friday',
+      'Saturday',
+    ];
+    const currentDayCloseHour =
+      chatwootWebChannel.workingHours[wrapper.vm.currentDay].close_hour;
+    const nextDayOpenHour =
+      chatwootWebChannel.workingHours[
+        wrapper.vm.currentDay === 6 ? 0 : wrapper.vm.currentDay + 1
+      ].open_hour;
+    const nextDayOpenMinute =
+      chatwootWebChannel.workingHours[
+        wrapper.vm.currentDay === 6 ? 0 : wrapper.vm.currentDay + 1
+      ].open_minutes;
+    const expectedHoursAndMinutes = wrapper.vm.getHoursAndMinutesUntilNextDayOpen(
+      nextDayOpenHour,
+      nextDayOpenMinute,
+      currentDayCloseHour
+    );
+    expect(wrapper.vm.hoursAndMinutesBackInOnline).toEqual(
+      expectedHoursAndMinutes
+    );
+  });
+
+  it('should return getNextDay', () => {
+    const Component = {
+      render() {},
+      mixins: [nextAvailabilityTimeMixin],
+    };
+    const Constructor = Vue.extend(Component);
+    const vm = new Constructor().$mount();
+    const wrapper = createWrapper(vm);
+    expect(wrapper.vm.getNextDay(6)).toBe(0);
+  });
+
+  it('should return in 30 minutes', () => {
+    const Component = {
+      render() {},
+      mixins: [nextAvailabilityTimeMixin],
+    };
+    jest
+      .useFakeTimers('modern')
+      .setSystemTime(new Date('Thu Apr 14 2022 23:04:46 GMT+0530'));
+    const Constructor = Vue.extend(Component);
+    const vm = new Constructor().$mount();
+    const wrapper = createWrapper(vm);
+    wrapper.vm.timeSlot = {
+      day: 4,
+      from: '12:00 AM',
+      openAllDay: false,
+      to: '08:00 AM',
+      valid: true,
+    };
+    wrapper.vm.dayNames = [
+      'Sunday',
+      'Monday',
+      'Tuesday',
+      'Wednesday',
+      'Thursday',
+      'Friday',
+      'Saturday',
+    ];
+
+    chatwootWebChannel.workingHours[4].open_hour = 18;
+    chatwootWebChannel.workingHours[4].open_minutes = 0;
+    chatwootWebChannel.workingHours[4].close_hour = 23;
+    expect(wrapper.vm.timeLeftToBackInOnline).toBe('in 30 minutes');
+  });
+
+  it('should return in 3 hours', () => {
+    const Component = {
+      render() {},
+      mixins: [nextAvailabilityTimeMixin],
+    };
+    jest
+      .useFakeTimers('modern')
+      .setSystemTime(new Date('Thu Apr 14 2022 23:04:46 GMT+0530'));
+    const Constructor = Vue.extend(Component);
+    const vm = new Constructor().$mount();
+    const wrapper = createWrapper(vm);
+    wrapper.vm.timeSlot = {
+      day: 4,
+      from: '12:00 PM',
+      openAllDay: false,
+      to: '11:30 PM',
+      valid: true,
+    };
+    wrapper.vm.dayNames = [
+      'Sunday',
+      'Monday',
+      'Tuesday',
+      'Wednesday',
+      'Thursday',
+      'Friday',
+      'Saturday',
+    ];
+    chatwootWebChannel.workingHours[4].open_hour = 19;
+    expect(wrapper.vm.timeLeftToBackInOnline).toBe('in 2 hours');
+  });
+
+  it('should return at 10:00 AM', () => {
+    const Component = {
+      render() {},
+      mixins: [nextAvailabilityTimeMixin],
+    };
+    jest
+      .useFakeTimers('modern')
+      .setSystemTime(new Date('Thu Apr 14 2022 23:04:46 GMT+0530'));
+    const Constructor = Vue.extend(Component);
+    const vm = new Constructor().$mount();
+    const wrapper = createWrapper(vm);
+    wrapper.vm.timeSlot = {
+      day: 4,
+      from: '10:00 AM',
+      openAllDay: false,
+      to: '11:00 AM',
+      valid: true,
+    };
+    wrapper.vm.dayNames = [
+      'Sunday',
+      'Monday',
+      'Tuesday',
+      'Wednesday',
+      'Thursday',
+      'Friday',
+      'Saturday',
+    ];
+    chatwootWebChannel.workingHours[4].open_hour = 10;
+    expect(wrapper.vm.timeLeftToBackInOnline).toBe('at 10:00 AM');
+  });
+
+  it('should return tomorrow', () => {
+    const Component = {
+      render() {},
+      mixins: [nextAvailabilityTimeMixin],
+    };
+    jest
+      .useFakeTimers('modern')
+      .setSystemTime(new Date('Thu Apr 14 2022 23:04:46 GMT+0530'));
+    const Constructor = Vue.extend(Component);
+    const vm = new Constructor().$mount();
+    const wrapper = createWrapper(vm);
+    wrapper.vm.timeSlot = {
+      day: 0,
+      from: '12:00 AM',
+      openAllDay: false,
+      to: '08:00 AM',
+      valid: true,
+    };
+    wrapper.vm.dayNames = [
+      'Sunday',
+      'Monday',
+      'Tuesday',
+      'Wednesday',
+      'Thursday',
+      'Friday',
+      'Saturday',
+    ];
+    chatwootWebChannel.workingHours[4].open_hour = 9;
+    chatwootWebChannel.workingHours[4].close_hour = 16;
+    expect(wrapper.vm.timeLeftToBackInOnline).toBe('tomorrow');
+  });
+
+  it('should return on Saturday', () => {
+    const Component = {
+      render() {},
+      mixins: [nextAvailabilityTimeMixin],
+    };
+    jest
+      .useFakeTimers('modern')
+      .setSystemTime(new Date('Thu Apr 14 2022 23:04:46 GMT+0530'));
+    const Constructor = Vue.extend(Component);
+    const vm = new Constructor().$mount();
+    const wrapper = createWrapper(vm);
+    wrapper.vm.timeSlot = {
+      day: 0,
+      from: '12:00 AM',
+      openAllDay: false,
+      to: '08:00 AM',
+      valid: true,
+    };
+    wrapper.vm.dayNames = [
+      'Sunday',
+      'Monday',
+      'Tuesday',
+      'Wednesday',
+      'Thursday',
+      'Friday',
+      'Saturday',
+    ];
+
+    chatwootWebChannel.workingHours[4].open_hour = 9;
+    chatwootWebChannel.workingHours[4].close_hour = 16;
+    chatwootWebChannel.workingHours[5].closed_all_day = true;
+    expect(wrapper.vm.timeLeftToBackInOnline).toBe('on Saturday');
+  });
+});
diff --git a/app/views/widgets/show.html.erb b/app/views/widgets/show.html.erb
index baa7c6ac1..d5d047074 100644
--- a/app/views/widgets/show.html.erb
+++ b/app/views/widgets/show.html.erb
@@ -24,6 +24,7 @@
         workingHours: <%= @web_widget.inbox.working_hours.to_json.html_safe %>,
         outOfOfficeMessage: <%= @web_widget.inbox.out_of_office_message.to_json.html_safe %>,
         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') %>
       }

From 385eab6b96bd4478a805f40c5d7b51f635bd5b9c Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Fri, 12 May 2023 22:12:21 +0530
Subject: [PATCH 086/101] chore: Add max length validation to text fields
 (#7073)

Introduces a default max length validation for all string and text fields to prevent processing large payloads.
---
 app/models/account.rb            |  2 +-
 app/models/application_record.rb | 27 +++++++++++++++++++++++++++
 app/models/contact.rb            |  1 -
 spec/models/account_spec.rb      | 17 +++++++++++++++++
 spec/models/article_spec.rb      | 31 +++++++++++++++++++++++++++----
 spec/models/message_spec.rb      | 17 +++++++++++++++++
 6 files changed, 89 insertions(+), 6 deletions(-)

diff --git a/app/models/account.rb b/app/models/account.rb
index 331343de1..e5453bfa3 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -34,7 +34,7 @@ class Account < ApplicationRecord
 
   validates :name, presence: true
   validates :auto_resolve_duration, numericality: { greater_than_or_equal_to: 1, less_than_or_equal_to: 999, allow_nil: true }
-  validates :name, length: { maximum: 255 }
+  validates :domain, length: { maximum: 100 }
 
   has_many :account_users, dependent: :destroy_async
   has_many :agent_bot_inboxes, dependent: :destroy_async
diff --git a/app/models/application_record.rb b/app/models/application_record.rb
index ee91205eb..117950e35 100644
--- a/app/models/application_record.rb
+++ b/app/models/application_record.rb
@@ -2,6 +2,8 @@ class ApplicationRecord < ActiveRecord::Base
   include Events::Types
   self.abstract_class = true
 
+  before_validation :validates_column_content_length
+
   # the models that exposed in email templates through liquid
   DROPPABLES = %w[Account Channel Conversation Inbox User Message].freeze
 
@@ -14,6 +16,31 @@ class ApplicationRecord < ActiveRecord::Base
 
   private
 
+  # Generic validation for all columns of type string and text
+  # Validates the length of the column to prevent DOS via large payloads
+  # if a custom length validation is already present, skip the validation
+  def validates_column_content_length
+    self.class.columns.each do |column|
+      check_and_validate_content_length(column) if column_of_type_string_or_text?(column)
+    end
+  end
+
+  def column_of_type_string_or_text?(column)
+    %i[string text].include?(column.type)
+  end
+
+  def check_and_validate_content_length(column)
+    length_validator = self.class.validators_on(column.name).find { |v| v.kind == :length }
+    validate_content_length(column) if length_validator.blank?
+  end
+
+  def validate_content_length(column)
+    max_length = column.type == :text ? 20_000 : 255
+    return if self[column.name].nil? || self[column.name].length <= max_length
+
+    errors.add(column.name.to_sym, "is too long (maximum is #{max_length} characters)")
+  end
+
   def normalize_empty_string_to_nil(attrs = [])
     attrs.each do |attr|
       self[attr] = nil if self[attr].blank?
diff --git a/app/models/contact.rb b/app/models/contact.rb
index 934fbd387..96457996f 100644
--- a/app/models/contact.rb
+++ b/app/models/contact.rb
@@ -36,7 +36,6 @@ class Contact < ApplicationRecord
   validates :phone_number,
             allow_blank: true, uniqueness: { scope: [:account_id] },
             format: { with: /\+[1-9]\d{1,14}\z/, message: I18n.t('errors.contacts.phone_number.invalid') }
-  validates :name, length: { maximum: 255 }
 
   belongs_to :account
   has_many :conversations, dependent: :destroy_async
diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index 9cd5721ac..86a7e6a5d 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -23,6 +23,23 @@ RSpec.describe Account do
   it { is_expected.to have_many(:categories).dependent(:destroy_async) }
   it { is_expected.to have_many(:teams).dependent(:destroy_async) }
 
+  # This validation happens in ApplicationRecord
+  describe 'length validations' do
+    let(:account) { create(:account) }
+
+    it 'validates name length' do
+      account.name = 'a' * 256
+      account.valid?
+      expect(account.errors[:name]).to include('is too long (maximum is 255 characters)')
+    end
+
+    it 'validates domain length' do
+      account.domain = 'a' * 150
+      account.valid?
+      expect(account.errors[:domain]).to include('is too long (maximum is 100 characters)')
+    end
+  end
+
   describe 'usage_limits' do
     let(:account) { create(:account) }
 
diff --git a/spec/models/article_spec.rb b/spec/models/article_spec.rb
index 1520b86a7..11837a1d8 100644
--- a/spec/models/article_spec.rb
+++ b/spec/models/article_spec.rb
@@ -1,6 +1,11 @@
 require 'rails_helper'
 
 RSpec.describe Article, type: :model do
+  let!(:account) { create(:account) }
+  let(:user) { create(:user, account_ids: [account.id], role: :agent) }
+  let!(:portal_1) { create(:portal, account_id: account.id, config: { allowed_locales: %w[en es] }) }
+  let!(:category_1) { create(:category, slug: 'category_1', locale: 'en', portal_id: portal_1.id) }
+
   context 'with validations' do
     it { is_expected.to validate_presence_of(:account_id) }
     it { is_expected.to validate_presence_of(:author_id) }
@@ -13,12 +18,30 @@ RSpec.describe Article, type: :model do
     it { is_expected.to belong_to(:author) }
   end
 
+  # This validation happens in ApplicationRecord
+  describe 'length validations' do
+    let(:article) do
+      create(:article, category_id: category_1.id, content: 'This is the content', description: 'this is the description',
+                       slug: 'this-is-title', title: 'this is title',
+                       portal_id: portal_1.id, author_id: user.id)
+    end
+
+    context 'when it validates content length' do
+      it 'valid when within limit' do
+        article.content = 'a' * 1000
+        expect(article.valid?).to be true
+      end
+
+      it 'invalid when crossed the limit' do
+        article.content = 'a' * 25_001
+        article.valid?
+        expect(article.errors[:content]).to include('is too long (maximum is 20000 characters)')
+      end
+    end
+  end
+
   describe 'search' do
-    let!(:account) { create(:account) }
-    let(:user) { create(:user, account_ids: [account.id], role: :agent) }
-    let!(:portal_1) { create(:portal, account_id: account.id, config: { allowed_locales: %w[en es] }) }
     let!(:portal_2) { create(:portal, account_id: account.id, config: { allowed_locales: %w[en es] }) }
-    let!(:category_1) { create(:category, slug: 'category_1', locale: 'en', portal_id: portal_1.id) }
     let!(:category_2) { create(:category, slug: 'category_2', locale: 'es', portal_id: portal_1.id) }
     let!(:category_3) { create(:category, slug: 'category_3', locale: 'es', portal_id: portal_2.id) }
 
diff --git a/spec/models/message_spec.rb b/spec/models/message_spec.rb
index e3ee1959e..e6dddbe4b 100644
--- a/spec/models/message_spec.rb
+++ b/spec/models/message_spec.rb
@@ -10,6 +10,23 @@ RSpec.describe Message, type: :model do
     it { is_expected.to validate_presence_of(:account_id) }
   end
 
+  describe 'length validations' do
+    let(:message) { create(:message) }
+
+    context 'when it validates name length' do
+      it 'valid when within limit' do
+        message.content = 'a' * 120_000
+        expect(message.valid?).to be true
+      end
+
+      it 'invalid when crossed the limit' do
+        message.content = 'a' * 150_001
+        message.valid?
+        expect(message.errors[:content]).to include('is too long (maximum is 150000 characters)')
+      end
+    end
+  end
+
   describe 'concerns' do
     it_behaves_like 'liqudable'
   end

From 354010a6e1131c64f20e765f01c0ecac845e09fc Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Sun, 14 May 2023 10:02:36 +0530
Subject: [PATCH 087/101] chore: fetch mails with multiple attachments (#7030)

---
 app/jobs/inboxes/fetch_imap_emails_job.rb     |  49 ++--
 app/mailboxes/mailbox_helper.rb               |   2 +-
 spec/fixtures/files/multiple_attachments.eml  | 270 ++++++++++++++++++
 .../inboxes/fetch_imap_emails_job_spec.rb     |  52 +++-
 4 files changed, 352 insertions(+), 21 deletions(-)
 create mode 100644 spec/fixtures/files/multiple_attachments.eml

diff --git a/app/jobs/inboxes/fetch_imap_emails_job.rb b/app/jobs/inboxes/fetch_imap_emails_job.rb
index 1072e7ba6..bf9972778 100644
--- a/app/jobs/inboxes/fetch_imap_emails_job.rb
+++ b/app/jobs/inboxes/fetch_imap_emails_job.rb
@@ -33,23 +33,30 @@ class Inboxes::FetchImapEmailsJob < ApplicationJob
   end
 
   def fetch_mail_for_channel(channel)
-    # TODO: rather than setting this as default method for all mail objects, lets if can do new mail object
-    # using Mail.retriever_method.new(params)
-    Mail.defaults do
-      retriever_method :imap, address: channel.imap_address,
-                              port: channel.imap_port,
-                              user_name: channel.imap_login,
-                              password: channel.imap_password,
-                              enable_ssl: channel.imap_enable_ssl
-    end
+    imap_inbox = authenticated_imap_inbox(channel, channel.imap_password, 'PLAIN')
+    last_email_time = DateTime.parse(Net::IMAP.format_datetime(last_email_time(channel)))
 
-    Mail.find(what: :last, count: 10, order: :asc).each do |inbound_mail|
-      next if channel.inbox.messages.find_by(source_id: inbound_mail.message_id).present?
+    received_mails(imap_inbox).each do |message_id|
+      inbound_mail = Mail.read_from_string imap_inbox.fetch(message_id, 'RFC822')[0].attr['RFC822']
+
+      next if email_already_present?(channel, inbound_mail, last_email_time)
 
       process_mail(inbound_mail, channel)
     end
   end
 
+  def email_already_present?(channel, inbound_mail, last_email_time)
+    processed_email?(inbound_mail, last_email_time) || channel.inbox.messages.find_by(source_id: inbound_mail.message_id).present?
+  end
+
+  def received_mails(imap_inbox)
+    imap_inbox.search(['BEFORE', tomorrow, 'SINCE', yesterday])
+  end
+
+  def processed_email?(current_email, last_email_time)
+    current_email.date < last_email_time
+  end
+
   def fetch_mail_for_ms_provider(channel)
     return if channel.provider_config['access_token'].blank?
 
@@ -57,14 +64,14 @@ class Inboxes::FetchImapEmailsJob < ApplicationJob
 
     return unless access_token
 
-    imap = imap_authenticate(channel, access_token)
+    imap_inbox = authenticated_imap_inbox(channel, access_token, 'XOAUTH2')
 
-    process_mails(imap, channel)
+    process_mails(imap_inbox, channel)
   end
 
-  def process_mails(imap, channel)
-    imap.search(['BEFORE', tomorrow, 'SINCE', yesterday]).each do |message_id|
-      inbound_mail = Mail.read_from_string imap.fetch(message_id, 'RFC822')[0].attr['RFC822']
+  def process_mails(imap_inbox, channel)
+    received_mails(imap_inbox).each do |message_id|
+      inbound_mail = Mail.read_from_string imap_inbox.fetch(message_id, 'RFC822')[0].attr['RFC822']
 
       next if channel.inbox.messages.find_by(source_id: inbound_mail.message_id).present?
 
@@ -72,13 +79,19 @@ class Inboxes::FetchImapEmailsJob < ApplicationJob
     end
   end
 
-  def imap_authenticate(channel, access_token)
+  def authenticated_imap_inbox(channel, access_token, auth_method)
     imap = Net::IMAP.new(channel.imap_address, channel.imap_port, true)
-    imap.authenticate('XOAUTH2', channel.imap_login, access_token)
+    imap.authenticate(auth_method, channel.imap_login, access_token)
     imap.select('INBOX')
     imap
   end
 
+  def last_email_time(channel)
+    time = 1.hour.ago.to_s
+    time = channel.inbox.messages.incoming.last.content_attributes['email']['date'] if channel.inbox.messages.any?
+    DateTime.parse(time)
+  end
+
   def yesterday
     (Time.zone.today - 1).strftime('%d-%b-%Y')
   end
diff --git a/app/mailboxes/mailbox_helper.rb b/app/mailboxes/mailbox_helper.rb
index 216d5c2c3..fd812d7d4 100644
--- a/app/mailboxes/mailbox_helper.rb
+++ b/app/mailboxes/mailbox_helper.rb
@@ -23,7 +23,7 @@ module MailboxHelper
   def add_attachments_to_message
     return if @message.blank?
 
-    processed_mail.attachments.each do |mail_attachment|
+    processed_mail.attachments.last(Message::NUMBER_OF_PERMITTED_ATTACHMENTS).each do |mail_attachment|
       attachment = @message.attachments.new(
         account_id: @conversation.account_id,
         file_type: 'file'
diff --git a/spec/fixtures/files/multiple_attachments.eml b/spec/fixtures/files/multiple_attachments.eml
new file mode 100644
index 000000000..cde02abb7
--- /dev/null
+++ b/spec/fixtures/files/multiple_attachments.eml
@@ -0,0 +1,270 @@
+From: test@gmail.com
+Date: Thu, 4 May 2023 10:35:52 +0530
+Message-ID: <6215d536e0484_10bc6191402183@tejaswinis-MacBook-Pro.local.mail>
+Subject: multiple attachments
+To: test@outlook.com
+Content-Type: multipart/mixed; boundary="0000000000002488f405fad721cc"
+
+--0000000000002488f405fad721cc
+Content-Type: multipart/alternative; boundary="0000000000002488f205fad721ca"
+
+--0000000000002488f205fad721ca
+Content-Type: text/plain; charset="UTF-8"
+Content-Transfer-Encoding: quoted-printable
+
+Attaching 30 files:
+
+Hi people!
+
+We are excited to inform you that we have recently released some new
+features and several updates to our platform. These features and updates
+are designed to enhance your experience and make your trading journey
+seamless and efficient.
+
+
+
+> Okay noted
+
+
+--0000000000002488f205fad721ca--
+--0000000000002488f405fad721cc
+Content-Type: image/png; name="Screenshot 2023-05-03 at 3.32.04 PM.png"
+Content-Disposition: attachment; filename="Screenshot 2023-05-03 at 3.32.04 PM.png"
+Content-Transfer-Encoding: base64
+Content-ID: <f_lh8nwk8l3>
+X-Attachment-Id: f_lh8nwk8l3
+
+
+--0000000000002488f405fad721cc
+Content-Type: image/png; name="Screenshot 2023-05-03 at 2.52.11 PM.png"
+Content-Disposition: attachment; filename="Screenshot 2023-05-03 at 2.52.11 PM.png"
+Content-Transfer-Encoding: base64
+Content-ID: <f_lh8nwk8l2>
+X-Attachment-Id: f_lh8nwk8l2
+
+
+--0000000000002488f405fad721cc
+Content-Type: image/png; name="Screenshot 2023-05-03 at 3.32.12 PM.png"
+Content-Disposition: attachment; filename="Screenshot 2023-05-03 at 3.32.12 PM.png"
+Content-Transfer-Encoding: base64
+Content-ID: <f_lh8nwk8l4>
+X-Attachment-Id: f_lh8nwk8l4
+
+
+--0000000000002488f405fad721cc
+Content-Type: image/png; name="Screenshot 2023-05-03 at 2.46.52 PM.png"
+Content-Disposition: attachment; filename="Screenshot 2023-05-03 at 2.46.52 PM.png"
+Content-Transfer-Encoding: base64
+Content-ID: <f_lh8nwk8h0>
+X-Attachment-Id: f_lh8nwk8h0
+
+
+--0000000000002488f405fad721cc
+Content-Type: image/png; name="Screenshot 2023-05-03 at 2.49.26 PM.png"
+Content-Disposition: attachment; filename="Screenshot 2023-05-03 at 2.49.26 PM.png"
+Content-Transfer-Encoding: base64
+Content-ID: <f_lh8nwk8k1>
+X-Attachment-Id: f_lh8nwk8k1
+
+
+--0000000000002488f405fad721cc
+Content-Type: image/png; name="Screenshot 2023-05-03 at 7.58.33 PM.png"
+Content-Disposition: attachment; filename="Screenshot 2023-05-03 at 7.58.33 PM.png"
+Content-Transfer-Encoding: base64
+Content-ID: <f_lh8nwk8n7>
+X-Attachment-Id: f_lh8nwk8n7
+
+
+--0000000000002488f405fad721cc
+Content-Type: image/png; name="Screenshot 2023-05-03 at 6.32.57 PM.png"
+Content-Disposition: attachment; filename="Screenshot 2023-05-03 at 6.32.57 PM.png"
+Content-Transfer-Encoding: base64
+Content-ID: <f_lh8nwk8m5>
+X-Attachment-Id: f_lh8nwk8m5
+
+
+--0000000000002488f405fad721cc
+Content-Type: image/png; name="Screenshot 2023-05-03 at 7.58.04 PM.png"
+Content-Disposition: attachment; filename="Screenshot 2023-05-03 at 7.58.04 PM.png"
+Content-Transfer-Encoding: base64
+Content-ID: <f_lh8nwk8m6>
+X-Attachment-Id: f_lh8nwk8m6
+
+
+--0000000000002488f405fad721cc
+Content-Type: image/png; name="Screenshot 2023-04-26 at 1.37.06 PM.png"
+Content-Disposition: attachment; filename="Screenshot 2023-04-26 at 1.37.06 PM.png"
+Content-Transfer-Encoding: base64
+Content-ID: <f_lh8nwk8n8>
+X-Attachment-Id: f_lh8nwk8n8
+
+
+--0000000000002488f405fad721cc
+Content-Type: image/png; name="Screenshot 2023-04-26 at 1.50.55 PM.png"
+Content-Disposition: attachment; filename="Screenshot 2023-04-26 at 1.50.55 PM.png"
+Content-Transfer-Encoding: base64
+Content-ID: <f_lh8nwk8n9>
+X-Attachment-Id: f_lh8nwk8n9
+
+
+--0000000000002488f405fad721cc
+Content-Type: image/png; name="Screenshot 2023-04-29 at 10.17.21 PM.png"
+Content-Disposition: attachment; filename="Screenshot 2023-04-29 at 10.17.21 PM.png"
+Content-Transfer-Encoding: base64
+Content-ID: <f_lh8nwk8o11>
+X-Attachment-Id: f_lh8nwk8o11
+
+
+--0000000000002488f405fad721cc
+Content-Type: image/png; name="Screenshot 2023-05-02 at 11.44.34 PM.png"
+Content-Disposition: attachment; filename="Screenshot 2023-05-02 at 11.44.34 PM.png"
+Content-Transfer-Encoding: base64
+Content-ID: <f_lh8nwk8o12>
+X-Attachment-Id: f_lh8nwk8o12
+
+
+--0000000000002488f405fad721cc
+Content-Type: image/png; name="Screenshot 2023-05-02 at 11.44.50 PM.png"
+Content-Disposition: attachment; filename="Screenshot 2023-05-02 at 11.44.50 PM.png"
+Content-Transfer-Encoding: base64
+Content-ID: <f_lh8nwk8o13>
+X-Attachment-Id: f_lh8nwk8o13
+
+
+--0000000000002488f405fad721cc
+Content-Type: image/png; name="Screenshot 2023-05-03 at 2.46.52 PM.png"
+Content-Disposition: attachment; filename="Screenshot 2023-05-03 at 2.46.52 PM.png"
+Content-Transfer-Encoding: base64
+Content-ID: <f_lh8nwsii15>
+X-Attachment-Id: f_lh8nwsii15
+
+
+--0000000000002488f405fad721cc
+Content-Type: image/png; name="Screenshot 2023-05-03 at 2.49.26 PM.png"
+Content-Disposition: attachment; filename="Screenshot 2023-05-03 at 2.49.26 PM.png"
+Content-Transfer-Encoding: base64
+Content-ID: <f_lh8nwsij16>
+X-Attachment-Id: f_lh8nwsij16
+
+
+--0000000000002488f405fad721cc
+Content-Type: image/png; name="Screenshot 2023-05-03 at 2.52.11 PM.png"
+Content-Disposition: attachment; filename="Screenshot 2023-05-03 at 2.52.11 PM.png"
+Content-Transfer-Encoding: base64
+Content-ID: <f_lh8nwsik17>
+X-Attachment-Id: f_lh8nwsik17
+
+
+--0000000000002488f405fad721cc
+Content-Type: image/png; name="Screenshot 2023-05-02 at 11.49.19 PM.png"
+Content-Disposition: attachment; filename="Screenshot 2023-05-02 at 11.49.19 PM.png"
+Content-Transfer-Encoding: base64
+Content-ID: <f_lh8nwk8o14>
+X-Attachment-Id: f_lh8nwk8o14
+
+
+--0000000000002488f405fad721cc
+Content-Type: image/png; name="Screenshot 2023-05-03 at 3.32.04 PM.png"
+Content-Disposition: attachment; filename="Screenshot 2023-05-03 at 3.32.04 PM.png"
+Content-Transfer-Encoding: base64
+Content-ID: <f_lh8nwsil18>
+X-Attachment-Id: f_lh8nwsil18
+
+
+--0000000000002488f405fad721cc
+Content-Type: image/png; name="Screenshot 2023-05-03 at 3.32.12 PM.png"
+Content-Disposition: attachment; filename="Screenshot 2023-05-03 at 3.32.12 PM.png"
+Content-Transfer-Encoding: base64
+Content-ID: <f_lh8nwsil19>
+X-Attachment-Id: f_lh8nwsil19
+
+
+--0000000000002488f405fad721cc
+Content-Type: image/png; name="Screenshot 2023-04-26 at 9.43.29 AM.png"
+Content-Disposition: attachment; filename="Screenshot 2023-04-26 at 9.43.29 AM.png"
+Content-Transfer-Encoding: base64
+Content-ID: <f_lh8nwk8n10>
+X-Attachment-Id: f_lh8nwk8n10
+
+
+--0000000000002488f405fad721cc
+Content-Type: image/png; name="Screenshot 2023-05-03 at 6.32.57 PM.png"
+Content-Disposition: attachment; filename="Screenshot 2023-05-03 at 6.32.57 PM.png"
+Content-Transfer-Encoding: base64
+Content-ID: <f_lh8nwsim20>
+X-Attachment-Id: f_lh8nwsim20
+
+
+--0000000000002488f405fad721cc
+Content-Type: image/png; name="Screenshot 2023-05-03 at 7.58.04 PM.png"
+Content-Disposition: attachment; filename="Screenshot 2023-05-03 at 7.58.04 PM.png"
+Content-Transfer-Encoding: base64
+Content-ID: <f_lh8nwsim21>
+X-Attachment-Id: f_lh8nwsim21
+
+
+--0000000000002488f405fad721cc
+Content-Type: image/png; name="Screenshot 2023-05-03 at 7.58.33 PM.png"
+Content-Disposition: attachment; filename="Screenshot 2023-05-03 at 7.58.33 PM.png"
+Content-Transfer-Encoding: base64
+Content-ID: <f_lh8nwsim22>
+X-Attachment-Id: f_lh8nwsim22
+
+
+--0000000000002488f405fad721cc
+Content-Type: image/png; name="Screenshot 2023-04-26 at 1.37.06 PM.png"
+Content-Disposition: attachment; filename="Screenshot 2023-04-26 at 1.37.06 PM.png"
+Content-Transfer-Encoding: base64
+Content-ID: <f_lh8nwsim23>
+X-Attachment-Id: f_lh8nwsim23
+
+
+--0000000000002488f405fad721cc
+Content-Type: image/png; name="Screenshot 2023-04-29 at 10.17.21 PM.png"
+Content-Disposition: attachment; filename="Screenshot 2023-04-29 at 10.17.21 PM.png"
+Content-Transfer-Encoding: base64
+Content-ID: <f_lh8nwsin26>
+X-Attachment-Id: f_lh8nwsin26
+
+
+--0000000000002488f405fad721cc
+Content-Type: image/png; name="Screenshot 2023-05-02 at 11.44.34 PM.png"
+Content-Disposition: attachment; filename="Screenshot 2023-05-02 at 11.44.34 PM.png"
+Content-Transfer-Encoding: base64
+Content-ID: <f_lh8nwsio27>
+X-Attachment-Id: f_lh8nwsio27
+
+
+--0000000000002488f405fad721cc
+Content-Type: image/png; name="Screenshot 2023-04-26 at 1.50.55 PM.png"
+Content-Disposition: attachment; filename="Screenshot 2023-04-26 at 1.50.55 PM.png"
+Content-Transfer-Encoding: base64
+Content-ID: <f_lh8nwsin24>
+X-Attachment-Id: f_lh8nwsin24
+
+
+--0000000000002488f405fad721cc
+Content-Type: image/png; name="Screenshot 2023-05-02 at 11.44.50 PM.png"
+Content-Disposition: attachment; filename="Screenshot 2023-05-02 at 11.44.50 PM.png"
+Content-Transfer-Encoding: base64
+Content-ID: <f_lh8nwsio28>
+X-Attachment-Id: f_lh8nwsio28
+
+
+--0000000000002488f405fad721cc
+Content-Type: image/png; name="Screenshot 2023-05-02 at 11.49.19 PM.png"
+Content-Disposition: attachment; filename="Screenshot 2023-05-02 at 11.49.19 PM.png"
+Content-Transfer-Encoding: base64
+Content-ID: <f_lh8nwsio29>
+X-Attachment-Id: f_lh8nwsio29
+
+
+--0000000000002488f405fad721cc
+Content-Type: image/png; name="Screenshot 2023-04-26 at 9.43.29 AM.png"
+Content-Disposition: attachment; filename="Screenshot 2023-04-26 at 9.43.29 AM.png"
+Content-Transfer-Encoding: base64
+Content-ID: <f_lh8nwsin25>
+X-Attachment-Id: f_lh8nwsin25
+
+
+--0000000000002488f405fad721cc--
diff --git a/spec/jobs/inboxes/fetch_imap_emails_job_spec.rb b/spec/jobs/inboxes/fetch_imap_emails_job_spec.rb
index 14efa2031..3a3b5f577 100644
--- a/spec/jobs/inboxes/fetch_imap_emails_job_spec.rb
+++ b/spec/jobs/inboxes/fetch_imap_emails_job_spec.rb
@@ -16,6 +16,7 @@ RSpec.describe Inboxes::FetchImapEmailsJob, type: :job do
   let(:ms_email_inbox) { create(:inbox, channel: microsoft_imap_email_channel, account: account) }
   let!(:conversation) { create(:conversation, inbox: imap_email_channel.inbox, account: account) }
   let(:inbound_mail) { create_inbound_email_from_mail(from: 'testemail@gmail.com', to: 'imap@outlook.com', subject: 'Hello!') }
+  let(:inbound_mail_with_attachments) { create_inbound_email_from_fixture('multiple_attachments.eml') }
 
   it 'enqueues the job' do
     expect { described_class.perform_later }.to have_enqueued_job(described_class)
@@ -31,15 +32,62 @@ RSpec.describe Inboxes::FetchImapEmailsJob, type: :job do
         body 'hello'
       end
 
-      allow(Mail).to receive(:find).and_return([email])
+      imap_fetch_mail = Net::IMAP::FetchData.new
+      imap_fetch_mail.attr = { seqno: 1, RFC822: email }.with_indifferent_access
+
+      imap = double
+
+      allow(Net::IMAP).to receive(:new).and_return(imap)
+      allow(imap).to receive(:authenticate)
+      allow(imap).to receive(:select)
+      allow(imap).to receive(:search).and_return([1])
+      allow(imap).to receive(:fetch).and_return([imap_fetch_mail])
+
+      read_mail = Mail::Message.new(date: DateTime.now, from: 'testemail@gmail.com', to: 'imap@outlook.com', subject: 'Hello!')
+      allow(Mail).to receive(:read_from_string).and_return(inbound_mail.mail)
+
       imap_mailbox = double
+
       allow(Imap::ImapMailbox).to receive(:new).and_return(imap_mailbox)
-      expect(imap_mailbox).to receive(:process).with(email, imap_email_channel).once
+      expect(imap_mailbox).to receive(:process).with(read_mail, imap_email_channel).once
 
       described_class.perform_now(imap_email_channel)
     end
   end
 
+  context 'when imap fetch new emails with more than 15 attachments' do
+    it 'process the email' do
+      email = Mail.new do
+        to 'test@outlook.com'
+        from 'test@gmail.com'
+        subject :test.to_s
+        body 'hello'
+      end
+
+      imap_fetch_mail = Net::IMAP::FetchData.new
+      imap_fetch_mail.attr = { seqno: 1, RFC822: email }.with_indifferent_access
+
+      imap = double
+
+      allow(Net::IMAP).to receive(:new).and_return(imap)
+      allow(imap).to receive(:authenticate)
+      allow(imap).to receive(:select)
+      allow(imap).to receive(:search).and_return([1])
+      allow(imap).to receive(:fetch).and_return([imap_fetch_mail])
+
+      inbound_mail_with_attachments.mail.date = DateTime.now
+
+      allow(Mail).to receive(:read_from_string).and_return(inbound_mail_with_attachments.mail)
+
+      imap_mailbox = Imap::ImapMailbox.new
+
+      allow(Imap::ImapMailbox).to receive(:new).and_return(imap_mailbox)
+
+      described_class.perform_now(imap_email_channel)
+      expect(Message.last.attachments.count).to eq(15)
+    end
+  end
+
   context 'when imap fetch new emails for microsoft mailer' do
     it 'fetch and process all emails' do
       email = Mail.new do

From 1936369b12044b1de89d895191690b93e01af985 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Mon, 15 May 2023 11:57:56 +0530
Subject: [PATCH 088/101] feat: Add analytics event for OpenAI (#7074)

* Add analytics event for OpenAI

* Add more variations
---
 .../components/widgets/AIAssistanceButton.vue         | 11 +++++++++++
 .../dashboard/helper/AnalyticsHelper/events.js        |  6 ++++++
 2 files changed, 17 insertions(+)

diff --git a/app/javascript/dashboard/components/widgets/AIAssistanceButton.vue b/app/javascript/dashboard/components/widgets/AIAssistanceButton.vue
index 98629edf3..1da4109da 100644
--- a/app/javascript/dashboard/components/widgets/AIAssistanceButton.vue
+++ b/app/javascript/dashboard/components/widgets/AIAssistanceButton.vue
@@ -74,6 +74,7 @@ import { mapGetters } from 'vuex';
 import { mixin as clickaway } from 'vue-clickaway';
 import OpenAPI from 'dashboard/api/integrations/openapi';
 import alertMixin from 'shared/mixins/alertMixin';
+import { OPEN_AI_EVENTS } from 'dashboard/helper/AnalyticsHelper/events';
 
 export default {
   mixins: [alertMixin, clickaway],
@@ -144,6 +145,15 @@ export default {
     closeDropdown() {
       this.showDropdown = false;
     },
+    async recordAnalytics({ type, tone }) {
+      const event = OPEN_AI_EVENTS[type.toUpperCase()];
+      if (event) {
+        this.$track(event, {
+          type,
+          tone,
+        });
+      }
+    },
     async processEvent(type = 'rephrase') {
       this.uiFlags[type] = true;
       try {
@@ -159,6 +169,7 @@ export default {
         } = result;
         this.$emit('replace-text', generatedMessage || this.message);
         this.closeDropdown();
+        this.recordAnalytics({ type, tone: this.activeTone });
       } catch (error) {
         this.showAlert(this.$t('INTEGRATION_SETTINGS.OPEN_AI.GENERATE_ERROR'));
       } finally {
diff --git a/app/javascript/dashboard/helper/AnalyticsHelper/events.js b/app/javascript/dashboard/helper/AnalyticsHelper/events.js
index 979120560..6bc96c453 100644
--- a/app/javascript/dashboard/helper/AnalyticsHelper/events.js
+++ b/app/javascript/dashboard/helper/AnalyticsHelper/events.js
@@ -76,3 +76,9 @@ export const PORTALS_EVENTS = Object.freeze({
   DELETE_ARTICLE: 'Deleted an article',
   PREVIEW_ARTICLE: 'Previewed article',
 });
+
+export const OPEN_AI_EVENTS = Object.freeze({
+  SUMMARIZE: 'OpenAI: Used summarize',
+  REPLY_SUGGESTION: 'OpenAI: Used reply suggestion',
+  REPHRASE: 'OpenAI: Used rephrase',
+});

From 5a8eff35b58305d7602d97dccfe18561171911a2 Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Date: Mon, 15 May 2023 14:03:29 +0530
Subject: [PATCH 089/101] chore: Enable support for hebrew in dashboard
 [CW-1736] (#7077)

---
 app/javascript/dashboard/i18n/index.js | 2 ++
 config/initializers/languages.rb       | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/javascript/dashboard/i18n/index.js b/app/javascript/dashboard/i18n/index.js
index d32094ad2..a00dd2517 100644
--- a/app/javascript/dashboard/i18n/index.js
+++ b/app/javascript/dashboard/i18n/index.js
@@ -9,6 +9,7 @@ import es from './locale/es';
 import fa from './locale/fa';
 import fi from './locale/fi';
 import fr from './locale/fr';
+import he from './locale/he';
 import hi from './locale/hi';
 import hu from './locale/hu';
 import id from './locale/id';
@@ -47,6 +48,7 @@ export default {
   fa,
   fi,
   fr,
+  he,
   hi,
   hu,
   id,
diff --git a/config/initializers/languages.rb b/config/initializers/languages.rb
index fdd394440..44ce2df2a 100644
--- a/config/initializers/languages.rb
+++ b/config/initializers/languages.rb
@@ -38,7 +38,8 @@ LANGUAGES_CONFIG = {
   33 => { name: 'украї́нська мо́ва (uk)', iso_639_3_code: 'ukr', iso_639_1_code: 'uk', enabled: true },
   34 => { name: 'ภาษาไทย (th)', iso_639_3_code: 'tha', iso_639_1_code: 'th', enabled: true },
   35 => { name: 'latviešu valoda (lv)', iso_639_3_code: 'lav', iso_639_1_code: 'lv', enabled: true },
-  36 => { name: 'íslenska (is)', iso_639_3_code: 'isl', iso_639_1_code: 'is', enabled: true }
+  36 => { name: 'íslenska (is)', iso_639_3_code: 'isl', iso_639_1_code: 'is', enabled: true },
+  37 => { name: 'עִברִית (he)', iso_639_3_code: 'heb', iso_639_1_code: 'he', enabled: true }
 }.filter { |_key, val| val[:enabled] }.freeze
 
 Rails.configuration.i18n.available_locales = LANGUAGES_CONFIG.map { |_index, lang| lang[:iso_639_1_code].to_sym }

From c70367bbd7ec61d29293efc45766baf301b322bc Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Mon, 15 May 2023 15:13:26 +0530
Subject: [PATCH 090/101] feat: add migration to fix image signed keys (#7076)

---
 ...0230515051424_update_article_image_keys.rb | 55 +++++++++++++++++++
 db/schema.rb                                  |  2 +-
 2 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 db/migrate/20230515051424_update_article_image_keys.rb

diff --git a/db/migrate/20230515051424_update_article_image_keys.rb b/db/migrate/20230515051424_update_article_image_keys.rb
new file mode 100644
index 000000000..db208470f
--- /dev/null
+++ b/db/migrate/20230515051424_update_article_image_keys.rb
@@ -0,0 +1,55 @@
+class ArticleKeyConverter
+  def initialize(article)
+    @article = article
+  end
+
+  def process
+    new_content = replace(@article.content)
+    @article.update(content: new_content)
+  end
+
+  private
+
+  def convert_key(id)
+    verifier_name = 'ActiveStorage'
+    key_generator =  ActiveSupport::KeyGenerator.new(Rails.application.secrets.secret_key_base, iterations: 1000,
+                                                                                                hash_digest_class: OpenSSL::Digest::SHA1)
+    key_generator = ActiveSupport::CachingKeyGenerator.new(key_generator)
+    secret = key_generator.generate_key(verifier_name.to_s)
+    verifier = ActiveSupport::MessageVerifier.new(secret)
+
+    begin
+      ActiveStorage::Blob.find(verifier.verify(id, purpose: :blob_id))
+                         .try(:signed_id)
+    rescue StandardError
+      nil
+    end
+  end
+
+  def replace(text)
+    keys = get_keys(text)
+    keys.each do |key|
+      new_key = convert_key(key)
+      text = text.gsub(key, new_key) if new_key
+    end
+    text
+  end
+
+  def get_keys(text)
+    uris = text.scan(URI::DEFAULT_PARSER.make_regexp).flatten.select do |x|
+      x.to_s.include?('rails/active_storage')
+    end
+
+    uris.map { |x| x.split('/')[-2] }
+  end
+end
+
+class UpdateArticleImageKeys < ActiveRecord::Migration[7.0]
+  def change
+    # Iterate through all articles
+    Article.find_each do |article|
+      # Run the ArticleKeyConverter for each one
+      ArticleKeyConverter.new(article).process
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index befec82f7..171e8e12b 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_05_10_113208) do
+ActiveRecord::Schema[7.0].define(version: 2023_05_15_051424) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_stat_statements"
   enable_extension "pg_trgm"

From 7dd1562b40e1e42420c7106d8c8620f54b905f7e Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Date: Mon, 15 May 2023 16:17:55 +0530
Subject: [PATCH 091/101] fix: Welcome email copy changes and canned response
 API error handling [cw-1290]  (#7054)

Fixes: https://linear.app/chatwoot/issue/CW-1290/minor-ui-issues
---
 .../dashboard/i18n/locale/en/cannedMgmt.json  |  6 +++---
 .../dashboard/settings/canned/AddCanned.vue   | 10 +++++----
 .../dashboard/settings/canned/EditCanned.vue  | 20 +++++++-----------
 .../dashboard/settings/canned/Index.vue       |  6 ++++--
 .../dashboard/store/modules/cannedResponse.js |  7 +++++++
 .../mailer/confirmation_instructions.html.erb | 21 ++++++++++++-------
 .../mailers/confirmation_instructions_spec.rb |  4 ++--
 7 files changed, 42 insertions(+), 32 deletions(-)

diff --git a/app/javascript/dashboard/i18n/locale/en/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/en/cannedMgmt.json
index 9c14f5a52..e3391967d 100644
--- a/app/javascript/dashboard/i18n/locale/en/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/en/cannedMgmt.json
@@ -34,7 +34,7 @@
       },
       "API": {
         "SUCCESS_MESSAGE": "Canned Response added successfully",
-        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        "ERROR_MESSAGE": "Could not create canned response, Please try again later"
       }
     },
     "EDIT": {
@@ -56,14 +56,14 @@
       "BUTTON_TEXT": "Edit",
       "API": {
         "SUCCESS_MESSAGE": "Canned Response updated successfully",
-        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        "ERROR_MESSAGE": "Could not update canned response, Please try again later"
       }
     },
     "DELETE": {
       "BUTTON_TEXT": "Delete",
       "API": {
         "SUCCESS_MESSAGE": "Canned response deleted successfully",
-        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        "ERROR_MESSAGE": "Could not delete canned response, Please try again later"
       },
       "CONFIRM": {
         "TITLE": "Confirm Deletion",
diff --git a/app/javascript/dashboard/routes/dashboard/settings/canned/AddCanned.vue b/app/javascript/dashboard/routes/dashboard/settings/canned/AddCanned.vue
index 1f117eb81..10c17a003 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/canned/AddCanned.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/canned/AddCanned.vue
@@ -5,7 +5,7 @@
         :header-title="$t('CANNED_MGMT.ADD.TITLE')"
         :header-content="$t('CANNED_MGMT.ADD.DESC')"
       />
-      <form class="row" @submit.prevent="addAgent()">
+      <form class="row" @submit.prevent="addCannedResponse()">
         <div class="medium-12 columns">
           <label :class="{ error: $v.shortCode.$error }">
             {{ $t('CANNED_MGMT.ADD.FORM.SHORT_CODE.LABEL') }}
@@ -107,7 +107,7 @@ export default {
       this.$v.shortCode.$reset();
       this.$v.content.$reset();
     },
-    addAgent() {
+    addCannedResponse() {
       // Show loading on button
       this.addCanned.showLoading = true;
       // Make API Calls
@@ -123,9 +123,11 @@ export default {
           this.resetForm();
           this.onClose();
         })
-        .catch(() => {
+        .catch(error => {
           this.addCanned.showLoading = false;
-          this.showAlert(this.$t('CANNED_MGMT.ADD.API.ERROR_MESSAGE'));
+          const errorMessage =
+            error?.message || this.$t('CANNED_MGMT.ADD.API.ERROR_MESSAGE');
+          this.showAlert(errorMessage);
         });
     },
   },
diff --git a/app/javascript/dashboard/routes/dashboard/settings/canned/EditCanned.vue b/app/javascript/dashboard/routes/dashboard/settings/canned/EditCanned.vue
index 2ab51653c..063fba23b 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/canned/EditCanned.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/canned/EditCanned.vue
@@ -57,6 +57,7 @@
 import { required, minLength } from 'vuelidate/lib/validators';
 import WootMessageEditor from 'dashboard/components/widgets/WootWriter/Editor';
 import WootSubmitButton from '../../../../components/buttons/FormSubmitButton';
+import alertMixin from 'shared/mixins/alertMixin';
 import Modal from '../../../../components/Modal';
 
 export default {
@@ -65,6 +66,7 @@ export default {
     Modal,
     WootMessageEditor,
   },
+  mixins: [alertMixin],
   props: {
     id: { type: Number, default: null },
     edcontent: { type: String, default: '' },
@@ -76,7 +78,6 @@ export default {
       editCanned: {
         showAlert: false,
         showLoading: false,
-        message: '',
       },
       shortCode: this.edshortCode,
       content: this.edcontent,
@@ -102,9 +103,6 @@ export default {
       this.$v.content.$touch();
       this.content = name;
     },
-    showAlert() {
-      bus.$emit('newToastMessage', this.editCanned.message);
-    },
     resetForm() {
       this.shortCode = '';
       this.content = '';
@@ -124,21 +122,17 @@ export default {
         .then(() => {
           // Reset Form, Show success message
           this.editCanned.showLoading = false;
-          this.editCanned.message = this.$t(
-            'CANNED_MGMT.EDIT.API.SUCCESS_MESSAGE'
-          );
-          this.showAlert();
+          this.showAlert(this.$t('CANNED_MGMT.EDIT.API.SUCCESS_MESSAGE'));
           this.resetForm();
           setTimeout(() => {
             this.onClose();
           }, 10);
         })
-        .catch(() => {
+        .catch(error => {
           this.editCanned.showLoading = false;
-          this.editCanned.message = this.$t(
-            'CANNED_MGMT.EDIT.API.ERROR_MESSAGE'
-          );
-          this.showAlert();
+          const errorMessage =
+            error?.message || this.$t('CANNED_MGMT.EDIT.API.ERROR_MESSAGE');
+          this.showAlert(errorMessage);
         });
     },
   },
diff --git a/app/javascript/dashboard/routes/dashboard/settings/canned/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/canned/Index.vue
index 6e8b1165f..4912ea03f 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/canned/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/canned/Index.vue
@@ -198,8 +198,10 @@ export default {
         .then(() => {
           this.showAlert(this.$t('CANNED_MGMT.DELETE.API.SUCCESS_MESSAGE'));
         })
-        .catch(() => {
-          this.showAlert(this.$t('CANNED_MGMT.DELETE.API.ERROR_MESSAGE'));
+        .catch(error => {
+          const errorMessage =
+            error?.message || this.$t('CANNED_MGMT.DELETE.API.ERROR_MESSAGE');
+          this.showAlert(errorMessage);
         });
     },
   },
diff --git a/app/javascript/dashboard/store/modules/cannedResponse.js b/app/javascript/dashboard/store/modules/cannedResponse.js
index 24f53a170..7b24d1171 100644
--- a/app/javascript/dashboard/store/modules/cannedResponse.js
+++ b/app/javascript/dashboard/store/modules/cannedResponse.js
@@ -1,3 +1,4 @@
+import { throwErrorMessage } from 'dashboard/store/utils/api';
 import * as MutationHelpers from 'shared/helpers/vuex/mutationHelpers';
 import * as types from '../mutation-types';
 import CannedResponseAPI from '../../api/cannedResponse';
@@ -46,8 +47,10 @@ const actions = {
       const response = await CannedResponseAPI.create(cannedObj);
       commit(types.default.ADD_CANNED, response.data);
       commit(types.default.SET_CANNED_UI_FLAG, { creatingItem: false });
+      return response.data;
     } catch (error) {
       commit(types.default.SET_CANNED_UI_FLAG, { creatingItem: false });
+      return throwErrorMessage(error);
     }
   },
 
@@ -60,8 +63,10 @@ const actions = {
       const response = await CannedResponseAPI.update(id, updateObj);
       commit(types.default.EDIT_CANNED, response.data);
       commit(types.default.SET_CANNED_UI_FLAG, { updatingItem: false });
+      return response.data;
     } catch (error) {
       commit(types.default.SET_CANNED_UI_FLAG, { updatingItem: false });
+      return throwErrorMessage(error);
     }
   },
 
@@ -71,8 +76,10 @@ const actions = {
       await CannedResponseAPI.delete(id);
       commit(types.default.DELETE_CANNED, id);
       commit(types.default.SET_CANNED_UI_FLAG, { deletingItem: true });
+      return id;
     } catch (error) {
       commit(types.default.SET_CANNED_UI_FLAG, { deletingItem: true });
+      return throwErrorMessage(error);
     }
   },
 };
diff --git a/app/views/devise/mailer/confirmation_instructions.html.erb b/app/views/devise/mailer/confirmation_instructions.html.erb
index 7e1338b19..ef94788a2 100644
--- a/app/views/devise/mailer/confirmation_instructions.html.erb
+++ b/app/views/devise/mailer/confirmation_instructions.html.erb
@@ -1,22 +1,27 @@
-<p>Welcome, <%= @resource.name %>!</p>
+<p>Hi <%= @resource.name %>,</p>
 
 <% account_user = @resource&.account_users&.first %>
+
 <% if account_user&.inviter.present? && @resource.unconfirmed_email.blank? %>
-  <p><%= account_user.inviter.name %>, with <%= account_user.account.name %>, has invited you to try out <%= global_config['BRAND_NAME'] || 'Chatwoot' %>! </p>
+  <p><%= account_user.inviter.name %>, with <%= account_user.account.name %>, has invited you to try out <%= global_config['BRAND_NAME'] || 'Chatwoot' %>.</p>
 <% end %>
 
 <% if @resource.confirmed? %>
-<p>You can login to your account through the link below:</p>
+  <p>You can login to your <%= global_config['BRAND_NAME'] || 'Chatwoot' %> account through the link below:</p>
 <% else %>
-<p>You can confirm your account email through the link below:</p>
+  <p>
+    Welcome to <%= global_config['BRAND_NAME'] || 'Chatwoot' %>! We have a suite of powerful tools ready for you to explore. Before that we quickly need to verify your email address to know it's really you.
+  </p>
+  <p>Please take a moment and click the link below and activate your account.</p>
 <% end %>
 
+
 <% if @resource.unconfirmed_email.present? %>
-<p><%= link_to 'Confirm my account', frontend_url('auth/confirmation', confirmation_token: @token) %></p>
+  <p><%= link_to 'Confirm my account', frontend_url('auth/confirmation', confirmation_token: @token) %></p>
 <% elsif @resource.confirmed? %>
-<p><%= link_to 'Login to my account', frontend_url('auth/sign_in') %></p>
+  <p><%= link_to 'Login to my account', frontend_url('auth/sign_in') %></p>
 <% elsif account_user&.inviter.present? %>
-<p><%= link_to 'Confirm my account', frontend_url('auth/password/edit', reset_password_token: @resource.send(:set_reset_password_token)) %></p>
+  <p><%= link_to 'Confirm my account', frontend_url('auth/password/edit', reset_password_token: @resource.send(:set_reset_password_token)) %></p>
 <% else %>
-<p><%= link_to 'Confirm my account', frontend_url('auth/confirmation', confirmation_token: @token) %></p>
+  <p><%= link_to 'Confirm my account', frontend_url('auth/confirmation', confirmation_token: @token) %></p>
 <% end %>
diff --git a/spec/mailers/confirmation_instructions_spec.rb b/spec/mailers/confirmation_instructions_spec.rb
index a6f3f63af..9eeed85d2 100644
--- a/spec/mailers/confirmation_instructions_spec.rb
+++ b/spec/mailers/confirmation_instructions_spec.rb
@@ -22,7 +22,7 @@ RSpec.describe 'Confirmation Instructions', type: :mailer do
     end
 
     it 'uses the user\'s name' do
-      expect(mail.body).to match("Welcome, #{CGI.escapeHTML(confirmable_user.name)}!")
+      expect(mail.body).to match("Hi #{CGI.escapeHTML(confirmable_user.name)},")
     end
 
     it 'does not refer to the inviter and their account' do
@@ -39,7 +39,7 @@ RSpec.describe 'Confirmation Instructions', type: :mailer do
 
       it 'refers to the inviter and their account' do
         expect(mail.body).to match(
-          "#{CGI.escapeHTML(inviter_val.name)}, with #{CGI.escapeHTML(account.name)}, has invited you to try out Chatwoot!"
+          "#{CGI.escapeHTML(inviter_val.name)}, with #{CGI.escapeHTML(account.name)}, has invited you to try out Chatwoot."
         )
       end
 

From 65e91f6a6fddf3fce620351659b822052d1d6fca Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Mon, 15 May 2023 16:25:15 +0530
Subject: [PATCH 092/101] fix: Duplicate instagram conversations for echo
 messages (#7078)

---
 .../messages/instagram/message_builder.rb     | 12 +++----
 app/jobs/webhooks/instagram_events_job.rb     |  6 +++-
 .../instagram/message_builder_spec.rb         | 33 +++++++++++++++++++
 .../instagram_message_create_event.rb         | 27 +++++++++++++++
 .../webhooks/instagram_events_job_spec.rb     | 19 +++++++++++
 5 files changed, 90 insertions(+), 7 deletions(-)

diff --git a/app/builders/messages/instagram/message_builder.rb b/app/builders/messages/instagram/message_builder.rb
index e917af5db..eb34d4052 100644
--- a/app/builders/messages/instagram/message_builder.rb
+++ b/app/builders/messages/instagram/message_builder.rb
@@ -63,7 +63,9 @@ class Messages::Instagram::MessageBuilder < Messages::Messenger::MessageBuilder
   end
 
   def conversation
-    @conversation ||= Conversation.find_by(conversation_params) || build_conversation
+    @conversation ||= Conversation.where(
+      "additional_attributes ->> 'type' = 'instagram_direct_message'"
+    ).find_by(conversation_params) || build_conversation
   end
 
   def message_content
@@ -95,7 +97,8 @@ class Messages::Instagram::MessageBuilder < Messages::Messenger::MessageBuilder
   def build_conversation
     @contact_inbox ||= contact.contact_inboxes.find_by!(source_id: message_source_id)
     Conversation.create!(conversation_params.merge(
-                           contact_inbox_id: @contact_inbox.id
+                           contact_inbox_id: @contact_inbox.id,
+                           additional_attributes: { type: 'instagram_direct_message' }
                          ))
   end
 
@@ -103,10 +106,7 @@ class Messages::Instagram::MessageBuilder < Messages::Messenger::MessageBuilder
     {
       account_id: @inbox.account_id,
       inbox_id: @inbox.id,
-      contact_id: contact.id,
-      additional_attributes: {
-        type: 'instagram_direct_message'
-      }
+      contact_id: contact.id
     }
   end
 
diff --git a/app/jobs/webhooks/instagram_events_job.rb b/app/jobs/webhooks/instagram_events_job.rb
index 0f78c6277..ad02a3c18 100644
--- a/app/jobs/webhooks/instagram_events_job.rb
+++ b/app/jobs/webhooks/instagram_events_job.rb
@@ -14,7 +14,7 @@ class Webhooks::InstagramEventsJob < ApplicationJob
 
     @entries.each do |entry|
       entry = entry.with_indifferent_access
-      entry[:messaging].each do |messaging|
+      messages(entry).each do |messaging|
         send(@event_name, messaging) if event_name(messaging)
       end
     end
@@ -29,4 +29,8 @@ class Webhooks::InstagramEventsJob < ApplicationJob
   def message(messaging)
     ::Instagram::MessageText.new(messaging).perform
   end
+
+  def messages(entry)
+    (entry[:messaging].presence || entry[:standby])
+  end
 end
diff --git a/spec/builders/messages/instagram/message_builder_spec.rb b/spec/builders/messages/instagram/message_builder_spec.rb
index e33c697eb..3eaa5c25b 100644
--- a/spec/builders/messages/instagram/message_builder_spec.rb
+++ b/spec/builders/messages/instagram/message_builder_spec.rb
@@ -17,6 +17,14 @@ describe  ::Messages::Instagram::MessageBuilder do
   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') }
+  let(:conversation) do
+    create(:conversation, account_id: account.id, inbox_id: instagram_inbox.id, contact_id: contact.id,
+                          additional_attributes: { type: 'instagram_direct_message', conversation_language: 'en' })
+  end
+  let(:message) do
+    create(:message, account_id: account.id, inbox_id: instagram_inbox.id, conversation_id: conversation.id, message_type: 'outgoing',
+                     source_id: 'message-id-1')
+  end
 
   describe '#perform' do
     it 'creates contact and message for the facebook inbox' do
@@ -45,6 +53,31 @@ describe  ::Messages::Instagram::MessageBuilder do
       expect(message.content).to eq('This is the first message from the customer')
     end
 
+    it 'discard echo message already sent by chatwoot' do
+      message
+
+      expect(instagram_inbox.conversations.count).to be 1
+      expect(instagram_inbox.messages.count).to be 1
+
+      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
+      )
+      messaging = dm_params[:entry][0]['messaging'][0]
+      contact_inbox
+      described_class.new(messaging, instagram_inbox, outgoing_echo: true).perform
+
+      instagram_inbox.reload
+
+      expect(instagram_inbox.conversations.count).to be 1
+      expect(instagram_inbox.messages.count).to be 1
+    end
+
     it 'creates message with for reply with story id' do
       allow(Koala::Facebook::API).to receive(:new).and_return(fb_object)
       allow(fb_object).to receive(:get_object).and_return(
diff --git a/spec/factories/instagram/instagram_message_create_event.rb b/spec/factories/instagram/instagram_message_create_event.rb
index 0220feab5..6b66c29a7 100644
--- a/spec/factories/instagram/instagram_message_create_event.rb
+++ b/spec/factories/instagram/instagram_message_create_event.rb
@@ -26,6 +26,33 @@ FactoryBot.define do
     initialize_with { attributes }
   end
 
+  factory :instagram_message_standby_event, class: Hash do
+    entry do
+      [
+        {
+          'time': '2021-09-08T06:34:04+0000',
+          'id': 'instagram-message-id-123',
+          'standby': [
+            {
+              'sender': {
+                'id': 'Sender-id-1'
+              },
+              'recipient': {
+                'id': 'chatwoot-app-user-id-1'
+              },
+              'timestamp': '2021-09-08T06:34:04+0000',
+              'message': {
+                'mid': 'message-id-1',
+                'text': 'This is the first standby message from the customer, after 24 hours.'
+              }
+            }
+          ]
+        }
+      ]
+    end
+    initialize_with { attributes }
+  end
+
   factory :instagram_story_reply_event, class: Hash do
     entry do
       [
diff --git a/spec/jobs/webhooks/instagram_events_job_spec.rb b/spec/jobs/webhooks/instagram_events_job_spec.rb
index 91085f967..b5e73e2f5 100644
--- a/spec/jobs/webhooks/instagram_events_job_spec.rb
+++ b/spec/jobs/webhooks/instagram_events_job_spec.rb
@@ -21,6 +21,7 @@ describe Webhooks::InstagramEventsJob do
   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!(:dm_params) { build(:instagram_message_create_event).with_indifferent_access }
+  let!(:standby_params) { build(:instagram_message_standby_event).with_indifferent_access }
   let!(:test_params) { build(:instagram_test_text_event).with_indifferent_access }
   let!(:unsend_event) { build(:instagram_message_unsend_event).with_indifferent_access }
   let!(:attachment_params) { build(:instagram_message_attachment_event).with_indifferent_access }
@@ -45,6 +46,24 @@ describe Webhooks::InstagramEventsJob do
         expect(instagram_inbox.messages.count).to be 1
       end
 
+      it 'creates standby message in the instagram inbox' do
+        allow(Koala::Facebook::API).to receive(:new).and_return(fb_object)
+        allow(fb_object).to receive(:get_object).and_return(
+          return_object.with_indifferent_access
+        )
+        instagram_webhook.perform_now(standby_params[:entry])
+
+        instagram_inbox.reload
+
+        expect(instagram_inbox.contacts.count).to be 1
+        expect(instagram_inbox.contacts.last.additional_attributes['social_profiles']['instagram']).to eq 'some_user_name'
+        expect(instagram_inbox.conversations.count).to be 1
+        expect(instagram_inbox.messages.count).to be 1
+
+        message = instagram_inbox.messages.last
+        expect(message.content).to eq('This is the first standby message from the customer, after 24 hours.')
+      end
+
       it 'creates test text message in the instagram inbox' do
         allow(Koala::Facebook::API).to receive(:new).and_return(fb_object)
         allow(fb_object).to receive(:get_object).and_return(

From f2a34ad8aa4f15f4ee713ac1868fe7a00cf695fc Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Mon, 15 May 2023 16:32:27 +0530
Subject: [PATCH 093/101] Chore: Remove deprecation warning post rails upgrade
 (#7080)

Fixes: https://linear.app/chatwoot/issue/CW-1575/fix-deprecations-post-upgrade-to-rails-7
---
 app/models/attachment.rb                         |  2 +-
 app/views/fields/belongs_to/_index.html.erb      |  2 +-
 app/views/fields/belongs_to/_show.html.erb       |  2 +-
 app/views/fields/polymorphic/_show.html.erb      |  2 +-
 app/views/super_admin/accounts/show.html.erb     |  2 +-
 .../super_admin/application/_collection.html.erb | 16 ++++++++--------
 .../super_admin/application/_navigation.html.erb |  2 +-
 app/views/super_admin/application/index.html.erb |  2 +-
 app/views/super_admin/users/_collection.html.erb | 16 ++++++++--------
 app/views/super_admin/users/show.html.erb        |  2 +-
 10 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index b9272d9f0..276c082b7 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -56,7 +56,7 @@ class Attachment < ApplicationRecord
 
   # NOTE: for External services use this methods since redirect doesn't work effectively in a lot of cases
   def download_url
-    ActiveStorage::Current.host = Rails.application.routes.default_url_options[:host] if ActiveStorage::Current.host.blank?
+    ActiveStorage::Current.url_options = Rails.application.routes.default_url_options if ActiveStorage::Current.url_options.blank?
     file.attached? ? file.blob.url : ''
   end
 
diff --git a/app/views/fields/belongs_to/_index.html.erb b/app/views/fields/belongs_to/_index.html.erb
index 8637400ca..24b43d9c5 100644
--- a/app/views/fields/belongs_to/_index.html.erb
+++ b/app/views/fields/belongs_to/_index.html.erb
@@ -21,7 +21,7 @@ By default, the relationship is rendered as a link to the associated object.
       field.display_associated_resource,
       super_admin_user_path(field.data),
     ) %>
-  <% elsif valid_action?(:show, field.associated_class) %>
+  <% elsif existing_action?(field.associated_class, :show) %>
     <%= link_to(
       field.display_associated_resource,
       [namespace, field.data],
diff --git a/app/views/fields/belongs_to/_show.html.erb b/app/views/fields/belongs_to/_show.html.erb
index 24b47081a..5cf2c7701 100644
--- a/app/views/fields/belongs_to/_show.html.erb
+++ b/app/views/fields/belongs_to/_show.html.erb
@@ -16,7 +16,7 @@ By default, the relationship is rendered as a link to the associated object.
 %>
 
 <% if field.data %>
-  <% if valid_action?(:show, field.associated_class) %>
+  <% if existing_action?(field.associated_class, :show) %>
     <%= link_to(
       field.display_associated_resource,
       [namespace, field.data],
diff --git a/app/views/fields/polymorphic/_show.html.erb b/app/views/fields/polymorphic/_show.html.erb
index 27a5645ae..fa9e88307 100644
--- a/app/views/fields/polymorphic/_show.html.erb
+++ b/app/views/fields/polymorphic/_show.html.erb
@@ -17,7 +17,7 @@ By default, the relationship is rendered as a link to the associated object.
 %>
 
 <% if field.data %>
-  <% if valid_action?(:show, field.data.class) %>
+  <% if existing_action?(field.data.class, :show) %>
     <%= link_to(
       field.display_associated_resource,
       [namespace, field.data],
diff --git a/app/views/super_admin/accounts/show.html.erb b/app/views/super_admin/accounts/show.html.erb
index 1b37e4402..995af9ff0 100644
--- a/app/views/super_admin/accounts/show.html.erb
+++ b/app/views/super_admin/accounts/show.html.erb
@@ -28,7 +28,7 @@ as well as a link to its edit page.
       t("administrate.actions.edit_resource", name: page.page_title),
       [:edit, namespace, page.resource],
       class: "button",
-    ) if valid_action?(:edit) && show_action?(:edit, page.resource) %>
+    ) if accessible_action?(page.resource, :edit) %>
   </div>
 </header>
 
diff --git a/app/views/super_admin/application/_collection.html.erb b/app/views/super_admin/application/_collection.html.erb
index 3f7aa489c..89fa167d1 100644
--- a/app/views/super_admin/application/_collection.html.erb
+++ b/app/views/super_admin/application/_collection.html.erb
@@ -45,8 +45,8 @@ to display a collection of resources in an HTML table.
           <% end %>
         </th>
       <% end %>
-      <% [valid_action?(:edit, collection_presenter.resource_name),
-          valid_action?(:destroy, collection_presenter.resource_name)].count(true).times do %>
+      <% [existing_action?(collection_presenter.resource_name, :edit),
+          existing_action?(collection_presenter.resource_name, :destroy)].count(true).times do %>
         <th scope="col"></th>
       <% end %>
     </tr>
@@ -56,13 +56,13 @@ to display a collection of resources in an HTML table.
     <% resources.each do |resource| %>
       <tr class="js-table-row"
           tabindex="0"
-          <% if valid_action? :show, collection_presenter.resource_name %>
+          <% if existing_action? collection_presenter.resource_name, :show %>
             <%= %(role=link data-url=#{polymorphic_path([namespace, resource])}) %>
           <% end %>
           >
         <% collection_presenter.attributes_for(resource).each do |attribute| %>
           <td class="cell-data cell-data--<%= attribute.html_class %>">
-            <% if show_action? :show, resource -%>
+            <% if authorized_action? resource, :show -%>
               <a href="<%= polymorphic_path([namespace, resource]) -%>"
                  class="action-show"
                  >
@@ -72,22 +72,22 @@ to display a collection of resources in an HTML table.
           </td>
         <% end %>
 
-        <% if valid_action? :edit, collection_presenter.resource_name %>
+        <% if existing_action? collection_presenter.resource_name, :edit %>
           <td><%= link_to(
             t("administrate.actions.edit"),
             [:edit, namespace, resource],
             class: "action-edit",
-          ) if show_action? :edit, resource%></td>
+          ) if authorized_action? resource, :edit%></td>
         <% end %>
 
-        <% if valid_action? :destroy, collection_presenter.resource_name %>
+        <% if existing_action? collection_presenter.resource_name, :destroy %>
           <td><%= link_to(
             t("administrate.actions.destroy"),
             [namespace, resource],
             class: "text-color-red",
             method: :delete,
             data: { confirm: t("administrate.actions.confirm") }
-          ) if show_action? :destroy, resource %></td>
+          ) if authorized_action? resource, :destroy %></td>
         <% end %>
       </tr>
     <% end %>
diff --git a/app/views/super_admin/application/_navigation.html.erb b/app/views/super_admin/application/_navigation.html.erb
index e09ebb277..4e2a675bc 100644
--- a/app/views/super_admin/application/_navigation.html.erb
+++ b/app/views/super_admin/application/_navigation.html.erb
@@ -46,7 +46,7 @@ as defined by the routes in the `admin/` namespace
         <%= link_to(
           display_resource_name(resource),
           resource_index_route(resource)
-        ) if valid_action? :index, resource  %>
+        ) if existing_action? resource, :index  %>
       </li>
     <% end %>
 
diff --git a/app/views/super_admin/application/index.html.erb b/app/views/super_admin/application/index.html.erb
index 43a3705de..f73b3033c 100644
--- a/app/views/super_admin/application/index.html.erb
+++ b/app/views/super_admin/application/index.html.erb
@@ -48,7 +48,7 @@ It renders the `_table` partial to display details about the resources.
       ),
       [:new, namespace, page.resource_path.to_sym],
       class: "button",
-    ) if valid_action?(:new) && show_action?(:new, new_resource) %>
+    ) if accessible_action?(new_resource, :new) %>
   </div>
 </header>
 
diff --git a/app/views/super_admin/users/_collection.html.erb b/app/views/super_admin/users/_collection.html.erb
index f1f25987c..512624daa 100644
--- a/app/views/super_admin/users/_collection.html.erb
+++ b/app/views/super_admin/users/_collection.html.erb
@@ -45,8 +45,8 @@ to display a collection of resources in an HTML table.
           <% end %>
         </th>
       <% end %>
-      <% [valid_action?(:edit, collection_presenter.resource_name),
-          valid_action?(:destroy, collection_presenter.resource_name)].count(true).times do %>
+      <% [existing_action?(collection_presenter.resource_name, :edit),
+          existing_action?(collection_presenter.resource_name, :destroy)].count(true).times do %>
         <th scope="col"></th>
       <% end %>
     </tr>
@@ -56,13 +56,13 @@ to display a collection of resources in an HTML table.
     <% resources.each do |resource| %>
       <tr class="js-table-row"
           tabindex="0"
-          <% if valid_action? :show, collection_presenter.resource_name %>
+          <% if existing_action? collection_presenter.resource_name, :show %>
             <%= %(role=link data-url=#{polymorphic_path([namespace, resource.becomes(User)])}) %>
           <% end %>
           >
         <% collection_presenter.attributes_for(resource).each do |attribute| %>
           <td class="cell-data cell-data--<%= attribute.html_class %>">
-            <% if show_action? :show, resource -%>
+            <% if authorized_action? resource,  :show -%>
               <a href="<%= polymorphic_path([namespace, resource.becomes(User)]) -%>"
                  class="action-show"
                  >
@@ -72,22 +72,22 @@ to display a collection of resources in an HTML table.
           </td>
         <% end %>
 
-        <% if valid_action? :edit, collection_presenter.resource_name %>
+        <% if existing_action? collection_presenter.resource_name, :edit %>
           <td><%= link_to(
             t("administrate.actions.edit"),
             [:edit, namespace, resource.becomes(User)],
             class: "action-edit",
-          ) if show_action? :edit, resource%></td>
+          ) if authorized_action? resource, :edit%></td>
         <% end %>
 
-        <% if valid_action? :destroy, collection_presenter.resource_name %>
+        <% if existing_action? collection_presenter.resource_name, :destroy %>
           <td><%= link_to(
             t("administrate.actions.destroy"),
             [namespace, resource.becomes(User)],
             class: "text-color-red",
             method: :delete,
             data: { confirm: t("administrate.actions.confirm") }
-          ) if show_action? :destroy, resource %></td>
+          ) if authorized_action? resource, :destroy %></td>
         <% end %>
       </tr>
     <% end %>
diff --git a/app/views/super_admin/users/show.html.erb b/app/views/super_admin/users/show.html.erb
index 15bdb0ca9..37a79b121 100644
--- a/app/views/super_admin/users/show.html.erb
+++ b/app/views/super_admin/users/show.html.erb
@@ -28,7 +28,7 @@ as well as a link to its edit page.
       t("administrate.actions.edit_resource", name: page.page_title),
       [:edit, namespace, page.resource],
       class: "button",
-    ) if valid_action?(:edit) && show_action?(:edit, page.resource) %>
+    ) if accessible_action?(:edit, page.resource) %>
   </div>
 </header>
 

From d9f2cd0a6e8a26c8acaedff9eeb9604892c01c8e Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Date: Mon, 15 May 2023 16:56:04 +0530
Subject: [PATCH 094/101] chore: Enable Hebrew language for widget (#7079)

Co-authored-by: Sojan Jose <sojan@pepalo.com>
---
 app/javascript/survey/i18n/index.js | 2 ++
 app/javascript/widget/i18n/index.js | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/app/javascript/survey/i18n/index.js b/app/javascript/survey/i18n/index.js
index 391d67848..77a8668d3 100644
--- a/app/javascript/survey/i18n/index.js
+++ b/app/javascript/survey/i18n/index.js
@@ -9,6 +9,7 @@ import es from './locale/es.json';
 import fa from './locale/fa.json';
 import fi from './locale/fi.json';
 import fr from './locale/fr.json';
+import he from './locale/he.json';
 import hi from './locale/hi.json';
 import hu from './locale/hu.json';
 import id from './locale/id.json';
@@ -47,6 +48,7 @@ export default {
   fa,
   fi,
   fr,
+  he,
   hi,
   hu,
   id,
diff --git a/app/javascript/widget/i18n/index.js b/app/javascript/widget/i18n/index.js
index 544397ddd..c5b2c935f 100644
--- a/app/javascript/widget/i18n/index.js
+++ b/app/javascript/widget/i18n/index.js
@@ -9,6 +9,7 @@ import es from './locale/es.json';
 import fa from './locale/fa.json';
 import fi from './locale/fi.json';
 import fr from './locale/fr.json';
+import he from './locale/he.json';
 import hi from './locale/hi.json';
 import hu from './locale/hu.json';
 import id from './locale/id.json';
@@ -47,6 +48,7 @@ export default {
   fa,
   fi,
   fr,
+  he,
   hi,
   hu,
   id,

From b99470626564ef0b3796dc17ccae34c4edc013ea Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Mon, 15 May 2023 20:19:03 +0530
Subject: [PATCH 095/101] fix: Email date attribute not being set (#7081)

Fixes: https://linear.app/chatwoot/issue/CW-1738/typeerror-no-implicit-conversion-of-nil-into-string-typeerror
---
 app/jobs/inboxes/fetch_imap_emails_job.rb     | 10 +++++--
 spec/fixtures/files/mail_with_no_date.eml     |  6 ++++
 .../inboxes/fetch_imap_emails_job_spec.rb     | 30 +++++++++++++++++++
 3 files changed, 43 insertions(+), 3 deletions(-)
 create mode 100644 spec/fixtures/files/mail_with_no_date.eml

diff --git a/app/jobs/inboxes/fetch_imap_emails_job.rb b/app/jobs/inboxes/fetch_imap_emails_job.rb
index bf9972778..80308f1e1 100644
--- a/app/jobs/inboxes/fetch_imap_emails_job.rb
+++ b/app/jobs/inboxes/fetch_imap_emails_job.rb
@@ -9,7 +9,7 @@ class Inboxes::FetchImapEmailsJob < ApplicationJob
     process_email_for_channel(channel)
   rescue *ExceptionList::IMAP_EXCEPTIONS
     channel.authorization_error!
-  rescue EOFError => e
+  rescue EOFError, OpenSSL::SSL::SSLError => e
     Rails.logger.error e
   rescue StandardError => e
     ChatwootExceptionTracker.new(e, account: channel.account).capture_exception
@@ -87,8 +87,12 @@ class Inboxes::FetchImapEmailsJob < ApplicationJob
   end
 
   def last_email_time(channel)
-    time = 1.hour.ago.to_s
-    time = channel.inbox.messages.incoming.last.content_attributes['email']['date'] if channel.inbox.messages.any?
+    if channel.inbox.messages.any?
+      time = channel.inbox.messages.incoming.last.content_attributes['email']['date']
+      time ||= channel.inbox.messages.incoming.last.created_at.to_s
+    end
+    time ||= 1.hour.ago.to_s
+
     DateTime.parse(time)
   end
 
diff --git a/spec/fixtures/files/mail_with_no_date.eml b/spec/fixtures/files/mail_with_no_date.eml
new file mode 100644
index 000000000..745d5782d
--- /dev/null
+++ b/spec/fixtures/files/mail_with_no_date.eml
@@ -0,0 +1,6 @@
+Date:
+From: testemail@gmail.com
+To: imap@outlook.com
+Subject: test text only mail
+
+text only mail
diff --git a/spec/jobs/inboxes/fetch_imap_emails_job_spec.rb b/spec/jobs/inboxes/fetch_imap_emails_job_spec.rb
index 3a3b5f577..20c3880e8 100644
--- a/spec/jobs/inboxes/fetch_imap_emails_job_spec.rb
+++ b/spec/jobs/inboxes/fetch_imap_emails_job_spec.rb
@@ -16,6 +16,7 @@ RSpec.describe Inboxes::FetchImapEmailsJob, type: :job do
   let(:ms_email_inbox) { create(:inbox, channel: microsoft_imap_email_channel, account: account) }
   let!(:conversation) { create(:conversation, inbox: imap_email_channel.inbox, account: account) }
   let(:inbound_mail) { create_inbound_email_from_mail(from: 'testemail@gmail.com', to: 'imap@outlook.com', subject: 'Hello!') }
+  let(:inbound_mail_with_no_date) { create_inbound_email_from_fixture('mail_with_no_date.eml') }
   let(:inbound_mail_with_attachments) { create_inbound_email_from_fixture('multiple_attachments.eml') }
 
   it 'enqueues the job' do
@@ -53,6 +54,35 @@ RSpec.describe Inboxes::FetchImapEmailsJob, type: :job do
 
       described_class.perform_now(imap_email_channel)
     end
+
+    it 'process the email with no date' do
+      email = Mail.new do
+        to 'test@outlook.com'
+        from 'test@gmail.com'
+        subject :test.to_s
+        body 'hello'
+      end
+
+      imap_fetch_mail = Net::IMAP::FetchData.new
+      imap_fetch_mail.attr = { seqno: 1, RFC822: email }.with_indifferent_access
+
+      imap = double
+
+      allow(Net::IMAP).to receive(:new).and_return(imap)
+      allow(imap).to receive(:authenticate)
+      allow(imap).to receive(:select)
+      allow(imap).to receive(:search).and_return([1])
+      allow(imap).to receive(:fetch).and_return([imap_fetch_mail])
+
+      allow(Mail).to receive(:read_from_string).and_return(inbound_mail_with_no_date.mail)
+
+      imap_mailbox = double
+
+      allow(Imap::ImapMailbox).to receive(:new).and_return(imap_mailbox)
+      expect(imap_mailbox).to receive(:process).with(inbound_mail_with_no_date.mail, imap_email_channel).once
+
+      described_class.perform_now(imap_email_channel)
+    end
   end
 
   context 'when imap fetch new emails with more than 15 attachments' do

From ca85d4e1c6d6fcb76d49f38c36fe40bb476384f8 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Mon, 15 May 2023 20:33:58 +0530
Subject: [PATCH 096/101] fix: External url validation in attachment (#7082)

fixes: https://linear.app/chatwoot/issue/CW-1746/activerecordrecordinvalid-validation-failed-external-url-is-too-long
---
 app/models/attachment.rb       |  2 +-
 spec/models/attachment_spec.rb | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index 276c082b7..9325d8168 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -37,7 +37,7 @@ class Attachment < ApplicationRecord
   belongs_to :message
   has_one_attached :file
   validate :acceptable_file
-
+  validates :external_url, length: { maximum: 1000 }
   enum file_type: [:image, :audio, :video, :file, :location, :fallback, :share, :story_mention, :contact]
 
   def push_event_data
diff --git a/spec/models/attachment_spec.rb b/spec/models/attachment_spec.rb
index bd82b2c2f..2f73d1abe 100644
--- a/spec/models/attachment_spec.rb
+++ b/spec/models/attachment_spec.rb
@@ -1,6 +1,28 @@
 require 'rails_helper'
 
 RSpec.describe Attachment, type: :model do
+  describe 'external url validations' do
+    let(:message) { create(:message) }
+    let(:attachment) { message.attachments.new(account_id: message.account_id, file_type: :image) }
+
+    before do
+      attachment.file.attach(io: File.open(Rails.root.join('spec/assets/avatar.png')), filename: 'avatar.png', content_type: 'image/png')
+    end
+
+    context 'when it validates external url length' do
+      it 'valid when within limit' do
+        attachment.external_url = 'a' * 1000
+        expect(attachment.valid?).to be true
+      end
+
+      it 'invalid when crossed the limit' do
+        attachment.external_url = 'a' * 1500
+        attachment.valid?
+        expect(attachment.errors[:external_url]).to include('is too long (maximum is 1000 characters)')
+      end
+    end
+  end
+
   describe 'download_url' do
     it 'returns valid download url' do
       message = create(:message)

From d3206055564a0228598db5422d35c843efd4d3f0 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Mon, 15 May 2023 21:23:17 +0530
Subject: [PATCH 097/101] chore: Fix Activerecord querry cancelled when
 fetching email (#7083)

limiting the query to 2 days to ensure that it runs timebound.

fixes: https://linear.app/chatwoot/issue/CW-1747/activerecordquerycanceled-pgquerycanceled-error-canceling-statement
---
 app/jobs/inboxes/fetch_imap_emails_job.rb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/jobs/inboxes/fetch_imap_emails_job.rb b/app/jobs/inboxes/fetch_imap_emails_job.rb
index 80308f1e1..b1eac71b1 100644
--- a/app/jobs/inboxes/fetch_imap_emails_job.rb
+++ b/app/jobs/inboxes/fetch_imap_emails_job.rb
@@ -87,9 +87,11 @@ class Inboxes::FetchImapEmailsJob < ApplicationJob
   end
 
   def last_email_time(channel)
-    if channel.inbox.messages.any?
-      time = channel.inbox.messages.incoming.last.content_attributes['email']['date']
-      time ||= channel.inbox.messages.incoming.last.created_at.to_s
+    # we are only checking for emails in last 2 day
+    last_email_incoming_message = channel.inbox.messages.incoming.where('messages.created_at >= ?', 2.days.ago).last
+    if last_email_incoming_message.present?
+      time = last_email_incoming_message.content_attributes['email']['date']
+      time ||= last_email_incoming_message.created_at.to_s
     end
     time ||= 1.hour.ago.to_s
 

From 0f776a173ccfa22a6bb82d29768eb016e56c99bb Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Mon, 15 May 2023 21:42:22 +0530
Subject: [PATCH 098/101] Fix: Mail ate compare with nil date (#7084)

fixes: https://chatwoot-p3.sentry.io/issues/4185144468/?project=6382945
---
 app/jobs/inboxes/fetch_imap_emails_job.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/jobs/inboxes/fetch_imap_emails_job.rb b/app/jobs/inboxes/fetch_imap_emails_job.rb
index b1eac71b1..9f9393df7 100644
--- a/app/jobs/inboxes/fetch_imap_emails_job.rb
+++ b/app/jobs/inboxes/fetch_imap_emails_job.rb
@@ -54,7 +54,9 @@ class Inboxes::FetchImapEmailsJob < ApplicationJob
   end
 
   def processed_email?(current_email, last_email_time)
-    current_email.date < last_email_time
+    return current_email.date < last_email_time if current_email.date.present?
+
+    false
   end
 
   def fetch_mail_for_ms_provider(channel)

From a3547c5a1f8923f74d3ba9e3140db646dfe8975f Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Mon, 15 May 2023 18:43:16 -0700
Subject: [PATCH 099/101] feat: Show Table of Contents in the article sidebar
 (#7085)

---
 app/javascript/packs/portal.js                | 30 +------
 app/javascript/portal/application.scss        | 18 ++++
 .../portal/components/TableOfContents.vue     | 70 ++++++++++++++++
 app/javascript/portal/portalHelpers.js        | 84 +++++++++++++++++--
 app/javascript/portal/specs/portal.spec.js    |  4 +-
 app/views/layouts/portal.html.erb             |  5 +-
 .../api/v1/portals/articles/show.html.erb     | 13 ++-
 config/locales/en.yml                         |  1 +
 package.json                                  |  8 +-
 tailwind.config.js                            |  1 -
 yarn.lock                                     | 26 ++++++
 11 files changed, 204 insertions(+), 56 deletions(-)
 create mode 100644 app/javascript/portal/components/TableOfContents.vue

diff --git a/app/javascript/packs/portal.js b/app/javascript/packs/portal.js
index 5c1867658..42493615d 100644
--- a/app/javascript/packs/portal.js
+++ b/app/javascript/packs/portal.js
@@ -1,35 +1,9 @@
-// This file is automatically compiled by Webpack, along with any other files
-// present in this directory. You're encouraged to place your actual application logic in
-// a relevant structure within app/javascript and only use these pack files to reference
-// that code so that it will be compiled.
-
-import Vue from 'vue';
 import Rails from '@rails/ujs';
 import Turbolinks from 'turbolinks';
-import PublicArticleSearch from '../portal/components/PublicArticleSearch.vue';
-
-import { navigateToLocalePage } from '../portal/portalHelpers';
-
 import '../portal/application.scss';
+import { InitializationHelpers } from '../portal/portalHelpers';
 
 Rails.start();
 Turbolinks.start();
 
-const initPageSetUp = () => {
-  navigateToLocalePage();
-  const isSearchContainerAvailable = document.querySelector('#search-wrap');
-  if (isSearchContainerAvailable) {
-    new Vue({
-      components: { PublicArticleSearch },
-      template: '<PublicArticleSearch />',
-    }).$mount('#search-wrap');
-  }
-};
-
-document.addEventListener('DOMContentLoaded', () => {
-  initPageSetUp();
-});
-
-document.addEventListener('turbolinks:load', () => {
-  initPageSetUp();
-});
+document.addEventListener('turbolinks:load', InitializationHelpers.onLoad);
diff --git a/app/javascript/portal/application.scss b/app/javascript/portal/application.scss
index b657e2249..8a1b7461b 100644
--- a/app/javascript/portal/application.scss
+++ b/app/javascript/portal/application.scss
@@ -16,3 +16,21 @@ body {
   -webkit-font-smoothing: antialiased;
   height: 100%;
 }
+
+
+// Taking these utils from tailwind 3.x.x, need to remove once we upgrade
+.scroll-mt-24 {
+  scroll-margin-top: 6rem;
+}
+
+.top-24 {
+  top: 6rem;
+}
+
+.heading {
+  &:hover {
+    a {
+      visibility: visible;
+    }
+  }
+}
diff --git a/app/javascript/portal/components/TableOfContents.vue b/app/javascript/portal/components/TableOfContents.vue
new file mode 100644
index 000000000..5e00f50aa
--- /dev/null
+++ b/app/javascript/portal/components/TableOfContents.vue
@@ -0,0 +1,70 @@
+<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">
+      <nav class="max-w-2xl">
+        <h2
+          id="on-this-page-title"
+          class="text-slate-800 font-semibold tracking-wide border-b mb-3 leading-7"
+        >
+          {{ 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">
+            <p :class="getClassName(element)">
+              <a
+                :href="`#${element.slug}`"
+                data-turbolinks="false"
+                class="text-base text-slate-800 cursor-pointer"
+              >
+                {{ element.title }}
+              </a>
+            </p>
+          </li>
+        </ol>
+      </nav>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  props: {
+    rows: {
+      type: Array,
+      default: () => [],
+    },
+  },
+  computed: {
+    tocHeader() {
+      return window.portalConfig.tocHeader;
+    },
+    h1Count() {
+      return this.rows.filter(el => el.tag === 'h1').length;
+    },
+    h2Count() {
+      return this.rows.filter(el => el.tag === 'h2').length;
+    },
+  },
+  methods: {
+    getClassName(el) {
+      if (el.tag === 'h1') {
+        return '';
+      }
+      if (el.tag === 'h2') {
+        if (this.h1Count > 0) {
+          return 'ml-2';
+        }
+        return '';
+      }
+
+      if (el.tag === 'h3') {
+        if (!this.h1Count && !this.h2Count) {
+          return '';
+        }
+        return 'ml-8';
+      }
+
+      return '';
+    },
+  },
+};
+</script>
diff --git a/app/javascript/portal/portalHelpers.js b/app/javascript/portal/portalHelpers.js
index 647059b73..27adad3d5 100644
--- a/app/javascript/portal/portalHelpers.js
+++ b/app/javascript/portal/portalHelpers.js
@@ -1,13 +1,79 @@
-export const navigateToLocalePage = () => {
-  const allLocaleSwitcher = document.querySelector('.locale-switcher');
+import slugifyWithCounter from '@sindresorhus/slugify';
+import Vue from 'vue';
 
-  if (!allLocaleSwitcher) {
-    return false;
-  }
+import PublicArticleSearch from './components/PublicArticleSearch.vue';
+import TableOfContents from './components/TableOfContents.vue';
 
-  const { portalSlug } = allLocaleSwitcher.dataset;
-  allLocaleSwitcher.addEventListener('change', event => {
-    window.location = `/hc/${portalSlug}/${event.target.value}/`;
+export const getHeadingsfromTheArticle = () => {
+  const rows = [];
+  const articleElement = document.getElementById('cw-article-content');
+  articleElement.querySelectorAll('h1, h2, h3').forEach(element => {
+    const slug = slugifyWithCounter(element.innerText);
+    element.id = slug;
+    element.className = 'scroll-mt-24 heading';
+    element.innerHTML += `<a class="invisible text-slate-600 ml-3" href="#${slug}" title="${element.innerText}" data-turbolinks="false">#</a>`;
+    rows.push({
+      slug,
+      title: element.innerText,
+      tag: element.tagName.toLowerCase(),
+    });
   });
-  return false;
+  return rows;
+};
+
+export const InitializationHelpers = {
+  navigateToLocalePage: () => {
+    const allLocaleSwitcher = document.querySelector('.locale-switcher');
+
+    if (!allLocaleSwitcher) {
+      return false;
+    }
+
+    const { portalSlug } = allLocaleSwitcher.dataset;
+    allLocaleSwitcher.addEventListener('change', event => {
+      window.location = `/hc/${portalSlug}/${event.target.value}/`;
+    });
+    return false;
+  },
+
+  initalizeSearch: () => {
+    const isSearchContainerAvailable = document.querySelector('#search-wrap');
+    if (isSearchContainerAvailable) {
+      new Vue({
+        components: { PublicArticleSearch },
+        template: '<PublicArticleSearch />',
+      }).$mount('#search-wrap');
+    }
+  },
+
+  initializeTableOfContents: () => {
+    const isOnArticlePage = document.querySelector('#cw-hc-toc');
+    if (isOnArticlePage) {
+      new Vue({
+        components: { TableOfContents },
+        data: { rows: getHeadingsfromTheArticle() },
+        template: '<table-of-contents :rows="rows" />',
+      }).$mount('#cw-hc-toc');
+    }
+  },
+
+  initialize: () => {
+    InitializationHelpers.navigateToLocalePage();
+    InitializationHelpers.initalizeSearch();
+    InitializationHelpers.initializeTableOfContents();
+  },
+
+  onLoad: () => {
+    InitializationHelpers.initialize();
+    if (window.location.hash) {
+      if ('scrollRestoration' in window.history) {
+        window.history.scrollRestoration = 'manual';
+      }
+
+      const a = document.createElement('a');
+      a.href = window.location.hash;
+      a['data-turbolinks'] = false;
+      a.click();
+    }
+  },
 };
diff --git a/app/javascript/portal/specs/portal.spec.js b/app/javascript/portal/specs/portal.spec.js
index 31dc06890..cd4347bad 100644
--- a/app/javascript/portal/specs/portal.spec.js
+++ b/app/javascript/portal/specs/portal.spec.js
@@ -1,4 +1,4 @@
-import { navigateToLocalePage } from '../portalHelpers';
+import { InitializationHelpers } from '../portalHelpers';
 
 describe('#navigateToLocalePage', () => {
   it('returns correct cookie name', () => {
@@ -14,7 +14,7 @@ describe('#navigateToLocalePage', () => {
         callback({ target: { value: 1 } });
       });
 
-    navigateToLocalePage();
+    InitializationHelpers.navigateToLocalePage();
     expect(allLocaleSwitcher.addEventListener).toBeCalledWith(
       'change',
       expect.any(Function)
diff --git a/app/views/layouts/portal.html.erb b/app/views/layouts/portal.html.erb
index 071fde9ee..8f1dda7ae 100644
--- a/app/views/layouts/portal.html.erb
+++ b/app/views/layouts/portal.html.erb
@@ -44,8 +44,9 @@ By default, it renders:
         searchPlaceholder: '<%= I18n.t('public_portal.search.search_placeholder') %>',
         emptyPlaceholder: '<%= I18n.t('public_portal.search.empty_placeholder') %>',
         loadingPlaceholder: '<%= I18n.t('public_portal.search.loading_placeholder') %>',
-        resultsTitle: '<%= I18n.t('public_portal.search.results_title') %>'
-      }
+        resultsTitle: '<%= I18n.t('public_portal.search.results_title') %>',
+      },
+      tocHeader: '<%= I18n.t('public_portal.toc_header') %>'
     };
   </script>
 </html>
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 bea1a20e8..20f14e787 100644
--- a/app/views/public/api/v1/portals/articles/show.html.erb
+++ b/app/views/public/api/v1/portals/articles/show.html.erb
@@ -35,9 +35,9 @@
     <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">
         <% if @article.author&.avatar_url&.present? %>
-          <img src="<%= @article.author.avatar_url %>" alt="<%= @article.author.display_name %>" class="w-12 h-12 border rounded-full">
+          <img src="<%= @article.author.avatar_url %>" alt="<%= @article.author.display_name %>" class="w-12 h-12 border rounded-full pr-1">
         <% end %>
-        <div class="pl-1">
+        <div>
           <h5 class="text-base font-medium text-slate-900 mb-2"><%= @article.author.available_name %></h5>
           <p class="text-sm font-normal text-slate-700">
           <%= I18n.t('public_portal.common.last_updated_on', last_updated_on: @article.updated_at.strftime("%b %d, %Y")) %>
@@ -46,10 +46,9 @@
     </div>
   </div>
 </div>
-<div class="max-w-6xl flex-grow w-full px-8 py-8 mx-auto space-y-12">
-  <article class="space-y-8">
-    <div class="text-slate-800 text-lg max-w-3xl prose break-words">
-      <p><%= @parsed_content %></p>
-    </div>
+<div class="flex max-w-6xl w-full px-8 mx-auto">
+  <article id="cw-article-content" class="flex-grow flex-2 py-12 mx-auto text-slate-800 text-lg max-w-3xl prose break-words">
+    <%= @parsed_content %>
   </article>
+  <div class="flex-1" id="cw-hc-toc"></div>
 </div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 0a9026554..2a2437566 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -196,6 +196,7 @@ en:
       empty_placeholder: No results found.
       loading_placeholder: Searching...
       results_title: Search results
+    toc_header: 'On this page'
     hero:
       sub_title: Search for the articles here or browse the categories below.
     common:
diff --git a/package.json b/package.json
index 9b739c030..24c61216d 100644
--- a/package.json
+++ b/package.json
@@ -28,6 +28,7 @@
     "@rails/webpacker": "5.4.4",
     "@sentry/tracing": "^6.19.7",
     "@sentry/vue": "^6.19.7",
+    "@sindresorhus/slugify": "1.1.0",
     "@tailwindcss/typography": "0.2.0",
     "activestorage": "^5.2.6",
     "axios": "^0.21.2",
@@ -133,13 +134,6 @@
       "pre-push": "sh bin/validate_push"
     }
   },
-  "jest": {
-    "collectCoverage": true,
-    "coverageReporters": [
-      "lcov",
-      "text"
-    ]
-  },
   "lint-staged": {
     "app/**/*.{js,vue}": [
       "eslint --fix",
diff --git a/tailwind.config.js b/tailwind.config.js
index 1076ae315..0dc013c8e 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -97,7 +97,6 @@ module.exports = {
       },
     },
   },
-  variants: {},
   plugins: [
     // eslint-disable-next-line
     require('@tailwindcss/typography'),
diff --git a/yarn.lock b/yarn.lock
index 6cdb92044..323c690c7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2887,6 +2887,22 @@
     "@sentry/utils" "6.19.7"
     tslib "^1.9.3"
 
+"@sindresorhus/slugify@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@sindresorhus/slugify/-/slugify-1.1.0.tgz#2f195365d9b953384305b62664b44b4036c49430"
+  integrity sha512-ujZRbmmizX26yS/HnB3P9QNlNa4+UvHh+rIse3RbOXLp8yl6n1TxB4t7NHggtVgS8QmmOtzXo48kCxZGACpkPw==
+  dependencies:
+    "@sindresorhus/transliterate" "^0.1.1"
+    escape-string-regexp "^4.0.0"
+
+"@sindresorhus/transliterate@^0.1.1":
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/@sindresorhus/transliterate/-/transliterate-0.1.2.tgz#ffce368271d153550e87de81486004f2637425af"
+  integrity sha512-5/kmIOY9FF32nicXH+5yLNTX4NJ4atl7jRgqAJuIn/iyDFXBktOKDxCvyGE/EzmF4ngSUvjXxQUQlQiZ5lfw+w==
+  dependencies:
+    escape-string-regexp "^2.0.0"
+    lodash.deburr "^4.1.0"
+
 "@sinonjs/commons@^1.7.0":
   version "1.8.3"
   resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.3.tgz#3802ddd21a50a949b6721ddd72da36e67e7f1b2d"
@@ -8468,6 +8484,11 @@ escape-string-regexp@^2.0.0:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
   integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
 
+escape-string-regexp@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
+  integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
+
 escodegen@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd"
@@ -12048,6 +12069,11 @@ lodash.debounce@^4.0.8:
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
   integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168=
 
+lodash.deburr@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/lodash.deburr/-/lodash.deburr-4.1.0.tgz#ddb1bbb3ef07458c0177ba07de14422cb033ff9b"
+  integrity sha512-m/M1U1f3ddMCs6Hq2tAsYThTBDaAKFDX3dwDo97GEYzamXi9SqUpjWi/Rrj/gf3X2n8ktwgZrlP1z6E3v/IExQ==
+
 lodash.get@^4.0:
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"

From 3f39b7ad1f104ec03dac12e517d1912618abfe5c Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Mon, 15 May 2023 19:05:07 -0700
Subject: [PATCH 100/101] fix: Avoid styles getting purged on prod build
 (#7086)

---
 app/javascript/portal/application.scss | 6 +++++-
 app/javascript/portal/portalHelpers.js | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/javascript/portal/application.scss b/app/javascript/portal/application.scss
index 8a1b7461b..866d21c14 100644
--- a/app/javascript/portal/application.scss
+++ b/app/javascript/portal/application.scss
@@ -28,8 +28,12 @@ body {
 }
 
 .heading {
+  .permalink {
+    visibility: hidden;
+  }
+
   &:hover {
-    a {
+    .permalink {
       visibility: visible;
     }
   }
diff --git a/app/javascript/portal/portalHelpers.js b/app/javascript/portal/portalHelpers.js
index 27adad3d5..b5f892398 100644
--- a/app/javascript/portal/portalHelpers.js
+++ b/app/javascript/portal/portalHelpers.js
@@ -11,7 +11,7 @@ export const getHeadingsfromTheArticle = () => {
     const slug = slugifyWithCounter(element.innerText);
     element.id = slug;
     element.className = 'scroll-mt-24 heading';
-    element.innerHTML += `<a class="invisible text-slate-600 ml-3" href="#${slug}" title="${element.innerText}" data-turbolinks="false">#</a>`;
+    element.innerHTML += `<a class="permalink text-slate-600 ml-3" href="#${slug}" title="${element.innerText}" data-turbolinks="false">#</a>`;
     rows.push({
       slug,
       title: element.innerText,

From 7b8bcaba111c03e44dc1fe7607b2ca4db5dd5b07 Mon Sep 17 00:00:00 2001
From: Sojan <sojan@pepalo.com>
Date: Tue, 16 May 2023 12:33:16 +0530
Subject: [PATCH 101/101] Bump version to 2.17.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 d142137c1..1096df605 100644
--- a/config/app.yml
+++ b/config/app.yml
@@ -1,5 +1,5 @@
 shared: &shared
-  version: '2.16.1'
+  version: '2.17.0'
 
 development:
   <<: *shared
diff --git a/package.json b/package.json
index 24c61216d..56713231c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@chatwoot/chatwoot",
-  "version": "2.16.1",
+  "version": "2.17.0",
   "license": "MIT",
   "scripts": {
     "eslint": "eslint app/**/*.{js,vue}",