From 7298002da73daf6eee7d857ceaffaf1af95bffb1 Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Date: Wed, 14 Feb 2024 03:01:32 -0800
Subject: [PATCH 01/96] fix: Adds forgot password link for login form (#8927)

- focus ring not appearing issue
- missing forgot password link

Fixes: https://linear.app/chatwoot/issue/CW-3090/fix-fixes-issues-with-login-form
---
 app/javascript/v3/components/Form/Input.vue     | 15 ++++++++++++---
 app/javascript/v3/components/Form/WithLabel.vue |  3 +++
 app/javascript/v3/views/login/Index.vue         |  9 ++++++++-
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/app/javascript/v3/components/Form/Input.vue b/app/javascript/v3/components/Form/Input.vue
index b9e73387d..753157ab0 100644
--- a/app/javascript/v3/components/Form/Input.vue
+++ b/app/javascript/v3/components/Form/Input.vue
@@ -6,24 +6,29 @@
     :has-error="hasError"
     :error-message="errorMessage"
   >
+    <template #rightOfLabel>
+      <slot />
+    </template>
     <input
       :id="name"
       :name="name"
       :type="type"
       autocomplete="off"
+      :tabindex="tabindex"
       :required="required"
       :placeholder="placeholder"
       :data-testid="dataTestid"
       :value="value"
       :class="{
-        'focus:ring-red-600 ring-red-600': hasError,
-        'dark:ring-slate-600 dark:focus:ring-woot-500 ring-slate-200':
+        'focus:outline-red-600 outline-red-600 dark:focus:outline-red-600 dark:outline-red-600':
+          hasError,
+        'outline-slate-200 dark:outline-slate-600 dark:focus:outline-woot-500 focus:outline-woot-500':
           !hasError,
         'px-3 py-3': spacing === 'base',
         'px-3 py-2 mb-0': spacing === 'compact',
         'pl-9': icon,
       }"
-      class="block w-full border-none shadow-sm appearance-none rounded-xl outline outline-1 outline-slate-200 dark:outline-slate-200/20 focus:outline-none focus:outline-0 text-slate-900 dark:text-slate-100 placeholder:text-slate-400 focus:ring-2 focus:ring-woot-500 sm:text-sm sm:leading-6 dark:bg-slate-800"
+      class="block w-full border-none shadow-sm appearance-none rounded-xl outline outline-1 focus:outline-2 text-slate-900 dark:text-slate-100 placeholder:text-slate-400 sm:text-sm sm:leading-6 dark:bg-slate-800"
       @input="onInput"
       @blur="$emit('blur')"
     />
@@ -48,6 +53,10 @@ export default {
       type: String,
       default: 'text',
     },
+    tabindex: {
+      type: Number,
+      default: undefined,
+    },
     required: {
       type: Boolean,
       default: false,
diff --git a/app/javascript/v3/components/Form/WithLabel.vue b/app/javascript/v3/components/Form/WithLabel.vue
index d8c339a53..17bdeb202 100644
--- a/app/javascript/v3/components/Form/WithLabel.vue
+++ b/app/javascript/v3/components/Form/WithLabel.vue
@@ -9,6 +9,9 @@
       <slot name="label">
         {{ label }}
       </slot>
+      <slot name="rightOfLabel">
+        {{ label }}
+      </slot>
     </label>
     <div class="w-full">
       <div class="flex items-center relative w-full">
diff --git a/app/javascript/v3/views/login/Index.vue b/app/javascript/v3/views/login/Index.vue
index d840c27a5..8be74e709 100644
--- a/app/javascript/v3/views/login/Index.vue
+++ b/app/javascript/v3/views/login/Index.vue
@@ -46,6 +46,7 @@
             name="email_address"
             type="text"
             data-testid="email_input"
+            :tabindex="1"
             required
             :label="$t('LOGIN.EMAIL.LABEL')"
             :placeholder="$t('LOGIN.EMAIL.PLACEHOLDER')"
@@ -58,19 +59,25 @@
             name="password"
             data-testid="password_input"
             required
+            :tabindex="2"
             :label="$t('LOGIN.PASSWORD.LABEL')"
             :placeholder="$t('LOGIN.PASSWORD.PLACEHOLDER')"
             :has-error="$v.credentials.password.$error"
             @input="$v.credentials.password.$touch"
           >
             <p v-if="!globalConfig.disableUserProfileUpdate">
-              <router-link to="auth/reset/password" class="text-link">
+              <router-link
+                to="auth/reset/password"
+                class="text-link text-sm"
+                tabindex="4"
+              >
                 {{ $t('LOGIN.FORGOT_PASSWORD') }}
               </router-link>
             </p>
           </form-input>
           <submit-button
             :disabled="loginApi.showLoading"
+            :tabindex="3"
             :button-text="$t('LOGIN.SUBMIT')"
             :loading="loginApi.showLoading"
           />

From 678c00f2543d2416aea04c0e8127488992e35f7a Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Date: Wed, 14 Feb 2024 10:48:54 -0800
Subject: [PATCH 02/96] fix: Removes default slot for right of label (#8936)

---
 app/javascript/v3/components/Form/WithLabel.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/javascript/v3/components/Form/WithLabel.vue b/app/javascript/v3/components/Form/WithLabel.vue
index 17bdeb202..be7fefffd 100644
--- a/app/javascript/v3/components/Form/WithLabel.vue
+++ b/app/javascript/v3/components/Form/WithLabel.vue
@@ -9,9 +9,7 @@
       <slot name="label">
         {{ label }}
       </slot>
-      <slot name="rightOfLabel">
-        {{ label }}
-      </slot>
+      <slot name="rightOfLabel" />
     </label>
     <div class="w-full">
       <div class="flex items-center relative w-full">

From 597a4164e8f4c0f3cff56c6c1865236c4cae06b9 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Fri, 16 Feb 2024 08:19:06 +0530
Subject: [PATCH 03/96] fix: Editor hyperlink popup is hidden under modal
 (#8950)

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

diff --git a/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue b/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue
index 625fda78e..caa6e235e 100644
--- a/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue
+++ b/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue
@@ -753,7 +753,7 @@ export default {
 }
 
 .ProseMirror-prompt {
-  @apply z-50 bg-slate-25 dark:bg-slate-700 rounded-md border border-solid border-slate-75 dark:border-slate-800;
+  @apply z-[9999] bg-slate-25 dark:bg-slate-700 rounded-md border border-solid border-slate-75 dark:border-slate-800 shadow-lg;
 
   h5 {
     @apply dark:text-slate-25 text-slate-800;

From 3b7b06dbec7a29052d67205d419cd0e3731a1433 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Fri, 16 Feb 2024 14:38:02 +0530
Subject: [PATCH 04/96] feat: Add `meta` to notification model (#8941)

* feat: Add meta and description to notification model

* chore: remove description
---
 app/models/notification.rb                             | 1 +
 db/migrate/20240215065844_add_meta_to_notifications.rb | 5 +++++
 db/schema.rb                                           | 3 ++-
 3 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 db/migrate/20240215065844_add_meta_to_notifications.rb

diff --git a/app/models/notification.rb b/app/models/notification.rb
index e0b31b457..f8c6e3d5b 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -4,6 +4,7 @@
 #
 #  id                   :bigint           not null, primary key
 #  last_activity_at     :datetime
+#  meta                 :jsonb
 #  notification_type    :integer          not null
 #  primary_actor_type   :string           not null
 #  read_at              :datetime
diff --git a/db/migrate/20240215065844_add_meta_to_notifications.rb b/db/migrate/20240215065844_add_meta_to_notifications.rb
new file mode 100644
index 000000000..e0f93f276
--- /dev/null
+++ b/db/migrate/20240215065844_add_meta_to_notifications.rb
@@ -0,0 +1,5 @@
+class AddMetaToNotifications < ActiveRecord::Migration[7.0]
+  def change
+    add_column :notifications, :meta, :jsonb, default: {}
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 7d2372554..138ea6835 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: 2024_02_07_103014) do
+ActiveRecord::Schema[7.0].define(version: 2024_02_15_065844) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_stat_statements"
   enable_extension "pg_trgm"
@@ -750,6 +750,7 @@ ActiveRecord::Schema[7.0].define(version: 2024_02_07_103014) do
     t.datetime "updated_at", null: false
     t.datetime "snoozed_until"
     t.datetime "last_activity_at", default: -> { "CURRENT_TIMESTAMP" }
+    t.jsonb "meta", default: {}
     t.index ["account_id"], name: "index_notifications_on_account_id"
     t.index ["last_activity_at"], name: "index_notifications_on_last_activity_at"
     t.index ["primary_actor_type", "primary_actor_id"], name: "uniq_primary_actor_per_account_notifications"

From 9c07b6dd46387f76b31c5fd7cd6718acff632f41 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Fri, 16 Feb 2024 16:44:55 +0530
Subject: [PATCH 05/96] chore: Support for updated_within in ConverationFinder
 (#8947)

- `updated_within' accepts value in seconds and returns all conversations updated in the given period with out pagination. This API will assist in our refetch logic on socket disconnect

ref: #8888
---
 app/finders/conversation_finder.rb       |  8 +++++++-
 spec/finders/conversation_finder_spec.rb | 24 ++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/app/finders/conversation_finder.rb b/app/finders/conversation_finder.rb
index 0cc5e52d8..f3c85be7a 100644
--- a/app/finders/conversation_finder.rb
+++ b/app/finders/conversation_finder.rb
@@ -169,6 +169,12 @@ class ConversationFinder
     )
 
     sort_by, sort_order = SORT_OPTIONS[params[:sort_by]] || SORT_OPTIONS['last_activity_at_desc']
-    @conversations.send(sort_by, sort_order).page(current_page).per(ENV.fetch('CONVERSATION_RESULTS_PER_PAGE', '25').to_i)
+    @conversations = @conversations.send(sort_by, sort_order)
+
+    if params[:updated_within].present?
+      @conversations.where('conversations.updated_at > ?', Time.zone.now - params[:updated_within].to_i.seconds)
+    else
+      @conversations.page(current_page).per(ENV.fetch('CONVERSATION_RESULTS_PER_PAGE', '25').to_i)
+    end
   end
 end
diff --git a/spec/finders/conversation_finder_spec.rb b/spec/finders/conversation_finder_spec.rb
index 2ce5b6bf9..4d6e9ed40 100644
--- a/spec/finders/conversation_finder_spec.rb
+++ b/spec/finders/conversation_finder_spec.rb
@@ -146,6 +146,30 @@ describe ConversationFinder do
       end
     end
 
+    context 'with updated_within' do
+      let(:params) { { updated_within: 20, assignee_type: 'unassigned', sort_by: 'created_at_asc' } }
+
+      it 'filters based on params, sort order but returns all conversations without pagination with in time range' do
+        # value of updated_within is in seconds
+        # write spec based on that
+        conversations = create_list(:conversation, 50, account: account,
+                                                       inbox: inbox, assignee: nil,
+                                                       updated_at: Time.now.utc - 30.seconds,
+                                                       created_at: Time.now.utc - 30.seconds)
+        # update updated_at of 27 conversations to be with in 20 seconds
+        conversations[0..27].each do |conversation|
+          conversation.update(updated_at: Time.now.utc - 10.seconds)
+        end
+        result = conversation_finder.perform
+        # pagination is not applied
+        # filters are applied
+        # modified conversations + 1 conversation created during set up
+        expect(result[:conversations].length).to be 29
+        # ensure that the conversations are sorted by created_at
+        expect(result[:conversations].first.created_at).to be < result[:conversations].last.created_at
+      end
+    end
+
     context 'with pagination' do
       let(:params) { { status: 'open', assignee_type: 'me', page: 1 } }
 

From a902b49bc5ad9b5c1d292435e0d638d90be7a06a Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Date: Fri, 16 Feb 2024 03:31:27 -0800
Subject: [PATCH 06/96] feat: Adds bulk_invite api for onboarding view (#8931)

- New API for bulk email invite
---
 app/javascript/dashboard/api/agents.js        |  8 ++++++
 .../dashboard/api/specs/agents.spec.js        | 25 +++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/app/javascript/dashboard/api/agents.js b/app/javascript/dashboard/api/agents.js
index 7cc5e6d0c..cfc6b36ff 100644
--- a/app/javascript/dashboard/api/agents.js
+++ b/app/javascript/dashboard/api/agents.js
@@ -1,9 +1,17 @@
+/* global axios */
+
 import ApiClient from './ApiClient';
 
 class Agents extends ApiClient {
   constructor() {
     super('agents', { accountScoped: true });
   }
+
+  bulkInvite({ emails }) {
+    return axios.post(`${this.url}/bulk_create`, {
+      emails,
+    });
+  }
 }
 
 export default new Agents();
diff --git a/app/javascript/dashboard/api/specs/agents.spec.js b/app/javascript/dashboard/api/specs/agents.spec.js
index 7cf1bdd0e..20dd36688 100644
--- a/app/javascript/dashboard/api/specs/agents.spec.js
+++ b/app/javascript/dashboard/api/specs/agents.spec.js
@@ -10,4 +10,29 @@ describe('#AgentAPI', () => {
     expect(agents).toHaveProperty('update');
     expect(agents).toHaveProperty('delete');
   });
+
+  describe('API calls', () => {
+    const originalAxios = window.axios;
+    const axiosMock = {
+      post: jest.fn(() => Promise.resolve()),
+    };
+
+    beforeEach(() => {
+      window.axios = axiosMock;
+    });
+
+    afterEach(() => {
+      window.axios = originalAxios;
+    });
+
+    it('#bulkInvite', () => {
+      agents.bulkInvite({ emails: ['hello@hi.com'] });
+      expect(axiosMock.post).toHaveBeenCalledWith(
+        '/api/v1/agents/bulk_create',
+        {
+          emails: ['hello@hi.com'],
+        }
+      );
+    });
+  });
 });

From fe744abe268e9b4d51d85ff21e3ebb2c14f7e085 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Fri, 16 Feb 2024 17:30:54 +0530
Subject: [PATCH 07/96] fix: Mark notification as unread after the un-snooze
 (#8917)

---
 app/jobs/notification/reopen_snoozed_notifications_job.rb       | 2 +-
 spec/jobs/notification/reopen_snoozed_notifications_job_spec.rb | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/jobs/notification/reopen_snoozed_notifications_job.rb b/app/jobs/notification/reopen_snoozed_notifications_job.rb
index 89b245187..05235b62b 100644
--- a/app/jobs/notification/reopen_snoozed_notifications_job.rb
+++ b/app/jobs/notification/reopen_snoozed_notifications_job.rb
@@ -4,7 +4,7 @@ class Notification::ReopenSnoozedNotificationsJob < ApplicationJob
   def perform
     # rubocop:disable Rails/SkipsModelValidations
     Notification.where(snoozed_until: 3.days.ago..Time.current)
-                .update_all(snoozed_until: nil, updated_at: Time.current, last_activity_at: Time.current)
+                .update_all(snoozed_until: nil, updated_at: Time.current, last_activity_at: Time.current, read_at: nil)
     # rubocop:enable Rails/SkipsModelValidations
   end
 end
diff --git a/spec/jobs/notification/reopen_snoozed_notifications_job_spec.rb b/spec/jobs/notification/reopen_snoozed_notifications_job_spec.rb
index 2b210ef2b..024c3d0d6 100644
--- a/spec/jobs/notification/reopen_snoozed_notifications_job_spec.rb
+++ b/spec/jobs/notification/reopen_snoozed_notifications_job_spec.rb
@@ -17,6 +17,7 @@ RSpec.describe Notification::ReopenSnoozedNotificationsJob do
       expect(snoozed_till_5_minutes_ago.reload.snoozed_until).to be_nil
       expect(snoozed_till_tomorrow.reload.snoozed_until.to_date).to eq 1.day.from_now.to_date
       expect(snoozed_indefinitely.reload.snoozed_until).to be_nil
+      expect(snoozed_indefinitely.reload.read_at).to be_nil
     end
   end
 end

From 94892e71687fab7d21843e892dac05e45ded3ee5 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Sat, 17 Feb 2024 01:41:39 +0530
Subject: [PATCH 08/96] chore: Fix flaky spec relying on unguaranteed order
 (#8956)

---
 .../api/v1/accounts/contacts_controller_spec.rb            | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/spec/controllers/api/v1/accounts/contacts_controller_spec.rb b/spec/controllers/api/v1/accounts/contacts_controller_spec.rb
index ace9e8e03..e5e298747 100644
--- a/spec/controllers/api/v1/accounts/contacts_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/contacts_controller_spec.rb
@@ -50,8 +50,11 @@ RSpec.describe 'Contacts API', type: :request do
 
         expect(response).to have_http_status(:success)
         response_body = response.parsed_body
-        expect(response_body['payload'].first['email']).to eq(contact.email)
-        expect(response_body['payload'].first['contact_inboxes'].blank?).to be(true)
+
+        contact_emails = response_body['payload'].pluck('email')
+        contact_inboxes = response_body['payload'].pluck('contact_inboxes').flatten.compact
+        expect(contact_emails).to include(contact.email)
+        expect(contact_inboxes).to eq([])
       end
 
       it 'returns all contacts with company name desc order' do

From 6eb06377ccd0a885a9e4a3f04615028f49209d4b Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Date: Fri, 16 Feb 2024 12:19:08 -0800
Subject: [PATCH 09/96] feat: Add textarea component to use in forms (#8932)

Co-authored-by: Pranav <pranav@chatwoot.com>
---
 .../v3/components/Form/Textarea.vue           | 83 +++++++++++++++++++
 1 file changed, 83 insertions(+)
 create mode 100644 app/javascript/v3/components/Form/Textarea.vue

diff --git a/app/javascript/v3/components/Form/Textarea.vue b/app/javascript/v3/components/Form/Textarea.vue
new file mode 100644
index 000000000..e43c411f5
--- /dev/null
+++ b/app/javascript/v3/components/Form/Textarea.vue
@@ -0,0 +1,83 @@
+<template>
+  <with-label
+    :label="label"
+    :name="name"
+    :has-error="hasError"
+    :error-message="errorMessage"
+  >
+    <textarea
+      :id="name"
+      :name="name"
+      autocomplete="off"
+      :required="required"
+      :placeholder="placeholder"
+      :data-testid="dataTestid"
+      :value="value"
+      :rows="rows"
+      :class="{
+        'focus:outline-red-600 outline-red-600': hasError,
+        'dark:outline-slate-600 dark:focus:outline-woot-500 outline-slate-200 focus:outline-woot-500':
+          !hasError,
+        'resize-none': !allowResize,
+      }"
+      class="block w-full p-3 border-none rounded-xl shadow-sm appearance-none outline outline-1 focus:outline focus:outline-2 text-slate-900 dark:text-slate-100 placeholder:text-slate-400 bg-white dark:bg-slate-800"
+      @input="onInput"
+      @blur="$emit('blur')"
+    />
+  </with-label>
+</template>
+<script>
+import WithLabel from './WithLabel.vue';
+export default {
+  components: {
+    WithLabel,
+  },
+  props: {
+    label: {
+      type: String,
+      default: '',
+    },
+    name: {
+      type: String,
+      required: true,
+    },
+    required: {
+      type: Boolean,
+      default: false,
+    },
+    placeholder: {
+      type: String,
+      default: '',
+    },
+    value: {
+      type: [String, Number],
+      default: '',
+    },
+    rows: {
+      type: Number,
+      default: 3,
+    },
+    allowResize: {
+      type: Boolean,
+      default: true,
+    },
+    hasError: {
+      type: Boolean,
+      default: false,
+    },
+    errorMessage: {
+      type: String,
+      default: '',
+    },
+    dataTestid: {
+      type: String,
+      default: '',
+    },
+  },
+  methods: {
+    onInput(e) {
+      this.$emit('input', e.target.value);
+    },
+  },
+};
+</script>

From cd06b2b3379636d4ea525a3bf241368ec9a59c14 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Sat, 17 Feb 2024 13:59:25 +0530
Subject: [PATCH 10/96] fix: Inbox view Read/Snoozed display filters (#8907)

* fix: Notification filters

* Update notification_finder.rb

* Update notification_finder.rb

* Update notification_finder.rb

* fix: spec

* fix: specs

* Update notification_finder.rb

* fix: add more fixes

* Update notification_finder.rb

* fix: specs

* chore: better comments

* chore: removed filtering

* chore: refactoring

* fix: review fixes

* fix: API call

* chore: Minor fix

* Rename spec

* Fix params getting undefined

* Fix finder

---------

Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Co-authored-by: iamsivin <iamsivin@gmail.com>
Co-authored-by: Pranav <pranav@chatwoot.com>
---
 .../v1/accounts/notifications_controller.rb   |   2 +-
 app/finders/notification_finder.rb            |  24 ++--
 app/javascript/dashboard/api/notifications.js |   5 +-
 .../dashboard/api/specs/notifications.spec.js |  42 ++++--
 .../store/modules/notifications/getters.js    |   9 +-
 .../store/modules/notifications/helpers.js    |  28 ----
 .../specs/notifications/getters.spec.js       |   2 +
 .../specs/notifications/helpers.spec.js       | 128 +-----------------
 spec/factories/notifications.rb               |  10 ++
 spec/finders/notification_finder_spec.rb      | 122 +++++++----------
 10 files changed, 112 insertions(+), 260 deletions(-)

diff --git a/app/controllers/api/v1/accounts/notifications_controller.rb b/app/controllers/api/v1/accounts/notifications_controller.rb
index 0eeff5695..3ac0568e3 100644
--- a/app/controllers/api/v1/accounts/notifications_controller.rb
+++ b/app/controllers/api/v1/accounts/notifications_controller.rb
@@ -7,8 +7,8 @@ class Api::V1::Accounts::NotificationsController < Api::V1::Accounts::BaseContro
   before_action :set_current_page, only: [:index]
 
   def index
+    @notifications = notification_finder.notifications
     @unread_count = notification_finder.unread_count
-    @notifications = notification_finder.perform
     @count = notification_finder.count
   end
 
diff --git a/app/finders/notification_finder.rb b/app/finders/notification_finder.rb
index 7e5789372..ccfe470a0 100644
--- a/app/finders/notification_finder.rb
+++ b/app/finders/notification_finder.rb
@@ -10,8 +10,8 @@ class NotificationFinder
     set_up
   end
 
-  def perform
-    notifications
+  def notifications
+    @notifications.page(current_page).per(RESULTS_PER_PAGE).order(last_activity_at: sort_order)
   end
 
   def unread_count
@@ -26,27 +26,31 @@ class NotificationFinder
 
   def set_up
     find_all_notifications
-    filter_by_read_status
-    filter_by_status
+    filter_snoozed_notifications
+    fitler_read_notifications
   end
 
   def find_all_notifications
     @notifications = current_user.notifications.where(account_id: @current_account.id)
   end
 
-  def filter_by_status
-    @notifications = @notifications.where('snoozed_until > ?', DateTime.now.utc) if params[:status] == 'snoozed'
+  def filter_snoozed_notifications
+    @notifications = @notifications.where(snoozed_until: nil) unless type_included?('snoozed')
   end
 
-  def filter_by_read_status
-    @notifications = @notifications.where.not(read_at: nil) if params[:type] == 'read'
+  def fitler_read_notifications
+    @notifications = @notifications.where(read_at: nil) unless type_included?('read')
+  end
+
+  def type_included?(type)
+    (params[:includes] || []).include?(type)
   end
 
   def current_page
     params[:page] || 1
   end
 
-  def notifications
-    @notifications.page(current_page).per(RESULTS_PER_PAGE).order(last_activity_at: params[:sort_order] || :desc)
+  def sort_order
+    params[:sort_order] || :desc
   end
 end
diff --git a/app/javascript/dashboard/api/notifications.js b/app/javascript/dashboard/api/notifications.js
index 65fc937b7..65284623f 100644
--- a/app/javascript/dashboard/api/notifications.js
+++ b/app/javascript/dashboard/api/notifications.js
@@ -7,12 +7,13 @@ class NotificationsAPI extends ApiClient {
   }
 
   get({ page, status, type, sortOrder }) {
+    const includesFilter = [status, type].filter(value => !!value);
+
     return axios.get(this.url, {
       params: {
         page,
-        status,
-        type,
         sort_order: sortOrder,
+        includes: includesFilter,
       },
     });
   }
diff --git a/app/javascript/dashboard/api/specs/notifications.spec.js b/app/javascript/dashboard/api/specs/notifications.spec.js
index bc06eaa2b..fe748fe19 100644
--- a/app/javascript/dashboard/api/specs/notifications.spec.js
+++ b/app/javascript/dashboard/api/specs/notifications.spec.js
@@ -27,20 +27,36 @@ describe('#NotificationAPI', () => {
       window.axios = originalAxios;
     });
 
-    it('#get', () => {
-      notificationsAPI.get({
-        page: 1,
-        status: 'read',
-        type: 'Conversation',
-        sortOrder: 'desc',
-      });
-      expect(axiosMock.get).toHaveBeenCalledWith('/api/v1/notifications', {
-        params: {
+    describe('#get', () => {
+      it('generates the API call if both params are available', () => {
+        notificationsAPI.get({
           page: 1,
-          status: 'read',
-          type: 'Conversation',
-          sort_order: 'desc',
-        },
+          status: 'snoozed',
+          type: 'read',
+          sortOrder: 'desc',
+        });
+        expect(axiosMock.get).toHaveBeenCalledWith('/api/v1/notifications', {
+          params: {
+            page: 1,
+            sort_order: 'desc',
+            includes: ['snoozed', 'read'],
+          },
+        });
+      });
+
+      it('generates the API call if one of the params are available', () => {
+        notificationsAPI.get({
+          page: 1,
+          type: 'read',
+          sortOrder: 'desc',
+        });
+        expect(axiosMock.get).toHaveBeenCalledWith('/api/v1/notifications', {
+          params: {
+            page: 1,
+            sort_order: 'desc',
+            includes: ['read'],
+          },
+        });
       });
     });
 
diff --git a/app/javascript/dashboard/store/modules/notifications/getters.js b/app/javascript/dashboard/store/modules/notifications/getters.js
index b8df2b173..3fc1d9458 100644
--- a/app/javascript/dashboard/store/modules/notifications/getters.js
+++ b/app/javascript/dashboard/store/modules/notifications/getters.js
@@ -1,4 +1,4 @@
-import { applyInboxPageFilters, sortComparator } from './helpers';
+import { sortComparator } from './helpers';
 
 export const getters = {
   getNotifications($state) {
@@ -6,11 +6,8 @@ export const getters = {
   },
   getFilteredNotifications: $state => filters => {
     const sortOrder = filters.sortOrder === 'desc' ? 'newest' : 'oldest';
-    const filteredNotifications = Object.values($state.records).filter(
-      notification => applyInboxPageFilters(notification, filters)
-    );
-    const sortedNotifications = filteredNotifications.sort((a, b) =>
-      sortComparator(a, b, sortOrder)
+    const sortedNotifications = Object.values($state.records).sort((n1, n2) =>
+      sortComparator(n1, n2, sortOrder)
     );
     return sortedNotifications;
   },
diff --git a/app/javascript/dashboard/store/modules/notifications/helpers.js b/app/javascript/dashboard/store/modules/notifications/helpers.js
index 53c05c94e..33b864c43 100644
--- a/app/javascript/dashboard/store/modules/notifications/helpers.js
+++ b/app/javascript/dashboard/store/modules/notifications/helpers.js
@@ -1,31 +1,3 @@
-export const filterByStatus = (snoozedUntil, filterStatus) =>
-  filterStatus === 'snoozed' ? !!snoozedUntil : !snoozedUntil;
-
-export const filterByType = (readAt, filterType) =>
-  filterType === 'read' ? !!readAt : !readAt;
-
-export const filterByTypeAndStatus = (
-  readAt,
-  snoozedUntil,
-  filterType,
-  filterStatus
-) => {
-  const shouldFilterByStatus = filterByStatus(snoozedUntil, filterStatus);
-  const shouldFilterByType = filterByType(readAt, filterType);
-  return shouldFilterByStatus && shouldFilterByType;
-};
-
-export const applyInboxPageFilters = (notification, filters) => {
-  const { status, type } = filters;
-  const { read_at: readAt, snoozed_until: snoozedUntil } = notification;
-
-  if (status && type)
-    return filterByTypeAndStatus(readAt, snoozedUntil, type, status);
-  if (status && !type) return filterByStatus(snoozedUntil, status);
-  if (!status && type) return filterByType(readAt, type);
-  return true;
-};
-
 const INBOX_SORT_OPTIONS = {
   newest: 'desc',
   oldest: 'asc',
diff --git a/app/javascript/dashboard/store/modules/specs/notifications/getters.spec.js b/app/javascript/dashboard/store/modules/specs/notifications/getters.spec.js
index d557fca7a..f3ea23cb5 100644
--- a/app/javascript/dashboard/store/modules/specs/notifications/getters.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/notifications/getters.spec.js
@@ -34,6 +34,8 @@ describe('#getters', () => {
       sortOrder: 'desc',
     };
     expect(getters.getFilteredNotifications(state)(filters)).toEqual([
+      { id: 1, read_at: '2024-02-07T11:42:39.988Z', snoozed_until: null },
+      { id: 2, read_at: null, snoozed_until: null },
       {
         id: 3,
         read_at: '2024-02-07T11:42:39.988Z',
diff --git a/app/javascript/dashboard/store/modules/specs/notifications/helpers.spec.js b/app/javascript/dashboard/store/modules/specs/notifications/helpers.spec.js
index f5a9a3d9b..6d0338032 100644
--- a/app/javascript/dashboard/store/modules/specs/notifications/helpers.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/notifications/helpers.spec.js
@@ -1,10 +1,4 @@
-import {
-  filterByStatus,
-  filterByType,
-  filterByTypeAndStatus,
-  applyInboxPageFilters,
-  sortComparator,
-} from '../../notifications/helpers';
+import { sortComparator } from '../../notifications/helpers';
 
 const notifications = [
   {
@@ -45,126 +39,6 @@ const notifications = [
   },
 ];
 
-describe('#filterByStatus', () => {
-  it('returns the notifications with snoozed status', () => {
-    const filters = { status: 'snoozed' };
-    notifications.forEach(notification => {
-      expect(
-        filterByStatus(notification.snoozed_until, filters.status)
-      ).toEqual(notification.snoozed_until !== null);
-    });
-  });
-  it('returns true if the notification is snoozed', () => {
-    const filters = { status: 'snoozed' };
-    expect(
-      filterByStatus(notifications[3].snoozed_until, filters.status)
-    ).toEqual(true);
-  });
-  it('returns false if the notification is not snoozed', () => {
-    const filters = { status: 'snoozed' };
-    expect(
-      filterByStatus(notifications[2].snoozed_until, filters.status)
-    ).toEqual(false);
-  });
-});
-
-describe('#filterByType', () => {
-  it('returns the notifications with read status', () => {
-    const filters = { type: 'read' };
-    notifications.forEach(notification => {
-      expect(filterByType(notification.read_at, filters.type)).toEqual(
-        notification.read_at !== null
-      );
-    });
-  });
-  it('returns true if the notification is read', () => {
-    const filters = { type: 'read' };
-    expect(filterByType(notifications[0].read_at, filters.type)).toEqual(true);
-  });
-  it('returns false if the notification is not read', () => {
-    const filters = { type: 'read' };
-    expect(filterByType(notifications[1].read_at, filters.type)).toEqual(false);
-  });
-});
-
-describe('#filterByTypeAndStatus', () => {
-  it('returns the notifications with type and status', () => {
-    const filters = { type: 'read', status: 'snoozed' };
-    notifications.forEach(notification => {
-      expect(
-        filterByTypeAndStatus(
-          notification.read_at,
-          notification.snoozed_until,
-          filters.type,
-          filters.status
-        )
-      ).toEqual(
-        notification.read_at !== null && notification.snoozed_until !== null
-      );
-    });
-  });
-  it('returns true if the notification is read and snoozed', () => {
-    const filters = { type: 'read', status: 'snoozed' };
-    expect(
-      filterByTypeAndStatus(
-        notifications[4].read_at,
-        notifications[4].snoozed_until,
-        filters.type,
-        filters.status
-      )
-    ).toEqual(true);
-  });
-  it('returns false if the notification is not read and snoozed', () => {
-    const filters = { type: 'read', status: 'snoozed' };
-    expect(
-      filterByTypeAndStatus(
-        notifications[3].read_at,
-        notifications[3].snoozed_until,
-        filters.type,
-        filters.status
-      )
-    ).toEqual(false);
-  });
-});
-
-describe('#applyInboxPageFilters', () => {
-  it('returns the notifications with type and status', () => {
-    const filters = { type: 'read', status: 'snoozed' };
-    notifications.forEach(notification => {
-      expect(applyInboxPageFilters(notification, filters)).toEqual(
-        filterByTypeAndStatus(
-          notification.read_at,
-          notification.snoozed_until,
-          filters.type,
-          filters.status
-        )
-      );
-    });
-  });
-  it('returns the notifications with type only', () => {
-    const filters = { type: 'read', status: null };
-    notifications.forEach(notification => {
-      expect(applyInboxPageFilters(notification, filters)).toEqual(
-        filterByType(notification.read_at, filters.type)
-      );
-    });
-  });
-  it('returns the notifications with status only', () => {
-    const filters = { type: null, status: 'snoozed' };
-    notifications.forEach(notification => {
-      expect(applyInboxPageFilters(notification, filters)).toEqual(
-        filterByStatus(notification.snoozed_until, filters.status)
-      );
-    });
-  });
-  it('returns true if there are no filters', () => {
-    const filters = { type: null, status: null };
-    notifications.forEach(notification => {
-      expect(applyInboxPageFilters(notification, filters)).toEqual(true);
-    });
-  });
-});
-
 describe('#sortComparator', () => {
   it('returns the notifications sorted by newest', () => {
     const sortOrder = 'newest';
diff --git a/spec/factories/notifications.rb b/spec/factories/notifications.rb
index 63bae1119..1c3a8fba5 100644
--- a/spec/factories/notifications.rb
+++ b/spec/factories/notifications.rb
@@ -6,5 +6,15 @@ FactoryBot.define do
     notification_type { 'conversation_assignment' }
     user
     account
+    read_at { nil }
+    snoozed_until { nil }
+  end
+
+  trait :read do
+    read_at { DateTime.now.utc - 3.days }
+  end
+
+  trait :snoozed do
+    snoozed_until { DateTime.now.utc + 3.days }
   end
 end
diff --git a/spec/finders/notification_finder_spec.rb b/spec/finders/notification_finder_spec.rb
index 48a9f2785..962edc297 100644
--- a/spec/finders/notification_finder_spec.rb
+++ b/spec/finders/notification_finder_spec.rb
@@ -1,103 +1,79 @@
 require 'rails_helper'
 
-describe NotificationFinder do
-  subject(:notification_finder) { described_class.new(user, account, params) }
-
+RSpec.describe NotificationFinder do
   let!(:account) { create(:account) }
   let!(:user) { create(:user, account: account) }
+  let(:notification_finder) { described_class.new(user, account, params) }
 
   before do
-    create(:notification, account: account, user: user, updated_at: DateTime.now.utc + 1.day, last_activity_at: DateTime.now.utc + 1.day,
-                          read_at: DateTime.now.utc)
-    create(:notification, account: account, user: user, snoozed_until: DateTime.now.utc + 3.days, updated_at: DateTime.now.utc,
-                          last_activity_at: DateTime.now.utc)
-    create(:notification, account: account, user: user, updated_at: DateTime.now.utc + 2.days, last_activity_at: DateTime.now.utc + 2.days)
-    create(:notification, account: account, user: user, updated_at: DateTime.now.utc + 4.days, last_activity_at: DateTime.now.utc + 4.days,
-                          notification_type: :conversation_creation, read_at: DateTime.now.utc)
-    create(:notification, account: account, user: user, updated_at: DateTime.now.utc + 5.days, last_activity_at: DateTime.now.utc + 5.days,
-                          notification_type: :conversation_mention)
-    create(:notification, account: account, user: user, updated_at: DateTime.now.utc + 6.days, last_activity_at: DateTime.now.utc + 6.days,
-                          notification_type: :participating_conversation_new_message)
+    create(:notification, :snoozed, account: account, user: user)
+    create_list(:notification, 2, :read, account: account, user: user)
+    create_list(:notification, 3, account: account, user: user)
   end
 
-  describe '#perform' do
-    context 'when params are empty' do
+  describe '#notifications' do
+    subject { notification_finder.notifications }
+
+    context 'with default params (empty)' do
       let(:params) { {} }
 
-      it 'returns all the notifications' do
-        result = notification_finder.perform
-        expect(result.length).to be 6
-      end
-
-      it 'orders notifications by last activity at' do
-        result = notification_finder.perform
-        expect(result.first.last_activity_at).to be > result.last.last_activity_at
-      end
-
-      it 'returns unread count' do
-        result = notification_finder.unread_count
-        expect(result).to be 4
-      end
-
-      it 'returns count' do
-        result = notification_finder.count
-        expect(result).to be 6
+      it 'returns all unread and unsnoozed notifications, ordered by last activity' do
+        expect(subject.size).to eq(3)
+        expect(subject).to match_array(subject.sort_by(&:last_activity_at).reverse)
       end
     end
 
-    context 'when snoozed param is passed' do
-      let(:params) { { status: 'snoozed' } }
+    context 'with params including read and snoozed statuses' do
+      let(:params) { { includes: %w[read snoozed] } }
 
-      it 'returns only snoozed notifications' do
-        result = notification_finder.perform
-        expect(result.length).to be 1
-      end
-
-      it 'returns unread count' do
-        result = notification_finder.unread_count
-        expect(result).to be 1
-      end
-
-      it 'returns count' do
-        result = notification_finder.count
-        expect(result).to be 1
+      it 'returns all notifications, including read and snoozed' do
+        expect(subject.size).to eq(6)
       end
     end
 
-    context 'when type read param is passed' do
-      let(:params) { { type: 'read' } }
+    context 'with params including only read status' do
+      let(:params) { { includes: ['read'] } }
 
-      it 'returns only read notifications' do
-        result = notification_finder.perform
-        expect(result.length).to be 2
-      end
-
-      it 'returns count' do
-        result = notification_finder.count
-        expect(result).to be 2
+      it 'returns all notifications expect the snoozed' do
+        expect(subject.size).to eq(5)
       end
     end
 
-    context 'when type read and snoozed param is passed' do
-      let(:params) { { type: 'read', status: 'snoozed' } }
+    context 'with params including only snoozed status' do
+      let(:params) { { includes: ['snoozed'] } }
 
-      it 'returns only read notifications' do
-        result = notification_finder.perform
-        expect(result.length).to be 0
-      end
-
-      it 'returns count' do
-        result = notification_finder.count
-        expect(result).to be 0
+      it 'rreturns all notifications only expect the read' do
+        expect(subject.size).to eq(4)
       end
     end
 
-    context 'when sort order is passed' do
+    context 'with ascending sort order' do
       let(:params) { { sort_order: :asc } }
 
-      it 'returns notifications in ascending order' do
-        result = notification_finder.perform
-        expect(result.first.last_activity_at).to be < result.last.last_activity_at
+      it 'returns notifications in ascending order by last activity' do
+        expect(subject.first.last_activity_at).to be < subject.last.last_activity_at
+      end
+    end
+  end
+
+  describe 'counts' do
+    subject { notification_finder }
+
+    context 'without specific filters' do
+      let(:params) { {} }
+
+      it 'correctly reports unread and total counts' do
+        expect(subject.unread_count).to eq(3)
+        expect(subject.count).to eq(3)
+      end
+    end
+
+    context 'with filters applied' do
+      let(:params) { { includes: %w[read snoozed] } }
+
+      it 'adjusts counts based on included statuses' do
+        expect(subject.unread_count).to eq(4)
+        expect(subject.count).to eq(6)
       end
     end
   end

From 978a8a4cb20745c620294fc5bd1b0823defff0b0 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Mon, 19 Feb 2024 15:43:35 +0530
Subject: [PATCH 11/96] fix: `support_email` and `inbound_email_domain`
 returning empty string (#8963)

chore: Fix for inbound email domain being nil
---
 app/models/account.rb       |  5 ++--
 spec/models/account_spec.rb | 50 +++++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/app/models/account.rb b/app/models/account.rb
index a24aec775..419ccc471 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -111,11 +111,12 @@ class Account < ApplicationRecord
   end
 
   def inbound_email_domain
-    domain || GlobalConfig.get('MAILER_INBOUND_EMAIL_DOMAIN')['MAILER_INBOUND_EMAIL_DOMAIN'] || ENV.fetch('MAILER_INBOUND_EMAIL_DOMAIN', false)
+    domain.presence || GlobalConfig.get('MAILER_INBOUND_EMAIL_DOMAIN')['MAILER_INBOUND_EMAIL_DOMAIN'] || ENV.fetch('MAILER_INBOUND_EMAIL_DOMAIN',
+                                                                                                                   false)
   end
 
   def support_email
-    super || ENV.fetch('MAILER_SENDER_EMAIL') { GlobalConfig.get('MAILER_SUPPORT_EMAIL')['MAILER_SUPPORT_EMAIL'] }
+    super.presence || ENV.fetch('MAILER_SENDER_EMAIL') { GlobalConfig.get('MAILER_SUPPORT_EMAIL')['MAILER_SUPPORT_EMAIL'] }
   end
 
   def usage_limits
diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index 8f9ba7d2c..aa0556492 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -47,6 +47,56 @@ RSpec.describe Account do
     end
   end
 
+  describe 'inbound_email_domain' do
+    let(:account) { create(:account) }
+
+    it 'returns the domain from inbox if inbox value is present' do
+      account.update(domain: 'test.com')
+      with_modified_env MAILER_INBOUND_EMAIL_DOMAIN: 'test2.com' do
+        expect(account.inbound_email_domain).to eq('test.com')
+      end
+    end
+
+    it 'returns the domain from ENV if inbox value is nil' do
+      account.update(domain: nil)
+      with_modified_env MAILER_INBOUND_EMAIL_DOMAIN: 'test.com' do
+        expect(account.inbound_email_domain).to eq('test.com')
+      end
+    end
+
+    it 'returns the domain from ENV if inbox value is empty string' do
+      account.update(domain: '')
+      with_modified_env MAILER_INBOUND_EMAIL_DOMAIN: 'test.com' do
+        expect(account.inbound_email_domain).to eq('test.com')
+      end
+    end
+  end
+
+  describe 'support_email' do
+    let(:account) { create(:account) }
+
+    it 'returns the support email from inbox if inbox value is present' do
+      account.update(support_email: 'support@chatwoot.com')
+      with_modified_env MAILER_SENDER_EMAIL: 'hello@chatwoot.com' do
+        expect(account.support_email).to eq('support@chatwoot.com')
+      end
+    end
+
+    it 'returns the support email from ENV if inbox value is nil' do
+      account.update(support_email: nil)
+      with_modified_env MAILER_SENDER_EMAIL: 'hello@chatwoot.com' do
+        expect(account.support_email).to eq('hello@chatwoot.com')
+      end
+    end
+
+    it 'returns the support email from ENV if inbox value is empty string' do
+      account.update(support_email: '')
+      with_modified_env MAILER_SENDER_EMAIL: 'hello@chatwoot.com' do
+        expect(account.support_email).to eq('hello@chatwoot.com')
+      end
+    end
+  end
+
   context 'when after_destroy is called' do
     it 'conv_dpid_seq and camp_dpid_seq_ are deleted' do
       account = create(:account)

From 71ee10c88932276badede8917117a5e610c39124 Mon Sep 17 00:00:00 2001
From: Sojan <sojan@pepalo.com>
Date: Mon, 19 Feb 2024 15:58:21 +0530
Subject: [PATCH 12/96] Bump version to 3.6.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 3ba8851b8..99f2706e9 100644
--- a/config/app.yml
+++ b/config/app.yml
@@ -1,5 +1,5 @@
 shared: &shared
-  version: '3.5.2'
+  version: '3.6.0'
 
 development:
   <<: *shared
diff --git a/package.json b/package.json
index 3213922e8..f7a2f86f7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@chatwoot/chatwoot",
-  "version": "3.5.2",
+  "version": "3.6.0",
   "license": "MIT",
   "scripts": {
     "eslint": "eslint app/**/*.{js,vue}",

From 7320957405c21b1f428e8d36910ed65852c4d64b Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Tue, 20 Feb 2024 15:53:29 +0530
Subject: [PATCH 13/96] chore: Add facebook_api_version to global config
 (#8965)

- Ability to configure facebook_api_version from global config

Co-authored-by: Pranav <pranav@chatwoot.com>
---
 app/controllers/dashboard_controller.rb               | 2 +-
 app/controllers/super_admin/app_configs_controller.rb | 2 +-
 config/installation_config.yml                        | 5 +++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb
index 9e59758ea..0aea9df83 100644
--- a/app/controllers/dashboard_controller.rb
+++ b/app/controllers/dashboard_controller.rb
@@ -55,7 +55,7 @@ class DashboardController < ActionController::Base
       VAPID_PUBLIC_KEY: VapidService.public_key,
       ENABLE_ACCOUNT_SIGNUP: GlobalConfigService.load('ENABLE_ACCOUNT_SIGNUP', 'false'),
       FB_APP_ID: GlobalConfigService.load('FB_APP_ID', ''),
-      FACEBOOK_API_VERSION: 'v14.0',
+      FACEBOOK_API_VERSION: GlobalConfigService.load('FACEBOOK_API_VERSION', 'v17.0'),
       IS_ENTERPRISE: ChatwootApp.enterprise?,
       AZURE_APP_ID: ENV.fetch('AZURE_APP_ID', ''),
       GIT_SHA: GIT_HASH
diff --git a/app/controllers/super_admin/app_configs_controller.rb b/app/controllers/super_admin/app_configs_controller.rb
index a31d01675..6223f7174 100644
--- a/app/controllers/super_admin/app_configs_controller.rb
+++ b/app/controllers/super_admin/app_configs_controller.rb
@@ -34,7 +34,7 @@ class SuperAdmin::AppConfigsController < SuperAdmin::ApplicationController
   def allowed_configs
     @allowed_configs = case @config
                        when 'facebook'
-                         %w[FB_APP_ID FB_VERIFY_TOKEN FB_APP_SECRET IG_VERIFY_TOKEN ENABLE_MESSENGER_CHANNEL_HUMAN_AGENT]
+                         %w[FB_APP_ID FB_VERIFY_TOKEN FB_APP_SECRET IG_VERIFY_TOKEN FACEBOOK_API_VERSION ENABLE_MESSENGER_CHANNEL_HUMAN_AGENT]
                        when 'email'
                          ['MAILER_INBOUND_EMAIL_DOMAIN']
                        else
diff --git a/config/installation_config.yml b/config/installation_config.yml
index 60eae3bc2..9db527832 100644
--- a/config/installation_config.yml
+++ b/config/installation_config.yml
@@ -110,6 +110,11 @@
   display_title: 'Instagram Verify Token'
   description: 'The verify token used for Instagram Webhook'
   locked: false
+- name: FACEBOOK_API_VERSION
+  display_title: 'Facebook API Version'
+  description: 'Configure this if you want to use a different Facebook API version. Make sure its prefixed with `v`'
+  value: 'v17.0'
+  locked: false
 - name: ENABLE_MESSENGER_CHANNEL_HUMAN_AGENT
   display_title: 'Enable human agent'
   value: false

From 721a2f50525eeb116db4f3b8b96ac3588fb0ac56 Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Date: Tue, 20 Feb 2024 03:18:51 -0800
Subject: [PATCH 14/96] feat: API changes to support multi step user signup
 (#8933)

-API Changes to support the new onboarding flow

Co-authored-by: Sojan <sojan@pepalo.com>
---
 .../api/v1/accounts/agents_controller.rb      |  5 +++
 app/controllers/api/v1/accounts_controller.rb |  1 +
 app/controllers/api/v2/accounts_controller.rb | 13 +++++++
 .../api/v1/models/_account.json.jbuilder      |  5 +++
 .../enterprise/api/v2/accounts_controller.rb  | 35 +++++++++++--------
 .../api/v1/accounts_controller_spec.rb        | 19 ++++++++++
 .../api/v2/accounts_controller_spec.rb        | 14 ++++++++
 .../api/v1/accounts/agents_controller_spec.rb | 10 ++++++
 .../api/v2/accounts_controller_spec.rb        | 16 +++++++++
 9 files changed, 103 insertions(+), 15 deletions(-)

diff --git a/app/controllers/api/v1/accounts/agents_controller.rb b/app/controllers/api/v1/accounts/agents_controller.rb
index 221c96b85..eff9975f7 100644
--- a/app/controllers/api/v1/accounts/agents_controller.rb
+++ b/app/controllers/api/v1/accounts/agents_controller.rb
@@ -49,6 +49,11 @@ class Api::V1::Accounts::AgentsController < Api::V1::Accounts::BaseController
         Rails.logger.info "[Agent#bulk_create] ignoring email #{email}, errors: #{e.record.errors}"
       end
     end
+
+    # This endpoint is used to bulk create agents during onboarding
+    # onboarding_step key in present in Current account custom attributes, since this is a one time operation
+    Current.account.custom_attributes.delete('onboarding_step')
+    Current.account.save!
     head :ok
   end
 
diff --git a/app/controllers/api/v1/accounts_controller.rb b/app/controllers/api/v1/accounts_controller.rb
index 481594ee4..c0dac6d9e 100644
--- a/app/controllers/api/v1/accounts_controller.rb
+++ b/app/controllers/api/v1/accounts_controller.rb
@@ -46,6 +46,7 @@ class Api::V1::AccountsController < Api::BaseController
   def update
     @account.assign_attributes(account_params.slice(:name, :locale, :domain, :support_email, :auto_resolve_duration))
     @account.custom_attributes.merge!(custom_attributes_params)
+    @account.custom_attributes['onboarding_step'] = 'invite_team' if @account.custom_attributes['onboarding_step'] == 'account_update'
     @account.save!
   end
 
diff --git a/app/controllers/api/v2/accounts_controller.rb b/app/controllers/api/v2/accounts_controller.rb
index ea19727ad..45faca3d0 100644
--- a/app/controllers/api/v2/accounts_controller.rb
+++ b/app/controllers/api/v2/accounts_controller.rb
@@ -22,6 +22,7 @@ class Api::V2::AccountsController < Api::BaseController
     ).perform
 
     fetch_account_and_user_info
+    update_account_info if @account.present?
 
     if @user
       send_auth_headers(@user)
@@ -33,6 +34,18 @@ class Api::V2::AccountsController < Api::BaseController
 
   private
 
+  def account_attributes
+    {
+      custom_attributes: @account.custom_attributes.merge({ 'onboarding_step' => 'profile_update' })
+    }
+  end
+
+  def update_account_info
+    @account.update!(
+      account_attributes
+    )
+  end
+
   def fetch_account_and_user_info; end
 
   def fetch_account
diff --git a/app/views/api/v1/models/_account.json.jbuilder b/app/views/api/v1/models/_account.json.jbuilder
index 9f89a5510..5e9d9048a 100644
--- a/app/views/api/v1/models/_account.json.jbuilder
+++ b/app/views/api/v1/models/_account.json.jbuilder
@@ -6,6 +6,11 @@ if resource.custom_attributes.present?
     json.subscribed_quantity resource.custom_attributes['subscribed_quantity']
     json.subscription_status resource.custom_attributes['subscription_status']
     json.subscription_ends_on resource.custom_attributes['subscription_ends_on']
+    json.industry resource.custom_attributes['industry'] if resource.custom_attributes['industry'].present?
+    json.company_size resource.custom_attributes['company_size'] if resource.custom_attributes['company_size'].present?
+    json.timezone resource.custom_attributes['timezone'] if resource.custom_attributes['timezone'].present?
+    json.logo resource.custom_attributes['logo'] if resource.custom_attributes['logo'].present?
+    json.onboarding_step resource.custom_attributes['onboarding_step'] if resource.custom_attributes['onboarding_step'].present?
   end
 end
 json.domain @account.domain
diff --git a/enterprise/app/controllers/enterprise/api/v2/accounts_controller.rb b/enterprise/app/controllers/enterprise/api/v2/accounts_controller.rb
index d0d76c1ae..3edefbb5f 100644
--- a/enterprise/app/controllers/enterprise/api/v2/accounts_controller.rb
+++ b/enterprise/app/controllers/enterprise/api/v2/accounts_controller.rb
@@ -2,12 +2,11 @@ module Enterprise::Api::V2::AccountsController
   private
 
   def fetch_account_and_user_info
-    data = fetch_from_clearbit
+    @data = fetch_from_clearbit
 
-    return if data.blank?
+    return if @data.blank?
 
-    update_user_info(data)
-    update_account_info(data)
+    update_user_info
   end
 
   def fetch_from_clearbit
@@ -17,19 +16,25 @@ module Enterprise::Api::V2::AccountsController
     nil
   end
 
-  def update_user_info(data)
-    @user.update!(name: data[:name])
+  def update_user_info
+    @user.update!(name: @data[:name]) if @data[:name].present?
   end
 
-  def update_account_info(data)
-    @account.update!(
-      name: data[:company_name],
-      custom_attributes: @account.custom_attributes.merge(
-        'industry' => data[:industry],
-        'company_size' => data[:company_size],
-        'timezone' => data[:timezone],
-        'logo' => data[:logo]
-      )
+  def data_from_clearbit
+    return {} if @data.blank?
+
+    { name: @data[:company_name],
+      custom_attributes: {
+        'industry' => @data[:industry],
+        'company_size' => @data[:company_size],
+        'timezone' => @data[:timezone],
+        'logo' => @data[:logo]
+      } }
+  end
+
+  def account_attributes
+    super.deep_merge(
+      data_from_clearbit
     )
   end
 end
diff --git a/spec/controllers/api/v1/accounts_controller_spec.rb b/spec/controllers/api/v1/accounts_controller_spec.rb
index 95fa2ae7f..bd604f650 100644
--- a/spec/controllers/api/v1/accounts_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts_controller_spec.rb
@@ -213,6 +213,25 @@ RSpec.describe 'Accounts API', type: :request do
         end
       end
 
+      it 'updates onboarding step to invite_team if onboarding step is present in account custom attributes' do
+        account.update(custom_attributes: { onboarding_step: 'account_update' })
+        put "/api/v1/accounts/#{account.id}",
+            params: params,
+            headers: admin.create_new_auth_token,
+            as: :json
+
+        expect(account.reload.custom_attributes['onboarding_step']).to eq('invite_team')
+      end
+
+      it 'will not update onboarding step if onboarding step is not present in account custom attributes' do
+        put "/api/v1/accounts/#{account.id}",
+            params: params,
+            headers: admin.create_new_auth_token,
+            as: :json
+
+        expect(account.reload.custom_attributes['onboarding_step']).to be_nil
+      end
+
       it 'Throws error 422' do
         params[:name] = 'test' * 999
 
diff --git a/spec/controllers/api/v2/accounts_controller_spec.rb b/spec/controllers/api/v2/accounts_controller_spec.rb
index 82693ed2b..182ebadac 100644
--- a/spec/controllers/api/v2/accounts_controller_spec.rb
+++ b/spec/controllers/api/v2/accounts_controller_spec.rb
@@ -30,6 +30,20 @@ RSpec.describe 'Accounts API', type: :request do
         end
       end
 
+      it 'updates the onboarding step in custom attributes' do
+        with_modified_env ENABLE_ACCOUNT_SIGNUP: 'true' do
+          allow(account_builder).to receive(:perform).and_return([user, account])
+
+          params = { email: email, user: nil, locale: nil, password: 'Password1!' }
+
+          post api_v2_accounts_url,
+               params: params,
+               as: :json
+
+          expect(account.reload.custom_attributes['onboarding_step']).to eq('profile_update')
+        end
+      end
+
       it 'calls ChatwootCaptcha' do
         with_modified_env ENABLE_ACCOUNT_SIGNUP: 'true' do
           captcha = double
diff --git a/spec/enterprise/controllers/api/v1/accounts/agents_controller_spec.rb b/spec/enterprise/controllers/api/v1/accounts/agents_controller_spec.rb
index 97e76a6cd..e5a8a5b7d 100644
--- a/spec/enterprise/controllers/api/v1/accounts/agents_controller_spec.rb
+++ b/spec/enterprise/controllers/api/v1/accounts/agents_controller_spec.rb
@@ -41,5 +41,15 @@ RSpec.describe 'Agents API', type: :request do
         expect(response.body).to include('Account limit exceeded. Please purchase more licenses')
       end
     end
+
+    context 'when onboarding step is present in account custom attributes' do
+      it 'removes onboarding step from account custom attributes' do
+        account.update(custom_attributes: { onboarding_step: 'completed' })
+
+        post "/api/v1/accounts/#{account.id}/agents/bulk_create", params: bulk_create_params, headers: admin.create_new_auth_token
+
+        expect(account.reload.custom_attributes).not_to include('onboarding_step')
+      end
+    end
   end
 end
diff --git a/spec/enterprise/controllers/enterprise/api/v2/accounts_controller_spec.rb b/spec/enterprise/controllers/enterprise/api/v2/accounts_controller_spec.rb
index 8ad75b42f..c74a2bcb5 100644
--- a/spec/enterprise/controllers/enterprise/api/v2/accounts_controller_spec.rb
+++ b/spec/enterprise/controllers/enterprise/api/v2/accounts_controller_spec.rb
@@ -51,6 +51,22 @@ RSpec.describe Enterprise::Api::V2::AccountsController, type: :request do
       end
     end
 
+    it 'updates the onboarding step in custom attributes' do
+      with_modified_env ENABLE_ACCOUNT_SIGNUP: 'true' do
+        allow(account_builder).to receive(:perform).and_return([user, account])
+
+        params = { email: email, user: nil, locale: nil, password: 'Password1!' }
+
+        post api_v2_accounts_url,
+             params: params,
+             as: :json
+
+        custom_attributes = account.custom_attributes
+
+        expect(custom_attributes['onboarding_step']).to eq('profile_update')
+      end
+    end
+
     it 'handles errors when fetching data from clearbit' do
       with_modified_env ENABLE_ACCOUNT_SIGNUP: 'true' do
         allow(account_builder).to receive(:perform).and_return([user, account])

From 5d9fb55370ccd9ea01043cbfe0e74f09569602e0 Mon Sep 17 00:00:00 2001
From: Liam <43280985+LiamAshdown@users.noreply.github.com>
Date: Tue, 20 Feb 2024 11:41:03 +0000
Subject: [PATCH 15/96] feat: Export contact improvements (#8895)

This pull request enhances the export contacts feature by adding a confirmation step before exporting. Previously, clicking the export button would trigger the export action without confirmation.

Additionally, it ensures that only the intended recipient receives the export email, addressing the previous behaviour where all administrators received it.

Fixes: #8504

Co-authored-by: Sojan Jose <sojan@pepalo.com>
---
 .../api/v1/accounts/contacts_controller.rb       |  2 +-
 .../dashboard/i18n/locale/en/contact.json        |  8 +++++++-
 .../dashboard/contacts/components/Header.vue     | 16 ++++++++++++++--
 app/jobs/account/contacts_export_job.rb          |  4 ++--
 .../channel_notifications_mailer.rb              |  5 +++--
 .../api/v1/accounts/contacts_controller_spec.rb  |  4 ++--
 spec/jobs/account/contacts_export_job_spec.rb    |  6 +++---
 .../channel_notifications_mailer_spec.rb         |  5 ++---
 8 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/app/controllers/api/v1/accounts/contacts_controller.rb b/app/controllers/api/v1/accounts/contacts_controller.rb
index f424f3b66..98683ea25 100644
--- a/app/controllers/api/v1/accounts/contacts_controller.rb
+++ b/app/controllers/api/v1/accounts/contacts_controller.rb
@@ -46,7 +46,7 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
 
   def export
     column_names = params['column_names']
-    Account::ContactsExportJob.perform_later(Current.account.id, column_names)
+    Account::ContactsExportJob.perform_later(Current.account.id, column_names, Current.user.email)
     head :ok, message: I18n.t('errors.contacts.export.success')
   end
 
diff --git a/app/javascript/dashboard/i18n/locale/en/contact.json b/app/javascript/dashboard/i18n/locale/en/contact.json
index 594e34c4f..cae908016 100644
--- a/app/javascript/dashboard/i18n/locale/en/contact.json
+++ b/app/javascript/dashboard/i18n/locale/en/contact.json
@@ -79,7 +79,13 @@
     "TITLE": "Export Contacts",
     "DESC": "Export contacts to a CSV file.",
     "SUCCESS_MESSAGE": "Export is in progress. You will be notified on email when the export file is ready to download.",
-    "ERROR_MESSAGE": "There was an error, please try again"
+    "ERROR_MESSAGE": "There was an error, please try again",
+    "CONFIRM": {
+      "TITLE": "Export Contacts",
+      "MESSAGE": "Are you sure you want to export all contacts?",
+      "YES": "Yes, Export",
+      "NO": "No, Cancel"
+    }
   },
   "DELETE_NOTE": {
     "CONFIRM": {
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/Header.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/Header.vue
index 4df4017b2..1b4fd90e0 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/Header.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/Header.vue
@@ -113,6 +113,13 @@
         </woot-button>
       </div>
     </div>
+    <woot-confirm-modal
+      ref="confirmExportContactsDialog"
+      :title="$t('EXPORT_CONTACTS.CONFIRM.TITLE')"
+      :description="$t('EXPORT_CONTACTS.CONFIRM.MESSAGE')"
+      :confirm-label="$t('EXPORT_CONTACTS.CONFIRM.YES')"
+      :cancel-label="$t('EXPORT_CONTACTS.CONFIRM.NO')"
+    />
   </header>
 </template>
 
@@ -175,8 +182,13 @@ export default {
     toggleImport() {
       this.$emit('on-toggle-import');
     },
-    submitExport() {
-      this.$emit('on-export-submit');
+    async submitExport() {
+      const ok =
+        await this.$refs.confirmExportContactsDialog.showConfirmation();
+
+      if (ok) {
+        this.$emit('on-export-submit');
+      }
     },
     submitSearch() {
       this.$emit('on-search-submit');
diff --git a/app/jobs/account/contacts_export_job.rb b/app/jobs/account/contacts_export_job.rb
index 0ae8b3892..b8e9dbc96 100644
--- a/app/jobs/account/contacts_export_job.rb
+++ b/app/jobs/account/contacts_export_job.rb
@@ -1,13 +1,13 @@
 class Account::ContactsExportJob < ApplicationJob
   queue_as :low
 
-  def perform(account_id, column_names)
+  def perform(account_id, column_names, email_to)
     account = Account.find(account_id)
     headers = valid_headers(column_names)
     generate_csv(account, headers)
     file_url = account_contact_export_url(account)
 
-    AdministratorNotifications::ChannelNotificationsMailer.with(account: account).contact_export_complete(file_url)&.deliver_later
+    AdministratorNotifications::ChannelNotificationsMailer.with(account: account).contact_export_complete(file_url, email_to)&.deliver_later
   end
 
   def generate_csv(account, headers)
diff --git a/app/mailers/administrator_notifications/channel_notifications_mailer.rb b/app/mailers/administrator_notifications/channel_notifications_mailer.rb
index 8c52a9bd3..6c0f7cee2 100644
--- a/app/mailers/administrator_notifications/channel_notifications_mailer.rb
+++ b/app/mailers/administrator_notifications/channel_notifications_mailer.rb
@@ -60,12 +60,13 @@ class AdministratorNotifications::ChannelNotificationsMailer < ApplicationMailer
     send_mail_with_liquid(to: admin_emails, subject: subject) and return
   end
 
-  def contact_export_complete(file_url)
+  def contact_export_complete(file_url, email_to)
     return unless smtp_config_set_or_development?
 
     @action_url = file_url
     subject = "Your contact's export file is available to download."
-    send_mail_with_liquid(to: admin_emails, subject: subject) and return
+
+    send_mail_with_liquid(to: email_to, subject: subject) and return
   end
 
   private
diff --git a/spec/controllers/api/v1/accounts/contacts_controller_spec.rb b/spec/controllers/api/v1/accounts/contacts_controller_spec.rb
index e5e298747..21511310b 100644
--- a/spec/controllers/api/v1/accounts/contacts_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/contacts_controller_spec.rb
@@ -197,7 +197,7 @@ RSpec.describe 'Contacts API', type: :request do
       let(:admin) { create(:user, account: account, role: :administrator) }
 
       it 'enqueues a contact export job' do
-        expect(Account::ContactsExportJob).to receive(:perform_later).with(account.id, nil).once
+        expect(Account::ContactsExportJob).to receive(:perform_later).with(account.id, nil, admin.email).once
 
         get "/api/v1/accounts/#{account.id}/contacts/export",
             headers: admin.create_new_auth_token,
@@ -207,7 +207,7 @@ RSpec.describe 'Contacts API', type: :request do
       end
 
       it 'enqueues a contact export job with sent_columns' do
-        expect(Account::ContactsExportJob).to receive(:perform_later).with(account.id, %w[phone_number email]).once
+        expect(Account::ContactsExportJob).to receive(:perform_later).with(account.id, %w[phone_number email], admin.email).once
 
         get "/api/v1/accounts/#{account.id}/contacts/export",
             headers: admin.create_new_auth_token,
diff --git a/spec/jobs/account/contacts_export_job_spec.rb b/spec/jobs/account/contacts_export_job_spec.rb
index e597ff637..b395967b4 100644
--- a/spec/jobs/account/contacts_export_job_spec.rb
+++ b/spec/jobs/account/contacts_export_job_spec.rb
@@ -24,17 +24,17 @@ RSpec.describe Account::ContactsExportJob do
       allow(AdministratorNotifications::ChannelNotificationsMailer).to receive(:with).with(account: account).and_return(mailer)
       allow(mailer).to receive(:contact_export_complete)
 
-      described_class.perform_now(account.id, [])
+      described_class.perform_now(account.id, [], 'test@test.com')
 
       file_url = Rails.application.routes.url_helpers.rails_blob_url(account.contacts_export)
 
       expect(account.contacts_export).to be_present
       expect(file_url).to be_present
-      expect(mailer).to have_received(:contact_export_complete).with(file_url)
+      expect(mailer).to have_received(:contact_export_complete).with(file_url, 'test@test.com')
     end
 
     it 'generates valid data export file' do
-      described_class.perform_now(account.id, [])
+      described_class.perform_now(account.id, [], 'test@test.com')
 
       csv_data = CSV.parse(account.contacts_export.download, headers: true)
       emails = csv_data.pluck('email')
diff --git a/spec/mailers/administrator_notifications/channel_notifications_mailer_spec.rb b/spec/mailers/administrator_notifications/channel_notifications_mailer_spec.rb
index f67b8300c..944475fb2 100644
--- a/spec/mailers/administrator_notifications/channel_notifications_mailer_spec.rb
+++ b/spec/mailers/administrator_notifications/channel_notifications_mailer_spec.rb
@@ -10,7 +10,6 @@ RSpec.describe AdministratorNotifications::ChannelNotificationsMailer do
   before do
     allow(described_class).to receive(:new).and_return(class_instance)
     allow(class_instance).to receive(:smtp_config_set_or_development?).and_return(true)
-    Account::ContactsExportJob.perform_now(account.id, [])
   end
 
   describe 'slack_disconnect' do
@@ -92,8 +91,8 @@ RSpec.describe AdministratorNotifications::ChannelNotificationsMailer do
   end
 
   describe 'contact_export_complete' do
-    let!(:file_url) { Rails.application.routes.url_helpers.rails_blob_url(account.contacts_export) }
-    let(:mail) { described_class.with(account: account).contact_export_complete(file_url).deliver_now }
+    let!(:file_url) { 'http://test.com/test' }
+    let(:mail) { described_class.with(account: account).contact_export_complete(file_url, administrator.email).deliver_now }
 
     it 'renders the subject' do
       expect(mail.subject).to eq("Your contact's export file is available to download.")

From c5c08451517f86b3b95b5f836e80b1597ef23244 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Tue, 20 Feb 2024 17:17:25 +0530
Subject: [PATCH 16/96] feat: Add labels, status and priority in notification
 `push_event_data` (#8972)

---
 app/models/notification.rb                             | 10 +---------
 .../api/v1/accounts/notifications_controller_spec.rb   |  1 +
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/app/models/notification.rb b/app/models/notification.rb
index f8c6e3d5b..cd3d57627 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -68,20 +68,12 @@ class Notification < ApplicationRecord
 
     }
     if primary_actor.present?
-      payload[:primary_actor] = primary_actor_data
+      payload[:primary_actor] = primary_actor&.push_event_data
       payload[:push_message_title] = push_message_title
     end
     payload
   end
 
-  def primary_actor_data
-    {
-      id: primary_actor.push_event_data[:id],
-      meta: primary_actor.push_event_data[:meta],
-      inbox_id: primary_actor.push_event_data[:inbox_id]
-    }
-  end
-
   def fcm_push_data
     {
       id: id,
diff --git a/spec/controllers/api/v1/accounts/notifications_controller_spec.rb b/spec/controllers/api/v1/accounts/notifications_controller_spec.rb
index 3dcb47f71..4605e0fda 100644
--- a/spec/controllers/api/v1/accounts/notifications_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/notifications_controller_spec.rb
@@ -29,6 +29,7 @@ RSpec.describe 'Notifications API', type: :request do
         expect(response_json['data']['meta']['count']).to eq 2
         # notification appear in descending order
         expect(response_json['data']['payload'].first['id']).to eq notification2.id
+        expect(response_json['data']['payload'].first['primary_actor']).not_to be_nil
       end
     end
   end

From e6cf8c39b7a3d4482c2a96dcc51995e910800255 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Tue, 20 Feb 2024 18:55:39 +0530
Subject: [PATCH 17/96] feat: Update `last_snoozed_at` after the un-snooze
 notification (#8943)

---
 .../v1/accounts/notifications_controller.rb   |  3 ++-
 .../reopen_snoozed_notifications_job.rb       | 23 +++++++++++++++----
 app/models/notification.rb                    |  1 +
 .../notifications/index.json.jbuilder         |  1 +
 .../accounts/notifications_controller_spec.rb |  1 +
 .../reopen_snoozed_notifications_job_spec.rb  |  3 +++
 6 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/app/controllers/api/v1/accounts/notifications_controller.rb b/app/controllers/api/v1/accounts/notifications_controller.rb
index 3ac0568e3..52035ce64 100644
--- a/app/controllers/api/v1/accounts/notifications_controller.rb
+++ b/app/controllers/api/v1/accounts/notifications_controller.rb
@@ -54,7 +54,8 @@ class Api::V1::Accounts::NotificationsController < Api::V1::Accounts::BaseContro
   end
 
   def snooze
-    @notification.update(snoozed_until: parse_date_time(params[:snoozed_until].to_s)) if params[:snoozed_until]
+    updated_meta = (@notification.meta || {}).merge('last_snoozed_at' => nil)
+    @notification.update(snoozed_until: parse_date_time(params[:snoozed_until].to_s), meta: updated_meta) if params[:snoozed_until]
     render json: @notification
   end
 
diff --git a/app/jobs/notification/reopen_snoozed_notifications_job.rb b/app/jobs/notification/reopen_snoozed_notifications_job.rb
index 05235b62b..91ed5ee61 100644
--- a/app/jobs/notification/reopen_snoozed_notifications_job.rb
+++ b/app/jobs/notification/reopen_snoozed_notifications_job.rb
@@ -2,9 +2,24 @@ class Notification::ReopenSnoozedNotificationsJob < ApplicationJob
   queue_as :low
 
   def perform
-    # rubocop:disable Rails/SkipsModelValidations
-    Notification.where(snoozed_until: 3.days.ago..Time.current)
-                .update_all(snoozed_until: nil, updated_at: Time.current, last_activity_at: Time.current, read_at: nil)
-    # rubocop:enable Rails/SkipsModelValidations
+    Notification.where(snoozed_until: 3.days.ago..Time.current).find_in_batches(batch_size: 100) do |notifications_batch|
+      notifications_batch.each do |notification|
+        update_notification(notification)
+      end
+    end
+  end
+
+  private
+
+  def update_notification(notification)
+    updated_meta = (notification.meta || {}).merge('last_snoozed_at' => notification.snoozed_until)
+
+    notification.update!(
+      snoozed_until: nil,
+      updated_at: Time.current,
+      last_activity_at: Time.current,
+      meta: updated_meta,
+      read_at: nil
+    )
   end
 end
diff --git a/app/models/notification.rb b/app/models/notification.rb
index cd3d57627..113c6cf3e 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -64,6 +64,7 @@ class Notification < ApplicationRecord
       created_at: created_at.to_i,
       last_activity_at: last_activity_at.to_i,
       snoozed_until: snoozed_until,
+      meta: meta,
       account_id: account_id
 
     }
diff --git a/app/views/api/v1/accounts/notifications/index.json.jbuilder b/app/views/api/v1/accounts/notifications/index.json.jbuilder
index ae86372c9..4a408dfca 100644
--- a/app/views/api/v1/accounts/notifications/index.json.jbuilder
+++ b/app/views/api/v1/accounts/notifications/index.json.jbuilder
@@ -21,6 +21,7 @@ json.data do
       json.created_at notification.created_at.to_i
       json.last_activity_at notification.last_activity_at.to_i
       json.snoozed_until notification.snoozed_until
+      json.meta notification.meta
     end
   end
 end
diff --git a/spec/controllers/api/v1/accounts/notifications_controller_spec.rb b/spec/controllers/api/v1/accounts/notifications_controller_spec.rb
index 4605e0fda..9b16e48fb 100644
--- a/spec/controllers/api/v1/accounts/notifications_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/notifications_controller_spec.rb
@@ -179,6 +179,7 @@ RSpec.describe 'Notifications API', type: :request do
 
         expect(response).to have_http_status(:success)
         expect(notification.reload.snoozed_until).not_to eq('')
+        expect(notification.reload.meta['last_snoozed_at']).to be_nil
       end
     end
   end
diff --git a/spec/jobs/notification/reopen_snoozed_notifications_job_spec.rb b/spec/jobs/notification/reopen_snoozed_notifications_job_spec.rb
index 024c3d0d6..94697dcd6 100644
--- a/spec/jobs/notification/reopen_snoozed_notifications_job_spec.rb
+++ b/spec/jobs/notification/reopen_snoozed_notifications_job_spec.rb
@@ -14,10 +14,13 @@ RSpec.describe Notification::ReopenSnoozedNotificationsJob do
     it 'reopens snoozed notifications whose snooze until has passed' do
       described_class.perform_now
 
+      snoozed_until = snoozed_till_5_minutes_ago.reload.snoozed_until
+
       expect(snoozed_till_5_minutes_ago.reload.snoozed_until).to be_nil
       expect(snoozed_till_tomorrow.reload.snoozed_until.to_date).to eq 1.day.from_now.to_date
       expect(snoozed_indefinitely.reload.snoozed_until).to be_nil
       expect(snoozed_indefinitely.reload.read_at).to be_nil
+      expect(snoozed_until).to eq(snoozed_till_5_minutes_ago.reload.meta['snoozed_until'])
     end
   end
 end

From f92cea144cb7bf156593dfbe07f855a867223cef Mon Sep 17 00:00:00 2001
From: Vishnu Narayanan <iamwishnu@gmail.com>
Date: Tue, 20 Feb 2024 21:54:37 +0530
Subject: [PATCH 18/96] feat(perf): sla-9 improve perf of
 TriggerSlasForAccountsJob (#8953)

* feat: improve perf of TriggerSlasForAccountsJob
---
 .../jobs/sla/trigger_slas_for_accounts_job.rb   |  2 +-
 .../sla/trigger_slas_for_accounts_job_spec.rb   | 17 +++++++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/enterprise/app/jobs/sla/trigger_slas_for_accounts_job.rb b/enterprise/app/jobs/sla/trigger_slas_for_accounts_job.rb
index 212c44d94..a2a142430 100644
--- a/enterprise/app/jobs/sla/trigger_slas_for_accounts_job.rb
+++ b/enterprise/app/jobs/sla/trigger_slas_for_accounts_job.rb
@@ -2,7 +2,7 @@ class Sla::TriggerSlasForAccountsJob < ApplicationJob
   queue_as :scheduled_jobs
 
   def perform
-    Account.find_each do |account|
+    Account.joins(:sla_policies).distinct.find_each do |account|
       Rails.logger.info "Enqueuing ProcessAccountAppliedSlasJob for account #{account.id}"
       Sla::ProcessAccountAppliedSlasJob.perform_later(account)
     end
diff --git a/spec/enterprise/jobs/sla/trigger_slas_for_accounts_job_spec.rb b/spec/enterprise/jobs/sla/trigger_slas_for_accounts_job_spec.rb
index 95650748a..d02e543ba 100644
--- a/spec/enterprise/jobs/sla/trigger_slas_for_accounts_job_spec.rb
+++ b/spec/enterprise/jobs/sla/trigger_slas_for_accounts_job_spec.rb
@@ -1,16 +1,25 @@
 require 'rails_helper'
-
 RSpec.describe Sla::TriggerSlasForAccountsJob do
   context 'when perform is called' do
-    let(:account) { create(:account) }
+    let(:account_with_sla) { create(:account) }
+    let(:account_without_sla) { create(:account) }
+
+    before do
+      create(:sla_policy, account: account_with_sla)
+    end
 
     it 'enqueues the job' do
       expect { described_class.perform_later }.to have_enqueued_job(described_class)
         .on_queue('scheduled_jobs')
     end
 
-    it 'calls the ProcessAccountAppliedSlasJob' do
-      expect(Sla::ProcessAccountAppliedSlasJob).to receive(:perform_later).with(account).and_call_original
+    it 'calls the ProcessAccountAppliedSlasJob for accounts with SLA' do
+      expect(Sla::ProcessAccountAppliedSlasJob).to receive(:perform_later).with(account_with_sla).and_call_original
+      described_class.perform_now
+    end
+
+    it 'does not call the ProcessAccountAppliedSlasJob for accounts without SLA' do
+      expect(Sla::ProcessAccountAppliedSlasJob).not_to receive(:perform_later).with(account_without_sla)
       described_class.perform_now
     end
   end

From 23230e0143e70dc12c62e39af0bd78d874f998cf Mon Sep 17 00:00:00 2001
From: Vishnu Narayanan <iamwishnu@gmail.com>
Date: Tue, 20 Feb 2024 21:59:49 +0530
Subject: [PATCH 19/96] feat: sla-7 ensure applied_sla uniqueness (#8938)

* feat: refactor fetching sla in action service

* chore: modify spec

* chore: ensure applied_sla uniqueness

* chore: review fixes

* feat: add unique index on applied_sla

* chore: fix spec

* chore: add new specs to improve coverage

* chore: improve spec

* Update spec/enterprise/services/enterprise/action_service_spec.rb

---------

Co-authored-by: Sojan Jose <sojan@pepalo.com>
---
 app/services/action_service.rb                |  1 +
 ...055809_add_unique_index_to_applied_slas.rb |  8 ++++
 db/schema.rb                                  |  3 +-
 enterprise/app/models/applied_sla.rb          |  9 ++--
 .../app/services/enterprise/action_service.rb | 10 ++++-
 .../enterprise/action_service_spec.rb         | 44 +++++++++++++++----
 6 files changed, 61 insertions(+), 14 deletions(-)
 create mode 100644 db/migrate/20240216055809_add_unique_index_to_applied_slas.rb

diff --git a/app/services/action_service.rb b/app/services/action_service.rb
index 7a9a14d0d..79f1234a0 100644
--- a/app/services/action_service.rb
+++ b/app/services/action_service.rb
@@ -3,6 +3,7 @@ class ActionService
 
   def initialize(conversation)
     @conversation = conversation.reload
+    @account = @conversation.account
   end
 
   def mute_conversation(_params)
diff --git a/db/migrate/20240216055809_add_unique_index_to_applied_slas.rb b/db/migrate/20240216055809_add_unique_index_to_applied_slas.rb
new file mode 100644
index 000000000..1d64fc67d
--- /dev/null
+++ b/db/migrate/20240216055809_add_unique_index_to_applied_slas.rb
@@ -0,0 +1,8 @@
+class AddUniqueIndexToAppliedSlas < ActiveRecord::Migration[7.0]
+  def change
+    add_index :applied_slas,
+              [:account_id, :sla_policy_id, :conversation_id],
+              unique: true,
+              name: 'index_applied_slas_on_account_sla_policy_conversation'
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 138ea6835..546df444f 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: 2024_02_15_065844) do
+ActiveRecord::Schema[7.0].define(version: 2024_02_16_055809) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_stat_statements"
   enable_extension "pg_trgm"
@@ -122,6 +122,7 @@ ActiveRecord::Schema[7.0].define(version: 2024_02_15_065844) do
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.integer "sla_status", default: 0
+    t.index ["account_id", "sla_policy_id", "conversation_id"], name: "index_applied_slas_on_account_sla_policy_conversation", unique: true
     t.index ["account_id"], name: "index_applied_slas_on_account_id"
     t.index ["conversation_id"], name: "index_applied_slas_on_conversation_id"
     t.index ["sla_policy_id"], name: "index_applied_slas_on_sla_policy_id"
diff --git a/enterprise/app/models/applied_sla.rb b/enterprise/app/models/applied_sla.rb
index 825c747fc..cb5ca508d 100644
--- a/enterprise/app/models/applied_sla.rb
+++ b/enterprise/app/models/applied_sla.rb
@@ -12,14 +12,17 @@
 #
 # Indexes
 #
-#  index_applied_slas_on_account_id       (account_id)
-#  index_applied_slas_on_conversation_id  (conversation_id)
-#  index_applied_slas_on_sla_policy_id    (sla_policy_id)
+#  index_applied_slas_on_account_id                       (account_id)
+#  index_applied_slas_on_account_sla_policy_conversation  (account_id,sla_policy_id,conversation_id) UNIQUE
+#  index_applied_slas_on_conversation_id                  (conversation_id)
+#  index_applied_slas_on_sla_policy_id                    (sla_policy_id)
 #
 class AppliedSla < ApplicationRecord
   belongs_to :account
   belongs_to :sla_policy
   belongs_to :conversation
 
+  validates :account_id, uniqueness: { scope: %i[sla_policy_id conversation_id] }
+
   enum sla_status: { active: 0, hit: 1, missed: 2 }
 end
diff --git a/enterprise/app/services/enterprise/action_service.rb b/enterprise/app/services/enterprise/action_service.rb
index 6e21031aa..1e4165b09 100644
--- a/enterprise/app/services/enterprise/action_service.rb
+++ b/enterprise/app/services/enterprise/action_service.rb
@@ -1,10 +1,18 @@
 module Enterprise::ActionService
-  def add_sla(sla_policy)
+  def add_sla(sla_policy_id)
+    return if sla_policy_id.blank?
+
+    sla_policy = @account.sla_policies.find_by(id: sla_policy_id.first)
+    return if sla_policy.nil?
+    return if @conversation.sla_policy.present?
+
+    Rails.logger.info "SLA:: Adding SLA #{sla_policy.id} to conversation: #{@conversation.id}"
     @conversation.update!(sla_policy_id: sla_policy.id)
     create_applied_sla(sla_policy)
   end
 
   def create_applied_sla(sla_policy)
+    Rails.logger.info "SLA:: Creating Applied SLA for conversation: #{@conversation.id}"
     AppliedSla.create!(
       account_id: @conversation.account_id,
       sla_policy_id: sla_policy.id,
diff --git a/spec/enterprise/services/enterprise/action_service_spec.rb b/spec/enterprise/services/enterprise/action_service_spec.rb
index 6efffca6d..a77a039dd 100644
--- a/spec/enterprise/services/enterprise/action_service_spec.rb
+++ b/spec/enterprise/services/enterprise/action_service_spec.rb
@@ -8,16 +8,42 @@ describe ActionService do
     let(:conversation) { create(:conversation, account: account) }
     let(:action_service) { described_class.new(conversation) }
 
-    it 'adds the sla policy to the conversation and create applied_sla entry' do
-      action_service.add_sla(sla_policy)
-      expect(conversation.reload.sla_policy_id).to eq(sla_policy.id)
+    context 'when sla_policy_id is present' do
+      it 'adds the sla policy to the conversation and create applied_sla entry' do
+        action_service.add_sla([sla_policy.id])
+        expect(conversation.reload.sla_policy_id).to eq(sla_policy.id)
 
-      # check if appliedsla table entry is created with matching attributes
-      applied_sla = AppliedSla.last
-      expect(applied_sla.account_id).to eq(account.id)
-      expect(applied_sla.sla_policy_id).to eq(sla_policy.id)
-      expect(applied_sla.conversation_id).to eq(conversation.id)
-      expect(applied_sla.sla_status).to eq('active')
+        # check if appliedsla table entry is created with matching attributes
+        applied_sla = AppliedSla.last
+        expect(applied_sla.account_id).to eq(account.id)
+        expect(applied_sla.sla_policy_id).to eq(sla_policy.id)
+        expect(applied_sla.conversation_id).to eq(conversation.id)
+        expect(applied_sla.sla_status).to eq('active')
+      end
+    end
+
+    context 'when sla_policy_id is not present' do
+      it 'does not add the sla policy to the conversation' do
+        action_service.add_sla(nil)
+        expect(conversation.reload.sla_policy_id).to be_nil
+      end
+    end
+
+    context 'when conversation already has a sla policy' do
+      it 'does not add the new sla policy to the conversation' do
+        existing_sla_policy = sla_policy
+        new_sla_policy = create(:sla_policy, account: account)
+        conversation.update!(sla_policy_id: existing_sla_policy.id)
+        action_service.add_sla([new_sla_policy.id])
+        expect(conversation.reload.sla_policy_id).to eq(existing_sla_policy.id)
+      end
+    end
+
+    context 'when sla_policy is not found' do
+      it 'does not add the sla policy to the conversation' do
+        action_service.add_sla([sla_policy.id + 1])
+        expect(conversation.reload.sla_policy_id).to be_nil
+      end
     end
   end
 end

From 19aef3e94b395d4d140842130bdb2e74abe5e5c7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 Feb 2024 16:11:02 -0800
Subject: [PATCH 20/96] chore(deps): bump ip from 1.1.5 to 1.1.9 (#8976)

Bumps [ip](https://github.com/indutny/node-ip) from 1.1.5 to 1.1.9.
- [Commits](https://github.com/indutny/node-ip/compare/v1.1.5...v1.1.9)

---
updated-dependencies:
- dependency-name: ip
  dependency-type: indirect
...

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

diff --git a/yarn.lock b/yarn.lock
index 1ab16149d..cc9a6f34c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12597,14 +12597,14 @@ ip-regex@^2.1.0:
   integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=
 
 ip@^1.1.0, ip@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
-  integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=
+  version "1.1.9"
+  resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.9.tgz#8dfbcc99a754d07f425310b86a99546b1151e396"
+  integrity sha512-cyRxvOEpNHNtchU3Ln9KC/auJgup87llfQpQ+t5ghoC/UhL16SWzbueiCsdTnWmqAWl7LadfuwhlqmtOaqMHdQ==
 
 ip@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da"
-  integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.1.tgz#e8f3595d33a3ea66490204234b77636965307105"
+  integrity sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ==
 
 ipaddr.js@1.9.1, ipaddr.js@^1.9.0:
   version "1.9.1"

From 9911c5dc12495beb7a3c838c89e43fa7adc3f737 Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Date: Tue, 20 Feb 2024 16:12:51 -0800
Subject: [PATCH 21/96] chore: Hide banners on onboarding view (#8934)

---------
Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
---
 app/javascript/dashboard/App.vue              |  8 +++++--
 app/javascript/v3/helpers/RouteHelper.js      | 10 ++++++++
 .../v3/helpers/specs/RouteHelper.spec.js      | 23 ++++++++++++++++++-
 3 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/app/javascript/dashboard/App.vue b/app/javascript/dashboard/App.vue
index 49fe325f6..481c671ce 100644
--- a/app/javascript/dashboard/App.vue
+++ b/app/javascript/dashboard/App.vue
@@ -8,8 +8,8 @@
   >
     <update-banner :latest-chatwoot-version="latestChatwootVersion" />
     <template v-if="currentAccountId">
-      <pending-email-verification-banner />
-      <payment-pending-banner />
+      <pending-email-verification-banner v-if="hideOnOnboardingView" />
+      <payment-pending-banner v-if="hideOnOnboardingView" />
       <upgrade-banner />
     </template>
     <transition name="fade" mode="out-in">
@@ -38,6 +38,7 @@ import vueActionCable from './helper/actionCable';
 import WootSnackbarBox from './components/SnackbarContainer.vue';
 import rtlMixin from 'shared/mixins/rtlMixin';
 import { setColorTheme } from './helper/themeHelper';
+import { isOnOnboardingView } from 'v3/helpers/RouteHelper';
 import {
   registerSubscription,
   verifyServiceWorkerExistence,
@@ -79,6 +80,9 @@ export default {
       const { accounts = [] } = this.currentUser || {};
       return accounts.length > 0;
     },
+    hideOnOnboardingView() {
+      return !isOnOnboardingView(this.$route);
+    },
   },
 
   watch: {
diff --git a/app/javascript/v3/helpers/RouteHelper.js b/app/javascript/v3/helpers/RouteHelper.js
index db508ac13..16bc9cd41 100644
--- a/app/javascript/v3/helpers/RouteHelper.js
+++ b/app/javascript/v3/helpers/RouteHelper.js
@@ -48,3 +48,13 @@ export const validateRouteAccess = (to, next, chatwootConfig = {}) => {
 
   next();
 };
+
+export const isOnOnboardingView = route => {
+  const { name = '' } = route || {};
+
+  if (!name) {
+    return false;
+  }
+
+  return name.includes('onboarding_');
+};
diff --git a/app/javascript/v3/helpers/specs/RouteHelper.spec.js b/app/javascript/v3/helpers/specs/RouteHelper.spec.js
index 8481a8ff4..4ebeccdcb 100644
--- a/app/javascript/v3/helpers/specs/RouteHelper.spec.js
+++ b/app/javascript/v3/helpers/specs/RouteHelper.spec.js
@@ -1,4 +1,4 @@
-import { validateRouteAccess } from '../RouteHelper';
+import { validateRouteAccess, isOnOnboardingView } from '../RouteHelper';
 import { clearBrowserSessionCookies } from 'dashboard/store/utils/api';
 import { replaceRouteWithReload } from '../CommonHelper';
 import Cookies from 'js-cookie';
@@ -67,3 +67,24 @@ describe('#validateRouteAccess', () => {
     expect(next).toHaveBeenCalledWith();
   });
 });
+
+describe('isOnOnboardingView', () => {
+  test('returns true for a route with onboarding name', () => {
+    const route = { name: 'onboarding_welcome' };
+    expect(isOnOnboardingView(route)).toBe(true);
+  });
+
+  test('returns false for a route without onboarding name', () => {
+    const route = { name: 'home' };
+    expect(isOnOnboardingView(route)).toBe(false);
+  });
+
+  test('returns false for a route with null name', () => {
+    const route = { name: null };
+    expect(isOnOnboardingView(route)).toBe(false);
+  });
+
+  test('returns false for an  undefined route object', () => {
+    expect(isOnOnboardingView()).toBe(false);
+  });
+});

From d53097f77d2af04e4380231682f082d89ca26bc9 Mon Sep 17 00:00:00 2001
From: Vishnu Narayanan <iamwishnu@gmail.com>
Date: Wed, 21 Feb 2024 06:33:39 +0530
Subject: [PATCH 22/96] fix: Raise error if email to_header is invalid (#8688)

---
 app/mailboxes/application_mailbox.rb          | 14 +++++++++
 spec/fixtures/files/mail_with_invalid_to.eml  | 29 +++++++++++++++++++
 .../fixtures/files/mail_with_invalid_to_2.eml | 29 +++++++++++++++++++
 spec/mailboxes/application_mailbox_spec.rb    | 18 ++++++++++++
 4 files changed, 90 insertions(+)
 create mode 100644 spec/fixtures/files/mail_with_invalid_to.eml
 create mode 100644 spec/fixtures/files/mail_with_invalid_to_2.eml

diff --git a/app/mailboxes/application_mailbox.rb b/app/mailboxes/application_mailbox.rb
index c1e273e70..6a1902ce4 100644
--- a/app/mailboxes/application_mailbox.rb
+++ b/app/mailboxes/application_mailbox.rb
@@ -37,10 +37,24 @@ class ApplicationMailbox < ActionMailbox::Base
     # checks if follow this pattern  send it to reply_mailbox
     # reply+<conversation-uuid>@<mailer-domain.com>
     def reply_uuid_mail?(inbound_mail)
+      validate_to_address(inbound_mail)
+
       inbound_mail.mail.to&.any? do |email|
         conversation_uuid = email.split('@')[0]
         conversation_uuid.match?(REPLY_EMAIL_UUID_PATTERN)
       end
     end
+
+    # if mail.to returns a string, then it is a malformed `to` header
+    # valid `to` header will be of type Mail::AddressContainer
+    # validate if the to address is of type string
+    def validate_to_address(inbound_mail)
+      to_address_class = inbound_mail.mail.to&.class
+
+      return if to_address_class == Mail::AddressContainer
+
+      Rails.logger.error "Email to address header is malformed `#{inbound_mail.mail.to}`"
+      raise StandardError, "Invalid email to address header #{inbound_mail.mail.to}"
+    end
   end
 end
diff --git a/spec/fixtures/files/mail_with_invalid_to.eml b/spec/fixtures/files/mail_with_invalid_to.eml
new file mode 100644
index 000000000..8dd2aabb6
--- /dev/null
+++ b/spec/fixtures/files/mail_with_invalid_to.eml
@@ -0,0 +1,29 @@
+X-Original-To: bd84c730a1ac7833e4d27253804516f7@reply.chatwoot.com
+Received: from mail.planetmars.com (mxd [192.168.1.1]) by mx.sendgrid.net with ESMTP id AAAA-bCCCCCC5DeeeFFgg for <bd84c730a1ac7833e4d27253804516f7@reply.chatwoot.com>; Sun, 31 Dec 2023 22:32:23.586 +0000 (UTC)
+From: "Mark Whatney" <mark@planetmars.com>
+To: <vishnu@chatwoot.com>vishnu@chatwoot.com
+Subject: stranded in mars
+Date: Mon, 1 Jan 2024 06:31:44 +0800
+Message-ID: <1234560e0123c05b4bbf83c828b1688a93c7@com>
+MIME-Version: 1.0
+Content-Type: multipart/alternative;
+ boundary=15688136a4ad411d82b004fae6e46549
+X-Exim-Id: 1234560e0123c05b4bbf83c828b1688a93c7
+
+This is a multipart message in MIME format.
+
+--15688136a4ad411d82b004fae6e46549
+Content-Type: text/plain;
+        charset="us-ascii"
+Content-Transfer-Encoding: 7bit
+
+hey v, can i get some help over here?
+
+--15688136a4ad411d82b004fae6e46549
+Content-Type: text/html;
+        charset="utf-8"
+Content-Transfer-Encoding: quoted-printable
+
+hey v, can i get some help over here?
+
+--15688136a4ad411d82b004fae6e46549--
diff --git a/spec/fixtures/files/mail_with_invalid_to_2.eml b/spec/fixtures/files/mail_with_invalid_to_2.eml
new file mode 100644
index 000000000..4ef77cb2d
--- /dev/null
+++ b/spec/fixtures/files/mail_with_invalid_to_2.eml
@@ -0,0 +1,29 @@
+X-Original-To: bd84c730a1ac7833e4d27253804516f7@reply.chatwoot.com
+Received: from mail.planetmars.com (mxd [192.168.1.1]) by mx.sendgrid.net with ESMTP id AAAA-bCCCCCC5DeeeFFgg for <bd84c730a1ac7833e4d27253804516f7@reply.chatwoot.com>; Sun, 31 Dec 2023 22:32:23.586 +0000 (UTC)
+From: "Mark Whatney" <mark@planetmars.com>
+To: vishnu@chatwoot.com www.chatwoot.com
+Subject: stranded in mars
+Date: Mon, 1 Jan 2024 06:31:44 +0800
+Message-ID: <1234560e0123c05b4bbf83c828b1688a93c7@com>
+MIME-Version: 1.0
+Content-Type: multipart/alternative;
+ boundary=15688136a4ad411d82b004fae6e46549
+X-Exim-Id: 1234560e0123c05b4bbf83c828b1688a93c7
+
+This is a multipart message in MIME format.
+
+--15688136a4ad411d82b004fae6e46549
+Content-Type: text/plain;
+        charset="us-ascii"
+Content-Transfer-Encoding: 7bit
+
+hey v, can i get some help over here?
+
+--15688136a4ad411d82b004fae6e46549
+Content-Type: text/html;
+        charset="utf-8"
+Content-Transfer-Encoding: quoted-printable
+
+hey v, can i get some help over here?
+
+--15688136a4ad411d82b004fae6e46549--
diff --git a/spec/mailboxes/application_mailbox_spec.rb b/spec/mailboxes/application_mailbox_spec.rb
index d5e15dc46..733ec5523 100644
--- a/spec/mailboxes/application_mailbox_spec.rb
+++ b/spec/mailboxes/application_mailbox_spec.rb
@@ -10,6 +10,8 @@ RSpec.describe ApplicationMailbox do
     let(:reply_mail_without_uuid) { create_inbound_email_from_fixture('reply.eml') }
     let(:reply_mail_with_in_reply_to) { create_inbound_email_from_fixture('in_reply_to.eml') }
     let(:support_mail) { create_inbound_email_from_fixture('support.eml') }
+    let(:mail_with_invalid_to_address) { create_inbound_email_from_fixture('mail_with_invalid_to.eml') }
+    let(:mail_with_invalid_to_address_2) { create_inbound_email_from_fixture('mail_with_invalid_to_2.eml') }
 
     describe 'Default' do
       it 'catchall mails route to Default Mailbox' do
@@ -65,5 +67,21 @@ RSpec.describe ApplicationMailbox do
         described_class.route reply_cc_mail
       end
     end
+
+    describe 'Invalid Mail To Address' do
+      it 'raises error when mail.to header is malformed' do
+        expect do
+          described_class.route mail_with_invalid_to_address
+        end.to raise_error(StandardError,
+                           'Invalid email to address header <vishnu@chatwoot.com>vishnu@chatwoot.com')
+      end
+
+      it 'raises another error when mail.to header is malformed' do
+        expect do
+          described_class.route mail_with_invalid_to_address_2
+        end.to raise_error(StandardError,
+                           'Invalid email to address header vishnu@chatwoot.com www.chatwoot.com')
+      end
+    end
   end
 end

From cc47ccaa2c6dbacb2072e4c8c859322b63c9cc02 Mon Sep 17 00:00:00 2001
From: Vishnu Narayanan <iamwishnu@gmail.com>
Date: Wed, 21 Feb 2024 12:33:22 +0530
Subject: [PATCH 23/96] feat(ee): Add SLA management UI (#8777)

Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
Co-authored-by: Pranav <pranav@chatwoot.com>
---
 app/javascript/dashboard/api/sla.js           |   9 ++
 .../layout/config/sidebarItems/settings.js    |  10 ++
 app/javascript/dashboard/featureFlags.js      |   1 +
 .../helper/AnalyticsHelper/events.js          |   6 +
 .../dashboard/i18n/locale/en/index.js         |   2 +
 .../dashboard/i18n/locale/en/settings.json    |   1 +
 .../dashboard/i18n/locale/en/sla.json         |  63 ++++++++
 .../dashboard/settings/settings.routes.js     |   2 +
 .../routes/dashboard/settings/sla/AddSLA.vue  |  50 +++++++
 .../routes/dashboard/settings/sla/EditSLA.vue |  60 ++++++++
 .../routes/dashboard/settings/sla/Index.vue   | 135 +++++++++++++++++
 .../routes/dashboard/settings/sla/SlaForm.vue | 141 ++++++++++++++++++
 .../dashboard/settings/sla/sla.routes.js      |  32 ++++
 .../sla/specs/validationMixin.spec.js         |  65 ++++++++
 .../dashboard/settings/sla/validationMixin.js |  15 ++
 .../dashboard/settings/sla/validations.js     |   8 +
 app/javascript/dashboard/store/index.js       |   2 +
 app/javascript/dashboard/store/modules/sla.js |  86 +++++++++++
 .../dashboard/store/mutation-types.js         |   7 +
 config/features.yml                           |   3 +
 enterprise/config/premium_features.yml        |   1 +
 21 files changed, 699 insertions(+)
 create mode 100644 app/javascript/dashboard/api/sla.js
 create mode 100644 app/javascript/dashboard/i18n/locale/en/sla.json
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/sla/AddSLA.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/sla/EditSLA.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/sla/Index.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/sla/SlaForm.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/sla/sla.routes.js
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/sla/specs/validationMixin.spec.js
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/sla/validationMixin.js
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/sla/validations.js
 create mode 100644 app/javascript/dashboard/store/modules/sla.js

diff --git a/app/javascript/dashboard/api/sla.js b/app/javascript/dashboard/api/sla.js
new file mode 100644
index 000000000..8480b1846
--- /dev/null
+++ b/app/javascript/dashboard/api/sla.js
@@ -0,0 +1,9 @@
+import ApiClient from './ApiClient';
+
+class SlaAPI extends ApiClient {
+  constructor() {
+    super('sla_policies', { accountScoped: true });
+  }
+}
+
+export default new SlaAPI();
diff --git a/app/javascript/dashboard/components/layout/config/sidebarItems/settings.js b/app/javascript/dashboard/components/layout/config/sidebarItems/settings.js
index 75f09e9da..444285657 100644
--- a/app/javascript/dashboard/components/layout/config/sidebarItems/settings.js
+++ b/app/javascript/dashboard/components/layout/config/sidebarItems/settings.js
@@ -39,6 +39,7 @@ const settings = accountId => ({
     'settings_teams_finish',
     'settings_teams_list',
     'settings_teams_new',
+    'sla_list',
   ],
   menuItems: [
     {
@@ -158,6 +159,15 @@ const settings = accountId => ({
       featureFlag: FEATURE_FLAGS.AUDIT_LOGS,
       beta: true,
     },
+    {
+      icon: 'key',
+      label: 'SLA',
+      hasSubMenu: false,
+      toState: frontendURL(`accounts/${accountId}/settings/sla/list`),
+      toStateName: 'sla_list',
+      featureFlag: FEATURE_FLAGS.SLA,
+      beta: true,
+    },
   ],
 });
 
diff --git a/app/javascript/dashboard/featureFlags.js b/app/javascript/dashboard/featureFlags.js
index 9d06f15c6..2936d22ea 100644
--- a/app/javascript/dashboard/featureFlags.js
+++ b/app/javascript/dashboard/featureFlags.js
@@ -18,4 +18,5 @@ export const FEATURE_FLAGS = {
   AUDIT_LOGS: 'audit_logs',
   INSERT_ARTICLE_IN_REPLY: 'insert_article_in_reply',
   INBOX_VIEW: 'inbox_view',
+  SLA: 'sla',
 };
diff --git a/app/javascript/dashboard/helper/AnalyticsHelper/events.js b/app/javascript/dashboard/helper/AnalyticsHelper/events.js
index 59361e446..4b378c74a 100644
--- a/app/javascript/dashboard/helper/AnalyticsHelper/events.js
+++ b/app/javascript/dashboard/helper/AnalyticsHelper/events.js
@@ -111,3 +111,9 @@ export const INBOX_EVENTS = Object.freeze({
   DELETE_NOTIFICATION: 'Deleted notification',
   DELETE_ALL_NOTIFICATIONS: 'Deleted all notifications',
 });
+
+export const SLA_EVENTS = Object.freeze({
+  CREATE: 'Created an SLA',
+  UPDATE: 'Updated an SLA',
+  DELETED: 'Deleted an SLA',
+});
diff --git a/app/javascript/dashboard/i18n/locale/en/index.js b/app/javascript/dashboard/i18n/locale/en/index.js
index 6cc73c5b6..75cdb5836 100644
--- a/app/javascript/dashboard/i18n/locale/en/index.js
+++ b/app/javascript/dashboard/i18n/locale/en/index.js
@@ -29,6 +29,7 @@ import settings from './settings.json';
 import signup from './signup.json';
 import teamsSettings from './teamsSettings.json';
 import whatsappTemplates from './whatsappTemplates.json';
+import sla from './sla.json';
 import inbox from './inbox.json';
 
 export default {
@@ -61,6 +62,7 @@ export default {
   ...setNewPassword,
   ...settings,
   ...signup,
+  ...sla,
   ...teamsSettings,
   ...whatsappTemplates,
   ...inbox,
diff --git a/app/javascript/dashboard/i18n/locale/en/settings.json b/app/javascript/dashboard/i18n/locale/en/settings.json
index 6c4d8cbfe..d1d16a607 100644
--- a/app/javascript/dashboard/i18n/locale/en/settings.json
+++ b/app/javascript/dashboard/i18n/locale/en/settings.json
@@ -238,6 +238,7 @@
     "REPORTS_INBOX": "Inbox",
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
+    "SLA": "SLA",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Overview",
     "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
diff --git a/app/javascript/dashboard/i18n/locale/en/sla.json b/app/javascript/dashboard/i18n/locale/en/sla.json
new file mode 100644
index 000000000..67ec4549f
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/en/sla.json
@@ -0,0 +1,63 @@
+{
+  "SLA": {
+    "HEADER": "SLA",
+    "HEADER_BTN_TXT": "Add SLA",
+    "LOADING": "Fetching SLAs",
+    "SEARCH_404": "There are no items matching this query",
+    "SIDEBAR_TXT": "<p><b>SLA</b> <p>Think of Service Level Agreements (SLAs) like friendly promises between a service provider and a customer.</p> <p> These promises set clear expectations for things like how quickly the team will respond to issues, making sure you always get a reliable and top-notch experience!</p>",
+    "LIST": {
+      "404": "There are no SLAs available in this account.",
+      "TITLE": "Manage SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "TABLE_HEADER": ["Name", "Description", "FRT", "NRT", "RT", "Business Hours"]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "SLA Name",
+        "PLACEHOLDER": "SLA Name",
+        "REQUIRED_ERROR": "SLA name is required",
+        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
+        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Description",
+        "PLACEHOLDER": "SLA for premium customers"
+      },
+      "FIRST_RESPONSE_TIME": {
+        "LABEL": "First Response Time(Seconds)",
+        "PLACEHOLDER": "300 for 5 minutes"
+      },
+      "NEXT_RESPONSE_TIME": {
+        "LABEL": "Next Response Time(Seconds)",
+        "PLACEHOLDER": "600 for 10 minutes"
+      },
+      "RESOLUTION_TIME": {
+        "LABEL": "Resolution Time(Seconds)",
+        "PLACEHOLDER": "86400 for 1 day"
+      },
+      "BUSINESS_HOURS": {
+        "LABEL": "Business Hours",
+        "PLACEHOLDER": "Only during business hours"
+      },
+      "EDIT": "Edit",
+      "CREATE": "Create",
+      "DELETE": "Delete",
+      "CANCEL": "Cancel"
+    },
+    "ADD": {
+      "TITLE": "Add SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA added successfully",
+        "ERROR_MESSAGE": "There was an error, please try again"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit SLA",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA updated successfully",
+        "ERROR_MESSAGE": "There was an error, please try again"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/routes/dashboard/settings/settings.routes.js b/app/javascript/dashboard/routes/dashboard/settings/settings.routes.js
index 48ef316ef..98b81f47c 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/settings.routes.js
+++ b/app/javascript/dashboard/routes/dashboard/settings/settings.routes.js
@@ -16,6 +16,7 @@ import macros from './macros/macros.routes';
 import profile from './profile/profile.routes';
 import reports from './reports/reports.routes';
 import store from '../../../store';
+import sla from './sla/sla.routes';
 import teams from './teams/teams.routes';
 
 export default {
@@ -47,6 +48,7 @@ export default {
     ...macros.routes,
     ...profile.routes,
     ...reports.routes,
+    ...sla.routes,
     ...teams.routes,
   ],
 };
diff --git a/app/javascript/dashboard/routes/dashboard/settings/sla/AddSLA.vue b/app/javascript/dashboard/routes/dashboard/settings/sla/AddSLA.vue
new file mode 100644
index 000000000..772ec4bcd
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/sla/AddSLA.vue
@@ -0,0 +1,50 @@
+<template>
+  <div class="h-auto overflow-auto flex flex-col">
+    <woot-modal-header
+      :header-title="$t('SLA.ADD.TITLE')"
+      :header-content="$t('SLA.ADD.DESC')"
+    />
+    <sla-form
+      :submit-label="$t('SLA.FORM.CREATE')"
+      @submit="addSLA"
+      @close="onClose"
+    />
+  </div>
+</template>
+
+<script>
+import alertMixin from 'shared/mixins/alertMixin';
+import validationMixin from './validationMixin';
+import { mapGetters } from 'vuex';
+import validations from './validations';
+import SlaForm from './SlaForm.vue';
+
+export default {
+  components: {
+    SlaForm,
+  },
+  mixins: [alertMixin, validationMixin],
+  validations,
+  computed: {
+    ...mapGetters({
+      uiFlags: 'sla/getUIFlags',
+    }),
+  },
+  methods: {
+    onClose() {
+      this.$emit('close');
+    },
+    async addSLA(payload) {
+      try {
+        await this.$store.dispatch('sla/create', payload);
+        this.showAlert(this.$t('SLA.ADD.API.SUCCESS_MESSAGE'));
+        this.onClose();
+      } catch (error) {
+        const errorMessage =
+          error.message || this.$t('SLA.ADD.API.ERROR_MESSAGE');
+        this.showAlert(errorMessage);
+      }
+    },
+  },
+};
+</script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/sla/EditSLA.vue b/app/javascript/dashboard/routes/dashboard/settings/sla/EditSLA.vue
new file mode 100644
index 000000000..2fc577bad
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/sla/EditSLA.vue
@@ -0,0 +1,60 @@
+<template>
+  <div class="h-auto overflow-auto flex flex-col">
+    <woot-modal-header :header-title="pageTitle" />
+    <sla-form
+      :submit-label="$t('SLA.FORM.EDIT')"
+      :selected-response="selectedResponse"
+      @submit="editSLA"
+      @close="onClose"
+    />
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import alertMixin from 'shared/mixins/alertMixin';
+import validationMixin from './validationMixin';
+import validations from './validations';
+import SlaForm from './SlaForm.vue';
+
+export default {
+  components: {
+    SlaForm,
+  },
+  mixins: [alertMixin, validationMixin],
+  props: {
+    selectedResponse: {
+      type: Object,
+      default: () => {},
+    },
+  },
+  validations,
+  computed: {
+    ...mapGetters({
+      uiFlags: 'sla/getUIFlags',
+    }),
+    pageTitle() {
+      return `${this.$t('SLA.EDIT.TITLE')} - ${this.selectedResponse.name}`;
+    },
+  },
+  methods: {
+    onClose() {
+      this.$emit('close');
+    },
+    async editSLA(payload) {
+      try {
+        await this.$store.dispatch('sla/update', {
+          id: this.selectedResponse.id,
+          ...payload,
+        });
+        this.showAlert(this.$t('SLA.EDIT.API.SUCCESS_MESSAGE'));
+        this.onClose();
+      } catch (error) {
+        const errorMessage =
+          error.message || this.$t('SLA.EDIT.API.ERROR_MESSAGE');
+        this.showAlert(errorMessage);
+      }
+    },
+  },
+};
+</script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/sla/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/sla/Index.vue
new file mode 100644
index 000000000..473583f6d
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/sla/Index.vue
@@ -0,0 +1,135 @@
+<template>
+  <div class="flex-1 overflow-auto p-4">
+    <woot-button
+      color-scheme="success"
+      class-names="button--fixed-top"
+      icon="add-circle"
+      @click="openAddPopup"
+    >
+      {{ $t('SLA.HEADER_BTN_TXT') }}
+    </woot-button>
+    <div class="flex flex-row gap-4">
+      <div class="w-[60%]">
+        <p
+          v-if="!uiFlags.isFetching && !records.length"
+          class="flex h-full items-center flex-col justify-center"
+        >
+          {{ $t('SLA.LIST.404') }}
+        </p>
+        <woot-loading-state
+          v-if="uiFlags.isFetching"
+          :message="$t('SLA.LOADING')"
+        />
+        <table v-if="!uiFlags.isFetching && records.length" class="woot-table">
+          <thead>
+            <th v-for="thHeader in $t('SLA.LIST.TABLE_HEADER')" :key="thHeader">
+              {{ thHeader }}
+            </th>
+          </thead>
+          <tbody>
+            <tr v-for="sla in records" :key="sla.title">
+              <td>
+                <span
+                  class="inline-block overflow-hidden whitespace-nowrap text-ellipsis"
+                >
+                  {{ sla.name }}
+                </span>
+              </td>
+              <td>{{ sla.description }}</td>
+              <td>
+                <span class="flex items-center">
+                  {{ sla.first_response_time_threshold }}
+                </span>
+              </td>
+              <td>
+                <span class="flex items-center">
+                  {{ sla.next_response_time_threshold }}
+                </span>
+              </td>
+              <td>
+                <span class="flex items-center">
+                  {{ sla.resolution_time_threshold }}
+                </span>
+              </td>
+              <td>
+                <span class="flex items-center">
+                  {{ sla.only_during_business_hours }}
+                </span>
+              </td>
+              <td class="button-wrapper">
+                <woot-button
+                  v-tooltip.top="$t('SLA.FORM.EDIT')"
+                  variant="smooth"
+                  size="tiny"
+                  color-scheme="secondary"
+                  class-names="grey-btn"
+                  :is-loading="loading[sla.id]"
+                  icon="edit"
+                  @click="openEditPopup(sla)"
+                />
+              </td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+
+      <div class="w-[34%]">
+        <span v-dompurify-html="$t('SLA.SIDEBAR_TXT')" />
+      </div>
+    </div>
+    <woot-modal :show.sync="showAddPopup" :on-close="hideAddPopup">
+      <add-SLA @close="hideAddPopup" />
+    </woot-modal>
+
+    <woot-modal :show.sync="showEditPopup" :on-close="hideEditPopup">
+      <edit-SLA :selected-response="selectedResponse" @close="hideEditPopup" />
+    </woot-modal>
+  </div>
+</template>
+<script>
+import { mapGetters } from 'vuex';
+
+import AddSLA from './AddSLA.vue';
+import EditSLA from './EditSLA.vue';
+import alertMixin from 'shared/mixins/alertMixin';
+
+export default {
+  components: {
+    AddSLA,
+    EditSLA,
+  },
+  mixins: [alertMixin],
+  data() {
+    return {
+      loading: {},
+      showAddPopup: false,
+      showEditPopup: false,
+      selectedResponse: {},
+    };
+  },
+  computed: {
+    ...mapGetters({
+      records: 'sla/getSLA',
+      uiFlags: 'sla/getUIFlags',
+    }),
+  },
+  mounted() {
+    this.$store.dispatch('sla/get');
+  },
+  methods: {
+    openAddPopup() {
+      this.showAddPopup = true;
+    },
+    hideAddPopup() {
+      this.showAddPopup = false;
+    },
+    openEditPopup(response) {
+      this.showEditPopup = true;
+      this.selectedResponse = response;
+    },
+    hideEditPopup() {
+      this.showEditPopup = false;
+    },
+  },
+};
+</script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/sla/SlaForm.vue b/app/javascript/dashboard/routes/dashboard/settings/sla/SlaForm.vue
new file mode 100644
index 000000000..775c0ff2a
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/sla/SlaForm.vue
@@ -0,0 +1,141 @@
+<template>
+  <div class="h-auto overflow-auto flex flex-col">
+    <form class="mx-0 flex flex-wrap" @submit.prevent="onSubmit">
+      <woot-input
+        v-model.trim="name"
+        :class="{ error: $v.name.$error }"
+        class="w-full"
+        :sla="$t('SLA.FORM.NAME.LABEL')"
+        :placeholder="$t('SLA.FORM.NAME.PLACEHOLDER')"
+        :error="getSlaNameErrorMessage"
+        @input="$v.name.$touch"
+      />
+      <woot-input
+        v-model.trim="description"
+        class="w-full"
+        :label="$t('SLA.FORM.DESCRIPTION.LABEL')"
+        :placeholder="$t('SLA.FORM.DESCRIPTION.PLACEHOLDER')"
+        data-testid="sla-description"
+      />
+
+      <woot-input
+        v-model.trim="firstResponseTimeThreshold"
+        class="w-full"
+        :label="$t('SLA.FORM.FIRST_RESPONSE_TIME.LABEL')"
+        :placeholder="$t('SLA.FORM.FIRST_RESPONSE_TIME.PLACEHOLDER')"
+        data-testid="sla-firstResponseTimeThreshold"
+      />
+
+      <woot-input
+        v-model.trim="nextResponseTimeThreshold"
+        class="w-full"
+        :label="$t('SLA.FORM.NEXT_RESPONSE_TIME.LABEL')"
+        :placeholder="$t('SLA.FORM.NEXT_RESPONSE_TIME.PLACEHOLDER')"
+        data-testid="sla-nextResponseTimeThreshold"
+      />
+
+      <woot-input
+        v-model.trim="resolutionTimeThreshold"
+        class="w-full"
+        :label="$t('SLA.FORM.RESOLUTION_TIME.LABEL')"
+        :placeholder="$t('SLA.FORM.RESOLUTION_TIME.PLACEHOLDER')"
+        data-testid="sla-resolutionTimeThreshold"
+      />
+
+      <div class="w-full">
+        <input id="sla_bh" v-model="onlyDuringBusinessHours" type="checkbox" />
+        <label for="sla_bh">
+          {{ $t('SLA.FORM.BUSINESS_HOURS.PLACEHOLDER') }}
+        </label>
+      </div>
+
+      <div class="flex justify-end items-center py-2 px-0 gap-2 w-full">
+        <woot-button
+          :is-disabled="$v.name.$invalid || uiFlags.isUpdating"
+          :is-loading="uiFlags.isUpdating"
+        >
+          {{ submitLabel }}
+        </woot-button>
+        <woot-button class="button clear" @click.prevent="onClose">
+          {{ $t('SLA.FORM.CANCEL') }}
+        </woot-button>
+      </div>
+    </form>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import validationMixin from './validationMixin';
+import validations from './validations';
+
+export default {
+  mixins: [validationMixin],
+  props: {
+    selectedResponse: {
+      type: Object,
+      default: () => {},
+    },
+    submitLabel: {
+      type: String,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      name: '',
+      description: '',
+      firstResponseTimeThreshold: '',
+      nextResponseTimeThreshold: '',
+      resolutionTimeThreshold: '',
+      onlyDuringBusinessHours: false,
+    };
+  },
+  validations,
+  computed: {
+    ...mapGetters({
+      uiFlags: 'sla/getUIFlags',
+    }),
+    pageTitle() {
+      return `${this.$t('SLA.EDIT.TITLE')} - ${
+        this.selectedResponse?.name || ''
+      }`;
+    },
+  },
+  mounted() {
+    if (this.selectedResponse) this.setFormValues();
+  },
+  methods: {
+    onClose() {
+      this.$emit('close');
+    },
+    setFormValues() {
+      const {
+        name,
+        description,
+        first_response_time_threshold: firstResponseTimeThreshold,
+        next_response_time_threshold: nextResponseTimeThreshold,
+        resolution_time_threshold: resolutionTimeThreshold,
+        only_during_business_hours: onlyDuringBusinessHours,
+      } = this.selectedResponse;
+
+      this.name = name;
+      this.description = description;
+      this.firstResponseTimeThreshold = firstResponseTimeThreshold;
+      this.nextResponseTimeThreshold = nextResponseTimeThreshold;
+      this.resolutionTimeThreshold = resolutionTimeThreshold;
+      this.onlyDuringBusinessHours = onlyDuringBusinessHours;
+    },
+    onSubmit() {
+      this.$emit('submit', {
+        name: this.name,
+        description: this.description,
+        first_response_time_threshold: this.firstResponseTimeThreshold,
+        next_response_time_threshold: this.nextResponseTimeThreshold,
+        resolution_time_threshold: this.resolutionTimeThreshold,
+        only_during_business_hours: this.onlyDuringBusinessHours,
+      });
+    },
+  },
+};
+</script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/sla/sla.routes.js b/app/javascript/dashboard/routes/dashboard/settings/sla/sla.routes.js
new file mode 100644
index 000000000..360c5a1f5
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/sla/sla.routes.js
@@ -0,0 +1,32 @@
+import { frontendURL } from '../../../../helper/URLHelper';
+
+const SettingsContent = () => import('../Wrapper.vue');
+const Index = () => import('./Index.vue');
+
+export default {
+  routes: [
+    {
+      path: frontendURL('accounts/:accountId/settings/sla'),
+      component: SettingsContent,
+      props: {
+        headerTitle: 'SLA.HEADER',
+        icon: 'tag',
+        showNewButton: true,
+      },
+      children: [
+        {
+          path: '',
+          name: 'sla_wrapper',
+          roles: ['administrator'],
+          redirect: 'list',
+        },
+        {
+          path: 'list',
+          name: 'sla_list',
+          roles: ['administrator'],
+          component: Index,
+        },
+      ],
+    },
+  ],
+};
diff --git a/app/javascript/dashboard/routes/dashboard/settings/sla/specs/validationMixin.spec.js b/app/javascript/dashboard/routes/dashboard/settings/sla/specs/validationMixin.spec.js
new file mode 100644
index 000000000..a828c8556
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/sla/specs/validationMixin.spec.js
@@ -0,0 +1,65 @@
+import { shallowMount, createLocalVue } from '@vue/test-utils';
+import VueI18n from 'vue-i18n';
+import Vuelidate from 'vuelidate';
+
+import validationMixin from '../validationMixin';
+import validations from '../validations';
+import i18n from 'dashboard/i18n';
+
+const localVue = createLocalVue();
+localVue.use(VueI18n);
+localVue.use(Vuelidate);
+
+const i18nConfig = new VueI18n({
+  locale: 'en',
+  messages: i18n,
+});
+
+const TestComponent = {
+  render() {},
+  mixins: [validationMixin],
+  validations,
+};
+
+describe('validationMixin', () => {
+  let wrapper;
+
+  beforeEach(() => {
+    wrapper = shallowMount(TestComponent, {
+      localVue,
+      i18n: i18nConfig,
+      data() {
+        return {
+          name: '',
+        };
+      },
+    });
+  });
+
+  it('should not return required error message if name is empty but not touched', () => {
+    wrapper.setData({ name: '' });
+    expect(wrapper.vm.getSlaNameErrorMessage).toBe('');
+  });
+
+  it('should return empty error message if name is valid', () => {
+    wrapper.setData({ name: 'ValidName' });
+    wrapper.vm.$v.name.$touch();
+    expect(wrapper.vm.getSlaNameErrorMessage).toBe('');
+  });
+
+  it('should return required error message if name is empty', () => {
+    wrapper.setData({ name: '' });
+    wrapper.vm.$v.name.$touch();
+    expect(wrapper.vm.getSlaNameErrorMessage).toBe(
+      wrapper.vm.$t('SLA.FORM.NAME.REQUIRED_ERROR')
+    );
+  });
+
+  it('should return minimum length error message if name is too short', () => {
+    wrapper.setData({ name: 'a' });
+    wrapper.vm.$v.name.$touch();
+    expect(wrapper.vm.getSlaNameErrorMessage).toBe(
+      wrapper.vm.$t('SLA.FORM.NAME.MINIMUM_LENGTH_ERROR')
+    );
+  });
+});
diff --git a/app/javascript/dashboard/routes/dashboard/settings/sla/validationMixin.js b/app/javascript/dashboard/routes/dashboard/settings/sla/validationMixin.js
new file mode 100644
index 000000000..28f7436c8
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/sla/validationMixin.js
@@ -0,0 +1,15 @@
+export default {
+  computed: {
+    getSlaNameErrorMessage() {
+      let errorMessage = '';
+      if (this.$v.name.$error) {
+        if (!this.$v.name.required) {
+          errorMessage = this.$t('SLA.FORM.NAME.REQUIRED_ERROR');
+        } else if (!this.$v.name.minLength) {
+          errorMessage = this.$t('SLA.FORM.NAME.MINIMUM_LENGTH_ERROR');
+        }
+      }
+      return errorMessage;
+    },
+  },
+};
diff --git a/app/javascript/dashboard/routes/dashboard/settings/sla/validations.js b/app/javascript/dashboard/routes/dashboard/settings/sla/validations.js
new file mode 100644
index 000000000..bda4b9556
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/sla/validations.js
@@ -0,0 +1,8 @@
+import { required, minLength } from 'vuelidate/lib/validators';
+
+export default {
+  name: {
+    required,
+    minLength: minLength(2),
+  },
+};
diff --git a/app/javascript/dashboard/store/index.js b/app/javascript/dashboard/store/index.js
index 2d1564b79..91b84ddd1 100755
--- a/app/javascript/dashboard/store/index.js
+++ b/app/javascript/dashboard/store/index.js
@@ -38,6 +38,7 @@ import macros from './modules/macros';
 import notifications from './modules/notifications';
 import portals from './modules/helpCenterPortals';
 import reports from './modules/reports';
+import sla from './modules/sla';
 import teamMembers from './modules/teamMembers';
 import teams from './modules/teams';
 import userNotificationSettings from './modules/userNotificationSettings';
@@ -109,6 +110,7 @@ export default new Vuex.Store({
     userNotificationSettings,
     webhooks,
     draftMessages,
+    sla,
   },
   plugins,
 });
diff --git a/app/javascript/dashboard/store/modules/sla.js b/app/javascript/dashboard/store/modules/sla.js
new file mode 100644
index 000000000..e1ded7f51
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/sla.js
@@ -0,0 +1,86 @@
+import * as MutationHelpers from 'shared/helpers/vuex/mutationHelpers';
+import types from '../mutation-types';
+import SlaAPI from '../../api/sla';
+import AnalyticsHelper from '../../helper/AnalyticsHelper';
+import { SLA_EVENTS } from '../../helper/AnalyticsHelper/events';
+import { throwErrorMessage } from '../utils/api';
+
+export const state = {
+  records: [],
+  uiFlags: {
+    isFetching: false,
+    isFetchingItem: false,
+    isCreating: false,
+    isDeleting: false,
+  },
+};
+
+export const getters = {
+  getSLA(_state) {
+    return _state.records;
+  },
+  getUIFlags(_state) {
+    return _state.uiFlags;
+  },
+};
+
+export const actions = {
+  get: async function get({ commit }) {
+    commit(types.SET_SLA_UI_FLAG, { isFetching: true });
+    try {
+      const response = await SlaAPI.get();
+      commit(types.SET_SLA, response.data.payload);
+    } catch (error) {
+      // Ignore error
+    } finally {
+      commit(types.SET_SLA_UI_FLAG, { isFetching: false });
+    }
+  },
+
+  create: async function create({ commit }, slaObj) {
+    commit(types.SET_SLA_UI_FLAG, { isCreating: true });
+    try {
+      const response = await SlaAPI.create(slaObj);
+      AnalyticsHelper.track(SLA_EVENTS.CREATE);
+      commit(types.ADD_SLA, response.data.payload);
+    } catch (error) {
+      throwErrorMessage(error);
+    } finally {
+      commit(types.SET_SLA_UI_FLAG, { isCreating: false });
+    }
+  },
+
+  update: async function update({ commit }, { id, ...updateObj }) {
+    commit(types.SET_SLA_UI_FLAG, { isUpdating: true });
+    try {
+      const response = await SlaAPI.update(id, updateObj);
+      AnalyticsHelper.track(SLA_EVENTS.UPDATE);
+      commit(types.EDIT_SLA, response.data.payload);
+    } catch (error) {
+      throwErrorMessage(error);
+    } finally {
+      commit(types.SET_SLA_UI_FLAG, { isUpdating: false });
+    }
+  },
+};
+
+export const mutations = {
+  [types.SET_SLA_UI_FLAG](_state, data) {
+    _state.uiFlags = {
+      ..._state.uiFlags,
+      ...data,
+    };
+  },
+
+  [types.SET_SLA]: MutationHelpers.set,
+  [types.ADD_SLA]: MutationHelpers.create,
+  [types.EDIT_SLA]: MutationHelpers.update,
+};
+
+export default {
+  namespaced: true,
+  state,
+  getters,
+  actions,
+  mutations,
+};
diff --git a/app/javascript/dashboard/store/mutation-types.js b/app/javascript/dashboard/store/mutation-types.js
index 0d4f0c010..c9d2d1767 100644
--- a/app/javascript/dashboard/store/mutation-types.js
+++ b/app/javascript/dashboard/store/mutation-types.js
@@ -301,4 +301,11 @@ export default {
   SET_AUDIT_LOGS_UI_FLAG: 'SET_AUDIT_LOGS_UI_FLAG',
   SET_AUDIT_LOGS: 'SET_AUDIT_LOGS',
   SET_AUDIT_LOGS_META: 'SET_AUDIT_LOGS_META',
+
+  // SLA
+  SET_SLA_UI_FLAG: 'SET_SLA_UI_FLAG',
+  SET_SLA: 'SET_SLA',
+  ADD_SLA: 'ADD_SLA',
+  EDIT_SLA: 'EDIT_SLA',
+  DELETE_SLA: 'DELETE_SLA',
 };
diff --git a/config/features.yml b/config/features.yml
index 529ad37d9..f0477c297 100644
--- a/config/features.yml
+++ b/config/features.yml
@@ -66,3 +66,6 @@
   enabled: false
 - name: inbox_view
   enabled: false
+- name: sla
+  enabled: false
+  premium: true
diff --git a/enterprise/config/premium_features.yml b/enterprise/config/premium_features.yml
index 9628e1da4..18e5b15ba 100644
--- a/enterprise/config/premium_features.yml
+++ b/enterprise/config/premium_features.yml
@@ -2,3 +2,4 @@
 - disable_branding
 - audit_logs
 - response_bot
+- sla

From ebae547a6083c6b1b557f0f51bd75a565e73361f Mon Sep 17 00:00:00 2001
From: CristianDuta <cristian.duta90@gmail.com>
Date: Wed, 21 Feb 2024 13:11:20 +0100
Subject: [PATCH 24/96] feat: Add ability to resolve API channel conversations
 (#8348)

- Create a new endpoint to fetch a single conversation in client apis
- Create a new endpoint to resolve a single conversation in client apis
- Update swagger API definition to include missing endpoints

Fixes: #6329

Co-authored-by: Cristian Duta <Cristian.Duta@ti8m.ch>
---
 .../v1/inboxes/conversations_controller.rb    |  24 ++-
 .../inboxes/conversations/show.json.jbuilder  |   1 +
 .../conversations/toggle_status.json.jbuilder |   1 +
 config/routes.rb                              |   3 +-
 .../v1/inbox/conversations_controller_spec.rb |  39 +++++
 swagger/paths/index.yml                       |  33 +++-
 .../public/inboxes/conversations/show.yml     |  14 ++
 .../inboxes/conversations/toggle_status.yml   |  14 ++
 .../inboxes/conversations/toggle_typing.yml   |  18 +++
 .../conversations/update_last_seen.yml        |  12 ++
 swagger/swagger.json                          | 143 ++++++++++++++++++
 11 files changed, 298 insertions(+), 4 deletions(-)
 create mode 100644 app/views/public/api/v1/inboxes/conversations/show.json.jbuilder
 create mode 100644 app/views/public/api/v1/inboxes/conversations/toggle_status.json.jbuilder
 create mode 100644 swagger/paths/public/inboxes/conversations/show.yml
 create mode 100644 swagger/paths/public/inboxes/conversations/toggle_status.yml
 create mode 100644 swagger/paths/public/inboxes/conversations/toggle_typing.yml
 create mode 100644 swagger/paths/public/inboxes/conversations/update_last_seen.yml

diff --git a/app/controllers/public/api/v1/inboxes/conversations_controller.rb b/app/controllers/public/api/v1/inboxes/conversations_controller.rb
index 671863bdc..4e3b5dca9 100644
--- a/app/controllers/public/api/v1/inboxes/conversations_controller.rb
+++ b/app/controllers/public/api/v1/inboxes/conversations_controller.rb
@@ -1,15 +1,31 @@
 class Public::Api::V1::Inboxes::ConversationsController < Public::Api::V1::InboxesController
   include Events::Types
-  before_action :set_conversation, only: [:toggle_typing, :update_last_seen]
+  before_action :set_conversation, only: [:toggle_typing, :update_last_seen, :show, :toggle_status]
 
   def index
     @conversations = @contact_inbox.hmac_verified? ? @contact.conversations : @contact_inbox.conversations
   end
 
+  def show; end
+
   def create
     @conversation = create_conversation
   end
 
+  def toggle_status
+    # Check if the conversation is already resolved to prevent redundant operations
+    return if @conversation.resolved?
+
+    # Assign the conversation's contact as the resolver
+    # This step attributes the resolution action to the contact involved in the conversation
+    # If this assignment is not made, the system implicitly becomes the resolver by default
+    Current.contact = @conversation.contact
+
+    # Update the conversation's status to 'resolved' to reflect its closure
+    @conversation.status = :resolved
+    @conversation.save!
+  end
+
   def toggle_typing
     case params[:typing_status]
     when 'on'
@@ -30,7 +46,11 @@ class Public::Api::V1::Inboxes::ConversationsController < Public::Api::V1::Inbox
   private
 
   def set_conversation
-    @conversation = @contact_inbox.contact.conversations.find_by!(display_id: params[:id])
+    @conversation = if @contact_inbox.hmac_verified?
+                      @contact_inbox.contact.conversations.find_by!(display_id: params[:id])
+                    else
+                      @contact_inbox.conversations.find_by!(display_id: params[:id])
+                    end
   end
 
   def create_conversation
diff --git a/app/views/public/api/v1/inboxes/conversations/show.json.jbuilder b/app/views/public/api/v1/inboxes/conversations/show.json.jbuilder
new file mode 100644
index 000000000..1b9588465
--- /dev/null
+++ b/app/views/public/api/v1/inboxes/conversations/show.json.jbuilder
@@ -0,0 +1 @@
+json.partial! 'public/api/v1/models/conversation', formats: [:json], resource: @conversation
diff --git a/app/views/public/api/v1/inboxes/conversations/toggle_status.json.jbuilder b/app/views/public/api/v1/inboxes/conversations/toggle_status.json.jbuilder
new file mode 100644
index 000000000..1b9588465
--- /dev/null
+++ b/app/views/public/api/v1/inboxes/conversations/toggle_status.json.jbuilder
@@ -0,0 +1 @@
+json.partial! 'public/api/v1/models/conversation', formats: [:json], resource: @conversation
diff --git a/config/routes.rb b/config/routes.rb
index 8c4d4124b..1ee74145f 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -366,8 +366,9 @@ Rails.application.routes.draw do
         resources :inboxes do
           scope module: :inboxes do
             resources :contacts, only: [:create, :show, :update] do
-              resources :conversations, only: [:index, :create] do
+              resources :conversations, only: [:index, :create, :show] do
                 member do
+                  post :toggle_status
                   post :toggle_typing
                   post :update_last_seen
                 end
diff --git a/spec/controllers/public/api/v1/inbox/conversations_controller_spec.rb b/spec/controllers/public/api/v1/inbox/conversations_controller_spec.rb
index d54f26272..2b2bdefc3 100644
--- a/spec/controllers/public/api/v1/inbox/conversations_controller_spec.rb
+++ b/spec/controllers/public/api/v1/inbox/conversations_controller_spec.rb
@@ -36,6 +36,45 @@ RSpec.describe 'Public Inbox Contact Conversations API', type: :request do
     end
   end
 
+  describe 'GET /public/api/v1/inboxes/{identifier}/contact/{source_id}/conversations/{conversation_id}' do
+    it 'returns the conversation that the contact has access to' do
+      conversation = create(:conversation, contact_inbox: contact_inbox)
+      create(:message, account: conversation.account, inbox: conversation.inbox, conversation: conversation, content: 'message-1')
+      create(:message, account: conversation.account, inbox: conversation.inbox, conversation: conversation, content: 'message-2')
+
+      get "/public/api/v1/inboxes/#{api_channel.identifier}/contacts/#{contact_inbox.source_id}/conversations/#{conversation.display_id}"
+
+      expect(response).to have_http_status(:success)
+      data = response.parsed_body
+      expect(data['id']).to eq(conversation.display_id)
+      expect(data['messages']).to be_a(Array)
+      expect(data['messages'].length).to eq(conversation.messages.count)
+      expect(data['messages'].pluck('content')).to include(conversation.messages.first.content)
+    end
+  end
+
+  describe 'POST /public/api/v1/inboxes/{identifier}/contact/{source_id}/conversations/{conversation_id}/toggle_status' do
+    it 'resolves the conversation' do
+      conversation = create(:conversation, contact_inbox: contact_inbox)
+      display_id = conversation.display_id
+
+      post "/public/api/v1/inboxes/#{api_channel.identifier}/contacts/#{contact_inbox.source_id}/conversations/#{display_id}/toggle_status"
+
+      expect(response).to have_http_status(:success)
+      expect(conversation.reload).to be_resolved
+    end
+
+    it 'does not resolve a conversation that is already resolved' do
+      conversation = create(:conversation, contact_inbox: contact_inbox, status: :resolved)
+      display_id = conversation.display_id
+
+      post "/public/api/v1/inboxes/#{api_channel.identifier}/contacts/#{contact_inbox.source_id}/conversations/#{display_id}/toggle_status"
+
+      expect(response).to have_http_status(:success)
+      expect(Conversation.where(id: conversation.id, status: :resolved).count).to eq(1)
+    end
+  end
+
   describe 'POST /public/api/v1/inboxes/{identifier}/contact/{source_id}/conversations' do
     it 'creates a conversation for that contact' do
       post "/public/api/v1/inboxes/#{api_channel.identifier}/contacts/#{contact_inbox.source_id}/conversations"
diff --git a/swagger/paths/index.yml b/swagger/paths/index.yml
index d58439647..2c6dd3f87 100644
--- a/swagger/paths/index.yml
+++ b/swagger/paths/index.yml
@@ -94,7 +94,6 @@
   patch:
     $ref: ./public/inboxes/contacts/update.yml
 
-
 /public/api/v1/inboxes/{inbox_identifier}/contacts/{contact_identifier}/conversations:
   parameters:
     - $ref: '#/parameters/public_inbox_identifier'
@@ -104,6 +103,38 @@
   get:
     $ref: ./public/inboxes/conversations/index.yml
 
+/public/api/v1/inboxes/{inbox_identifier}/contacts/{contact_identifier}/conversations/{conversation_id}:
+  parameters:
+    - $ref: '#/parameters/public_inbox_identifier'
+    - $ref: '#/parameters/public_contact_identifier'
+    - $ref: '#/parameters/conversation_id'
+  get:
+    $ref: ./public/inboxes/conversations/show.yml
+
+/public/api/v1/inboxes/{inbox_identifier}/contacts/{contact_identifier}/conversations/{conversation_id}/toggle_status:
+  parameters:
+    - $ref: '#/parameters/public_inbox_identifier'
+    - $ref: '#/parameters/public_contact_identifier'
+    - $ref: '#/parameters/conversation_id'
+  post:
+    $ref: ./public/inboxes/conversations/toggle_status.yml
+
+/public/api/v1/inboxes/{inbox_identifier}/contacts/{contact_identifier}/conversations/{conversation_id}/toggle_typing:
+  parameters:
+    - $ref: '#/parameters/public_inbox_identifier'
+    - $ref: '#/parameters/public_contact_identifier'
+    - $ref: '#/parameters/conversation_id'
+  post:
+    $ref: ./public/inboxes/conversations/toggle_typing.yml
+
+/public/api/v1/inboxes/{inbox_identifier}/contacts/{contact_identifier}/conversations/{conversation_id}/update_last_seen:
+  parameters:
+    - $ref: '#/parameters/public_inbox_identifier'
+    - $ref: '#/parameters/public_contact_identifier'
+    - $ref: '#/parameters/conversation_id'
+  post:
+    $ref: ./public/inboxes/conversations/update_last_seen.yml
+
 /public/api/v1/inboxes/{inbox_identifier}/contacts/{contact_identifier}/conversations/{conversation_id}/messages:
   parameters:
     - $ref: '#/parameters/public_inbox_identifier'
diff --git a/swagger/paths/public/inboxes/conversations/show.yml b/swagger/paths/public/inboxes/conversations/show.yml
new file mode 100644
index 000000000..2ec6caa63
--- /dev/null
+++ b/swagger/paths/public/inboxes/conversations/show.yml
@@ -0,0 +1,14 @@
+tags:
+  - Conversations API
+operationId: get-single-conversation
+summary: Get a single conversation
+description: Retrieves the details of a specific conversation
+responses:
+  200:
+    description: Success
+    schema:
+      $ref: '#/definitions/public_conversation'
+  401:
+    description: Unauthorized
+  404:
+    description: Conversation not found
diff --git a/swagger/paths/public/inboxes/conversations/toggle_status.yml b/swagger/paths/public/inboxes/conversations/toggle_status.yml
new file mode 100644
index 000000000..cac1c3d8d
--- /dev/null
+++ b/swagger/paths/public/inboxes/conversations/toggle_status.yml
@@ -0,0 +1,14 @@
+tags:
+  - Conversations API
+operationId: resolve-conversation
+summary: Resolve a conversation
+description: Marks a conversation as resolved
+responses:
+  200:
+    description: Conversation resolved successfully
+    schema:
+      $ref: '#/definitions/public_conversation'
+  401:
+    description: Unauthorized
+  404:
+    description: Conversation not found
diff --git a/swagger/paths/public/inboxes/conversations/toggle_typing.yml b/swagger/paths/public/inboxes/conversations/toggle_typing.yml
new file mode 100644
index 000000000..af01c77f6
--- /dev/null
+++ b/swagger/paths/public/inboxes/conversations/toggle_typing.yml
@@ -0,0 +1,18 @@
+tags:
+  - Conversations API
+operationId: toggle-typing-status
+summary: Toggle typing status
+description: Toggles the typing status in a conversation
+parameters:
+  - name: typing_status
+    in: query
+    required: true
+    type: string
+    description: Typing status, either 'on' or 'off'
+responses:
+  200:
+    description: Typing status toggled successfully
+  401:
+    description: Unauthorized
+  404:
+    description: Conversation not found
diff --git a/swagger/paths/public/inboxes/conversations/update_last_seen.yml b/swagger/paths/public/inboxes/conversations/update_last_seen.yml
new file mode 100644
index 000000000..4e56aa11d
--- /dev/null
+++ b/swagger/paths/public/inboxes/conversations/update_last_seen.yml
@@ -0,0 +1,12 @@
+tags:
+  - Conversations API
+operationId: update-last-seen
+summary: Update last seen
+description: Updates the last seen time of the contact in a conversation
+responses:
+  200:
+    description: Last seen updated successfully
+  401:
+    description: Unauthorized
+  404:
+    description: Conversation not found
diff --git a/swagger/swagger.json b/swagger/swagger.json
index 4859a785f..dde7c5f01 100644
--- a/swagger/swagger.json
+++ b/swagger/swagger.json
@@ -894,6 +894,149 @@
         }
       }
     },
+    "/public/api/v1/inboxes/{inbox_identifier}/contacts/{contact_identifier}/conversations/{conversation_id}": {
+      "parameters": [
+        {
+          "$ref": "#/parameters/public_inbox_identifier"
+        },
+        {
+          "$ref": "#/parameters/public_contact_identifier"
+        },
+        {
+          "$ref": "#/parameters/conversation_id"
+        }
+      ],
+      "get": {
+        "tags": [
+          "Conversations API"
+        ],
+        "operationId": "get-single-conversation",
+        "summary": "Get a single conversation",
+        "description": "Retrieves the details of a specific conversation",
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "$ref": "#/definitions/public_conversation"
+            }
+          },
+          "401": {
+            "description": "Unauthorized"
+          },
+          "404": {
+            "description": "Conversation not found"
+          }
+        }
+      }
+    },
+    "/public/api/v1/inboxes/{inbox_identifier}/contacts/{contact_identifier}/conversations/{conversation_id}/toggle_status": {
+      "parameters": [
+        {
+          "$ref": "#/parameters/public_inbox_identifier"
+        },
+        {
+          "$ref": "#/parameters/public_contact_identifier"
+        },
+        {
+          "$ref": "#/parameters/conversation_id"
+        }
+      ],
+      "post": {
+        "tags": [
+          "Conversations API"
+        ],
+        "operationId": "resolve-conversation",
+        "summary": "Resolve a conversation",
+        "description": "Marks a conversation as resolved",
+        "responses": {
+          "200": {
+            "description": "Conversation resolved successfully",
+            "schema": {
+              "$ref": "#/definitions/public_conversation"
+            }
+          },
+          "401": {
+            "description": "Unauthorized"
+          },
+          "404": {
+            "description": "Conversation not found"
+          }
+        }
+      }
+    },
+    "/public/api/v1/inboxes/{inbox_identifier}/contacts/{contact_identifier}/conversations/{conversation_id}/toggle_typing": {
+      "parameters": [
+        {
+          "$ref": "#/parameters/public_inbox_identifier"
+        },
+        {
+          "$ref": "#/parameters/public_contact_identifier"
+        },
+        {
+          "$ref": "#/parameters/conversation_id"
+        }
+      ],
+      "post": {
+        "tags": [
+          "Conversations API"
+        ],
+        "operationId": "toggle-typing-status",
+        "summary": "Toggle typing status",
+        "description": "Toggles the typing status in a conversation",
+        "parameters": [
+          {
+            "name": "typing_status",
+            "in": "query",
+            "required": true,
+            "type": "string",
+            "description": "Typing status, either 'on' or 'off'"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Typing status toggled successfully"
+          },
+          "401": {
+            "description": "Unauthorized"
+          },
+          "404": {
+            "description": "Conversation not found"
+          }
+        }
+      }
+    },
+    "/public/api/v1/inboxes/{inbox_identifier}/contacts/{contact_identifier}/conversations/{conversation_id}/update_last_seen": {
+      "parameters": [
+        {
+          "$ref": "#/parameters/public_inbox_identifier"
+        },
+        {
+          "$ref": "#/parameters/public_contact_identifier"
+        },
+        {
+          "$ref": "#/parameters/conversation_id"
+        }
+      ],
+      "post": {
+        "tags": [
+          "Conversations API"
+        ],
+        "operationId": "update-last-seen",
+        "summary": "Update last seen",
+        "description": "Updates the last seen time of the contact in a conversation",
+        "responses": {
+          "200": {
+            "description": "Last seen updated successfully"
+          },
+          "401": {
+            "description": "Unauthorized"
+          },
+          "404": {
+            "description": "Conversation not found"
+          }
+        }
+      }
+    },
     "/public/api/v1/inboxes/{inbox_identifier}/contacts/{contact_identifier}/conversations/{conversation_id}/messages": {
       "parameters": [
         {

From c031cb19d26595377bb15b9c1cd9e3fa02d74366 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Wed, 21 Feb 2024 18:51:00 +0530
Subject: [PATCH 25/96] fix: downcase email before finding (#8921)

* fix: downcase email when finding

* feat: add `from_email` class

* refactor: use `from_email`

* feat: add rule to disallow find_by email directly

* chore:  remove redundant test

Since the previous imlpmentation didn't do a case-insentive search, a new user would be created, and the error would be raised at the DB layer. With the new changes, this test case is redundant

* refactor: use from_email
---
 .rubocop.yml                                     |  5 +++++
 app/actions/contact_identify_action.rb           |  2 +-
 app/builders/agent_builder.rb                    |  2 +-
 .../contact_inbox_with_contact_builder.rb        |  2 +-
 .../devise_overrides/passwords_controller.rb     |  2 +-
 .../devise_overrides/sessions_controller.rb      |  2 +-
 .../platform/api/v1/users_controller.rb          |  2 +-
 app/mailboxes/imap/imap_mailbox.rb               |  2 +-
 app/mailboxes/support_mailbox.rb                 |  2 +-
 app/models/contact.rb                            |  6 ++++++
 app/models/user.rb                               |  6 ++++++
 app/services/data_import/contact_manager.rb      |  2 +-
 lib/integrations/slack/slack_message_helper.rb   |  2 +-
 lib/rubocop/user_find_by.rb                      | 16 ++++++++++++++++
 lib/seeders/account_seeder.rb                    |  4 ++--
 .../platform/api/v1/users_controller_spec.rb     |  5 -----
 spec/jobs/data_import_job_spec.rb                |  2 +-
 17 files changed, 46 insertions(+), 18 deletions(-)
 create mode 100644 lib/rubocop/user_find_by.rb

diff --git a/.rubocop.yml b/.rubocop.yml
index 5add6e26a..f4187dbb5 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -2,6 +2,7 @@ require:
   - rubocop-performance
   - rubocop-rails
   - rubocop-rspec
+  - ./lib/rubocop/user_find_by.rb
 
 Layout/LineLength:
   Max: 150
@@ -140,6 +141,10 @@ RSpec/MultipleExpectations:
 RSpec/MultipleMemoizedHelpers:
   Max: 14
 
+# custom rules
+UseFromEmail:
+  Enabled: true
+
 AllCops:
   NewCops: enable
   Exclude:
diff --git a/app/actions/contact_identify_action.rb b/app/actions/contact_identify_action.rb
index 6b2f37433..a88d3535b 100644
--- a/app/actions/contact_identify_action.rb
+++ b/app/actions/contact_identify_action.rb
@@ -59,7 +59,7 @@ class ContactIdentifyAction
   def existing_email_contact
     return if params[:email].blank?
 
-    @existing_email_contact ||= account.contacts.find_by(email: params[:email])
+    @existing_email_contact ||= account.contacts.from_email(params[:email])
   end
 
   def existing_phone_number_contact
diff --git a/app/builders/agent_builder.rb b/app/builders/agent_builder.rb
index 6ea68821d..07b0e7345 100644
--- a/app/builders/agent_builder.rb
+++ b/app/builders/agent_builder.rb
@@ -27,7 +27,7 @@ class AgentBuilder
   # Finds a user by email or creates a new one with a temporary password.
   # @return [User] the found or created user.
   def find_or_create_user
-    user = User.find_by(email: email)
+    user = User.from_email(email)
     return user if user
 
     temp_password = "1!aA#{SecureRandom.alphanumeric(12)}"
diff --git a/app/builders/contact_inbox_with_contact_builder.rb b/app/builders/contact_inbox_with_contact_builder.rb
index d97f64cfe..6e913eda8 100644
--- a/app/builders/contact_inbox_with_contact_builder.rb
+++ b/app/builders/contact_inbox_with_contact_builder.rb
@@ -75,7 +75,7 @@ class ContactInboxWithContactBuilder
   def find_contact_by_email(email)
     return if email.blank?
 
-    account.contacts.find_by(email: email.downcase)
+    account.contacts.from_email(email)
   end
 
   def find_contact_by_phone_number(phone_number)
diff --git a/app/controllers/devise_overrides/passwords_controller.rb b/app/controllers/devise_overrides/passwords_controller.rb
index 26a9d4555..17dd32086 100644
--- a/app/controllers/devise_overrides/passwords_controller.rb
+++ b/app/controllers/devise_overrides/passwords_controller.rb
@@ -5,7 +5,7 @@ class DeviseOverrides::PasswordsController < Devise::PasswordsController
   skip_before_action :authenticate_user!, raise: false
 
   def create
-    @user = User.find_by(email: params[:email])
+    @user = User.from_email(params[:email])
     if @user
       @user.send_reset_password_instructions
       build_response(I18n.t('messages.reset_password_success'), 200)
diff --git a/app/controllers/devise_overrides/sessions_controller.rb b/app/controllers/devise_overrides/sessions_controller.rb
index 2659aeebf..e623e52f7 100644
--- a/app/controllers/devise_overrides/sessions_controller.rb
+++ b/app/controllers/devise_overrides/sessions_controller.rb
@@ -33,7 +33,7 @@ class DeviseOverrides::SessionsController < DeviseTokenAuth::SessionsController
   def process_sso_auth_token
     return if params[:email].blank?
 
-    user = User.find_by(email: params[:email])
+    user = User.from_email(params[:email])
     @resource = user if user&.valid_sso_auth_token?(params[:sso_auth_token])
   end
 end
diff --git a/app/controllers/platform/api/v1/users_controller.rb b/app/controllers/platform/api/v1/users_controller.rb
index 03ed55754..453e475b0 100644
--- a/app/controllers/platform/api/v1/users_controller.rb
+++ b/app/controllers/platform/api/v1/users_controller.rb
@@ -8,7 +8,7 @@ class Platform::Api::V1::UsersController < PlatformController
   def show; end
 
   def create
-    @resource = (User.find_by(email: user_params[:email]) || User.new(user_params))
+    @resource = (User.from_email(user_params[:email]) || User.new(user_params))
     @resource.skip_confirmation!
     @resource.save!
     @platform_app.platform_app_permissibles.find_or_create_by!(permissible: @resource)
diff --git a/app/mailboxes/imap/imap_mailbox.rb b/app/mailboxes/imap/imap_mailbox.rb
index 57d30253a..a8308b48a 100644
--- a/app/mailboxes/imap/imap_mailbox.rb
+++ b/app/mailboxes/imap/imap_mailbox.rb
@@ -91,7 +91,7 @@ class Imap::ImapMailbox
   end
 
   def find_or_create_contact
-    @contact = @inbox.contacts.find_by(email: @processed_mail.original_sender)
+    @contact = @inbox.contacts.from_email(@processed_mail.original_sender)
     if @contact.present?
       @contact_inbox = ContactInbox.find_by(inbox: @inbox, contact: @contact)
     else
diff --git a/app/mailboxes/support_mailbox.rb b/app/mailboxes/support_mailbox.rb
index 5a1f5ecf5..94404d8ed 100644
--- a/app/mailboxes/support_mailbox.rb
+++ b/app/mailboxes/support_mailbox.rb
@@ -86,7 +86,7 @@ class SupportMailbox < ApplicationMailbox
   end
 
   def find_or_create_contact
-    @contact = @inbox.contacts.find_by(email: original_sender_email)
+    @contact = @inbox.contacts.from_email(original_sender_email)
     if @contact.present?
       @contact_inbox = ContactInbox.find_by(inbox: @inbox, contact: @contact)
     else
diff --git a/app/models/contact.rb b/app/models/contact.rb
index af3f605a7..23eca55e6 100644
--- a/app/models/contact.rb
+++ b/app/models/contact.rb
@@ -165,6 +165,12 @@ class Contact < ApplicationRecord
     email_format
   end
 
+  def self.from_email(email)
+    # rubocop:disable UseFromEmail,Migration/DepartmentName
+    find_by(email: email.downcase)
+    # rubocop:enable UseFromEmail,Migration/DepartmentName
+  end
+
   private
 
   def ip_lookup
diff --git a/app/models/user.rb b/app/models/user.rb
index ba638f637..b54f74a64 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -156,6 +156,12 @@ class User < ApplicationRecord
     mutations_from_database.changed?('email')
   end
 
+  def self.from_email(email)
+    # rubocop:disable UseFromEmail,Migration/DepartmentName
+    find_by(email: email.downcase)
+    # rubocop:enable UseFromEmail,Migration/DepartmentName
+  end
+
   private
 
   def remove_macros
diff --git a/app/services/data_import/contact_manager.rb b/app/services/data_import/contact_manager.rb
index ab9a1ee70..460a83726 100644
--- a/app/services/data_import/contact_manager.rb
+++ b/app/services/data_import/contact_manager.rb
@@ -35,7 +35,7 @@ class DataImport::ContactManager
   def find_contact_by_email(params)
     return unless params[:email]
 
-    @account.contacts.find_by(email: params[:email])
+    @account.contacts.from_email(params[:email])
   end
 
   def find_contact_by_phone_number(params)
diff --git a/lib/integrations/slack/slack_message_helper.rb b/lib/integrations/slack/slack_message_helper.rb
index 9522112a8..762d488c5 100644
--- a/lib/integrations/slack/slack_message_helper.rb
+++ b/lib/integrations/slack/slack_message_helper.rb
@@ -69,7 +69,7 @@ module Integrations::Slack::SlackMessageHelper
 
   def sender
     user_email = slack_client.users_info(user: params[:event][:user])[:user][:profile][:email]
-    conversation.account.users.find_by(email: user_email)
+    conversation.account.users.from_email(user_email)
   end
 
   def private_note?
diff --git a/lib/rubocop/user_find_by.rb b/lib/rubocop/user_find_by.rb
new file mode 100644
index 000000000..0bc248c27
--- /dev/null
+++ b/lib/rubocop/user_find_by.rb
@@ -0,0 +1,16 @@
+require 'rubocop'
+
+# Enforces use of from_email for email attribute lookups
+class UseFromEmail < RuboCop::Cop::Cop
+  MSG = 'Use `from_email` for email lookups to ensure case insensitivity.'.freeze
+
+  def_node_matcher :find_by_email?, <<~PATTERN
+    (send _ :find_by (hash (pair (sym :email) _)))
+  PATTERN
+
+  def on_send(node)
+    return unless find_by_email?(node)
+
+    add_offense(node, message: MSG)
+  end
+end
diff --git a/lib/seeders/account_seeder.rb b/lib/seeders/account_seeder.rb
index 9793ffd1d..802a02dbf 100644
--- a/lib/seeders/account_seeder.rb
+++ b/lib/seeders/account_seeder.rb
@@ -88,7 +88,7 @@ class Seeders::AccountSeeder
   end
 
   def create_conversation(contact_inbox:, conversation_data:)
-    assignee = User.find_by(email: conversation_data['assignee']) if conversation_data['assignee'].present?
+    assignee = User.from_email(conversation_data['assignee']) if conversation_data['assignee'].present?
     conversation = contact_inbox.conversations.create!(account: contact_inbox.inbox.account, contact: contact_inbox.contact,
                                                        inbox: contact_inbox.inbox, assignee: assignee)
     create_messages(conversation: conversation, messages: conversation_data['messages'])
@@ -111,7 +111,7 @@ class Seeders::AccountSeeder
     if message_data['message_type'] == 'incoming'
       conversation.contact
     elsif message_data['sender'].present?
-      User.find_by(email: message_data['sender'])
+      User.from_email(message_data['sender'])
     end
   end
 
diff --git a/spec/controllers/platform/api/v1/users_controller_spec.rb b/spec/controllers/platform/api/v1/users_controller_spec.rb
index 2ebb0d1a4..95d6cd452 100644
--- a/spec/controllers/platform/api/v1/users_controller_spec.rb
+++ b/spec/controllers/platform/api/v1/users_controller_spec.rb
@@ -115,11 +115,6 @@ RSpec.describe 'Platform Users API', type: :request do
           )
         )
         expect(platform_app.platform_app_permissibles.first.permissible_id).to eq data['id']
-
-        post '/platform/api/v1/users/', params: { name: 'test', email: 'TesT@test.com', password: 'Password1!' },
-                                        headers: { api_access_token: platform_app.access_token.token }, as: :json
-        data = response.parsed_body
-        expect(data['message']).to eq('Email has already been taken')
       end
 
       it 'fetch existing user and creates permissible for the user' do
diff --git a/spec/jobs/data_import_job_spec.rb b/spec/jobs/data_import_job_spec.rb
index 5ece07e53..fb1057f4a 100644
--- a/spec/jobs/data_import_job_spec.rb
+++ b/spec/jobs/data_import_job_spec.rb
@@ -111,7 +111,7 @@ RSpec.describe DataImportJob do
 
           described_class.perform_now(existing_data_import)
           expect(existing_data_import.account.contacts.count).to eq(csv_length)
-          contact = Contact.find_by(email: csv_data[0]['email'])
+          contact = Contact.from_email(csv_data[0]['email'])
           expect(contact).to be_present
           expect(contact.phone_number).to eq("+#{csv_data[0]['phone_number']}")
           expect(contact.name).to eq((csv_data[0]['name']).to_s)

From ae4c8d818fe038aff5e1dac5fc6ea457c48f4851 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Thu, 22 Feb 2024 03:48:42 +0530
Subject: [PATCH 26/96] feat: Ability to block contacts permanently (#8922)

Co-authored-by: Pranav <pranav@chatwoot.com>
---
 .../api/v1/accounts/contacts_controller.rb    |  2 +-
 .../conversation/specs/MoreActions.spec.js    |  4 ++--
 .../dashboard/i18n/locale/en/contact.json     |  8 +++----
 .../concerns/conversation_mute_helpers.rb     | 16 +++-----------
 app/models/contact.rb                         |  2 ++
 app/models/conversation.rb                    |  7 ++++--
 .../20240213131252_add_blocked_to_contacts.rb |  6 +++++
 db/schema.rb                                  |  3 +++
 .../v1/accounts/contacts_controller_spec.rb   | 21 ++++++++++++++++++
 spec/models/conversation_spec.rb              | 22 ++++++++++++++-----
 10 files changed, 63 insertions(+), 28 deletions(-)
 create mode 100644 db/migrate/20240213131252_add_blocked_to_contacts.rb

diff --git a/app/controllers/api/v1/accounts/contacts_controller.rb b/app/controllers/api/v1/accounts/contacts_controller.rb
index 98683ea25..71e9100e7 100644
--- a/app/controllers/api/v1/accounts/contacts_controller.rb
+++ b/app/controllers/api/v1/accounts/contacts_controller.rb
@@ -148,7 +148,7 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
   end
 
   def permitted_params
-    params.permit(:name, :identifier, :email, :phone_number, :avatar, :avatar_url, additional_attributes: {}, custom_attributes: {})
+    params.permit(:name, :identifier, :email, :phone_number, :avatar, :blocked, :avatar_url, additional_attributes: {}, custom_attributes: {})
   end
 
   def contact_custom_attributes
diff --git a/app/javascript/dashboard/components/widgets/conversation/specs/MoreActions.spec.js b/app/javascript/dashboard/components/widgets/conversation/specs/MoreActions.spec.js
index dafe97cba..df3c85f1f 100644
--- a/app/javascript/dashboard/components/widgets/conversation/specs/MoreActions.spec.js
+++ b/app/javascript/dashboard/components/widgets/conversation/specs/MoreActions.spec.js
@@ -78,7 +78,7 @@ describe('MoveActions', () => {
 
       expect(window.bus.$emit).toBeCalledWith(
         'newToastMessage',
-        'This conversation is muted for 6 hours',
+        'This contact is blocked successfully. You will not be notified of any future conversations.',
         undefined
       );
     });
@@ -104,7 +104,7 @@ describe('MoveActions', () => {
 
       expect(window.bus.$emit).toBeCalledWith(
         'newToastMessage',
-        'This conversation is unmuted',
+        'This contact is unblocked successfully.',
         undefined
       );
     });
diff --git a/app/javascript/dashboard/i18n/locale/en/contact.json b/app/javascript/dashboard/i18n/locale/en/contact.json
index cae908016..791279899 100644
--- a/app/javascript/dashboard/i18n/locale/en/contact.json
+++ b/app/javascript/dashboard/i18n/locale/en/contact.json
@@ -39,10 +39,10 @@
     },
     "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",
+    "MUTE_CONTACT": "Block Contact",
+    "UNMUTE_CONTACT": "Unblock Contact",
+    "MUTED_SUCCESS": "This contact is blocked successfully. You will not be notified of any future conversations.",
+    "UNMUTED_SUCCESS": "This contact is unblocked successfully.",
     "SEND_TRANSCRIPT": "Send Transcript",
     "EDIT_LABEL": "Edit",
     "SIDEBAR_SECTIONS": {
diff --git a/app/models/concerns/conversation_mute_helpers.rb b/app/models/concerns/conversation_mute_helpers.rb
index 525346869..c6ea4c7b1 100644
--- a/app/models/concerns/conversation_mute_helpers.rb
+++ b/app/models/concerns/conversation_mute_helpers.rb
@@ -3,26 +3,16 @@ module ConversationMuteHelpers
 
   def mute!
     resolved!
-    Redis::Alfred.setex(mute_key, 1, mute_period)
+    contact.update(blocked: true)
     create_muted_message
   end
 
   def unmute!
-    Redis::Alfred.delete(mute_key)
+    contact.update(blocked: false)
     create_unmuted_message
   end
 
   def muted?
-    Redis::Alfred.get(mute_key).present?
-  end
-
-  private
-
-  def mute_key
-    format(Redis::RedisKeys::CONVERSATION_MUTE_KEY, id: id)
-  end
-
-  def mute_period
-    6.hours
+    contact.blocked?
   end
 end
diff --git a/app/models/contact.rb b/app/models/contact.rb
index 23eca55e6..07b29fdf3 100644
--- a/app/models/contact.rb
+++ b/app/models/contact.rb
@@ -6,6 +6,7 @@
 #
 #  id                    :integer          not null, primary key
 #  additional_attributes :jsonb
+#  blocked               :boolean          default(FALSE), not null
 #  contact_type          :integer          default("visitor")
 #  country_code          :string           default("")
 #  custom_attributes     :jsonb
@@ -24,6 +25,7 @@
 # Indexes
 #
 #  index_contacts_on_account_id                          (account_id)
+#  index_contacts_on_blocked                             (blocked)
 #  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_nonempty_fields                     (account_id,email,phone_number,identifier) WHERE (((email)::text <> ''::text) OR ((phone_number)::text <> ''::text) OR ((identifier)::text <> ''::text))
diff --git a/app/models/conversation.rb b/app/models/conversation.rb
index fb2ae8b77..72518f250 100644
--- a/app/models/conversation.rb
+++ b/app/models/conversation.rb
@@ -61,6 +61,7 @@ class Conversation < ApplicationRecord
 
   validates :account_id, presence: true
   validates :inbox_id, presence: true
+  validates :contact_id, presence: true
   before_validation :validate_additional_attributes
   validates :additional_attributes, jsonb_attributes_length: true
   validates :custom_attributes, jsonb_attributes_length: true
@@ -103,7 +104,7 @@ class Conversation < ApplicationRecord
   has_many :attachments, through: :messages
 
   before_save :ensure_snooze_until_reset
-  before_create :mark_conversation_pending_if_bot
+  before_create :determine_conversation_status
   before_create :ensure_waiting_since
 
   after_update_commit :execute_after_update_commit_callbacks
@@ -226,7 +227,9 @@ class Conversation < ApplicationRecord
     self.additional_attributes = {} unless additional_attributes.is_a?(Hash)
   end
 
-  def mark_conversation_pending_if_bot
+  def determine_conversation_status
+    self.status = :resolved and return if contact.blocked?
+
     # Message template hooks aren't executed for conversations from campaigns
     # So making these conversations open for agent visibility
     return if campaign.present?
diff --git a/db/migrate/20240213131252_add_blocked_to_contacts.rb b/db/migrate/20240213131252_add_blocked_to_contacts.rb
new file mode 100644
index 000000000..6d37484e4
--- /dev/null
+++ b/db/migrate/20240213131252_add_blocked_to_contacts.rb
@@ -0,0 +1,6 @@
+class AddBlockedToContacts < ActiveRecord::Migration[7.0]
+  def change
+    add_column :contacts, :blocked, :boolean, default: false, null: false
+    add_index :contacts, :blocked
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 546df444f..775e67f96 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,6 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
+
 ActiveRecord::Schema[7.0].define(version: 2024_02_16_055809) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_stat_statements"
@@ -423,10 +424,12 @@ ActiveRecord::Schema[7.0].define(version: 2024_02_16_055809) do
     t.string "last_name", default: ""
     t.string "location", default: ""
     t.string "country_code", default: ""
+    t.boolean "blocked", default: false, null: false
     t.index "lower((email)::text), account_id", name: "index_contacts_on_lower_email_account_id"
     t.index ["account_id", "email", "phone_number", "identifier"], name: "index_contacts_on_nonempty_fields", where: "(((email)::text <> ''::text) OR ((phone_number)::text <> ''::text) OR ((identifier)::text <> ''::text))"
     t.index ["account_id"], name: "index_contacts_on_account_id"
     t.index ["account_id"], name: "index_resolved_contact_account_id", where: "(((email)::text <> ''::text) OR ((phone_number)::text <> ''::text) OR ((identifier)::text <> ''::text))"
+    t.index ["blocked"], name: "index_contacts_on_blocked"
     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
     t.index ["name", "email", "phone_number", "identifier"], name: "index_contacts_on_name_email_phone_number_identifier", opclass: :gin_trgm_ops, using: :gin
diff --git a/spec/controllers/api/v1/accounts/contacts_controller_spec.rb b/spec/controllers/api/v1/accounts/contacts_controller_spec.rb
index 21511310b..d2527e6a9 100644
--- a/spec/controllers/api/v1/accounts/contacts_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/contacts_controller_spec.rb
@@ -557,6 +557,27 @@ RSpec.describe 'Contacts API', type: :request do
         expect(response).to have_http_status(:success)
         expect(Avatar::AvatarFromUrlJob).to have_been_enqueued.with(contact, 'http://example.com/avatar.png')
       end
+
+      it 'allows blocking of contact' do
+        patch "/api/v1/accounts/#{account.id}/contacts/#{contact.id}",
+              params: { blocked: true },
+              headers: admin.create_new_auth_token,
+              as: :json
+
+        expect(response).to have_http_status(:success)
+        expect(contact.reload.blocked).to be(true)
+      end
+
+      it 'allows unblocking of contact' do
+        contact.update(blocked: true)
+        patch "/api/v1/accounts/#{account.id}/contacts/#{contact.id}",
+              params: { blocked: false },
+              headers: admin.create_new_auth_token,
+              as: :json
+
+        expect(response).to have_http_status(:success)
+        expect(contact.reload.blocked).to be(false)
+      end
     end
   end
 
diff --git a/spec/models/conversation_spec.rb b/spec/models/conversation_spec.rb
index efeda965d..2f79b08f2 100644
--- a/spec/models/conversation_spec.rb
+++ b/spec/models/conversation_spec.rb
@@ -372,9 +372,9 @@ RSpec.describe Conversation do
       expect(conversation.reload.resolved?).to be(true)
     end
 
-    it 'marks conversation as muted in redis' do
+    it 'blocks the contact' do
       mute!
-      expect(Redis::Alfred.get(conversation.send(:mute_key))).not_to be_nil
+      expect(conversation.reload.contact.blocked?).to be(true)
     end
 
     it 'creates mute message' do
@@ -400,10 +400,9 @@ RSpec.describe Conversation do
       expect { unmute! }.not_to(change { conversation.reload.status })
     end
 
-    it 'marks conversation as muted in redis' do
-      expect { unmute! }
-        .to change { Redis::Alfred.get(conversation.send(:mute_key)) }
-        .to nil
+    it 'unblocks the contact' do
+      unmute!
+      expect(conversation.reload.contact.blocked?).to be(false)
     end
 
     it 'creates unmute message' do
@@ -549,6 +548,17 @@ RSpec.describe Conversation do
     end
   end
 
+  describe 'when conversation is created by blocked contact' do
+    let(:account) { create(:account) }
+    let(:blocked_contact) { create(:contact, account: account, blocked: true) }
+    let(:inbox) { create(:inbox, account: account) }
+
+    it 'creates conversation in resolved state' do
+      conversation = create(:conversation, account: account, contact: blocked_contact, inbox: inbox)
+      expect(conversation.status).to eq('resolved')
+    end
+  end
+
   describe '#botinbox: when conversation created inside inbox with agent bot' do
     let!(:bot_inbox) { create(:agent_bot_inbox) }
     let(:conversation) { create(:conversation, inbox: bot_inbox.inbox) }

From 27ac262a269b09e0153e5cd23bd8bf34548ac68c Mon Sep 17 00:00:00 2001
From: Vishnu Narayanan <iamwishnu@gmail.com>
Date: Thu, 22 Feb 2024 04:15:43 +0530
Subject: [PATCH 27/96] feat(ee): Add support for SLA in automation rules
 (#8910)

Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
---
 .../dashboard/helper/automationHelper.js      |  9 +++-
 .../mixins/automations/methodsMixin.js        | 12 +++++-
 .../settings/automation/AddAutomationRule.vue | 17 +++++++-
 .../automation/EditAutomationRule.vue         | 17 +++++++-
 .../dashboard/settings/automation/Index.vue   |  6 +++
 .../settings/automation/constants.js          |  5 +++
 .../routes/dashboard/settings/sla/Index.vue   | 16 ++++++-
 .../shared/mixins/specs/automationFixtures.js | 42 +++++++++++++++++++
 .../mixins/specs/automationMixin.spec.js      |  7 ++++
 9 files changed, 125 insertions(+), 6 deletions(-)

diff --git a/app/javascript/dashboard/helper/automationHelper.js b/app/javascript/dashboard/helper/automationHelper.js
index d1a85570b..665e8faf6 100644
--- a/app/javascript/dashboard/helper/automationHelper.js
+++ b/app/javascript/dashboard/helper/automationHelper.js
@@ -129,7 +129,13 @@ export const agentList = agents => [
   ...(agents || []),
 ];
 
-export const getActionOptions = ({ agents, teams, labels, type }) => {
+export const getActionOptions = ({
+  agents,
+  teams,
+  labels,
+  slaPolicies,
+  type,
+}) => {
   const actionsMap = {
     assign_agent: agentList(agents),
     assign_team: teams,
@@ -137,6 +143,7 @@ export const getActionOptions = ({ agents, teams, labels, type }) => {
     add_label: generateConditionOptions(labels, 'title'),
     remove_label: generateConditionOptions(labels, 'title'),
     change_priority: PRIORITY_CONDITION_VALUES,
+    add_sla: slaPolicies,
   };
   return actionsMap[type];
 };
diff --git a/app/javascript/dashboard/mixins/automations/methodsMixin.js b/app/javascript/dashboard/mixins/automations/methodsMixin.js
index de108910a..a7e8d8120 100644
--- a/app/javascript/dashboard/mixins/automations/methodsMixin.js
+++ b/app/javascript/dashboard/mixins/automations/methodsMixin.js
@@ -27,6 +27,7 @@ export default {
       inboxes: 'inboxes/getInboxes',
       labels: 'labels/getLabels',
       teams: 'teams/getTeams',
+      slaPolicies: 'sla/getSLA',
     }),
     booleanFilterOptions() {
       return [
@@ -257,8 +258,15 @@ export default {
       };
     },
     getActionDropdownValues(type) {
-      const { agents, labels, teams } = this;
-      return getActionOptions({ agents, labels, teams, languages, type });
+      const { agents, labels, teams, slaPolicies } = this;
+      return getActionOptions({
+        agents,
+        labels,
+        teams,
+        slaPolicies,
+        languages,
+        type,
+      });
     },
     manifestCustomAttributes() {
       const conversationCustomAttributesRaw = this.$store.getters[
diff --git a/app/javascript/dashboard/routes/dashboard/settings/automation/AddAutomationRule.vue b/app/javascript/dashboard/routes/dashboard/settings/automation/AddAutomationRule.vue
index 67184054a..152b55aae 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/automation/AddAutomationRule.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/automation/AddAutomationRule.vue
@@ -144,6 +144,7 @@
 </template>
 
 <script>
+import { mapGetters } from 'vuex';
 import alertMixin from 'shared/mixins/alertMixin';
 import automationMethodsMixin from 'dashboard/mixins/automations/methodsMixin';
 import automationValidationsMixin from 'dashboard/mixins/automations/validationsMixin';
@@ -173,7 +174,6 @@ export default {
       automationTypes: JSON.parse(JSON.stringify(AUTOMATIONS)),
       automationRuleEvent: AUTOMATION_RULE_EVENTS[0].key,
       automationRuleEvents: AUTOMATION_RULE_EVENTS,
-      automationActionTypes: AUTOMATION_ACTION_TYPES,
       automationMutated: false,
       show: true,
       automation: {
@@ -202,6 +202,10 @@ export default {
     };
   },
   computed: {
+    ...mapGetters({
+      accountId: 'getCurrentAccountId',
+      isFeatureEnabledonAccount: 'accounts/isFeatureEnabledonAccount',
+    }),
     hasAutomationMutated() {
       if (
         this.automation.conditions[0].values ||
@@ -210,6 +214,12 @@ export default {
         return true;
       return false;
     },
+    automationActionTypes() {
+      const isSLAEnabled = this.isFeatureEnabled('sla');
+      return isSLAEnabled
+        ? AUTOMATION_ACTION_TYPES
+        : AUTOMATION_ACTION_TYPES.filter(action => action.key !== 'add_sla');
+    },
   },
   mounted() {
     this.$store.dispatch('inboxes/get');
@@ -221,6 +231,11 @@ export default {
     this.allCustomAttributes = this.$store.getters['attributes/getAttributes'];
     this.manifestCustomAttributes();
   },
+  methods: {
+    isFeatureEnabled(flag) {
+      return this.isFeatureEnabledonAccount(this.accountId, flag);
+    },
+  },
 };
 </script>
 <style lang="scss" scoped>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/automation/EditAutomationRule.vue b/app/javascript/dashboard/routes/dashboard/settings/automation/EditAutomationRule.vue
index 3ac454868..1b2b5a9fe 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/automation/EditAutomationRule.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/automation/EditAutomationRule.vue
@@ -142,6 +142,7 @@
 </template>
 
 <script>
+import { mapGetters } from 'vuex';
 import alertMixin from 'shared/mixins/alertMixin';
 import automationMethodsMixin from 'dashboard/mixins/automations/methodsMixin';
 import automationValidationsMixin from 'dashboard/mixins/automations/validationsMixin';
@@ -175,7 +176,6 @@ export default {
       automationTypes: JSON.parse(JSON.stringify(AUTOMATIONS)),
       automationRuleEvent: AUTOMATION_RULE_EVENTS[0].key,
       automationRuleEvents: AUTOMATION_RULE_EVENTS,
-      automationActionTypes: AUTOMATION_ACTION_TYPES,
       automationMutated: false,
       show: true,
       automation: null,
@@ -185,6 +185,10 @@ export default {
     };
   },
   computed: {
+    ...mapGetters({
+      accountId: 'getCurrentAccountId',
+      isFeatureEnabledonAccount: 'accounts/isFeatureEnabledonAccount',
+    }),
     hasAutomationMutated() {
       if (
         this.automation.conditions[0].values ||
@@ -193,12 +197,23 @@ export default {
         return true;
       return false;
     },
+    automationActionTypes() {
+      const isSLAEnabled = this.isFeatureEnabled('sla');
+      return isSLAEnabled
+        ? AUTOMATION_ACTION_TYPES
+        : AUTOMATION_ACTION_TYPES.filter(action => action.key !== 'add_sla');
+    },
   },
   mounted() {
     this.manifestCustomAttributes();
     this.allCustomAttributes = this.$store.getters['attributes/getAttributes'];
     this.formatAutomation(this.selectedResponse);
   },
+  methods: {
+    isFeatureEnabled(flag) {
+      return this.isFeatureEnabledonAccount(this.accountId, flag);
+    },
+  },
 };
 </script>
 <style lang="scss" scoped>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/automation/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/automation/Index.vue
index 886f7bd34..65aa6487a 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/automation/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/automation/Index.vue
@@ -153,6 +153,8 @@ export default {
     ...mapGetters({
       records: ['automations/getAutomations'],
       uiFlags: 'automations/getUIFlags',
+      accountId: 'getCurrentAccountId',
+      isFeatureEnabledonAccount: 'accounts/isFeatureEnabledonAccount',
     }),
     // Delete Modal
     deleteConfirmText() {
@@ -168,6 +170,9 @@ export default {
     deleteMessage() {
       return ` ${this.selectedResponse.name}?`;
     },
+    isSLAEnabled() {
+      return this.isFeatureEnabledonAccount(this.accountId, 'sla');
+    },
   },
   mounted() {
     this.$store.dispatch('inboxes/get');
@@ -177,6 +182,7 @@ export default {
     this.$store.dispatch('labels/get');
     this.$store.dispatch('campaigns/get');
     this.$store.dispatch('automations/get');
+    if (this.isSLAEnabled) this.$store.dispatch('sla/get');
   },
   methods: {
     openAddPopup() {
diff --git a/app/javascript/dashboard/routes/dashboard/settings/automation/constants.js b/app/javascript/dashboard/routes/dashboard/settings/automation/constants.js
index e86aa5161..c8d67745c 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/automation/constants.js
+++ b/app/javascript/dashboard/routes/dashboard/settings/automation/constants.js
@@ -611,4 +611,9 @@ export const AUTOMATION_ACTION_TYPES = [
     label: 'Change Priority',
     inputType: 'search_select',
   },
+  {
+    key: 'add_sla',
+    label: 'Add SLA',
+    inputType: 'search_select',
+  },
 ];
diff --git a/app/javascript/dashboard/routes/dashboard/settings/sla/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/sla/Index.vue
index 473583f6d..6c4002821 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/sla/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/sla/Index.vue
@@ -111,12 +111,26 @@ export default {
     ...mapGetters({
       records: 'sla/getSLA',
       uiFlags: 'sla/getUIFlags',
+      accountId: 'getCurrentAccountId',
+      isFeatureEnabledonAccount: 'accounts/isFeatureEnabledonAccount',
     }),
+    isSLAEnabled() {
+      return this.isFeatureEnabledonAccount(this.accountId, 'sla');
+    },
   },
   mounted() {
-    this.$store.dispatch('sla/get');
+    this.isSLAfeatureEnabled();
   },
   methods: {
+    isSLAfeatureEnabled() {
+      if (!this.isSLAEnabled) {
+        this.$router.push({
+          name: 'general_settings_index',
+        });
+      } else {
+        this.$store.dispatch('sla/get');
+      }
+    },
     openAddPopup() {
       this.showAddPopup = true;
     },
diff --git a/app/javascript/shared/mixins/specs/automationFixtures.js b/app/javascript/shared/mixins/specs/automationFixtures.js
index 81a53ad25..1647f9004 100644
--- a/app/javascript/shared/mixins/specs/automationFixtures.js
+++ b/app/javascript/shared/mixins/specs/automationFixtures.js
@@ -762,3 +762,45 @@ export const expectedOutputForCustomAttributeGenerator = [
     ],
   },
 ];
+export const slaPolicies = [
+  {
+    id: 1,
+    account_id: 1,
+    name: 'Low',
+    first_response_time_threshold: 60,
+    next_response_time_threshold: 120,
+    resolution_time_threshold: 240,
+    created_at: '2022-01-26T08:06:39.470Z',
+    updated_at: '2022-01-26T08:06:39.470Z',
+  },
+  {
+    id: 2,
+    account_id: 1,
+    name: 'Medium',
+    first_response_time_threshold: 30,
+    next_response_time_threshold: 60,
+    resolution_time_threshold: 120,
+    created_at: '2022-01-26T08:06:39.470Z',
+    updated_at: '2022-01-26T08:06:39.470Z',
+  },
+  {
+    id: 3,
+    account_id: 1,
+    name: 'High',
+    first_response_time_threshold: 15,
+    next_response_time_threshold: 30,
+    resolution_time_threshold: 60,
+    created_at: '2022-01-26T08:06:39.470Z',
+    updated_at: '2022-01-26T08:06:39.470Z',
+  },
+  {
+    id: 4,
+    account_id: 1,
+    name: 'Urgent',
+    first_response_time_threshold: 5,
+    next_response_time_threshold: 10,
+    resolution_time_threshold: 20,
+    created_at: '2022-01-26T08:06:39.470Z',
+    updated_at: '2022-01-26T08:06:39.470Z',
+  },
+];
diff --git a/app/javascript/shared/mixins/specs/automationMixin.spec.js b/app/javascript/shared/mixins/specs/automationMixin.spec.js
index 36dd2973a..465e6e9b4 100644
--- a/app/javascript/shared/mixins/specs/automationMixin.spec.js
+++ b/app/javascript/shared/mixins/specs/automationMixin.spec.js
@@ -13,6 +13,7 @@ import {
   inboxes,
   languages,
   countries,
+  slaPolicies,
   MESSAGE_CONDITION_VALUES,
   automationToSubmit,
   savedAutomation,
@@ -89,6 +90,9 @@ const generateComputedProperties = () => {
     countries() {
       return countries;
     },
+    slaPolicies() {
+      return slaPolicies;
+    },
     MESSAGE_CONDITION_VALUES() {
       return MESSAGE_CONDITION_VALUES;
     },
@@ -433,6 +437,9 @@ describe('automationMethodsMixin', () => {
       teams() {
         return teams;
       },
+      slaPolicies() {
+        return slaPolicies;
+      },
     };
     const expectedActionDropdownValues = [
       { id: 'testlabel', name: 'testlabel' },

From a5e9cd94e16e8e38c97aa6266f2b00a578435c8a Mon Sep 17 00:00:00 2001
From: Chatwoot Bot <92152627+chatwoot-bot@users.noreply.github.com>
Date: Thu, 22 Feb 2024 05:31:14 +0530
Subject: [PATCH 28/96] chore: Update translations (#8983)

---
 .../i18n/locale/am/attributesMgmt.json        | 22 +++++
 .../dashboard/i18n/locale/am/contact.json     | 19 +++--
 .../i18n/locale/am/generalSettings.json       |  6 +-
 .../dashboard/i18n/locale/am/helpCenter.json  |  3 +-
 .../dashboard/i18n/locale/am/inbox.json       | 60 ++++++++++++++
 .../dashboard/i18n/locale/am/inboxMgmt.json   |  2 +-
 .../dashboard/i18n/locale/am/settings.json    |  5 ++
 .../dashboard/i18n/locale/am/sla.json         | 70 ++++++++++++++++
 .../i18n/locale/ar/attributesMgmt.json        | 22 +++++
 .../dashboard/i18n/locale/ar/contact.json     | 19 +++--
 .../i18n/locale/ar/generalSettings.json       |  6 +-
 .../dashboard/i18n/locale/ar/helpCenter.json  |  3 +-
 .../dashboard/i18n/locale/ar/inbox.json       | 60 ++++++++++++++
 .../dashboard/i18n/locale/ar/inboxMgmt.json   |  2 +-
 .../dashboard/i18n/locale/ar/settings.json    |  5 ++
 .../dashboard/i18n/locale/ar/sla.json         | 70 ++++++++++++++++
 .../i18n/locale/ar/whatsappTemplates.json     |  2 +-
 .../i18n/locale/bg/attributesMgmt.json        | 22 +++++
 .../dashboard/i18n/locale/bg/contact.json     | 19 +++--
 .../i18n/locale/bg/generalSettings.json       |  6 +-
 .../dashboard/i18n/locale/bg/helpCenter.json  |  3 +-
 .../dashboard/i18n/locale/bg/inbox.json       | 60 ++++++++++++++
 .../dashboard/i18n/locale/bg/inboxMgmt.json   |  2 +-
 .../dashboard/i18n/locale/bg/settings.json    |  5 ++
 .../dashboard/i18n/locale/bg/sla.json         | 70 ++++++++++++++++
 .../i18n/locale/ca/attributesMgmt.json        | 22 +++++
 .../dashboard/i18n/locale/ca/contact.json     | 19 +++--
 .../i18n/locale/ca/generalSettings.json       |  6 +-
 .../dashboard/i18n/locale/ca/helpCenter.json  |  3 +-
 .../dashboard/i18n/locale/ca/inbox.json       | 60 ++++++++++++++
 .../dashboard/i18n/locale/ca/inboxMgmt.json   |  2 +-
 .../dashboard/i18n/locale/ca/settings.json    |  5 ++
 .../dashboard/i18n/locale/ca/sla.json         | 70 ++++++++++++++++
 .../i18n/locale/cs/attributesMgmt.json        | 22 +++++
 .../dashboard/i18n/locale/cs/contact.json     | 19 +++--
 .../i18n/locale/cs/generalSettings.json       |  6 +-
 .../dashboard/i18n/locale/cs/helpCenter.json  |  3 +-
 .../dashboard/i18n/locale/cs/inbox.json       | 60 ++++++++++++++
 .../dashboard/i18n/locale/cs/inboxMgmt.json   |  2 +-
 .../dashboard/i18n/locale/cs/settings.json    |  5 ++
 .../dashboard/i18n/locale/cs/sla.json         | 70 ++++++++++++++++
 .../i18n/locale/da/attributesMgmt.json        | 22 +++++
 .../dashboard/i18n/locale/da/contact.json     | 19 +++--
 .../i18n/locale/da/generalSettings.json       |  6 +-
 .../dashboard/i18n/locale/da/helpCenter.json  |  3 +-
 .../dashboard/i18n/locale/da/inbox.json       | 60 ++++++++++++++
 .../dashboard/i18n/locale/da/inboxMgmt.json   |  2 +-
 .../dashboard/i18n/locale/da/settings.json    |  5 ++
 .../dashboard/i18n/locale/da/sla.json         | 70 ++++++++++++++++
 .../i18n/locale/de/attributesMgmt.json        | 22 +++++
 .../dashboard/i18n/locale/de/contact.json     | 19 +++--
 .../i18n/locale/de/generalSettings.json       |  6 +-
 .../dashboard/i18n/locale/de/helpCenter.json  |  3 +-
 .../dashboard/i18n/locale/de/inbox.json       | 60 ++++++++++++++
 .../dashboard/i18n/locale/de/inboxMgmt.json   |  2 +-
 .../dashboard/i18n/locale/de/settings.json    |  5 ++
 .../dashboard/i18n/locale/de/sla.json         | 70 ++++++++++++++++
 .../i18n/locale/el/attributesMgmt.json        | 22 +++++
 .../dashboard/i18n/locale/el/contact.json     | 19 +++--
 .../i18n/locale/el/generalSettings.json       |  6 +-
 .../dashboard/i18n/locale/el/helpCenter.json  |  3 +-
 .../dashboard/i18n/locale/el/inbox.json       | 60 ++++++++++++++
 .../dashboard/i18n/locale/el/inboxMgmt.json   |  2 +-
 .../dashboard/i18n/locale/el/settings.json    |  5 ++
 .../dashboard/i18n/locale/el/sla.json         | 70 ++++++++++++++++
 .../i18n/locale/es/attributesMgmt.json        | 22 +++++
 .../dashboard/i18n/locale/es/contact.json     | 19 +++--
 .../i18n/locale/es/generalSettings.json       |  6 +-
 .../dashboard/i18n/locale/es/helpCenter.json  |  3 +-
 .../dashboard/i18n/locale/es/inbox.json       | 60 ++++++++++++++
 .../dashboard/i18n/locale/es/settings.json    |  5 ++
 .../dashboard/i18n/locale/es/sla.json         | 70 ++++++++++++++++
 .../i18n/locale/fa/attributesMgmt.json        | 22 +++++
 .../dashboard/i18n/locale/fa/contact.json     | 19 +++--
 .../i18n/locale/fa/generalSettings.json       |  6 +-
 .../dashboard/i18n/locale/fa/helpCenter.json  |  3 +-
 .../dashboard/i18n/locale/fa/inbox.json       | 60 ++++++++++++++
 .../dashboard/i18n/locale/fa/inboxMgmt.json   |  2 +-
 .../dashboard/i18n/locale/fa/settings.json    |  5 ++
 .../dashboard/i18n/locale/fa/sla.json         | 70 ++++++++++++++++
 .../i18n/locale/fi/attributesMgmt.json        | 22 +++++
 .../dashboard/i18n/locale/fi/contact.json     | 19 +++--
 .../i18n/locale/fi/generalSettings.json       |  6 +-
 .../dashboard/i18n/locale/fi/helpCenter.json  |  3 +-
 .../dashboard/i18n/locale/fi/inbox.json       | 60 ++++++++++++++
 .../dashboard/i18n/locale/fi/inboxMgmt.json   |  2 +-
 .../dashboard/i18n/locale/fi/settings.json    |  5 ++
 .../dashboard/i18n/locale/fi/sla.json         | 70 ++++++++++++++++
 .../i18n/locale/fr/attributesMgmt.json        | 22 +++++
 .../dashboard/i18n/locale/fr/contact.json     | 19 +++--
 .../i18n/locale/fr/generalSettings.json       |  6 +-
 .../dashboard/i18n/locale/fr/helpCenter.json  |  3 +-
 .../dashboard/i18n/locale/fr/inbox.json       | 60 ++++++++++++++
 .../dashboard/i18n/locale/fr/inboxMgmt.json   |  2 +-
 .../dashboard/i18n/locale/fr/settings.json    |  5 ++
 .../dashboard/i18n/locale/fr/sla.json         | 70 ++++++++++++++++
 .../i18n/locale/he/attributesMgmt.json        | 22 +++++
 .../dashboard/i18n/locale/he/contact.json     | 19 +++--
 .../i18n/locale/he/generalSettings.json       |  6 +-
 .../dashboard/i18n/locale/he/helpCenter.json  |  3 +-
 .../dashboard/i18n/locale/he/inbox.json       | 60 ++++++++++++++
 .../dashboard/i18n/locale/he/inboxMgmt.json   |  2 +-
 .../dashboard/i18n/locale/he/settings.json    |  5 ++
 .../dashboard/i18n/locale/he/sla.json         | 70 ++++++++++++++++
 .../i18n/locale/hi/attributesMgmt.json        | 22 +++++
 .../dashboard/i18n/locale/hi/contact.json     | 19 +++--
 .../i18n/locale/hi/generalSettings.json       |  6 +-
 .../dashboard/i18n/locale/hi/helpCenter.json  |  3 +-
 .../dashboard/i18n/locale/hi/inbox.json       | 60 ++++++++++++++
 .../dashboard/i18n/locale/hi/inboxMgmt.json   |  2 +-
 .../dashboard/i18n/locale/hi/settings.json    |  5 ++
 .../dashboard/i18n/locale/hi/sla.json         | 70 ++++++++++++++++
 .../i18n/locale/hr/attributesMgmt.json        | 22 +++++
 .../dashboard/i18n/locale/hr/contact.json     | 19 +++--
 .../i18n/locale/hr/generalSettings.json       |  6 +-
 .../dashboard/i18n/locale/hr/helpCenter.json  |  3 +-
 .../dashboard/i18n/locale/hr/inbox.json       | 60 ++++++++++++++
 .../dashboard/i18n/locale/hr/inboxMgmt.json   |  2 +-
 .../dashboard/i18n/locale/hr/settings.json    |  5 ++
 .../dashboard/i18n/locale/hr/sla.json         | 70 ++++++++++++++++
 .../i18n/locale/hu/attributesMgmt.json        | 22 +++++
 .../dashboard/i18n/locale/hu/contact.json     | 19 +++--
 .../i18n/locale/hu/generalSettings.json       |  6 +-
 .../dashboard/i18n/locale/hu/helpCenter.json  |  3 +-
 .../dashboard/i18n/locale/hu/inbox.json       | 60 ++++++++++++++
 .../dashboard/i18n/locale/hu/inboxMgmt.json   |  2 +-
 .../dashboard/i18n/locale/hu/settings.json    |  5 ++
 .../dashboard/i18n/locale/hu/sla.json         | 70 ++++++++++++++++
 .../i18n/locale/hy/attributesMgmt.json        | 22 +++++
 .../dashboard/i18n/locale/hy/contact.json     | 19 +++--
 .../i18n/locale/hy/generalSettings.json       |  6 +-
 .../dashboard/i18n/locale/hy/helpCenter.json  |  3 +-
 .../dashboard/i18n/locale/hy/inbox.json       | 60 ++++++++++++++
 .../dashboard/i18n/locale/hy/inboxMgmt.json   |  2 +-
 .../dashboard/i18n/locale/hy/settings.json    |  5 ++
 .../dashboard/i18n/locale/hy/sla.json         | 70 ++++++++++++++++
 .../i18n/locale/id/attributesMgmt.json        | 22 +++++
 .../dashboard/i18n/locale/id/contact.json     | 19 +++--
 .../i18n/locale/id/generalSettings.json       |  6 +-
 .../dashboard/i18n/locale/id/helpCenter.json  |  3 +-
 .../dashboard/i18n/locale/id/inbox.json       | 60 ++++++++++++++
 .../dashboard/i18n/locale/id/inboxMgmt.json   |  2 +-
 .../dashboard/i18n/locale/id/settings.json    |  5 ++
 .../dashboard/i18n/locale/id/sla.json         | 70 ++++++++++++++++
 .../i18n/locale/is/attributesMgmt.json        | 22 +++++
 .../dashboard/i18n/locale/is/contact.json     | 19 +++--
 .../i18n/locale/is/generalSettings.json       |  6 +-
 .../dashboard/i18n/locale/is/helpCenter.json  |  3 +-
 .../dashboard/i18n/locale/is/inbox.json       | 60 ++++++++++++++
 .../dashboard/i18n/locale/is/inboxMgmt.json   |  2 +-
 .../dashboard/i18n/locale/is/settings.json    |  5 ++
 .../dashboard/i18n/locale/is/sla.json         | 70 ++++++++++++++++
 .../i18n/locale/it/attributesMgmt.json        | 22 +++++
 .../dashboard/i18n/locale/it/contact.json     | 19 +++--
 .../i18n/locale/it/generalSettings.json       |  6 +-
 .../dashboard/i18n/locale/it/helpCenter.json  |  3 +-
 .../dashboard/i18n/locale/it/inbox.json       | 60 ++++++++++++++
 .../dashboard/i18n/locale/it/inboxMgmt.json   |  2 +-
 .../dashboard/i18n/locale/it/settings.json    |  5 ++
 .../dashboard/i18n/locale/it/sla.json         | 70 ++++++++++++++++
 .../i18n/locale/ja/attributesMgmt.json        | 22 +++++
 .../dashboard/i18n/locale/ja/contact.json     | 19 +++--
 .../i18n/locale/ja/generalSettings.json       |  6 +-
 .../dashboard/i18n/locale/ja/helpCenter.json  |  3 +-
 .../dashboard/i18n/locale/ja/inbox.json       | 60 ++++++++++++++
 .../dashboard/i18n/locale/ja/inboxMgmt.json   |  2 +-
 .../dashboard/i18n/locale/ja/settings.json    |  5 ++
 .../dashboard/i18n/locale/ja/sla.json         | 70 ++++++++++++++++
 .../i18n/locale/ka/attributesMgmt.json        | 22 +++++
 .../dashboard/i18n/locale/ka/contact.json     | 19 +++--
 .../i18n/locale/ka/generalSettings.json       |  6 +-
 .../dashboard/i18n/locale/ka/helpCenter.json  |  3 +-
 .../dashboard/i18n/locale/ka/inbox.json       | 60 ++++++++++++++
 .../dashboard/i18n/locale/ka/inboxMgmt.json   |  2 +-
 .../dashboard/i18n/locale/ka/settings.json    |  5 ++
 .../dashboard/i18n/locale/ka/sla.json         | 70 ++++++++++++++++
 .../i18n/locale/ko/attributesMgmt.json        | 22 +++++
 .../dashboard/i18n/locale/ko/contact.json     | 19 +++--
 .../i18n/locale/ko/generalSettings.json       |  6 +-
 .../dashboard/i18n/locale/ko/helpCenter.json  |  3 +-
 .../dashboard/i18n/locale/ko/inbox.json       | 60 ++++++++++++++
 .../dashboard/i18n/locale/ko/inboxMgmt.json   |  2 +-
 .../dashboard/i18n/locale/ko/settings.json    |  5 ++
 .../dashboard/i18n/locale/ko/sla.json         | 70 ++++++++++++++++
 .../i18n/locale/lt/attributesMgmt.json        | 22 +++++
 .../dashboard/i18n/locale/lt/contact.json     | 19 +++--
 .../i18n/locale/lt/generalSettings.json       |  6 +-
 .../dashboard/i18n/locale/lt/helpCenter.json  |  3 +-
 .../dashboard/i18n/locale/lt/inbox.json       | 60 ++++++++++++++
 .../dashboard/i18n/locale/lt/inboxMgmt.json   |  2 +-
 .../dashboard/i18n/locale/lt/settings.json    |  5 ++
 .../dashboard/i18n/locale/lt/sla.json         | 70 ++++++++++++++++
 .../dashboard/i18n/locale/lv/agentBots.json   | 32 ++++----
 .../i18n/locale/lv/attributesMgmt.json        | 22 +++++
 .../dashboard/i18n/locale/lv/contact.json     | 19 +++--
 .../i18n/locale/lv/conversation.json          |  6 +-
 .../i18n/locale/lv/generalSettings.json       |  6 +-
 .../dashboard/i18n/locale/lv/helpCenter.json  |  3 +-
 .../dashboard/i18n/locale/lv/inbox.json       | 60 ++++++++++++++
 .../dashboard/i18n/locale/lv/inboxMgmt.json   |  2 +-
 .../dashboard/i18n/locale/lv/settings.json    |  5 ++
 .../dashboard/i18n/locale/lv/sla.json         | 70 ++++++++++++++++
 .../i18n/locale/ml/attributesMgmt.json        | 22 +++++
 .../dashboard/i18n/locale/ml/contact.json     | 19 +++--
 .../i18n/locale/ml/generalSettings.json       |  6 +-
 .../dashboard/i18n/locale/ml/helpCenter.json  |  3 +-
 .../dashboard/i18n/locale/ml/inbox.json       | 60 ++++++++++++++
 .../dashboard/i18n/locale/ml/inboxMgmt.json   |  2 +-
 .../dashboard/i18n/locale/ml/settings.json    |  5 ++
 .../dashboard/i18n/locale/ml/sla.json         | 70 ++++++++++++++++
 .../i18n/locale/ms/attributesMgmt.json        | 22 +++++
 .../dashboard/i18n/locale/ms/contact.json     | 19 +++--
 .../i18n/locale/ms/generalSettings.json       |  6 +-
 .../dashboard/i18n/locale/ms/helpCenter.json  |  3 +-
 .../dashboard/i18n/locale/ms/inbox.json       | 60 ++++++++++++++
 .../dashboard/i18n/locale/ms/inboxMgmt.json   |  2 +-
 .../dashboard/i18n/locale/ms/settings.json    |  5 ++
 .../dashboard/i18n/locale/ms/sla.json         | 70 ++++++++++++++++
 .../i18n/locale/ne/attributesMgmt.json        | 22 +++++
 .../dashboard/i18n/locale/ne/contact.json     | 19 +++--
 .../i18n/locale/ne/generalSettings.json       |  6 +-
 .../dashboard/i18n/locale/ne/helpCenter.json  |  3 +-
 .../dashboard/i18n/locale/ne/inbox.json       | 60 ++++++++++++++
 .../dashboard/i18n/locale/ne/inboxMgmt.json   |  2 +-
 .../dashboard/i18n/locale/ne/settings.json    |  5 ++
 .../dashboard/i18n/locale/ne/sla.json         | 70 ++++++++++++++++
 .../i18n/locale/nl/attributesMgmt.json        | 22 +++++
 .../dashboard/i18n/locale/nl/cannedMgmt.json  |  4 +-
 .../dashboard/i18n/locale/nl/contact.json     | 19 +++--
 .../i18n/locale/nl/conversation.json          | 36 ++++-----
 .../i18n/locale/nl/generalSettings.json       | 46 ++++++-----
 .../dashboard/i18n/locale/nl/helpCenter.json  |  7 +-
 .../dashboard/i18n/locale/nl/inbox.json       | 60 ++++++++++++++
 .../dashboard/i18n/locale/nl/inboxMgmt.json   | 28 +++----
 .../dashboard/i18n/locale/nl/macros.json      |  2 +-
 .../dashboard/i18n/locale/nl/settings.json    |  7 +-
 .../dashboard/i18n/locale/nl/sla.json         | 70 ++++++++++++++++
 .../i18n/locale/no/attributesMgmt.json        | 22 +++++
 .../dashboard/i18n/locale/no/contact.json     | 19 +++--
 .../i18n/locale/no/generalSettings.json       |  6 +-
 .../dashboard/i18n/locale/no/helpCenter.json  |  3 +-
 .../dashboard/i18n/locale/no/inbox.json       | 60 ++++++++++++++
 .../dashboard/i18n/locale/no/inboxMgmt.json   |  2 +-
 .../dashboard/i18n/locale/no/settings.json    |  5 ++
 .../dashboard/i18n/locale/no/sla.json         | 70 ++++++++++++++++
 .../i18n/locale/pl/advancedFilters.json       | 50 ++++++------
 .../dashboard/i18n/locale/pl/agentBots.json   | 54 ++++++-------
 .../dashboard/i18n/locale/pl/agentMgmt.json   | 46 +++++------
 .../i18n/locale/pl/attributesMgmt.json        | 80 ++++++++++++-------
 .../dashboard/i18n/locale/pl/auditLogs.json   | 30 +++----
 .../dashboard/i18n/locale/pl/contact.json     | 19 +++--
 .../i18n/locale/pl/generalSettings.json       |  6 +-
 .../dashboard/i18n/locale/pl/helpCenter.json  |  3 +-
 .../dashboard/i18n/locale/pl/inbox.json       | 60 ++++++++++++++
 .../dashboard/i18n/locale/pl/inboxMgmt.json   |  2 +-
 .../dashboard/i18n/locale/pl/settings.json    |  5 ++
 .../dashboard/i18n/locale/pl/sla.json         | 70 ++++++++++++++++
 .../i18n/locale/pt/attributesMgmt.json        | 22 +++++
 .../dashboard/i18n/locale/pt/contact.json     | 19 +++--
 .../i18n/locale/pt/generalSettings.json       |  6 +-
 .../dashboard/i18n/locale/pt/helpCenter.json  |  3 +-
 .../dashboard/i18n/locale/pt/inbox.json       | 60 ++++++++++++++
 .../dashboard/i18n/locale/pt/inboxMgmt.json   |  2 +-
 .../dashboard/i18n/locale/pt/settings.json    |  5 ++
 .../dashboard/i18n/locale/pt/sla.json         | 70 ++++++++++++++++
 .../i18n/locale/pt_BR/attributesMgmt.json     | 22 +++++
 .../dashboard/i18n/locale/pt_BR/contact.json  | 19 +++--
 .../i18n/locale/pt_BR/generalSettings.json    |  6 +-
 .../i18n/locale/pt_BR/helpCenter.json         |  3 +-
 .../dashboard/i18n/locale/pt_BR/inbox.json    | 60 ++++++++++++++
 .../dashboard/i18n/locale/pt_BR/settings.json |  5 ++
 .../dashboard/i18n/locale/pt_BR/sla.json      | 70 ++++++++++++++++
 .../i18n/locale/ro/attributesMgmt.json        | 22 +++++
 .../dashboard/i18n/locale/ro/contact.json     | 19 +++--
 .../i18n/locale/ro/generalSettings.json       |  6 +-
 .../dashboard/i18n/locale/ro/helpCenter.json  |  3 +-
 .../dashboard/i18n/locale/ro/inbox.json       | 60 ++++++++++++++
 .../dashboard/i18n/locale/ro/inboxMgmt.json   |  2 +-
 .../dashboard/i18n/locale/ro/settings.json    |  5 ++
 .../dashboard/i18n/locale/ro/sla.json         | 70 ++++++++++++++++
 .../i18n/locale/ru/attributesMgmt.json        | 22 +++++
 .../dashboard/i18n/locale/ru/contact.json     | 19 +++--
 .../i18n/locale/ru/generalSettings.json       |  6 +-
 .../dashboard/i18n/locale/ru/helpCenter.json  |  3 +-
 .../dashboard/i18n/locale/ru/inbox.json       | 60 ++++++++++++++
 .../dashboard/i18n/locale/ru/settings.json    |  5 ++
 .../dashboard/i18n/locale/ru/sla.json         | 70 ++++++++++++++++
 .../i18n/locale/sh/attributesMgmt.json        | 22 +++++
 .../dashboard/i18n/locale/sh/contact.json     | 19 +++--
 .../i18n/locale/sh/generalSettings.json       |  6 +-
 .../dashboard/i18n/locale/sh/helpCenter.json  |  3 +-
 .../dashboard/i18n/locale/sh/inbox.json       | 60 ++++++++++++++
 .../dashboard/i18n/locale/sh/inboxMgmt.json   |  2 +-
 .../dashboard/i18n/locale/sh/settings.json    |  5 ++
 .../dashboard/i18n/locale/sh/sla.json         | 70 ++++++++++++++++
 .../i18n/locale/sk/attributesMgmt.json        | 22 +++++
 .../dashboard/i18n/locale/sk/contact.json     | 19 +++--
 .../i18n/locale/sk/generalSettings.json       |  6 +-
 .../dashboard/i18n/locale/sk/helpCenter.json  |  3 +-
 .../dashboard/i18n/locale/sk/inbox.json       | 60 ++++++++++++++
 .../dashboard/i18n/locale/sk/inboxMgmt.json   |  2 +-
 .../dashboard/i18n/locale/sk/settings.json    |  5 ++
 .../dashboard/i18n/locale/sk/sla.json         | 70 ++++++++++++++++
 .../i18n/locale/sl/attributesMgmt.json        | 22 +++++
 .../dashboard/i18n/locale/sl/contact.json     | 19 +++--
 .../i18n/locale/sl/generalSettings.json       |  6 +-
 .../dashboard/i18n/locale/sl/helpCenter.json  |  3 +-
 .../dashboard/i18n/locale/sl/inbox.json       | 60 ++++++++++++++
 .../dashboard/i18n/locale/sl/inboxMgmt.json   |  2 +-
 .../dashboard/i18n/locale/sl/settings.json    |  5 ++
 .../dashboard/i18n/locale/sl/sla.json         | 70 ++++++++++++++++
 .../i18n/locale/sq/attributesMgmt.json        | 22 +++++
 .../dashboard/i18n/locale/sq/contact.json     | 19 +++--
 .../i18n/locale/sq/generalSettings.json       |  6 +-
 .../dashboard/i18n/locale/sq/helpCenter.json  |  3 +-
 .../dashboard/i18n/locale/sq/inbox.json       | 60 ++++++++++++++
 .../dashboard/i18n/locale/sq/inboxMgmt.json   |  2 +-
 .../dashboard/i18n/locale/sq/settings.json    |  5 ++
 .../dashboard/i18n/locale/sq/sla.json         | 70 ++++++++++++++++
 .../i18n/locale/sr/attributesMgmt.json        | 22 +++++
 .../dashboard/i18n/locale/sr/contact.json     | 19 +++--
 .../i18n/locale/sr/generalSettings.json       |  6 +-
 .../dashboard/i18n/locale/sr/helpCenter.json  |  3 +-
 .../dashboard/i18n/locale/sr/inbox.json       | 60 ++++++++++++++
 .../dashboard/i18n/locale/sr/inboxMgmt.json   |  2 +-
 .../dashboard/i18n/locale/sr/settings.json    |  5 ++
 .../dashboard/i18n/locale/sr/sla.json         | 70 ++++++++++++++++
 .../i18n/locale/sv/attributesMgmt.json        | 22 +++++
 .../dashboard/i18n/locale/sv/contact.json     | 19 +++--
 .../i18n/locale/sv/generalSettings.json       |  6 +-
 .../dashboard/i18n/locale/sv/helpCenter.json  |  3 +-
 .../dashboard/i18n/locale/sv/inbox.json       | 60 ++++++++++++++
 .../dashboard/i18n/locale/sv/inboxMgmt.json   |  2 +-
 .../dashboard/i18n/locale/sv/settings.json    |  5 ++
 .../dashboard/i18n/locale/sv/sla.json         | 70 ++++++++++++++++
 .../i18n/locale/ta/attributesMgmt.json        | 22 +++++
 .../dashboard/i18n/locale/ta/contact.json     | 19 +++--
 .../i18n/locale/ta/generalSettings.json       |  6 +-
 .../dashboard/i18n/locale/ta/helpCenter.json  |  3 +-
 .../dashboard/i18n/locale/ta/inbox.json       | 60 ++++++++++++++
 .../dashboard/i18n/locale/ta/inboxMgmt.json   |  2 +-
 .../dashboard/i18n/locale/ta/settings.json    |  5 ++
 .../dashboard/i18n/locale/ta/sla.json         | 70 ++++++++++++++++
 .../i18n/locale/th/attributesMgmt.json        | 22 +++++
 .../dashboard/i18n/locale/th/contact.json     | 19 +++--
 .../i18n/locale/th/generalSettings.json       |  6 +-
 .../dashboard/i18n/locale/th/helpCenter.json  |  3 +-
 .../dashboard/i18n/locale/th/inbox.json       | 60 ++++++++++++++
 .../dashboard/i18n/locale/th/inboxMgmt.json   |  2 +-
 .../dashboard/i18n/locale/th/settings.json    |  5 ++
 .../dashboard/i18n/locale/th/sla.json         | 70 ++++++++++++++++
 .../dashboard/i18n/locale/tr/agentMgmt.json   |  4 +-
 .../i18n/locale/tr/attributesMgmt.json        | 22 +++++
 .../dashboard/i18n/locale/tr/chatlist.json    | 16 ++--
 .../dashboard/i18n/locale/tr/contact.json     | 21 +++--
 .../i18n/locale/tr/conversation.json          |  6 +-
 .../i18n/locale/tr/generalSettings.json       |  6 +-
 .../dashboard/i18n/locale/tr/helpCenter.json  | 11 +--
 .../dashboard/i18n/locale/tr/inbox.json       | 60 ++++++++++++++
 .../dashboard/i18n/locale/tr/inboxMgmt.json   |  2 +-
 .../dashboard/i18n/locale/tr/search.json      |  4 +-
 .../dashboard/i18n/locale/tr/settings.json    |  5 ++
 .../dashboard/i18n/locale/tr/sla.json         | 70 ++++++++++++++++
 .../i18n/locale/uk/attributesMgmt.json        | 22 +++++
 .../dashboard/i18n/locale/uk/contact.json     | 19 +++--
 .../i18n/locale/uk/generalSettings.json       | 12 +--
 .../dashboard/i18n/locale/uk/helpCenter.json  |  3 +-
 .../dashboard/i18n/locale/uk/inbox.json       | 60 ++++++++++++++
 .../dashboard/i18n/locale/uk/inboxMgmt.json   |  4 +-
 .../dashboard/i18n/locale/uk/settings.json    |  5 ++
 .../dashboard/i18n/locale/uk/sla.json         | 70 ++++++++++++++++
 .../i18n/locale/ur/attributesMgmt.json        | 22 +++++
 .../dashboard/i18n/locale/ur/contact.json     | 19 +++--
 .../i18n/locale/ur/generalSettings.json       |  6 +-
 .../dashboard/i18n/locale/ur/helpCenter.json  |  3 +-
 .../dashboard/i18n/locale/ur/inbox.json       | 60 ++++++++++++++
 .../dashboard/i18n/locale/ur/inboxMgmt.json   |  2 +-
 .../dashboard/i18n/locale/ur/settings.json    |  5 ++
 .../dashboard/i18n/locale/ur/sla.json         | 70 ++++++++++++++++
 .../i18n/locale/ur_IN/attributesMgmt.json     | 22 +++++
 .../dashboard/i18n/locale/ur_IN/contact.json  | 19 +++--
 .../i18n/locale/ur_IN/generalSettings.json    |  6 +-
 .../i18n/locale/ur_IN/helpCenter.json         |  3 +-
 .../dashboard/i18n/locale/ur_IN/inbox.json    | 60 ++++++++++++++
 .../i18n/locale/ur_IN/inboxMgmt.json          |  2 +-
 .../dashboard/i18n/locale/ur_IN/settings.json |  5 ++
 .../dashboard/i18n/locale/ur_IN/sla.json      | 70 ++++++++++++++++
 .../i18n/locale/vi/attributesMgmt.json        | 22 +++++
 .../dashboard/i18n/locale/vi/contact.json     | 19 +++--
 .../i18n/locale/vi/generalSettings.json       |  6 +-
 .../dashboard/i18n/locale/vi/helpCenter.json  |  3 +-
 .../dashboard/i18n/locale/vi/inbox.json       | 60 ++++++++++++++
 .../dashboard/i18n/locale/vi/inboxMgmt.json   |  2 +-
 .../dashboard/i18n/locale/vi/settings.json    |  5 ++
 .../dashboard/i18n/locale/vi/sla.json         | 70 ++++++++++++++++
 .../i18n/locale/zh_CN/attributesMgmt.json     | 22 +++++
 .../dashboard/i18n/locale/zh_CN/contact.json  | 19 +++--
 .../i18n/locale/zh_CN/generalSettings.json    |  6 +-
 .../i18n/locale/zh_CN/helpCenter.json         |  3 +-
 .../dashboard/i18n/locale/zh_CN/inbox.json    | 60 ++++++++++++++
 .../i18n/locale/zh_CN/inboxMgmt.json          |  2 +-
 .../dashboard/i18n/locale/zh_CN/settings.json |  5 ++
 .../dashboard/i18n/locale/zh_CN/sla.json      | 70 ++++++++++++++++
 .../i18n/locale/zh_TW/advancedFilters.json    | 54 ++++++-------
 .../i18n/locale/zh_TW/attributesMgmt.json     | 22 +++++
 .../dashboard/i18n/locale/zh_TW/contact.json  | 19 +++--
 .../i18n/locale/zh_TW/conversation.json       |  2 +-
 .../i18n/locale/zh_TW/generalSettings.json    |  6 +-
 .../i18n/locale/zh_TW/helpCenter.json         |  3 +-
 .../dashboard/i18n/locale/zh_TW/inbox.json    | 60 ++++++++++++++
 .../i18n/locale/zh_TW/inboxMgmt.json          |  2 +-
 .../dashboard/i18n/locale/zh_TW/settings.json |  5 ++
 .../dashboard/i18n/locale/zh_TW/sla.json      | 70 ++++++++++++++++
 app/javascript/widget/i18n/locale/am.json     |  3 +-
 app/javascript/widget/i18n/locale/ar.json     | 23 +++---
 app/javascript/widget/i18n/locale/bg.json     |  3 +-
 app/javascript/widget/i18n/locale/ca.json     |  3 +-
 app/javascript/widget/i18n/locale/cs.json     |  3 +-
 app/javascript/widget/i18n/locale/da.json     |  3 +-
 app/javascript/widget/i18n/locale/de.json     |  3 +-
 app/javascript/widget/i18n/locale/el.json     |  3 +-
 app/javascript/widget/i18n/locale/es.json     |  3 +-
 app/javascript/widget/i18n/locale/fa.json     |  3 +-
 app/javascript/widget/i18n/locale/fi.json     |  3 +-
 app/javascript/widget/i18n/locale/fr.json     |  3 +-
 app/javascript/widget/i18n/locale/he.json     |  3 +-
 app/javascript/widget/i18n/locale/hi.json     |  3 +-
 app/javascript/widget/i18n/locale/hr.json     |  3 +-
 app/javascript/widget/i18n/locale/hu.json     |  3 +-
 app/javascript/widget/i18n/locale/hy.json     |  3 +-
 app/javascript/widget/i18n/locale/id.json     |  3 +-
 app/javascript/widget/i18n/locale/is.json     |  3 +-
 app/javascript/widget/i18n/locale/it.json     |  3 +-
 app/javascript/widget/i18n/locale/ja.json     |  3 +-
 app/javascript/widget/i18n/locale/ka.json     |  3 +-
 app/javascript/widget/i18n/locale/ko.json     |  3 +-
 app/javascript/widget/i18n/locale/lt.json     |  3 +-
 app/javascript/widget/i18n/locale/lv.json     |  3 +-
 app/javascript/widget/i18n/locale/ml.json     |  3 +-
 app/javascript/widget/i18n/locale/ms.json     |  3 +-
 app/javascript/widget/i18n/locale/ne.json     |  3 +-
 app/javascript/widget/i18n/locale/nl.json     |  3 +-
 app/javascript/widget/i18n/locale/no.json     |  3 +-
 app/javascript/widget/i18n/locale/pl.json     |  3 +-
 app/javascript/widget/i18n/locale/pt.json     |  3 +-
 app/javascript/widget/i18n/locale/pt_BR.json  |  3 +-
 app/javascript/widget/i18n/locale/ro.json     |  3 +-
 app/javascript/widget/i18n/locale/ru.json     |  3 +-
 app/javascript/widget/i18n/locale/sh.json     |  3 +-
 app/javascript/widget/i18n/locale/sk.json     |  3 +-
 app/javascript/widget/i18n/locale/sl.json     |  3 +-
 app/javascript/widget/i18n/locale/sq.json     |  3 +-
 app/javascript/widget/i18n/locale/sr.json     |  3 +-
 app/javascript/widget/i18n/locale/sv.json     |  3 +-
 app/javascript/widget/i18n/locale/ta.json     |  3 +-
 app/javascript/widget/i18n/locale/th.json     |  5 +-
 app/javascript/widget/i18n/locale/tr.json     |  3 +-
 app/javascript/widget/i18n/locale/uk.json     | 17 ++--
 app/javascript/widget/i18n/locale/ur.json     |  3 +-
 app/javascript/widget/i18n/locale/ur_IN.json  |  3 +-
 app/javascript/widget/i18n/locale/vi.json     |  3 +-
 app/javascript/widget/i18n/locale/zh_CN.json  |  3 +-
 app/javascript/widget/i18n/locale/zh_TW.json  |  3 +-
 config/locales/am.yml                         | 32 +++++---
 config/locales/ar.yml                         | 74 ++++++++++++-----
 config/locales/bg.yml                         | 32 +++++---
 config/locales/ca.yml                         | 32 +++++---
 config/locales/cs.yml                         | 40 +++++++---
 config/locales/da.yml                         | 32 +++++---
 config/locales/de.yml                         | 32 +++++---
 config/locales/el.yml                         | 32 +++++---
 config/locales/es.yml                         | 32 +++++---
 config/locales/fa.yml                         | 32 +++++---
 config/locales/fi.yml                         | 32 +++++---
 config/locales/fr.yml                         | 32 +++++---
 config/locales/he.yml                         | 40 +++++++---
 config/locales/hi.yml                         | 32 +++++---
 config/locales/hr.yml                         | 36 ++++++---
 config/locales/hu.yml                         | 32 +++++---
 config/locales/hy.yml                         | 32 +++++---
 config/locales/id.yml                         | 28 ++++---
 config/locales/is.yml                         | 32 +++++---
 config/locales/it.yml                         | 32 +++++---
 config/locales/ja.yml                         | 28 ++++---
 config/locales/ka.yml                         | 32 +++++---
 config/locales/ko.yml                         | 28 ++++---
 config/locales/lt.yml                         | 40 +++++++---
 config/locales/lv.yml                         | 36 ++++++---
 config/locales/ml.yml                         | 32 +++++---
 config/locales/ms.yml                         | 28 ++++---
 config/locales/ne.yml                         | 32 +++++---
 config/locales/nl.yml                         | 32 +++++---
 config/locales/no.yml                         | 32 +++++---
 config/locales/pl.yml                         | 42 +++++++---
 config/locales/pt.yml                         | 32 +++++---
 config/locales/pt_BR.yml                      | 32 +++++---
 config/locales/ro.yml                         | 36 ++++++---
 config/locales/ru.yml                         | 40 +++++++---
 config/locales/sh.yml                         | 40 +++++++---
 config/locales/sk.yml                         | 40 +++++++---
 config/locales/sl.yml                         | 40 +++++++---
 config/locales/sq.yml                         | 32 +++++---
 config/locales/sr.yml                         | 36 ++++++---
 config/locales/sv.yml                         | 32 +++++---
 config/locales/ta.yml                         | 32 +++++---
 config/locales/th.yml                         | 28 ++++---
 config/locales/tr.yml                         | 50 +++++++-----
 config/locales/uk.yml                         | 74 +++++++++++------
 config/locales/ur.yml                         | 32 +++++---
 config/locales/ur_IN.yml                      | 32 +++++---
 config/locales/vi.yml                         | 28 ++++---
 config/locales/zh_CN.yml                      | 28 ++++---
 config/locales/zh_TW.yml                      | 28 ++++---
 513 files changed, 10475 insertions(+), 1303 deletions(-)
 create mode 100644 app/javascript/dashboard/i18n/locale/am/inbox.json
 create mode 100644 app/javascript/dashboard/i18n/locale/am/sla.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ar/inbox.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ar/sla.json
 create mode 100644 app/javascript/dashboard/i18n/locale/bg/inbox.json
 create mode 100644 app/javascript/dashboard/i18n/locale/bg/sla.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ca/inbox.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ca/sla.json
 create mode 100644 app/javascript/dashboard/i18n/locale/cs/inbox.json
 create mode 100644 app/javascript/dashboard/i18n/locale/cs/sla.json
 create mode 100644 app/javascript/dashboard/i18n/locale/da/inbox.json
 create mode 100644 app/javascript/dashboard/i18n/locale/da/sla.json
 create mode 100644 app/javascript/dashboard/i18n/locale/de/inbox.json
 create mode 100644 app/javascript/dashboard/i18n/locale/de/sla.json
 create mode 100644 app/javascript/dashboard/i18n/locale/el/inbox.json
 create mode 100644 app/javascript/dashboard/i18n/locale/el/sla.json
 create mode 100644 app/javascript/dashboard/i18n/locale/es/inbox.json
 create mode 100644 app/javascript/dashboard/i18n/locale/es/sla.json
 create mode 100644 app/javascript/dashboard/i18n/locale/fa/inbox.json
 create mode 100644 app/javascript/dashboard/i18n/locale/fa/sla.json
 create mode 100644 app/javascript/dashboard/i18n/locale/fi/inbox.json
 create mode 100644 app/javascript/dashboard/i18n/locale/fi/sla.json
 create mode 100644 app/javascript/dashboard/i18n/locale/fr/inbox.json
 create mode 100644 app/javascript/dashboard/i18n/locale/fr/sla.json
 create mode 100644 app/javascript/dashboard/i18n/locale/he/inbox.json
 create mode 100644 app/javascript/dashboard/i18n/locale/he/sla.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hi/inbox.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hi/sla.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hr/inbox.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hr/sla.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hu/inbox.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hu/sla.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hy/inbox.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hy/sla.json
 create mode 100644 app/javascript/dashboard/i18n/locale/id/inbox.json
 create mode 100644 app/javascript/dashboard/i18n/locale/id/sla.json
 create mode 100644 app/javascript/dashboard/i18n/locale/is/inbox.json
 create mode 100644 app/javascript/dashboard/i18n/locale/is/sla.json
 create mode 100644 app/javascript/dashboard/i18n/locale/it/inbox.json
 create mode 100644 app/javascript/dashboard/i18n/locale/it/sla.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ja/inbox.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ja/sla.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ka/inbox.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ka/sla.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ko/inbox.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ko/sla.json
 create mode 100644 app/javascript/dashboard/i18n/locale/lt/inbox.json
 create mode 100644 app/javascript/dashboard/i18n/locale/lt/sla.json
 create mode 100644 app/javascript/dashboard/i18n/locale/lv/inbox.json
 create mode 100644 app/javascript/dashboard/i18n/locale/lv/sla.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ml/inbox.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ml/sla.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ms/inbox.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ms/sla.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ne/inbox.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ne/sla.json
 create mode 100644 app/javascript/dashboard/i18n/locale/nl/inbox.json
 create mode 100644 app/javascript/dashboard/i18n/locale/nl/sla.json
 create mode 100644 app/javascript/dashboard/i18n/locale/no/inbox.json
 create mode 100644 app/javascript/dashboard/i18n/locale/no/sla.json
 create mode 100644 app/javascript/dashboard/i18n/locale/pl/inbox.json
 create mode 100644 app/javascript/dashboard/i18n/locale/pl/sla.json
 create mode 100644 app/javascript/dashboard/i18n/locale/pt/inbox.json
 create mode 100644 app/javascript/dashboard/i18n/locale/pt/sla.json
 create mode 100644 app/javascript/dashboard/i18n/locale/pt_BR/inbox.json
 create mode 100644 app/javascript/dashboard/i18n/locale/pt_BR/sla.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ro/inbox.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ro/sla.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ru/inbox.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ru/sla.json
 create mode 100644 app/javascript/dashboard/i18n/locale/sh/inbox.json
 create mode 100644 app/javascript/dashboard/i18n/locale/sh/sla.json
 create mode 100644 app/javascript/dashboard/i18n/locale/sk/inbox.json
 create mode 100644 app/javascript/dashboard/i18n/locale/sk/sla.json
 create mode 100644 app/javascript/dashboard/i18n/locale/sl/inbox.json
 create mode 100644 app/javascript/dashboard/i18n/locale/sl/sla.json
 create mode 100644 app/javascript/dashboard/i18n/locale/sq/inbox.json
 create mode 100644 app/javascript/dashboard/i18n/locale/sq/sla.json
 create mode 100644 app/javascript/dashboard/i18n/locale/sr/inbox.json
 create mode 100644 app/javascript/dashboard/i18n/locale/sr/sla.json
 create mode 100644 app/javascript/dashboard/i18n/locale/sv/inbox.json
 create mode 100644 app/javascript/dashboard/i18n/locale/sv/sla.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ta/inbox.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ta/sla.json
 create mode 100644 app/javascript/dashboard/i18n/locale/th/inbox.json
 create mode 100644 app/javascript/dashboard/i18n/locale/th/sla.json
 create mode 100644 app/javascript/dashboard/i18n/locale/tr/inbox.json
 create mode 100644 app/javascript/dashboard/i18n/locale/tr/sla.json
 create mode 100644 app/javascript/dashboard/i18n/locale/uk/inbox.json
 create mode 100644 app/javascript/dashboard/i18n/locale/uk/sla.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ur/inbox.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ur/sla.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ur_IN/inbox.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ur_IN/sla.json
 create mode 100644 app/javascript/dashboard/i18n/locale/vi/inbox.json
 create mode 100644 app/javascript/dashboard/i18n/locale/vi/sla.json
 create mode 100644 app/javascript/dashboard/i18n/locale/zh_CN/inbox.json
 create mode 100644 app/javascript/dashboard/i18n/locale/zh_CN/sla.json
 create mode 100644 app/javascript/dashboard/i18n/locale/zh_TW/inbox.json
 create mode 100644 app/javascript/dashboard/i18n/locale/zh_TW/sla.json

diff --git a/app/javascript/dashboard/i18n/locale/am/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/am/attributesMgmt.json
index 2a9ea7de3..64a0e83d6 100644
--- a/app/javascript/dashboard/i18n/locale/am/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/am/attributesMgmt.json
@@ -39,6 +39,17 @@
           "PLACEHOLDER": "Enter custom attribute key",
           "ERROR": "Key is required",
           "IN_VALID": "Invalid key"
+        },
+        "REGEX_PATTERN": {
+          "LABEL": "Regex Pattern",
+          "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+        },
+        "REGEX_CUE": {
+          "LABEL": "Regex Cue",
+          "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+        },
+        "ENABLE_REGEX": {
+          "LABEL": "Enable regex validation"
         }
       },
       "API": {
@@ -93,6 +104,17 @@
       "EMPTY_RESULT": {
         "404": "There are no custom attributes created",
         "NOT_FOUND": "There are no custom attributes configured"
+      },
+      "REGEX_PATTERN": {
+        "LABEL": "Regex Pattern",
+        "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+      },
+      "REGEX_CUE": {
+        "LABEL": "Regex Cue",
+        "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+      },
+      "ENABLE_REGEX": {
+        "LABEL": "Enable regex validation"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/am/contact.json b/app/javascript/dashboard/i18n/locale/am/contact.json
index 7ad18b792..791279899 100644
--- a/app/javascript/dashboard/i18n/locale/am/contact.json
+++ b/app/javascript/dashboard/i18n/locale/am/contact.json
@@ -39,10 +39,10 @@
     },
     "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",
+    "MUTE_CONTACT": "Block Contact",
+    "UNMUTE_CONTACT": "Unblock Contact",
+    "MUTED_SUCCESS": "This contact is blocked successfully. You will not be notified of any future conversations.",
+    "UNMUTED_SUCCESS": "This contact is unblocked successfully.",
     "SEND_TRANSCRIPT": "Send Transcript",
     "EDIT_LABEL": "Edit",
     "SIDEBAR_SECTIONS": {
@@ -79,7 +79,13 @@
     "TITLE": "Export Contacts",
     "DESC": "Export contacts to a CSV file.",
     "SUCCESS_MESSAGE": "Export is in progress. You will be notified on email when the export file is ready to download.",
-    "ERROR_MESSAGE": "There was an error, please try again"
+    "ERROR_MESSAGE": "There was an error, please try again",
+    "CONFIRM": {
+      "TITLE": "Export Contacts",
+      "MESSAGE": "Are you sure you want to export all contacts?",
+      "YES": "Yes, Export",
+      "NO": "No, Cancel"
+    }
   },
   "DELETE_NOTE": {
     "CONFIRM": {
@@ -339,7 +345,8 @@
     },
     "VALIDATIONS": {
       "REQUIRED": "Valid value is required",
-      "INVALID_URL": "Invalid URL"
+      "INVALID_URL": "Invalid URL",
+      "INVALID_INPUT": "Invalid Input"
     }
   },
   "MERGE_CONTACTS": {
diff --git a/app/javascript/dashboard/i18n/locale/am/generalSettings.json b/app/javascript/dashboard/i18n/locale/am/generalSettings.json
index d56a20c15..185d328a5 100644
--- a/app/javascript/dashboard/i18n/locale/am/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/am/generalSettings.json
@@ -112,7 +112,8 @@
       "REMOVE_LABEL": "Remove label from the conversation",
       "SETTINGS": "Settings",
       "AI_ASSIST": "AI Assist",
-      "APPEARANCE": "Appearance"
+      "APPEARANCE": "Appearance",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     },
     "COMMANDS": {
       "GO_TO_CONVERSATION_DASHBOARD": "Go to Conversation Dashboard",
@@ -153,7 +154,8 @@
       "CHANGE_APPEARANCE": "Change Appearance",
       "LIGHT_MODE": "Light",
       "DARK_MODE": "Dark",
-      "SYSTEM_MODE": "System"
+      "SYSTEM_MODE": "System",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     }
   },
   "DASHBOARD_APPS": {
diff --git a/app/javascript/dashboard/i18n/locale/am/helpCenter.json b/app/javascript/dashboard/i18n/locale/am/helpCenter.json
index 1f3bda807..d94692e3d 100644
--- a/app/javascript/dashboard/i18n/locale/am/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/am/helpCenter.json
@@ -324,7 +324,8 @@
         "LAST_EDITED": "Last edited"
       },
       "COLUMNS": {
-        "BY": "by"
+        "BY": "by",
+        "AUTHOR_NOT_AVAILABLE": "Author is not available"
       }
     },
     "EDIT_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/am/inbox.json b/app/javascript/dashboard/i18n/locale/am/inbox.json
new file mode 100644
index 000000000..dcac5459f
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/am/inbox.json
@@ -0,0 +1,60 @@
+{
+  "INBOX": {
+    "LIST": {
+      "TITLE": "Inbox",
+      "DISPLAY_DROPDOWN": "Display",
+      "LOADING": "Fetching notifications",
+      "EOF": "All notifications loaded 🎉",
+      "404": "There are no active notifications in this group.",
+      "NO_NOTIFICATIONS": "No notifications",
+      "NOTE": "Notifications from all subscribed inboxes",
+      "SNOOZED_UNTIL": "Snoozed until",
+      "SNOOZED_UNTIL_TOMORROW": "Snoozed until tomorrow",
+      "SNOOZED_UNTIL_NEXT_WEEK": "Snoozed until next week"
+    },
+    "ACTION_HEADER": {
+      "SNOOZE": "Snooze notification",
+      "DELETE": "Delete notification"
+    },
+    "TYPES": {
+      "CONVERSATION_MENTION": "You have been mentioned in a conversation",
+      "CONVERSATION_CREATION": "New conversation created",
+      "CONVERSATION_ASSIGNMENT": "A conversation has been assigned to you",
+      "ASSIGNED_CONVERSATION_NEW_MESSAGE": "New message in an assigned conversation",
+      "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "New message in a conversation you are participating in"
+    },
+    "MENU_ITEM": {
+      "MARK_AS_READ": "Mark as read",
+      "MARK_AS_UNREAD": "Mark as unread",
+      "SNOOZE": "Snooze",
+      "DELETE": "Delete",
+      "MARK_ALL_READ": "Mark all as read",
+      "DELETE_ALL": "Delete all",
+      "DELETE_ALL_READ": "Delete all read"
+    },
+    "DISPLAY_MENU": {
+      "SORT": "Sort",
+      "DISPLAY": "Display :",
+      "SORT_OPTIONS": {
+        "NEWEST": "Newest",
+        "OLDEST": "Oldest",
+        "PRIORITY": "Priority"
+      },
+      "DISPLAY_OPTIONS": {
+        "SNOOZED": "Snoozed",
+        "READ": "Read",
+        "LABELS": "Labels",
+        "CONVERSATION_ID": "Conversation ID"
+      }
+    },
+    "ALERTS": {
+      "MARK_AS_READ": "Notification marked as read",
+      "MARK_AS_UNREAD": "Notification marked as unread",
+      "SNOOZE": "Notification snoozed",
+      "DELETE": "Notification deleted",
+      "MARK_ALL_READ": "All notifications marked as read",
+      "DELETE_ALL": "All notifications deleted",
+      "DELETE_ALL_READ": "All read notifications deleted"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/am/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/am/inboxMgmt.json
index 74eff2033..8d1662f91 100644
--- a/app/javascript/dashboard/i18n/locale/am/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/am/inboxMgmt.json
@@ -569,7 +569,7 @@
       "UPDATE": "Update business hours settings",
       "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
       "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for visitors",
-      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours visitors can be warned with a message and a pre-chat form.",
       "DAY": {
         "ENABLE": "Enable availability for this day",
         "UNAVAILABLE": "Unavailable",
diff --git a/app/javascript/dashboard/i18n/locale/am/settings.json b/app/javascript/dashboard/i18n/locale/am/settings.json
index b96a7c091..a953dbca0 100644
--- a/app/javascript/dashboard/i18n/locale/am/settings.json
+++ b/app/javascript/dashboard/i18n/locale/am/settings.json
@@ -160,6 +160,9 @@
     "TRIAL_MESSAGE": "days trial remaining.",
     "TRAIL_BUTTON": "Buy Now",
     "DELETED_USER": "Deleted User",
+    "EMAIL_VERIFICATION_PENDING": "It seems that you haven't verified your email address yet. Please check your inbox for the verification email.",
+    "RESEND_VERIFICATION_MAIL": "Resend verification email",
+    "EMAIL_VERIFICATION_SENT": "Verification email has been sent. Please check your inbox.",
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Account Suspended",
       "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
@@ -197,6 +200,7 @@
     "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
     "SWITCH": "Switch",
     "CONVERSATIONS": "Conversations",
+    "INBOX": "Inbox",
     "ALL_CONVERSATIONS": "All Conversations",
     "MENTIONED_CONVERSATIONS": "Mentions",
     "PARTICIPATING_CONVERSATIONS": "Participating",
@@ -238,6 +242,7 @@
     "REPORTS_INBOX": "Inbox",
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
+    "SLA": "SLA",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Overview",
     "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
diff --git a/app/javascript/dashboard/i18n/locale/am/sla.json b/app/javascript/dashboard/i18n/locale/am/sla.json
new file mode 100644
index 000000000..869b3ba3f
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/am/sla.json
@@ -0,0 +1,70 @@
+{
+  "SLA": {
+    "HEADER": "SLA",
+    "HEADER_BTN_TXT": "Add SLA",
+    "LOADING": "Fetching SLAs",
+    "SEARCH_404": "There are no items matching this query",
+    "SIDEBAR_TXT": "<p><b>SLA</b> <p>Think of Service Level Agreements (SLAs) like friendly promises between a service provider and a customer.</p> <p> These promises set clear expectations for things like how quickly the team will respond to issues, making sure you always get a reliable and top-notch experience!</p>",
+    "LIST": {
+      "404": "There are no SLAs available in this account.",
+      "TITLE": "Manage SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "TABLE_HEADER": [
+        "Name",
+        "Description",
+        "FRT",
+        "NRT",
+        "RT",
+        "Business Hours"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "SLA Name",
+        "PLACEHOLDER": "SLA Name",
+        "REQUIRED_ERROR": "SLA name is required",
+        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
+        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Description",
+        "PLACEHOLDER": "SLA for premium customers"
+      },
+      "FIRST_RESPONSE_TIME": {
+        "LABEL": "First Response Time(Seconds)",
+        "PLACEHOLDER": "300 for 5 minutes"
+      },
+      "NEXT_RESPONSE_TIME": {
+        "LABEL": "Next Response Time(Seconds)",
+        "PLACEHOLDER": "600 for 10 minutes"
+      },
+      "RESOLUTION_TIME": {
+        "LABEL": "Resolution Time(Seconds)",
+        "PLACEHOLDER": "86400 for 1 day"
+      },
+      "BUSINESS_HOURS": {
+        "LABEL": "Business Hours",
+        "PLACEHOLDER": "Only during business hours"
+      },
+      "EDIT": "Edit",
+      "CREATE": "Create",
+      "DELETE": "Delete",
+      "CANCEL": "Cancel"
+    },
+    "ADD": {
+      "TITLE": "Add SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA added successfully",
+        "ERROR_MESSAGE": "There was an error, please try again"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit SLA",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA updated successfully",
+        "ERROR_MESSAGE": "There was an error, please try again"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ar/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/ar/attributesMgmt.json
index aa1c7f307..3ced03bb8 100644
--- a/app/javascript/dashboard/i18n/locale/ar/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ar/attributesMgmt.json
@@ -39,6 +39,17 @@
           "PLACEHOLDER": "أدخل مفتاح السمة المخصصة",
           "ERROR": "المفتاح مطلوب",
           "IN_VALID": "مفتاح غير صالح"
+        },
+        "REGEX_PATTERN": {
+          "LABEL": "Regex Pattern",
+          "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+        },
+        "REGEX_CUE": {
+          "LABEL": "Regex Cue",
+          "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+        },
+        "ENABLE_REGEX": {
+          "LABEL": "Enable regex validation"
         }
       },
       "API": {
@@ -93,6 +104,17 @@
       "EMPTY_RESULT": {
         "404": "لا توجد سمات مخصصة تم إنشاؤها",
         "NOT_FOUND": "لا توجد سمات مخصصة تم تكوينها"
+      },
+      "REGEX_PATTERN": {
+        "LABEL": "Regex Pattern",
+        "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+      },
+      "REGEX_CUE": {
+        "LABEL": "Regex Cue",
+        "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+      },
+      "ENABLE_REGEX": {
+        "LABEL": "Enable regex validation"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/ar/contact.json b/app/javascript/dashboard/i18n/locale/ar/contact.json
index 6d1037bb0..00681a963 100644
--- a/app/javascript/dashboard/i18n/locale/ar/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ar/contact.json
@@ -39,10 +39,10 @@
     },
     "MERGE_CONTACT": "دمج جهة الاتصال",
     "CONTACT_ACTIONS": "إجراءات جهات الاتصال",
-    "MUTE_CONTACT": "كتم المحادثة",
-    "UNMUTE_CONTACT": "إلغاء كتم المحادثة",
-    "MUTED_SUCCESS": "تم كتم هذه المحادثة لمدة 6 ساعات",
-    "UNMUTED_SUCCESS": "تم إلغاء كتم هذه المحادثة",
+    "MUTE_CONTACT": "Block Contact",
+    "UNMUTE_CONTACT": "Unblock Contact",
+    "MUTED_SUCCESS": "This contact is blocked successfully. You will not be notified of any future conversations.",
+    "UNMUTED_SUCCESS": "This contact is unblocked successfully.",
     "SEND_TRANSCRIPT": "إرسال النص",
     "EDIT_LABEL": "تعديل",
     "SIDEBAR_SECTIONS": {
@@ -79,7 +79,13 @@
     "TITLE": "Export Contacts",
     "DESC": "Export contacts to a CSV file.",
     "SUCCESS_MESSAGE": "Export is in progress, You will be notified via email when export file is ready to dowanlod.",
-    "ERROR_MESSAGE": "حدث خطأ، الرجاء المحاولة مرة أخرى"
+    "ERROR_MESSAGE": "حدث خطأ، الرجاء المحاولة مرة أخرى",
+    "CONFIRM": {
+      "TITLE": "Export Contacts",
+      "MESSAGE": "Are you sure you want to export all contacts?",
+      "YES": "Yes, Export",
+      "NO": "No, Cancel"
+    }
   },
   "DELETE_NOTE": {
     "CONFIRM": {
@@ -339,7 +345,8 @@
     },
     "VALIDATIONS": {
       "REQUIRED": "القيمة الصالحة مطلوبة",
-      "INVALID_URL": "عنوان URL غير صالح"
+      "INVALID_URL": "عنوان URL غير صالح",
+      "INVALID_INPUT": "Invalid Input"
     }
   },
   "MERGE_CONTACTS": {
diff --git a/app/javascript/dashboard/i18n/locale/ar/generalSettings.json b/app/javascript/dashboard/i18n/locale/ar/generalSettings.json
index 627becffd..fd96a3ca4 100644
--- a/app/javascript/dashboard/i18n/locale/ar/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ar/generalSettings.json
@@ -112,7 +112,8 @@
       "REMOVE_LABEL": "إزالة التسمية من المحادثة",
       "SETTINGS": "الإعدادات",
       "AI_ASSIST": "AI Assist",
-      "APPEARANCE": "Appearance"
+      "APPEARANCE": "Appearance",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     },
     "COMMANDS": {
       "GO_TO_CONVERSATION_DASHBOARD": "الذهاب إلى لوحة المحادثة",
@@ -153,7 +154,8 @@
       "CHANGE_APPEARANCE": "Change Appearance",
       "LIGHT_MODE": "Light",
       "DARK_MODE": "Dark",
-      "SYSTEM_MODE": "System"
+      "SYSTEM_MODE": "System",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     }
   },
   "DASHBOARD_APPS": {
diff --git a/app/javascript/dashboard/i18n/locale/ar/helpCenter.json b/app/javascript/dashboard/i18n/locale/ar/helpCenter.json
index 78bd33d6a..f9d919a91 100644
--- a/app/javascript/dashboard/i18n/locale/ar/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ar/helpCenter.json
@@ -324,7 +324,8 @@
         "LAST_EDITED": "آخر تعديل"
       },
       "COLUMNS": {
-        "BY": "بواسطة"
+        "BY": "بواسطة",
+        "AUTHOR_NOT_AVAILABLE": "Author is not available"
       }
     },
     "EDIT_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/ar/inbox.json b/app/javascript/dashboard/i18n/locale/ar/inbox.json
new file mode 100644
index 000000000..debc566a2
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ar/inbox.json
@@ -0,0 +1,60 @@
+{
+  "INBOX": {
+    "LIST": {
+      "TITLE": "صندوق الوارد",
+      "DISPLAY_DROPDOWN": "Display",
+      "LOADING": "Fetching notifications",
+      "EOF": "تم تحميل كافة الإشعارات 🎉",
+      "404": "There are no active notifications in this group.",
+      "NO_NOTIFICATIONS": "No notifications",
+      "NOTE": "Notifications from all subscribed inboxes",
+      "SNOOZED_UNTIL": "Snoozed until",
+      "SNOOZED_UNTIL_TOMORROW": "غفوة حتى الغد",
+      "SNOOZED_UNTIL_NEXT_WEEK": "غفوة حتى الأسبوع القادم"
+    },
+    "ACTION_HEADER": {
+      "SNOOZE": "Snooze notification",
+      "DELETE": "Delete notification"
+    },
+    "TYPES": {
+      "CONVERSATION_MENTION": "You have been mentioned in a conversation",
+      "CONVERSATION_CREATION": "New conversation created",
+      "CONVERSATION_ASSIGNMENT": "A conversation has been assigned to you",
+      "ASSIGNED_CONVERSATION_NEW_MESSAGE": "New message in an assigned conversation",
+      "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "New message in a conversation you are participating in"
+    },
+    "MENU_ITEM": {
+      "MARK_AS_READ": "Mark as read",
+      "MARK_AS_UNREAD": "وضع علامة كغير مقروء",
+      "SNOOZE": "غفوة",
+      "DELETE": "حذف",
+      "MARK_ALL_READ": "تحديد الكل كمقروء",
+      "DELETE_ALL": "Delete all",
+      "DELETE_ALL_READ": "Delete all read"
+    },
+    "DISPLAY_MENU": {
+      "SORT": "Sort",
+      "DISPLAY": "Display :",
+      "SORT_OPTIONS": {
+        "NEWEST": "Newest",
+        "OLDEST": "Oldest",
+        "PRIORITY": "الأولوية"
+      },
+      "DISPLAY_OPTIONS": {
+        "SNOOZED": "غفوة",
+        "READ": "قرائة",
+        "LABELS": "الوسوم",
+        "CONVERSATION_ID": "Conversation ID"
+      }
+    },
+    "ALERTS": {
+      "MARK_AS_READ": "Notification marked as read",
+      "MARK_AS_UNREAD": "Notification marked as unread",
+      "SNOOZE": "Notification snoozed",
+      "DELETE": "Notification deleted",
+      "MARK_ALL_READ": "All notifications marked as read",
+      "DELETE_ALL": "All notifications deleted",
+      "DELETE_ALL_READ": "All read notifications deleted"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json
index 692ae08ec..8b6e42b45 100644
--- a/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json
@@ -569,7 +569,7 @@
       "UPDATE": "تحديث إعدادات ساعات العمل",
       "TOGGLE_AVAILABILITY": "تمكين توافر العمل لهذا البريد الوارد",
       "UNAVAILABLE_MESSAGE_LABEL": "رسالة غير متاح للزائرين",
-      "TOGGLE_HELP": "تمكين توفر العمل سيظهر الساعات المتاحة على أداة الدردشة المباشرة حتى لو كان جميع الوكلاء غير متصلين بالإنترنت. خارج الساعات المتاحة يمكن تحذير الزوار برسالة ونموذج ما قبل الدردشة.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours visitors can be warned with a message and a pre-chat form.",
       "DAY": {
         "ENABLE": "تمكين التوفر لهذا اليوم",
         "UNAVAILABLE": "غير متوفر",
diff --git a/app/javascript/dashboard/i18n/locale/ar/settings.json b/app/javascript/dashboard/i18n/locale/ar/settings.json
index 272f635c8..5359cb388 100644
--- a/app/javascript/dashboard/i18n/locale/ar/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ar/settings.json
@@ -160,6 +160,9 @@
     "TRIAL_MESSAGE": "أيام متبقية من الفترة التجريبية.",
     "TRAIL_BUTTON": "اشترك الآن",
     "DELETED_USER": "حذف المستخدم",
+    "EMAIL_VERIFICATION_PENDING": "It seems that you haven't verified your email address yet. Please check your inbox for the verification email.",
+    "RESEND_VERIFICATION_MAIL": "Resend verification email",
+    "EMAIL_VERIFICATION_SENT": "Verification email has been sent. Please check your inbox.",
     "ACCOUNT_SUSPENDED": {
       "TITLE": "تم تعليق الحساب",
       "MESSAGE": "تم تعليق حسابك. يرجى الاتصال بفريق الدعم للمزيد من المعلومات."
@@ -197,6 +200,7 @@
     "CURRENTLY_VIEWING_ACCOUNT": "مشاهدة حاليا:",
     "SWITCH": "تبديل",
     "CONVERSATIONS": "المحادثات",
+    "INBOX": "صندوق الوارد",
     "ALL_CONVERSATIONS": "كل المحادثات",
     "MENTIONED_CONVERSATIONS": "الإشارات",
     "PARTICIPATING_CONVERSATIONS": "شارك",
@@ -238,6 +242,7 @@
     "REPORTS_INBOX": "صندوق الوارد",
     "REPORTS_TEAM": "الفريق",
     "SET_AVAILABILITY_TITLE": "تعيين نفسك كـ",
+    "SLA": "SLA",
     "BETA": "تجريبي",
     "REPORTS_OVERVIEW": "نظرة عامة",
     "FACEBOOK_REAUTHORIZE": "انتهت صلاحية اتصال الفيسبوك الخاص بك، يرجى إعادة الاتصال بصفحة الفيسبوك الخاصة بك لمواصلة الخدمات",
diff --git a/app/javascript/dashboard/i18n/locale/ar/sla.json b/app/javascript/dashboard/i18n/locale/ar/sla.json
new file mode 100644
index 000000000..9dcb07d21
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ar/sla.json
@@ -0,0 +1,70 @@
+{
+  "SLA": {
+    "HEADER": "SLA",
+    "HEADER_BTN_TXT": "Add SLA",
+    "LOADING": "Fetching SLAs",
+    "SEARCH_404": "لا توجد عناصر مطابقة لهذا الاستعلام",
+    "SIDEBAR_TXT": "<p><b>SLA</b> <p>Think of Service Level Agreements (SLAs) like friendly promises between a service provider and a customer.</p> <p> These promises set clear expectations for things like how quickly the team will respond to issues, making sure you always get a reliable and top-notch experience!</p>",
+    "LIST": {
+      "404": "There are no SLAs available in this account.",
+      "TITLE": "Manage SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "TABLE_HEADER": [
+        "الاسم",
+        "الوصف",
+        "FRT",
+        "NRT",
+        "RT",
+        "ساعات العمل"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "SLA Name",
+        "PLACEHOLDER": "SLA Name",
+        "REQUIRED_ERROR": "SLA name is required",
+        "MINIMUM_LENGTH_ERROR": "الحد الأدنى للطول 2 مطلوب",
+        "VALID_ERROR": "مسموح فقط بالابجدية,الارقام, -, _"
+      },
+      "DESCRIPTION": {
+        "LABEL": "الوصف",
+        "PLACEHOLDER": "SLA for premium customers"
+      },
+      "FIRST_RESPONSE_TIME": {
+        "LABEL": "First Response Time(Seconds)",
+        "PLACEHOLDER": "300 for 5 minutes"
+      },
+      "NEXT_RESPONSE_TIME": {
+        "LABEL": "Next Response Time(Seconds)",
+        "PLACEHOLDER": "600 for 10 minutes"
+      },
+      "RESOLUTION_TIME": {
+        "LABEL": "Resolution Time(Seconds)",
+        "PLACEHOLDER": "86400 for 1 day"
+      },
+      "BUSINESS_HOURS": {
+        "LABEL": "ساعات العمل",
+        "PLACEHOLDER": "Only during business hours"
+      },
+      "EDIT": "تعديل",
+      "CREATE": "إنشاء",
+      "DELETE": "حذف",
+      "CANCEL": "إلغاء"
+    },
+    "ADD": {
+      "TITLE": "Add SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA added successfully",
+        "ERROR_MESSAGE": "حدث خطأ، الرجاء المحاولة مرة أخرى"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit SLA",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA updated successfully",
+        "ERROR_MESSAGE": "حدث خطأ، الرجاء المحاولة مرة أخرى"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ar/whatsappTemplates.json b/app/javascript/dashboard/i18n/locale/ar/whatsappTemplates.json
index 77687f8df..509c96173 100644
--- a/app/javascript/dashboard/i18n/locale/ar/whatsappTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/ar/whatsappTemplates.json
@@ -2,7 +2,7 @@
     "WHATSAPP_TEMPLATES": {
         "MODAL": {
             "TITLE": "قوالب Whatsapp",
-            "SUBTITLE": "حدد قالب ما تريد إرساله",
+            "SUBTITLE": "حدد القالب الذي تريد إرساله",
             "TEMPLATE_SELECTED_SUBTITLE": "معالجة %{templateName}"
         },
         "PICKER": {
diff --git a/app/javascript/dashboard/i18n/locale/bg/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/bg/attributesMgmt.json
index de9fb8b16..8e30e3e7c 100644
--- a/app/javascript/dashboard/i18n/locale/bg/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/bg/attributesMgmt.json
@@ -39,6 +39,17 @@
           "PLACEHOLDER": "Enter custom attribute key",
           "ERROR": "Key is required",
           "IN_VALID": "Невалиден ключ"
+        },
+        "REGEX_PATTERN": {
+          "LABEL": "Regex Pattern",
+          "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+        },
+        "REGEX_CUE": {
+          "LABEL": "Regex Cue",
+          "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+        },
+        "ENABLE_REGEX": {
+          "LABEL": "Enable regex validation"
         }
       },
       "API": {
@@ -93,6 +104,17 @@
       "EMPTY_RESULT": {
         "404": "Няма създадени персонализирани атрибути",
         "NOT_FOUND": "Няма настроени персонализирани атрибути"
+      },
+      "REGEX_PATTERN": {
+        "LABEL": "Regex Pattern",
+        "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+      },
+      "REGEX_CUE": {
+        "LABEL": "Regex Cue",
+        "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+      },
+      "ENABLE_REGEX": {
+        "LABEL": "Enable regex validation"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/bg/contact.json b/app/javascript/dashboard/i18n/locale/bg/contact.json
index 97fdf5d65..236a68ea1 100644
--- a/app/javascript/dashboard/i18n/locale/bg/contact.json
+++ b/app/javascript/dashboard/i18n/locale/bg/contact.json
@@ -39,10 +39,10 @@
     },
     "MERGE_CONTACT": "Обединяване на контакти",
     "CONTACT_ACTIONS": "Действия за контакта",
-    "MUTE_CONTACT": "Заглушаване на разговора",
-    "UNMUTE_CONTACT": "Пускане звука на разговора",
-    "MUTED_SUCCESS": "Този разговор е заглушен за 6 часа",
-    "UNMUTED_SUCCESS": "Този разговор е с пуснат звук",
+    "MUTE_CONTACT": "Block Contact",
+    "UNMUTE_CONTACT": "Unblock Contact",
+    "MUTED_SUCCESS": "This contact is blocked successfully. You will not be notified of any future conversations.",
+    "UNMUTED_SUCCESS": "This contact is unblocked successfully.",
     "SEND_TRANSCRIPT": "Изпрати копие",
     "EDIT_LABEL": "Редактирай",
     "SIDEBAR_SECTIONS": {
@@ -79,7 +79,13 @@
     "TITLE": "Export Contacts",
     "DESC": "Export contacts to a CSV file.",
     "SUCCESS_MESSAGE": "Export is in progress, You will be notified via email when export file is ready to dowanlod.",
-    "ERROR_MESSAGE": "Възникна грешка, моля опитайте отново"
+    "ERROR_MESSAGE": "Възникна грешка, моля опитайте отново",
+    "CONFIRM": {
+      "TITLE": "Export Contacts",
+      "MESSAGE": "Are you sure you want to export all contacts?",
+      "YES": "Yes, Export",
+      "NO": "No, Cancel"
+    }
   },
   "DELETE_NOTE": {
     "CONFIRM": {
@@ -339,7 +345,8 @@
     },
     "VALIDATIONS": {
       "REQUIRED": "Необходима е валидна стойност",
-      "INVALID_URL": "Невалиден URL"
+      "INVALID_URL": "Невалиден URL",
+      "INVALID_INPUT": "Invalid Input"
     }
   },
   "MERGE_CONTACTS": {
diff --git a/app/javascript/dashboard/i18n/locale/bg/generalSettings.json b/app/javascript/dashboard/i18n/locale/bg/generalSettings.json
index 8fbff8916..c9de6f519 100644
--- a/app/javascript/dashboard/i18n/locale/bg/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/bg/generalSettings.json
@@ -112,7 +112,8 @@
       "REMOVE_LABEL": "Remove label from the conversation",
       "SETTINGS": "Settings",
       "AI_ASSIST": "AI Assist",
-      "APPEARANCE": "Appearance"
+      "APPEARANCE": "Appearance",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     },
     "COMMANDS": {
       "GO_TO_CONVERSATION_DASHBOARD": "Go to Conversation Dashboard",
@@ -153,7 +154,8 @@
       "CHANGE_APPEARANCE": "Change Appearance",
       "LIGHT_MODE": "Light",
       "DARK_MODE": "Dark",
-      "SYSTEM_MODE": "System"
+      "SYSTEM_MODE": "System",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     }
   },
   "DASHBOARD_APPS": {
diff --git a/app/javascript/dashboard/i18n/locale/bg/helpCenter.json b/app/javascript/dashboard/i18n/locale/bg/helpCenter.json
index 894f20393..687dd44de 100644
--- a/app/javascript/dashboard/i18n/locale/bg/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/bg/helpCenter.json
@@ -324,7 +324,8 @@
         "LAST_EDITED": "Last edited"
       },
       "COLUMNS": {
-        "BY": "by"
+        "BY": "by",
+        "AUTHOR_NOT_AVAILABLE": "Author is not available"
       }
     },
     "EDIT_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/bg/inbox.json b/app/javascript/dashboard/i18n/locale/bg/inbox.json
new file mode 100644
index 000000000..adae4bc9c
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/bg/inbox.json
@@ -0,0 +1,60 @@
+{
+  "INBOX": {
+    "LIST": {
+      "TITLE": "Входяща кутия",
+      "DISPLAY_DROPDOWN": "Display",
+      "LOADING": "Fetching notifications",
+      "EOF": "All notifications loaded 🎉",
+      "404": "There are no active notifications in this group.",
+      "NO_NOTIFICATIONS": "No notifications",
+      "NOTE": "Notifications from all subscribed inboxes",
+      "SNOOZED_UNTIL": "Snoozed until",
+      "SNOOZED_UNTIL_TOMORROW": "Snoozed until tomorrow",
+      "SNOOZED_UNTIL_NEXT_WEEK": "Snoozed until next week"
+    },
+    "ACTION_HEADER": {
+      "SNOOZE": "Snooze notification",
+      "DELETE": "Delete notification"
+    },
+    "TYPES": {
+      "CONVERSATION_MENTION": "You have been mentioned in a conversation",
+      "CONVERSATION_CREATION": "New conversation created",
+      "CONVERSATION_ASSIGNMENT": "A conversation has been assigned to you",
+      "ASSIGNED_CONVERSATION_NEW_MESSAGE": "New message in an assigned conversation",
+      "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "New message in a conversation you are participating in"
+    },
+    "MENU_ITEM": {
+      "MARK_AS_READ": "Mark as read",
+      "MARK_AS_UNREAD": "Mark as unread",
+      "SNOOZE": "Snooze",
+      "DELETE": "Изтрий",
+      "MARK_ALL_READ": "Mark all as read",
+      "DELETE_ALL": "Delete all",
+      "DELETE_ALL_READ": "Delete all read"
+    },
+    "DISPLAY_MENU": {
+      "SORT": "Sort",
+      "DISPLAY": "Display :",
+      "SORT_OPTIONS": {
+        "NEWEST": "Newest",
+        "OLDEST": "Oldest",
+        "PRIORITY": "Priority"
+      },
+      "DISPLAY_OPTIONS": {
+        "SNOOZED": "Отложен",
+        "READ": "Read",
+        "LABELS": "Етикети",
+        "CONVERSATION_ID": "Conversation ID"
+      }
+    },
+    "ALERTS": {
+      "MARK_AS_READ": "Notification marked as read",
+      "MARK_AS_UNREAD": "Notification marked as unread",
+      "SNOOZE": "Notification snoozed",
+      "DELETE": "Notification deleted",
+      "MARK_ALL_READ": "All notifications marked as read",
+      "DELETE_ALL": "All notifications deleted",
+      "DELETE_ALL_READ": "All read notifications deleted"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/bg/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/bg/inboxMgmt.json
index f4fecc0c8..56859a357 100644
--- a/app/javascript/dashboard/i18n/locale/bg/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/bg/inboxMgmt.json
@@ -569,7 +569,7 @@
       "UPDATE": "Update business hours settings",
       "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
       "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for visitors",
-      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours visitors can be warned with a message and a pre-chat form.",
       "DAY": {
         "ENABLE": "Enable availability for this day",
         "UNAVAILABLE": "Unavailable",
diff --git a/app/javascript/dashboard/i18n/locale/bg/settings.json b/app/javascript/dashboard/i18n/locale/bg/settings.json
index 3b55bc31c..3c34700b4 100644
--- a/app/javascript/dashboard/i18n/locale/bg/settings.json
+++ b/app/javascript/dashboard/i18n/locale/bg/settings.json
@@ -160,6 +160,9 @@
     "TRIAL_MESSAGE": "days trial remaining.",
     "TRAIL_BUTTON": "Buy Now",
     "DELETED_USER": "Deleted User",
+    "EMAIL_VERIFICATION_PENDING": "It seems that you haven't verified your email address yet. Please check your inbox for the verification email.",
+    "RESEND_VERIFICATION_MAIL": "Resend verification email",
+    "EMAIL_VERIFICATION_SENT": "Verification email has been sent. Please check your inbox.",
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Account Suspended",
       "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
@@ -197,6 +200,7 @@
     "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
     "SWITCH": "Switch",
     "CONVERSATIONS": "Разговори",
+    "INBOX": "Входяща кутия",
     "ALL_CONVERSATIONS": "All Conversations",
     "MENTIONED_CONVERSATIONS": "Споменавания",
     "PARTICIPATING_CONVERSATIONS": "Participating",
@@ -238,6 +242,7 @@
     "REPORTS_INBOX": "Входяща кутия",
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
+    "SLA": "SLA",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Overview",
     "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
diff --git a/app/javascript/dashboard/i18n/locale/bg/sla.json b/app/javascript/dashboard/i18n/locale/bg/sla.json
new file mode 100644
index 000000000..98e085207
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/bg/sla.json
@@ -0,0 +1,70 @@
+{
+  "SLA": {
+    "HEADER": "SLA",
+    "HEADER_BTN_TXT": "Add SLA",
+    "LOADING": "Fetching SLAs",
+    "SEARCH_404": "Няма резултати отговарящи на тази заявка",
+    "SIDEBAR_TXT": "<p><b>SLA</b> <p>Think of Service Level Agreements (SLAs) like friendly promises between a service provider and a customer.</p> <p> These promises set clear expectations for things like how quickly the team will respond to issues, making sure you always get a reliable and top-notch experience!</p>",
+    "LIST": {
+      "404": "There are no SLAs available in this account.",
+      "TITLE": "Manage SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "TABLE_HEADER": [
+        "Име",
+        "Описание",
+        "FRT",
+        "NRT",
+        "RT",
+        "Business Hours"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "SLA Name",
+        "PLACEHOLDER": "SLA Name",
+        "REQUIRED_ERROR": "SLA name is required",
+        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
+        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Описание",
+        "PLACEHOLDER": "SLA for premium customers"
+      },
+      "FIRST_RESPONSE_TIME": {
+        "LABEL": "First Response Time(Seconds)",
+        "PLACEHOLDER": "300 for 5 minutes"
+      },
+      "NEXT_RESPONSE_TIME": {
+        "LABEL": "Next Response Time(Seconds)",
+        "PLACEHOLDER": "600 for 10 minutes"
+      },
+      "RESOLUTION_TIME": {
+        "LABEL": "Resolution Time(Seconds)",
+        "PLACEHOLDER": "86400 for 1 day"
+      },
+      "BUSINESS_HOURS": {
+        "LABEL": "Business Hours",
+        "PLACEHOLDER": "Only during business hours"
+      },
+      "EDIT": "Редактирай",
+      "CREATE": "Създаване",
+      "DELETE": "Изтрий",
+      "CANCEL": "Отмени"
+    },
+    "ADD": {
+      "TITLE": "Add SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA added successfully",
+        "ERROR_MESSAGE": "Възникна грешка, моля опитайте отново"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit SLA",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA updated successfully",
+        "ERROR_MESSAGE": "Възникна грешка, моля опитайте отново"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ca/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/ca/attributesMgmt.json
index 142f50c15..04cddfe5e 100644
--- a/app/javascript/dashboard/i18n/locale/ca/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ca/attributesMgmt.json
@@ -39,6 +39,17 @@
           "PLACEHOLDER": "Enter custom attribute key",
           "ERROR": "Key is required",
           "IN_VALID": "Invalid key"
+        },
+        "REGEX_PATTERN": {
+          "LABEL": "Regex Pattern",
+          "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+        },
+        "REGEX_CUE": {
+          "LABEL": "Regex Cue",
+          "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+        },
+        "ENABLE_REGEX": {
+          "LABEL": "Enable regex validation"
         }
       },
       "API": {
@@ -93,6 +104,17 @@
       "EMPTY_RESULT": {
         "404": "There are no custom attributes created",
         "NOT_FOUND": "There are no custom attributes configured"
+      },
+      "REGEX_PATTERN": {
+        "LABEL": "Regex Pattern",
+        "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+      },
+      "REGEX_CUE": {
+        "LABEL": "Regex Cue",
+        "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+      },
+      "ENABLE_REGEX": {
+        "LABEL": "Enable regex validation"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/ca/contact.json b/app/javascript/dashboard/i18n/locale/ca/contact.json
index 0a960e58b..73b6a92b2 100644
--- a/app/javascript/dashboard/i18n/locale/ca/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ca/contact.json
@@ -39,10 +39,10 @@
     },
     "MERGE_CONTACT": "Reagrupa contacte",
     "CONTACT_ACTIONS": "Accions de contacte",
-    "MUTE_CONTACT": "Silencia la conversa",
-    "UNMUTE_CONTACT": "Desactiva el silenci de la conversa",
-    "MUTED_SUCCESS": "Aquesta conversa s'ha silenciat durant 6 hores",
-    "UNMUTED_SUCCESS": "La conversa te desactivat el silenci",
+    "MUTE_CONTACT": "Block Contact",
+    "UNMUTE_CONTACT": "Unblock Contact",
+    "MUTED_SUCCESS": "This contact is blocked successfully. You will not be notified of any future conversations.",
+    "UNMUTED_SUCCESS": "This contact is unblocked successfully.",
     "SEND_TRANSCRIPT": "Envia la transcripció",
     "EDIT_LABEL": "Edita",
     "SIDEBAR_SECTIONS": {
@@ -79,7 +79,13 @@
     "TITLE": "Export Contacts",
     "DESC": "Export contacts to a CSV file.",
     "SUCCESS_MESSAGE": "Export is in progress, You will be notified via email when export file is ready to dowanlod.",
-    "ERROR_MESSAGE": "S'ha produït un error; tornau-ho a provar"
+    "ERROR_MESSAGE": "S'ha produït un error; tornau-ho a provar",
+    "CONFIRM": {
+      "TITLE": "Export Contacts",
+      "MESSAGE": "Are you sure you want to export all contacts?",
+      "YES": "Yes, Export",
+      "NO": "No, Cancel"
+    }
   },
   "DELETE_NOTE": {
     "CONFIRM": {
@@ -339,7 +345,8 @@
     },
     "VALIDATIONS": {
       "REQUIRED": "Valid value is required",
-      "INVALID_URL": "Invalid URL"
+      "INVALID_URL": "Invalid URL",
+      "INVALID_INPUT": "Invalid Input"
     }
   },
   "MERGE_CONTACTS": {
diff --git a/app/javascript/dashboard/i18n/locale/ca/generalSettings.json b/app/javascript/dashboard/i18n/locale/ca/generalSettings.json
index 5e7a3b997..1e45c4ed8 100644
--- a/app/javascript/dashboard/i18n/locale/ca/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ca/generalSettings.json
@@ -112,7 +112,8 @@
       "REMOVE_LABEL": "Remove label from the conversation",
       "SETTINGS": "Configuracions",
       "AI_ASSIST": "AI Assist",
-      "APPEARANCE": "Appearance"
+      "APPEARANCE": "Appearance",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     },
     "COMMANDS": {
       "GO_TO_CONVERSATION_DASHBOARD": "Go to Conversation Dashboard",
@@ -153,7 +154,8 @@
       "CHANGE_APPEARANCE": "Change Appearance",
       "LIGHT_MODE": "Light",
       "DARK_MODE": "Dark",
-      "SYSTEM_MODE": "System"
+      "SYSTEM_MODE": "System",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     }
   },
   "DASHBOARD_APPS": {
diff --git a/app/javascript/dashboard/i18n/locale/ca/helpCenter.json b/app/javascript/dashboard/i18n/locale/ca/helpCenter.json
index f441c60dd..5aee1c9eb 100644
--- a/app/javascript/dashboard/i18n/locale/ca/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ca/helpCenter.json
@@ -324,7 +324,8 @@
         "LAST_EDITED": "Last edited"
       },
       "COLUMNS": {
-        "BY": "by"
+        "BY": "by",
+        "AUTHOR_NOT_AVAILABLE": "Author is not available"
       }
     },
     "EDIT_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/ca/inbox.json b/app/javascript/dashboard/i18n/locale/ca/inbox.json
new file mode 100644
index 000000000..37aa55c95
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ca/inbox.json
@@ -0,0 +1,60 @@
+{
+  "INBOX": {
+    "LIST": {
+      "TITLE": "Inbox",
+      "DISPLAY_DROPDOWN": "Display",
+      "LOADING": "Fetching notifications",
+      "EOF": "S'han carregat totes les notificacions 🎉",
+      "404": "There are no active notifications in this group.",
+      "NO_NOTIFICATIONS": "No notifications",
+      "NOTE": "Notifications from all subscribed inboxes",
+      "SNOOZED_UNTIL": "Snoozed until",
+      "SNOOZED_UNTIL_TOMORROW": "Snoozed until tomorrow",
+      "SNOOZED_UNTIL_NEXT_WEEK": "Snoozed until next week"
+    },
+    "ACTION_HEADER": {
+      "SNOOZE": "Snooze notification",
+      "DELETE": "Delete notification"
+    },
+    "TYPES": {
+      "CONVERSATION_MENTION": "You have been mentioned in a conversation",
+      "CONVERSATION_CREATION": "New conversation created",
+      "CONVERSATION_ASSIGNMENT": "A conversation has been assigned to you",
+      "ASSIGNED_CONVERSATION_NEW_MESSAGE": "New message in an assigned conversation",
+      "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "New message in a conversation you are participating in"
+    },
+    "MENU_ITEM": {
+      "MARK_AS_READ": "Mark as read",
+      "MARK_AS_UNREAD": "Mark as unread",
+      "SNOOZE": "Snooze",
+      "DELETE": "Esborrar",
+      "MARK_ALL_READ": "Marcar tots com a llegits",
+      "DELETE_ALL": "Delete all",
+      "DELETE_ALL_READ": "Delete all read"
+    },
+    "DISPLAY_MENU": {
+      "SORT": "Sort",
+      "DISPLAY": "Display :",
+      "SORT_OPTIONS": {
+        "NEWEST": "Newest",
+        "OLDEST": "Oldest",
+        "PRIORITY": "Priority"
+      },
+      "DISPLAY_OPTIONS": {
+        "SNOOZED": "Posposat",
+        "READ": "Llegir",
+        "LABELS": "Etiquetes",
+        "CONVERSATION_ID": "Conversation ID"
+      }
+    },
+    "ALERTS": {
+      "MARK_AS_READ": "Notification marked as read",
+      "MARK_AS_UNREAD": "Notification marked as unread",
+      "SNOOZE": "Notification snoozed",
+      "DELETE": "Notification deleted",
+      "MARK_ALL_READ": "All notifications marked as read",
+      "DELETE_ALL": "All notifications deleted",
+      "DELETE_ALL_READ": "All read notifications deleted"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json
index 1fecc2d85..832808d3c 100644
--- a/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json
@@ -569,7 +569,7 @@
       "UPDATE": "Update business hours settings",
       "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
       "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for visitors",
-      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours visitors can be warned with a message and a pre-chat form.",
       "DAY": {
         "ENABLE": "Enable availability for this day",
         "UNAVAILABLE": "Unavailable",
diff --git a/app/javascript/dashboard/i18n/locale/ca/settings.json b/app/javascript/dashboard/i18n/locale/ca/settings.json
index 35a0cd785..5d54e7af3 100644
--- a/app/javascript/dashboard/i18n/locale/ca/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ca/settings.json
@@ -160,6 +160,9 @@
     "TRIAL_MESSAGE": "dies de prova restants.",
     "TRAIL_BUTTON": "Compra ara",
     "DELETED_USER": "Deleted User",
+    "EMAIL_VERIFICATION_PENDING": "It seems that you haven't verified your email address yet. Please check your inbox for the verification email.",
+    "RESEND_VERIFICATION_MAIL": "Resend verification email",
+    "EMAIL_VERIFICATION_SENT": "Verification email has been sent. Please check your inbox.",
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Account Suspended",
       "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
@@ -197,6 +200,7 @@
     "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
     "SWITCH": "Switch",
     "CONVERSATIONS": "Converses",
+    "INBOX": "Inbox",
     "ALL_CONVERSATIONS": "All Conversations",
     "MENTIONED_CONVERSATIONS": "Mencions",
     "PARTICIPATING_CONVERSATIONS": "Participating",
@@ -238,6 +242,7 @@
     "REPORTS_INBOX": "Inbox",
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
+    "SLA": "SLA",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Overview",
     "FACEBOOK_REAUTHORIZE": "La teva connexió a Facebook ha caducat, torna a connectar la vostra pàgina de Facebook per continuar els serveis",
diff --git a/app/javascript/dashboard/i18n/locale/ca/sla.json b/app/javascript/dashboard/i18n/locale/ca/sla.json
new file mode 100644
index 000000000..131f6742b
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ca/sla.json
@@ -0,0 +1,70 @@
+{
+  "SLA": {
+    "HEADER": "SLA",
+    "HEADER_BTN_TXT": "Add SLA",
+    "LOADING": "Fetching SLAs",
+    "SEARCH_404": "No hi ha articles que coincideixin amb aquesta consulta",
+    "SIDEBAR_TXT": "<p><b>SLA</b> <p>Think of Service Level Agreements (SLAs) like friendly promises between a service provider and a customer.</p> <p> These promises set clear expectations for things like how quickly the team will respond to issues, making sure you always get a reliable and top-notch experience!</p>",
+    "LIST": {
+      "404": "There are no SLAs available in this account.",
+      "TITLE": "Manage SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "TABLE_HEADER": [
+        "Nom",
+        "Descripció",
+        "FRT",
+        "NRT",
+        "RT",
+        "Business Hours"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "SLA Name",
+        "PLACEHOLDER": "SLA Name",
+        "REQUIRED_ERROR": "SLA name is required",
+        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
+        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Descripció",
+        "PLACEHOLDER": "SLA for premium customers"
+      },
+      "FIRST_RESPONSE_TIME": {
+        "LABEL": "First Response Time(Seconds)",
+        "PLACEHOLDER": "300 for 5 minutes"
+      },
+      "NEXT_RESPONSE_TIME": {
+        "LABEL": "Next Response Time(Seconds)",
+        "PLACEHOLDER": "600 for 10 minutes"
+      },
+      "RESOLUTION_TIME": {
+        "LABEL": "Resolution Time(Seconds)",
+        "PLACEHOLDER": "86400 for 1 day"
+      },
+      "BUSINESS_HOURS": {
+        "LABEL": "Business Hours",
+        "PLACEHOLDER": "Only during business hours"
+      },
+      "EDIT": "Edita",
+      "CREATE": "Crear",
+      "DELETE": "Esborrar",
+      "CANCEL": "Cancel·la"
+    },
+    "ADD": {
+      "TITLE": "Add SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA added successfully",
+        "ERROR_MESSAGE": "S'ha produït un error; tornau-ho a provar"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit SLA",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA updated successfully",
+        "ERROR_MESSAGE": "S'ha produït un error; tornau-ho a provar"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/cs/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/cs/attributesMgmt.json
index 3cd8c1c8b..7f08ae00b 100644
--- a/app/javascript/dashboard/i18n/locale/cs/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/cs/attributesMgmt.json
@@ -39,6 +39,17 @@
           "PLACEHOLDER": "Enter custom attribute key",
           "ERROR": "Key is required",
           "IN_VALID": "Invalid key"
+        },
+        "REGEX_PATTERN": {
+          "LABEL": "Regex Pattern",
+          "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+        },
+        "REGEX_CUE": {
+          "LABEL": "Regex Cue",
+          "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+        },
+        "ENABLE_REGEX": {
+          "LABEL": "Enable regex validation"
         }
       },
       "API": {
@@ -93,6 +104,17 @@
       "EMPTY_RESULT": {
         "404": "There are no custom attributes created",
         "NOT_FOUND": "There are no custom attributes configured"
+      },
+      "REGEX_PATTERN": {
+        "LABEL": "Regex Pattern",
+        "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+      },
+      "REGEX_CUE": {
+        "LABEL": "Regex Cue",
+        "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+      },
+      "ENABLE_REGEX": {
+        "LABEL": "Enable regex validation"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/cs/contact.json b/app/javascript/dashboard/i18n/locale/cs/contact.json
index d2157f0c8..893161434 100644
--- a/app/javascript/dashboard/i18n/locale/cs/contact.json
+++ b/app/javascript/dashboard/i18n/locale/cs/contact.json
@@ -39,10 +39,10 @@
     },
     "MERGE_CONTACT": "Merge contact",
     "CONTACT_ACTIONS": "Contact actions",
-    "MUTE_CONTACT": "Ztlumit konverzaci",
-    "UNMUTE_CONTACT": "Zrušit ztlumení konverzace",
-    "MUTED_SUCCESS": "Tato konverzace je ztlumena na 6 hodin",
-    "UNMUTED_SUCCESS": "Tato konverzace je odtlumena",
+    "MUTE_CONTACT": "Block Contact",
+    "UNMUTE_CONTACT": "Unblock Contact",
+    "MUTED_SUCCESS": "This contact is blocked successfully. You will not be notified of any future conversations.",
+    "UNMUTED_SUCCESS": "This contact is unblocked successfully.",
     "SEND_TRANSCRIPT": "Poslat přepis",
     "EDIT_LABEL": "Upravit",
     "SIDEBAR_SECTIONS": {
@@ -79,7 +79,13 @@
     "TITLE": "Export Contacts",
     "DESC": "Export contacts to a CSV file.",
     "SUCCESS_MESSAGE": "Export is in progress, You will be notified via email when export file is ready to dowanlod.",
-    "ERROR_MESSAGE": "Došlo k chybě, zkuste to prosím znovu"
+    "ERROR_MESSAGE": "Došlo k chybě, zkuste to prosím znovu",
+    "CONFIRM": {
+      "TITLE": "Export Contacts",
+      "MESSAGE": "Are you sure you want to export all contacts?",
+      "YES": "Yes, Export",
+      "NO": "No, Cancel"
+    }
   },
   "DELETE_NOTE": {
     "CONFIRM": {
@@ -339,7 +345,8 @@
     },
     "VALIDATIONS": {
       "REQUIRED": "Valid value is required",
-      "INVALID_URL": "Invalid URL"
+      "INVALID_URL": "Invalid URL",
+      "INVALID_INPUT": "Invalid Input"
     }
   },
   "MERGE_CONTACTS": {
diff --git a/app/javascript/dashboard/i18n/locale/cs/generalSettings.json b/app/javascript/dashboard/i18n/locale/cs/generalSettings.json
index a7e06b0c9..3ceeb280d 100644
--- a/app/javascript/dashboard/i18n/locale/cs/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/cs/generalSettings.json
@@ -112,7 +112,8 @@
       "REMOVE_LABEL": "Remove label from the conversation",
       "SETTINGS": "Nastavení",
       "AI_ASSIST": "AI Assist",
-      "APPEARANCE": "Appearance"
+      "APPEARANCE": "Appearance",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     },
     "COMMANDS": {
       "GO_TO_CONVERSATION_DASHBOARD": "Go to Conversation Dashboard",
@@ -153,7 +154,8 @@
       "CHANGE_APPEARANCE": "Change Appearance",
       "LIGHT_MODE": "Light",
       "DARK_MODE": "Dark",
-      "SYSTEM_MODE": "System"
+      "SYSTEM_MODE": "System",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     }
   },
   "DASHBOARD_APPS": {
diff --git a/app/javascript/dashboard/i18n/locale/cs/helpCenter.json b/app/javascript/dashboard/i18n/locale/cs/helpCenter.json
index b1b20f54e..555eb25ae 100644
--- a/app/javascript/dashboard/i18n/locale/cs/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/cs/helpCenter.json
@@ -324,7 +324,8 @@
         "LAST_EDITED": "Last edited"
       },
       "COLUMNS": {
-        "BY": "by"
+        "BY": "by",
+        "AUTHOR_NOT_AVAILABLE": "Author is not available"
       }
     },
     "EDIT_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/cs/inbox.json b/app/javascript/dashboard/i18n/locale/cs/inbox.json
new file mode 100644
index 000000000..028f74569
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/cs/inbox.json
@@ -0,0 +1,60 @@
+{
+  "INBOX": {
+    "LIST": {
+      "TITLE": "Inbox",
+      "DISPLAY_DROPDOWN": "Display",
+      "LOADING": "Fetching notifications",
+      "EOF": "All notifications loaded 🎉",
+      "404": "There are no active notifications in this group.",
+      "NO_NOTIFICATIONS": "No notifications",
+      "NOTE": "Notifications from all subscribed inboxes",
+      "SNOOZED_UNTIL": "Snoozed until",
+      "SNOOZED_UNTIL_TOMORROW": "Odloženo do zítřka",
+      "SNOOZED_UNTIL_NEXT_WEEK": "Odloženo do příštího týdne"
+    },
+    "ACTION_HEADER": {
+      "SNOOZE": "Snooze notification",
+      "DELETE": "Delete notification"
+    },
+    "TYPES": {
+      "CONVERSATION_MENTION": "You have been mentioned in a conversation",
+      "CONVERSATION_CREATION": "New conversation created",
+      "CONVERSATION_ASSIGNMENT": "A conversation has been assigned to you",
+      "ASSIGNED_CONVERSATION_NEW_MESSAGE": "New message in an assigned conversation",
+      "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "New message in a conversation you are participating in"
+    },
+    "MENU_ITEM": {
+      "MARK_AS_READ": "Mark as read",
+      "MARK_AS_UNREAD": "Mark as unread",
+      "SNOOZE": "Odložit",
+      "DELETE": "Vymazat",
+      "MARK_ALL_READ": "Mark all as read",
+      "DELETE_ALL": "Delete all",
+      "DELETE_ALL_READ": "Delete all read"
+    },
+    "DISPLAY_MENU": {
+      "SORT": "Sort",
+      "DISPLAY": "Display :",
+      "SORT_OPTIONS": {
+        "NEWEST": "Newest",
+        "OLDEST": "Oldest",
+        "PRIORITY": "Priority"
+      },
+      "DISPLAY_OPTIONS": {
+        "SNOOZED": "Odložené",
+        "READ": "Přečtené",
+        "LABELS": "Štítky",
+        "CONVERSATION_ID": "Conversation ID"
+      }
+    },
+    "ALERTS": {
+      "MARK_AS_READ": "Notification marked as read",
+      "MARK_AS_UNREAD": "Notification marked as unread",
+      "SNOOZE": "Notification snoozed",
+      "DELETE": "Notification deleted",
+      "MARK_ALL_READ": "All notifications marked as read",
+      "DELETE_ALL": "All notifications deleted",
+      "DELETE_ALL_READ": "All read notifications deleted"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json
index 0c33b9d21..8eb79b1ab 100644
--- a/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json
@@ -569,7 +569,7 @@
       "UPDATE": "Update business hours settings",
       "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
       "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for visitors",
-      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours visitors can be warned with a message and a pre-chat form.",
       "DAY": {
         "ENABLE": "Enable availability for this day",
         "UNAVAILABLE": "Nedostupný",
diff --git a/app/javascript/dashboard/i18n/locale/cs/settings.json b/app/javascript/dashboard/i18n/locale/cs/settings.json
index 9f838ad2f..f76442ea6 100644
--- a/app/javascript/dashboard/i18n/locale/cs/settings.json
+++ b/app/javascript/dashboard/i18n/locale/cs/settings.json
@@ -160,6 +160,9 @@
     "TRIAL_MESSAGE": "dní zbývá zkušební verze.",
     "TRAIL_BUTTON": "Koupit nyní",
     "DELETED_USER": "Deleted User",
+    "EMAIL_VERIFICATION_PENDING": "It seems that you haven't verified your email address yet. Please check your inbox for the verification email.",
+    "RESEND_VERIFICATION_MAIL": "Resend verification email",
+    "EMAIL_VERIFICATION_SENT": "Verification email has been sent. Please check your inbox.",
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Account Suspended",
       "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
@@ -197,6 +200,7 @@
     "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
     "SWITCH": "Switch",
     "CONVERSATIONS": "Konverzace",
+    "INBOX": "Inbox",
     "ALL_CONVERSATIONS": "All Conversations",
     "MENTIONED_CONVERSATIONS": "Zmínky",
     "PARTICIPATING_CONVERSATIONS": "Participating",
@@ -238,6 +242,7 @@
     "REPORTS_INBOX": "Inbox",
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
+    "SLA": "SLA",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Overview",
     "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
diff --git a/app/javascript/dashboard/i18n/locale/cs/sla.json b/app/javascript/dashboard/i18n/locale/cs/sla.json
new file mode 100644
index 000000000..f75809210
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/cs/sla.json
@@ -0,0 +1,70 @@
+{
+  "SLA": {
+    "HEADER": "SLA",
+    "HEADER_BTN_TXT": "Add SLA",
+    "LOADING": "Fetching SLAs",
+    "SEARCH_404": "Neexistují žádné položky odpovídající tomuto dotazu",
+    "SIDEBAR_TXT": "<p><b>SLA</b> <p>Think of Service Level Agreements (SLAs) like friendly promises between a service provider and a customer.</p> <p> These promises set clear expectations for things like how quickly the team will respond to issues, making sure you always get a reliable and top-notch experience!</p>",
+    "LIST": {
+      "404": "There are no SLAs available in this account.",
+      "TITLE": "Manage SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "TABLE_HEADER": [
+        "Název",
+        "Description",
+        "FRT",
+        "NRT",
+        "RT",
+        "Pracovní doba"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "SLA Name",
+        "PLACEHOLDER": "SLA Name",
+        "REQUIRED_ERROR": "SLA name is required",
+        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
+        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Description",
+        "PLACEHOLDER": "SLA for premium customers"
+      },
+      "FIRST_RESPONSE_TIME": {
+        "LABEL": "First Response Time(Seconds)",
+        "PLACEHOLDER": "300 for 5 minutes"
+      },
+      "NEXT_RESPONSE_TIME": {
+        "LABEL": "Next Response Time(Seconds)",
+        "PLACEHOLDER": "600 for 10 minutes"
+      },
+      "RESOLUTION_TIME": {
+        "LABEL": "Resolution Time(Seconds)",
+        "PLACEHOLDER": "86400 for 1 day"
+      },
+      "BUSINESS_HOURS": {
+        "LABEL": "Pracovní doba",
+        "PLACEHOLDER": "Only during business hours"
+      },
+      "EDIT": "Upravit",
+      "CREATE": "Create",
+      "DELETE": "Vymazat",
+      "CANCEL": "Zrušit"
+    },
+    "ADD": {
+      "TITLE": "Add SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA added successfully",
+        "ERROR_MESSAGE": "Došlo k chybě, zkuste to prosím znovu"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit SLA",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA updated successfully",
+        "ERROR_MESSAGE": "Došlo k chybě, zkuste to prosím znovu"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/da/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/da/attributesMgmt.json
index 2bfb67b9f..0d14d7476 100644
--- a/app/javascript/dashboard/i18n/locale/da/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/da/attributesMgmt.json
@@ -39,6 +39,17 @@
           "PLACEHOLDER": "Angiv brugerdefineret attributnøgle",
           "ERROR": "Nøgle er påkrævet",
           "IN_VALID": "Ugyldig nøgle"
+        },
+        "REGEX_PATTERN": {
+          "LABEL": "Regex Pattern",
+          "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+        },
+        "REGEX_CUE": {
+          "LABEL": "Regex Cue",
+          "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+        },
+        "ENABLE_REGEX": {
+          "LABEL": "Enable regex validation"
         }
       },
       "API": {
@@ -93,6 +104,17 @@
       "EMPTY_RESULT": {
         "404": "Der er ingen brugerdefinerede attributter oprettet",
         "NOT_FOUND": "Der er ingen brugerdefinerede attributter konfigureret"
+      },
+      "REGEX_PATTERN": {
+        "LABEL": "Regex Pattern",
+        "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+      },
+      "REGEX_CUE": {
+        "LABEL": "Regex Cue",
+        "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+      },
+      "ENABLE_REGEX": {
+        "LABEL": "Enable regex validation"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/da/contact.json b/app/javascript/dashboard/i18n/locale/da/contact.json
index 987618f2c..53abd01a0 100644
--- a/app/javascript/dashboard/i18n/locale/da/contact.json
+++ b/app/javascript/dashboard/i18n/locale/da/contact.json
@@ -39,10 +39,10 @@
     },
     "MERGE_CONTACT": "Sammenflet kontakt",
     "CONTACT_ACTIONS": "Kontakt handlinger",
-    "MUTE_CONTACT": "Gør Samtale Lydløs",
-    "UNMUTE_CONTACT": "Fjern Lydløs",
-    "MUTED_SUCCESS": "Denne samtale er gjort tavs i 6 timer",
-    "UNMUTED_SUCCESS": "Denne samtale er genaktiveret",
+    "MUTE_CONTACT": "Block Contact",
+    "UNMUTE_CONTACT": "Unblock Contact",
+    "MUTED_SUCCESS": "This contact is blocked successfully. You will not be notified of any future conversations.",
+    "UNMUTED_SUCCESS": "This contact is unblocked successfully.",
     "SEND_TRANSCRIPT": "Send Udskrift",
     "EDIT_LABEL": "Rediger",
     "SIDEBAR_SECTIONS": {
@@ -79,7 +79,13 @@
     "TITLE": "Export Contacts",
     "DESC": "Export contacts to a CSV file.",
     "SUCCESS_MESSAGE": "Export is in progress, You will be notified via email when export file is ready to dowanlod.",
-    "ERROR_MESSAGE": "Der opstod en fejl. Prøv venligst igen"
+    "ERROR_MESSAGE": "Der opstod en fejl. Prøv venligst igen",
+    "CONFIRM": {
+      "TITLE": "Export Contacts",
+      "MESSAGE": "Are you sure you want to export all contacts?",
+      "YES": "Yes, Export",
+      "NO": "No, Cancel"
+    }
   },
   "DELETE_NOTE": {
     "CONFIRM": {
@@ -339,7 +345,8 @@
     },
     "VALIDATIONS": {
       "REQUIRED": "Gyldig værdi er påkrævet",
-      "INVALID_URL": "Ugyldig URL"
+      "INVALID_URL": "Ugyldig URL",
+      "INVALID_INPUT": "Invalid Input"
     }
   },
   "MERGE_CONTACTS": {
diff --git a/app/javascript/dashboard/i18n/locale/da/generalSettings.json b/app/javascript/dashboard/i18n/locale/da/generalSettings.json
index 768930075..3ccfbaf25 100644
--- a/app/javascript/dashboard/i18n/locale/da/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/da/generalSettings.json
@@ -112,7 +112,8 @@
       "REMOVE_LABEL": "Fjern etiket fra samtalen",
       "SETTINGS": "Indstillinger",
       "AI_ASSIST": "AI Assist",
-      "APPEARANCE": "Appearance"
+      "APPEARANCE": "Appearance",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     },
     "COMMANDS": {
       "GO_TO_CONVERSATION_DASHBOARD": "Gå til Konversationspanel",
@@ -153,7 +154,8 @@
       "CHANGE_APPEARANCE": "Change Appearance",
       "LIGHT_MODE": "Light",
       "DARK_MODE": "Dark",
-      "SYSTEM_MODE": "System"
+      "SYSTEM_MODE": "System",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     }
   },
   "DASHBOARD_APPS": {
diff --git a/app/javascript/dashboard/i18n/locale/da/helpCenter.json b/app/javascript/dashboard/i18n/locale/da/helpCenter.json
index 6e3e7ce7a..f3d5f75e6 100644
--- a/app/javascript/dashboard/i18n/locale/da/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/da/helpCenter.json
@@ -324,7 +324,8 @@
         "LAST_EDITED": "Sidst redigeret"
       },
       "COLUMNS": {
-        "BY": "af"
+        "BY": "af",
+        "AUTHOR_NOT_AVAILABLE": "Author is not available"
       }
     },
     "EDIT_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/da/inbox.json b/app/javascript/dashboard/i18n/locale/da/inbox.json
new file mode 100644
index 000000000..571deefe8
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/da/inbox.json
@@ -0,0 +1,60 @@
+{
+  "INBOX": {
+    "LIST": {
+      "TITLE": "Indbakke",
+      "DISPLAY_DROPDOWN": "Display",
+      "LOADING": "Fetching notifications",
+      "EOF": "All notifications loaded 🎉",
+      "404": "There are no active notifications in this group.",
+      "NO_NOTIFICATIONS": "No notifications",
+      "NOTE": "Notifications from all subscribed inboxes",
+      "SNOOZED_UNTIL": "Snoozed until",
+      "SNOOZED_UNTIL_TOMORROW": "Udsat til i morgen",
+      "SNOOZED_UNTIL_NEXT_WEEK": "Udsat indtil næste uge"
+    },
+    "ACTION_HEADER": {
+      "SNOOZE": "Snooze notification",
+      "DELETE": "Delete notification"
+    },
+    "TYPES": {
+      "CONVERSATION_MENTION": "You have been mentioned in a conversation",
+      "CONVERSATION_CREATION": "New conversation created",
+      "CONVERSATION_ASSIGNMENT": "A conversation has been assigned to you",
+      "ASSIGNED_CONVERSATION_NEW_MESSAGE": "New message in an assigned conversation",
+      "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "New message in a conversation you are participating in"
+    },
+    "MENU_ITEM": {
+      "MARK_AS_READ": "Mark as read",
+      "MARK_AS_UNREAD": "Marker som ulæst",
+      "SNOOZE": "Udsæt",
+      "DELETE": "Slet",
+      "MARK_ALL_READ": "Mark all as read",
+      "DELETE_ALL": "Delete all",
+      "DELETE_ALL_READ": "Delete all read"
+    },
+    "DISPLAY_MENU": {
+      "SORT": "Sort",
+      "DISPLAY": "Display :",
+      "SORT_OPTIONS": {
+        "NEWEST": "Newest",
+        "OLDEST": "Oldest",
+        "PRIORITY": "Priority"
+      },
+      "DISPLAY_OPTIONS": {
+        "SNOOZED": "Udsat",
+        "READ": "Læst",
+        "LABELS": "Etiketter",
+        "CONVERSATION_ID": "Conversation ID"
+      }
+    },
+    "ALERTS": {
+      "MARK_AS_READ": "Notification marked as read",
+      "MARK_AS_UNREAD": "Notification marked as unread",
+      "SNOOZE": "Notification snoozed",
+      "DELETE": "Notification deleted",
+      "MARK_ALL_READ": "All notifications marked as read",
+      "DELETE_ALL": "All notifications deleted",
+      "DELETE_ALL_READ": "All read notifications deleted"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json
index ed1c78f3f..8b93c1136 100644
--- a/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json
@@ -569,7 +569,7 @@
       "UPDATE": "Opdater indstillinger for åbningstider",
       "TOGGLE_AVAILABILITY": "Aktiver forretningstilgængelighed for denne indbakke",
       "UNAVAILABLE_MESSAGE_LABEL": "Utilgængelig besked til besøgende",
-      "TOGGLE_HELP": "Aktivering af forretningstilgængelighed vil vise de tilgængelige timer på live chat widget, selvom alle agenter er offline. Udenfor tilgængelige timer kan livreddere advares med en besked og en pre-chat formular.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours visitors can be warned with a message and a pre-chat form.",
       "DAY": {
         "ENABLE": "Aktiver tilgængelighed for denne dag",
         "UNAVAILABLE": "Unavailable",
diff --git a/app/javascript/dashboard/i18n/locale/da/settings.json b/app/javascript/dashboard/i18n/locale/da/settings.json
index cbdb3f5ff..6444a2ed9 100644
--- a/app/javascript/dashboard/i18n/locale/da/settings.json
+++ b/app/javascript/dashboard/i18n/locale/da/settings.json
@@ -160,6 +160,9 @@
     "TRIAL_MESSAGE": "dage prøveperiode tilbage.",
     "TRAIL_BUTTON": "Køb Nu",
     "DELETED_USER": "Slettet Bruger",
+    "EMAIL_VERIFICATION_PENDING": "It seems that you haven't verified your email address yet. Please check your inbox for the verification email.",
+    "RESEND_VERIFICATION_MAIL": "Resend verification email",
+    "EMAIL_VERIFICATION_SENT": "Verification email has been sent. Please check your inbox.",
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Konto Suspenderet",
       "MESSAGE": "Din konto er suspenderet. Gå ud til supportteamet for mere information."
@@ -197,6 +200,7 @@
     "CURRENTLY_VIEWING_ACCOUNT": "Vises nu:",
     "SWITCH": "Skift",
     "CONVERSATIONS": "Samtaler",
+    "INBOX": "Indbakke",
     "ALL_CONVERSATIONS": "Alle Samtaler",
     "MENTIONED_CONVERSATIONS": "Omtaler",
     "PARTICIPATING_CONVERSATIONS": "Participating",
@@ -238,6 +242,7 @@
     "REPORTS_INBOX": "Indbakke",
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Sæt dig selv som",
+    "SLA": "SLA",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Oversigt",
     "FACEBOOK_REAUTHORIZE": "Din Facebook-forbindelse er udløbet, tilslut venligst din Facebook-side igen for at fortsætte tjenesterne",
diff --git a/app/javascript/dashboard/i18n/locale/da/sla.json b/app/javascript/dashboard/i18n/locale/da/sla.json
new file mode 100644
index 000000000..d826fd06e
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/da/sla.json
@@ -0,0 +1,70 @@
+{
+  "SLA": {
+    "HEADER": "SLA",
+    "HEADER_BTN_TXT": "Add SLA",
+    "LOADING": "Fetching SLAs",
+    "SEARCH_404": "Der er ingen elementer, der matcher denne forespørgsel",
+    "SIDEBAR_TXT": "<p><b>SLA</b> <p>Think of Service Level Agreements (SLAs) like friendly promises between a service provider and a customer.</p> <p> These promises set clear expectations for things like how quickly the team will respond to issues, making sure you always get a reliable and top-notch experience!</p>",
+    "LIST": {
+      "404": "There are no SLAs available in this account.",
+      "TITLE": "Manage SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "TABLE_HEADER": [
+        "Navn",
+        "Beskrivelse",
+        "FRT",
+        "NRT",
+        "RT",
+        "Forretningstider"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "SLA Name",
+        "PLACEHOLDER": "SLA Name",
+        "REQUIRED_ERROR": "SLA name is required",
+        "MINIMUM_LENGTH_ERROR": "Mindste længde 2 er påkrævet",
+        "VALID_ERROR": "Kun alfabeter, tal, bindestreger og understregning er tilladt"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Beskrivelse",
+        "PLACEHOLDER": "SLA for premium customers"
+      },
+      "FIRST_RESPONSE_TIME": {
+        "LABEL": "First Response Time(Seconds)",
+        "PLACEHOLDER": "300 for 5 minutes"
+      },
+      "NEXT_RESPONSE_TIME": {
+        "LABEL": "Next Response Time(Seconds)",
+        "PLACEHOLDER": "600 for 10 minutes"
+      },
+      "RESOLUTION_TIME": {
+        "LABEL": "Resolution Time(Seconds)",
+        "PLACEHOLDER": "86400 for 1 day"
+      },
+      "BUSINESS_HOURS": {
+        "LABEL": "Forretningstider",
+        "PLACEHOLDER": "Only during business hours"
+      },
+      "EDIT": "Rediger",
+      "CREATE": "Opret",
+      "DELETE": "Slet",
+      "CANCEL": "Annuller"
+    },
+    "ADD": {
+      "TITLE": "Add SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA added successfully",
+        "ERROR_MESSAGE": "Der opstod en fejl. Prøv venligst igen"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit SLA",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA updated successfully",
+        "ERROR_MESSAGE": "Der opstod en fejl. Prøv venligst igen"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/de/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/de/attributesMgmt.json
index 460e53c12..1a8e88c38 100644
--- a/app/javascript/dashboard/i18n/locale/de/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/de/attributesMgmt.json
@@ -39,6 +39,17 @@
           "PLACEHOLDER": "Benutzerdefinierten Attributschlüssel eingeben",
           "ERROR": "Schlüssel ist erforderlich",
           "IN_VALID": "Ungültiger Schlüssel"
+        },
+        "REGEX_PATTERN": {
+          "LABEL": "Regex Pattern",
+          "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+        },
+        "REGEX_CUE": {
+          "LABEL": "Regex Cue",
+          "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+        },
+        "ENABLE_REGEX": {
+          "LABEL": "Enable regex validation"
         }
       },
       "API": {
@@ -93,6 +104,17 @@
       "EMPTY_RESULT": {
         "404": "Es wurden keine benutzerdefinierten Attribute erstellt",
         "NOT_FOUND": "Es sind keine benutzerdefinierten Attribute konfiguriert"
+      },
+      "REGEX_PATTERN": {
+        "LABEL": "Regex Pattern",
+        "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+      },
+      "REGEX_CUE": {
+        "LABEL": "Regex Cue",
+        "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+      },
+      "ENABLE_REGEX": {
+        "LABEL": "Enable regex validation"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/de/contact.json b/app/javascript/dashboard/i18n/locale/de/contact.json
index a238b3549..33dd5889b 100644
--- a/app/javascript/dashboard/i18n/locale/de/contact.json
+++ b/app/javascript/dashboard/i18n/locale/de/contact.json
@@ -39,10 +39,10 @@
     },
     "MERGE_CONTACT": "Kontakte zusammenführen",
     "CONTACT_ACTIONS": "Kontakt-Aktionen",
-    "MUTE_CONTACT": "Unterhaltung stummschalten",
-    "UNMUTE_CONTACT": "Unterhaltung entstummen",
-    "MUTED_SUCCESS": "Diese Unterhaltung ist für 6 Stunden auf stumm schalten",
-    "UNMUTED_SUCCESS": "Diese Unterhaltung ist nicht mehr stumm geschaltet",
+    "MUTE_CONTACT": "Block Contact",
+    "UNMUTE_CONTACT": "Unblock Contact",
+    "MUTED_SUCCESS": "This contact is blocked successfully. You will not be notified of any future conversations.",
+    "UNMUTED_SUCCESS": "This contact is unblocked successfully.",
     "SEND_TRANSCRIPT": "Transkript senden",
     "EDIT_LABEL": "Bearbeiten",
     "SIDEBAR_SECTIONS": {
@@ -79,7 +79,13 @@
     "TITLE": "Kontakte exportieren",
     "DESC": "Kontakte als CSV exportieren.",
     "SUCCESS_MESSAGE": "Export is in progress, You will be notified via email when export file is ready to dowanlod.",
-    "ERROR_MESSAGE": "Es ist ein Fehler aufgetreten, bitte versuchen Sie es erneut"
+    "ERROR_MESSAGE": "Es ist ein Fehler aufgetreten, bitte versuchen Sie es erneut",
+    "CONFIRM": {
+      "TITLE": "Kontakte exportieren",
+      "MESSAGE": "Are you sure you want to export all contacts?",
+      "YES": "Yes, Export",
+      "NO": "No, Cancel"
+    }
   },
   "DELETE_NOTE": {
     "CONFIRM": {
@@ -339,7 +345,8 @@
     },
     "VALIDATIONS": {
       "REQUIRED": "Gültiger Wert ist erforderlich",
-      "INVALID_URL": "Ungültige URL"
+      "INVALID_URL": "Ungültige URL",
+      "INVALID_INPUT": "Invalid Input"
     }
   },
   "MERGE_CONTACTS": {
diff --git a/app/javascript/dashboard/i18n/locale/de/generalSettings.json b/app/javascript/dashboard/i18n/locale/de/generalSettings.json
index c4c83a527..e0e0e035c 100644
--- a/app/javascript/dashboard/i18n/locale/de/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/de/generalSettings.json
@@ -112,7 +112,8 @@
       "REMOVE_LABEL": "Label aus der Konversation entfernen",
       "SETTINGS": "Einstellungen",
       "AI_ASSIST": "AI Assist",
-      "APPEARANCE": "Appearance"
+      "APPEARANCE": "Appearance",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     },
     "COMMANDS": {
       "GO_TO_CONVERSATION_DASHBOARD": "Zur Konversationsübersicht",
@@ -153,7 +154,8 @@
       "CHANGE_APPEARANCE": "Change Appearance",
       "LIGHT_MODE": "Light",
       "DARK_MODE": "Dark",
-      "SYSTEM_MODE": "System"
+      "SYSTEM_MODE": "System",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     }
   },
   "DASHBOARD_APPS": {
diff --git a/app/javascript/dashboard/i18n/locale/de/helpCenter.json b/app/javascript/dashboard/i18n/locale/de/helpCenter.json
index cb1e3b28e..5d401430b 100644
--- a/app/javascript/dashboard/i18n/locale/de/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/de/helpCenter.json
@@ -324,7 +324,8 @@
         "LAST_EDITED": "Zuletzt bearbeitet"
       },
       "COLUMNS": {
-        "BY": "von"
+        "BY": "von",
+        "AUTHOR_NOT_AVAILABLE": "Author is not available"
       }
     },
     "EDIT_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/de/inbox.json b/app/javascript/dashboard/i18n/locale/de/inbox.json
new file mode 100644
index 000000000..4895b8008
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/de/inbox.json
@@ -0,0 +1,60 @@
+{
+  "INBOX": {
+    "LIST": {
+      "TITLE": "Posteingang",
+      "DISPLAY_DROPDOWN": "Display",
+      "LOADING": "Fetching notifications",
+      "EOF": "Alle Benachrichtigungen geladen 🎉",
+      "404": "There are no active notifications in this group.",
+      "NO_NOTIFICATIONS": "No notifications",
+      "NOTE": "Notifications from all subscribed inboxes",
+      "SNOOZED_UNTIL": "Stummschalten bis",
+      "SNOOZED_UNTIL_TOMORROW": "Schlummern bis morgen",
+      "SNOOZED_UNTIL_NEXT_WEEK": "Schlummern bis nächste Woche"
+    },
+    "ACTION_HEADER": {
+      "SNOOZE": "Snooze notification",
+      "DELETE": "Delete notification"
+    },
+    "TYPES": {
+      "CONVERSATION_MENTION": "You have been mentioned in a conversation",
+      "CONVERSATION_CREATION": "New conversation created",
+      "CONVERSATION_ASSIGNMENT": "A conversation has been assigned to you",
+      "ASSIGNED_CONVERSATION_NEW_MESSAGE": "New message in an assigned conversation",
+      "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "New message in a conversation you are participating in"
+    },
+    "MENU_ITEM": {
+      "MARK_AS_READ": "Mark as read",
+      "MARK_AS_UNREAD": "Als ungelesen markieren",
+      "SNOOZE": "Erinnern",
+      "DELETE": "Löschen",
+      "MARK_ALL_READ": "Alle als gelesen markieren",
+      "DELETE_ALL": "Delete all",
+      "DELETE_ALL_READ": "Delete all read"
+    },
+    "DISPLAY_MENU": {
+      "SORT": "Sort",
+      "DISPLAY": "Display :",
+      "SORT_OPTIONS": {
+        "NEWEST": "Newest",
+        "OLDEST": "Oldest",
+        "PRIORITY": "Priorität"
+      },
+      "DISPLAY_OPTIONS": {
+        "SNOOZED": "Erinnern",
+        "READ": "Lesen",
+        "LABELS": "Labels",
+        "CONVERSATION_ID": "Conversation ID"
+      }
+    },
+    "ALERTS": {
+      "MARK_AS_READ": "Notification marked as read",
+      "MARK_AS_UNREAD": "Notification marked as unread",
+      "SNOOZE": "Notification snoozed",
+      "DELETE": "Notification deleted",
+      "MARK_ALL_READ": "All notifications marked as read",
+      "DELETE_ALL": "All notifications deleted",
+      "DELETE_ALL_READ": "All read notifications deleted"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
index 4b3d49b84..cc2ad3c9e 100644
--- a/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
@@ -569,7 +569,7 @@
       "UPDATE": "Einstellungen für Geschäftszeiten aktualisieren",
       "TOGGLE_AVAILABILITY": "Geschäftszeiten für diesen Posteingang aktivieren",
       "UNAVAILABLE_MESSAGE_LABEL": "Nachricht für Besucher außerhalb Geschäftszeiten",
-      "TOGGLE_HELP": "Die Aktivierung der Geschäftsverfügbarkeit zeigt die verfügbaren Stunden auf dem Live-Chat-Widget an, auch wenn alle Agenten offline sind. Außerhalb der verfügbaren Stunden können Besucher mit einer Nachricht und einem Vor-Chat-Formular gewarnt werden.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours visitors can be warned with a message and a pre-chat form.",
       "DAY": {
         "ENABLE": "Verfügbarkeit für diesen Tag aktivieren",
         "UNAVAILABLE": "Nicht verfügbar",
diff --git a/app/javascript/dashboard/i18n/locale/de/settings.json b/app/javascript/dashboard/i18n/locale/de/settings.json
index 44c78a5fa..286fd07a7 100644
--- a/app/javascript/dashboard/i18n/locale/de/settings.json
+++ b/app/javascript/dashboard/i18n/locale/de/settings.json
@@ -160,6 +160,9 @@
     "TRIAL_MESSAGE": "Tage der Testversion verbleibend.",
     "TRAIL_BUTTON": "Jetzt kaufen",
     "DELETED_USER": "Gelöschter Benutzer",
+    "EMAIL_VERIFICATION_PENDING": "It seems that you haven't verified your email address yet. Please check your inbox for the verification email.",
+    "RESEND_VERIFICATION_MAIL": "Resend verification email",
+    "EMAIL_VERIFICATION_SENT": "Verification email has been sent. Please check your inbox.",
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Konto gesperrt",
       "MESSAGE": "Ihr Account wurde gesperrt. Wenden Sie sich für weitere Informationen bitte an das Support-Team."
@@ -197,6 +200,7 @@
     "CURRENTLY_VIEWING_ACCOUNT": "Wird gerade angezeigt:",
     "SWITCH": "Wechseln",
     "CONVERSATIONS": "Gespräche",
+    "INBOX": "Posteingang",
     "ALL_CONVERSATIONS": "Alle Konversationen",
     "MENTIONED_CONVERSATIONS": "Erwähnungen",
     "PARTICIPATING_CONVERSATIONS": "Beteiligt",
@@ -238,6 +242,7 @@
     "REPORTS_INBOX": "Posteingang",
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Setzen Sie sich als",
+    "SLA": "SLA",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Übersicht",
     "FACEBOOK_REAUTHORIZE": "Ihre Facebook-Verbindung ist abgelaufen, bitte verbinden Sie sich erneut.",
diff --git a/app/javascript/dashboard/i18n/locale/de/sla.json b/app/javascript/dashboard/i18n/locale/de/sla.json
new file mode 100644
index 000000000..64e851188
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/de/sla.json
@@ -0,0 +1,70 @@
+{
+  "SLA": {
+    "HEADER": "SLA",
+    "HEADER_BTN_TXT": "Add SLA",
+    "LOADING": "Fetching SLAs",
+    "SEARCH_404": "Es gibt keine Elemente, die dieser Abfrage entsprechen",
+    "SIDEBAR_TXT": "<p><b>SLA</b> <p>Think of Service Level Agreements (SLAs) like friendly promises between a service provider and a customer.</p> <p> These promises set clear expectations for things like how quickly the team will respond to issues, making sure you always get a reliable and top-notch experience!</p>",
+    "LIST": {
+      "404": "There are no SLAs available in this account.",
+      "TITLE": "Manage SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "TABLE_HEADER": [
+        "Name",
+        "Beschreibung",
+        "FRT",
+        "NRT",
+        "RT",
+        "Öffnungszeiten"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "SLA Name",
+        "PLACEHOLDER": "SLA Name",
+        "REQUIRED_ERROR": "SLA name is required",
+        "MINIMUM_LENGTH_ERROR": "Mindestlänge 2 wird benötigt",
+        "VALID_ERROR": "Nur Buchstaben, Zahlen, Binde- und Unterstriche sind erlaubt"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Beschreibung",
+        "PLACEHOLDER": "SLA for premium customers"
+      },
+      "FIRST_RESPONSE_TIME": {
+        "LABEL": "First Response Time(Seconds)",
+        "PLACEHOLDER": "300 for 5 minutes"
+      },
+      "NEXT_RESPONSE_TIME": {
+        "LABEL": "Next Response Time(Seconds)",
+        "PLACEHOLDER": "600 for 10 minutes"
+      },
+      "RESOLUTION_TIME": {
+        "LABEL": "Resolution Time(Seconds)",
+        "PLACEHOLDER": "86400 for 1 day"
+      },
+      "BUSINESS_HOURS": {
+        "LABEL": "Öffnungszeiten",
+        "PLACEHOLDER": "Only during business hours"
+      },
+      "EDIT": "Bearbeiten",
+      "CREATE": "Erstellen",
+      "DELETE": "Löschen",
+      "CANCEL": "Stornieren"
+    },
+    "ADD": {
+      "TITLE": "Add SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA added successfully",
+        "ERROR_MESSAGE": "Es ist ein Fehler aufgetreten, bitte versuchen Sie es erneut"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit SLA",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA updated successfully",
+        "ERROR_MESSAGE": "Es ist ein Fehler aufgetreten, bitte versuchen Sie es erneut"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/el/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/el/attributesMgmt.json
index e3850ed07..c0624e627 100644
--- a/app/javascript/dashboard/i18n/locale/el/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/el/attributesMgmt.json
@@ -39,6 +39,17 @@
           "PLACEHOLDER": "Εισάγετε τον κωδικό της ιδιότητας",
           "ERROR": "Ο Κωδικός απαιτείται",
           "IN_VALID": "Μη έγκυρο κλειδί"
+        },
+        "REGEX_PATTERN": {
+          "LABEL": "Regex Pattern",
+          "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+        },
+        "REGEX_CUE": {
+          "LABEL": "Regex Cue",
+          "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+        },
+        "ENABLE_REGEX": {
+          "LABEL": "Enable regex validation"
         }
       },
       "API": {
@@ -93,6 +104,17 @@
       "EMPTY_RESULT": {
         "404": "Δεν δημιουργήθηκαν προσαρμοζόμενες ιδιότητες",
         "NOT_FOUND": "Δεν έχουν ρυθμιστεί προσαρμοζόμενες ιδιότητες"
+      },
+      "REGEX_PATTERN": {
+        "LABEL": "Regex Pattern",
+        "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+      },
+      "REGEX_CUE": {
+        "LABEL": "Regex Cue",
+        "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+      },
+      "ENABLE_REGEX": {
+        "LABEL": "Enable regex validation"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/el/contact.json b/app/javascript/dashboard/i18n/locale/el/contact.json
index 5fe8d0640..7ec3514ee 100644
--- a/app/javascript/dashboard/i18n/locale/el/contact.json
+++ b/app/javascript/dashboard/i18n/locale/el/contact.json
@@ -39,10 +39,10 @@
     },
     "MERGE_CONTACT": "Συγχώνευση επαφής",
     "CONTACT_ACTIONS": "Ενέργειες επαφής",
-    "MUTE_CONTACT": "Σίγαση Συνομιλίας",
-    "UNMUTE_CONTACT": "Επαναφορά Συνομιλίας",
-    "MUTED_SUCCESS": "Η συνομιλία είναι σε σίγαση (mute) για 6 ώρες",
-    "UNMUTED_SUCCESS": "Έγινε επαναφορά της συνομιλίας",
+    "MUTE_CONTACT": "Block Contact",
+    "UNMUTE_CONTACT": "Unblock Contact",
+    "MUTED_SUCCESS": "This contact is blocked successfully. You will not be notified of any future conversations.",
+    "UNMUTED_SUCCESS": "This contact is unblocked successfully.",
     "SEND_TRANSCRIPT": "Αποστολή μεταγραφής",
     "EDIT_LABEL": "Επεξεργασία",
     "SIDEBAR_SECTIONS": {
@@ -79,7 +79,13 @@
     "TITLE": "Export Contacts",
     "DESC": "Export contacts to a CSV file.",
     "SUCCESS_MESSAGE": "Export is in progress, You will be notified via email when export file is ready to dowanlod.",
-    "ERROR_MESSAGE": "Υπήρξε ένα σφάλμα, παρακαλώ προσπαθήστε ξανά"
+    "ERROR_MESSAGE": "Υπήρξε ένα σφάλμα, παρακαλώ προσπαθήστε ξανά",
+    "CONFIRM": {
+      "TITLE": "Export Contacts",
+      "MESSAGE": "Are you sure you want to export all contacts?",
+      "YES": "Yes, Export",
+      "NO": "No, Cancel"
+    }
   },
   "DELETE_NOTE": {
     "CONFIRM": {
@@ -339,7 +345,8 @@
     },
     "VALIDATIONS": {
       "REQUIRED": "Απαιτείται έγκυρη τιμή",
-      "INVALID_URL": "Μη Έγκυρο URL"
+      "INVALID_URL": "Μη Έγκυρο URL",
+      "INVALID_INPUT": "Invalid Input"
     }
   },
   "MERGE_CONTACTS": {
diff --git a/app/javascript/dashboard/i18n/locale/el/generalSettings.json b/app/javascript/dashboard/i18n/locale/el/generalSettings.json
index de49b058e..53d2f7fcc 100644
--- a/app/javascript/dashboard/i18n/locale/el/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/el/generalSettings.json
@@ -112,7 +112,8 @@
       "REMOVE_LABEL": "Αφαίρεση ετικέτας από την συνομιλία",
       "SETTINGS": "Ρυθμίσεις",
       "AI_ASSIST": "AI Assist",
-      "APPEARANCE": "Appearance"
+      "APPEARANCE": "Appearance",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     },
     "COMMANDS": {
       "GO_TO_CONVERSATION_DASHBOARD": "Μεταβείτε στον Πίνακα Συνομιλίων",
@@ -153,7 +154,8 @@
       "CHANGE_APPEARANCE": "Change Appearance",
       "LIGHT_MODE": "Light",
       "DARK_MODE": "Dark",
-      "SYSTEM_MODE": "System"
+      "SYSTEM_MODE": "System",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     }
   },
   "DASHBOARD_APPS": {
diff --git a/app/javascript/dashboard/i18n/locale/el/helpCenter.json b/app/javascript/dashboard/i18n/locale/el/helpCenter.json
index dd2f59aa9..71e338591 100644
--- a/app/javascript/dashboard/i18n/locale/el/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/el/helpCenter.json
@@ -324,7 +324,8 @@
         "LAST_EDITED": "Τελευταία επεξεργασία"
       },
       "COLUMNS": {
-        "BY": "από"
+        "BY": "από",
+        "AUTHOR_NOT_AVAILABLE": "Author is not available"
       }
     },
     "EDIT_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/el/inbox.json b/app/javascript/dashboard/i18n/locale/el/inbox.json
new file mode 100644
index 000000000..4ec1e9de4
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/el/inbox.json
@@ -0,0 +1,60 @@
+{
+  "INBOX": {
+    "LIST": {
+      "TITLE": "Εισερχόμενα",
+      "DISPLAY_DROPDOWN": "Display",
+      "LOADING": "Fetching notifications",
+      "EOF": "All notifications loaded 🎉",
+      "404": "There are no active notifications in this group.",
+      "NO_NOTIFICATIONS": "No notifications",
+      "NOTE": "Notifications from all subscribed inboxes",
+      "SNOOZED_UNTIL": "Snoozed until",
+      "SNOOZED_UNTIL_TOMORROW": "Αναβλήθηκε μέχρι αύριο",
+      "SNOOZED_UNTIL_NEXT_WEEK": "Αναβολή έως την επόμενη εβδομάδα"
+    },
+    "ACTION_HEADER": {
+      "SNOOZE": "Snooze notification",
+      "DELETE": "Delete notification"
+    },
+    "TYPES": {
+      "CONVERSATION_MENTION": "You have been mentioned in a conversation",
+      "CONVERSATION_CREATION": "New conversation created",
+      "CONVERSATION_ASSIGNMENT": "A conversation has been assigned to you",
+      "ASSIGNED_CONVERSATION_NEW_MESSAGE": "New message in an assigned conversation",
+      "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "New message in a conversation you are participating in"
+    },
+    "MENU_ITEM": {
+      "MARK_AS_READ": "Mark as read",
+      "MARK_AS_UNREAD": "Σήμανση ως μη αναγνωσμένο",
+      "SNOOZE": "Αναβολή",
+      "DELETE": "Διαγραφή",
+      "MARK_ALL_READ": "Mark all as read",
+      "DELETE_ALL": "Delete all",
+      "DELETE_ALL_READ": "Delete all read"
+    },
+    "DISPLAY_MENU": {
+      "SORT": "Sort",
+      "DISPLAY": "Display :",
+      "SORT_OPTIONS": {
+        "NEWEST": "Newest",
+        "OLDEST": "Oldest",
+        "PRIORITY": "Priority"
+      },
+      "DISPLAY_OPTIONS": {
+        "SNOOZED": "Αναβολή",
+        "READ": "Ανάγνωση",
+        "LABELS": "Ετικέτες",
+        "CONVERSATION_ID": "Conversation ID"
+      }
+    },
+    "ALERTS": {
+      "MARK_AS_READ": "Notification marked as read",
+      "MARK_AS_UNREAD": "Notification marked as unread",
+      "SNOOZE": "Notification snoozed",
+      "DELETE": "Notification deleted",
+      "MARK_ALL_READ": "All notifications marked as read",
+      "DELETE_ALL": "All notifications deleted",
+      "DELETE_ALL_READ": "All read notifications deleted"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json
index 5956d81e5..25d547a7d 100644
--- a/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json
@@ -569,7 +569,7 @@
       "UPDATE": "Ενημέρωση ρυθμίσεων ωραρίου",
       "TOGGLE_AVAILABILITY": "Ενεργοποίηση διαθεσιμότητας ωραρίου για αυτό το κιβώτιο εισερχομένων",
       "UNAVAILABLE_MESSAGE_LABEL": "Μήνυμα μη διαθεσιμότητας για τους επισκέπτες",
-      "TOGGLE_HELP": "Η ενεργοποίηση της διαθεσιμότητας ωραρίου θα δείξει τις διαθέσιμες ώρες στο widget συνομιλίας ακόμα και αν όλοι οι πράκτορες είναι εκτός σύνδεσης. Εκτός των διαθέσιμων ωρών οι επισκέπτες μπορούν να προειδοποιηθούν με ένα μήνυμα και μια φόρμα προ-συνομιλίας.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours visitors can be warned with a message and a pre-chat form.",
       "DAY": {
         "ENABLE": "Ενεργοποιήσετε τη διαθεσιμότητα για αυτήν την ημέρα",
         "UNAVAILABLE": "Μη διαθέσιμος",
diff --git a/app/javascript/dashboard/i18n/locale/el/settings.json b/app/javascript/dashboard/i18n/locale/el/settings.json
index 8fd59bc5d..f35b503c6 100644
--- a/app/javascript/dashboard/i18n/locale/el/settings.json
+++ b/app/javascript/dashboard/i18n/locale/el/settings.json
@@ -160,6 +160,9 @@
     "TRIAL_MESSAGE": "ημέρες δοκιμαστικής περιόδου απομένουν.",
     "TRAIL_BUTTON": "Αγόρασε τώρα",
     "DELETED_USER": "Διαγραμμένος Χρήστης",
+    "EMAIL_VERIFICATION_PENDING": "It seems that you haven't verified your email address yet. Please check your inbox for the verification email.",
+    "RESEND_VERIFICATION_MAIL": "Resend verification email",
+    "EMAIL_VERIFICATION_SENT": "Verification email has been sent. Please check your inbox.",
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Αναστολή Λογαριασμού",
       "MESSAGE": "Ο λογαριασμός σας έχει ανασταλεί. Επικοινωνήστε με την ομάδα υποστήριξης για περισσότερες πληροφορίες."
@@ -197,6 +200,7 @@
     "CURRENTLY_VIEWING_ACCOUNT": "Τρέχουσα προβολή:",
     "SWITCH": "Εναλλαγή",
     "CONVERSATIONS": "Συζητήσεις",
+    "INBOX": "Εισερχόμενα",
     "ALL_CONVERSATIONS": "Όλες Οι Συνομιλίες",
     "MENTIONED_CONVERSATIONS": "Αναφορές",
     "PARTICIPATING_CONVERSATIONS": "Participating",
@@ -238,6 +242,7 @@
     "REPORTS_INBOX": "Εισερχόμενα",
     "REPORTS_TEAM": "Ομάδα",
     "SET_AVAILABILITY_TITLE": "Ορίστε τον εαυτό σας ως",
+    "SLA": "SLA",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Επισκόπηση",
     "FACEBOOK_REAUTHORIZE": "Η σύνδεση Facebook έχει λήξει, παρακαλώ ξανασυνδεθείτε στο Facebook για να συνεχίσετε",
diff --git a/app/javascript/dashboard/i18n/locale/el/sla.json b/app/javascript/dashboard/i18n/locale/el/sla.json
new file mode 100644
index 000000000..afaa7cd99
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/el/sla.json
@@ -0,0 +1,70 @@
+{
+  "SLA": {
+    "HEADER": "SLA",
+    "HEADER_BTN_TXT": "Add SLA",
+    "LOADING": "Fetching SLAs",
+    "SEARCH_404": "Δεν υπάρχουν δεδομένα που να ταιριάζουν με αυτό το ερώτημα",
+    "SIDEBAR_TXT": "<p><b>SLA</b> <p>Think of Service Level Agreements (SLAs) like friendly promises between a service provider and a customer.</p> <p> These promises set clear expectations for things like how quickly the team will respond to issues, making sure you always get a reliable and top-notch experience!</p>",
+    "LIST": {
+      "404": "There are no SLAs available in this account.",
+      "TITLE": "Manage SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "TABLE_HEADER": [
+        "Όνομα",
+        "Περιγραφή",
+        "FRT",
+        "NRT",
+        "RT",
+        "Ώρες Εργασίας"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "SLA Name",
+        "PLACEHOLDER": "SLA Name",
+        "REQUIRED_ERROR": "SLA name is required",
+        "MINIMUM_LENGTH_ERROR": "Απαιτείται ελάχιστο μήκος 2 χαρακτήρες",
+        "VALID_ERROR": "Επιτρέπονται μόνο γράμματα, αριθμοί, παύλα και υπογράμμιση"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Περιγραφή",
+        "PLACEHOLDER": "SLA for premium customers"
+      },
+      "FIRST_RESPONSE_TIME": {
+        "LABEL": "First Response Time(Seconds)",
+        "PLACEHOLDER": "300 for 5 minutes"
+      },
+      "NEXT_RESPONSE_TIME": {
+        "LABEL": "Next Response Time(Seconds)",
+        "PLACEHOLDER": "600 for 10 minutes"
+      },
+      "RESOLUTION_TIME": {
+        "LABEL": "Resolution Time(Seconds)",
+        "PLACEHOLDER": "86400 for 1 day"
+      },
+      "BUSINESS_HOURS": {
+        "LABEL": "Ώρες Εργασίας",
+        "PLACEHOLDER": "Only during business hours"
+      },
+      "EDIT": "Επεξεργασία",
+      "CREATE": "Δημιουργία",
+      "DELETE": "Διαγραφή",
+      "CANCEL": "Άκυρο"
+    },
+    "ADD": {
+      "TITLE": "Add SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA added successfully",
+        "ERROR_MESSAGE": "Υπήρξε ένα σφάλμα, παρακαλώ προσπαθήστε ξανά"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit SLA",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA updated successfully",
+        "ERROR_MESSAGE": "Υπήρξε ένα σφάλμα, παρακαλώ προσπαθήστε ξανά"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/es/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/es/attributesMgmt.json
index af1f0216d..3d33afaf4 100644
--- a/app/javascript/dashboard/i18n/locale/es/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/es/attributesMgmt.json
@@ -39,6 +39,17 @@
           "PLACEHOLDER": "Introducir clave de atributo personalizado",
           "ERROR": "Clave es requerida",
           "IN_VALID": "Llave Invalida"
+        },
+        "REGEX_PATTERN": {
+          "LABEL": "Patrón de Regex",
+          "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+        },
+        "REGEX_CUE": {
+          "LABEL": "Regex Cue",
+          "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+        },
+        "ENABLE_REGEX": {
+          "LABEL": "Enable regex validation"
         }
       },
       "API": {
@@ -93,6 +104,17 @@
       "EMPTY_RESULT": {
         "404": "No hay atributos personalizados creados",
         "NOT_FOUND": "No hay atributos personalizados configurados"
+      },
+      "REGEX_PATTERN": {
+        "LABEL": "Patrón de Regex",
+        "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+      },
+      "REGEX_CUE": {
+        "LABEL": "Regex Cue",
+        "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+      },
+      "ENABLE_REGEX": {
+        "LABEL": "Enable regex validation"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/es/contact.json b/app/javascript/dashboard/i18n/locale/es/contact.json
index 434d9d8cc..786b9cab4 100644
--- a/app/javascript/dashboard/i18n/locale/es/contact.json
+++ b/app/javascript/dashboard/i18n/locale/es/contact.json
@@ -39,10 +39,10 @@
     },
     "MERGE_CONTACT": "Combinar contacto",
     "CONTACT_ACTIONS": "Acciones de contacto",
-    "MUTE_CONTACT": "Silenciar Conversación",
-    "UNMUTE_CONTACT": "Dessilenciar conversación",
-    "MUTED_SUCCESS": "Ésta conversación está silenciada por 6 horas",
-    "UNMUTED_SUCCESS": "Ésta conversación ya no está silenciada",
+    "MUTE_CONTACT": "Block Contact",
+    "UNMUTE_CONTACT": "Unblock Contact",
+    "MUTED_SUCCESS": "This contact is blocked successfully. You will not be notified of any future conversations.",
+    "UNMUTED_SUCCESS": "This contact is unblocked successfully.",
     "SEND_TRANSCRIPT": "Enviar Transcripción",
     "EDIT_LABEL": "Editar",
     "SIDEBAR_SECTIONS": {
@@ -79,7 +79,13 @@
     "TITLE": "Exportar contactos",
     "DESC": "Exportar contactos a un archivo CSV.",
     "SUCCESS_MESSAGE": "El proceso de exportar esta en proceso. Será notificado por correo cuando el archivo esté listo para descargar.",
-    "ERROR_MESSAGE": "Hubo un error, por favor inténtelo de nuevo"
+    "ERROR_MESSAGE": "Hubo un error, por favor inténtelo de nuevo",
+    "CONFIRM": {
+      "TITLE": "Exportar contactos",
+      "MESSAGE": "Are you sure you want to export all contacts?",
+      "YES": "Yes, Export",
+      "NO": "No, Cancel"
+    }
   },
   "DELETE_NOTE": {
     "CONFIRM": {
@@ -339,7 +345,8 @@
     },
     "VALIDATIONS": {
       "REQUIRED": "Se requiere un valor válido",
-      "INVALID_URL": "URL inválida"
+      "INVALID_URL": "URL inválida",
+      "INVALID_INPUT": "Ingreso inválido"
     }
   },
   "MERGE_CONTACTS": {
diff --git a/app/javascript/dashboard/i18n/locale/es/generalSettings.json b/app/javascript/dashboard/i18n/locale/es/generalSettings.json
index 65c1b8cf2..4e45625dc 100644
--- a/app/javascript/dashboard/i18n/locale/es/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/es/generalSettings.json
@@ -112,7 +112,8 @@
       "REMOVE_LABEL": "Eliminar etiqueta de la conversación",
       "SETTINGS": "Ajustes",
       "AI_ASSIST": "Asistencia AI",
-      "APPEARANCE": "Apariencia"
+      "APPEARANCE": "Apariencia",
+      "SNOOZE_NOTIFICATION": "Posponer notificación"
     },
     "COMMANDS": {
       "GO_TO_CONVERSATION_DASHBOARD": "Ir al panel de conversaciones",
@@ -153,7 +154,8 @@
       "CHANGE_APPEARANCE": "Cambiar apariencia",
       "LIGHT_MODE": "Claro",
       "DARK_MODE": "Oscuro",
-      "SYSTEM_MODE": "Sistema"
+      "SYSTEM_MODE": "Sistema",
+      "SNOOZE_NOTIFICATION": "Posponer notificación"
     }
   },
   "DASHBOARD_APPS": {
diff --git a/app/javascript/dashboard/i18n/locale/es/helpCenter.json b/app/javascript/dashboard/i18n/locale/es/helpCenter.json
index 4ac7930bd..fa34f1181 100644
--- a/app/javascript/dashboard/i18n/locale/es/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/es/helpCenter.json
@@ -324,7 +324,8 @@
         "LAST_EDITED": "Última edición"
       },
       "COLUMNS": {
-        "BY": "por"
+        "BY": "por",
+        "AUTHOR_NOT_AVAILABLE": "El autor no está disponible"
       }
     },
     "EDIT_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/es/inbox.json b/app/javascript/dashboard/i18n/locale/es/inbox.json
new file mode 100644
index 000000000..f499ab0e4
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/es/inbox.json
@@ -0,0 +1,60 @@
+{
+  "INBOX": {
+    "LIST": {
+      "TITLE": "Bandeja de entrada",
+      "DISPLAY_DROPDOWN": "Mostrar",
+      "LOADING": "Cargando notificaciones",
+      "EOF": "Todas las notificaciones cargadas 🎉",
+      "404": "There are no active notifications in this group.",
+      "NO_NOTIFICATIONS": "No notifications",
+      "NOTE": "Notifications from all subscribed inboxes",
+      "SNOOZED_UNTIL": "Posponer hasta",
+      "SNOOZED_UNTIL_TOMORROW": "Pospuesto hasta mañana",
+      "SNOOZED_UNTIL_NEXT_WEEK": "Pospuesto hasta la próxima semana"
+    },
+    "ACTION_HEADER": {
+      "SNOOZE": "Snooze notification",
+      "DELETE": "Delete notification"
+    },
+    "TYPES": {
+      "CONVERSATION_MENTION": "You have been mentioned in a conversation",
+      "CONVERSATION_CREATION": "New conversation created",
+      "CONVERSATION_ASSIGNMENT": "A conversation has been assigned to you",
+      "ASSIGNED_CONVERSATION_NEW_MESSAGE": "New message in an assigned conversation",
+      "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "New message in a conversation you are participating in"
+    },
+    "MENU_ITEM": {
+      "MARK_AS_READ": "Mark as read",
+      "MARK_AS_UNREAD": "Marcar como no leído",
+      "SNOOZE": "Posponer",
+      "DELETE": "Eliminar",
+      "MARK_ALL_READ": "Marcar todo como leído",
+      "DELETE_ALL": "Delete all",
+      "DELETE_ALL_READ": "Delete all read"
+    },
+    "DISPLAY_MENU": {
+      "SORT": "Sort",
+      "DISPLAY": "Display :",
+      "SORT_OPTIONS": {
+        "NEWEST": "Más reciente",
+        "OLDEST": "Más antiguo",
+        "PRIORITY": "Prioridad"
+      },
+      "DISPLAY_OPTIONS": {
+        "SNOOZED": "Postpuestas",
+        "READ": "Leído",
+        "LABELS": "Etiquetas",
+        "CONVERSATION_ID": "ID de conversación"
+      }
+    },
+    "ALERTS": {
+      "MARK_AS_READ": "Notificación marcada como leída",
+      "MARK_AS_UNREAD": "Notificación marcada como no leída",
+      "SNOOZE": "Notificación pospuesta",
+      "DELETE": "Notificación eliminada",
+      "MARK_ALL_READ": "Todas las notificaciones marcadas como leídas",
+      "DELETE_ALL": "Todas las notificaciones eliminadas",
+      "DELETE_ALL_READ": "Todas las notificaciones leídas eliminadas"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/es/settings.json b/app/javascript/dashboard/i18n/locale/es/settings.json
index 391f9509a..c32b29972 100644
--- a/app/javascript/dashboard/i18n/locale/es/settings.json
+++ b/app/javascript/dashboard/i18n/locale/es/settings.json
@@ -160,6 +160,9 @@
     "TRIAL_MESSAGE": "días de prueba restantes.",
     "TRAIL_BUTTON": "Comprar ahora",
     "DELETED_USER": "Usuario eliminado",
+    "EMAIL_VERIFICATION_PENDING": "Parece que aún no has verificado tu dirección de correo electrónico. Por favor, revisa tu bandeja de entrada para ver el correo electrónico de verificación.",
+    "RESEND_VERIFICATION_MAIL": "Reenviar correo de verificación",
+    "EMAIL_VERIFICATION_SENT": "El correo electrónico de verificación ha sido enviado. Por favor, comprueba tu bandeja de entrada.",
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Cuenta suspendida",
       "MESSAGE": "Tu cuenta está suspendida. Comuníquese con el equipo de soporte para obtener más información."
@@ -197,6 +200,7 @@
     "CURRENTLY_VIEWING_ACCOUNT": "Visualizando:",
     "SWITCH": "Cambiar",
     "CONVERSATIONS": "Conversaciones",
+    "INBOX": "Bandeja de entrada",
     "ALL_CONVERSATIONS": "Todas las conversaciones",
     "MENTIONED_CONVERSATIONS": "Menciones",
     "PARTICIPATING_CONVERSATIONS": "Participar",
@@ -238,6 +242,7 @@
     "REPORTS_INBOX": "Bandeja de entrada",
     "REPORTS_TEAM": "Equipo",
     "SET_AVAILABILITY_TITLE": "Ponte como",
+    "SLA": "SLA",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Resumen",
     "FACEBOOK_REAUTHORIZE": "Su conexión de Facebook expiró, por favor reconecte si página de Facebook para continuar con el servicio",
diff --git a/app/javascript/dashboard/i18n/locale/es/sla.json b/app/javascript/dashboard/i18n/locale/es/sla.json
new file mode 100644
index 000000000..43053370b
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/es/sla.json
@@ -0,0 +1,70 @@
+{
+  "SLA": {
+    "HEADER": "SLA",
+    "HEADER_BTN_TXT": "Add SLA",
+    "LOADING": "Fetching SLAs",
+    "SEARCH_404": "No hay elementos que coincidan con esta consulta",
+    "SIDEBAR_TXT": "<p><b>SLA</b> <p>Think of Service Level Agreements (SLAs) like friendly promises between a service provider and a customer.</p> <p> These promises set clear expectations for things like how quickly the team will respond to issues, making sure you always get a reliable and top-notch experience!</p>",
+    "LIST": {
+      "404": "There are no SLAs available in this account.",
+      "TITLE": "Manage SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "TABLE_HEADER": [
+        "Nombre",
+        "Descripción",
+        "FRT",
+        "NRT",
+        "RT",
+        "Horarios"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "SLA Name",
+        "PLACEHOLDER": "SLA Name",
+        "REQUIRED_ERROR": "SLA name is required",
+        "MINIMUM_LENGTH_ERROR": "La longitud mínima es de 2 caracteres",
+        "VALID_ERROR": "Sólo letras, números, guión y guión bajo son permitidos"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Descripción",
+        "PLACEHOLDER": "SLA for premium customers"
+      },
+      "FIRST_RESPONSE_TIME": {
+        "LABEL": "First Response Time(Seconds)",
+        "PLACEHOLDER": "300 for 5 minutes"
+      },
+      "NEXT_RESPONSE_TIME": {
+        "LABEL": "Next Response Time(Seconds)",
+        "PLACEHOLDER": "600 for 10 minutes"
+      },
+      "RESOLUTION_TIME": {
+        "LABEL": "Resolution Time(Seconds)",
+        "PLACEHOLDER": "86400 for 1 day"
+      },
+      "BUSINESS_HOURS": {
+        "LABEL": "Horarios",
+        "PLACEHOLDER": "Only during business hours"
+      },
+      "EDIT": "Editar",
+      "CREATE": "Crear",
+      "DELETE": "Eliminar",
+      "CANCEL": "Cancelar"
+    },
+    "ADD": {
+      "TITLE": "Add SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA added successfully",
+        "ERROR_MESSAGE": "Hubo un error, por favor inténtelo de nuevo"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit SLA",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA updated successfully",
+        "ERROR_MESSAGE": "Hubo un error, por favor inténtelo de nuevo"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/fa/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/fa/attributesMgmt.json
index 8783a53fe..8346ae40e 100644
--- a/app/javascript/dashboard/i18n/locale/fa/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fa/attributesMgmt.json
@@ -39,6 +39,17 @@
           "PLACEHOLDER": "کلید ویژگی سفارشی را وارد کنید",
           "ERROR": "کلید الزامی است",
           "IN_VALID": "کلید نامعتبر"
+        },
+        "REGEX_PATTERN": {
+          "LABEL": "Regex Pattern",
+          "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+        },
+        "REGEX_CUE": {
+          "LABEL": "Regex Cue",
+          "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+        },
+        "ENABLE_REGEX": {
+          "LABEL": "Enable regex validation"
         }
       },
       "API": {
@@ -93,6 +104,17 @@
       "EMPTY_RESULT": {
         "404": "هیچ ویژگی سفارشی ایجاد نشده است",
         "NOT_FOUND": "هیچ ویژگی سفارشی پیکربندی نشده است"
+      },
+      "REGEX_PATTERN": {
+        "LABEL": "Regex Pattern",
+        "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+      },
+      "REGEX_CUE": {
+        "LABEL": "Regex Cue",
+        "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+      },
+      "ENABLE_REGEX": {
+        "LABEL": "Enable regex validation"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/fa/contact.json b/app/javascript/dashboard/i18n/locale/fa/contact.json
index 6d2055cb8..71b675464 100644
--- a/app/javascript/dashboard/i18n/locale/fa/contact.json
+++ b/app/javascript/dashboard/i18n/locale/fa/contact.json
@@ -39,10 +39,10 @@
     },
     "MERGE_CONTACT": "ادغام مخاطبین",
     "CONTACT_ACTIONS": "اقدامات مخاطب",
-    "MUTE_CONTACT": "بی‌صدا کردن گفتگو",
-    "UNMUTE_CONTACT": "خارج کردن از حالت بی صدا",
-    "MUTED_SUCCESS": "این گفتگو به مدت ۶ ساعت بی‌صدا است",
-    "UNMUTED_SUCCESS": "این گفتگو از حالت بی صدا خارج شده است",
+    "MUTE_CONTACT": "Block Contact",
+    "UNMUTE_CONTACT": "Unblock Contact",
+    "MUTED_SUCCESS": "This contact is blocked successfully. You will not be notified of any future conversations.",
+    "UNMUTED_SUCCESS": "This contact is unblocked successfully.",
     "SEND_TRANSCRIPT": "ارسال رونوشت",
     "EDIT_LABEL": "ویرایش",
     "SIDEBAR_SECTIONS": {
@@ -79,7 +79,13 @@
     "TITLE": "خروجی گرفتن مخاطب ها",
     "DESC": "خروجی گرفتن مخاطب ها از طریق CSV",
     "SUCCESS_MESSAGE": "Export is in progress, You will be notified via email when export file is ready to dowanlod.",
-    "ERROR_MESSAGE": "خطایی پیش آمد. لطفا دوباره امتحان کنید"
+    "ERROR_MESSAGE": "خطایی پیش آمد. لطفا دوباره امتحان کنید",
+    "CONFIRM": {
+      "TITLE": "خروجی گرفتن مخاطب ها",
+      "MESSAGE": "Are you sure you want to export all contacts?",
+      "YES": "Yes, Export",
+      "NO": "No, Cancel"
+    }
   },
   "DELETE_NOTE": {
     "CONFIRM": {
@@ -339,7 +345,8 @@
     },
     "VALIDATIONS": {
       "REQUIRED": "مقدار معتبر مورد نیاز است",
-      "INVALID_URL": "URL نامعتبر"
+      "INVALID_URL": "URL نامعتبر",
+      "INVALID_INPUT": "Invalid Input"
     }
   },
   "MERGE_CONTACTS": {
diff --git a/app/javascript/dashboard/i18n/locale/fa/generalSettings.json b/app/javascript/dashboard/i18n/locale/fa/generalSettings.json
index 691cdfa30..d155baaa6 100644
--- a/app/javascript/dashboard/i18n/locale/fa/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/fa/generalSettings.json
@@ -112,7 +112,8 @@
       "REMOVE_LABEL": "برچسب را از مکالمه حذف کنید",
       "SETTINGS": "تنظیمات",
       "AI_ASSIST": "AI Assist",
-      "APPEARANCE": "ظاهری"
+      "APPEARANCE": "ظاهری",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     },
     "COMMANDS": {
       "GO_TO_CONVERSATION_DASHBOARD": "به داشبورد مکالمه بروید",
@@ -153,7 +154,8 @@
       "CHANGE_APPEARANCE": "تغییر ظاهر",
       "LIGHT_MODE": "روشن",
       "DARK_MODE": "تیره",
-      "SYSTEM_MODE": "سیستم"
+      "SYSTEM_MODE": "سیستم",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     }
   },
   "DASHBOARD_APPS": {
diff --git a/app/javascript/dashboard/i18n/locale/fa/helpCenter.json b/app/javascript/dashboard/i18n/locale/fa/helpCenter.json
index bcaf0dd59..9c93d8a69 100644
--- a/app/javascript/dashboard/i18n/locale/fa/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/fa/helpCenter.json
@@ -324,7 +324,8 @@
         "LAST_EDITED": "آخرین ویرایش"
       },
       "COLUMNS": {
-        "BY": "توسط"
+        "BY": "توسط",
+        "AUTHOR_NOT_AVAILABLE": "Author is not available"
       }
     },
     "EDIT_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/fa/inbox.json b/app/javascript/dashboard/i18n/locale/fa/inbox.json
new file mode 100644
index 000000000..8b772cc0b
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/fa/inbox.json
@@ -0,0 +1,60 @@
+{
+  "INBOX": {
+    "LIST": {
+      "TITLE": "صندوق ورودی",
+      "DISPLAY_DROPDOWN": "Display",
+      "LOADING": "Fetching notifications",
+      "EOF": "همه اعلان ها بارگیری شدند 🎉",
+      "404": "There are no active notifications in this group.",
+      "NO_NOTIFICATIONS": "No notifications",
+      "NOTE": "آگاه‌سازی‌ها از همه صندوق‌های ورودی مشترک",
+      "SNOOZED_UNTIL": "به تعویق افتاده تا",
+      "SNOOZED_UNTIL_TOMORROW": "تا فردا به تعویق افتاد",
+      "SNOOZED_UNTIL_NEXT_WEEK": "تا هفته آینده به تعویق افتاد"
+    },
+    "ACTION_HEADER": {
+      "SNOOZE": "به تعویق انداختن آگاه‌سازی",
+      "DELETE": "حذف آگاه‌سازی"
+    },
+    "TYPES": {
+      "CONVERSATION_MENTION": "You have been mentioned in a conversation",
+      "CONVERSATION_CREATION": "New conversation created",
+      "CONVERSATION_ASSIGNMENT": "A conversation has been assigned to you",
+      "ASSIGNED_CONVERSATION_NEW_MESSAGE": "New message in an assigned conversation",
+      "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "New message in a conversation you are participating in"
+    },
+    "MENU_ITEM": {
+      "MARK_AS_READ": "Mark as read",
+      "MARK_AS_UNREAD": "علامت گذاری به عنوان خوانده نشده",
+      "SNOOZE": "به تعویق انداختن",
+      "DELETE": "حذف",
+      "MARK_ALL_READ": "همه را به عنوان خوانده شده علامت بزن",
+      "DELETE_ALL": "Delete all",
+      "DELETE_ALL_READ": "Delete all read"
+    },
+    "DISPLAY_MENU": {
+      "SORT": "Sort",
+      "DISPLAY": "Display :",
+      "SORT_OPTIONS": {
+        "NEWEST": "Newest",
+        "OLDEST": "Oldest",
+        "PRIORITY": "اولویت"
+      },
+      "DISPLAY_OPTIONS": {
+        "SNOOZED": "به تعویق افتاد",
+        "READ": "خوانده شده",
+        "LABELS": "برچسب‌ها",
+        "CONVERSATION_ID": "Conversation ID"
+      }
+    },
+    "ALERTS": {
+      "MARK_AS_READ": "Notification marked as read",
+      "MARK_AS_UNREAD": "Notification marked as unread",
+      "SNOOZE": "Notification snoozed",
+      "DELETE": "Notification deleted",
+      "MARK_ALL_READ": "All notifications marked as read",
+      "DELETE_ALL": "All notifications deleted",
+      "DELETE_ALL_READ": "All read notifications deleted"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json
index 80c08d99a..ddc3a1c38 100644
--- a/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json
@@ -569,7 +569,7 @@
       "UPDATE": "تنظیمات ساعات کاری را به روز کنید",
       "TOGGLE_AVAILABILITY": "دسترس بودن کسب و کار را برای این صندوق فعال کردن",
       "UNAVAILABLE_MESSAGE_LABEL": "پیامی برای بازدیدکنندگان در دسترس نیست",
-      "TOGGLE_HELP": "فعال کردن در دسترس بودن کسب کار ، ساعات موجود در ویجت چت زنده را نشان می دهد حتی اگر همه ایجنت ها آفلاین باشند. خارج از ساعات موجود می توان با پیام و فرم قبل از چت ، به کاربران هشدار داد.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours visitors can be warned with a message and a pre-chat form.",
       "DAY": {
         "ENABLE": "در دسترس بودن را برای این روز فعال کنید",
         "UNAVAILABLE": "غیر قابل دسترسی",
diff --git a/app/javascript/dashboard/i18n/locale/fa/settings.json b/app/javascript/dashboard/i18n/locale/fa/settings.json
index fc7056df4..f8790b224 100644
--- a/app/javascript/dashboard/i18n/locale/fa/settings.json
+++ b/app/javascript/dashboard/i18n/locale/fa/settings.json
@@ -160,6 +160,9 @@
     "TRIAL_MESSAGE": "روز تا اتمام دوره آزمایشی باقی است.",
     "TRAIL_BUTTON": "الان بخرید",
     "DELETED_USER": "کاربر حذف شده",
+    "EMAIL_VERIFICATION_PENDING": "It seems that you haven't verified your email address yet. Please check your inbox for the verification email.",
+    "RESEND_VERIFICATION_MAIL": "Resend verification email",
+    "EMAIL_VERIFICATION_SENT": "Verification email has been sent. Please check your inbox.",
     "ACCOUNT_SUSPENDED": {
       "TITLE": "حساب‌کاربری معلق شده است",
       "MESSAGE": "حساب‌کاربری شما به حالت تعلیق درآمده. لطفا برای اطلاعات بیشتر با تیم پشتیبانی تماس بگیرید."
@@ -197,6 +200,7 @@
     "CURRENTLY_VIEWING_ACCOUNT": "در حال مشاهده:",
     "SWITCH": "تعویض",
     "CONVERSATIONS": "گفتگوها",
+    "INBOX": "صندوق ورودی",
     "ALL_CONVERSATIONS": "همه گفتگوها",
     "MENTIONED_CONVERSATIONS": "اشاره",
     "PARTICIPATING_CONVERSATIONS": "شرکت کننده",
@@ -238,6 +242,7 @@
     "REPORTS_INBOX": "صندوق ورودی",
     "REPORTS_TEAM": "تیم‌",
     "SET_AVAILABILITY_TITLE": "خود را به عنوان",
+    "SLA": "SLA",
     "BETA": "آزمایشی",
     "REPORTS_OVERVIEW": "بررسی اجمالی",
     "FACEBOOK_REAUTHORIZE": "اتصال فیس بوک شما منقضی شده است ، لطفاً برای ادامه خدمات دوباره صفحه فیس بوک خود را متصل کنید",
diff --git a/app/javascript/dashboard/i18n/locale/fa/sla.json b/app/javascript/dashboard/i18n/locale/fa/sla.json
new file mode 100644
index 000000000..d0701ee19
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/fa/sla.json
@@ -0,0 +1,70 @@
+{
+  "SLA": {
+    "HEADER": "SLA",
+    "HEADER_BTN_TXT": "Add SLA",
+    "LOADING": "Fetching SLAs",
+    "SEARCH_404": "هیچ گزینه‌ای با این شرایط پیدا نشد",
+    "SIDEBAR_TXT": "<p><b>SLA</b> <p>Think of Service Level Agreements (SLAs) like friendly promises between a service provider and a customer.</p> <p> These promises set clear expectations for things like how quickly the team will respond to issues, making sure you always get a reliable and top-notch experience!</p>",
+    "LIST": {
+      "404": "There are no SLAs available in this account.",
+      "TITLE": "Manage SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "TABLE_HEADER": [
+        "نام",
+        "توضیحات",
+        "FRT",
+        "NRT",
+        "RT",
+        "ساعت کاری"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "SLA Name",
+        "PLACEHOLDER": "SLA Name",
+        "REQUIRED_ERROR": "SLA name is required",
+        "MINIMUM_LENGTH_ERROR": "باید بیشتر از 2 کاراکتر باشد",
+        "VALID_ERROR": "فقط حروف ، اعداد ، خط تیره و زیر خط مجاز است"
+      },
+      "DESCRIPTION": {
+        "LABEL": "توضیحات",
+        "PLACEHOLDER": "SLA for premium customers"
+      },
+      "FIRST_RESPONSE_TIME": {
+        "LABEL": "First Response Time(Seconds)",
+        "PLACEHOLDER": "300 for 5 minutes"
+      },
+      "NEXT_RESPONSE_TIME": {
+        "LABEL": "Next Response Time(Seconds)",
+        "PLACEHOLDER": "600 for 10 minutes"
+      },
+      "RESOLUTION_TIME": {
+        "LABEL": "Resolution Time(Seconds)",
+        "PLACEHOLDER": "86400 for 1 day"
+      },
+      "BUSINESS_HOURS": {
+        "LABEL": "ساعت کاری",
+        "PLACEHOLDER": "Only during business hours"
+      },
+      "EDIT": "ویرایش",
+      "CREATE": "ايجاد كردن",
+      "DELETE": "حذف",
+      "CANCEL": "انصراف"
+    },
+    "ADD": {
+      "TITLE": "Add SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA added successfully",
+        "ERROR_MESSAGE": "خطایی پیش آمد. لطفا دوباره امتحان کنید"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit SLA",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA updated successfully",
+        "ERROR_MESSAGE": "خطایی پیش آمد. لطفا دوباره امتحان کنید"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/fi/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/fi/attributesMgmt.json
index 6e6ef580c..7b7927cf9 100644
--- a/app/javascript/dashboard/i18n/locale/fi/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fi/attributesMgmt.json
@@ -39,6 +39,17 @@
           "PLACEHOLDER": "Enter custom attribute key",
           "ERROR": "Key is required",
           "IN_VALID": "Invalid key"
+        },
+        "REGEX_PATTERN": {
+          "LABEL": "Regex Pattern",
+          "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+        },
+        "REGEX_CUE": {
+          "LABEL": "Regex Cue",
+          "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+        },
+        "ENABLE_REGEX": {
+          "LABEL": "Enable regex validation"
         }
       },
       "API": {
@@ -93,6 +104,17 @@
       "EMPTY_RESULT": {
         "404": "There are no custom attributes created",
         "NOT_FOUND": "There are no custom attributes configured"
+      },
+      "REGEX_PATTERN": {
+        "LABEL": "Regex Pattern",
+        "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+      },
+      "REGEX_CUE": {
+        "LABEL": "Regex Cue",
+        "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+      },
+      "ENABLE_REGEX": {
+        "LABEL": "Enable regex validation"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/fi/contact.json b/app/javascript/dashboard/i18n/locale/fi/contact.json
index 8afed55d0..842c97dd6 100644
--- a/app/javascript/dashboard/i18n/locale/fi/contact.json
+++ b/app/javascript/dashboard/i18n/locale/fi/contact.json
@@ -39,10 +39,10 @@
     },
     "MERGE_CONTACT": "Yhdistä yhteystieto",
     "CONTACT_ACTIONS": "Contact actions",
-    "MUTE_CONTACT": "Mykistä Keskustelu",
-    "UNMUTE_CONTACT": "Poista keskustelun mykistys",
-    "MUTED_SUCCESS": "Tämä keskustelu on mykistetty 6 tunniksi",
-    "UNMUTED_SUCCESS": "Tätä keskustelua ei ole hiljennetty",
+    "MUTE_CONTACT": "Block Contact",
+    "UNMUTE_CONTACT": "Unblock Contact",
+    "MUTED_SUCCESS": "This contact is blocked successfully. You will not be notified of any future conversations.",
+    "UNMUTED_SUCCESS": "This contact is unblocked successfully.",
     "SEND_TRANSCRIPT": "Lähetä keskustelu",
     "EDIT_LABEL": "Muokkaa",
     "SIDEBAR_SECTIONS": {
@@ -79,7 +79,13 @@
     "TITLE": "Export Contacts",
     "DESC": "Export contacts to a CSV file.",
     "SUCCESS_MESSAGE": "Export is in progress, You will be notified via email when export file is ready to dowanlod.",
-    "ERROR_MESSAGE": "Tapahtui virhe, yritä uudelleen"
+    "ERROR_MESSAGE": "Tapahtui virhe, yritä uudelleen",
+    "CONFIRM": {
+      "TITLE": "Export Contacts",
+      "MESSAGE": "Are you sure you want to export all contacts?",
+      "YES": "Yes, Export",
+      "NO": "No, Cancel"
+    }
   },
   "DELETE_NOTE": {
     "CONFIRM": {
@@ -339,7 +345,8 @@
     },
     "VALIDATIONS": {
       "REQUIRED": "Kelvollinen arvo vaaditaan",
-      "INVALID_URL": "Virheellinen URL"
+      "INVALID_URL": "Virheellinen URL",
+      "INVALID_INPUT": "Invalid Input"
     }
   },
   "MERGE_CONTACTS": {
diff --git a/app/javascript/dashboard/i18n/locale/fi/generalSettings.json b/app/javascript/dashboard/i18n/locale/fi/generalSettings.json
index 8c23b735b..33073a4f4 100644
--- a/app/javascript/dashboard/i18n/locale/fi/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/fi/generalSettings.json
@@ -112,7 +112,8 @@
       "REMOVE_LABEL": "Remove label from the conversation",
       "SETTINGS": "Asetukset",
       "AI_ASSIST": "AI Assist",
-      "APPEARANCE": "Appearance"
+      "APPEARANCE": "Appearance",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     },
     "COMMANDS": {
       "GO_TO_CONVERSATION_DASHBOARD": "Go to Conversation Dashboard",
@@ -153,7 +154,8 @@
       "CHANGE_APPEARANCE": "Change Appearance",
       "LIGHT_MODE": "Light",
       "DARK_MODE": "Dark",
-      "SYSTEM_MODE": "System"
+      "SYSTEM_MODE": "System",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     }
   },
   "DASHBOARD_APPS": {
diff --git a/app/javascript/dashboard/i18n/locale/fi/helpCenter.json b/app/javascript/dashboard/i18n/locale/fi/helpCenter.json
index 2e0c39788..8d123921f 100644
--- a/app/javascript/dashboard/i18n/locale/fi/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/fi/helpCenter.json
@@ -324,7 +324,8 @@
         "LAST_EDITED": "Last edited"
       },
       "COLUMNS": {
-        "BY": "by"
+        "BY": "by",
+        "AUTHOR_NOT_AVAILABLE": "Author is not available"
       }
     },
     "EDIT_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/fi/inbox.json b/app/javascript/dashboard/i18n/locale/fi/inbox.json
new file mode 100644
index 000000000..f01ed9b84
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/fi/inbox.json
@@ -0,0 +1,60 @@
+{
+  "INBOX": {
+    "LIST": {
+      "TITLE": "Inbox",
+      "DISPLAY_DROPDOWN": "Display",
+      "LOADING": "Fetching notifications",
+      "EOF": "Kaikki ilmoitukset ladattu 🎉",
+      "404": "There are no active notifications in this group.",
+      "NO_NOTIFICATIONS": "No notifications",
+      "NOTE": "Notifications from all subscribed inboxes",
+      "SNOOZED_UNTIL": "Snoozed until",
+      "SNOOZED_UNTIL_TOMORROW": "Snoozed until tomorrow",
+      "SNOOZED_UNTIL_NEXT_WEEK": "Snoozed until next week"
+    },
+    "ACTION_HEADER": {
+      "SNOOZE": "Snooze notification",
+      "DELETE": "Delete notification"
+    },
+    "TYPES": {
+      "CONVERSATION_MENTION": "You have been mentioned in a conversation",
+      "CONVERSATION_CREATION": "New conversation created",
+      "CONVERSATION_ASSIGNMENT": "A conversation has been assigned to you",
+      "ASSIGNED_CONVERSATION_NEW_MESSAGE": "New message in an assigned conversation",
+      "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "New message in a conversation you are participating in"
+    },
+    "MENU_ITEM": {
+      "MARK_AS_READ": "Mark as read",
+      "MARK_AS_UNREAD": "Mark as unread",
+      "SNOOZE": "Snooze",
+      "DELETE": "Poista",
+      "MARK_ALL_READ": "Merkitse kaikki luetuiksi",
+      "DELETE_ALL": "Delete all",
+      "DELETE_ALL_READ": "Delete all read"
+    },
+    "DISPLAY_MENU": {
+      "SORT": "Sort",
+      "DISPLAY": "Display :",
+      "SORT_OPTIONS": {
+        "NEWEST": "Newest",
+        "OLDEST": "Oldest",
+        "PRIORITY": "Priority"
+      },
+      "DISPLAY_OPTIONS": {
+        "SNOOZED": "Torkutettu",
+        "READ": "Read",
+        "LABELS": "Tunnisteet",
+        "CONVERSATION_ID": "Conversation ID"
+      }
+    },
+    "ALERTS": {
+      "MARK_AS_READ": "Notification marked as read",
+      "MARK_AS_UNREAD": "Notification marked as unread",
+      "SNOOZE": "Notification snoozed",
+      "DELETE": "Notification deleted",
+      "MARK_ALL_READ": "All notifications marked as read",
+      "DELETE_ALL": "All notifications deleted",
+      "DELETE_ALL_READ": "All read notifications deleted"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json
index 2e8adb796..1b4a4c349 100644
--- a/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json
@@ -569,7 +569,7 @@
       "UPDATE": "Update business hours settings",
       "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
       "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for visitors",
-      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours visitors can be warned with a message and a pre-chat form.",
       "DAY": {
         "ENABLE": "Enable availability for this day",
         "UNAVAILABLE": "Unavailable",
diff --git a/app/javascript/dashboard/i18n/locale/fi/settings.json b/app/javascript/dashboard/i18n/locale/fi/settings.json
index a0fdec338..c176a1257 100644
--- a/app/javascript/dashboard/i18n/locale/fi/settings.json
+++ b/app/javascript/dashboard/i18n/locale/fi/settings.json
@@ -160,6 +160,9 @@
     "TRIAL_MESSAGE": "päivää jäljellä.",
     "TRAIL_BUTTON": "Osta nyt",
     "DELETED_USER": "Deleted User",
+    "EMAIL_VERIFICATION_PENDING": "It seems that you haven't verified your email address yet. Please check your inbox for the verification email.",
+    "RESEND_VERIFICATION_MAIL": "Resend verification email",
+    "EMAIL_VERIFICATION_SENT": "Verification email has been sent. Please check your inbox.",
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Account Suspended",
       "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
@@ -197,6 +200,7 @@
     "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
     "SWITCH": "Switch",
     "CONVERSATIONS": "Keskustelut",
+    "INBOX": "Inbox",
     "ALL_CONVERSATIONS": "All Conversations",
     "MENTIONED_CONVERSATIONS": "Mentions",
     "PARTICIPATING_CONVERSATIONS": "Participating",
@@ -238,6 +242,7 @@
     "REPORTS_INBOX": "Inbox",
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
+    "SLA": "SLA",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Overview",
     "FACEBOOK_REAUTHORIZE": "Facebook-yhteytesi on vanhentunut, ole hyvä ja yhdistä uudelleen Facebook-sivusi jatkaaksesi palveluita",
diff --git a/app/javascript/dashboard/i18n/locale/fi/sla.json b/app/javascript/dashboard/i18n/locale/fi/sla.json
new file mode 100644
index 000000000..2fdc5ea44
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/fi/sla.json
@@ -0,0 +1,70 @@
+{
+  "SLA": {
+    "HEADER": "SLA",
+    "HEADER_BTN_TXT": "Add SLA",
+    "LOADING": "Fetching SLAs",
+    "SEARCH_404": "Tätä hakua vastaavia kohteita ei löydy",
+    "SIDEBAR_TXT": "<p><b>SLA</b> <p>Think of Service Level Agreements (SLAs) like friendly promises between a service provider and a customer.</p> <p> These promises set clear expectations for things like how quickly the team will respond to issues, making sure you always get a reliable and top-notch experience!</p>",
+    "LIST": {
+      "404": "There are no SLAs available in this account.",
+      "TITLE": "Manage SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "TABLE_HEADER": [
+        "Nimi",
+        "Kuvaus",
+        "FRT",
+        "NRT",
+        "RT",
+        "Business Hours"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "SLA Name",
+        "PLACEHOLDER": "SLA Name",
+        "REQUIRED_ERROR": "SLA name is required",
+        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
+        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Kuvaus",
+        "PLACEHOLDER": "SLA for premium customers"
+      },
+      "FIRST_RESPONSE_TIME": {
+        "LABEL": "First Response Time(Seconds)",
+        "PLACEHOLDER": "300 for 5 minutes"
+      },
+      "NEXT_RESPONSE_TIME": {
+        "LABEL": "Next Response Time(Seconds)",
+        "PLACEHOLDER": "600 for 10 minutes"
+      },
+      "RESOLUTION_TIME": {
+        "LABEL": "Resolution Time(Seconds)",
+        "PLACEHOLDER": "86400 for 1 day"
+      },
+      "BUSINESS_HOURS": {
+        "LABEL": "Business Hours",
+        "PLACEHOLDER": "Only during business hours"
+      },
+      "EDIT": "Muokkaa",
+      "CREATE": "Luo",
+      "DELETE": "Poista",
+      "CANCEL": "Peruuta"
+    },
+    "ADD": {
+      "TITLE": "Add SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA added successfully",
+        "ERROR_MESSAGE": "Tapahtui virhe, yritä uudelleen"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit SLA",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA updated successfully",
+        "ERROR_MESSAGE": "Tapahtui virhe, yritä uudelleen"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/fr/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/fr/attributesMgmt.json
index db3dcaab2..22bb1a62a 100644
--- a/app/javascript/dashboard/i18n/locale/fr/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fr/attributesMgmt.json
@@ -39,6 +39,17 @@
           "PLACEHOLDER": "Entrez une clé d'attribut personnalisée",
           "ERROR": "La clé est requise",
           "IN_VALID": "Clé invalide"
+        },
+        "REGEX_PATTERN": {
+          "LABEL": "Schéma Regex",
+          "PLACEHOLDER": "Veuillez indiquer un attribut personnalisé pour le schéma Regex (facultatif)."
+        },
+        "REGEX_CUE": {
+          "LABEL": "Regex Cue",
+          "PLACEHOLDER": "Veuillez entrer l'indice du schéma Regex (facultatif)"
+        },
+        "ENABLE_REGEX": {
+          "LABEL": "Activer la validation Regex"
         }
       },
       "API": {
@@ -93,6 +104,17 @@
       "EMPTY_RESULT": {
         "404": "Aucun attribut personnalisé créé",
         "NOT_FOUND": "Il n’y a aucun attribut personnalisé configuré"
+      },
+      "REGEX_PATTERN": {
+        "LABEL": "Schéma Regex",
+        "PLACEHOLDER": "Veuillez indiquer un attribut personnalisé pour le schéma Regex (facultatif)."
+      },
+      "REGEX_CUE": {
+        "LABEL": "Regex Cue",
+        "PLACEHOLDER": "Veuillez entrer l'indice du schéma Regex (facultatif)"
+      },
+      "ENABLE_REGEX": {
+        "LABEL": "Activer la validation Regex"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/fr/contact.json b/app/javascript/dashboard/i18n/locale/fr/contact.json
index 38d50d563..1f042f9b5 100644
--- a/app/javascript/dashboard/i18n/locale/fr/contact.json
+++ b/app/javascript/dashboard/i18n/locale/fr/contact.json
@@ -39,10 +39,10 @@
     },
     "MERGE_CONTACT": "Fusionner le contact",
     "CONTACT_ACTIONS": "Actions du contact",
-    "MUTE_CONTACT": "Mettre la conversation en sourdine",
-    "UNMUTE_CONTACT": "Réactiver le son de conversation",
-    "MUTED_SUCCESS": "Cette conversation est mise en sourdine pendant 6 heures",
-    "UNMUTED_SUCCESS": "Cette conversation n'est plus muette",
+    "MUTE_CONTACT": "Block Contact",
+    "UNMUTE_CONTACT": "Unblock Contact",
+    "MUTED_SUCCESS": "This contact is blocked successfully. You will not be notified of any future conversations.",
+    "UNMUTED_SUCCESS": "This contact is unblocked successfully.",
     "SEND_TRANSCRIPT": "Envoyer la transcription",
     "EDIT_LABEL": "Modifier",
     "SIDEBAR_SECTIONS": {
@@ -79,7 +79,13 @@
     "TITLE": "Exporter les contacts",
     "DESC": "Exporter les contacts vers un fichier CSV.",
     "SUCCESS_MESSAGE": "Export is in progress, You will be notified via email when export file is ready to dowanlod.",
-    "ERROR_MESSAGE": "Une erreur est survenue, veuillez réessayer"
+    "ERROR_MESSAGE": "Une erreur est survenue, veuillez réessayer",
+    "CONFIRM": {
+      "TITLE": "Exporter les contacts",
+      "MESSAGE": "Are you sure you want to export all contacts?",
+      "YES": "Yes, Export",
+      "NO": "No, Cancel"
+    }
   },
   "DELETE_NOTE": {
     "CONFIRM": {
@@ -339,7 +345,8 @@
     },
     "VALIDATIONS": {
       "REQUIRED": "Une valeur valide est requise",
-      "INVALID_URL": "URL invalide"
+      "INVALID_URL": "URL invalide",
+      "INVALID_INPUT": "Entrée invalide"
     }
   },
   "MERGE_CONTACTS": {
diff --git a/app/javascript/dashboard/i18n/locale/fr/generalSettings.json b/app/javascript/dashboard/i18n/locale/fr/generalSettings.json
index e4a095a1b..a6591278d 100644
--- a/app/javascript/dashboard/i18n/locale/fr/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/fr/generalSettings.json
@@ -112,7 +112,8 @@
       "REMOVE_LABEL": "Supprimer l'étiquette de la conversation",
       "SETTINGS": "Paramètres",
       "AI_ASSIST": "Assistance IA",
-      "APPEARANCE": "Apparence"
+      "APPEARANCE": "Apparence",
+      "SNOOZE_NOTIFICATION": "Mettre la notification en veille"
     },
     "COMMANDS": {
       "GO_TO_CONVERSATION_DASHBOARD": "Aller au tableau de bord des conversations",
@@ -153,7 +154,8 @@
       "CHANGE_APPEARANCE": "Changer l'apparence",
       "LIGHT_MODE": "Clair",
       "DARK_MODE": "Sombre",
-      "SYSTEM_MODE": "Système"
+      "SYSTEM_MODE": "Système",
+      "SNOOZE_NOTIFICATION": "Mettre la notification en veille"
     }
   },
   "DASHBOARD_APPS": {
diff --git a/app/javascript/dashboard/i18n/locale/fr/helpCenter.json b/app/javascript/dashboard/i18n/locale/fr/helpCenter.json
index 9d7b30615..18af06944 100644
--- a/app/javascript/dashboard/i18n/locale/fr/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/fr/helpCenter.json
@@ -324,7 +324,8 @@
         "LAST_EDITED": "Dernière modification"
       },
       "COLUMNS": {
-        "BY": "par"
+        "BY": "par",
+        "AUTHOR_NOT_AVAILABLE": "L'auteur n'est pas disponible"
       }
     },
     "EDIT_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/fr/inbox.json b/app/javascript/dashboard/i18n/locale/fr/inbox.json
new file mode 100644
index 000000000..7e5c71009
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/fr/inbox.json
@@ -0,0 +1,60 @@
+{
+  "INBOX": {
+    "LIST": {
+      "TITLE": "Boîte de réception",
+      "DISPLAY_DROPDOWN": "Display",
+      "LOADING": "Chargement des notifications",
+      "EOF": "Toutes les notifications ont été chargées 🎉",
+      "404": "Il n'y a aucune notification active dans ce groupe.",
+      "NO_NOTIFICATIONS": "No notifications",
+      "NOTE": "Notifications from all subscribed inboxes",
+      "SNOOZED_UNTIL": "Reporter jusqu'à",
+      "SNOOZED_UNTIL_TOMORROW": "Reporté jusqu'à demain",
+      "SNOOZED_UNTIL_NEXT_WEEK": "Reporté jusqu'à la semaine prochaine"
+    },
+    "ACTION_HEADER": {
+      "SNOOZE": "Snooze notification",
+      "DELETE": "Delete notification"
+    },
+    "TYPES": {
+      "CONVERSATION_MENTION": "Vous avez été cité dans une conversation",
+      "CONVERSATION_CREATION": "Nouvelle conversation créée",
+      "CONVERSATION_ASSIGNMENT": "Une conversation vous a été attribuée",
+      "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Nouveau message dans une conversation attribuée",
+      "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Nouveau message dans une conversation à laquelle vous participez"
+    },
+    "MENU_ITEM": {
+      "MARK_AS_READ": "Mark as read",
+      "MARK_AS_UNREAD": "Marquer comme non lu",
+      "SNOOZE": "Reporter",
+      "DELETE": "Supprimer",
+      "MARK_ALL_READ": "Tout marquer comme lu",
+      "DELETE_ALL": "Delete all",
+      "DELETE_ALL_READ": "Delete all read"
+    },
+    "DISPLAY_MENU": {
+      "SORT": "Sort",
+      "DISPLAY": "Display :",
+      "SORT_OPTIONS": {
+        "NEWEST": "Newest",
+        "OLDEST": "Oldest",
+        "PRIORITY": "Priorité"
+      },
+      "DISPLAY_OPTIONS": {
+        "SNOOZED": "Reporté",
+        "READ": "Lu",
+        "LABELS": "Étiquettes",
+        "CONVERSATION_ID": "Conversation ID"
+      }
+    },
+    "ALERTS": {
+      "MARK_AS_READ": "Notification marquée comme lue",
+      "MARK_AS_UNREAD": "Notification marquée comme non lue",
+      "SNOOZE": "Notification en veille",
+      "DELETE": "Notification supprimée",
+      "MARK_ALL_READ": "Toutes les notifications sont marquées comme lues",
+      "DELETE_ALL": "Toutes les notifications sont supprimées",
+      "DELETE_ALL_READ": "Toutes les notifications lues ont été supprimées"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json
index a83ac85ab..5859f8cbc 100644
--- a/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json
@@ -569,7 +569,7 @@
       "UPDATE": "Mettre à jour les paramètres des heures de bureau",
       "TOGGLE_AVAILABILITY": "Activer la disponibilité aux heures de bureau pour cette boîte de réception",
       "UNAVAILABLE_MESSAGE_LABEL": "Message d'indisponibilité pour les visiteurs",
-      "TOGGLE_HELP": "Activer la disponibilité aux heures de bureau montrera les heures disponibles sur le widget chat en direct même si tous les agents sont hors ligne. En dehors des heures disponibles, les visiteurs peuvent être avertis avec un message et un formulaire de préconversation.",
+      "TOGGLE_HELP": "Activer la disponibilité professionnelle montrera les heures disponibles sur le widget chat en direct même si tous les agents sont hors ligne. En dehors des heures disponibles, les visiteurs peuvent être avertis avec un message et un formulaire de préconversation.",
       "DAY": {
         "ENABLE": "Activer la disponibilité pour ce jour",
         "UNAVAILABLE": "Non disponible",
diff --git a/app/javascript/dashboard/i18n/locale/fr/settings.json b/app/javascript/dashboard/i18n/locale/fr/settings.json
index 9bf8b448d..9baf82516 100644
--- a/app/javascript/dashboard/i18n/locale/fr/settings.json
+++ b/app/javascript/dashboard/i18n/locale/fr/settings.json
@@ -160,6 +160,9 @@
     "TRIAL_MESSAGE": "jours d'essai restants.",
     "TRAIL_BUTTON": "Acheter Maintenant",
     "DELETED_USER": "Utilisateur supprimé",
+    "EMAIL_VERIFICATION_PENDING": "It seems that you haven't verified your email address yet. Please check your inbox for the verification email.",
+    "RESEND_VERIFICATION_MAIL": "Resend verification email",
+    "EMAIL_VERIFICATION_SENT": "Verification email has been sent. Please check your inbox.",
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Compte Suspendu",
       "MESSAGE": "Votre compte est suspendu. Veuillez contacter le support pour plus d'informations."
@@ -197,6 +200,7 @@
     "CURRENTLY_VIEWING_ACCOUNT": "En cours de visualisation:",
     "SWITCH": "Commuter",
     "CONVERSATIONS": "Conversations",
+    "INBOX": "Boîte de réception",
     "ALL_CONVERSATIONS": "Toutes les conversations",
     "MENTIONED_CONVERSATIONS": "Mentions",
     "PARTICIPATING_CONVERSATIONS": "Conversations assignées",
@@ -238,6 +242,7 @@
     "REPORTS_INBOX": "Boîte de réception",
     "REPORTS_TEAM": "Équipes",
     "SET_AVAILABILITY_TITLE": "Se définir comme",
+    "SLA": "SLA",
     "BETA": "Bêta",
     "REPORTS_OVERVIEW": "Vue d'ensemble",
     "FACEBOOK_REAUTHORIZE": "Votre connexion Facebook a expiré, veuillez reconnecter votre page Facebook pour continuer les services",
diff --git a/app/javascript/dashboard/i18n/locale/fr/sla.json b/app/javascript/dashboard/i18n/locale/fr/sla.json
new file mode 100644
index 000000000..aea4e039e
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/fr/sla.json
@@ -0,0 +1,70 @@
+{
+  "SLA": {
+    "HEADER": "SLA",
+    "HEADER_BTN_TXT": "Add SLA",
+    "LOADING": "Fetching SLAs",
+    "SEARCH_404": "Il n'y a aucun élément correspondant à cette requête",
+    "SIDEBAR_TXT": "<p><b>SLA</b> <p>Think of Service Level Agreements (SLAs) like friendly promises between a service provider and a customer.</p> <p> These promises set clear expectations for things like how quickly the team will respond to issues, making sure you always get a reliable and top-notch experience!</p>",
+    "LIST": {
+      "404": "There are no SLAs available in this account.",
+      "TITLE": "Manage SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "TABLE_HEADER": [
+        "Nom",
+        "Description",
+        "FRT",
+        "NRT",
+        "RT",
+        "Heures de bureau"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "SLA Name",
+        "PLACEHOLDER": "SLA Name",
+        "REQUIRED_ERROR": "SLA name is required",
+        "MINIMUM_LENGTH_ERROR": "Longueur minimale de 2 requise",
+        "VALID_ERROR": "Seuls les caractères alphabétiques, les chiffres, les traits d'union et les tirets bas sont autorisés"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Description",
+        "PLACEHOLDER": "SLA for premium customers"
+      },
+      "FIRST_RESPONSE_TIME": {
+        "LABEL": "First Response Time(Seconds)",
+        "PLACEHOLDER": "300 for 5 minutes"
+      },
+      "NEXT_RESPONSE_TIME": {
+        "LABEL": "Next Response Time(Seconds)",
+        "PLACEHOLDER": "600 for 10 minutes"
+      },
+      "RESOLUTION_TIME": {
+        "LABEL": "Resolution Time(Seconds)",
+        "PLACEHOLDER": "86400 for 1 day"
+      },
+      "BUSINESS_HOURS": {
+        "LABEL": "Heures de bureau",
+        "PLACEHOLDER": "Only during business hours"
+      },
+      "EDIT": "Modifier",
+      "CREATE": "Créer",
+      "DELETE": "Supprimer",
+      "CANCEL": "Annuler"
+    },
+    "ADD": {
+      "TITLE": "Add SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA added successfully",
+        "ERROR_MESSAGE": "Une erreur est survenue, veuillez réessayer"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit SLA",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA updated successfully",
+        "ERROR_MESSAGE": "Une erreur est survenue, veuillez réessayer"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/he/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/he/attributesMgmt.json
index 9ce953b8b..cda523dfb 100644
--- a/app/javascript/dashboard/i18n/locale/he/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/he/attributesMgmt.json
@@ -39,6 +39,17 @@
           "PLACEHOLDER": "הכנס מפתח ייחודי לשדה המותאם",
           "ERROR": "מפתח הוא שדה חובה",
           "IN_VALID": "מפתח אינו חוקי"
+        },
+        "REGEX_PATTERN": {
+          "LABEL": "Regex Pattern",
+          "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+        },
+        "REGEX_CUE": {
+          "LABEL": "Regex Cue",
+          "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+        },
+        "ENABLE_REGEX": {
+          "LABEL": "Enable regex validation"
         }
       },
       "API": {
@@ -93,6 +104,17 @@
       "EMPTY_RESULT": {
         "404": "לא קיימים שדות מותאמים",
         "NOT_FOUND": "לא קיימים שדות מותאמים"
+      },
+      "REGEX_PATTERN": {
+        "LABEL": "Regex Pattern",
+        "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+      },
+      "REGEX_CUE": {
+        "LABEL": "Regex Cue",
+        "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+      },
+      "ENABLE_REGEX": {
+        "LABEL": "Enable regex validation"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/he/contact.json b/app/javascript/dashboard/i18n/locale/he/contact.json
index ad889787a..50b992bab 100644
--- a/app/javascript/dashboard/i18n/locale/he/contact.json
+++ b/app/javascript/dashboard/i18n/locale/he/contact.json
@@ -39,10 +39,10 @@
     },
     "MERGE_CONTACT": "מזג אנשי קשר",
     "CONTACT_ACTIONS": "פעולות אנשי קשר",
-    "MUTE_CONTACT": "השתק שיחה",
-    "UNMUTE_CONTACT": "בטל השתקת שיחה",
-    "MUTED_SUCCESS": "שיחה זו מושתקת למשך 6 שעות",
-    "UNMUTED_SUCCESS": "השיחה זו אינה מושתקת",
+    "MUTE_CONTACT": "Block Contact",
+    "UNMUTE_CONTACT": "Unblock Contact",
+    "MUTED_SUCCESS": "This contact is blocked successfully. You will not be notified of any future conversations.",
+    "UNMUTED_SUCCESS": "This contact is unblocked successfully.",
     "SEND_TRANSCRIPT": "שלח תמלול",
     "EDIT_LABEL": "ערוך",
     "SIDEBAR_SECTIONS": {
@@ -79,7 +79,13 @@
     "TITLE": "Export Contacts",
     "DESC": "Export contacts to a CSV file.",
     "SUCCESS_MESSAGE": "Export is in progress, You will be notified via email when export file is ready to dowanlod.",
-    "ERROR_MESSAGE": "היתה שגיאה, בקשה נסה שוב"
+    "ERROR_MESSAGE": "היתה שגיאה, בקשה נסה שוב",
+    "CONFIRM": {
+      "TITLE": "Export Contacts",
+      "MESSAGE": "Are you sure you want to export all contacts?",
+      "YES": "Yes, Export",
+      "NO": "No, Cancel"
+    }
   },
   "DELETE_NOTE": {
     "CONFIRM": {
@@ -339,7 +345,8 @@
     },
     "VALIDATIONS": {
       "REQUIRED": "נדרש ערך חוקי",
-      "INVALID_URL": "כתובת אתר לא חוקית"
+      "INVALID_URL": "כתובת אתר לא חוקית",
+      "INVALID_INPUT": "Invalid Input"
     }
   },
   "MERGE_CONTACTS": {
diff --git a/app/javascript/dashboard/i18n/locale/he/generalSettings.json b/app/javascript/dashboard/i18n/locale/he/generalSettings.json
index 5e646a12f..612c5eefc 100644
--- a/app/javascript/dashboard/i18n/locale/he/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/he/generalSettings.json
@@ -112,7 +112,8 @@
       "REMOVE_LABEL": "הסר תווית מהשיחה",
       "SETTINGS": "הגדרות",
       "AI_ASSIST": "AI Assist",
-      "APPEARANCE": "Appearance"
+      "APPEARANCE": "Appearance",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     },
     "COMMANDS": {
       "GO_TO_CONVERSATION_DASHBOARD": "עבור ללוח המחוונים לשיחה",
@@ -153,7 +154,8 @@
       "CHANGE_APPEARANCE": "Change Appearance",
       "LIGHT_MODE": "Light",
       "DARK_MODE": "Dark",
-      "SYSTEM_MODE": "System"
+      "SYSTEM_MODE": "System",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     }
   },
   "DASHBOARD_APPS": {
diff --git a/app/javascript/dashboard/i18n/locale/he/helpCenter.json b/app/javascript/dashboard/i18n/locale/he/helpCenter.json
index a74b5e1a4..9f9cd706b 100644
--- a/app/javascript/dashboard/i18n/locale/he/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/he/helpCenter.json
@@ -324,7 +324,8 @@
         "LAST_EDITED": "עריכה אחרונה"
       },
       "COLUMNS": {
-        "BY": "על ידי"
+        "BY": "על ידי",
+        "AUTHOR_NOT_AVAILABLE": "Author is not available"
       }
     },
     "EDIT_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/he/inbox.json b/app/javascript/dashboard/i18n/locale/he/inbox.json
new file mode 100644
index 000000000..79fad6ef5
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/he/inbox.json
@@ -0,0 +1,60 @@
+{
+  "INBOX": {
+    "LIST": {
+      "TITLE": "תיבת הדואר הנכנס",
+      "DISPLAY_DROPDOWN": "Display",
+      "LOADING": "Fetching notifications",
+      "EOF": "כל ההתראות נטענו 🎉",
+      "404": "There are no active notifications in this group.",
+      "NO_NOTIFICATIONS": "No notifications",
+      "NOTE": "Notifications from all subscribed inboxes",
+      "SNOOZED_UNTIL": "Snoozed until",
+      "SNOOZED_UNTIL_TOMORROW": "נמנם עד מחר",
+      "SNOOZED_UNTIL_NEXT_WEEK": "נמנם עד שבוע הבא"
+    },
+    "ACTION_HEADER": {
+      "SNOOZE": "Snooze notification",
+      "DELETE": "Delete notification"
+    },
+    "TYPES": {
+      "CONVERSATION_MENTION": "You have been mentioned in a conversation",
+      "CONVERSATION_CREATION": "New conversation created",
+      "CONVERSATION_ASSIGNMENT": "A conversation has been assigned to you",
+      "ASSIGNED_CONVERSATION_NEW_MESSAGE": "New message in an assigned conversation",
+      "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "New message in a conversation you are participating in"
+    },
+    "MENU_ITEM": {
+      "MARK_AS_READ": "Mark as read",
+      "MARK_AS_UNREAD": "סמן כלא נקרא",
+      "SNOOZE": "נודניק",
+      "DELETE": "מחק",
+      "MARK_ALL_READ": "סמן הכל כנקרא",
+      "DELETE_ALL": "Delete all",
+      "DELETE_ALL_READ": "Delete all read"
+    },
+    "DISPLAY_MENU": {
+      "SORT": "Sort",
+      "DISPLAY": "Display :",
+      "SORT_OPTIONS": {
+        "NEWEST": "Newest",
+        "OLDEST": "Oldest",
+        "PRIORITY": "Priority"
+      },
+      "DISPLAY_OPTIONS": {
+        "SNOOZED": "נימנום",
+        "READ": "נקרא",
+        "LABELS": "תוויות",
+        "CONVERSATION_ID": "Conversation ID"
+      }
+    },
+    "ALERTS": {
+      "MARK_AS_READ": "Notification marked as read",
+      "MARK_AS_UNREAD": "Notification marked as unread",
+      "SNOOZE": "Notification snoozed",
+      "DELETE": "Notification deleted",
+      "MARK_ALL_READ": "All notifications marked as read",
+      "DELETE_ALL": "All notifications deleted",
+      "DELETE_ALL_READ": "All read notifications deleted"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/he/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/he/inboxMgmt.json
index 1247c731a..6cd4e9c54 100644
--- a/app/javascript/dashboard/i18n/locale/he/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/he/inboxMgmt.json
@@ -569,7 +569,7 @@
       "UPDATE": "עדכן את הגדרות שעות הפעילות",
       "TOGGLE_AVAILABILITY": "הפעל זמינות עסקית עבור תיבת הדואר הנכנס הזו",
       "UNAVAILABLE_MESSAGE_LABEL": "הודעה לא זמינה למבקרים",
-      "TOGGLE_HELP": "הפעלת זמינות עסקית תציג את השעות הזמינות בווידג'ט צ'אט חי גם אם כל הסוכנים אינם מקוונים. מחוץ לשעות הזמינות ניתן להזהיר מבקרים באמצעות הודעה וטופס צ'אט מראש.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours visitors can be warned with a message and a pre-chat form.",
       "DAY": {
         "ENABLE": "אפשר זמינות ליום זה",
         "UNAVAILABLE": "אינו זמין",
diff --git a/app/javascript/dashboard/i18n/locale/he/settings.json b/app/javascript/dashboard/i18n/locale/he/settings.json
index 142b7ad68..89ea470d2 100644
--- a/app/javascript/dashboard/i18n/locale/he/settings.json
+++ b/app/javascript/dashboard/i18n/locale/he/settings.json
@@ -160,6 +160,9 @@
     "TRIAL_MESSAGE": "שנותרו ימי ניסיון.",
     "TRAIL_BUTTON": "קנה עכשיו",
     "DELETED_USER": "משתמש מחוק",
+    "EMAIL_VERIFICATION_PENDING": "It seems that you haven't verified your email address yet. Please check your inbox for the verification email.",
+    "RESEND_VERIFICATION_MAIL": "Resend verification email",
+    "EMAIL_VERIFICATION_SENT": "Verification email has been sent. Please check your inbox.",
     "ACCOUNT_SUSPENDED": {
       "TITLE": "חשבון מושעה",
       "MESSAGE": "החשבון שלך מושעה. אנא פנה לצוות התמיכה לקבלת מידע נוסף."
@@ -197,6 +200,7 @@
     "CURRENTLY_VIEWING_ACCOUNT": "צופה כרגע:",
     "SWITCH": "החלף",
     "CONVERSATIONS": "שיחות",
+    "INBOX": "תיבת הדואר הנכנס",
     "ALL_CONVERSATIONS": "כל השיחות",
     "MENTIONED_CONVERSATIONS": "אִזְכּוּרים",
     "PARTICIPATING_CONVERSATIONS": "משתתף",
@@ -238,6 +242,7 @@
     "REPORTS_INBOX": "תיבת הדואר הנכנס",
     "REPORTS_TEAM": "צוות",
     "SET_AVAILABILITY_TITLE": "הגדר את עצמך בתור",
+    "SLA": "SLA",
     "BETA": "בטא",
     "REPORTS_OVERVIEW": "סקירה כללית",
     "FACEBOOK_REAUTHORIZE": "פג תוקף החיבור שלך לפייסבוק, אנא חבר מחדש את דף הפייסבוק שלך כדי להמשיך בשירותים",
diff --git a/app/javascript/dashboard/i18n/locale/he/sla.json b/app/javascript/dashboard/i18n/locale/he/sla.json
new file mode 100644
index 000000000..3207d7f85
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/he/sla.json
@@ -0,0 +1,70 @@
+{
+  "SLA": {
+    "HEADER": "SLA",
+    "HEADER_BTN_TXT": "Add SLA",
+    "LOADING": "Fetching SLAs",
+    "SEARCH_404": "אין פריטים התואמים לשאילתה זו",
+    "SIDEBAR_TXT": "<p><b>SLA</b> <p>Think of Service Level Agreements (SLAs) like friendly promises between a service provider and a customer.</p> <p> These promises set clear expectations for things like how quickly the team will respond to issues, making sure you always get a reliable and top-notch experience!</p>",
+    "LIST": {
+      "404": "There are no SLAs available in this account.",
+      "TITLE": "Manage SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "TABLE_HEADER": [
+        "שם",
+        "תיאור",
+        "FRT",
+        "NRT",
+        "RT",
+        "שעות פעילות"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "SLA Name",
+        "PLACEHOLDER": "SLA Name",
+        "REQUIRED_ERROR": "SLA name is required",
+        "MINIMUM_LENGTH_ERROR": "נדרש אורך מינימלי 2",
+        "VALID_ERROR": "רק אלפבית, מספרים, מקף וקו תחתון מותרים"
+      },
+      "DESCRIPTION": {
+        "LABEL": "תיאור",
+        "PLACEHOLDER": "SLA for premium customers"
+      },
+      "FIRST_RESPONSE_TIME": {
+        "LABEL": "First Response Time(Seconds)",
+        "PLACEHOLDER": "300 for 5 minutes"
+      },
+      "NEXT_RESPONSE_TIME": {
+        "LABEL": "Next Response Time(Seconds)",
+        "PLACEHOLDER": "600 for 10 minutes"
+      },
+      "RESOLUTION_TIME": {
+        "LABEL": "Resolution Time(Seconds)",
+        "PLACEHOLDER": "86400 for 1 day"
+      },
+      "BUSINESS_HOURS": {
+        "LABEL": "שעות פעילות",
+        "PLACEHOLDER": "Only during business hours"
+      },
+      "EDIT": "ערוך",
+      "CREATE": "צור",
+      "DELETE": "מחק",
+      "CANCEL": "ביטול"
+    },
+    "ADD": {
+      "TITLE": "Add SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA added successfully",
+        "ERROR_MESSAGE": "היתה שגיאה, בקשה נסה שוב"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit SLA",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA updated successfully",
+        "ERROR_MESSAGE": "היתה שגיאה, בקשה נסה שוב"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hi/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/hi/attributesMgmt.json
index 2a9ea7de3..64a0e83d6 100644
--- a/app/javascript/dashboard/i18n/locale/hi/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hi/attributesMgmt.json
@@ -39,6 +39,17 @@
           "PLACEHOLDER": "Enter custom attribute key",
           "ERROR": "Key is required",
           "IN_VALID": "Invalid key"
+        },
+        "REGEX_PATTERN": {
+          "LABEL": "Regex Pattern",
+          "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+        },
+        "REGEX_CUE": {
+          "LABEL": "Regex Cue",
+          "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+        },
+        "ENABLE_REGEX": {
+          "LABEL": "Enable regex validation"
         }
       },
       "API": {
@@ -93,6 +104,17 @@
       "EMPTY_RESULT": {
         "404": "There are no custom attributes created",
         "NOT_FOUND": "There are no custom attributes configured"
+      },
+      "REGEX_PATTERN": {
+        "LABEL": "Regex Pattern",
+        "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+      },
+      "REGEX_CUE": {
+        "LABEL": "Regex Cue",
+        "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+      },
+      "ENABLE_REGEX": {
+        "LABEL": "Enable regex validation"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/hi/contact.json b/app/javascript/dashboard/i18n/locale/hi/contact.json
index 09d5075ac..5186fda9a 100644
--- a/app/javascript/dashboard/i18n/locale/hi/contact.json
+++ b/app/javascript/dashboard/i18n/locale/hi/contact.json
@@ -39,10 +39,10 @@
     },
     "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",
+    "MUTE_CONTACT": "Block Contact",
+    "UNMUTE_CONTACT": "Unblock Contact",
+    "MUTED_SUCCESS": "This contact is blocked successfully. You will not be notified of any future conversations.",
+    "UNMUTED_SUCCESS": "This contact is unblocked successfully.",
     "SEND_TRANSCRIPT": "Send Transcript",
     "EDIT_LABEL": "Edit",
     "SIDEBAR_SECTIONS": {
@@ -79,7 +79,13 @@
     "TITLE": "Export Contacts",
     "DESC": "Export contacts to a CSV file.",
     "SUCCESS_MESSAGE": "Export is in progress, You will be notified via email when export file is ready to dowanlod.",
-    "ERROR_MESSAGE": "There was an error, please try again"
+    "ERROR_MESSAGE": "There was an error, please try again",
+    "CONFIRM": {
+      "TITLE": "Export Contacts",
+      "MESSAGE": "Are you sure you want to export all contacts?",
+      "YES": "Yes, Export",
+      "NO": "No, Cancel"
+    }
   },
   "DELETE_NOTE": {
     "CONFIRM": {
@@ -339,7 +345,8 @@
     },
     "VALIDATIONS": {
       "REQUIRED": "Valid value is required",
-      "INVALID_URL": "Invalid URL"
+      "INVALID_URL": "Invalid URL",
+      "INVALID_INPUT": "Invalid Input"
     }
   },
   "MERGE_CONTACTS": {
diff --git a/app/javascript/dashboard/i18n/locale/hi/generalSettings.json b/app/javascript/dashboard/i18n/locale/hi/generalSettings.json
index d56a20c15..185d328a5 100644
--- a/app/javascript/dashboard/i18n/locale/hi/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/hi/generalSettings.json
@@ -112,7 +112,8 @@
       "REMOVE_LABEL": "Remove label from the conversation",
       "SETTINGS": "Settings",
       "AI_ASSIST": "AI Assist",
-      "APPEARANCE": "Appearance"
+      "APPEARANCE": "Appearance",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     },
     "COMMANDS": {
       "GO_TO_CONVERSATION_DASHBOARD": "Go to Conversation Dashboard",
@@ -153,7 +154,8 @@
       "CHANGE_APPEARANCE": "Change Appearance",
       "LIGHT_MODE": "Light",
       "DARK_MODE": "Dark",
-      "SYSTEM_MODE": "System"
+      "SYSTEM_MODE": "System",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     }
   },
   "DASHBOARD_APPS": {
diff --git a/app/javascript/dashboard/i18n/locale/hi/helpCenter.json b/app/javascript/dashboard/i18n/locale/hi/helpCenter.json
index f44e44c6f..cd397ed1e 100644
--- a/app/javascript/dashboard/i18n/locale/hi/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/hi/helpCenter.json
@@ -324,7 +324,8 @@
         "LAST_EDITED": "Last edited"
       },
       "COLUMNS": {
-        "BY": "by"
+        "BY": "by",
+        "AUTHOR_NOT_AVAILABLE": "Author is not available"
       }
     },
     "EDIT_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/hi/inbox.json b/app/javascript/dashboard/i18n/locale/hi/inbox.json
new file mode 100644
index 000000000..dcac5459f
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hi/inbox.json
@@ -0,0 +1,60 @@
+{
+  "INBOX": {
+    "LIST": {
+      "TITLE": "Inbox",
+      "DISPLAY_DROPDOWN": "Display",
+      "LOADING": "Fetching notifications",
+      "EOF": "All notifications loaded 🎉",
+      "404": "There are no active notifications in this group.",
+      "NO_NOTIFICATIONS": "No notifications",
+      "NOTE": "Notifications from all subscribed inboxes",
+      "SNOOZED_UNTIL": "Snoozed until",
+      "SNOOZED_UNTIL_TOMORROW": "Snoozed until tomorrow",
+      "SNOOZED_UNTIL_NEXT_WEEK": "Snoozed until next week"
+    },
+    "ACTION_HEADER": {
+      "SNOOZE": "Snooze notification",
+      "DELETE": "Delete notification"
+    },
+    "TYPES": {
+      "CONVERSATION_MENTION": "You have been mentioned in a conversation",
+      "CONVERSATION_CREATION": "New conversation created",
+      "CONVERSATION_ASSIGNMENT": "A conversation has been assigned to you",
+      "ASSIGNED_CONVERSATION_NEW_MESSAGE": "New message in an assigned conversation",
+      "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "New message in a conversation you are participating in"
+    },
+    "MENU_ITEM": {
+      "MARK_AS_READ": "Mark as read",
+      "MARK_AS_UNREAD": "Mark as unread",
+      "SNOOZE": "Snooze",
+      "DELETE": "Delete",
+      "MARK_ALL_READ": "Mark all as read",
+      "DELETE_ALL": "Delete all",
+      "DELETE_ALL_READ": "Delete all read"
+    },
+    "DISPLAY_MENU": {
+      "SORT": "Sort",
+      "DISPLAY": "Display :",
+      "SORT_OPTIONS": {
+        "NEWEST": "Newest",
+        "OLDEST": "Oldest",
+        "PRIORITY": "Priority"
+      },
+      "DISPLAY_OPTIONS": {
+        "SNOOZED": "Snoozed",
+        "READ": "Read",
+        "LABELS": "Labels",
+        "CONVERSATION_ID": "Conversation ID"
+      }
+    },
+    "ALERTS": {
+      "MARK_AS_READ": "Notification marked as read",
+      "MARK_AS_UNREAD": "Notification marked as unread",
+      "SNOOZE": "Notification snoozed",
+      "DELETE": "Notification deleted",
+      "MARK_ALL_READ": "All notifications marked as read",
+      "DELETE_ALL": "All notifications deleted",
+      "DELETE_ALL_READ": "All read notifications deleted"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json
index 08f2ef2a2..ba83549cf 100644
--- a/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json
@@ -569,7 +569,7 @@
       "UPDATE": "Update business hours settings",
       "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
       "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for visitors",
-      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours visitors can be warned with a message and a pre-chat form.",
       "DAY": {
         "ENABLE": "Enable availability for this day",
         "UNAVAILABLE": "Unavailable",
diff --git a/app/javascript/dashboard/i18n/locale/hi/settings.json b/app/javascript/dashboard/i18n/locale/hi/settings.json
index 78411ee09..ca734fe43 100644
--- a/app/javascript/dashboard/i18n/locale/hi/settings.json
+++ b/app/javascript/dashboard/i18n/locale/hi/settings.json
@@ -160,6 +160,9 @@
     "TRIAL_MESSAGE": "days trial remaining.",
     "TRAIL_BUTTON": "Buy Now",
     "DELETED_USER": "Deleted User",
+    "EMAIL_VERIFICATION_PENDING": "It seems that you haven't verified your email address yet. Please check your inbox for the verification email.",
+    "RESEND_VERIFICATION_MAIL": "Resend verification email",
+    "EMAIL_VERIFICATION_SENT": "Verification email has been sent. Please check your inbox.",
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Account Suspended",
       "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
@@ -197,6 +200,7 @@
     "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
     "SWITCH": "Switch",
     "CONVERSATIONS": "Conversations",
+    "INBOX": "Inbox",
     "ALL_CONVERSATIONS": "All Conversations",
     "MENTIONED_CONVERSATIONS": "Mentions",
     "PARTICIPATING_CONVERSATIONS": "Participating",
@@ -238,6 +242,7 @@
     "REPORTS_INBOX": "Inbox",
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
+    "SLA": "SLA",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Overview",
     "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
diff --git a/app/javascript/dashboard/i18n/locale/hi/sla.json b/app/javascript/dashboard/i18n/locale/hi/sla.json
new file mode 100644
index 000000000..869b3ba3f
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hi/sla.json
@@ -0,0 +1,70 @@
+{
+  "SLA": {
+    "HEADER": "SLA",
+    "HEADER_BTN_TXT": "Add SLA",
+    "LOADING": "Fetching SLAs",
+    "SEARCH_404": "There are no items matching this query",
+    "SIDEBAR_TXT": "<p><b>SLA</b> <p>Think of Service Level Agreements (SLAs) like friendly promises between a service provider and a customer.</p> <p> These promises set clear expectations for things like how quickly the team will respond to issues, making sure you always get a reliable and top-notch experience!</p>",
+    "LIST": {
+      "404": "There are no SLAs available in this account.",
+      "TITLE": "Manage SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "TABLE_HEADER": [
+        "Name",
+        "Description",
+        "FRT",
+        "NRT",
+        "RT",
+        "Business Hours"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "SLA Name",
+        "PLACEHOLDER": "SLA Name",
+        "REQUIRED_ERROR": "SLA name is required",
+        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
+        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Description",
+        "PLACEHOLDER": "SLA for premium customers"
+      },
+      "FIRST_RESPONSE_TIME": {
+        "LABEL": "First Response Time(Seconds)",
+        "PLACEHOLDER": "300 for 5 minutes"
+      },
+      "NEXT_RESPONSE_TIME": {
+        "LABEL": "Next Response Time(Seconds)",
+        "PLACEHOLDER": "600 for 10 minutes"
+      },
+      "RESOLUTION_TIME": {
+        "LABEL": "Resolution Time(Seconds)",
+        "PLACEHOLDER": "86400 for 1 day"
+      },
+      "BUSINESS_HOURS": {
+        "LABEL": "Business Hours",
+        "PLACEHOLDER": "Only during business hours"
+      },
+      "EDIT": "Edit",
+      "CREATE": "Create",
+      "DELETE": "Delete",
+      "CANCEL": "Cancel"
+    },
+    "ADD": {
+      "TITLE": "Add SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA added successfully",
+        "ERROR_MESSAGE": "There was an error, please try again"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit SLA",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA updated successfully",
+        "ERROR_MESSAGE": "There was an error, please try again"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hr/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/hr/attributesMgmt.json
index 2a9ea7de3..64a0e83d6 100644
--- a/app/javascript/dashboard/i18n/locale/hr/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hr/attributesMgmt.json
@@ -39,6 +39,17 @@
           "PLACEHOLDER": "Enter custom attribute key",
           "ERROR": "Key is required",
           "IN_VALID": "Invalid key"
+        },
+        "REGEX_PATTERN": {
+          "LABEL": "Regex Pattern",
+          "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+        },
+        "REGEX_CUE": {
+          "LABEL": "Regex Cue",
+          "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+        },
+        "ENABLE_REGEX": {
+          "LABEL": "Enable regex validation"
         }
       },
       "API": {
@@ -93,6 +104,17 @@
       "EMPTY_RESULT": {
         "404": "There are no custom attributes created",
         "NOT_FOUND": "There are no custom attributes configured"
+      },
+      "REGEX_PATTERN": {
+        "LABEL": "Regex Pattern",
+        "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+      },
+      "REGEX_CUE": {
+        "LABEL": "Regex Cue",
+        "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+      },
+      "ENABLE_REGEX": {
+        "LABEL": "Enable regex validation"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/hr/contact.json b/app/javascript/dashboard/i18n/locale/hr/contact.json
index c220bab60..622e23d9a 100644
--- a/app/javascript/dashboard/i18n/locale/hr/contact.json
+++ b/app/javascript/dashboard/i18n/locale/hr/contact.json
@@ -39,10 +39,10 @@
     },
     "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",
+    "MUTE_CONTACT": "Block Contact",
+    "UNMUTE_CONTACT": "Unblock Contact",
+    "MUTED_SUCCESS": "This contact is blocked successfully. You will not be notified of any future conversations.",
+    "UNMUTED_SUCCESS": "This contact is unblocked successfully.",
     "SEND_TRANSCRIPT": "Send Transcript",
     "EDIT_LABEL": "Edit",
     "SIDEBAR_SECTIONS": {
@@ -79,7 +79,13 @@
     "TITLE": "Export Contacts",
     "DESC": "Export contacts to a CSV file.",
     "SUCCESS_MESSAGE": "Export is in progress, You will be notified via email when export file is ready to dowanlod.",
-    "ERROR_MESSAGE": "There was an error, please try again"
+    "ERROR_MESSAGE": "There was an error, please try again",
+    "CONFIRM": {
+      "TITLE": "Export Contacts",
+      "MESSAGE": "Are you sure you want to export all contacts?",
+      "YES": "Yes, Export",
+      "NO": "No, Cancel"
+    }
   },
   "DELETE_NOTE": {
     "CONFIRM": {
@@ -339,7 +345,8 @@
     },
     "VALIDATIONS": {
       "REQUIRED": "Valid value is required",
-      "INVALID_URL": "Invalid URL"
+      "INVALID_URL": "Invalid URL",
+      "INVALID_INPUT": "Invalid Input"
     }
   },
   "MERGE_CONTACTS": {
diff --git a/app/javascript/dashboard/i18n/locale/hr/generalSettings.json b/app/javascript/dashboard/i18n/locale/hr/generalSettings.json
index c980c6400..9ea0cb5b6 100644
--- a/app/javascript/dashboard/i18n/locale/hr/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/hr/generalSettings.json
@@ -112,7 +112,8 @@
       "REMOVE_LABEL": "Remove label from the conversation",
       "SETTINGS": "Settings",
       "AI_ASSIST": "AI Assist",
-      "APPEARANCE": "Appearance"
+      "APPEARANCE": "Appearance",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     },
     "COMMANDS": {
       "GO_TO_CONVERSATION_DASHBOARD": "Go to Conversation Dashboard",
@@ -153,7 +154,8 @@
       "CHANGE_APPEARANCE": "Change Appearance",
       "LIGHT_MODE": "Light",
       "DARK_MODE": "Dark",
-      "SYSTEM_MODE": "System"
+      "SYSTEM_MODE": "System",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     }
   },
   "DASHBOARD_APPS": {
diff --git a/app/javascript/dashboard/i18n/locale/hr/helpCenter.json b/app/javascript/dashboard/i18n/locale/hr/helpCenter.json
index 80029e46b..69d6e9eec 100644
--- a/app/javascript/dashboard/i18n/locale/hr/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/hr/helpCenter.json
@@ -324,7 +324,8 @@
         "LAST_EDITED": "Last edited"
       },
       "COLUMNS": {
-        "BY": "by"
+        "BY": "by",
+        "AUTHOR_NOT_AVAILABLE": "Author is not available"
       }
     },
     "EDIT_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/hr/inbox.json b/app/javascript/dashboard/i18n/locale/hr/inbox.json
new file mode 100644
index 000000000..9b4133d4c
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hr/inbox.json
@@ -0,0 +1,60 @@
+{
+  "INBOX": {
+    "LIST": {
+      "TITLE": "Inbox",
+      "DISPLAY_DROPDOWN": "Display",
+      "LOADING": "Fetching notifications",
+      "EOF": "All notifications loaded 🎉",
+      "404": "There are no active notifications in this group.",
+      "NO_NOTIFICATIONS": "No notifications",
+      "NOTE": "Notifications from all subscribed inboxes",
+      "SNOOZED_UNTIL": "Snoozed until",
+      "SNOOZED_UNTIL_TOMORROW": "Snoozed until tomorrow",
+      "SNOOZED_UNTIL_NEXT_WEEK": "Snoozed until next week"
+    },
+    "ACTION_HEADER": {
+      "SNOOZE": "Snooze notification",
+      "DELETE": "Delete notification"
+    },
+    "TYPES": {
+      "CONVERSATION_MENTION": "You have been mentioned in a conversation",
+      "CONVERSATION_CREATION": "New conversation created",
+      "CONVERSATION_ASSIGNMENT": "A conversation has been assigned to you",
+      "ASSIGNED_CONVERSATION_NEW_MESSAGE": "New message in an assigned conversation",
+      "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "New message in a conversation you are participating in"
+    },
+    "MENU_ITEM": {
+      "MARK_AS_READ": "Mark as read",
+      "MARK_AS_UNREAD": "Mark as unread",
+      "SNOOZE": "Snooze",
+      "DELETE": "Izbriši",
+      "MARK_ALL_READ": "Mark all as read",
+      "DELETE_ALL": "Delete all",
+      "DELETE_ALL_READ": "Delete all read"
+    },
+    "DISPLAY_MENU": {
+      "SORT": "Sort",
+      "DISPLAY": "Display :",
+      "SORT_OPTIONS": {
+        "NEWEST": "Newest",
+        "OLDEST": "Oldest",
+        "PRIORITY": "Prioritet"
+      },
+      "DISPLAY_OPTIONS": {
+        "SNOOZED": "Snoozed",
+        "READ": "Read",
+        "LABELS": "Labels",
+        "CONVERSATION_ID": "Conversation ID"
+      }
+    },
+    "ALERTS": {
+      "MARK_AS_READ": "Notification marked as read",
+      "MARK_AS_UNREAD": "Notification marked as unread",
+      "SNOOZE": "Notification snoozed",
+      "DELETE": "Notification deleted",
+      "MARK_ALL_READ": "All notifications marked as read",
+      "DELETE_ALL": "All notifications deleted",
+      "DELETE_ALL_READ": "All read notifications deleted"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hr/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/hr/inboxMgmt.json
index 0edee5421..8eb6ebe15 100644
--- a/app/javascript/dashboard/i18n/locale/hr/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hr/inboxMgmt.json
@@ -569,7 +569,7 @@
       "UPDATE": "Update business hours settings",
       "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
       "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for visitors",
-      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours visitors can be warned with a message and a pre-chat form.",
       "DAY": {
         "ENABLE": "Enable availability for this day",
         "UNAVAILABLE": "Unavailable",
diff --git a/app/javascript/dashboard/i18n/locale/hr/settings.json b/app/javascript/dashboard/i18n/locale/hr/settings.json
index 1fd795620..5de9f9ce5 100644
--- a/app/javascript/dashboard/i18n/locale/hr/settings.json
+++ b/app/javascript/dashboard/i18n/locale/hr/settings.json
@@ -160,6 +160,9 @@
     "TRIAL_MESSAGE": "days trial remaining.",
     "TRAIL_BUTTON": "Buy Now",
     "DELETED_USER": "Deleted User",
+    "EMAIL_VERIFICATION_PENDING": "It seems that you haven't verified your email address yet. Please check your inbox for the verification email.",
+    "RESEND_VERIFICATION_MAIL": "Resend verification email",
+    "EMAIL_VERIFICATION_SENT": "Verification email has been sent. Please check your inbox.",
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Account Suspended",
       "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
@@ -197,6 +200,7 @@
     "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
     "SWITCH": "Switch",
     "CONVERSATIONS": "Conversations",
+    "INBOX": "Inbox",
     "ALL_CONVERSATIONS": "All Conversations",
     "MENTIONED_CONVERSATIONS": "Mentions",
     "PARTICIPATING_CONVERSATIONS": "Participating",
@@ -238,6 +242,7 @@
     "REPORTS_INBOX": "Inbox",
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
+    "SLA": "SLA",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Overview",
     "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
diff --git a/app/javascript/dashboard/i18n/locale/hr/sla.json b/app/javascript/dashboard/i18n/locale/hr/sla.json
new file mode 100644
index 000000000..821b717d6
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hr/sla.json
@@ -0,0 +1,70 @@
+{
+  "SLA": {
+    "HEADER": "SLA",
+    "HEADER_BTN_TXT": "Add SLA",
+    "LOADING": "Fetching SLAs",
+    "SEARCH_404": "Ne postoji rezultat za zadano pretraživanje",
+    "SIDEBAR_TXT": "<p><b>SLA</b> <p>Think of Service Level Agreements (SLAs) like friendly promises between a service provider and a customer.</p> <p> These promises set clear expectations for things like how quickly the team will respond to issues, making sure you always get a reliable and top-notch experience!</p>",
+    "LIST": {
+      "404": "There are no SLAs available in this account.",
+      "TITLE": "Manage SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "TABLE_HEADER": [
+        "Name",
+        "Description",
+        "FRT",
+        "NRT",
+        "RT",
+        "Business Hours"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "SLA Name",
+        "PLACEHOLDER": "SLA Name",
+        "REQUIRED_ERROR": "SLA name is required",
+        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
+        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Description",
+        "PLACEHOLDER": "SLA for premium customers"
+      },
+      "FIRST_RESPONSE_TIME": {
+        "LABEL": "First Response Time(Seconds)",
+        "PLACEHOLDER": "300 for 5 minutes"
+      },
+      "NEXT_RESPONSE_TIME": {
+        "LABEL": "Next Response Time(Seconds)",
+        "PLACEHOLDER": "600 for 10 minutes"
+      },
+      "RESOLUTION_TIME": {
+        "LABEL": "Resolution Time(Seconds)",
+        "PLACEHOLDER": "86400 for 1 day"
+      },
+      "BUSINESS_HOURS": {
+        "LABEL": "Business Hours",
+        "PLACEHOLDER": "Only during business hours"
+      },
+      "EDIT": "Uredi",
+      "CREATE": "Create",
+      "DELETE": "Izbriši",
+      "CANCEL": "Odustani"
+    },
+    "ADD": {
+      "TITLE": "Add SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA added successfully",
+        "ERROR_MESSAGE": "There was an error, please try again"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit SLA",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA updated successfully",
+        "ERROR_MESSAGE": "There was an error, please try again"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hu/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/hu/attributesMgmt.json
index acb7ea58a..9256f03f5 100644
--- a/app/javascript/dashboard/i18n/locale/hu/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hu/attributesMgmt.json
@@ -39,6 +39,17 @@
           "PLACEHOLDER": "Add meg az egyéni tulajdonság kulcsát",
           "ERROR": "Kulcs megadása kötelező",
           "IN_VALID": "Érvénytelen kulcs"
+        },
+        "REGEX_PATTERN": {
+          "LABEL": "Regex Pattern",
+          "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+        },
+        "REGEX_CUE": {
+          "LABEL": "Regex Cue",
+          "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+        },
+        "ENABLE_REGEX": {
+          "LABEL": "Enable regex validation"
         }
       },
       "API": {
@@ -93,6 +104,17 @@
       "EMPTY_RESULT": {
         "404": "Nincsennek létrehozva egyéni tulajdonságok",
         "NOT_FOUND": "Nincsennek beállítva egyéni tulajdonságok"
+      },
+      "REGEX_PATTERN": {
+        "LABEL": "Regex Pattern",
+        "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+      },
+      "REGEX_CUE": {
+        "LABEL": "Regex Cue",
+        "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+      },
+      "ENABLE_REGEX": {
+        "LABEL": "Enable regex validation"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/hu/contact.json b/app/javascript/dashboard/i18n/locale/hu/contact.json
index 838ac3aab..80c092801 100644
--- a/app/javascript/dashboard/i18n/locale/hu/contact.json
+++ b/app/javascript/dashboard/i18n/locale/hu/contact.json
@@ -39,10 +39,10 @@
     },
     "MERGE_CONTACT": "Kapcsolattartók összevonása",
     "CONTACT_ACTIONS": "Kapcsolattartói tevékenységek",
-    "MUTE_CONTACT": "Beszélgetés elnémítása",
-    "UNMUTE_CONTACT": "Beszélgetés elnémításának feloldása",
-    "MUTED_SUCCESS": "A beszélgetés 6 órára elnémítva",
-    "UNMUTED_SUCCESS": "A beszélgetés elnémítása megszűntetve",
+    "MUTE_CONTACT": "Block Contact",
+    "UNMUTE_CONTACT": "Unblock Contact",
+    "MUTED_SUCCESS": "This contact is blocked successfully. You will not be notified of any future conversations.",
+    "UNMUTED_SUCCESS": "This contact is unblocked successfully.",
     "SEND_TRANSCRIPT": "Jegyzetek elküldése",
     "EDIT_LABEL": "Szerkesztés",
     "SIDEBAR_SECTIONS": {
@@ -79,7 +79,13 @@
     "TITLE": "Kontaktok exportálása",
     "DESC": "Kontaktok exportálása CSV fájlból.",
     "SUCCESS_MESSAGE": "Export is in progress, You will be notified via email when export file is ready to dowanlod.",
-    "ERROR_MESSAGE": "Hiba történt, kérjük próbáld újra"
+    "ERROR_MESSAGE": "Hiba történt, kérjük próbáld újra",
+    "CONFIRM": {
+      "TITLE": "Kontaktok exportálása",
+      "MESSAGE": "Are you sure you want to export all contacts?",
+      "YES": "Yes, Export",
+      "NO": "No, Cancel"
+    }
   },
   "DELETE_NOTE": {
     "CONFIRM": {
@@ -339,7 +345,8 @@
     },
     "VALIDATIONS": {
       "REQUIRED": "Kötelező megadni",
-      "INVALID_URL": "Hibás URL"
+      "INVALID_URL": "Hibás URL",
+      "INVALID_INPUT": "Invalid Input"
     }
   },
   "MERGE_CONTACTS": {
diff --git a/app/javascript/dashboard/i18n/locale/hu/generalSettings.json b/app/javascript/dashboard/i18n/locale/hu/generalSettings.json
index 955c7243a..bad4ac35b 100644
--- a/app/javascript/dashboard/i18n/locale/hu/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/hu/generalSettings.json
@@ -112,7 +112,8 @@
       "REMOVE_LABEL": "Címke eltávolítása a beszélgetésről",
       "SETTINGS": "Beállítások",
       "AI_ASSIST": "AI segítség",
-      "APPEARANCE": "Megjelenés"
+      "APPEARANCE": "Megjelenés",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     },
     "COMMANDS": {
       "GO_TO_CONVERSATION_DASHBOARD": "Ugrás a beszélgetések kezdőoldalára",
@@ -153,7 +154,8 @@
       "CHANGE_APPEARANCE": "Megjelenés módosítása",
       "LIGHT_MODE": "Világos mód",
       "DARK_MODE": "Sötét mód",
-      "SYSTEM_MODE": "Rendszer"
+      "SYSTEM_MODE": "Rendszer",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     }
   },
   "DASHBOARD_APPS": {
diff --git a/app/javascript/dashboard/i18n/locale/hu/helpCenter.json b/app/javascript/dashboard/i18n/locale/hu/helpCenter.json
index 1cf64263b..db7fb8be6 100644
--- a/app/javascript/dashboard/i18n/locale/hu/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/hu/helpCenter.json
@@ -324,7 +324,8 @@
         "LAST_EDITED": "Utoljára szerkesztve"
       },
       "COLUMNS": {
-        "BY": "általa:"
+        "BY": "általa:",
+        "AUTHOR_NOT_AVAILABLE": "Author is not available"
       }
     },
     "EDIT_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/hu/inbox.json b/app/javascript/dashboard/i18n/locale/hu/inbox.json
new file mode 100644
index 000000000..f16e033ef
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hu/inbox.json
@@ -0,0 +1,60 @@
+{
+  "INBOX": {
+    "LIST": {
+      "TITLE": "Fiók",
+      "DISPLAY_DROPDOWN": "Display",
+      "LOADING": "Értesítések lekérése",
+      "EOF": "Minden értesítés betöltve 🎉",
+      "404": "Ebben a csoportban nincsenek aktív értesítések.",
+      "NO_NOTIFICATIONS": "No notifications",
+      "NOTE": "Értesítés az összes feliratkozott postafiókból",
+      "SNOOZED_UNTIL": "Halasztás eddig",
+      "SNOOZED_UNTIL_TOMORROW": "Halasztás holnapig",
+      "SNOOZED_UNTIL_NEXT_WEEK": "Halasztás jövő hétig"
+    },
+    "ACTION_HEADER": {
+      "SNOOZE": "Értesítés alvó állapotban",
+      "DELETE": "Értesítés törlése"
+    },
+    "TYPES": {
+      "CONVERSATION_MENTION": "Önt megemlítették egy beszélgetésben",
+      "CONVERSATION_CREATION": "Új beszélgetés létrehozása",
+      "CONVERSATION_ASSIGNMENT": "Egy beszélgetés hozzád lett rendelve",
+      "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Új üzenet egy kijelölt beszélgetésben",
+      "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Új üzenet egy beszélgetésben, amelyben részt vesz"
+    },
+    "MENU_ITEM": {
+      "MARK_AS_READ": "Mark as read",
+      "MARK_AS_UNREAD": "Megjelölés olvasatlanként",
+      "SNOOZE": "Halasztás",
+      "DELETE": "Törlés",
+      "MARK_ALL_READ": "Mindent olvasottra állít",
+      "DELETE_ALL": "Delete all",
+      "DELETE_ALL_READ": "Delete all read"
+    },
+    "DISPLAY_MENU": {
+      "SORT": "Rendezés",
+      "DISPLAY": "Megjelenítés:",
+      "SORT_OPTIONS": {
+        "NEWEST": "Legújabb",
+        "OLDEST": "Legrégibb",
+        "PRIORITY": "Prioritás"
+      },
+      "DISPLAY_OPTIONS": {
+        "SNOOZED": "Elnémított",
+        "READ": "Olvasott",
+        "LABELS": "Cimkék",
+        "CONVERSATION_ID": "Beszélgetés azonosítója"
+      }
+    },
+    "ALERTS": {
+      "MARK_AS_READ": "Notification marked as read",
+      "MARK_AS_UNREAD": "Notification marked as unread",
+      "SNOOZE": "Notification snoozed",
+      "DELETE": "Notification deleted",
+      "MARK_ALL_READ": "All notifications marked as read",
+      "DELETE_ALL": "All notifications deleted",
+      "DELETE_ALL_READ": "All read notifications deleted"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json
index 33c09e8e2..b2e1a3fbb 100644
--- a/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json
@@ -569,7 +569,7 @@
       "UPDATE": "Nyitvatartási idő beállítások szerkesztése",
       "TOGGLE_AVAILABILITY": "Nyitvatartási idő beállítások engedélyezése erre az inboxra",
       "UNAVAILABLE_MESSAGE_LABEL": "Nem elérhető üzenetek a vendégek számára",
-      "TOGGLE_HELP": "A nyitvatartási idő megmutatja az elérhetőségetek idejét az élő chat widgeten akkor is ha minden ügynök offline. A nyitvatartási időben a vendégek figyelmeztetést kaphatnak üzenettel és chat előtti űrlappal.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours visitors can be warned with a message and a pre-chat form.",
       "DAY": {
         "ENABLE": "Elérhetőség bekapcsolása erre a napra",
         "UNAVAILABLE": "Nem elérhető",
diff --git a/app/javascript/dashboard/i18n/locale/hu/settings.json b/app/javascript/dashboard/i18n/locale/hu/settings.json
index 460cf8ec1..4143f9d32 100644
--- a/app/javascript/dashboard/i18n/locale/hu/settings.json
+++ b/app/javascript/dashboard/i18n/locale/hu/settings.json
@@ -160,6 +160,9 @@
     "TRIAL_MESSAGE": "nap van hátra a próbaidőszakból.",
     "TRAIL_BUTTON": "Előfizetés",
     "DELETED_USER": "Törölt Felhasználó",
+    "EMAIL_VERIFICATION_PENDING": "It seems that you haven't verified your email address yet. Please check your inbox for the verification email.",
+    "RESEND_VERIFICATION_MAIL": "Resend verification email",
+    "EMAIL_VERIFICATION_SENT": "Verification email has been sent. Please check your inbox.",
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Felfüggesztett Fiók",
       "MESSAGE": "A fiókod felfüggesztés alatt van. Bővebb információkért, kérlek, lépj kapcsolatba az ügfyélszolgálattal."
@@ -197,6 +200,7 @@
     "CURRENTLY_VIEWING_ACCOUNT": "Jelenleg nézi:",
     "SWITCH": "Váltás",
     "CONVERSATIONS": "Beszélgetések",
+    "INBOX": "Fiók",
     "ALL_CONVERSATIONS": "Beszélgetések",
     "MENTIONED_CONVERSATIONS": "Megemlítések",
     "PARTICIPATING_CONVERSATIONS": "Részvétel",
@@ -238,6 +242,7 @@
     "REPORTS_INBOX": "Fiók",
     "REPORTS_TEAM": "Csapat",
     "SET_AVAILABILITY_TITLE": "Ugrás a Beszélgetések Irányítópultjához",
+    "SLA": "SLA",
     "BETA": "Béta",
     "REPORTS_OVERVIEW": "Áttekintés",
     "FACEBOOK_REAUTHORIZE": "A Facebook kapcsolatod lejárt, kérjük kapcsold össze oldalad újra a szolgáltatás folytatásához",
diff --git a/app/javascript/dashboard/i18n/locale/hu/sla.json b/app/javascript/dashboard/i18n/locale/hu/sla.json
new file mode 100644
index 000000000..13eed7285
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hu/sla.json
@@ -0,0 +1,70 @@
+{
+  "SLA": {
+    "HEADER": "SLA",
+    "HEADER_BTN_TXT": "Add SLA",
+    "LOADING": "Fetching SLAs",
+    "SEARCH_404": "Nincs megfelelő elem",
+    "SIDEBAR_TXT": "<p><b>SLA</b> <p>Think of Service Level Agreements (SLAs) like friendly promises between a service provider and a customer.</p> <p> These promises set clear expectations for things like how quickly the team will respond to issues, making sure you always get a reliable and top-notch experience!</p>",
+    "LIST": {
+      "404": "There are no SLAs available in this account.",
+      "TITLE": "Manage SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "TABLE_HEADER": [
+        "Név",
+        "Leírás",
+        "FRT",
+        "NRT",
+        "RT",
+        "Nyitvatartás"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "SLA Name",
+        "PLACEHOLDER": "SLA Name",
+        "REQUIRED_ERROR": "SLA name is required",
+        "MINIMUM_LENGTH_ERROR": "Minimum 2 karakter hosszúnak kell lennie",
+        "VALID_ERROR": "Kizárólag betűk, számok, kötőjel és alulvonás szerepelhet"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Leírás",
+        "PLACEHOLDER": "SLA for premium customers"
+      },
+      "FIRST_RESPONSE_TIME": {
+        "LABEL": "First Response Time(Seconds)",
+        "PLACEHOLDER": "300 for 5 minutes"
+      },
+      "NEXT_RESPONSE_TIME": {
+        "LABEL": "Next Response Time(Seconds)",
+        "PLACEHOLDER": "600 for 10 minutes"
+      },
+      "RESOLUTION_TIME": {
+        "LABEL": "Resolution Time(Seconds)",
+        "PLACEHOLDER": "86400 for 1 day"
+      },
+      "BUSINESS_HOURS": {
+        "LABEL": "Nyitvatartás",
+        "PLACEHOLDER": "Only during business hours"
+      },
+      "EDIT": "Szerkesztés",
+      "CREATE": "Létrehozás",
+      "DELETE": "Törlés",
+      "CANCEL": "Mégse"
+    },
+    "ADD": {
+      "TITLE": "Add SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA added successfully",
+        "ERROR_MESSAGE": "Hiba történt, kérjük próbáld újra"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit SLA",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA updated successfully",
+        "ERROR_MESSAGE": "Hiba történt, kérjük próbáld újra"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hy/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/hy/attributesMgmt.json
index 2a9ea7de3..64a0e83d6 100644
--- a/app/javascript/dashboard/i18n/locale/hy/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hy/attributesMgmt.json
@@ -39,6 +39,17 @@
           "PLACEHOLDER": "Enter custom attribute key",
           "ERROR": "Key is required",
           "IN_VALID": "Invalid key"
+        },
+        "REGEX_PATTERN": {
+          "LABEL": "Regex Pattern",
+          "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+        },
+        "REGEX_CUE": {
+          "LABEL": "Regex Cue",
+          "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+        },
+        "ENABLE_REGEX": {
+          "LABEL": "Enable regex validation"
         }
       },
       "API": {
@@ -93,6 +104,17 @@
       "EMPTY_RESULT": {
         "404": "There are no custom attributes created",
         "NOT_FOUND": "There are no custom attributes configured"
+      },
+      "REGEX_PATTERN": {
+        "LABEL": "Regex Pattern",
+        "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+      },
+      "REGEX_CUE": {
+        "LABEL": "Regex Cue",
+        "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+      },
+      "ENABLE_REGEX": {
+        "LABEL": "Enable regex validation"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/hy/contact.json b/app/javascript/dashboard/i18n/locale/hy/contact.json
index 09d5075ac..5186fda9a 100644
--- a/app/javascript/dashboard/i18n/locale/hy/contact.json
+++ b/app/javascript/dashboard/i18n/locale/hy/contact.json
@@ -39,10 +39,10 @@
     },
     "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",
+    "MUTE_CONTACT": "Block Contact",
+    "UNMUTE_CONTACT": "Unblock Contact",
+    "MUTED_SUCCESS": "This contact is blocked successfully. You will not be notified of any future conversations.",
+    "UNMUTED_SUCCESS": "This contact is unblocked successfully.",
     "SEND_TRANSCRIPT": "Send Transcript",
     "EDIT_LABEL": "Edit",
     "SIDEBAR_SECTIONS": {
@@ -79,7 +79,13 @@
     "TITLE": "Export Contacts",
     "DESC": "Export contacts to a CSV file.",
     "SUCCESS_MESSAGE": "Export is in progress, You will be notified via email when export file is ready to dowanlod.",
-    "ERROR_MESSAGE": "There was an error, please try again"
+    "ERROR_MESSAGE": "There was an error, please try again",
+    "CONFIRM": {
+      "TITLE": "Export Contacts",
+      "MESSAGE": "Are you sure you want to export all contacts?",
+      "YES": "Yes, Export",
+      "NO": "No, Cancel"
+    }
   },
   "DELETE_NOTE": {
     "CONFIRM": {
@@ -339,7 +345,8 @@
     },
     "VALIDATIONS": {
       "REQUIRED": "Valid value is required",
-      "INVALID_URL": "Invalid URL"
+      "INVALID_URL": "Invalid URL",
+      "INVALID_INPUT": "Invalid Input"
     }
   },
   "MERGE_CONTACTS": {
diff --git a/app/javascript/dashboard/i18n/locale/hy/generalSettings.json b/app/javascript/dashboard/i18n/locale/hy/generalSettings.json
index d56a20c15..185d328a5 100644
--- a/app/javascript/dashboard/i18n/locale/hy/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/hy/generalSettings.json
@@ -112,7 +112,8 @@
       "REMOVE_LABEL": "Remove label from the conversation",
       "SETTINGS": "Settings",
       "AI_ASSIST": "AI Assist",
-      "APPEARANCE": "Appearance"
+      "APPEARANCE": "Appearance",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     },
     "COMMANDS": {
       "GO_TO_CONVERSATION_DASHBOARD": "Go to Conversation Dashboard",
@@ -153,7 +154,8 @@
       "CHANGE_APPEARANCE": "Change Appearance",
       "LIGHT_MODE": "Light",
       "DARK_MODE": "Dark",
-      "SYSTEM_MODE": "System"
+      "SYSTEM_MODE": "System",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     }
   },
   "DASHBOARD_APPS": {
diff --git a/app/javascript/dashboard/i18n/locale/hy/helpCenter.json b/app/javascript/dashboard/i18n/locale/hy/helpCenter.json
index f44e44c6f..cd397ed1e 100644
--- a/app/javascript/dashboard/i18n/locale/hy/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/hy/helpCenter.json
@@ -324,7 +324,8 @@
         "LAST_EDITED": "Last edited"
       },
       "COLUMNS": {
-        "BY": "by"
+        "BY": "by",
+        "AUTHOR_NOT_AVAILABLE": "Author is not available"
       }
     },
     "EDIT_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/hy/inbox.json b/app/javascript/dashboard/i18n/locale/hy/inbox.json
new file mode 100644
index 000000000..dcac5459f
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hy/inbox.json
@@ -0,0 +1,60 @@
+{
+  "INBOX": {
+    "LIST": {
+      "TITLE": "Inbox",
+      "DISPLAY_DROPDOWN": "Display",
+      "LOADING": "Fetching notifications",
+      "EOF": "All notifications loaded 🎉",
+      "404": "There are no active notifications in this group.",
+      "NO_NOTIFICATIONS": "No notifications",
+      "NOTE": "Notifications from all subscribed inboxes",
+      "SNOOZED_UNTIL": "Snoozed until",
+      "SNOOZED_UNTIL_TOMORROW": "Snoozed until tomorrow",
+      "SNOOZED_UNTIL_NEXT_WEEK": "Snoozed until next week"
+    },
+    "ACTION_HEADER": {
+      "SNOOZE": "Snooze notification",
+      "DELETE": "Delete notification"
+    },
+    "TYPES": {
+      "CONVERSATION_MENTION": "You have been mentioned in a conversation",
+      "CONVERSATION_CREATION": "New conversation created",
+      "CONVERSATION_ASSIGNMENT": "A conversation has been assigned to you",
+      "ASSIGNED_CONVERSATION_NEW_MESSAGE": "New message in an assigned conversation",
+      "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "New message in a conversation you are participating in"
+    },
+    "MENU_ITEM": {
+      "MARK_AS_READ": "Mark as read",
+      "MARK_AS_UNREAD": "Mark as unread",
+      "SNOOZE": "Snooze",
+      "DELETE": "Delete",
+      "MARK_ALL_READ": "Mark all as read",
+      "DELETE_ALL": "Delete all",
+      "DELETE_ALL_READ": "Delete all read"
+    },
+    "DISPLAY_MENU": {
+      "SORT": "Sort",
+      "DISPLAY": "Display :",
+      "SORT_OPTIONS": {
+        "NEWEST": "Newest",
+        "OLDEST": "Oldest",
+        "PRIORITY": "Priority"
+      },
+      "DISPLAY_OPTIONS": {
+        "SNOOZED": "Snoozed",
+        "READ": "Read",
+        "LABELS": "Labels",
+        "CONVERSATION_ID": "Conversation ID"
+      }
+    },
+    "ALERTS": {
+      "MARK_AS_READ": "Notification marked as read",
+      "MARK_AS_UNREAD": "Notification marked as unread",
+      "SNOOZE": "Notification snoozed",
+      "DELETE": "Notification deleted",
+      "MARK_ALL_READ": "All notifications marked as read",
+      "DELETE_ALL": "All notifications deleted",
+      "DELETE_ALL_READ": "All read notifications deleted"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hy/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/hy/inboxMgmt.json
index 26d1ad7fc..3762a5151 100644
--- a/app/javascript/dashboard/i18n/locale/hy/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hy/inboxMgmt.json
@@ -569,7 +569,7 @@
       "UPDATE": "Update business hours settings",
       "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
       "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for visitors",
-      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours visitors can be warned with a message and a pre-chat form.",
       "DAY": {
         "ENABLE": "Enable availability for this day",
         "UNAVAILABLE": "Unavailable",
diff --git a/app/javascript/dashboard/i18n/locale/hy/settings.json b/app/javascript/dashboard/i18n/locale/hy/settings.json
index b96a7c091..a953dbca0 100644
--- a/app/javascript/dashboard/i18n/locale/hy/settings.json
+++ b/app/javascript/dashboard/i18n/locale/hy/settings.json
@@ -160,6 +160,9 @@
     "TRIAL_MESSAGE": "days trial remaining.",
     "TRAIL_BUTTON": "Buy Now",
     "DELETED_USER": "Deleted User",
+    "EMAIL_VERIFICATION_PENDING": "It seems that you haven't verified your email address yet. Please check your inbox for the verification email.",
+    "RESEND_VERIFICATION_MAIL": "Resend verification email",
+    "EMAIL_VERIFICATION_SENT": "Verification email has been sent. Please check your inbox.",
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Account Suspended",
       "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
@@ -197,6 +200,7 @@
     "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
     "SWITCH": "Switch",
     "CONVERSATIONS": "Conversations",
+    "INBOX": "Inbox",
     "ALL_CONVERSATIONS": "All Conversations",
     "MENTIONED_CONVERSATIONS": "Mentions",
     "PARTICIPATING_CONVERSATIONS": "Participating",
@@ -238,6 +242,7 @@
     "REPORTS_INBOX": "Inbox",
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
+    "SLA": "SLA",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Overview",
     "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
diff --git a/app/javascript/dashboard/i18n/locale/hy/sla.json b/app/javascript/dashboard/i18n/locale/hy/sla.json
new file mode 100644
index 000000000..869b3ba3f
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hy/sla.json
@@ -0,0 +1,70 @@
+{
+  "SLA": {
+    "HEADER": "SLA",
+    "HEADER_BTN_TXT": "Add SLA",
+    "LOADING": "Fetching SLAs",
+    "SEARCH_404": "There are no items matching this query",
+    "SIDEBAR_TXT": "<p><b>SLA</b> <p>Think of Service Level Agreements (SLAs) like friendly promises between a service provider and a customer.</p> <p> These promises set clear expectations for things like how quickly the team will respond to issues, making sure you always get a reliable and top-notch experience!</p>",
+    "LIST": {
+      "404": "There are no SLAs available in this account.",
+      "TITLE": "Manage SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "TABLE_HEADER": [
+        "Name",
+        "Description",
+        "FRT",
+        "NRT",
+        "RT",
+        "Business Hours"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "SLA Name",
+        "PLACEHOLDER": "SLA Name",
+        "REQUIRED_ERROR": "SLA name is required",
+        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
+        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Description",
+        "PLACEHOLDER": "SLA for premium customers"
+      },
+      "FIRST_RESPONSE_TIME": {
+        "LABEL": "First Response Time(Seconds)",
+        "PLACEHOLDER": "300 for 5 minutes"
+      },
+      "NEXT_RESPONSE_TIME": {
+        "LABEL": "Next Response Time(Seconds)",
+        "PLACEHOLDER": "600 for 10 minutes"
+      },
+      "RESOLUTION_TIME": {
+        "LABEL": "Resolution Time(Seconds)",
+        "PLACEHOLDER": "86400 for 1 day"
+      },
+      "BUSINESS_HOURS": {
+        "LABEL": "Business Hours",
+        "PLACEHOLDER": "Only during business hours"
+      },
+      "EDIT": "Edit",
+      "CREATE": "Create",
+      "DELETE": "Delete",
+      "CANCEL": "Cancel"
+    },
+    "ADD": {
+      "TITLE": "Add SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA added successfully",
+        "ERROR_MESSAGE": "There was an error, please try again"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit SLA",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA updated successfully",
+        "ERROR_MESSAGE": "There was an error, please try again"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/id/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/id/attributesMgmt.json
index 9854b1d03..3f6414296 100644
--- a/app/javascript/dashboard/i18n/locale/id/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/id/attributesMgmt.json
@@ -39,6 +39,17 @@
           "PLACEHOLDER": "Masukkan kunci atribut kustom",
           "ERROR": "Kunci dibutuhkan",
           "IN_VALID": "Kunci tidak valid"
+        },
+        "REGEX_PATTERN": {
+          "LABEL": "Regex Pattern",
+          "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+        },
+        "REGEX_CUE": {
+          "LABEL": "Regex Cue",
+          "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+        },
+        "ENABLE_REGEX": {
+          "LABEL": "Enable regex validation"
         }
       },
       "API": {
@@ -93,6 +104,17 @@
       "EMPTY_RESULT": {
         "404": "Tidak ada atribut kustom yang dibuat",
         "NOT_FOUND": "Tidak ada atribut kustom yang dikonfigurasi"
+      },
+      "REGEX_PATTERN": {
+        "LABEL": "Regex Pattern",
+        "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+      },
+      "REGEX_CUE": {
+        "LABEL": "Regex Cue",
+        "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+      },
+      "ENABLE_REGEX": {
+        "LABEL": "Enable regex validation"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/id/contact.json b/app/javascript/dashboard/i18n/locale/id/contact.json
index f5674f58d..8067691fb 100644
--- a/app/javascript/dashboard/i18n/locale/id/contact.json
+++ b/app/javascript/dashboard/i18n/locale/id/contact.json
@@ -39,10 +39,10 @@
     },
     "MERGE_CONTACT": "Gabungkan Kontak",
     "CONTACT_ACTIONS": "Tindakan Kontak",
-    "MUTE_CONTACT": "Matikan Suara Percakapan",
-    "UNMUTE_CONTACT": "Hidupkan Suara Percakapan",
-    "MUTED_SUCCESS": "Percakapan ini di matikan suara selama 6 jam",
-    "UNMUTED_SUCCESS": "Percakapan ini dihidupkan suara",
+    "MUTE_CONTACT": "Block Contact",
+    "UNMUTE_CONTACT": "Unblock Contact",
+    "MUTED_SUCCESS": "This contact is blocked successfully. You will not be notified of any future conversations.",
+    "UNMUTED_SUCCESS": "This contact is unblocked successfully.",
     "SEND_TRANSCRIPT": "Kirim Transkrip",
     "EDIT_LABEL": "Edit",
     "SIDEBAR_SECTIONS": {
@@ -79,7 +79,13 @@
     "TITLE": "Ekspor Kontak",
     "DESC": "Ekspor kontak ke file CSV.",
     "SUCCESS_MESSAGE": "Export is in progress, You will be notified via email when export file is ready to dowanlod.",
-    "ERROR_MESSAGE": "Terjadi kesalahan, harap coba lagi"
+    "ERROR_MESSAGE": "Terjadi kesalahan, harap coba lagi",
+    "CONFIRM": {
+      "TITLE": "Ekspor Kontak",
+      "MESSAGE": "Are you sure you want to export all contacts?",
+      "YES": "Yes, Export",
+      "NO": "No, Cancel"
+    }
   },
   "DELETE_NOTE": {
     "CONFIRM": {
@@ -339,7 +345,8 @@
     },
     "VALIDATIONS": {
       "REQUIRED": "Nilai yang valid diperlukan",
-      "INVALID_URL": "URL tidak valid"
+      "INVALID_URL": "URL tidak valid",
+      "INVALID_INPUT": "Invalid Input"
     }
   },
   "MERGE_CONTACTS": {
diff --git a/app/javascript/dashboard/i18n/locale/id/generalSettings.json b/app/javascript/dashboard/i18n/locale/id/generalSettings.json
index c9c2945df..b4ac1cacf 100644
--- a/app/javascript/dashboard/i18n/locale/id/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/id/generalSettings.json
@@ -112,7 +112,8 @@
       "REMOVE_LABEL": "Hapus label dari percakapan",
       "SETTINGS": "Pengaturan",
       "AI_ASSIST": "AI Assist",
-      "APPEARANCE": "Appearance"
+      "APPEARANCE": "Appearance",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     },
     "COMMANDS": {
       "GO_TO_CONVERSATION_DASHBOARD": "Menuju ke Dasbor Percakapan",
@@ -153,7 +154,8 @@
       "CHANGE_APPEARANCE": "Change Appearance",
       "LIGHT_MODE": "Light",
       "DARK_MODE": "Dark",
-      "SYSTEM_MODE": "Sistem"
+      "SYSTEM_MODE": "Sistem",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     }
   },
   "DASHBOARD_APPS": {
diff --git a/app/javascript/dashboard/i18n/locale/id/helpCenter.json b/app/javascript/dashboard/i18n/locale/id/helpCenter.json
index dfcdf52a7..3e65ae78c 100644
--- a/app/javascript/dashboard/i18n/locale/id/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/id/helpCenter.json
@@ -324,7 +324,8 @@
         "LAST_EDITED": "Terakhir diedit"
       },
       "COLUMNS": {
-        "BY": "oleh"
+        "BY": "oleh",
+        "AUTHOR_NOT_AVAILABLE": "Author is not available"
       }
     },
     "EDIT_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/id/inbox.json b/app/javascript/dashboard/i18n/locale/id/inbox.json
new file mode 100644
index 000000000..3461e90c1
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/id/inbox.json
@@ -0,0 +1,60 @@
+{
+  "INBOX": {
+    "LIST": {
+      "TITLE": "Kotak masuk",
+      "DISPLAY_DROPDOWN": "Display",
+      "LOADING": "Fetching notifications",
+      "EOF": "All notifications loaded 🎉",
+      "404": "There are no active notifications in this group.",
+      "NO_NOTIFICATIONS": "No notifications",
+      "NOTE": "Notifications from all subscribed inboxes",
+      "SNOOZED_UNTIL": "Ditunda hingga",
+      "SNOOZED_UNTIL_TOMORROW": "Ditunda hingga besok",
+      "SNOOZED_UNTIL_NEXT_WEEK": "Ditunda hingga minggu depan"
+    },
+    "ACTION_HEADER": {
+      "SNOOZE": "Snooze notification",
+      "DELETE": "Delete notification"
+    },
+    "TYPES": {
+      "CONVERSATION_MENTION": "You have been mentioned in a conversation",
+      "CONVERSATION_CREATION": "New conversation created",
+      "CONVERSATION_ASSIGNMENT": "A conversation has been assigned to you",
+      "ASSIGNED_CONVERSATION_NEW_MESSAGE": "New message in an assigned conversation",
+      "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "New message in a conversation you are participating in"
+    },
+    "MENU_ITEM": {
+      "MARK_AS_READ": "Mark as read",
+      "MARK_AS_UNREAD": "Tandai sebagai belum terbaca",
+      "SNOOZE": "Tunda",
+      "DELETE": "Hapus",
+      "MARK_ALL_READ": "Mark all as read",
+      "DELETE_ALL": "Delete all",
+      "DELETE_ALL_READ": "Delete all read"
+    },
+    "DISPLAY_MENU": {
+      "SORT": "Sort",
+      "DISPLAY": "Display :",
+      "SORT_OPTIONS": {
+        "NEWEST": "Newest",
+        "OLDEST": "Oldest",
+        "PRIORITY": "Prioritas"
+      },
+      "DISPLAY_OPTIONS": {
+        "SNOOZED": "Ditunda Sebentar",
+        "READ": "Dibaca",
+        "LABELS": "Label",
+        "CONVERSATION_ID": "Conversation ID"
+      }
+    },
+    "ALERTS": {
+      "MARK_AS_READ": "Notification marked as read",
+      "MARK_AS_UNREAD": "Notification marked as unread",
+      "SNOOZE": "Notification snoozed",
+      "DELETE": "Notification deleted",
+      "MARK_ALL_READ": "All notifications marked as read",
+      "DELETE_ALL": "All notifications deleted",
+      "DELETE_ALL_READ": "All read notifications deleted"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/id/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/id/inboxMgmt.json
index 97075b804..c7176a250 100644
--- a/app/javascript/dashboard/i18n/locale/id/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/id/inboxMgmt.json
@@ -569,7 +569,7 @@
       "UPDATE": "Perbarui pengaturan jam kerja",
       "TOGGLE_AVAILABILITY": "Aktifkan ketersediaan bisnis untuk kotak masuk ini",
       "UNAVAILABLE_MESSAGE_LABEL": "Pesan tidak tersedia untuk pengunjung",
-      "TOGGLE_HELP": "Mengaktifkan ketersediaan bisnis akan menunjukkan jam yang tersedia di widget obrolan langsung meskipun semua agen sedang offline. Di luar jam buka yang tersedia, pengunjung dapat diperingatkan dengan pesan dan formulir pra-obrolan.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours visitors can be warned with a message and a pre-chat form.",
       "DAY": {
         "ENABLE": "Aktifkan ketersediaan untuk hari ini",
         "UNAVAILABLE": "Tidak tersedia",
diff --git a/app/javascript/dashboard/i18n/locale/id/settings.json b/app/javascript/dashboard/i18n/locale/id/settings.json
index 2b6dda7b5..a652d9aae 100644
--- a/app/javascript/dashboard/i18n/locale/id/settings.json
+++ b/app/javascript/dashboard/i18n/locale/id/settings.json
@@ -160,6 +160,9 @@
     "TRIAL_MESSAGE": "hari percobaan tersisa.",
     "TRAIL_BUTTON": "Beli Sekarang",
     "DELETED_USER": "Pengguna Dihapus",
+    "EMAIL_VERIFICATION_PENDING": "It seems that you haven't verified your email address yet. Please check your inbox for the verification email.",
+    "RESEND_VERIFICATION_MAIL": "Resend verification email",
+    "EMAIL_VERIFICATION_SENT": "Verification email has been sent. Please check your inbox.",
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Akun Ditangguhkan",
       "MESSAGE": "Akun Anda ditangguhkan. Silakan hubungi tim dukungan untuk informasi lebih lanjut."
@@ -197,6 +200,7 @@
     "CURRENTLY_VIEWING_ACCOUNT": "Saat ini dilihat:",
     "SWITCH": "Ganti",
     "CONVERSATIONS": "Percakapan",
+    "INBOX": "Kotak masuk",
     "ALL_CONVERSATIONS": "Semua Percakapan",
     "MENTIONED_CONVERSATIONS": "Disebutkan",
     "PARTICIPATING_CONVERSATIONS": "Berpartisipasi",
@@ -238,6 +242,7 @@
     "REPORTS_INBOX": "Kotak Masuk",
     "REPORTS_TEAM": "Tim",
     "SET_AVAILABILITY_TITLE": "Atur diri anda sebagai",
+    "SLA": "SLA",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Gambaran",
     "FACEBOOK_REAUTHORIZE": "Koneksi Facebook Anda telah kedaluwarsa, hubungkan kembali halaman Facebook Anda untuk melanjutkan layanan",
diff --git a/app/javascript/dashboard/i18n/locale/id/sla.json b/app/javascript/dashboard/i18n/locale/id/sla.json
new file mode 100644
index 000000000..3e7194089
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/id/sla.json
@@ -0,0 +1,70 @@
+{
+  "SLA": {
+    "HEADER": "SLA",
+    "HEADER_BTN_TXT": "Add SLA",
+    "LOADING": "Fetching SLAs",
+    "SEARCH_404": "Tidak ada item yang cocok dengan kueri ini",
+    "SIDEBAR_TXT": "<p><b>SLA</b> <p>Think of Service Level Agreements (SLAs) like friendly promises between a service provider and a customer.</p> <p> These promises set clear expectations for things like how quickly the team will respond to issues, making sure you always get a reliable and top-notch experience!</p>",
+    "LIST": {
+      "404": "There are no SLAs available in this account.",
+      "TITLE": "Manage SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "TABLE_HEADER": [
+        "Nama",
+        "Deskripsi",
+        "FRT",
+        "NRT",
+        "RT",
+        "Jam Kerja"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "SLA Name",
+        "PLACEHOLDER": "SLA Name",
+        "REQUIRED_ERROR": "SLA name is required",
+        "MINIMUM_LENGTH_ERROR": "Panjang minimal 2 diperlukan",
+        "VALID_ERROR": "Hanya Abjad, Angka, Tanda Hubung, dan Garis Bawah yang diperbolehkan"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Deskripsi",
+        "PLACEHOLDER": "SLA for premium customers"
+      },
+      "FIRST_RESPONSE_TIME": {
+        "LABEL": "First Response Time(Seconds)",
+        "PLACEHOLDER": "300 for 5 minutes"
+      },
+      "NEXT_RESPONSE_TIME": {
+        "LABEL": "Next Response Time(Seconds)",
+        "PLACEHOLDER": "600 for 10 minutes"
+      },
+      "RESOLUTION_TIME": {
+        "LABEL": "Resolution Time(Seconds)",
+        "PLACEHOLDER": "86400 for 1 day"
+      },
+      "BUSINESS_HOURS": {
+        "LABEL": "Jam Kerja",
+        "PLACEHOLDER": "Only during business hours"
+      },
+      "EDIT": "Edit",
+      "CREATE": "Buat",
+      "DELETE": "Hapus",
+      "CANCEL": "Batalkan"
+    },
+    "ADD": {
+      "TITLE": "Add SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA added successfully",
+        "ERROR_MESSAGE": "Terjadi kesalahan, harap coba lagi"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit SLA",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA updated successfully",
+        "ERROR_MESSAGE": "Terjadi kesalahan, harap coba lagi"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/is/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/is/attributesMgmt.json
index 5a7140287..176e94ea7 100644
--- a/app/javascript/dashboard/i18n/locale/is/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/is/attributesMgmt.json
@@ -39,6 +39,17 @@
           "PLACEHOLDER": "Enter custom attribute key",
           "ERROR": "Key is required",
           "IN_VALID": "Invalid key"
+        },
+        "REGEX_PATTERN": {
+          "LABEL": "Regex Pattern",
+          "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+        },
+        "REGEX_CUE": {
+          "LABEL": "Regex Cue",
+          "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+        },
+        "ENABLE_REGEX": {
+          "LABEL": "Enable regex validation"
         }
       },
       "API": {
@@ -93,6 +104,17 @@
       "EMPTY_RESULT": {
         "404": "There are no custom attributes created",
         "NOT_FOUND": "There are no custom attributes configured"
+      },
+      "REGEX_PATTERN": {
+        "LABEL": "Regex Pattern",
+        "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+      },
+      "REGEX_CUE": {
+        "LABEL": "Regex Cue",
+        "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+      },
+      "ENABLE_REGEX": {
+        "LABEL": "Enable regex validation"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/is/contact.json b/app/javascript/dashboard/i18n/locale/is/contact.json
index 2c0b239d9..e609a754a 100644
--- a/app/javascript/dashboard/i18n/locale/is/contact.json
+++ b/app/javascript/dashboard/i18n/locale/is/contact.json
@@ -39,10 +39,10 @@
     },
     "MERGE_CONTACT": "Sameina tengilið",
     "CONTACT_ACTIONS": "Aðgerðir tengiliðs",
-    "MUTE_CONTACT": "Þagga Samtal",
-    "UNMUTE_CONTACT": "Afþagga Samtal",
-    "MUTED_SUCCESS": "Þetta samtal er þaggað í 6 klukkustundir",
-    "UNMUTED_SUCCESS": "Þetta samtal er afþaggað",
+    "MUTE_CONTACT": "Block Contact",
+    "UNMUTE_CONTACT": "Unblock Contact",
+    "MUTED_SUCCESS": "This contact is blocked successfully. You will not be notified of any future conversations.",
+    "UNMUTED_SUCCESS": "This contact is unblocked successfully.",
     "SEND_TRANSCRIPT": "Senda Afrit",
     "EDIT_LABEL": "Breyta",
     "SIDEBAR_SECTIONS": {
@@ -79,7 +79,13 @@
     "TITLE": "Export Contacts",
     "DESC": "Export contacts to a CSV file.",
     "SUCCESS_MESSAGE": "Export is in progress, You will be notified via email when export file is ready to dowanlod.",
-    "ERROR_MESSAGE": "Það kom upp villa, vinsamlegast reyndu aftur"
+    "ERROR_MESSAGE": "Það kom upp villa, vinsamlegast reyndu aftur",
+    "CONFIRM": {
+      "TITLE": "Export Contacts",
+      "MESSAGE": "Are you sure you want to export all contacts?",
+      "YES": "Yes, Export",
+      "NO": "No, Cancel"
+    }
   },
   "DELETE_NOTE": {
     "CONFIRM": {
@@ -339,7 +345,8 @@
     },
     "VALIDATIONS": {
       "REQUIRED": "Það þarf að slá inn gilt gildi",
-      "INVALID_URL": "Ógilt URL"
+      "INVALID_URL": "Ógilt URL",
+      "INVALID_INPUT": "Invalid Input"
     }
   },
   "MERGE_CONTACTS": {
diff --git a/app/javascript/dashboard/i18n/locale/is/generalSettings.json b/app/javascript/dashboard/i18n/locale/is/generalSettings.json
index a5a4d7757..0c26e98ac 100644
--- a/app/javascript/dashboard/i18n/locale/is/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/is/generalSettings.json
@@ -112,7 +112,8 @@
       "REMOVE_LABEL": "Fjarlægja merki af samtali",
       "SETTINGS": "Stillingar",
       "AI_ASSIST": "AI Assist",
-      "APPEARANCE": "Appearance"
+      "APPEARANCE": "Appearance",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     },
     "COMMANDS": {
       "GO_TO_CONVERSATION_DASHBOARD": "Opna Stjórnborð Samtals",
@@ -153,7 +154,8 @@
       "CHANGE_APPEARANCE": "Change Appearance",
       "LIGHT_MODE": "Light",
       "DARK_MODE": "Dark",
-      "SYSTEM_MODE": "System"
+      "SYSTEM_MODE": "System",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     }
   },
   "DASHBOARD_APPS": {
diff --git a/app/javascript/dashboard/i18n/locale/is/helpCenter.json b/app/javascript/dashboard/i18n/locale/is/helpCenter.json
index 9eea279e6..7cac3184c 100644
--- a/app/javascript/dashboard/i18n/locale/is/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/is/helpCenter.json
@@ -324,7 +324,8 @@
         "LAST_EDITED": "Last edited"
       },
       "COLUMNS": {
-        "BY": "by"
+        "BY": "by",
+        "AUTHOR_NOT_AVAILABLE": "Author is not available"
       }
     },
     "EDIT_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/is/inbox.json b/app/javascript/dashboard/i18n/locale/is/inbox.json
new file mode 100644
index 000000000..cbc16a010
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/is/inbox.json
@@ -0,0 +1,60 @@
+{
+  "INBOX": {
+    "LIST": {
+      "TITLE": "Innhólf",
+      "DISPLAY_DROPDOWN": "Display",
+      "LOADING": "Fetching notifications",
+      "EOF": "All notifications loaded 🎉",
+      "404": "There are no active notifications in this group.",
+      "NO_NOTIFICATIONS": "No notifications",
+      "NOTE": "Notifications from all subscribed inboxes",
+      "SNOOZED_UNTIL": "Snoozed until",
+      "SNOOZED_UNTIL_TOMORROW": "Snoozed until tomorrow",
+      "SNOOZED_UNTIL_NEXT_WEEK": "Snoozed until next week"
+    },
+    "ACTION_HEADER": {
+      "SNOOZE": "Snooze notification",
+      "DELETE": "Delete notification"
+    },
+    "TYPES": {
+      "CONVERSATION_MENTION": "You have been mentioned in a conversation",
+      "CONVERSATION_CREATION": "New conversation created",
+      "CONVERSATION_ASSIGNMENT": "A conversation has been assigned to you",
+      "ASSIGNED_CONVERSATION_NEW_MESSAGE": "New message in an assigned conversation",
+      "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "New message in a conversation you are participating in"
+    },
+    "MENU_ITEM": {
+      "MARK_AS_READ": "Mark as read",
+      "MARK_AS_UNREAD": "Mark as unread",
+      "SNOOZE": "Snooze",
+      "DELETE": "Eyða",
+      "MARK_ALL_READ": "Mark all as read",
+      "DELETE_ALL": "Delete all",
+      "DELETE_ALL_READ": "Delete all read"
+    },
+    "DISPLAY_MENU": {
+      "SORT": "Sort",
+      "DISPLAY": "Display :",
+      "SORT_OPTIONS": {
+        "NEWEST": "Newest",
+        "OLDEST": "Oldest",
+        "PRIORITY": "Priority"
+      },
+      "DISPLAY_OPTIONS": {
+        "SNOOZED": "Blundað",
+        "READ": "Lesið",
+        "LABELS": "Labels",
+        "CONVERSATION_ID": "Conversation ID"
+      }
+    },
+    "ALERTS": {
+      "MARK_AS_READ": "Notification marked as read",
+      "MARK_AS_UNREAD": "Notification marked as unread",
+      "SNOOZE": "Notification snoozed",
+      "DELETE": "Notification deleted",
+      "MARK_ALL_READ": "All notifications marked as read",
+      "DELETE_ALL": "All notifications deleted",
+      "DELETE_ALL_READ": "All read notifications deleted"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/is/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/is/inboxMgmt.json
index 0ffdfe631..bf624f7e5 100644
--- a/app/javascript/dashboard/i18n/locale/is/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/is/inboxMgmt.json
@@ -569,7 +569,7 @@
       "UPDATE": "Update business hours settings",
       "TOGGLE_AVAILABILITY": "Virkja opnunartíma fyrirtækja fyrir þetta innhólf",
       "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for visitors",
-      "TOGGLE_HELP": "Með því að virkja opnunartíma fyrirtækis mun opnunartíminn sjást á vefspjallinu jafnvel þótt allir þjónustufulltrúar séu ótengdir. Utan opnunnartíma er hægt að vara viðskiptavini við með skilaboðum og forspjallsformi.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours visitors can be warned with a message and a pre-chat form.",
       "DAY": {
         "ENABLE": "Enable availability for this day",
         "UNAVAILABLE": "Unavailable",
diff --git a/app/javascript/dashboard/i18n/locale/is/settings.json b/app/javascript/dashboard/i18n/locale/is/settings.json
index 1fb843e56..892639af1 100644
--- a/app/javascript/dashboard/i18n/locale/is/settings.json
+++ b/app/javascript/dashboard/i18n/locale/is/settings.json
@@ -160,6 +160,9 @@
     "TRIAL_MESSAGE": "days trial remaining.",
     "TRAIL_BUTTON": "Buy Now",
     "DELETED_USER": "Deleted User",
+    "EMAIL_VERIFICATION_PENDING": "It seems that you haven't verified your email address yet. Please check your inbox for the verification email.",
+    "RESEND_VERIFICATION_MAIL": "Resend verification email",
+    "EMAIL_VERIFICATION_SENT": "Verification email has been sent. Please check your inbox.",
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Account Suspended",
       "MESSAGE": "Reikningnum þínum er lokað. Vinsamlegast hafðu samband við þjónustusviðið okkar til að fá frekari upplýsingar."
@@ -197,6 +200,7 @@
     "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
     "SWITCH": "Switch",
     "CONVERSATIONS": "Samtöl",
+    "INBOX": "Innhólf",
     "ALL_CONVERSATIONS": "Öll Samtöl",
     "MENTIONED_CONVERSATIONS": "Mentions",
     "PARTICIPATING_CONVERSATIONS": "Participating",
@@ -238,6 +242,7 @@
     "REPORTS_INBOX": "Innhólf",
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
+    "SLA": "SLA",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Overview",
     "FACEBOOK_REAUTHORIZE": "Facebook tengingin þín er útrunnin, vinsamlegast tengdu Facebook síðuna þína aftur til að halda áfram þjónustu",
diff --git a/app/javascript/dashboard/i18n/locale/is/sla.json b/app/javascript/dashboard/i18n/locale/is/sla.json
new file mode 100644
index 000000000..3727ca04e
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/is/sla.json
@@ -0,0 +1,70 @@
+{
+  "SLA": {
+    "HEADER": "SLA",
+    "HEADER_BTN_TXT": "Add SLA",
+    "LOADING": "Fetching SLAs",
+    "SEARCH_404": "Það eru engin atriði sem passa við þessa fyrirspurn",
+    "SIDEBAR_TXT": "<p><b>SLA</b> <p>Think of Service Level Agreements (SLAs) like friendly promises between a service provider and a customer.</p> <p> These promises set clear expectations for things like how quickly the team will respond to issues, making sure you always get a reliable and top-notch experience!</p>",
+    "LIST": {
+      "404": "There are no SLAs available in this account.",
+      "TITLE": "Manage SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "TABLE_HEADER": [
+        "Nafn",
+        "Description",
+        "FRT",
+        "NRT",
+        "RT",
+        "Business Hours"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "SLA Name",
+        "PLACEHOLDER": "SLA Name",
+        "REQUIRED_ERROR": "SLA name is required",
+        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
+        "VALID_ERROR": "Aðeins stafrófsstafir, tölustafir, bandstrik og undirstrik eru leyfð"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Description",
+        "PLACEHOLDER": "SLA for premium customers"
+      },
+      "FIRST_RESPONSE_TIME": {
+        "LABEL": "First Response Time(Seconds)",
+        "PLACEHOLDER": "300 for 5 minutes"
+      },
+      "NEXT_RESPONSE_TIME": {
+        "LABEL": "Next Response Time(Seconds)",
+        "PLACEHOLDER": "600 for 10 minutes"
+      },
+      "RESOLUTION_TIME": {
+        "LABEL": "Resolution Time(Seconds)",
+        "PLACEHOLDER": "86400 for 1 day"
+      },
+      "BUSINESS_HOURS": {
+        "LABEL": "Business Hours",
+        "PLACEHOLDER": "Only during business hours"
+      },
+      "EDIT": "Breyta",
+      "CREATE": "Stofna",
+      "DELETE": "Eyða",
+      "CANCEL": "Hætta við"
+    },
+    "ADD": {
+      "TITLE": "Add SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA added successfully",
+        "ERROR_MESSAGE": "Það kom upp villa, vinsamlegast reyndu aftur"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit SLA",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA updated successfully",
+        "ERROR_MESSAGE": "Það kom upp villa, vinsamlegast reyndu aftur"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/it/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/it/attributesMgmt.json
index f1f866328..1a8d3bb68 100644
--- a/app/javascript/dashboard/i18n/locale/it/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/it/attributesMgmt.json
@@ -39,6 +39,17 @@
           "PLACEHOLDER": "Inserisci la chiave dell'attributo personalizzato",
           "ERROR": "La chiave è obbligatoria",
           "IN_VALID": "Chiave non valida"
+        },
+        "REGEX_PATTERN": {
+          "LABEL": "Regex Pattern",
+          "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+        },
+        "REGEX_CUE": {
+          "LABEL": "Regex Cue",
+          "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+        },
+        "ENABLE_REGEX": {
+          "LABEL": "Enable regex validation"
         }
       },
       "API": {
@@ -93,6 +104,17 @@
       "EMPTY_RESULT": {
         "404": "Non ci sono attributi personalizzati creati",
         "NOT_FOUND": "Non ci sono attributi personalizzati configurati"
+      },
+      "REGEX_PATTERN": {
+        "LABEL": "Regex Pattern",
+        "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+      },
+      "REGEX_CUE": {
+        "LABEL": "Regex Cue",
+        "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+      },
+      "ENABLE_REGEX": {
+        "LABEL": "Enable regex validation"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/it/contact.json b/app/javascript/dashboard/i18n/locale/it/contact.json
index 72d6cc7f4..f17386475 100644
--- a/app/javascript/dashboard/i18n/locale/it/contact.json
+++ b/app/javascript/dashboard/i18n/locale/it/contact.json
@@ -39,10 +39,10 @@
     },
     "MERGE_CONTACT": "Unisci contatto",
     "CONTACT_ACTIONS": "Azioni contatto",
-    "MUTE_CONTACT": "Silenzia conversazione",
-    "UNMUTE_CONTACT": "Riattiva conversazione",
-    "MUTED_SUCCESS": "Questa conversazione è silenziata per 6 ore",
-    "UNMUTED_SUCCESS": "Questa conversazione non è più silenziata",
+    "MUTE_CONTACT": "Block Contact",
+    "UNMUTE_CONTACT": "Unblock Contact",
+    "MUTED_SUCCESS": "This contact is blocked successfully. You will not be notified of any future conversations.",
+    "UNMUTED_SUCCESS": "This contact is unblocked successfully.",
     "SEND_TRANSCRIPT": "Invia trascrizione",
     "EDIT_LABEL": "Modifica",
     "SIDEBAR_SECTIONS": {
@@ -79,7 +79,13 @@
     "TITLE": "Export Contacts",
     "DESC": "Export contacts to a CSV file.",
     "SUCCESS_MESSAGE": "Export is in progress, You will be notified via email when export file is ready to dowanlod.",
-    "ERROR_MESSAGE": "Si è verificato un errore, riprova"
+    "ERROR_MESSAGE": "Si è verificato un errore, riprova",
+    "CONFIRM": {
+      "TITLE": "Export Contacts",
+      "MESSAGE": "Are you sure you want to export all contacts?",
+      "YES": "Yes, Export",
+      "NO": "No, Cancel"
+    }
   },
   "DELETE_NOTE": {
     "CONFIRM": {
@@ -339,7 +345,8 @@
     },
     "VALIDATIONS": {
       "REQUIRED": "Valore valido richiesto",
-      "INVALID_URL": "URL non valido"
+      "INVALID_URL": "URL non valido",
+      "INVALID_INPUT": "Invalid Input"
     }
   },
   "MERGE_CONTACTS": {
diff --git a/app/javascript/dashboard/i18n/locale/it/generalSettings.json b/app/javascript/dashboard/i18n/locale/it/generalSettings.json
index 0939f6367..dd3f74cc0 100644
--- a/app/javascript/dashboard/i18n/locale/it/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/it/generalSettings.json
@@ -112,7 +112,8 @@
       "REMOVE_LABEL": "Rimuovi etichetta dalla conversazione",
       "SETTINGS": "Impostazioni",
       "AI_ASSIST": "AI Assist",
-      "APPEARANCE": "Appearance"
+      "APPEARANCE": "Appearance",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     },
     "COMMANDS": {
       "GO_TO_CONVERSATION_DASHBOARD": "Vai alla dashboard Conversazioni",
@@ -153,7 +154,8 @@
       "CHANGE_APPEARANCE": "Change Appearance",
       "LIGHT_MODE": "Light",
       "DARK_MODE": "Dark",
-      "SYSTEM_MODE": "System"
+      "SYSTEM_MODE": "System",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     }
   },
   "DASHBOARD_APPS": {
diff --git a/app/javascript/dashboard/i18n/locale/it/helpCenter.json b/app/javascript/dashboard/i18n/locale/it/helpCenter.json
index 64dd9056f..bc9a0999d 100644
--- a/app/javascript/dashboard/i18n/locale/it/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/it/helpCenter.json
@@ -324,7 +324,8 @@
         "LAST_EDITED": "Ultima modifica"
       },
       "COLUMNS": {
-        "BY": "di"
+        "BY": "di",
+        "AUTHOR_NOT_AVAILABLE": "Author is not available"
       }
     },
     "EDIT_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/it/inbox.json b/app/javascript/dashboard/i18n/locale/it/inbox.json
new file mode 100644
index 000000000..42c15b093
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/it/inbox.json
@@ -0,0 +1,60 @@
+{
+  "INBOX": {
+    "LIST": {
+      "TITLE": "Casella",
+      "DISPLAY_DROPDOWN": "Display",
+      "LOADING": "Fetching notifications",
+      "EOF": "Tutte le notifiche caricate 🎉",
+      "404": "There are no active notifications in this group.",
+      "NO_NOTIFICATIONS": "No notifications",
+      "NOTE": "Notifications from all subscribed inboxes",
+      "SNOOZED_UNTIL": "Snoozed until",
+      "SNOOZED_UNTIL_TOMORROW": "Posticipato fino a domani",
+      "SNOOZED_UNTIL_NEXT_WEEK": "Posticipato fino alla prossima settimana"
+    },
+    "ACTION_HEADER": {
+      "SNOOZE": "Snooze notification",
+      "DELETE": "Delete notification"
+    },
+    "TYPES": {
+      "CONVERSATION_MENTION": "You have been mentioned in a conversation",
+      "CONVERSATION_CREATION": "New conversation created",
+      "CONVERSATION_ASSIGNMENT": "A conversation has been assigned to you",
+      "ASSIGNED_CONVERSATION_NEW_MESSAGE": "New message in an assigned conversation",
+      "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "New message in a conversation you are participating in"
+    },
+    "MENU_ITEM": {
+      "MARK_AS_READ": "Segna come letto",
+      "MARK_AS_UNREAD": "Segna come non letto",
+      "SNOOZE": "Posticipa",
+      "DELETE": "Elimina",
+      "MARK_ALL_READ": "Segna tutto come letto",
+      "DELETE_ALL": "Delete all",
+      "DELETE_ALL_READ": "Delete all read"
+    },
+    "DISPLAY_MENU": {
+      "SORT": "Sort",
+      "DISPLAY": "Display :",
+      "SORT_OPTIONS": {
+        "NEWEST": "Newest",
+        "OLDEST": "Oldest",
+        "PRIORITY": "Priorità"
+      },
+      "DISPLAY_OPTIONS": {
+        "SNOOZED": "Posticipato",
+        "READ": "Leggi",
+        "LABELS": "Etichette",
+        "CONVERSATION_ID": "Conversation ID"
+      }
+    },
+    "ALERTS": {
+      "MARK_AS_READ": "Notification marked as read",
+      "MARK_AS_UNREAD": "Notification marked as unread",
+      "SNOOZE": "Notification snoozed",
+      "DELETE": "Notification deleted",
+      "MARK_ALL_READ": "All notifications marked as read",
+      "DELETE_ALL": "All notifications deleted",
+      "DELETE_ALL_READ": "All read notifications deleted"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json
index abf586140..b83dbb547 100644
--- a/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json
@@ -569,7 +569,7 @@
       "UPDATE": "Aggiorna le impostazioni dell'orario di lavoro",
       "TOGGLE_AVAILABILITY": "Abilita la disponibilità aziendale per questa casella",
       "UNAVAILABLE_MESSAGE_LABEL": "Messaggio non disponibile per i visitatori",
-      "TOGGLE_HELP": "Abilitare la disponibilità aziendale mostrerà le ore disponibili sul widget chat live anche se tutti gli agenti sono offline. Al di fuori delle ore disponibili visori possono essere avvisati con un messaggio e un modulo di pre-chat.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours visitors can be warned with a message and a pre-chat form.",
       "DAY": {
         "ENABLE": "Abilita disponibilità per questo giorno",
         "UNAVAILABLE": "Non disponibile",
diff --git a/app/javascript/dashboard/i18n/locale/it/settings.json b/app/javascript/dashboard/i18n/locale/it/settings.json
index 180d36546..a3020ddcf 100644
--- a/app/javascript/dashboard/i18n/locale/it/settings.json
+++ b/app/javascript/dashboard/i18n/locale/it/settings.json
@@ -160,6 +160,9 @@
     "TRIAL_MESSAGE": "giorni di prova rimanenti.",
     "TRAIL_BUTTON": "Acquista ora",
     "DELETED_USER": "Utente eliminato",
+    "EMAIL_VERIFICATION_PENDING": "It seems that you haven't verified your email address yet. Please check your inbox for the verification email.",
+    "RESEND_VERIFICATION_MAIL": "Resend verification email",
+    "EMAIL_VERIFICATION_SENT": "Verification email has been sent. Please check your inbox.",
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Account sospeso",
       "MESSAGE": "Il tuo account è sospeso. Contatta il team di supporto per ulteriori informazioni."
@@ -197,6 +200,7 @@
     "CURRENTLY_VIEWING_ACCOUNT": "Visualizzazione attuale:",
     "SWITCH": "Scambia",
     "CONVERSATIONS": "Conversazioni",
+    "INBOX": "Casella",
     "ALL_CONVERSATIONS": "Tutte le conversazioni",
     "MENTIONED_CONVERSATIONS": "Menzioni",
     "PARTICIPATING_CONVERSATIONS": "Participating",
@@ -238,6 +242,7 @@
     "REPORTS_INBOX": "Posta",
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Imposta te stesso come",
+    "SLA": "SLA",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Panoramica",
     "FACEBOOK_REAUTHORIZE": "La tua connessione a Facebook è scaduta, ricollegati alla tua pagina Facebook per continuare i servizi",
diff --git a/app/javascript/dashboard/i18n/locale/it/sla.json b/app/javascript/dashboard/i18n/locale/it/sla.json
new file mode 100644
index 000000000..38793b184
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/it/sla.json
@@ -0,0 +1,70 @@
+{
+  "SLA": {
+    "HEADER": "SLA",
+    "HEADER_BTN_TXT": "Add SLA",
+    "LOADING": "Fetching SLAs",
+    "SEARCH_404": "Non ci sono elementi che corrispondono a questa richiesta",
+    "SIDEBAR_TXT": "<p><b>SLA</b> <p>Think of Service Level Agreements (SLAs) like friendly promises between a service provider and a customer.</p> <p> These promises set clear expectations for things like how quickly the team will respond to issues, making sure you always get a reliable and top-notch experience!</p>",
+    "LIST": {
+      "404": "There are no SLAs available in this account.",
+      "TITLE": "Manage SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "TABLE_HEADER": [
+        "Nome",
+        "Descrizione",
+        "FRT",
+        "NRT",
+        "RT",
+        "Ore di lavoro"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "SLA Name",
+        "PLACEHOLDER": "SLA Name",
+        "REQUIRED_ERROR": "SLA name is required",
+        "MINIMUM_LENGTH_ERROR": "È richiesta una lunghezza minima di 2",
+        "VALID_ERROR": "Sono ammessi solo lettere, numeri, trattino e sottolineatura"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Descrizione",
+        "PLACEHOLDER": "SLA for premium customers"
+      },
+      "FIRST_RESPONSE_TIME": {
+        "LABEL": "First Response Time(Seconds)",
+        "PLACEHOLDER": "300 for 5 minutes"
+      },
+      "NEXT_RESPONSE_TIME": {
+        "LABEL": "Next Response Time(Seconds)",
+        "PLACEHOLDER": "600 for 10 minutes"
+      },
+      "RESOLUTION_TIME": {
+        "LABEL": "Resolution Time(Seconds)",
+        "PLACEHOLDER": "86400 for 1 day"
+      },
+      "BUSINESS_HOURS": {
+        "LABEL": "Ore di lavoro",
+        "PLACEHOLDER": "Only during business hours"
+      },
+      "EDIT": "Modifica",
+      "CREATE": "Crea",
+      "DELETE": "Elimina",
+      "CANCEL": "annulla"
+    },
+    "ADD": {
+      "TITLE": "Add SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA added successfully",
+        "ERROR_MESSAGE": "Si è verificato un errore, riprova"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit SLA",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA updated successfully",
+        "ERROR_MESSAGE": "Si è verificato un errore, riprova"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ja/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/ja/attributesMgmt.json
index c44e1428c..1c4993e4b 100644
--- a/app/javascript/dashboard/i18n/locale/ja/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ja/attributesMgmt.json
@@ -39,6 +39,17 @@
           "PLACEHOLDER": "Enter custom attribute key",
           "ERROR": "Key is required",
           "IN_VALID": "Invalid key"
+        },
+        "REGEX_PATTERN": {
+          "LABEL": "Regex Pattern",
+          "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+        },
+        "REGEX_CUE": {
+          "LABEL": "Regex Cue",
+          "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+        },
+        "ENABLE_REGEX": {
+          "LABEL": "Enable regex validation"
         }
       },
       "API": {
@@ -93,6 +104,17 @@
       "EMPTY_RESULT": {
         "404": "There are no custom attributes created",
         "NOT_FOUND": "There are no custom attributes configured"
+      },
+      "REGEX_PATTERN": {
+        "LABEL": "Regex Pattern",
+        "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+      },
+      "REGEX_CUE": {
+        "LABEL": "Regex Cue",
+        "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+      },
+      "ENABLE_REGEX": {
+        "LABEL": "Enable regex validation"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/ja/contact.json b/app/javascript/dashboard/i18n/locale/ja/contact.json
index 4a959c86b..5c8641fad 100644
--- a/app/javascript/dashboard/i18n/locale/ja/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ja/contact.json
@@ -39,10 +39,10 @@
     },
     "MERGE_CONTACT": "Merge contact",
     "CONTACT_ACTIONS": "Contact actions",
-    "MUTE_CONTACT": "会話をミュート",
-    "UNMUTE_CONTACT": "Unmute Conversation",
-    "MUTED_SUCCESS": "この会話は6時間ミュートされています。",
-    "UNMUTED_SUCCESS": "This conversation is unmuted",
+    "MUTE_CONTACT": "Block Contact",
+    "UNMUTE_CONTACT": "Unblock Contact",
+    "MUTED_SUCCESS": "This contact is blocked successfully. You will not be notified of any future conversations.",
+    "UNMUTED_SUCCESS": "This contact is unblocked successfully.",
     "SEND_TRANSCRIPT": "会話のログを送信",
     "EDIT_LABEL": "編集",
     "SIDEBAR_SECTIONS": {
@@ -79,7 +79,13 @@
     "TITLE": "Export Contacts",
     "DESC": "Export contacts to a CSV file.",
     "SUCCESS_MESSAGE": "Export is in progress, You will be notified via email when export file is ready to dowanlod.",
-    "ERROR_MESSAGE": "エラーが発生しました。もう一度お試しください。"
+    "ERROR_MESSAGE": "エラーが発生しました。もう一度お試しください。",
+    "CONFIRM": {
+      "TITLE": "Export Contacts",
+      "MESSAGE": "Are you sure you want to export all contacts?",
+      "YES": "Yes, Export",
+      "NO": "No, Cancel"
+    }
   },
   "DELETE_NOTE": {
     "CONFIRM": {
@@ -339,7 +345,8 @@
     },
     "VALIDATIONS": {
       "REQUIRED": "Valid value is required",
-      "INVALID_URL": "Invalid URL"
+      "INVALID_URL": "Invalid URL",
+      "INVALID_INPUT": "Invalid Input"
     }
   },
   "MERGE_CONTACTS": {
diff --git a/app/javascript/dashboard/i18n/locale/ja/generalSettings.json b/app/javascript/dashboard/i18n/locale/ja/generalSettings.json
index 1e082b60e..65ac7e997 100644
--- a/app/javascript/dashboard/i18n/locale/ja/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ja/generalSettings.json
@@ -112,7 +112,8 @@
       "REMOVE_LABEL": "Remove label from the conversation",
       "SETTINGS": "設定",
       "AI_ASSIST": "AI Assist",
-      "APPEARANCE": "Appearance"
+      "APPEARANCE": "Appearance",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     },
     "COMMANDS": {
       "GO_TO_CONVERSATION_DASHBOARD": "Go to Conversation Dashboard",
@@ -153,7 +154,8 @@
       "CHANGE_APPEARANCE": "Change Appearance",
       "LIGHT_MODE": "Light",
       "DARK_MODE": "Dark",
-      "SYSTEM_MODE": "System"
+      "SYSTEM_MODE": "System",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     }
   },
   "DASHBOARD_APPS": {
diff --git a/app/javascript/dashboard/i18n/locale/ja/helpCenter.json b/app/javascript/dashboard/i18n/locale/ja/helpCenter.json
index 9346a9a86..190c7daa2 100644
--- a/app/javascript/dashboard/i18n/locale/ja/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ja/helpCenter.json
@@ -324,7 +324,8 @@
         "LAST_EDITED": "Last edited"
       },
       "COLUMNS": {
-        "BY": "by"
+        "BY": "by",
+        "AUTHOR_NOT_AVAILABLE": "Author is not available"
       }
     },
     "EDIT_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/ja/inbox.json b/app/javascript/dashboard/i18n/locale/ja/inbox.json
new file mode 100644
index 000000000..8c32799a1
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ja/inbox.json
@@ -0,0 +1,60 @@
+{
+  "INBOX": {
+    "LIST": {
+      "TITLE": "Inbox",
+      "DISPLAY_DROPDOWN": "Display",
+      "LOADING": "Fetching notifications",
+      "EOF": "All notifications loaded 🎉",
+      "404": "There are no active notifications in this group.",
+      "NO_NOTIFICATIONS": "No notifications",
+      "NOTE": "Notifications from all subscribed inboxes",
+      "SNOOZED_UNTIL": "Snoozed until",
+      "SNOOZED_UNTIL_TOMORROW": "明日までスヌーズしました",
+      "SNOOZED_UNTIL_NEXT_WEEK": "来週までスヌーズ"
+    },
+    "ACTION_HEADER": {
+      "SNOOZE": "Snooze notification",
+      "DELETE": "Delete notification"
+    },
+    "TYPES": {
+      "CONVERSATION_MENTION": "You have been mentioned in a conversation",
+      "CONVERSATION_CREATION": "New conversation created",
+      "CONVERSATION_ASSIGNMENT": "A conversation has been assigned to you",
+      "ASSIGNED_CONVERSATION_NEW_MESSAGE": "New message in an assigned conversation",
+      "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "New message in a conversation you are participating in"
+    },
+    "MENU_ITEM": {
+      "MARK_AS_READ": "Mark as read",
+      "MARK_AS_UNREAD": "Mark as unread",
+      "SNOOZE": "スヌーズ",
+      "DELETE": "削除",
+      "MARK_ALL_READ": "Mark all as read",
+      "DELETE_ALL": "Delete all",
+      "DELETE_ALL_READ": "Delete all read"
+    },
+    "DISPLAY_MENU": {
+      "SORT": "Sort",
+      "DISPLAY": "Display :",
+      "SORT_OPTIONS": {
+        "NEWEST": "Newest",
+        "OLDEST": "Oldest",
+        "PRIORITY": "Priority"
+      },
+      "DISPLAY_OPTIONS": {
+        "SNOOZED": "Snoozed",
+        "READ": "Read",
+        "LABELS": "ラベル",
+        "CONVERSATION_ID": "Conversation ID"
+      }
+    },
+    "ALERTS": {
+      "MARK_AS_READ": "Notification marked as read",
+      "MARK_AS_UNREAD": "Notification marked as unread",
+      "SNOOZE": "Notification snoozed",
+      "DELETE": "Notification deleted",
+      "MARK_ALL_READ": "All notifications marked as read",
+      "DELETE_ALL": "All notifications deleted",
+      "DELETE_ALL_READ": "All read notifications deleted"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json
index f0cd2d366..8f6febead 100644
--- a/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json
@@ -569,7 +569,7 @@
       "UPDATE": "Update business hours settings",
       "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
       "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for visitors",
-      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours visitors can be warned with a message and a pre-chat form.",
       "DAY": {
         "ENABLE": "Enable availability for this day",
         "UNAVAILABLE": "Unavailable",
diff --git a/app/javascript/dashboard/i18n/locale/ja/settings.json b/app/javascript/dashboard/i18n/locale/ja/settings.json
index 6ceacd34a..d7e3fba9c 100644
--- a/app/javascript/dashboard/i18n/locale/ja/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ja/settings.json
@@ -160,6 +160,9 @@
     "TRIAL_MESSAGE": "日、トライアル期間が残っています。",
     "TRAIL_BUTTON": "今すぐ購入",
     "DELETED_USER": "Deleted User",
+    "EMAIL_VERIFICATION_PENDING": "It seems that you haven't verified your email address yet. Please check your inbox for the verification email.",
+    "RESEND_VERIFICATION_MAIL": "Resend verification email",
+    "EMAIL_VERIFICATION_SENT": "Verification email has been sent. Please check your inbox.",
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Account Suspended",
       "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
@@ -197,6 +200,7 @@
     "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
     "SWITCH": "Switch",
     "CONVERSATIONS": "会話データ",
+    "INBOX": "Inbox",
     "ALL_CONVERSATIONS": "All Conversations",
     "MENTIONED_CONVERSATIONS": "Mentions",
     "PARTICIPATING_CONVERSATIONS": "Participating",
@@ -238,6 +242,7 @@
     "REPORTS_INBOX": "Inbox",
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
+    "SLA": "SLA",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Overview",
     "FACEBOOK_REAUTHORIZE": "Facebookの接続が期限切れになりました。サービスを継続するには、Facebookページを再接続してください。",
diff --git a/app/javascript/dashboard/i18n/locale/ja/sla.json b/app/javascript/dashboard/i18n/locale/ja/sla.json
new file mode 100644
index 000000000..c68050981
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ja/sla.json
@@ -0,0 +1,70 @@
+{
+  "SLA": {
+    "HEADER": "SLA",
+    "HEADER_BTN_TXT": "Add SLA",
+    "LOADING": "Fetching SLAs",
+    "SEARCH_404": "検索内容（クエリ）に一致する項目はありませんでした",
+    "SIDEBAR_TXT": "<p><b>SLA</b> <p>Think of Service Level Agreements (SLAs) like friendly promises between a service provider and a customer.</p> <p> These promises set clear expectations for things like how quickly the team will respond to issues, making sure you always get a reliable and top-notch experience!</p>",
+    "LIST": {
+      "404": "There are no SLAs available in this account.",
+      "TITLE": "Manage SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "TABLE_HEADER": [
+        "名前",
+        "説明",
+        "FRT",
+        "NRT",
+        "RT",
+        "Business Hours"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "SLA Name",
+        "PLACEHOLDER": "SLA Name",
+        "REQUIRED_ERROR": "SLA name is required",
+        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
+        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
+      },
+      "DESCRIPTION": {
+        "LABEL": "説明",
+        "PLACEHOLDER": "SLA for premium customers"
+      },
+      "FIRST_RESPONSE_TIME": {
+        "LABEL": "First Response Time(Seconds)",
+        "PLACEHOLDER": "300 for 5 minutes"
+      },
+      "NEXT_RESPONSE_TIME": {
+        "LABEL": "Next Response Time(Seconds)",
+        "PLACEHOLDER": "600 for 10 minutes"
+      },
+      "RESOLUTION_TIME": {
+        "LABEL": "Resolution Time(Seconds)",
+        "PLACEHOLDER": "86400 for 1 day"
+      },
+      "BUSINESS_HOURS": {
+        "LABEL": "Business Hours",
+        "PLACEHOLDER": "Only during business hours"
+      },
+      "EDIT": "編集",
+      "CREATE": "作成",
+      "DELETE": "削除",
+      "CANCEL": "キャンセル"
+    },
+    "ADD": {
+      "TITLE": "Add SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA added successfully",
+        "ERROR_MESSAGE": "エラーが発生しました。もう一度お試しください。"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit SLA",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA updated successfully",
+        "ERROR_MESSAGE": "エラーが発生しました。もう一度お試しください。"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ka/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/ka/attributesMgmt.json
index 2a9ea7de3..64a0e83d6 100644
--- a/app/javascript/dashboard/i18n/locale/ka/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ka/attributesMgmt.json
@@ -39,6 +39,17 @@
           "PLACEHOLDER": "Enter custom attribute key",
           "ERROR": "Key is required",
           "IN_VALID": "Invalid key"
+        },
+        "REGEX_PATTERN": {
+          "LABEL": "Regex Pattern",
+          "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+        },
+        "REGEX_CUE": {
+          "LABEL": "Regex Cue",
+          "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+        },
+        "ENABLE_REGEX": {
+          "LABEL": "Enable regex validation"
         }
       },
       "API": {
@@ -93,6 +104,17 @@
       "EMPTY_RESULT": {
         "404": "There are no custom attributes created",
         "NOT_FOUND": "There are no custom attributes configured"
+      },
+      "REGEX_PATTERN": {
+        "LABEL": "Regex Pattern",
+        "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+      },
+      "REGEX_CUE": {
+        "LABEL": "Regex Cue",
+        "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+      },
+      "ENABLE_REGEX": {
+        "LABEL": "Enable regex validation"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/ka/contact.json b/app/javascript/dashboard/i18n/locale/ka/contact.json
index 09d5075ac..5186fda9a 100644
--- a/app/javascript/dashboard/i18n/locale/ka/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ka/contact.json
@@ -39,10 +39,10 @@
     },
     "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",
+    "MUTE_CONTACT": "Block Contact",
+    "UNMUTE_CONTACT": "Unblock Contact",
+    "MUTED_SUCCESS": "This contact is blocked successfully. You will not be notified of any future conversations.",
+    "UNMUTED_SUCCESS": "This contact is unblocked successfully.",
     "SEND_TRANSCRIPT": "Send Transcript",
     "EDIT_LABEL": "Edit",
     "SIDEBAR_SECTIONS": {
@@ -79,7 +79,13 @@
     "TITLE": "Export Contacts",
     "DESC": "Export contacts to a CSV file.",
     "SUCCESS_MESSAGE": "Export is in progress, You will be notified via email when export file is ready to dowanlod.",
-    "ERROR_MESSAGE": "There was an error, please try again"
+    "ERROR_MESSAGE": "There was an error, please try again",
+    "CONFIRM": {
+      "TITLE": "Export Contacts",
+      "MESSAGE": "Are you sure you want to export all contacts?",
+      "YES": "Yes, Export",
+      "NO": "No, Cancel"
+    }
   },
   "DELETE_NOTE": {
     "CONFIRM": {
@@ -339,7 +345,8 @@
     },
     "VALIDATIONS": {
       "REQUIRED": "Valid value is required",
-      "INVALID_URL": "Invalid URL"
+      "INVALID_URL": "Invalid URL",
+      "INVALID_INPUT": "Invalid Input"
     }
   },
   "MERGE_CONTACTS": {
diff --git a/app/javascript/dashboard/i18n/locale/ka/generalSettings.json b/app/javascript/dashboard/i18n/locale/ka/generalSettings.json
index d56a20c15..185d328a5 100644
--- a/app/javascript/dashboard/i18n/locale/ka/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ka/generalSettings.json
@@ -112,7 +112,8 @@
       "REMOVE_LABEL": "Remove label from the conversation",
       "SETTINGS": "Settings",
       "AI_ASSIST": "AI Assist",
-      "APPEARANCE": "Appearance"
+      "APPEARANCE": "Appearance",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     },
     "COMMANDS": {
       "GO_TO_CONVERSATION_DASHBOARD": "Go to Conversation Dashboard",
@@ -153,7 +154,8 @@
       "CHANGE_APPEARANCE": "Change Appearance",
       "LIGHT_MODE": "Light",
       "DARK_MODE": "Dark",
-      "SYSTEM_MODE": "System"
+      "SYSTEM_MODE": "System",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     }
   },
   "DASHBOARD_APPS": {
diff --git a/app/javascript/dashboard/i18n/locale/ka/helpCenter.json b/app/javascript/dashboard/i18n/locale/ka/helpCenter.json
index f44e44c6f..cd397ed1e 100644
--- a/app/javascript/dashboard/i18n/locale/ka/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ka/helpCenter.json
@@ -324,7 +324,8 @@
         "LAST_EDITED": "Last edited"
       },
       "COLUMNS": {
-        "BY": "by"
+        "BY": "by",
+        "AUTHOR_NOT_AVAILABLE": "Author is not available"
       }
     },
     "EDIT_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/ka/inbox.json b/app/javascript/dashboard/i18n/locale/ka/inbox.json
new file mode 100644
index 000000000..dcac5459f
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ka/inbox.json
@@ -0,0 +1,60 @@
+{
+  "INBOX": {
+    "LIST": {
+      "TITLE": "Inbox",
+      "DISPLAY_DROPDOWN": "Display",
+      "LOADING": "Fetching notifications",
+      "EOF": "All notifications loaded 🎉",
+      "404": "There are no active notifications in this group.",
+      "NO_NOTIFICATIONS": "No notifications",
+      "NOTE": "Notifications from all subscribed inboxes",
+      "SNOOZED_UNTIL": "Snoozed until",
+      "SNOOZED_UNTIL_TOMORROW": "Snoozed until tomorrow",
+      "SNOOZED_UNTIL_NEXT_WEEK": "Snoozed until next week"
+    },
+    "ACTION_HEADER": {
+      "SNOOZE": "Snooze notification",
+      "DELETE": "Delete notification"
+    },
+    "TYPES": {
+      "CONVERSATION_MENTION": "You have been mentioned in a conversation",
+      "CONVERSATION_CREATION": "New conversation created",
+      "CONVERSATION_ASSIGNMENT": "A conversation has been assigned to you",
+      "ASSIGNED_CONVERSATION_NEW_MESSAGE": "New message in an assigned conversation",
+      "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "New message in a conversation you are participating in"
+    },
+    "MENU_ITEM": {
+      "MARK_AS_READ": "Mark as read",
+      "MARK_AS_UNREAD": "Mark as unread",
+      "SNOOZE": "Snooze",
+      "DELETE": "Delete",
+      "MARK_ALL_READ": "Mark all as read",
+      "DELETE_ALL": "Delete all",
+      "DELETE_ALL_READ": "Delete all read"
+    },
+    "DISPLAY_MENU": {
+      "SORT": "Sort",
+      "DISPLAY": "Display :",
+      "SORT_OPTIONS": {
+        "NEWEST": "Newest",
+        "OLDEST": "Oldest",
+        "PRIORITY": "Priority"
+      },
+      "DISPLAY_OPTIONS": {
+        "SNOOZED": "Snoozed",
+        "READ": "Read",
+        "LABELS": "Labels",
+        "CONVERSATION_ID": "Conversation ID"
+      }
+    },
+    "ALERTS": {
+      "MARK_AS_READ": "Notification marked as read",
+      "MARK_AS_UNREAD": "Notification marked as unread",
+      "SNOOZE": "Notification snoozed",
+      "DELETE": "Notification deleted",
+      "MARK_ALL_READ": "All notifications marked as read",
+      "DELETE_ALL": "All notifications deleted",
+      "DELETE_ALL_READ": "All read notifications deleted"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ka/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ka/inboxMgmt.json
index 08f2ef2a2..ba83549cf 100644
--- a/app/javascript/dashboard/i18n/locale/ka/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ka/inboxMgmt.json
@@ -569,7 +569,7 @@
       "UPDATE": "Update business hours settings",
       "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
       "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for visitors",
-      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours visitors can be warned with a message and a pre-chat form.",
       "DAY": {
         "ENABLE": "Enable availability for this day",
         "UNAVAILABLE": "Unavailable",
diff --git a/app/javascript/dashboard/i18n/locale/ka/settings.json b/app/javascript/dashboard/i18n/locale/ka/settings.json
index 78411ee09..ca734fe43 100644
--- a/app/javascript/dashboard/i18n/locale/ka/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ka/settings.json
@@ -160,6 +160,9 @@
     "TRIAL_MESSAGE": "days trial remaining.",
     "TRAIL_BUTTON": "Buy Now",
     "DELETED_USER": "Deleted User",
+    "EMAIL_VERIFICATION_PENDING": "It seems that you haven't verified your email address yet. Please check your inbox for the verification email.",
+    "RESEND_VERIFICATION_MAIL": "Resend verification email",
+    "EMAIL_VERIFICATION_SENT": "Verification email has been sent. Please check your inbox.",
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Account Suspended",
       "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
@@ -197,6 +200,7 @@
     "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
     "SWITCH": "Switch",
     "CONVERSATIONS": "Conversations",
+    "INBOX": "Inbox",
     "ALL_CONVERSATIONS": "All Conversations",
     "MENTIONED_CONVERSATIONS": "Mentions",
     "PARTICIPATING_CONVERSATIONS": "Participating",
@@ -238,6 +242,7 @@
     "REPORTS_INBOX": "Inbox",
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
+    "SLA": "SLA",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Overview",
     "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
diff --git a/app/javascript/dashboard/i18n/locale/ka/sla.json b/app/javascript/dashboard/i18n/locale/ka/sla.json
new file mode 100644
index 000000000..869b3ba3f
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ka/sla.json
@@ -0,0 +1,70 @@
+{
+  "SLA": {
+    "HEADER": "SLA",
+    "HEADER_BTN_TXT": "Add SLA",
+    "LOADING": "Fetching SLAs",
+    "SEARCH_404": "There are no items matching this query",
+    "SIDEBAR_TXT": "<p><b>SLA</b> <p>Think of Service Level Agreements (SLAs) like friendly promises between a service provider and a customer.</p> <p> These promises set clear expectations for things like how quickly the team will respond to issues, making sure you always get a reliable and top-notch experience!</p>",
+    "LIST": {
+      "404": "There are no SLAs available in this account.",
+      "TITLE": "Manage SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "TABLE_HEADER": [
+        "Name",
+        "Description",
+        "FRT",
+        "NRT",
+        "RT",
+        "Business Hours"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "SLA Name",
+        "PLACEHOLDER": "SLA Name",
+        "REQUIRED_ERROR": "SLA name is required",
+        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
+        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Description",
+        "PLACEHOLDER": "SLA for premium customers"
+      },
+      "FIRST_RESPONSE_TIME": {
+        "LABEL": "First Response Time(Seconds)",
+        "PLACEHOLDER": "300 for 5 minutes"
+      },
+      "NEXT_RESPONSE_TIME": {
+        "LABEL": "Next Response Time(Seconds)",
+        "PLACEHOLDER": "600 for 10 minutes"
+      },
+      "RESOLUTION_TIME": {
+        "LABEL": "Resolution Time(Seconds)",
+        "PLACEHOLDER": "86400 for 1 day"
+      },
+      "BUSINESS_HOURS": {
+        "LABEL": "Business Hours",
+        "PLACEHOLDER": "Only during business hours"
+      },
+      "EDIT": "Edit",
+      "CREATE": "Create",
+      "DELETE": "Delete",
+      "CANCEL": "Cancel"
+    },
+    "ADD": {
+      "TITLE": "Add SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA added successfully",
+        "ERROR_MESSAGE": "There was an error, please try again"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit SLA",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA updated successfully",
+        "ERROR_MESSAGE": "There was an error, please try again"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ko/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/ko/attributesMgmt.json
index 4885b59d9..174ce88de 100644
--- a/app/javascript/dashboard/i18n/locale/ko/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ko/attributesMgmt.json
@@ -39,6 +39,17 @@
           "PLACEHOLDER": "Enter custom attribute key",
           "ERROR": "Key is required",
           "IN_VALID": "Invalid key"
+        },
+        "REGEX_PATTERN": {
+          "LABEL": "Regex Pattern",
+          "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+        },
+        "REGEX_CUE": {
+          "LABEL": "Regex Cue",
+          "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+        },
+        "ENABLE_REGEX": {
+          "LABEL": "Enable regex validation"
         }
       },
       "API": {
@@ -93,6 +104,17 @@
       "EMPTY_RESULT": {
         "404": "There are no custom attributes created",
         "NOT_FOUND": "There are no custom attributes configured"
+      },
+      "REGEX_PATTERN": {
+        "LABEL": "Regex Pattern",
+        "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+      },
+      "REGEX_CUE": {
+        "LABEL": "Regex Cue",
+        "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+      },
+      "ENABLE_REGEX": {
+        "LABEL": "Enable regex validation"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/ko/contact.json b/app/javascript/dashboard/i18n/locale/ko/contact.json
index c4fd0e0d9..29548b6cd 100644
--- a/app/javascript/dashboard/i18n/locale/ko/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ko/contact.json
@@ -39,10 +39,10 @@
     },
     "MERGE_CONTACT": "연락처 합치기",
     "CONTACT_ACTIONS": "연락처 활동",
-    "MUTE_CONTACT": "대화 음소거",
-    "UNMUTE_CONTACT": "대화 음소거 해제",
-    "MUTED_SUCCESS": "이 대화는 6시간 동안 중단됩니다.",
-    "UNMUTED_SUCCESS": "이 대화는 음소거 되었습니다.",
+    "MUTE_CONTACT": "Block Contact",
+    "UNMUTE_CONTACT": "Unblock Contact",
+    "MUTED_SUCCESS": "This contact is blocked successfully. You will not be notified of any future conversations.",
+    "UNMUTED_SUCCESS": "This contact is unblocked successfully.",
     "SEND_TRANSCRIPT": "대화기록 보내기",
     "EDIT_LABEL": "수정",
     "SIDEBAR_SECTIONS": {
@@ -79,7 +79,13 @@
     "TITLE": "Export Contacts",
     "DESC": "Export contacts to a CSV file.",
     "SUCCESS_MESSAGE": "Export is in progress, You will be notified via email when export file is ready to dowanlod.",
-    "ERROR_MESSAGE": "오류가 발생했습니다. 다시 시도하십시오."
+    "ERROR_MESSAGE": "오류가 발생했습니다. 다시 시도하십시오.",
+    "CONFIRM": {
+      "TITLE": "Export Contacts",
+      "MESSAGE": "Are you sure you want to export all contacts?",
+      "YES": "Yes, Export",
+      "NO": "No, Cancel"
+    }
   },
   "DELETE_NOTE": {
     "CONFIRM": {
@@ -339,7 +345,8 @@
     },
     "VALIDATIONS": {
       "REQUIRED": "Valid value is required",
-      "INVALID_URL": "잘못된 주소입니다."
+      "INVALID_URL": "잘못된 주소입니다.",
+      "INVALID_INPUT": "Invalid Input"
     }
   },
   "MERGE_CONTACTS": {
diff --git a/app/javascript/dashboard/i18n/locale/ko/generalSettings.json b/app/javascript/dashboard/i18n/locale/ko/generalSettings.json
index 4a6c651df..e0d49ca0a 100644
--- a/app/javascript/dashboard/i18n/locale/ko/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ko/generalSettings.json
@@ -112,7 +112,8 @@
       "REMOVE_LABEL": "Remove label from the conversation",
       "SETTINGS": "설정",
       "AI_ASSIST": "AI Assist",
-      "APPEARANCE": "Appearance"
+      "APPEARANCE": "Appearance",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     },
     "COMMANDS": {
       "GO_TO_CONVERSATION_DASHBOARD": "Go to Conversation Dashboard",
@@ -153,7 +154,8 @@
       "CHANGE_APPEARANCE": "Change Appearance",
       "LIGHT_MODE": "Light",
       "DARK_MODE": "Dark",
-      "SYSTEM_MODE": "System"
+      "SYSTEM_MODE": "System",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     }
   },
   "DASHBOARD_APPS": {
diff --git a/app/javascript/dashboard/i18n/locale/ko/helpCenter.json b/app/javascript/dashboard/i18n/locale/ko/helpCenter.json
index 0a5650cc1..eb1aca9fe 100644
--- a/app/javascript/dashboard/i18n/locale/ko/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ko/helpCenter.json
@@ -324,7 +324,8 @@
         "LAST_EDITED": "Last edited"
       },
       "COLUMNS": {
-        "BY": "by"
+        "BY": "by",
+        "AUTHOR_NOT_AVAILABLE": "Author is not available"
       }
     },
     "EDIT_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/ko/inbox.json b/app/javascript/dashboard/i18n/locale/ko/inbox.json
new file mode 100644
index 000000000..228efedeb
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ko/inbox.json
@@ -0,0 +1,60 @@
+{
+  "INBOX": {
+    "LIST": {
+      "TITLE": "받은 메시지함",
+      "DISPLAY_DROPDOWN": "Display",
+      "LOADING": "Fetching notifications",
+      "EOF": "모든 알림이 불러와졌음 🎉",
+      "404": "There are no active notifications in this group.",
+      "NO_NOTIFICATIONS": "No notifications",
+      "NOTE": "Notifications from all subscribed inboxes",
+      "SNOOZED_UNTIL": "Snoozed until",
+      "SNOOZED_UNTIL_TOMORROW": "Snoozed until tomorrow",
+      "SNOOZED_UNTIL_NEXT_WEEK": "Snoozed until next week"
+    },
+    "ACTION_HEADER": {
+      "SNOOZE": "Snooze notification",
+      "DELETE": "Delete notification"
+    },
+    "TYPES": {
+      "CONVERSATION_MENTION": "You have been mentioned in a conversation",
+      "CONVERSATION_CREATION": "New conversation created",
+      "CONVERSATION_ASSIGNMENT": "A conversation has been assigned to you",
+      "ASSIGNED_CONVERSATION_NEW_MESSAGE": "New message in an assigned conversation",
+      "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "New message in a conversation you are participating in"
+    },
+    "MENU_ITEM": {
+      "MARK_AS_READ": "Mark as read",
+      "MARK_AS_UNREAD": "Mark as unread",
+      "SNOOZE": "Snooze",
+      "DELETE": "삭제",
+      "MARK_ALL_READ": "전부 읽음으로 바꾸기",
+      "DELETE_ALL": "Delete all",
+      "DELETE_ALL_READ": "Delete all read"
+    },
+    "DISPLAY_MENU": {
+      "SORT": "Sort",
+      "DISPLAY": "Display :",
+      "SORT_OPTIONS": {
+        "NEWEST": "Newest",
+        "OLDEST": "Oldest",
+        "PRIORITY": "Priority"
+      },
+      "DISPLAY_OPTIONS": {
+        "SNOOZED": "일시 중지됨",
+        "READ": "읽기",
+        "LABELS": "라벨",
+        "CONVERSATION_ID": "Conversation ID"
+      }
+    },
+    "ALERTS": {
+      "MARK_AS_READ": "Notification marked as read",
+      "MARK_AS_UNREAD": "Notification marked as unread",
+      "SNOOZE": "Notification snoozed",
+      "DELETE": "Notification deleted",
+      "MARK_ALL_READ": "All notifications marked as read",
+      "DELETE_ALL": "All notifications deleted",
+      "DELETE_ALL_READ": "All read notifications deleted"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json
index eff4e0a57..110a49b46 100644
--- a/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json
@@ -569,7 +569,7 @@
       "UPDATE": "변경된 영업시간 적용",
       "TOGGLE_AVAILABILITY": "이 받은 메시지함에 대해 영업시간 설정 적용",
       "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for visitors",
-      "TOGGLE_HELP": "영업시간 설정을 적용할 경우 라이브챗 위젯에 해당 시간을 표시합니다. 담당자가 현재 오프라인 상태일 때도 해당 영업시간을 표시합니다. 영업 외 시간에는 사용자에게 아래 메시지와 대화 전 설문을 대신 보여줍니다.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours visitors can be warned with a message and a pre-chat form.",
       "DAY": {
         "ENABLE": "아래 날짜에 대해 영업시간 설정 적용",
         "UNAVAILABLE": "영업 종료",
diff --git a/app/javascript/dashboard/i18n/locale/ko/settings.json b/app/javascript/dashboard/i18n/locale/ko/settings.json
index d1654e919..97e6c5398 100644
--- a/app/javascript/dashboard/i18n/locale/ko/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ko/settings.json
@@ -160,6 +160,9 @@
     "TRIAL_MESSAGE": "일 평가판이 남아 있습니다.",
     "TRAIL_BUTTON": "지금 구입하기",
     "DELETED_USER": "Deleted User",
+    "EMAIL_VERIFICATION_PENDING": "It seems that you haven't verified your email address yet. Please check your inbox for the verification email.",
+    "RESEND_VERIFICATION_MAIL": "Resend verification email",
+    "EMAIL_VERIFICATION_SENT": "Verification email has been sent. Please check your inbox.",
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Account Suspended",
       "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
@@ -197,6 +200,7 @@
     "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
     "SWITCH": "Switch",
     "CONVERSATIONS": "대화",
+    "INBOX": "받은 메시지함",
     "ALL_CONVERSATIONS": "All Conversations",
     "MENTIONED_CONVERSATIONS": "멘션",
     "PARTICIPATING_CONVERSATIONS": "Participating",
@@ -238,6 +242,7 @@
     "REPORTS_INBOX": "받은 메시지함",
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
+    "SLA": "SLA",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Overview",
     "FACEBOOK_REAUTHORIZE": "페이스북 연결이 만료되었습니다. 서비스를 계속하려면 페이스북 페이지를 다시 연결하십시오.",
diff --git a/app/javascript/dashboard/i18n/locale/ko/sla.json b/app/javascript/dashboard/i18n/locale/ko/sla.json
new file mode 100644
index 000000000..205b57cca
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ko/sla.json
@@ -0,0 +1,70 @@
+{
+  "SLA": {
+    "HEADER": "SLA",
+    "HEADER_BTN_TXT": "Add SLA",
+    "LOADING": "Fetching SLAs",
+    "SEARCH_404": "이 쿼리와 일치하는 항목이 없음",
+    "SIDEBAR_TXT": "<p><b>SLA</b> <p>Think of Service Level Agreements (SLAs) like friendly promises between a service provider and a customer.</p> <p> These promises set clear expectations for things like how quickly the team will respond to issues, making sure you always get a reliable and top-notch experience!</p>",
+    "LIST": {
+      "404": "There are no SLAs available in this account.",
+      "TITLE": "Manage SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "TABLE_HEADER": [
+        "이름",
+        "내용",
+        "FRT",
+        "NRT",
+        "RT",
+        "영업시간"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "SLA Name",
+        "PLACEHOLDER": "SLA Name",
+        "REQUIRED_ERROR": "SLA name is required",
+        "MINIMUM_LENGTH_ERROR": "최소 두글자 이상이여야 합니다",
+        "VALID_ERROR": "영어나, 숫자, - 와 _ 만 사용 가능합니다"
+      },
+      "DESCRIPTION": {
+        "LABEL": "내용",
+        "PLACEHOLDER": "SLA for premium customers"
+      },
+      "FIRST_RESPONSE_TIME": {
+        "LABEL": "First Response Time(Seconds)",
+        "PLACEHOLDER": "300 for 5 minutes"
+      },
+      "NEXT_RESPONSE_TIME": {
+        "LABEL": "Next Response Time(Seconds)",
+        "PLACEHOLDER": "600 for 10 minutes"
+      },
+      "RESOLUTION_TIME": {
+        "LABEL": "Resolution Time(Seconds)",
+        "PLACEHOLDER": "86400 for 1 day"
+      },
+      "BUSINESS_HOURS": {
+        "LABEL": "영업시간",
+        "PLACEHOLDER": "Only during business hours"
+      },
+      "EDIT": "수정",
+      "CREATE": "만들기",
+      "DELETE": "삭제",
+      "CANCEL": "취소"
+    },
+    "ADD": {
+      "TITLE": "Add SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA added successfully",
+        "ERROR_MESSAGE": "오류가 발생했습니다. 다시 시도하십시오."
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit SLA",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA updated successfully",
+        "ERROR_MESSAGE": "오류가 발생했습니다. 다시 시도하십시오."
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/lt/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/lt/attributesMgmt.json
index a60b2d354..2e1d6a980 100644
--- a/app/javascript/dashboard/i18n/locale/lt/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/lt/attributesMgmt.json
@@ -39,6 +39,17 @@
           "PLACEHOLDER": "Įveskite personalizuotą atributo raktą",
           "ERROR": "Yra reikalingas raktas",
           "IN_VALID": "Neteisingas raktas"
+        },
+        "REGEX_PATTERN": {
+          "LABEL": "Regex Pattern",
+          "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+        },
+        "REGEX_CUE": {
+          "LABEL": "Regex Cue",
+          "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+        },
+        "ENABLE_REGEX": {
+          "LABEL": "Enable regex validation"
         }
       },
       "API": {
@@ -93,6 +104,17 @@
       "EMPTY_RESULT": {
         "404": "Nėra sukurta personalizuotų požymių",
         "NOT_FOUND": "Nėra sukonfiguruota personalizuotų požymių"
+      },
+      "REGEX_PATTERN": {
+        "LABEL": "Regex Pattern",
+        "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+      },
+      "REGEX_CUE": {
+        "LABEL": "Regex Cue",
+        "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+      },
+      "ENABLE_REGEX": {
+        "LABEL": "Enable regex validation"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/lt/contact.json b/app/javascript/dashboard/i18n/locale/lt/contact.json
index 763f16429..3bf32d57a 100644
--- a/app/javascript/dashboard/i18n/locale/lt/contact.json
+++ b/app/javascript/dashboard/i18n/locale/lt/contact.json
@@ -39,10 +39,10 @@
     },
     "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",
+    "MUTE_CONTACT": "Block Contact",
+    "UNMUTE_CONTACT": "Unblock Contact",
+    "MUTED_SUCCESS": "This contact is blocked successfully. You will not be notified of any future conversations.",
+    "UNMUTED_SUCCESS": "This contact is unblocked successfully.",
     "SEND_TRANSCRIPT": "Siųsti stenogramą",
     "EDIT_LABEL": "Redaguoti",
     "SIDEBAR_SECTIONS": {
@@ -79,7 +79,13 @@
     "TITLE": "Eksportuoti Kontaktus",
     "DESC": "Eksportuoti kontaktus į CSV failą.",
     "SUCCESS_MESSAGE": "Vykdomas eksportavimas. Jums bus pranešta el. paštu, kai eksporto failas bus paruoštas įkelti.",
-    "ERROR_MESSAGE": "Įvyko klaida, prašau pabandykite dar kartą"
+    "ERROR_MESSAGE": "Įvyko klaida, prašau pabandykite dar kartą",
+    "CONFIRM": {
+      "TITLE": "Eksportuoti Kontaktus",
+      "MESSAGE": "Are you sure you want to export all contacts?",
+      "YES": "Yes, Export",
+      "NO": "No, Cancel"
+    }
   },
   "DELETE_NOTE": {
     "CONFIRM": {
@@ -339,7 +345,8 @@
     },
     "VALIDATIONS": {
       "REQUIRED": "Reikalinga tinkama vertė",
-      "INVALID_URL": "Neteisingas URL"
+      "INVALID_URL": "Neteisingas URL",
+      "INVALID_INPUT": "Invalid Input"
     }
   },
   "MERGE_CONTACTS": {
diff --git a/app/javascript/dashboard/i18n/locale/lt/generalSettings.json b/app/javascript/dashboard/i18n/locale/lt/generalSettings.json
index 375494bdb..ab0ada9bb 100644
--- a/app/javascript/dashboard/i18n/locale/lt/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/lt/generalSettings.json
@@ -112,7 +112,8 @@
       "REMOVE_LABEL": "Pašalinti pokalbio etiketę",
       "SETTINGS": "Nustatymai",
       "AI_ASSIST": "AI pagalba",
-      "APPEARANCE": "Išvaizda"
+      "APPEARANCE": "Išvaizda",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     },
     "COMMANDS": {
       "GO_TO_CONVERSATION_DASHBOARD": "Eikite į Pokalbio informacijos skydelį",
@@ -153,7 +154,8 @@
       "CHANGE_APPEARANCE": "Keisti išvaizdą",
       "LIGHT_MODE": "Šviesus",
       "DARK_MODE": "Tamsus",
-      "SYSTEM_MODE": "Sistema"
+      "SYSTEM_MODE": "Sistema",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     }
   },
   "DASHBOARD_APPS": {
diff --git a/app/javascript/dashboard/i18n/locale/lt/helpCenter.json b/app/javascript/dashboard/i18n/locale/lt/helpCenter.json
index a3534ff9e..2f9b3a771 100644
--- a/app/javascript/dashboard/i18n/locale/lt/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/lt/helpCenter.json
@@ -324,7 +324,8 @@
         "LAST_EDITED": "Paskutinį kartą redaguota"
       },
       "COLUMNS": {
-        "BY": "pateikė"
+        "BY": "pateikė",
+        "AUTHOR_NOT_AVAILABLE": "Author is not available"
       }
     },
     "EDIT_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/lt/inbox.json b/app/javascript/dashboard/i18n/locale/lt/inbox.json
new file mode 100644
index 000000000..a5a33df66
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/lt/inbox.json
@@ -0,0 +1,60 @@
+{
+  "INBOX": {
+    "LIST": {
+      "TITLE": "Gautų laiškų aplankas",
+      "DISPLAY_DROPDOWN": "Display",
+      "LOADING": "Fetching notifications",
+      "EOF": "All notifications loaded 🎉",
+      "404": "There are no active notifications in this group.",
+      "NO_NOTIFICATIONS": "No notifications",
+      "NOTE": "Notifications from all subscribed inboxes",
+      "SNOOZED_UNTIL": "Atidėta iki",
+      "SNOOZED_UNTIL_TOMORROW": "Atidėta iki rytojaus",
+      "SNOOZED_UNTIL_NEXT_WEEK": "Atidėta iki kitos savaitės"
+    },
+    "ACTION_HEADER": {
+      "SNOOZE": "Snooze notification",
+      "DELETE": "Delete notification"
+    },
+    "TYPES": {
+      "CONVERSATION_MENTION": "You have been mentioned in a conversation",
+      "CONVERSATION_CREATION": "New conversation created",
+      "CONVERSATION_ASSIGNMENT": "A conversation has been assigned to you",
+      "ASSIGNED_CONVERSATION_NEW_MESSAGE": "New message in an assigned conversation",
+      "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "New message in a conversation you are participating in"
+    },
+    "MENU_ITEM": {
+      "MARK_AS_READ": "Mark as read",
+      "MARK_AS_UNREAD": "Pažymėti kaip neperskaitytą",
+      "SNOOZE": "Atidėti",
+      "DELETE": "Ištrinti",
+      "MARK_ALL_READ": "Mark all as read",
+      "DELETE_ALL": "Delete all",
+      "DELETE_ALL_READ": "Delete all read"
+    },
+    "DISPLAY_MENU": {
+      "SORT": "Sort",
+      "DISPLAY": "Display :",
+      "SORT_OPTIONS": {
+        "NEWEST": "Newest",
+        "OLDEST": "Oldest",
+        "PRIORITY": "Prioritetas"
+      },
+      "DISPLAY_OPTIONS": {
+        "SNOOZED": "Atidėta",
+        "READ": "Skaityti",
+        "LABELS": "Etiketės",
+        "CONVERSATION_ID": "Conversation ID"
+      }
+    },
+    "ALERTS": {
+      "MARK_AS_READ": "Notification marked as read",
+      "MARK_AS_UNREAD": "Notification marked as unread",
+      "SNOOZE": "Notification snoozed",
+      "DELETE": "Notification deleted",
+      "MARK_ALL_READ": "All notifications marked as read",
+      "DELETE_ALL": "All notifications deleted",
+      "DELETE_ALL_READ": "All read notifications deleted"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/lt/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/lt/inboxMgmt.json
index 581b4678a..27c41cf39 100644
--- a/app/javascript/dashboard/i18n/locale/lt/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/lt/inboxMgmt.json
@@ -569,7 +569,7 @@
       "UPDATE": "Atnaujinti darbo laiko nustatymus",
       "TOGGLE_AVAILABILITY": "Leisti verslo pasiekiamumą šiam gautų laiškų aplankui",
       "UNAVAILABLE_MESSAGE_LABEL": "Pranešimas lankytojams apie nepasiekiamumą",
-      "TOGGLE_HELP": "Leidus įmonės pasiekiamumą bus rodomos galimos darbo valandos tiesioginio pokalbio valdiklyje, net jei visi agentai neprisijungę. Ne darbo valandomis lankytojai gali būti įspėti pranešimu ir išankstinio pokalbio forma.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours visitors can be warned with a message and a pre-chat form.",
       "DAY": {
         "ENABLE": "Įgalinti pasiekiamumą šiai dienai",
         "UNAVAILABLE": "Nepasiekiamas",
diff --git a/app/javascript/dashboard/i18n/locale/lt/settings.json b/app/javascript/dashboard/i18n/locale/lt/settings.json
index f8fa6ad8c..1eac2af60 100644
--- a/app/javascript/dashboard/i18n/locale/lt/settings.json
+++ b/app/javascript/dashboard/i18n/locale/lt/settings.json
@@ -160,6 +160,9 @@
     "TRIAL_MESSAGE": "liko bandymo dienų.",
     "TRAIL_BUTTON": "Pirkti dabar",
     "DELETED_USER": "Trinti Vartotoją",
+    "EMAIL_VERIFICATION_PENDING": "It seems that you haven't verified your email address yet. Please check your inbox for the verification email.",
+    "RESEND_VERIFICATION_MAIL": "Resend verification email",
+    "EMAIL_VERIFICATION_SENT": "Verification email has been sent. Please check your inbox.",
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Paskyra laikinai sustabdyta",
       "MESSAGE": "Jūsų paskyra laikinai sustabdyta. Norėdami gauti daugiau informacijos, susisiekite su palaikymo komanda."
@@ -197,6 +200,7 @@
     "CURRENTLY_VIEWING_ACCOUNT": "Šiuo metu peržiūri:",
     "SWITCH": "Perjungti",
     "CONVERSATIONS": "Pokalbiai",
+    "INBOX": "Gautų laiškų aplankas",
     "ALL_CONVERSATIONS": "Visi Pokalbiai",
     "MENTIONED_CONVERSATIONS": "Paminėjimai",
     "PARTICIPATING_CONVERSATIONS": "Dalyvaujantys",
@@ -238,6 +242,7 @@
     "REPORTS_INBOX": "Gautų laiškų aplankas",
     "REPORTS_TEAM": "Komanda",
     "SET_AVAILABILITY_TITLE": "Nustatykite save kaip",
+    "SLA": "SLA",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Apžvalga",
     "FACEBOOK_REAUTHORIZE": "Jūsų ryšys su Facebook nutrūko. Jei norite toliau nauditis paslaugomis, iš naujo prisijunkite prie Facebook puslapio",
diff --git a/app/javascript/dashboard/i18n/locale/lt/sla.json b/app/javascript/dashboard/i18n/locale/lt/sla.json
new file mode 100644
index 000000000..10489e707
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/lt/sla.json
@@ -0,0 +1,70 @@
+{
+  "SLA": {
+    "HEADER": "SLA",
+    "HEADER_BTN_TXT": "Add SLA",
+    "LOADING": "Fetching SLAs",
+    "SEARCH_404": "Šią užklausą atitinkančių elementų nėra",
+    "SIDEBAR_TXT": "<p><b>SLA</b> <p>Think of Service Level Agreements (SLAs) like friendly promises between a service provider and a customer.</p> <p> These promises set clear expectations for things like how quickly the team will respond to issues, making sure you always get a reliable and top-notch experience!</p>",
+    "LIST": {
+      "404": "There are no SLAs available in this account.",
+      "TITLE": "Manage SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "TABLE_HEADER": [
+        "Vardas",
+        "Aprašymas",
+        "FRT",
+        "NRT",
+        "RT",
+        "Darbo valandos"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "SLA Name",
+        "PLACEHOLDER": "SLA Name",
+        "REQUIRED_ERROR": "SLA name is required",
+        "MINIMUM_LENGTH_ERROR": "Minimalus ilgis yra 2",
+        "VALID_ERROR": "Leidžiama naudoti tik abėcėlės raides, skaitmenis, brūkšnelius ir apatinį pabraukimą"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Aprašymas",
+        "PLACEHOLDER": "SLA for premium customers"
+      },
+      "FIRST_RESPONSE_TIME": {
+        "LABEL": "First Response Time(Seconds)",
+        "PLACEHOLDER": "300 for 5 minutes"
+      },
+      "NEXT_RESPONSE_TIME": {
+        "LABEL": "Next Response Time(Seconds)",
+        "PLACEHOLDER": "600 for 10 minutes"
+      },
+      "RESOLUTION_TIME": {
+        "LABEL": "Resolution Time(Seconds)",
+        "PLACEHOLDER": "86400 for 1 day"
+      },
+      "BUSINESS_HOURS": {
+        "LABEL": "Darbo valandos",
+        "PLACEHOLDER": "Only during business hours"
+      },
+      "EDIT": "Redaguoti",
+      "CREATE": "Sukurti",
+      "DELETE": "Ištrinti",
+      "CANCEL": "Atšaukti"
+    },
+    "ADD": {
+      "TITLE": "Add SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA added successfully",
+        "ERROR_MESSAGE": "Įvyko klaida, prašau pabandykite dar kartą"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit SLA",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA updated successfully",
+        "ERROR_MESSAGE": "Įvyko klaida, prašau pabandykite dar kartą"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/lv/agentBots.json b/app/javascript/dashboard/i18n/locale/lv/agentBots.json
index 6cf7a4aa5..f31aa836e 100644
--- a/app/javascript/dashboard/i18n/locale/lv/agentBots.json
+++ b/app/javascript/dashboard/i18n/locale/lv/agentBots.json
@@ -1,6 +1,6 @@
 {
   "AGENT_BOTS": {
-    "HEADER": "Bots",
+    "HEADER": "Roboti",
     "LOADING_EDITOR": "Notiek redaktora ielāde...",
     "HEADER_BTN_TXT": "Pievienot robota konfigurāciju",
     "SIDEBAR_TXT": "<p><b>Aģentu Roboti</b> <p>Aģentu Roboti ir kā visbrīnišķīgākie jūsu komandas locekļi. Viņi var tikt galā ar sīkumiem, lai jūs varētu koncentrēties uz svarīgākajām lietām. Izmēģiniet viņus.</p> <p> Jūs varat pārvaldīt savus robotus šajā lapā vai izveidot jaunus, izmantojot pogu 'Pievienot robota konfigurāciju'.</p> <p> Atveriet <a href=\"https://www.chatwoot.com/hc/chatwoot-user-guide-cloud-version/articles/1677497472-how-to-use-agent-bots\" target=\"blank\">Aģentu robotu rokasgrāmatu</a> jaunā cilnē, lai saņemtu palīdzību.</p>",
@@ -24,50 +24,50 @@
       "TITLE": "Izvēlieties aģentu robotu",
       "DESC": "Piešķiriet savai iesūtnei Aģentu Robotu. Viņi var apstrādāt sākotnējās sarunas un vajadzības gadījumā tās pārsūtīt tiešajam aģentam.",
       "SUBMIT": "Atjaunināt",
-      "DISCONNECT": "Disconnect bot",
+      "DISCONNECT": "Atvienot robotu",
       "SUCCESS_MESSAGE": "Aģents robots ir veiksmīgi atjaunināts.",
       "DISCONNECTED_SUCCESS_MESSAGE": "Aģenta robots ir veiksmīgi atvienots.",
-      "ERROR_MESSAGE": "Could not update the agent bot. Please try again.",
-      "DISCONNECTED_ERROR_MESSAGE": "Could not disconnect the agent bot. Please try again.",
-      "SELECT_PLACEHOLDER": "Select bot"
+      "ERROR_MESSAGE": "Nevarēja atjaunināt aģenta robotu. Lūdzu mēģiniet vēlreiz.",
+      "DISCONNECTED_ERROR_MESSAGE": "Nevarēja atvienot aģenta robotu. Lūdzu mēģiniet vēlreiz.",
+      "SELECT_PLACEHOLDER": "Izvēlieties robotu"
     },
     "ADD": {
       "TITLE": "Konfigurēt jaunu robotu",
       "CANCEL_BUTTON_TEXT": "Atcelt",
       "API": {
         "SUCCESS_MESSAGE": "Robots ir veiksmīgi pievienots.",
-        "ERROR_MESSAGE": "Could not add bot. Please try again later."
+        "ERROR_MESSAGE": "Nevarēja pievienot robotu. Lūdzu, pamēģiniet vēlāk vēlreiz."
       }
     },
     "LIST": {
-      "404": "No bots found. You can create a bot by clicking the 'Configure new bot' button ↗",
-      "LOADING": "Fetching bots...",
-      "TYPE": "Bot type"
+      "404": "Roboti nav atrasti. Jūs varat izveidot robotu, noklikšķinot uz 'Konfigurēt jaunu robotu' pogas ↗",
+      "LOADING": "Notiek robotu iegūšana...",
+      "TYPE": "Robota tips"
     },
     "DELETE": {
       "BUTTON_TEXT": "Dzēst",
-      "TITLE": "Delete bot",
+      "TITLE": "Dzēst robotu",
       "SUBMIT": "Dzēst",
       "CANCEL_BUTTON_TEXT": "Atcelt",
       "DESCRIPTION": "Vai tiešām vēlaties dzēst šo robotu? Šī darbība ir neatgriezeniska.",
       "API": {
         "SUCCESS_MESSAGE": "Robots ir veiksmīgi izdzēsts.",
-        "ERROR_MESSAGE": "Could not delete bot. Please try again."
+        "ERROR_MESSAGE": "Nevarēja izdzēst robotu. Lūdzu mēģiniet vēlreiz."
       }
     },
     "EDIT": {
       "BUTTON_TEXT": "Rediģēt",
-      "LOADING": "Fetching bots...",
-      "TITLE": "Edit bot",
+      "LOADING": "Notiek robotu iegūšana...",
+      "TITLE": "Rediģēt robotu",
       "CANCEL_BUTTON_TEXT": "Atcelt",
       "API": {
         "SUCCESS_MESSAGE": "Robots ir veiksmīgi atjaunināts.",
-        "ERROR_MESSAGE": "Could not update bot. Please try again."
+        "ERROR_MESSAGE": "Nevarēja atjaunināt robotu. Lūdzu mēģiniet vēlreiz."
       }
     },
     "TYPES": {
-      "WEBHOOK": "Webhook bot",
-      "CSML": "CSML bot"
+      "WEBHOOK": "Webhook robots",
+      "CSML": "CSML robots"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/lv/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/lv/attributesMgmt.json
index 8735b53c1..72ae385ce 100644
--- a/app/javascript/dashboard/i18n/locale/lv/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/lv/attributesMgmt.json
@@ -39,6 +39,17 @@
           "PLACEHOLDER": "Ievadiet pielāgotas īpašības atslēgu",
           "ERROR": "Nepieciešama atslēga",
           "IN_VALID": "Nederīga atslēga"
+        },
+        "REGEX_PATTERN": {
+          "LABEL": "Regex Šablons",
+          "PLACEHOLDER": "Lūdzu, ievadiet pielāgotu atribūtu regex šablonu. (Neobligāti)"
+        },
+        "REGEX_CUE": {
+          "LABEL": "Regex Norādījums",
+          "PLACEHOLDER": "Lūdzu, ievadiet regex šablona norādījumu. (Neobligāti)"
+        },
+        "ENABLE_REGEX": {
+          "LABEL": "Iespējot regex pārbaudi"
         }
       },
       "API": {
@@ -93,6 +104,17 @@
       "EMPTY_RESULT": {
         "404": "Nav izveidotas pielāgotas īpašības",
         "NOT_FOUND": "Nav nokonfigurētas pielāgotas īpašības"
+      },
+      "REGEX_PATTERN": {
+        "LABEL": "Regex Šablons",
+        "PLACEHOLDER": "Lūdzu, ievadiet pielāgotu atribūtu regex šablonu. (Neobligāti)"
+      },
+      "REGEX_CUE": {
+        "LABEL": "Regex Norādījums",
+        "PLACEHOLDER": "Lūdzu, ievadiet regex šablona norādījumu. (Neobligāti)"
+      },
+      "ENABLE_REGEX": {
+        "LABEL": "Iespējot regex pārbaudi"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/lv/contact.json b/app/javascript/dashboard/i18n/locale/lv/contact.json
index 7fcc1f5e4..ee98ceabb 100644
--- a/app/javascript/dashboard/i18n/locale/lv/contact.json
+++ b/app/javascript/dashboard/i18n/locale/lv/contact.json
@@ -39,10 +39,10 @@
     },
     "MERGE_CONTACT": "Apvienot kontaktu",
     "CONTACT_ACTIONS": "Kontaktpersonu darbības",
-    "MUTE_CONTACT": "Izslēgt Sarunu",
-    "UNMUTE_CONTACT": "Ieslēgt Sarunu",
-    "MUTED_SUCCESS": "Šī saruna ir izslēgta uz 6 stundām",
-    "UNMUTED_SUCCESS": "Šī saruna ir ieslēgta",
+    "MUTE_CONTACT": "Block Contact",
+    "UNMUTE_CONTACT": "Unblock Contact",
+    "MUTED_SUCCESS": "This contact is blocked successfully. You will not be notified of any future conversations.",
+    "UNMUTED_SUCCESS": "This contact is unblocked successfully.",
     "SEND_TRANSCRIPT": "Nosūtīt Transkriptu",
     "EDIT_LABEL": "Rediģēt",
     "SIDEBAR_SECTIONS": {
@@ -79,7 +79,13 @@
     "TITLE": "Eksportēt Kontaktpersonas",
     "DESC": "Eksportēt kontaktpersonas uz CSV failu.",
     "SUCCESS_MESSAGE": "Notiek eksportēšana, Jūs saņemsit paziņojumu pa e-pastu, kad eksporta fails būs gatavs lejupielādei.",
-    "ERROR_MESSAGE": "Radās kļūda. Lūdzu, mēģiniet vēlreiz"
+    "ERROR_MESSAGE": "Radās kļūda. Lūdzu, mēģiniet vēlreiz",
+    "CONFIRM": {
+      "TITLE": "Eksportēt Kontaktpersonas",
+      "MESSAGE": "Vai vēlaties eksportēt visas kontaktpersonas?",
+      "YES": "Jā, Eksportēt",
+      "NO": "Nē, Atcelt"
+    }
   },
   "DELETE_NOTE": {
     "CONFIRM": {
@@ -339,7 +345,8 @@
     },
     "VALIDATIONS": {
       "REQUIRED": "Nepieciešama derīga vērtība",
-      "INVALID_URL": "Nederīgs URL"
+      "INVALID_URL": "Nederīgs URL",
+      "INVALID_INPUT": "Nepareizi Ievadīts"
     }
   },
   "MERGE_CONTACTS": {
diff --git a/app/javascript/dashboard/i18n/locale/lv/conversation.json b/app/javascript/dashboard/i18n/locale/lv/conversation.json
index 4ce036520..363373426 100644
--- a/app/javascript/dashboard/i18n/locale/lv/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/lv/conversation.json
@@ -41,9 +41,9 @@
     "SAVE_CONTACT": "Saglabāt",
     "UPLOADING_ATTACHMENTS": "Notiek pielikumu augšupielāde...",
     "REPLIED_TO_STORY": "Atbildēja uz Jūsu stāstu",
-    "UNSUPPORTED_MESSAGE": "This message is unsupported.",
-    "UNSUPPORTED_MESSAGE_FACEBOOK": "This message is unsupported. You can view this message on the Facebook Messenger app.",
-    "UNSUPPORTED_MESSAGE_INSTAGRAM": "This message is unsupported. You can view this message on the Instagram app.",
+    "UNSUPPORTED_MESSAGE": "Šis ziņojums netiek atbalstīts.",
+    "UNSUPPORTED_MESSAGE_FACEBOOK": "Šis ziņojums netiek atbalstīts. Šo ziņojumu Jūs varat apskatīt lietotnē Facebook Messenger.",
+    "UNSUPPORTED_MESSAGE_INSTAGRAM": "Šis ziņojums netiek atbalstīts. Šo ziņojumu Jūs varat apskatīt lietotnē Instagram.",
     "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",
diff --git a/app/javascript/dashboard/i18n/locale/lv/generalSettings.json b/app/javascript/dashboard/i18n/locale/lv/generalSettings.json
index 82c8d7058..3f1429b98 100644
--- a/app/javascript/dashboard/i18n/locale/lv/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/lv/generalSettings.json
@@ -112,7 +112,8 @@
       "REMOVE_LABEL": "Noņemt etiķeti no sarunas",
       "SETTINGS": "Iestatījumi",
       "AI_ASSIST": "AI Palīgs",
-      "APPEARANCE": "Izskats"
+      "APPEARANCE": "Izskats",
+      "SNOOZE_NOTIFICATION": "Atlikt Paziņojumu"
     },
     "COMMANDS": {
       "GO_TO_CONVERSATION_DASHBOARD": "Doties uz Sarunu Informācijas Paneli",
@@ -153,7 +154,8 @@
       "CHANGE_APPEARANCE": "Mainīt Izskatu",
       "LIGHT_MODE": "Gaišs",
       "DARK_MODE": "Tumšs",
-      "SYSTEM_MODE": "Sistēma"
+      "SYSTEM_MODE": "Sistēma",
+      "SNOOZE_NOTIFICATION": "Atlikt Paziņojumu"
     }
   },
   "DASHBOARD_APPS": {
diff --git a/app/javascript/dashboard/i18n/locale/lv/helpCenter.json b/app/javascript/dashboard/i18n/locale/lv/helpCenter.json
index 0d2bb3100..0fc39606f 100644
--- a/app/javascript/dashboard/i18n/locale/lv/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/lv/helpCenter.json
@@ -324,7 +324,8 @@
         "LAST_EDITED": "Pēdējo reizi rediģēts"
       },
       "COLUMNS": {
-        "BY": "persona"
+        "BY": "persona",
+        "AUTHOR_NOT_AVAILABLE": "Autors nav pieejams"
       }
     },
     "EDIT_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/lv/inbox.json b/app/javascript/dashboard/i18n/locale/lv/inbox.json
new file mode 100644
index 000000000..4a824e2df
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/lv/inbox.json
@@ -0,0 +1,60 @@
+{
+  "INBOX": {
+    "LIST": {
+      "TITLE": "Iesūtne",
+      "DISPLAY_DROPDOWN": "Parādīt",
+      "LOADING": "Notiek paziņojumu iegūšana",
+      "EOF": "Visi paziņojumi ir ielādēti",
+      "404": "Šajā grupā nav aktīvu paziņojumu.",
+      "NO_NOTIFICATIONS": "Nav paziņojumu",
+      "NOTE": "Paziņojumi no visām abonētajām iesūtnēm",
+      "SNOOZED_UNTIL": "Atlikts līdz",
+      "SNOOZED_UNTIL_TOMORROW": "Atlikts līdz rītdienai",
+      "SNOOZED_UNTIL_NEXT_WEEK": "Atlikts līdz nākamajai nedēļai"
+    },
+    "ACTION_HEADER": {
+      "SNOOZE": "Atlikt paziņojumu",
+      "DELETE": "Dzēst paziņojumu"
+    },
+    "TYPES": {
+      "CONVERSATION_MENTION": "Jūs esat pieminēts sarunā",
+      "CONVERSATION_CREATION": "Izveidota jauna saruna",
+      "CONVERSATION_ASSIGNMENT": "Jums ir piešķirta saruna",
+      "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Jauns ziņojums piešķirtajā sarunā",
+      "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Jauns ziņojums sarunā, kurā piedalāties"
+    },
+    "MENU_ITEM": {
+      "MARK_AS_READ": "Atzīmēt kā lasītu",
+      "MARK_AS_UNREAD": "Atzīmēt kā nelasītu",
+      "SNOOZE": "Atlikt",
+      "DELETE": "Dzēst",
+      "MARK_ALL_READ": "Atzīmēt visu kā izlasītu",
+      "DELETE_ALL": "Dzēst visu",
+      "DELETE_ALL_READ": "Dzēst visu izlasīto"
+    },
+    "DISPLAY_MENU": {
+      "SORT": "Šķirot",
+      "DISPLAY": "Parādīt :",
+      "SORT_OPTIONS": {
+        "NEWEST": "Jaunākais",
+        "OLDEST": "Vecākais",
+        "PRIORITY": "Prioritāte"
+      },
+      "DISPLAY_OPTIONS": {
+        "SNOOZED": "Atlikts",
+        "READ": "Lasīts",
+        "LABELS": "Etiķetes",
+        "CONVERSATION_ID": "Sarunas ID"
+      }
+    },
+    "ALERTS": {
+      "MARK_AS_READ": "Paziņojums atzīmēts kā izlasīts",
+      "MARK_AS_UNREAD": "Paziņojums atzīmēts kā nelasīts",
+      "SNOOZE": "Paziņojums atlikts",
+      "DELETE": "Paziņojums izdzēsts",
+      "MARK_ALL_READ": "Visi paziņojumi ir atzīmēti kā lasīti",
+      "DELETE_ALL": "Visi paziņojumi izdzēsti",
+      "DELETE_ALL_READ": "Visi lasīšanas paziņojumi ir izdzēsti"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/lv/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/lv/inboxMgmt.json
index 6a2325203..f31abe266 100644
--- a/app/javascript/dashboard/i18n/locale/lv/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/lv/inboxMgmt.json
@@ -569,7 +569,7 @@
       "UPDATE": "Atjaunināt darba laika iestatījumus",
       "TOGGLE_AVAILABILITY": "Iespējot biznesa pieejamību šai iesūtnei",
       "UNAVAILABLE_MESSAGE_LABEL": "Ziņojums nav pieejams priekš apmeklētājiem",
-      "TOGGLE_HELP": "Iespējojot biznesa pieejamību, tiešraides tērzēšanas logrīkā tiks rādīts pieejamais laiks, pat ja visi aģenti būs bezsaistē. Ārpus pieejamā laika, apmeklētājus var brīdināt ar ziņojumu un pirms tērzēšanas veidlapu.",
+      "TOGGLE_HELP": "Iespējojot uzņēmuma pieejamību, tiešraides tērzēšanas logrīkā tiks rādīts darba laiks, pat ja visi aģenti būs bezsaistē. Ārpus darba laika apmeklētājus var brīdināt ar ziņojumu un pirms tērzēšanas veidlapu.",
       "DAY": {
         "ENABLE": "Iespējot pieejamību šai dienai",
         "UNAVAILABLE": "Nav pieejams",
diff --git a/app/javascript/dashboard/i18n/locale/lv/settings.json b/app/javascript/dashboard/i18n/locale/lv/settings.json
index ad18596da..05ab720b8 100644
--- a/app/javascript/dashboard/i18n/locale/lv/settings.json
+++ b/app/javascript/dashboard/i18n/locale/lv/settings.json
@@ -160,6 +160,9 @@
     "TRIAL_MESSAGE": "izmēģinājuma dienas atlikušas.",
     "TRAIL_BUTTON": "Pirkt Tagad",
     "DELETED_USER": "Dzēsts Lietotājs",
+    "EMAIL_VERIFICATION_PENDING": "Izskatās, ka Jūs vēl neesat verificējis savu e-pasta adresi. Lūdzu, izlasiet savā iesūtnē verifikācijas e-pasta ziņojumu.",
+    "RESEND_VERIFICATION_MAIL": "Sūtīt verifikācijas e-pastu atkārtoti",
+    "EMAIL_VERIFICATION_SENT": "Verifikācijas e-pasts ir nosūtīts. Lūdzu, pārbaudiet savu iesūtni.",
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Konts Iesaldēts",
       "MESSAGE": "Jūsu konts ir iesaldēts. Lai iegūtu papildu informāciju, lūdzu, sazinieties ar atbalsta komandu."
@@ -197,6 +200,7 @@
     "CURRENTLY_VIEWING_ACCOUNT": "Pašlaik skatās:",
     "SWITCH": "Pārslēgt",
     "CONVERSATIONS": "Sarunas",
+    "INBOX": "Iesūtne",
     "ALL_CONVERSATIONS": "Visas Sarunas",
     "MENTIONED_CONVERSATIONS": "Pieminēšanas",
     "PARTICIPATING_CONVERSATIONS": "Piedalās",
@@ -238,6 +242,7 @@
     "REPORTS_INBOX": "Iesūtne",
     "REPORTS_TEAM": "Komanda",
     "SET_AVAILABILITY_TITLE": "Iestatīt sevi kā",
+    "SLA": "SLA",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Pārskats",
     "FACEBOOK_REAUTHORIZE": "Jūsu Facebook savienojuma derīguma termiņš ir beidzies. Lūdzu, atkārtoti pievienojiet savu Facebook lapu, lai turpinātu pakalpojumus",
diff --git a/app/javascript/dashboard/i18n/locale/lv/sla.json b/app/javascript/dashboard/i18n/locale/lv/sla.json
new file mode 100644
index 000000000..15419ad9c
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/lv/sla.json
@@ -0,0 +1,70 @@
+{
+  "SLA": {
+    "HEADER": "SLA",
+    "HEADER_BTN_TXT": "Pievienot SLA",
+    "LOADING": "Notiek SLA iegūšana",
+    "SEARCH_404": "Šim vaicājumam nav atbilstošu vienumu",
+    "SIDEBAR_TXT": "<p><b>SLA</b> <p>Uztveriet Pakalpojuma Līmeņa Vienošanos (SLA) kā draudzīgu solījumu starp pakalpojumu sniedzēju un klientu.</p> <p> Šis solījums skaidri nosaka cik ātri komanda reaģēs uz problēmām un nodrošina, ka Jūs vienmēr saņemsiet uzticamu un izcilu pakalpojumu!</p>",
+    "LIST": {
+      "404": "Šim kontam nav piesaistīti SLA līgumi.",
+      "TITLE": "Pārvaldīt SLA",
+      "DESC": "SLA: Draudzīgi solījumi priekš lieliska servisa!",
+      "TABLE_HEADER": [
+        "Nosaukums",
+        "Apraksts",
+        "FRT",
+        "NRT",
+        "RT",
+        "Darba Laiks"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "SLA Nosaukums",
+        "PLACEHOLDER": "SLA Nosaukums",
+        "REQUIRED_ERROR": "Nepieciešams SLA nosaukums",
+        "MINIMUM_LENGTH_ERROR": "Nepieciešamais minimālais garums 2 simboli",
+        "VALID_ERROR": "Ir atļauti tikai Alfabēti burti, Cipari, Defise un Pasvītra"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Apraksts",
+        "PLACEHOLDER": "SLA priekš premium klientiem"
+      },
+      "FIRST_RESPONSE_TIME": {
+        "LABEL": "Pirmās Atbildes Laiks (Sekundes)",
+        "PLACEHOLDER": "300, priekš 5 minūtēm"
+      },
+      "NEXT_RESPONSE_TIME": {
+        "LABEL": "Nākamās Atbildes Laiks (Sekundes)",
+        "PLACEHOLDER": "600, priekš 10 minūtēm"
+      },
+      "RESOLUTION_TIME": {
+        "LABEL": "Atrisināšanas Laiks (Sekundes)",
+        "PLACEHOLDER": "86400, priekš 1 dienas"
+      },
+      "BUSINESS_HOURS": {
+        "LABEL": "Darba Laiks",
+        "PLACEHOLDER": "Tikai darba laikā"
+      },
+      "EDIT": "Rediģēt",
+      "CREATE": "Izveidot",
+      "DELETE": "Dzēst",
+      "CANCEL": "Atcelt"
+    },
+    "ADD": {
+      "TITLE": "Pievienot SLA",
+      "DESC": "SLA: Draudzīgi solījumi priekš lieliska servisa!",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA ir veiksmīgi pievienots",
+        "ERROR_MESSAGE": "Radās kļūda. Lūdzu, mēģiniet vēlreiz"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Rediģēt SLA",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA ir veiksmīgi atjaunināts",
+        "ERROR_MESSAGE": "Radās kļūda. Lūdzu, mēģiniet vēlreiz"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ml/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/ml/attributesMgmt.json
index 4cb7120e7..768b1727a 100644
--- a/app/javascript/dashboard/i18n/locale/ml/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ml/attributesMgmt.json
@@ -39,6 +39,17 @@
           "PLACEHOLDER": "Enter custom attribute key",
           "ERROR": "കീ ആവശ്യമാണ്",
           "IN_VALID": "Invalid key"
+        },
+        "REGEX_PATTERN": {
+          "LABEL": "Regex Pattern",
+          "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+        },
+        "REGEX_CUE": {
+          "LABEL": "Regex Cue",
+          "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+        },
+        "ENABLE_REGEX": {
+          "LABEL": "Enable regex validation"
         }
       },
       "API": {
@@ -93,6 +104,17 @@
       "EMPTY_RESULT": {
         "404": "There are no custom attributes created",
         "NOT_FOUND": "There are no custom attributes configured"
+      },
+      "REGEX_PATTERN": {
+        "LABEL": "Regex Pattern",
+        "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+      },
+      "REGEX_CUE": {
+        "LABEL": "Regex Cue",
+        "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+      },
+      "ENABLE_REGEX": {
+        "LABEL": "Enable regex validation"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/ml/contact.json b/app/javascript/dashboard/i18n/locale/ml/contact.json
index 876ce24bb..4a5f438a5 100644
--- a/app/javascript/dashboard/i18n/locale/ml/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ml/contact.json
@@ -39,10 +39,10 @@
     },
     "MERGE_CONTACT": "കോൺടാക്റ്റ് ലയിപ്പിക്കുക",
     "CONTACT_ACTIONS": "Contact actions",
-    "MUTE_CONTACT": "സംഭാഷണം ഒച്ചയിലാതാക്കുക",
-    "UNMUTE_CONTACT": "സംഭാഷണം നിശബ്ദമാക്കുക",
-    "MUTED_SUCCESS": "ഈ സംഭാഷണം 6 മണിക്കൂർ നിശബ്ദമാക്കി",
-    "UNMUTED_SUCCESS": "ഈ സംഭാഷണം നിശബ്ദമാക്കി",
+    "MUTE_CONTACT": "Block Contact",
+    "UNMUTE_CONTACT": "Unblock Contact",
+    "MUTED_SUCCESS": "This contact is blocked successfully. You will not be notified of any future conversations.",
+    "UNMUTED_SUCCESS": "This contact is unblocked successfully.",
     "SEND_TRANSCRIPT": "ട്രാൻസ്ക്രിപ്റ്റ് അയയ്ക്കുക",
     "EDIT_LABEL": "എഡിറ്റുചെയ്യുക",
     "SIDEBAR_SECTIONS": {
@@ -79,7 +79,13 @@
     "TITLE": "Export Contacts",
     "DESC": "Export contacts to a CSV file.",
     "SUCCESS_MESSAGE": "Export is in progress, You will be notified via email when export file is ready to dowanlod.",
-    "ERROR_MESSAGE": "ഒരു പിശക് ഉണ്ടായിരുന്നു, ദയവായി വീണ്ടും ശ്രമിക്കുക"
+    "ERROR_MESSAGE": "ഒരു പിശക് ഉണ്ടായിരുന്നു, ദയവായി വീണ്ടും ശ്രമിക്കുക",
+    "CONFIRM": {
+      "TITLE": "Export Contacts",
+      "MESSAGE": "Are you sure you want to export all contacts?",
+      "YES": "Yes, Export",
+      "NO": "No, Cancel"
+    }
   },
   "DELETE_NOTE": {
     "CONFIRM": {
@@ -339,7 +345,8 @@
     },
     "VALIDATIONS": {
       "REQUIRED": "Valid value is required",
-      "INVALID_URL": "Invalid URL"
+      "INVALID_URL": "Invalid URL",
+      "INVALID_INPUT": "Invalid Input"
     }
   },
   "MERGE_CONTACTS": {
diff --git a/app/javascript/dashboard/i18n/locale/ml/generalSettings.json b/app/javascript/dashboard/i18n/locale/ml/generalSettings.json
index 7d5306964..ddeed8fc8 100644
--- a/app/javascript/dashboard/i18n/locale/ml/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ml/generalSettings.json
@@ -112,7 +112,8 @@
       "REMOVE_LABEL": "Remove label from the conversation",
       "SETTINGS": "ക്രമീകരണങ്ങൾ",
       "AI_ASSIST": "AI Assist",
-      "APPEARANCE": "Appearance"
+      "APPEARANCE": "Appearance",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     },
     "COMMANDS": {
       "GO_TO_CONVERSATION_DASHBOARD": "Go to Conversation Dashboard",
@@ -153,7 +154,8 @@
       "CHANGE_APPEARANCE": "Change Appearance",
       "LIGHT_MODE": "Light",
       "DARK_MODE": "Dark",
-      "SYSTEM_MODE": "System"
+      "SYSTEM_MODE": "System",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     }
   },
   "DASHBOARD_APPS": {
diff --git a/app/javascript/dashboard/i18n/locale/ml/helpCenter.json b/app/javascript/dashboard/i18n/locale/ml/helpCenter.json
index 23d88436c..14d77aaec 100644
--- a/app/javascript/dashboard/i18n/locale/ml/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ml/helpCenter.json
@@ -324,7 +324,8 @@
         "LAST_EDITED": "Last edited"
       },
       "COLUMNS": {
-        "BY": "by"
+        "BY": "by",
+        "AUTHOR_NOT_AVAILABLE": "Author is not available"
       }
     },
     "EDIT_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/ml/inbox.json b/app/javascript/dashboard/i18n/locale/ml/inbox.json
new file mode 100644
index 000000000..63fce6b2a
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ml/inbox.json
@@ -0,0 +1,60 @@
+{
+  "INBOX": {
+    "LIST": {
+      "TITLE": "ഇൻബോക്സ്",
+      "DISPLAY_DROPDOWN": "Display",
+      "LOADING": "Fetching notifications",
+      "EOF": "All notifications loaded 🎉",
+      "404": "There are no active notifications in this group.",
+      "NO_NOTIFICATIONS": "No notifications",
+      "NOTE": "Notifications from all subscribed inboxes",
+      "SNOOZED_UNTIL": "Snoozed until",
+      "SNOOZED_UNTIL_TOMORROW": "Snoozed until tomorrow",
+      "SNOOZED_UNTIL_NEXT_WEEK": "Snoozed until next week"
+    },
+    "ACTION_HEADER": {
+      "SNOOZE": "Snooze notification",
+      "DELETE": "Delete notification"
+    },
+    "TYPES": {
+      "CONVERSATION_MENTION": "You have been mentioned in a conversation",
+      "CONVERSATION_CREATION": "New conversation created",
+      "CONVERSATION_ASSIGNMENT": "A conversation has been assigned to you",
+      "ASSIGNED_CONVERSATION_NEW_MESSAGE": "New message in an assigned conversation",
+      "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "New message in a conversation you are participating in"
+    },
+    "MENU_ITEM": {
+      "MARK_AS_READ": "Mark as read",
+      "MARK_AS_UNREAD": "Mark as unread",
+      "SNOOZE": "Snooze",
+      "DELETE": "ഇല്ലാതാക്കുക",
+      "MARK_ALL_READ": "എല്ലാം വായിച്ചതായി അടയാളപ്പെടുത്തുക",
+      "DELETE_ALL": "Delete all",
+      "DELETE_ALL_READ": "Delete all read"
+    },
+    "DISPLAY_MENU": {
+      "SORT": "Sort",
+      "DISPLAY": "Display :",
+      "SORT_OPTIONS": {
+        "NEWEST": "Newest",
+        "OLDEST": "Oldest",
+        "PRIORITY": "Priority"
+      },
+      "DISPLAY_OPTIONS": {
+        "SNOOZED": "സ്‌നൂസ് ചെയ്തു",
+        "READ": "Read",
+        "LABELS": "ലേബലുകൾ",
+        "CONVERSATION_ID": "Conversation ID"
+      }
+    },
+    "ALERTS": {
+      "MARK_AS_READ": "Notification marked as read",
+      "MARK_AS_UNREAD": "Notification marked as unread",
+      "SNOOZE": "Notification snoozed",
+      "DELETE": "Notification deleted",
+      "MARK_ALL_READ": "All notifications marked as read",
+      "DELETE_ALL": "All notifications deleted",
+      "DELETE_ALL_READ": "All read notifications deleted"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json
index 9e4878ec5..5dfd3e3ad 100644
--- a/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json
@@ -569,7 +569,7 @@
       "UPDATE": "Update business hours settings",
       "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
       "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for visitors",
-      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours visitors can be warned with a message and a pre-chat form.",
       "DAY": {
         "ENABLE": "Enable availability for this day",
         "UNAVAILABLE": "Unavailable",
diff --git a/app/javascript/dashboard/i18n/locale/ml/settings.json b/app/javascript/dashboard/i18n/locale/ml/settings.json
index 9b84ceda9..e9f539c2b 100644
--- a/app/javascript/dashboard/i18n/locale/ml/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ml/settings.json
@@ -160,6 +160,9 @@
     "TRIAL_MESSAGE": "ദിവസത്തെ ട്രയൽ ശേഷിക്കുന്നു.",
     "TRAIL_BUTTON": "ഇപ്പോൾ വാങ്ങുക",
     "DELETED_USER": "Deleted User",
+    "EMAIL_VERIFICATION_PENDING": "It seems that you haven't verified your email address yet. Please check your inbox for the verification email.",
+    "RESEND_VERIFICATION_MAIL": "Resend verification email",
+    "EMAIL_VERIFICATION_SENT": "Verification email has been sent. Please check your inbox.",
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Account Suspended",
       "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
@@ -197,6 +200,7 @@
     "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
     "SWITCH": "Switch",
     "CONVERSATIONS": "സംഭാഷണങ്ങൾ",
+    "INBOX": "ഇൻബോക്സ്",
     "ALL_CONVERSATIONS": "All Conversations",
     "MENTIONED_CONVERSATIONS": "പരാമർശിക്കുന്നു",
     "PARTICIPATING_CONVERSATIONS": "Participating",
@@ -238,6 +242,7 @@
     "REPORTS_INBOX": "ഇൻബോക്സ്",
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
+    "SLA": "SLA",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "അവലോകനം",
     "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
diff --git a/app/javascript/dashboard/i18n/locale/ml/sla.json b/app/javascript/dashboard/i18n/locale/ml/sla.json
new file mode 100644
index 000000000..d40278f7a
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ml/sla.json
@@ -0,0 +1,70 @@
+{
+  "SLA": {
+    "HEADER": "SLA",
+    "HEADER_BTN_TXT": "Add SLA",
+    "LOADING": "Fetching SLAs",
+    "SEARCH_404": "ഈ ചോദ്യവുമായി പൊരുത്തപ്പെടുന്ന ഇനങ്ങളൊന്നുമില്ല",
+    "SIDEBAR_TXT": "<p><b>SLA</b> <p>Think of Service Level Agreements (SLAs) like friendly promises between a service provider and a customer.</p> <p> These promises set clear expectations for things like how quickly the team will respond to issues, making sure you always get a reliable and top-notch experience!</p>",
+    "LIST": {
+      "404": "There are no SLAs available in this account.",
+      "TITLE": "Manage SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "TABLE_HEADER": [
+        "പേര്",
+        "വിവരണം",
+        "FRT",
+        "NRT",
+        "RT",
+        "Business Hours"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "SLA Name",
+        "PLACEHOLDER": "SLA Name",
+        "REQUIRED_ERROR": "SLA name is required",
+        "MINIMUM_LENGTH_ERROR": "കുറഞ്ഞ ദൈർഘ്യം 2 ആവശ്യമാണ്",
+        "VALID_ERROR": "അക്ഷരമാല, അക്കങ്ങൾ, ഹൈഫൻ, അണ്ടർ സ്‌കോർ എന്നിവ മാത്രമേ അനുവദിക്കൂ"
+      },
+      "DESCRIPTION": {
+        "LABEL": "വിവരണം",
+        "PLACEHOLDER": "SLA for premium customers"
+      },
+      "FIRST_RESPONSE_TIME": {
+        "LABEL": "First Response Time(Seconds)",
+        "PLACEHOLDER": "300 for 5 minutes"
+      },
+      "NEXT_RESPONSE_TIME": {
+        "LABEL": "Next Response Time(Seconds)",
+        "PLACEHOLDER": "600 for 10 minutes"
+      },
+      "RESOLUTION_TIME": {
+        "LABEL": "Resolution Time(Seconds)",
+        "PLACEHOLDER": "86400 for 1 day"
+      },
+      "BUSINESS_HOURS": {
+        "LABEL": "Business Hours",
+        "PLACEHOLDER": "Only during business hours"
+      },
+      "EDIT": "എഡിറ്റുചെയ്യുക",
+      "CREATE": "സൃഷ്ടിക്കുക",
+      "DELETE": "ഇല്ലാതാക്കുക",
+      "CANCEL": "റദ്ദാക്കുക"
+    },
+    "ADD": {
+      "TITLE": "Add SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA added successfully",
+        "ERROR_MESSAGE": "ഒരു പിശക് ഉണ്ടായിരുന്നു, ദയവായി വീണ്ടും ശ്രമിക്കുക"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit SLA",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA updated successfully",
+        "ERROR_MESSAGE": "ഒരു പിശക് ഉണ്ടായിരുന്നു, ദയവായി വീണ്ടും ശ്രമിക്കുക"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ms/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/ms/attributesMgmt.json
index 97ce785a4..ce5ed05b9 100644
--- a/app/javascript/dashboard/i18n/locale/ms/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ms/attributesMgmt.json
@@ -39,6 +39,17 @@
           "PLACEHOLDER": "Enter custom attribute key",
           "ERROR": "Key is required",
           "IN_VALID": "Invalid key"
+        },
+        "REGEX_PATTERN": {
+          "LABEL": "Regex Pattern",
+          "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+        },
+        "REGEX_CUE": {
+          "LABEL": "Regex Cue",
+          "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+        },
+        "ENABLE_REGEX": {
+          "LABEL": "Enable regex validation"
         }
       },
       "API": {
@@ -93,6 +104,17 @@
       "EMPTY_RESULT": {
         "404": "There are no custom attributes created",
         "NOT_FOUND": "There are no custom attributes configured"
+      },
+      "REGEX_PATTERN": {
+        "LABEL": "Regex Pattern",
+        "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+      },
+      "REGEX_CUE": {
+        "LABEL": "Regex Cue",
+        "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+      },
+      "ENABLE_REGEX": {
+        "LABEL": "Enable regex validation"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/ms/contact.json b/app/javascript/dashboard/i18n/locale/ms/contact.json
index d47069356..634182e05 100644
--- a/app/javascript/dashboard/i18n/locale/ms/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ms/contact.json
@@ -39,10 +39,10 @@
     },
     "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",
+    "MUTE_CONTACT": "Block Contact",
+    "UNMUTE_CONTACT": "Unblock Contact",
+    "MUTED_SUCCESS": "This contact is blocked successfully. You will not be notified of any future conversations.",
+    "UNMUTED_SUCCESS": "This contact is unblocked successfully.",
     "SEND_TRANSCRIPT": "Send Transcript",
     "EDIT_LABEL": "Edit",
     "SIDEBAR_SECTIONS": {
@@ -79,7 +79,13 @@
     "TITLE": "Export Contacts",
     "DESC": "Export contacts to a CSV file.",
     "SUCCESS_MESSAGE": "Export is in progress, You will be notified via email when export file is ready to download.",
-    "ERROR_MESSAGE": "There was an error, please try again"
+    "ERROR_MESSAGE": "There was an error, please try again",
+    "CONFIRM": {
+      "TITLE": "Export Contacts",
+      "MESSAGE": "Are you sure you want to export all contacts?",
+      "YES": "Yes, Export",
+      "NO": "No, Cancel"
+    }
   },
   "DELETE_NOTE": {
     "CONFIRM": {
@@ -339,7 +345,8 @@
     },
     "VALIDATIONS": {
       "REQUIRED": "Valid value is required",
-      "INVALID_URL": "Invalid URL"
+      "INVALID_URL": "Invalid URL",
+      "INVALID_INPUT": "Invalid Input"
     }
   },
   "MERGE_CONTACTS": {
diff --git a/app/javascript/dashboard/i18n/locale/ms/generalSettings.json b/app/javascript/dashboard/i18n/locale/ms/generalSettings.json
index 74e85a40f..9c5a720aa 100644
--- a/app/javascript/dashboard/i18n/locale/ms/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ms/generalSettings.json
@@ -112,7 +112,8 @@
       "REMOVE_LABEL": "Remove label from the conversation",
       "SETTINGS": "Settings",
       "AI_ASSIST": "AI Assist",
-      "APPEARANCE": "Appearance"
+      "APPEARANCE": "Appearance",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     },
     "COMMANDS": {
       "GO_TO_CONVERSATION_DASHBOARD": "Go to Conversation Dashboard",
@@ -153,7 +154,8 @@
       "CHANGE_APPEARANCE": "Change Appearance",
       "LIGHT_MODE": "Light",
       "DARK_MODE": "Dark",
-      "SYSTEM_MODE": "System"
+      "SYSTEM_MODE": "System",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     }
   },
   "DASHBOARD_APPS": {
diff --git a/app/javascript/dashboard/i18n/locale/ms/helpCenter.json b/app/javascript/dashboard/i18n/locale/ms/helpCenter.json
index d8008f9ca..66c142481 100644
--- a/app/javascript/dashboard/i18n/locale/ms/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ms/helpCenter.json
@@ -324,7 +324,8 @@
         "LAST_EDITED": "Last edited"
       },
       "COLUMNS": {
-        "BY": "by"
+        "BY": "by",
+        "AUTHOR_NOT_AVAILABLE": "Author is not available"
       }
     },
     "EDIT_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/ms/inbox.json b/app/javascript/dashboard/i18n/locale/ms/inbox.json
new file mode 100644
index 000000000..bca81b233
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ms/inbox.json
@@ -0,0 +1,60 @@
+{
+  "INBOX": {
+    "LIST": {
+      "TITLE": "Inbox",
+      "DISPLAY_DROPDOWN": "Display",
+      "LOADING": "Fetching notifications",
+      "EOF": "All notifications loaded 🎉",
+      "404": "There are no active notifications in this group.",
+      "NO_NOTIFICATIONS": "No notifications",
+      "NOTE": "Notifications from all subscribed inboxes",
+      "SNOOZED_UNTIL": "Snoozed until",
+      "SNOOZED_UNTIL_TOMORROW": "Snoozed until tomorrow",
+      "SNOOZED_UNTIL_NEXT_WEEK": "Snoozed until next week"
+    },
+    "ACTION_HEADER": {
+      "SNOOZE": "Snooze notification",
+      "DELETE": "Delete notification"
+    },
+    "TYPES": {
+      "CONVERSATION_MENTION": "You have been mentioned in a conversation",
+      "CONVERSATION_CREATION": "New conversation created",
+      "CONVERSATION_ASSIGNMENT": "A conversation has been assigned to you",
+      "ASSIGNED_CONVERSATION_NEW_MESSAGE": "New message in an assigned conversation",
+      "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "New message in a conversation you are participating in"
+    },
+    "MENU_ITEM": {
+      "MARK_AS_READ": "Mark as read",
+      "MARK_AS_UNREAD": "Mark as unread",
+      "SNOOZE": "Snooze",
+      "DELETE": "Padamkan",
+      "MARK_ALL_READ": "Mark all as read",
+      "DELETE_ALL": "Delete all",
+      "DELETE_ALL_READ": "Delete all read"
+    },
+    "DISPLAY_MENU": {
+      "SORT": "Sort",
+      "DISPLAY": "Display :",
+      "SORT_OPTIONS": {
+        "NEWEST": "Newest",
+        "OLDEST": "Oldest",
+        "PRIORITY": "Priority"
+      },
+      "DISPLAY_OPTIONS": {
+        "SNOOZED": "Snoozed",
+        "READ": "Read",
+        "LABELS": "Label",
+        "CONVERSATION_ID": "Conversation ID"
+      }
+    },
+    "ALERTS": {
+      "MARK_AS_READ": "Notification marked as read",
+      "MARK_AS_UNREAD": "Notification marked as unread",
+      "SNOOZE": "Notification snoozed",
+      "DELETE": "Notification deleted",
+      "MARK_ALL_READ": "All notifications marked as read",
+      "DELETE_ALL": "All notifications deleted",
+      "DELETE_ALL_READ": "All read notifications deleted"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ms/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ms/inboxMgmt.json
index 1e2ac1b25..6c9b031c1 100644
--- a/app/javascript/dashboard/i18n/locale/ms/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ms/inboxMgmt.json
@@ -569,7 +569,7 @@
       "UPDATE": "Update business hours settings",
       "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
       "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for visitors",
-      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours visitors can be warned with a message and a pre-chat form.",
       "DAY": {
         "ENABLE": "Enable availability for this day",
         "UNAVAILABLE": "Unavailable",
diff --git a/app/javascript/dashboard/i18n/locale/ms/settings.json b/app/javascript/dashboard/i18n/locale/ms/settings.json
index 71d47a017..6eb09f3d7 100644
--- a/app/javascript/dashboard/i18n/locale/ms/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ms/settings.json
@@ -160,6 +160,9 @@
     "TRIAL_MESSAGE": "days trial remaining.",
     "TRAIL_BUTTON": "Buy Now",
     "DELETED_USER": "Deleted User",
+    "EMAIL_VERIFICATION_PENDING": "It seems that you haven't verified your email address yet. Please check your inbox for the verification email.",
+    "RESEND_VERIFICATION_MAIL": "Resend verification email",
+    "EMAIL_VERIFICATION_SENT": "Verification email has been sent. Please check your inbox.",
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Account Suspended",
       "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
@@ -197,6 +200,7 @@
     "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
     "SWITCH": "Switch",
     "CONVERSATIONS": "Conversations",
+    "INBOX": "Inbox",
     "ALL_CONVERSATIONS": "All Conversations",
     "MENTIONED_CONVERSATIONS": "Mentions",
     "PARTICIPATING_CONVERSATIONS": "Participating",
@@ -238,6 +242,7 @@
     "REPORTS_INBOX": "Inbox",
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
+    "SLA": "SLA",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Overview",
     "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
diff --git a/app/javascript/dashboard/i18n/locale/ms/sla.json b/app/javascript/dashboard/i18n/locale/ms/sla.json
new file mode 100644
index 000000000..992813cb8
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ms/sla.json
@@ -0,0 +1,70 @@
+{
+  "SLA": {
+    "HEADER": "SLA",
+    "HEADER_BTN_TXT": "Add SLA",
+    "LOADING": "Fetching SLAs",
+    "SEARCH_404": "There are no items matching this query",
+    "SIDEBAR_TXT": "<p><b>SLA</b> <p>Think of Service Level Agreements (SLAs) like friendly promises between a service provider and a customer.</p> <p> These promises set clear expectations for things like how quickly the team will respond to issues, making sure you always get a reliable and top-notch experience!</p>",
+    "LIST": {
+      "404": "There are no SLAs available in this account.",
+      "TITLE": "Manage SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "TABLE_HEADER": [
+        "Nama",
+        "Description",
+        "FRT",
+        "NRT",
+        "RT",
+        "Business Hours"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "SLA Name",
+        "PLACEHOLDER": "SLA Name",
+        "REQUIRED_ERROR": "SLA name is required",
+        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
+        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Description",
+        "PLACEHOLDER": "SLA for premium customers"
+      },
+      "FIRST_RESPONSE_TIME": {
+        "LABEL": "First Response Time(Seconds)",
+        "PLACEHOLDER": "300 for 5 minutes"
+      },
+      "NEXT_RESPONSE_TIME": {
+        "LABEL": "Next Response Time(Seconds)",
+        "PLACEHOLDER": "600 for 10 minutes"
+      },
+      "RESOLUTION_TIME": {
+        "LABEL": "Resolution Time(Seconds)",
+        "PLACEHOLDER": "86400 for 1 day"
+      },
+      "BUSINESS_HOURS": {
+        "LABEL": "Business Hours",
+        "PLACEHOLDER": "Only during business hours"
+      },
+      "EDIT": "Edit",
+      "CREATE": "Create",
+      "DELETE": "Padamkan",
+      "CANCEL": "Batalkan"
+    },
+    "ADD": {
+      "TITLE": "Add SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA added successfully",
+        "ERROR_MESSAGE": "There was an error, please try again"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit SLA",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA updated successfully",
+        "ERROR_MESSAGE": "There was an error, please try again"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ne/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/ne/attributesMgmt.json
index 2a9ea7de3..64a0e83d6 100644
--- a/app/javascript/dashboard/i18n/locale/ne/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ne/attributesMgmt.json
@@ -39,6 +39,17 @@
           "PLACEHOLDER": "Enter custom attribute key",
           "ERROR": "Key is required",
           "IN_VALID": "Invalid key"
+        },
+        "REGEX_PATTERN": {
+          "LABEL": "Regex Pattern",
+          "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+        },
+        "REGEX_CUE": {
+          "LABEL": "Regex Cue",
+          "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+        },
+        "ENABLE_REGEX": {
+          "LABEL": "Enable regex validation"
         }
       },
       "API": {
@@ -93,6 +104,17 @@
       "EMPTY_RESULT": {
         "404": "There are no custom attributes created",
         "NOT_FOUND": "There are no custom attributes configured"
+      },
+      "REGEX_PATTERN": {
+        "LABEL": "Regex Pattern",
+        "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+      },
+      "REGEX_CUE": {
+        "LABEL": "Regex Cue",
+        "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+      },
+      "ENABLE_REGEX": {
+        "LABEL": "Enable regex validation"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/ne/contact.json b/app/javascript/dashboard/i18n/locale/ne/contact.json
index 6a5096c30..64bbdb547 100644
--- a/app/javascript/dashboard/i18n/locale/ne/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ne/contact.json
@@ -39,10 +39,10 @@
     },
     "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",
+    "MUTE_CONTACT": "Block Contact",
+    "UNMUTE_CONTACT": "Unblock Contact",
+    "MUTED_SUCCESS": "This contact is blocked successfully. You will not be notified of any future conversations.",
+    "UNMUTED_SUCCESS": "This contact is unblocked successfully.",
     "SEND_TRANSCRIPT": "Send Transcript",
     "EDIT_LABEL": "Edit",
     "SIDEBAR_SECTIONS": {
@@ -79,7 +79,13 @@
     "TITLE": "Export Contacts",
     "DESC": "Export contacts to a CSV file.",
     "SUCCESS_MESSAGE": "Export is in progress, You will be notified via email when export file is ready to dowanlod.",
-    "ERROR_MESSAGE": "There was an error, please try again"
+    "ERROR_MESSAGE": "There was an error, please try again",
+    "CONFIRM": {
+      "TITLE": "Export Contacts",
+      "MESSAGE": "Are you sure you want to export all contacts?",
+      "YES": "Yes, Export",
+      "NO": "No, Cancel"
+    }
   },
   "DELETE_NOTE": {
     "CONFIRM": {
@@ -339,7 +345,8 @@
     },
     "VALIDATIONS": {
       "REQUIRED": "Valid value is required",
-      "INVALID_URL": "Invalid URL"
+      "INVALID_URL": "Invalid URL",
+      "INVALID_INPUT": "Invalid Input"
     }
   },
   "MERGE_CONTACTS": {
diff --git a/app/javascript/dashboard/i18n/locale/ne/generalSettings.json b/app/javascript/dashboard/i18n/locale/ne/generalSettings.json
index d56a20c15..185d328a5 100644
--- a/app/javascript/dashboard/i18n/locale/ne/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ne/generalSettings.json
@@ -112,7 +112,8 @@
       "REMOVE_LABEL": "Remove label from the conversation",
       "SETTINGS": "Settings",
       "AI_ASSIST": "AI Assist",
-      "APPEARANCE": "Appearance"
+      "APPEARANCE": "Appearance",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     },
     "COMMANDS": {
       "GO_TO_CONVERSATION_DASHBOARD": "Go to Conversation Dashboard",
@@ -153,7 +154,8 @@
       "CHANGE_APPEARANCE": "Change Appearance",
       "LIGHT_MODE": "Light",
       "DARK_MODE": "Dark",
-      "SYSTEM_MODE": "System"
+      "SYSTEM_MODE": "System",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     }
   },
   "DASHBOARD_APPS": {
diff --git a/app/javascript/dashboard/i18n/locale/ne/helpCenter.json b/app/javascript/dashboard/i18n/locale/ne/helpCenter.json
index 3e53883b2..8ee4fa8b1 100644
--- a/app/javascript/dashboard/i18n/locale/ne/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ne/helpCenter.json
@@ -324,7 +324,8 @@
         "LAST_EDITED": "Last edited"
       },
       "COLUMNS": {
-        "BY": "by"
+        "BY": "by",
+        "AUTHOR_NOT_AVAILABLE": "Author is not available"
       }
     },
     "EDIT_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/ne/inbox.json b/app/javascript/dashboard/i18n/locale/ne/inbox.json
new file mode 100644
index 000000000..dcac5459f
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ne/inbox.json
@@ -0,0 +1,60 @@
+{
+  "INBOX": {
+    "LIST": {
+      "TITLE": "Inbox",
+      "DISPLAY_DROPDOWN": "Display",
+      "LOADING": "Fetching notifications",
+      "EOF": "All notifications loaded 🎉",
+      "404": "There are no active notifications in this group.",
+      "NO_NOTIFICATIONS": "No notifications",
+      "NOTE": "Notifications from all subscribed inboxes",
+      "SNOOZED_UNTIL": "Snoozed until",
+      "SNOOZED_UNTIL_TOMORROW": "Snoozed until tomorrow",
+      "SNOOZED_UNTIL_NEXT_WEEK": "Snoozed until next week"
+    },
+    "ACTION_HEADER": {
+      "SNOOZE": "Snooze notification",
+      "DELETE": "Delete notification"
+    },
+    "TYPES": {
+      "CONVERSATION_MENTION": "You have been mentioned in a conversation",
+      "CONVERSATION_CREATION": "New conversation created",
+      "CONVERSATION_ASSIGNMENT": "A conversation has been assigned to you",
+      "ASSIGNED_CONVERSATION_NEW_MESSAGE": "New message in an assigned conversation",
+      "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "New message in a conversation you are participating in"
+    },
+    "MENU_ITEM": {
+      "MARK_AS_READ": "Mark as read",
+      "MARK_AS_UNREAD": "Mark as unread",
+      "SNOOZE": "Snooze",
+      "DELETE": "Delete",
+      "MARK_ALL_READ": "Mark all as read",
+      "DELETE_ALL": "Delete all",
+      "DELETE_ALL_READ": "Delete all read"
+    },
+    "DISPLAY_MENU": {
+      "SORT": "Sort",
+      "DISPLAY": "Display :",
+      "SORT_OPTIONS": {
+        "NEWEST": "Newest",
+        "OLDEST": "Oldest",
+        "PRIORITY": "Priority"
+      },
+      "DISPLAY_OPTIONS": {
+        "SNOOZED": "Snoozed",
+        "READ": "Read",
+        "LABELS": "Labels",
+        "CONVERSATION_ID": "Conversation ID"
+      }
+    },
+    "ALERTS": {
+      "MARK_AS_READ": "Notification marked as read",
+      "MARK_AS_UNREAD": "Notification marked as unread",
+      "SNOOZE": "Notification snoozed",
+      "DELETE": "Notification deleted",
+      "MARK_ALL_READ": "All notifications marked as read",
+      "DELETE_ALL": "All notifications deleted",
+      "DELETE_ALL_READ": "All read notifications deleted"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ne/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ne/inboxMgmt.json
index 4676a871e..1e635b760 100644
--- a/app/javascript/dashboard/i18n/locale/ne/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ne/inboxMgmt.json
@@ -569,7 +569,7 @@
       "UPDATE": "Update business hours settings",
       "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
       "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for visitors",
-      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours visitors can be warned with a message and a pre-chat form.",
       "DAY": {
         "ENABLE": "Enable availability for this day",
         "UNAVAILABLE": "Unavailable",
diff --git a/app/javascript/dashboard/i18n/locale/ne/settings.json b/app/javascript/dashboard/i18n/locale/ne/settings.json
index ac3ac09c9..9176bdf3f 100644
--- a/app/javascript/dashboard/i18n/locale/ne/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ne/settings.json
@@ -160,6 +160,9 @@
     "TRIAL_MESSAGE": "days trial remaining.",
     "TRAIL_BUTTON": "Buy Now",
     "DELETED_USER": "Deleted User",
+    "EMAIL_VERIFICATION_PENDING": "It seems that you haven't verified your email address yet. Please check your inbox for the verification email.",
+    "RESEND_VERIFICATION_MAIL": "Resend verification email",
+    "EMAIL_VERIFICATION_SENT": "Verification email has been sent. Please check your inbox.",
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Account Suspended",
       "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
@@ -197,6 +200,7 @@
     "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
     "SWITCH": "Switch",
     "CONVERSATIONS": "Conversations",
+    "INBOX": "Inbox",
     "ALL_CONVERSATIONS": "All Conversations",
     "MENTIONED_CONVERSATIONS": "Mentions",
     "PARTICIPATING_CONVERSATIONS": "Participating",
@@ -238,6 +242,7 @@
     "REPORTS_INBOX": "Inbox",
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
+    "SLA": "SLA",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Overview",
     "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
diff --git a/app/javascript/dashboard/i18n/locale/ne/sla.json b/app/javascript/dashboard/i18n/locale/ne/sla.json
new file mode 100644
index 000000000..869b3ba3f
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ne/sla.json
@@ -0,0 +1,70 @@
+{
+  "SLA": {
+    "HEADER": "SLA",
+    "HEADER_BTN_TXT": "Add SLA",
+    "LOADING": "Fetching SLAs",
+    "SEARCH_404": "There are no items matching this query",
+    "SIDEBAR_TXT": "<p><b>SLA</b> <p>Think of Service Level Agreements (SLAs) like friendly promises between a service provider and a customer.</p> <p> These promises set clear expectations for things like how quickly the team will respond to issues, making sure you always get a reliable and top-notch experience!</p>",
+    "LIST": {
+      "404": "There are no SLAs available in this account.",
+      "TITLE": "Manage SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "TABLE_HEADER": [
+        "Name",
+        "Description",
+        "FRT",
+        "NRT",
+        "RT",
+        "Business Hours"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "SLA Name",
+        "PLACEHOLDER": "SLA Name",
+        "REQUIRED_ERROR": "SLA name is required",
+        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
+        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Description",
+        "PLACEHOLDER": "SLA for premium customers"
+      },
+      "FIRST_RESPONSE_TIME": {
+        "LABEL": "First Response Time(Seconds)",
+        "PLACEHOLDER": "300 for 5 minutes"
+      },
+      "NEXT_RESPONSE_TIME": {
+        "LABEL": "Next Response Time(Seconds)",
+        "PLACEHOLDER": "600 for 10 minutes"
+      },
+      "RESOLUTION_TIME": {
+        "LABEL": "Resolution Time(Seconds)",
+        "PLACEHOLDER": "86400 for 1 day"
+      },
+      "BUSINESS_HOURS": {
+        "LABEL": "Business Hours",
+        "PLACEHOLDER": "Only during business hours"
+      },
+      "EDIT": "Edit",
+      "CREATE": "Create",
+      "DELETE": "Delete",
+      "CANCEL": "Cancel"
+    },
+    "ADD": {
+      "TITLE": "Add SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA added successfully",
+        "ERROR_MESSAGE": "There was an error, please try again"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit SLA",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA updated successfully",
+        "ERROR_MESSAGE": "There was an error, please try again"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/nl/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/nl/attributesMgmt.json
index 430143b7c..764f47c09 100644
--- a/app/javascript/dashboard/i18n/locale/nl/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/nl/attributesMgmt.json
@@ -39,6 +39,17 @@
           "PLACEHOLDER": "Voer aangepaste attribuut sleutel in",
           "ERROR": "Sleutel is vereist",
           "IN_VALID": "Ongeldige sleutel"
+        },
+        "REGEX_PATTERN": {
+          "LABEL": "Regex Pattern",
+          "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+        },
+        "REGEX_CUE": {
+          "LABEL": "Regex Cue",
+          "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+        },
+        "ENABLE_REGEX": {
+          "LABEL": "Enable regex validation"
         }
       },
       "API": {
@@ -93,6 +104,17 @@
       "EMPTY_RESULT": {
         "404": "Er zijn geen aangepaste attributen aangemaakt",
         "NOT_FOUND": "Er zijn geen aangepaste attributen geconfigureerd"
+      },
+      "REGEX_PATTERN": {
+        "LABEL": "Regex Pattern",
+        "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+      },
+      "REGEX_CUE": {
+        "LABEL": "Regex Cue",
+        "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+      },
+      "ENABLE_REGEX": {
+        "LABEL": "Enable regex validation"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/nl/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/nl/cannedMgmt.json
index 1daa606cb..aead72726 100644
--- a/app/javascript/dashboard/i18n/locale/nl/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/nl/cannedMgmt.json
@@ -68,8 +68,8 @@
       "CONFIRM": {
         "TITLE": "Verwijdering bevestigen",
         "MESSAGE": "Weet u zeker dat u wilt verwijderen ",
-        "YES": "Yes, delete ",
-        "NO": "No, keep "
+        "YES": "Ja, verwijder ",
+        "NO": "Nee, bewaar"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/nl/contact.json b/app/javascript/dashboard/i18n/locale/nl/contact.json
index 6ec9f0efa..fc4fb0bc0 100644
--- a/app/javascript/dashboard/i18n/locale/nl/contact.json
+++ b/app/javascript/dashboard/i18n/locale/nl/contact.json
@@ -39,10 +39,10 @@
     },
     "MERGE_CONTACT": "Contact samenvoegen",
     "CONTACT_ACTIONS": "Contact acties",
-    "MUTE_CONTACT": "Gesprek dempen",
-    "UNMUTE_CONTACT": "Gesprek dempen opheffen",
-    "MUTED_SUCCESS": "Dit gesprek is gedempt voor 6 uur",
-    "UNMUTED_SUCCESS": "Dit gesprek is niet gedempt",
+    "MUTE_CONTACT": "Block Contact",
+    "UNMUTE_CONTACT": "Unblock Contact",
+    "MUTED_SUCCESS": "This contact is blocked successfully. You will not be notified of any future conversations.",
+    "UNMUTED_SUCCESS": "This contact is unblocked successfully.",
     "SEND_TRANSCRIPT": "Transcript verzenden",
     "EDIT_LABEL": "Bewerken",
     "SIDEBAR_SECTIONS": {
@@ -79,7 +79,13 @@
     "TITLE": "Contactpersonen exporteren",
     "DESC": "Exporteer contacten naar een CSV-bestand.",
     "SUCCESS_MESSAGE": "Export is in progress, You will be notified via email when export file is ready to dowanlod.",
-    "ERROR_MESSAGE": "Er is een fout opgetreden, probeer het opnieuw"
+    "ERROR_MESSAGE": "Er is een fout opgetreden, probeer het opnieuw",
+    "CONFIRM": {
+      "TITLE": "Contactpersonen exporteren",
+      "MESSAGE": "Are you sure you want to export all contacts?",
+      "YES": "Yes, Export",
+      "NO": "No, Cancel"
+    }
   },
   "DELETE_NOTE": {
     "CONFIRM": {
@@ -339,7 +345,8 @@
     },
     "VALIDATIONS": {
       "REQUIRED": "Geldige waarde is vereist",
-      "INVALID_URL": "Ongeldige URL"
+      "INVALID_URL": "Ongeldige URL",
+      "INVALID_INPUT": "Invalid Input"
     }
   },
   "MERGE_CONTACTS": {
diff --git a/app/javascript/dashboard/i18n/locale/nl/conversation.json b/app/javascript/dashboard/i18n/locale/nl/conversation.json
index d664ed659..bb07b076a 100644
--- a/app/javascript/dashboard/i18n/locale/nl/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/nl/conversation.json
@@ -156,8 +156,8 @@
       "STOP_AUDIO_RECORDING": "Stop audio recording",
       "": "",
       "EMAIL_HEAD": {
-        "TO": "TO",
-        "ADD_BCC": "Add bcc",
+        "TO": "AAN",
+        "ADD_BCC": "Voeg bcc toe",
         "CC": {
           "LABEL": "CC",
           "PLACEHOLDER": "Emails separated by commas",
@@ -202,11 +202,11 @@
       "REPLY_TO": "Reply to this message",
       "DELETE": "Verwijderen",
       "CREATE_A_CANNED_RESPONSE": "Add to canned responses",
-      "TRANSLATE": "Translate",
+      "TRANSLATE": "Vertaal",
       "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?",
+        "TITLE": "Weet je zeker dat je dit bericht wilt verwijderen?",
         "MESSAGE": "You cannot undo this action",
         "DELETE": "Verwijderen",
         "CANCEL": "Annuleren"
@@ -225,7 +225,7 @@
       "SEND_TO_AGENT": "Send the transcript to the assigned agent",
       "SEND_TO_OTHER_EMAIL_ADDRESS": "Send the transcript to another email address",
       "EMAIL": {
-        "PLACEHOLDER": "Enter an email address",
+        "PLACEHOLDER": "Voer een e-mailadres in",
         "ERROR": "Voer een geldig e-mailadres in"
       }
     }
@@ -233,7 +233,7 @@
   "ONBOARDING": {
     "TITLE": "Hey 👋, Welcome to %{installationName}!",
     "DESCRIPTION": "Thanks for signing up. We want you to get the most out of %{installationName}. Here are a few things you can do in %{installationName} to make the experience delightful.",
-    "READ_LATEST_UPDATES": "Read our latest updates",
+    "READ_LATEST_UPDATES": "Lees onze laatste 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."
@@ -256,23 +256,23 @@
   },
   "CONVERSATION_SIDEBAR": {
     "ASSIGNEE_LABEL": "Assigned Agent",
-    "SELF_ASSIGN": "Assign to me",
-    "TEAM_LABEL": "Assigned Team",
+    "SELF_ASSIGN": "Aan mij toewijzen",
+    "TEAM_LABEL": "Toegewezen team",
     "SELECT": {
-      "PLACEHOLDER": "None"
+      "PLACEHOLDER": "Geen"
     },
     "ACCORDION": {
-      "CONTACT_DETAILS": "Contact Details",
+      "CONTACT_DETAILS": "Contactgegevens",
       "CONVERSATION_ACTIONS": "Conversation Actions",
       "CONVERSATION_LABELS": "Labels voor gesprekken",
       "CONVERSATION_INFO": "Conversation Information",
       "CONTACT_ATTRIBUTES": "Contact Attributes",
       "PREVIOUS_CONVERSATION": "Vorige gesprekken",
-      "MACROS": "Macros"
+      "MACROS": "Macro's"
     }
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
-    "ADD_BUTTON_TEXT": "Create attribute",
+    "ADD_BUTTON_TEXT": "Maak kenmerk aan",
     "UPDATE": {
       "SUCCESS": "Attribuut succesvol toegevoegd",
       "ERROR": "Kan het attribuut niet bijwerken. Probeer het later opnieuw"
@@ -295,9 +295,9 @@
   "EMAIL_HEADER": {
     "FROM": "van",
     "TO": "Aan",
-    "BCC": "Bcc",
-    "CC": "Cc",
-    "SUBJECT": "Subject"
+    "BCC": "BCC",
+    "CC": "CC",
+    "SUBJECT": "Onderwerp"
   },
   "CONVERSATION_PARTICIPANTS": {
     "SIDEBAR_MENU_TITLE": "Participating",
@@ -319,8 +319,8 @@
   "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"
+    "ORIGINAL_CONTENT": "Oorspronkelijke inhoud",
+    "TRANSLATED_CONTENT": "Vertaalde inhoud",
+    "NO_TRANSLATIONS_AVAILABLE": "Geen vertalingen beschikbaar voor deze inhoud"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/nl/generalSettings.json b/app/javascript/dashboard/i18n/locale/nl/generalSettings.json
index 9b95bd78e..a3812d30b 100644
--- a/app/javascript/dashboard/i18n/locale/nl/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/nl/generalSettings.json
@@ -2,8 +2,8 @@
   "GENERAL_SETTINGS": {
     "TITLE": "Accountinstellingen",
     "SUBMIT": "Instellingen bijwerken",
-    "BACK": "Back",
-    "DISMISS": "Dismiss",
+    "BACK": "Terug",
+    "DISMISS": "Negeer",
     "UPDATE": {
       "ERROR": "Instellingen konden niet worden bijgewerkt, probeer het opnieuw!",
       "SUCCESS": "Accountinstellingen succesvol bijgewerkt"
@@ -24,7 +24,7 @@
         "ERROR": "Voer een geldige accountnaam in"
       },
       "LANGUAGE": {
-        "LABEL": "Site language",
+        "LABEL": "Taal",
         "PLACEHOLDER": "Uw accountnaam",
         "ERROR": ""
       },
@@ -52,20 +52,20 @@
     "LEARN_MORE": "Learn more",
     "PAYMENT_PENDING": "Your payment is pending. Please update your payment information to continue using Chatwoot",
     "LIMITS_UPGRADE": "Your account has exceeded the usage limits, please upgrade your plan to continue using Chatwoot",
-    "OPEN_BILLING": "Open billing"
+    "OPEN_BILLING": "Openstaande facturering"
   },
   "FORMS": {
     "MULTISELECT": {
       "ENTER_TO_SELECT": "Press enter to select",
       "ENTER_TO_REMOVE": "Press enter to remove",
-      "SELECT_ONE": "Select one",
-      "SELECT": "Select"
+      "SELECT_ONE": "Selecteer een",
+      "SELECT": "Selecteer"
     }
   },
   "NOTIFICATIONS_PAGE": {
     "HEADER": "Notifications",
     "MARK_ALL_DONE": "Mark All Done",
-    "DELETE_TITLE": "deleted",
+    "DELETE_TITLE": "verwijderd",
     "UNREAD_NOTIFICATION": {
       "TITLE": "Unread Notifications",
       "ALL_NOTIFICATIONS": "View all notifications",
@@ -74,19 +74,19 @@
     },
     "LIST": {
       "LOADING_MESSAGE": "Loading notifications...",
-      "404": "No Notifications",
+      "404": "Geen meldingen",
       "TABLE_HEADER": [
         "Naam",
-        "Phone Number",
+        "Telefoonnummer",
         "Gesprekken",
-        "Last Contacted"
+        "Laatste contact"
       ]
     },
     "TYPE_LABEL": {
       "conversation_creation": "New conversation",
       "conversation_assignment": "Conversation Assigned",
-      "assigned_conversation_new_message": "New Message",
-      "participating_conversation_new_message": "New Message",
+      "assigned_conversation_new_message": "Nieuw bericht",
+      "participating_conversation_new_message": "Nieuw bericht",
       "conversation_mention": "Mention"
     }
   },
@@ -101,7 +101,7 @@
   "COMMAND_BAR": {
     "SEARCH_PLACEHOLDER": "Search or jump to",
     "SECTIONS": {
-      "GENERAL": "General",
+      "GENERAL": "Algemeen",
       "REPORTS": "Rapporten",
       "CONVERSATION": "Gesprek",
       "CHANGE_ASSIGNEE": "Change Assignee",
@@ -111,8 +111,9 @@
       "ADD_LABEL": "Add label to the conversation",
       "REMOVE_LABEL": "Remove label from the conversation",
       "SETTINGS": "Instellingen",
-      "AI_ASSIST": "AI Assist",
-      "APPEARANCE": "Appearance"
+      "AI_ASSIST": "AI-assistent",
+      "APPEARANCE": "Weergave",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     },
     "COMMANDS": {
       "GO_TO_CONVERSATION_DASHBOARD": "Go to Conversation Dashboard",
@@ -134,7 +135,7 @@
       "GO_TO_NOTIFICATIONS": "Go to Notifications",
       "ADD_LABELS_TO_CONVERSATION": "Add label to the conversation",
       "ASSIGN_AN_AGENT": "Assign an agent",
-      "AI_ASSIST": "AI Assist",
+      "AI_ASSIST": "AI-assistent",
       "ASSIGN_PRIORITY": "Assign priority",
       "ASSIGN_A_TEAM": "Assign a team",
       "MUTE_CONVERSATION": "Mute conversation",
@@ -143,17 +144,18 @@
       "REOPEN_CONVERSATION": "Reopen conversation",
       "RESOLVE_CONVERSATION": "Resolve conversation",
       "SEND_TRANSCRIPT": "Send an email transcript",
-      "SNOOZE_CONVERSATION": "Snooze Conversation",
-      "UNTIL_NEXT_REPLY": "Until next reply",
-      "UNTIL_NEXT_WEEK": "Until next week",
-      "UNTIL_TOMORROW": "Until tomorrow",
-      "UNTIL_NEXT_MONTH": "Until next month",
+      "SNOOZE_CONVERSATION": "Demp gesprek",
+      "UNTIL_NEXT_REPLY": "Tot de volgende reactie",
+      "UNTIL_NEXT_WEEK": "Tot volgende week",
+      "UNTIL_TOMORROW": "Tot morgen",
+      "UNTIL_NEXT_MONTH": "Tot volgende maand",
       "AN_HOUR_FROM_NOW": "Until an hour from now",
       "CUSTOM": "Custom...",
       "CHANGE_APPEARANCE": "Change Appearance",
       "LIGHT_MODE": "Light",
       "DARK_MODE": "Dark",
-      "SYSTEM_MODE": "Systeem"
+      "SYSTEM_MODE": "Systeem",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     }
   },
   "DASHBOARD_APPS": {
diff --git a/app/javascript/dashboard/i18n/locale/nl/helpCenter.json b/app/javascript/dashboard/i18n/locale/nl/helpCenter.json
index 22b9d49c6..9b8d2e51e 100644
--- a/app/javascript/dashboard/i18n/locale/nl/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/nl/helpCenter.json
@@ -210,7 +210,7 @@
           }
         ],
         "CREATE_FLOW_PAGE": {
-          "BACK_BUTTON": "Back",
+          "BACK_BUTTON": "Terug",
           "BASIC_SETTINGS_PAGE": {
             "HEADER": "Create Portal",
             "TITLE": "Help center information",
@@ -324,7 +324,8 @@
         "LAST_EDITED": "Last edited"
       },
       "COLUMNS": {
-        "BY": "by"
+        "BY": "by",
+        "AUTHOR_NOT_AVAILABLE": "Author is not available"
       }
     },
     "EDIT_ARTICLE": {
@@ -451,7 +452,7 @@
       "SUCCESS_ARTICLE_INSERTED": "Article inserted successfully",
       "PREVIEW_LINK": "Preview article",
       "CANCEL": "Sluiten",
-      "BACK": "Back",
+      "BACK": "Terug",
       "BACK_RESULTS": "Back to results"
     },
     "UPGRADE_PAGE": {
diff --git a/app/javascript/dashboard/i18n/locale/nl/inbox.json b/app/javascript/dashboard/i18n/locale/nl/inbox.json
new file mode 100644
index 000000000..b7ec502d1
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/nl/inbox.json
@@ -0,0 +1,60 @@
+{
+  "INBOX": {
+    "LIST": {
+      "TITLE": "Postvak In",
+      "DISPLAY_DROPDOWN": "Display",
+      "LOADING": "Fetching notifications",
+      "EOF": "Alle notificaties geladen 🎉",
+      "404": "There are no active notifications in this group.",
+      "NO_NOTIFICATIONS": "No notifications",
+      "NOTE": "Notifications from all subscribed inboxes",
+      "SNOOZED_UNTIL": "Snooze tot",
+      "SNOOZED_UNTIL_TOMORROW": "Snoozed tot morgen",
+      "SNOOZED_UNTIL_NEXT_WEEK": "Snoozed tot volgende week"
+    },
+    "ACTION_HEADER": {
+      "SNOOZE": "Snooze notification",
+      "DELETE": "Delete notification"
+    },
+    "TYPES": {
+      "CONVERSATION_MENTION": "You have been mentioned in a conversation",
+      "CONVERSATION_CREATION": "New conversation created",
+      "CONVERSATION_ASSIGNMENT": "A conversation has been assigned to you",
+      "ASSIGNED_CONVERSATION_NEW_MESSAGE": "New message in an assigned conversation",
+      "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "New message in a conversation you are participating in"
+    },
+    "MENU_ITEM": {
+      "MARK_AS_READ": "Mark as read",
+      "MARK_AS_UNREAD": "Markeer als ongelezen",
+      "SNOOZE": "Sluimeren",
+      "DELETE": "Verwijderen",
+      "MARK_ALL_READ": "Markeer alles als gelezen",
+      "DELETE_ALL": "Delete all",
+      "DELETE_ALL_READ": "Delete all read"
+    },
+    "DISPLAY_MENU": {
+      "SORT": "Sort",
+      "DISPLAY": "Display :",
+      "SORT_OPTIONS": {
+        "NEWEST": "Newest",
+        "OLDEST": "Oldest",
+        "PRIORITY": "Prioriteit"
+      },
+      "DISPLAY_OPTIONS": {
+        "SNOOZED": "Gesluimerd",
+        "READ": "Lezen",
+        "LABELS": "Labelen",
+        "CONVERSATION_ID": "Conversation ID"
+      }
+    },
+    "ALERTS": {
+      "MARK_AS_READ": "Notification marked as read",
+      "MARK_AS_UNREAD": "Notification marked as unread",
+      "SNOOZE": "Notification snoozed",
+      "DELETE": "Notification deleted",
+      "MARK_ALL_READ": "All notifications marked as read",
+      "DELETE_ALL": "All notifications deleted",
+      "DELETE_ALL_READ": "All read notifications deleted"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json
index 4413070bc..c0233071c 100644
--- a/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json
@@ -39,7 +39,7 @@
       },
       "FB": {
         "HELP": "PS: Door in te loggen krijgen we alleen toegang tot berichten van uw Pagina. Chatwood heeft nooit toegang tot je privéberichten.",
-        "CHOOSE_PAGE": "Choose Page",
+        "CHOOSE_PAGE": "Kies pagina",
         "CHOOSE_PLACEHOLDER": "Select a page from the list",
         "INBOX_NAME": "Inbox Name",
         "ADD_NAME": "Add a name for your inbox",
@@ -58,7 +58,7 @@
         "DESC": "Maak een kanaal voor uw website en begin met het ondersteunen van uw klanten via onze website widget.",
         "LOADING_MESSAGE": "Website ondersteuningskanaal aanmaken",
         "CHANNEL_AVATAR": {
-          "LABEL": "Channel Avatar"
+          "LABEL": "Avatar kanaal"
         },
         "CHANNEL_WEBHOOK_URL": {
           "LABEL": "Webhook URL",
@@ -157,10 +157,10 @@
         }
       },
       "SMS": {
-        "TITLE": "SMS Channel",
+        "TITLE": "SMS-kanaal",
         "DESC": "Start supporting your customers via SMS.",
         "PROVIDERS": {
-          "LABEL": "API Provider",
+          "LABEL": "API-aanbieder",
           "TWILIO": "Twilio",
           "BANDWIDTH": "Bandbreedte"
         },
@@ -179,12 +179,12 @@
             "ERROR": "Dit veld is verplicht"
           },
           "API_SECRET": {
-            "LABEL": "API Secret",
+            "LABEL": "API-geheim",
             "PLACEHOLDER": "Please enter your Bandwith API Secret",
             "ERROR": "Dit veld is verplicht"
           },
           "APPLICATION_ID": {
-            "LABEL": "Application ID",
+            "LABEL": "Applicatie-ID",
             "PLACEHOLDER": "Please enter your Bandwidth Application ID",
             "ERROR": "Dit veld is verplicht"
           },
@@ -212,10 +212,10 @@
         "TITLE": "WhatsApp Channel",
         "DESC": "Start supporting your customers via WhatsApp.",
         "PROVIDERS": {
-          "LABEL": "API Provider",
+          "LABEL": "API-aanbieder",
           "TWILIO": "Twilio",
           "WHATSAPP_CLOUD": "WhatsApp Cloud",
-          "360_DIALOG": "360Dialog"
+          "360_DIALOG": "360dialog"
         },
         "INBOX_NAME": {
           "LABEL": "Inbox Name",
@@ -243,9 +243,9 @@
           "ERROR": "Please enter a valid value."
         },
         "API_KEY": {
-          "LABEL": "API key",
+          "LABEL": "API-sleutel",
           "SUBTITLE": "Configure the WhatsApp API key.",
-          "PLACEHOLDER": "API key",
+          "PLACEHOLDER": "API-sleutel",
           "ERROR": "Please enter a valid value."
         },
         "API_CALLBACK": {
@@ -260,7 +260,7 @@
         }
       },
       "API_CHANNEL": {
-        "TITLE": "API Channel",
+        "TITLE": "API-kanaal",
         "DESC": "Integrate with API channel and start supporting your customers.",
         "CHANNEL_NAME": {
           "LABEL": "Kanaal naam",
@@ -297,7 +297,7 @@
         "FINISH_MESSAGE": "Start forwarding your emails to the following email address."
       },
       "LINE_CHANNEL": {
-        "TITLE": "LINE Channel",
+        "TITLE": "LINE-kanaal",
         "DESC": "Integrate with LINE channel and start supporting your customers.",
         "CHANNEL_NAME": {
           "LABEL": "Kanaal naam",
@@ -339,7 +339,7 @@
         }
       },
       "AUTH": {
-        "TITLE": "Choose a channel",
+        "TITLE": "Kies een kanaal",
         "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": {
@@ -569,7 +569,7 @@
       "UPDATE": "Update business hours settings",
       "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
       "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for visitors",
-      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours visitors can be warned with a message and a pre-chat form.",
       "DAY": {
         "ENABLE": "Enable availability for this day",
         "UNAVAILABLE": "Unavailable",
diff --git a/app/javascript/dashboard/i18n/locale/nl/macros.json b/app/javascript/dashboard/i18n/locale/nl/macros.json
index 67d3e4177..c76ba92ac 100644
--- a/app/javascript/dashboard/i18n/locale/nl/macros.json
+++ b/app/javascript/dashboard/i18n/locale/nl/macros.json
@@ -1,6 +1,6 @@
 {
   "MACROS": {
-    "HEADER": "Macros",
+    "HEADER": "Macro's",
     "HEADER_BTN_TXT": "Add a new macro",
     "HEADER_BTN_TXT_SAVE": "Save macro",
     "LOADING": "Fetching macros",
diff --git a/app/javascript/dashboard/i18n/locale/nl/settings.json b/app/javascript/dashboard/i18n/locale/nl/settings.json
index 2a96fcce3..c7ecf0c8f 100644
--- a/app/javascript/dashboard/i18n/locale/nl/settings.json
+++ b/app/javascript/dashboard/i18n/locale/nl/settings.json
@@ -160,6 +160,9 @@
     "TRIAL_MESSAGE": "dagen proefperiode resterend.",
     "TRAIL_BUTTON": "Nu kopen",
     "DELETED_USER": "Deleted User",
+    "EMAIL_VERIFICATION_PENDING": "It seems that you haven't verified your email address yet. Please check your inbox for the verification email.",
+    "RESEND_VERIFICATION_MAIL": "Resend verification email",
+    "EMAIL_VERIFICATION_SENT": "Verification email has been sent. Please check your inbox.",
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Account Suspended",
       "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
@@ -197,6 +200,7 @@
     "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
     "SWITCH": "Switch",
     "CONVERSATIONS": "Gesprekken",
+    "INBOX": "Postvak In",
     "ALL_CONVERSATIONS": "Alle gesprekken",
     "MENTIONED_CONVERSATIONS": "Vermeldingen",
     "PARTICIPATING_CONVERSATIONS": "Participating",
@@ -218,7 +222,7 @@
     "LABELS": "Labelen",
     "CUSTOM_ATTRIBUTES": "Aangepaste attributen",
     "AUTOMATION": "Automation",
-    "MACROS": "Macros",
+    "MACROS": "Macro's",
     "TEAMS": "Teams",
     "BILLING": "Billing",
     "CUSTOM_VIEWS_FOLDER": "Folders",
@@ -238,6 +242,7 @@
     "REPORTS_INBOX": "Postvak In",
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
+    "SLA": "SLA",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Overview",
     "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
diff --git a/app/javascript/dashboard/i18n/locale/nl/sla.json b/app/javascript/dashboard/i18n/locale/nl/sla.json
new file mode 100644
index 000000000..c1201f037
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/nl/sla.json
@@ -0,0 +1,70 @@
+{
+  "SLA": {
+    "HEADER": "SLA",
+    "HEADER_BTN_TXT": "Add SLA",
+    "LOADING": "Fetching SLAs",
+    "SEARCH_404": "Er zijn geen items die overeenkomen met deze zoekopdracht",
+    "SIDEBAR_TXT": "<p><b>SLA</b> <p>Think of Service Level Agreements (SLAs) like friendly promises between a service provider and a customer.</p> <p> These promises set clear expectations for things like how quickly the team will respond to issues, making sure you always get a reliable and top-notch experience!</p>",
+    "LIST": {
+      "404": "There are no SLAs available in this account.",
+      "TITLE": "Manage SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "TABLE_HEADER": [
+        "Naam",
+        "Beschrijving",
+        "FRT",
+        "NRT",
+        "RT",
+        "Business Hours"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "SLA Name",
+        "PLACEHOLDER": "SLA Name",
+        "REQUIRED_ERROR": "SLA name is required",
+        "MINIMUM_LENGTH_ERROR": "Minimum lengte van 2 is vereist",
+        "VALID_ERROR": "Enkel letters, cijfers, liggend streepje & underscore zijn toegestaan"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Beschrijving",
+        "PLACEHOLDER": "SLA for premium customers"
+      },
+      "FIRST_RESPONSE_TIME": {
+        "LABEL": "First Response Time(Seconds)",
+        "PLACEHOLDER": "300 for 5 minutes"
+      },
+      "NEXT_RESPONSE_TIME": {
+        "LABEL": "Next Response Time(Seconds)",
+        "PLACEHOLDER": "600 for 10 minutes"
+      },
+      "RESOLUTION_TIME": {
+        "LABEL": "Resolution Time(Seconds)",
+        "PLACEHOLDER": "86400 for 1 day"
+      },
+      "BUSINESS_HOURS": {
+        "LABEL": "Business Hours",
+        "PLACEHOLDER": "Only during business hours"
+      },
+      "EDIT": "Bewerken",
+      "CREATE": "Aanmaken",
+      "DELETE": "Verwijderen",
+      "CANCEL": "Annuleren"
+    },
+    "ADD": {
+      "TITLE": "Add SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA added successfully",
+        "ERROR_MESSAGE": "Er is een fout opgetreden, probeer het opnieuw"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit SLA",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA updated successfully",
+        "ERROR_MESSAGE": "Er is een fout opgetreden, probeer het opnieuw"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/no/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/no/attributesMgmt.json
index d4aa4acd1..a0ae848e4 100644
--- a/app/javascript/dashboard/i18n/locale/no/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/no/attributesMgmt.json
@@ -39,6 +39,17 @@
           "PLACEHOLDER": "Enter custom attribute key",
           "ERROR": "Key is required",
           "IN_VALID": "Invalid key"
+        },
+        "REGEX_PATTERN": {
+          "LABEL": "Regex Pattern",
+          "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+        },
+        "REGEX_CUE": {
+          "LABEL": "Regex Cue",
+          "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+        },
+        "ENABLE_REGEX": {
+          "LABEL": "Enable regex validation"
         }
       },
       "API": {
@@ -93,6 +104,17 @@
       "EMPTY_RESULT": {
         "404": "There are no custom attributes created",
         "NOT_FOUND": "There are no custom attributes configured"
+      },
+      "REGEX_PATTERN": {
+        "LABEL": "Regex Pattern",
+        "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+      },
+      "REGEX_CUE": {
+        "LABEL": "Regex Cue",
+        "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+      },
+      "ENABLE_REGEX": {
+        "LABEL": "Enable regex validation"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/no/contact.json b/app/javascript/dashboard/i18n/locale/no/contact.json
index ee75ea317..ade37f07e 100644
--- a/app/javascript/dashboard/i18n/locale/no/contact.json
+++ b/app/javascript/dashboard/i18n/locale/no/contact.json
@@ -39,10 +39,10 @@
     },
     "MERGE_CONTACT": "Merge contact",
     "CONTACT_ACTIONS": "Contact actions",
-    "MUTE_CONTACT": "Demp samtale",
-    "UNMUTE_CONTACT": "Skru av demping",
-    "MUTED_SUCCESS": "Denne samtalen er dempet i 6 timer",
-    "UNMUTED_SUCCESS": "Demping er skrudd av for samtalen",
+    "MUTE_CONTACT": "Block Contact",
+    "UNMUTE_CONTACT": "Unblock Contact",
+    "MUTED_SUCCESS": "This contact is blocked successfully. You will not be notified of any future conversations.",
+    "UNMUTED_SUCCESS": "This contact is unblocked successfully.",
     "SEND_TRANSCRIPT": "Send kopi av samtale",
     "EDIT_LABEL": "Rediger",
     "SIDEBAR_SECTIONS": {
@@ -79,7 +79,13 @@
     "TITLE": "Export Contacts",
     "DESC": "Export contacts to a CSV file.",
     "SUCCESS_MESSAGE": "Export is in progress, You will be notified via email when export file is ready to dowanlod.",
-    "ERROR_MESSAGE": "Det oppstod en feil. Prøv igjen"
+    "ERROR_MESSAGE": "Det oppstod en feil. Prøv igjen",
+    "CONFIRM": {
+      "TITLE": "Export Contacts",
+      "MESSAGE": "Are you sure you want to export all contacts?",
+      "YES": "Yes, Export",
+      "NO": "No, Cancel"
+    }
   },
   "DELETE_NOTE": {
     "CONFIRM": {
@@ -339,7 +345,8 @@
     },
     "VALIDATIONS": {
       "REQUIRED": "Valid value is required",
-      "INVALID_URL": "Invalid URL"
+      "INVALID_URL": "Invalid URL",
+      "INVALID_INPUT": "Invalid Input"
     }
   },
   "MERGE_CONTACTS": {
diff --git a/app/javascript/dashboard/i18n/locale/no/generalSettings.json b/app/javascript/dashboard/i18n/locale/no/generalSettings.json
index 66f8cb3ff..fc500c474 100644
--- a/app/javascript/dashboard/i18n/locale/no/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/no/generalSettings.json
@@ -112,7 +112,8 @@
       "REMOVE_LABEL": "Remove label from the conversation",
       "SETTINGS": "Innstillinger",
       "AI_ASSIST": "AI Assist",
-      "APPEARANCE": "Appearance"
+      "APPEARANCE": "Appearance",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     },
     "COMMANDS": {
       "GO_TO_CONVERSATION_DASHBOARD": "Go to Conversation Dashboard",
@@ -153,7 +154,8 @@
       "CHANGE_APPEARANCE": "Change Appearance",
       "LIGHT_MODE": "Light",
       "DARK_MODE": "Dark",
-      "SYSTEM_MODE": "System"
+      "SYSTEM_MODE": "System",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     }
   },
   "DASHBOARD_APPS": {
diff --git a/app/javascript/dashboard/i18n/locale/no/helpCenter.json b/app/javascript/dashboard/i18n/locale/no/helpCenter.json
index 74f0c543e..ba9f561a8 100644
--- a/app/javascript/dashboard/i18n/locale/no/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/no/helpCenter.json
@@ -324,7 +324,8 @@
         "LAST_EDITED": "Last edited"
       },
       "COLUMNS": {
-        "BY": "by"
+        "BY": "by",
+        "AUTHOR_NOT_AVAILABLE": "Author is not available"
       }
     },
     "EDIT_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/no/inbox.json b/app/javascript/dashboard/i18n/locale/no/inbox.json
new file mode 100644
index 000000000..01a933135
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/no/inbox.json
@@ -0,0 +1,60 @@
+{
+  "INBOX": {
+    "LIST": {
+      "TITLE": "Inbox",
+      "DISPLAY_DROPDOWN": "Display",
+      "LOADING": "Fetching notifications",
+      "EOF": "All notifications loaded 🎉",
+      "404": "There are no active notifications in this group.",
+      "NO_NOTIFICATIONS": "No notifications",
+      "NOTE": "Notifications from all subscribed inboxes",
+      "SNOOZED_UNTIL": "Snoozed until",
+      "SNOOZED_UNTIL_TOMORROW": "Snoozed until tomorrow",
+      "SNOOZED_UNTIL_NEXT_WEEK": "Snoozed until next week"
+    },
+    "ACTION_HEADER": {
+      "SNOOZE": "Snooze notification",
+      "DELETE": "Delete notification"
+    },
+    "TYPES": {
+      "CONVERSATION_MENTION": "You have been mentioned in a conversation",
+      "CONVERSATION_CREATION": "New conversation created",
+      "CONVERSATION_ASSIGNMENT": "A conversation has been assigned to you",
+      "ASSIGNED_CONVERSATION_NEW_MESSAGE": "New message in an assigned conversation",
+      "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "New message in a conversation you are participating in"
+    },
+    "MENU_ITEM": {
+      "MARK_AS_READ": "Mark as read",
+      "MARK_AS_UNREAD": "Mark as unread",
+      "SNOOZE": "Snooze",
+      "DELETE": "Slett",
+      "MARK_ALL_READ": "Mark all as read",
+      "DELETE_ALL": "Delete all",
+      "DELETE_ALL_READ": "Delete all read"
+    },
+    "DISPLAY_MENU": {
+      "SORT": "Sort",
+      "DISPLAY": "Display :",
+      "SORT_OPTIONS": {
+        "NEWEST": "Newest",
+        "OLDEST": "Oldest",
+        "PRIORITY": "Priority"
+      },
+      "DISPLAY_OPTIONS": {
+        "SNOOZED": "Snoozed",
+        "READ": "Read",
+        "LABELS": "Etiketter",
+        "CONVERSATION_ID": "Conversation ID"
+      }
+    },
+    "ALERTS": {
+      "MARK_AS_READ": "Notification marked as read",
+      "MARK_AS_UNREAD": "Notification marked as unread",
+      "SNOOZE": "Notification snoozed",
+      "DELETE": "Notification deleted",
+      "MARK_ALL_READ": "All notifications marked as read",
+      "DELETE_ALL": "All notifications deleted",
+      "DELETE_ALL_READ": "All read notifications deleted"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/no/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/no/inboxMgmt.json
index 39acb7a9e..a7aa3e4fc 100644
--- a/app/javascript/dashboard/i18n/locale/no/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/no/inboxMgmt.json
@@ -569,7 +569,7 @@
       "UPDATE": "Update business hours settings",
       "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
       "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for visitors",
-      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours visitors can be warned with a message and a pre-chat form.",
       "DAY": {
         "ENABLE": "Enable availability for this day",
         "UNAVAILABLE": "Unavailable",
diff --git a/app/javascript/dashboard/i18n/locale/no/settings.json b/app/javascript/dashboard/i18n/locale/no/settings.json
index 831deeff7..fff2604ef 100644
--- a/app/javascript/dashboard/i18n/locale/no/settings.json
+++ b/app/javascript/dashboard/i18n/locale/no/settings.json
@@ -160,6 +160,9 @@
     "TRIAL_MESSAGE": "dager gjenværende av prøveperioden.",
     "TRAIL_BUTTON": "Kjøp nå",
     "DELETED_USER": "Deleted User",
+    "EMAIL_VERIFICATION_PENDING": "It seems that you haven't verified your email address yet. Please check your inbox for the verification email.",
+    "RESEND_VERIFICATION_MAIL": "Resend verification email",
+    "EMAIL_VERIFICATION_SENT": "Verification email has been sent. Please check your inbox.",
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Account Suspended",
       "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
@@ -197,6 +200,7 @@
     "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
     "SWITCH": "Switch",
     "CONVERSATIONS": "Samtaler",
+    "INBOX": "Inbox",
     "ALL_CONVERSATIONS": "All Conversations",
     "MENTIONED_CONVERSATIONS": "Mentions",
     "PARTICIPATING_CONVERSATIONS": "Participating",
@@ -238,6 +242,7 @@
     "REPORTS_INBOX": "Inbox",
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
+    "SLA": "SLA",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Overview",
     "FACEBOOK_REAUTHORIZE": "Facebook-tilkoblingen din er utløpt, koble til Facebook-siden din for å fortsette tjenester",
diff --git a/app/javascript/dashboard/i18n/locale/no/sla.json b/app/javascript/dashboard/i18n/locale/no/sla.json
new file mode 100644
index 000000000..170bf1a94
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/no/sla.json
@@ -0,0 +1,70 @@
+{
+  "SLA": {
+    "HEADER": "SLA",
+    "HEADER_BTN_TXT": "Add SLA",
+    "LOADING": "Fetching SLAs",
+    "SEARCH_404": "Det finnes ingen elementer som samsvarer med denne spørringen",
+    "SIDEBAR_TXT": "<p><b>SLA</b> <p>Think of Service Level Agreements (SLAs) like friendly promises between a service provider and a customer.</p> <p> These promises set clear expectations for things like how quickly the team will respond to issues, making sure you always get a reliable and top-notch experience!</p>",
+    "LIST": {
+      "404": "There are no SLAs available in this account.",
+      "TITLE": "Manage SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "TABLE_HEADER": [
+        "Navn",
+        "Beskrivelse",
+        "FRT",
+        "NRT",
+        "RT",
+        "Business Hours"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "SLA Name",
+        "PLACEHOLDER": "SLA Name",
+        "REQUIRED_ERROR": "SLA name is required",
+        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
+        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Beskrivelse",
+        "PLACEHOLDER": "SLA for premium customers"
+      },
+      "FIRST_RESPONSE_TIME": {
+        "LABEL": "First Response Time(Seconds)",
+        "PLACEHOLDER": "300 for 5 minutes"
+      },
+      "NEXT_RESPONSE_TIME": {
+        "LABEL": "Next Response Time(Seconds)",
+        "PLACEHOLDER": "600 for 10 minutes"
+      },
+      "RESOLUTION_TIME": {
+        "LABEL": "Resolution Time(Seconds)",
+        "PLACEHOLDER": "86400 for 1 day"
+      },
+      "BUSINESS_HOURS": {
+        "LABEL": "Business Hours",
+        "PLACEHOLDER": "Only during business hours"
+      },
+      "EDIT": "Rediger",
+      "CREATE": "Opprett",
+      "DELETE": "Slett",
+      "CANCEL": "Avbryt"
+    },
+    "ADD": {
+      "TITLE": "Add SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA added successfully",
+        "ERROR_MESSAGE": "Det oppstod en feil. Prøv igjen"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit SLA",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA updated successfully",
+        "ERROR_MESSAGE": "Det oppstod en feil. Prøv igjen"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/pl/advancedFilters.json b/app/javascript/dashboard/i18n/locale/pl/advancedFilters.json
index a101be610..5b82fb085 100644
--- a/app/javascript/dashboard/i18n/locale/pl/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/pl/advancedFilters.json
@@ -1,15 +1,15 @@
 {
   "FILTER": {
     "TITLE": "Filtruj konwersacje",
-    "SUBTITLE": "Add your filters below and hit 'Apply filters' to cut through the chat clutter.",
+    "SUBTITLE": "Dodaj swoje filtry poniżej i kliknij 'Zastosuj filtry', aby przefiltrować nieporządek w rozmowach.",
     "EDIT_CUSTOM_FILTER": "Edytuj folder",
     "CUSTOM_VIEWS_SUBTITLE": "Dodaj lub usuń filtry i zaktualizuj swój folder.",
-    "ADD_NEW_FILTER": "Add filter",
-    "FILTER_DELETE_ERROR": "Oops, looks like we can't save nothing! Please add at least one filter to save it.",
+    "ADD_NEW_FILTER": "Dodaj filtr",
+    "FILTER_DELETE_ERROR": "Ups, wygląda na to, że nic nie możemy zapisać! Proszę dodać co najmniej jeden filtr, aby go zapisać.",
     "SUBMIT_BUTTON_LABEL": "Zastosuj filtry",
     "UPDATE_BUTTON_LABEL": "Zaktualizuj folder",
     "CANCEL_BUTTON_LABEL": "Anuluj",
-    "CLEAR_BUTTON_LABEL": "Clear filters",
+    "CLEAR_BUTTON_LABEL": "Wyczyść filtry",
     "FOLDER_LABEL": "Nazwa Folderu",
     "FOLDER_QUERY_LABEL": "Zapytanie do Folderu",
     "EMPTY_VALUE_ERROR": "Wartość jest wymagana.",
@@ -36,16 +36,16 @@
     },
     "ATTRIBUTES": {
       "STATUS": "Status",
-      "ASSIGNEE_NAME": "Assignee name",
+      "ASSIGNEE_NAME": "Imię przydzielonej osoby",
       "INBOX_NAME": "Nazwa skrzynki odbiorczej",
       "TEAM_NAME": "Nazwa zespołu",
-      "CONVERSATION_IDENTIFIER": "Conversation identifier",
-      "CAMPAIGN_NAME": "Campaign name",
+      "CONVERSATION_IDENTIFIER": "Identyfikator konwersacji",
+      "CAMPAIGN_NAME": "Nazwa kampanii",
       "LABELS": "Etykiety",
-      "BROWSER_LANGUAGE": "Browser language",
+      "BROWSER_LANGUAGE": "Język przeglądarki",
       "PRIORITY": "Priorytet",
-      "COUNTRY_NAME": "Country name",
-      "REFERER_LINK": "Link Odsyłający",
+      "COUNTRY_NAME": "Nazwa kraju",
+      "REFERER_LINK": "Link odsyłający",
       "CUSTOM_ATTRIBUTE_LIST": "Lista",
       "CUSTOM_ATTRIBUTE_TEXT": "Tekst",
       "CUSTOM_ATTRIBUTE_NUMBER": "Numer",
@@ -55,25 +55,25 @@
       "LAST_ACTIVITY": "Ostatnia aktywność"
     },
     "GROUPS": {
-      "STANDARD_FILTERS": "Standard filters",
-      "ADDITIONAL_FILTERS": "Additional filters",
-      "CUSTOM_ATTRIBUTES": "Custom attributes"
+      "STANDARD_FILTERS": "Standardowe filtry",
+      "ADDITIONAL_FILTERS": "Dodatkowe filtry",
+      "CUSTOM_ATTRIBUTES": "Atrybuty niestandardowe"
     },
     "CUSTOM_VIEWS": {
       "ADD": {
         "TITLE": "Czy chcesz zapisać ten filtr?",
-        "LABEL": "Nazwa Filtra",
-        "PLACEHOLDER": "Name your filter to refer it later.",
+        "LABEL": "Nazwij ten filtr",
+        "PLACEHOLDER": "Nazwij swój filtr, aby móc do niego później się odwołać.",
         "ERROR_MESSAGE": "Nazwa jest wymagana.",
         "SAVE_BUTTON": "Zapisz filtr",
         "CANCEL_BUTTON": "Anuluj",
         "API_FOLDERS": {
-          "SUCCESS_MESSAGE": "Pomyślnie utworzono folder.",
-          "ERROR_MESSAGE": "Błąd podczas tworzenia folderu."
+          "SUCCESS_MESSAGE": "Folder został pomyślnie utworzony.",
+          "ERROR_MESSAGE": "Wystąpił błąd podczas tworzenia folderu."
         },
         "API_SEGMENTS": {
-          "SUCCESS_MESSAGE": "Pomyślnie utworzono segment.",
-          "ERROR_MESSAGE": "Błąd podczas tworzenia segmentu."
+          "SUCCESS_MESSAGE": "Segment został pomyślnie utworzony.",
+          "ERROR_MESSAGE": "Wystąpił błąd podczas tworzenia segmentu."
         }
       },
       "EDIT": {
@@ -84,18 +84,18 @@
         "MODAL": {
           "CONFIRM": {
             "TITLE": "Potwierdzenie usunięcia",
-            "MESSAGE": "Czy na pewno chcesz usunąć filtr ",
-            "YES": "Yes, delete",
+            "MESSAGE": "Czy na pewno chcesz usunąć ten filtr ",
+            "YES": "Tak, usuń",
             "NO": "Nie, zostaw"
           }
         },
         "API_FOLDERS": {
-          "SUCCESS_MESSAGE": "Pomyślnie usunięto folder.",
-          "ERROR_MESSAGE": "Błąd podczas usuwania folderu."
+          "SUCCESS_MESSAGE": "Folder został pomyślnie usunięty.",
+          "ERROR_MESSAGE": "Wystąpił błąd podczas usuwania folderu."
         },
         "API_SEGMENTS": {
-          "SUCCESS_MESSAGE": "Pomyślnie usunięto segment.",
-          "ERROR_MESSAGE": "Błąd podczas usuwania segmentu."
+          "SUCCESS_MESSAGE": "Segment został pomyślnie usunięty.",
+          "ERROR_MESSAGE": "Wystąpił błąd podczas usuwania segmentu."
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/pl/agentBots.json b/app/javascript/dashboard/i18n/locale/pl/agentBots.json
index 62bf6c24a..f24852af7 100644
--- a/app/javascript/dashboard/i18n/locale/pl/agentBots.json
+++ b/app/javascript/dashboard/i18n/locale/pl/agentBots.json
@@ -1,73 +1,73 @@
 {
   "AGENT_BOTS": {
     "HEADER": "Boty",
-    "LOADING_EDITOR": "Loading editor...",
-    "HEADER_BTN_TXT": "Add bot configuration",
-    "SIDEBAR_TXT": "<p><b>Agent Bots</b> <p>Agent Bots are like the most fabulous members of your team. They can handle the small stuff, so you can focus on the stuff that matters. Give them a try.</p> <p> You can manage your bots from this page or create new ones using the 'Add bot configuraton' button.</p> <p> Open the <a href=\"https://www.chatwoot.com/hc/chatwoot-user-guide-cloud-version/articles/1677497472-how-to-use-agent-bots\" target=\"blank\">Agent bots handbook</a> in another tab for a helping hand.</p>",
+    "LOADING_EDITOR": "Ładowanie edytora...",
+    "HEADER_BTN_TXT": "Dodaj konfigurację bota",
+    "SIDEBAR_TXT": "<p><b>Boty Agentów</b></p><p>Boty Agentów są jak najwspanialsi członkowie Twojego zespołu. Mogą zajmować się drobnostkami, dzięki czemu Ty możesz skupić się na tym, co naprawdę ważne. Spróbuj ich.</p><p> Możesz zarządzać swoimi botami z tej strony lub tworzyć nowe, używając przycisku 'Dodaj konfigurację bota'.</p><p> Otwórz <a href=\"https://www.chatwoot.com/hc/chatwoot-user-guide-cloud-version/articles/1677497472-how-to-use-agent-bots\" target=\"blank\">podręcznik Botów Agentów</a> w innej karcie, aby uzyskać pomoc.</p>",
     "CSML_BOT_EDITOR": {
       "NAME": {
-        "LABEL": "Bot name",
-        "PLACEHOLDER": "Name your bot.",
+        "LABEL": "Nazwa bota",
+        "PLACEHOLDER": "Nazwij swojego bota.",
         "ERROR": "Nazwa bota jest wymagana."
       },
       "DESCRIPTION": {
-        "LABEL": "Bot description",
+        "LABEL": "Opis bota",
         "PLACEHOLDER": "Co robi ten bot?"
       },
       "BOT_CONFIG": {
         "ERROR": "Proszę wprowadzić konfigurację bota CSML powyżej.",
-        "API_ERROR": "Your CSML configuration is invalid. Please fix it and try again."
+        "API_ERROR": "Twoja konfiguracja CSML jest nieprawidłowa. Proszę ją poprawić i spróbować ponownie."
       },
-      "SUBMIT": "Sprawdź i zapisz"
+      "SUBMIT": "Zweryfikuj i zapisz"
     },
     "BOT_CONFIGURATION": {
       "TITLE": "Wybierz bota agenta",
-      "DESC": "Assign an Agent Bot to your inbox. They can handle initial conversations and transfer them to a live agent when necessary.",
+      "DESC": "Przypisz Bota Agenta do swojej skrzynki odbiorczej. Mogą oni obsługiwać wstępne rozmowy i przekazywać je do żywego agenta, gdy jest to konieczne.",
       "SUBMIT": "Aktualizuj",
-      "DISCONNECT": "Disconnect bot",
+      "DISCONNECT": "Odłącz bota",
       "SUCCESS_MESSAGE": "Pomyślnie zaktualizowano bota agenta.",
       "DISCONNECTED_SUCCESS_MESSAGE": "Pomyślnie odłączono bota agenta.",
-      "ERROR_MESSAGE": "Could not update the agent bot. Please try again.",
-      "DISCONNECTED_ERROR_MESSAGE": "Could not disconnect the agent bot. Please try again.",
-      "SELECT_PLACEHOLDER": "Select bot"
+      "ERROR_MESSAGE": "Nie udało się zaktualizować bota agenta. Proszę spróbować ponownie.",
+      "DISCONNECTED_ERROR_MESSAGE": "Nie udało się odłączyć bota agenta. Proszę spróbować ponownie.",
+      "SELECT_PLACEHOLDER": "Wybierz bota"
     },
     "ADD": {
       "TITLE": "Konfiguruj nowego bota",
       "CANCEL_BUTTON_TEXT": "Anuluj",
       "API": {
-        "SUCCESS_MESSAGE": "Pomyślnie dodano bota.",
-        "ERROR_MESSAGE": "Could not add bot. Please try again later."
+        "SUCCESS_MESSAGE": "Bot dodany pomyślnie.",
+        "ERROR_MESSAGE": "Nie udało się dodać bota. Proszę spróbować później."
       }
     },
     "LIST": {
-      "404": "No bots found. You can create a bot by clicking the 'Configure new bot' button ↗",
-      "LOADING": "Fetching bots...",
-      "TYPE": "Bot type"
+      "404": "Nie znaleziono botów. Możesz stworzyć bota, klikając przycisk 'Konfiguruj nowego bota' ↗",
+      "LOADING": "Pobieranie botów...",
+      "TYPE": "Typ bota"
     },
     "DELETE": {
       "BUTTON_TEXT": "Usuń",
-      "TITLE": "Delete bot",
+      "TITLE": "Usuń bota",
       "SUBMIT": "Usuń",
       "CANCEL_BUTTON_TEXT": "Anuluj",
       "DESCRIPTION": "Czy na pewno chcesz usunąć tego bota? Ta akcja jest nieodwracalna.",
       "API": {
-        "SUCCESS_MESSAGE": "Pomyślnie usunięto bota.",
-        "ERROR_MESSAGE": "Could not delete bot. Please try again."
+        "SUCCESS_MESSAGE": "Bot usunięty pomyślnie.",
+        "ERROR_MESSAGE": "Nie udało się usunąć bota. Proszę spróbować ponownie."
       }
     },
     "EDIT": {
       "BUTTON_TEXT": "Edytuj",
-      "LOADING": "Fetching bots...",
-      "TITLE": "Edit bot",
+      "LOADING": "Pobieranie botów...",
+      "TITLE": "Edytuj bota",
       "CANCEL_BUTTON_TEXT": "Anuluj",
       "API": {
-        "SUCCESS_MESSAGE": "Pomyślnie zaktualizowano bota.",
-        "ERROR_MESSAGE": "Could not update bot. Please try again."
+        "SUCCESS_MESSAGE": "Bot zaktualizowany pomyślnie.",
+        "ERROR_MESSAGE": "Nie udało się zaktualizować bota. Proszę spróbować ponownie."
       }
     },
     "TYPES": {
-      "WEBHOOK": "Webhook bot",
-      "CSML": "CSML bot"
+      "WEBHOOK": "Bot webhook",
+      "CSML": "Bot CSML"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pl/agentMgmt.json b/app/javascript/dashboard/i18n/locale/pl/agentMgmt.json
index aba4bba2d..c5c7bc040 100644
--- a/app/javascript/dashboard/i18n/locale/pl/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pl/agentMgmt.json
@@ -12,7 +12,7 @@
       "404": "Nie ma agentów powiązanych z tym kontem",
       "TITLE": "Zarządzaj agentami w zespole",
       "DESC": "Możesz dodać/usunąć agentów do/w zespole.",
-      "NAME": "Nazwa",
+      "NAME": "Imię",
       "EMAIL": "EMAIL",
       "STATUS": "Status",
       "ACTIONS": "Akcje",
@@ -42,18 +42,18 @@
       "API": {
         "SUCCESS_MESSAGE": "Agent dodany pomyślnie",
         "EXIST_MESSAGE": "Email agenta jest już w użyciu, spróbuj innego adresu e-mail",
-        "ERROR_MESSAGE": "Nie można połączyć się z Woot Server, spróbuj ponownie później"
+        "ERROR_MESSAGE": "Nie można połączyć się z serwerem Woot, proszę spróbować później"
       }
     },
     "DELETE": {
       "BUTTON_TEXT": "Usuń",
       "API": {
-        "SUCCESS_MESSAGE": "Agent usunięty pomyślnie",
-        "ERROR_MESSAGE": "Nie można połączyć się z Woot Server, spróbuj ponownie później"
+        "SUCCESS_MESSAGE": "Agent został pomyślnie usunięty",
+        "ERROR_MESSAGE": "Nie można połączyć się z serwerem Woot, proszę spróbować później"
       },
       "CONFIRM": {
         "TITLE": "Potwierdź usunięcie",
-        "MESSAGE": "Czy na pewno chcesz usunąć ",
+        "MESSAGE": "Czy jesteś pewien, że chcesz usunąć ",
         "YES": "Tak, usuń ",
         "NO": "Nie, zachowaj "
       }
@@ -62,22 +62,22 @@
       "TITLE": "Edytuj agenta",
       "FORM": {
         "NAME": {
-          "LABEL": "Nazwa agenta",
-          "PLACEHOLDER": "Wprowadź nazwę agenta"
+          "LABEL": "Imię agenta",
+          "PLACEHOLDER": "Proszę wprowadzić imię agenta"
         },
         "AGENT_TYPE": {
-          "LABEL": "Typ agenta",
-          "PLACEHOLDER": "Wybierz typ",
-          "ERROR": "Typ agenta jest wymagany"
+          "LABEL": "Rola",
+          "PLACEHOLDER": "Proszę wybrać rolę",
+          "ERROR": "Rola jest wymagana"
         },
         "EMAIL": {
           "LABEL": "Adres e-mail",
-          "PLACEHOLDER": "Wprowadź adres e-mail agenta"
+          "PLACEHOLDER": "Proszę wprowadzić adres e-mail agenta"
         },
         "AGENT_AVAILABILITY": {
           "LABEL": "Dostępność",
-          "PLACEHOLDER": "Wybierz status dostępności",
-          "ERROR": "Wymagana jest dostępność"
+          "PLACEHOLDER": "Proszę wybrać status dostępności",
+          "ERROR": "Dostępność jest wymagana"
         },
         "SUBMIT": "Edytuj agenta"
       },
@@ -85,17 +85,17 @@
       "CANCEL_BUTTON_TEXT": "Anuluj",
       "API": {
         "SUCCESS_MESSAGE": "Agent został pomyślnie zaktualizowany",
-        "ERROR_MESSAGE": "Nie można połączyć się z Woot Server, spróbuj ponownie później"
+        "ERROR_MESSAGE": "Nie można połączyć się z serwerem Woot, proszę spróbować później"
       },
       "PASSWORD_RESET": {
-        "ADMIN_RESET_BUTTON": "Resetuj hasło",
+        "ADMIN_RESET_BUTTON": "Zresetuj hasło",
         "ADMIN_SUCCESS_MESSAGE": "E-mail z instrukcjami resetowania hasła został wysłany do agenta",
-        "SUCCESS_MESSAGE": "Pomyślnie zresetowano hasło agenta",
-        "ERROR_MESSAGE": "Nie można połączyć się z Woot Server, spróbuj ponownie później"
+        "SUCCESS_MESSAGE": "Hasło agenta zostało pomyślnie zresetowane",
+        "ERROR_MESSAGE": "Nie można połączyć się z serwerem Woot, proszę spróbować później"
       }
     },
     "SEARCH": {
-      "NO_RESULTS": "Brak wyników."
+      "NO_RESULTS": "Nie znaleziono wyników."
     },
     "MULTI_SELECTOR": {
       "PLACEHOLDER": "Brak",
@@ -105,13 +105,13 @@
       },
       "SEARCH": {
         "NO_RESULTS": {
-          "AGENT": "Nie znaleziono żadnych konsultantów",
-          "TEAM": "Nie znaleziono żadnych zespołów"
+          "AGENT": "Nie znaleziono agentów",
+          "TEAM": "Nie znaleziono zespołów"
         },
         "PLACEHOLDER": {
-          "AGENT": "Wyszukaj konsultantów",
-          "TEAM": "Wyszukaj zespoły",
-          "INPUT": "Wyszukiwanie konsultantów"
+          "AGENT": "Szukaj agentów",
+          "TEAM": "Szukaj zespołów",
+          "INPUT": "Szukaj agentów"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/pl/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/pl/attributesMgmt.json
index d04927558..1124ecdce 100644
--- a/app/javascript/dashboard/i18n/locale/pl/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pl/attributesMgmt.json
@@ -1,81 +1,92 @@
 {
   "ATTRIBUTES_MGMT": {
-    "HEADER": "Niestandardowe atrybuty",
-    "HEADER_BTN_TXT": "Dodaj niestandardowy atrybut",
-    "LOADING": "Pobieranie niestandardowych atrybutów",
-    "SIDEBAR_TXT": "<p><b>Niestandardowe atrybuty</b> <p>Niestandardowy atrybut śledzi informacje o Twoich kontaktach/rozmowach - na przykład plan subskrypcji lub datę zamówienia pierwszego przedmiotu itp. <br /><br />Aby utworzyć niestandardowy atrybut, wystarczy kliknąć przycisk <b>Dodaj niestandardowy atrybut</b>. Możesz również edytować lub usunąć istniejący niestandardowy atrybut, klikając przycisk Edytuj lub Usuń.</p>",
+    "HEADER": "Atrybuty Niestandardowe",
+    "HEADER_BTN_TXT": "Dodaj Atrybut Niestandardowy",
+    "LOADING": "Pobieranie atrybutów niestandardowych",
+    "SIDEBAR_TXT": "<p><b>Atrybuty Niestandardowe</b></p><p>Atrybut niestandardowy śledzi fakty dotyczące twoich kontaktów/rozmów — takie jak plan subskrypcji, czy data pierwszego zamówienia itp. <br /><br />Aby utworzyć Atrybut Niestandardowy, wystarczy kliknąć na <b>Dodaj Atrybut Niestandardowy</b>. Możesz również edytować lub usunąć istniejący Atrybut Niestandardowy, klikając przycisk Edytuj lub Usuń.</p>",
     "ADD": {
-      "TITLE": "Dodaj niestandardowy atrybut",
-      "SUBMIT": "Stwórz",
+      "TITLE": "Dodaj Atrybut Niestandardowy",
+      "SUBMIT": "Utwórz",
       "CANCEL_BUTTON_TEXT": "Anuluj",
       "FORM": {
         "NAME": {
-          "LABEL": "Nazwa wyświetlana",
-          "PLACEHOLDER": "Wprowadź nazwę wyświetlaną niestandardowego atrybutu",
+          "LABEL": "Nazwa Wyświetlana",
+          "PLACEHOLDER": "Wprowadź nazwę wyświetlaną atrybutu niestandardowego",
           "ERROR": "Nazwa jest wymagana"
         },
         "DESC": {
           "LABEL": "Opis",
-          "PLACEHOLDER": "Wprowadź opis niestandardowego atrybutu",
+          "PLACEHOLDER": "Wprowadź opis atrybutu niestandardowego",
           "ERROR": "Opis jest wymagany"
         },
         "MODEL": {
           "LABEL": "Dotyczy",
-          "PLACEHOLDER": "Wybierz jedno",
+          "PLACEHOLDER": "Proszę wybrać jedno",
           "ERROR": "Model jest wymagany"
         },
         "TYPE": {
           "LABEL": "Typ",
-          "PLACEHOLDER": "Wybierz typ",
+          "PLACEHOLDER": "Proszę wybrać typ",
           "ERROR": "Typ jest wymagany",
           "LIST": {
-            "LABEL": "Wartości listy",
-            "PLACEHOLDER": "Wprowadź wartość i naciśnij klawisz Enter",
-            "ERROR": "Musisz mieć co najmniej jedną wartość"
+            "LABEL": "Wartości Listy",
+            "PLACEHOLDER": "Proszę wprowadzić wartość i nacisnąć klawisz enter",
+            "ERROR": "Musisz mieć przynajmniej jedną wartość"
           }
         },
         "KEY": {
           "LABEL": "Klucz",
-          "PLACEHOLDER": "Wprowadź klucz niestandardowego atrybutu",
+          "PLACEHOLDER": "Wprowadź klucz atrybutu niestandardowego",
           "ERROR": "Klucz jest wymagany",
           "IN_VALID": "Nieprawidłowy klucz"
+        },
+        "REGEX_PATTERN": {
+          "LABEL": "Wzorzec Regex",
+          "PLACEHOLDER": "Proszę wprowadzić wzorzec regex atrybutu niestandardowego. (Opcjonalnie)"
+        },
+        "REGEX_CUE": {
+          "LABEL": "Wskazówka Regex",
+          "PLACEHOLDER": "Proszę wprowadzić wskazówkę wzorca regex. (Opcjonalnie)"
+        },
+        "ENABLE_REGEX": {
+          "LABEL": "Włącz walidację regex"
         }
       },
       "API": {
-        "SUCCESS_MESSAGE": "Niestandardowy atrybut został pomyślnie dodany!",
-        "ERROR_MESSAGE": "Nie można utworzyć niestandardowego atrybutu. Spróbuj ponownie później."
+        "SUCCESS_MESSAGE": "Atrybut Niestandardowy został pomyślnie dodany!",
+        "ERROR_MESSAGE": "Nie udało się utworzyć Atrybutu Niestandardowego. Proszę spróbować później."
       }
     },
     "DELETE": {
       "BUTTON_TEXT": "Usuń",
       "API": {
-        "SUCCESS_MESSAGE": "Niestandardowy atrybut został pomyślnie usunięty.",
-        "ERROR_MESSAGE": "Nie można usunąć niestandardowego atrybutu. Spróbuj ponownie."
+        "SUCCESS_MESSAGE": "Atrybut Niestandardowy został pomyślnie usunięty.",
+        "ERROR_MESSAGE": "Nie udało się usunąć atrybutu niestandardowego. Spróbuj ponownie."
       },
       "CONFIRM": {
         "TITLE": "Czy na pewno chcesz usunąć - %{attributeName}",
-        "PLACE_HOLDER": "Wpisz {attributeName}, aby potwierdzić",
-        "MESSAGE": "Spowoduje to usunięcie niestandardowego atrybutu",
+        "PLACE_HOLDER": "Proszę wpisać {attributeName}, aby potwierdzić",
+        "MESSAGE": "Usunięcie spowoduje usunięcie atrybutu niestandardowego",
         "YES": "Usuń ",
         "NO": "Anuluj"
       }
     },
     "EDIT": {
-      "TITLE": "Edytuj niestandardowy atrybut",
+      "TITLE": "Edytuj Atrybut Niestandardowy",
       "UPDATE_BUTTON_TEXT": "Aktualizuj",
       "TYPE": {
         "LIST": {
-          "LABEL": "Wartości listy",
-          "PLACEHOLDER": "Wprowadź wartości i naciśnij klawisz Enter"
+          "LABEL": "Wartości Listy",
+          "PLACEHOLDER": "Proszę wprowadzić wartości i nacisnąć klawisz enter"
         }
       },
       "API": {
-        "SUCCESS_MESSAGE": "Atrybut został pomyślnie zaktualizowany",
-        "ERROR_MESSAGE": "Wystąpił błąd podczas aktualizacji niestandardowego atrybutu, spróbuj ponownie"
+        "SUCCESS_MESSAGE": "Atrybut Niestandardowy został pomyślnie zaktualizowany",
+        "ERROR_MESSAGE": "Wystąpił błąd podczas aktualizacji atrybutu niestandardowego, proszę spróbować ponownie"
       }
     },
     "TABS": {
-      "HEADER": "Niestandardowe atrybuty",
+      "HEADER": "Atrybuty Niestandardowe",
       "CONVERSATION": "Rozmowa",
       "CONTACT": "Kontakt"
     },
@@ -91,8 +102,19 @@
         "DELETE": "Usuń"
       },
       "EMPTY_RESULT": {
-        "404": "Nie utworzono niestandardowych atrybutów",
-        "NOT_FOUND": "Brak skonfigurowanych niestandardowych atrybutów"
+        "404": "Nie utworzono żadnych atrybutów niestandardowych",
+        "NOT_FOUND": "Nie skonfigurowano żadnych atrybutów niestandardowych"
+      },
+      "REGEX_PATTERN": {
+        "LABEL": "Wzorzec Regex",
+        "PLACEHOLDER": "Proszę wprowadzić wzorzec regex atrybutu niestandardowego. (Opcjonalnie)"
+      },
+      "REGEX_CUE": {
+        "LABEL": "Wskazówka Regex",
+        "PLACEHOLDER": "Proszę wprowadzić wskazówkę wzorca regex. (Opcjonalnie)"
+      },
+      "ENABLE_REGEX": {
+        "LABEL": "Włącz walidację regex"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/pl/auditLogs.json b/app/javascript/dashboard/i18n/locale/pl/auditLogs.json
index ecd12b091..e6b6649ae 100644
--- a/app/javascript/dashboard/i18n/locale/pl/auditLogs.json
+++ b/app/javascript/dashboard/i18n/locale/pl/auditLogs.json
@@ -1,23 +1,23 @@
 {
   "AUDIT_LOGS": {
-    "HEADER": "Dzienniki audytowe",
-    "HEADER_BTN_TXT": "Dodaj dziennik audytowy",
-    "LOADING": "Pobieranie dzienników audytowych...",
+    "HEADER": "Dzienniki Audytu",
+    "HEADER_BTN_TXT": "Dodaj Dzienniki Audytu",
+    "LOADING": "Pobieranie Dzienników Audytu",
     "SEARCH_404": "Brak elementów pasujących do tego zapytania",
-    "SIDEBAR_TXT": "<p><b>Dzienniki audytowe</b> </p><p>Dzienniki audytowe śledzą zdarzenia i działania w systemie Chatwoot.</p>",
+    "SIDEBAR_TXT": "<p><b>Dzienniki Audytu</b></p><p>Dzienniki Audytu to ślady działań i zdarzeń w systemie Chatwoot.</p>",
     "LIST": {
-      "404": "Nie ma dostępnych dzienników audytowych dla tego konta.",
-      "TITLE": "Zarządzaj dziennikami audytowymi",
-      "DESC": "Dziennik audytu śledzi zdarzenia i działania w systemie Chatwoot.",
+      "404": "Brak dostępnych Dzienników Audytu na tym koncie.",
+      "TITLE": "Zarządzaj Dziennikami Audytu",
+      "DESC": "Dzienniki Audytu to ślady działań i zdarzeń w systemie Chatwoot.",
       "TABLE_HEADER": [
-        "Użytkownik",
+        "Aktywność",
         "Akcja",
         "Adres IP"
       ]
     },
     "API": {
-      "SUCCESS_MESSAGE": "Dzienniki audytowe pomyślnie pobrane.",
-      "ERROR_MESSAGE": "Nie można połączyć się z serwerem Woot. Spróbuj ponownie później."
+      "SUCCESS_MESSAGE": "Dzienniki Audytu pobrane pomyślnie",
+      "ERROR_MESSAGE": "Nie można połączyć się z serwerem Woot, proszę spróbować później"
     },
     "DEFAULT_USER": "System",
     "AUTOMATION_RULE": {
@@ -52,17 +52,17 @@
       "DELETE": "%{agentName} usunął zespół (#%{id})"
     },
     "MACRO": {
-      "ADD": "%{agentName} dodał nową makroinstrukcję (#%{id})",
+      "ADD": "%{agentName} utworzył nowe makro (#%{id})",
       "EDIT": "%{agentName} zaktualizował makroinstrukcję (#%{id})",
       "DELETE": "%{agentName} usunął makroinstrukcję (#%{id})"
     },
     "INBOX_MEMBER": {
-      "ADD": "%{agentName} dodał %{user} do skrzynki odbiorczej (#%{inbox_id})",
-      "REMOVE": "%{agentName} usunął %{user} ze skrzynki odbiorczej (#%{inbox_id})"
+      "ADD": "%{agentName} dodał %{user} do skrzynki odbiorczej(#%{inbox_id})",
+      "REMOVE": "%{agentName} usunął %{user} ze skrzynki odbiorczej(#%{inbox_id})"
     },
     "TEAM_MEMBER": {
-      "ADD": "%{agentName} dodał %{user} do zespołu (#%{team_id})",
-      "REMOVE": "%{agentName} usunął %{user} z zespołu (#%{team_id})"
+      "ADD": "%{agentName} dodał %{user} do zespołu(#%{team_id})",
+      "REMOVE": "%{agentName} usunął %{user} z zespołu(#%{team_id})"
     },
     "ACCOUNT": {
       "EDIT": "%{agentName} zaktualizował konfigurację konta (#%{id})"
diff --git a/app/javascript/dashboard/i18n/locale/pl/contact.json b/app/javascript/dashboard/i18n/locale/pl/contact.json
index aeede3982..7cf08e246 100644
--- a/app/javascript/dashboard/i18n/locale/pl/contact.json
+++ b/app/javascript/dashboard/i18n/locale/pl/contact.json
@@ -39,10 +39,10 @@
     },
     "MERGE_CONTACT": "Połącz kontakty",
     "CONTACT_ACTIONS": "Akcje kontaktu",
-    "MUTE_CONTACT": "Wycisz kontakt",
-    "UNMUTE_CONTACT": "Wyłącz wyciszenie kontaktu",
-    "MUTED_SUCCESS": "Ta rozmowa jest wyciszona przez 6 godzin",
-    "UNMUTED_SUCCESS": "Ta rozmowa nie jest wyciszona",
+    "MUTE_CONTACT": "Block Contact",
+    "UNMUTE_CONTACT": "Unblock Contact",
+    "MUTED_SUCCESS": "This contact is blocked successfully. You will not be notified of any future conversations.",
+    "UNMUTED_SUCCESS": "This contact is unblocked successfully.",
     "SEND_TRANSCRIPT": "Wyślij transkrypt",
     "EDIT_LABEL": "Edytuj",
     "SIDEBAR_SECTIONS": {
@@ -79,7 +79,13 @@
     "TITLE": "Eksportuj kontakty",
     "DESC": "Eksportuj kontakty do pliku CSV",
     "SUCCESS_MESSAGE": "Eksportowanie w toku, otrzymasz powiadomienie e-mailem, gdy plik będzie gotowy do pobrania.",
-    "ERROR_MESSAGE": "Wystąpił błąd, spróbuj ponownie"
+    "ERROR_MESSAGE": "Wystąpił błąd, spróbuj ponownie",
+    "CONFIRM": {
+      "TITLE": "Eksportuj kontakty",
+      "MESSAGE": "Are you sure you want to export all contacts?",
+      "YES": "Yes, Export",
+      "NO": "No, Cancel"
+    }
   },
   "DELETE_NOTE": {
     "CONFIRM": {
@@ -339,7 +345,8 @@
     },
     "VALIDATIONS": {
       "REQUIRED": "Wymagana jest prawidłowa wartość",
-      "INVALID_URL": "Nieprawidłowy adres URL"
+      "INVALID_URL": "Nieprawidłowy adres URL",
+      "INVALID_INPUT": "Invalid Input"
     }
   },
   "MERGE_CONTACTS": {
diff --git a/app/javascript/dashboard/i18n/locale/pl/generalSettings.json b/app/javascript/dashboard/i18n/locale/pl/generalSettings.json
index 0e041b7de..fbbacf8de 100644
--- a/app/javascript/dashboard/i18n/locale/pl/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/pl/generalSettings.json
@@ -112,7 +112,8 @@
       "REMOVE_LABEL": "Usuń etykietę z rozmowy",
       "SETTINGS": "Ustawienia",
       "AI_ASSIST": "AI Assist",
-      "APPEARANCE": "Appearance"
+      "APPEARANCE": "Appearance",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     },
     "COMMANDS": {
       "GO_TO_CONVERSATION_DASHBOARD": "Przejdź do pulpitu rozmów",
@@ -153,7 +154,8 @@
       "CHANGE_APPEARANCE": "Change Appearance",
       "LIGHT_MODE": "Light",
       "DARK_MODE": "Dark",
-      "SYSTEM_MODE": "System"
+      "SYSTEM_MODE": "System",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     }
   },
   "DASHBOARD_APPS": {
diff --git a/app/javascript/dashboard/i18n/locale/pl/helpCenter.json b/app/javascript/dashboard/i18n/locale/pl/helpCenter.json
index 59b092a2a..ba00f8a82 100644
--- a/app/javascript/dashboard/i18n/locale/pl/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/pl/helpCenter.json
@@ -324,7 +324,8 @@
         "LAST_EDITED": "Ostatnio edytowane"
       },
       "COLUMNS": {
-        "BY": "przez"
+        "BY": "przez",
+        "AUTHOR_NOT_AVAILABLE": "Author is not available"
       }
     },
     "EDIT_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/pl/inbox.json b/app/javascript/dashboard/i18n/locale/pl/inbox.json
new file mode 100644
index 000000000..3d045fd62
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/pl/inbox.json
@@ -0,0 +1,60 @@
+{
+  "INBOX": {
+    "LIST": {
+      "TITLE": "Skrzynka odbiorcza",
+      "DISPLAY_DROPDOWN": "Display",
+      "LOADING": "Fetching notifications",
+      "EOF": "Wszystkie powiadomienia załadowane 🎉",
+      "404": "There are no active notifications in this group.",
+      "NO_NOTIFICATIONS": "No notifications",
+      "NOTE": "Notifications from all subscribed inboxes",
+      "SNOOZED_UNTIL": "Uśpione do",
+      "SNOOZED_UNTIL_TOMORROW": "Uśpij do jutra",
+      "SNOOZED_UNTIL_NEXT_WEEK": "Uśpione do następnego tygodnia"
+    },
+    "ACTION_HEADER": {
+      "SNOOZE": "Snooze notification",
+      "DELETE": "Delete notification"
+    },
+    "TYPES": {
+      "CONVERSATION_MENTION": "You have been mentioned in a conversation",
+      "CONVERSATION_CREATION": "New conversation created",
+      "CONVERSATION_ASSIGNMENT": "A conversation has been assigned to you",
+      "ASSIGNED_CONVERSATION_NEW_MESSAGE": "New message in an assigned conversation",
+      "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "New message in a conversation you are participating in"
+    },
+    "MENU_ITEM": {
+      "MARK_AS_READ": "Mark as read",
+      "MARK_AS_UNREAD": "Oznacz jako nieprzeczytane",
+      "SNOOZE": "Uśpij",
+      "DELETE": "Usuń",
+      "MARK_ALL_READ": "Oznacz wszystko jako przeczytane",
+      "DELETE_ALL": "Delete all",
+      "DELETE_ALL_READ": "Delete all read"
+    },
+    "DISPLAY_MENU": {
+      "SORT": "Sort",
+      "DISPLAY": "Display :",
+      "SORT_OPTIONS": {
+        "NEWEST": "Newest",
+        "OLDEST": "Oldest",
+        "PRIORITY": "Priorytet"
+      },
+      "DISPLAY_OPTIONS": {
+        "SNOOZED": "Uśpij",
+        "READ": "Przeczytane",
+        "LABELS": "Etykiety",
+        "CONVERSATION_ID": "Conversation ID"
+      }
+    },
+    "ALERTS": {
+      "MARK_AS_READ": "Notification marked as read",
+      "MARK_AS_UNREAD": "Notification marked as unread",
+      "SNOOZE": "Notification snoozed",
+      "DELETE": "Notification deleted",
+      "MARK_ALL_READ": "All notifications marked as read",
+      "DELETE_ALL": "All notifications deleted",
+      "DELETE_ALL_READ": "All read notifications deleted"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json
index 5875dcc67..c799d3cf3 100644
--- a/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json
@@ -569,7 +569,7 @@
       "UPDATE": "Zaktualizuj ustawienia godzin pracy",
       "TOGGLE_AVAILABILITY": "Włącz dostępność biznesową dla tej skrzynki odbiorczej",
       "UNAVAILABLE_MESSAGE_LABEL": "Wiadomość niedostępna dla odwiedzających",
-      "TOGGLE_HELP": "Włączenie dostępności biznesowej pokaże dostępne godziny na czacie na żywo, nawet jeśli wszyscy agenci są offline. Poza dostępnymi godzinami można ostrzec za pomocą wiadomości i formularza wstępnego czatu.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours visitors can be warned with a message and a pre-chat form.",
       "DAY": {
         "ENABLE": "Włącz dostępność w tym dniu",
         "UNAVAILABLE": "Niedostępny",
diff --git a/app/javascript/dashboard/i18n/locale/pl/settings.json b/app/javascript/dashboard/i18n/locale/pl/settings.json
index 166ab98d3..1059eebf6 100644
--- a/app/javascript/dashboard/i18n/locale/pl/settings.json
+++ b/app/javascript/dashboard/i18n/locale/pl/settings.json
@@ -160,6 +160,9 @@
     "TRIAL_MESSAGE": "dni pozostało w okresie próbnym.",
     "TRAIL_BUTTON": "Kup teraz",
     "DELETED_USER": "Usunięty użytkownik",
+    "EMAIL_VERIFICATION_PENDING": "It seems that you haven't verified your email address yet. Please check your inbox for the verification email.",
+    "RESEND_VERIFICATION_MAIL": "Resend verification email",
+    "EMAIL_VERIFICATION_SENT": "Verification email has been sent. Please check your inbox.",
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Konto zawieszone",
       "MESSAGE": "Twoje konto zostało zawieszone. Skontaktuj się z zespołem pomocy technicznej w celu uzyskania dodatkowych informacji."
@@ -197,6 +200,7 @@
     "CURRENTLY_VIEWING_ACCOUNT": "Aktualnie przeglądane konto:",
     "SWITCH": "Przełącz",
     "CONVERSATIONS": "Rozmowy",
+    "INBOX": "Skrzynka odbiorcza",
     "ALL_CONVERSATIONS": "Rozmowy",
     "MENTIONED_CONVERSATIONS": "Wzmianki",
     "PARTICIPATING_CONVERSATIONS": "Udział",
@@ -238,6 +242,7 @@
     "REPORTS_INBOX": "Skrzynka odbiorcza",
     "REPORTS_TEAM": "Zespół",
     "SET_AVAILABILITY_TITLE": "Ustaw dostępność jako",
+    "SLA": "SLA",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Przegląd",
     "FACEBOOK_REAUTHORIZE": "Twoje połączenie z Facebookiem wygasło, aby kontynuować usługi, ponownie połącz swoją stronę na Facebooku",
diff --git a/app/javascript/dashboard/i18n/locale/pl/sla.json b/app/javascript/dashboard/i18n/locale/pl/sla.json
new file mode 100644
index 000000000..3a60942c3
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/pl/sla.json
@@ -0,0 +1,70 @@
+{
+  "SLA": {
+    "HEADER": "SLA",
+    "HEADER_BTN_TXT": "Add SLA",
+    "LOADING": "Fetching SLAs",
+    "SEARCH_404": "Brak wyników pasujących do wyszukiwania",
+    "SIDEBAR_TXT": "<p><b>SLA</b> <p>Think of Service Level Agreements (SLAs) like friendly promises between a service provider and a customer.</p> <p> These promises set clear expectations for things like how quickly the team will respond to issues, making sure you always get a reliable and top-notch experience!</p>",
+    "LIST": {
+      "404": "There are no SLAs available in this account.",
+      "TITLE": "Manage SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "TABLE_HEADER": [
+        "Imię",
+        "Opis",
+        "FRT",
+        "NRT",
+        "RT",
+        "Godziny pracy"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "SLA Name",
+        "PLACEHOLDER": "SLA Name",
+        "REQUIRED_ERROR": "SLA name is required",
+        "MINIMUM_LENGTH_ERROR": "Wymagana długość wynosi minimum 2",
+        "VALID_ERROR": "Dozwolone są tylko litery, cyfry, myślnik i podkreślenie"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Opis",
+        "PLACEHOLDER": "SLA for premium customers"
+      },
+      "FIRST_RESPONSE_TIME": {
+        "LABEL": "First Response Time(Seconds)",
+        "PLACEHOLDER": "300 for 5 minutes"
+      },
+      "NEXT_RESPONSE_TIME": {
+        "LABEL": "Next Response Time(Seconds)",
+        "PLACEHOLDER": "600 for 10 minutes"
+      },
+      "RESOLUTION_TIME": {
+        "LABEL": "Resolution Time(Seconds)",
+        "PLACEHOLDER": "86400 for 1 day"
+      },
+      "BUSINESS_HOURS": {
+        "LABEL": "Godziny pracy",
+        "PLACEHOLDER": "Only during business hours"
+      },
+      "EDIT": "Edytuj",
+      "CREATE": "Stwórz",
+      "DELETE": "Usuń",
+      "CANCEL": "Anuluj"
+    },
+    "ADD": {
+      "TITLE": "Add SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA added successfully",
+        "ERROR_MESSAGE": "Wystąpił błąd, spróbuj ponownie"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit SLA",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA updated successfully",
+        "ERROR_MESSAGE": "Wystąpił błąd, spróbuj ponownie"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/pt/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/pt/attributesMgmt.json
index 9621249bb..27883db0d 100644
--- a/app/javascript/dashboard/i18n/locale/pt/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt/attributesMgmt.json
@@ -39,6 +39,17 @@
           "PLACEHOLDER": "Introduzir chave de atributo personalizado",
           "ERROR": "Chave é obrigatória",
           "IN_VALID": "Chave inválida"
+        },
+        "REGEX_PATTERN": {
+          "LABEL": "Padrão Regex",
+          "PLACEHOLDER": "Por favor, insira um padrão regex de atributo personalizado. (Opcional)"
+        },
+        "REGEX_CUE": {
+          "LABEL": "Sugestão Regex",
+          "PLACEHOLDER": "Por favor, insira dica para o padrão regex. (Opcional)"
+        },
+        "ENABLE_REGEX": {
+          "LABEL": "Ativar validação de regex"
         }
       },
       "API": {
@@ -93,6 +104,17 @@
       "EMPTY_RESULT": {
         "404": "Não há atributos personalizados criados",
         "NOT_FOUND": "Não há atributos personalizados configurados"
+      },
+      "REGEX_PATTERN": {
+        "LABEL": "Padrão Regex",
+        "PLACEHOLDER": "Por favor, insira um padrão regex de atributo personalizado. (Opcional)"
+      },
+      "REGEX_CUE": {
+        "LABEL": "Sugestão Regex",
+        "PLACEHOLDER": "Por favor, insira dica para o padrão regex. (Opcional)"
+      },
+      "ENABLE_REGEX": {
+        "LABEL": "Ativar validação de regex"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/pt/contact.json b/app/javascript/dashboard/i18n/locale/pt/contact.json
index e5eacf7df..069531521 100644
--- a/app/javascript/dashboard/i18n/locale/pt/contact.json
+++ b/app/javascript/dashboard/i18n/locale/pt/contact.json
@@ -39,10 +39,10 @@
     },
     "MERGE_CONTACT": "Unir contacto",
     "CONTACT_ACTIONS": "Ações de contacto",
-    "MUTE_CONTACT": "Silenciar Conversa",
-    "UNMUTE_CONTACT": "Reativar Conversa",
-    "MUTED_SUCCESS": "Esta conversa foi silenciada por 6 horas",
-    "UNMUTED_SUCCESS": "Esta conversa foi reativada",
+    "MUTE_CONTACT": "Block Contact",
+    "UNMUTE_CONTACT": "Unblock Contact",
+    "MUTED_SUCCESS": "This contact is blocked successfully. You will not be notified of any future conversations.",
+    "UNMUTED_SUCCESS": "This contact is unblocked successfully.",
     "SEND_TRANSCRIPT": "Enviar Transcrição",
     "EDIT_LABEL": "Alterar",
     "SIDEBAR_SECTIONS": {
@@ -79,7 +79,13 @@
     "TITLE": "Exportar contactos",
     "DESC": "Exportar contactos para um ficheiro CSV.",
     "SUCCESS_MESSAGE": "Export is in progress, You will be notified via email when export file is ready to dowanlod.",
-    "ERROR_MESSAGE": "Ocorreu um erro, por favor tente novamente"
+    "ERROR_MESSAGE": "Ocorreu um erro, por favor tente novamente",
+    "CONFIRM": {
+      "TITLE": "Exportar contactos",
+      "MESSAGE": "Tem certeza de que deseja exportar todos os contatos?",
+      "YES": "Sim, Exportar",
+      "NO": "Não, Cancelar"
+    }
   },
   "DELETE_NOTE": {
     "CONFIRM": {
@@ -339,7 +345,8 @@
     },
     "VALIDATIONS": {
       "REQUIRED": "Valor válido é obrigatório",
-      "INVALID_URL": "URL Inválido"
+      "INVALID_URL": "URL Inválido",
+      "INVALID_INPUT": "Entrada inválida"
     }
   },
   "MERGE_CONTACTS": {
diff --git a/app/javascript/dashboard/i18n/locale/pt/generalSettings.json b/app/javascript/dashboard/i18n/locale/pt/generalSettings.json
index 8661657f7..3a0c02296 100644
--- a/app/javascript/dashboard/i18n/locale/pt/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/pt/generalSettings.json
@@ -112,7 +112,8 @@
       "REMOVE_LABEL": "Remover etiqueta da conversa",
       "SETTINGS": "Configurações",
       "AI_ASSIST": "Assistente IA",
-      "APPEARANCE": "Aspeto"
+      "APPEARANCE": "Aspeto",
+      "SNOOZE_NOTIFICATION": "Suspender notificação"
     },
     "COMMANDS": {
       "GO_TO_CONVERSATION_DASHBOARD": "Ir para o painel de conversação",
@@ -153,7 +154,8 @@
       "CHANGE_APPEARANCE": "Alterar Aspeto",
       "LIGHT_MODE": "Claro",
       "DARK_MODE": "Escuro",
-      "SYSTEM_MODE": "Sistema"
+      "SYSTEM_MODE": "Sistema",
+      "SNOOZE_NOTIFICATION": "Suspender notificação"
     }
   },
   "DASHBOARD_APPS": {
diff --git a/app/javascript/dashboard/i18n/locale/pt/helpCenter.json b/app/javascript/dashboard/i18n/locale/pt/helpCenter.json
index 1679c5584..83889ed8b 100644
--- a/app/javascript/dashboard/i18n/locale/pt/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/pt/helpCenter.json
@@ -324,7 +324,8 @@
         "LAST_EDITED": "Última edição"
       },
       "COLUMNS": {
-        "BY": "por"
+        "BY": "por",
+        "AUTHOR_NOT_AVAILABLE": "Autor não disponível"
       }
     },
     "EDIT_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/pt/inbox.json b/app/javascript/dashboard/i18n/locale/pt/inbox.json
new file mode 100644
index 000000000..dbd3d7b5c
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/pt/inbox.json
@@ -0,0 +1,60 @@
+{
+  "INBOX": {
+    "LIST": {
+      "TITLE": "Caixa de Entrada",
+      "DISPLAY_DROPDOWN": "Mostrar",
+      "LOADING": "A obter notificações",
+      "EOF": "Notificações obtidas 🎉",
+      "404": "Não há notificações ativas neste grupo.",
+      "NO_NOTIFICATIONS": "Sem Notificações",
+      "NOTE": "Notificações de todas as caixas subscritas",
+      "SNOOZED_UNTIL": "Suspender até",
+      "SNOOZED_UNTIL_TOMORROW": "Adiado até amanhã",
+      "SNOOZED_UNTIL_NEXT_WEEK": "Adiada até a próxima semana"
+    },
+    "ACTION_HEADER": {
+      "SNOOZE": "Suspender notificação",
+      "DELETE": "Apagar notificação"
+    },
+    "TYPES": {
+      "CONVERSATION_MENTION": "Foi mencionado numa conversa",
+      "CONVERSATION_CREATION": "Nova conversa criada",
+      "CONVERSATION_ASSIGNMENT": "Foi-lhe atribuída uma conversa",
+      "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Nova mensagem nesta conversa atribuída",
+      "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Nova mensagem em uma conversa em que você está participando"
+    },
+    "MENU_ITEM": {
+      "MARK_AS_READ": "Marcar como lido",
+      "MARK_AS_UNREAD": "Marcar como não lida",
+      "SNOOZE": "Adiar",
+      "DELETE": "excluir",
+      "MARK_ALL_READ": "Marcar todos como lidos",
+      "DELETE_ALL": "Excluir tudo",
+      "DELETE_ALL_READ": "Excluir todas lidas"
+    },
+    "DISPLAY_MENU": {
+      "SORT": "Ordenar",
+      "DISPLAY": "Mostrar :",
+      "SORT_OPTIONS": {
+        "NEWEST": "Recentes",
+        "OLDEST": "Antigas",
+        "PRIORITY": "Prioridade"
+      },
+      "DISPLAY_OPTIONS": {
+        "SNOOZED": "Adiado",
+        "READ": "Lida",
+        "LABELS": "Etiquetas",
+        "CONVERSATION_ID": "ID da conversa"
+      }
+    },
+    "ALERTS": {
+      "MARK_AS_READ": "Notificação marcada como lida",
+      "MARK_AS_UNREAD": "Notificação marcada como não lida",
+      "SNOOZE": "Notificação adiada",
+      "DELETE": "Notificação excluída",
+      "MARK_ALL_READ": "Todas as notificações marcadas como lidas",
+      "DELETE_ALL": "Todas as notificações foram excluídas",
+      "DELETE_ALL_READ": "Todas as notificações lidas foram excluídas"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json
index 0469a43f5..71511eb7d 100644
--- a/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json
@@ -569,7 +569,7 @@
       "UPDATE": "Atualizar as configurações do horário comercial",
       "TOGGLE_AVAILABILITY": "Definir a disponibilidade para essa caixa de entrada",
       "UNAVAILABLE_MESSAGE_LABEL": "Mensagem indisponível para os visitantes",
-      "TOGGLE_HELP": "Está opção mostrará as horas de disponibilidade no widget da conversa, mesmo que todos os agentes estejam offline. Os visitantes serão avisados dos horários disponíveis através de uma mensagem no formulário de pré-chat.",
+      "TOGGLE_HELP": "Está opção mostrará as horas de disponibilidade no widget da conversa, mesmo que todos os agentes estejam offline. Quem solicitar o serviço fora de horas poderá ser avisado dos horários disponíveis através de uma mensagem e do formulário de pré-chat.",
       "DAY": {
         "ENABLE": "Permitir a disponibilidade para este dia",
         "UNAVAILABLE": "Indisponível",
diff --git a/app/javascript/dashboard/i18n/locale/pt/settings.json b/app/javascript/dashboard/i18n/locale/pt/settings.json
index 552b70a98..945135d2b 100644
--- a/app/javascript/dashboard/i18n/locale/pt/settings.json
+++ b/app/javascript/dashboard/i18n/locale/pt/settings.json
@@ -160,6 +160,9 @@
     "TRIAL_MESSAGE": "dias de teste restantes.",
     "TRAIL_BUTTON": "Comprar agora",
     "DELETED_USER": "Utilizador Excluído",
+    "EMAIL_VERIFICATION_PENDING": "Parece que o seu endereço de e-mail ainda não foi verificado. Por favor, confira a sua caixa de entrada e siga as instruções para concluir a verificação.",
+    "RESEND_VERIFICATION_MAIL": "Reenviar e-mail de verificação",
+    "EMAIL_VERIFICATION_SENT": "O e-mail de verificação foi enviado. Por favor, confira a sua caixa de entrada.",
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Conta Suspensa",
       "MESSAGE": "A sua conta está suspensa. Entre em contato com a equipa de suporte para obter mais informações."
@@ -197,6 +200,7 @@
     "CURRENTLY_VIEWING_ACCOUNT": "Atualmente visualizando:",
     "SWITCH": "Alternar",
     "CONVERSATIONS": "Conversas",
+    "INBOX": "Caixa de Entrada",
     "ALL_CONVERSATIONS": "Todas as conversas",
     "MENTIONED_CONVERSATIONS": "Menções",
     "PARTICIPATING_CONVERSATIONS": "Participando",
@@ -238,6 +242,7 @@
     "REPORTS_INBOX": "Caixa de Entrada",
     "REPORTS_TEAM": "Equipa",
     "SET_AVAILABILITY_TITLE": "Defina-se como",
+    "SLA": "SLA",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Visão geral",
     "FACEBOOK_REAUTHORIZE": "A sua ligação ao Facebook caducou, volte a ligar a página para poder continuar a utilizar os serviços",
diff --git a/app/javascript/dashboard/i18n/locale/pt/sla.json b/app/javascript/dashboard/i18n/locale/pt/sla.json
new file mode 100644
index 000000000..08ce6b54e
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/pt/sla.json
@@ -0,0 +1,70 @@
+{
+  "SLA": {
+    "HEADER": "SLA",
+    "HEADER_BTN_TXT": "Add SLA",
+    "LOADING": "Fetching SLAs",
+    "SEARCH_404": "Não existem itens correspondentes a esta consulta",
+    "SIDEBAR_TXT": "<p><b>SLA</b> <p>Think of Service Level Agreements (SLAs) like friendly promises between a service provider and a customer.</p> <p> These promises set clear expectations for things like how quickly the team will respond to issues, making sure you always get a reliable and top-notch experience!</p>",
+    "LIST": {
+      "404": "There are no SLAs available in this account.",
+      "TITLE": "Manage SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "TABLE_HEADER": [
+        "Nome:",
+        "Descrição",
+        "FRT",
+        "NRT",
+        "RT",
+        "Horário comercial"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "SLA Name",
+        "PLACEHOLDER": "SLA Name",
+        "REQUIRED_ERROR": "SLA name is required",
+        "MINIMUM_LENGTH_ERROR": "O tamanho mínimo obrigatório é 2",
+        "VALID_ERROR": "Apenas são permitidos Alfabetos, Números, Hífen e Underscores"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Descrição",
+        "PLACEHOLDER": "SLA for premium customers"
+      },
+      "FIRST_RESPONSE_TIME": {
+        "LABEL": "First Response Time(Seconds)",
+        "PLACEHOLDER": "300 for 5 minutes"
+      },
+      "NEXT_RESPONSE_TIME": {
+        "LABEL": "Next Response Time(Seconds)",
+        "PLACEHOLDER": "600 for 10 minutes"
+      },
+      "RESOLUTION_TIME": {
+        "LABEL": "Resolution Time(Seconds)",
+        "PLACEHOLDER": "86400 for 1 day"
+      },
+      "BUSINESS_HOURS": {
+        "LABEL": "Horário comercial",
+        "PLACEHOLDER": "Only during business hours"
+      },
+      "EDIT": "Alterar",
+      "CREATE": "Criar",
+      "DELETE": "excluir",
+      "CANCEL": "cancelar"
+    },
+    "ADD": {
+      "TITLE": "Add SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA added successfully",
+        "ERROR_MESSAGE": "Ocorreu um erro, por favor tente novamente"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit SLA",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA updated successfully",
+        "ERROR_MESSAGE": "Ocorreu um erro, por favor tente novamente"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/pt_BR/attributesMgmt.json
index c7f5db18b..5e462550f 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/attributesMgmt.json
@@ -39,6 +39,17 @@
           "PLACEHOLDER": "Digite a chave de atributo personalizada",
           "ERROR": "A chave é obrigatória",
           "IN_VALID": "Chave inválida"
+        },
+        "REGEX_PATTERN": {
+          "LABEL": "Regex Pattern",
+          "PLACEHOLDER": "Por favor, insira o padrão de expressão regular para atributo personalizado. (Opcional)"
+        },
+        "REGEX_CUE": {
+          "LABEL": "Regex Cue",
+          "PLACEHOLDER": "Por favor, insira uma dica para o padrão de expressão regular. (Opcional)"
+        },
+        "ENABLE_REGEX": {
+          "LABEL": "Habilitar validação do regex"
         }
       },
       "API": {
@@ -93,6 +104,17 @@
       "EMPTY_RESULT": {
         "404": "Não há atributos personalizados criados",
         "NOT_FOUND": "Não há atributos personalizados configurados"
+      },
+      "REGEX_PATTERN": {
+        "LABEL": "Regex Pattern",
+        "PLACEHOLDER": "Por favor, insira o padrão de expressão regular para atributo personalizado. (Opcional)"
+      },
+      "REGEX_CUE": {
+        "LABEL": "Regex Cue",
+        "PLACEHOLDER": "Por favor, insira uma dica para o padrão de expressão regular. (Opcional)"
+      },
+      "ENABLE_REGEX": {
+        "LABEL": "Habilitar validação do regex"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/contact.json b/app/javascript/dashboard/i18n/locale/pt_BR/contact.json
index 32607cd5e..ddee25f99 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/contact.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/contact.json
@@ -39,10 +39,10 @@
     },
     "MERGE_CONTACT": "Mesclar contatos",
     "CONTACT_ACTIONS": "Ações de contatos",
-    "MUTE_CONTACT": "Silenciar Conversa",
-    "UNMUTE_CONTACT": "Reativar Conversa",
-    "MUTED_SUCCESS": "Esta conversa está silenciada por 6 horas",
-    "UNMUTED_SUCCESS": "Essa conversa está reativada",
+    "MUTE_CONTACT": "Block Contact",
+    "UNMUTE_CONTACT": "Unblock Contact",
+    "MUTED_SUCCESS": "This contact is blocked successfully. You will not be notified of any future conversations.",
+    "UNMUTED_SUCCESS": "This contact is unblocked successfully.",
     "SEND_TRANSCRIPT": "Enviar Transcrição",
     "EDIT_LABEL": "Alterar",
     "SIDEBAR_SECTIONS": {
@@ -79,7 +79,13 @@
     "TITLE": "Exportar contatos",
     "DESC": "Exportar contatos para arquivo CSV.",
     "SUCCESS_MESSAGE": "Export is in progress, You will be notified via email when export file is ready to dowanlod.",
-    "ERROR_MESSAGE": "Ocorreu um erro, por favor tente novamente"
+    "ERROR_MESSAGE": "Ocorreu um erro, por favor tente novamente",
+    "CONFIRM": {
+      "TITLE": "Exportar contatos",
+      "MESSAGE": "Are you sure you want to export all contacts?",
+      "YES": "Yes, Export",
+      "NO": "No, Cancel"
+    }
   },
   "DELETE_NOTE": {
     "CONFIRM": {
@@ -339,7 +345,8 @@
     },
     "VALIDATIONS": {
       "REQUIRED": "Um valor válido é obrigatório",
-      "INVALID_URL": "URL inválida"
+      "INVALID_URL": "URL inválida",
+      "INVALID_INPUT": "Campo inválido"
     }
   },
   "MERGE_CONTACTS": {
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/generalSettings.json b/app/javascript/dashboard/i18n/locale/pt_BR/generalSettings.json
index 0b2f27b6f..39ed2564a 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/generalSettings.json
@@ -112,7 +112,8 @@
       "REMOVE_LABEL": "Remover etiqueta da conversa",
       "SETTINGS": "Confirgurações",
       "AI_ASSIST": "Assistente Open AI",
-      "APPEARANCE": "Tema"
+      "APPEARANCE": "Tema",
+      "SNOOZE_NOTIFICATION": "Adiar Notificação"
     },
     "COMMANDS": {
       "GO_TO_CONVERSATION_DASHBOARD": "Ir para Painel de Conversação",
@@ -153,7 +154,8 @@
       "CHANGE_APPEARANCE": "Alterar Tema",
       "LIGHT_MODE": "Claro",
       "DARK_MODE": "Escuro",
-      "SYSTEM_MODE": "Sistema"
+      "SYSTEM_MODE": "Sistema",
+      "SNOOZE_NOTIFICATION": "Adiar Notificação"
     }
   },
   "DASHBOARD_APPS": {
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/helpCenter.json b/app/javascript/dashboard/i18n/locale/pt_BR/helpCenter.json
index e6f59fc72..7440f99a4 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/helpCenter.json
@@ -324,7 +324,8 @@
         "LAST_EDITED": "Última edição"
       },
       "COLUMNS": {
-        "BY": "por"
+        "BY": "por",
+        "AUTHOR_NOT_AVAILABLE": "Autor indisponível"
       }
     },
     "EDIT_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/inbox.json b/app/javascript/dashboard/i18n/locale/pt_BR/inbox.json
new file mode 100644
index 000000000..263de41e6
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/inbox.json
@@ -0,0 +1,60 @@
+{
+  "INBOX": {
+    "LIST": {
+      "TITLE": "Caixa de Entrada",
+      "DISPLAY_DROPDOWN": "Exibir",
+      "LOADING": "Carregando notificações",
+      "EOF": "Todas as notificações carregadas 🎉",
+      "404": "Não há conversas ativas neste grupo.",
+      "NO_NOTIFICATIONS": "Nenhuma notificação",
+      "NOTE": "Notificações de todas as caixas inscritas",
+      "SNOOZED_UNTIL": "Suspender até",
+      "SNOOZED_UNTIL_TOMORROW": "Adiado até amanhã",
+      "SNOOZED_UNTIL_NEXT_WEEK": "Adiada até a próxima semana"
+    },
+    "ACTION_HEADER": {
+      "SNOOZE": "Adiar notificação",
+      "DELETE": "Excluir notificação"
+    },
+    "TYPES": {
+      "CONVERSATION_MENTION": "Você foi mencionado em uma conversa",
+      "CONVERSATION_CREATION": "Nova conversa criada",
+      "CONVERSATION_ASSIGNMENT": "Uma conversa foi atribuída a você",
+      "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Nova mensagem em uma conversa atribuída",
+      "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Nova mensagem em uma conversa na qual você participa"
+    },
+    "MENU_ITEM": {
+      "MARK_AS_READ": "Marcar como lido",
+      "MARK_AS_UNREAD": "Marcar como não lida",
+      "SNOOZE": "Adiar",
+      "DELETE": "Excluir",
+      "MARK_ALL_READ": "Marcar todas como lidas",
+      "DELETE_ALL": "Excluir todos",
+      "DELETE_ALL_READ": "Excluir todos os lidos"
+    },
+    "DISPLAY_MENU": {
+      "SORT": "Ordenar",
+      "DISPLAY": "Exibir :",
+      "SORT_OPTIONS": {
+        "NEWEST": "Mais recente",
+        "OLDEST": "Mais antigo",
+        "PRIORITY": "Prioridade"
+      },
+      "DISPLAY_OPTIONS": {
+        "SNOOZED": "Adiado",
+        "READ": "Lida",
+        "LABELS": "Marcadores",
+        "CONVERSATION_ID": "Conversas"
+      }
+    },
+    "ALERTS": {
+      "MARK_AS_READ": "Notificação marcada como lida",
+      "MARK_AS_UNREAD": "Notificação marcada como não lida",
+      "SNOOZE": "Notificação adiada",
+      "DELETE": "Notificação excluída",
+      "MARK_ALL_READ": "Todas as notificações marcadas como lidas",
+      "DELETE_ALL": "Todas as notificações excluídas",
+      "DELETE_ALL_READ": "Todas as notificações lidas foram excluídas"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/settings.json b/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
index 0458ff19c..23e7c3358 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
@@ -160,6 +160,9 @@
     "TRIAL_MESSAGE": "dias de teste restantes.",
     "TRAIL_BUTTON": "Comprar agora",
     "DELETED_USER": "Deletar Usuário",
+    "EMAIL_VERIFICATION_PENDING": "Parece que você ainda não verificou seu endereço de e-mail. Por favor, verifique sua caixa de entrada pelo e-mail de verificação.",
+    "RESEND_VERIFICATION_MAIL": "Reenviar email de verificação",
+    "EMAIL_VERIFICATION_SENT": "O e-mail de verificação foi enviado. Por favor, verifique sua caixa de entrada.",
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Conta Suspensa",
       "MESSAGE": "Sua conta está suspensa. Por favor, entre em contato com a equipe de suporte para mais informações."
@@ -197,6 +200,7 @@
     "CURRENTLY_VIEWING_ACCOUNT": "Visualização atual:",
     "SWITCH": "Trocar",
     "CONVERSATIONS": "Conversas",
+    "INBOX": "Caixa de Entrada",
     "ALL_CONVERSATIONS": "Todas as conversas",
     "MENTIONED_CONVERSATIONS": "Menções",
     "PARTICIPATING_CONVERSATIONS": "Participantes",
@@ -238,6 +242,7 @@
     "REPORTS_INBOX": "Caixa de Entrada",
     "REPORTS_TEAM": "Times",
     "SET_AVAILABILITY_TITLE": "Defina como",
+    "SLA": "SLA",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Visão geral",
     "FACEBOOK_REAUTHORIZE": "Sua conexão com o Facebook expirou! Por favor, reconecte sua página do Facebook para continuar os serviços",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/sla.json b/app/javascript/dashboard/i18n/locale/pt_BR/sla.json
new file mode 100644
index 000000000..1f0299ced
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/sla.json
@@ -0,0 +1,70 @@
+{
+  "SLA": {
+    "HEADER": "SLA",
+    "HEADER_BTN_TXT": "Add SLA",
+    "LOADING": "Fetching SLAs",
+    "SEARCH_404": "Não existem itens correspondentes a esta consulta",
+    "SIDEBAR_TXT": "<p><b>SLA</b> <p>Think of Service Level Agreements (SLAs) like friendly promises between a service provider and a customer.</p> <p> These promises set clear expectations for things like how quickly the team will respond to issues, making sure you always get a reliable and top-notch experience!</p>",
+    "LIST": {
+      "404": "There are no SLAs available in this account.",
+      "TITLE": "Manage SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "TABLE_HEADER": [
+        "Nome",
+        "Descrição",
+        "FRT",
+        "NRT",
+        "RT",
+        "Horário de funcionamento"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "SLA Name",
+        "PLACEHOLDER": "SLA Name",
+        "REQUIRED_ERROR": "SLA name is required",
+        "MINIMUM_LENGTH_ERROR": "Tamanho mínimo 2 é necessário",
+        "VALID_ERROR": "Somente Letras, Números, Hífen e Sublinhado são permitidos"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Descrição",
+        "PLACEHOLDER": "SLA for premium customers"
+      },
+      "FIRST_RESPONSE_TIME": {
+        "LABEL": "First Response Time(Seconds)",
+        "PLACEHOLDER": "300 for 5 minutes"
+      },
+      "NEXT_RESPONSE_TIME": {
+        "LABEL": "Next Response Time(Seconds)",
+        "PLACEHOLDER": "600 for 10 minutes"
+      },
+      "RESOLUTION_TIME": {
+        "LABEL": "Resolution Time(Seconds)",
+        "PLACEHOLDER": "86400 for 1 day"
+      },
+      "BUSINESS_HOURS": {
+        "LABEL": "Horário de funcionamento",
+        "PLACEHOLDER": "Only during business hours"
+      },
+      "EDIT": "Alterar",
+      "CREATE": "Criar",
+      "DELETE": "Excluir",
+      "CANCEL": "Cancelar"
+    },
+    "ADD": {
+      "TITLE": "Add SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA added successfully",
+        "ERROR_MESSAGE": "Ocorreu um erro, por favor tente novamente"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit SLA",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA updated successfully",
+        "ERROR_MESSAGE": "Ocorreu um erro, por favor tente novamente"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ro/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/ro/attributesMgmt.json
index e78fad5c3..758aa78c5 100644
--- a/app/javascript/dashboard/i18n/locale/ro/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ro/attributesMgmt.json
@@ -39,6 +39,17 @@
           "PLACEHOLDER": "Introduceți cheia atributului personalizat",
           "ERROR": "Cheia este obligatorie",
           "IN_VALID": "Cheie invalidă"
+        },
+        "REGEX_PATTERN": {
+          "LABEL": "Regex Pattern",
+          "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+        },
+        "REGEX_CUE": {
+          "LABEL": "Regex Cue",
+          "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+        },
+        "ENABLE_REGEX": {
+          "LABEL": "Enable regex validation"
         }
       },
       "API": {
@@ -93,6 +104,17 @@
       "EMPTY_RESULT": {
         "404": "Nu exista atribute personalizate create",
         "NOT_FOUND": "Nu sunt configurate atribute personalizate"
+      },
+      "REGEX_PATTERN": {
+        "LABEL": "Regex Pattern",
+        "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+      },
+      "REGEX_CUE": {
+        "LABEL": "Regex Cue",
+        "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+      },
+      "ENABLE_REGEX": {
+        "LABEL": "Enable regex validation"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/ro/contact.json b/app/javascript/dashboard/i18n/locale/ro/contact.json
index 2bf3d393b..82148ae26 100644
--- a/app/javascript/dashboard/i18n/locale/ro/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ro/contact.json
@@ -39,10 +39,10 @@
     },
     "MERGE_CONTACT": "Îmbinare contact",
     "CONTACT_ACTIONS": "Acțiuni contact",
-    "MUTE_CONTACT": "Silențios conversația",
-    "UNMUTE_CONTACT": "Sunet conversația",
-    "MUTED_SUCCESS": "Această conversație este dezactivată pentru 6 ore",
-    "UNMUTED_SUCCESS": "Această conversație este reactivată",
+    "MUTE_CONTACT": "Block Contact",
+    "UNMUTE_CONTACT": "Unblock Contact",
+    "MUTED_SUCCESS": "This contact is blocked successfully. You will not be notified of any future conversations.",
+    "UNMUTED_SUCCESS": "This contact is unblocked successfully.",
     "SEND_TRANSCRIPT": "Trimite Transcriere",
     "EDIT_LABEL": "Editare",
     "SIDEBAR_SECTIONS": {
@@ -79,7 +79,13 @@
     "TITLE": "Exportă contacte",
     "DESC": "Exportă contactele într-un fișier CSV.",
     "SUCCESS_MESSAGE": "Exportul este în desfășurare, veți fi notificat prin e-mail când fișierul de export este gata de descărcare.",
-    "ERROR_MESSAGE": "A apărut o eroare, încercați din nou"
+    "ERROR_MESSAGE": "A apărut o eroare, încercați din nou",
+    "CONFIRM": {
+      "TITLE": "Exportă contacte",
+      "MESSAGE": "Are you sure you want to export all contacts?",
+      "YES": "Yes, Export",
+      "NO": "No, Cancel"
+    }
   },
   "DELETE_NOTE": {
     "CONFIRM": {
@@ -339,7 +345,8 @@
     },
     "VALIDATIONS": {
       "REQUIRED": "Este necesară o valoare validă",
-      "INVALID_URL": "URL invalid"
+      "INVALID_URL": "URL invalid",
+      "INVALID_INPUT": "Invalid Input"
     }
   },
   "MERGE_CONTACTS": {
diff --git a/app/javascript/dashboard/i18n/locale/ro/generalSettings.json b/app/javascript/dashboard/i18n/locale/ro/generalSettings.json
index 6250523a2..4e6b488f4 100644
--- a/app/javascript/dashboard/i18n/locale/ro/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ro/generalSettings.json
@@ -112,7 +112,8 @@
       "REMOVE_LABEL": "Eliminarea etichetei din conversație",
       "SETTINGS": "Setări",
       "AI_ASSIST": "AI Assist",
-      "APPEARANCE": "Appearance"
+      "APPEARANCE": "Appearance",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     },
     "COMMANDS": {
       "GO_TO_CONVERSATION_DASHBOARD": "Accesați Tabloul de bord conversație",
@@ -153,7 +154,8 @@
       "CHANGE_APPEARANCE": "Change Appearance",
       "LIGHT_MODE": "Light",
       "DARK_MODE": "Dark",
-      "SYSTEM_MODE": "Sistem"
+      "SYSTEM_MODE": "Sistem",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     }
   },
   "DASHBOARD_APPS": {
diff --git a/app/javascript/dashboard/i18n/locale/ro/helpCenter.json b/app/javascript/dashboard/i18n/locale/ro/helpCenter.json
index f3b783402..4b15ae822 100644
--- a/app/javascript/dashboard/i18n/locale/ro/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ro/helpCenter.json
@@ -324,7 +324,8 @@
         "LAST_EDITED": "Ultima modificare"
       },
       "COLUMNS": {
-        "BY": "de"
+        "BY": "de",
+        "AUTHOR_NOT_AVAILABLE": "Author is not available"
       }
     },
     "EDIT_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/ro/inbox.json b/app/javascript/dashboard/i18n/locale/ro/inbox.json
new file mode 100644
index 000000000..cff7993b8
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ro/inbox.json
@@ -0,0 +1,60 @@
+{
+  "INBOX": {
+    "LIST": {
+      "TITLE": "Inbox",
+      "DISPLAY_DROPDOWN": "Display",
+      "LOADING": "Fetching notifications",
+      "EOF": "Toate notificările încărcate 🎉",
+      "404": "There are no active notifications in this group.",
+      "NO_NOTIFICATIONS": "No notifications",
+      "NOTE": "Notifications from all subscribed inboxes",
+      "SNOOZED_UNTIL": "Amânare până la",
+      "SNOOZED_UNTIL_TOMORROW": "Amânat până mâine",
+      "SNOOZED_UNTIL_NEXT_WEEK": "Amânat până săptămâna viitoare"
+    },
+    "ACTION_HEADER": {
+      "SNOOZE": "Snooze notification",
+      "DELETE": "Delete notification"
+    },
+    "TYPES": {
+      "CONVERSATION_MENTION": "You have been mentioned in a conversation",
+      "CONVERSATION_CREATION": "New conversation created",
+      "CONVERSATION_ASSIGNMENT": "A conversation has been assigned to you",
+      "ASSIGNED_CONVERSATION_NEW_MESSAGE": "New message in an assigned conversation",
+      "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "New message in a conversation you are participating in"
+    },
+    "MENU_ITEM": {
+      "MARK_AS_READ": "Mark as read",
+      "MARK_AS_UNREAD": "Marcheaza ca necitit",
+      "SNOOZE": "Amânați",
+      "DELETE": "Şterge",
+      "MARK_ALL_READ": "Marcare totală ca citit",
+      "DELETE_ALL": "Delete all",
+      "DELETE_ALL_READ": "Delete all read"
+    },
+    "DISPLAY_MENU": {
+      "SORT": "Sort",
+      "DISPLAY": "Display :",
+      "SORT_OPTIONS": {
+        "NEWEST": "Newest",
+        "OLDEST": "Oldest",
+        "PRIORITY": "Prioritate"
+      },
+      "DISPLAY_OPTIONS": {
+        "SNOOZED": "Amânat",
+        "READ": "Citește",
+        "LABELS": "Etichete",
+        "CONVERSATION_ID": "Conversation ID"
+      }
+    },
+    "ALERTS": {
+      "MARK_AS_READ": "Notification marked as read",
+      "MARK_AS_UNREAD": "Notification marked as unread",
+      "SNOOZE": "Notification snoozed",
+      "DELETE": "Notification deleted",
+      "MARK_ALL_READ": "All notifications marked as read",
+      "DELETE_ALL": "All notifications deleted",
+      "DELETE_ALL_READ": "All read notifications deleted"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json
index ad4856cd3..4a952af5d 100644
--- a/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json
@@ -569,7 +569,7 @@
       "UPDATE": "Actualizarea setărilor orelor de lucru",
       "TOGGLE_AVAILABILITY": "Activați disponibilitatea afacerii pentru acest inbox",
       "UNAVAILABLE_MESSAGE_LABEL": "Mesaj indisponibil pentru vizitatori",
-      "TOGGLE_HELP": "Activarea disponibilității afacerii va afișa orele disponibile pe widget-ul de chat live, chiar dacă toți agenții sunt offline. În afara orelor disponibile, vizitorii pot fi avertizați cu un mesaj și un formular de pre-chat.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours visitors can be warned with a message and a pre-chat form.",
       "DAY": {
         "ENABLE": "Activați disponibilitatea pentru această zi",
         "UNAVAILABLE": "Indisponibil",
diff --git a/app/javascript/dashboard/i18n/locale/ro/settings.json b/app/javascript/dashboard/i18n/locale/ro/settings.json
index dd34a361b..4beb633ca 100644
--- a/app/javascript/dashboard/i18n/locale/ro/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ro/settings.json
@@ -160,6 +160,9 @@
     "TRIAL_MESSAGE": "zile de încercare rămase.",
     "TRAIL_BUTTON": "Cumpara acum",
     "DELETED_USER": "Utilizator șters",
+    "EMAIL_VERIFICATION_PENDING": "It seems that you haven't verified your email address yet. Please check your inbox for the verification email.",
+    "RESEND_VERIFICATION_MAIL": "Resend verification email",
+    "EMAIL_VERIFICATION_SENT": "Verification email has been sent. Please check your inbox.",
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Cont suspendat",
       "MESSAGE": "Contul tău este suspendat. Vă rugăm să contactați echipa de asistență pentru mai multe informații."
@@ -197,6 +200,7 @@
     "CURRENTLY_VIEWING_ACCOUNT": "În prezent, vizualizarea:",
     "SWITCH": "Comută contul",
     "CONVERSATIONS": "Conversații",
+    "INBOX": "Inbox",
     "ALL_CONVERSATIONS": "Toate conversațiile",
     "MENTIONED_CONVERSATIONS": "Menţionări",
     "PARTICIPATING_CONVERSATIONS": "Participante",
@@ -238,6 +242,7 @@
     "REPORTS_INBOX": "Inbox",
     "REPORTS_TEAM": "Echipa",
     "SET_AVAILABILITY_TITLE": "Setați-vă ca",
+    "SLA": "SLA",
     "BETA": "Beta",
     "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",
diff --git a/app/javascript/dashboard/i18n/locale/ro/sla.json b/app/javascript/dashboard/i18n/locale/ro/sla.json
new file mode 100644
index 000000000..c2da26c80
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ro/sla.json
@@ -0,0 +1,70 @@
+{
+  "SLA": {
+    "HEADER": "SLA",
+    "HEADER_BTN_TXT": "Add SLA",
+    "LOADING": "Fetching SLAs",
+    "SEARCH_404": "Nu există elemente care să corespundă acestei interogări",
+    "SIDEBAR_TXT": "<p><b>SLA</b> <p>Think of Service Level Agreements (SLAs) like friendly promises between a service provider and a customer.</p> <p> These promises set clear expectations for things like how quickly the team will respond to issues, making sure you always get a reliable and top-notch experience!</p>",
+    "LIST": {
+      "404": "There are no SLAs available in this account.",
+      "TITLE": "Manage SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "TABLE_HEADER": [
+        "Nume",
+        "Descriere",
+        "FRT",
+        "NRT",
+        "RT",
+        "Program de lucru"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "SLA Name",
+        "PLACEHOLDER": "SLA Name",
+        "REQUIRED_ERROR": "SLA name is required",
+        "MINIMUM_LENGTH_ERROR": "Lungimea minimă 2 este necesară",
+        "VALID_ERROR": "Numai alfabetele, numerele, cratima și sublinierea sunt permise"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Descriere",
+        "PLACEHOLDER": "SLA for premium customers"
+      },
+      "FIRST_RESPONSE_TIME": {
+        "LABEL": "First Response Time(Seconds)",
+        "PLACEHOLDER": "300 for 5 minutes"
+      },
+      "NEXT_RESPONSE_TIME": {
+        "LABEL": "Next Response Time(Seconds)",
+        "PLACEHOLDER": "600 for 10 minutes"
+      },
+      "RESOLUTION_TIME": {
+        "LABEL": "Resolution Time(Seconds)",
+        "PLACEHOLDER": "86400 for 1 day"
+      },
+      "BUSINESS_HOURS": {
+        "LABEL": "Program de lucru",
+        "PLACEHOLDER": "Only during business hours"
+      },
+      "EDIT": "Editare",
+      "CREATE": "Creeaza",
+      "DELETE": "Şterge",
+      "CANCEL": "Renunță"
+    },
+    "ADD": {
+      "TITLE": "Add SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA added successfully",
+        "ERROR_MESSAGE": "A apărut o eroare, încercați din nou"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit SLA",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA updated successfully",
+        "ERROR_MESSAGE": "A apărut o eroare, încercați din nou"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ru/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/ru/attributesMgmt.json
index 722bf9ef6..7dff57574 100644
--- a/app/javascript/dashboard/i18n/locale/ru/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ru/attributesMgmt.json
@@ -39,6 +39,17 @@
           "PLACEHOLDER": "Введите ключ пользовательского атрибута",
           "ERROR": "Необходимо указать ключ",
           "IN_VALID": "Неверный ключ"
+        },
+        "REGEX_PATTERN": {
+          "LABEL": "Шаблон Regex",
+          "PLACEHOLDER": "Пожалуйста, введите пользовательский атрибут шаблона регулярного выражения. (Опционально)"
+        },
+        "REGEX_CUE": {
+          "LABEL": "Предложенное регулярное выражение",
+          "PLACEHOLDER": "Пожалуйста, введите подсказку для регулярного выражения. (Опционально)"
+        },
+        "ENABLE_REGEX": {
+          "LABEL": "Включить проверку регулярных выражений"
         }
       },
       "API": {
@@ -93,6 +104,17 @@
       "EMPTY_RESULT": {
         "404": "Нет созданных пользовательских атрибутов",
         "NOT_FOUND": "Нет настроенных пользовательских атрибутов"
+      },
+      "REGEX_PATTERN": {
+        "LABEL": "Шаблон Regex",
+        "PLACEHOLDER": "Пожалуйста, введите пользовательский атрибут шаблона регулярного выражения. (Опционально)"
+      },
+      "REGEX_CUE": {
+        "LABEL": "Предложенное регулярное выражение",
+        "PLACEHOLDER": "Пожалуйста, введите подсказку для регулярного выражения. (Опционально)"
+      },
+      "ENABLE_REGEX": {
+        "LABEL": "Включить проверку регулярных выражений"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/ru/contact.json b/app/javascript/dashboard/i18n/locale/ru/contact.json
index 23c3ad1f0..ce478c5d6 100644
--- a/app/javascript/dashboard/i18n/locale/ru/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ru/contact.json
@@ -39,10 +39,10 @@
     },
     "MERGE_CONTACT": "Объединить контакты",
     "CONTACT_ACTIONS": "Действия с контактами",
-    "MUTE_CONTACT": "Заглушить диалог",
-    "UNMUTE_CONTACT": "Включить звук диалога",
-    "MUTED_SUCCESS": "Этот диалог заглушен на 6 часов",
-    "UNMUTED_SUCCESS": "Этот диалог включен",
+    "MUTE_CONTACT": "Block Contact",
+    "UNMUTE_CONTACT": "Unblock Contact",
+    "MUTED_SUCCESS": "This contact is blocked successfully. You will not be notified of any future conversations.",
+    "UNMUTED_SUCCESS": "This contact is unblocked successfully.",
     "SEND_TRANSCRIPT": "Отправить субтитры",
     "EDIT_LABEL": "Редактировать",
     "SIDEBAR_SECTIONS": {
@@ -79,7 +79,13 @@
     "TITLE": "Экспорт контактов",
     "DESC": "Экспорт контактов в CSV файл.",
     "SUCCESS_MESSAGE": "Выполняется экспорт. Вы будете уведомлены по электронной почте, когда файл экспорта будет готов к загрузке.",
-    "ERROR_MESSAGE": "Произошла ошибка, попробуйте еще раз"
+    "ERROR_MESSAGE": "Произошла ошибка, попробуйте еще раз",
+    "CONFIRM": {
+      "TITLE": "Экспорт контактов",
+      "MESSAGE": "Are you sure you want to export all contacts?",
+      "YES": "Yes, Export",
+      "NO": "No, Cancel"
+    }
   },
   "DELETE_NOTE": {
     "CONFIRM": {
@@ -339,7 +345,8 @@
     },
     "VALIDATIONS": {
       "REQUIRED": "Требуется корректное значение",
-      "INVALID_URL": "Некорректный URL"
+      "INVALID_URL": "Некорректный URL",
+      "INVALID_INPUT": "Неверный ввод"
     }
   },
   "MERGE_CONTACTS": {
diff --git a/app/javascript/dashboard/i18n/locale/ru/generalSettings.json b/app/javascript/dashboard/i18n/locale/ru/generalSettings.json
index 216175d6f..6c3f75cb1 100644
--- a/app/javascript/dashboard/i18n/locale/ru/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ru/generalSettings.json
@@ -112,7 +112,8 @@
       "REMOVE_LABEL": "Удалить метку из разговора",
       "SETTINGS": "Настройки",
       "AI_ASSIST": "Помощь ИИ",
-      "APPEARANCE": "Образец"
+      "APPEARANCE": "Образец",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     },
     "COMMANDS": {
       "GO_TO_CONVERSATION_DASHBOARD": "Перейти к панели разговоров",
@@ -153,7 +154,8 @@
       "CHANGE_APPEARANCE": "Изменить внешний вид",
       "LIGHT_MODE": "Светлая",
       "DARK_MODE": "Тёмная",
-      "SYSTEM_MODE": "Система"
+      "SYSTEM_MODE": "Система",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     }
   },
   "DASHBOARD_APPS": {
diff --git a/app/javascript/dashboard/i18n/locale/ru/helpCenter.json b/app/javascript/dashboard/i18n/locale/ru/helpCenter.json
index a4a2a760c..47f0cbb9c 100644
--- a/app/javascript/dashboard/i18n/locale/ru/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ru/helpCenter.json
@@ -324,7 +324,8 @@
         "LAST_EDITED": "Последнее изменение"
       },
       "COLUMNS": {
-        "BY": "От"
+        "BY": "От",
+        "AUTHOR_NOT_AVAILABLE": "Автор недоступен"
       }
     },
     "EDIT_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/ru/inbox.json b/app/javascript/dashboard/i18n/locale/ru/inbox.json
new file mode 100644
index 000000000..7451c22f1
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ru/inbox.json
@@ -0,0 +1,60 @@
+{
+  "INBOX": {
+    "LIST": {
+      "TITLE": "Электронная почта",
+      "DISPLAY_DROPDOWN": "Отображать",
+      "LOADING": "Загрузка уведомлений",
+      "EOF": "Все уведомления загружены 🎉",
+      "404": "В этой группе нет активных уведомлений.",
+      "NO_NOTIFICATIONS": "No notifications",
+      "NOTE": "Уведомления от всех подписанных источников",
+      "SNOOZED_UNTIL": "Отложить до",
+      "SNOOZED_UNTIL_TOMORROW": "Отложено до завтра",
+      "SNOOZED_UNTIL_NEXT_WEEK": "Отложено до следующей недели"
+    },
+    "ACTION_HEADER": {
+      "SNOOZE": "Отложить уведомление",
+      "DELETE": "Удалить уведомление"
+    },
+    "TYPES": {
+      "CONVERSATION_MENTION": "Вас упомянули в диалоге",
+      "CONVERSATION_CREATION": "Диалог создан",
+      "CONVERSATION_ASSIGNMENT": "Вам назначен диалог",
+      "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Новое сообщение в назначенном диалоге",
+      "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Новое сообщение в диалоге, в котором вы участвуете"
+    },
+    "MENU_ITEM": {
+      "MARK_AS_READ": "Отметить как прочитанное",
+      "MARK_AS_UNREAD": "Отметить как непрочитанное",
+      "SNOOZE": "Отложено",
+      "DELETE": "Удалить",
+      "MARK_ALL_READ": "Отметить все как прочитанные",
+      "DELETE_ALL": "Удалить всё",
+      "DELETE_ALL_READ": "Удалить всё прочитанное"
+    },
+    "DISPLAY_MENU": {
+      "SORT": "Сортировка",
+      "DISPLAY": "Отображать :",
+      "SORT_OPTIONS": {
+        "NEWEST": "Самые новые",
+        "OLDEST": "Самые старые",
+        "PRIORITY": "Приоритет"
+      },
+      "DISPLAY_OPTIONS": {
+        "SNOOZED": "Отложено",
+        "READ": "Прочитано",
+        "LABELS": "Категории",
+        "CONVERSATION_ID": "ID диалога"
+      }
+    },
+    "ALERTS": {
+      "MARK_AS_READ": "Notification marked as read",
+      "MARK_AS_UNREAD": "Notification marked as unread",
+      "SNOOZE": "Notification snoozed",
+      "DELETE": "Notification deleted",
+      "MARK_ALL_READ": "All notifications marked as read",
+      "DELETE_ALL": "All notifications deleted",
+      "DELETE_ALL_READ": "All read notifications deleted"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ru/settings.json b/app/javascript/dashboard/i18n/locale/ru/settings.json
index 071c5fed1..929e835bf 100644
--- a/app/javascript/dashboard/i18n/locale/ru/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ru/settings.json
@@ -160,6 +160,9 @@
     "TRIAL_MESSAGE": "дней до окончания бесплатного периода.",
     "TRAIL_BUTTON": "Купить",
     "DELETED_USER": "Удаленный пользователь",
+    "EMAIL_VERIFICATION_PENDING": "Похоже, что вы еще не подтвердили свой адрес электронной почты. Пожалуйста, проверьте свой почтовый ящик для подтверждения электронной почты.",
+    "RESEND_VERIFICATION_MAIL": "Повторно отправить письмо с подтверждением",
+    "EMAIL_VERIFICATION_SENT": "Письмо с подтверждением отправлено. Пожалуйста, проверьте свой почтовый ящик.",
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Аккаунт заблокирован",
       "MESSAGE": "Ваша учетная запись приостановлена. Пожалуйста, обратитесь в службу поддержки для получения дополнительной информации."
@@ -197,6 +200,7 @@
     "CURRENTLY_VIEWING_ACCOUNT": "Сейчас просматривается:",
     "SWITCH": "Переключить",
     "CONVERSATIONS": "Диалоги",
+    "INBOX": "Электронная почта",
     "ALL_CONVERSATIONS": "Диалоги",
     "MENTIONED_CONVERSATIONS": "Упоминания",
     "PARTICIPATING_CONVERSATIONS": "Участвующие",
@@ -238,6 +242,7 @@
     "REPORTS_INBOX": "Электронная почта",
     "REPORTS_TEAM": "Команда",
     "SET_AVAILABILITY_TITLE": "Установить себя",
+    "SLA": "SLA",
     "BETA": "Бета",
     "REPORTS_OVERVIEW": "Обзор",
     "FACEBOOK_REAUTHORIZE": "Ваше подключение к Facebook истекло. Пожалуйста, переподключитесь к Facebook для продолжения работы",
diff --git a/app/javascript/dashboard/i18n/locale/ru/sla.json b/app/javascript/dashboard/i18n/locale/ru/sla.json
new file mode 100644
index 000000000..7bf47cf4f
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ru/sla.json
@@ -0,0 +1,70 @@
+{
+  "SLA": {
+    "HEADER": "SLA",
+    "HEADER_BTN_TXT": "Add SLA",
+    "LOADING": "Fetching SLAs",
+    "SEARCH_404": "Нет вебхуков, соответствующих запросу",
+    "SIDEBAR_TXT": "<p><b>SLA</b> <p>Think of Service Level Agreements (SLAs) like friendly promises between a service provider and a customer.</p> <p> These promises set clear expectations for things like how quickly the team will respond to issues, making sure you always get a reliable and top-notch experience!</p>",
+    "LIST": {
+      "404": "There are no SLAs available in this account.",
+      "TITLE": "Manage SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "TABLE_HEADER": [
+        "Имя",
+        "Описание",
+        "FRT",
+        "NRT",
+        "RT",
+        "Время работы"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "SLA Name",
+        "PLACEHOLDER": "SLA Name",
+        "REQUIRED_ERROR": "SLA name is required",
+        "MINIMUM_LENGTH_ERROR": "Минимальная длина 2 обязательна",
+        "VALID_ERROR": "Разрешены только алфавиты, числа, дефисы и подчеркивание"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Описание",
+        "PLACEHOLDER": "SLA for premium customers"
+      },
+      "FIRST_RESPONSE_TIME": {
+        "LABEL": "First Response Time(Seconds)",
+        "PLACEHOLDER": "300 for 5 minutes"
+      },
+      "NEXT_RESPONSE_TIME": {
+        "LABEL": "Next Response Time(Seconds)",
+        "PLACEHOLDER": "600 for 10 minutes"
+      },
+      "RESOLUTION_TIME": {
+        "LABEL": "Resolution Time(Seconds)",
+        "PLACEHOLDER": "86400 for 1 day"
+      },
+      "BUSINESS_HOURS": {
+        "LABEL": "Время работы",
+        "PLACEHOLDER": "Only during business hours"
+      },
+      "EDIT": "Редактировать",
+      "CREATE": "Создать",
+      "DELETE": "Удалить",
+      "CANCEL": "Отменить"
+    },
+    "ADD": {
+      "TITLE": "Add SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA added successfully",
+        "ERROR_MESSAGE": "Произошла ошибка, попробуйте еще раз"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit SLA",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA updated successfully",
+        "ERROR_MESSAGE": "Произошла ошибка, попробуйте еще раз"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/sh/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/sh/attributesMgmt.json
index 2a9ea7de3..64a0e83d6 100644
--- a/app/javascript/dashboard/i18n/locale/sh/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sh/attributesMgmt.json
@@ -39,6 +39,17 @@
           "PLACEHOLDER": "Enter custom attribute key",
           "ERROR": "Key is required",
           "IN_VALID": "Invalid key"
+        },
+        "REGEX_PATTERN": {
+          "LABEL": "Regex Pattern",
+          "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+        },
+        "REGEX_CUE": {
+          "LABEL": "Regex Cue",
+          "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+        },
+        "ENABLE_REGEX": {
+          "LABEL": "Enable regex validation"
         }
       },
       "API": {
@@ -93,6 +104,17 @@
       "EMPTY_RESULT": {
         "404": "There are no custom attributes created",
         "NOT_FOUND": "There are no custom attributes configured"
+      },
+      "REGEX_PATTERN": {
+        "LABEL": "Regex Pattern",
+        "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+      },
+      "REGEX_CUE": {
+        "LABEL": "Regex Cue",
+        "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+      },
+      "ENABLE_REGEX": {
+        "LABEL": "Enable regex validation"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/sh/contact.json b/app/javascript/dashboard/i18n/locale/sh/contact.json
index 7f4410464..7ab197734 100644
--- a/app/javascript/dashboard/i18n/locale/sh/contact.json
+++ b/app/javascript/dashboard/i18n/locale/sh/contact.json
@@ -39,10 +39,10 @@
     },
     "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",
+    "MUTE_CONTACT": "Block Contact",
+    "UNMUTE_CONTACT": "Unblock Contact",
+    "MUTED_SUCCESS": "This contact is blocked successfully. You will not be notified of any future conversations.",
+    "UNMUTED_SUCCESS": "This contact is unblocked successfully.",
     "SEND_TRANSCRIPT": "Send Transcript",
     "EDIT_LABEL": "Edit",
     "SIDEBAR_SECTIONS": {
@@ -79,7 +79,13 @@
     "TITLE": "Export Contacts",
     "DESC": "Export contacts to a CSV file.",
     "SUCCESS_MESSAGE": "Export is in progress, You will be notified via email when export file is ready to dowanlod.",
-    "ERROR_MESSAGE": "There was an error, please try again"
+    "ERROR_MESSAGE": "There was an error, please try again",
+    "CONFIRM": {
+      "TITLE": "Export Contacts",
+      "MESSAGE": "Are you sure you want to export all contacts?",
+      "YES": "Yes, Export",
+      "NO": "No, Cancel"
+    }
   },
   "DELETE_NOTE": {
     "CONFIRM": {
@@ -339,7 +345,8 @@
     },
     "VALIDATIONS": {
       "REQUIRED": "Valid value is required",
-      "INVALID_URL": "Invalid URL"
+      "INVALID_URL": "Invalid URL",
+      "INVALID_INPUT": "Invalid Input"
     }
   },
   "MERGE_CONTACTS": {
diff --git a/app/javascript/dashboard/i18n/locale/sh/generalSettings.json b/app/javascript/dashboard/i18n/locale/sh/generalSettings.json
index d56a20c15..185d328a5 100644
--- a/app/javascript/dashboard/i18n/locale/sh/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/sh/generalSettings.json
@@ -112,7 +112,8 @@
       "REMOVE_LABEL": "Remove label from the conversation",
       "SETTINGS": "Settings",
       "AI_ASSIST": "AI Assist",
-      "APPEARANCE": "Appearance"
+      "APPEARANCE": "Appearance",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     },
     "COMMANDS": {
       "GO_TO_CONVERSATION_DASHBOARD": "Go to Conversation Dashboard",
@@ -153,7 +154,8 @@
       "CHANGE_APPEARANCE": "Change Appearance",
       "LIGHT_MODE": "Light",
       "DARK_MODE": "Dark",
-      "SYSTEM_MODE": "System"
+      "SYSTEM_MODE": "System",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     }
   },
   "DASHBOARD_APPS": {
diff --git a/app/javascript/dashboard/i18n/locale/sh/helpCenter.json b/app/javascript/dashboard/i18n/locale/sh/helpCenter.json
index f44e44c6f..cd397ed1e 100644
--- a/app/javascript/dashboard/i18n/locale/sh/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/sh/helpCenter.json
@@ -324,7 +324,8 @@
         "LAST_EDITED": "Last edited"
       },
       "COLUMNS": {
-        "BY": "by"
+        "BY": "by",
+        "AUTHOR_NOT_AVAILABLE": "Author is not available"
       }
     },
     "EDIT_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/sh/inbox.json b/app/javascript/dashboard/i18n/locale/sh/inbox.json
new file mode 100644
index 000000000..dcac5459f
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sh/inbox.json
@@ -0,0 +1,60 @@
+{
+  "INBOX": {
+    "LIST": {
+      "TITLE": "Inbox",
+      "DISPLAY_DROPDOWN": "Display",
+      "LOADING": "Fetching notifications",
+      "EOF": "All notifications loaded 🎉",
+      "404": "There are no active notifications in this group.",
+      "NO_NOTIFICATIONS": "No notifications",
+      "NOTE": "Notifications from all subscribed inboxes",
+      "SNOOZED_UNTIL": "Snoozed until",
+      "SNOOZED_UNTIL_TOMORROW": "Snoozed until tomorrow",
+      "SNOOZED_UNTIL_NEXT_WEEK": "Snoozed until next week"
+    },
+    "ACTION_HEADER": {
+      "SNOOZE": "Snooze notification",
+      "DELETE": "Delete notification"
+    },
+    "TYPES": {
+      "CONVERSATION_MENTION": "You have been mentioned in a conversation",
+      "CONVERSATION_CREATION": "New conversation created",
+      "CONVERSATION_ASSIGNMENT": "A conversation has been assigned to you",
+      "ASSIGNED_CONVERSATION_NEW_MESSAGE": "New message in an assigned conversation",
+      "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "New message in a conversation you are participating in"
+    },
+    "MENU_ITEM": {
+      "MARK_AS_READ": "Mark as read",
+      "MARK_AS_UNREAD": "Mark as unread",
+      "SNOOZE": "Snooze",
+      "DELETE": "Delete",
+      "MARK_ALL_READ": "Mark all as read",
+      "DELETE_ALL": "Delete all",
+      "DELETE_ALL_READ": "Delete all read"
+    },
+    "DISPLAY_MENU": {
+      "SORT": "Sort",
+      "DISPLAY": "Display :",
+      "SORT_OPTIONS": {
+        "NEWEST": "Newest",
+        "OLDEST": "Oldest",
+        "PRIORITY": "Priority"
+      },
+      "DISPLAY_OPTIONS": {
+        "SNOOZED": "Snoozed",
+        "READ": "Read",
+        "LABELS": "Labels",
+        "CONVERSATION_ID": "Conversation ID"
+      }
+    },
+    "ALERTS": {
+      "MARK_AS_READ": "Notification marked as read",
+      "MARK_AS_UNREAD": "Notification marked as unread",
+      "SNOOZE": "Notification snoozed",
+      "DELETE": "Notification deleted",
+      "MARK_ALL_READ": "All notifications marked as read",
+      "DELETE_ALL": "All notifications deleted",
+      "DELETE_ALL_READ": "All read notifications deleted"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/sh/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/sh/inboxMgmt.json
index 70799b835..1b138fe95 100644
--- a/app/javascript/dashboard/i18n/locale/sh/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sh/inboxMgmt.json
@@ -569,7 +569,7 @@
       "UPDATE": "Update business hours settings",
       "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
       "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for visitors",
-      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours visitors can be warned with a message and a pre-chat form.",
       "DAY": {
         "ENABLE": "Enable availability for this day",
         "UNAVAILABLE": "Unavailable",
diff --git a/app/javascript/dashboard/i18n/locale/sh/settings.json b/app/javascript/dashboard/i18n/locale/sh/settings.json
index b96a7c091..a953dbca0 100644
--- a/app/javascript/dashboard/i18n/locale/sh/settings.json
+++ b/app/javascript/dashboard/i18n/locale/sh/settings.json
@@ -160,6 +160,9 @@
     "TRIAL_MESSAGE": "days trial remaining.",
     "TRAIL_BUTTON": "Buy Now",
     "DELETED_USER": "Deleted User",
+    "EMAIL_VERIFICATION_PENDING": "It seems that you haven't verified your email address yet. Please check your inbox for the verification email.",
+    "RESEND_VERIFICATION_MAIL": "Resend verification email",
+    "EMAIL_VERIFICATION_SENT": "Verification email has been sent. Please check your inbox.",
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Account Suspended",
       "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
@@ -197,6 +200,7 @@
     "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
     "SWITCH": "Switch",
     "CONVERSATIONS": "Conversations",
+    "INBOX": "Inbox",
     "ALL_CONVERSATIONS": "All Conversations",
     "MENTIONED_CONVERSATIONS": "Mentions",
     "PARTICIPATING_CONVERSATIONS": "Participating",
@@ -238,6 +242,7 @@
     "REPORTS_INBOX": "Inbox",
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
+    "SLA": "SLA",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Overview",
     "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
diff --git a/app/javascript/dashboard/i18n/locale/sh/sla.json b/app/javascript/dashboard/i18n/locale/sh/sla.json
new file mode 100644
index 000000000..869b3ba3f
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sh/sla.json
@@ -0,0 +1,70 @@
+{
+  "SLA": {
+    "HEADER": "SLA",
+    "HEADER_BTN_TXT": "Add SLA",
+    "LOADING": "Fetching SLAs",
+    "SEARCH_404": "There are no items matching this query",
+    "SIDEBAR_TXT": "<p><b>SLA</b> <p>Think of Service Level Agreements (SLAs) like friendly promises between a service provider and a customer.</p> <p> These promises set clear expectations for things like how quickly the team will respond to issues, making sure you always get a reliable and top-notch experience!</p>",
+    "LIST": {
+      "404": "There are no SLAs available in this account.",
+      "TITLE": "Manage SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "TABLE_HEADER": [
+        "Name",
+        "Description",
+        "FRT",
+        "NRT",
+        "RT",
+        "Business Hours"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "SLA Name",
+        "PLACEHOLDER": "SLA Name",
+        "REQUIRED_ERROR": "SLA name is required",
+        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
+        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Description",
+        "PLACEHOLDER": "SLA for premium customers"
+      },
+      "FIRST_RESPONSE_TIME": {
+        "LABEL": "First Response Time(Seconds)",
+        "PLACEHOLDER": "300 for 5 minutes"
+      },
+      "NEXT_RESPONSE_TIME": {
+        "LABEL": "Next Response Time(Seconds)",
+        "PLACEHOLDER": "600 for 10 minutes"
+      },
+      "RESOLUTION_TIME": {
+        "LABEL": "Resolution Time(Seconds)",
+        "PLACEHOLDER": "86400 for 1 day"
+      },
+      "BUSINESS_HOURS": {
+        "LABEL": "Business Hours",
+        "PLACEHOLDER": "Only during business hours"
+      },
+      "EDIT": "Edit",
+      "CREATE": "Create",
+      "DELETE": "Delete",
+      "CANCEL": "Cancel"
+    },
+    "ADD": {
+      "TITLE": "Add SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA added successfully",
+        "ERROR_MESSAGE": "There was an error, please try again"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit SLA",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA updated successfully",
+        "ERROR_MESSAGE": "There was an error, please try again"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/sk/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/sk/attributesMgmt.json
index 87d409e06..03dddd41e 100644
--- a/app/javascript/dashboard/i18n/locale/sk/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sk/attributesMgmt.json
@@ -39,6 +39,17 @@
           "PLACEHOLDER": "Enter custom attribute key",
           "ERROR": "Key is required",
           "IN_VALID": "Invalid key"
+        },
+        "REGEX_PATTERN": {
+          "LABEL": "Regex Pattern",
+          "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+        },
+        "REGEX_CUE": {
+          "LABEL": "Regex Cue",
+          "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+        },
+        "ENABLE_REGEX": {
+          "LABEL": "Enable regex validation"
         }
       },
       "API": {
@@ -93,6 +104,17 @@
       "EMPTY_RESULT": {
         "404": "There are no custom attributes created",
         "NOT_FOUND": "There are no custom attributes configured"
+      },
+      "REGEX_PATTERN": {
+        "LABEL": "Regex Pattern",
+        "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+      },
+      "REGEX_CUE": {
+        "LABEL": "Regex Cue",
+        "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+      },
+      "ENABLE_REGEX": {
+        "LABEL": "Enable regex validation"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/sk/contact.json b/app/javascript/dashboard/i18n/locale/sk/contact.json
index 6421e10c1..3140cf6ba 100644
--- a/app/javascript/dashboard/i18n/locale/sk/contact.json
+++ b/app/javascript/dashboard/i18n/locale/sk/contact.json
@@ -39,10 +39,10 @@
     },
     "MERGE_CONTACT": "Zlúčiť kontakt",
     "CONTACT_ACTIONS": "Akcie kontaktov",
-    "MUTE_CONTACT": "Stlmiť konverzáciu",
-    "UNMUTE_CONTACT": "Zrušenie stíšenia konverzácie",
-    "MUTED_SUCCESS": "Táto konverzácia je stlmená na 6 hodín",
-    "UNMUTED_SUCCESS": "Táto konverzácia nie je stlmená",
+    "MUTE_CONTACT": "Block Contact",
+    "UNMUTE_CONTACT": "Unblock Contact",
+    "MUTED_SUCCESS": "This contact is blocked successfully. You will not be notified of any future conversations.",
+    "UNMUTED_SUCCESS": "This contact is unblocked successfully.",
     "SEND_TRANSCRIPT": "Odoslať prepis",
     "EDIT_LABEL": "Upraviť",
     "SIDEBAR_SECTIONS": {
@@ -79,7 +79,13 @@
     "TITLE": "Export Contacts",
     "DESC": "Export contacts to a CSV file.",
     "SUCCESS_MESSAGE": "Export is in progress, You will be notified via email when export file is ready to dowanlod.",
-    "ERROR_MESSAGE": "Vyskytla sa chyba, skúste to prosím znova"
+    "ERROR_MESSAGE": "Vyskytla sa chyba, skúste to prosím znova",
+    "CONFIRM": {
+      "TITLE": "Export Contacts",
+      "MESSAGE": "Are you sure you want to export all contacts?",
+      "YES": "Yes, Export",
+      "NO": "No, Cancel"
+    }
   },
   "DELETE_NOTE": {
     "CONFIRM": {
@@ -339,7 +345,8 @@
     },
     "VALIDATIONS": {
       "REQUIRED": "Vyžaduje sa platná hodnota",
-      "INVALID_URL": "Neplatná URL"
+      "INVALID_URL": "Neplatná URL",
+      "INVALID_INPUT": "Invalid Input"
     }
   },
   "MERGE_CONTACTS": {
diff --git a/app/javascript/dashboard/i18n/locale/sk/generalSettings.json b/app/javascript/dashboard/i18n/locale/sk/generalSettings.json
index b37444add..c6c183780 100644
--- a/app/javascript/dashboard/i18n/locale/sk/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/sk/generalSettings.json
@@ -112,7 +112,8 @@
       "REMOVE_LABEL": "Odstrániť štítok z konverzácie",
       "SETTINGS": "Nastavenia",
       "AI_ASSIST": "AI Assist",
-      "APPEARANCE": "Appearance"
+      "APPEARANCE": "Appearance",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     },
     "COMMANDS": {
       "GO_TO_CONVERSATION_DASHBOARD": "Prejsť na ovládací panel konverzácie",
@@ -153,7 +154,8 @@
       "CHANGE_APPEARANCE": "Change Appearance",
       "LIGHT_MODE": "Light",
       "DARK_MODE": "Dark",
-      "SYSTEM_MODE": "System"
+      "SYSTEM_MODE": "System",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     }
   },
   "DASHBOARD_APPS": {
diff --git a/app/javascript/dashboard/i18n/locale/sk/helpCenter.json b/app/javascript/dashboard/i18n/locale/sk/helpCenter.json
index be48c6bb0..d0c40ce52 100644
--- a/app/javascript/dashboard/i18n/locale/sk/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/sk/helpCenter.json
@@ -324,7 +324,8 @@
         "LAST_EDITED": "Last edited"
       },
       "COLUMNS": {
-        "BY": "by"
+        "BY": "by",
+        "AUTHOR_NOT_AVAILABLE": "Author is not available"
       }
     },
     "EDIT_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/sk/inbox.json b/app/javascript/dashboard/i18n/locale/sk/inbox.json
new file mode 100644
index 000000000..4d356e350
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sk/inbox.json
@@ -0,0 +1,60 @@
+{
+  "INBOX": {
+    "LIST": {
+      "TITLE": "Schránka",
+      "DISPLAY_DROPDOWN": "Display",
+      "LOADING": "Fetching notifications",
+      "EOF": "All notifications loaded 🎉",
+      "404": "There are no active notifications in this group.",
+      "NO_NOTIFICATIONS": "No notifications",
+      "NOTE": "Notifications from all subscribed inboxes",
+      "SNOOZED_UNTIL": "Snoozed until",
+      "SNOOZED_UNTIL_TOMORROW": "Odložené do zajtra",
+      "SNOOZED_UNTIL_NEXT_WEEK": "Odložené do ďalšieho týždňa"
+    },
+    "ACTION_HEADER": {
+      "SNOOZE": "Snooze notification",
+      "DELETE": "Delete notification"
+    },
+    "TYPES": {
+      "CONVERSATION_MENTION": "You have been mentioned in a conversation",
+      "CONVERSATION_CREATION": "New conversation created",
+      "CONVERSATION_ASSIGNMENT": "A conversation has been assigned to you",
+      "ASSIGNED_CONVERSATION_NEW_MESSAGE": "New message in an assigned conversation",
+      "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "New message in a conversation you are participating in"
+    },
+    "MENU_ITEM": {
+      "MARK_AS_READ": "Mark as read",
+      "MARK_AS_UNREAD": "Mark as unread",
+      "SNOOZE": "Snooze",
+      "DELETE": "Vymazať",
+      "MARK_ALL_READ": "Mark all as read",
+      "DELETE_ALL": "Delete all",
+      "DELETE_ALL_READ": "Delete all read"
+    },
+    "DISPLAY_MENU": {
+      "SORT": "Sort",
+      "DISPLAY": "Display :",
+      "SORT_OPTIONS": {
+        "NEWEST": "Newest",
+        "OLDEST": "Oldest",
+        "PRIORITY": "Priority"
+      },
+      "DISPLAY_OPTIONS": {
+        "SNOOZED": "Odložené",
+        "READ": "Read",
+        "LABELS": "Labels",
+        "CONVERSATION_ID": "Conversation ID"
+      }
+    },
+    "ALERTS": {
+      "MARK_AS_READ": "Notification marked as read",
+      "MARK_AS_UNREAD": "Notification marked as unread",
+      "SNOOZE": "Notification snoozed",
+      "DELETE": "Notification deleted",
+      "MARK_ALL_READ": "All notifications marked as read",
+      "DELETE_ALL": "All notifications deleted",
+      "DELETE_ALL_READ": "All read notifications deleted"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json
index ff2203b0d..6dc024aa1 100644
--- a/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json
@@ -569,7 +569,7 @@
       "UPDATE": "Aktualizácia nastavení otváracích hodín",
       "TOGGLE_AVAILABILITY": "Povoliť nastavenie otváracích hodín pre túto schránku",
       "UNAVAILABLE_MESSAGE_LABEL": "Správa pre návštevníkov pri nedostupnosti",
-      "TOGGLE_HELP": "Ak povolíte otváracie hodiny, na widgete živého chatu sa zobrazia dostupné hodiny, aj keď sú všetci agenti offline. Mimo dostupných hodín môžu byť návštevníci upozornení správou a formulárom pred konverzáciou.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours visitors can be warned with a message and a pre-chat form.",
       "DAY": {
         "ENABLE": "Povolenie dostupnosti pre tento deň",
         "UNAVAILABLE": "Neodstupné",
diff --git a/app/javascript/dashboard/i18n/locale/sk/settings.json b/app/javascript/dashboard/i18n/locale/sk/settings.json
index 133d4cbd7..7305d4fa5 100644
--- a/app/javascript/dashboard/i18n/locale/sk/settings.json
+++ b/app/javascript/dashboard/i18n/locale/sk/settings.json
@@ -160,6 +160,9 @@
     "TRIAL_MESSAGE": "days trial remaining.",
     "TRAIL_BUTTON": "Buy Now",
     "DELETED_USER": "Deleted User",
+    "EMAIL_VERIFICATION_PENDING": "It seems that you haven't verified your email address yet. Please check your inbox for the verification email.",
+    "RESEND_VERIFICATION_MAIL": "Resend verification email",
+    "EMAIL_VERIFICATION_SENT": "Verification email has been sent. Please check your inbox.",
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Account Suspended",
       "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
@@ -197,6 +200,7 @@
     "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
     "SWITCH": "Switch",
     "CONVERSATIONS": "Rozhovory",
+    "INBOX": "Schránka",
     "ALL_CONVERSATIONS": "Všetky konverzácie",
     "MENTIONED_CONVERSATIONS": "Zmienky",
     "PARTICIPATING_CONVERSATIONS": "Participating",
@@ -238,6 +242,7 @@
     "REPORTS_INBOX": "Schránka",
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
+    "SLA": "SLA",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Prehľad",
     "FACEBOOK_REAUTHORIZE": "Vaše pripojenie k Facebooku vypršalo, pre pokračovanie v službách prosím znovu pripojte svoju stránku na Facebooku",
diff --git a/app/javascript/dashboard/i18n/locale/sk/sla.json b/app/javascript/dashboard/i18n/locale/sk/sla.json
new file mode 100644
index 000000000..ced225b50
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sk/sla.json
@@ -0,0 +1,70 @@
+{
+  "SLA": {
+    "HEADER": "SLA",
+    "HEADER_BTN_TXT": "Add SLA",
+    "LOADING": "Fetching SLAs",
+    "SEARCH_404": "Neexistujú žiadne položky, ktoré by zodpovedali tejto požiadavke",
+    "SIDEBAR_TXT": "<p><b>SLA</b> <p>Think of Service Level Agreements (SLAs) like friendly promises between a service provider and a customer.</p> <p> These promises set clear expectations for things like how quickly the team will respond to issues, making sure you always get a reliable and top-notch experience!</p>",
+    "LIST": {
+      "404": "There are no SLAs available in this account.",
+      "TITLE": "Manage SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "TABLE_HEADER": [
+        "Meno",
+        "Description",
+        "FRT",
+        "NRT",
+        "RT",
+        "Otváracie hodiny"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "SLA Name",
+        "PLACEHOLDER": "SLA Name",
+        "REQUIRED_ERROR": "SLA name is required",
+        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
+        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Description",
+        "PLACEHOLDER": "SLA for premium customers"
+      },
+      "FIRST_RESPONSE_TIME": {
+        "LABEL": "First Response Time(Seconds)",
+        "PLACEHOLDER": "300 for 5 minutes"
+      },
+      "NEXT_RESPONSE_TIME": {
+        "LABEL": "Next Response Time(Seconds)",
+        "PLACEHOLDER": "600 for 10 minutes"
+      },
+      "RESOLUTION_TIME": {
+        "LABEL": "Resolution Time(Seconds)",
+        "PLACEHOLDER": "86400 for 1 day"
+      },
+      "BUSINESS_HOURS": {
+        "LABEL": "Otváracie hodiny",
+        "PLACEHOLDER": "Only during business hours"
+      },
+      "EDIT": "Upraviť",
+      "CREATE": "Create",
+      "DELETE": "Vymazať",
+      "CANCEL": "Zrušiť"
+    },
+    "ADD": {
+      "TITLE": "Add SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA added successfully",
+        "ERROR_MESSAGE": "Vyskytla sa chyba, skúste to prosím znova"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit SLA",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA updated successfully",
+        "ERROR_MESSAGE": "Vyskytla sa chyba, skúste to prosím znova"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/sl/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/sl/attributesMgmt.json
index 2a9ea7de3..64a0e83d6 100644
--- a/app/javascript/dashboard/i18n/locale/sl/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sl/attributesMgmt.json
@@ -39,6 +39,17 @@
           "PLACEHOLDER": "Enter custom attribute key",
           "ERROR": "Key is required",
           "IN_VALID": "Invalid key"
+        },
+        "REGEX_PATTERN": {
+          "LABEL": "Regex Pattern",
+          "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+        },
+        "REGEX_CUE": {
+          "LABEL": "Regex Cue",
+          "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+        },
+        "ENABLE_REGEX": {
+          "LABEL": "Enable regex validation"
         }
       },
       "API": {
@@ -93,6 +104,17 @@
       "EMPTY_RESULT": {
         "404": "There are no custom attributes created",
         "NOT_FOUND": "There are no custom attributes configured"
+      },
+      "REGEX_PATTERN": {
+        "LABEL": "Regex Pattern",
+        "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+      },
+      "REGEX_CUE": {
+        "LABEL": "Regex Cue",
+        "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+      },
+      "ENABLE_REGEX": {
+        "LABEL": "Enable regex validation"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/sl/contact.json b/app/javascript/dashboard/i18n/locale/sl/contact.json
index 7ad18b792..791279899 100644
--- a/app/javascript/dashboard/i18n/locale/sl/contact.json
+++ b/app/javascript/dashboard/i18n/locale/sl/contact.json
@@ -39,10 +39,10 @@
     },
     "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",
+    "MUTE_CONTACT": "Block Contact",
+    "UNMUTE_CONTACT": "Unblock Contact",
+    "MUTED_SUCCESS": "This contact is blocked successfully. You will not be notified of any future conversations.",
+    "UNMUTED_SUCCESS": "This contact is unblocked successfully.",
     "SEND_TRANSCRIPT": "Send Transcript",
     "EDIT_LABEL": "Edit",
     "SIDEBAR_SECTIONS": {
@@ -79,7 +79,13 @@
     "TITLE": "Export Contacts",
     "DESC": "Export contacts to a CSV file.",
     "SUCCESS_MESSAGE": "Export is in progress. You will be notified on email when the export file is ready to download.",
-    "ERROR_MESSAGE": "There was an error, please try again"
+    "ERROR_MESSAGE": "There was an error, please try again",
+    "CONFIRM": {
+      "TITLE": "Export Contacts",
+      "MESSAGE": "Are you sure you want to export all contacts?",
+      "YES": "Yes, Export",
+      "NO": "No, Cancel"
+    }
   },
   "DELETE_NOTE": {
     "CONFIRM": {
@@ -339,7 +345,8 @@
     },
     "VALIDATIONS": {
       "REQUIRED": "Valid value is required",
-      "INVALID_URL": "Invalid URL"
+      "INVALID_URL": "Invalid URL",
+      "INVALID_INPUT": "Invalid Input"
     }
   },
   "MERGE_CONTACTS": {
diff --git a/app/javascript/dashboard/i18n/locale/sl/generalSettings.json b/app/javascript/dashboard/i18n/locale/sl/generalSettings.json
index d56a20c15..185d328a5 100644
--- a/app/javascript/dashboard/i18n/locale/sl/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/sl/generalSettings.json
@@ -112,7 +112,8 @@
       "REMOVE_LABEL": "Remove label from the conversation",
       "SETTINGS": "Settings",
       "AI_ASSIST": "AI Assist",
-      "APPEARANCE": "Appearance"
+      "APPEARANCE": "Appearance",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     },
     "COMMANDS": {
       "GO_TO_CONVERSATION_DASHBOARD": "Go to Conversation Dashboard",
@@ -153,7 +154,8 @@
       "CHANGE_APPEARANCE": "Change Appearance",
       "LIGHT_MODE": "Light",
       "DARK_MODE": "Dark",
-      "SYSTEM_MODE": "System"
+      "SYSTEM_MODE": "System",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     }
   },
   "DASHBOARD_APPS": {
diff --git a/app/javascript/dashboard/i18n/locale/sl/helpCenter.json b/app/javascript/dashboard/i18n/locale/sl/helpCenter.json
index 1f3bda807..d94692e3d 100644
--- a/app/javascript/dashboard/i18n/locale/sl/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/sl/helpCenter.json
@@ -324,7 +324,8 @@
         "LAST_EDITED": "Last edited"
       },
       "COLUMNS": {
-        "BY": "by"
+        "BY": "by",
+        "AUTHOR_NOT_AVAILABLE": "Author is not available"
       }
     },
     "EDIT_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/sl/inbox.json b/app/javascript/dashboard/i18n/locale/sl/inbox.json
new file mode 100644
index 000000000..dcac5459f
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sl/inbox.json
@@ -0,0 +1,60 @@
+{
+  "INBOX": {
+    "LIST": {
+      "TITLE": "Inbox",
+      "DISPLAY_DROPDOWN": "Display",
+      "LOADING": "Fetching notifications",
+      "EOF": "All notifications loaded 🎉",
+      "404": "There are no active notifications in this group.",
+      "NO_NOTIFICATIONS": "No notifications",
+      "NOTE": "Notifications from all subscribed inboxes",
+      "SNOOZED_UNTIL": "Snoozed until",
+      "SNOOZED_UNTIL_TOMORROW": "Snoozed until tomorrow",
+      "SNOOZED_UNTIL_NEXT_WEEK": "Snoozed until next week"
+    },
+    "ACTION_HEADER": {
+      "SNOOZE": "Snooze notification",
+      "DELETE": "Delete notification"
+    },
+    "TYPES": {
+      "CONVERSATION_MENTION": "You have been mentioned in a conversation",
+      "CONVERSATION_CREATION": "New conversation created",
+      "CONVERSATION_ASSIGNMENT": "A conversation has been assigned to you",
+      "ASSIGNED_CONVERSATION_NEW_MESSAGE": "New message in an assigned conversation",
+      "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "New message in a conversation you are participating in"
+    },
+    "MENU_ITEM": {
+      "MARK_AS_READ": "Mark as read",
+      "MARK_AS_UNREAD": "Mark as unread",
+      "SNOOZE": "Snooze",
+      "DELETE": "Delete",
+      "MARK_ALL_READ": "Mark all as read",
+      "DELETE_ALL": "Delete all",
+      "DELETE_ALL_READ": "Delete all read"
+    },
+    "DISPLAY_MENU": {
+      "SORT": "Sort",
+      "DISPLAY": "Display :",
+      "SORT_OPTIONS": {
+        "NEWEST": "Newest",
+        "OLDEST": "Oldest",
+        "PRIORITY": "Priority"
+      },
+      "DISPLAY_OPTIONS": {
+        "SNOOZED": "Snoozed",
+        "READ": "Read",
+        "LABELS": "Labels",
+        "CONVERSATION_ID": "Conversation ID"
+      }
+    },
+    "ALERTS": {
+      "MARK_AS_READ": "Notification marked as read",
+      "MARK_AS_UNREAD": "Notification marked as unread",
+      "SNOOZE": "Notification snoozed",
+      "DELETE": "Notification deleted",
+      "MARK_ALL_READ": "All notifications marked as read",
+      "DELETE_ALL": "All notifications deleted",
+      "DELETE_ALL_READ": "All read notifications deleted"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/sl/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/sl/inboxMgmt.json
index 74eff2033..8d1662f91 100644
--- a/app/javascript/dashboard/i18n/locale/sl/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sl/inboxMgmt.json
@@ -569,7 +569,7 @@
       "UPDATE": "Update business hours settings",
       "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
       "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for visitors",
-      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours visitors can be warned with a message and a pre-chat form.",
       "DAY": {
         "ENABLE": "Enable availability for this day",
         "UNAVAILABLE": "Unavailable",
diff --git a/app/javascript/dashboard/i18n/locale/sl/settings.json b/app/javascript/dashboard/i18n/locale/sl/settings.json
index b96a7c091..a953dbca0 100644
--- a/app/javascript/dashboard/i18n/locale/sl/settings.json
+++ b/app/javascript/dashboard/i18n/locale/sl/settings.json
@@ -160,6 +160,9 @@
     "TRIAL_MESSAGE": "days trial remaining.",
     "TRAIL_BUTTON": "Buy Now",
     "DELETED_USER": "Deleted User",
+    "EMAIL_VERIFICATION_PENDING": "It seems that you haven't verified your email address yet. Please check your inbox for the verification email.",
+    "RESEND_VERIFICATION_MAIL": "Resend verification email",
+    "EMAIL_VERIFICATION_SENT": "Verification email has been sent. Please check your inbox.",
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Account Suspended",
       "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
@@ -197,6 +200,7 @@
     "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
     "SWITCH": "Switch",
     "CONVERSATIONS": "Conversations",
+    "INBOX": "Inbox",
     "ALL_CONVERSATIONS": "All Conversations",
     "MENTIONED_CONVERSATIONS": "Mentions",
     "PARTICIPATING_CONVERSATIONS": "Participating",
@@ -238,6 +242,7 @@
     "REPORTS_INBOX": "Inbox",
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
+    "SLA": "SLA",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Overview",
     "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
diff --git a/app/javascript/dashboard/i18n/locale/sl/sla.json b/app/javascript/dashboard/i18n/locale/sl/sla.json
new file mode 100644
index 000000000..869b3ba3f
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sl/sla.json
@@ -0,0 +1,70 @@
+{
+  "SLA": {
+    "HEADER": "SLA",
+    "HEADER_BTN_TXT": "Add SLA",
+    "LOADING": "Fetching SLAs",
+    "SEARCH_404": "There are no items matching this query",
+    "SIDEBAR_TXT": "<p><b>SLA</b> <p>Think of Service Level Agreements (SLAs) like friendly promises between a service provider and a customer.</p> <p> These promises set clear expectations for things like how quickly the team will respond to issues, making sure you always get a reliable and top-notch experience!</p>",
+    "LIST": {
+      "404": "There are no SLAs available in this account.",
+      "TITLE": "Manage SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "TABLE_HEADER": [
+        "Name",
+        "Description",
+        "FRT",
+        "NRT",
+        "RT",
+        "Business Hours"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "SLA Name",
+        "PLACEHOLDER": "SLA Name",
+        "REQUIRED_ERROR": "SLA name is required",
+        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
+        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Description",
+        "PLACEHOLDER": "SLA for premium customers"
+      },
+      "FIRST_RESPONSE_TIME": {
+        "LABEL": "First Response Time(Seconds)",
+        "PLACEHOLDER": "300 for 5 minutes"
+      },
+      "NEXT_RESPONSE_TIME": {
+        "LABEL": "Next Response Time(Seconds)",
+        "PLACEHOLDER": "600 for 10 minutes"
+      },
+      "RESOLUTION_TIME": {
+        "LABEL": "Resolution Time(Seconds)",
+        "PLACEHOLDER": "86400 for 1 day"
+      },
+      "BUSINESS_HOURS": {
+        "LABEL": "Business Hours",
+        "PLACEHOLDER": "Only during business hours"
+      },
+      "EDIT": "Edit",
+      "CREATE": "Create",
+      "DELETE": "Delete",
+      "CANCEL": "Cancel"
+    },
+    "ADD": {
+      "TITLE": "Add SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA added successfully",
+        "ERROR_MESSAGE": "There was an error, please try again"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit SLA",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA updated successfully",
+        "ERROR_MESSAGE": "There was an error, please try again"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/sq/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/sq/attributesMgmt.json
index 2a9ea7de3..64a0e83d6 100644
--- a/app/javascript/dashboard/i18n/locale/sq/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sq/attributesMgmt.json
@@ -39,6 +39,17 @@
           "PLACEHOLDER": "Enter custom attribute key",
           "ERROR": "Key is required",
           "IN_VALID": "Invalid key"
+        },
+        "REGEX_PATTERN": {
+          "LABEL": "Regex Pattern",
+          "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+        },
+        "REGEX_CUE": {
+          "LABEL": "Regex Cue",
+          "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+        },
+        "ENABLE_REGEX": {
+          "LABEL": "Enable regex validation"
         }
       },
       "API": {
@@ -93,6 +104,17 @@
       "EMPTY_RESULT": {
         "404": "There are no custom attributes created",
         "NOT_FOUND": "There are no custom attributes configured"
+      },
+      "REGEX_PATTERN": {
+        "LABEL": "Regex Pattern",
+        "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+      },
+      "REGEX_CUE": {
+        "LABEL": "Regex Cue",
+        "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+      },
+      "ENABLE_REGEX": {
+        "LABEL": "Enable regex validation"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/sq/contact.json b/app/javascript/dashboard/i18n/locale/sq/contact.json
index 7ad18b792..791279899 100644
--- a/app/javascript/dashboard/i18n/locale/sq/contact.json
+++ b/app/javascript/dashboard/i18n/locale/sq/contact.json
@@ -39,10 +39,10 @@
     },
     "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",
+    "MUTE_CONTACT": "Block Contact",
+    "UNMUTE_CONTACT": "Unblock Contact",
+    "MUTED_SUCCESS": "This contact is blocked successfully. You will not be notified of any future conversations.",
+    "UNMUTED_SUCCESS": "This contact is unblocked successfully.",
     "SEND_TRANSCRIPT": "Send Transcript",
     "EDIT_LABEL": "Edit",
     "SIDEBAR_SECTIONS": {
@@ -79,7 +79,13 @@
     "TITLE": "Export Contacts",
     "DESC": "Export contacts to a CSV file.",
     "SUCCESS_MESSAGE": "Export is in progress. You will be notified on email when the export file is ready to download.",
-    "ERROR_MESSAGE": "There was an error, please try again"
+    "ERROR_MESSAGE": "There was an error, please try again",
+    "CONFIRM": {
+      "TITLE": "Export Contacts",
+      "MESSAGE": "Are you sure you want to export all contacts?",
+      "YES": "Yes, Export",
+      "NO": "No, Cancel"
+    }
   },
   "DELETE_NOTE": {
     "CONFIRM": {
@@ -339,7 +345,8 @@
     },
     "VALIDATIONS": {
       "REQUIRED": "Valid value is required",
-      "INVALID_URL": "Invalid URL"
+      "INVALID_URL": "Invalid URL",
+      "INVALID_INPUT": "Invalid Input"
     }
   },
   "MERGE_CONTACTS": {
diff --git a/app/javascript/dashboard/i18n/locale/sq/generalSettings.json b/app/javascript/dashboard/i18n/locale/sq/generalSettings.json
index d56a20c15..185d328a5 100644
--- a/app/javascript/dashboard/i18n/locale/sq/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/sq/generalSettings.json
@@ -112,7 +112,8 @@
       "REMOVE_LABEL": "Remove label from the conversation",
       "SETTINGS": "Settings",
       "AI_ASSIST": "AI Assist",
-      "APPEARANCE": "Appearance"
+      "APPEARANCE": "Appearance",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     },
     "COMMANDS": {
       "GO_TO_CONVERSATION_DASHBOARD": "Go to Conversation Dashboard",
@@ -153,7 +154,8 @@
       "CHANGE_APPEARANCE": "Change Appearance",
       "LIGHT_MODE": "Light",
       "DARK_MODE": "Dark",
-      "SYSTEM_MODE": "System"
+      "SYSTEM_MODE": "System",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     }
   },
   "DASHBOARD_APPS": {
diff --git a/app/javascript/dashboard/i18n/locale/sq/helpCenter.json b/app/javascript/dashboard/i18n/locale/sq/helpCenter.json
index 1f3bda807..d94692e3d 100644
--- a/app/javascript/dashboard/i18n/locale/sq/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/sq/helpCenter.json
@@ -324,7 +324,8 @@
         "LAST_EDITED": "Last edited"
       },
       "COLUMNS": {
-        "BY": "by"
+        "BY": "by",
+        "AUTHOR_NOT_AVAILABLE": "Author is not available"
       }
     },
     "EDIT_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/sq/inbox.json b/app/javascript/dashboard/i18n/locale/sq/inbox.json
new file mode 100644
index 000000000..dcac5459f
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sq/inbox.json
@@ -0,0 +1,60 @@
+{
+  "INBOX": {
+    "LIST": {
+      "TITLE": "Inbox",
+      "DISPLAY_DROPDOWN": "Display",
+      "LOADING": "Fetching notifications",
+      "EOF": "All notifications loaded 🎉",
+      "404": "There are no active notifications in this group.",
+      "NO_NOTIFICATIONS": "No notifications",
+      "NOTE": "Notifications from all subscribed inboxes",
+      "SNOOZED_UNTIL": "Snoozed until",
+      "SNOOZED_UNTIL_TOMORROW": "Snoozed until tomorrow",
+      "SNOOZED_UNTIL_NEXT_WEEK": "Snoozed until next week"
+    },
+    "ACTION_HEADER": {
+      "SNOOZE": "Snooze notification",
+      "DELETE": "Delete notification"
+    },
+    "TYPES": {
+      "CONVERSATION_MENTION": "You have been mentioned in a conversation",
+      "CONVERSATION_CREATION": "New conversation created",
+      "CONVERSATION_ASSIGNMENT": "A conversation has been assigned to you",
+      "ASSIGNED_CONVERSATION_NEW_MESSAGE": "New message in an assigned conversation",
+      "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "New message in a conversation you are participating in"
+    },
+    "MENU_ITEM": {
+      "MARK_AS_READ": "Mark as read",
+      "MARK_AS_UNREAD": "Mark as unread",
+      "SNOOZE": "Snooze",
+      "DELETE": "Delete",
+      "MARK_ALL_READ": "Mark all as read",
+      "DELETE_ALL": "Delete all",
+      "DELETE_ALL_READ": "Delete all read"
+    },
+    "DISPLAY_MENU": {
+      "SORT": "Sort",
+      "DISPLAY": "Display :",
+      "SORT_OPTIONS": {
+        "NEWEST": "Newest",
+        "OLDEST": "Oldest",
+        "PRIORITY": "Priority"
+      },
+      "DISPLAY_OPTIONS": {
+        "SNOOZED": "Snoozed",
+        "READ": "Read",
+        "LABELS": "Labels",
+        "CONVERSATION_ID": "Conversation ID"
+      }
+    },
+    "ALERTS": {
+      "MARK_AS_READ": "Notification marked as read",
+      "MARK_AS_UNREAD": "Notification marked as unread",
+      "SNOOZE": "Notification snoozed",
+      "DELETE": "Notification deleted",
+      "MARK_ALL_READ": "All notifications marked as read",
+      "DELETE_ALL": "All notifications deleted",
+      "DELETE_ALL_READ": "All read notifications deleted"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/sq/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/sq/inboxMgmt.json
index 74eff2033..8d1662f91 100644
--- a/app/javascript/dashboard/i18n/locale/sq/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sq/inboxMgmt.json
@@ -569,7 +569,7 @@
       "UPDATE": "Update business hours settings",
       "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
       "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for visitors",
-      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours visitors can be warned with a message and a pre-chat form.",
       "DAY": {
         "ENABLE": "Enable availability for this day",
         "UNAVAILABLE": "Unavailable",
diff --git a/app/javascript/dashboard/i18n/locale/sq/settings.json b/app/javascript/dashboard/i18n/locale/sq/settings.json
index b96a7c091..a953dbca0 100644
--- a/app/javascript/dashboard/i18n/locale/sq/settings.json
+++ b/app/javascript/dashboard/i18n/locale/sq/settings.json
@@ -160,6 +160,9 @@
     "TRIAL_MESSAGE": "days trial remaining.",
     "TRAIL_BUTTON": "Buy Now",
     "DELETED_USER": "Deleted User",
+    "EMAIL_VERIFICATION_PENDING": "It seems that you haven't verified your email address yet. Please check your inbox for the verification email.",
+    "RESEND_VERIFICATION_MAIL": "Resend verification email",
+    "EMAIL_VERIFICATION_SENT": "Verification email has been sent. Please check your inbox.",
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Account Suspended",
       "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
@@ -197,6 +200,7 @@
     "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
     "SWITCH": "Switch",
     "CONVERSATIONS": "Conversations",
+    "INBOX": "Inbox",
     "ALL_CONVERSATIONS": "All Conversations",
     "MENTIONED_CONVERSATIONS": "Mentions",
     "PARTICIPATING_CONVERSATIONS": "Participating",
@@ -238,6 +242,7 @@
     "REPORTS_INBOX": "Inbox",
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
+    "SLA": "SLA",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Overview",
     "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
diff --git a/app/javascript/dashboard/i18n/locale/sq/sla.json b/app/javascript/dashboard/i18n/locale/sq/sla.json
new file mode 100644
index 000000000..869b3ba3f
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sq/sla.json
@@ -0,0 +1,70 @@
+{
+  "SLA": {
+    "HEADER": "SLA",
+    "HEADER_BTN_TXT": "Add SLA",
+    "LOADING": "Fetching SLAs",
+    "SEARCH_404": "There are no items matching this query",
+    "SIDEBAR_TXT": "<p><b>SLA</b> <p>Think of Service Level Agreements (SLAs) like friendly promises between a service provider and a customer.</p> <p> These promises set clear expectations for things like how quickly the team will respond to issues, making sure you always get a reliable and top-notch experience!</p>",
+    "LIST": {
+      "404": "There are no SLAs available in this account.",
+      "TITLE": "Manage SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "TABLE_HEADER": [
+        "Name",
+        "Description",
+        "FRT",
+        "NRT",
+        "RT",
+        "Business Hours"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "SLA Name",
+        "PLACEHOLDER": "SLA Name",
+        "REQUIRED_ERROR": "SLA name is required",
+        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
+        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Description",
+        "PLACEHOLDER": "SLA for premium customers"
+      },
+      "FIRST_RESPONSE_TIME": {
+        "LABEL": "First Response Time(Seconds)",
+        "PLACEHOLDER": "300 for 5 minutes"
+      },
+      "NEXT_RESPONSE_TIME": {
+        "LABEL": "Next Response Time(Seconds)",
+        "PLACEHOLDER": "600 for 10 minutes"
+      },
+      "RESOLUTION_TIME": {
+        "LABEL": "Resolution Time(Seconds)",
+        "PLACEHOLDER": "86400 for 1 day"
+      },
+      "BUSINESS_HOURS": {
+        "LABEL": "Business Hours",
+        "PLACEHOLDER": "Only during business hours"
+      },
+      "EDIT": "Edit",
+      "CREATE": "Create",
+      "DELETE": "Delete",
+      "CANCEL": "Cancel"
+    },
+    "ADD": {
+      "TITLE": "Add SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA added successfully",
+        "ERROR_MESSAGE": "There was an error, please try again"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit SLA",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA updated successfully",
+        "ERROR_MESSAGE": "There was an error, please try again"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/sr/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/sr/attributesMgmt.json
index 476286ce7..f64cb98e8 100644
--- a/app/javascript/dashboard/i18n/locale/sr/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sr/attributesMgmt.json
@@ -39,6 +39,17 @@
           "PLACEHOLDER": "Unesite ključ prilagođenog atributa",
           "ERROR": "Ključ je neophodan",
           "IN_VALID": "Neispravan ključ"
+        },
+        "REGEX_PATTERN": {
+          "LABEL": "Regex Pattern",
+          "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+        },
+        "REGEX_CUE": {
+          "LABEL": "Regex Cue",
+          "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+        },
+        "ENABLE_REGEX": {
+          "LABEL": "Enable regex validation"
         }
       },
       "API": {
@@ -93,6 +104,17 @@
       "EMPTY_RESULT": {
         "404": "Nema kreiranih prilagođenih atributa",
         "NOT_FOUND": "Nema podešenih prilagođenih atributa"
+      },
+      "REGEX_PATTERN": {
+        "LABEL": "Regex Pattern",
+        "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+      },
+      "REGEX_CUE": {
+        "LABEL": "Regex Cue",
+        "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+      },
+      "ENABLE_REGEX": {
+        "LABEL": "Enable regex validation"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/sr/contact.json b/app/javascript/dashboard/i18n/locale/sr/contact.json
index 07a1f73c6..8f8590ff4 100644
--- a/app/javascript/dashboard/i18n/locale/sr/contact.json
+++ b/app/javascript/dashboard/i18n/locale/sr/contact.json
@@ -39,10 +39,10 @@
     },
     "MERGE_CONTACT": "Spoji kontakt",
     "CONTACT_ACTIONS": "Akcije nad kontaktom",
-    "MUTE_CONTACT": "Utišaj razgovor",
-    "UNMUTE_CONTACT": "Poništi utišanje razgovora",
-    "MUTED_SUCCESS": "Ovaj razgovor je utišan za narednih 6 sati",
-    "UNMUTED_SUCCESS": "Ovaj razgovor više nije utišan",
+    "MUTE_CONTACT": "Block Contact",
+    "UNMUTE_CONTACT": "Unblock Contact",
+    "MUTED_SUCCESS": "This contact is blocked successfully. You will not be notified of any future conversations.",
+    "UNMUTED_SUCCESS": "This contact is unblocked successfully.",
     "SEND_TRANSCRIPT": "Pošalji transkript",
     "EDIT_LABEL": "Uredi",
     "SIDEBAR_SECTIONS": {
@@ -79,7 +79,13 @@
     "TITLE": "Export Contacts",
     "DESC": "Export contacts to a CSV file.",
     "SUCCESS_MESSAGE": "Export is in progress, You will be notified via email when export file is ready to dowanlod.",
-    "ERROR_MESSAGE": "Pojavila se greška, molim vas pokušajte ponovo"
+    "ERROR_MESSAGE": "Pojavila se greška, molim vas pokušajte ponovo",
+    "CONFIRM": {
+      "TITLE": "Export Contacts",
+      "MESSAGE": "Are you sure you want to export all contacts?",
+      "YES": "Yes, Export",
+      "NO": "No, Cancel"
+    }
   },
   "DELETE_NOTE": {
     "CONFIRM": {
@@ -339,7 +345,8 @@
     },
     "VALIDATIONS": {
       "REQUIRED": "Ispravna vrednost je obavezna",
-      "INVALID_URL": "Neispravna adresa"
+      "INVALID_URL": "Neispravna adresa",
+      "INVALID_INPUT": "Invalid Input"
     }
   },
   "MERGE_CONTACTS": {
diff --git a/app/javascript/dashboard/i18n/locale/sr/generalSettings.json b/app/javascript/dashboard/i18n/locale/sr/generalSettings.json
index 7c3ed949f..ff162689a 100644
--- a/app/javascript/dashboard/i18n/locale/sr/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/sr/generalSettings.json
@@ -112,7 +112,8 @@
       "REMOVE_LABEL": "Ukloni oznaku sa razgovora",
       "SETTINGS": "Podešavanja",
       "AI_ASSIST": "AI Assist",
-      "APPEARANCE": "Appearance"
+      "APPEARANCE": "Appearance",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     },
     "COMMANDS": {
       "GO_TO_CONVERSATION_DASHBOARD": "Idi na radnu tablu razgovora",
@@ -153,7 +154,8 @@
       "CHANGE_APPEARANCE": "Change Appearance",
       "LIGHT_MODE": "Light",
       "DARK_MODE": "Dark",
-      "SYSTEM_MODE": "System"
+      "SYSTEM_MODE": "System",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     }
   },
   "DASHBOARD_APPS": {
diff --git a/app/javascript/dashboard/i18n/locale/sr/helpCenter.json b/app/javascript/dashboard/i18n/locale/sr/helpCenter.json
index 56a320a65..48c9726a5 100644
--- a/app/javascript/dashboard/i18n/locale/sr/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/sr/helpCenter.json
@@ -324,7 +324,8 @@
         "LAST_EDITED": "Poslednje izmenjeno"
       },
       "COLUMNS": {
-        "BY": "od strane"
+        "BY": "od strane",
+        "AUTHOR_NOT_AVAILABLE": "Author is not available"
       }
     },
     "EDIT_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/sr/inbox.json b/app/javascript/dashboard/i18n/locale/sr/inbox.json
new file mode 100644
index 000000000..8ca769d70
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sr/inbox.json
@@ -0,0 +1,60 @@
+{
+  "INBOX": {
+    "LIST": {
+      "TITLE": "Prijemno sanduče",
+      "DISPLAY_DROPDOWN": "Display",
+      "LOADING": "Fetching notifications",
+      "EOF": "All notifications loaded 🎉",
+      "404": "There are no active notifications in this group.",
+      "NO_NOTIFICATIONS": "No notifications",
+      "NOTE": "Notifications from all subscribed inboxes",
+      "SNOOZED_UNTIL": "Snoozed until",
+      "SNOOZED_UNTIL_TOMORROW": "Odloženo do sutra",
+      "SNOOZED_UNTIL_NEXT_WEEK": "Odloženo do sledeće nedelje"
+    },
+    "ACTION_HEADER": {
+      "SNOOZE": "Snooze notification",
+      "DELETE": "Delete notification"
+    },
+    "TYPES": {
+      "CONVERSATION_MENTION": "You have been mentioned in a conversation",
+      "CONVERSATION_CREATION": "New conversation created",
+      "CONVERSATION_ASSIGNMENT": "A conversation has been assigned to you",
+      "ASSIGNED_CONVERSATION_NEW_MESSAGE": "New message in an assigned conversation",
+      "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "New message in a conversation you are participating in"
+    },
+    "MENU_ITEM": {
+      "MARK_AS_READ": "Mark as read",
+      "MARK_AS_UNREAD": "Mark as unread",
+      "SNOOZE": "Odloži",
+      "DELETE": "Izbriši",
+      "MARK_ALL_READ": "Mark all as read",
+      "DELETE_ALL": "Delete all",
+      "DELETE_ALL_READ": "Delete all read"
+    },
+    "DISPLAY_MENU": {
+      "SORT": "Sort",
+      "DISPLAY": "Display :",
+      "SORT_OPTIONS": {
+        "NEWEST": "Newest",
+        "OLDEST": "Oldest",
+        "PRIORITY": "Prioritet"
+      },
+      "DISPLAY_OPTIONS": {
+        "SNOOZED": "Odložen",
+        "READ": "Pročitane",
+        "LABELS": "Oznake",
+        "CONVERSATION_ID": "Conversation ID"
+      }
+    },
+    "ALERTS": {
+      "MARK_AS_READ": "Notification marked as read",
+      "MARK_AS_UNREAD": "Notification marked as unread",
+      "SNOOZE": "Notification snoozed",
+      "DELETE": "Notification deleted",
+      "MARK_ALL_READ": "All notifications marked as read",
+      "DELETE_ALL": "All notifications deleted",
+      "DELETE_ALL_READ": "All read notifications deleted"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/sr/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/sr/inboxMgmt.json
index 49c6a3207..cdef30a0b 100644
--- a/app/javascript/dashboard/i18n/locale/sr/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sr/inboxMgmt.json
@@ -569,7 +569,7 @@
       "UPDATE": "Izmena podešavanja radnog vremena",
       "TOGGLE_AVAILABILITY": "Omogući vreme dostupnosti za ovo prijemno sanduče",
       "UNAVAILABLE_MESSAGE_LABEL": "Poruka nedostupnosti za posetioce",
-      "TOGGLE_HELP": "Omogućavanje vremena dostupnosti će prikazati dostupno vreme na vidžetu ćaskanja čak i kada su svi agenti nedostupni. Van radnih sati posetioci će biti upozoreni porukom i formularom pre ćaskanja.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours visitors can be warned with a message and a pre-chat form.",
       "DAY": {
         "ENABLE": "Omogućite dostupnost za ovaj dan",
         "UNAVAILABLE": "Nedostupan",
diff --git a/app/javascript/dashboard/i18n/locale/sr/settings.json b/app/javascript/dashboard/i18n/locale/sr/settings.json
index 122323559..bf66c24c2 100644
--- a/app/javascript/dashboard/i18n/locale/sr/settings.json
+++ b/app/javascript/dashboard/i18n/locale/sr/settings.json
@@ -160,6 +160,9 @@
     "TRIAL_MESSAGE": "dana preostalo od probnog perioda.",
     "TRAIL_BUTTON": "Kupi sada",
     "DELETED_USER": "Obrisan korisnik",
+    "EMAIL_VERIFICATION_PENDING": "It seems that you haven't verified your email address yet. Please check your inbox for the verification email.",
+    "RESEND_VERIFICATION_MAIL": "Resend verification email",
+    "EMAIL_VERIFICATION_SENT": "Verification email has been sent. Please check your inbox.",
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Nalog je suspendovan",
       "MESSAGE": "Vaš nalog je suspendovan. Molim vas kontaktirajte tim za podršku za dodatne informacije."
@@ -197,6 +200,7 @@
     "CURRENTLY_VIEWING_ACCOUNT": "Trenutno pregledate:",
     "SWITCH": "Prebaci",
     "CONVERSATIONS": "Razgovori",
+    "INBOX": "Prijemno sanduče",
     "ALL_CONVERSATIONS": "Svi razgovori",
     "MENTIONED_CONVERSATIONS": "Spominjanja",
     "PARTICIPATING_CONVERSATIONS": "Participating",
@@ -238,6 +242,7 @@
     "REPORTS_INBOX": "Prijemno sanduče",
     "REPORTS_TEAM": "Tim",
     "SET_AVAILABILITY_TITLE": "Postavite da ste",
+    "SLA": "SLA",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Pregled",
     "FACEBOOK_REAUTHORIZE": "Vaša veza sa Fejsbukom je istekla, molim vas povežite ponovo vašu Fejsbuk stranicu za nastavak servisa",
diff --git a/app/javascript/dashboard/i18n/locale/sr/sla.json b/app/javascript/dashboard/i18n/locale/sr/sla.json
new file mode 100644
index 000000000..50507ee46
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sr/sla.json
@@ -0,0 +1,70 @@
+{
+  "SLA": {
+    "HEADER": "SLA",
+    "HEADER_BTN_TXT": "Add SLA",
+    "LOADING": "Fetching SLAs",
+    "SEARCH_404": "Nema razultata",
+    "SIDEBAR_TXT": "<p><b>SLA</b> <p>Think of Service Level Agreements (SLAs) like friendly promises between a service provider and a customer.</p> <p> These promises set clear expectations for things like how quickly the team will respond to issues, making sure you always get a reliable and top-notch experience!</p>",
+    "LIST": {
+      "404": "There are no SLAs available in this account.",
+      "TITLE": "Manage SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "TABLE_HEADER": [
+        "Ime",
+        "Opis",
+        "FRT",
+        "NRT",
+        "RT",
+        "Radno vreme"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "SLA Name",
+        "PLACEHOLDER": "SLA Name",
+        "REQUIRED_ERROR": "SLA name is required",
+        "MINIMUM_LENGTH_ERROR": "Obavezna je minimalna dužina od 2 karaktera",
+        "VALID_ERROR": "Dozvoljena su samo slova, brojevi, crtice i donje crtice"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Opis",
+        "PLACEHOLDER": "SLA for premium customers"
+      },
+      "FIRST_RESPONSE_TIME": {
+        "LABEL": "First Response Time(Seconds)",
+        "PLACEHOLDER": "300 for 5 minutes"
+      },
+      "NEXT_RESPONSE_TIME": {
+        "LABEL": "Next Response Time(Seconds)",
+        "PLACEHOLDER": "600 for 10 minutes"
+      },
+      "RESOLUTION_TIME": {
+        "LABEL": "Resolution Time(Seconds)",
+        "PLACEHOLDER": "86400 for 1 day"
+      },
+      "BUSINESS_HOURS": {
+        "LABEL": "Radno vreme",
+        "PLACEHOLDER": "Only during business hours"
+      },
+      "EDIT": "Uredi",
+      "CREATE": "Napravi",
+      "DELETE": "Izbriši",
+      "CANCEL": "Otkaži"
+    },
+    "ADD": {
+      "TITLE": "Add SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA added successfully",
+        "ERROR_MESSAGE": "Pojavila se greška, molim vas pokušajte ponovo"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit SLA",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA updated successfully",
+        "ERROR_MESSAGE": "Pojavila se greška, molim vas pokušajte ponovo"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/sv/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/sv/attributesMgmt.json
index f219c1895..37e492bb3 100644
--- a/app/javascript/dashboard/i18n/locale/sv/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sv/attributesMgmt.json
@@ -39,6 +39,17 @@
           "PLACEHOLDER": "Enter custom attribute key",
           "ERROR": "Key is required",
           "IN_VALID": "Invalid key"
+        },
+        "REGEX_PATTERN": {
+          "LABEL": "Regex Pattern",
+          "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+        },
+        "REGEX_CUE": {
+          "LABEL": "Regex Cue",
+          "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+        },
+        "ENABLE_REGEX": {
+          "LABEL": "Enable regex validation"
         }
       },
       "API": {
@@ -93,6 +104,17 @@
       "EMPTY_RESULT": {
         "404": "There are no custom attributes created",
         "NOT_FOUND": "There are no custom attributes configured"
+      },
+      "REGEX_PATTERN": {
+        "LABEL": "Regex Pattern",
+        "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+      },
+      "REGEX_CUE": {
+        "LABEL": "Regex Cue",
+        "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+      },
+      "ENABLE_REGEX": {
+        "LABEL": "Enable regex validation"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/sv/contact.json b/app/javascript/dashboard/i18n/locale/sv/contact.json
index b8092abc9..70fc41046 100644
--- a/app/javascript/dashboard/i18n/locale/sv/contact.json
+++ b/app/javascript/dashboard/i18n/locale/sv/contact.json
@@ -39,10 +39,10 @@
     },
     "MERGE_CONTACT": "Slå samman kontakt",
     "CONTACT_ACTIONS": "Kontakt åtgärder",
-    "MUTE_CONTACT": "Tysta konversation",
-    "UNMUTE_CONTACT": "Avtysta konversation",
-    "MUTED_SUCCESS": "Denna konversation är tystad i 6 timmar",
-    "UNMUTED_SUCCESS": "Denna konversation är avtystad",
+    "MUTE_CONTACT": "Block Contact",
+    "UNMUTE_CONTACT": "Unblock Contact",
+    "MUTED_SUCCESS": "This contact is blocked successfully. You will not be notified of any future conversations.",
+    "UNMUTED_SUCCESS": "This contact is unblocked successfully.",
     "SEND_TRANSCRIPT": "Skicka transkribering",
     "EDIT_LABEL": "Redigera",
     "SIDEBAR_SECTIONS": {
@@ -79,7 +79,13 @@
     "TITLE": "Export Contacts",
     "DESC": "Export contacts to a CSV file.",
     "SUCCESS_MESSAGE": "Export is in progress, You will be notified via email when export file is ready to dowanlod.",
-    "ERROR_MESSAGE": "Ett fel uppstod, vänligen försök igen"
+    "ERROR_MESSAGE": "Ett fel uppstod, vänligen försök igen",
+    "CONFIRM": {
+      "TITLE": "Export Contacts",
+      "MESSAGE": "Are you sure you want to export all contacts?",
+      "YES": "Yes, Export",
+      "NO": "No, Cancel"
+    }
   },
   "DELETE_NOTE": {
     "CONFIRM": {
@@ -339,7 +345,8 @@
     },
     "VALIDATIONS": {
       "REQUIRED": "Valid value is required",
-      "INVALID_URL": "Ogiltig URL"
+      "INVALID_URL": "Ogiltig URL",
+      "INVALID_INPUT": "Invalid Input"
     }
   },
   "MERGE_CONTACTS": {
diff --git a/app/javascript/dashboard/i18n/locale/sv/generalSettings.json b/app/javascript/dashboard/i18n/locale/sv/generalSettings.json
index 855617266..9c23f1e13 100644
--- a/app/javascript/dashboard/i18n/locale/sv/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/sv/generalSettings.json
@@ -112,7 +112,8 @@
       "REMOVE_LABEL": "Remove label from the conversation",
       "SETTINGS": "Inställningar",
       "AI_ASSIST": "AI Assist",
-      "APPEARANCE": "Appearance"
+      "APPEARANCE": "Appearance",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     },
     "COMMANDS": {
       "GO_TO_CONVERSATION_DASHBOARD": "Go to Conversation Dashboard",
@@ -153,7 +154,8 @@
       "CHANGE_APPEARANCE": "Change Appearance",
       "LIGHT_MODE": "Light",
       "DARK_MODE": "Dark",
-      "SYSTEM_MODE": "System"
+      "SYSTEM_MODE": "System",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     }
   },
   "DASHBOARD_APPS": {
diff --git a/app/javascript/dashboard/i18n/locale/sv/helpCenter.json b/app/javascript/dashboard/i18n/locale/sv/helpCenter.json
index c5dcbbbc1..c45e9f2dc 100644
--- a/app/javascript/dashboard/i18n/locale/sv/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/sv/helpCenter.json
@@ -324,7 +324,8 @@
         "LAST_EDITED": "Senast redigerad"
       },
       "COLUMNS": {
-        "BY": "by"
+        "BY": "by",
+        "AUTHOR_NOT_AVAILABLE": "Författaren är inte tillgänglig"
       }
     },
     "EDIT_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/sv/inbox.json b/app/javascript/dashboard/i18n/locale/sv/inbox.json
new file mode 100644
index 000000000..425dd9baa
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sv/inbox.json
@@ -0,0 +1,60 @@
+{
+  "INBOX": {
+    "LIST": {
+      "TITLE": "Inkorg",
+      "DISPLAY_DROPDOWN": "Display",
+      "LOADING": "Fetching notifications",
+      "EOF": "Alla aviseringar laddade 🎉",
+      "404": "There are no active notifications in this group.",
+      "NO_NOTIFICATIONS": "No notifications",
+      "NOTE": "Notifications from all subscribed inboxes",
+      "SNOOZED_UNTIL": "Snoozad till",
+      "SNOOZED_UNTIL_TOMORROW": "Snoozad till imorgon",
+      "SNOOZED_UNTIL_NEXT_WEEK": "Snoozad till nästa vecka"
+    },
+    "ACTION_HEADER": {
+      "SNOOZE": "Snooze notification",
+      "DELETE": "Delete notification"
+    },
+    "TYPES": {
+      "CONVERSATION_MENTION": "You have been mentioned in a conversation",
+      "CONVERSATION_CREATION": "New conversation created",
+      "CONVERSATION_ASSIGNMENT": "A conversation has been assigned to you",
+      "ASSIGNED_CONVERSATION_NEW_MESSAGE": "New message in an assigned conversation",
+      "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "New message in a conversation you are participating in"
+    },
+    "MENU_ITEM": {
+      "MARK_AS_READ": "Mark as read",
+      "MARK_AS_UNREAD": "Markera som oläst",
+      "SNOOZE": "Snooza",
+      "DELETE": "Radera",
+      "MARK_ALL_READ": "Markera alla som lästa",
+      "DELETE_ALL": "Delete all",
+      "DELETE_ALL_READ": "Delete all read"
+    },
+    "DISPLAY_MENU": {
+      "SORT": "Sort",
+      "DISPLAY": "Display :",
+      "SORT_OPTIONS": {
+        "NEWEST": "Newest",
+        "OLDEST": "Oldest",
+        "PRIORITY": "Prioritet"
+      },
+      "DISPLAY_OPTIONS": {
+        "SNOOZED": "Pausad",
+        "READ": "Read",
+        "LABELS": "Etiketter",
+        "CONVERSATION_ID": "Conversation ID"
+      }
+    },
+    "ALERTS": {
+      "MARK_AS_READ": "Notification marked as read",
+      "MARK_AS_UNREAD": "Notification marked as unread",
+      "SNOOZE": "Notification snoozed",
+      "DELETE": "Notification deleted",
+      "MARK_ALL_READ": "All notifications marked as read",
+      "DELETE_ALL": "All notifications deleted",
+      "DELETE_ALL_READ": "All read notifications deleted"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json
index 7e799cff9..6a16de08a 100644
--- a/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json
@@ -569,7 +569,7 @@
       "UPDATE": "Update business hours settings",
       "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
       "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for visitors",
-      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours visitors can be warned with a message and a pre-chat form.",
       "DAY": {
         "ENABLE": "Enable availability for this day",
         "UNAVAILABLE": "Unavailable",
diff --git a/app/javascript/dashboard/i18n/locale/sv/settings.json b/app/javascript/dashboard/i18n/locale/sv/settings.json
index 16574ad8b..603ea228b 100644
--- a/app/javascript/dashboard/i18n/locale/sv/settings.json
+++ b/app/javascript/dashboard/i18n/locale/sv/settings.json
@@ -160,6 +160,9 @@
     "TRIAL_MESSAGE": "dagars provperiod återstår.",
     "TRAIL_BUTTON": "Köp nu",
     "DELETED_USER": "Deleted User",
+    "EMAIL_VERIFICATION_PENDING": "Det verkar som om du inte har bekräftat din e-postadress ännu. Vänligen kolla din inkorg för verifieringsmailet.",
+    "RESEND_VERIFICATION_MAIL": "Skicka verifieringsmail igen",
+    "EMAIL_VERIFICATION_SENT": "Ett verifieringsmail har skickats. Kolla din inkorg.",
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Account Suspended",
       "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
@@ -197,6 +200,7 @@
     "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
     "SWITCH": "Switch",
     "CONVERSATIONS": "Konversationer",
+    "INBOX": "Inkorg",
     "ALL_CONVERSATIONS": "All Conversations",
     "MENTIONED_CONVERSATIONS": "Mentions",
     "PARTICIPATING_CONVERSATIONS": "Deltar",
@@ -238,6 +242,7 @@
     "REPORTS_INBOX": "Inkorg",
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
+    "SLA": "SLA",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Overview",
     "FACEBOOK_REAUTHORIZE": "Din Facebook-anslutning har löpt ut, vänligen återanslut din Facebook-sida för att fortsätta med tjänsterna",
diff --git a/app/javascript/dashboard/i18n/locale/sv/sla.json b/app/javascript/dashboard/i18n/locale/sv/sla.json
new file mode 100644
index 000000000..deb61fab1
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sv/sla.json
@@ -0,0 +1,70 @@
+{
+  "SLA": {
+    "HEADER": "SLA",
+    "HEADER_BTN_TXT": "Add SLA",
+    "LOADING": "Fetching SLAs",
+    "SEARCH_404": "Det finns inga objekt som matchar denna fråga",
+    "SIDEBAR_TXT": "<p><b>SLA</b> <p>Think of Service Level Agreements (SLAs) like friendly promises between a service provider and a customer.</p> <p> These promises set clear expectations for things like how quickly the team will respond to issues, making sure you always get a reliable and top-notch experience!</p>",
+    "LIST": {
+      "404": "There are no SLAs available in this account.",
+      "TITLE": "Manage SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "TABLE_HEADER": [
+        "Namn",
+        "Beskrivning",
+        "FRT",
+        "NRT",
+        "RT",
+        "Öppettider"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "SLA Name",
+        "PLACEHOLDER": "SLA Name",
+        "REQUIRED_ERROR": "SLA name is required",
+        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
+        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Beskrivning",
+        "PLACEHOLDER": "SLA for premium customers"
+      },
+      "FIRST_RESPONSE_TIME": {
+        "LABEL": "First Response Time(Seconds)",
+        "PLACEHOLDER": "300 for 5 minutes"
+      },
+      "NEXT_RESPONSE_TIME": {
+        "LABEL": "Next Response Time(Seconds)",
+        "PLACEHOLDER": "600 for 10 minutes"
+      },
+      "RESOLUTION_TIME": {
+        "LABEL": "Resolution Time(Seconds)",
+        "PLACEHOLDER": "86400 for 1 day"
+      },
+      "BUSINESS_HOURS": {
+        "LABEL": "Öppettider",
+        "PLACEHOLDER": "Only during business hours"
+      },
+      "EDIT": "Redigera",
+      "CREATE": "Skapa",
+      "DELETE": "Radera",
+      "CANCEL": "Avbryt"
+    },
+    "ADD": {
+      "TITLE": "Add SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA added successfully",
+        "ERROR_MESSAGE": "Ett fel uppstod, vänligen försök igen"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit SLA",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA updated successfully",
+        "ERROR_MESSAGE": "Ett fel uppstod, vänligen försök igen"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ta/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/ta/attributesMgmt.json
index bba596f6f..e4d8de8fc 100644
--- a/app/javascript/dashboard/i18n/locale/ta/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ta/attributesMgmt.json
@@ -39,6 +39,17 @@
           "PLACEHOLDER": "Enter custom attribute key",
           "ERROR": "Key is required",
           "IN_VALID": "Invalid key"
+        },
+        "REGEX_PATTERN": {
+          "LABEL": "Regex Pattern",
+          "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+        },
+        "REGEX_CUE": {
+          "LABEL": "Regex Cue",
+          "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+        },
+        "ENABLE_REGEX": {
+          "LABEL": "Enable regex validation"
         }
       },
       "API": {
@@ -93,6 +104,17 @@
       "EMPTY_RESULT": {
         "404": "There are no custom attributes created",
         "NOT_FOUND": "There are no custom attributes configured"
+      },
+      "REGEX_PATTERN": {
+        "LABEL": "Regex Pattern",
+        "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+      },
+      "REGEX_CUE": {
+        "LABEL": "Regex Cue",
+        "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+      },
+      "ENABLE_REGEX": {
+        "LABEL": "Enable regex validation"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/ta/contact.json b/app/javascript/dashboard/i18n/locale/ta/contact.json
index c39635bfa..939aa68d5 100644
--- a/app/javascript/dashboard/i18n/locale/ta/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ta/contact.json
@@ -39,10 +39,10 @@
     },
     "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",
+    "MUTE_CONTACT": "Block Contact",
+    "UNMUTE_CONTACT": "Unblock Contact",
+    "MUTED_SUCCESS": "This contact is blocked successfully. You will not be notified of any future conversations.",
+    "UNMUTED_SUCCESS": "This contact is unblocked successfully.",
     "SEND_TRANSCRIPT": "Send Transcript",
     "EDIT_LABEL": "திருத்து",
     "SIDEBAR_SECTIONS": {
@@ -79,7 +79,13 @@
     "TITLE": "Export Contacts",
     "DESC": "Export contacts to a CSV file.",
     "SUCCESS_MESSAGE": "Export is in progress, You will be notified via email when export file is ready to dowanlod.",
-    "ERROR_MESSAGE": "There was an error, please try again"
+    "ERROR_MESSAGE": "There was an error, please try again",
+    "CONFIRM": {
+      "TITLE": "Export Contacts",
+      "MESSAGE": "Are you sure you want to export all contacts?",
+      "YES": "Yes, Export",
+      "NO": "No, Cancel"
+    }
   },
   "DELETE_NOTE": {
     "CONFIRM": {
@@ -339,7 +345,8 @@
     },
     "VALIDATIONS": {
       "REQUIRED": "Valid value is required",
-      "INVALID_URL": "Invalid URL"
+      "INVALID_URL": "Invalid URL",
+      "INVALID_INPUT": "Invalid Input"
     }
   },
   "MERGE_CONTACTS": {
diff --git a/app/javascript/dashboard/i18n/locale/ta/generalSettings.json b/app/javascript/dashboard/i18n/locale/ta/generalSettings.json
index 4163229e6..2ccedcb2c 100644
--- a/app/javascript/dashboard/i18n/locale/ta/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ta/generalSettings.json
@@ -112,7 +112,8 @@
       "REMOVE_LABEL": "Remove label from the conversation",
       "SETTINGS": "அமைப்புகள்",
       "AI_ASSIST": "AI Assist",
-      "APPEARANCE": "Appearance"
+      "APPEARANCE": "Appearance",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     },
     "COMMANDS": {
       "GO_TO_CONVERSATION_DASHBOARD": "Go to Conversation Dashboard",
@@ -153,7 +154,8 @@
       "CHANGE_APPEARANCE": "Change Appearance",
       "LIGHT_MODE": "Light",
       "DARK_MODE": "Dark",
-      "SYSTEM_MODE": "System"
+      "SYSTEM_MODE": "System",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     }
   },
   "DASHBOARD_APPS": {
diff --git a/app/javascript/dashboard/i18n/locale/ta/helpCenter.json b/app/javascript/dashboard/i18n/locale/ta/helpCenter.json
index f6edceb92..bff004dec 100644
--- a/app/javascript/dashboard/i18n/locale/ta/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ta/helpCenter.json
@@ -324,7 +324,8 @@
         "LAST_EDITED": "Last edited"
       },
       "COLUMNS": {
-        "BY": "by"
+        "BY": "by",
+        "AUTHOR_NOT_AVAILABLE": "Author is not available"
       }
     },
     "EDIT_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/ta/inbox.json b/app/javascript/dashboard/i18n/locale/ta/inbox.json
new file mode 100644
index 000000000..dcac5459f
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ta/inbox.json
@@ -0,0 +1,60 @@
+{
+  "INBOX": {
+    "LIST": {
+      "TITLE": "Inbox",
+      "DISPLAY_DROPDOWN": "Display",
+      "LOADING": "Fetching notifications",
+      "EOF": "All notifications loaded 🎉",
+      "404": "There are no active notifications in this group.",
+      "NO_NOTIFICATIONS": "No notifications",
+      "NOTE": "Notifications from all subscribed inboxes",
+      "SNOOZED_UNTIL": "Snoozed until",
+      "SNOOZED_UNTIL_TOMORROW": "Snoozed until tomorrow",
+      "SNOOZED_UNTIL_NEXT_WEEK": "Snoozed until next week"
+    },
+    "ACTION_HEADER": {
+      "SNOOZE": "Snooze notification",
+      "DELETE": "Delete notification"
+    },
+    "TYPES": {
+      "CONVERSATION_MENTION": "You have been mentioned in a conversation",
+      "CONVERSATION_CREATION": "New conversation created",
+      "CONVERSATION_ASSIGNMENT": "A conversation has been assigned to you",
+      "ASSIGNED_CONVERSATION_NEW_MESSAGE": "New message in an assigned conversation",
+      "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "New message in a conversation you are participating in"
+    },
+    "MENU_ITEM": {
+      "MARK_AS_READ": "Mark as read",
+      "MARK_AS_UNREAD": "Mark as unread",
+      "SNOOZE": "Snooze",
+      "DELETE": "Delete",
+      "MARK_ALL_READ": "Mark all as read",
+      "DELETE_ALL": "Delete all",
+      "DELETE_ALL_READ": "Delete all read"
+    },
+    "DISPLAY_MENU": {
+      "SORT": "Sort",
+      "DISPLAY": "Display :",
+      "SORT_OPTIONS": {
+        "NEWEST": "Newest",
+        "OLDEST": "Oldest",
+        "PRIORITY": "Priority"
+      },
+      "DISPLAY_OPTIONS": {
+        "SNOOZED": "Snoozed",
+        "READ": "Read",
+        "LABELS": "Labels",
+        "CONVERSATION_ID": "Conversation ID"
+      }
+    },
+    "ALERTS": {
+      "MARK_AS_READ": "Notification marked as read",
+      "MARK_AS_UNREAD": "Notification marked as unread",
+      "SNOOZE": "Notification snoozed",
+      "DELETE": "Notification deleted",
+      "MARK_ALL_READ": "All notifications marked as read",
+      "DELETE_ALL": "All notifications deleted",
+      "DELETE_ALL_READ": "All read notifications deleted"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json
index b02e2252c..1993cd7d5 100644
--- a/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json
@@ -569,7 +569,7 @@
       "UPDATE": "Update business hours settings",
       "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
       "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for visitors",
-      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours visitors can be warned with a message and a pre-chat form.",
       "DAY": {
         "ENABLE": "Enable availability for this day",
         "UNAVAILABLE": "Unavailable",
diff --git a/app/javascript/dashboard/i18n/locale/ta/settings.json b/app/javascript/dashboard/i18n/locale/ta/settings.json
index db3f9008c..f8ef418da 100644
--- a/app/javascript/dashboard/i18n/locale/ta/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ta/settings.json
@@ -160,6 +160,9 @@
     "TRIAL_MESSAGE": "நாட்கள் சோதனை மீதமுள்ளது.",
     "TRAIL_BUTTON": "இப்போது வாங்க",
     "DELETED_USER": "Deleted User",
+    "EMAIL_VERIFICATION_PENDING": "It seems that you haven't verified your email address yet. Please check your inbox for the verification email.",
+    "RESEND_VERIFICATION_MAIL": "Resend verification email",
+    "EMAIL_VERIFICATION_SENT": "Verification email has been sent. Please check your inbox.",
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Account Suspended",
       "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
@@ -197,6 +200,7 @@
     "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
     "SWITCH": "Switch",
     "CONVERSATIONS": "உரையாடல்கள்",
+    "INBOX": "Inbox",
     "ALL_CONVERSATIONS": "All Conversations",
     "MENTIONED_CONVERSATIONS": "Mentions",
     "PARTICIPATING_CONVERSATIONS": "Participating",
@@ -238,6 +242,7 @@
     "REPORTS_INBOX": "Inbox",
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
+    "SLA": "SLA",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Overview",
     "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
diff --git a/app/javascript/dashboard/i18n/locale/ta/sla.json b/app/javascript/dashboard/i18n/locale/ta/sla.json
new file mode 100644
index 000000000..7eacfea2c
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ta/sla.json
@@ -0,0 +1,70 @@
+{
+  "SLA": {
+    "HEADER": "SLA",
+    "HEADER_BTN_TXT": "Add SLA",
+    "LOADING": "Fetching SLAs",
+    "SEARCH_404": "இந்த கேள்விக்கு பொருந்தக்கூடியவை எதுவும் இல்லை",
+    "SIDEBAR_TXT": "<p><b>SLA</b> <p>Think of Service Level Agreements (SLAs) like friendly promises between a service provider and a customer.</p> <p> These promises set clear expectations for things like how quickly the team will respond to issues, making sure you always get a reliable and top-notch experience!</p>",
+    "LIST": {
+      "404": "There are no SLAs available in this account.",
+      "TITLE": "Manage SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "TABLE_HEADER": [
+        "பெயர்",
+        "Description",
+        "FRT",
+        "NRT",
+        "RT",
+        "Business Hours"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "SLA Name",
+        "PLACEHOLDER": "SLA Name",
+        "REQUIRED_ERROR": "SLA name is required",
+        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
+        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Description",
+        "PLACEHOLDER": "SLA for premium customers"
+      },
+      "FIRST_RESPONSE_TIME": {
+        "LABEL": "First Response Time(Seconds)",
+        "PLACEHOLDER": "300 for 5 minutes"
+      },
+      "NEXT_RESPONSE_TIME": {
+        "LABEL": "Next Response Time(Seconds)",
+        "PLACEHOLDER": "600 for 10 minutes"
+      },
+      "RESOLUTION_TIME": {
+        "LABEL": "Resolution Time(Seconds)",
+        "PLACEHOLDER": "86400 for 1 day"
+      },
+      "BUSINESS_HOURS": {
+        "LABEL": "Business Hours",
+        "PLACEHOLDER": "Only during business hours"
+      },
+      "EDIT": "திருத்து",
+      "CREATE": "Create",
+      "DELETE": "Delete",
+      "CANCEL": "ரத்துசெய்"
+    },
+    "ADD": {
+      "TITLE": "Add SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA added successfully",
+        "ERROR_MESSAGE": "There was an error, please try again"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit SLA",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA updated successfully",
+        "ERROR_MESSAGE": "There was an error, please try again"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/th/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/th/attributesMgmt.json
index 8e52ac44c..7df48bbe4 100644
--- a/app/javascript/dashboard/i18n/locale/th/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/th/attributesMgmt.json
@@ -39,6 +39,17 @@
           "PLACEHOLDER": "โปรดใส่คีย์ของแอตทริบิวต์เเบบกำหนดเอง",
           "ERROR": "โปรดระบุคีย์",
           "IN_VALID": "คีย์นี้ใช้ไม่ได้"
+        },
+        "REGEX_PATTERN": {
+          "LABEL": "Regex Pattern",
+          "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+        },
+        "REGEX_CUE": {
+          "LABEL": "Regex Cue",
+          "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+        },
+        "ENABLE_REGEX": {
+          "LABEL": "Enable regex validation"
         }
       },
       "API": {
@@ -93,6 +104,17 @@
       "EMPTY_RESULT": {
         "404": "ไม่พบแอตทริบิวต์เเบบกำหนดเองที่สร้างไว้",
         "NOT_FOUND": "ไม่มีแอตทริบิวต์เเบบกำหนดเอง ที่กำหนดค่าไว้"
+      },
+      "REGEX_PATTERN": {
+        "LABEL": "Regex Pattern",
+        "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+      },
+      "REGEX_CUE": {
+        "LABEL": "Regex Cue",
+        "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+      },
+      "ENABLE_REGEX": {
+        "LABEL": "Enable regex validation"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/th/contact.json b/app/javascript/dashboard/i18n/locale/th/contact.json
index baa81ed94..107370e6a 100644
--- a/app/javascript/dashboard/i18n/locale/th/contact.json
+++ b/app/javascript/dashboard/i18n/locale/th/contact.json
@@ -39,10 +39,10 @@
     },
     "MERGE_CONTACT": "รวมผู้ติดต่อ",
     "CONTACT_ACTIONS": "ดำเนินการติดต่อ",
-    "MUTE_CONTACT": "ระงับการสนทนา",
-    "UNMUTE_CONTACT": "เลิกใบ้การสนทนา",
-    "MUTED_SUCCESS": "การสนทนานี้ถูกระงับ 6 ชั่วโมง",
-    "UNMUTED_SUCCESS": "การสนทนานี้เลิกใบ้เเล้ว",
+    "MUTE_CONTACT": "Block Contact",
+    "UNMUTE_CONTACT": "Unblock Contact",
+    "MUTED_SUCCESS": "This contact is blocked successfully. You will not be notified of any future conversations.",
+    "UNMUTED_SUCCESS": "This contact is unblocked successfully.",
     "SEND_TRANSCRIPT": "ส่งประวัติเเชท",
     "EDIT_LABEL": "เเก้ไข",
     "SIDEBAR_SECTIONS": {
@@ -79,7 +79,13 @@
     "TITLE": "Export Contacts",
     "DESC": "Export contacts to a CSV file.",
     "SUCCESS_MESSAGE": "Export is in progress, You will be notified via email when export file is ready to dowanlod.",
-    "ERROR_MESSAGE": "เกิดข้อผิดพลาดกรุณาลองใหม่อีกครั้ง"
+    "ERROR_MESSAGE": "เกิดข้อผิดพลาดกรุณาลองใหม่อีกครั้ง",
+    "CONFIRM": {
+      "TITLE": "Export Contacts",
+      "MESSAGE": "Are you sure you want to export all contacts?",
+      "YES": "Yes, Export",
+      "NO": "No, Cancel"
+    }
   },
   "DELETE_NOTE": {
     "CONFIRM": {
@@ -339,7 +345,8 @@
     },
     "VALIDATIONS": {
       "REQUIRED": "โปรดระบุค่าที่ถูกต้อง",
-      "INVALID_URL": "URL ไม่ถูกต้อง"
+      "INVALID_URL": "URL ไม่ถูกต้อง",
+      "INVALID_INPUT": "Invalid Input"
     }
   },
   "MERGE_CONTACTS": {
diff --git a/app/javascript/dashboard/i18n/locale/th/generalSettings.json b/app/javascript/dashboard/i18n/locale/th/generalSettings.json
index 5e5ca75ce..feb70fe3c 100644
--- a/app/javascript/dashboard/i18n/locale/th/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/th/generalSettings.json
@@ -112,7 +112,8 @@
       "REMOVE_LABEL": "ลบป้ายกำกับออกจากการสนทนา",
       "SETTINGS": "ตั้งค่า",
       "AI_ASSIST": "AI Assist",
-      "APPEARANCE": "Appearance"
+      "APPEARANCE": "Appearance",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     },
     "COMMANDS": {
       "GO_TO_CONVERSATION_DASHBOARD": "ไปยังแดชบอร์ดการสนทนา",
@@ -153,7 +154,8 @@
       "CHANGE_APPEARANCE": "Change Appearance",
       "LIGHT_MODE": "Light",
       "DARK_MODE": "Dark",
-      "SYSTEM_MODE": "System"
+      "SYSTEM_MODE": "System",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     }
   },
   "DASHBOARD_APPS": {
diff --git a/app/javascript/dashboard/i18n/locale/th/helpCenter.json b/app/javascript/dashboard/i18n/locale/th/helpCenter.json
index 4f28c1ef4..4558d5810 100644
--- a/app/javascript/dashboard/i18n/locale/th/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/th/helpCenter.json
@@ -324,7 +324,8 @@
         "LAST_EDITED": "Last edited"
       },
       "COLUMNS": {
-        "BY": "by"
+        "BY": "by",
+        "AUTHOR_NOT_AVAILABLE": "Author is not available"
       }
     },
     "EDIT_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/th/inbox.json b/app/javascript/dashboard/i18n/locale/th/inbox.json
new file mode 100644
index 000000000..4447ddef5
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/th/inbox.json
@@ -0,0 +1,60 @@
+{
+  "INBOX": {
+    "LIST": {
+      "TITLE": "กล่องข้อความ",
+      "DISPLAY_DROPDOWN": "Display",
+      "LOADING": "Fetching notifications",
+      "EOF": "All notifications loaded 🎉",
+      "404": "There are no active notifications in this group.",
+      "NO_NOTIFICATIONS": "No notifications",
+      "NOTE": "Notifications from all subscribed inboxes",
+      "SNOOZED_UNTIL": "Snoozed until",
+      "SNOOZED_UNTIL_TOMORROW": "พักการสนทนาจนถึงพรุ่งนี้",
+      "SNOOZED_UNTIL_NEXT_WEEK": "พักการสนทนาจนถึงสัปดาห์หน้า"
+    },
+    "ACTION_HEADER": {
+      "SNOOZE": "Snooze notification",
+      "DELETE": "Delete notification"
+    },
+    "TYPES": {
+      "CONVERSATION_MENTION": "You have been mentioned in a conversation",
+      "CONVERSATION_CREATION": "New conversation created",
+      "CONVERSATION_ASSIGNMENT": "A conversation has been assigned to you",
+      "ASSIGNED_CONVERSATION_NEW_MESSAGE": "New message in an assigned conversation",
+      "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "New message in a conversation you are participating in"
+    },
+    "MENU_ITEM": {
+      "MARK_AS_READ": "Mark as read",
+      "MARK_AS_UNREAD": "Mark as unread",
+      "SNOOZE": "Snooze",
+      "DELETE": "ลบ",
+      "MARK_ALL_READ": "Mark all as read",
+      "DELETE_ALL": "Delete all",
+      "DELETE_ALL_READ": "Delete all read"
+    },
+    "DISPLAY_MENU": {
+      "SORT": "Sort",
+      "DISPLAY": "Display :",
+      "SORT_OPTIONS": {
+        "NEWEST": "Newest",
+        "OLDEST": "Oldest",
+        "PRIORITY": "Priority"
+      },
+      "DISPLAY_OPTIONS": {
+        "SNOOZED": "หลับ",
+        "READ": "อ่านแล้ว",
+        "LABELS": "ป้ายกำกับ",
+        "CONVERSATION_ID": "Conversation ID"
+      }
+    },
+    "ALERTS": {
+      "MARK_AS_READ": "Notification marked as read",
+      "MARK_AS_UNREAD": "Notification marked as unread",
+      "SNOOZE": "Notification snoozed",
+      "DELETE": "Notification deleted",
+      "MARK_ALL_READ": "All notifications marked as read",
+      "DELETE_ALL": "All notifications deleted",
+      "DELETE_ALL_READ": "All read notifications deleted"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json
index aae9b171d..f605463f4 100644
--- a/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json
@@ -569,7 +569,7 @@
       "UPDATE": "อัปเดตเวลาทำการ",
       "TOGGLE_AVAILABILITY": "แสดงความพร้อมในการให้บริการสำหรับกล่องข้อความนี้",
       "UNAVAILABLE_MESSAGE_LABEL": "ข้อความที่ต้องการแสดงเมื่ออยู่นอกเวลาทำการ",
-      "TOGGLE_HELP": "การเปิดใช้ความพร้อมในการให้บริการจะแสดงเวลาทำการบน live-chat widget แม้ว่าพนักงานทุกคนจะออฟไลน์ เมื่อมีลูกค้าต้องการติดต่อนอกเวลาทำการจะมีข้อความแจ้งเตือน และแสดงแบบสอบถามก่อนเริ่มแชทให้กับลูกค้า",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours visitors can be warned with a message and a pre-chat form.",
       "DAY": {
         "ENABLE": "เปิดใช้ความพร้อมในการให้บริการสำหรับวันนี้",
         "UNAVAILABLE": "ไม่พร้อมให้บริการ",
diff --git a/app/javascript/dashboard/i18n/locale/th/settings.json b/app/javascript/dashboard/i18n/locale/th/settings.json
index d63082424..6028abd11 100644
--- a/app/javascript/dashboard/i18n/locale/th/settings.json
+++ b/app/javascript/dashboard/i18n/locale/th/settings.json
@@ -160,6 +160,9 @@
     "TRIAL_MESSAGE": "จำนวนวันทดลองใช้ที่เหลืออยู่",
     "TRAIL_BUTTON": "ซื้อเลย",
     "DELETED_USER": "ผู้ใช้งานที่ถูกลบ",
+    "EMAIL_VERIFICATION_PENDING": "It seems that you haven't verified your email address yet. Please check your inbox for the verification email.",
+    "RESEND_VERIFICATION_MAIL": "Resend verification email",
+    "EMAIL_VERIFICATION_SENT": "Verification email has been sent. Please check your inbox.",
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Account Suspended",
       "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
@@ -197,6 +200,7 @@
     "CURRENTLY_VIEWING_ACCOUNT": "กำลังดูอยู่:",
     "SWITCH": "Switch",
     "CONVERSATIONS": "การสนทนา",
+    "INBOX": "กล่องข้อความ",
     "ALL_CONVERSATIONS": "การสนทนาทั้งหมด",
     "MENTIONED_CONVERSATIONS": "การกล่าวถึง",
     "PARTICIPATING_CONVERSATIONS": "Participating",
@@ -238,6 +242,7 @@
     "REPORTS_INBOX": "กล่องข้อความ",
     "REPORTS_TEAM": "ทีม",
     "SET_AVAILABILITY_TITLE": "ตั้งสถานะเป็น...",
+    "SLA": "SLA",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "ภาพรวม",
     "FACEBOOK_REAUTHORIZE": "การเชื่อมต่อกับ Facebook หมดอายุแล้ว โปรดเชื่อมต่อใหม่อีกครั้ง",
diff --git a/app/javascript/dashboard/i18n/locale/th/sla.json b/app/javascript/dashboard/i18n/locale/th/sla.json
new file mode 100644
index 000000000..0d972ee37
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/th/sla.json
@@ -0,0 +1,70 @@
+{
+  "SLA": {
+    "HEADER": "SLA",
+    "HEADER_BTN_TXT": "Add SLA",
+    "LOADING": "Fetching SLAs",
+    "SEARCH_404": "ไม่มีรายการที่ตรงกับเนื้อหานี้",
+    "SIDEBAR_TXT": "<p><b>SLA</b> <p>Think of Service Level Agreements (SLAs) like friendly promises between a service provider and a customer.</p> <p> These promises set clear expectations for things like how quickly the team will respond to issues, making sure you always get a reliable and top-notch experience!</p>",
+    "LIST": {
+      "404": "There are no SLAs available in this account.",
+      "TITLE": "Manage SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "TABLE_HEADER": [
+        "ชื่อ",
+        "คำอธิบาย",
+        "FRT",
+        "NRT",
+        "RT",
+        "เวลาทำการ"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "SLA Name",
+        "PLACEHOLDER": "SLA Name",
+        "REQUIRED_ERROR": "SLA name is required",
+        "MINIMUM_LENGTH_ERROR": "ชื่อป้ายกำกับต้องยาวอย่างน้อย 2 ตัวอักษร",
+        "VALID_ERROR": "ชื่อป้ายกำกับต้องเป็นตัวอักษรภาษาอังกฤษ ตัวเลข ขีดกลาง'-' และ ขีดล่าง'_' เท่านั้น"
+      },
+      "DESCRIPTION": {
+        "LABEL": "คำอธิบาย",
+        "PLACEHOLDER": "SLA for premium customers"
+      },
+      "FIRST_RESPONSE_TIME": {
+        "LABEL": "First Response Time(Seconds)",
+        "PLACEHOLDER": "300 for 5 minutes"
+      },
+      "NEXT_RESPONSE_TIME": {
+        "LABEL": "Next Response Time(Seconds)",
+        "PLACEHOLDER": "600 for 10 minutes"
+      },
+      "RESOLUTION_TIME": {
+        "LABEL": "Resolution Time(Seconds)",
+        "PLACEHOLDER": "86400 for 1 day"
+      },
+      "BUSINESS_HOURS": {
+        "LABEL": "เวลาทำการ",
+        "PLACEHOLDER": "Only during business hours"
+      },
+      "EDIT": "เเก้ไข",
+      "CREATE": "สร้าง",
+      "DELETE": "ลบ",
+      "CANCEL": "ยกเลิก"
+    },
+    "ADD": {
+      "TITLE": "Add SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA added successfully",
+        "ERROR_MESSAGE": "เกิดข้อผิดพลาดกรุณาลองใหม่อีกครั้ง"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit SLA",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA updated successfully",
+        "ERROR_MESSAGE": "เกิดข้อผิดพลาดกรุณาลองใหม่อีกครั้ง"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/tr/agentMgmt.json b/app/javascript/dashboard/i18n/locale/tr/agentMgmt.json
index f3978834a..4fd1a9bda 100644
--- a/app/javascript/dashboard/i18n/locale/tr/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/tr/agentMgmt.json
@@ -76,8 +76,8 @@
         },
         "AGENT_AVAILABILITY": {
           "LABEL": "Uygun",
-          "PLACEHOLDER": "Lütfen bir müsaitlik durumu seçin",
-          "ERROR": "Müsaitlik gereklidir"
+          "PLACEHOLDER": "Lütfen bir erişilebilirlik durumu seçin",
+          "ERROR": "Erişilebilirlik gereklidir"
         },
         "SUBMIT": "Temsilciyi düzenle"
       },
diff --git a/app/javascript/dashboard/i18n/locale/tr/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/tr/attributesMgmt.json
index af886afa1..10929f6c6 100644
--- a/app/javascript/dashboard/i18n/locale/tr/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/tr/attributesMgmt.json
@@ -39,6 +39,17 @@
           "PLACEHOLDER": "Özel nitelik anahtarını girin",
           "ERROR": "Anahtar gerekli",
           "IN_VALID": "Geçersiz anahtar"
+        },
+        "REGEX_PATTERN": {
+          "LABEL": "Düzenli İfade",
+          "PLACEHOLDER": "Lütfen özel nitelikli düzenli deseni giriniz. (İsteğe bağlı)"
+        },
+        "REGEX_CUE": {
+          "LABEL": "Düzenli ifade ipucu",
+          "PLACEHOLDER": "Lütfen düzenli ifade ipucunu girin (İsteğe bağlı)"
+        },
+        "ENABLE_REGEX": {
+          "LABEL": "Düzenli ifade doğrulamasını aç"
         }
       },
       "API": {
@@ -93,6 +104,17 @@
       "EMPTY_RESULT": {
         "404": "Oluşturulmuş özel nitelik yok",
         "NOT_FOUND": "Yapılandırılmış özel nitelikler yok"
+      },
+      "REGEX_PATTERN": {
+        "LABEL": "Düzenli İfade",
+        "PLACEHOLDER": "Lütfen özel nitelikli düzenli deseni giriniz. (İsteğe bağlı)"
+      },
+      "REGEX_CUE": {
+        "LABEL": "Düzenli ifade ipucu",
+        "PLACEHOLDER": "Lütfen düzenli ifade ipucunu girin (İsteğe bağlı)"
+      },
+      "ENABLE_REGEX": {
+        "LABEL": "Düzenli ifade doğrulamasını aç"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/tr/chatlist.json b/app/javascript/dashboard/i18n/locale/tr/chatlist.json
index 4c5768fec..fadac0b00 100644
--- a/app/javascript/dashboard/i18n/locale/tr/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/tr/chatlist.json
@@ -53,28 +53,28 @@
     },
     "SORT_ORDER_ITEMS": {
       "last_activity_at_asc": {
-        "TEXT": "Last activity: Oldest first"
+        "TEXT": "Son aktivite: En eski"
       },
       "last_activity_at_desc": {
-        "TEXT": "Last activity: Newest first"
+        "TEXT": "Son Aktivite: En Yeni"
       },
       "created_at_desc": {
-        "TEXT": "Created at: Newest first"
+        "TEXT": "Oluşturulma: En Yeni"
       },
       "created_at_asc": {
-        "TEXT": "Created at: Oldest first"
+        "TEXT": "Oluşturulma: En Eski"
       },
       "priority_desc": {
-        "TEXT": "Priority: Highest first"
+        "TEXT": "Öncelik: Yüksek"
       },
       "priority_asc": {
-        "TEXT": "Priority: Lowest first"
+        "TEXT": "Öncelik: Düşük"
       },
       "waiting_since_asc": {
-        "TEXT": "Pending Response: Longest first"
+        "TEXT": "Cevap Bekleyen: Uzun olan"
       },
       "waiting_since_desc": {
-        "TEXT": "Pending Response: Shortest first"
+        "TEXT": "Cevap Bekleyen: Kısa olan"
       }
     },
     "ATTACHMENTS": {
diff --git a/app/javascript/dashboard/i18n/locale/tr/contact.json b/app/javascript/dashboard/i18n/locale/tr/contact.json
index 31872199a..ca71fbde0 100644
--- a/app/javascript/dashboard/i18n/locale/tr/contact.json
+++ b/app/javascript/dashboard/i18n/locale/tr/contact.json
@@ -39,10 +39,10 @@
     },
     "MERGE_CONTACT": "Kişileri birleştir",
     "CONTACT_ACTIONS": "Kişi Eylemleri",
-    "MUTE_CONTACT": "Konuşmayı Sessize Al",
-    "UNMUTE_CONTACT": "Konuşmanın Sesini Aç",
-    "MUTED_SUCCESS": "Bu konuşma 6 saatliğine sessize alındı",
-    "UNMUTED_SUCCESS": "Bu görüşmenin sesi kapatıldı",
+    "MUTE_CONTACT": "Block Contact",
+    "UNMUTE_CONTACT": "Unblock Contact",
+    "MUTED_SUCCESS": "This contact is blocked successfully. You will not be notified of any future conversations.",
+    "UNMUTED_SUCCESS": "This contact is unblocked successfully.",
     "SEND_TRANSCRIPT": "Transkript Gönder",
     "EDIT_LABEL": "Düzenle",
     "SIDEBAR_SECTIONS": {
@@ -79,7 +79,13 @@
     "TITLE": "Kişileri Dışa Aktar",
     "DESC": "Kişileri CSV dosyası olarak dışa aktar.",
     "SUCCESS_MESSAGE": "Dışa aktarma işlemi devam ediyor, dışa aktarma dosyası indirmeye hazır olduğunda e-posta ile bildirileceksiniz.",
-    "ERROR_MESSAGE": "Bir hata oluştu, lütfen tekrar deneyin"
+    "ERROR_MESSAGE": "Bir hata oluştu, lütfen tekrar deneyin",
+    "CONFIRM": {
+      "TITLE": "Kişileri Dışa Aktar",
+      "MESSAGE": "Are you sure you want to export all contacts?",
+      "YES": "Yes, Export",
+      "NO": "No, Cancel"
+    }
   },
   "DELETE_NOTE": {
     "CONFIRM": {
@@ -339,7 +345,8 @@
     },
     "VALIDATIONS": {
       "REQUIRED": "Geçerli değer gereklidir",
-      "INVALID_URL": "Geçersiz URL"
+      "INVALID_URL": "Geçersiz URL",
+      "INVALID_INPUT": "Geçersiz giriş"
     }
   },
   "MERGE_CONTACTS": {
@@ -357,7 +364,7 @@
     "SUMMARY": {
       "TITLE": "Özet",
       "DELETE_WARNING": "<strong>%{primaryContactName}</strong> kişisi silinecek.",
-      "ATTRIBUTE_WARNING": "Contact details of <strong>%{primaryContactName}</strong> will be copied to <strong>%{parentContactName}</strong>."
+      "ATTRIBUTE_WARNING": "Şu: <strong>%{primaryContactName}</strong> kişinin iletişim bilgileri, şu<strong>%{parentContactName}</strong> kişiye kopyalanacaktır."
     },
     "SEARCH": {
       "ERROR": "ERROR_MESSAGE"
diff --git a/app/javascript/dashboard/i18n/locale/tr/conversation.json b/app/javascript/dashboard/i18n/locale/tr/conversation.json
index e4371c71d..2faf2852d 100644
--- a/app/javascript/dashboard/i18n/locale/tr/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/tr/conversation.json
@@ -41,9 +41,9 @@
     "SAVE_CONTACT": "Kaydet",
     "UPLOADING_ATTACHMENTS": "Dosyalar gönderiliyor...",
     "REPLIED_TO_STORY": "Hikayene cevap verildi",
-    "UNSUPPORTED_MESSAGE": "This message is unsupported.",
-    "UNSUPPORTED_MESSAGE_FACEBOOK": "This message is unsupported. You can view this message on the Facebook Messenger app.",
-    "UNSUPPORTED_MESSAGE_INSTAGRAM": "This message is unsupported. You can view this message on the Instagram app.",
+    "UNSUPPORTED_MESSAGE": "Bu mesaj desteklenmiyor.",
+    "UNSUPPORTED_MESSAGE_FACEBOOK": "Bu mesaj desteklenmiyor. Bu mesajı Facebook Messenger uygulamasında görüntüleyebilirsiniz.",
+    "UNSUPPORTED_MESSAGE_INSTAGRAM": "Bu mesaj desteklenmiyor. Bu mesajı Instagram uygulamasında görüntüleyebilirsiniz.",
     "SUCCESS_DELETE_MESSAGE": "Mesaj başarıyla silindi",
     "FAIL_DELETE_MESSSAGE": "Mesaj silinemiyor. Tekrar deneyin",
     "NO_RESPONSE": "Cevap Yok",
diff --git a/app/javascript/dashboard/i18n/locale/tr/generalSettings.json b/app/javascript/dashboard/i18n/locale/tr/generalSettings.json
index 2988f3394..43daead87 100644
--- a/app/javascript/dashboard/i18n/locale/tr/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/tr/generalSettings.json
@@ -112,7 +112,8 @@
       "REMOVE_LABEL": "Konuşmadan Etiketi Kaldır",
       "SETTINGS": "Ayarlar",
       "AI_ASSIST": "AI Yardımı",
-      "APPEARANCE": "Görünüm"
+      "APPEARANCE": "Görünüm",
+      "SNOOZE_NOTIFICATION": "Sessiz bildirim"
     },
     "COMMANDS": {
       "GO_TO_CONVERSATION_DASHBOARD": "Konuşma Paneline Git",
@@ -153,7 +154,8 @@
       "CHANGE_APPEARANCE": "Görünümü Değiştir",
       "LIGHT_MODE": "Açık Mod",
       "DARK_MODE": "Koyu Mod",
-      "SYSTEM_MODE": "Sistem Modu"
+      "SYSTEM_MODE": "Sistem Modu",
+      "SNOOZE_NOTIFICATION": "Sessiz bildirim"
     }
   },
   "DASHBOARD_APPS": {
diff --git a/app/javascript/dashboard/i18n/locale/tr/helpCenter.json b/app/javascript/dashboard/i18n/locale/tr/helpCenter.json
index 68251bfdf..a9c949ed8 100644
--- a/app/javascript/dashboard/i18n/locale/tr/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/tr/helpCenter.json
@@ -18,10 +18,10 @@
         "ARCHIVED": "Arşivlenmiş Makaleler"
       },
       "LOCALE_SELECT": {
-        "TITLE": "Select locale",
-        "PLACEHOLDER": "Select locale",
-        "NO_RESULT": "No locale found",
-        "SEARCH_PLACEHOLDER": "Search locale"
+        "TITLE": "Dil seçin",
+        "PLACEHOLDER": "Dil seçin",
+        "NO_RESULT": "Dil bulunamadı",
+        "SEARCH_PLACEHOLDER": "Dil ara"
       }
     },
     "EDIT_HEADER": {
@@ -324,7 +324,8 @@
         "LAST_EDITED": "Son düzenleme"
       },
       "COLUMNS": {
-        "BY": "tarafından"
+        "BY": "tarafından",
+        "AUTHOR_NOT_AVAILABLE": "Yazar uygun değil"
       }
     },
     "EDIT_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/tr/inbox.json b/app/javascript/dashboard/i18n/locale/tr/inbox.json
new file mode 100644
index 000000000..2cae19c0e
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/tr/inbox.json
@@ -0,0 +1,60 @@
+{
+  "INBOX": {
+    "LIST": {
+      "TITLE": "Gelen Kutusu",
+      "DISPLAY_DROPDOWN": "Görüntüle",
+      "LOADING": "Bildirimler yükleniyor",
+      "EOF": "Tüm bildirimler yüklendi 🎉",
+      "404": "Bu grupta aktif görüşme yok.",
+      "NO_NOTIFICATIONS": "Bildirim yok",
+      "NOTE": "Abone olunan tüm gelen kutularından bildirimler",
+      "SNOOZED_UNTIL": "Susturulacak kadar ertelendi",
+      "SNOOZED_UNTIL_TOMORROW": "yarına ertelendi",
+      "SNOOZED_UNTIL_NEXT_WEEK": "Önümüzdeki haftaya ertelendi"
+    },
+    "ACTION_HEADER": {
+      "SNOOZE": "Sessiz bildirim",
+      "DELETE": "Bildirimi Sil"
+    },
+    "TYPES": {
+      "CONVERSATION_MENTION": "Bir konuşmada senden bahsedildi",
+      "CONVERSATION_CREATION": "Yeni bir görüşme oluşturuldu",
+      "CONVERSATION_ASSIGNMENT": "Size bir görüşme atandı",
+      "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Atandığınız görüşmeden bir yeni mesaj",
+      "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Katıldığınız sohbetteki yeni mesaj"
+    },
+    "MENU_ITEM": {
+      "MARK_AS_READ": "Okundu olarak işaretle",
+      "MARK_AS_UNREAD": "Okunmamış olarak işaretle",
+      "SNOOZE": "Sustur",
+      "DELETE": "Sil",
+      "MARK_ALL_READ": "Tümünü okundu olarak işaretle",
+      "DELETE_ALL": "Tümünü sil",
+      "DELETE_ALL_READ": "Tüm okunmuşları sil"
+    },
+    "DISPLAY_MENU": {
+      "SORT": "Filtre",
+      "DISPLAY": "Görüntüle :",
+      "SORT_OPTIONS": {
+        "NEWEST": "En Yeni",
+        "OLDEST": "En Eski",
+        "PRIORITY": "Öncelik"
+      },
+      "DISPLAY_OPTIONS": {
+        "SNOOZED": "Susturuldu",
+        "READ": "Oku",
+        "LABELS": "Etiketler",
+        "CONVERSATION_ID": "Sohbet ID"
+      }
+    },
+    "ALERTS": {
+      "MARK_AS_READ": "Bildirim okundu olarak işaretlendi",
+      "MARK_AS_UNREAD": "Bildirim okunmamış olarak işaretlendi",
+      "SNOOZE": "Bildirim Sessize Alındı",
+      "DELETE": "Bildirim Silindi",
+      "MARK_ALL_READ": "Tüm Bildirimler Okundu Olarak İşaretlendi",
+      "DELETE_ALL": "Tüm Bildirimler Silindi",
+      "DELETE_ALL_READ": "Tüm Okunmuş Bildirimler Silindi"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json
index a137c58b4..30713a4ec 100644
--- a/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json
@@ -569,7 +569,7 @@
       "UPDATE": "İş Saatleri Ayarlarını Güncelle",
       "TOGGLE_AVAILABILITY": "Bu gelen kutusu için iş uygunluğunu etkinleştir",
       "UNAVAILABLE_MESSAGE_LABEL": "Ziyaretçiler için uygun değil mesajı",
-      "TOGGLE_HELP": "İş uygunluğu etkinleştirildiğinde, tüm ajanlar çevrimdışı olsa bile canlı sohbet widget'ında uygun saatler görüntülenecektir. Uygun olmayan saatlerde ziyaretçilere bir mesaj ve bir ön sohbet formu ile uyarı yapılabilir.",
+      "TOGGLE_HELP": "İşletme erişilebilirliğini etkinleştirmek, tüm temsilciler çevrimdışı olsa bile canlı sohbet ekranında mevcut saatleri gösterecektir. Mevcut saatler dışında ziyaretçiler bir mesaj ve ön sohbet formu ile uyarılabilir.",
       "DAY": {
         "ENABLE": "Bu gün için uygunluğu etkinleştir",
         "UNAVAILABLE": "Uygun Değil",
diff --git a/app/javascript/dashboard/i18n/locale/tr/search.json b/app/javascript/dashboard/i18n/locale/tr/search.json
index da8e1ed99..703aecc9c 100644
--- a/app/javascript/dashboard/i18n/locale/tr/search.json
+++ b/app/javascript/dashboard/i18n/locale/tr/search.json
@@ -11,8 +11,8 @@
       "CONVERSATIONS": "Konuşmalar",
       "MESSAGES": "Mesajlar"
     },
-    "EMPTY_STATE": "No %{item} found for query '%{query}'",
-    "EMPTY_STATE_FULL": "No results found for query '%{query}'",
+    "EMPTY_STATE": "%{query} sorgusunda hiç bir %{item} bulunamadı",
+    "EMPTY_STATE_FULL": "%{query} sorgusu için hiç bir sonuç bulunamadı",
     "PLACEHOLDER_KEYBINDING": "odaklanmak için / basın",
     "INPUT_PLACEHOLDER": "Aramak için 3 veya daha fazla karakter yazın",
     "EMPTY_STATE_DEFAULT": "Daha iyi arama sonuçları için konuşma id si, e-posta, telefon numarası, mesajlara göre arama yapın. ",
diff --git a/app/javascript/dashboard/i18n/locale/tr/settings.json b/app/javascript/dashboard/i18n/locale/tr/settings.json
index 3212dc38e..9d1fe9804 100644
--- a/app/javascript/dashboard/i18n/locale/tr/settings.json
+++ b/app/javascript/dashboard/i18n/locale/tr/settings.json
@@ -160,6 +160,9 @@
     "TRIAL_MESSAGE": "gün deneme kaldı.",
     "TRAIL_BUTTON": "Şimdi satın al",
     "DELETED_USER": "Silinmiş Kullanıcı",
+    "EMAIL_VERIFICATION_PENDING": "Görünüşe göre E-Posta adresinizi henüz doğrulamadınız. Lütfen doğrulama e-postası için gelen kutunuzu kontrol edin.",
+    "RESEND_VERIFICATION_MAIL": "Doğrulama E-Postasını tekrar gönder",
+    "EMAIL_VERIFICATION_SENT": "Doğrulama E-Postası gönderildi. Lütfen gelen kutunuzu kontrol edin.",
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Hesap Askıya Alındı",
       "MESSAGE": "Hesabınız askıya alındı. Daha fazla bilgi için lütfen destek ekibine ulaşın."
@@ -197,6 +200,7 @@
     "CURRENTLY_VIEWING_ACCOUNT": "Şu an görüntülüyor:",
     "SWITCH": "Değiştir",
     "CONVERSATIONS": "Konuşmalar",
+    "INBOX": "Gelen Kutusu",
     "ALL_CONVERSATIONS": "Tüm Görüşmeler",
     "MENTIONED_CONVERSATIONS": "Bahsedilmeler",
     "PARTICIPATING_CONVERSATIONS": "Katılımcılar",
@@ -238,6 +242,7 @@
     "REPORTS_INBOX": "Gelen kutusu",
     "REPORTS_TEAM": "Ekip",
     "SET_AVAILABILITY_TITLE": "Kendini şu şekilde ayarla",
+    "SLA": "SLA",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Önizleme",
     "FACEBOOK_REAUTHORIZE": "Facebook bağlantınızın süresi doldu, hizmetlere devam etmek için lütfen Facebook sayfanızı yeniden bağlayın",
diff --git a/app/javascript/dashboard/i18n/locale/tr/sla.json b/app/javascript/dashboard/i18n/locale/tr/sla.json
new file mode 100644
index 000000000..83699d873
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/tr/sla.json
@@ -0,0 +1,70 @@
+{
+  "SLA": {
+    "HEADER": "SLA",
+    "HEADER_BTN_TXT": "Add SLA",
+    "LOADING": "Fetching SLAs",
+    "SEARCH_404": "Bu sorgu ile eşleşen öğe yok",
+    "SIDEBAR_TXT": "<p><b>SLA</b> <p>Think of Service Level Agreements (SLAs) like friendly promises between a service provider and a customer.</p> <p> These promises set clear expectations for things like how quickly the team will respond to issues, making sure you always get a reliable and top-notch experience!</p>",
+    "LIST": {
+      "404": "There are no SLAs available in this account.",
+      "TITLE": "Manage SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "TABLE_HEADER": [
+        "İsim",
+        "Açıklama",
+        "FRT",
+        "NRT",
+        "RT",
+        "İş Saatleri"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "SLA Name",
+        "PLACEHOLDER": "SLA Name",
+        "REQUIRED_ERROR": "SLA name is required",
+        "MINIMUM_LENGTH_ERROR": "En az 2 karakter gereklidir",
+        "VALID_ERROR": "Sadece yazılar, numaralar, tire işareti ve alt çizgi kullanabilirsiniz"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Açıklama",
+        "PLACEHOLDER": "SLA for premium customers"
+      },
+      "FIRST_RESPONSE_TIME": {
+        "LABEL": "First Response Time(Seconds)",
+        "PLACEHOLDER": "300 for 5 minutes"
+      },
+      "NEXT_RESPONSE_TIME": {
+        "LABEL": "Next Response Time(Seconds)",
+        "PLACEHOLDER": "600 for 10 minutes"
+      },
+      "RESOLUTION_TIME": {
+        "LABEL": "Resolution Time(Seconds)",
+        "PLACEHOLDER": "86400 for 1 day"
+      },
+      "BUSINESS_HOURS": {
+        "LABEL": "İş Saatleri",
+        "PLACEHOLDER": "Only during business hours"
+      },
+      "EDIT": "Düzenle",
+      "CREATE": "Yarat",
+      "DELETE": "Sil",
+      "CANCEL": "İptal Et"
+    },
+    "ADD": {
+      "TITLE": "Add SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA added successfully",
+        "ERROR_MESSAGE": "Bir hata oluştu, lütfen tekrar deneyin"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit SLA",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA updated successfully",
+        "ERROR_MESSAGE": "Bir hata oluştu, lütfen tekrar deneyin"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/uk/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/uk/attributesMgmt.json
index 897f71846..55d19e994 100644
--- a/app/javascript/dashboard/i18n/locale/uk/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/uk/attributesMgmt.json
@@ -39,6 +39,17 @@
           "PLACEHOLDER": "Введіть ключ користувацького атрибуту",
           "ERROR": "Потрібен ключ",
           "IN_VALID": "Невірний ключ"
+        },
+        "REGEX_PATTERN": {
+          "LABEL": "Regex Pattern",
+          "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+        },
+        "REGEX_CUE": {
+          "LABEL": "Regex Cue",
+          "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+        },
+        "ENABLE_REGEX": {
+          "LABEL": "Enable regex validation"
         }
       },
       "API": {
@@ -93,6 +104,17 @@
       "EMPTY_RESULT": {
         "404": "Не створено жодного користувацького атрибуту",
         "NOT_FOUND": "Немає налаштованих власних атрибутів"
+      },
+      "REGEX_PATTERN": {
+        "LABEL": "Regex Pattern",
+        "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+      },
+      "REGEX_CUE": {
+        "LABEL": "Regex Cue",
+        "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+      },
+      "ENABLE_REGEX": {
+        "LABEL": "Enable regex validation"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/uk/contact.json b/app/javascript/dashboard/i18n/locale/uk/contact.json
index 6aabcac96..2033ae92a 100644
--- a/app/javascript/dashboard/i18n/locale/uk/contact.json
+++ b/app/javascript/dashboard/i18n/locale/uk/contact.json
@@ -39,10 +39,10 @@
     },
     "MERGE_CONTACT": "Об'єднати",
     "CONTACT_ACTIONS": "Дії з контактами",
-    "MUTE_CONTACT": "Заглушити розмову",
-    "UNMUTE_CONTACT": "Увімкнути розмову",
-    "MUTED_SUCCESS": "Ця розмова заглушена на 6 годин",
-    "UNMUTED_SUCCESS": "Ця розмова увімкнена",
+    "MUTE_CONTACT": "Block Contact",
+    "UNMUTE_CONTACT": "Unblock Contact",
+    "MUTED_SUCCESS": "This contact is blocked successfully. You will not be notified of any future conversations.",
+    "UNMUTED_SUCCESS": "This contact is unblocked successfully.",
     "SEND_TRANSCRIPT": "Надіслати транскрипт",
     "EDIT_LABEL": "Редагувати",
     "SIDEBAR_SECTIONS": {
@@ -79,7 +79,13 @@
     "TITLE": "Експорт контактів",
     "DESC": "Експортувати контакти у файл CSV.",
     "SUCCESS_MESSAGE": "Триває експорт, з'явиться повідомлення коли він буде готовий для скачування.",
-    "ERROR_MESSAGE": "Сталася помилка, будь ласка, спробуйте ще раз"
+    "ERROR_MESSAGE": "Сталася помилка, будь ласка, спробуйте ще раз",
+    "CONFIRM": {
+      "TITLE": "Експорт контактів",
+      "MESSAGE": "Ви впевнені, що хочете експортувати всі контакти?",
+      "YES": "Так, експортувати",
+      "NO": "Ні, скасувати"
+    }
   },
   "DELETE_NOTE": {
     "CONFIRM": {
@@ -339,7 +345,8 @@
     },
     "VALIDATIONS": {
       "REQUIRED": "Потрібне коректне значення",
-      "INVALID_URL": "Недопустимий URL"
+      "INVALID_URL": "Недопустимий URL",
+      "INVALID_INPUT": "Invalid Input"
     }
   },
   "MERGE_CONTACTS": {
diff --git a/app/javascript/dashboard/i18n/locale/uk/generalSettings.json b/app/javascript/dashboard/i18n/locale/uk/generalSettings.json
index 973ae4120..1f37f16dc 100644
--- a/app/javascript/dashboard/i18n/locale/uk/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/uk/generalSettings.json
@@ -112,7 +112,8 @@
       "REMOVE_LABEL": "Видалити мітку з діалогу",
       "SETTINGS": "Налаштування",
       "AI_ASSIST": "AI Assist",
-      "APPEARANCE": "Appearance"
+      "APPEARANCE": "Appearance",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     },
     "COMMANDS": {
       "GO_TO_CONVERSATION_DASHBOARD": "Перейти до панелі керування бесід",
@@ -151,16 +152,17 @@
       "AN_HOUR_FROM_NOW": "Until an hour from now",
       "CUSTOM": "Custom...",
       "CHANGE_APPEARANCE": "Change Appearance",
-      "LIGHT_MODE": "Light",
-      "DARK_MODE": "Dark",
-      "SYSTEM_MODE": "System"
+      "LIGHT_MODE": "Світла",
+      "DARK_MODE": "Темна",
+      "SYSTEM_MODE": "System",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     }
   },
   "DASHBOARD_APPS": {
     "LOADING_MESSAGE": "Завантаження дашборду..."
   },
   "COMMON": {
-    "OR": "Or",
+    "OR": "Або",
     "CLICK_HERE": "натисніть тут"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/uk/helpCenter.json b/app/javascript/dashboard/i18n/locale/uk/helpCenter.json
index 417d88ea6..1539114fb 100644
--- a/app/javascript/dashboard/i18n/locale/uk/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/uk/helpCenter.json
@@ -324,7 +324,8 @@
         "LAST_EDITED": "Останній раз відредагований"
       },
       "COLUMNS": {
-        "BY": "від"
+        "BY": "від",
+        "AUTHOR_NOT_AVAILABLE": "Author is not available"
       }
     },
     "EDIT_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/uk/inbox.json b/app/javascript/dashboard/i18n/locale/uk/inbox.json
new file mode 100644
index 000000000..5a9485482
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/uk/inbox.json
@@ -0,0 +1,60 @@
+{
+  "INBOX": {
+    "LIST": {
+      "TITLE": "Вхідні",
+      "DISPLAY_DROPDOWN": "Display",
+      "LOADING": "Fetching notifications",
+      "EOF": "Всі сповіщення завантажено 🎉",
+      "404": "There are no active notifications in this group.",
+      "NO_NOTIFICATIONS": "No notifications",
+      "NOTE": "Notifications from all subscribed inboxes",
+      "SNOOZED_UNTIL": "Відкладено до",
+      "SNOOZED_UNTIL_TOMORROW": "Відкладено до завтра",
+      "SNOOZED_UNTIL_NEXT_WEEK": "Відкладено до наступного тижня"
+    },
+    "ACTION_HEADER": {
+      "SNOOZE": "Snooze notification",
+      "DELETE": "Delete notification"
+    },
+    "TYPES": {
+      "CONVERSATION_MENTION": "You have been mentioned in a conversation",
+      "CONVERSATION_CREATION": "New conversation created",
+      "CONVERSATION_ASSIGNMENT": "A conversation has been assigned to you",
+      "ASSIGNED_CONVERSATION_NEW_MESSAGE": "New message in an assigned conversation",
+      "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "New message in a conversation you are participating in"
+    },
+    "MENU_ITEM": {
+      "MARK_AS_READ": "Mark as read",
+      "MARK_AS_UNREAD": "Позначити як непрочитане",
+      "SNOOZE": "Відкласти",
+      "DELETE": "Видалити",
+      "MARK_ALL_READ": "Позначити всі як прочитані",
+      "DELETE_ALL": "Delete all",
+      "DELETE_ALL_READ": "Delete all read"
+    },
+    "DISPLAY_MENU": {
+      "SORT": "Sort",
+      "DISPLAY": "Display :",
+      "SORT_OPTIONS": {
+        "NEWEST": "Newest",
+        "OLDEST": "Oldest",
+        "PRIORITY": "Пріоритет"
+      },
+      "DISPLAY_OPTIONS": {
+        "SNOOZED": "Відкладено",
+        "READ": "Прочитано",
+        "LABELS": "Мітки",
+        "CONVERSATION_ID": "Conversation ID"
+      }
+    },
+    "ALERTS": {
+      "MARK_AS_READ": "Notification marked as read",
+      "MARK_AS_UNREAD": "Notification marked as unread",
+      "SNOOZE": "Notification snoozed",
+      "DELETE": "Notification deleted",
+      "MARK_ALL_READ": "All notifications marked as read",
+      "DELETE_ALL": "All notifications deleted",
+      "DELETE_ALL_READ": "All read notifications deleted"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json
index 96410efa4..4824970fe 100644
--- a/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json
@@ -405,7 +405,7 @@
         "DISABLED": "Вимкнено"
       },
       "SENDER_NAME_SECTION": {
-        "TITLE": "Sender name",
+        "TITLE": "Ім'я відправника",
         "SUB_TEXT": "Select the name shown to the your customer when they receive emails from your agents.",
         "FOR_EG": "For eg:",
         "FRIENDLY": {
@@ -569,7 +569,7 @@
       "UPDATE": "Оновити налаштування робочих годин",
       "TOGGLE_AVAILABILITY": "Увімкнути робочі години для цього каналу",
       "UNAVAILABLE_MESSAGE_LABEL": "Повідомлення для відвідувачів у неробочі години",
-      "TOGGLE_HELP": "Включення покаже робочі години на віджеті в чаті, навіть якщо всі агенти перебувають у автономному режимі. У неробочі години відвідувачі можуть бути попереджені повідомленням і формою попереднього чату.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours visitors can be warned with a message and a pre-chat form.",
       "DAY": {
         "ENABLE": "Увімкнути доступність для цього дня",
         "UNAVAILABLE": "Неприсутній",
diff --git a/app/javascript/dashboard/i18n/locale/uk/settings.json b/app/javascript/dashboard/i18n/locale/uk/settings.json
index 2261a945b..50ebe8f3d 100644
--- a/app/javascript/dashboard/i18n/locale/uk/settings.json
+++ b/app/javascript/dashboard/i18n/locale/uk/settings.json
@@ -160,6 +160,9 @@
     "TRIAL_MESSAGE": "днів пробного періоду залишилося.",
     "TRAIL_BUTTON": "Придбати зараз",
     "DELETED_USER": "Видалений користувач",
+    "EMAIL_VERIFICATION_PENDING": "It seems that you haven't verified your email address yet. Please check your inbox for the verification email.",
+    "RESEND_VERIFICATION_MAIL": "Resend verification email",
+    "EMAIL_VERIFICATION_SENT": "Verification email has been sent. Please check your inbox.",
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Обліковий запис призупинено",
       "MESSAGE": "Ваш обліковий запис призупинено. Будь ласка, зверніться до служби підтримки для отримання додаткової інформації."
@@ -197,6 +200,7 @@
     "CURRENTLY_VIEWING_ACCOUNT": "Зараз переглядається:",
     "SWITCH": "Перемкнути",
     "CONVERSATIONS": "Бесіди",
+    "INBOX": "Вхідні",
     "ALL_CONVERSATIONS": "Всі розмови",
     "MENTIONED_CONVERSATIONS": "Згадування",
     "PARTICIPATING_CONVERSATIONS": "Підключені агенти",
@@ -238,6 +242,7 @@
     "REPORTS_INBOX": "Канал",
     "REPORTS_TEAM": "Команда",
     "SET_AVAILABILITY_TITLE": "Позначити себе як",
+    "SLA": "SLA",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Огляд",
     "FACEBOOK_REAUTHORIZE": "Підключення до Facebook закінчилося, будь ласка, поновіть сторінку Facebook, щоб продовжити роботу служб",
diff --git a/app/javascript/dashboard/i18n/locale/uk/sla.json b/app/javascript/dashboard/i18n/locale/uk/sla.json
new file mode 100644
index 000000000..ad26eede4
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/uk/sla.json
@@ -0,0 +1,70 @@
+{
+  "SLA": {
+    "HEADER": "SLA",
+    "HEADER_BTN_TXT": "Add SLA",
+    "LOADING": "Fetching SLAs",
+    "SEARCH_404": "Немає елементів, що відповідають запиту",
+    "SIDEBAR_TXT": "<p><b>SLA</b> <p>Think of Service Level Agreements (SLAs) like friendly promises between a service provider and a customer.</p> <p> These promises set clear expectations for things like how quickly the team will respond to issues, making sure you always get a reliable and top-notch experience!</p>",
+    "LIST": {
+      "404": "There are no SLAs available in this account.",
+      "TITLE": "Manage SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "TABLE_HEADER": [
+        "Ім'я",
+        "Опис",
+        "FRT",
+        "NRT",
+        "RT",
+        "Робочий час"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "SLA Name",
+        "PLACEHOLDER": "SLA Name",
+        "REQUIRED_ERROR": "SLA name is required",
+        "MINIMUM_LENGTH_ERROR": "Необхідна мінімальна довжина 2",
+        "VALID_ERROR": "Дозволено тільки букви, цифри, гіфен та підкреслення"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Опис",
+        "PLACEHOLDER": "SLA for premium customers"
+      },
+      "FIRST_RESPONSE_TIME": {
+        "LABEL": "First Response Time(Seconds)",
+        "PLACEHOLDER": "300 for 5 minutes"
+      },
+      "NEXT_RESPONSE_TIME": {
+        "LABEL": "Next Response Time(Seconds)",
+        "PLACEHOLDER": "600 for 10 minutes"
+      },
+      "RESOLUTION_TIME": {
+        "LABEL": "Resolution Time(Seconds)",
+        "PLACEHOLDER": "86400 for 1 day"
+      },
+      "BUSINESS_HOURS": {
+        "LABEL": "Робочий час",
+        "PLACEHOLDER": "Only during business hours"
+      },
+      "EDIT": "Редагувати",
+      "CREATE": "Створити",
+      "DELETE": "Видалити",
+      "CANCEL": "Скасувати"
+    },
+    "ADD": {
+      "TITLE": "Add SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA added successfully",
+        "ERROR_MESSAGE": "Сталася помилка, будь ласка, спробуйте ще раз"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit SLA",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA updated successfully",
+        "ERROR_MESSAGE": "Сталася помилка, будь ласка, спробуйте ще раз"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ur/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/ur/attributesMgmt.json
index 02fdadd89..bcc04ffb1 100644
--- a/app/javascript/dashboard/i18n/locale/ur/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ur/attributesMgmt.json
@@ -39,6 +39,17 @@
           "PLACEHOLDER": "Enter custom attribute key",
           "ERROR": "Key is required",
           "IN_VALID": "Invalid key"
+        },
+        "REGEX_PATTERN": {
+          "LABEL": "Regex Pattern",
+          "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+        },
+        "REGEX_CUE": {
+          "LABEL": "Regex Cue",
+          "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+        },
+        "ENABLE_REGEX": {
+          "LABEL": "Enable regex validation"
         }
       },
       "API": {
@@ -93,6 +104,17 @@
       "EMPTY_RESULT": {
         "404": "There are no custom attributes created",
         "NOT_FOUND": "There are no custom attributes configured"
+      },
+      "REGEX_PATTERN": {
+        "LABEL": "Regex Pattern",
+        "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+      },
+      "REGEX_CUE": {
+        "LABEL": "Regex Cue",
+        "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+      },
+      "ENABLE_REGEX": {
+        "LABEL": "Enable regex validation"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/ur/contact.json b/app/javascript/dashboard/i18n/locale/ur/contact.json
index 7d6456efe..7f59c47e2 100644
--- a/app/javascript/dashboard/i18n/locale/ur/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ur/contact.json
@@ -39,10 +39,10 @@
     },
     "MERGE_CONTACT": "کانٹیکٹ ضم کریں۔",
     "CONTACT_ACTIONS": "کانٹیکٹ ایکشنز",
-    "MUTE_CONTACT": "خاموش گفتگو",
-    "UNMUTE_CONTACT": "گفتگو کو چالو کریں۔",
-    "MUTED_SUCCESS": "یہ گفتگو 6 گھنٹے کے لیے خاموش ہے۔",
-    "UNMUTED_SUCCESS": "یہ گفتگو غیر خاموش ہے۔",
+    "MUTE_CONTACT": "Block Contact",
+    "UNMUTE_CONTACT": "Unblock Contact",
+    "MUTED_SUCCESS": "This contact is blocked successfully. You will not be notified of any future conversations.",
+    "UNMUTED_SUCCESS": "This contact is unblocked successfully.",
     "SEND_TRANSCRIPT": "ٹرانسکرپٹ بھیجیں۔",
     "EDIT_LABEL": "ترمیم",
     "SIDEBAR_SECTIONS": {
@@ -79,7 +79,13 @@
     "TITLE": "Export Contacts",
     "DESC": "Export contacts to a CSV file.",
     "SUCCESS_MESSAGE": "Export is in progress, You will be notified via email when export file is ready to dowanlod.",
-    "ERROR_MESSAGE": "ایک خامی تھی، براہ کرم دوبارہ کوشش کریں۔"
+    "ERROR_MESSAGE": "ایک خامی تھی، براہ کرم دوبارہ کوشش کریں۔",
+    "CONFIRM": {
+      "TITLE": "Export Contacts",
+      "MESSAGE": "Are you sure you want to export all contacts?",
+      "YES": "Yes, Export",
+      "NO": "No, Cancel"
+    }
   },
   "DELETE_NOTE": {
     "CONFIRM": {
@@ -339,7 +345,8 @@
     },
     "VALIDATIONS": {
       "REQUIRED": "Valid value is required",
-      "INVALID_URL": "Invalid URL"
+      "INVALID_URL": "Invalid URL",
+      "INVALID_INPUT": "Invalid Input"
     }
   },
   "MERGE_CONTACTS": {
diff --git a/app/javascript/dashboard/i18n/locale/ur/generalSettings.json b/app/javascript/dashboard/i18n/locale/ur/generalSettings.json
index 5372fd6e7..ee64e08ec 100644
--- a/app/javascript/dashboard/i18n/locale/ur/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ur/generalSettings.json
@@ -112,7 +112,8 @@
       "REMOVE_LABEL": "Remove label from the conversation",
       "SETTINGS": "Settings",
       "AI_ASSIST": "AI Assist",
-      "APPEARANCE": "Appearance"
+      "APPEARANCE": "Appearance",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     },
     "COMMANDS": {
       "GO_TO_CONVERSATION_DASHBOARD": "Go to Conversation Dashboard",
@@ -153,7 +154,8 @@
       "CHANGE_APPEARANCE": "Change Appearance",
       "LIGHT_MODE": "Light",
       "DARK_MODE": "Dark",
-      "SYSTEM_MODE": "System"
+      "SYSTEM_MODE": "System",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     }
   },
   "DASHBOARD_APPS": {
diff --git a/app/javascript/dashboard/i18n/locale/ur/helpCenter.json b/app/javascript/dashboard/i18n/locale/ur/helpCenter.json
index 30da0bde1..6566ed6f6 100644
--- a/app/javascript/dashboard/i18n/locale/ur/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ur/helpCenter.json
@@ -324,7 +324,8 @@
         "LAST_EDITED": "Last edited"
       },
       "COLUMNS": {
-        "BY": "by"
+        "BY": "by",
+        "AUTHOR_NOT_AVAILABLE": "Author is not available"
       }
     },
     "EDIT_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/ur/inbox.json b/app/javascript/dashboard/i18n/locale/ur/inbox.json
new file mode 100644
index 000000000..2331f6e01
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur/inbox.json
@@ -0,0 +1,60 @@
+{
+  "INBOX": {
+    "LIST": {
+      "TITLE": "ان باکس",
+      "DISPLAY_DROPDOWN": "Display",
+      "LOADING": "Fetching notifications",
+      "EOF": "All notifications loaded 🎉",
+      "404": "There are no active notifications in this group.",
+      "NO_NOTIFICATIONS": "No notifications",
+      "NOTE": "Notifications from all subscribed inboxes",
+      "SNOOZED_UNTIL": "Snoozed until",
+      "SNOOZED_UNTIL_TOMORROW": "Snoozed until tomorrow",
+      "SNOOZED_UNTIL_NEXT_WEEK": "Snoozed until next week"
+    },
+    "ACTION_HEADER": {
+      "SNOOZE": "Snooze notification",
+      "DELETE": "Delete notification"
+    },
+    "TYPES": {
+      "CONVERSATION_MENTION": "You have been mentioned in a conversation",
+      "CONVERSATION_CREATION": "New conversation created",
+      "CONVERSATION_ASSIGNMENT": "A conversation has been assigned to you",
+      "ASSIGNED_CONVERSATION_NEW_MESSAGE": "New message in an assigned conversation",
+      "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "New message in a conversation you are participating in"
+    },
+    "MENU_ITEM": {
+      "MARK_AS_READ": "Mark as read",
+      "MARK_AS_UNREAD": "Mark as unread",
+      "SNOOZE": "Snooze",
+      "DELETE": "حذف کریں۔",
+      "MARK_ALL_READ": "Mark all as read",
+      "DELETE_ALL": "Delete all",
+      "DELETE_ALL_READ": "Delete all read"
+    },
+    "DISPLAY_MENU": {
+      "SORT": "Sort",
+      "DISPLAY": "Display :",
+      "SORT_OPTIONS": {
+        "NEWEST": "Newest",
+        "OLDEST": "Oldest",
+        "PRIORITY": "Priority"
+      },
+      "DISPLAY_OPTIONS": {
+        "SNOOZED": "اسنوز کیا گیا۔",
+        "READ": "پڑھیں",
+        "LABELS": "Labels",
+        "CONVERSATION_ID": "Conversation ID"
+      }
+    },
+    "ALERTS": {
+      "MARK_AS_READ": "Notification marked as read",
+      "MARK_AS_UNREAD": "Notification marked as unread",
+      "SNOOZE": "Notification snoozed",
+      "DELETE": "Notification deleted",
+      "MARK_ALL_READ": "All notifications marked as read",
+      "DELETE_ALL": "All notifications deleted",
+      "DELETE_ALL_READ": "All read notifications deleted"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ur/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ur/inboxMgmt.json
index 15fbb7c14..7bea02763 100644
--- a/app/javascript/dashboard/i18n/locale/ur/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ur/inboxMgmt.json
@@ -569,7 +569,7 @@
       "UPDATE": "Update business hours settings",
       "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
       "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for visitors",
-      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours visitors can be warned with a message and a pre-chat form.",
       "DAY": {
         "ENABLE": "Enable availability for this day",
         "UNAVAILABLE": "Unavailable",
diff --git a/app/javascript/dashboard/i18n/locale/ur/settings.json b/app/javascript/dashboard/i18n/locale/ur/settings.json
index 412dc7ba4..e80b1bc36 100644
--- a/app/javascript/dashboard/i18n/locale/ur/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ur/settings.json
@@ -160,6 +160,9 @@
     "TRIAL_MESSAGE": "days trial remaining.",
     "TRAIL_BUTTON": "Buy Now",
     "DELETED_USER": "Deleted User",
+    "EMAIL_VERIFICATION_PENDING": "It seems that you haven't verified your email address yet. Please check your inbox for the verification email.",
+    "RESEND_VERIFICATION_MAIL": "Resend verification email",
+    "EMAIL_VERIFICATION_SENT": "Verification email has been sent. Please check your inbox.",
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Account Suspended",
       "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
@@ -197,6 +200,7 @@
     "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
     "SWITCH": "Switch",
     "CONVERSATIONS": "مکالمات",
+    "INBOX": "ان باکس",
     "ALL_CONVERSATIONS": "All Conversations",
     "MENTIONED_CONVERSATIONS": "تذکرہ",
     "PARTICIPATING_CONVERSATIONS": "Participating",
@@ -238,6 +242,7 @@
     "REPORTS_INBOX": "ان باکس",
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
+    "SLA": "SLA",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Overview",
     "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
diff --git a/app/javascript/dashboard/i18n/locale/ur/sla.json b/app/javascript/dashboard/i18n/locale/ur/sla.json
new file mode 100644
index 000000000..9a30e8dde
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur/sla.json
@@ -0,0 +1,70 @@
+{
+  "SLA": {
+    "HEADER": "SLA",
+    "HEADER_BTN_TXT": "Add SLA",
+    "LOADING": "Fetching SLAs",
+    "SEARCH_404": "اس سوال سے مماثل کوئی آئٹمز نہیں ہیں۔",
+    "SIDEBAR_TXT": "<p><b>SLA</b> <p>Think of Service Level Agreements (SLAs) like friendly promises between a service provider and a customer.</p> <p> These promises set clear expectations for things like how quickly the team will respond to issues, making sure you always get a reliable and top-notch experience!</p>",
+    "LIST": {
+      "404": "There are no SLAs available in this account.",
+      "TITLE": "Manage SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "TABLE_HEADER": [
+        "نام",
+        "Description",
+        "FRT",
+        "NRT",
+        "RT",
+        "Business Hours"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "SLA Name",
+        "PLACEHOLDER": "SLA Name",
+        "REQUIRED_ERROR": "SLA name is required",
+        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
+        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Description",
+        "PLACEHOLDER": "SLA for premium customers"
+      },
+      "FIRST_RESPONSE_TIME": {
+        "LABEL": "First Response Time(Seconds)",
+        "PLACEHOLDER": "300 for 5 minutes"
+      },
+      "NEXT_RESPONSE_TIME": {
+        "LABEL": "Next Response Time(Seconds)",
+        "PLACEHOLDER": "600 for 10 minutes"
+      },
+      "RESOLUTION_TIME": {
+        "LABEL": "Resolution Time(Seconds)",
+        "PLACEHOLDER": "86400 for 1 day"
+      },
+      "BUSINESS_HOURS": {
+        "LABEL": "Business Hours",
+        "PLACEHOLDER": "Only during business hours"
+      },
+      "EDIT": "ترمیم",
+      "CREATE": "Create",
+      "DELETE": "حذف کریں۔",
+      "CANCEL": "منسوخ کریں۔"
+    },
+    "ADD": {
+      "TITLE": "Add SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA added successfully",
+        "ERROR_MESSAGE": "ایک خامی تھی، براہ کرم دوبارہ کوشش کریں۔"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit SLA",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA updated successfully",
+        "ERROR_MESSAGE": "ایک خامی تھی، براہ کرم دوبارہ کوشش کریں۔"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/ur_IN/attributesMgmt.json
index 2a9ea7de3..64a0e83d6 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/attributesMgmt.json
@@ -39,6 +39,17 @@
           "PLACEHOLDER": "Enter custom attribute key",
           "ERROR": "Key is required",
           "IN_VALID": "Invalid key"
+        },
+        "REGEX_PATTERN": {
+          "LABEL": "Regex Pattern",
+          "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+        },
+        "REGEX_CUE": {
+          "LABEL": "Regex Cue",
+          "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+        },
+        "ENABLE_REGEX": {
+          "LABEL": "Enable regex validation"
         }
       },
       "API": {
@@ -93,6 +104,17 @@
       "EMPTY_RESULT": {
         "404": "There are no custom attributes created",
         "NOT_FOUND": "There are no custom attributes configured"
+      },
+      "REGEX_PATTERN": {
+        "LABEL": "Regex Pattern",
+        "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+      },
+      "REGEX_CUE": {
+        "LABEL": "Regex Cue",
+        "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+      },
+      "ENABLE_REGEX": {
+        "LABEL": "Enable regex validation"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/contact.json b/app/javascript/dashboard/i18n/locale/ur_IN/contact.json
index 7f4410464..7ab197734 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/contact.json
@@ -39,10 +39,10 @@
     },
     "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",
+    "MUTE_CONTACT": "Block Contact",
+    "UNMUTE_CONTACT": "Unblock Contact",
+    "MUTED_SUCCESS": "This contact is blocked successfully. You will not be notified of any future conversations.",
+    "UNMUTED_SUCCESS": "This contact is unblocked successfully.",
     "SEND_TRANSCRIPT": "Send Transcript",
     "EDIT_LABEL": "Edit",
     "SIDEBAR_SECTIONS": {
@@ -79,7 +79,13 @@
     "TITLE": "Export Contacts",
     "DESC": "Export contacts to a CSV file.",
     "SUCCESS_MESSAGE": "Export is in progress, You will be notified via email when export file is ready to dowanlod.",
-    "ERROR_MESSAGE": "There was an error, please try again"
+    "ERROR_MESSAGE": "There was an error, please try again",
+    "CONFIRM": {
+      "TITLE": "Export Contacts",
+      "MESSAGE": "Are you sure you want to export all contacts?",
+      "YES": "Yes, Export",
+      "NO": "No, Cancel"
+    }
   },
   "DELETE_NOTE": {
     "CONFIRM": {
@@ -339,7 +345,8 @@
     },
     "VALIDATIONS": {
       "REQUIRED": "Valid value is required",
-      "INVALID_URL": "Invalid URL"
+      "INVALID_URL": "Invalid URL",
+      "INVALID_INPUT": "Invalid Input"
     }
   },
   "MERGE_CONTACTS": {
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/generalSettings.json b/app/javascript/dashboard/i18n/locale/ur_IN/generalSettings.json
index d56a20c15..185d328a5 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/generalSettings.json
@@ -112,7 +112,8 @@
       "REMOVE_LABEL": "Remove label from the conversation",
       "SETTINGS": "Settings",
       "AI_ASSIST": "AI Assist",
-      "APPEARANCE": "Appearance"
+      "APPEARANCE": "Appearance",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     },
     "COMMANDS": {
       "GO_TO_CONVERSATION_DASHBOARD": "Go to Conversation Dashboard",
@@ -153,7 +154,8 @@
       "CHANGE_APPEARANCE": "Change Appearance",
       "LIGHT_MODE": "Light",
       "DARK_MODE": "Dark",
-      "SYSTEM_MODE": "System"
+      "SYSTEM_MODE": "System",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     }
   },
   "DASHBOARD_APPS": {
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/helpCenter.json b/app/javascript/dashboard/i18n/locale/ur_IN/helpCenter.json
index f44e44c6f..cd397ed1e 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/helpCenter.json
@@ -324,7 +324,8 @@
         "LAST_EDITED": "Last edited"
       },
       "COLUMNS": {
-        "BY": "by"
+        "BY": "by",
+        "AUTHOR_NOT_AVAILABLE": "Author is not available"
       }
     },
     "EDIT_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/inbox.json b/app/javascript/dashboard/i18n/locale/ur_IN/inbox.json
new file mode 100644
index 000000000..dcac5459f
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/inbox.json
@@ -0,0 +1,60 @@
+{
+  "INBOX": {
+    "LIST": {
+      "TITLE": "Inbox",
+      "DISPLAY_DROPDOWN": "Display",
+      "LOADING": "Fetching notifications",
+      "EOF": "All notifications loaded 🎉",
+      "404": "There are no active notifications in this group.",
+      "NO_NOTIFICATIONS": "No notifications",
+      "NOTE": "Notifications from all subscribed inboxes",
+      "SNOOZED_UNTIL": "Snoozed until",
+      "SNOOZED_UNTIL_TOMORROW": "Snoozed until tomorrow",
+      "SNOOZED_UNTIL_NEXT_WEEK": "Snoozed until next week"
+    },
+    "ACTION_HEADER": {
+      "SNOOZE": "Snooze notification",
+      "DELETE": "Delete notification"
+    },
+    "TYPES": {
+      "CONVERSATION_MENTION": "You have been mentioned in a conversation",
+      "CONVERSATION_CREATION": "New conversation created",
+      "CONVERSATION_ASSIGNMENT": "A conversation has been assigned to you",
+      "ASSIGNED_CONVERSATION_NEW_MESSAGE": "New message in an assigned conversation",
+      "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "New message in a conversation you are participating in"
+    },
+    "MENU_ITEM": {
+      "MARK_AS_READ": "Mark as read",
+      "MARK_AS_UNREAD": "Mark as unread",
+      "SNOOZE": "Snooze",
+      "DELETE": "Delete",
+      "MARK_ALL_READ": "Mark all as read",
+      "DELETE_ALL": "Delete all",
+      "DELETE_ALL_READ": "Delete all read"
+    },
+    "DISPLAY_MENU": {
+      "SORT": "Sort",
+      "DISPLAY": "Display :",
+      "SORT_OPTIONS": {
+        "NEWEST": "Newest",
+        "OLDEST": "Oldest",
+        "PRIORITY": "Priority"
+      },
+      "DISPLAY_OPTIONS": {
+        "SNOOZED": "Snoozed",
+        "READ": "Read",
+        "LABELS": "Labels",
+        "CONVERSATION_ID": "Conversation ID"
+      }
+    },
+    "ALERTS": {
+      "MARK_AS_READ": "Notification marked as read",
+      "MARK_AS_UNREAD": "Notification marked as unread",
+      "SNOOZE": "Notification snoozed",
+      "DELETE": "Notification deleted",
+      "MARK_ALL_READ": "All notifications marked as read",
+      "DELETE_ALL": "All notifications deleted",
+      "DELETE_ALL_READ": "All read notifications deleted"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ur_IN/inboxMgmt.json
index e6b8413fe..ef4275a4c 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/inboxMgmt.json
@@ -569,7 +569,7 @@
       "UPDATE": "Update business hours settings",
       "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
       "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for visitors",
-      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours visitors can be warned with a message and a pre-chat form.",
       "DAY": {
         "ENABLE": "Enable availability for this day",
         "UNAVAILABLE": "Unavailable",
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/settings.json b/app/javascript/dashboard/i18n/locale/ur_IN/settings.json
index 78411ee09..ca734fe43 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/settings.json
@@ -160,6 +160,9 @@
     "TRIAL_MESSAGE": "days trial remaining.",
     "TRAIL_BUTTON": "Buy Now",
     "DELETED_USER": "Deleted User",
+    "EMAIL_VERIFICATION_PENDING": "It seems that you haven't verified your email address yet. Please check your inbox for the verification email.",
+    "RESEND_VERIFICATION_MAIL": "Resend verification email",
+    "EMAIL_VERIFICATION_SENT": "Verification email has been sent. Please check your inbox.",
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Account Suspended",
       "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
@@ -197,6 +200,7 @@
     "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
     "SWITCH": "Switch",
     "CONVERSATIONS": "Conversations",
+    "INBOX": "Inbox",
     "ALL_CONVERSATIONS": "All Conversations",
     "MENTIONED_CONVERSATIONS": "Mentions",
     "PARTICIPATING_CONVERSATIONS": "Participating",
@@ -238,6 +242,7 @@
     "REPORTS_INBOX": "Inbox",
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
+    "SLA": "SLA",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Overview",
     "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/sla.json b/app/javascript/dashboard/i18n/locale/ur_IN/sla.json
new file mode 100644
index 000000000..869b3ba3f
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/sla.json
@@ -0,0 +1,70 @@
+{
+  "SLA": {
+    "HEADER": "SLA",
+    "HEADER_BTN_TXT": "Add SLA",
+    "LOADING": "Fetching SLAs",
+    "SEARCH_404": "There are no items matching this query",
+    "SIDEBAR_TXT": "<p><b>SLA</b> <p>Think of Service Level Agreements (SLAs) like friendly promises between a service provider and a customer.</p> <p> These promises set clear expectations for things like how quickly the team will respond to issues, making sure you always get a reliable and top-notch experience!</p>",
+    "LIST": {
+      "404": "There are no SLAs available in this account.",
+      "TITLE": "Manage SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "TABLE_HEADER": [
+        "Name",
+        "Description",
+        "FRT",
+        "NRT",
+        "RT",
+        "Business Hours"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "SLA Name",
+        "PLACEHOLDER": "SLA Name",
+        "REQUIRED_ERROR": "SLA name is required",
+        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
+        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Description",
+        "PLACEHOLDER": "SLA for premium customers"
+      },
+      "FIRST_RESPONSE_TIME": {
+        "LABEL": "First Response Time(Seconds)",
+        "PLACEHOLDER": "300 for 5 minutes"
+      },
+      "NEXT_RESPONSE_TIME": {
+        "LABEL": "Next Response Time(Seconds)",
+        "PLACEHOLDER": "600 for 10 minutes"
+      },
+      "RESOLUTION_TIME": {
+        "LABEL": "Resolution Time(Seconds)",
+        "PLACEHOLDER": "86400 for 1 day"
+      },
+      "BUSINESS_HOURS": {
+        "LABEL": "Business Hours",
+        "PLACEHOLDER": "Only during business hours"
+      },
+      "EDIT": "Edit",
+      "CREATE": "Create",
+      "DELETE": "Delete",
+      "CANCEL": "Cancel"
+    },
+    "ADD": {
+      "TITLE": "Add SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA added successfully",
+        "ERROR_MESSAGE": "There was an error, please try again"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit SLA",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA updated successfully",
+        "ERROR_MESSAGE": "There was an error, please try again"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/vi/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/vi/attributesMgmt.json
index efdf9235a..a5a5ef980 100644
--- a/app/javascript/dashboard/i18n/locale/vi/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/vi/attributesMgmt.json
@@ -39,6 +39,17 @@
           "PLACEHOLDER": "Nhập khoá của thuộc tính tuỳ chỉnh",
           "ERROR": "C\u001dần có khoá",
           "IN_VALID": "Khoá không hợp lệ"
+        },
+        "REGEX_PATTERN": {
+          "LABEL": "Regex Pattern",
+          "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+        },
+        "REGEX_CUE": {
+          "LABEL": "Regex Cue",
+          "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+        },
+        "ENABLE_REGEX": {
+          "LABEL": "Enable regex validation"
         }
       },
       "API": {
@@ -93,6 +104,17 @@
       "EMPTY_RESULT": {
         "404": "Không có thuộc tính tuỳ chỉnh nào được tạo",
         "NOT_FOUND": "Không có thuộc tính tuỳ chỉnh nào được cấu hình"
+      },
+      "REGEX_PATTERN": {
+        "LABEL": "Regex Pattern",
+        "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+      },
+      "REGEX_CUE": {
+        "LABEL": "Regex Cue",
+        "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+      },
+      "ENABLE_REGEX": {
+        "LABEL": "Enable regex validation"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/vi/contact.json b/app/javascript/dashboard/i18n/locale/vi/contact.json
index 69a38f129..1f4d92be9 100644
--- a/app/javascript/dashboard/i18n/locale/vi/contact.json
+++ b/app/javascript/dashboard/i18n/locale/vi/contact.json
@@ -39,10 +39,10 @@
     },
     "MERGE_CONTACT": "Hợp nhất liên hệ",
     "CONTACT_ACTIONS": "Hành động với liên hệ",
-    "MUTE_CONTACT": "Tắt tiếng cuộc trò chuyện",
-    "UNMUTE_CONTACT": "Bật tiếng cuộc trò chuyện",
-    "MUTED_SUCCESS": "Cuộc trò chuyện này bị tắt tiếng trong 6 giờ",
-    "UNMUTED_SUCCESS": "Cuộc trò chuyện này được bật tiếng",
+    "MUTE_CONTACT": "Block Contact",
+    "UNMUTE_CONTACT": "Unblock Contact",
+    "MUTED_SUCCESS": "This contact is blocked successfully. You will not be notified of any future conversations.",
+    "UNMUTED_SUCCESS": "This contact is unblocked successfully.",
     "SEND_TRANSCRIPT": "Gửi bản ghi",
     "EDIT_LABEL": "Chỉnh sửa",
     "SIDEBAR_SECTIONS": {
@@ -79,7 +79,13 @@
     "TITLE": "Export Contacts",
     "DESC": "Export contacts to a CSV file.",
     "SUCCESS_MESSAGE": "Export is in progress, You will be notified via email when export file is ready to dowanlod.",
-    "ERROR_MESSAGE": "Đã có lỗi, vui lòng thử lại"
+    "ERROR_MESSAGE": "Đã có lỗi, vui lòng thử lại",
+    "CONFIRM": {
+      "TITLE": "Export Contacts",
+      "MESSAGE": "Are you sure you want to export all contacts?",
+      "YES": "Yes, Export",
+      "NO": "No, Cancel"
+    }
   },
   "DELETE_NOTE": {
     "CONFIRM": {
@@ -339,7 +345,8 @@
     },
     "VALIDATIONS": {
       "REQUIRED": "Giá trị hợp lệ bắt buộc có",
-      "INVALID_URL": "URL không hợp lệ"
+      "INVALID_URL": "URL không hợp lệ",
+      "INVALID_INPUT": "Invalid Input"
     }
   },
   "MERGE_CONTACTS": {
diff --git a/app/javascript/dashboard/i18n/locale/vi/generalSettings.json b/app/javascript/dashboard/i18n/locale/vi/generalSettings.json
index 8b2d3c9d0..b7037270d 100644
--- a/app/javascript/dashboard/i18n/locale/vi/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/vi/generalSettings.json
@@ -112,7 +112,8 @@
       "REMOVE_LABEL": "Xoá nhãn khỏi hội thoại",
       "SETTINGS": "Cài đặt",
       "AI_ASSIST": "AI Assist",
-      "APPEARANCE": "Appearance"
+      "APPEARANCE": "Appearance",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     },
     "COMMANDS": {
       "GO_TO_CONVERSATION_DASHBOARD": "Đi tới Trang tổng quan hội thoại",
@@ -153,7 +154,8 @@
       "CHANGE_APPEARANCE": "Change Appearance",
       "LIGHT_MODE": "Light",
       "DARK_MODE": "Dark",
-      "SYSTEM_MODE": "System"
+      "SYSTEM_MODE": "System",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     }
   },
   "DASHBOARD_APPS": {
diff --git a/app/javascript/dashboard/i18n/locale/vi/helpCenter.json b/app/javascript/dashboard/i18n/locale/vi/helpCenter.json
index 5ac851a4d..cd0620025 100644
--- a/app/javascript/dashboard/i18n/locale/vi/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/vi/helpCenter.json
@@ -324,7 +324,8 @@
         "LAST_EDITED": "Sửa lần cuối"
       },
       "COLUMNS": {
-        "BY": "bởi"
+        "BY": "bởi",
+        "AUTHOR_NOT_AVAILABLE": "Author is not available"
       }
     },
     "EDIT_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/vi/inbox.json b/app/javascript/dashboard/i18n/locale/vi/inbox.json
new file mode 100644
index 000000000..eacf6ad49
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/vi/inbox.json
@@ -0,0 +1,60 @@
+{
+  "INBOX": {
+    "LIST": {
+      "TITLE": "Hộp thư đến",
+      "DISPLAY_DROPDOWN": "Display",
+      "LOADING": "Fetching notifications",
+      "EOF": "Tất cả thông báo đã được tải 🎉",
+      "404": "There are no active notifications in this group.",
+      "NO_NOTIFICATIONS": "No notifications",
+      "NOTE": "Notifications from all subscribed inboxes",
+      "SNOOZED_UNTIL": "Snoozed until",
+      "SNOOZED_UNTIL_TOMORROW": "Tạm dừng đến ngày mai",
+      "SNOOZED_UNTIL_NEXT_WEEK": "Tạm dừng đến tuần sau"
+    },
+    "ACTION_HEADER": {
+      "SNOOZE": "Snooze notification",
+      "DELETE": "Delete notification"
+    },
+    "TYPES": {
+      "CONVERSATION_MENTION": "You have been mentioned in a conversation",
+      "CONVERSATION_CREATION": "New conversation created",
+      "CONVERSATION_ASSIGNMENT": "A conversation has been assigned to you",
+      "ASSIGNED_CONVERSATION_NEW_MESSAGE": "New message in an assigned conversation",
+      "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "New message in a conversation you are participating in"
+    },
+    "MENU_ITEM": {
+      "MARK_AS_READ": "Mark as read",
+      "MARK_AS_UNREAD": "Đánh dấu là chưa đọc",
+      "SNOOZE": "Báo lại",
+      "DELETE": "Xoá",
+      "MARK_ALL_READ": "Đánh dấu tất cả đã đọc",
+      "DELETE_ALL": "Delete all",
+      "DELETE_ALL_READ": "Delete all read"
+    },
+    "DISPLAY_MENU": {
+      "SORT": "Sort",
+      "DISPLAY": "Display :",
+      "SORT_OPTIONS": {
+        "NEWEST": "Newest",
+        "OLDEST": "Oldest",
+        "PRIORITY": "Priority"
+      },
+      "DISPLAY_OPTIONS": {
+        "SNOOZED": "Tạm dừng",
+        "READ": "\bĐọc",
+        "LABELS": "Nhãn",
+        "CONVERSATION_ID": "Conversation ID"
+      }
+    },
+    "ALERTS": {
+      "MARK_AS_READ": "Notification marked as read",
+      "MARK_AS_UNREAD": "Notification marked as unread",
+      "SNOOZE": "Notification snoozed",
+      "DELETE": "Notification deleted",
+      "MARK_ALL_READ": "All notifications marked as read",
+      "DELETE_ALL": "All notifications deleted",
+      "DELETE_ALL_READ": "All read notifications deleted"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json
index c57718512..4fbfd90c8 100644
--- a/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json
@@ -569,7 +569,7 @@
       "UPDATE": "Cập nhật tuỳ chỉnh giờ làm việc",
       "TOGGLE_AVAILABILITY": "Kích hoạt tính khả dụng của doanh nghiệp cho hộp thư đến này",
       "UNAVAILABLE_MESSAGE_LABEL": "Thông báo không có sẵn cho khách truy cập",
-      "TOGGLE_HELP": "Việc kích hoạt tính khả dụng của doanh nghiệp sẽ hiển thị giờ có sẵn trên tiện ích trò chuyện trực tiếp ngay cả khi tất cả các đại lý đều ngoại tuyến. Ngoài giờ có sẵn, khách truy cập có thể được cảnh báo bằng thông điệp và biểu mẫu trò chuyện trước.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours visitors can be warned with a message and a pre-chat form.",
       "DAY": {
         "ENABLE": "Kích hoạt tính khả dụng cho hôm nay",
         "UNAVAILABLE": "Không có sẵn",
diff --git a/app/javascript/dashboard/i18n/locale/vi/settings.json b/app/javascript/dashboard/i18n/locale/vi/settings.json
index 5f4981790..7b6810a2d 100644
--- a/app/javascript/dashboard/i18n/locale/vi/settings.json
+++ b/app/javascript/dashboard/i18n/locale/vi/settings.json
@@ -160,6 +160,9 @@
     "TRIAL_MESSAGE": "ngày dùng thử còn lại.",
     "TRAIL_BUTTON": "Mua Ngay",
     "DELETED_USER": "Người dùng bị xoá",
+    "EMAIL_VERIFICATION_PENDING": "It seems that you haven't verified your email address yet. Please check your inbox for the verification email.",
+    "RESEND_VERIFICATION_MAIL": "Resend verification email",
+    "EMAIL_VERIFICATION_SENT": "Verification email has been sent. Please check your inbox.",
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Tài khoản bị ngưng",
       "MESSAGE": "Tài khoản của bạn bị tạm ngưng. Vui lòng liên hệ với nhóm hỗ trợ để biết thêm thông tin."
@@ -197,6 +200,7 @@
     "CURRENTLY_VIEWING_ACCOUNT": "Hiện đang xem:",
     "SWITCH": "Chuyển",
     "CONVERSATIONS": "Cuộc trò chuyện",
+    "INBOX": "Hộp thư đến",
     "ALL_CONVERSATIONS": "Tất cả cuộc trò chuyện",
     "MENTIONED_CONVERSATIONS": "Nhắn đến",
     "PARTICIPATING_CONVERSATIONS": "Participating",
@@ -238,6 +242,7 @@
     "REPORTS_INBOX": "Kênh",
     "REPORTS_TEAM": "Nhóm",
     "SET_AVAILABILITY_TITLE": "Đặt chính mình như",
+    "SLA": "SLA",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Tổng quan",
     "FACEBOOK_REAUTHORIZE": "Kết nối Facebook của bạn đã hết hạn, vui lòng kết nối lại trang Facebook của bạn để tiếp tục dịch vụ",
diff --git a/app/javascript/dashboard/i18n/locale/vi/sla.json b/app/javascript/dashboard/i18n/locale/vi/sla.json
new file mode 100644
index 000000000..74fae1534
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/vi/sla.json
@@ -0,0 +1,70 @@
+{
+  "SLA": {
+    "HEADER": "SLA",
+    "HEADER_BTN_TXT": "Add SLA",
+    "LOADING": "Fetching SLAs",
+    "SEARCH_404": "Không có kết quả nào được tìm thấy",
+    "SIDEBAR_TXT": "<p><b>SLA</b> <p>Think of Service Level Agreements (SLAs) like friendly promises between a service provider and a customer.</p> <p> These promises set clear expectations for things like how quickly the team will respond to issues, making sure you always get a reliable and top-notch experience!</p>",
+    "LIST": {
+      "404": "There are no SLAs available in this account.",
+      "TITLE": "Manage SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "TABLE_HEADER": [
+        "Tên",
+        "Mô tả",
+        "FRT",
+        "NRT",
+        "RT",
+        "Giờ làm việc"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "SLA Name",
+        "PLACEHOLDER": "SLA Name",
+        "REQUIRED_ERROR": "SLA name is required",
+        "MINIMUM_LENGTH_ERROR": "Bắt buộc độ dài tối thiểu là 2",
+        "VALID_ERROR": "Chỉ cho phép Chữ cái, Chữ số, Dấu gạch ngang và Dấu gạch dưới"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Mô tả",
+        "PLACEHOLDER": "SLA for premium customers"
+      },
+      "FIRST_RESPONSE_TIME": {
+        "LABEL": "First Response Time(Seconds)",
+        "PLACEHOLDER": "300 for 5 minutes"
+      },
+      "NEXT_RESPONSE_TIME": {
+        "LABEL": "Next Response Time(Seconds)",
+        "PLACEHOLDER": "600 for 10 minutes"
+      },
+      "RESOLUTION_TIME": {
+        "LABEL": "Resolution Time(Seconds)",
+        "PLACEHOLDER": "86400 for 1 day"
+      },
+      "BUSINESS_HOURS": {
+        "LABEL": "Giờ làm việc",
+        "PLACEHOLDER": "Only during business hours"
+      },
+      "EDIT": "Chỉnh sửa",
+      "CREATE": "Tạo",
+      "DELETE": "Xoá",
+      "CANCEL": "Huỷ"
+    },
+    "ADD": {
+      "TITLE": "Add SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA added successfully",
+        "ERROR_MESSAGE": "Đã có lỗi, vui lòng thử lại"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit SLA",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA updated successfully",
+        "ERROR_MESSAGE": "Đã có lỗi, vui lòng thử lại"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/zh_CN/attributesMgmt.json
index 2db45ec24..5d9e71b57 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/attributesMgmt.json
@@ -39,6 +39,17 @@
           "PLACEHOLDER": "输入自定义属性键",
           "ERROR": "键是必需的",
           "IN_VALID": "无效键"
+        },
+        "REGEX_PATTERN": {
+          "LABEL": "Regex Pattern",
+          "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+        },
+        "REGEX_CUE": {
+          "LABEL": "Regex Cue",
+          "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+        },
+        "ENABLE_REGEX": {
+          "LABEL": "Enable regex validation"
         }
       },
       "API": {
@@ -93,6 +104,17 @@
       "EMPTY_RESULT": {
         "404": "没有创建自定义属性",
         "NOT_FOUND": "没有配置自定义属性"
+      },
+      "REGEX_PATTERN": {
+        "LABEL": "Regex Pattern",
+        "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+      },
+      "REGEX_CUE": {
+        "LABEL": "Regex Cue",
+        "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+      },
+      "ENABLE_REGEX": {
+        "LABEL": "Enable regex validation"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/contact.json b/app/javascript/dashboard/i18n/locale/zh_CN/contact.json
index ffbbe1ee5..1690fc73c 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/contact.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/contact.json
@@ -39,10 +39,10 @@
     },
     "MERGE_CONTACT": "合并联系人",
     "CONTACT_ACTIONS": "联系人操作",
-    "MUTE_CONTACT": "开始会话",
-    "UNMUTE_CONTACT": "取消静音",
-    "MUTED_SUCCESS": "此对话被静音6小时",
-    "UNMUTED_SUCCESS": "此对话已取消静音",
+    "MUTE_CONTACT": "Block Contact",
+    "UNMUTE_CONTACT": "Unblock Contact",
+    "MUTED_SUCCESS": "This contact is blocked successfully. You will not be notified of any future conversations.",
+    "UNMUTED_SUCCESS": "This contact is unblocked successfully.",
     "SEND_TRANSCRIPT": "发送客服记录",
     "EDIT_LABEL": "编辑",
     "SIDEBAR_SECTIONS": {
@@ -79,7 +79,13 @@
     "TITLE": "Export Contacts",
     "DESC": "Export contacts to a CSV file.",
     "SUCCESS_MESSAGE": "Export is in progress, You will be notified via email when export file is ready to dowanlod.",
-    "ERROR_MESSAGE": "出现错误，请重试"
+    "ERROR_MESSAGE": "出现错误，请重试",
+    "CONFIRM": {
+      "TITLE": "Export Contacts",
+      "MESSAGE": "Are you sure you want to export all contacts?",
+      "YES": "Yes, Export",
+      "NO": "No, Cancel"
+    }
   },
   "DELETE_NOTE": {
     "CONFIRM": {
@@ -339,7 +345,8 @@
     },
     "VALIDATIONS": {
       "REQUIRED": "需要有效的值",
-      "INVALID_URL": "无效的 URL"
+      "INVALID_URL": "无效的 URL",
+      "INVALID_INPUT": "Invalid Input"
     }
   },
   "MERGE_CONTACTS": {
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json b/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json
index facb1fe34..d0cfdf07c 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json
@@ -112,7 +112,8 @@
       "REMOVE_LABEL": "从对话移除标签",
       "SETTINGS": "设置",
       "AI_ASSIST": "AI Assist",
-      "APPEARANCE": "Appearance"
+      "APPEARANCE": "Appearance",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     },
     "COMMANDS": {
       "GO_TO_CONVERSATION_DASHBOARD": "转到对话面板",
@@ -153,7 +154,8 @@
       "CHANGE_APPEARANCE": "Change Appearance",
       "LIGHT_MODE": "Light",
       "DARK_MODE": "Dark",
-      "SYSTEM_MODE": "System"
+      "SYSTEM_MODE": "System",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     }
   },
   "DASHBOARD_APPS": {
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/helpCenter.json b/app/javascript/dashboard/i18n/locale/zh_CN/helpCenter.json
index e630d2bde..1157a674c 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/helpCenter.json
@@ -324,7 +324,8 @@
         "LAST_EDITED": "Last edited"
       },
       "COLUMNS": {
-        "BY": "by"
+        "BY": "by",
+        "AUTHOR_NOT_AVAILABLE": "Author is not available"
       }
     },
     "EDIT_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/inbox.json b/app/javascript/dashboard/i18n/locale/zh_CN/inbox.json
new file mode 100644
index 000000000..050eb83d1
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/inbox.json
@@ -0,0 +1,60 @@
+{
+  "INBOX": {
+    "LIST": {
+      "TITLE": "收件箱",
+      "DISPLAY_DROPDOWN": "Display",
+      "LOADING": "Fetching notifications",
+      "EOF": "所有通知已加载 🎉",
+      "404": "There are no active notifications in this group.",
+      "NO_NOTIFICATIONS": "No notifications",
+      "NOTE": "Notifications from all subscribed inboxes",
+      "SNOOZED_UNTIL": "Snoozed until",
+      "SNOOZED_UNTIL_TOMORROW": "推迟到明天",
+      "SNOOZED_UNTIL_NEXT_WEEK": "推迟到下周"
+    },
+    "ACTION_HEADER": {
+      "SNOOZE": "Snooze notification",
+      "DELETE": "Delete notification"
+    },
+    "TYPES": {
+      "CONVERSATION_MENTION": "You have been mentioned in a conversation",
+      "CONVERSATION_CREATION": "New conversation created",
+      "CONVERSATION_ASSIGNMENT": "A conversation has been assigned to you",
+      "ASSIGNED_CONVERSATION_NEW_MESSAGE": "New message in an assigned conversation",
+      "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "New message in a conversation you are participating in"
+    },
+    "MENU_ITEM": {
+      "MARK_AS_READ": "Mark as read",
+      "MARK_AS_UNREAD": "Mark as unread",
+      "SNOOZE": "推迟",
+      "DELETE": "删除",
+      "MARK_ALL_READ": "全部标记为已读",
+      "DELETE_ALL": "Delete all",
+      "DELETE_ALL_READ": "Delete all read"
+    },
+    "DISPLAY_MENU": {
+      "SORT": "Sort",
+      "DISPLAY": "Display :",
+      "SORT_OPTIONS": {
+        "NEWEST": "Newest",
+        "OLDEST": "Oldest",
+        "PRIORITY": "优先级"
+      },
+      "DISPLAY_OPTIONS": {
+        "SNOOZED": "已关闭",
+        "READ": "已读",
+        "LABELS": "标签",
+        "CONVERSATION_ID": "Conversation ID"
+      }
+    },
+    "ALERTS": {
+      "MARK_AS_READ": "Notification marked as read",
+      "MARK_AS_UNREAD": "Notification marked as unread",
+      "SNOOZE": "Notification snoozed",
+      "DELETE": "Notification deleted",
+      "MARK_ALL_READ": "All notifications marked as read",
+      "DELETE_ALL": "All notifications deleted",
+      "DELETE_ALL_READ": "All read notifications deleted"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json
index 3fbdb9097..45a646a97 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json
@@ -569,7 +569,7 @@
       "UPDATE": "Update business hours settings",
       "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
       "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for visitors",
-      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours visitors can be warned with a message and a pre-chat form.",
       "DAY": {
         "ENABLE": "Enable availability for this day",
         "UNAVAILABLE": "Unavailable",
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/settings.json b/app/javascript/dashboard/i18n/locale/zh_CN/settings.json
index 270b25186..9206e6af1 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/settings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/settings.json
@@ -160,6 +160,9 @@
     "TRIAL_MESSAGE": "剩余试用期天数",
     "TRAIL_BUTTON": "立即购买",
     "DELETED_USER": "Deleted User",
+    "EMAIL_VERIFICATION_PENDING": "It seems that you haven't verified your email address yet. Please check your inbox for the verification email.",
+    "RESEND_VERIFICATION_MAIL": "Resend verification email",
+    "EMAIL_VERIFICATION_SENT": "Verification email has been sent. Please check your inbox.",
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Account Suspended",
       "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
@@ -197,6 +200,7 @@
     "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
     "SWITCH": "Switch",
     "CONVERSATIONS": "会话",
+    "INBOX": "收件箱",
     "ALL_CONVERSATIONS": "所有会话",
     "MENTIONED_CONVERSATIONS": "提及",
     "PARTICIPATING_CONVERSATIONS": "参与者",
@@ -238,6 +242,7 @@
     "REPORTS_INBOX": "收件箱",
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
+    "SLA": "SLA",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Overview",
     "FACEBOOK_REAUTHORIZE": "您的 Facebook 连接已过期，请重新连接您的 Facebook 页面以继续服务",
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/sla.json b/app/javascript/dashboard/i18n/locale/zh_CN/sla.json
new file mode 100644
index 000000000..00d83f363
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/sla.json
@@ -0,0 +1,70 @@
+{
+  "SLA": {
+    "HEADER": "SLA",
+    "HEADER_BTN_TXT": "Add SLA",
+    "LOADING": "Fetching SLAs",
+    "SEARCH_404": "没有任何项目符合此查询",
+    "SIDEBAR_TXT": "<p><b>SLA</b> <p>Think of Service Level Agreements (SLAs) like friendly promises between a service provider and a customer.</p> <p> These promises set clear expectations for things like how quickly the team will respond to issues, making sure you always get a reliable and top-notch experience!</p>",
+    "LIST": {
+      "404": "There are no SLAs available in this account.",
+      "TITLE": "Manage SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "TABLE_HEADER": [
+        "姓名：",
+        "描述信息",
+        "FRT",
+        "NRT",
+        "RT",
+        "Business Hours"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "SLA Name",
+        "PLACEHOLDER": "SLA Name",
+        "REQUIRED_ERROR": "SLA name is required",
+        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
+        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
+      },
+      "DESCRIPTION": {
+        "LABEL": "描述信息",
+        "PLACEHOLDER": "SLA for premium customers"
+      },
+      "FIRST_RESPONSE_TIME": {
+        "LABEL": "First Response Time(Seconds)",
+        "PLACEHOLDER": "300 for 5 minutes"
+      },
+      "NEXT_RESPONSE_TIME": {
+        "LABEL": "Next Response Time(Seconds)",
+        "PLACEHOLDER": "600 for 10 minutes"
+      },
+      "RESOLUTION_TIME": {
+        "LABEL": "Resolution Time(Seconds)",
+        "PLACEHOLDER": "86400 for 1 day"
+      },
+      "BUSINESS_HOURS": {
+        "LABEL": "Business Hours",
+        "PLACEHOLDER": "Only during business hours"
+      },
+      "EDIT": "编辑",
+      "CREATE": "创建",
+      "DELETE": "删除",
+      "CANCEL": "取消"
+    },
+    "ADD": {
+      "TITLE": "Add SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA added successfully",
+        "ERROR_MESSAGE": "出现错误，请重试"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit SLA",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA updated successfully",
+        "ERROR_MESSAGE": "出现错误，请重试"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/advancedFilters.json b/app/javascript/dashboard/i18n/locale/zh_TW/advancedFilters.json
index ab02c1502..31654ecf8 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/advancedFilters.json
@@ -1,17 +1,17 @@
 {
   "FILTER": {
     "TITLE": "篩選對話",
-    "SUBTITLE": "Add your filters below and hit 'Apply filters' to cut through the chat clutter.",
-    "EDIT_CUSTOM_FILTER": "Edit Folder",
-    "CUSTOM_VIEWS_SUBTITLE": "Add or remove filters and update your folder.",
-    "ADD_NEW_FILTER": "Add filter",
-    "FILTER_DELETE_ERROR": "Oops, looks like we can't save nothing! Please add at least one filter to save it.",
+    "SUBTITLE": "添加你的條件，並按下同意後，可以讓你的聊天更加簡潔",
+    "EDIT_CUSTOM_FILTER": "編輯資料夾",
+    "CUSTOM_VIEWS_SUBTITLE": "添加或移除一些條件與更新你的資料夾",
+    "ADD_NEW_FILTER": "添加查詢條件",
+    "FILTER_DELETE_ERROR": "哎呀，我們無法存檔！ 請添加至少一個條件來保存。",
     "SUBMIT_BUTTON_LABEL": "篩選",
-    "UPDATE_BUTTON_LABEL": "Update folder",
+    "UPDATE_BUTTON_LABEL": "更新資料夾",
     "CANCEL_BUTTON_LABEL": "取消",
-    "CLEAR_BUTTON_LABEL": "Clear filters",
-    "FOLDER_LABEL": "Folder Name",
-    "FOLDER_QUERY_LABEL": "Folder Query",
+    "CLEAR_BUTTON_LABEL": "清除查詢條件",
+    "FOLDER_LABEL": "資料夾名稱",
+    "FOLDER_QUERY_LABEL": "快速資料夾",
     "EMPTY_VALUE_ERROR": "此欄位為必填項目.",
     "TOOLTIP_LABEL": "篩選對話",
     "QUERY_DROPDOWN_LABELS": {
@@ -28,7 +28,7 @@
       "is_greater_than": "大於",
       "is_less_than": "小於",
       "days_before": "x 天前",
-      "starts_with": "Starts with"
+      "starts_with": "從這開始"
     },
     "ATTRIBUTE_LABELS": {
       "TRUE": "True",
@@ -36,15 +36,15 @@
     },
     "ATTRIBUTES": {
       "STATUS": "狀態",
-      "ASSIGNEE_NAME": "Assignee name",
+      "ASSIGNEE_NAME": "轉發指定人",
       "INBOX_NAME": "收件匣名稱",
       "TEAM_NAME": "團隊名稱",
-      "CONVERSATION_IDENTIFIER": "Conversation identifier",
-      "CAMPAIGN_NAME": "Campaign name",
+      "CONVERSATION_IDENTIFIER": "對話ID",
+      "CAMPAIGN_NAME": "活動名稱",
       "LABELS": "標籤",
-      "BROWSER_LANGUAGE": "Browser language",
-      "PRIORITY": "Priority",
-      "COUNTRY_NAME": "Country name",
+      "BROWSER_LANGUAGE": "瀏覽器語言",
+      "PRIORITY": "優先",
+      "COUNTRY_NAME": "國家名稱",
       "REFERER_LINK": "推薦人連結",
       "CUSTOM_ATTRIBUTE_LIST": "列表",
       "CUSTOM_ATTRIBUTE_TEXT": "文字",
@@ -52,18 +52,18 @@
       "CUSTOM_ATTRIBUTE_LINK": "連結",
       "CUSTOM_ATTRIBUTE_CHECKBOX": "勾選框",
       "CREATED_AT": "建立於",
-      "LAST_ACTIVITY": "Last activity"
+      "LAST_ACTIVITY": "最後活動"
     },
     "GROUPS": {
-      "STANDARD_FILTERS": "Standard filters",
-      "ADDITIONAL_FILTERS": "Additional filters",
-      "CUSTOM_ATTRIBUTES": "Custom attributes"
+      "STANDARD_FILTERS": "一般查詢條件",
+      "ADDITIONAL_FILTERS": "田家查詢條件",
+      "CUSTOM_ATTRIBUTES": "自訂屬性"
     },
     "CUSTOM_VIEWS": {
       "ADD": {
         "TITLE": "你要儲存這個篩選條件嗎？",
         "LABEL": "為這個篩選條件命名",
-        "PLACEHOLDER": "Name your filter to refer it later.",
+        "PLACEHOLDER": "給你的查詢條件命名，以便後面查看",
         "ERROR_MESSAGE": "名稱為必填.",
         "SAVE_BUTTON": "儲存篩選條件",
         "CANCEL_BUTTON": "取消",
@@ -72,12 +72,12 @@
           "ERROR_MESSAGE": "建立資料夾時出現錯誤."
         },
         "API_SEGMENTS": {
-          "SUCCESS_MESSAGE": "Segment created successfully.",
-          "ERROR_MESSAGE": "Error while creating segment."
+          "SUCCESS_MESSAGE": "成功建立帳戶",
+          "ERROR_MESSAGE": "建立時出錯"
         }
       },
       "EDIT": {
-        "EDIT_BUTTON": "Edit folder"
+        "EDIT_BUTTON": "編輯資料夾"
       },
       "DELETE": {
         "DELETE_BUTTON": "刪除篩選條件",
@@ -85,7 +85,7 @@
           "CONFIRM": {
             "TITLE": "刪除確認",
             "MESSAGE": "你確定要刪除此篩選條件嗎",
-            "YES": "Yes, delete",
+            "YES": "是的，刪除",
             "NO": "否，保留"
           }
         },
@@ -94,8 +94,8 @@
           "ERROR_MESSAGE": "刪除資料夾時出現錯誤."
         },
         "API_SEGMENTS": {
-          "SUCCESS_MESSAGE": "Segment deleted successfully.",
-          "ERROR_MESSAGE": "Error while deleting segment."
+          "SUCCESS_MESSAGE": "刪除成功",
+          "ERROR_MESSAGE": "刪除時出錯"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/zh_TW/attributesMgmt.json
index 4fd58ac97..87f6c57a6 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/attributesMgmt.json
@@ -39,6 +39,17 @@
           "PLACEHOLDER": "Enter custom attribute key",
           "ERROR": "Key is required",
           "IN_VALID": "Invalid key"
+        },
+        "REGEX_PATTERN": {
+          "LABEL": "Regex Pattern",
+          "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+        },
+        "REGEX_CUE": {
+          "LABEL": "Regex Cue",
+          "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+        },
+        "ENABLE_REGEX": {
+          "LABEL": "Enable regex validation"
         }
       },
       "API": {
@@ -93,6 +104,17 @@
       "EMPTY_RESULT": {
         "404": "There are no custom attributes created",
         "NOT_FOUND": "There are no custom attributes configured"
+      },
+      "REGEX_PATTERN": {
+        "LABEL": "Regex Pattern",
+        "PLACEHOLDER": "Please enter custom attribute regex pattern. (Optional)"
+      },
+      "REGEX_CUE": {
+        "LABEL": "Regex Cue",
+        "PLACEHOLDER": "Please enter regex pattern hint. (Optional)"
+      },
+      "ENABLE_REGEX": {
+        "LABEL": "Enable regex validation"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/contact.json b/app/javascript/dashboard/i18n/locale/zh_TW/contact.json
index 05098d2a3..c58ce3908 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/contact.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/contact.json
@@ -39,10 +39,10 @@
     },
     "MERGE_CONTACT": "Merge contact",
     "CONTACT_ACTIONS": "Contact actions",
-    "MUTE_CONTACT": "將對話靜音",
-    "UNMUTE_CONTACT": "將對話解除靜音",
-    "MUTED_SUCCESS": "將對話靜音 6 小時",
-    "UNMUTED_SUCCESS": "對話已解除靜音",
+    "MUTE_CONTACT": "Block Contact",
+    "UNMUTE_CONTACT": "Unblock Contact",
+    "MUTED_SUCCESS": "This contact is blocked successfully. You will not be notified of any future conversations.",
+    "UNMUTED_SUCCESS": "This contact is unblocked successfully.",
     "SEND_TRANSCRIPT": "Send Transcript",
     "EDIT_LABEL": "編輯",
     "SIDEBAR_SECTIONS": {
@@ -79,7 +79,13 @@
     "TITLE": "Export Contacts",
     "DESC": "Export contacts to a CSV file.",
     "SUCCESS_MESSAGE": "Export is in progress, You will be notified via email when export file is ready to dowanlod.",
-    "ERROR_MESSAGE": "出現錯誤，請重試"
+    "ERROR_MESSAGE": "出現錯誤，請重試",
+    "CONFIRM": {
+      "TITLE": "Export Contacts",
+      "MESSAGE": "Are you sure you want to export all contacts?",
+      "YES": "Yes, Export",
+      "NO": "No, Cancel"
+    }
   },
   "DELETE_NOTE": {
     "CONFIRM": {
@@ -339,7 +345,8 @@
     },
     "VALIDATIONS": {
       "REQUIRED": "Valid value is required",
-      "INVALID_URL": "Invalid URL"
+      "INVALID_URL": "Invalid URL",
+      "INVALID_INPUT": "Invalid Input"
     }
   },
   "MERGE_CONTACTS": {
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/conversation.json b/app/javascript/dashboard/i18n/locale/zh_TW/conversation.json
index b7f26fdad..256da601d 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/conversation.json
@@ -82,7 +82,7 @@
       "CANCEL": "取消"
     },
     "PRIORITY": {
-      "TITLE": "Priority",
+      "TITLE": "優先",
       "OPTIONS": {
         "NONE": "無",
         "URGENT": "Urgent",
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/generalSettings.json b/app/javascript/dashboard/i18n/locale/zh_TW/generalSettings.json
index e291f390f..567a1b8ef 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/generalSettings.json
@@ -112,7 +112,8 @@
       "REMOVE_LABEL": "Remove label from the conversation",
       "SETTINGS": "設定",
       "AI_ASSIST": "AI Assist",
-      "APPEARANCE": "Appearance"
+      "APPEARANCE": "Appearance",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     },
     "COMMANDS": {
       "GO_TO_CONVERSATION_DASHBOARD": "Go to Conversation Dashboard",
@@ -153,7 +154,8 @@
       "CHANGE_APPEARANCE": "Change Appearance",
       "LIGHT_MODE": "Light",
       "DARK_MODE": "Dark",
-      "SYSTEM_MODE": "System"
+      "SYSTEM_MODE": "System",
+      "SNOOZE_NOTIFICATION": "Snooze Notification"
     }
   },
   "DASHBOARD_APPS": {
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/helpCenter.json b/app/javascript/dashboard/i18n/locale/zh_TW/helpCenter.json
index d3e23ff7f..e7b9f91ac 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/helpCenter.json
@@ -324,7 +324,8 @@
         "LAST_EDITED": "Last edited"
       },
       "COLUMNS": {
-        "BY": "by"
+        "BY": "by",
+        "AUTHOR_NOT_AVAILABLE": "Author is not available"
       }
     },
     "EDIT_ARTICLE": {
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/inbox.json b/app/javascript/dashboard/i18n/locale/zh_TW/inbox.json
new file mode 100644
index 000000000..6911a132d
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/inbox.json
@@ -0,0 +1,60 @@
+{
+  "INBOX": {
+    "LIST": {
+      "TITLE": "收件匣",
+      "DISPLAY_DROPDOWN": "Display",
+      "LOADING": "Fetching notifications",
+      "EOF": "All notifications loaded 🎉",
+      "404": "There are no active notifications in this group.",
+      "NO_NOTIFICATIONS": "No notifications",
+      "NOTE": "Notifications from all subscribed inboxes",
+      "SNOOZED_UNTIL": "Snoozed until",
+      "SNOOZED_UNTIL_TOMORROW": "Snoozed until tomorrow",
+      "SNOOZED_UNTIL_NEXT_WEEK": "Snoozed until next week"
+    },
+    "ACTION_HEADER": {
+      "SNOOZE": "Snooze notification",
+      "DELETE": "Delete notification"
+    },
+    "TYPES": {
+      "CONVERSATION_MENTION": "You have been mentioned in a conversation",
+      "CONVERSATION_CREATION": "New conversation created",
+      "CONVERSATION_ASSIGNMENT": "A conversation has been assigned to you",
+      "ASSIGNED_CONVERSATION_NEW_MESSAGE": "New message in an assigned conversation",
+      "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "New message in a conversation you are participating in"
+    },
+    "MENU_ITEM": {
+      "MARK_AS_READ": "Mark as read",
+      "MARK_AS_UNREAD": "Mark as unread",
+      "SNOOZE": "Snooze",
+      "DELETE": "刪除",
+      "MARK_ALL_READ": "Mark all as read",
+      "DELETE_ALL": "Delete all",
+      "DELETE_ALL_READ": "Delete all read"
+    },
+    "DISPLAY_MENU": {
+      "SORT": "Sort",
+      "DISPLAY": "Display :",
+      "SORT_OPTIONS": {
+        "NEWEST": "Newest",
+        "OLDEST": "Oldest",
+        "PRIORITY": "優先"
+      },
+      "DISPLAY_OPTIONS": {
+        "SNOOZED": "已关闭",
+        "READ": "Read",
+        "LABELS": "標籤",
+        "CONVERSATION_ID": "Conversation ID"
+      }
+    },
+    "ALERTS": {
+      "MARK_AS_READ": "Notification marked as read",
+      "MARK_AS_UNREAD": "Notification marked as unread",
+      "SNOOZE": "Notification snoozed",
+      "DELETE": "Notification deleted",
+      "MARK_ALL_READ": "All notifications marked as read",
+      "DELETE_ALL": "All notifications deleted",
+      "DELETE_ALL_READ": "All read notifications deleted"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json
index df4b08aff..aa42ec52f 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json
@@ -569,7 +569,7 @@
       "UPDATE": "更新服務時間設定",
       "TOGGLE_AVAILABILITY": "啟用收件匣可用服務時間",
       "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for visitors",
-      "TOGGLE_HELP": "啟用服務時間將會在 live chat 小工具上顯示你的服務時間，就算所有客服都不在線上。若不在服務時間內，訪客將會被提醒及傳送 pre-chat 表單",
+      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours visitors can be warned with a message and a pre-chat form.",
       "DAY": {
         "ENABLE": "Enable availability for this day",
         "UNAVAILABLE": "無法使用",
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/settings.json b/app/javascript/dashboard/i18n/locale/zh_TW/settings.json
index a908050f4..fd89fc8f3 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/settings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/settings.json
@@ -160,6 +160,9 @@
     "TRIAL_MESSAGE": "剩餘試用期天數",
     "TRAIL_BUTTON": "立即購買",
     "DELETED_USER": "刪除使用者",
+    "EMAIL_VERIFICATION_PENDING": "It seems that you haven't verified your email address yet. Please check your inbox for the verification email.",
+    "RESEND_VERIFICATION_MAIL": "Resend verification email",
+    "EMAIL_VERIFICATION_SENT": "Verification email has been sent. Please check your inbox.",
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Account Suspended",
       "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
@@ -197,6 +200,7 @@
     "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
     "SWITCH": "Switch",
     "CONVERSATIONS": "會話",
+    "INBOX": "收件匣",
     "ALL_CONVERSATIONS": "所有對話",
     "MENTIONED_CONVERSATIONS": "Mentions",
     "PARTICIPATING_CONVERSATIONS": "Participating",
@@ -238,6 +242,7 @@
     "REPORTS_INBOX": "收件匣",
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
+    "SLA": "SLA",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "總覽",
     "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/sla.json b/app/javascript/dashboard/i18n/locale/zh_TW/sla.json
new file mode 100644
index 000000000..ef7b9ccef
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/sla.json
@@ -0,0 +1,70 @@
+{
+  "SLA": {
+    "HEADER": "SLA",
+    "HEADER_BTN_TXT": "Add SLA",
+    "LOADING": "Fetching SLAs",
+    "SEARCH_404": "没有任何項目符合此查詢",
+    "SIDEBAR_TXT": "<p><b>SLA</b> <p>Think of Service Level Agreements (SLAs) like friendly promises between a service provider and a customer.</p> <p> These promises set clear expectations for things like how quickly the team will respond to issues, making sure you always get a reliable and top-notch experience!</p>",
+    "LIST": {
+      "404": "There are no SLAs available in this account.",
+      "TITLE": "Manage SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "TABLE_HEADER": [
+        "姓名",
+        "描述資訊",
+        "FRT",
+        "NRT",
+        "RT",
+        "服務時間"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "SLA Name",
+        "PLACEHOLDER": "SLA Name",
+        "REQUIRED_ERROR": "SLA name is required",
+        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
+        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
+      },
+      "DESCRIPTION": {
+        "LABEL": "描述資訊",
+        "PLACEHOLDER": "SLA for premium customers"
+      },
+      "FIRST_RESPONSE_TIME": {
+        "LABEL": "First Response Time(Seconds)",
+        "PLACEHOLDER": "300 for 5 minutes"
+      },
+      "NEXT_RESPONSE_TIME": {
+        "LABEL": "Next Response Time(Seconds)",
+        "PLACEHOLDER": "600 for 10 minutes"
+      },
+      "RESOLUTION_TIME": {
+        "LABEL": "Resolution Time(Seconds)",
+        "PLACEHOLDER": "86400 for 1 day"
+      },
+      "BUSINESS_HOURS": {
+        "LABEL": "服務時間",
+        "PLACEHOLDER": "Only during business hours"
+      },
+      "EDIT": "編輯",
+      "CREATE": "建立",
+      "DELETE": "刪除",
+      "CANCEL": "取消"
+    },
+    "ADD": {
+      "TITLE": "Add SLA",
+      "DESC": "SLAs: Friendly promises for great service!",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA added successfully",
+        "ERROR_MESSAGE": "出現錯誤，請重試"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit SLA",
+      "API": {
+        "SUCCESS_MESSAGE": "SLA updated successfully",
+        "ERROR_MESSAGE": "出現錯誤，請重試"
+      }
+    }
+  }
+}
diff --git a/app/javascript/widget/i18n/locale/am.json b/app/javascript/widget/i18n/locale/am.json
index 3a1f51ccf..83b442e51 100644
--- a/app/javascript/widget/i18n/locale/am.json
+++ b/app/javascript/widget/i18n/locale/am.json
@@ -80,7 +80,8 @@
     },
     "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation",
     "IS_REQUIRED": "is required",
-    "REQUIRED": "Required"
+    "REQUIRED": "Required",
+    "REGEX_ERROR": "Please provide a valid input"
   },
   "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/ar.json b/app/javascript/widget/i18n/locale/ar.json
index de9c575f0..2e76a6b05 100644
--- a/app/javascript/widget/i18n/locale/ar.json
+++ b/app/javascript/widget/i18n/locale/ar.json
@@ -23,20 +23,20 @@
     "BACK_IN": "We will be back online"
   },
   "DAY_NAMES": [
-    "Sunday",
-    "Monday",
-    "Tuesday",
-    "Wednesday",
-    "Thursday",
-    "Friday",
-    "Saturday"
+    "الأحد",
+    "الإثنين",
+    "الثلاثاء",
+    "الأربعاء",
+    "الخميس",
+    "الجمعة",
+    "السبت"
   ],
   "START_CONVERSATION": "ابدأ المحادثة",
   "END_CONVERSATION": "إنهاء المحادثة",
   "CONTINUE_CONVERSATION": "متابعة المحادثة",
-  "YOU": "You",
+  "YOU": "أنت",
   "START_NEW_CONVERSATION": "ابدأ محادثة جديدة",
-  "VIEW_UNREAD_MESSAGES": "You have unread messages",
+  "VIEW_UNREAD_MESSAGES": "لديك رسائل غير مقروءة",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "عرض الرسائل الجديدة",
     "CLOSE_MESSAGES_BUTTON": "أغلق",
@@ -68,7 +68,7 @@
         "LABEL": "رقم الهاتف",
         "PLACEHOLDER": "الرجاء إدخال رقم الهاتف الخاص بك",
         "REQUIRED_ERROR": "رقم الهاتف مطلوب",
-        "DIAL_CODE_VALID_ERROR": "Please select a country code",
+        "DIAL_CODE_VALID_ERROR": "الرجاء اختيار رمز البلد",
         "VALID_ERROR": "Please enter a valid phone number",
         "DROPDOWN_EMPTY": "لم يتم العثور على النتائج"
       },
@@ -80,7 +80,8 @@
     },
     "CAMPAIGN_HEADER": "الرجاء تقديم اسمك و بريدك الإلكتروني قبل بدء المحادثة",
     "IS_REQUIRED": "مطلوب",
-    "REQUIRED": "مطلوب"
+    "REQUIRED": "مطلوب",
+    "REGEX_ERROR": "Please provide a valid input"
   },
   "FILE_SIZE_LIMIT": "حجم الملف يتجاوز حد الاقصى وهو {MAXIMUM_FILE_UPLOAD_SIZE}",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/bg.json b/app/javascript/widget/i18n/locale/bg.json
index 0543f20c5..ffdf25359 100644
--- a/app/javascript/widget/i18n/locale/bg.json
+++ b/app/javascript/widget/i18n/locale/bg.json
@@ -80,7 +80,8 @@
     },
     "CAMPAIGN_HEADER": "Преди да започенте разговора, моля, посочете вашето име и имейл адрес",
     "IS_REQUIRED": "is required",
-    "REQUIRED": "Required"
+    "REQUIRED": "Required",
+    "REGEX_ERROR": "Please provide a valid input"
   },
   "FILE_SIZE_LIMIT": "Файлът надхвърля {MAXIMUM_FILE_UPLOAD_SIZE} лимит",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/ca.json b/app/javascript/widget/i18n/locale/ca.json
index 492737e85..6ac532ba1 100644
--- a/app/javascript/widget/i18n/locale/ca.json
+++ b/app/javascript/widget/i18n/locale/ca.json
@@ -80,7 +80,8 @@
     },
     "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation",
     "IS_REQUIRED": "is required",
-    "REQUIRED": "Required"
+    "REQUIRED": "Required",
+    "REGEX_ERROR": "Please provide a valid input"
   },
   "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/cs.json b/app/javascript/widget/i18n/locale/cs.json
index 00bad18d4..4b28e1b71 100644
--- a/app/javascript/widget/i18n/locale/cs.json
+++ b/app/javascript/widget/i18n/locale/cs.json
@@ -80,7 +80,8 @@
     },
     "CAMPAIGN_HEADER": "Zadejte své jméno a e-mail před zahájením konverzace",
     "IS_REQUIRED": "je vyžadováno",
-    "REQUIRED": "Required"
+    "REQUIRED": "Required",
+    "REGEX_ERROR": "Please provide a valid input"
   },
   "FILE_SIZE_LIMIT": "Soubor překračuje limit {MAXIMUM_FILE_UPLOAD_SIZE} přílohy",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/da.json b/app/javascript/widget/i18n/locale/da.json
index 9a173825d..e0161f692 100644
--- a/app/javascript/widget/i18n/locale/da.json
+++ b/app/javascript/widget/i18n/locale/da.json
@@ -80,7 +80,8 @@
     },
     "CAMPAIGN_HEADER": "Angiv venligst dit navn og e-mail, før du starter samtalen",
     "IS_REQUIRED": "er påkrævet",
-    "REQUIRED": "Påkrævet"
+    "REQUIRED": "Påkrævet",
+    "REGEX_ERROR": "Please provide a valid input"
   },
   "FILE_SIZE_LIMIT": "Filen overskrider grænsen på {MAXIMUM_FILE_UPLOAD_SIZE} for vedhæftede filer",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/de.json b/app/javascript/widget/i18n/locale/de.json
index cca79454d..d6120a4ea 100644
--- a/app/javascript/widget/i18n/locale/de.json
+++ b/app/javascript/widget/i18n/locale/de.json
@@ -80,7 +80,8 @@
     },
     "CAMPAIGN_HEADER": "Bitte geben Sie Ihren Namen und Ihre E-Mail-Adresse an, bevor Sie die Konversation beginnen",
     "IS_REQUIRED": "erforderlich",
-    "REQUIRED": "Benötigt"
+    "REQUIRED": "Benötigt",
+    "REGEX_ERROR": "Please provide a valid input"
   },
   "FILE_SIZE_LIMIT": "Die Datei überschreitet das Anhangslimit von {MAXIMUM_FILE_UPLOAD_SIZE}",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/el.json b/app/javascript/widget/i18n/locale/el.json
index 1e07d9aa6..8180fcfc5 100644
--- a/app/javascript/widget/i18n/locale/el.json
+++ b/app/javascript/widget/i18n/locale/el.json
@@ -80,7 +80,8 @@
     },
     "CAMPAIGN_HEADER": "Παρακαλώ δώστε το όνομα και το email σας πριν ξεκινήσετε την συνομιλία",
     "IS_REQUIRED": "είναι απαραίτητο",
-    "REQUIRED": "Υποχρεωτικό"
+    "REQUIRED": "Υποχρεωτικό",
+    "REGEX_ERROR": "Please provide a valid input"
   },
   "FILE_SIZE_LIMIT": "Το αρχείο υπερβαίνει το όριο συνημμένου {MAXIMUM_FILE_UPLOAD_SIZE}",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/es.json b/app/javascript/widget/i18n/locale/es.json
index 1a5f3a885..2dad00069 100644
--- a/app/javascript/widget/i18n/locale/es.json
+++ b/app/javascript/widget/i18n/locale/es.json
@@ -80,7 +80,8 @@
     },
     "CAMPAIGN_HEADER": "Por favor, introduce tu nombre y correo electrónico antes de iniciar la conversación",
     "IS_REQUIRED": "es obligatorio",
-    "REQUIRED": "Requerido"
+    "REQUIRED": "Requerido",
+    "REGEX_ERROR": "Por favor proporcione una entrada válida"
   },
   "FILE_SIZE_LIMIT": "El archivo excede el límite de los archivos adjuntos {MAXIMUM_FILE_UPLOAD_SIZE}",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/fa.json b/app/javascript/widget/i18n/locale/fa.json
index 00194038e..940ee9b75 100644
--- a/app/javascript/widget/i18n/locale/fa.json
+++ b/app/javascript/widget/i18n/locale/fa.json
@@ -80,7 +80,8 @@
     },
     "CAMPAIGN_HEADER": "لطفا قبل از شروع گفتگو نام و ایمیل خود را وارد کنید",
     "IS_REQUIRED": "مورد نیاز است",
-    "REQUIRED": "ضروری"
+    "REQUIRED": "ضروری",
+    "REGEX_ERROR": "Please provide a valid input"
   },
   "FILE_SIZE_LIMIT": "فایل ضمیمه شده بیشتر از {MAXIMUM_FILE_UPLOAD_SIZE} است",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/fi.json b/app/javascript/widget/i18n/locale/fi.json
index fa1462e5f..ecc9af895 100644
--- a/app/javascript/widget/i18n/locale/fi.json
+++ b/app/javascript/widget/i18n/locale/fi.json
@@ -80,7 +80,8 @@
     },
     "CAMPAIGN_HEADER": "Ole hyvä ja anna nimesi ja sähköpostisi ennen keskustelun aloittamista",
     "IS_REQUIRED": "on vaadittu",
-    "REQUIRED": "Pakollinen"
+    "REQUIRED": "Pakollinen",
+    "REGEX_ERROR": "Please provide a valid input"
   },
   "FILE_SIZE_LIMIT": "Tiedosto ylittää sallitun {MAXIMUM_FILE_UPLOAD_SIZE} liitteen rajan",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/fr.json b/app/javascript/widget/i18n/locale/fr.json
index f56bdef70..fac594f5c 100644
--- a/app/javascript/widget/i18n/locale/fr.json
+++ b/app/javascript/widget/i18n/locale/fr.json
@@ -80,7 +80,8 @@
     },
     "CAMPAIGN_HEADER": "Veuillez fournir votre nom et votre courriel avant de commencer la conversation",
     "IS_REQUIRED": "est obligatoire",
-    "REQUIRED": "Requis"
+    "REQUIRED": "Requis",
+    "REGEX_ERROR": "Veuillez fournir une entrée valide"
   },
   "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/he.json b/app/javascript/widget/i18n/locale/he.json
index d746e2c08..bb8e58760 100644
--- a/app/javascript/widget/i18n/locale/he.json
+++ b/app/javascript/widget/i18n/locale/he.json
@@ -80,7 +80,8 @@
     },
     "CAMPAIGN_HEADER": "אנא ספק את שמך ואת הדוא\"ל שלך לפני תחילת השיחה",
     "IS_REQUIRED": "is required",
-    "REQUIRED": "נדרש"
+    "REQUIRED": "נדרש",
+    "REGEX_ERROR": "Please provide a valid input"
   },
   "FILE_SIZE_LIMIT": "קובץ חורג ממגבלת גודל מקסימלי {MAXIMUM_FILE_UPLOAD_SIZE}",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/hi.json b/app/javascript/widget/i18n/locale/hi.json
index 3a1f51ccf..83b442e51 100644
--- a/app/javascript/widget/i18n/locale/hi.json
+++ b/app/javascript/widget/i18n/locale/hi.json
@@ -80,7 +80,8 @@
     },
     "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation",
     "IS_REQUIRED": "is required",
-    "REQUIRED": "Required"
+    "REQUIRED": "Required",
+    "REGEX_ERROR": "Please provide a valid input"
   },
   "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/hr.json b/app/javascript/widget/i18n/locale/hr.json
index 844a537e3..23d3383d5 100644
--- a/app/javascript/widget/i18n/locale/hr.json
+++ b/app/javascript/widget/i18n/locale/hr.json
@@ -80,7 +80,8 @@
     },
     "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation",
     "IS_REQUIRED": "is required",
-    "REQUIRED": "Required"
+    "REQUIRED": "Required",
+    "REGEX_ERROR": "Please provide a valid input"
   },
   "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/hu.json b/app/javascript/widget/i18n/locale/hu.json
index 8d30dd3ec..6754dbad5 100644
--- a/app/javascript/widget/i18n/locale/hu.json
+++ b/app/javascript/widget/i18n/locale/hu.json
@@ -80,7 +80,8 @@
     },
     "CAMPAIGN_HEADER": "Kérjük a beszélgetés megkezdése előtt add meg neved és e-mail címed",
     "IS_REQUIRED": "kötelező",
-    "REQUIRED": "Kötelező"
+    "REQUIRED": "Kötelező",
+    "REGEX_ERROR": "Please provide a valid input"
   },
   "FILE_SIZE_LIMIT": "A file mérete meghaladja a {MAXIMUM_FILE_UPLOAD_SIZE} limitet",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/hy.json b/app/javascript/widget/i18n/locale/hy.json
index 3a1f51ccf..83b442e51 100644
--- a/app/javascript/widget/i18n/locale/hy.json
+++ b/app/javascript/widget/i18n/locale/hy.json
@@ -80,7 +80,8 @@
     },
     "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation",
     "IS_REQUIRED": "is required",
-    "REQUIRED": "Required"
+    "REQUIRED": "Required",
+    "REGEX_ERROR": "Please provide a valid input"
   },
   "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/id.json b/app/javascript/widget/i18n/locale/id.json
index b0ff95387..6daedd2bb 100644
--- a/app/javascript/widget/i18n/locale/id.json
+++ b/app/javascript/widget/i18n/locale/id.json
@@ -80,7 +80,8 @@
     },
     "CAMPAIGN_HEADER": "Silahkan input nama dan email anda sebelum memulai percakapan",
     "IS_REQUIRED": "dibutuhkan",
-    "REQUIRED": "Diperlukan"
+    "REQUIRED": "Diperlukan",
+    "REGEX_ERROR": "Please provide a valid input"
   },
   "FILE_SIZE_LIMIT": "File melebihi batas {MAXIMUM_FILE_UPLOAD_SIZE} lampiran",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/is.json b/app/javascript/widget/i18n/locale/is.json
index 94fc39330..062c92554 100644
--- a/app/javascript/widget/i18n/locale/is.json
+++ b/app/javascript/widget/i18n/locale/is.json
@@ -80,7 +80,8 @@
     },
     "CAMPAIGN_HEADER": "Vinsamlegast sláðu inn nafn og netfang áður en samtalið hefst",
     "IS_REQUIRED": "er nauðsynlegt",
-    "REQUIRED": "Nauðsynlegt"
+    "REQUIRED": "Nauðsynlegt",
+    "REGEX_ERROR": "Please provide a valid input"
   },
   "FILE_SIZE_LIMIT": "Skráin fer framyfir hámarksstærð viðhengja ({MAXIMUM_FILE_UPLOAD_SIZE})",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/it.json b/app/javascript/widget/i18n/locale/it.json
index 0c5fc02c0..3e07e5f9f 100644
--- a/app/javascript/widget/i18n/locale/it.json
+++ b/app/javascript/widget/i18n/locale/it.json
@@ -80,7 +80,8 @@
     },
     "CAMPAIGN_HEADER": "Per favore inserisci il tuo nome ed email prima di iniziare la conversazione",
     "IS_REQUIRED": "è obbligatorio",
-    "REQUIRED": "Obbligatorio"
+    "REQUIRED": "Obbligatorio",
+    "REGEX_ERROR": "Please provide a valid input"
   },
   "FILE_SIZE_LIMIT": "Il file supera il limite di {MAXIMUM_FILE_UPLOAD_SIZE} per poter essere allegato",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/ja.json b/app/javascript/widget/i18n/locale/ja.json
index f293ceaf5..ebd2bc178 100644
--- a/app/javascript/widget/i18n/locale/ja.json
+++ b/app/javascript/widget/i18n/locale/ja.json
@@ -80,7 +80,8 @@
     },
     "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation",
     "IS_REQUIRED": "is required",
-    "REQUIRED": "Required"
+    "REQUIRED": "Required",
+    "REGEX_ERROR": "Please provide a valid input"
   },
   "FILE_SIZE_LIMIT": "添付ファイルサイズの上限 {MAXIMUM_FILE_UPLOAD_SIZE} を超えています",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/ka.json b/app/javascript/widget/i18n/locale/ka.json
index 3a1f51ccf..83b442e51 100644
--- a/app/javascript/widget/i18n/locale/ka.json
+++ b/app/javascript/widget/i18n/locale/ka.json
@@ -80,7 +80,8 @@
     },
     "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation",
     "IS_REQUIRED": "is required",
-    "REQUIRED": "Required"
+    "REQUIRED": "Required",
+    "REGEX_ERROR": "Please provide a valid input"
   },
   "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/ko.json b/app/javascript/widget/i18n/locale/ko.json
index c8040f8ef..f2fa90eb7 100644
--- a/app/javascript/widget/i18n/locale/ko.json
+++ b/app/javascript/widget/i18n/locale/ko.json
@@ -80,7 +80,8 @@
     },
     "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation",
     "IS_REQUIRED": "is required",
-    "REQUIRED": "Required"
+    "REQUIRED": "Required",
+    "REGEX_ERROR": "Please provide a valid input"
   },
   "FILE_SIZE_LIMIT": "첨부파일이 최대 {MAXIMUM_FILE_UPLOAD_SIZE} 용량 제한을 넘어섭니다.",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/lt.json b/app/javascript/widget/i18n/locale/lt.json
index 8d5a9fd50..1ee559728 100644
--- a/app/javascript/widget/i18n/locale/lt.json
+++ b/app/javascript/widget/i18n/locale/lt.json
@@ -80,7 +80,8 @@
     },
     "CAMPAIGN_HEADER": "Prieš pradėdami pokalbį nurodykite savo vardą ir el. pašto adresą",
     "IS_REQUIRED": "reikalingas",
-    "REQUIRED": "Reikalingas"
+    "REQUIRED": "Reikalingas",
+    "REGEX_ERROR": "Please provide a valid input"
   },
   "FILE_SIZE_LIMIT": "Failas viršija {MAXIMUM_FILE_UPLOAD_SIZE} apribojimą",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/lv.json b/app/javascript/widget/i18n/locale/lv.json
index 1107ed7f6..c62c810bf 100644
--- a/app/javascript/widget/i18n/locale/lv.json
+++ b/app/javascript/widget/i18n/locale/lv.json
@@ -80,7 +80,8 @@
     },
     "CAMPAIGN_HEADER": "Lūdzu, pirms sarunas sākšanas, norādiet savu vārdu un e -pastu",
     "IS_REQUIRED": "ir nepieciešams",
-    "REQUIRED": "Nepieciešams"
+    "REQUIRED": "Nepieciešams",
+    "REGEX_ERROR": "Lūdzu, ievadiet pareizi"
   },
   "FILE_SIZE_LIMIT": "Fails pārsniedz {MAXIMUM_FILE_UPLOAD_SIZE} pielikuma lieluma ierobežojumu",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/ml.json b/app/javascript/widget/i18n/locale/ml.json
index 16d5adabb..0cc0871ef 100644
--- a/app/javascript/widget/i18n/locale/ml.json
+++ b/app/javascript/widget/i18n/locale/ml.json
@@ -80,7 +80,8 @@
     },
     "CAMPAIGN_HEADER": "സംഭാഷണം ആരംഭിക്കുന്നതിന് മുമ്പ് ദയവായി നിങ്ങളുടെ പേരും ഇമെയിലും നൽകുക",
     "IS_REQUIRED": "is required",
-    "REQUIRED": "Required"
+    "REQUIRED": "Required",
+    "REGEX_ERROR": "Please provide a valid input"
   },
   "FILE_SIZE_LIMIT": "ഫയൽ {MAXIMUM_FILE_UPLOAD_SIZE} അറ്റാച്ച്‌മെന്റ് പരിധി കവിഞ്ഞു",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/ms.json b/app/javascript/widget/i18n/locale/ms.json
index 847d373b3..ff6d6dd50 100644
--- a/app/javascript/widget/i18n/locale/ms.json
+++ b/app/javascript/widget/i18n/locale/ms.json
@@ -80,7 +80,8 @@
     },
     "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation",
     "IS_REQUIRED": "is required",
-    "REQUIRED": "Required"
+    "REQUIRED": "Required",
+    "REGEX_ERROR": "Please provide a valid input"
   },
   "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/ne.json b/app/javascript/widget/i18n/locale/ne.json
index c3effd10a..41c73c2e8 100644
--- a/app/javascript/widget/i18n/locale/ne.json
+++ b/app/javascript/widget/i18n/locale/ne.json
@@ -80,7 +80,8 @@
     },
     "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation",
     "IS_REQUIRED": "is required",
-    "REQUIRED": "Required"
+    "REQUIRED": "Required",
+    "REGEX_ERROR": "Please provide a valid input"
   },
   "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/nl.json b/app/javascript/widget/i18n/locale/nl.json
index 92006425e..a9ef64869 100644
--- a/app/javascript/widget/i18n/locale/nl.json
+++ b/app/javascript/widget/i18n/locale/nl.json
@@ -80,7 +80,8 @@
     },
     "CAMPAIGN_HEADER": "Geef uw naam en e-mail voordat u het gesprek begint",
     "IS_REQUIRED": "is vereist",
-    "REQUIRED": "Vereist"
+    "REQUIRED": "Vereist",
+    "REGEX_ERROR": "Please provide a valid input"
   },
   "FILE_SIZE_LIMIT": "Bestand overschrijdt de bijlagelimiet van {MAXIMUM_FILE_UPLOAD_SIZE}",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/no.json b/app/javascript/widget/i18n/locale/no.json
index 547400fa2..73f494422 100644
--- a/app/javascript/widget/i18n/locale/no.json
+++ b/app/javascript/widget/i18n/locale/no.json
@@ -80,7 +80,8 @@
     },
     "CAMPAIGN_HEADER": "Angi navn og e-post før du starter samtalen",
     "IS_REQUIRED": "is required",
-    "REQUIRED": "Required"
+    "REQUIRED": "Required",
+    "REGEX_ERROR": "Please provide a valid input"
   },
   "FILE_SIZE_LIMIT": "Filens størrelse overskrider grensen på {MAXIMUM_FILE_UPLOAD_SIZE}",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/pl.json b/app/javascript/widget/i18n/locale/pl.json
index 60c7307d1..cd489731b 100644
--- a/app/javascript/widget/i18n/locale/pl.json
+++ b/app/javascript/widget/i18n/locale/pl.json
@@ -80,7 +80,8 @@
     },
     "CAMPAIGN_HEADER": "Proszę podać swoje imię i nazwisko oraz adres e-mail przed rozpoczęciem rozmowy",
     "IS_REQUIRED": "jest wymagane",
-    "REQUIRED": "Wymagane"
+    "REQUIRED": "Wymagane",
+    "REGEX_ERROR": "Please provide a valid input"
   },
   "FILE_SIZE_LIMIT": "Plik przekracza limit {MAXIMUM_FILE_UPLOAD_SIZE} dla załącznika",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/pt.json b/app/javascript/widget/i18n/locale/pt.json
index d737b924c..8adadabfd 100644
--- a/app/javascript/widget/i18n/locale/pt.json
+++ b/app/javascript/widget/i18n/locale/pt.json
@@ -80,7 +80,8 @@
     },
     "CAMPAIGN_HEADER": "Por favor, forneça seu nome e e-mail antes de iniciar a conversa",
     "IS_REQUIRED": "é obrigatório",
-    "REQUIRED": "Obrigatório"
+    "REQUIRED": "Obrigatório",
+    "REGEX_ERROR": "Por favor, introduza um valor válido"
   },
   "FILE_SIZE_LIMIT": "O ficheiro ultrapassa o tamanho limite {MAXIMUM_FILE_UPLOAD_SIZE}",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/pt_BR.json b/app/javascript/widget/i18n/locale/pt_BR.json
index 7fa4fcb3a..8cf6158de 100644
--- a/app/javascript/widget/i18n/locale/pt_BR.json
+++ b/app/javascript/widget/i18n/locale/pt_BR.json
@@ -80,7 +80,8 @@
     },
     "CAMPAIGN_HEADER": "Por favor, forneça seu nome e e-mail antes de iniciar a conversa",
     "IS_REQUIRED": "é obrigatório",
-    "REQUIRED": "Obrigatório"
+    "REQUIRED": "Obrigatório",
+    "REGEX_ERROR": "Forneça uma entrada válida"
   },
   "FILE_SIZE_LIMIT": "O arquivo excede o limite de anexos {MAXIMUM_FILE_UPLOAD_SIZE}",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/ro.json b/app/javascript/widget/i18n/locale/ro.json
index 12e7d378a..720328d2b 100644
--- a/app/javascript/widget/i18n/locale/ro.json
+++ b/app/javascript/widget/i18n/locale/ro.json
@@ -80,7 +80,8 @@
     },
     "CAMPAIGN_HEADER": "Vă rugăm să furnizați numele și e-mailul înainte de a începe conversația",
     "IS_REQUIRED": "este obligatoriu",
-    "REQUIRED": "Necesar"
+    "REQUIRED": "Necesar",
+    "REGEX_ERROR": "Please provide a valid input"
   },
   "FILE_SIZE_LIMIT": "Fisierul depaseste limita de {MAXIMUM_FILE_UPLOAD_SIZE} atasamente",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/ru.json b/app/javascript/widget/i18n/locale/ru.json
index cacd9e78e..c2c24cc12 100644
--- a/app/javascript/widget/i18n/locale/ru.json
+++ b/app/javascript/widget/i18n/locale/ru.json
@@ -80,7 +80,8 @@
     },
     "CAMPAIGN_HEADER": "Пожалуйста, укажите Ваше имя и адрес электронной почты перед началом диалога",
     "IS_REQUIRED": "обязательно",
-    "REQUIRED": "Обязательно"
+    "REQUIRED": "Обязательно",
+    "REGEX_ERROR": "Пожалуйста, предоставьте корректные данные"
   },
   "FILE_SIZE_LIMIT": "Превышен размер загружаемого файла - {MAXIMUM_FILE_UPLOAD_SIZE}",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/sh.json b/app/javascript/widget/i18n/locale/sh.json
index 3a1f51ccf..83b442e51 100644
--- a/app/javascript/widget/i18n/locale/sh.json
+++ b/app/javascript/widget/i18n/locale/sh.json
@@ -80,7 +80,8 @@
     },
     "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation",
     "IS_REQUIRED": "is required",
-    "REQUIRED": "Required"
+    "REQUIRED": "Required",
+    "REGEX_ERROR": "Please provide a valid input"
   },
   "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/sk.json b/app/javascript/widget/i18n/locale/sk.json
index 7dec7e968..0e2cf74ee 100644
--- a/app/javascript/widget/i18n/locale/sk.json
+++ b/app/javascript/widget/i18n/locale/sk.json
@@ -80,7 +80,8 @@
     },
     "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation",
     "IS_REQUIRED": "is required",
-    "REQUIRED": "Povinné"
+    "REQUIRED": "Povinné",
+    "REGEX_ERROR": "Please provide a valid input"
   },
   "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/sl.json b/app/javascript/widget/i18n/locale/sl.json
index 3a1f51ccf..83b442e51 100644
--- a/app/javascript/widget/i18n/locale/sl.json
+++ b/app/javascript/widget/i18n/locale/sl.json
@@ -80,7 +80,8 @@
     },
     "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation",
     "IS_REQUIRED": "is required",
-    "REQUIRED": "Required"
+    "REQUIRED": "Required",
+    "REGEX_ERROR": "Please provide a valid input"
   },
   "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/sq.json b/app/javascript/widget/i18n/locale/sq.json
index 3a1f51ccf..83b442e51 100644
--- a/app/javascript/widget/i18n/locale/sq.json
+++ b/app/javascript/widget/i18n/locale/sq.json
@@ -80,7 +80,8 @@
     },
     "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation",
     "IS_REQUIRED": "is required",
-    "REQUIRED": "Required"
+    "REQUIRED": "Required",
+    "REGEX_ERROR": "Please provide a valid input"
   },
   "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/sr.json b/app/javascript/widget/i18n/locale/sr.json
index 961baab4e..29f113728 100644
--- a/app/javascript/widget/i18n/locale/sr.json
+++ b/app/javascript/widget/i18n/locale/sr.json
@@ -80,7 +80,8 @@
     },
     "CAMPAIGN_HEADER": "Molim vas dostavite vaše ime i e-poštu pre započinjanja razgovora",
     "IS_REQUIRED": "je obavezno",
-    "REQUIRED": "Obavezno"
+    "REQUIRED": "Obavezno",
+    "REGEX_ERROR": "Please provide a valid input"
   },
   "FILE_SIZE_LIMIT": "Datoteka prevazilazi {MAXIMUM_FILE_UPLOAD_SIZE} ograničenje priloga",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/sv.json b/app/javascript/widget/i18n/locale/sv.json
index c28df2ae0..050142ba6 100644
--- a/app/javascript/widget/i18n/locale/sv.json
+++ b/app/javascript/widget/i18n/locale/sv.json
@@ -80,7 +80,8 @@
     },
     "CAMPAIGN_HEADER": "Ange ditt namn och e-post innan du startar konversationen",
     "IS_REQUIRED": "är obligatoriskt",
-    "REQUIRED": "Obligatoriskt"
+    "REQUIRED": "Obligatoriskt",
+    "REGEX_ERROR": "Please provide a valid input"
   },
   "FILE_SIZE_LIMIT": "Filen överskrider gränsen för {MAXIMUM_FILE_UPLOAD_SIZE} bifogade filer",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/ta.json b/app/javascript/widget/i18n/locale/ta.json
index 1ec0d9fb0..fc5d3ba96 100644
--- a/app/javascript/widget/i18n/locale/ta.json
+++ b/app/javascript/widget/i18n/locale/ta.json
@@ -80,7 +80,8 @@
     },
     "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation",
     "IS_REQUIRED": "is required",
-    "REQUIRED": "Required"
+    "REQUIRED": "Required",
+    "REGEX_ERROR": "Please provide a valid input"
   },
   "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/th.json b/app/javascript/widget/i18n/locale/th.json
index 3885dfe7f..ef0f6d1eb 100644
--- a/app/javascript/widget/i18n/locale/th.json
+++ b/app/javascript/widget/i18n/locale/th.json
@@ -14,7 +14,7 @@
   },
   "TEAM_AVAILABILITY": {
     "ONLINE": "เรากำลังออนไลน์",
-    "OFFLINE": "ออฟไลน์"
+    "OFFLINE": "เราไม่อยู่"
   },
   "REPLY_TIME": {
     "IN_A_FEW_MINUTES": "ปกติจะตอบกลับภายในไม่กี่นาที",
@@ -80,7 +80,8 @@
     },
     "CAMPAIGN_HEADER": "โปรดแจ้งชื่อ และ อีเมลื ก่อนเริ่มการสนทนา",
     "IS_REQUIRED": "is required",
-    "REQUIRED": "โปรดระบุ"
+    "REQUIRED": "โปรดระบุ",
+    "REGEX_ERROR": "Please provide a valid input"
   },
   "FILE_SIZE_LIMIT": "ไฟล์ใหเกินกว่า {MAXIMUM_FILE_UPLOAD_SIZE} ที่กำหนดไว้",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/tr.json b/app/javascript/widget/i18n/locale/tr.json
index b86a0c7d1..f91424337 100644
--- a/app/javascript/widget/i18n/locale/tr.json
+++ b/app/javascript/widget/i18n/locale/tr.json
@@ -80,7 +80,8 @@
     },
     "CAMPAIGN_HEADER": "Görüşmeye başlamadan önce lütfen isminizi ve e-posta adresinizi belirtiniz",
     "IS_REQUIRED": "zorunlu",
-    "REQUIRED": "Zorunlu"
+    "REQUIRED": "Zorunlu",
+    "REGEX_ERROR": "Lütfen geçerli bir giriş yapın"
   },
   "FILE_SIZE_LIMIT": "Dosya {MAXIMUM_FILE_UPLOAD_SIZE} sınırını aşıyor",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/uk.json b/app/javascript/widget/i18n/locale/uk.json
index e345ff790..119c97257 100644
--- a/app/javascript/widget/i18n/locale/uk.json
+++ b/app/javascript/widget/i18n/locale/uk.json
@@ -20,7 +20,7 @@
     "IN_A_FEW_MINUTES": "Зазвичай, відповідаємо за декілька хвилин",
     "IN_A_FEW_HOURS": "Зазвичай, відповідаємо за декілька годин",
     "IN_A_DAY": "Зазвичай, відповідаємо протягом доби",
-    "BACK_IN": "We will be back online"
+    "BACK_IN": "Ми повернемось в мережу"
   },
   "DAY_NAMES": [
     "Неділя",
@@ -34,9 +34,9 @@
   "START_CONVERSATION": "Розпочати розмову",
   "END_CONVERSATION": "Закінчити спілкування",
   "CONTINUE_CONVERSATION": "Продовжити спілкування",
-  "YOU": "You",
+  "YOU": "Ви",
   "START_NEW_CONVERSATION": "Розпочати нову розмову",
-  "VIEW_UNREAD_MESSAGES": "You have unread messages",
+  "VIEW_UNREAD_MESSAGES": "У Вас є непрочитані повідомлення",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Переглянути нові повідомлення",
     "CLOSE_MESSAGES_BUTTON": "Закрити",
@@ -68,8 +68,8 @@
         "LABEL": "Номер телефону",
         "PLACEHOLDER": "Будь ласка, введіть номер телефону",
         "REQUIRED_ERROR": "Номер телефону є обов'язковим",
-        "DIAL_CODE_VALID_ERROR": "Please select a country code",
-        "VALID_ERROR": "Please enter a valid phone number",
+        "DIAL_CODE_VALID_ERROR": "Будь ласка, оберіть код країни",
+        "VALID_ERROR": "Будь ласка, введіть правильний номер телефону",
         "DROPDOWN_EMPTY": "Результатів не знайдено"
       },
       "MESSAGE": {
@@ -80,7 +80,8 @@
     },
     "CAMPAIGN_HEADER": "Будь ласка, надайте своє ім'я та електронну пошту перед початком бесіди",
     "IS_REQUIRED": "обов'язково",
-    "REQUIRED": "Обов'язково"
+    "REQUIRED": "Обов'язково",
+    "REGEX_ERROR": "Please provide a valid input"
   },
   "FILE_SIZE_LIMIT": "Файл перевищує ліміт вкладення {MAXIMUM_FILE_UPLOAD_SIZE}",
   "CHAT_FORM": {
@@ -109,9 +110,9 @@
     }
   },
   "PORTAL": {
-    "POPULAR_ARTICLES": "Popular Articles",
+    "POPULAR_ARTICLES": "Популярні статті",
     "VIEW_ALL_ARTICLES": "Переглянути всі статті",
-    "IFRAME_LOAD_ERROR": "There was an error loading the article, please refresh the page and try again."
+    "IFRAME_LOAD_ERROR": "Помилка при завантаженні статті, будь ласка, оновіть сторінку та повторіть спробу."
   },
   "ATTACHMENTS": {
     "image": {
diff --git a/app/javascript/widget/i18n/locale/ur.json b/app/javascript/widget/i18n/locale/ur.json
index 6c0f5f111..b472bd8aa 100644
--- a/app/javascript/widget/i18n/locale/ur.json
+++ b/app/javascript/widget/i18n/locale/ur.json
@@ -80,7 +80,8 @@
     },
     "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation",
     "IS_REQUIRED": "is required",
-    "REQUIRED": "Required"
+    "REQUIRED": "Required",
+    "REGEX_ERROR": "Please provide a valid input"
   },
   "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/ur_IN.json b/app/javascript/widget/i18n/locale/ur_IN.json
index 3a1f51ccf..83b442e51 100644
--- a/app/javascript/widget/i18n/locale/ur_IN.json
+++ b/app/javascript/widget/i18n/locale/ur_IN.json
@@ -80,7 +80,8 @@
     },
     "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation",
     "IS_REQUIRED": "is required",
-    "REQUIRED": "Required"
+    "REQUIRED": "Required",
+    "REGEX_ERROR": "Please provide a valid input"
   },
   "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/vi.json b/app/javascript/widget/i18n/locale/vi.json
index 12e4bdac1..f16aa29f8 100644
--- a/app/javascript/widget/i18n/locale/vi.json
+++ b/app/javascript/widget/i18n/locale/vi.json
@@ -80,7 +80,8 @@
     },
     "CAMPAIGN_HEADER": "Vui lòng cung cấp tên và địa chỉ email của bạn trước khi bắt đầu hội thoại",
     "IS_REQUIRED": "được yêu cầu",
-    "REQUIRED": "Bắt buộc"
+    "REQUIRED": "Bắt buộc",
+    "REGEX_ERROR": "Please provide a valid input"
   },
   "FILE_SIZE_LIMIT": "Tệp vượt quá kích thước giới hạn {MAXIMUM_FILE_UPLOAD_SIZE}",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/zh_CN.json b/app/javascript/widget/i18n/locale/zh_CN.json
index fe1d9bd9e..37203dc34 100644
--- a/app/javascript/widget/i18n/locale/zh_CN.json
+++ b/app/javascript/widget/i18n/locale/zh_CN.json
@@ -80,7 +80,8 @@
     },
     "CAMPAIGN_HEADER": "请在开始对话之前提供您的姓名和电子邮件",
     "IS_REQUIRED": "是必填项",
-    "REQUIRED": "必填项"
+    "REQUIRED": "必填项",
+    "REGEX_ERROR": "Please provide a valid input"
   },
   "FILE_SIZE_LIMIT": "文件超过大小 {MAXIMUM_FILE_UPLOAD_SIZE} 附件限制",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/zh_TW.json b/app/javascript/widget/i18n/locale/zh_TW.json
index 64e0bd879..95613d275 100644
--- a/app/javascript/widget/i18n/locale/zh_TW.json
+++ b/app/javascript/widget/i18n/locale/zh_TW.json
@@ -80,7 +80,8 @@
     },
     "CAMPAIGN_HEADER": "在開始對話之前請提供您的名字及電郵",
     "IS_REQUIRED": "必填",
-    "REQUIRED": "Required"
+    "REQUIRED": "Required",
+    "REGEX_ERROR": "Please provide a valid input"
   },
   "FILE_SIZE_LIMIT": "{MAXIMUM_FILE_UPLOAD_SIZE} 已超出檔案大小限制",
   "CHAT_FORM": {
diff --git a/config/locales/am.yml b/config/locales/am.yml
index 08b584232..87b4c2c15 100644
--- a/config/locales/am.yml
+++ b/config/locales/am.yml
@@ -31,6 +31,7 @@ am:
       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}"
+      invalid_params: 'Invalid, please check the signup paramters and try again'
       failed: Signup failed
     data_import:
       data_type:
@@ -67,25 +68,25 @@ am:
     utc_warning: The report generated is in UTC timezone
     agent_csv:
       agent_name: Agent name
-      conversations_count: Conversations count
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      conversations_count: Assigned conversations
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     inbox_csv:
       inbox_name: Inbox name
       inbox_type: Inbox type
       conversations_count: No. of conversations
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     label_csv:
       label_title: Label
       conversations_count: No. of conversations
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     team_csv:
       team_name: Team name
       conversations_count: Conversations count
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     conversation_traffic_csv:
       timezone: Timezone
     default_group_by: day
@@ -228,3 +229,16 @@ am:
       inbox_name: Inbox
       inbox_type: Inbox Type
     button: Open conversation
+  time_units:
+    days:
+      one: "%{count} day"
+      other: "%{count} days"
+    hours:
+      one: "%{count} hour"
+      other: "%{count} hours"
+    minutes:
+      one: "%{count} minute"
+      other: "%{count} minutes"
+    seconds:
+      one: "%{count} second"
+      other: "%{count} seconds"
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index e50f85cc0..77272fb1b 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -31,6 +31,7 @@ ar:
       disposable_email: نحن لا نسمح باسخدام عناوين البريد الإلكتروني المؤقتة
       invalid_email: لقد قمت بإدخال عنوان بريد إلكتروني غير صالح
       email_already_exists: "لقد قمت بالفعل بتسجيل حساب سابقاً بالعنوان %{email}"
+      invalid_params: 'Invalid, please check the signup paramters and try again'
       failed: فشلت عملية التسجيل
     data_import:
       data_type:
@@ -50,7 +51,7 @@ ar:
     dyte:
       invalid_message_type: "Invalid message type. Action not permitted"
     slack:
-      invalid_channel_id: "Invalid slack channel. Please try again"
+      invalid_channel_id: "قناة Slack غير صحيحة. الرجاء المحاولة مرة أخرى"
     inboxes:
       imap:
         socket_error: الرجاء التحقق من اتصال الشبكة، عنوان IMAP وحاول مرة أخرى.
@@ -67,25 +68,25 @@ ar:
     utc_warning: The report generated is in UTC timezone
     agent_csv:
       agent_name: اسم الموظف
-      conversations_count: عدد المحادثات
-      avg_first_response_time: متوسط وقت الرد الأول (الدقائق)
-      avg_resolution_time: متوسط وقت المحادثة (الدقائق)
+      conversations_count: Assigned conversations
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     inbox_csv:
       inbox_name: اسم صندوق الوارد
       inbox_type: نوع صندوق البريد
       conversations_count: عدد المحادثات
-      avg_first_response_time: متوسط وقت الرد الأول (الدقائق)
-      avg_resolution_time: متوسط وقت المحادثة (الدقائق)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     label_csv:
       label_title: الوسم
       conversations_count: عدد المحادثات
-      avg_first_response_time: متوسط وقت الرد الأول (الدقائق)
-      avg_resolution_time: متوسط وقت المحادثة (الدقائق)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     team_csv:
       team_name: اسم الفريق
       conversations_count: عدد المحادثات
-      avg_first_response_time: متوسط وقت الرد الأول (الدقائق)
-      avg_resolution_time: متوسط وقت المحادثة (الدقائق)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     conversation_traffic_csv:
       timezone: Timezone
     default_group_by: اليوم
@@ -179,7 +180,7 @@ ar:
       name: "الاتصال الكامل"
       description: "التكامل الكامل يساعد على إثراء ملفات تعريف الزوار. تحديد المستخدمين بمجرد مشاركتهم عنوان البريد الإلكتروني الخاص بهم وتقديم خدمة العملاء الخاصة بهم. قم بتوصيل اتصالك الكامل بحسابك عن طريق مشاركة مفتاح API للاتصال الكامل."
     google_translate:
-      name: "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"
@@ -189,42 +190,71 @@ ar:
       search_placeholder: Search for article by title or body...
       empty_placeholder: لم يتم العثور على النتائج.
       loading_placeholder: يبحث...
-      results_title: Search results
+      results_title: نتائج البحث
     toc_header: 'On this page'
     hero:
       sub_title: Search for the articles here or browse the categories below.
     common:
       home: الرئيسية
       last_updated_on: Last updated on %{last_updated_on}
-      view_all_articles: View all
-      article: article
+      view_all_articles: عرض الكل
+      article: مقال
       articles: المقالات
       author: المؤلف
-      authors: authors
+      authors: المؤلفون
       other: other
       others: others
-      by: By
-      no_articles: There are no articles here
+      by: بواسطة
+      no_articles: لا توجد مقالات
     footer:
       made_with: Made with
     header:
       go_to_homepage: Website
       appearance:
-        system: System
+        system: النظام
         light: Light
         dark: Dark
       featured_articles: Featured Articles
       uncategorized: Uncategorized
     404:
-      title: Page not found
-      description: We couldn't find the page you were looking for.
-      back_to_home: Go to home page
+      title: لم يتم العثور على الصفحة
+      description: لم نتمكن من العثور على الصفحة التي تبحث عنها.
+      back_to_home: الذهاب إلى الصفحة الرئيسية
   slack_unfurl:
     fields:
       name: الاسم
       email: البريد الإلكتروني
-      phone_number: Phone
+      phone_number: هاتف
       company_name: الشركة
       inbox_name: صندوق الوارد
       inbox_type: Inbox Type
     button: فتح المحادثة
+  time_units:
+    days:
+      zero: "%{count} days"
+      one: "%{count} day"
+      two: "%{count} days"
+      few: "%{count} days"
+      many: "%{count} days"
+      other: "%{count} days"
+    hours:
+      zero: "%{count} hours"
+      one: "%{count} hour"
+      two: "%{count} hours"
+      few: "%{count} hours"
+      many: "%{count} hours"
+      other: "%{count} hours"
+    minutes:
+      zero: "%{count} minutes"
+      one: "%{count} minute"
+      two: "%{count} minutes"
+      few: "%{count} minutes"
+      many: "%{count} minutes"
+      other: "%{count} minutes"
+    seconds:
+      zero: "%{count} seconds"
+      one: "%{count} second"
+      two: "%{count} seconds"
+      few: "%{count} seconds"
+      many: "%{count} seconds"
+      other: "%{count} seconds"
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 656275b6e..7b5dc6736 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -31,6 +31,7 @@ bg:
       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}"
+      invalid_params: 'Invalid, please check the signup paramters and try again'
       failed: Signup failed
     data_import:
       data_type:
@@ -67,25 +68,25 @@ bg:
     utc_warning: The report generated is in UTC timezone
     agent_csv:
       agent_name: Agent name
-      conversations_count: Conversations count
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      conversations_count: Assigned conversations
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     inbox_csv:
       inbox_name: Inbox name
       inbox_type: Inbox type
       conversations_count: No. of conversations
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     label_csv:
       label_title: Label
       conversations_count: No. of conversations
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     team_csv:
       team_name: Team name
       conversations_count: Conversations count
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     conversation_traffic_csv:
       timezone: Timezone
     default_group_by: day
@@ -228,3 +229,16 @@ bg:
       inbox_name: Входяща кутия
       inbox_type: Inbox Type
     button: Open conversation
+  time_units:
+    days:
+      one: "%{count} day"
+      other: "%{count} days"
+    hours:
+      one: "%{count} hour"
+      other: "%{count} hours"
+    minutes:
+      one: "%{count} minute"
+      other: "%{count} minutes"
+    seconds:
+      one: "%{count} second"
+      other: "%{count} seconds"
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 8131ddf3c..de6d919e1 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -31,6 +31,7 @@ ca:
       disposable_email: Els correus d'un sol ús no s'accepten
       invalid_email: Heu introduït un correu electrònic no vàlid
       email_already_exists: "Ja us heu registrat amb el compte %{email}"
+      invalid_params: 'Invalid, please check the signup paramters and try again'
       failed: El registre ha fallat
     data_import:
       data_type:
@@ -67,25 +68,25 @@ ca:
     utc_warning: The report generated is in UTC timezone
     agent_csv:
       agent_name: Agent name
-      conversations_count: Conversations count
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      conversations_count: Assigned conversations
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     inbox_csv:
       inbox_name: Inbox name
       inbox_type: Inbox type
       conversations_count: No. of conversations
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     label_csv:
       label_title: Label
       conversations_count: No. of conversations
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     team_csv:
       team_name: Team name
       conversations_count: Conversations count
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     conversation_traffic_csv:
       timezone: Timezone
     default_group_by: day
@@ -228,3 +229,16 @@ ca:
       inbox_name: Inbox
       inbox_type: Inbox Type
     button: Open conversation
+  time_units:
+    days:
+      one: "%{count} day"
+      other: "%{count} days"
+    hours:
+      one: "%{count} hour"
+      other: "%{count} hours"
+    minutes:
+      one: "%{count} minute"
+      other: "%{count} minutes"
+    seconds:
+      one: "%{count} second"
+      other: "%{count} seconds"
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 4b1445f05..54feee848 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -31,6 +31,7 @@ cs:
       disposable_email: Nepovolujeme jednorázové e-maily
       invalid_email: Zadali jste neplatný e-mail
       email_already_exists: "Již jste se zaregistrovali k účtu s %{email}"
+      invalid_params: 'Invalid, please check the signup paramters and try again'
       failed: Registrace se nezdařila
     data_import:
       data_type:
@@ -67,25 +68,25 @@ cs:
     utc_warning: The report generated is in UTC timezone
     agent_csv:
       agent_name: Jméno agenta
-      conversations_count: Conversations count
-      avg_first_response_time: Prům. doba první odpovědi (minuty)
-      avg_resolution_time: Avg resolution time (Minutes)
+      conversations_count: Assigned conversations
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     inbox_csv:
       inbox_name: Inbox name
       inbox_type: Inbox type
       conversations_count: No. of conversations
-      avg_first_response_time: Prům. doba první odpovědi (minuty)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     label_csv:
       label_title: Label
       conversations_count: No. of conversations
-      avg_first_response_time: Prům. doba první odpovědi (minuty)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     team_csv:
       team_name: Team name
       conversations_count: Conversations count
-      avg_first_response_time: Prům. doba první odpovědi (minuty)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     conversation_traffic_csv:
       timezone: Timezone
     default_group_by: day
@@ -228,3 +229,24 @@ cs:
       inbox_name: Inbox
       inbox_type: Inbox Type
     button: Open conversation
+  time_units:
+    days:
+      one: "%{count} day"
+      few: "%{count} days"
+      many: "%{count} days"
+      other: "%{count} days"
+    hours:
+      one: "%{count} hour"
+      few: "%{count} hours"
+      many: "%{count} hours"
+      other: "%{count} hours"
+    minutes:
+      one: "%{count} minute"
+      few: "%{count} minutes"
+      many: "%{count} minutes"
+      other: "%{count} minutes"
+    seconds:
+      one: "%{count} second"
+      few: "%{count} seconds"
+      many: "%{count} seconds"
+      other: "%{count} seconds"
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 6bbdadea3..c200da344 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -31,6 +31,7 @@ da:
       disposable_email: Vi tillader ikke engangs e-mails
       invalid_email: Du har indtastet en ugyldig e-mail
       email_already_exists: "Du har allerede tilmeldt dig en konto med %{email}"
+      invalid_params: 'Invalid, please check the signup paramters and try again'
       failed: Tilmelding mislykkedes
     data_import:
       data_type:
@@ -67,25 +68,25 @@ da:
     utc_warning: The report generated is in UTC timezone
     agent_csv:
       agent_name: Agentens navn
-      conversations_count: Samtaler tæller
-      avg_first_response_time: Gns første svartid (minutter)
-      avg_resolution_time: Gennemsnitlig afviklingstid (protokol)
+      conversations_count: Assigned conversations
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     inbox_csv:
       inbox_name: Indbakkens navn
       inbox_type: Indbakke type
       conversations_count: Antal samtaler
-      avg_first_response_time: Gns første svartid (minutter)
-      avg_resolution_time: Gennemsnitlig afviklingstid (protokol)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     label_csv:
       label_title: Etiketter
       conversations_count: Antal samtaler
-      avg_first_response_time: Gns første svartid (minutter)
-      avg_resolution_time: Gennemsnitlig afviklingstid (protokol)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     team_csv:
       team_name: Team navn
       conversations_count: Samtaler tæller
-      avg_first_response_time: Gns første svartid (minutter)
-      avg_resolution_time: Gennemsnitlig afviklingstid (protokol)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     conversation_traffic_csv:
       timezone: Timezone
     default_group_by: dag
@@ -228,3 +229,16 @@ da:
       inbox_name: Indbakke
       inbox_type: Inbox Type
     button: Åbn samtale
+  time_units:
+    days:
+      one: "%{count} day"
+      other: "%{count} days"
+    hours:
+      one: "%{count} hour"
+      other: "%{count} hours"
+    minutes:
+      one: "%{count} minute"
+      other: "%{count} minutes"
+    seconds:
+      one: "%{count} second"
+      other: "%{count} seconds"
diff --git a/config/locales/de.yml b/config/locales/de.yml
index a44c567f7..642c5078c 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -31,6 +31,7 @@ de:
       disposable_email: Wir erlauben keine Einweg-E-Mails
       invalid_email: Sie haben eine ungültige E-Mail-Adresse eingegeben
       email_already_exists: "Sie haben sich bereits für ein Konto bei %{email} angemeldet."
+      invalid_params: 'Invalid, please check the signup paramters and try again'
       failed: Anmeldung gescheitert
     data_import:
       data_type:
@@ -67,25 +68,25 @@ de:
     utc_warning: Der generierte Bericht ist in UTC-Zeitzone
     agent_csv:
       agent_name: Agentenname
-      conversations_count: Anzahl Gespräche
-      avg_first_response_time: Durchschnittliche Reaktionszeit (Minuten)
-      avg_resolution_time: Durchschnittliche Auflösungszeit (Minuten)
+      conversations_count: Assigned conversations
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     inbox_csv:
       inbox_name: Posteingangsname
       inbox_type: Posteingangstyp
       conversations_count: Anzahl der Konversationen
-      avg_first_response_time: Durchschnittliche Zeit bis zur ersten Antwort (Minuten)
-      avg_resolution_time: Durchschnittliche Auflösungszeit (Minuten)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     label_csv:
       label_title: Label
       conversations_count: Anzahl der Konversationen
-      avg_first_response_time: Durchschnittliche Reaktionszeit (Minuten)
-      avg_resolution_time: Durchschnittliche Auflösungszeit (Minuten)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     team_csv:
       team_name: Teamname
       conversations_count: Anzahl Gespräche
-      avg_first_response_time: Durchschnittliche Reaktionszeit (Minuten)
-      avg_resolution_time: Durchschnittliche Auflösungszeit (Minuten)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     conversation_traffic_csv:
       timezone: Zeitzone
     default_group_by: Tag
@@ -228,3 +229,16 @@ de:
       inbox_name: Posteingang
       inbox_type: Inbox Type
     button: Unterhaltung öffnen
+  time_units:
+    days:
+      one: "%{count} day"
+      other: "%{count} days"
+    hours:
+      one: "%{count} hour"
+      other: "%{count} hours"
+    minutes:
+      one: "%{count} minute"
+      other: "%{count} minutes"
+    seconds:
+      one: "%{count} second"
+      other: "%{count} seconds"
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 4dfc677f2..a4c829f34 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -31,6 +31,7 @@ el:
       disposable_email: Δεν επιτρέπονται προσωρινά emails
       invalid_email: Έχετε καταχωρήσει ακατάλληλο email
       email_already_exists: "Έχει ήδη καταχωρηθεί λογαριασμός στο %{email}"
+      invalid_params: 'Invalid, please check the signup paramters and try again'
       failed: Η εγγραφή απέτυχε
     data_import:
       data_type:
@@ -67,25 +68,25 @@ el:
     utc_warning: The report generated is in UTC timezone
     agent_csv:
       agent_name: Όνομα Πράκτορα
-      conversations_count: Αριθμός συνομιλιών
-      avg_first_response_time: Μέσος χρόνος πρώτης ανταπόκρισης (λεπτά)
-      avg_resolution_time: Μέσος χρόνος επίλυσης (λεπτά)
+      conversations_count: Assigned conversations
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     inbox_csv:
       inbox_name: Όνομα Κιβωτίου
       inbox_type: Τύπος κιβωτίου εισερχόμενων
       conversations_count: Αριθμός συνομιλιών
-      avg_first_response_time: Μέσος χρόνος πρώτης ανταπόκρισης (λεπτά)
-      avg_resolution_time: Μέσος χρόνος επίλυσης (λεπτά)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     label_csv:
       label_title: Ετικέτα
       conversations_count: Αριθμός συνομιλιών
-      avg_first_response_time: Μέσος χρόνος πρώτης ανταπόκρισης (λεπτά)
-      avg_resolution_time: Μέσος χρόνος επίλυσης (λεπτά)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     team_csv:
       team_name: Όνομα ομάδας
       conversations_count: Αριθμός συνομιλιών
-      avg_first_response_time: Μέσος χρόνος πρώτης ανταπόκρισης (λεπτά)
-      avg_resolution_time: Μέσος χρόνος επίλυσης (λεπτά)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     conversation_traffic_csv:
       timezone: Timezone
     default_group_by: ημέρα
@@ -228,3 +229,16 @@ el:
       inbox_name: Εισερχόμενα
       inbox_type: Inbox Type
     button: Άνοιγμα συνομιλίας
+  time_units:
+    days:
+      one: "%{count} day"
+      other: "%{count} days"
+    hours:
+      one: "%{count} hour"
+      other: "%{count} hours"
+    minutes:
+      one: "%{count} minute"
+      other: "%{count} minutes"
+    seconds:
+      one: "%{count} second"
+      other: "%{count} seconds"
diff --git a/config/locales/es.yml b/config/locales/es.yml
index c853ed938..97041490e 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -31,6 +31,7 @@ es:
       disposable_email: No permitimos correos electrónicos desechables
       invalid_email: Ha introducido un correo electrónico no válido
       email_already_exists: "Ya te has registrado en una cuenta con %{email}"
+      invalid_params: 'Inválido, por favor comprueba los parámetros de registro e inténtalo de nuevo'
       failed: Registro fallido
     data_import:
       data_type:
@@ -67,25 +68,25 @@ es:
     utc_warning: El informe generado está en zona horaria UTC
     agent_csv:
       agent_name: Nombre del agente
-      conversations_count: Cantidad de conversaciones
-      avg_first_response_time: Promedio de tiempo de la primera respuesta (Minutos)
-      avg_resolution_time: Promedio de tiempo de resolución (Minutos)
+      conversations_count: Conversaciones asignadas
+      avg_first_response_time: Promedio de tiempo de la primera respuesta
+      avg_resolution_time: Tiempo promedio de resolución
     inbox_csv:
       inbox_name: Nombre de la bandeja de entrada
       inbox_type: Tipo de bandeja de entrada
       conversations_count: Núm. de conversaciones
-      avg_first_response_time: Promedio de tiempo de la primera respuesta (Minutos)
-      avg_resolution_time: Promedio de tiempo de resolución (Minutos)
+      avg_first_response_time: Promedio de tiempo de la primera respuesta
+      avg_resolution_time: Tiempo promedio de resolución
     label_csv:
       label_title: Etiqueta
       conversations_count: Núm. de conversaciones
-      avg_first_response_time: Promedio de tiempo de la primera respuesta (Minutos)
-      avg_resolution_time: Promedio de tiempo de resolución (Minutos)
+      avg_first_response_time: Promedio de tiempo de la primera respuesta
+      avg_resolution_time: Tiempo promedio de resolución
     team_csv:
       team_name: Nombre del equipo
       conversations_count: Cantidad de conversaciones
-      avg_first_response_time: Promedio de tiempo de la primera respuesta (Minutos)
-      avg_resolution_time: Promedio de tiempo de resolución (Minutos)
+      avg_first_response_time: Promedio de tiempo de la primera respuesta
+      avg_resolution_time: Tiempo promedio de resolución
     conversation_traffic_csv:
       timezone: Timezone
     default_group_by: día
@@ -228,3 +229,16 @@ es:
       inbox_name: Bandeja de entrada
       inbox_type: Tipo de bandeja de entrada
     button: Abrir conversación
+  time_units:
+    days:
+      one: "%{count} día"
+      other: "%{count} days"
+    hours:
+      one: "%{count} hora"
+      other: "%{count} hours"
+    minutes:
+      one: "%{count} minuto"
+      other: "%{count} minutes"
+    seconds:
+      one: "%{count} segundo"
+      other: "%{count} seconds"
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index c167a5f4b..707359b7b 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -31,6 +31,7 @@ fa:
       disposable_email: استفاده از ایمیل‌های موقت امکان‌پذیر نیست
       invalid_email: ایمیل وارد شده معتبر نیست
       email_already_exists: "قبلا کاربری با ایمیل %{email} ثبت‌نام کرده است"
+      invalid_params: 'نامعتبر است، لطفا پارامترهای ثبت‌نام را بررسی کرده و دوباره امتحان کنید'
       failed: ثبت نام ناموفق بود
     data_import:
       data_type:
@@ -67,25 +68,25 @@ fa:
     utc_warning: گزارش تولید شده در منطقه زمانی UTC است
     agent_csv:
       agent_name: اسم ایجنت
-      conversations_count: Conversations count
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      conversations_count: Assigned conversations
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     inbox_csv:
       inbox_name: نام صندوق ورودی
       inbox_type: نوع صندوق ورودی
       conversations_count: تعداد گفتگوها
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     label_csv:
       label_title: برچسب
       conversations_count: تعداد گفتگوها
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     team_csv:
       team_name: نام تیم
       conversations_count: Conversations count
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     conversation_traffic_csv:
       timezone: منطقه زمانی
     default_group_by: روز
@@ -228,3 +229,16 @@ fa:
       inbox_name: صندوق ورودی
       inbox_type: نوع صندوق ورودی
     button: باز کردن گفتگو
+  time_units:
+    days:
+      one: "%{count} day"
+      other: "%{count} days"
+    hours:
+      one: "%{count} hour"
+      other: "%{count} hours"
+    minutes:
+      one: "%{count} minute"
+      other: "%{count} minutes"
+    seconds:
+      one: "%{count} second"
+      other: "%{count} seconds"
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 6e772ca03..d7320d360 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -31,6 +31,7 @@ fi:
       disposable_email: Emme salli kertakäyttöisiä sähköposteja
       invalid_email: Olet syöttänyt virheellisen sähköpostin
       email_already_exists: "Olet jo rekisteröitynyt tiliin sähköpostin %{email} kanssa"
+      invalid_params: 'Invalid, please check the signup paramters and try again'
       failed: Rekisteröityminen epäonnistui
     data_import:
       data_type:
@@ -67,25 +68,25 @@ fi:
     utc_warning: The report generated is in UTC timezone
     agent_csv:
       agent_name: Agent name
-      conversations_count: Conversations count
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      conversations_count: Assigned conversations
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     inbox_csv:
       inbox_name: Inbox name
       inbox_type: Inbox type
       conversations_count: No. of conversations
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     label_csv:
       label_title: Label
       conversations_count: No. of conversations
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     team_csv:
       team_name: Team name
       conversations_count: Conversations count
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     conversation_traffic_csv:
       timezone: Timezone
     default_group_by: day
@@ -228,3 +229,16 @@ fi:
       inbox_name: Inbox
       inbox_type: Inbox Type
     button: Open conversation
+  time_units:
+    days:
+      one: "%{count} day"
+      other: "%{count} days"
+    hours:
+      one: "%{count} hour"
+      other: "%{count} hours"
+    minutes:
+      one: "%{count} minute"
+      other: "%{count} minutes"
+    seconds:
+      one: "%{count} second"
+      other: "%{count} seconds"
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 67aa73b72..93c270359 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -31,6 +31,7 @@ fr:
       disposable_email: Nous n'autorisons pas les courriels jetables
       invalid_email: Vous avez entré un courriel non valide
       email_already_exists: "Vous avez déjà créé un compte avec %{email}"
+      invalid_params: 'Invalid, please check the signup paramters and try again'
       failed: L'inscription a échoué
     data_import:
       data_type:
@@ -67,25 +68,25 @@ fr:
     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
-      avg_first_response_time: Temps de réponse moyen (Minutes)
-      avg_resolution_time: Temps moyen de résolution (Minutes)
+      conversations_count: Conversations assignées
+      avg_first_response_time: Temps moyen pour une première réponse
+      avg_resolution_time: Temps nécessaire pour résoudre une demande (en moyenne)
     inbox_csv:
       inbox_name: Nom de la boîte de réception
       inbox_type: Type de boîte de réception
       conversations_count: Nbre de conversations
-      avg_first_response_time: Temps de réponse moyen (Minutes)
-      avg_resolution_time: Temps moyen de résolution (Minutes)
+      avg_first_response_time: Temps moyen pour une première réponse
+      avg_resolution_time: Temps nécessaire pour résoudre une demande (en moyenne)
     label_csv:
       label_title: Libellé
       conversations_count: Nbre de conversations
-      avg_first_response_time: Temps de réponse moyen (Minutes)
-      avg_resolution_time: Temps moyen de résolution (Minutes)
+      avg_first_response_time: Temps moyen pour une première réponse
+      avg_resolution_time: Temps nécessaire pour résoudre une demande (en moyenne)
     team_csv:
       team_name: Nom de l'équipe
       conversations_count: Nombre de conversations
-      avg_first_response_time: Temps de réponse moyen (Minutes)
-      avg_resolution_time: Temps moyen de résolution (Minutes)
+      avg_first_response_time: Temps moyen pour une première réponse
+      avg_resolution_time: Temps nécessaire pour résoudre une demande (en moyenne)
     conversation_traffic_csv:
       timezone: Fuseau horaire
     default_group_by: jour
@@ -228,3 +229,16 @@ fr:
       inbox_name: Boîte de réception
       inbox_type: Type de boîte de réception
     button: Ouvrir la conversation
+  time_units:
+    days:
+      one: "%{count} jour"
+      other: "%{count} days"
+    hours:
+      one: "%{count} heure"
+      other: "%{count} hours"
+    minutes:
+      one: "%{count} minute"
+      other: "%{count} minutes"
+    seconds:
+      one: "%{count} seconde"
+      other: "%{count} seconds"
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 1f8aec9f9..ca0bf787e 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -31,6 +31,7 @@ he:
       disposable_email: אנחנו לא מאפשרים מיילים חד פעמיים
       invalid_email: הכנסת מייל לא תקין
       email_already_exists: "כבר נרשמת לחשבון עם %{email}"
+      invalid_params: 'Invalid, please check the signup paramters and try again'
       failed: הרשמה נכשלה
     data_import:
       data_type:
@@ -67,25 +68,25 @@ he:
     utc_warning: The report generated is in UTC timezone
     agent_csv:
       agent_name: Agent name
-      conversations_count: Conversations count
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      conversations_count: Assigned conversations
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     inbox_csv:
       inbox_name: Inbox name
       inbox_type: Inbox type
       conversations_count: No. of conversations
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     label_csv:
       label_title: תווית
       conversations_count: No. of conversations
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     team_csv:
       team_name: שם קבוצה
       conversations_count: Conversations count
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     conversation_traffic_csv:
       timezone: Timezone
     default_group_by: day
@@ -228,3 +229,24 @@ he:
       inbox_name: תיבת הדואר הנכנס
       inbox_type: Inbox Type
     button: שיחה פתוחה
+  time_units:
+    days:
+      one: "%{count} day"
+      two: "%{count} days"
+      many: "%{count} days"
+      other: "%{count} days"
+    hours:
+      one: "%{count} hour"
+      two: "%{count} hours"
+      many: "%{count} hours"
+      other: "%{count} hours"
+    minutes:
+      one: "%{count} minute"
+      two: "%{count} minutes"
+      many: "%{count} minutes"
+      other: "%{count} minutes"
+    seconds:
+      one: "%{count} second"
+      two: "%{count} seconds"
+      many: "%{count} seconds"
+      other: "%{count} seconds"
diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index 16b98c7de..9b6185a45 100644
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -31,6 +31,7 @@ hi:
       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}"
+      invalid_params: 'Invalid, please check the signup paramters and try again'
       failed: Signup failed
     data_import:
       data_type:
@@ -67,25 +68,25 @@ hi:
     utc_warning: The report generated is in UTC timezone
     agent_csv:
       agent_name: Agent name
-      conversations_count: Conversations count
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      conversations_count: Assigned conversations
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     inbox_csv:
       inbox_name: Inbox name
       inbox_type: Inbox type
       conversations_count: No. of conversations
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     label_csv:
       label_title: Label
       conversations_count: No. of conversations
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     team_csv:
       team_name: Team name
       conversations_count: Conversations count
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     conversation_traffic_csv:
       timezone: Timezone
     default_group_by: day
@@ -228,3 +229,16 @@ hi:
       inbox_name: Inbox
       inbox_type: Inbox Type
     button: Open conversation
+  time_units:
+    days:
+      one: "%{count} day"
+      other: "%{count} days"
+    hours:
+      one: "%{count} hour"
+      other: "%{count} hours"
+    minutes:
+      one: "%{count} minute"
+      other: "%{count} minutes"
+    seconds:
+      one: "%{count} second"
+      other: "%{count} seconds"
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index a44d6c233..44bee04e9 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -31,6 +31,7 @@ hr:
       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}"
+      invalid_params: 'Invalid, please check the signup paramters and try again'
       failed: Signup failed
     data_import:
       data_type:
@@ -67,25 +68,25 @@ hr:
     utc_warning: The report generated is in UTC timezone
     agent_csv:
       agent_name: Agent name
-      conversations_count: Conversations count
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      conversations_count: Assigned conversations
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     inbox_csv:
       inbox_name: Inbox name
       inbox_type: Inbox type
       conversations_count: No. of conversations
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     label_csv:
       label_title: Label
       conversations_count: No. of conversations
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     team_csv:
       team_name: Team name
       conversations_count: Conversations count
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     conversation_traffic_csv:
       timezone: Timezone
     default_group_by: day
@@ -228,3 +229,20 @@ hr:
       inbox_name: Inbox
       inbox_type: Inbox Type
     button: Open conversation
+  time_units:
+    days:
+      one: "%{count} day"
+      few: "%{count} days"
+      other: "%{count} days"
+    hours:
+      one: "%{count} hour"
+      few: "%{count} hours"
+      other: "%{count} hours"
+    minutes:
+      one: "%{count} minute"
+      few: "%{count} minutes"
+      other: "%{count} minutes"
+    seconds:
+      one: "%{count} second"
+      few: "%{count} seconds"
+      other: "%{count} seconds"
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 7895892a0..0c60b3676 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -31,6 +31,7 @@ hu:
       disposable_email: Nem támogatjuk az eldobható e-mailcímeket
       invalid_email: Hibás e-mailcímet adtál meg
       email_already_exists: "Ezzel az e-mailcímmel már van fiók: %{email}"
+      invalid_params: 'Invalid, please check the signup paramters and try again'
       failed: Feliratkozás sikertelen
     data_import:
       data_type:
@@ -67,25 +68,25 @@ hu:
     utc_warning: A generált riport UTC időzónát használ
     agent_csv:
       agent_name: Ügynök neve
-      conversations_count: Beszélgetésszám
-      avg_first_response_time: Átlagos első reakcióidő (perc)
-      avg_resolution_time: Átlagos megoldási idő (perc)
+      conversations_count: Assigned conversations
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     inbox_csv:
       inbox_name: Fiók név
       inbox_type: Fiók típus
       conversations_count: Beszélgetések száma
-      avg_first_response_time: Átlagos első reakcióidő (perc)
-      avg_resolution_time: Átlagos megoldási idő (perc)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     label_csv:
       label_title: Cimke
       conversations_count: Beszélgetések száma
-      avg_first_response_time: Átlagos első reakcióidő (perc)
-      avg_resolution_time: Átlagos megoldási idő (perc)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     team_csv:
       team_name: Csapatnév
       conversations_count: Beszélgetésszám
-      avg_first_response_time: Átlagos első reakcióidő (perc)
-      avg_resolution_time: Átlagos megoldási idő (perc)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     conversation_traffic_csv:
       timezone: Időzóna
     default_group_by: nap
@@ -228,3 +229,16 @@ hu:
       inbox_name: Fiók
       inbox_type: Beérkezett üzenetek típusa
     button: Beszélgetés megnyitása
+  time_units:
+    days:
+      one: "%{count} day"
+      other: "%{count} days"
+    hours:
+      one: "%{count} hour"
+      other: "%{count} hours"
+    minutes:
+      one: "%{count} minute"
+      other: "%{count} minutes"
+    seconds:
+      one: "%{count} second"
+      other: "%{count} seconds"
diff --git a/config/locales/hy.yml b/config/locales/hy.yml
index c64ae616f..2546c9424 100644
--- a/config/locales/hy.yml
+++ b/config/locales/hy.yml
@@ -31,6 +31,7 @@ hy:
       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}"
+      invalid_params: 'Invalid, please check the signup paramters and try again'
       failed: Signup failed
     data_import:
       data_type:
@@ -67,25 +68,25 @@ hy:
     utc_warning: The report generated is in UTC timezone
     agent_csv:
       agent_name: Agent name
-      conversations_count: Conversations count
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      conversations_count: Assigned conversations
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     inbox_csv:
       inbox_name: Inbox name
       inbox_type: Inbox type
       conversations_count: No. of conversations
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     label_csv:
       label_title: Label
       conversations_count: No. of conversations
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     team_csv:
       team_name: Team name
       conversations_count: Conversations count
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     conversation_traffic_csv:
       timezone: Timezone
     default_group_by: day
@@ -228,3 +229,16 @@ hy:
       inbox_name: Inbox
       inbox_type: Inbox Type
     button: Open conversation
+  time_units:
+    days:
+      one: "%{count} day"
+      other: "%{count} days"
+    hours:
+      one: "%{count} hour"
+      other: "%{count} hours"
+    minutes:
+      one: "%{count} minute"
+      other: "%{count} minutes"
+    seconds:
+      one: "%{count} second"
+      other: "%{count} seconds"
diff --git a/config/locales/id.yml b/config/locales/id.yml
index 0f2cdb891..b6213beb3 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -31,6 +31,7 @@ id:
       disposable_email: Kami tidak mengizinkan email sekali pakai
       invalid_email: Anda telah memasukkan email yang tidak valid
       email_already_exists: "Anda telah mendaftar untuk sebuah akun dengan %{email}"
+      invalid_params: 'Invalid, please check the signup paramters and try again'
       failed: Pendaftaran gagal
     data_import:
       data_type:
@@ -67,25 +68,25 @@ id:
     utc_warning: Laporan yang dihasilkan berada dalam zona waktu UTC
     agent_csv:
       agent_name: Nama agen
-      conversations_count: Jumlah percakapan
-      avg_first_response_time: Rata-rata waktu respons pertama (Menit)
-      avg_resolution_time: Rata-rata waktu resolusi (Menit)
+      conversations_count: Assigned conversations
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     inbox_csv:
       inbox_name: Nama kotak masuk
       inbox_type: Jenis kotak masuk
       conversations_count: Jumlah percakapan
-      avg_first_response_time: Rata-rata waktu respons pertama (Menit)
-      avg_resolution_time: Rata-rata waktu resolusi (Menit)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     label_csv:
       label_title: Label
       conversations_count: Jumlah percakapan
-      avg_first_response_time: Rata-rata waktu respons pertama (Menit)
-      avg_resolution_time: Rata-rata waktu resolusi (Menit)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     team_csv:
       team_name: Nama Tim
       conversations_count: Jumlah percakapan
-      avg_first_response_time: Rata-rata waktu respons pertama (Menit)
-      avg_resolution_time: Rata-rata waktu resolusi (Menit)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     conversation_traffic_csv:
       timezone: Zona Waktu
     default_group_by: hari
@@ -228,3 +229,12 @@ id:
       inbox_name: Kotak masuk
       inbox_type: Inbox Type
     button: Buka percakapan
+  time_units:
+    days:
+      other: "%{count} days"
+    hours:
+      other: "%{count} hours"
+    minutes:
+      other: "%{count} minutes"
+    seconds:
+      other: "%{count} seconds"
diff --git a/config/locales/is.yml b/config/locales/is.yml
index ae54d20bc..b9f4b4054 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -31,6 +31,7 @@ is:
       disposable_email: We do not allow disposable emails
       invalid_email: You have entered an invalid email
       email_already_exists: "Þú hefur þegar skráð þig fyrir reikning með %{email}"
+      invalid_params: 'Invalid, please check the signup paramters and try again'
       failed: Signup failed
     data_import:
       data_type:
@@ -67,25 +68,25 @@ is:
     utc_warning: The report generated is in UTC timezone
     agent_csv:
       agent_name: Agent name
-      conversations_count: Conversations count
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      conversations_count: Assigned conversations
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     inbox_csv:
       inbox_name: Inbox name
       inbox_type: Inbox type
       conversations_count: No. of conversations
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     label_csv:
       label_title: Label
       conversations_count: No. of conversations
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     team_csv:
       team_name: Team name
       conversations_count: Conversations count
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     conversation_traffic_csv:
       timezone: Timezone
     default_group_by: day
@@ -228,3 +229,16 @@ is:
       inbox_name: Innhólf
       inbox_type: Inbox Type
     button: Opna samtal
+  time_units:
+    days:
+      one: "%{count} day"
+      other: "%{count} days"
+    hours:
+      one: "%{count} hour"
+      other: "%{count} hours"
+    minutes:
+      one: "%{count} minute"
+      other: "%{count} minutes"
+    seconds:
+      one: "%{count} second"
+      other: "%{count} seconds"
diff --git a/config/locales/it.yml b/config/locales/it.yml
index bf57ee414..d73e25977 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -31,6 +31,7 @@ it:
       disposable_email: Non consentiamo email usa e getta
       invalid_email: Hai inserito un'email non valida
       email_already_exists: "Ti sei già registrato per un account con %{email}"
+      invalid_params: 'Invalid, please check the signup paramters and try again'
       failed: Registrazione non riuscita
     data_import:
       data_type:
@@ -67,25 +68,25 @@ it:
     utc_warning: The report generated is in UTC timezone
     agent_csv:
       agent_name: Nome agente
-      conversations_count: Numero di conversazioni
-      avg_first_response_time: Tempo medio di prima risposta (minuti)
-      avg_resolution_time: Tempo medio di risoluzione (minuti)
+      conversations_count: Assigned conversations
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     inbox_csv:
       inbox_name: Nome casella
       inbox_type: Tipo casella
       conversations_count: Numero di conversazioni
-      avg_first_response_time: Tempo medio di prima risposta (minuti)
-      avg_resolution_time: Tempo medio di risoluzione (minuti)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     label_csv:
       label_title: Etichetta
       conversations_count: Numero di conversazioni
-      avg_first_response_time: Tempo medio di prima risposta (minuti)
-      avg_resolution_time: Tempo medio di risoluzione (minuti)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     team_csv:
       team_name: Nome del team
       conversations_count: Numero di conversazioni
-      avg_first_response_time: Tempo medio di prima risposta (minuti)
-      avg_resolution_time: Tempo medio di risoluzione (minuti)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     conversation_traffic_csv:
       timezone: Timezone
     default_group_by: giorno
@@ -228,3 +229,16 @@ it:
       inbox_name: Casella
       inbox_type: Inbox Type
     button: Apri conversazione
+  time_units:
+    days:
+      one: "%{count} day"
+      other: "%{count} days"
+    hours:
+      one: "%{count} hour"
+      other: "%{count} hours"
+    minutes:
+      one: "%{count} minute"
+      other: "%{count} minutes"
+    seconds:
+      one: "%{count} second"
+      other: "%{count} seconds"
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 99def4627..9f025c1e4 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -31,6 +31,7 @@ ja:
       disposable_email: 使い捨てメールは許可されません
       invalid_email: 無効なメールアドレスを入力しました。
       email_already_exists: "あなたは既に %{email} でアカウントにサインアップしています"
+      invalid_params: 'Invalid, please check the signup paramters and try again'
       failed: サインアップに失敗しました
     data_import:
       data_type:
@@ -67,25 +68,25 @@ ja:
     utc_warning: The report generated is in UTC timezone
     agent_csv:
       agent_name: Agent name
-      conversations_count: Conversations count
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      conversations_count: Assigned conversations
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     inbox_csv:
       inbox_name: Inbox name
       inbox_type: Inbox type
       conversations_count: No. of conversations
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     label_csv:
       label_title: Label
       conversations_count: No. of conversations
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     team_csv:
       team_name: Team name
       conversations_count: Conversations count
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     conversation_traffic_csv:
       timezone: Timezone
     default_group_by: day
@@ -228,3 +229,12 @@ ja:
       inbox_name: Inbox
       inbox_type: Inbox Type
     button: Open conversation
+  time_units:
+    days:
+      other: "%{count} days"
+    hours:
+      other: "%{count} hours"
+    minutes:
+      other: "%{count} minutes"
+    seconds:
+      other: "%{count} seconds"
diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index f96a8cd88..165935f99 100644
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -31,6 +31,7 @@ ka:
       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}"
+      invalid_params: 'Invalid, please check the signup paramters and try again'
       failed: Signup failed
     data_import:
       data_type:
@@ -67,25 +68,25 @@ ka:
     utc_warning: The report generated is in UTC timezone
     agent_csv:
       agent_name: Agent name
-      conversations_count: Conversations count
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      conversations_count: Assigned conversations
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     inbox_csv:
       inbox_name: Inbox name
       inbox_type: Inbox type
       conversations_count: No. of conversations
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     label_csv:
       label_title: Label
       conversations_count: No. of conversations
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     team_csv:
       team_name: Team name
       conversations_count: Conversations count
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     conversation_traffic_csv:
       timezone: Timezone
     default_group_by: day
@@ -228,3 +229,16 @@ ka:
       inbox_name: Inbox
       inbox_type: Inbox Type
     button: Open conversation
+  time_units:
+    days:
+      one: "%{count} day"
+      other: "%{count} days"
+    hours:
+      one: "%{count} hour"
+      other: "%{count} hours"
+    minutes:
+      one: "%{count} minute"
+      other: "%{count} minutes"
+    seconds:
+      one: "%{count} second"
+      other: "%{count} seconds"
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 8602b9131..f62928f00 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -31,6 +31,7 @@ ko:
       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}"
+      invalid_params: 'Invalid, please check the signup paramters and try again'
       failed: Signup failed
     data_import:
       data_type:
@@ -67,25 +68,25 @@ ko:
     utc_warning: The report generated is in UTC timezone
     agent_csv:
       agent_name: Agent name
-      conversations_count: Conversations count
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      conversations_count: Assigned conversations
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     inbox_csv:
       inbox_name: Inbox name
       inbox_type: Inbox type
       conversations_count: No. of conversations
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     label_csv:
       label_title: Label
       conversations_count: No. of conversations
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     team_csv:
       team_name: Team name
       conversations_count: Conversations count
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     conversation_traffic_csv:
       timezone: Timezone
     default_group_by: day
@@ -228,3 +229,12 @@ ko:
       inbox_name: 받은 메시지함
       inbox_type: Inbox Type
     button: Open conversation
+  time_units:
+    days:
+      other: "%{count} days"
+    hours:
+      other: "%{count} hours"
+    minutes:
+      other: "%{count} minutes"
+    seconds:
+      other: "%{count} seconds"
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 734116507..8fd1b342a 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -31,6 +31,7 @@ lt:
       disposable_email: Neleidžiame naudoti vienkartinių el. laiškų
       invalid_email: Įvedėte neteisingą el. pašto adresą
       email_already_exists: "Jūs jau užregistravote paskyrą su %{email}"
+      invalid_params: 'Invalid, please check the signup paramters and try again'
       failed: Prisijungimas nesėkmingas
     data_import:
       data_type:
@@ -67,25 +68,25 @@ lt:
     utc_warning: Sugeneruota ataskaita yra UTC laiko juostoje
     agent_csv:
       agent_name: Agento Vardas
-      conversations_count: Pokalbių skaičius
-      avg_first_response_time: Vidutinis pirmojo reagavimo laikas (minutėmis)
-      avg_resolution_time: Vidutinis sprendimo laikas(Minutėmis)
+      conversations_count: Assigned conversations
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     inbox_csv:
       inbox_name: Gautų laiškų aplanko pavadinimas
       inbox_type: Gautų laiškų aplanko tipas
       conversations_count: Pokalbių kiekis
-      avg_first_response_time: Vidutinis pirmojo reagavimo laikas (minutėmis)
-      avg_resolution_time: Vidutinis sprendimo laikas(Minutėmis)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     label_csv:
       label_title: Etiketė
       conversations_count: Pokalbių kiekis
-      avg_first_response_time: Vidutinis pirmojo reagavimo laikas (minutėmis)
-      avg_resolution_time: Vidutinis sprendimo laikas(Minutėmis)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     team_csv:
       team_name: Komandos pavadinimas
       conversations_count: Pokalbių skaičius
-      avg_first_response_time: Vidutinis pirmojo reagavimo laikas (minutėmis)
-      avg_resolution_time: Vidutinis sprendimo laikas(Minutėmis)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     conversation_traffic_csv:
       timezone: Laiko zona
     default_group_by: diena
@@ -228,3 +229,24 @@ lt:
       inbox_name: Gautų laiškų aplankas
       inbox_type: Gautų laiškų aplanko tipas
     button: Atidaryti pokalbį
+  time_units:
+    days:
+      one: "%{count} day"
+      few: "%{count} days"
+      many: "%{count} days"
+      other: "%{count} days"
+    hours:
+      one: "%{count} hour"
+      few: "%{count} hours"
+      many: "%{count} hours"
+      other: "%{count} hours"
+    minutes:
+      one: "%{count} minute"
+      few: "%{count} minutes"
+      many: "%{count} minutes"
+      other: "%{count} minutes"
+    seconds:
+      one: "%{count} second"
+      few: "%{count} seconds"
+      many: "%{count} seconds"
+      other: "%{count} seconds"
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index d3eb41db3..6cf50833d 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -31,6 +31,7 @@ lv:
       disposable_email: Mēs nepieļaujam vienreizējās lietošanas e-pasta adreses
       invalid_email: Jūs esat ievadījis nederīgu e-pasta adresi
       email_already_exists: "Jūs jau esat reģistrējis kontu ar %{email}"
+      invalid_params: 'Kļūda. Lūdzu, pārbaudiet pierakstīšanās parametrus un mēģiniet vēlreiz'
       failed: Reģistrēšanās neizdevās
     data_import:
       data_type:
@@ -67,25 +68,25 @@ lv:
     utc_warning: Izveidotais pārskats atbilst UTC laika joslai
     agent_csv:
       agent_name: Aģenta vārds
-      conversations_count: Sarunu skaits
-      avg_first_response_time: Vidējais pirmās reakcijas laiks (Minūtes)
-      avg_resolution_time: Vidējais atrisināšanas laiks (Minūtes)
+      conversations_count: Piešķirtās sarunas
+      avg_first_response_time: Vidējais pirmās reakcijas laiks
+      avg_resolution_time: Vidējais atrisināšanas laiks
     inbox_csv:
       inbox_name: Iesūtnes nosaukums
       inbox_type: Iesūtnes tips
       conversations_count: Sarunu skaits
-      avg_first_response_time: Vidējais pirmās reakcijas laiks (Minūtes)
-      avg_resolution_time: Vidējais atrisināšanas laiks (Minūtes)
+      avg_first_response_time: Vidējais pirmās reakcijas laiks
+      avg_resolution_time: Vidējais atrisināšanas laiks
     label_csv:
       label_title: Etiķete
       conversations_count: Sarunu skaits
-      avg_first_response_time: Vidējais pirmās atbildes laiks (Minūtes)
-      avg_resolution_time: Vidējais atrisināšanas laiks (minūtes)
+      avg_first_response_time: Vidējais pirmās reakcijas laiks
+      avg_resolution_time: Vidējais atrisināšanas laiks
     team_csv:
       team_name: Komandas nosaukums
       conversations_count: Sarunu skaits
-      avg_first_response_time: Vidējais pirmās atbildes laiks (Minūtes)
-      avg_resolution_time: Vidējais atrisinājuma laiks (Minūtes)
+      avg_first_response_time: Vidējais pirmās reakcijas laiks
+      avg_resolution_time: Vidējais atrisināšanas laiks
     conversation_traffic_csv:
       timezone: Laika zona
     default_group_by: diena
@@ -228,3 +229,20 @@ lv:
       inbox_name: Iesūtne
       inbox_type: Iesūtnes Veids
     button: Atvērt sarunu
+  time_units:
+    days:
+      zero: "%{count} days"
+      one: "%{count} day"
+      other: "%{count} dienas"
+    hours:
+      zero: "%{count} hours"
+      one: "%{count} hour"
+      other: "%{count} stundas"
+    minutes:
+      zero: "%{count} minutes"
+      one: "%{count} minute"
+      other: "%{count} minūtes"
+    seconds:
+      zero: "%{count} seconds"
+      one: "%{count} second"
+      other: "%{count} sekundes"
diff --git a/config/locales/ml.yml b/config/locales/ml.yml
index 6af05c4ba..07f715d30 100644
--- a/config/locales/ml.yml
+++ b/config/locales/ml.yml
@@ -31,6 +31,7 @@ ml:
       disposable_email: ഡിസ്പോസിബിൾ ഇമെയിലുകൾ ഞങ്ങൾ അനുവദിക്കുന്നില്ല
       invalid_email: നിങ്ങൾ ഒരു അസാധുവായ ഇമെയിൽ നൽകി
       email_already_exists: "നിങ്ങൾ ഇതിനകം ഈ %{email} ഉപയോഗിച്ചു ഒരു അക്കൗണ്ടിനായി സൈൻ അപ്പ് ചെയ്തു"
+      invalid_params: 'Invalid, please check the signup paramters and try again'
       failed: സൈനപ്പ് പരാജയപ്പെട്ടു
     data_import:
       data_type:
@@ -67,25 +68,25 @@ ml:
     utc_warning: The report generated is in UTC timezone
     agent_csv:
       agent_name: Agent name
-      conversations_count: Conversations count
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      conversations_count: Assigned conversations
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     inbox_csv:
       inbox_name: Inbox name
       inbox_type: Inbox type
       conversations_count: No. of conversations
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     label_csv:
       label_title: Label
       conversations_count: No. of conversations
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     team_csv:
       team_name: ടീമിന്റെ പേര്
       conversations_count: സംഭാഷണങ്ങളുടെ എണ്ണം
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     conversation_traffic_csv:
       timezone: Timezone
     default_group_by: ദിവസം
@@ -228,3 +229,16 @@ ml:
       inbox_name: ഇൻബോക്സ്
       inbox_type: Inbox Type
     button: Open conversation
+  time_units:
+    days:
+      one: "%{count} day"
+      other: "%{count} days"
+    hours:
+      one: "%{count} hour"
+      other: "%{count} hours"
+    minutes:
+      one: "%{count} minute"
+      other: "%{count} minutes"
+    seconds:
+      one: "%{count} second"
+      other: "%{count} seconds"
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index d433a2d73..d62ab48c9 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -31,6 +31,7 @@ ms:
       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}"
+      invalid_params: 'Invalid, please check the signup paramters and try again'
       failed: Signup failed
     data_import:
       data_type:
@@ -67,25 +68,25 @@ ms:
     utc_warning: The report generated is in UTC timezone
     agent_csv:
       agent_name: Agent name
-      conversations_count: Conversations count
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      conversations_count: Assigned conversations
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     inbox_csv:
       inbox_name: Inbox name
       inbox_type: Inbox type
       conversations_count: No. of conversations
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     label_csv:
       label_title: Label
       conversations_count: No. of conversations
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     team_csv:
       team_name: Team name
       conversations_count: Conversations count
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     conversation_traffic_csv:
       timezone: Timezone
     default_group_by: day
@@ -228,3 +229,12 @@ ms:
       inbox_name: Inbox
       inbox_type: Inbox Type
     button: Open conversation
+  time_units:
+    days:
+      other: "%{count} days"
+    hours:
+      other: "%{count} hours"
+    minutes:
+      other: "%{count} minutes"
+    seconds:
+      other: "%{count} seconds"
diff --git a/config/locales/ne.yml b/config/locales/ne.yml
index 55a34af63..a4df39498 100644
--- a/config/locales/ne.yml
+++ b/config/locales/ne.yml
@@ -31,6 +31,7 @@ ne:
       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}"
+      invalid_params: 'Invalid, please check the signup paramters and try again'
       failed: Signup failed
     data_import:
       data_type:
@@ -67,25 +68,25 @@ ne:
     utc_warning: The report generated is in UTC timezone
     agent_csv:
       agent_name: Agent name
-      conversations_count: Conversations count
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      conversations_count: Assigned conversations
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     inbox_csv:
       inbox_name: Inbox name
       inbox_type: Inbox type
       conversations_count: No. of conversations
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     label_csv:
       label_title: Label
       conversations_count: No. of conversations
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     team_csv:
       team_name: Team name
       conversations_count: Conversations count
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     conversation_traffic_csv:
       timezone: Timezone
     default_group_by: day
@@ -228,3 +229,16 @@ ne:
       inbox_name: Inbox
       inbox_type: Inbox Type
     button: Open conversation
+  time_units:
+    days:
+      one: "%{count} day"
+      other: "%{count} days"
+    hours:
+      one: "%{count} hour"
+      other: "%{count} hours"
+    minutes:
+      one: "%{count} minute"
+      other: "%{count} minutes"
+    seconds:
+      one: "%{count} second"
+      other: "%{count} seconds"
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 8a5f97c91..56bfe4d7d 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -31,6 +31,7 @@ nl:
       disposable_email: Wij staan geen verwijderbare e-mails toe
       invalid_email: Je hebt een ongeldig e-mailadres ingevoerd
       email_already_exists: "Je hebt je al aangemeld voor een account bij %{email}"
+      invalid_params: 'Invalid, please check the signup paramters and try again'
       failed: Aanmelden mislukt
     data_import:
       data_type:
@@ -67,25 +68,25 @@ nl:
     utc_warning: The report generated is in UTC timezone
     agent_csv:
       agent_name: Agent naam
-      conversations_count: Aantal gesprekken
-      avg_first_response_time: Gem. eerste reactie (minuten)
-      avg_resolution_time: Gemiddelde tijd tot oplossing (minuten)
+      conversations_count: Assigned conversations
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     inbox_csv:
       inbox_name: Naam postvak
       inbox_type: Inbox type
       conversations_count: Aantal conversaties
-      avg_first_response_time: Gem. eerste reactie (minuten)
-      avg_resolution_time: Gemiddelde tijd tot oplossing (minuten)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     label_csv:
       label_title: Label
       conversations_count: Aantal conversaties
-      avg_first_response_time: Gem. eerste reactie (minuten)
-      avg_resolution_time: Gemiddelde tijd tot oplossing (minuten)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     team_csv:
       team_name: Team Naam
       conversations_count: Aantal gesprekken
-      avg_first_response_time: Gem. eerste reactie (minuten)
-      avg_resolution_time: Gemiddelde tijd tot oplossing (minuten)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     conversation_traffic_csv:
       timezone: Timezone
     default_group_by: dag
@@ -228,3 +229,16 @@ nl:
       inbox_name: Postvak In
       inbox_type: Inbox Type
     button: Open conversation
+  time_units:
+    days:
+      one: "%{count} day"
+      other: "%{count} days"
+    hours:
+      one: "%{count} hour"
+      other: "%{count} hours"
+    minutes:
+      one: "%{count} minute"
+      other: "%{count} minutes"
+    seconds:
+      one: "%{count} second"
+      other: "%{count} seconds"
diff --git a/config/locales/no.yml b/config/locales/no.yml
index d25556f96..d5bb49b4f 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -31,6 +31,7 @@
       disposable_email: Vi tillater ikke engangs e-poster
       invalid_email: Du har angitt en ugyldig e-post
       email_already_exists: "Du har allerede registrert en konto med %{email}"
+      invalid_params: 'Invalid, please check the signup paramters and try again'
       failed: Registrering mislyktes
     data_import:
       data_type:
@@ -67,25 +68,25 @@
     utc_warning: The report generated is in UTC timezone
     agent_csv:
       agent_name: Agent name
-      conversations_count: Conversations count
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      conversations_count: Assigned conversations
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     inbox_csv:
       inbox_name: Inbox name
       inbox_type: Inbox type
       conversations_count: No. of conversations
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     label_csv:
       label_title: Label
       conversations_count: No. of conversations
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     team_csv:
       team_name: Team name
       conversations_count: Conversations count
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     conversation_traffic_csv:
       timezone: Timezone
     default_group_by: day
@@ -228,3 +229,16 @@
       inbox_name: Inbox
       inbox_type: Inbox Type
     button: Open conversation
+  time_units:
+    days:
+      one: "%{count} day"
+      other: "%{count} days"
+    hours:
+      one: "%{count} hour"
+      other: "%{count} hours"
+    minutes:
+      one: "%{count} minute"
+      other: "%{count} minutes"
+    seconds:
+      one: "%{count} second"
+      other: "%{count} seconds"
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 29bf9c95d..fb9418d17 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -31,6 +31,7 @@ pl:
       disposable_email: Nie zezwalamy na jednorazowe konta e-mail
       invalid_email: Wprowadzono nieprawidłowy adres e-mail
       email_already_exists: "Już zarejestrowałeś się na konto %{email}"
+      invalid_params: 'Invalid, please check the signup paramters and try again'
       failed: Rejestracja nie powiodła się
     data_import:
       data_type:
@@ -67,25 +68,25 @@ pl:
     utc_warning: Generowany raport jest w strefie czasowej UTC
     agent_csv:
       agent_name: Nazwa agenta
-      conversations_count: Liczba rozmów
-      avg_first_response_time: Średni czas pierwszej odpowiedzi (minuty)
-      avg_resolution_time: Średni czas do rozwiązania problemu (minuty)
+      conversations_count: Assigned conversations
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     inbox_csv:
       inbox_name: Nazwa skrzynki odbiorczej
       inbox_type: Typ skrzynki odbiorczej
       conversations_count: Ilość rozmów
-      avg_first_response_time: Średni czas pierwszej odpowiedzi (minuty)
-      avg_resolution_time: Średni czas do rozwiązania problemu (minuty)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     label_csv:
       label_title: Etykieta
       conversations_count: Ilość rozmów
-      avg_first_response_time: Średni czas pierwszej odpowiedzi (minuty)
-      avg_resolution_time: Średni czas do rozwiązania problemu (minuty)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     team_csv:
       team_name: Nazwa zespołu
       conversations_count: Liczba rozmów
-      avg_first_response_time: Średni czas pierwszej odpowiedzi (minuty)
-      avg_resolution_time: Średni czas do rozwiązania problemu (minuty)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     conversation_traffic_csv:
       timezone: Strefa czasowa
     default_group_by: dnia
@@ -221,10 +222,31 @@ pl:
       back_to_home: Go to home page
   slack_unfurl:
     fields:
-      name: Nazwa
+      name: Imię
       email: E-mail
       phone_number: Phone
       company_name: Firma
       inbox_name: Skrzynka odbiorcza
       inbox_type: Inbox Type
     button: Otwórz rozmowę
+  time_units:
+    days:
+      one: "%{count} day"
+      few: "%{count} days"
+      many: "%{count} days"
+      other: "%{count} days"
+    hours:
+      one: "%{count} hour"
+      few: "%{count} hours"
+      many: "%{count} hours"
+      other: "%{count} hours"
+    minutes:
+      one: "%{count} minute"
+      few: "%{count} minutes"
+      many: "%{count} minutes"
+      other: "%{count} minutes"
+    seconds:
+      one: "%{count} second"
+      few: "%{count} seconds"
+      many: "%{count} seconds"
+      other: "%{count} seconds"
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 0f843a462..01f47fcf1 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -31,6 +31,7 @@ pt:
       disposable_email: Não permitimos e-mails descartáveis
       invalid_email: Você digitou um email inválido
       email_already_exists: "Você já se inscreveu para uma conta com %{email}"
+      invalid_params: 'Inválido, por favor, verifique os parâmetros de subscrição e tente novamente'
       failed: Falha na inscrição
     data_import:
       data_type:
@@ -67,25 +68,25 @@ pt:
     utc_warning: O relatório gerado está no fuso horário UTC
     agent_csv:
       agent_name: Nome do agente
-      conversations_count: Número de conversas
-      avg_first_response_time: Média do tempo de resposta (minutos)
-      avg_resolution_time: Média do tempo de resolução (minutos)
+      conversations_count: Conversas atribuídas
+      avg_first_response_time: Média de tempo da primeira resposta
+      avg_resolution_time: Média de tempo de resolução
     inbox_csv:
       inbox_name: Nome da caixa de entrada
       inbox_type: Tipo de caixa de entrada
       conversations_count: Num de conversas
-      avg_first_response_time: Média do tempo de resposta (minutos)
-      avg_resolution_time: Média do tempo de resolução (minutos)
+      avg_first_response_time: Média de tempo da primeira resposta
+      avg_resolution_time: Média de tempo de resolução
     label_csv:
       label_title: Etiqueta
       conversations_count: Num de conversas
-      avg_first_response_time: Média do tempo de resposta (minutos)
-      avg_resolution_time: Média do tempo de resolução (minutos)
+      avg_first_response_time: Média de tempo da primeira resposta
+      avg_resolution_time: Média de tempo de resolução
     team_csv:
       team_name: Nome da equipa
       conversations_count: Número de conversas
-      avg_first_response_time: Média do tempo de resposta (minutos)
-      avg_resolution_time: Média do tempo de resolução (minutos)
+      avg_first_response_time: Média de tempo da primeira resposta
+      avg_resolution_time: Média de tempo de resolução
     conversation_traffic_csv:
       timezone: Fuso Horário
     default_group_by: dia
@@ -228,3 +229,16 @@ pt:
       inbox_name: Caixa de Entrada
       inbox_type: Tipo de caixa de entrada
     button: Abrir conversa
+  time_units:
+    days:
+      one: "%{count} dia"
+      other: "%{count} dias"
+    hours:
+      one: "%{count} hora"
+      other: "%{count} horas"
+    minutes:
+      one: "%{count} minuto"
+      other: "%{count} minutos"
+    seconds:
+      one: "%{count} segundo"
+      other: "%{count} segundos"
diff --git a/config/locales/pt_BR.yml b/config/locales/pt_BR.yml
index 1960cc6db..f4d2e1c42 100644
--- a/config/locales/pt_BR.yml
+++ b/config/locales/pt_BR.yml
@@ -31,6 +31,7 @@ pt_BR:
       disposable_email: Não permitimos e-mails descartáveis
       invalid_email: Você digitou um email inválido
       email_already_exists: "Você já se cadastrou para uma conta com %{email}"
+      invalid_params: 'Inválido, por favor, verifique os parâmetros de inscrição e tente novamente'
       failed: Registro falhou
     data_import:
       data_type:
@@ -67,25 +68,25 @@ pt_BR:
     utc_warning: O relatório gerado está em fuso horário UTC
     agent_csv:
       agent_name: Nome do Agente
-      conversations_count: Contagem de conversas
-      avg_first_response_time: Tempo médio de primeira resposta (minutos)
-      avg_resolution_time: Tempo médio de resolução (minutos)
+      conversations_count: Conversas atribuídas
+      avg_first_response_time: Tempo médio de primeira resposta (minutos
+      avg_resolution_time: Avg resolution time
     inbox_csv:
       inbox_name: Nome da Caixa de Entrada
       inbox_type: Tipo da Caixa de Entrada
       conversations_count: Nº de Conversas
-      avg_first_response_time: Média de tempo da primeira resposta (minutos)
-      avg_resolution_time: Tempo médio de resolução (minutos)
+      avg_first_response_time: Tempo médio de primeira resposta (minutos
+      avg_resolution_time: Avg resolution time
     label_csv:
       label_title: Nome do campo
       conversations_count: Nº de Conversas
-      avg_first_response_time: Tempo médio de primeira resposta (minutos)
-      avg_resolution_time: Tempo médio de resolução (minutos)
+      avg_first_response_time: Tempo médio de primeira resposta (minutos
+      avg_resolution_time: Avg resolution time
     team_csv:
       team_name: Nome do departamento
       conversations_count: Contagem de conversas
-      avg_first_response_time: Tempo médio de primeira resposta (minutos)
-      avg_resolution_time: Tempo médio de resolução (minutos)
+      avg_first_response_time: Tempo médio de primeira resposta (minutos
+      avg_resolution_time: Avg resolution time
     conversation_traffic_csv:
       timezone: Timezone
     default_group_by: dia
@@ -228,3 +229,16 @@ pt_BR:
       inbox_name: Caixa de Entrada
       inbox_type: Tipo de Caixa de Entrada
     button: Abrir conversa
+  time_units:
+    days:
+      one: "%{count} day"
+      other: "%{count} days"
+    hours:
+      one: "%{count} hour"
+      other: "%{count} hours"
+    minutes:
+      one: "%{count} minute"
+      other: "%{count} minutes"
+    seconds:
+      one: "%{count} second"
+      other: "%{count} seconds"
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 6c799f89f..146224d66 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -31,6 +31,7 @@ ro:
       disposable_email: Nu permitem email-uri de unică folosință
       invalid_email: Ați introdus un e-mail invalid
       email_already_exists: "V-ați înregistrat deja cu un cont cu %{email}"
+      invalid_params: 'Invalid, please check the signup paramters and try again'
       failed: Înregistrare eșuată
     data_import:
       data_type:
@@ -67,25 +68,25 @@ ro:
     utc_warning: Raportul generat este în fusul orar UTC
     agent_csv:
       agent_name: Nume agent
-      conversations_count: Conversațiile contează
-      avg_first_response_time: Avg primul timp de răspuns (minute)
-      avg_resolution_time: Timp de rezoluție AVG (proces-verbal)
+      conversations_count: Assigned conversations
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     inbox_csv:
       inbox_name: Nume Inbox
       inbox_type: Tip inbox
       conversations_count: Conversații
-      avg_first_response_time: Avg primul timp de răspuns (minute)
-      avg_resolution_time: Timp de rezoluție AVG (proces-verbal)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     label_csv:
       label_title: Etichetă
       conversations_count: Conversații
-      avg_first_response_time: Avg primul timp de răspuns (minute)
-      avg_resolution_time: Timp de rezoluție AVG (proces-verbal)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     team_csv:
       team_name: Numele echipei
       conversations_count: Conversațiile contează
-      avg_first_response_time: Avg primul timp de răspuns (minute)
-      avg_resolution_time: Timp de rezoluție AVG (proces-verbal)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     conversation_traffic_csv:
       timezone: Fus orar
     default_group_by: zi
@@ -228,3 +229,20 @@ ro:
       inbox_name: Inbox
       inbox_type: Inbox Type
     button: Deschiderea conversației
+  time_units:
+    days:
+      one: "%{count} day"
+      few: "%{count} days"
+      other: "%{count} days"
+    hours:
+      one: "%{count} hour"
+      few: "%{count} hours"
+      other: "%{count} hours"
+    minutes:
+      one: "%{count} minute"
+      few: "%{count} minutes"
+      other: "%{count} minutes"
+    seconds:
+      one: "%{count} second"
+      few: "%{count} seconds"
+      other: "%{count} seconds"
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 2d4f26706..d967b3621 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -31,6 +31,7 @@ ru:
       disposable_email: Мы не разрешаем одноразовые почтовые ящики
       invalid_email: Вы ввели неверный email
       email_already_exists: "Вы уже зарегистрировались для учётной записи с %{email}"
+      invalid_params: 'Неверно, проверьте параметры регистрации и повторите попытку'
       failed: Ошибка регистрации
     data_import:
       data_type:
@@ -67,25 +68,25 @@ ru:
     utc_warning: Отчёт создан в часовом поясе UTC
     agent_csv:
       agent_name: Имя оператора
-      conversations_count: Количество бесед
-      avg_first_response_time: Среднее время первого ответа (в минутах)
-      avg_resolution_time: Среднее время решения (в минутах)
+      conversations_count: Назначенные диалоги
+      avg_first_response_time: Среднее время первого ответа
+      avg_resolution_time: Среднее время завершения
     inbox_csv:
       inbox_name: Inbox name
       inbox_type: Inbox type
       conversations_count: No. of conversations
-      avg_first_response_time: Среднее время первого ответа (в минутах)
-      avg_resolution_time: Среднее время решения (в минутах)
+      avg_first_response_time: Среднее время первого ответа
+      avg_resolution_time: Среднее время завершения
     label_csv:
       label_title: Метка
       conversations_count: No. of conversations
-      avg_first_response_time: Среднее время первого ответа (в минутах)
-      avg_resolution_time: Среднее время решения (в минутах)
+      avg_first_response_time: Среднее время первого ответа
+      avg_resolution_time: Среднее время завершения
     team_csv:
       team_name: Название команды
       conversations_count: Количество бесед
-      avg_first_response_time: Среднее время первого ответа (в минутах)
-      avg_resolution_time: Среднее время решения (в минутах)
+      avg_first_response_time: Среднее время первого ответа
+      avg_resolution_time: Среднее время завершения
     conversation_traffic_csv:
       timezone: Часовой пояс
     default_group_by: день
@@ -228,3 +229,24 @@ ru:
       inbox_name: Электронная почта
       inbox_type: Тип источника
     button: Открыть беседу
+  time_units:
+    days:
+      one: "%{count} день"
+      few: "%{count} дней"
+      many: "%{count} дней"
+      other: "%{count} дней"
+    hours:
+      one: "%{count} час"
+      few: "%{count} часов"
+      many: "%{count} часов"
+      other: "%{count} часов"
+    minutes:
+      one: "%{count} минут"
+      few: "%{count} минут"
+      many: "%{count} минут"
+      other: "%{count} минут"
+    seconds:
+      one: "%{count} секунд"
+      few: "%{count} секунд"
+      many: "%{count} секунд"
+      other: "%{count} секунд"
diff --git a/config/locales/sh.yml b/config/locales/sh.yml
index c190d8a3e..e01cb1183 100644
--- a/config/locales/sh.yml
+++ b/config/locales/sh.yml
@@ -31,6 +31,7 @@ sh:
       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}"
+      invalid_params: 'Invalid, please check the signup paramters and try again'
       failed: Signup failed
     data_import:
       data_type:
@@ -67,25 +68,25 @@ sh:
     utc_warning: The report generated is in UTC timezone
     agent_csv:
       agent_name: Agent name
-      conversations_count: Conversations count
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      conversations_count: Assigned conversations
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     inbox_csv:
       inbox_name: Inbox name
       inbox_type: Inbox type
       conversations_count: No. of conversations
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     label_csv:
       label_title: Label
       conversations_count: No. of conversations
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     team_csv:
       team_name: Team name
       conversations_count: Conversations count
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     conversation_traffic_csv:
       timezone: Timezone
     default_group_by: day
@@ -228,3 +229,24 @@ sh:
       inbox_name: Inbox
       inbox_type: Inbox Type
     button: Open conversation
+  time_units:
+    days:
+      one: "%{count} day"
+      few: "%{count} days"
+      many: "%{count} days"
+      other: "%{count} days"
+    hours:
+      one: "%{count} hour"
+      few: "%{count} hours"
+      many: "%{count} hours"
+      other: "%{count} hours"
+    minutes:
+      one: "%{count} minute"
+      few: "%{count} minutes"
+      many: "%{count} minutes"
+      other: "%{count} minutes"
+    seconds:
+      one: "%{count} second"
+      few: "%{count} seconds"
+      many: "%{count} seconds"
+      other: "%{count} seconds"
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index f65c0cc66..2d0bcec31 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -31,6 +31,7 @@ sk:
       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}"
+      invalid_params: 'Invalid, please check the signup paramters and try again'
       failed: Signup failed
     data_import:
       data_type:
@@ -67,25 +68,25 @@ sk:
     utc_warning: The report generated is in UTC timezone
     agent_csv:
       agent_name: Agent name
-      conversations_count: Conversations count
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      conversations_count: Assigned conversations
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     inbox_csv:
       inbox_name: Inbox name
       inbox_type: Inbox type
       conversations_count: No. of conversations
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     label_csv:
       label_title: Label
       conversations_count: No. of conversations
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     team_csv:
       team_name: Názov tímu
       conversations_count: Conversations count
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     conversation_traffic_csv:
       timezone: Timezone
     default_group_by: day
@@ -228,3 +229,24 @@ sk:
       inbox_name: Schránka
       inbox_type: Inbox Type
     button: Open conversation
+  time_units:
+    days:
+      one: "%{count} day"
+      few: "%{count} days"
+      many: "%{count} days"
+      other: "%{count} days"
+    hours:
+      one: "%{count} hour"
+      few: "%{count} hours"
+      many: "%{count} hours"
+      other: "%{count} hours"
+    minutes:
+      one: "%{count} minute"
+      few: "%{count} minutes"
+      many: "%{count} minutes"
+      other: "%{count} minutes"
+    seconds:
+      one: "%{count} second"
+      few: "%{count} seconds"
+      many: "%{count} seconds"
+      other: "%{count} seconds"
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 1e1bb9a6e..2842d1347 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -31,6 +31,7 @@ sl:
       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}"
+      invalid_params: 'Invalid, please check the signup paramters and try again'
       failed: Signup failed
     data_import:
       data_type:
@@ -67,25 +68,25 @@ sl:
     utc_warning: The report generated is in UTC timezone
     agent_csv:
       agent_name: Agent name
-      conversations_count: Conversations count
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      conversations_count: Assigned conversations
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     inbox_csv:
       inbox_name: Inbox name
       inbox_type: Inbox type
       conversations_count: No. of conversations
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     label_csv:
       label_title: Label
       conversations_count: No. of conversations
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     team_csv:
       team_name: Team name
       conversations_count: Conversations count
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     conversation_traffic_csv:
       timezone: Timezone
     default_group_by: day
@@ -228,3 +229,24 @@ sl:
       inbox_name: Inbox
       inbox_type: Inbox Type
     button: Open conversation
+  time_units:
+    days:
+      one: "%{count} day"
+      two: "%{count} days"
+      few: "%{count} days"
+      other: "%{count} days"
+    hours:
+      one: "%{count} hour"
+      two: "%{count} hours"
+      few: "%{count} hours"
+      other: "%{count} hours"
+    minutes:
+      one: "%{count} minute"
+      two: "%{count} minutes"
+      few: "%{count} minutes"
+      other: "%{count} minutes"
+    seconds:
+      one: "%{count} second"
+      two: "%{count} seconds"
+      few: "%{count} seconds"
+      other: "%{count} seconds"
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 2a8a926a5..ea8e9b19e 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -31,6 +31,7 @@ sq:
       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}"
+      invalid_params: 'Invalid, please check the signup paramters and try again'
       failed: Signup failed
     data_import:
       data_type:
@@ -67,25 +68,25 @@ sq:
     utc_warning: The report generated is in UTC timezone
     agent_csv:
       agent_name: Agent name
-      conversations_count: Conversations count
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      conversations_count: Assigned conversations
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     inbox_csv:
       inbox_name: Inbox name
       inbox_type: Inbox type
       conversations_count: No. of conversations
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     label_csv:
       label_title: Label
       conversations_count: No. of conversations
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     team_csv:
       team_name: Team name
       conversations_count: Conversations count
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     conversation_traffic_csv:
       timezone: Timezone
     default_group_by: day
@@ -228,3 +229,16 @@ sq:
       inbox_name: Inbox
       inbox_type: Inbox Type
     button: Open conversation
+  time_units:
+    days:
+      one: "%{count} day"
+      other: "%{count} days"
+    hours:
+      one: "%{count} hour"
+      other: "%{count} hours"
+    minutes:
+      one: "%{count} minute"
+      other: "%{count} minutes"
+    seconds:
+      one: "%{count} second"
+      other: "%{count} seconds"
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index d8ecf2af4..652b34f42 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -31,6 +31,7 @@ sr-Latn:
       disposable_email: Ne dozvoljavamo potrošne e-pošte
       invalid_email: Uneli ste neispravnu e-poštu
       email_already_exists: "Već ste registrovali nalog sa %{email}"
+      invalid_params: 'Invalid, please check the signup paramters and try again'
       failed: Registracija nije uspela
     data_import:
       data_type:
@@ -67,25 +68,25 @@ sr-Latn:
     utc_warning: Generisani izveštaj je u UTC vremenskoj zoni
     agent_csv:
       agent_name: Naziv agenta
-      conversations_count: Broj razgovora
-      avg_first_response_time: Prosečno vreme prvog odgovora (minuti)
-      avg_resolution_time: Prosečno vreme rešavanja (minuti)
+      conversations_count: Assigned conversations
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     inbox_csv:
       inbox_name: Naziv prijemnog sandučeta
       inbox_type: Vrsta prijemnog sandučeta
       conversations_count: Broj razgovora
-      avg_first_response_time: Prosečno vreme prvog odgovora (minuti)
-      avg_resolution_time: Prosečno vreme rešavanja (minuti)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     label_csv:
       label_title: Oznaka
       conversations_count: Broj razgovora
-      avg_first_response_time: Prosečno vreme prvog odgovora (minuti)
-      avg_resolution_time: Prosečno vreme rešavanja (minuti)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     team_csv:
       team_name: Naziv tima
       conversations_count: Broj razgovora
-      avg_first_response_time: Prosečno vreme prvog odgovora (minuti)
-      avg_resolution_time: Prosečno vreme rešavanja (minuti)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     conversation_traffic_csv:
       timezone: Timezone
     default_group_by: dan
@@ -228,3 +229,20 @@ sr-Latn:
       inbox_name: Prijemno sanduče
       inbox_type: Inbox Type
     button: Otvoren razgovor
+  time_units:
+    days:
+      one: "%{count} day"
+      few: "%{count} days"
+      other: "%{count} days"
+    hours:
+      one: "%{count} hour"
+      few: "%{count} hours"
+      other: "%{count} hours"
+    minutes:
+      one: "%{count} minute"
+      few: "%{count} minutes"
+      other: "%{count} minutes"
+    seconds:
+      one: "%{count} second"
+      few: "%{count} seconds"
+      other: "%{count} seconds"
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 7eaf9d36b..fe894551c 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -31,6 +31,7 @@ sv:
       disposable_email: Vi tillåter inte engångsadresser
       invalid_email: Du har angett en ogiltig e-postadress
       email_already_exists: "Du har redan registrerat dig för ett konto med %{email}"
+      invalid_params: 'Invalid, please check the signup paramters and try again'
       failed: Registrering misslyckades
     data_import:
       data_type:
@@ -67,25 +68,25 @@ sv:
     utc_warning: The report generated is in UTC timezone
     agent_csv:
       agent_name: Agent name
-      conversations_count: Conversations count
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      conversations_count: Assigned conversations
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     inbox_csv:
       inbox_name: Inbox name
       inbox_type: Inbox type
       conversations_count: No. of conversations
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     label_csv:
       label_title: Label
       conversations_count: No. of conversations
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     team_csv:
       team_name: Team name
       conversations_count: Conversations count
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     conversation_traffic_csv:
       timezone: Timezone
     default_group_by: day
@@ -228,3 +229,16 @@ sv:
       inbox_name: Inkorg
       inbox_type: Typ av inkorg
     button: Öppna konversation
+  time_units:
+    days:
+      one: "%{count} day"
+      other: "%{count} days"
+    hours:
+      one: "%{count} hour"
+      other: "%{count} hours"
+    minutes:
+      one: "%{count} minute"
+      other: "%{count} minutes"
+    seconds:
+      one: "%{count} second"
+      other: "%{count} seconds"
diff --git a/config/locales/ta.yml b/config/locales/ta.yml
index 4daf08eef..c2185ea8b 100644
--- a/config/locales/ta.yml
+++ b/config/locales/ta.yml
@@ -31,6 +31,7 @@ ta:
       disposable_email: களைந்துவிடும் இமெயில்களை நாங்கள் அனுமதிக்க மாட்டோம்
       invalid_email: நீங்கள் தவறான ஈ-மெயிலை உள்ளிட்டுள்ளீர்கள்
       email_already_exists: "நீங்கள் ஏற்கனவே %{email} கொண்டு கணக்கிற்கு பதிவு செய்துள்ளீர்கள்"
+      invalid_params: 'Invalid, please check the signup paramters and try again'
       failed: உள்நுழையும் முயறிசி தோல்வி அடைந்துள்ளது
     data_import:
       data_type:
@@ -67,25 +68,25 @@ ta:
     utc_warning: The report generated is in UTC timezone
     agent_csv:
       agent_name: Agent name
-      conversations_count: Conversations count
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      conversations_count: Assigned conversations
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     inbox_csv:
       inbox_name: Inbox name
       inbox_type: Inbox type
       conversations_count: No. of conversations
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     label_csv:
       label_title: Label
       conversations_count: No. of conversations
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     team_csv:
       team_name: Team name
       conversations_count: Conversations count
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     conversation_traffic_csv:
       timezone: Timezone
     default_group_by: day
@@ -228,3 +229,16 @@ ta:
       inbox_name: Inbox
       inbox_type: Inbox Type
     button: Open conversation
+  time_units:
+    days:
+      one: "%{count} day"
+      other: "%{count} days"
+    hours:
+      one: "%{count} hour"
+      other: "%{count} hours"
+    minutes:
+      one: "%{count} minute"
+      other: "%{count} minutes"
+    seconds:
+      one: "%{count} second"
+      other: "%{count} seconds"
diff --git a/config/locales/th.yml b/config/locales/th.yml
index b2a1b221c..92b4bd557 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -31,6 +31,7 @@ th:
       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}"
+      invalid_params: 'Invalid, please check the signup paramters and try again'
       failed: Signup failed
     data_import:
       data_type:
@@ -67,25 +68,25 @@ th:
     utc_warning: The report generated is in UTC timezone
     agent_csv:
       agent_name: Agent name
-      conversations_count: Conversations count
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      conversations_count: Assigned conversations
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     inbox_csv:
       inbox_name: Inbox name
       inbox_type: Inbox type
       conversations_count: No. of conversations
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     label_csv:
       label_title: ป้ายกำกับ
       conversations_count: No. of conversations
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     team_csv:
       team_name: ชื่อทีม
       conversations_count: Conversations count
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     conversation_traffic_csv:
       timezone: Timezone
     default_group_by: day
@@ -228,3 +229,12 @@ th:
       inbox_name: กล่องข้อความ
       inbox_type: Inbox Type
     button: เปิดดูการสนทนา
+  time_units:
+    days:
+      other: "%{count} days"
+    hours:
+      other: "%{count} hours"
+    minutes:
+      other: "%{count} minutes"
+    seconds:
+      other: "%{count} seconds"
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index e965b7e60..907f02f56 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -21,7 +21,7 @@ tr:
   messages:
     reset_password_success: Parola sıfırlama isteği başarılı. Talimatlar için postanızı kontrol edin.
     reset_password_failure: Belirtilen e-postaya sahip herhangi bir kullanıcı bulamadık.
-    inbox_deletetion_response: Inbox silme isteğiniz bir süre sonra işleme alınacaktır.
+    inbox_deletetion_response: Gelen kutusu silme isteğiniz bir süre sonra işleme alınacaktır.
   errors:
     validations:
       presence: boş bırakılmamalı
@@ -31,6 +31,7 @@ tr:
       disposable_email: Tek kullanımlık e-postalara izin vermiyoruz
       invalid_email: Geçersiz bir e-posta girdiniz
       email_already_exists: "%{email} ile zaten bir hesaba kaydoldunuz"
+      invalid_params: 'Hata, lütfen kayıt olma parametrelerini kontrol edin ve tekrar deneyin'
       failed: Kayıt başarısız oldu
     data_import:
       data_type:
@@ -67,25 +68,25 @@ tr:
     utc_warning: Oluşturulan rapor UTC zaman dilimindedir.
     agent_csv:
       agent_name: Temsilci adı
-      conversations_count: Konuşma sayısı
-      avg_first_response_time: Ortalama cevap süresi(dakika)
-      avg_resolution_time: Ortalama çözüm süresi(dakika)
+      conversations_count: Assigned conversations
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     inbox_csv:
       inbox_name: Inbox adı
       inbox_type: Inbox türü
       conversations_count: Konuşmaların sayısı
-      avg_first_response_time: Ortalama cevap süresi(dakika)
-      avg_resolution_time: Ortalama çözüm süresi(dakika)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     label_csv:
       label_title: Etiket
       conversations_count: Konuşma sayısı
-      avg_first_response_time: Ortalama cevap süresi(dakika)
-      avg_resolution_time: Ortalama çözüm süresi(dakika)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     team_csv:
       team_name: Ekip adı
       conversations_count: Konuşma sayısı
-      avg_first_response_time: Ortalama cevap süresi(dakika)
-      avg_resolution_time: Ortalama çözüm süresi(dakika)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     conversation_traffic_csv:
       timezone: Zaman dilimi
     default_group_by: gün
@@ -146,13 +147,13 @@ tr:
     reply:
       email:
         header:
-          from_with_name: "%{assignee_name} from %{inbox_name} <%{from_email}>"
-          reply_with_name: "%{assignee_name} from %{inbox_name} <reply+%{reply_email}>"
-          friendly_name: "%{sender_name} from %{business_name} <%{from_email}>"
+          from_with_name: "\"%{inbox_name} <%{from_email}> adresinden %{assignee_name}'e gönderildi,"
+          reply_with_name: "%{assignee_name} tarafından %{inbox_name} <reply+%{reply_email}>"
+          friendly_name: "%{sender_name} tarafından %{business_name} <%{from_email}>"
           professional_name: "%{business_name} <%{from_email}>"
       channel_email:
         header:
-          reply_with_name: "%{assignee_name} from %{inbox_name} <%{from_email}>"
+          reply_with_name: "\"%{inbox_name} <%{from_email}> adresinden %{assignee_name}'e gönderildi,"
           reply_with_inbox_name: "%{inbox_name} <%{from_email}>"
       email_subject: "Bu konuşmadaki yeni mesajlar"
       transcript_subject: "Konuşma Metni"
@@ -200,10 +201,10 @@ tr:
       article: makale
       articles: makaleler
       author: yazar
-      authors: authors
-      other: other
-      others: others
-      by: By
+      authors: yazarlar
+      other: diğer
+      others: diğerleri
+      by: Tarafından
       no_articles: Burada makale bulunmuyor
     footer:
       made_with: İle yapılmıştır
@@ -228,3 +229,16 @@ tr:
       inbox_name: Gelen Kutusu
       inbox_type: Gelen Kutusu Türü
     button: Görüşmeyi aç
+  time_units:
+    days:
+      one: "%{count} day"
+      other: "%{count} days"
+    hours:
+      one: "%{count} hour"
+      other: "%{count} hours"
+    minutes:
+      one: "%{count} minute"
+      other: "%{count} minutes"
+    seconds:
+      one: "%{count} second"
+      other: "%{count} seconds"
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 753e50908..5eae135e4 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -31,6 +31,7 @@ uk:
       disposable_email: Ми не дозволяємо використувати одноразові адреси електронної пошти
       invalid_email: Ви ввели неправильну адресу електронної пошти
       email_already_exists: "Ви вже зареєстровані з адресою %{email}"
+      invalid_params: 'Invalid, please check the signup paramters and try again'
       failed: Помилка реєстрації
     data_import:
       data_type:
@@ -39,7 +40,7 @@ uk:
       import:
         failed: Файл порожній
       export:
-        success: We will notify you once contacts export file is ready to view.
+        success: Ми повідомимо Вас, коли файл експорту контактів буде готовий до перегляду.
       email:
         invalid: Невірний email
       phone_number:
@@ -67,25 +68,25 @@ uk:
     utc_warning: Звіт створено в часовій зоні UTC
     agent_csv:
       agent_name: Ім'я агента
-      conversations_count: Кількість бесід
-      avg_first_response_time: Середній час першої відповіді (Хвилин)
-      avg_resolution_time: Середній час вирішення (Хвилин)
+      conversations_count: Assigned conversations
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     inbox_csv:
       inbox_name: Назва Джерела
       inbox_type: Тип Джерела
       conversations_count: '№ розмов'
-      avg_first_response_time: Середній час першої відповіді (Хвилин)
-      avg_resolution_time: Середній час вирішення (Хвилин)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     label_csv:
       label_title: Мітка
       conversations_count: '№ розмов'
-      avg_first_response_time: Середній час першої відповіді (Хвилин)
-      avg_resolution_time: Середній час вирішення (Хвилин)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     team_csv:
       team_name: Назва команди
       conversations_count: Кількість бесід
-      avg_first_response_time: Середній час першої відповіді (Хвилин)
-      avg_resolution_time: Середній час вирішення (Хвилин)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     conversation_traffic_csv:
       timezone: Timezone
     default_group_by: день
@@ -111,7 +112,7 @@ uk:
       instagram_deleted_story_content: Ця історія більше не доступна.
       deleted: Це повідомлення було видалено
       delivery_status:
-        error_code: "Error code: %{error_code}"
+        error_code: "Код помилки: %{error_code}"
     activity:
       status:
         resolved: "Розмова була відмічена як вирішена %{user_name}"
@@ -190,41 +191,62 @@ uk:
       empty_placeholder: Результатів не знайдено.
       loading_placeholder: Шукаємо...
       results_title: Результати пошуку
-    toc_header: 'On this page'
+    toc_header: 'На цій сторінці'
     hero:
       sub_title: Шукайте тут або перегляньте категорії нижче.
     common:
       home: Головна
       last_updated_on: Востаннє оновлено %{last_updated_on}
-      view_all_articles: View all
+      view_all_articles: Переглянути все
       article: статті
       articles: статті
       author: автор
-      authors: authors
-      other: other
-      others: others
-      by: By
+      authors: автори
+      other: інше
+      others: інші
+      by: Від
       no_articles: Тут немає статей
     footer:
       made_with: Зроблено з
     header:
-      go_to_homepage: Website
+      go_to_homepage: Вебсайт
       appearance:
-        system: System
-        light: Light
-        dark: Dark
+        system: Системна
+        light: Світла
+        dark: Темна
       featured_articles: Featured Articles
       uncategorized: Uncategorized
     404:
-      title: Page not found
-      description: We couldn't find the page you were looking for.
-      back_to_home: Go to home page
+      title: Сторінку не знайдено
+      description: Ми не змогли знайти сторінку, яку Ви шукали.
+      back_to_home: Перейти на головну сторінку
   slack_unfurl:
     fields:
       name: Ім'я
       email: Email
-      phone_number: Phone
+      phone_number: Телефон
       company_name: Організація
       inbox_name: Вхідні
-      inbox_type: Inbox Type
+      inbox_type: Тип Джерела
     button: Відкрити розмову
+  time_units:
+    days:
+      one: "%{count} day"
+      few: "%{count} days"
+      many: "%{count} days"
+      other: "%{count} days"
+    hours:
+      one: "%{count} hour"
+      few: "%{count} hours"
+      many: "%{count} hours"
+      other: "%{count} hours"
+    minutes:
+      one: "%{count} minute"
+      few: "%{count} minutes"
+      many: "%{count} minutes"
+      other: "%{count} minutes"
+    seconds:
+      one: "%{count} second"
+      few: "%{count} seconds"
+      many: "%{count} seconds"
+      other: "%{count} seconds"
diff --git a/config/locales/ur.yml b/config/locales/ur.yml
index 3c67067ee..947f9987d 100644
--- a/config/locales/ur.yml
+++ b/config/locales/ur.yml
@@ -31,6 +31,7 @@ ur:
       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}"
+      invalid_params: 'Invalid, please check the signup paramters and try again'
       failed: Signup failed
     data_import:
       data_type:
@@ -67,25 +68,25 @@ ur:
     utc_warning: The report generated is in UTC timezone
     agent_csv:
       agent_name: Agent name
-      conversations_count: Conversations count
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      conversations_count: Assigned conversations
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     inbox_csv:
       inbox_name: Inbox name
       inbox_type: Inbox type
       conversations_count: No. of conversations
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     label_csv:
       label_title: Label
       conversations_count: No. of conversations
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     team_csv:
       team_name: Team name
       conversations_count: Conversations count
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     conversation_traffic_csv:
       timezone: Timezone
     default_group_by: day
@@ -228,3 +229,16 @@ ur:
       inbox_name: ان باکس
       inbox_type: Inbox Type
     button: Open conversation
+  time_units:
+    days:
+      one: "%{count} day"
+      other: "%{count} days"
+    hours:
+      one: "%{count} hour"
+      other: "%{count} hours"
+    minutes:
+      one: "%{count} minute"
+      other: "%{count} minutes"
+    seconds:
+      one: "%{count} second"
+      other: "%{count} seconds"
diff --git a/config/locales/ur_IN.yml b/config/locales/ur_IN.yml
index 589ab0149..32b973fc1 100644
--- a/config/locales/ur_IN.yml
+++ b/config/locales/ur_IN.yml
@@ -31,6 +31,7 @@ ur:
       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}"
+      invalid_params: 'Invalid, please check the signup paramters and try again'
       failed: Signup failed
     data_import:
       data_type:
@@ -67,25 +68,25 @@ ur:
     utc_warning: The report generated is in UTC timezone
     agent_csv:
       agent_name: Agent name
-      conversations_count: Conversations count
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      conversations_count: Assigned conversations
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     inbox_csv:
       inbox_name: Inbox name
       inbox_type: Inbox type
       conversations_count: No. of conversations
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     label_csv:
       label_title: Label
       conversations_count: No. of conversations
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     team_csv:
       team_name: Team name
       conversations_count: Conversations count
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     conversation_traffic_csv:
       timezone: Timezone
     default_group_by: day
@@ -228,3 +229,16 @@ ur:
       inbox_name: Inbox
       inbox_type: Inbox Type
     button: Open conversation
+  time_units:
+    days:
+      one: "%{count} day"
+      other: "%{count} days"
+    hours:
+      one: "%{count} hour"
+      other: "%{count} hours"
+    minutes:
+      one: "%{count} minute"
+      other: "%{count} minutes"
+    seconds:
+      one: "%{count} second"
+      other: "%{count} seconds"
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 621972da8..7adbf7595 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -31,6 +31,7 @@ vi:
       disposable_email: Chúng tôi không cho phép các email dùng một lần
       invalid_email: Bạn đã nhập một email không hợp lệ
       email_already_exists: "Bạn đã đăng ký một tài khoản với %{email}"
+      invalid_params: 'Invalid, please check the signup paramters and try again'
       failed: Đăng ký thât bại
     data_import:
       data_type:
@@ -67,25 +68,25 @@ vi:
     utc_warning: Báo cáo đã được tạo với múi giờ UTC
     agent_csv:
       agent_name: Tên tổng đài viên
-      conversations_count: Số hội thoại
-      avg_first_response_time: Thời gian trung bình của phản hồi đầu tiên (phút)
-      avg_resolution_time: Thời gian giải quyết trung bình (phút)
+      conversations_count: Assigned conversations
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     inbox_csv:
       inbox_name: Tên kênh
       inbox_type: Kiểu kênh
       conversations_count: Số hội thoại
-      avg_first_response_time: Thời gian trung bình của phản hồi đầu tiên (phút)
-      avg_resolution_time: Thời gian giải quyết trung bình (phút)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     label_csv:
       label_title: Nhãn
       conversations_count: Số hội thoại
-      avg_first_response_time: Thời gian trung bình của phản hồi đầu tiên (phút)
-      avg_resolution_time: Thời gian giải quyết trung bình (phút)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     team_csv:
       team_name: Tên nhóm
       conversations_count: Số hội thoại
-      avg_first_response_time: Thời gian trung bình của phản hồi đầu tiên (phút)
-      avg_resolution_time: Thời gian giải quyết trung bình (phút)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     conversation_traffic_csv:
       timezone: Múi giờ
     default_group_by: ngày
@@ -228,3 +229,12 @@ vi:
       inbox_name: Hộp thư đến
       inbox_type: Inbox Type
     button: Mở cuộc trò chuyện
+  time_units:
+    days:
+      other: "%{count} days"
+    hours:
+      other: "%{count} hours"
+    minutes:
+      other: "%{count} minutes"
+    seconds:
+      other: "%{count} seconds"
diff --git a/config/locales/zh_CN.yml b/config/locales/zh_CN.yml
index 4cc8829d8..5a71b05b8 100644
--- a/config/locales/zh_CN.yml
+++ b/config/locales/zh_CN.yml
@@ -31,6 +31,7 @@ zh_CN:
       disposable_email: 我们不允许可用的电子邮件
       invalid_email: 您输入了一个无效的电子邮件
       email_already_exists: "您已经注册了 %{email} 的帐户"
+      invalid_params: 'Invalid, please check the signup paramters and try again'
       failed: 注册失败
     data_import:
       data_type:
@@ -67,25 +68,25 @@ zh_CN:
     utc_warning: 生成的报表在 UTC 时区
     agent_csv:
       agent_name: 客服名称
-      conversations_count: 对话数量
-      avg_first_response_time: 平均首次响应时间(分钟)
-      avg_resolution_time: 平均解决时间(分钟)
+      conversations_count: Assigned conversations
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     inbox_csv:
       inbox_name: 收件箱名称
       inbox_type: 收件箱类型
       conversations_count: No. of conversations
-      avg_first_response_time: 平均首次响应时间(分钟)
-      avg_resolution_time: 平均解决时间(分钟)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     label_csv:
       label_title: 标签
       conversations_count: No. of conversations
-      avg_first_response_time: 平均首次响应时间(分钟)
-      avg_resolution_time: 平均解决时间(分钟)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     team_csv:
       team_name: 团队名称
       conversations_count: 对话数量
-      avg_first_response_time: 平均首次响应时间(分钟)
-      avg_resolution_time: 平均解决时间(分钟)
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     conversation_traffic_csv:
       timezone: 时区
     default_group_by: 天
@@ -228,3 +229,12 @@ zh_CN:
       inbox_name: 收件箱
       inbox_type: 收件箱类型
     button: 重新打开会话
+  time_units:
+    days:
+      other: "%{count} days"
+    hours:
+      other: "%{count} hours"
+    minutes:
+      other: "%{count} minutes"
+    seconds:
+      other: "%{count} seconds"
diff --git a/config/locales/zh_TW.yml b/config/locales/zh_TW.yml
index ef093b32f..e3dd6cde3 100644
--- a/config/locales/zh_TW.yml
+++ b/config/locales/zh_TW.yml
@@ -31,6 +31,7 @@ zh_TW:
       disposable_email: 我們不允許一次性電子郵件。
       invalid_email: 您輸入的電子郵件無效。
       email_already_exists: "您已經註冊了一個帳號%{email}"
+      invalid_params: 'Invalid, please check the signup paramters and try again'
       failed: 註冊失敗。
     data_import:
       data_type:
@@ -67,25 +68,25 @@ zh_TW:
     utc_warning: The report generated is in UTC timezone
     agent_csv:
       agent_name: 客服名稱
-      conversations_count: 對話數量
-      avg_first_response_time: 平均第一次回覆時間（分鐘）
-      avg_resolution_time: 平均解決時間（分鐘）
+      conversations_count: Assigned conversations
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     inbox_csv:
       inbox_name: 收件匣名稱
       inbox_type: 收件匣類型
       conversations_count: No. of conversations
-      avg_first_response_time: 平均第一次回覆時間（分鐘）
-      avg_resolution_time: 平均解決時間（分鐘）
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     label_csv:
       label_title: Label
       conversations_count: No. of conversations
-      avg_first_response_time: 平均第一次回覆時間（分鐘）
-      avg_resolution_time: 平均解決時間（分鐘）
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     team_csv:
       team_name: 團隊名稱
       conversations_count: 對話數量
-      avg_first_response_time: 平均第一次回覆時間（分鐘）
-      avg_resolution_time: 平均解決時間（分鐘）
+      avg_first_response_time: Avg first response time
+      avg_resolution_time: Avg resolution time
     conversation_traffic_csv:
       timezone: Timezone
     default_group_by: day
@@ -228,3 +229,12 @@ zh_TW:
       inbox_name: 收件匣
       inbox_type: Inbox Type
     button: 開啟對話
+  time_units:
+    days:
+      other: "%{count} days"
+    hours:
+      other: "%{count} hours"
+    minutes:
+      other: "%{count} minutes"
+    seconds:
+      other: "%{count} seconds"

From 106319406b91ebe192eebe40b37f097e8522310c Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Thu, 22 Feb 2024 13:36:15 +0530
Subject: [PATCH 29/96] fix: remove rubocop rule (#8985)

* fix: remove rubocop rule

* chore: remove ignore comment

* chore: remove ignore comment
---
 .rubocop.yml                |  5 -----
 app/models/contact.rb       |  2 --
 app/models/user.rb          |  2 --
 lib/rubocop/user_find_by.rb | 16 ----------------
 4 files changed, 25 deletions(-)
 delete mode 100644 lib/rubocop/user_find_by.rb

diff --git a/.rubocop.yml b/.rubocop.yml
index f4187dbb5..5add6e26a 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -2,7 +2,6 @@ require:
   - rubocop-performance
   - rubocop-rails
   - rubocop-rspec
-  - ./lib/rubocop/user_find_by.rb
 
 Layout/LineLength:
   Max: 150
@@ -141,10 +140,6 @@ RSpec/MultipleExpectations:
 RSpec/MultipleMemoizedHelpers:
   Max: 14
 
-# custom rules
-UseFromEmail:
-  Enabled: true
-
 AllCops:
   NewCops: enable
   Exclude:
diff --git a/app/models/contact.rb b/app/models/contact.rb
index 07b29fdf3..1e9ab8dc6 100644
--- a/app/models/contact.rb
+++ b/app/models/contact.rb
@@ -168,9 +168,7 @@ class Contact < ApplicationRecord
   end
 
   def self.from_email(email)
-    # rubocop:disable UseFromEmail,Migration/DepartmentName
     find_by(email: email.downcase)
-    # rubocop:enable UseFromEmail,Migration/DepartmentName
   end
 
   private
diff --git a/app/models/user.rb b/app/models/user.rb
index b54f74a64..3fdaf7f25 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -157,9 +157,7 @@ class User < ApplicationRecord
   end
 
   def self.from_email(email)
-    # rubocop:disable UseFromEmail,Migration/DepartmentName
     find_by(email: email.downcase)
-    # rubocop:enable UseFromEmail,Migration/DepartmentName
   end
 
   private
diff --git a/lib/rubocop/user_find_by.rb b/lib/rubocop/user_find_by.rb
deleted file mode 100644
index 0bc248c27..000000000
--- a/lib/rubocop/user_find_by.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-require 'rubocop'
-
-# Enforces use of from_email for email attribute lookups
-class UseFromEmail < RuboCop::Cop::Cop
-  MSG = 'Use `from_email` for email lookups to ensure case insensitivity.'.freeze
-
-  def_node_matcher :find_by_email?, <<~PATTERN
-    (send _ :find_by (hash (pair (sym :email) _)))
-  PATTERN
-
-  def on_send(node)
-    return unless find_by_email?(node)
-
-    add_offense(node, message: MSG)
-  end
-end

From 1de3ff1a6dfd8fa00081f334d45a2eef1ea7ca19 Mon Sep 17 00:00:00 2001
From: Vishnu Narayanan <iamwishnu@gmail.com>
Date: Fri, 23 Feb 2024 04:58:28 +0530
Subject: [PATCH 30/96] chore(infra): Add GH action to ensure deployment
 success for every PR (#8990)

---
 .github/workflows/deploy_check.yml | 37 ++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 .github/workflows/deploy_check.yml

diff --git a/.github/workflows/deploy_check.yml b/.github/workflows/deploy_check.yml
new file mode 100644
index 000000000..246641595
--- /dev/null
+++ b/.github/workflows/deploy_check.yml
@@ -0,0 +1,37 @@
+## github action to check deployment success
+## curl the deployment url and check for 200 status
+## deployment url will be of the form chatwoot-pr-<pr_number>.herokuapp.com
+name: Deploy Check
+
+on:
+  pull_request:
+
+jobs:
+  deployment_check:
+    name: Check Deployment
+    runs-on: ubuntu-latest
+    steps:
+      - name: Install jq
+        run: sudo apt-get install -y jq
+      - name: Print Deployment URL
+        run: echo "https://chatwoot-pr-${{ github.event.pull_request.number }}.herokuapp.com"
+      - name: Check Deployment Status
+        run: |
+          max_attempts=10
+          attempt=1
+          status_code=0
+          while [ $attempt -le $max_attempts ]; do
+            response=$(curl -s  https://chatwoot-pr-${{ github.event.pull_request.number }}.herokuapp.com/api)
+            status_code=$(echo "$response" | jq -r 'if .version and .timestamp and .queue_services and .data_services then 200 else 400 end')
+            if [ $status_code -eq  200 ]; then
+              echo "Deployment successful"
+              exit  0
+            else
+              echo "Deployment status unknown, retrying in  3 minutes..."
+              sleep  180
+              attempt=$((attempt +  1))
+            fi
+          done
+          echo "Deployment failed after $max_attempts attempts"
+          exit  1
+          fi

From fa305d76e8c4f3dc5b75fe5125f00b5a0754de92 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Sat, 24 Feb 2024 01:28:02 +0530
Subject: [PATCH 31/96] fix: Add custom rubocop rules for email fetch (#8987)

---
 .rubocop.yml                   | 12 ++++++++++++
 rubocop/custom_cop_location.rb | 18 ++++++++++++++++++
 rubocop/use_from_email.rb      | 16 ++++++++++++++++
 3 files changed, 46 insertions(+)
 create mode 100644 rubocop/custom_cop_location.rb
 create mode 100644 rubocop/use_from_email.rb

diff --git a/.rubocop.yml b/.rubocop.yml
index 5add6e26a..1cdfbc713 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -2,6 +2,8 @@ require:
   - rubocop-performance
   - rubocop-rails
   - rubocop-rspec
+  - ./rubocop/use_from_email.rb
+  - ./rubocop/custom_cop_location.rb
 
 Layout/LineLength:
   Max: 150
@@ -140,6 +142,16 @@ RSpec/MultipleExpectations:
 RSpec/MultipleMemoizedHelpers:
   Max: 14
 
+# custom rules
+UseFromEmail:
+  Enabled: true
+  Exclude:
+    - 'app/models/user.rb'
+    - 'app/models/contact.rb'
+
+CustomCopLocation:
+  Enabled: true
+
 AllCops:
   NewCops: enable
   Exclude:
diff --git a/rubocop/custom_cop_location.rb b/rubocop/custom_cop_location.rb
new file mode 100644
index 000000000..8b5c287fc
--- /dev/null
+++ b/rubocop/custom_cop_location.rb
@@ -0,0 +1,18 @@
+require 'rubocop'
+
+# enforce rubocop custom rules to only be added in the `rubocop` directory
+class CustomCopLocation < RuboCop::Cop::Base
+  MSG = 'Custom cops should be added in the `rubocop` directory.'.freeze
+
+  def on_send(node)
+    return unless node.source.include?('require \'rubocop\'')
+
+    # convert the full path to relative
+    full_path = processed_source.file_path
+    relative_path = Pathname.new(full_path).relative_path_from(Pathname.new(Dir.pwd)).to_s
+
+    return if relative_path.start_with?('rubocop')
+
+    add_offense(node, message: MSG)
+  end
+end
diff --git a/rubocop/use_from_email.rb b/rubocop/use_from_email.rb
new file mode 100644
index 000000000..189877c94
--- /dev/null
+++ b/rubocop/use_from_email.rb
@@ -0,0 +1,16 @@
+require 'rubocop'
+
+# Enforces use of from_email for email attribute lookups
+class UseFromEmail < RuboCop::Cop::Base
+  MSG = 'Use `from_email` for email lookups to ensure case insensitivity.'.freeze
+
+  def_node_matcher :find_by_email?, <<~PATTERN
+    (send _ :find_by (hash (pair (sym :email) _)))
+  PATTERN
+
+  def on_send(node)
+    return unless find_by_email?(node)
+
+    add_offense(node, message: MSG)
+  end
+end

From ab56374b2fe0b895132788acd5bb2902ff951453 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Mon, 26 Feb 2024 15:25:21 +0530
Subject: [PATCH 32/96] chore: Fix Bundle Audit  Breakages (#9016)

Name: actionpack
Version: 7.0.8
CVE: CVE-2024-26143
Criticality: Unknown
URL: https://discuss.rubyonrails.org/t/possible-xss-vulnerability-in-action-controller/84947

-----

Name: rack
Version: 2.2.8
CVE: CVE-2024-25126
Criticality: Unknown
URL: https://discuss.rubyonrails.org/t/denial-of-service-vulnerability-in-rack-content-type-parsing/84941
---
 Gemfile      |   2 +-
 Gemfile.lock | 110 +++++++++++++++++++++++++--------------------------
 2 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/Gemfile b/Gemfile
index a21af8c01..21e942e0f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,7 +4,7 @@ ruby '3.2.2'
 
 ##-- base gems for rails --##
 gem 'rack-cors', require: 'rack/cors'
-gem 'rails', '~> 7.0.8.0'
+gem 'rails', '~> 7.0.8.1'
 # Reduces boot times through caching; required in config/boot.rb
 gem 'bootsnap', require: false
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 35e1e2a48..738a3415f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -33,70 +33,70 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.0.8)
-      actionpack (= 7.0.8)
-      activesupport (= 7.0.8)
+    actioncable (7.0.8.1)
+      actionpack (= 7.0.8.1)
+      activesupport (= 7.0.8.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.8)
-      actionpack (= 7.0.8)
-      activejob (= 7.0.8)
-      activerecord (= 7.0.8)
-      activestorage (= 7.0.8)
-      activesupport (= 7.0.8)
+    actionmailbox (7.0.8.1)
+      actionpack (= 7.0.8.1)
+      activejob (= 7.0.8.1)
+      activerecord (= 7.0.8.1)
+      activestorage (= 7.0.8.1)
+      activesupport (= 7.0.8.1)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.0.8)
-      actionpack (= 7.0.8)
-      actionview (= 7.0.8)
-      activejob (= 7.0.8)
-      activesupport (= 7.0.8)
+    actionmailer (7.0.8.1)
+      actionpack (= 7.0.8.1)
+      actionview (= 7.0.8.1)
+      activejob (= 7.0.8.1)
+      activesupport (= 7.0.8.1)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.0)
-    actionpack (7.0.8)
-      actionview (= 7.0.8)
-      activesupport (= 7.0.8)
+    actionpack (7.0.8.1)
+      actionview (= 7.0.8.1)
+      activesupport (= 7.0.8.1)
       rack (~> 2.0, >= 2.2.4)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (7.0.8)
-      actionpack (= 7.0.8)
-      activerecord (= 7.0.8)
-      activestorage (= 7.0.8)
-      activesupport (= 7.0.8)
+    actiontext (7.0.8.1)
+      actionpack (= 7.0.8.1)
+      activerecord (= 7.0.8.1)
+      activestorage (= 7.0.8.1)
+      activesupport (= 7.0.8.1)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.0.8)
-      activesupport (= 7.0.8)
+    actionview (7.0.8.1)
+      activesupport (= 7.0.8.1)
       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 (7.0.8)
-      activesupport (= 7.0.8)
+    activejob (7.0.8.1)
+      activesupport (= 7.0.8.1)
       globalid (>= 0.3.6)
-    activemodel (7.0.8)
-      activesupport (= 7.0.8)
-    activerecord (7.0.8)
-      activemodel (= 7.0.8)
-      activesupport (= 7.0.8)
+    activemodel (7.0.8.1)
+      activesupport (= 7.0.8.1)
+    activerecord (7.0.8.1)
+      activemodel (= 7.0.8.1)
+      activesupport (= 7.0.8.1)
     activerecord-import (1.4.1)
       activerecord (>= 4.2)
-    activestorage (7.0.8)
-      actionpack (= 7.0.8)
-      activejob (= 7.0.8)
-      activerecord (= 7.0.8)
-      activesupport (= 7.0.8)
+    activestorage (7.0.8.1)
+      actionpack (= 7.0.8.1)
+      activejob (= 7.0.8.1)
+      activerecord (= 7.0.8.1)
+      activesupport (= 7.0.8.1)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (7.0.8)
+    activesupport (7.0.8.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -559,7 +559,7 @@ GEM
       activesupport (>= 3.0.0)
     raabro (1.4.0)
     racc (1.7.3)
-    rack (2.2.8)
+    rack (2.2.8.1)
     rack-attack (6.7.0)
       rack (>= 1.0, < 4)
     rack-contrib (2.4.0)
@@ -575,20 +575,20 @@ GEM
     rack-test (2.1.0)
       rack (>= 1.3)
     rack-timeout (0.6.3)
-    rails (7.0.8)
-      actioncable (= 7.0.8)
-      actionmailbox (= 7.0.8)
-      actionmailer (= 7.0.8)
-      actionpack (= 7.0.8)
-      actiontext (= 7.0.8)
-      actionview (= 7.0.8)
-      activejob (= 7.0.8)
-      activemodel (= 7.0.8)
-      activerecord (= 7.0.8)
-      activestorage (= 7.0.8)
-      activesupport (= 7.0.8)
+    rails (7.0.8.1)
+      actioncable (= 7.0.8.1)
+      actionmailbox (= 7.0.8.1)
+      actionmailer (= 7.0.8.1)
+      actionpack (= 7.0.8.1)
+      actiontext (= 7.0.8.1)
+      actionview (= 7.0.8.1)
+      activejob (= 7.0.8.1)
+      activemodel (= 7.0.8.1)
+      activerecord (= 7.0.8.1)
+      activestorage (= 7.0.8.1)
+      activesupport (= 7.0.8.1)
       bundler (>= 1.15.0)
-      railties (= 7.0.8)
+      railties (= 7.0.8.1)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
@@ -596,9 +596,9 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    railties (7.0.8)
-      actionpack (= 7.0.8)
-      activesupport (= 7.0.8)
+    railties (7.0.8.1)
+      actionpack (= 7.0.8.1)
+      activesupport (= 7.0.8.1)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
@@ -921,7 +921,7 @@ DEPENDENCIES
   rack-cors
   rack-mini-profiler (>= 3.2.0)
   rack-timeout
-  rails (~> 7.0.8.0)
+  rails (~> 7.0.8.1)
   redis
   redis-namespace
   responders (>= 3.1.1)

From 8f6ff4bc415b347cd6c6e3331bda4a0c005055bd Mon Sep 17 00:00:00 2001
From: Vishnu Narayanan <iamwishnu@gmail.com>
Date: Mon, 26 Feb 2024 16:14:01 +0530
Subject: [PATCH 33/96] chore: refactor deploy check gh action (#9018)

* chore: refactor deploy check action

    Refactor deployment check gh action to account for the initial setup time required for heroku review apps
    Process /api response via jq only if http.status_code is 200
---
 .github/workflows/deploy_check.yml | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/deploy_check.yml b/.github/workflows/deploy_check.yml
index 246641595..7fda2b1a4 100644
--- a/.github/workflows/deploy_check.yml
+++ b/.github/workflows/deploy_check.yml
@@ -20,15 +20,23 @@ jobs:
           max_attempts=10
           attempt=1
           status_code=0
+          echo "Waiting for review app to be deployed/redeployed, trying in  10 minutes..."
+          sleep 600
           while [ $attempt -le $max_attempts ]; do
-            response=$(curl -s  https://chatwoot-pr-${{ github.event.pull_request.number }}.herokuapp.com/api)
-            status_code=$(echo "$response" | jq -r 'if .version and .timestamp and .queue_services and .data_services then 200 else 400 end')
-            if [ $status_code -eq  200 ]; then
-              echo "Deployment successful"
-              exit  0
+            response=$(curl -s -o /dev/null -w "%{http_code}" https://chatwoot-pr-${{ github.event.pull_request.number }}.herokuapp.com/api)
+            status_code=$(echo $response | head -n   1)
+            if [ $status_code -eq   200 ]; then
+              body=$(curl -s https://chatwoot-pr-${{ github.event.pull_request.number }}.herokuapp.com/api)
+              if echo "$body" | jq -e '.version and .timestamp and .queue_services == "ok" and .data_services == "ok"' > /dev/null; then
+                echo "Deployment successful"
+                exit 0
+              else
+                echo "Deployment status unknown, retrying in   3 minutes..."
+                sleep 180
+              fi
             else
-              echo "Deployment status unknown, retrying in  3 minutes..."
-              sleep  180
+              echo "Waiting for review app to be ready, retrying in  3 minutes..."
+              sleep 180
               attempt=$((attempt +  1))
             fi
           done

From 77e463990a678805c75c0e8cae946048544ebc61 Mon Sep 17 00:00:00 2001
From: Vishnu Narayanan <iamwishnu@gmail.com>
Date: Mon, 26 Feb 2024 16:41:05 +0530
Subject: [PATCH 34/96] feat: seed db for heroku review apps (#9019)

---
 app.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app.json b/app.json
index a89f2a08a..4ee025f06 100644
--- a/app.json
+++ b/app.json
@@ -72,6 +72,11 @@
       "scripts": {
         "test": "bundle exec rake test"
       }
+    },
+    "review": {
+      "scripts": {
+        "postdeploy": "bundle exec rails db:seed"
+      }
     }
   }
 }

From 773be6f8ec85426edfea60502539e4ab706bd040 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Mon, 26 Feb 2024 20:20:12 +0530
Subject: [PATCH 35/96] feat: Interface to validate response_source (#8894)

- This PR adds a UI to validate the response source quality quickly. It also helps to test with sample questions and update responses in the database when missing.

Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
---
 .../super_admin/application_controller.rb     |  15 ++
 app/javascript/packs/superadmin_pages.js      |  27 ++++
 .../components/playground/BotMessage.vue      |  17 +++
 .../components/playground/Header.vue          |  40 +++++
 .../components/playground/TypingIndicator.vue |  13 ++
 .../components/playground/UserMessage.vue     |  17 +++
 .../components/playground/assets/typing.gif   | Bin 0 -> 19296 bytes
 .../views/playground/Index.vue                | 139 ++++++++++++++++++
 app/views/super_admin/accounts/show.html.erb  |   2 +-
 .../super_admin/application/show.html.erb     |  65 ++++++++
 app/views/super_admin/users/show.html.erb     |   8 +-
 config/routes.rb                              |   5 +-
 .../super_admin/enterprise_base_controller.rb |   8 +
 .../response_documents_controller.rb          |   2 +-
 .../response_sources_controller.rb            |  34 ++++-
 .../super_admin/responses_controller.rb       |   2 +-
 enterprise/app/jobs/response_builder_job.rb   |  22 +--
 enterprise/app/models/response_source.rb      |   5 +
 .../message_templates/response_bot_service.rb |  71 +++++----
 .../response_sources/chat.html.erb            |   5 +
 .../response_sources/show.html.erb            |  71 +++++++++
 enterprise/lib/chat_gpt.rb                    |   2 +-
 tailwind.config.js                            |   1 +
 23 files changed, 514 insertions(+), 57 deletions(-)
 create mode 100644 app/javascript/superadmin_pages/components/playground/BotMessage.vue
 create mode 100644 app/javascript/superadmin_pages/components/playground/Header.vue
 create mode 100644 app/javascript/superadmin_pages/components/playground/TypingIndicator.vue
 create mode 100644 app/javascript/superadmin_pages/components/playground/UserMessage.vue
 create mode 100644 app/javascript/superadmin_pages/components/playground/assets/typing.gif
 create mode 100644 app/javascript/superadmin_pages/views/playground/Index.vue
 create mode 100644 app/views/super_admin/application/show.html.erb
 create mode 100644 enterprise/app/controllers/super_admin/enterprise_base_controller.rb
 create mode 100644 enterprise/app/views/super_admin/response_sources/chat.html.erb
 create mode 100644 enterprise/app/views/super_admin/response_sources/show.html.erb

diff --git a/app/controllers/super_admin/application_controller.rb b/app/controllers/super_admin/application_controller.rb
index 3b98a6e21..775fb34fc 100644
--- a/app/controllers/super_admin/application_controller.rb
+++ b/app/controllers/super_admin/application_controller.rb
@@ -5,6 +5,10 @@
 # If you want to add pagination or other controller-level concerns,
 # you're free to overwrite the RESTful controller actions.
 class SuperAdmin::ApplicationController < Administrate::ApplicationController
+  include ActionView::Helpers::TagHelper
+  include ActionView::Context
+
+  helper_method :render_vue_component
   # authenticiation done via devise : SuperAdmin Model
   before_action :authenticate_super_admin!
 
@@ -23,6 +27,17 @@ class SuperAdmin::ApplicationController < Administrate::ApplicationController
 
   private
 
+  def render_vue_component(component_name, props = {})
+    html_options = {
+      id: 'app',
+      data: {
+        component_name: component_name,
+        props: props.to_json
+      }
+    }
+    content_tag(:div, '', html_options)
+  end
+
   def invalid_action_perfomed
     # rubocop:disable Rails/I18nLocaleTexts
     flash[:error] = 'Invalid action performed'
diff --git a/app/javascript/packs/superadmin_pages.js b/app/javascript/packs/superadmin_pages.js
index ef82fc261..301d2bbee 100644
--- a/app/javascript/packs/superadmin_pages.js
+++ b/app/javascript/packs/superadmin_pages.js
@@ -1 +1,28 @@
 import 'chart.js';
+import Vue from 'vue';
+import VueDOMPurifyHTML from 'vue-dompurify-html';
+Vue.use(VueDOMPurifyHTML);
+
+const PlaygroundIndex = () =>
+  import('../superadmin_pages/views/playground/Index.vue');
+
+const ComponentMapping = {
+  PlaygroundIndex: PlaygroundIndex,
+};
+
+const renderComponent = (componentName, props) => {
+  Vue.component(componentName, ComponentMapping[componentName]);
+  new Vue({
+    data: { props: props },
+    template: `<${componentName} :component-data="props"/>`,
+  }).$mount('#app');
+};
+
+document.addEventListener('DOMContentLoaded', () => {
+  const element = document.getElementById('app');
+  if (element) {
+    const componentName = element.dataset.componentName;
+    const props = JSON.parse(element.dataset.props);
+    renderComponent(componentName, props);
+  }
+});
diff --git a/app/javascript/superadmin_pages/components/playground/BotMessage.vue b/app/javascript/superadmin_pages/components/playground/BotMessage.vue
new file mode 100644
index 000000000..51cff90fe
--- /dev/null
+++ b/app/javascript/superadmin_pages/components/playground/BotMessage.vue
@@ -0,0 +1,17 @@
+<script setup>
+defineProps({
+  message: {
+    type: String,
+    required: true,
+  },
+});
+</script>
+
+<template>
+  <div class="w-full mb-4 flex items-center justify-start">
+    <div
+      v-dompurify-html="message"
+      class="px-4 py-3 bg-white max-w-4xl text-slate-700 leading-6 text-sm rounded-md inline-block border border-slate-100"
+    />
+  </div>
+</template>
diff --git a/app/javascript/superadmin_pages/components/playground/Header.vue b/app/javascript/superadmin_pages/components/playground/Header.vue
new file mode 100644
index 000000000..e17dad415
--- /dev/null
+++ b/app/javascript/superadmin_pages/components/playground/Header.vue
@@ -0,0 +1,40 @@
+<script setup>
+defineProps({
+  responseSourcePath: {
+    type: String,
+    required: true,
+  },
+  responseSourceName: {
+    type: String,
+    required: true,
+  },
+});
+</script>
+
+<template>
+  <header
+    class="flex items-center px-8 py-4 bg-white border-b border-slate-100"
+    role="banner"
+  >
+    <a :href="responseSourcePath" class="text-woot-500 hover:underline mr-4">
+      Back
+    </a>
+    <div
+      class="border border-solid border-slate-100 text-slate-700 mr-4 p-2 rounded-full"
+    >
+      <svg width="24" height="24"><use xlink:href="#icon-mist-fill" /></svg>
+    </div>
+    <div class="flex flex-col h-14 justify-center">
+      <h1 id="page-title" class="text-base font-medium text-slate-900">
+        Robin AI playground
+      </h1>
+      <p class="text-sm text-slate-600">
+        Chat with the source
+        <span class="font-medium">
+          {{ responseSourceName }}
+        </span>
+        and evaluate it’s efficiency.
+      </p>
+    </div>
+  </header>
+</template>
diff --git a/app/javascript/superadmin_pages/components/playground/TypingIndicator.vue b/app/javascript/superadmin_pages/components/playground/TypingIndicator.vue
new file mode 100644
index 000000000..c11e523da
--- /dev/null
+++ b/app/javascript/superadmin_pages/components/playground/TypingIndicator.vue
@@ -0,0 +1,13 @@
+<script setup>
+import TypingIndicator from './assets/typing.gif';
+</script>
+
+<template>
+  <div class="w-full mb-4 flex items-center justify-start">
+    <div
+      class="px-2 py-2 bg-white max-w-4xl text-slate-700 leading-6 text-sm rounded-md inline-block border border-slate-100"
+    >
+      <img :src="TypingIndicator" alt="TypingIndicator" class="h-4" />
+    </div>
+  </div>
+</template>
diff --git a/app/javascript/superadmin_pages/components/playground/UserMessage.vue b/app/javascript/superadmin_pages/components/playground/UserMessage.vue
new file mode 100644
index 000000000..ee90f163e
--- /dev/null
+++ b/app/javascript/superadmin_pages/components/playground/UserMessage.vue
@@ -0,0 +1,17 @@
+<script setup>
+defineProps({
+  message: {
+    type: String,
+    required: true,
+  },
+});
+</script>
+
+<template>
+  <div class="w-full mb-4 flex items-center justify-end">
+    <div
+      v-dompurify-html="message"
+      class="px-4 py-3 bg-woot-400 text-white text-sm rounded-md inline-block"
+    />
+  </div>
+</template>
diff --git a/app/javascript/superadmin_pages/components/playground/assets/typing.gif b/app/javascript/superadmin_pages/components/playground/assets/typing.gif
new file mode 100644
index 0000000000000000000000000000000000000000..b288d2559786cff49bc67fd8d994f85a7db6188f
GIT binary patch
literal 19296
zcmdsfcU049yKO=Ogx(?a4x#rh4qZS%niNGviUNY7A|fItfk5b?h0uGi(vc#)gA@TP
zQWfi<<5*|L`zEo>eC3?+-22D<j%(J;TC<2re(!#sXFq%Imwi?ix_ZZbAi9uu#*ozX
zOk8YSR(5VCku*2I(Ajkz8-<I;#ipiZRM*sza`Lis^U>I7Qg$vrK9P`?5topZo|%<F
zB&B5#WAO=-lT#_F>DRk^YU>(`OUeq0N@izomX%lL<mN}=Vy|MNV({?^Nhvckvx9@f
zL{d&tO6v0RN^jqd#AHHjTtaSML48A0M`zcqTT8<uqphv&__)N(tn6e$T3dU^-MjbV
z6O*T=XEL&~(}|=^QqJn?!zdg+Iwo#zZeeR{JFlRqySw*B|G?PTc+<5O@NU@X*eh4D
zk!bMd@p17<iOH$Ssp*x~HN>p!EK*K(PTsZVmZW3?HaZ3qg}ZTMAUD6Tzkjf&x9`@i
z<zzx?cTewCG&U!%;NinHH28^_xasNH(b4fcckV7NuSDbU3k!=K9bH31Bdu-i4<4-E
zyLW$JaA<vFBPKR(etzNR&H1XD+Q_SzipuJS#%qhWmf{nWqM~CHl9HQSTD!Wg_x0UK
zNKEd!-aRxtGJA7w<@TMs_wL_+uv*{HSXosQiN;P&O-IMzuUy5{)YkX)^{=h1-<+E-
zudFI8F2%<sjEzlfZf@ll6pf6Ib#`8FZ|_`OT)N)fJ3qg;ynH()HLawqd}3nq9{3wq
z*GkJOGBUGbV!=m90cX&3tvN5haBO@cC$}IuC9R;KxTUpiVewW}bWD3kCowB$U|=YP
zklxzXk)BR0E-tO8sH(26t*x!!*xZ_%n+KmV2|UUSA|W-sq@;Xi_GVms;^N}1`Gv*8
zqLM3-=!uD`!J*;lnc4D+s+%|Gii^wY>Kn6j^VT;uiA2)FwKV{R+qdr&6_=KmS6;i;
zvb40En_G~dUszC3R9ILtFff>!K_q79Ha1;bS-IUmFxYpae|%!Hy`w8SHtt$;Ye`u}
zT|;AcPhVSmXH|9W@bD-&WIR40iI7%SQCZ*Egu&u^dv8omPLGa_-&$HODJ}2lyq=gu
zNKMP^>FL8p#Wc6HUAc;`t8eJ;?pa>B-O}2=zP=&;naR%F*~!${-dtT-6$XVsAmV?B
z?(;qEd+vCMuaB75C9yN71N~3??z6H8IddlPyt4P1Ac*(}I0GDF3{eC>4k1@k40r<I
z_yFKRu>jxzfB^`CqXfkTN&uW4C>#K0PzwP0pb7xOLE(Uc0tE<4iCR+t`JhIKq+C#s
zSvh&+>Z24Os3w3(fYtoMBJi|JO3OfrRaRBk)Pir*1fCc`H2@?i8E}-Knm|1QNP`Cm
zuni6cpk-omYGwu;3jpaNICSv!0rmj+0Du9E0n9cwHp$=RKlTs(XS6XkDjF9Pi;s&>
zNK8sj0SBL+kx9%VW#{DP<rfqd6@%wiUh(y@fu}}!Xw=6AIud}~P^q50Bp;W!tOiM6
zL25#5dRB3MQbsLTnvQ{khnI^P&aIOvgLtyGv8DBxfu8*t%L@|QD-ofOpV(pQ=^NTx
zoAeS`2p?pE<-V&bnsNU-Mou3@zl9Vdqm<n=UlD&9D?;-$91^v_0F%)1if%P2p1cA_
z@4>2xZCi?_MHWR^rH)9R*>k+&y_`}N4Og0%kQ>rDN>aceH|Day!J0D8*JbDI`%5_(
z=?--~+Rbrz22BuMv9k3{c0l-^D1D%2!p93uN(jhp4)RHV?B0Cg=ZgAnSg^;?srgwC
z0iyh3QS!_q#a*{@43F7L$#~rb&W=821u0MWU$-H7$%i`M9M%>0OUCNuMq=Kz#YSaD
zKwhXWoRkt{ntU62<jx?ZENgE_seNnizMJoJROU{oUvCXVXe{;1uiwKzCkB${=7jTp
z-ra=7hgsJ3etNgNIaPSzM&IwB-v9FK;msR2KD%Rnth5l|NjgEeATgkyf~JhdM1u;a
z))nZ>ps#`X0qP2jrGGB1Z$$;B+P9(t&E<Ptfr_FQRbByTiv@+n0384yplO2M4f+e{
zzhI<+>Y~5|lvUUD>ph?&1CUS(Y8><?&}+bO0xb{BJWyI-d{V0mbRW>^Kxcoj`Vh33
z{~e`etf>;aCmNJi)E)&%9u84im87ghLjrHQj55hkhK-gEQ7)=VsxdC9Ok;s@sMlu6
z(Km25u~jE1cMA5i!^B$?Ip6|91N|a{iX-vd<Defw<>Qs0X-m_zTys%fGY?jY>q2x}
z+k%intR4h;>p89Ty28-&X&%^5b9a|tNUoXM!x3-jR?(rJt9#Gfj#pcItC}BY@=^Yf
zBHd>0sHc!&WJtgDz&=82V18hwWcfroZ9oJG-m)#vuDNeExN8BzY-h-~I$b?4dw}$l
zG~BQz-QPg~B{RsJ-6XM8t*-78VuU>&lPcGP)zV!rMZ1qU^D2=-51C)ZdU}oD`zY?g
zPR{}l<(eCOY23T?o>RZL&4Z@f7_Dez&m*zX{ZwFocNOX>Y=|AbN4d*Wi1s+ssv+;I
zXGrYHM4wiLk$&fBd@fVmM?o+1z<n|`1AVPgxOi@bxm6LnJ?uX;au5(sP#1jEy7;Gg
zL#+!?5rAia!T)vGq=I3SmYxZCTP87^ToGAd%>4UF1B#-csGz7AOl!dEz$gWc6U=qM
zQ9xY)W&>s?;2(f3k=y3L5a2^#$bc~e=mlUffHMJp07wI1OMut`<^(1>sE9jv0i(N5
z<~yqo*VfkomHCeyH{=ga9XZAZsw&##x}c1lcoZiCeHN>@W*Qhdd1^#<KK^nZMz~C2
zZC!yfO=(3lKU}1~qcdI~!X?<!LL=KXR9^|6p>Ca?oMf+vtkTe)nNb<V1Z|k`_zlEh
zp)6e%M=ukMO|1h(+Gc;uq7p5Kc<`W*t!=DdzAm$D98!jSBTh7QN1P4`ADa<@@V#f%
zeE!yct|ba_D!4>vem%ub!Snc@ZOQR*pFF7oO|;kgNYq0t-oQNo%5J5?_*{^|TGp1%
z*mI|}%K>V8h*9$FZ+eoJG#8ODql~SAHA|SfRJLF68}uIDo`&nsbF>^88h+Z&zTeK}
z>(HF$M{Ed`$HT9;bB{g=-cCo&_IWXM;Z;vVVGe5&4T0IO%X{I{$Qi#-8eFT(bA89>
z(6pdiy~9Gn%hLzcrZL6BP-7v&wI|EfGrZbaD$sTpi4(bkD=ML7{D(ympV0zYEL>Xq
zctp7of4@F-Ac_bGGpG+?2oB5*K*qqt05lA6F!H#FPo#1%K*0Vr`}$K^{4@IkH38Vy
zx0(R6f?5-R=z{HoToYZ?k|2{VP!NEKj*U-(iU3mr3<yvRpcKGhpmKgn4Q%`u6+rj7
zKi3{9cu*h_zfUVrzi_T9#JW73j!tSgwf}m}T2q*Z26ysKNWbRk?gz1EGPYR|x1W1N
z<Rzw`h0tD(3im~$VbakF-m);hSaf3gK~cuk3v?P8dG?&FB#cUanQ38h04Qv+tg3yq
zxwZMpghtLY=0qzARJ4Y4H?sFYOe0Nv&=q(CGlGUmDO?inR%AJ6V|(Q)2^+*T*NzE1
z&Ax$`vZFmmy0~`orQGg=C$_$kn*p*x(mOA;hi{ok7saHr&hZ8g@UpPtyq^vZW8QD!
zIB?wfE{9h;yiux3`XYzTXC$FW&)>3t8<d}@hc3vs8C29e8DiDyr-$8Zw)Wd+9CZFe
zG1FvAfnZ@OPRdMKL#T1(&%WlDhp=EiOStD>D4nuB_vXHIuCHW`p{}h)+}ib-yC$@5
z@3*_swu3y{?L6>dI{|ef$je7g<8Mp-0FL&Oal{C4BnrWSZR|U*C$E@aseMcwmEBX3
z_0KE>uzNu5GcvzWkniM!O6mclr;z%8fEBgX0ty25Z)&#%iwjuGz$OGJ2)W~uN&U#k
z$d_&l$OpC4f<_DA^$lHM@uGr@?z2&0u<rh(<i-cV6BHadKg9|OrCCW8qik=iHMt=;
zopp0s!>{!xJ=_iMDs5=I^r|QF3FF)gH23AGv&_60G>vL>qNh5oA0C~Q;ULSF7H625
zXM^O<4rSENFW<{|viOu%MZOpp__%qBOxFTh@^oRT#Y}Qtc_Qq+X)yg@Jw>Tl5mdru
zgQ+SZSrxlIkt1;m!6*;+ShgOGOY)3}b?!|Lbz6<Qcp8adF2cPKsM4?SLd?gXh3?l5
zq0x+ySGPuxE#k(5S66acckJ1Paojp<x580pxJY}2KCcg)C@mAA{Ubsc9woi3;*_#$
zb<W2~M#AawX@5(?*~!tM!}M-lG_)C`S^M?5It6oX?QnB(<Pfcm>vpmVmGjTVJ8+?F
zb1{eXLb_h>k2)cLc-vXpXksif@ceW$XIc?c%t;Ms-cl(>Df{wRpjxN|GF!pyrbpb4
z(h;xAOmF#l9XHLa*%j&TH05;)ri=akW@Y%bS&5KA_OJIxu>5`l**_yJB{k#w3i;<P
zlCnqwz<qCG)cvub2&_S0M|vfox?rROoB^H-R&vn6fTRGn<}T330NL#$?~h=%gGL5)
z9-!d>eFLogV3>oo@!`XVe;(kVSryoanVv;)C8D&yHmi8Xr2Q6AaY&KYnlKyXXS|6i
z*N0BC9op{nm_?)ShP?}%{n_*Y<Hbu+jFB-{4CtZ~#OM@b3BIcIrxGuvk`7975To_7
zi|hpt<%coq6jz&;f___5EfZQF$fVy?t(MWsBXmVuLtV2lR$ocF4rOB(*Fzh8c8?r8
zJ)<8+JyL!-?=UNz{j%*MHlO*NhTq{!FwqG9wahT6g58Df1c=sI4M<tS@>ZB7I)yz^
zW>1w`32`P7eSt`06|hp%&nk=VyfpN>#wOOioF<w-9p@S^tLu`u!zqF5)YWAiPtf(U
zVKMI!=?~{X$+BHlQ{pA<@ifg;JSv(HK;!;O8dcWzR>?f4-@n4vIn(jDxMrn`y>azw
zjR{Ov#Z3n>{oL%)(GjlB@OmvvnLu-|nuUU2Nu&2AJq%s;<lWopzp2aknAHdxhF_zH
zh$iy5*`DTuGkIv9_Szh3qg!!C$~)G&_RgS=)!7dW$~XJ~>~zVnqjE^xH`(GJGz%O)
zo;osteDp6jtncG9otU1H1(YT-w<HrwvV`#kd6W$c$W>G(3Fal}YW4MvK+OUD4CrX&
zZgvCEM{+X*DjV3Tz^DZM45$=<Hv*i2W(K$-*r5L1m;}8oFBqRtpR8SSZo+x_Xr0@6
z>w4v&vI+5GRn5Ihr+zK-59}z(3R5~-Y#1B{<QxTW0=As%@g9U!DArnzhF|o`m7`HA
zFmAE9vvkO)L`XzxJSI>(2A_RSGBfmYVNo!RdZ0LKMJ3cRN(&_!DJre7UoE6E=aeS8
zH!eyBaTMu$mE*Xn?6JYLQ}Xl;y=>TtB?45|lrWd3;pM(ob#3!jFGSu%aD1ELvGaCX
zKv2&h-0IDvoj3HV%dIq(Met;=&t*#Q_n9&?8}7!hO?6C6ng&&Js}FOmAK81^OD1D-
zY*w^KRax1gbrIoRa_ZE0KDVQnmz2hEV4u*O{ie;a9JrVdV|b~fEyLY*y!WEI1P4;&
zIw>{YD}%r%IJ@=AF*Sn@dn9(w{%lF0QSAW-66&m%`Mfo*uliYB`^zfEn@10}O?52f
zxzc@N<kj4`y<&RQk@@I!b9A2JgA6$If85Q$$_}O`hD^Y4f0n|&(lGLZ@(*elb!-2E
zBPxif9W0luLQ@qmpfHz~SAx~NrKJtDDIk9K^xgoS3g8GVB7=j&<XvQV6rc(0B0!S_
z)QjA=0Ho#@7Zz@T_63jy#9s2KynXl19kK!j#9pwb|6?}`wp0{I8DCY(D7I8Aa5`sQ
zf2eUJMf_ErE>j9msEsn8Fuo#O36cG9*T-kT{hkWcF+!A$<LSjvxPAoA#~*VMaXKc+
zS&mjPE<QQaQj8@%UY(e4Dtsg-fL;kmo+W|h6+}{XX<nU~GD=oa=L{jOkuz9Du3gJn
zmvk6G?}0jjuTD5IGCs~HX(_$XT`J-miOz}gQDUOA!}3~4LXXC6`m%+r-tty@@?g8=
z&8p~&&D(*AZhQWC;}o*)6pg{a`%$I1J6WpC{9?{!&vE@HK2DB%a$2X1TJ~tZS>ttF
zE`<q%iFZ0Q^0TB{S@x;-(^!vZs;U@wW=r^R1?1@^bvkx=p&E<!Sr$3Fdmo*;z@N%_
z4f@(Ig?`J7#Z5YM+?K<{1wtCHFm;u5R?(EC@j~m+o=o33oF&Nwt%Lpi60e}+v`VX;
z+}a;(<AFW<`F#nkuMPCZaS0PNV!-4qkC3F4(_T*a-$$6<pGaBcRWwBuiX!uSTr8N8
z09fR;H!0-{xlbpPFQBVZ^`GzL>noB#Un(pnvw6yTOP+<*wRM2XgY_0@KA=Z|aR}NJ
zkedPX>bm|_Q5_g0gN%YOssu#Ve*n2(SOnMt3?IM?Xz^tIheGp#wE8c57nqlM6ogqG
zpGqI_vu-a70SHS#nXebw2C8+|f_WJLPmJ@KdDJ(#8}_>H#63ACW1HEmN}8~XSo$kC
z9|jg|JWM(!*;xs8As(ATv=sNqh|<g|Fy&*)jZzBMQIuCMv`jAzQuGmL^EixGs5KMB
zH#B-_9AOVV%GYTkL)#P7mxhUA9MPWcK?r)mOG?N0sfqEk`U}Yg^V84dLRDQudUj5%
zFvc+<($4rSJYI6q9iP}W`{l7c;Sy#vPnE&zkJiah)A6RjUn4GIWNnQ46hztIq}xMW
zVoyC^BQ+UKp=nq-mK>f}dL2_|Ox(x|SCeFoJ)(F3{oFNh@>+0`u+~~0Z@DZd@?F?A
ziB_|GUg9CIvcNS>k*Ugk(A{ZcRzH?H5@SJa_U2=Yrt@^nLEc801VJlUiR}W7NqyXQ
z;*NT!-%D<!q<-+Or^GZzdc+I3{dxzxhpm&K;Go*^lebPKN*f#+)Z}28xq|%x@zLZf
zFB1m3{#8sQ27477{SUf6m6v@VlX3rIOakxW&oV#oHvk-gkp((jMi%%d8#r2I6^5cq
zl9?I>nqVCOpae~hOwDTRK&xwLq^gi$3uvck{9R;@b{#aoFQ5dXB<Oix;7DnBKzspk
z1WgWzE<oV_mk|7q_@6*zG5MnFo9vYr<Kq#K(Tq#S87oN%Acayh@(W^Q>Dc&1M1^?i
z*>nnH<q=Fd!r9=lwZ|B<F-wwq`uJgr9oS?E;1VhfO>uHakB`%6bX4A)>w~IIwJXwr
zF<@M$0eiS64mY}2&^7w__Fy4<`OiJ9a?kR0SAV@xsQ24Pt;v1<I1P*>=bK&l5Y&W|
zK9t?YM}pXoFL1O8BSFT@%y{&ypO-mojk(aPeDvI57q>7;up3t|E?KU>GWPLzrrRne
z;@l;QfhbyxQ4Frb^GM)8z%56UnOT;m57p+-^J|Rw+CvSM`d)VBuZxx)Ygn4yt{O+H
zje8zy>yL;zvc_+ld%sq1oh9Ji8{#P3Bu-%F+H5AazeOTX*k{vd_2N`yC!xCfk=aCs
zaS`e5FR4?FvZhYaZ`@m-m?qg2992TKSTEO|(v3vqYCSAa4rrnKsGW2AHVf*_D0lzn
z&r4l{gEOH*q3rlyb`G-p_UHu)qa4qq9lvtn2T0|g7v?WU80JgOP;FVNZ%f`~Vky)T
zpFm~;-^+$7RsP8o%Oq0j<gaux7wpW1<j!40-eSlKOl1`ym7qv~0t3ne2=zdzrx;*l
zYDv{5N65+~kn4dmNg)Hk1*1rlph;8xFDe1}rqfdvX3F$0J7-mvZ)VSvYz3zOaMm^?
z+rEd9z`9@Adq2(o*rC(=7}Z)LPHUF0y!egQzVy?KIwUMSoaJh)Yd}==X<2-VwKiQs
z;%P#bg#t@vB0`&FsjXD%?JL8X7tNqrWM(MM!^p&fU>8#Mkvdv^iAkm2M3tEdStELq
zqo-HBU-@EYi>nHKMjlH!Ne{c!E9A0=VKR_Q+(PF7e}K#lU%~F42p2z*NvMXoq{p!*
zXZWtT>d3@NUNq-5JS7otY1HozQC7$qPTG7m1JU#2<CfXa(`danPKbLB(z*RW7b>~y
zP<xVgOZSA^q39j;g!_iB3eU=SEum$yS2YX*=Q=TE=5}WfItHe_hX|IX*qpa77Pt3O
zVBw4S!#geWaB(cDDWKluAiun)M7Tv}2aDv0iy{(h)_!dcUfmz!jElwEB(bpu%$Kbp
zZnGbu*PEOepc!G{KFfT{=6+n}R$xmH-Ogox=M>hD3&%<QxFe5U)GhEz6&sorKL9(}
z*H$e;(PLrXEx;&EBnw-ryka8R0*n?iVC7QN<K%@}$!1qnW?MrUnSi^)Y*W?J8pFjd
z-*}ygS*7hpm7*D-l+2p_6Iq=j-R#Yi^Km>P^)sUjcVblXS4Oq(uET7k!9H?#>ro?A
zdFRgHvxYr_I3-j5!k>_m6B3ff(Ig}DnY;SjIBkp@c9RY*F!Z$eHKsV4UWz+R%$<G9
zndQnOAtSD6?3fmvux-*f;#>huCNut$LWwuQJbNV3vZqy@#x7LdCe=;rm%*a=pU!)g
zyejs+#w{Pssxf}rvNYf|e!8=)=>By{6Px;e)X-xk3H6UG`q!dr^!6*I#dij|yv!(#
zfat5rWj59IG>jvUxV`7YrUXk(pLpRA7xi!i&m-zHz4LPq<N7WyYmcRdPmqz#p>|E!
z(?`MjTPJ=!=s$Gp#*Vi1g_wy&kCSpE1H0i152RPzAF_B(Dn4GeG0j<Zad_PnEGn!l
zPdw{T@7Aj45X`%`2<vSnfSSL{eudjC3E5ezbM`p?Q`1vmr~hp;9r}GMB`fRD?<a}#
zb#^@!kVrOjV~~)b++(bEu313E@MI6-V63ijv;&G&>~Us@M@_p2>&2$-hQJo4j*f!Z
z5PN=Gu7k*v-QIp<6TvQ}0vCXLcM2yI%FSDq<HU8QAvpix_{9yLtbov!+XK-K$6mQJ
zFBY@a?Y1AiM6Ak-=S##Qjo$@u+;3iAfHN{~2F+XeCu?Ev(0GQ$av<UR{e~|Ds^e@&
z6eV5rpA4Se;?~R*s|bW``%F3q4ep39HcFOjC^`Khq?^u4pP?gc>E-jP0;?S&bA0`x
z2AV6_T=rmbW=6hCneZ$3k*8@wrFi%9QI0t$H(ukp@H7#h@G-et)|c8nj&wTjH>@<h
zcemT8Lhx{h8(n#^0I!U6Ns?8N;l5%nIve#NEc4_=X92^oq9TTL6yII!wBo#h(sP<d
z^Os_X<*nOkjnk(e_na6$fmsiE_p*%lATBY`hf@(r-*(v%SIRaAjczlxi`uCQ(D~^{
zw027EQ9W7+;xmLE!R^KnUm?R)Blc9Isdy-sP0c}{6f8cRfMj@kO@d+nC^T^odYs#s
z25smh^Zo<rETI@8#SvrK73Vu;BOyEx;`PLf+mw+PE__#<38tVex|d+m`XtuMN|+Z5
zaYi}N*=D?~UbyvSvI-`nyK(mds+hx*K2QQ)WO}FMvVg?vwYT-|O&N}NwV32;Bzi9k
z>vG(VdwH}aqa=BckR~LfDydz4uYs7u!BK|vw`z&}Mvg{#YEjb*?iiSnHZ2Y%T$E-j
z53RHNW3$ZXiMjR!v0=hd>)F0G_stXT7cT}Zlz+0<T)nLIh_*iEb9;#Un`d*e8vd(y
z_?cuY^0{OqkL+=uJGpz4HbxQXG^<Zvz>F;--|raZKks&=`=oKhX|Lz;LE?qzRM%xE
ze-;SC!Dc<*qlY4x-xD3GwBT0s5_eqEESaUNj>aIe-z@NmxX9qn+Zm%L%yU&858K#h
z>Jkvjdm*KX@Pox%2U&YG5y?h${HfCR2paQPR@%S2M1dcKkn4<mYMc=AsX-CkRgCd<
z&})`UUrx=oOrJy`D&UbCG}!G4s}U}KXqZ0a>5^>pW#-}6T+Pz;Dyj!05arFzQv|Ga
zL7LSs+(WSreJD58R#cYLQRP+m^~tKmvi;eNVo$j-d??oa&(|H7c6f;nw4){cZ3^>B
z)<b(a0^TZGV%k_Uf(*13(a!Qu3fg#F60*92TrWW9%o|pV={#{tm%;|J91?OhD~z5g
z-y3Bq0jK7!@p#C=?B(!t$lO96i6_G0!d>I1Fi*?zJR46rIe25xYDD(o(9`!it)7Lt
zmvmSyTs`!;k724U_=dCb<>bgPeg8pQ*~<93e1jeLU}I>2Hq)f?(;;S>UuSA{em9~Y
zc~a8GB)0RuGGgau&(9Y=^&2HRxZXPW=J-A$S~$YQ6LW~x<&LQ^K~vDN_&4VwOHS*U
zG}M_RsQoqqdm&Cx{>+6`yliUNaZ}If1xS1qs(s^XtC$PNF_s@WA$o`+0|W_ifN(&t
zAn5>NS1E)vLTUzx<Yi=JfkXp1Lzr#Yb?;BA*0)8n!{WWpb05|Abgjy^MmGdL>kC%A
z84~pHJ^iCS)4v)nJ*A&!a40Q#ZK0`LIENB@s;6Fk+rGuu_jhIk*+%F3HN>M|q<)}H
ze}Ru989s0=_HnD)UQ+UO_h(O3vX6g(U(NRq5Z3VXuLH*rq_us~AMh~}<wZahw&xw-
z`tdg-r$DG!6+#pt)#S^E**(Ua*89~|!nEei<)J*WNWqQxo#>6C1mszkNprdkEBi9M
zuLpyeF&fgn*Opn!cSV(mbj`~Eii&b3b6bzpH6x4zZ6y*ubSF3~qtyPOuJ1sIcuS6X
z=~D^Kfa1BhLrH^m`c0L$n#>uX_3;_pcUupMaB>oO>gm0Gj@jsaYLCnCJ$U0S&pn%>
zI|EF6@7Kh0p517$d50FxlQ16WO@7Dh^>onm$Z(#aflO*`dE<Op_ER(AH9ouEx`bCV
z_h~Bc-PYYVDifc(9XMQn{_$PgvzjQH!OM-&K|ON;o5eq|C9_^Zo>(hDF4FdyTt3kQ
zi8*<yulkUtuLq{_U4F@Kb4b0MK7mE_>BU=Y&J!Y$357-bCx3x9C8A#SzO%XtO&flA
zf~hOS+N}V}TjXEz+||*8%h6Aq`GcBfB9}oqgv*DYSJM)vHu1(Jj!jyOxQ{btco3yY
z9Nb9KW#s;WKmvvL|C5*uRKLGw;9@}rE<W*lCIRF!fdxxQPfN=L(lNmF7v1<Tsvjky
zLuUMB(w~=K1X4OhMWw~X<Uj(M`j?YMn>vsRY-$E;F(CaQ|3@~*28V(B`pq8$X#^n9
zkOMkEqM<mjRB`6d)StQvQ+WT*RIi675R)k$#%oOnp$5X7&E$*lF4bBoQyCS;ipKC4
zz6=ui&3l~Intl$GW;L3hehibn6cxzre)TF$=ai0|WQ>TcVw8R|ueXfCel7S}JQ{mU
z#?709IbZdnEXa+OSF$Oa$uSn<*^jYbh>Vjzb&#*8$W$b_9j$$&qM#6})P)#npEV(j
zonx?aY@J>-Jfd)Bg@<;}-hoZuJ01)>D+tu&@)(1E?UNG^9hB(?H$8vf)!TjL#kW`a
z9b6`1(6)$Kv~7VQOvXINRIYS)K6Sg|UOmHWO$j{a6~@y2vHl0sW$EH!fqN2tQWk6M
zVsv_U;d@Zh)7CDBnKN1mM%FecKh6}3)DI1CF8*Y@BGT}vbg%H5bKj8hP8^I*1p481
zbK=qXh6CaF4_40A&3=Kf;v^a@cbP)YZG6*V+Mn+i$f#x*=2lv)4SbCG5e=DQO?<KM
zuS8x23Lo$#fV>CdwPbmZV&8*EClxzioUe2u#bhOe=v%Pmi`tj{mk1@m5r}$$<q?3W
zgpz6@gNTx9`R3pQQvxK4`)&Z04}j>aj7)LxsUjam-22Pg`0r#CvNd6kl5`icycsY~
zb;R_4XJ($*xACzg9N4Zi_ML!<w?KG+eZOTJzL%kO_5E+>%?OK+X~VIXyaASEqT-LE
zuEbnTNOcxtObMaYOv^dI#YRM{=9ZY|7y842bSa)$ae`D+l610x>x_8@i;$#Tl%`DG
z^&UGdnl}9D2zWg+VpRE(6mV4-_S-~65-~wcqpjzmvS-*I#!B0sB|;P*_&$?=DYR>&
zL!bOONaoQq9nY2u_-(%p<Nj{DrJ}ZhcX5#GD)bVa@~VRjiJT(5QcbGUGx5+hfylGa
z*CcuWHszw%=V+#`Dc2&)JoNlGryTCe$k%x}Jw~}_=u|(?WjLQ6pT@OMf(4nduFdJ`
zLC4L(<ToVn`Mn`0l4*>Xmo<u;Xx4IYy-crSjN5$UJkn6s;NuXCV-Zns6c1An<9$g;
z;MNRRuazCeyRzzM?2i42k53s_WFKGb>jZIwax_N81+#z&0yrwWq;*CWElwQKtxi|8
z=3g?FB4*0is=d8PLyL0Khp5?>O=XGI@;jzBS6Jgz&p#C!e+;wDHM;mhh;h+4vB-$u
zQ*!dnCcm6)Dov2J)`l3jW0ZW&WM(nsh<i};b8B7*L;CT9tMd1j4vn^=#+vK(C28+x
zobR$zV9=p0>G3e|v^Bt4*m0a}!ujiQuP`4tS<Pa-#m*N6bx2hwymjO#@enb>)4lTX
zpXDi?k3n6kI8IXX)H-(ggJ!=&?%v~(8-j0OCu1bu8u1uxH%?XhVQSc4ypDTOcNnFk
zXcScLcLYBf5|i()H%2%V!CA3-sB2nj^g4ZP66?8}FMf@heEC9Txtji?`_$W>Pnmnn
zOE2<E(74Z!_aB46>_V0>^=&+dkMV>#i$%fvXp8q<aJYRi2D%|Nf9k!JwCI`OHa>SZ
zcC(@7sAt(R;&F~VqsvOMZ=}<d<xH}yk1pW(O0T{!Tsa(p{<Z3;?QGFnv1O0Pn>A%V
z9thGH8zkkCrtsW(RO~E9nuXv*v&$^HP)D$iLjP^11OnLK40Mq8p*oo$wEq_;^S_H|
ze6capGRfW(*~tWP4T_WbB_&5upT7B-6p8jr8_5T4<VzL^v=NZUrgjo?bhL&n+J3dv
zfhN@nj4CjifEYz_(x<^J0xkjY2R8qdfTI}bB=1WyoHo_p40IxbMOv0i&gk?~Q<%-F
z9I`~yZ-#ezd^ha3Jzn?jX?I1k9g%)|5yKD>efdNH<|3^+F3CrW4j*?hMu(W}g|bS=
z8k|)VVx~is$>@@tgb(F~GU)l}u^bhxhs#wt)YQc{dg;Qr&{+P?1M(c*^##ZG(A1`<
zj@S~?y1iYO;-J032I_MABo%G!W+qO-&rG*JX6p!6Whgzw+JDJbIdy```_^MomNicZ
zu^uZZ+Z^q0kjXIk69;|gK?V#OUJKcZF`DZj*x;GiSXApa&hTM;O_QZ>JBt?&tIA@3
zH&souCWa~%?BI*5X&55;-mNJi;?7MrV&lXtB?n&?lK4$e_L<@8j#$WBm|)$*VUPuv
z6(Q>*^3k-$cCdKIRE{P2JIyC~)aG7Q^}Cv%iM>B(G&ulsU~w5Yj?y@jF7(i2xN5+Z
z%^5d$OCa<XXS0MwdU=r9l!S&m_b=M`0@e7K#~lXqn8f)`s~?~|-!f((wn5G&W3ZH%
z8IBw?i;bg3{Sy+&dL|$^Uot>nW5{G<{EMgg-OvPdro0kp)<Eb7N&Z%F3x@1Cfk6aN
z(|ZHRm{d{&a>wLQ8E`hoD9+{-*?1!J8X#tpoy{c>09pdB`IlrrIoJ=(^R=~qYo3G2
zMb4N}jm}&fNq<!lUI&WNY0f;b8=~7GQwMA)8OE8`Lrrqs53OjiB@L!DVx1y={BtiZ
zz_cz$d;6h7X$5eu@?t4bzS3|mpyxViBAICO4|7TT2%INklt}x;@{eM8y?Kt5`@>OH
z<|0r#e1=z3^QpFW6GaGnCJ~NwE4|TDIjD23nMTo7Dr3g(OtOTG%0BtXJCm-lH{yLu
z57QNjc6i)jn7X}~>V~3!bBfih@0GIK>~D9r?U>`eU@&py;L}1RW{l=6(%TfR?86?N
zc*=3@&YttfIHSWah)Fba=%^DWT`Fj~?CcpGZ@qgqYMef<Y}8`W;yf1U$9JXRwm;6j
z=a3Bh$2_CfD(qQWOT_%fqLEXj{g90?0mAMo=vrGfX)T3=hkkIeWj;(Bqf4~#iCAkY
zHdSqRDGKkOLRl#1WxZD)q@}&XJV4S9{xuvz=jE&<Uu2FZ-uFJN@hD(TY{~KmF!s&r
z6r<+PK>nQ?WyFy&_Kgcs-A-UK0hs;S>imK+a=-d+os*dlFqSBs2ec_boGDgk3mI=9
z&f9q%#LGbJhn&eEC(Ov#MgY>r$3f1WY@>h4xr1CURX?W~o}iCWv%P>#|Mym>_*A-o
z^63eXW31=h&qU)jV9(9SpLYS6=~`F|^TE@i2<4WDg8R(NFM4p|Mf0CSWT8M$r$^&`
z83S-Qm_%HvlfuO$Vj9U(jGmZ8tCd}B%FmpitawgGPWEicKCZ-y)AGJzY-f%opc>2s
z6PjDRHIJ5G8tyT1i*9Bdgn1BYna6c9`w@cP%lV#Gin20t+ULtIH$&B2LLXH?yUlcj
zj&^y<p1U`H=b$cps@cq~>;o5JU^+qbIkPR&yF^q~o33aJsWx7iOGg*SFJU=4M2zKL
z+af?ASaa`>0mu8LlZF!1`;4qno{dP=kn_&HyONbdjhI-?BWs(Z&}?o_8qDPTeugcY
zQU}X|o{)h@S_SsU+@*6ijq7UNQ~ObuobWby^}&Fe@ubRq*$lUqFFl$tN)XSe5Lggf
z5rl_#YU0IT{~}c1w`vlywuTvAQ}DUxZj^|J4f@fcWS<&c6pI?m`CRp$i8K&9NAkn(
z_UqFI7#aV7_xVjw7p4#<dW4W=Q_(;ag1*YyXaj>o9GsNSb5l*~q-FOuD;vL7I$$9p
zW;2Hxz=|WT>=CgE<}{i>sOK&1R5U*t(A087^>?<Mgwt&WGDdh>LJk!E#KCYRUINZn
zX36i-^ntVHrjjCYS?clg>ZMwL=cAr$zdoCl^J)!e_PiB%fZcc{Eu_02D%mFVDNNV;
z9cJvz<xd48`#Dmb1{i6op6Z&)dY#lp$SNw_w#OwWT8r7`Ildl{R~9|?h;->ZdbWV+
zoK`Q%+k2UoPg^1maly7X;>jN@9_|;$V^u04Zc-U0hp$81tGT<fJ)K${gW}UoJ}4Zz
z=JQG2(xBDi*Q(ws{p9zNOSxflb0?WKZT1G7U9~S|qBSynx2R-IyAi=`huYuHj}yDE
z6Yx8|kd0%s(W236$WosD{USBiAf^r9LGxlY^~^I(<&W0QST4L@#{-d3AP&W<nTwZ8
z)+Js!(MH;c%q$l7jxYDW=$#<v_h^~7{l$B6yJ>e^CP969Ti8lX4!@PevxRVQIgp0@
zf%frdH;x=%MMqsFyK%U$+z4EuB;TS0>e82R;a4|~nxFuqi`rBE;bz*OV_lRB0)PNf
zOt=b)2?uTlG<~^KMK!3&1B?<P93V#~{<M;V$pzLaN*|#na;Q!<Xd=|x0aQcoPh0s{
zH!dT|sBn&9tnN^wo7X99uw^HcxonnFZi@uex75E|9Jg}GPA8czu%kejwDkF;D&*4T
z%PeTT+o@>W8R<BJwFYfs(wS6}1&WE7M6a1`sUcsce^QboAIGR%Y-T9o$#O(M!B_lP
zO*oTMgUR8%7`Tuh+x6~q4GIB5#N%#C^qKiA1`T>qi`{~*hF)W*EwrRX`A$hHo?HvM
z;_5$h{e_u0-2g9lFn6Sz_Rup?H*OpBV`i~b1VW#o>4NX#4SK_d`(lKtbesf&Av|rp
zVdENH?LB6qiRnP9fk6I|OI1)~bw3f2Xa?TbJkr5%8#lRkO(*y-iD;g<ZB$}%_d2tS
zjphzNWAs><56Q;5dXguG(WX}M<GAYLQk`SV$S))3g<<kmFhWR-SV?pAz69eY<ga&U
zQc{|y*VfD*)iFp#%(PSn4CD#PSrbsN9Cr!s&Z&B=<&ufoj7+lW^&JOIdXMH@8R*wy
ze-<~F{UecyZ*2qka1<}#OWWX*_s}I+7yxs}%zgk{Jd%La;PiPsuo8_FQ-bf7o0m?c
z3+#v6H=)a?h|IIac~*;SaD@EPryjdd+nGX?d)ZW%lPpZYDBY`$qj_gPLOs*k_Wii&
z{z{9=04={+NtaUX_ITmohGEwx?+&8jC+;JM>P_xk*OV&pWJ2+qcp+1rhY<=XHbr%w
z2bCGPY4xxKl=ucWMDWDNez8(Xgor|Yo{#*Bt1|`_=J|Wk9Vz__3XQWbJk!`<CC4gv
zkX4+a^QNg9$zq!GPrTA;98(@?u$!*8^r<hb)nBiYT$U5nDP$@y<{omAKkDpBR4U#l
za}QHHc;8^yy90Irne)f5UQAB{X9_~bU+!Yh%Q7$PObg4IuKZ@a7UlN#_)3)dCw@!M
zGx@^f>{k_E*<;);(e6An;gRpm<Slu1(ZS>POnWBl%7sVi=7#;Uu7`x~JUVP4daZ*C
zR-UwNd2z_MbwE77R|^uSJ8|17Ow>s8E_yHPobf(2?PZQ*vc|<5PAEKS3&Qh!j1;O7
z)U;)(b>EGK&Q->rM%2DFiZ0xW?(Z50VA-Oq(p07Iix^9t4B&{}*pZnRPu)_@v%FSf
z9`)%t2C+6yP~m*194{otS<ndK;I8s0I>*D1rs^${_;^+%D^s^CFJppBCO1d%{Kju#
zyL=g!)B<JPhSCr3EwipCFuO=r%@x})oZD?uD<92?^px2}4V^+Y@hyclg=@(UgvZ>S
zd@pve%%Uqq$uUkrM;4(*v)?&r%JG<60+-N(;oJ)w?E_a_1>)&FAKo30Q+hPiK?-KR
z7>GKDO6c+}R94>KUFymat-WM#7Aqg5&vEQ7_a~20!&k!AccEKJ74`k8W-<J6^o1xD
zt<#)G4?fIs8<7bP<4$M^>K1^6Y%lVMCKB!DqxVAZ{Z3>@@aTGOwLEYwySTS^YxB3$
zS+l*DZ=7hpcS-7|k-u)N``-HEv0QVR-^3W*g)^JjEE<l}4PM<mn?+~kFO_yvTf;ua
zejoqGr7`p1OkM6%hH}nDsJGJEQI<c+op?yk)s7Nz<&u&f@F>pH<w@ClXw5-F|B-ec
zt=u(ay6ArG>@pMR4+!dJU(FwIt@8WA46arFRjs8`O!6iJ6t}Ne$$$^>r!>=FZ!Bm3
zV~B}zR~g)?BwthpSK`5LL%t$IUTmoOj2<u=$XAp>aI^pWdIQ#DkO3yAHmPazoAZC=
znqW$hlXcWF@!$c7p#NiVlR7f~BmNCcZZj-aUq+mdTU1IV3S1vc*%N~okyIv-vZGa%
z)C_XWB<L78d3d>5;oRCqIg<1U4iJCWsBhpbWoQzVC$ZBD2@ej7aL{CRBy-V?%#Kec
zYqAUsjllR)`bTG1wC1r@_a6*F6W27Maa*G-Nm4V<SJq@|UJt`f=S|<fV@6`J+?^L+
zm}xq~apEWr7BkqXKakg|h^ndT$XD`?_KzgJN9>z5<#*54M#GYX*mpXYuwH|3L)Gbp
zu+8Pz3!3{2xaCY`tV!Bu`&yT*%`B5tS$}_CeBR%wK;A>9XXmW^lpBvh)o*I{rEyV$
zJ?HAI?Fm(9U$f6i?mrD7#IPS1tFTqGG`@fNQ9s9>7(QBEk*9lEH$K`c?~Mw_*=t0&
zsc>*(7SlYm86RJxR~2GA=SJdG<joP~yZxaK%4VaHXosR5JhNl0<=pbe#~jOKw$N%d
zq*h7$&ks|bGmr%z9R6;O1V~Pl$RE`e{nJ(cuL-8_SAM|mMR79zauwshywLw8<44N<
z9`pN}^dlDuIUHY7Ouo=h`GpIVs~D8{DfL2sClI75_xZ_60QvIqF!|aKIVDfo!>FlK
zYE}HNxy?_B{9*MKW%zj{<uoaUVW0$7UP2aWZ@N&XI>`h@&&b7x<YA%Z(J8ExLojdx
z`9!;}P@b`|nYER`h7c7W7?R+GX|(sz4^PvmPNeWx4^H#UCbP4QEDb?w=dgT?_wEaV
z$}kaQklY@G6kt2IUNSvVT73Dl@tPX!%{KFI>@>sZy<W6O(SjFM-LO1N99qt36Fjpg
zORRC}HO12EBw<5r{I-K}iq9|BPmQ|zy%BJ2?eR%Jb$5d-hJZVaxbzsCJl#MU$BAZH
z=@J8Bh*HghXj`IKp?2b-v?AjiB?+%3{c9VR==<FFnW|Izjr>$zXKt(cal1wD*mW*n
zCeG4Cbv$Th{kZNDuo{BJs_q;PLNoTS-~Mpr@zVVMAkHK`d_re5iYfKjh$*wR>m%9_
z@jFKA7@BI%Vm&U2pz9e&muiK*PP{_>-L(N!0ibEx5Pt9<C<KkhM1wX;Lu2-L#|wBp
zpa|sFOMd+izLEx_Xbn7XID{3v5|QCuJ@ul|Nd9l8hyJhL`G5YI!7EV^aq72))2N#N
zfB$L!hiCJD^@RTSzbBO%lfS1OL;|2!D>?<Bm#s9f^=?ATYR@OOm<>zfqqvHvlkG2=
z#$Ma3yiI!iarWIGY|M<Y!zHiqHu70Ec0W*L(qB0oCj|E`H2!Ur0EG{*F6xyA;7Cxj
zu~eP!+kFPga!zJo<eAbxNdA=;<SSS}?gLsM`S-*CMHy(xfNOzE3}7RtsL0^D{+Iit
z<gfbw=nvg|f0{iijT<s<aT0i>`K1$3Is3hhw;g?RwtV<+sd8p0=?ot~@FAf>Iakue
zpw9iLl=E97FSj1a*`B*}I>Iz83WCI$An@Vf9z?>)REPwQBa<jCniCfxQNV&LIaELs
z!3~skY)%A2W!5Rrg8b%CXlHAsP-X6^>+M~=4Vg{dCz{!6Lu(4^<~lODipnEa7#m4B
zJ`t=B2+0=`V5yu5(xX>xL<XNf5vRekKarMt6jd4==_mMh<1PW#30dW0rF{YkTqx${
PVPd-H5WWMvNrV3bg8arB

literal 0
HcmV?d00001

diff --git a/app/javascript/superadmin_pages/views/playground/Index.vue b/app/javascript/superadmin_pages/views/playground/Index.vue
new file mode 100644
index 000000000..136a2b481
--- /dev/null
+++ b/app/javascript/superadmin_pages/views/playground/Index.vue
@@ -0,0 +1,139 @@
+<template>
+  <section class="h-full w-full flex flex-col bg-slate-25">
+    <PlaygroundHeader
+      :response-source-name="componentData.responseSourceName"
+      :response-source-path="componentData.responseSourcePath"
+    />
+    <div ref="chatContainer" class="flex-1 overflow-auto px-8 py-4">
+      <div
+        v-for="message in messages"
+        :id="`message-${message.id}`"
+        :key="message.id"
+      >
+        <UserMessage
+          v-if="message.type === 'User'"
+          :message="formatMessage(message.content)"
+        />
+        <BotMessage v-else :message="formatMessage(message.content)" />
+      </div>
+      <TypingIndicator v-if="isWaiting" />
+    </div>
+    <div class="w-full px-8 py-6">
+      <textarea
+        ref="messageInput"
+        v-model="messageContent"
+        :rows="4"
+        class="resize-none block p-2.5 w-full text-sm text-gray-900 bg-gray-50 rounded-lg border !outline-2 border-slate-100 focus:ring-woot-500 focus:border-woot-500 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-woot-500 dark:focus:border-woot-500"
+        placeholder="Type a message... [CMD/CTRL + Enter to send]"
+        autofocus
+        autocomplete="off"
+      />
+    </div>
+  </section>
+</template>
+
+<script>
+import { buildHotKeys } from 'shared/helpers/KeyboardHelpers';
+import messageFormatterMixin from 'shared/mixins/messageFormatterMixin';
+import Header from '../../components/playground/Header.vue';
+import UserMessage from '../../components/playground/UserMessage.vue';
+import BotMessage from '../../components/playground/BotMessage.vue';
+import TypingIndicator from '../../components/playground/TypingIndicator.vue';
+
+export default {
+  components: {
+    PlaygroundHeader: Header,
+    UserMessage,
+    BotMessage,
+    TypingIndicator,
+  },
+  mixins: [messageFormatterMixin],
+  props: {
+    componentData: {
+      type: Object,
+      default: () => ({}),
+    },
+  },
+  data() {
+    return { messages: [], messageContent: '', isWaiting: false };
+  },
+  computed: {
+    previousMessages() {
+      return this.messages.map(message => ({
+        type: message.type,
+        message: message.content,
+      }));
+    },
+  },
+  mounted() {
+    this.focusInput();
+    document.addEventListener('keydown', this.handleKeyEvents);
+  },
+  beforeDestroy() {
+    document.removeEventListener('keydown', this.handleKeyEvents);
+  },
+  methods: {
+    handleKeyEvents(e) {
+      const keyCode = buildHotKeys(e);
+      if (['meta+enter', 'ctrl+enter'].includes(keyCode)) {
+        this.onMessageSend();
+      }
+    },
+    focusInput() {
+      this.$refs.messageInput.focus();
+    },
+    onMessageSend() {
+      this.addMessageToData('User', this.messageContent);
+      this.sendMessageToServer(this.messageContent);
+    },
+    scrollToLastMessage() {
+      this.$nextTick(() => {
+        const messageId = this.messages[this.messages.length - 1].id;
+        const messageElement = document.getElementById(`message-${messageId}`);
+        messageElement.scrollIntoView({ behavior: 'smooth' });
+      });
+    },
+    addMessageToData(type, content) {
+      this.messages.push({ id: this.messages.length, type, content });
+      this.scrollToLastMessage();
+    },
+    async sendMessageToServer(messageContent) {
+      this.messageContent = '';
+      this.isWaiting = true;
+      const csrfToken = document
+        .querySelector('meta[name="csrf-token"]')
+        .getAttribute('content');
+
+      try {
+        const response = await fetch(window.location.href, {
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/json',
+            'X-CSRF-Token': csrfToken,
+          },
+          body: JSON.stringify({
+            message: messageContent,
+            previous_messages: this.previousMessages,
+          }),
+          credentials: 'include',
+        });
+
+        if (!response.ok) {
+          throw new Error(`HTTP error! status: ${response.status}`);
+        }
+
+        const { message } = await response.json();
+        this.addMessageToData('Bot', message);
+      } catch (error) {
+        this.addMessageToData(
+          'bot',
+          'Error: Could not retrieve response. Please check the console for more details.'
+        );
+      } finally {
+        this.isWaiting = false;
+        this.focusInput();
+      }
+    },
+  },
+};
+</script>
diff --git a/app/views/super_admin/accounts/show.html.erb b/app/views/super_admin/accounts/show.html.erb
index fb8947f69..04d92c9d9 100644
--- a/app/views/super_admin/accounts/show.html.erb
+++ b/app/views/super_admin/accounts/show.html.erb
@@ -25,7 +25,7 @@ as well as a link to its edit page.
 
   <div>
     <%= link_to(
-      t("administrate.actions.edit_resource", name: page.page_title),
+      "Edit",
       [:edit, namespace, page.resource],
       class: "button",
     ) if accessible_action?(page.resource, :edit) %>
diff --git a/app/views/super_admin/application/show.html.erb b/app/views/super_admin/application/show.html.erb
new file mode 100644
index 000000000..be51219da
--- /dev/null
+++ b/app/views/super_admin/application/show.html.erb
@@ -0,0 +1,65 @@
+<%#
+# Show
+
+This view is the template for the show page.
+It renders the attributes of a resource,
+as well as a link to its edit page.
+
+## Local variables:
+
+- `page`:
+  An instance of [Administrate::Page::Show][1].
+  Contains methods for accessing the resource to be displayed on the page,
+  as well as helpers for describing how each attribute of the resource
+  should be displayed.
+
+[1]: http://www.rubydoc.info/gems/administrate/Administrate/Page/Show
+%>
+
+<% content_for(:title) { t("administrate.actions.show_resource", name: page.page_title) } %>
+
+<header class="main-content__header">
+  <h1 class="main-content__page-title">
+    <%= content_for(:title) %>
+  </h1>
+
+  <div>
+    <%= link_to(
+      "Edit",
+      [:edit, namespace, page.resource],
+      class: "button",
+    ) if accessible_action?(page.resource, :edit) %>
+
+    <%= link_to(
+      t("administrate.actions.destroy"),
+      [namespace, page.resource],
+      class: "button button--danger",
+      method: :delete,
+      data: { confirm: t("administrate.actions.confirm") }
+    ) if accessible_action?(page.resource, :destroy) %>
+  </div>
+</header>
+
+<section class="main-content__body">
+  <dl>
+    <% page.attributes.each do |title, attributes| %>
+      <fieldset class="<%= "field-unit--nested" if title.present? %>">
+        <% if title.present? %>
+          <legend><%= t "helpers.label.#{page.resource_name}.#{title}", default: title %></legend>
+        <% end %>
+
+        <% attributes.each do |attribute| %>
+          <dt class="attribute-label" id="<%= attribute.name %>">
+          <%= t(
+            "helpers.label.#{resource_name}.#{attribute.name}",
+            default: page.resource.class.human_attribute_name(attribute.name),
+          ) %>
+          </dt>
+
+          <dd class="attribute-data attribute-data--<%=attribute.html_class%>"
+              ><%= render_field attribute, page: page %></dd>
+        <% end %>
+      </fieldset>
+    <% end %>
+  </dl>
+</section>
diff --git a/app/views/super_admin/users/show.html.erb b/app/views/super_admin/users/show.html.erb
index a5bc2bf39..622f95724 100644
--- a/app/views/super_admin/users/show.html.erb
+++ b/app/views/super_admin/users/show.html.erb
@@ -25,10 +25,10 @@ as well as a link to its edit page.
 
   <div>
     <%= link_to(
-      t("administrate.actions.edit_resource", name: page.page_title),
-      [:edit, namespace, page.resource],
-      class: "button",
-    ) if accessible_action?(:edit, page.resource) %>
+            t("administrate.actions.edit"),
+            [:edit, namespace,  page.resource.becomes(User)],
+            class: "button",
+          ) if authorized_action? page.resource, :edit %>
   </div>
 </header>
 
diff --git a/config/routes.rb b/config/routes.rb
index 1ee74145f..36b7f46a0 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -453,7 +453,10 @@ Rails.application.routes.draw do
       end
 
       resources :access_tokens, only: [:index, :show]
-      resources :response_sources, only: [:index, :show, :new, :create, :edit, :update, :destroy]
+      resources :response_sources, only: [:index, :show, :new, :create, :edit, :update, :destroy] do
+        get :chat, on: :member
+        post :chat, on: :member, action: :process_chat
+      end
       resources :response_documents, only: [:index, :show, :new, :create, :edit, :update, :destroy]
       resources :responses, only: [:index, :show, :new, :create, :edit, :update, :destroy]
       resources :installation_configs, only: [:index, :new, :create, :show, :edit, :update]
diff --git a/enterprise/app/controllers/super_admin/enterprise_base_controller.rb b/enterprise/app/controllers/super_admin/enterprise_base_controller.rb
new file mode 100644
index 000000000..b2108332a
--- /dev/null
+++ b/enterprise/app/controllers/super_admin/enterprise_base_controller.rb
@@ -0,0 +1,8 @@
+class SuperAdmin::EnterpriseBaseController < SuperAdmin::ApplicationController
+  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/super_admin/response_documents_controller.rb b/enterprise/app/controllers/super_admin/response_documents_controller.rb
index f1317785a..3702261cf 100644
--- a/enterprise/app/controllers/super_admin/response_documents_controller.rb
+++ b/enterprise/app/controllers/super_admin/response_documents_controller.rb
@@ -1,4 +1,4 @@
-class SuperAdmin::ResponseDocumentsController < SuperAdmin::ApplicationController
+class SuperAdmin::ResponseDocumentsController < SuperAdmin::EnterpriseBaseController
   # Overwrite any of the RESTful controller actions to implement custom behavior
   # For example, you may want to send an email after a foo is updated.
   #
diff --git a/enterprise/app/controllers/super_admin/response_sources_controller.rb b/enterprise/app/controllers/super_admin/response_sources_controller.rb
index a0e939913..045dd5958 100644
--- a/enterprise/app/controllers/super_admin/response_sources_controller.rb
+++ b/enterprise/app/controllers/super_admin/response_sources_controller.rb
@@ -1,4 +1,4 @@
-class SuperAdmin::ResponseSourcesController < SuperAdmin::ApplicationController
+class SuperAdmin::ResponseSourcesController < SuperAdmin::EnterpriseBaseController
   # Overwrite any of the RESTful controller actions to implement custom behavior
   # For example, you may want to send an email after a foo is updated.
   #
@@ -41,4 +41,36 @@ class SuperAdmin::ResponseSourcesController < SuperAdmin::ApplicationController
 
   # See https://administrate-demo.herokuapp.com/customizing_controller_actions
   # for more information
+
+  before_action :set_response_source, only: %i[chat process_chat]
+
+  def chat; end
+
+  def process_chat
+    previous_messages = []
+    get_previous_messages(previous_messages)
+    robin_response = ChatGpt.new(
+      Enterprise::MessageTemplates::ResponseBotService.response_sections(params[:message], @response_source)
+    ).generate_response(
+      params[:message], previous_messages
+    )
+    message_content = robin_response['response']
+    if robin_response['context_ids'].present?
+      message_content += Enterprise::MessageTemplates::ResponseBotService.generate_sources_section(robin_response['context_ids'])
+    end
+    render json: { message: message_content }
+  end
+
+  private
+
+  def get_previous_messages(previous_messages)
+    params[:previous_messages].each do |message|
+      role = message['type'] == 'user' ? 'user' : 'system'
+      previous_messages << { content: message['message'], role: role }
+    end
+  end
+
+  def set_response_source
+    @response_source = requested_resource
+  end
 end
diff --git a/enterprise/app/controllers/super_admin/responses_controller.rb b/enterprise/app/controllers/super_admin/responses_controller.rb
index 7566c8df3..4eb5db097 100644
--- a/enterprise/app/controllers/super_admin/responses_controller.rb
+++ b/enterprise/app/controllers/super_admin/responses_controller.rb
@@ -1,4 +1,4 @@
-class SuperAdmin::ResponsesController < SuperAdmin::ApplicationController
+class SuperAdmin::ResponsesController < SuperAdmin::EnterpriseBaseController
   # Overwrite any of the RESTful controller actions to implement custom behavior
   # For example, you may want to send an email after a foo is updated.
   #
diff --git a/enterprise/app/jobs/response_builder_job.rb b/enterprise/app/jobs/response_builder_job.rb
index f30f97d4b..536cdef5a 100644
--- a/enterprise/app/jobs/response_builder_job.rb
+++ b/enterprise/app/jobs/response_builder_job.rb
@@ -17,6 +17,7 @@ class ResponseBuilderJob < ApplicationJob
   def prepare_data(response_document)
     {
       model: 'gpt-3.5-turbo',
+      response_format: { type: 'json_object' },
       messages: [
         {
           role: 'system',
@@ -32,16 +33,15 @@ class ResponseBuilderJob < ApplicationJob
 
   def system_message_content
     <<~SYSTEM_MESSAGE_CONTENT
-       You are a content writer looking to convert user content into short FAQs which can be added to your website's helper centre.
-       Format the webpage content provided in the message to FAQ format like the following example.#{' '}
-       Ensure that you only generate faqs from the information provider in the message.#{' '}
-       Ensure that output is always valid json.#{'  '}
-       If no match is available, return an empty JSON.
-       ```
-      [ { "question": "What is the pricing?",
-         "answer" : " There are different pricing tiers available."
-       }]
-       ```
+      You are a content writer looking to convert user content into short FAQs which can be added to your website's helper centre.
+      Format the webpage content provided in the message to FAQ format mentioned below in the json
+      Ensure that you only generate faqs from the information provider in the message.
+      Ensure that output is always valid json.
+      If no match is available, return an empty JSON.
+
+      ```json
+      {faqs: [{question: '', answer: ''}]
+      ```
     SYSTEM_MESSAGE_CONTENT
   end
 
@@ -67,7 +67,7 @@ class ResponseBuilderJob < ApplicationJob
 
     return if content.nil?
 
-    faqs = JSON.parse(content.strip)
+    faqs = JSON.parse(content.strip).fetch('faqs', [])
 
     faqs.each do |faq|
       response_document.responses.create!(
diff --git a/enterprise/app/models/response_source.rb b/enterprise/app/models/response_source.rb
index cc5890a19..cbbd26289 100644
--- a/enterprise/app/models/response_source.rb
+++ b/enterprise/app/models/response_source.rb
@@ -25,4 +25,9 @@ class ResponseSource < ApplicationRecord
   has_many :responses, dependent: :destroy_async
 
   accepts_nested_attributes_for :response_documents
+
+  def get_responses(query)
+    embedding = Openai::EmbeddingsService.new.get_embedding(query)
+    responses.active.nearest_neighbors(:embedding, embedding, distance: 'cosine').first(5)
+  end
 end
diff --git a/enterprise/app/services/enterprise/message_templates/response_bot_service.rb b/enterprise/app/services/enterprise/message_templates/response_bot_service.rb
index 214b33788..9df63f7e4 100644
--- a/enterprise/app/services/enterprise/message_templates/response_bot_service.rb
+++ b/enterprise/app/services/enterprise/message_templates/response_bot_service.rb
@@ -1,6 +1,39 @@
 class Enterprise::MessageTemplates::ResponseBotService
   pattr_initialize [:conversation!]
 
+  def self.generate_sources_section(article_ids)
+    sources_content = ''
+
+    articles_hash = get_article_hash(article_ids.uniq)
+
+    articles_hash.first(3).each do |article_hash|
+      sources_content += " - [#{article_hash[:response].question}](#{article_hash[:response_document].document_link}) \n"
+    end
+    sources_content = "\n \n \n **Sources**  \n#{sources_content}" if sources_content.present?
+    sources_content
+  end
+
+  def self.get_article_hash(article_ids)
+    seen_documents = Set.new
+    article_ids.uniq.filter_map do |article_id|
+      response = Response.find(article_id)
+      response_document = response.response_document
+      next if response_document.blank? || seen_documents.include?(response_document)
+
+      seen_documents << response_document
+      { response: response, response_document: response_document }
+    end
+  end
+
+  def self.response_sections(content, response_source)
+    sections = ''
+
+    response_source.get_responses(content).each do |response|
+      sections += "{context_id: #{response.id}, context: #{response.question} ? #{response.answer}},"
+    end
+    sections
+  end
+
   def perform
     ActiveRecord::Base.transaction do
       @response = get_response(conversation.messages.incoming.last.content)
@@ -12,15 +45,6 @@ class Enterprise::MessageTemplates::ResponseBotService
     true
   end
 
-  def response_sections(content)
-    sections = ''
-
-    inbox.get_responses(content).each do |response|
-      sections += "{context_id: #{response.id}, context: #{response.question} ? #{response.answer}},"
-    end
-    sections
-  end
-
   private
 
   delegate :contact, :account, :inbox, to: :conversation
@@ -28,7 +52,7 @@ class Enterprise::MessageTemplates::ResponseBotService
   def get_response(content)
     previous_messages = []
     get_previous_messages(previous_messages)
-    ChatGpt.new(response_sections(content)).generate_response('', previous_messages)
+    ChatGpt.new(self.class.response_sections(content, inbox)).generate_response('', previous_messages)
   end
 
   def get_previous_messages(previous_messages)
@@ -63,24 +87,11 @@ class Enterprise::MessageTemplates::ResponseBotService
 
   def create_messages
     message_content = @response['response']
-    message_content += generate_sources_section if @response['context_ids'].present?
+    message_content += self.class.generate_sources_section(@response['context_ids']) if @response['context_ids'].present?
 
     create_outgoing_message(message_content)
   end
 
-  def generate_sources_section
-    article_ids = @response['context_ids']
-    sources_content = ''
-
-    articles_hash = get_article_hash(article_ids.uniq)
-
-    articles_hash.first(3).each do |article_hash|
-      sources_content += " - [#{article_hash[:response].question}](#{article_hash[:response_document].document_link}) \n"
-    end
-    sources_content = "\n \n \n **Sources**  \n#{sources_content}" if sources_content.present?
-    sources_content
-  end
-
   def create_outgoing_message(message_content)
     conversation.messages.create!(
       {
@@ -91,16 +102,4 @@ class Enterprise::MessageTemplates::ResponseBotService
       }
     )
   end
-
-  def get_article_hash(article_ids)
-    seen_documents = Set.new
-    article_ids.uniq.filter_map do |article_id|
-      response = Response.find(article_id)
-      response_document = response.response_document
-      next if response_document.blank? || seen_documents.include?(response_document)
-
-      seen_documents << response_document
-      { response: response, response_document: response_document }
-    end
-  end
 end
diff --git a/enterprise/app/views/super_admin/response_sources/chat.html.erb b/enterprise/app/views/super_admin/response_sources/chat.html.erb
new file mode 100644
index 000000000..ea2147ea4
--- /dev/null
+++ b/enterprise/app/views/super_admin/response_sources/chat.html.erb
@@ -0,0 +1,5 @@
+<% content_for :title, "Robin AI playground: #{@response_source.name}" %>
+<%= render_vue_component('PlaygroundIndex', {
+  responseSourceName: @response_source.name,
+  responseSourcePath: super_admin_response_source_path(@response_source)
+}) %>
diff --git a/enterprise/app/views/super_admin/response_sources/show.html.erb b/enterprise/app/views/super_admin/response_sources/show.html.erb
new file mode 100644
index 000000000..60cbda605
--- /dev/null
+++ b/enterprise/app/views/super_admin/response_sources/show.html.erb
@@ -0,0 +1,71 @@
+<%#
+# Show
+
+This view is the template for the show page.
+It renders the attributes of a resource,
+as well as a link to its edit page.
+
+## Local variables:
+
+- `page`:
+  An instance of [Administrate::Page::Show][1].
+  Contains methods for accessing the resource to be displayed on the page,
+  as well as helpers for describing how each attribute of the resource
+  should be displayed.
+
+[1]: http://www.rubydoc.info/gems/administrate/Administrate/Page/Show
+%>
+
+<% content_for(:title) { t("administrate.actions.show_resource", name: page.page_title) } %>
+
+<header class="main-content__header">
+  <h1 class="main-content__page-title">
+    <%= content_for(:title) %>
+  </h1>
+
+  <div>
+    <%= link_to(
+      "Chat",
+      [:chat, namespace, page.resource],
+      class: "button"
+    ) %>
+
+    <%= link_to(
+      "Edit",
+      [:edit, namespace, page.resource],
+      class: "button",
+    ) if accessible_action?(page.resource, :edit) %>
+
+    <%= link_to(
+      t("administrate.actions.destroy"),
+      [namespace, page.resource],
+      class: "button button--danger",
+      method: :delete,
+      data: { confirm: t("administrate.actions.confirm") }
+    ) if accessible_action?(page.resource, :destroy) %>
+  </div>
+</header>
+
+<section class="main-content__body">
+  <dl>
+    <% page.attributes.each do |title, attributes| %>
+      <fieldset class="<%= "field-unit--nested" if title.present? %>">
+        <% if title.present? %>
+          <legend><%= t "helpers.label.#{page.resource_name}.#{title}", default: title %></legend>
+        <% end %>
+
+        <% attributes.each do |attribute| %>
+          <dt class="attribute-label" id="<%= attribute.name %>">
+          <%= t(
+            "helpers.label.#{resource_name}.#{attribute.name}",
+            default: page.resource.class.human_attribute_name(attribute.name),
+          ) %>
+          </dt>
+
+          <dd class="attribute-data attribute-data--<%=attribute.html_class%>"
+              ><%= render_field attribute, page: page %></dd>
+        <% end %>
+      </fieldset>
+    <% end %>
+  </dl>
+</section>
diff --git a/enterprise/lib/chat_gpt.rb b/enterprise/lib/chat_gpt.rb
index 9b09569d0..a8dbf9537 100644
--- a/enterprise/lib/chat_gpt.rb
+++ b/enterprise/lib/chat_gpt.rb
@@ -4,7 +4,7 @@ class ChatGpt
   end
 
   def initialize(context_sections = '')
-    @model = 'gpt-4-1106-preview'
+    @model = 'gpt-4-0125-preview'
     @messages = [system_message(context_sections)]
   end
 
diff --git a/tailwind.config.js b/tailwind.config.js
index 4ab6f5dd8..0c0073180 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -16,6 +16,7 @@ const defaultTheme = require('tailwindcss/defaultTheme');
 module.exports = {
   darkMode: 'class',
   content: [
+    './enterprise/app/views/**/*.html.erb',
     './app/javascript/widget/**/*.vue',
     './app/javascript/v3/**/*.vue',
     './app/javascript/dashboard/**/*.vue',

From fd993feecec34ece22717d005cdbfa4869aac536 Mon Sep 17 00:00:00 2001
From: Danilo Campana Fuchs <danilo_fuchs@hotmail.com>
Date: Tue, 27 Feb 2024 00:15:55 +0100
Subject: [PATCH 36/96] chore(docs): Update the API documentation to add the
 filter status=all to conversation list and meta (#8994)

---
 swagger/paths/application/conversation/index.yml | 2 +-
 swagger/paths/application/conversation/meta.yml  | 2 +-
 swagger/swagger.json                             | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/swagger/paths/application/conversation/index.yml b/swagger/paths/application/conversation/index.yml
index c1cb199b0..6980eb2bd 100644
--- a/swagger/paths/application/conversation/index.yml
+++ b/swagger/paths/application/conversation/index.yml
@@ -17,7 +17,7 @@ get:
     - name: status
       in: query
       type: string
-      enum: ['open', 'resolved', 'pending', 'snoozed']
+      enum: ['all', 'open', 'resolved', 'pending', 'snoozed']
       default: 'open'
       description: Filter by conversation status.
     - name: q
diff --git a/swagger/paths/application/conversation/meta.yml b/swagger/paths/application/conversation/meta.yml
index 9bf32ef03..327fb702e 100644
--- a/swagger/paths/application/conversation/meta.yml
+++ b/swagger/paths/application/conversation/meta.yml
@@ -11,7 +11,7 @@ get:
     - name: status
       in: query
       type: string
-      enum: ['open', 'resolved', 'pending', 'snoozed']
+      enum: ['all', 'open', 'resolved', 'pending', 'snoozed']
       default: 'open'
       description: Filter by conversation status.
     - name: q
diff --git a/swagger/swagger.json b/swagger/swagger.json
index dde7c5f01..3cc128626 100644
--- a/swagger/swagger.json
+++ b/swagger/swagger.json
@@ -2875,6 +2875,7 @@
             "in": "query",
             "type": "string",
             "enum": [
+              "all",
               "open",
               "resolved",
               "pending",
@@ -2975,6 +2976,7 @@
             "in": "query",
             "type": "string",
             "enum": [
+              "all",
               "open",
               "resolved",
               "pending",

From b7a83dcbcd4d9d04257bc79a172bcaea5662d7c2 Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Date: Tue, 27 Feb 2024 14:46:16 -0800
Subject: [PATCH 37/96] feat: Add a placeholder for image attachments in
 conversations view (#8969)

We analyze an image to get it's height and width. On the frontend, we would show a placeholder with the corresponding width and height until the images are loaded properly.

---------

Co-authored-by: Shivam Mishra <scm.mymail@gmail.com>
---
 .../widgets/conversation/Message.vue          |  3 ++-
 .../conversation/bubble/ImageAudioVideo.vue   | 19 +++++++++++++++----
 app/models/attachment.rb                      |  4 +++-
 .../conversations/attachments.json.jbuilder   |  2 ++
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/app/javascript/dashboard/components/widgets/conversation/Message.vue b/app/javascript/dashboard/components/widgets/conversation/Message.vue
index e6890535b..8c57b6fc2 100644
--- a/app/javascript/dashboard/components/widgets/conversation/Message.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/Message.vue
@@ -577,7 +577,8 @@ export default {
 
         > img,
         > video {
-          @apply rounded-lg;
+          /** ensure that the bubble radius and image radius match*/
+          @apply rounded-[0.4rem];
         }
 
         > video {
diff --git a/app/javascript/dashboard/components/widgets/conversation/bubble/ImageAudioVideo.vue b/app/javascript/dashboard/components/widgets/conversation/bubble/ImageAudioVideo.vue
index 22ea61405..a105b63aa 100644
--- a/app/javascript/dashboard/components/widgets/conversation/bubble/ImageAudioVideo.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/bubble/ImageAudioVideo.vue
@@ -2,20 +2,23 @@
   <div class="message-text__wrap" :class="attachmentTypeClasses">
     <img
       v-if="isImage && !isImageError"
-      :src="attachment.data_url"
+      class="bg-woot-200 dark:bg-woot-900"
+      :src="dataUrl"
+      :width="imageWidth"
+      :height="imageHeight"
       @click="onClick"
       @error="onImgError"
     />
     <video
       v-if="isVideo"
-      :src="attachment.data_url"
+      :src="dataUrl"
       muted
       playsInline
       @error="onImgError"
       @click="onClick"
     />
     <audio v-else-if="isAudio" controls class="skip-context-menu">
-      <source :src="`${attachment.data_url}?t=${Date.now()}`" />
+      <source :src="`${dataUrl}?t=${Date.now()}`" />
     </audio>
     <gallery-view
       v-if="show"
@@ -31,7 +34,6 @@
 <script>
 import { mapGetters } from 'vuex';
 import { hasPressedCommand } from 'shared/helpers/KeyboardHelpers';
-
 import GalleryView from '../components/GalleryView.vue';
 
 const ALLOWED_FILE_TYPES = {
@@ -81,6 +83,15 @@ export default {
       );
       return attachments;
     },
+    dataUrl() {
+      return this.attachment.data_url;
+    },
+    imageWidth() {
+      return this.attachment.width ? `${this.attachment.width}px` : 'auto';
+    },
+    imageHeight() {
+      return this.attachment.height ? `${this.attachment.height}px` : 'auto';
+    },
   },
   watch: {
     attachment() {
diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index 7a8725e30..be9340dd0 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -76,7 +76,9 @@ class Attachment < ApplicationRecord
       extension: extension,
       data_url: file_url,
       thumb_url: thumb_url,
-      file_size: file.byte_size
+      file_size: file.byte_size,
+      width: file.metadata[:width],
+      height: file.metadata[:height]
     }
 
     metadata[:data_url] = metadata[:thumb_url] = external_url if message.instagram_story_mention?
diff --git a/app/views/api/v1/accounts/conversations/attachments.json.jbuilder b/app/views/api/v1/accounts/conversations/attachments.json.jbuilder
index 86c900fca..068462d54 100644
--- a/app/views/api/v1/accounts/conversations/attachments.json.jbuilder
+++ b/app/views/api/v1/accounts/conversations/attachments.json.jbuilder
@@ -5,6 +5,8 @@ json.payload @attachments do |attachment|
   json.file_size attachment.push_event_data[:file_size]
   json.file_type attachment.push_event_data[:file_type]
   json.extension attachment.push_event_data[:extension]
+  json.width attachment.push_event_data[:width]
+  json.height attachment.push_event_data[:height]
   json.created_at attachment.message.created_at.to_i
   json.sender attachment.message.sender.push_event_data if attachment.message.sender
 end

From 41e269e873a565b545a4e88228534c2316a50899 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Wed, 28 Feb 2024 04:23:28 +0530
Subject: [PATCH 38/96] feat(ee): Add reporting events for bots (#9027)

Added a new event conversation_bot_resolved and added a job to auto resolve the bot conversations if there was no activity for the last 1 hour.
---
 .github/workflows/run_response_bot_spec.yml   |  1 +
 .../conversations_resolution_scheduler_job.rb |  1 +
 app/listeners/reporting_event_listener.rb     | 14 +++++++
 .../conversations_resolution_scheduler_job.rb | 10 +++++
 ...ox_pending_conversations_resolution_job.rb | 19 ++++++++++
 .../{ => response_bot}/response_bot_job.rb    |  2 +-
 .../response_builder_job.rb                   |  2 +-
 .../response_document_content_job.rb          |  2 +-
 enterprise/app/models/response_document.rb    |  4 +-
 .../hook_execution_service.rb                 |  2 +-
 .../message_templates/response_bot_service.rb |  4 +-
 .../services/features/response_bot_service.rb |  5 +++
 .../response_sources_controller_spec.rb       |  2 +-
 .../v1/accounts/inboxes_controller_spec.rb    |  2 +-
 ...ersations_resolution_scheduler_job_spec.rb | 29 ++++++++++++++
 ...nding_conversations_resolution_job_spec.rb | 38 +++++++++++++++++++
 .../response_bot_service_spec.rb              | 23 ++++++++---
 spec/factories/inbox_response_source.rb       |  8 ++++
 .../reporting_event_listener_spec.rb          | 31 +++++++++++++++
 spec/spec_helper.rb                           | 10 +++++
 20 files changed, 194 insertions(+), 15 deletions(-)
 create mode 100644 enterprise/app/jobs/enterprise/account/conversations_resolution_scheduler_job.rb
 create mode 100644 enterprise/app/jobs/response_bot/inbox_pending_conversations_resolution_job.rb
 rename enterprise/app/jobs/{ => response_bot}/response_bot_job.rb (75%)
 rename enterprise/app/jobs/{ => response_bot}/response_builder_job.rb (97%)
 rename enterprise/app/jobs/{ => response_bot}/response_document_content_job.rb (83%)
 create mode 100644 spec/enterprise/jobs/enterprise/account/conversations_resolution_scheduler_job_spec.rb
 create mode 100644 spec/enterprise/jobs/response_bot/inbox_pending_conversations_resolution_job_spec.rb
 create mode 100644 spec/factories/inbox_response_source.rb

diff --git a/.github/workflows/run_response_bot_spec.yml b/.github/workflows/run_response_bot_spec.yml
index 77b96c48a..c594ff404 100644
--- a/.github/workflows/run_response_bot_spec.yml
+++ b/.github/workflows/run_response_bot_spec.yml
@@ -73,6 +73,7 @@ jobs:
           spec/enterprise/controllers/api/v1/accounts/response_sources_controller_spec.rb \
           spec/enterprise/services/enterprise/message_templates/response_bot_service_spec.rb \
           spec/enterprise/controllers/enterprise/api/v1/accounts/inboxes_controller_spec.rb:47 \
+          spec/enterprise/jobs/enterprise/account/conversations_resolution_scheduler_job_spec.rb \
           --profile=10 \
           --format documentation
 
diff --git a/app/jobs/account/conversations_resolution_scheduler_job.rb b/app/jobs/account/conversations_resolution_scheduler_job.rb
index 37848db49..ab9fc4029 100644
--- a/app/jobs/account/conversations_resolution_scheduler_job.rb
+++ b/app/jobs/account/conversations_resolution_scheduler_job.rb
@@ -7,3 +7,4 @@ class Account::ConversationsResolutionSchedulerJob < ApplicationJob
     end
   end
 end
+Account::ConversationsResolutionSchedulerJob.prepend_mod_with('Account::ConversationsResolutionSchedulerJob')
diff --git a/app/listeners/reporting_event_listener.rb b/app/listeners/reporting_event_listener.rb
index 093452e92..7c625c12d 100644
--- a/app/listeners/reporting_event_listener.rb
+++ b/app/listeners/reporting_event_listener.rb
@@ -17,6 +17,8 @@ class ReportingEventListener < BaseListener
       event_start_time: conversation.created_at,
       event_end_time: conversation.updated_at
     )
+
+    create_bot_resolved_event(conversation, reporting_event)
     reporting_event.save!
   end
 
@@ -83,4 +85,16 @@ class ReportingEventListener < BaseListener
     )
     reporting_event.save!
   end
+
+  private
+
+  def create_bot_resolved_event(conversation, reporting_event)
+    return unless conversation.inbox.active_bot?
+    # We don't want to create a bot_resolved event if there is user interaction on the conversation
+    return if conversation.messages.exists?(message_type: :outgoing, sender_type: 'User')
+
+    bot_resolved_event = reporting_event.dup
+    bot_resolved_event.name = 'conversation_bot_resolved'
+    bot_resolved_event.save!
+  end
 end
diff --git a/enterprise/app/jobs/enterprise/account/conversations_resolution_scheduler_job.rb b/enterprise/app/jobs/enterprise/account/conversations_resolution_scheduler_job.rb
new file mode 100644
index 000000000..4f80424f8
--- /dev/null
+++ b/enterprise/app/jobs/enterprise/account/conversations_resolution_scheduler_job.rb
@@ -0,0 +1,10 @@
+module Enterprise::Account::ConversationsResolutionSchedulerJob
+  def perform
+    super
+    Account.feature_response_bot.all.find_each(batch_size: 100) do |account|
+      account.inboxes.each do |inbox|
+        ResponseBot::InboxPendingConversationsResolutionJob.perform_later(inbox) if inbox.response_bot_enabled?
+      end
+    end
+  end
+end
diff --git a/enterprise/app/jobs/response_bot/inbox_pending_conversations_resolution_job.rb b/enterprise/app/jobs/response_bot/inbox_pending_conversations_resolution_job.rb
new file mode 100644
index 000000000..f6333d446
--- /dev/null
+++ b/enterprise/app/jobs/response_bot/inbox_pending_conversations_resolution_job.rb
@@ -0,0 +1,19 @@
+class ResponseBot::InboxPendingConversationsResolutionJob < ApplicationJob
+  queue_as :low
+
+  def perform(inbox)
+    # limiting the number of conversations to be resolved to avoid any performance issues
+    resolvable_conversations = inbox.conversations.pending.where('last_activity_at < ? ', Time.now.utc - 1.hour).limit(Limits::BULK_ACTIONS_LIMIT)
+    resolvable_conversations.each do |conversation|
+      conversation.messages.create!(
+        {
+          message_type: :outgoing,
+          account_id: conversation.account_id,
+          inbox_id: conversation.inbox_id,
+          content: 'Resolving the conversation as it has been inactive for a while. Please start a new conversation if you need further assistance.'
+        }
+      )
+      conversation.resolved!
+    end
+  end
+end
diff --git a/enterprise/app/jobs/response_bot_job.rb b/enterprise/app/jobs/response_bot/response_bot_job.rb
similarity index 75%
rename from enterprise/app/jobs/response_bot_job.rb
rename to enterprise/app/jobs/response_bot/response_bot_job.rb
index 5ad703bab..c235d4803 100644
--- a/enterprise/app/jobs/response_bot_job.rb
+++ b/enterprise/app/jobs/response_bot/response_bot_job.rb
@@ -1,4 +1,4 @@
-class ResponseBotJob < ApplicationJob
+class ResponseBot::ResponseBotJob < ApplicationJob
   queue_as :medium
 
   def perform(conversation)
diff --git a/enterprise/app/jobs/response_builder_job.rb b/enterprise/app/jobs/response_bot/response_builder_job.rb
similarity index 97%
rename from enterprise/app/jobs/response_builder_job.rb
rename to enterprise/app/jobs/response_bot/response_builder_job.rb
index 536cdef5a..6a8cc07a2 100644
--- a/enterprise/app/jobs/response_builder_job.rb
+++ b/enterprise/app/jobs/response_bot/response_builder_job.rb
@@ -1,4 +1,4 @@
-class ResponseBuilderJob < ApplicationJob
+class ResponseBot::ResponseBuilderJob < ApplicationJob
   queue_as :default
 
   def perform(response_document)
diff --git a/enterprise/app/jobs/response_document_content_job.rb b/enterprise/app/jobs/response_bot/response_document_content_job.rb
similarity index 83%
rename from enterprise/app/jobs/response_document_content_job.rb
rename to enterprise/app/jobs/response_bot/response_document_content_job.rb
index bced3a12f..31c87e293 100644
--- a/enterprise/app/jobs/response_document_content_job.rb
+++ b/enterprise/app/jobs/response_bot/response_document_content_job.rb
@@ -1,5 +1,5 @@
 # app/jobs/response_document_content_job.rb
-class ResponseDocumentContentJob < ApplicationJob
+class ResponseBot::ResponseDocumentContentJob < ApplicationJob
   queue_as :default
 
   def perform(response_document)
diff --git a/enterprise/app/models/response_document.rb b/enterprise/app/models/response_document.rb
index 91540e6ab..97e7ee949 100644
--- a/enterprise/app/models/response_document.rb
+++ b/enterprise/app/models/response_document.rb
@@ -35,12 +35,12 @@ class ResponseDocument < ApplicationRecord
   def ensure_content
     return unless content.nil?
 
-    ResponseDocumentContentJob.perform_later(self)
+    ResponseBot::ResponseDocumentContentJob.perform_later(self)
   end
 
   def handle_content_change
     return unless saved_change_to_content? && content.present?
 
-    ResponseBuilderJob.perform_later(self)
+    ResponseBot::ResponseBuilderJob.perform_later(self)
   end
 end
diff --git a/enterprise/app/services/enterprise/message_templates/hook_execution_service.rb b/enterprise/app/services/enterprise/message_templates/hook_execution_service.rb
index 5eadd2416..47aa559f9 100644
--- a/enterprise/app/services/enterprise/message_templates/hook_execution_service.rb
+++ b/enterprise/app/services/enterprise/message_templates/hook_execution_service.rb
@@ -1,7 +1,7 @@
 module Enterprise::MessageTemplates::HookExecutionService
   def trigger_templates
     super
-    ResponseBotJob.perform_later(conversation) if should_process_response_bot?
+    ResponseBot::ResponseBotJob.perform_later(conversation) if should_process_response_bot?
   end
 
   def should_process_response_bot?
diff --git a/enterprise/app/services/enterprise/message_templates/response_bot_service.rb b/enterprise/app/services/enterprise/message_templates/response_bot_service.rb
index 9df63f7e4..dca6f7279 100644
--- a/enterprise/app/services/enterprise/message_templates/response_bot_service.rb
+++ b/enterprise/app/services/enterprise/message_templates/response_bot_service.rb
@@ -80,8 +80,8 @@ class Enterprise::MessageTemplates::ResponseBotService
     case action
     when 'handoff'
       conversation.messages.create!('message_type': :outgoing, 'account_id': conversation.account_id, 'inbox_id': conversation.inbox_id,
-                                    'content': 'passing to an agent')
-      conversation.update(status: :open)
+                                    'content': 'Transferring to another agent for further assistance.')
+      conversation.bot_handoff!
     end
   end
 
diff --git a/enterprise/app/services/features/response_bot_service.rb b/enterprise/app/services/features/response_bot_service.rb
index da45cf48b..9162c085e 100644
--- a/enterprise/app/services/features/response_bot_service.rb
+++ b/enterprise/app/services/features/response_bot_service.rb
@@ -6,6 +6,11 @@ class Features::ResponseBotService
     create_tables
   end
 
+  def disable_in_installation
+    drop_tables
+    disable_vector_extension
+  end
+
   def enable_vector_extension
     MIGRATION_VERSION.enable_extension 'vector'
   rescue ActiveRecord::StatementInvalid
diff --git a/spec/enterprise/controllers/api/v1/accounts/response_sources_controller_spec.rb b/spec/enterprise/controllers/api/v1/accounts/response_sources_controller_spec.rb
index 44e0dced1..3d21a79a2 100644
--- a/spec/enterprise/controllers/api/v1/accounts/response_sources_controller_spec.rb
+++ b/spec/enterprise/controllers/api/v1/accounts/response_sources_controller_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe 'Response Sources API', type: :request do
   let!(:admin) { create(:user, account: account, role: :administrator) }
 
   before do
-    skip('Skipping since vector is not enabled in this environment') unless Features::ResponseBotService.new.vector_extension_enabled?
+    skip_unless_response_bot_enabled_test_environment
   end
 
   describe 'POST /api/v1/accounts/{account.id}/response_sources/parse' do
diff --git a/spec/enterprise/controllers/enterprise/api/v1/accounts/inboxes_controller_spec.rb b/spec/enterprise/controllers/enterprise/api/v1/accounts/inboxes_controller_spec.rb
index 7783dc384..199ee7cd7 100644
--- a/spec/enterprise/controllers/enterprise/api/v1/accounts/inboxes_controller_spec.rb
+++ b/spec/enterprise/controllers/enterprise/api/v1/accounts/inboxes_controller_spec.rb
@@ -50,7 +50,7 @@ RSpec.describe 'Enterprise Inboxes API', type: :request do
     let(:administrator) { create(:user, account: account, role: :administrator) }
 
     before do
-      skip('Skipping since vector is not enabled in this environment') unless Features::ResponseBotService.new.vector_extension_enabled?
+      skip_unless_response_bot_enabled_test_environment
     end
 
     context 'when it is an unauthenticated user' do
diff --git a/spec/enterprise/jobs/enterprise/account/conversations_resolution_scheduler_job_spec.rb b/spec/enterprise/jobs/enterprise/account/conversations_resolution_scheduler_job_spec.rb
new file mode 100644
index 000000000..642752c5b
--- /dev/null
+++ b/spec/enterprise/jobs/enterprise/account/conversations_resolution_scheduler_job_spec.rb
@@ -0,0 +1,29 @@
+require 'rails_helper'
+
+RSpec.describe Account::ConversationsResolutionSchedulerJob, type: :job do
+  let!(:account_with_bot) { create(:account) }
+  let!(:account_without_bot) { create(:account) }
+  let!(:inbox_with_bot) { create(:inbox, account: account_with_bot) }
+  let!(:inbox_without_bot) { create(:inbox, account: account_without_bot) }
+  let(:response_source) { create(:response_source, account: account_with_bot) }
+
+  before do
+    skip_unless_response_bot_enabled_test_environment
+    account_with_bot.enable_features!(:response_bot)
+    create(:inbox_response_source, inbox: inbox_with_bot, response_source: response_source)
+  end
+
+  describe '#perform' do
+    it 'enqueues resolution jobs only for inboxes with response bot enabled' do
+      expect do
+        described_class.perform_now
+      end.to have_enqueued_job(ResponseBot::InboxPendingConversationsResolutionJob).with(inbox_with_bot).and have_enqueued_job.exactly(:once)
+    end
+
+    it 'does not enqueue resolution jobs for inboxes without response bot enabled' do
+      expect do
+        described_class.perform_now
+      end.not_to have_enqueued_job(ResponseBot::InboxPendingConversationsResolutionJob).with(inbox_without_bot)
+    end
+  end
+end
diff --git a/spec/enterprise/jobs/response_bot/inbox_pending_conversations_resolution_job_spec.rb b/spec/enterprise/jobs/response_bot/inbox_pending_conversations_resolution_job_spec.rb
new file mode 100644
index 000000000..268d758cd
--- /dev/null
+++ b/spec/enterprise/jobs/response_bot/inbox_pending_conversations_resolution_job_spec.rb
@@ -0,0 +1,38 @@
+require 'rails_helper'
+
+RSpec.describe ResponseBot::InboxPendingConversationsResolutionJob, type: :job do
+  include ActiveJob::TestHelper
+
+  let!(:inbox) { create(:inbox) }
+  let!(:resolvable_pending_conversation) { create(:conversation, inbox: inbox, last_activity_at: 2.hours.ago, status: :pending) }
+  let!(:recent_pending_conversation) { create(:conversation, inbox: inbox, last_activity_at: 10.minutes.ago, status: :pending) }
+  let!(:open_conversation) { create(:conversation, inbox: inbox, last_activity_at: 1.hour.ago, status: :open) }
+
+  before do
+    stub_const('Limits::BULK_ACTIONS_LIMIT', 2)
+  end
+
+  it 'queues the job' do
+    expect { described_class.perform_later(inbox) }
+      .to have_enqueued_job.on_queue('low')
+  end
+
+  it 'resolves only the eligible pending conversations' do
+    perform_enqueued_jobs { described_class.perform_later(inbox) }
+
+    expect(resolvable_pending_conversation.reload.status).to eq('resolved')
+    expect(recent_pending_conversation.reload.status).to eq('pending')
+    expect(open_conversation.reload.status).to eq('open')
+  end
+
+  it 'creates an outgoing message for each resolved conversation' do
+    # resolution message + system message
+    expect { perform_enqueued_jobs { described_class.perform_later(inbox) } }
+      .to change { resolvable_pending_conversation.messages.reload.count }.by(2)
+
+    resolved_conversation_messages = resolvable_pending_conversation.messages.map(&:content)
+    expect(resolved_conversation_messages).to include(
+      'Resolving the conversation as it has been inactive for a while. Please start a new conversation if you need further assistance.'
+    )
+  end
+end
diff --git a/spec/enterprise/services/enterprise/message_templates/response_bot_service_spec.rb b/spec/enterprise/services/enterprise/message_templates/response_bot_service_spec.rb
index 42c62bc62..fc24a6379 100644
--- a/spec/enterprise/services/enterprise/message_templates/response_bot_service_spec.rb
+++ b/spec/enterprise/services/enterprise/message_templates/response_bot_service_spec.rb
@@ -8,9 +8,7 @@ RSpec.describe Enterprise::MessageTemplates::ResponseBotService, type: :service
   let(:response_object) { instance_double(Response, id: 1, question: 'Q1', answer: 'A1') }
 
   before do
-    # Uncomment if you want to run the spec in your local machine
-    # Features::ResponseBotService.new.enable_in_installation
-    skip('Skipping since vector is not enabled in this environment') unless Features::ResponseBotService.new.vector_extension_enabled?
+    skip_unless_response_bot_enabled_test_environment
     stub_request(:post, 'https://api.openai.com/v1/embeddings').to_return(status: 200, body: {}.to_json,
                                                                           headers: { Content_Type: 'application/json' })
     create(:message, message_type: :incoming, conversation: conversation, content: 'Hi')
@@ -33,6 +31,19 @@ RSpec.describe Enterprise::MessageTemplates::ResponseBotService, type: :service
         expect(last_message.content).to include(Response.first.question)
         expect(last_message.content).to include('**Sources**')
       end
+
+      it 'hands off the conversation if the response is handoff' do
+        allow(chat_gpt_double).to receive(:generate_response).and_return({ 'response' => 'conversation_handoff' })
+        expect(conversation).to receive(:bot_handoff!).and_call_original
+
+        expect do
+          service.perform
+        end.to change { conversation.messages.where(message_type: :outgoing).count }.by(1)
+
+        last_message = conversation.messages.last
+        expect(last_message.content).to eq('Transferring to another agent for further assistance.')
+        expect(conversation.status).to eq('open')
+      end
     end
 
     context 'when context_ids are not present' do
@@ -67,12 +78,13 @@ RSpec.describe Enterprise::MessageTemplates::ResponseBotService, type: :service
     context 'when JSON::ParserError is raised' do
       it 'creates a handoff message' do
         allow(chat_gpt_double).to receive(:generate_response).and_raise(JSON::ParserError)
+        expect(conversation).to receive(:bot_handoff!).and_call_original
 
         expect do
           service.perform
         end.to change { conversation.messages.where(message_type: :outgoing).count }.by(1)
 
-        expect(conversation.messages.last.content).to eq('passing to an agent')
+        expect(conversation.messages.last.content).to eq('Transferring to another agent for further assistance.')
         expect(conversation.status).to eq('open')
       end
     end
@@ -80,6 +92,7 @@ RSpec.describe Enterprise::MessageTemplates::ResponseBotService, type: :service
     context 'when StandardError is raised' do
       it 'captures the exception' do
         allow(chat_gpt_double).to receive(:generate_response).and_raise(StandardError)
+        expect(conversation).to receive(:bot_handoff!).and_call_original
 
         expect(ChatwootExceptionTracker).to receive(:new).and_call_original
 
@@ -87,7 +100,7 @@ RSpec.describe Enterprise::MessageTemplates::ResponseBotService, type: :service
           service.perform
         end.to change { conversation.messages.where(message_type: :outgoing).count }.by(1)
 
-        expect(conversation.messages.last.content).to eq('passing to an agent')
+        expect(conversation.messages.last.content).to eq('Transferring to another agent for further assistance.')
         expect(conversation.status).to eq('open')
       end
     end
diff --git a/spec/factories/inbox_response_source.rb b/spec/factories/inbox_response_source.rb
new file mode 100644
index 000000000..d8b9d18c6
--- /dev/null
+++ b/spec/factories/inbox_response_source.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :inbox_response_source do
+    inbox
+    response_source
+  end
+end
diff --git a/spec/listeners/reporting_event_listener_spec.rb b/spec/listeners/reporting_event_listener_spec.rb
index 9577f87b2..86647eb87 100644
--- a/spec/listeners/reporting_event_listener_spec.rb
+++ b/spec/listeners/reporting_event_listener_spec.rb
@@ -32,6 +32,37 @@ describe ReportingEventListener do
         expect(account.reporting_events.where(name: 'conversation_resolved')[0]['value_in_business_hours']).to be 144_000.0
       end
     end
+
+    describe 'conversation_bot_resolved' do
+      # create an agent bot
+      let!(:agent_bot_inbox) { create(:inbox, account: account) }
+      let!(:agent_bot) { create(:agent_bot, account: account) }
+      let!(:bot_resolved_conversation) { create(:conversation, account: account, inbox: agent_bot_inbox, assignee: user) }
+
+      before do
+        create(:agent_bot_inbox, agent_bot: agent_bot, inbox: agent_bot_inbox)
+      end
+
+      it 'creates a conversation_bot_resolved event if resolved conversation does not have human interaction' do
+        event = Events::Base.new('conversation.resolved', Time.zone.now, conversation: bot_resolved_conversation)
+        listener.conversation_resolved(event)
+        expect(account.reporting_events.where(name: 'conversation_bot_resolved').count).to be 1
+      end
+
+      it 'does not create a conversation_bot_resolved event if resolved conversation inbox does not have active bot' do
+        bot_resolved_conversation.update(inbox: inbox)
+        event = Events::Base.new('conversation.resolved', Time.zone.now, conversation: bot_resolved_conversation)
+        listener.conversation_resolved(event)
+        expect(account.reporting_events.where(name: 'conversation_bot_resolved').count).to be 0
+      end
+
+      it 'does not create a conversation_bot_resolved event if resolved conversation has human interaction' do
+        create(:message, message_type: 'outgoing', account: account, inbox: agent_bot_inbox, conversation: bot_resolved_conversation)
+        event = Events::Base.new('conversation.resolved', Time.zone.now, conversation: bot_resolved_conversation)
+        listener.conversation_resolved(event)
+        expect(account.reporting_events.where(name: 'conversation_bot_resolved').count).to be 0
+      end
+    end
   end
 
   describe '#reply_created' do
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 3c275aeb4..3e18ec5df 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -18,4 +18,14 @@ RSpec.configure do |config|
   def with_modified_env(options, &)
     ClimateControl.modify(options, &)
   end
+
+  def skip_unless_response_bot_enabled_test_environment
+    # Tests skipped using this method should be added to .github/workflows/run_response_bot_spec.yml
+    # Manage response bot tests in your local environment using the following commands:
+    # Enable response bot for tests
+    # RAILS_ENV=test bundle exec rails runner "Features::ResponseBotService.new.enable_in_installation"
+    # Disable response bot for tests
+    # RAILS_ENV=test bundle exec rails runner "Features::ResponseBotService.new.disable_in_installation"
+    skip('Skipping since vector is not enabled in this environment') unless Features::ResponseBotService.new.vector_extension_enabled?
+  end
 end

From ac249c75c43bb53c7fb3d69e3dbda5a560c4b6a2 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Wed, 28 Feb 2024 07:21:06 +0530
Subject: [PATCH 39/96] chore: Update the metric card component to support
 generic cases (#9030)

Rename the CSAT metric card to a generic name, updated the implementation to use composition API and removed all the custom CSS in the component to conform with TailwindCSS styles
---------
Co-authored-by: Pranav <pranav@chatwoot.com>
---
 .../settings/reports/ReportContainer.vue      | 35 ++++-----
 .../reports/components/CsatMetricCard.vue     | 77 -------------------
 .../reports/components/CsatMetrics.vue        | 13 ++--
 ...stories.js => ReportMetricCard.stories.js} | 12 +--
 .../reports/components/ReportMetricCard.vue   | 48 ++++++++++++
 ...cCard.spec.js => ReportMetricCard.spec.js} | 28 ++++---
 6 files changed, 93 insertions(+), 120 deletions(-)
 delete mode 100644 app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatMetricCard.vue
 rename app/javascript/dashboard/routes/dashboard/settings/reports/components/{CsatMetricCard.stories.js => ReportMetricCard.stories.js} (71%)
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/reports/components/ReportMetricCard.vue
 rename app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/{CsatMetricCard.spec.js => ReportMetricCard.spec.js} (52%)

diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/ReportContainer.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/ReportContainer.vue
index 6710187fd..c601b4277 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/ReportContainer.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/ReportContainer.vue
@@ -37,15 +37,6 @@ import format from 'date-fns/format';
 import { formatTime } from '@chatwoot/utils';
 import reportMixin from 'dashboard/mixins/reportMixin';
 import ChartStats from './components/ChartElements/ChartStats.vue';
-const REPORTS_KEYS = {
-  CONVERSATIONS: 'conversations_count',
-  INCOMING_MESSAGES: 'incoming_messages_count',
-  OUTGOING_MESSAGES: 'outgoing_messages_count',
-  FIRST_RESPONSE_TIME: 'avg_first_response_time',
-  RESOLUTION_TIME: 'avg_resolution_time',
-  RESOLUTION_COUNT: 'resolutions_count',
-  REPLY_TIME: 'reply_time',
-};
 
 export default {
   components: { ChartStats },
@@ -55,18 +46,22 @@ export default {
       type: Object,
       default: () => ({}),
     },
+    reportKeys: {
+      type: Object,
+      default: () => ({
+        CONVERSATIONS: 'conversations_count',
+        INCOMING_MESSAGES: 'incoming_messages_count',
+        OUTGOING_MESSAGES: 'outgoing_messages_count',
+        FIRST_RESPONSE_TIME: 'avg_first_response_time',
+        RESOLUTION_TIME: 'avg_resolution_time',
+        RESOLUTION_COUNT: 'resolutions_count',
+        REPLY_TIME: 'reply_time',
+      }),
+    },
   },
   computed: {
     metrics() {
-      const reportKeys = [
-        'CONVERSATIONS',
-        'FIRST_RESPONSE_TIME',
-        'REPLY_TIME',
-        'RESOLUTION_TIME',
-        'RESOLUTION_COUNT',
-        'INCOMING_MESSAGES',
-        'OUTGOING_MESSAGES',
-      ];
+      const reportKeys = Object.keys(this.reportKeys);
       const infoText = {
         FIRST_RESPONSE_TIME: this.$t(
           `REPORT.METRICS.FIRST_RESPONSE_TIME.INFO_TEXT`
@@ -75,11 +70,11 @@ export default {
       };
       return reportKeys.map(key => ({
         NAME: this.$t(`REPORT.METRICS.${key}.NAME`),
-        KEY: REPORTS_KEYS[key],
+        KEY: this.reportKeys[key],
         DESC: this.$t(`REPORT.METRICS.${key}.DESC`),
         INFO_TEXT: infoText[key],
         TOOLTIP_TEXT: `REPORT.METRICS.${key}.TOOLTIP_TEXT`,
-        trend: this.calculateTrend(REPORTS_KEYS[key]),
+        trend: this.calculateTrend(this.reportKeys[key]),
       }));
     },
   },
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatMetricCard.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatMetricCard.vue
deleted file mode 100644
index aa014a763..000000000
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatMetricCard.vue
+++ /dev/null
@@ -1,77 +0,0 @@
-<template>
-  <div
-    class="md:w-[16%] sm:w-[50%] sm:max-w-[50%] md:max-w-[16%] csat--metric-card"
-    :class="{
-      disabled: disabled,
-    }"
-  >
-    <h3 class="heading">
-      <span>{{ label }}</span>
-      <fluent-icon
-        v-tooltip="infoText"
-        size="14"
-        icon="info"
-        class="csat--icon"
-      />
-    </h3>
-    <h4 class="metric">
-      {{ value }}
-    </h4>
-  </div>
-</template>
-<script>
-export default {
-  props: {
-    label: {
-      type: String,
-      required: true,
-    },
-    value: {
-      type: String,
-      required: true,
-    },
-    infoText: {
-      type: String,
-      required: true,
-    },
-    disabled: {
-      type: Boolean,
-      default: false,
-    },
-  },
-};
-</script>
-<style lang="scss" scoped>
-.csat--metric-card {
-  margin: 0;
-  padding: var(--space-normal);
-
-  &.disabled {
-    // grayscale everything
-    filter: grayscale(100%);
-    opacity: 0.3;
-    pointer-events: none;
-  }
-
-  .heading {
-    align-items: center;
-    display: flex;
-    font-size: var(--font-size-small);
-    font-weight: var(--font-weight-bold);
-    margin: 0;
-    @apply text-slate-800 dark:text-slate-100;
-  }
-
-  .metric {
-    font-size: var(--font-size-bigger);
-    font-weight: var(--font-weight-feather);
-    margin-bottom: 0;
-    margin-top: var(--space-smaller);
-    @apply text-slate-700 dark:text-slate-100;
-  }
-}
-
-.csat--icon {
-  @apply text-slate-500 dark:text-slate-200 my-0 mx-0.5;
-}
-</style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatMetrics.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatMetrics.vue
index d1b9866b0..2c90f987e 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatMetrics.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatMetrics.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    class="flex flex-wrap mx-0 bg-white dark:bg-slate-800 rounded-[4px] p-4 mb-5 border border-solid border-slate-75 dark:border-slate-700"
+    class="flex-col lg:flex-row flex flex-wrap mx-0 bg-white dark:bg-slate-800 rounded-[4px] p-4 mb-5 border border-solid border-slate-75 dark:border-slate-700"
   >
     <csat-metric-card
       :label="$t('CSAT_REPORTS.METRIC.TOTAL_RESPONSES.LABEL')"
@@ -18,16 +18,19 @@
       :info-text="$t('CSAT_REPORTS.METRIC.RESPONSE_RATE.TOOLTIP')"
       :value="formatToPercent(responseRate)"
     />
+
     <div
       v-if="metrics.totalResponseCount && !ratingFilterEnabled"
-      class="w-[50%] max-w-[50%] flex-[50%] report-card rtl:[direction:initial]"
+      class="w-full md:w-1/2 md:max-w-[50%] flex-1 rtl:[direction:initial] p-4"
     >
-      <h3 class="heading text-slate-800 dark:text-slate-100">
+      <h3
+        class="flex items-center text-xs md:text-sm font-medium m-0 text-slate-800 dark:text-slate-100"
+      >
         <div class="flex justify-end flex-row-reverse">
           <div
             v-for="(rating, key, index) in ratingPercentage"
             :key="rating + key + index"
-            class="pl-4"
+            class="pr-4 rtl:pl-4"
           >
             <span class="my-0 mx-0.5">{{ ratingToEmoji(key) }}</span>
             <span>{{ formatToPercent(rating) }}</span>
@@ -42,7 +45,7 @@
 </template>
 <script>
 import { mapGetters } from 'vuex';
-import CsatMetricCard from './CsatMetricCard.vue';
+import CsatMetricCard from './ReportMetricCard.vue';
 import { CSAT_RATINGS } from 'shared/constants/messages';
 
 export default {
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatMetricCard.stories.js b/app/javascript/dashboard/routes/dashboard/settings/reports/components/ReportMetricCard.stories.js
similarity index 71%
rename from app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatMetricCard.stories.js
rename to app/javascript/dashboard/routes/dashboard/settings/reports/components/ReportMetricCard.stories.js
index f842c05f0..701b2c9f5 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatMetricCard.stories.js
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/ReportMetricCard.stories.js
@@ -1,12 +1,12 @@
 import Vue from 'vue';
 import VTooltip from 'v-tooltip';
-import CsatMetricCard from './CsatMetricCard';
+import ReportMetricCard from './ReportMetricCard';
 
 Vue.use(VTooltip, { defaultHtml: false });
 
 export default {
   title: 'Components/CSAT/Metrics Card',
-  component: CsatMetricCard,
+  component: ReportMetricCard,
   argTypes: {
     label: {
       defaultValue: '',
@@ -31,12 +31,12 @@ export default {
 
 const Template = (_, { argTypes }) => ({
   props: Object.keys(argTypes),
-  components: { CsatMetricCard },
-  template: '<csat-metric-card v-bind="$props" />',
+  components: { ReportMetricCard },
+  template: '<report-metric-card v-bind="$props" />',
 });
 
-export const CsatMetricCardTemplate = Template.bind({});
-CsatMetricCardTemplate.args = {
+export const ReportMetricCardTemplate = Template.bind({});
+ReportMetricCardTemplate.args = {
   infoText: 'No. of responses / No. of survey messages sent * 100',
   label: 'Satisfaction Score',
   value: '98.5',
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/ReportMetricCard.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/ReportMetricCard.vue
new file mode 100644
index 000000000..abede8c89
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/ReportMetricCard.vue
@@ -0,0 +1,48 @@
+<script setup>
+defineProps({
+  label: {
+    type: String,
+    required: true,
+  },
+  value: {
+    type: String,
+    required: true,
+  },
+  infoText: {
+    type: String,
+    required: true,
+  },
+  disabled: {
+    type: Boolean,
+    default: false,
+  },
+});
+</script>
+<template>
+  <div
+    ref="reportMetricContainer"
+    class="xs:w-full sm:max-w-[50%] lg:w-1/6 lg:max-w-[16%] m-0 p-4"
+    :class="{
+      'grayscale pointer-events-none opacity-30': disabled,
+    }"
+  >
+    <h3
+      class="flex items-center text-sm font-medium m-0 text-slate-800 dark:text-slate-100"
+    >
+      <span ref="reportMetricLabel">{{ label }}</span>
+      <fluent-icon
+        ref="reportMetricInfo"
+        v-tooltip="infoText"
+        size="14"
+        icon="info"
+        class="text-slate-500 dark:text-slate-200 my-0 mx-1 mt-0.5"
+      />
+    </h3>
+    <h4
+      ref="reportMetricValue"
+      class="text-slate-700 dark:text-slate-100 mb-0 mt-1 font-thin text-3xl"
+    >
+      {{ value }}
+    </h4>
+  </div>
+</template>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/CsatMetricCard.spec.js b/app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/ReportMetricCard.spec.js
similarity index 52%
rename from app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/CsatMetricCard.spec.js
rename to app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/ReportMetricCard.spec.js
index 8c52d2e1a..a2e194333 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/CsatMetricCard.spec.js
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/ReportMetricCard.spec.js
@@ -1,46 +1,50 @@
 import { createLocalVue, shallowMount } from '@vue/test-utils';
-import CsatMetricCard from '../CsatMetricCard.vue';
+import ReportMetricCard from '../ReportMetricCard.vue';
 
 import VTooltip from 'v-tooltip';
 
 const localVue = createLocalVue();
 localVue.use(VTooltip);
 
-describe('CsatMetricCard.vue', () => {
+describe('ReportMetricCard.vue', () => {
   it('renders props correctly', () => {
     const label = 'Total Responses';
     const value = '100';
     const infoText = 'Total number of responses';
-    const wrapper = shallowMount(CsatMetricCard, {
+    const wrapper = shallowMount(ReportMetricCard, {
       propsData: { label, value, infoText },
       localVue,
       stubs: ['fluent-icon'],
     });
 
-    expect(wrapper.find('.heading span').text()).toMatch(label);
-    expect(wrapper.find('.metric').text()).toMatch(value);
-    expect(wrapper.find('.csat--icon').classes()).toContain('has-tooltip');
+    expect(wrapper.find({ ref: 'reportMetricLabel' }).text()).toMatch(label);
+    expect(wrapper.find({ ref: 'reportMetricValue' }).text()).toMatch(value);
+    expect(wrapper.find({ ref: 'reportMetricInfo' }).classes()).toContain(
+      'has-tooltip'
+    );
   });
 
   it('adds disabled class when disabled prop is true', () => {
-    const wrapper = shallowMount(CsatMetricCard, {
+    const wrapper = shallowMount(ReportMetricCard, {
       propsData: { label: '', value: '', infoText: '', disabled: true },
       localVue,
       stubs: ['fluent-icon'],
     });
 
-    expect(wrapper.find('.csat--metric-card').classes()).toContain('disabled');
+    expect(wrapper.classes().join(' ')).toContain(
+      'grayscale pointer-events-none opacity-30'
+    );
   });
 
   it('does not add disabled class when disabled prop is false', () => {
-    const wrapper = shallowMount(CsatMetricCard, {
+    const wrapper = shallowMount(ReportMetricCard, {
       propsData: { label: '', value: '', infoText: '', disabled: false },
       localVue,
       stubs: ['fluent-icon'],
     });
 
-    expect(wrapper.find('.csat--metric-card').classes()).not.toContain(
-      'disabled'
-    );
+    expect(
+      wrapper.find({ ref: 'reportMetricContainer' }).classes().join(' ')
+    ).not.toContain('grayscale pointer-events-none opacity-30');
   });
 });

From dca14ef82da5a862d3bd7ad346ebafe6c712d12d Mon Sep 17 00:00:00 2001
From: Pranav <pranav@chatwoot.com>
Date: Tue, 27 Feb 2024 20:20:59 -0800
Subject: [PATCH 40/96] fix: Downgrade rack-cors to 2.0.0 to fix CVE-2024-27456
 (#9032)

---
 Gemfile                                                     | 2 +-
 Gemfile.lock                                                | 4 ++--
 .../dashboard/settings/reports/components/CsatMetrics.vue   | 1 +
 .../settings/reports/components/specs/CSATMetrics.spec.js   | 6 ++++--
 .../components/specs/__snapshots__/CSATMetrics.spec.js.snap | 2 +-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index 21e942e0f..59bfc5d7f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 ruby '3.2.2'
 
 ##-- base gems for rails --##
-gem 'rack-cors', require: 'rack/cors'
+gem 'rack-cors', '2.0.0', require: 'rack/cors'
 gem 'rails', '~> 7.0.8.1'
 # Reduces boot times through caching; required in config/boot.rb
 gem 'bootsnap', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 738a3415f..41cb0f20b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -564,7 +564,7 @@ GEM
       rack (>= 1.0, < 4)
     rack-contrib (2.4.0)
       rack (< 4)
-    rack-cors (2.0.1)
+    rack-cors (2.0.0)
       rack (>= 2.0.0)
     rack-mini-profiler (3.2.0)
       rack (>= 1.2.0)
@@ -918,7 +918,7 @@ DEPENDENCIES
   puma
   pundit
   rack-attack (>= 6.7.0)
-  rack-cors
+  rack-cors (= 2.0.0)
   rack-mini-profiler (>= 3.2.0)
   rack-timeout
   rails (~> 7.0.8.1)
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatMetrics.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatMetrics.vue
index 2c90f987e..c9f55bb68 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatMetrics.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatMetrics.vue
@@ -21,6 +21,7 @@
 
     <div
       v-if="metrics.totalResponseCount && !ratingFilterEnabled"
+      ref="csatHorizontalBarChart"
       class="w-full md:w-1/2 md:max-w-[50%] flex-1 rtl:[direction:initial] p-4"
     >
       <h3
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/CSATMetrics.spec.js b/app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/CSATMetrics.spec.js
index 90578153d..47b211574 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/CSATMetrics.spec.js
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/CSATMetrics.spec.js
@@ -54,11 +54,13 @@ describe('CsatMetrics.vue', () => {
   });
 
   it('hides report card if rating filter is enabled', () => {
-    expect(wrapper.find('.report-card').exists()).toBe(false);
+    expect(wrapper.find({ ref: 'csatHorizontalBarChart' }).exists()).toBe(
+      false
+    );
   });
 
   it('shows report card if rating filter is not enabled', async () => {
     await wrapper.setProps({ filters: {} });
-    expect(wrapper.find('.report-card').exists()).toBe(true);
+    expect(wrapper.find({ ref: 'csatHorizontalBarChart' }).exists()).toBe(true);
   });
 });
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/__snapshots__/CSATMetrics.spec.js.snap b/app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/__snapshots__/CSATMetrics.spec.js.snap
index 9788a1ef7..6f2a05bf5 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/__snapshots__/CSATMetrics.spec.js.snap
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/__snapshots__/CSATMetrics.spec.js.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`CsatMetrics.vue computes response count correctly 1`] = `
-<div class="flex flex-wrap mx-0 bg-white dark:bg-slate-800 rounded-[4px] p-4 mb-5 border border-solid border-slate-75 dark:border-slate-700">
+<div class="flex-col lg:flex-row flex flex-wrap mx-0 bg-white dark:bg-slate-800 rounded-[4px] p-4 mb-5 border border-solid border-slate-75 dark:border-slate-700">
   <csat-metric-card-stub label="CSAT_REPORTS.METRIC.TOTAL_RESPONSES.LABEL" value="100" infotext="CSAT_REPORTS.METRIC.TOTAL_RESPONSES.TOOLTIP"></csat-metric-card-stub>
   <csat-metric-card-stub label="CSAT_REPORTS.METRIC.SATISFACTION_SCORE.LABEL" value="--" infotext="CSAT_REPORTS.METRIC.SATISFACTION_SCORE.TOOLTIP" disabled="true"></csat-metric-card-stub>
   <csat-metric-card-stub label="CSAT_REPORTS.METRIC.RESPONSE_RATE.LABEL" value="90%" infotext="CSAT_REPORTS.METRIC.RESPONSE_RATE.TOOLTIP"></csat-metric-card-stub>

From 9f905ce2e628de100777327579bbb52226707feb Mon Sep 17 00:00:00 2001
From: Vishnu Narayanan <iamwishnu@gmail.com>
Date: Wed, 28 Feb 2024 12:30:24 +0530
Subject: [PATCH 41/96] feat: Update the input for the SLA threshold selection
 (#8974)

Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
Co-authored-by: iamsivin <iamsivin@gmail.com>
Co-authored-by: Pranav <pranav@chatwoot.com>
---
 .../dashboard/i18n/locale/en/sla.json         |  15 +-
 .../routes/dashboard/settings/sla/Index.vue   |  32 ++---
 .../routes/dashboard/settings/sla/SlaForm.vue | 136 ++++++++++++------
 .../dashboard/settings/sla/SlaTimeInput.vue   |  94 ++++++++++++
 .../sla/specs/validationMixin.spec.js         |  41 ++++++
 .../dashboard/settings/sla/validationMixin.js |  11 ++
 .../dashboard/settings/sla/validations.js     |  11 +-
 package.json                                  |   2 +-
 yarn.lock                                     |   8 +-
 9 files changed, 278 insertions(+), 72 deletions(-)
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/sla/SlaTimeInput.vue

diff --git a/app/javascript/dashboard/i18n/locale/en/sla.json b/app/javascript/dashboard/i18n/locale/en/sla.json
index 67ec4549f..d87f057eb 100644
--- a/app/javascript/dashboard/i18n/locale/en/sla.json
+++ b/app/javascript/dashboard/i18n/locale/en/sla.json
@@ -24,21 +24,24 @@
         "PLACEHOLDER": "SLA for premium customers"
       },
       "FIRST_RESPONSE_TIME": {
-        "LABEL": "First Response Time(Seconds)",
-        "PLACEHOLDER": "300 for 5 minutes"
+        "LABEL": "First Response Time",
+        "PLACEHOLDER": "5"
       },
       "NEXT_RESPONSE_TIME": {
-        "LABEL": "Next Response Time(Seconds)",
-        "PLACEHOLDER": "600 for 10 minutes"
+        "LABEL": "Next Response Time",
+        "PLACEHOLDER": "5"
       },
       "RESOLUTION_TIME": {
-        "LABEL": "Resolution Time(Seconds)",
-        "PLACEHOLDER": "86400 for 1 day"
+        "LABEL": "Resolution Time",
+        "PLACEHOLDER": "60"
       },
       "BUSINESS_HOURS": {
         "LABEL": "Business Hours",
         "PLACEHOLDER": "Only during business hours"
       },
+      "THRESHOLD_TIME": {
+        "INVALID_FORMAT_ERROR": "Threshold should be a number and greater than zero"
+      },
       "EDIT": "Edit",
       "CREATE": "Create",
       "DELETE": "Delete",
diff --git a/app/javascript/dashboard/routes/dashboard/settings/sla/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/sla/Index.vue
index 6c4002821..9ff510d06 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/sla/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/sla/Index.vue
@@ -38,17 +38,17 @@
               <td>{{ sla.description }}</td>
               <td>
                 <span class="flex items-center">
-                  {{ sla.first_response_time_threshold }}
+                  {{ displayTime(sla.first_response_time_threshold) }}
                 </span>
               </td>
               <td>
                 <span class="flex items-center">
-                  {{ sla.next_response_time_threshold }}
+                  {{ displayTime(sla.next_response_time_threshold) }}
                 </span>
               </td>
               <td>
                 <span class="flex items-center">
-                  {{ sla.resolution_time_threshold }}
+                  {{ displayTime(sla.resolution_time_threshold) }}
                 </span>
               </td>
               <td>
@@ -88,6 +88,7 @@
 </template>
 <script>
 import { mapGetters } from 'vuex';
+import { convertSecondsToTimeUnit } from '@chatwoot/utils';
 
 import AddSLA from './AddSLA.vue';
 import EditSLA from './EditSLA.vue';
@@ -111,26 +112,12 @@ export default {
     ...mapGetters({
       records: 'sla/getSLA',
       uiFlags: 'sla/getUIFlags',
-      accountId: 'getCurrentAccountId',
-      isFeatureEnabledonAccount: 'accounts/isFeatureEnabledonAccount',
     }),
-    isSLAEnabled() {
-      return this.isFeatureEnabledonAccount(this.accountId, 'sla');
-    },
   },
   mounted() {
-    this.isSLAfeatureEnabled();
+    this.$store.dispatch('sla/get');
   },
   methods: {
-    isSLAfeatureEnabled() {
-      if (!this.isSLAEnabled) {
-        this.$router.push({
-          name: 'general_settings_index',
-        });
-      } else {
-        this.$store.dispatch('sla/get');
-      }
-    },
     openAddPopup() {
       this.showAddPopup = true;
     },
@@ -144,6 +131,15 @@ export default {
     hideEditPopup() {
       this.showEditPopup = false;
     },
+    displayTime(threshold) {
+      const { time, unit } = convertSecondsToTimeUnit(threshold, {
+        minute: 'm',
+        hour: 'h',
+        day: 'd',
+      });
+      if (!time) return '-';
+      return `${time}${unit}`;
+    },
   },
 };
 </script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/sla/SlaForm.vue b/app/javascript/dashboard/routes/dashboard/settings/sla/SlaForm.vue
index 775c0ff2a..f41e8fcfc 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/sla/SlaForm.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/sla/SlaForm.vue
@@ -2,44 +2,31 @@
   <div class="h-auto overflow-auto flex flex-col">
     <form class="mx-0 flex flex-wrap" @submit.prevent="onSubmit">
       <woot-input
-        v-model.trim="name"
+        v-model="name"
         :class="{ error: $v.name.$error }"
         class="w-full"
-        :sla="$t('SLA.FORM.NAME.LABEL')"
+        :label="$t('SLA.FORM.NAME.LABEL')"
         :placeholder="$t('SLA.FORM.NAME.PLACEHOLDER')"
         :error="getSlaNameErrorMessage"
         @input="$v.name.$touch"
       />
       <woot-input
-        v-model.trim="description"
+        v-model="description"
         class="w-full"
         :label="$t('SLA.FORM.DESCRIPTION.LABEL')"
         :placeholder="$t('SLA.FORM.DESCRIPTION.PLACEHOLDER')"
-        data-testid="sla-description"
       />
 
-      <woot-input
-        v-model.trim="firstResponseTimeThreshold"
-        class="w-full"
-        :label="$t('SLA.FORM.FIRST_RESPONSE_TIME.LABEL')"
-        :placeholder="$t('SLA.FORM.FIRST_RESPONSE_TIME.PLACEHOLDER')"
-        data-testid="sla-firstResponseTimeThreshold"
-      />
-
-      <woot-input
-        v-model.trim="nextResponseTimeThreshold"
-        class="w-full"
-        :label="$t('SLA.FORM.NEXT_RESPONSE_TIME.LABEL')"
-        :placeholder="$t('SLA.FORM.NEXT_RESPONSE_TIME.PLACEHOLDER')"
-        data-testid="sla-nextResponseTimeThreshold"
-      />
-
-      <woot-input
-        v-model.trim="resolutionTimeThreshold"
-        class="w-full"
-        :label="$t('SLA.FORM.RESOLUTION_TIME.LABEL')"
-        :placeholder="$t('SLA.FORM.RESOLUTION_TIME.PLACEHOLDER')"
-        data-testid="sla-resolutionTimeThreshold"
+      <sla-time-input
+        v-for="(input, index) in slaTimeInputs"
+        :key="index"
+        :threshold="input.threshold"
+        :threshold-unit="input.unit"
+        :label="$t(input.label)"
+        :placeholder="$t(input.placeholder)"
+        @input="updateThreshold(index, $event)"
+        @unit="updateUnit(index, $event)"
+        @isInValid="handleIsInvalid(index, $event)"
       />
 
       <div class="w-full">
@@ -51,7 +38,7 @@
 
       <div class="flex justify-end items-center py-2 px-0 gap-2 w-full">
         <woot-button
-          :is-disabled="$v.name.$invalid || uiFlags.isUpdating"
+          :is-disabled="isSubmitDisabled"
           :is-loading="uiFlags.isUpdating"
         >
           {{ submitLabel }}
@@ -66,10 +53,15 @@
 
 <script>
 import { mapGetters } from 'vuex';
+import { convertSecondsToTimeUnit } from '@chatwoot/utils';
 import validationMixin from './validationMixin';
 import validations from './validations';
+import SlaTimeInput from './SlaTimeInput.vue';
 
 export default {
+  components: {
+    SlaTimeInput,
+  },
   mixins: [validationMixin],
   props: {
     selectedResponse: {
@@ -85,9 +77,28 @@ export default {
     return {
       name: '',
       description: '',
-      firstResponseTimeThreshold: '',
-      nextResponseTimeThreshold: '',
-      resolutionTimeThreshold: '',
+      isSlaTimeInputsInvalid: false,
+      slaTimeInputsValidation: {},
+      slaTimeInputs: [
+        {
+          threshold: null,
+          unit: 'Minutes',
+          label: 'SLA.FORM.FIRST_RESPONSE_TIME.LABEL',
+          placeholder: 'SLA.FORM.FIRST_RESPONSE_TIME.PLACEHOLDER',
+        },
+        {
+          threshold: null,
+          unit: 'Minutes',
+          label: 'SLA.FORM.NEXT_RESPONSE_TIME.LABEL',
+          placeholder: 'SLA.FORM.NEXT_RESPONSE_TIME.PLACEHOLDER',
+        },
+        {
+          threshold: null,
+          unit: 'Minutes',
+          label: 'SLA.FORM.RESOLUTION_TIME.LABEL',
+          placeholder: 'SLA.FORM.RESOLUTION_TIME.PLACEHOLDER',
+        },
+      ],
       onlyDuringBusinessHours: false,
     };
   },
@@ -96,10 +107,12 @@ export default {
     ...mapGetters({
       uiFlags: 'sla/getUIFlags',
     }),
-    pageTitle() {
-      return `${this.$t('SLA.EDIT.TITLE')} - ${
-        this.selectedResponse?.name || ''
-      }`;
+    isSubmitDisabled() {
+      return (
+        this.$v.name.$invalid ||
+        this.isSlaTimeInputsInvalid ||
+        this.uiFlags.isUpdating
+      );
     },
   },
   mounted() {
@@ -121,20 +134,59 @@ export default {
 
       this.name = name;
       this.description = description;
-      this.firstResponseTimeThreshold = firstResponseTimeThreshold;
-      this.nextResponseTimeThreshold = nextResponseTimeThreshold;
-      this.resolutionTimeThreshold = resolutionTimeThreshold;
       this.onlyDuringBusinessHours = onlyDuringBusinessHours;
+
+      const thresholds = [
+        firstResponseTimeThreshold,
+        nextResponseTimeThreshold,
+        resolutionTimeThreshold,
+      ];
+      this.slaTimeInputs.forEach((input, index) => {
+        const converted = convertSecondsToTimeUnit(thresholds[index], {
+          minute: 'Minutes',
+          hour: 'Hours',
+          day: 'Days',
+        });
+        input.threshold = converted.time;
+        input.unit = converted.unit;
+      });
+    },
+    updateThreshold(index, value) {
+      this.slaTimeInputs[index].threshold = value;
+    },
+    updateUnit(index, unit) {
+      this.slaTimeInputs[index].unit = unit;
     },
     onSubmit() {
-      this.$emit('submit', {
+      const payload = {
         name: this.name,
         description: this.description,
-        first_response_time_threshold: this.firstResponseTimeThreshold,
-        next_response_time_threshold: this.nextResponseTimeThreshold,
-        resolution_time_threshold: this.resolutionTimeThreshold,
+        first_response_time_threshold: this.convertToSeconds(0),
+        next_response_time_threshold: this.convertToSeconds(1),
+        resolution_time_threshold: this.convertToSeconds(2),
         only_during_business_hours: this.onlyDuringBusinessHours,
-      });
+      };
+      this.$emit('submit', payload);
+    },
+    convertToSeconds(index) {
+      const { threshold, unit } = this.slaTimeInputs[index];
+      if (threshold === null || threshold === 0) return null;
+      const unitsToSeconds = { Minutes: 60, Hours: 3600, Days: 86400 };
+      return Number(threshold * (unitsToSeconds[unit] || 1));
+    },
+    handleIsInvalid(index, isInvalid) {
+      this.slaTimeInputsValidation = {
+        ...this.slaTimeInputsValidation,
+        [index]: isInvalid,
+      };
+
+      this.checkValidationState();
+    },
+    checkValidationState() {
+      const isAnyInvalid = Object.values(this.slaTimeInputsValidation).some(
+        isInvalid => isInvalid
+      );
+      this.isSlaTimeInputsInvalid = isAnyInvalid;
     },
   },
 };
diff --git a/app/javascript/dashboard/routes/dashboard/settings/sla/SlaTimeInput.vue b/app/javascript/dashboard/routes/dashboard/settings/sla/SlaTimeInput.vue
new file mode 100644
index 000000000..5cf6229c3
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/sla/SlaTimeInput.vue
@@ -0,0 +1,94 @@
+<template>
+  <div class="relative mt-2 w-full">
+    <woot-input
+      v-model="thresholdTime"
+      :class="{ error: $v.thresholdTime.$error }"
+      class="w-full [&>input]:pr-24"
+      :label="label"
+      :placeholder="placeholder"
+      :error="getThresholdTimeErrorMessage"
+      @input="onThresholdTimeChange"
+    />
+    <div class="absolute right-px h-9 top-[27px] flex items-center">
+      <select
+        v-model="thresholdUnitValue"
+        class="h-full rounded-[4px] hover:cursor-pointer font-medium border-1 border-solid bg-transparent border-transparent dark:border-transparent mb-0 py-0 pl-2 pr-7 text-slate-600 dark:text-slate-300 dark:focus:border-woot-500 focus:border-woot-500 text-sm"
+        @change="onThresholdUnitChange"
+      >
+        <option
+          v-for="(option, index) in options"
+          :key="index"
+          :value="option.value"
+        >
+          {{ option.label }}
+        </option>
+      </select>
+    </div>
+  </div>
+</template>
+
+<script>
+import validationMixin from './validationMixin';
+import validations from './validations';
+
+export default {
+  mixins: [validationMixin],
+  props: {
+    threshold: {
+      type: Number,
+      default: null,
+    },
+    thresholdUnit: {
+      type: String,
+      default: 'Minutes',
+    },
+    label: {
+      type: String,
+      default: '',
+    },
+    placeholder: {
+      type: String,
+      default: '',
+    },
+  },
+  data() {
+    return {
+      thresholdTime: this.threshold || '',
+      thresholdUnitValue: this.thresholdUnit,
+      options: [
+        { value: 'Minutes', label: 'Minutes' },
+        { value: 'Hours', label: 'Hours' },
+        { value: 'Days', label: 'Days' },
+      ],
+    };
+  },
+  validations,
+  watch: {
+    threshold: {
+      immediate: true,
+      handler(value) {
+        if (!Number.isNaN(value)) {
+          this.thresholdTime = value;
+        }
+      },
+    },
+    thresholdUnit: {
+      immediate: true,
+      handler(value) {
+        this.thresholdUnitValue = value;
+      },
+    },
+  },
+  methods: {
+    onThresholdUnitChange() {
+      this.$emit('unit', this.thresholdUnitValue);
+    },
+    onThresholdTimeChange() {
+      this.$v.thresholdTime.$touch();
+      const isInvalid = this.$v.thresholdTime.$invalid;
+      this.$emit('isInValid', isInvalid);
+      this.$emit('input', Number(this.thresholdTime));
+    },
+  },
+};
+</script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/sla/specs/validationMixin.spec.js b/app/javascript/dashboard/routes/dashboard/settings/sla/specs/validationMixin.spec.js
index a828c8556..2266bdccd 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/sla/specs/validationMixin.spec.js
+++ b/app/javascript/dashboard/routes/dashboard/settings/sla/specs/validationMixin.spec.js
@@ -31,6 +31,7 @@ describe('validationMixin', () => {
       data() {
         return {
           name: '',
+          thresholdTime: '',
         };
       },
     });
@@ -62,4 +63,44 @@ describe('validationMixin', () => {
       wrapper.vm.$t('SLA.FORM.NAME.MINIMUM_LENGTH_ERROR')
     );
   });
+
+  it('should accept valid threshold values', () => {
+    wrapper.setData({ thresholdTime: 10 });
+    wrapper.vm.$v.thresholdTime.$touch();
+    expect(wrapper.vm.getThresholdTimeErrorMessage).toBe(wrapper.vm.$t(''));
+
+    wrapper.setData({ thresholdTime: 10.5 });
+    wrapper.vm.$v.thresholdTime.$touch();
+    expect(wrapper.vm.getThresholdTimeErrorMessage).toBe(wrapper.vm.$t(''));
+  });
+
+  it('should not return invalid format error message if thresholdTime is empty but not touched', () => {
+    wrapper.setData({ thresholdTime: '' });
+    expect(wrapper.vm.getThresholdTimeErrorMessage).toBe('');
+  });
+
+  it('should return invalid format error message if thresholdTime has an invalid format', () => {
+    wrapper.setData({ thresholdTime: 'fsdfsdfsdfsd' });
+    wrapper.vm.$v.thresholdTime.$touch();
+
+    expect(wrapper.vm.getThresholdTimeErrorMessage).toBe(
+      wrapper.vm.$t('SLA.FORM.THRESHOLD_TIME.INVALID_FORMAT_ERROR')
+    );
+  });
+
+  it('should reject invalid threshold values', () => {
+    wrapper.setData({ thresholdTime: 0 });
+    wrapper.vm.$v.thresholdTime.$touch();
+    expect(wrapper.vm.getThresholdTimeErrorMessage).toBe(
+      wrapper.vm.$t('SLA.FORM.THRESHOLD_TIME.INVALID_FORMAT_ERROR')
+    );
+  });
+
+  it('should reject invalid threshold values', () => {
+    wrapper.setData({ thresholdTime: -1 });
+    wrapper.vm.$v.thresholdTime.$touch();
+    expect(wrapper.vm.getThresholdTimeErrorMessage).toBe(
+      wrapper.vm.$t('SLA.FORM.THRESHOLD_TIME.INVALID_FORMAT_ERROR')
+    );
+  });
 });
diff --git a/app/javascript/dashboard/routes/dashboard/settings/sla/validationMixin.js b/app/javascript/dashboard/routes/dashboard/settings/sla/validationMixin.js
index 28f7436c8..d086c6072 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/sla/validationMixin.js
+++ b/app/javascript/dashboard/routes/dashboard/settings/sla/validationMixin.js
@@ -11,5 +11,16 @@ export default {
       }
       return errorMessage;
     },
+    getThresholdTimeErrorMessage() {
+      let errorMessage = '';
+      if (this.$v.thresholdTime.$error) {
+        if (!this.$v.thresholdTime.numeric || !this.$v.thresholdTime.minValue) {
+          errorMessage = this.$t(
+            'SLA.FORM.THRESHOLD_TIME.INVALID_FORMAT_ERROR'
+          );
+        }
+      }
+      return errorMessage;
+    },
   },
 };
diff --git a/app/javascript/dashboard/routes/dashboard/settings/sla/validations.js b/app/javascript/dashboard/routes/dashboard/settings/sla/validations.js
index bda4b9556..024aa6636 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/sla/validations.js
+++ b/app/javascript/dashboard/routes/dashboard/settings/sla/validations.js
@@ -1,8 +1,17 @@
-import { required, minLength } from 'vuelidate/lib/validators';
+import {
+  required,
+  minLength,
+  minValue,
+  decimal,
+} from 'vuelidate/lib/validators';
 
 export default {
   name: {
     required,
     minLength: minLength(2),
   },
+  thresholdTime: {
+    decimal,
+    minValue: minValue(0.001),
+  },
 };
diff --git a/package.json b/package.json
index f7a2f86f7..70ab8a666 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
   "dependencies": {
     "@braid/vue-formulate": "^2.5.2",
     "@chatwoot/prosemirror-schema": "1.0.5",
-    "@chatwoot/utils": "^0.0.21",
+    "@chatwoot/utils": "^0.0.23",
     "@hcaptcha/vue-hcaptcha": "^0.3.2",
     "@june-so/analytics-next": "^2.0.0",
     "@radix-ui/colors": "^1.0.1",
diff --git a/yarn.lock b/yarn.lock
index cc9a6f34c..b28813887 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3177,10 +3177,10 @@
     prosemirror-utils "^0.9.6"
     prosemirror-view "^1.17.2"
 
-"@chatwoot/utils@^0.0.21":
-  version "0.0.21"
-  resolved "https://registry.yarnpkg.com/@chatwoot/utils/-/utils-0.0.21.tgz#f9116daac0514a8a8fa6ce594efff10062222be0"
-  integrity sha512-eUDJ1K5x1rFlBywRctU3hXXiJ1U0EZiklowNl/YJOh1/BWDns4It3DWrQmAcjvsNbEUNWMfY+ShJmjdeei71Cw==
+"@chatwoot/utils@^0.0.23":
+  version "0.0.23"
+  resolved "https://registry.yarnpkg.com/@chatwoot/utils/-/utils-0.0.23.tgz#e961fd87ef9ee19c442bfcedac5fe0be2ef37726"
+  integrity sha512-BQ7DprXr7FIkSbHdDc1WonwH0rt/+B+WaaLaXNMjCcxJgkX/gZ8QMltruOfRp/S8cFyd9JfFQhNF0T9lz1OMvA==
   dependencies:
     date-fns "^2.29.1"
 

From dafedddc1ac66826c2342116e1495715d967c176 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Wed, 28 Feb 2024 13:56:28 +0530
Subject: [PATCH 42/96] feat: Remove Foundation in favor of Tailwind (#8984)

* feat: Remove foundation

* chore: Minor fix

* Minor fix

* Update _forms.scss

* chore: More changes

* chore: Minor fix

* chore: Clean up

* fix: font-weight

* chore: More changes

* chore: Setting page

* chore: Editor fix

* chore: Reports page

* chore: More changes

* chore: Minor changes

* chore: More fixes

* chore: More changes

* chore: More changes

* chore: More changes

* chore: Minor fix

* chore: More changes

* chore: More changes

* chore: More changes

* chore: More changes

* chore: Clean up

* chore: Minor fix

* chore: Clean ups

* chore: Rename basic file

* chore: Remove unused files

* chore: Fix expanded input

* Fix campaign rendering

* chore: Clean up

* chore: More changes

* chore: Remove unused files

* fix: Overflow issue

* chore: Minor fix

* chore: Clean up

* chore: Minor fix

* chore: Remove unused files

* chore: Minor fix

* chore: Minor fix

* fix: autoprefixer start/end value has mixed support

* chore: Minor fix

* chore: Remove unused files

* chore: Minor fix

* chore: Minor fix

* chore: Minor fix

* Add responsive design to label settings

* fix inbox view

* chore: Minor fix

* w-60% to w-2/3

* chore: Fix team

* chore: Fix button

* w-[34%] to w-1/3

* chore: Fix border

* Add support mobile views in team page

* chore: fix snackbar

* chore: clean up

* chore: Clean up

* fix: loading state alignment

* fix: alert styles

* chore: Minor fix

* fix: spacing for agent bot row

* fix: layout

* fix: layout for SLA

* fix: checkbox

* fix: SLA checkbox spacing

* Update inbox settings pages

* fix macros listing page layout

* fix canned responses

* chore: Fix bot page

* chore: fix automation page

* chore: fix agents page

* chore: fix canned response editor

* chore: Fix settings table

* chore: fix settings layout

* chore: Minor fix

* fix: canned response table layou

* fix: layout for table header for webhooks

* fix: webhook row layout

* fix: dashboard app modal layout

* fix: add title to canned response truncated shortcode

* fix: dashboard apps row layuot

* fix: layouts hooks

* fix: body color

* fix: delete action color in portal locales

* fix: text color for campagin title

* fix: success button color

---------

Co-authored-by: Pranav <pranav@chatwoot.com>
Co-authored-by: Vishnu Narayanan <iamwishnu@gmail.com>
Co-authored-by: Shivam Mishra <scm.mymail@gmail.com>
---
 .../assets/scss/_foundation-custom.scss       |  58 --
 .../assets/scss/_foundation-settings.scss     | 623 ------------------
 .../assets/scss/_helper-classes.scss          |  54 +-
 .../dashboard/assets/scss/_layout.scss        |  14 +
 .../dashboard/assets/scss/_rtl.scss           |  50 --
 .../dashboard/assets/scss/_typography.scss    |  33 -
 .../assets/scss/_utility-helpers.scss         |  73 --
 .../dashboard/assets/scss/_woot.scss          |  41 +-
 .../assets/scss/plugins/_dropdown.scss        |  43 +-
 .../assets/scss/plugins/_multiselect.scss     |   6 +-
 .../dashboard/assets/scss/storybook.scss      |   9 +-
 .../assets/scss/views/settings/inbox.scss     | 113 +---
 .../dashboard/assets/scss/widgets/_base.scss  | 140 ++++
 .../assets/scss/widgets/_buttons.scss         |  89 ++-
 .../assets/scss/widgets/_conv-header.scss     |   1 -
 .../scss/widgets/_conversation-card.scss      |  16 -
 .../scss/widgets/_conversation-view.scss      |   4 +-
 .../dashboard/assets/scss/widgets/_forms.scss |  78 ---
 .../dashboard/assets/scss/widgets/_login.scss |  66 --
 .../dashboard/assets/scss/widgets/_modal.scss |  75 ---
 .../assets/scss/widgets/_reply-box.scss       |  60 --
 .../assets/scss/widgets/_report.scss          |  60 --
 .../assets/scss/widgets/_reports.scss         |  29 -
 .../assets/scss/widgets/_search-box.scss      |  18 -
 .../assets/scss/widgets/_sidemenu.scss        |  78 ---
 .../assets/scss/widgets/_snackbar.scss        |  45 --
 .../assets/scss/widgets/_states.scss          |   1 -
 .../assets/scss/widgets/_status-bar.scss      |  46 --
 .../dashboard/assets/scss/widgets/_tabs.scss  |   4 +-
 .../assets/scss/widgets/_widget_builder.scss  |   0
 .../assets/scss/widgets/_woot-tables.scss     |   4 +-
 .../components/Accordion/AccordionItem.vue    |   2 +-
 .../dashboard/components/ChannelSelector.vue  |  34 +-
 .../dashboard/components/ChatList.vue         |   7 +-
 .../dashboard/components/CustomAttribute.vue  |  18 +-
 app/javascript/dashboard/components/Modal.vue |  55 +-
 .../dashboard/components/ModalHeader.vue      |   2 +-
 .../dashboard/components/SettingsSection.vue  |  12 +-
 .../dashboard/components/Snackbar.vue         |  14 +-
 .../components/SnackbarContainer.vue          |   6 +-
 app/javascript/dashboard/components/index.js  |   2 -
 .../layout/config/sidebarItems/campaigns.js   |   4 +-
 .../layout/config/sidebarItems/primaryMenu.js |   2 +-
 .../sidebarComponents/AccountSelector.vue     |   2 +-
 .../layout/sidebarComponents/AgentDetails.vue |  11 +-
 .../sidebarComponents/NotificationBell.vue    |   4 +-
 .../SecondaryChildNavItem.vue                 |   2 +-
 .../dashboard/components/ui/Label.vue         |  17 +-
 .../dashboard/components/ui/PreviewCard.vue   |  34 +-
 .../dashboard/components/ui/Switch.vue        |   2 +-
 .../dashboard/components/ui/Tabs/TabsItem.vue |   2 +-
 .../dashboard/components/ui/Wizard.vue        |  48 +-
 .../components/widgets/AttachmentsPreview.vue |   2 +-
 .../components/widgets/BackButton.vue         |   2 +-
 .../components/widgets/InboxName.vue          |   2 +-
 .../components/widgets/LoadingState.vue       |   6 +-
 .../components/widgets/ReportStatsCard.vue    |  57 --
 .../components/widgets/SettingIntroBanner.vue |   2 +-
 .../components/widgets/TableFooter.vue        |   4 +-
 .../components/widgets/Thumbnail.vue          |   1 +
 .../widgets/WootWriter/AudioRecorder.vue      |   7 +-
 .../widgets/WootWriter/ReplyBottomPanel.vue   |   2 +-
 .../widgets/WootWriter/ReplyTopPanel.vue      |   2 +-
 .../widgets/conversation/ConversationCard.vue |   5 +-
 .../conversation/ConversationHeader.vue       |  14 +-
 .../conversation/EmailTranscriptModal.vue     |   9 +-
 .../widgets/conversation/Message.vue          |   4 +-
 .../widgets/conversation/MessagesView.vue     |   2 +
 .../widgets/conversation/OnboardingView.vue   |  12 +-
 .../widgets/conversation/ReplyBox.vue         |  24 +-
 .../widgets/conversation/ReplyEmailHead.vue   |  14 +-
 .../WhatsappTemplates/TemplatesPicker.vue     |  10 +-
 .../widgets/conversation/bubble/File.vue      |   4 +-
 .../widgets/conversation/bubble/Location.vue  |   2 +-
 .../conversation/bubble/TranslateModal.vue    |   4 +-
 .../conversation/components/GalleryView.vue   |   8 +-
 .../conversationBulkActions/AgentSelector.vue |  14 +-
 .../conversationBulkActions/Index.vue         |   9 +-
 .../conversationBulkActions/LabelActions.vue  |   8 +-
 .../conversationBulkActions/TeamActions.vue   |  22 +-
 .../conversationBulkActions/UpdateActions.vue |   2 +-
 .../conversationCardComponents/CardLabels.vue |  15 +-
 .../components/widgets/forms/Input.vue        |   4 -
 .../components/widgets/forms/PhoneInput.vue   |  10 +-
 .../widgets/modal/ConfirmationModal.vue       |   5 -
 .../components/widgets/modal/DeleteModal.vue  |   2 +-
 .../contact/components/ContactAttribute.vue   |  15 +-
 .../contact/components/ContactFields.vue      |   2 +-
 .../contact/components/ContactIntro.vue       |   4 +-
 .../contact/components/MergeContact.vue       |   2 +-
 .../modules/notes/components/NoteList.vue     |   4 +-
 .../search/components/SearchHeader.vue        |   5 +-
 .../modules/search/components/SearchInput.vue |   4 +-
 .../components/SearchResultContactItem.vue    |  18 +-
 .../SearchResultConversationItem.vue          |   9 +-
 .../widget-preview/components/WidgetHead.vue  |   2 +-
 .../contacts/components/ContactInfoPanel.vue  |   7 +-
 .../contacts/components/ContactsTable.vue     |   2 +-
 .../contacts/components/SectionHeader.vue     |   2 +-
 .../contacts/components/TimelineCard.vue      |   2 +-
 .../contacts/pages/ContactManageView.vue      |   2 +-
 .../conversation/ConversationParticipant.vue  |   2 +-
 .../conversation/Macros/MacroItem.vue         |   3 +-
 .../conversation/contact/ContactForm.vue      |  19 +-
 .../conversation/contact/ContactInfo.vue      |  16 +-
 .../conversation/contact/ContactInfoRow.vue   |  17 +-
 .../conversation/contact/ConversationForm.vue |   9 +-
 .../conversation/labels/LabelBox.vue          |   1 +
 .../helpcenter/components/ArticleItem.vue     |   6 +-
 .../ArticleSearch/ArticleSearchResultItem.vue |   2 +-
 .../components/ArticleSearch/Header.vue       |   4 +-
 .../components/Header/ArticleHeader.vue       |   4 +-
 .../components/PortalListItemTable.vue        |   2 +-
 .../components/PortalSettingsBasicForm.vue    |  12 +-
 .../PortalSettingsCustomizationForm.vue       |  12 +-
 .../helpcenter/components/PortalSwitch.vue    |   2 +-
 .../helpcenter/pages/articles/EditArticle.vue |   2 +-
 .../pages/categories/NameEmojiInput.vue       |   2 +-
 .../pages/portals/ListAllPortals.vue          |   4 +-
 .../helpcenter/pages/portals/NewPortal.vue    |   2 +-
 .../pages/portals/PortalSettingsFinish.vue    |  11 +-
 .../components/NotificationPanel.vue          |   4 +-
 .../components/NotificationPanelItem.vue      |   3 +-
 .../components/NotificationTable.vue          |   8 +-
 .../components/NotificationsView.vue          |   4 +-
 .../dashboard/settings/SettingsHeader.vue     |   8 +-
 .../settings/SettingsSubPageHeader.vue        |   4 +-
 .../routes/dashboard/settings/Wrapper.vue     |   2 +-
 .../dashboard/settings/account/Index.vue      |   6 +-
 .../dashboard/settings/agentBots/Index.vue    |   6 +-
 .../agentBots/components/AgentBotRow.vue      |  13 +-
 .../agentBots/components/AgentBotType.vue     |   2 +-
 .../dashboard/settings/agents/Index.vue       |   5 +-
 .../settings/attributes/CustomAttribute.vue   |   7 +-
 .../dashboard/settings/attributes/Index.vue   |   2 +-
 .../dashboard/settings/auditlogs/Index.vue    |   2 +-
 .../dashboard/settings/automation/Index.vue   |   4 +-
 .../settings/campaigns/AddCampaign.vue        |   4 +-
 .../settings/campaigns/CampaignCard.vue       |  16 +-
 .../settings/campaigns/campaigns.routes.js    |   2 +-
 .../dashboard/settings/canned/AddCanned.vue   |   2 +-
 .../dashboard/settings/canned/EditCanned.vue  |   2 +-
 .../dashboard/settings/canned/Index.vue       |  18 +-
 .../dashboard/settings/inbox/AddAgents.vue    |   6 +-
 .../dashboard/settings/inbox/ChannelList.vue  |  13 +-
 .../dashboard/settings/inbox/FinishSetup.vue  |   8 +-
 .../dashboard/settings/inbox/ImapSettings.vue |  19 +-
 .../settings/inbox/InboxChannels.vue          |   2 +-
 .../routes/dashboard/settings/inbox/Index.vue |   9 +-
 .../settings/inbox/PreChatForm/Settings.vue   |   2 +-
 .../dashboard/settings/inbox/Settings.vue     |  52 +-
 .../dashboard/settings/inbox/SmtpSettings.vue |  23 +-
 .../settings/inbox/WidgetBuilder.vue          |  17 +-
 .../dashboard/settings/inbox/channels/Api.vue |   4 +-
 .../settings/inbox/channels/Email.vue         |  10 +-
 .../settings/inbox/channels/Facebook.vue      |  19 +-
 .../settings/inbox/channels/Line.vue          |   4 +-
 .../dashboard/settings/inbox/channels/Sms.vue |   4 +-
 .../settings/inbox/channels/Telegram.vue      |   4 +-
 .../settings/inbox/channels/Twilio.vue        |   4 +-
 .../settings/inbox/channels/Twitter.vue       |  15 +-
 .../settings/inbox/channels/Website.vue       |   4 +-
 .../settings/inbox/channels/Whatsapp.vue      |   4 +-
 .../emailChannels/ForwardToOption.vue         |   4 +-
 .../channels/emailChannels/Microsoft.vue      |   4 +-
 .../inbox/channels/microsoft/Reauthorize.vue  |   4 +-
 .../inbox/components/BotConfiguration.vue     |   4 +-
 .../settings/inbox/components/BusinessDay.vue |   2 +-
 .../components/SenderNameExamplePreview.vue   |   2 +-
 .../inbox/components/WeeklyAvailability.vue   |   7 +-
 .../inbox/settingsPage/CollaboratorsPage.vue  |   4 +-
 .../inbox/settingsPage/ConfigurationPage.vue  |  40 +-
 .../integrationapps/IntegrationItem.vue       |  10 +-
 .../MultipleIntegrationHooks.vue              |   8 +-
 .../SingleIntegrationHooks.vue                |   6 +-
 .../DashboardApps/DashboardAppModal.vue       |   7 +-
 .../DashboardApps/DashboardAppsRow.vue        |  10 +-
 .../integrations/DashboardApps/Index.vue      |   4 +-
 .../settings/integrations/Integration.vue     |   6 +-
 .../settings/integrations/Webhooks/Index.vue  |   9 +-
 .../integrations/Webhooks/WebhookForm.vue     |  30 +-
 .../integrations/Webhooks/WebhookRow.vue      |  10 +-
 .../dashboard/settings/labels/AddLabel.vue    |   2 +-
 .../dashboard/settings/labels/EditLabel.vue   |   2 +-
 .../dashboard/settings/labels/Index.vue       |   9 +-
 .../dashboard/settings/macros/Index.vue       |  10 +-
 .../settings/macros/MacroProperties.vue       |   3 +-
 .../settings/profile/ChangePassword.vue       |  10 +-
 .../dashboard/settings/profile/Index.vue      |  16 +-
 .../settings/profile/MessageSignature.vue     |   8 +-
 .../settings/profile/NotificationSettings.vue |  76 +--
 .../settings/reports/LiveReports.vue          |  16 +-
 .../reports/components/CsatMetrics.vue        |   2 +-
 .../reports/components/Filters/Labels.vue     |  12 +-
 .../settings/reports/components/Heatmap.vue   |   2 +-
 .../reports/components/ReportFilters.vue      |  26 +-
 .../components/overview/MetricCard.vue        |  65 +-
 .../routes/dashboard/settings/sla/Index.vue   |   4 +-
 .../routes/dashboard/settings/sla/SlaForm.vue |   8 +-
 .../settings/teams/AgentSelector.vue          |   8 +-
 .../settings/teams/Create/AddAgents.vue       |   7 +-
 .../settings/teams/Create/CreateTeam.vue      |   4 +-
 .../dashboard/settings/teams/Create/Index.vue |   6 +-
 .../settings/teams/Edit/EditAgents.vue        |   9 +-
 .../settings/teams/Edit/EditTeam.vue          |   4 +-
 .../dashboard/settings/teams/Edit/Index.vue   |   6 +-
 .../dashboard/settings/teams/FinishSetup.vue  |  11 +-
 .../routes/dashboard/settings/teams/Index.vue |   8 +-
 .../dashboard/settings/teams/TeamForm.vue     |   4 +-
 .../portal/components/SearchSuggestions.vue   |   2 +-
 .../shared/components/GreetingsEditor.vue     |   2 +-
 .../ui/MultiselectDropdownItems.vue           |   8 +-
 app/javascript/shared/mixins/campaignMixin.js |   9 +-
 .../shared/mixins/specs/campaignMixin.spec.js |  43 +-
 .../v3/views/auth/password/Edit.vue           |   2 +-
 .../v3/views/auth/reset/password/Index.vue    |   2 +-
 app/views/layouts/vueapp.html.erb             |   2 +-
 package.json                                  |   1 -
 yarn.lock                                     |   5 -
 219 files changed, 1134 insertions(+), 2511 deletions(-)
 delete mode 100644 app/javascript/dashboard/assets/scss/_foundation-custom.scss
 delete mode 100644 app/javascript/dashboard/assets/scss/_foundation-settings.scss
 delete mode 100644 app/javascript/dashboard/assets/scss/_typography.scss
 delete mode 100644 app/javascript/dashboard/assets/scss/_utility-helpers.scss
 create mode 100644 app/javascript/dashboard/assets/scss/widgets/_base.scss
 delete mode 100644 app/javascript/dashboard/assets/scss/widgets/_conv-header.scss
 delete mode 100644 app/javascript/dashboard/assets/scss/widgets/_conversation-card.scss
 delete mode 100644 app/javascript/dashboard/assets/scss/widgets/_forms.scss
 delete mode 100644 app/javascript/dashboard/assets/scss/widgets/_login.scss
 delete mode 100644 app/javascript/dashboard/assets/scss/widgets/_modal.scss
 delete mode 100644 app/javascript/dashboard/assets/scss/widgets/_reply-box.scss
 delete mode 100644 app/javascript/dashboard/assets/scss/widgets/_report.scss
 delete mode 100644 app/javascript/dashboard/assets/scss/widgets/_reports.scss
 delete mode 100644 app/javascript/dashboard/assets/scss/widgets/_search-box.scss
 delete mode 100644 app/javascript/dashboard/assets/scss/widgets/_sidemenu.scss
 delete mode 100644 app/javascript/dashboard/assets/scss/widgets/_snackbar.scss
 delete mode 100644 app/javascript/dashboard/assets/scss/widgets/_states.scss
 delete mode 100644 app/javascript/dashboard/assets/scss/widgets/_status-bar.scss
 delete mode 100644 app/javascript/dashboard/assets/scss/widgets/_widget_builder.scss
 delete mode 100644 app/javascript/dashboard/components/widgets/ReportStatsCard.vue

diff --git a/app/javascript/dashboard/assets/scss/_foundation-custom.scss b/app/javascript/dashboard/assets/scss/_foundation-custom.scss
deleted file mode 100644
index f7d10e633..000000000
--- a/app/javascript/dashboard/assets/scss/_foundation-custom.scss
+++ /dev/null
@@ -1,58 +0,0 @@
-.button {
-  font-family: $body-font-family;
-  font-weight: $font-weight-medium;
-
-  &.round {
-    border-radius: 1000px;
-  }
-}
-
-select {
-  height: 2.5rem;
-}
-
-.card {
-  margin-bottom: var(--space-small);
-  padding: var(--space-normal);
-}
-
-code {
-  border: 0;
-  font-family: 'ui-monospace', 'SFMono-Regular', 'Menlo', 'Monaco', 'Consolas',
-    '"Liberation Mono"', '"Courier New"', 'monospace';
-  font-size: $font-size-mini;
-
-  &.hljs {
-    background: $color-background;
-    border-radius: var(--border-radius-large);
-    padding: $space-two;
-    @apply bg-slate-50 dark:bg-slate-700 text-slate-800 dark:text-slate-100;
-  }
-}
-
-.text-truncate {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-.text-capitalize {
-  text-transform: capitalize;
-}
-
-.cursor-pointer {
-  cursor: pointer;
-}
-
-// remove when grid gutters are fixed
-.columns.with-right-space {
-  padding-right: var(--space-normal);
-}
-
-.badge {
-  border-radius: var(--border-radius-normal);
-}
-
-.padding-right-small {
-  padding-right: var(--space-one);
-}
diff --git a/app/javascript/dashboard/assets/scss/_foundation-settings.scss b/app/javascript/dashboard/assets/scss/_foundation-settings.scss
deleted file mode 100644
index 3fd834cdd..000000000
--- a/app/javascript/dashboard/assets/scss/_foundation-settings.scss
+++ /dev/null
@@ -1,623 +0,0 @@
-//  Foundation for Sites Settings
-//  -----------------------------
-//
-//  Table of Contents:
-//
-//   1. Global
-//   2. Breakpoints
-//   3. The Grid
-//   4. Base Typography
-//   5. Typography Helpers
-//   6. Abide
-//   7. Accordion
-//   8. Accordion Menu
-//   9. Badge
-//  10. Breadcrumbs
-//  11. Button
-//  12. Button Group
-//  13. Callout
-//  14. Card
-//  15. Close Button
-//  16. Drilldown
-//  17. Dropdown
-//  18. Dropdown Menu
-//  19. Forms
-//  20. Label
-//  21. Media Object
-//  22. Menu
-//  23. Meter
-//  24. Off-canvas
-//  25. Orbit
-//  26. Pagination
-//  27. Progress Bar
-//  28. Responsive Embed
-//  29. Reveal
-//  30. Slider
-//  31. Switch
-//  32. Table
-//  33. Tabs
-//  34. Thumbnail
-//  35. Title Bar
-//  36. Tooltip
-//  37. Top Bar
-
-@import '~foundation-sites/scss/util/util';
-// 1. Global
-// ---------
-
-// Disable contrast warnings in Foundation.
-$contrast-warnings: false;
-
-$global-font-size: 16px;
-$global-width: 100%;
-$global-lineheight: 1.5;
-$foundation-palette: (primary: $color-woot,
-  secondary: #5d7592,
-  success: #44ce4b,
-  warning: #ffc532,
-  alert: #ff382d);
-$light-gray: #c0ccda;
-$medium-gray: #8492a6;
-$dark-gray: $color-gray;
-$black: #000;
-$white: #fff;
-$body-background: $white;
-$body-font-color: $color-body;
-$body-font-family: 'PlusJakarta',
--apple-system,
-system-ui,
-BlinkMacSystemFont,
-"Segoe UI",
-Roboto,
-"Helvetica Neue",
-Tahoma,
-Arial,
-sans-serif;
-$body-antialiased: true;
-$global-margin: $space-small;
-$global-padding: $space-small;
-$global-weight-normal: normal;
-$global-weight-bold: bold;
-$global-radius: 0;
-$global-text-direction: ltr;
-$global-flexbox: false;
-$print-transparent-backgrounds: true;
-
-@include add-foundation-colors;
-
-// 2. Breakpoints
-// --------------
-
-$breakpoints: (small: 0,
-  medium: 640px,
-  large: 1024px,
-  xlarge: 1200px,
-  xxlarge: 1400px,
-  xxxlarge: 1600px,
-);
-$print-breakpoint: large;
-$breakpoint-classes: (small medium large);
-
-// 3. The Grid
-// -----------
-
-$grid-row-width: $global-width;
-$grid-column-count: 12;
-$grid-column-gutter: (small: $zero,
-  medium: $zero);
-$grid-column-align-edge: true;
-$block-grid-max: 8;
-
-// 4. Base Typography
-// ------------------
-
-$header-font-family: $body-font-family;
-$header-font-weight: $font-weight-medium;
-$header-font-style: normal;
-$font-family-monospace: $body-font-family;
-$header-color: $color-heading;
-$header-lineheight: 1.4;
-$header-margin-bottom: 0.3125rem;
-$header-styles: (small: ("h1": ("font-size": 24),
-    "h2": ("font-size": 20),
-    "h3": ("font-size": 19),
-    "h4": ("font-size": 18),
-    "h5": ("font-size": 17),
-    "h6": ("font-size": 16)),
-  medium: ("h1": ("font-size": 48),
-    "h2": ("font-size": 40),
-    "h3": ("font-size": 31),
-    "h4": ("font-size": 25),
-    "h5": ("font-size": 20),
-    "h6": ("font-size": 16)));
-$header-text-rendering: optimizeLegibility;
-$small-font-size: 80%;
-$header-small-font-color: $medium-gray;
-$paragraph-lineheight: 1.65;
-$paragraph-margin-bottom: var(--space-small);
-$paragraph-text-rendering: optimizeLegibility;
-$code-color: $black;
-$code-font-family: $font-family-monospace;
-$code-font-weight: $global-weight-normal;
-$code-background: $light-gray;
-$code-border: 1px solid $medium-gray;
-$code-padding: rem-calc(2 5 1);
-$anchor-color: $primary-color;
-$anchor-color-hover: scale-color($anchor-color, $lightness: -14%);
-$anchor-text-decoration: none;
-$anchor-text-decoration-hover: none;
-$hr-width: $global-width;
-$hr-border: 1px solid $medium-gray;
-$hr-margin: rem-calc(20) auto;
-$list-lineheight: $paragraph-lineheight;
-$list-margin-bottom: $paragraph-margin-bottom;
-$list-style-type: disc;
-$list-style-position: outside;
-$list-side-margin: 0.78125rem;
-$list-nested-side-margin: 0.78125rem;
-$defnlist-margin-bottom: 0.6875rem;
-$defnlist-term-weight: $global-weight-bold;
-$defnlist-term-margin-bottom: 0.1875rem;
-$blockquote-color: $dark-gray;
-$blockquote-padding: rem-calc(9 20 0 19);
-$blockquote-border: 1px solid $medium-gray;
-$cite-font-size: rem-calc(13);
-$cite-color: $dark-gray;
-$cite-pseudo-content: '\2014 \0020';
-$keystroke-font: $font-family-monospace;
-$keystroke-color: $black;
-$keystroke-background: $light-gray;
-$keystroke-padding: rem-calc(2 4 0);
-$keystroke-radius: $global-radius;
-$abbr-underline: 1px dotted $black;
-
-// 5. Typography Helpers
-// ---------------------
-
-$lead-font-size: $global-font-size * 1.25;
-$lead-lineheight: 1.6;
-$subheader-lineheight: 1.4;
-$subheader-color: $dark-gray;
-$subheader-font-weight: $global-weight-normal;
-$subheader-margin-top: 0.125rem;
-$subheader-margin-bottom: 0.3125rem;
-$stat-font-size: 1.5625rem;
-
-// 6. Abide
-// --------
-
-$abide-inputs: true;
-$abide-labels: true;
-$input-background-invalid: get-color(alert);
-$form-label-color-invalid: get-color(alert);
-$input-error-color: get-color(alert);
-$input-error-font-size: rem-calc(12);
-$input-error-font-weight: $global-weight-bold;
-
-// 7. Accordion
-// ------------
-
-$accordion-background: $white;
-$accordion-plusminus: true;
-$accordion-title-font-size: rem-calc(12);
-$accordion-item-color: $primary-color;
-$accordion-item-background-hover: $light-gray;
-$accordion-item-padding: 0.78125rem 0.625rem;
-$accordion-content-background: $white;
-$accordion-content-border: 1px solid $light-gray;
-$accordion-content-color: $body-font-color;
-$accordion-content-padding: 0.625rem;
-
-// 8. Accordion Menu
-// -----------------
-
-$accordionmenu-arrows: true;
-$accordionmenu-arrow-color: $primary-color;
-$accordionmenu-arrow-size: 6px;
-
-// 9. Badge
-// --------
-
-$badge-background: $primary-color;
-$badge-color: $white;
-$badge-color-alt: $black;
-$badge-palette: $foundation-palette;
-$badge-padding: var(--space-smaller);
-$badge-minwidth: 2.1em;
-$badge-font-size: var(--font-size-nano);
-
-// 10. Breadcrumbs
-// ---------------
-
-$breadcrumbs-margin: 0 0 $global-margin 0;
-$breadcrumbs-item-font-size: rem-calc(11);
-$breadcrumbs-item-color: $primary-color;
-$breadcrumbs-item-color-current: $black;
-$breadcrumbs-item-color-disabled: $medium-gray;
-$breadcrumbs-item-margin: 0.46875rem;
-$breadcrumbs-item-uppercase: true;
-$breadcrumbs-item-slash: true;
-
-// 11. Button
-// ----------
-
-$button-padding: var(--space-smaller) 1em;
-$button-margin: 0 0 $global-margin 0;
-$button-fill: solid;
-$button-background: $primary-color;
-$button-background-hover: scale-color($button-background, $lightness: -15%);
-$button-color: $white;
-$button-color-alt: $white;
-$button-radius: var(--border-radius-normal);
-$button-sizes: (tiny: var(--font-size-micro),
-  small: var(--font-size-mini),
-  default: var(--font-size-small),
-  large: var(--font-size-medium));
-$button-palette: $foundation-palette;
-$button-opacity-disabled: 0.4;
-$button-background-hover-lightness: -20%;
-$button-hollow-hover-lightness: -50%;
-$button-transition: background-color 0.25s ease-out,
-color 0.25s ease-out;
-
-// 12. Button Group
-// ----------------
-
-$buttongroup-margin: 0;
-$buttongroup-spacing: 0;
-$buttongroup-child-selector: '.button';
-$buttongroup-expand-max: 6;
-$buttongroup-radius-on-each: false;
-
-// 13. Callout
-// -----------
-
-$callout-background: $white;
-$callout-background-fade: 85%;
-$callout-border: 1px solid rgba($black, 0.25);
-$callout-margin: 0 0 0.625rem 0;
-$callout-padding: 0.625rem;
-$callout-font-color: $body-font-color;
-$callout-font-color-alt: $body-background;
-$callout-radius: $global-radius;
-$callout-link-tint: 30%;
-
-// 14. Card
-// --------
-
-$card-background: $white;
-$card-font-color: $body-font-color;
-$card-divider-background: $light-gray;
-$card-border: 1px solid var(--color-border);
-$card-shadow: var(--shadow-small);
-$card-border-radius: var(--border-radius-normal);
-$card-padding: var(--space-small);
-$card-margin: $global-margin;
-
-// 15. Close Button
-// ----------------
-
-$closebutton-position: right top;
-$closebutton-offset-horizontal: (small: 0.66rem,
-  medium: 1rem);
-$closebutton-offset-vertical: (small: 0.33em,
-  medium: 0.5rem);
-$closebutton-size: (small: 1.5em,
-  medium: 2em);
-$closebutton-lineheight: 1;
-$closebutton-color: $dark-gray;
-$closebutton-color-hover: $black;
-
-// 16. Drilldown
-// -------------
-
-$drilldown-transition: transform 0.15s linear;
-$drilldown-arrows: true;
-$drilldown-arrow-color: $primary-color;
-$drilldown-arrow-size: 6px;
-$drilldown-background: $white;
-
-// 17. Dropdown
-// ------------
-
-$dropdown-padding: 0.625rem;
-$dropdown-background: $body-background;
-$dropdown-border: 1px solid $medium-gray;
-$dropdown-font-size: 0.625rem;
-$dropdown-width: 300px;
-$dropdown-radius: $global-radius;
-$dropdown-sizes: (tiny: 100px,
-  small: 200px,
-  large: 400px);
-
-// 18. Dropdown Menu
-// -----------------
-
-$dropdownmenu-arrows: true;
-$dropdownmenu-arrow-color: $anchor-color;
-$dropdownmenu-arrow-size: 6px;
-$dropdownmenu-min-width: 200px;
-$dropdownmenu-background: $white;
-$dropdownmenu-border: 1px solid $medium-gray;
-
-// 19. Forms
-// ---------
-
-$fieldset-border: 1px solid $light-gray;
-$fieldset-padding: $space-two;
-$fieldset-margin: $space-one $zero;
-$legend-padding: rem-calc(0 3);
-$form-spacing: $space-normal;
-$helptext-color: $color-body;
-$helptext-font-size: $font-size-small;
-$helptext-font-style: italic;
-$input-prefix-color: $color-body;
-$input-prefix-background: var(--b-100);
-$input-prefix-border: 1px solid $color-border;
-$input-prefix-padding: 0.625rem;
-$form-label-color: $color-body;
-$form-label-font-size: rem-calc(14);
-$form-label-font-weight: $font-weight-medium;
-$form-label-line-height: 1.8;
-$select-background: $white;
-$select-triangle-color: $dark-gray;
-$select-radius: var(--border-radius-normal);
-$input-color: $color-body;
-$input-placeholder-color: $light-gray;
-$input-font-family: inherit;
-$input-font-size: $font-size-default;
-$input-font-weight: $global-weight-normal;
-$input-background: $white;
-$input-background-focus: $white;
-$input-background-disabled: $light-gray;
-$input-border: 1px solid var(--s-200);
-$input-border-focus: 1px solid lighten($primary-color, 15%);
-$input-shadow: 0;
-$input-shadow-focus: 0;
-$input-cursor-disabled: not-allowed;
-$input-transition: border-color 0.25s ease-in-out;
-$input-number-spinners: true;
-$input-radius: var(--border-radius-normal);
-$form-button-radius: var(--border-radius-normal);
-
-// 20. Label
-// ---------
-
-$label-background: $white;
-$label-color: $black;
-$label-color-alt: $black;
-$label-palette: $foundation-palette;
-$label-font-size: $font-size-mini;
-$label-padding: $space-smaller $space-small;
-$label-radius: var(--border-radius-small);
-
-// 21. Media Object
-// ----------------
-
-$mediaobject-margin-bottom: $global-margin;
-$mediaobject-section-padding: $global-padding;
-$mediaobject-image-width-stacked: 100%;
-
-// 22. Menu
-// --------
-
-$menu-margin: 0;
-$menu-margin-nested: $space-medium;
-$menu-item-padding: $space-slab;
-$menu-item-color-active: $white;
-$menu-item-background-active: $color-background;
-$menu-icon-spacing: 0.15625rem;
-$menu-item-background-hover: $light-gray;
-$menu-border: $light-gray;
-
-// 23. Meter
-// ---------
-
-$meter-height: 0.625rem;
-$meter-radius: $global-radius;
-$meter-background: $medium-gray;
-$meter-fill-good: $success-color;
-$meter-fill-medium: $warning-color;
-$meter-fill-bad: $alert-color;
-
-// 24. Off-canvas
-// --------------
-
-$offcanvas-sizes: (small: 14.375,
-  medium: 14.375,
-);
-$offcanvas-vertical-sizes: (small: 14.375,
-  medium: 14.375,
-);
-$offcanvas-background: $light-gray;
-$offcanvas-shadow: 0 0 10px rgba($black, 0.7);
-$offcanvas-push-zindex: 1;
-$offcanvas-overlap-zindex: 10;
-$offcanvas-reveal-zindex: 1;
-$offcanvas-transition-length: 0.5s;
-$offcanvas-transition-timing: ease;
-$offcanvas-fixed-reveal: true;
-$offcanvas-exit-background: rgba($white, 0.25);
-$maincontent-class: 'off-canvas-content';
-
-// 25. Orbit
-// ---------
-
-$orbit-bullet-background: $medium-gray;
-$orbit-bullet-background-active: $dark-gray;
-$orbit-bullet-diameter: 0.75rem;
-$orbit-bullet-margin: 0.0625rem;
-$orbit-bullet-margin-top: 0.5rem;
-$orbit-bullet-margin-bottom: 0.5rem;
-$orbit-caption-background: rgba($black, 0.5);
-$orbit-caption-padding: 0.625rem;
-$orbit-control-background-hover: rgba($black, 0.5);
-$orbit-control-padding: 0.625rem;
-$orbit-control-zindex: 10;
-
-// 26. Pagination
-// --------------
-
-$pagination-font-size: rem-calc(14);
-$pagination-margin-bottom: $global-margin;
-$pagination-item-color: $black;
-$pagination-item-padding: rem-calc(3 10);
-$pagination-item-spacing: rem-calc(1);
-$pagination-radius: $global-radius;
-$pagination-item-background-hover: $light-gray;
-$pagination-item-background-current: $primary-color;
-$pagination-item-color-current: $white;
-$pagination-item-color-disabled: $medium-gray;
-$pagination-ellipsis-color: $black;
-$pagination-mobile-items: false;
-$pagination-mobile-current-item: false;
-$pagination-arrows: true;
-
-// 27. Progress Bar
-// ----------------
-
-$progress-height: 0.625rem;
-$progress-background: $medium-gray;
-$progress-margin-bottom: $global-margin;
-$progress-meter-background: $primary-color;
-$progress-radius: $global-radius;
-
-// 28. Responsive Embed
-// --------------------
-
-$responsive-embed-margin-bottom: rem-calc(16);
-$responsive-embed-ratios: (default: 4 by 3,
-  widescreen: 16 by 9);
-
-// 29. Reveal
-// ----------
-
-$reveal-background: $white;
-$reveal-width: 600px;
-$reveal-max-width: $global-width;
-$reveal-padding: $global-padding;
-$reveal-border: 1px solid $medium-gray;
-$reveal-radius: $global-radius;
-$reveal-zindex: 1005;
-$reveal-overlay-background: rgba($black, 0.45);
-
-// 30. Slider
-// ----------
-
-$slider-width-vertical: 0.3125rem;
-$slider-transition: all 0.2s ease-in-out;
-$slider-height: 0.3125rem;
-$slider-background: $light-gray;
-$slider-fill-background: $medium-gray;
-$slider-handle-height: 0.875rem;
-$slider-handle-width: 0.875rem;
-$slider-handle-background: $primary-color;
-$slider-opacity-disabled: 0.25;
-$slider-radius: $global-radius;
-
-// 31. Switch
-// ----------
-
-$switch-background: $light-gray;
-$switch-background-active: $primary-color;
-$switch-height: $space-two;
-$switch-height-tiny: $space-slab;
-$switch-height-small: $space-normal;
-$switch-height-large: $space-large;
-$switch-radius: $space-large;
-$switch-margin: $global-margin;
-$switch-paddle-background: $white;
-$switch-paddle-offset: $space-micro;
-$switch-paddle-radius: $space-large;
-$switch-paddle-transition: all 0.15s ease-out;
-
-// 32. Table
-// ---------
-
-$table-background: transparent;
-$table-color-scale: 5%;
-$table-border: 1px solid transparent;
-$table-padding: rem-calc(8 10 10);
-$table-hover-scale: 2%;
-$table-row-hover: darken($table-background, $table-hover-scale);
-$table-row-stripe-hover: darken($table-background,
-  $table-color-scale + $table-hover-scale);
-$table-is-striped: false;
-$table-striped-background: smart-scale($table-background, $table-color-scale);
-$table-stripe: even;
-$table-head-background: smart-scale($table-background, $table-color-scale / 2);
-$table-head-row-hover: darken($table-head-background, $table-hover-scale);
-$table-foot-background: smart-scale($table-background, $table-color-scale);
-$table-foot-row-hover: darken($table-foot-background, $table-hover-scale);
-$table-head-font-color: $body-font-color;
-$table-foot-font-color: $body-font-color;
-$show-header-for-stacked: false;
-
-// 33. Tabs
-// --------
-
-$tab-margin: 0;
-
-$tab-background: transparent;
-$tab-background-active: transparent;
-$tab-item-font-size: $font-size-small;
-$tab-item-background-hover: transparent;
-$tab-item-padding: $space-one $zero;
-$tab-color: $primary-color;
-$tab-active-color: $primary-color;
-$tab-expand-max: 6;
-$tab-content-background: transparent;
-$tab-content-border: transparent;
-$tab-content-color: foreground($tab-background, $primary-color);
-$tab-content-padding: 0.625rem;
-
-// 34. Thumbnail
-// -------------
-
-$thumbnail-border: solid 4px $white;
-$thumbnail-margin-bottom: $global-margin;
-$thumbnail-shadow: 0 0 0 1px rgba($black, 0.2);
-$thumbnail-shadow-hover: 0 0 6px 1px rgba($primary-color, 0.5);
-$thumbnail-transition: box-shadow 200ms ease-out;
-$thumbnail-radius: $global-radius;
-
-// 35. Title Bar
-// -------------
-
-$titlebar-background: $black;
-$titlebar-color: $white;
-$titlebar-padding: 0.3125rem;
-$titlebar-text-font-weight: bold;
-$titlebar-icon-color: $white;
-$titlebar-icon-color-hover: $medium-gray;
-$titlebar-icon-spacing: 0.15625rem;
-
-// 36. Tooltip
-// -----------
-
-$has-tip-font-weight: $global-weight-bold;
-$has-tip-border-bottom: dotted 1px $dark-gray;
-$tooltip-background-color: $black;
-$tooltip-color: $white;
-$tooltip-padding: 0.46875rem;
-$tooltip-font-size: $font-size-mini;
-$tooltip-pip-width: 0.46875rem;
-$tooltip-pip-height: $tooltip-pip-width * 0.866;
-$tooltip-radius: $global-radius;
-
-// 37. Top Bar
-// -----------
-
-$topbar-padding: 0.3125;
-$topbar-background: $light-gray;
-$topbar-submenu-background: $topbar-background;
-$topbar-title-spacing: 0.3125 0.625rem 0.3125 0;
-$topbar-input-width: 200px;
-$topbar-unstack-breakpoint: medium;
-
-
-// Internal variable that contains the flex justifying options
-$-zf-flex-justify: -zf-flex-justify($global-text-direction);
-
-$menu-items-padding: $space-one;
-$xy-grid: false;
diff --git a/app/javascript/dashboard/assets/scss/_helper-classes.scss b/app/javascript/dashboard/assets/scss/_helper-classes.scss
index 0b400c4e9..48ee1918b 100644
--- a/app/javascript/dashboard/assets/scss/_helper-classes.scss
+++ b/app/javascript/dashboard/assets/scss/_helper-classes.scss
@@ -1,64 +1,22 @@
-.bg-light {
-  @apply bg-slate-25 dark:bg-slate-800;
-}
-
-.flex-center {
-  @include flex-align(center, middle);
-  display: flex;
-}
-
-.bottom-space-fix {
-  margin-bottom: auto;
-}
-
-.full-height {
-  @include full-height();
-}
-
+// loader class
 .spinner {
   @include color-spinner();
-  display: inline-block;
-  height: $space-medium;
-  padding: $zero $space-medium;
-  position: relative;
-  vertical-align: middle;
-  width: $space-medium;
+  @apply inline-block h-6 py-0 px-6 relative align-middle w-6;
 
   &.message {
     @include normal-shadow;
-    background: $color-white;
-    border-radius: $space-large;
-    left: 0;
-    margin: $space-slab auto;
-    padding: $space-normal;
-    top: 0;
+    @apply bg-white dark:bg-slate-800 rounded-full left-0 my-3 mx-auto p-4 top-0;
 
     &::before {
-      margin-left: -$space-slab;
-      margin-top: -$space-slab;
+      @apply -ml-3 -mt-3;
     }
   }
 
   &.small {
-    height: $space-normal;
-    width: $space-normal;
+    @apply h-4 w-4;
 
     &::before {
-      height: $space-normal;
-      margin-top: -$space-small;
-      width: $space-normal;
+      @apply h-4 -mt-2 w-4;
     }
   }
 }
-
-.justify-space-between {
-  justify-content: space-between;
-}
-
-.w-full {
-  width: 100%;
-}
-
-.h-full {
-  height: 100%;
-}
diff --git a/app/javascript/dashboard/assets/scss/_layout.scss b/app/javascript/dashboard/assets/scss/_layout.scss
index 594a14d95..ea40c1f3a 100644
--- a/app/javascript/dashboard/assets/scss/_layout.scss
+++ b/app/javascript/dashboard/assets/scss/_layout.scss
@@ -1,5 +1,19 @@
+// scss-lint:disable SpaceAfterPropertyColon
+// @import 'shared/assets/fonts/inter';
+
 html,
 body {
+  font-family:
+    'PlusJakarta',
+    Inter,
+    -apple-system,
+    system-ui,
+    BlinkMacSystemFont,
+    'Segoe UI',
+    Roboto,
+    'Helvetica Neue',
+    Arial,
+    sans-serif !important;
   -moz-osx-font-smoothing: grayscale;
   -webkit-font-smoothing: antialiased;
   height: 100%;
diff --git a/app/javascript/dashboard/assets/scss/_rtl.scss b/app/javascript/dashboard/assets/scss/_rtl.scss
index 6f16a2af4..36679fc60 100644
--- a/app/javascript/dashboard/assets/scss/_rtl.scss
+++ b/app/javascript/dashboard/assets/scss/_rtl.scss
@@ -131,37 +131,12 @@
       }
     }
 
-    .search-header--wrap {
-      .search--input {
-        text-align: right;
-      }
-
-      .layout-switch__container {
-        transform: rotate(180deg);
-      }
-    }
-
     // Basic filter dropdown
     .basic-filter {
       left: 0;
       right: unset;
     }
 
-    // Card label
-    .label-container {
-      .label {
-        margin-left: var(--space-smaller);
-        margin-right: 0;
-      }
-    }
-
-    // Secondary sidebar toggle button
-    .toggle-sidebar {
-      margin-left: 0;
-      margin-right: var(--space-minus-small);
-      transform: rotate(180deg);
-    }
-
     // Bulk actions
     .bulk-action__container {
       .triangle {
@@ -202,22 +177,6 @@
     }
   }
 
-  // Notification panel
-  .notification-wrap {
-    left: 0;
-    right: var(--space-jumbo);
-
-    .action-button {
-      margin-left: var(--space-small);
-      margin-right: 0;
-    }
-
-    .notification-content--wrap {
-      margin-left: 0;
-      margin-right: var(--space-small);
-    }
-  }
-
   //   Help center
   .article-container .row--article-block {
     td:last-child {
@@ -324,10 +283,6 @@
 
   // Other changes
 
-  .account-selector--wrap {
-    direction: initial;
-  }
-
   .colorpicker--chrome {
     direction: initial;
   }
@@ -347,9 +302,4 @@
   .contact--form .input-group {
     direction: initial;
   }
-
-  // scss-lint:disable QualifyingElement
-  .dropdown-menu--header > span.title {
-    text-align: right;
-  }
 }
diff --git a/app/javascript/dashboard/assets/scss/_typography.scss b/app/javascript/dashboard/assets/scss/_typography.scss
deleted file mode 100644
index ee35a9cf0..000000000
--- a/app/javascript/dashboard/assets/scss/_typography.scss
+++ /dev/null
@@ -1,33 +0,0 @@
-.page-title {
-  font-size: $font-size-big;
-}
-
-.page-sub-title {
-  font-size: $font-size-large;
-  word-wrap: break-word;
-}
-
-.block-title {
-  font-size: $font-size-medium;
-}
-
-.sub-block-title {
-  font-size: $font-size-default;
-}
-
-.text-block-title {
-  font-size: $font-size-small;
-}
-
-.text-muted {
-  color: var(--s-300);
-}
-
-a {
-  font-size: $font-size-small;
-}
-
-p {
-  font-size: $font-size-small;
-  word-spacing: .12em;
-}
diff --git a/app/javascript/dashboard/assets/scss/_utility-helpers.scss b/app/javascript/dashboard/assets/scss/_utility-helpers.scss
deleted file mode 100644
index 99f0fe3eb..000000000
--- a/app/javascript/dashboard/assets/scss/_utility-helpers.scss
+++ /dev/null
@@ -1,73 +0,0 @@
-.margin-bottom-small {
-  margin-bottom: var(--space-small);
-}
-
-.margin-right-smaller {
-  margin-right: var(--space-smaller);
-}
-
-.margin-left-minus-slab {
-  margin-left: var(--space-minus-slab);
-}
-
-.margin-right-minus-slab {
-  margin-right: var(--space-minus-slab);
-}
-
-.fs-small {
-  font-size: var(--font-size-small);
-}
-
-.fs-default {
-  font-size: var(--font-size-default);
-}
-
-.fw-medium {
-  font-weight: var(--font-weight-medium);
-}
-
-.p-normal {
-  padding: var(--space-normal);
-}
-
-.overflow-scroll {
-  overflow: scroll;
-}
-
-.overflow-auto {
-  overflow: auto;
-}
-
-.overflow-hidden {
-  overflow: hidden;
-}
-
-.border-right {
-  @apply border-r border-slate-50 dark:border-slate-700;
-}
-
-.border-left {
-  border-left: 1px solid var(--color-border);
-}
-
-.text-ellipsis {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-.flex-between {
-  align-items: center;
-  display: flex;
-  justify-content: space-between;
-}
-
-.flex-end {
-  display: flex;
-  justify-content: end;
-}
-
-.flex-align-center {
-  align-items: center;
-  display: flex;
-}
diff --git a/app/javascript/dashboard/assets/scss/_woot.scss b/app/javascript/dashboard/assets/scss/_woot.scss
index 2773ced6f..cdc522224 100644
--- a/app/javascript/dashboard/assets/scss/_woot.scss
+++ b/app/javascript/dashboard/assets/scss/_woot.scss
@@ -15,62 +15,23 @@
 @import 'variables';
 
 @import 'mixins';
-@import 'foundation-settings';
 @import 'helper-classes';
 @import 'formulate';
 @import 'date-picker';
 
-@import 'foundation-sites/scss/foundation';
-
-@include foundation-everything($flex: true);
-
-@include foundation-prototype-text-utilities;
-@include foundation-prototype-text-transformation;
-@include foundation-prototype-text-decoration;
-@include foundation-prototype-font-styling;
-@include foundation-prototype-list-style-type;
-@include foundation-prototype-rounded;
-@include foundation-prototype-bordered;
-@include foundation-prototype-shadow;
-@include foundation-prototype-separator;
-@include foundation-prototype-overflow;
-@include foundation-prototype-display;
-@include foundation-prototype-position;
-@include foundation-prototype-border-box;
-@include foundation-prototype-border-none;
-@include foundation-prototype-sizing;
-@include foundation-prototype-spacing;
-
-@import 'typography';
 @import 'layout';
 @import 'animations';
-@import 'foundation-custom';
 @import 'rtl';
 
+@import 'widgets/base';
 @import 'widgets/buttons';
-@import 'widgets/conv-header';
-@import 'widgets/conversation-card';
 @import 'widgets/conversation-view';
-@import 'widgets/forms';
-@import 'widgets/login';
-@import 'widgets/modal';
-@import 'widgets/reply-box';
-@import 'widgets/report';
-@import 'widgets/search-box';
-@import 'widgets/sidemenu';
-@import 'widgets/snackbar';
-@import 'widgets/states';
-@import 'widgets/status-bar';
 @import 'widgets/tabs';
 @import 'widgets/woot-tables';
 
-@import 'views/settings/inbox';
-@import 'views/settings/integrations';
-
 @import 'plugins/multiselect';
 @import 'plugins/dropdown';
 @import '~shared/assets/stylesheets/ionicons';
-@import 'utility-helpers';
 
 .tooltip {
   @apply bg-slate-900 text-white py-1 px-2 z-40 text-xs rounded-md dark:bg-slate-200 dark:text-slate-900;
diff --git a/app/javascript/dashboard/assets/scss/plugins/_dropdown.scss b/app/javascript/dashboard/assets/scss/plugins/_dropdown.scss
index 100662394..e08099ae6 100644
--- a/app/javascript/dashboard/assets/scss/plugins/_dropdown.scss
+++ b/app/javascript/dashboard/assets/scss/plugins/_dropdown.scss
@@ -1,46 +1,7 @@
 .dropdown-pane {
-  @include elegant-card;
-  @include border-light;
-  box-sizing: content-box;
-  padding: var(--space-small);
-  width: fit-content;
-  z-index: var(--z-index-very-high);
+  @apply border rounded-lg hidden relative invisible shadow-lg border-slate-25 dark:border-slate-700 box-content p-2 w-fit z-[9999];
 
   &.dropdown-pane--open {
-    @apply bg-white dark:bg-slate-800;
-    display: block;
-    visibility: visible;
-  }
-
-  &.dropdowm--bottom {
-    &::before {
-      @include arrow(top, var(--color-border-light), 14px);
-      position: absolute;
-      right: 6px;
-      top: -14px;
-    }
-
-    &::after {
-      @include arrow(top, $color-white, var(--space-slab));
-      position: absolute;
-      right: var(--space-small);
-      top: -12px;
-    }
-  }
-
-  &.dropdowm--top {
-    &::before {
-      @include arrow(bottom, var(--color-border-light), 14px);
-      bottom: -14px;
-      position: absolute;
-      right: 6px;
-    }
-
-    &::after {
-      @include arrow(bottom, $color-white, var(--space-slab));
-      bottom: -12px;
-      position: absolute;
-      right: var(--space-small);
-    }
+    @apply bg-white absolute dark:bg-slate-800 block visible;
   }
 }
diff --git a/app/javascript/dashboard/assets/scss/plugins/_multiselect.scss b/app/javascript/dashboard/assets/scss/plugins/_multiselect.scss
index 0fddae3d1..9170715e0 100644
--- a/app/javascript/dashboard/assets/scss/plugins/_multiselect.scss
+++ b/app/javascript/dashboard/assets/scss/plugins/_multiselect.scss
@@ -97,6 +97,10 @@
 
   .multiselect__tags {
     @apply bg-white dark:bg-slate-900 border border-solid border-slate-200 dark:border-slate-600 m-0 min-h-[2.875rem] pt-0;
+
+    input {
+      @apply border-0 border-none;
+    }
   }
 
   .multiselect__tags-wrap {
@@ -149,7 +153,6 @@
 }
 
 .multiselect-wrap--small {
-
   .multiselect__tags,
   .multiselect__input,
   .multiselect {
@@ -180,7 +183,6 @@
   .multiselect--disabled .multiselect__select {
     @apply bg-transparent;
   }
-
 }
 
 .multiselect-wrap--medium {
diff --git a/app/javascript/dashboard/assets/scss/storybook.scss b/app/javascript/dashboard/assets/scss/storybook.scss
index 457560aa9..fa2455918 100644
--- a/app/javascript/dashboard/assets/scss/storybook.scss
+++ b/app/javascript/dashboard/assets/scss/storybook.scss
@@ -13,20 +13,14 @@
 @import '~shared/assets/stylesheets/ionicons';
 
 @import 'mixins';
-@import 'foundation-settings';
 @import 'helper-classes';
-@import 'foundation-sites/scss/foundation';
-
-@include foundation-prototype-spacing;
-@include foundation-everything($flex: true);
 
 @import 'typography';
 @import 'layout';
 @import 'animations';
 
-@import 'foundation-custom';
 @import 'widgets/buttons';
-@import 'widgets/forms';
+@import 'widgets/base';
 
 @import 'plugins/multiselect';
 
@@ -36,7 +30,6 @@
 @import 'tailwindcss/utilities';
 @import 'widget/assets/scss/utilities';
 
-
 html,
 body {
   font-family: 'PlusJakarta', sans-serif;
diff --git a/app/javascript/dashboard/assets/scss/views/settings/inbox.scss b/app/javascript/dashboard/assets/scss/views/settings/inbox.scss
index 39e4ed2bd..8a118b906 100644
--- a/app/javascript/dashboard/assets/scss/views/settings/inbox.scss
+++ b/app/javascript/dashboard/assets/scss/views/settings/inbox.scss
@@ -1,112 +1 @@
-.settings {
-  @apply overflow-auto;
-}
-
-.wizard-box {
-  .item {
-    @apply cursor-pointer py-4 pr-4 pl-6 relative;
-
-    &::before,
-    &::after {
-      @apply bg-slate-75 dark:bg-slate-600 content-[''] h-full absolute top-5 w-0.5;
-    }
-
-    &::before {
-      @apply h-4 top-0;
-    }
-
-    &:first-child {
-      &::before {
-        @apply h-0;
-      }
-    }
-
-    &:last-child {
-      &::after {
-        @apply h-0;
-      }
-    }
-
-    &.active {
-      h3 {
-        @apply text-woot-500 dark:text-woot-500;
-      }
-
-      .step {
-        @apply bg-woot-500 dark:bg-woot-500;
-      }
-    }
-
-    &.over {
-      &::after {
-        @apply bg-woot-500 dark:bg-woot-500;
-      }
-
-      .step {
-        @apply bg-woot-500 dark:bg-woot-500;
-      }
-
-      & + .item {
-        &::before {
-          @apply bg-woot-500 dark:bg-woot-500;
-        }
-      }
-    }
-
-    h3 {
-      @apply text-slate-800 dark:text-slate-100 text-base pl-6;
-    }
-
-    .completed {
-      @apply text-green-500 dark:text-green-500 ml-1;
-    }
-
-    p {
-      @apply text-slate-600 dark:text-slate-300 text-sm m-0 pl-6;
-    }
-
-    .step {
-      @apply bg-slate-75 dark:bg-slate-600 rounded-2xl font-medium w-4 left-4 leading-4 z-[999] absolute text-center text-white dark:text-white text-xxs top-5;
-
-      i {
-        @apply text-xxs;
-      }
-    }
-  }
-}
-
-.wizard-body {
-  @apply border border-slate-25 dark:border-slate-800/60 bg-white dark:bg-slate-900 h-full p-6;
-
-  &.height-auto {
-    @apply h-auto;
-  }
-}
-
-.settings--content {
-  @apply my-2 mx-8;
-
-  .title {
-    @apply font-medium;
-  }
-
-  .code {
-    @apply bg-slate-50 dark:bg-slate-800 overflow-auto p-2.5 whitespace-nowrap;
-
-    code {
-      @apply bg-transparent border-0;
-    }
-  }
-}
-
-.login-init {
-  @apply pt-[30%] text-center;
-
-  p {
-    @apply p-6;
-  }
-
-  > a > img {
-    @apply w-60;
-  }
-}
+// to be removed
diff --git a/app/javascript/dashboard/assets/scss/widgets/_base.scss b/app/javascript/dashboard/assets/scss/widgets/_base.scss
new file mode 100644
index 000000000..261df19e8
--- /dev/null
+++ b/app/javascript/dashboard/assets/scss/widgets/_base.scss
@@ -0,0 +1,140 @@
+// scss-lint:disable QualifyingElement
+
+// Base typography
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+  @apply font-medium text-slate-800 dark:text-slate-50;
+}
+
+p {
+  text-rendering: optimizeLegibility;
+  word-spacing: 0.12em;
+
+  @apply mb-2 leading-[1.65] text-sm;
+
+  a {
+    @apply text-woot-500 dark:text-woot-500 cursor-pointer;
+  }
+}
+
+a {
+  @apply text-sm;
+}
+
+hr {
+  @apply clear-both max-w-full h-0 my-5 mx-0 border-slate-300 dark:border-slate-600;
+}
+
+// Form elements
+label {
+  @apply text-slate-800 dark:text-slate-200 block m-0 leading-7 text-sm font-medium;
+
+  &.error {
+    input {
+      @apply mb-1;
+    }
+  }
+}
+
+.input-wrap,
+.help-text {
+  @apply text-slate-800 dark:text-slate-100 text-sm font-medium;
+
+  .help-text {
+    @apply font-normal text-slate-600 dark:text-slate-400;
+  }
+}
+
+// Focus outline removal
+.button,
+textarea,
+input:focus {
+  outline: none;
+}
+
+// Inputs
+input[type='text'],
+input[type='number'],
+input[type='password'],
+input[type='date'],
+input[type='email'],
+input[type='url'] {
+  @apply block box-border w-full transition-colors focus:border-woot-500 dark:focus:border-woot-600 duration-[0.25s] ease-[ease-in-out] h-10 appearance-none mx-0 mt-0 mb-4 p-2 rounded-md text-base font-normal bg-white dark:bg-slate-900 focus:bg-white focus:dark:bg-slate-900 text-slate-900 dark:text-slate-100 border border-solid border-slate-200 dark:border-slate-600;
+
+  &[disabled] {
+    @apply bg-slate-200 dark:bg-slate-700 text-slate-400 dark:text-slate-400 border-slate-200 dark:border-slate-600 cursor-not-allowed;
+  }
+}
+
+input[type='file'] {
+  @apply bg-white dark:bg-slate-800 leading-[1.15] mb-4;
+}
+
+// Select
+select {
+  background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' version='1.1' width='32' height='24' viewBox='0 0 32 24'><polygon points='0,0 32,0 16,24' style='fill: rgb%28110, 111, 115%29'></polygon></svg>");
+  background-position: right -1rem center;
+  background-size: 9px 6px;
+  @apply h-10 mx-0 mt-0 mb-4 bg-origin-content focus-visible:outline-none bg-no-repeat py-2 pr-6 pl-2 rounded-md w-full text-base font-normal appearance-none transition-colors focus:border-woot-500 dark:focus:border-woot-600 duration-[0.25s] ease-[ease-in-out] bg-white dark:bg-slate-900 text-slate-900 dark:text-slate-100 border border-solid border-slate-200 dark:border-slate-600;
+}
+
+// Textarea
+textarea {
+  @apply block box-border w-full transition-colors focus:border-woot-500 dark:focus:border-woot-600 duration-[0.25s] ease-[ease-in-out] h-16 appearance-none mx-0 mt-0 mb-4 p-2 rounded-md text-base font-normal bg-white dark:bg-slate-900 focus:bg-white focus:dark:bg-slate-900 text-slate-900 dark:text-slate-100 border border-solid border-slate-200 dark:border-slate-600;
+
+  &[disabled] {
+    @apply bg-slate-200 dark:bg-slate-700 text-slate-400 dark:text-slate-400 border-slate-200 dark:border-slate-600 cursor-not-allowed;
+  }
+}
+
+// Error handling
+.has-multi-select-error {
+  div.multiselect {
+    @apply mb-1;
+  }
+}
+
+.error {
+  input,
+  input:not([type]),
+  textarea,
+  select,
+  .multiselect > .multiselect__tags,
+  .multiselect:not(.no-margin) {
+    @apply border border-solid border-red-400 dark:border-red-400 mb-1;
+  }
+
+  .message {
+    @apply text-red-400 dark:text-red-400 block text-sm mb-2.5 w-full;
+  }
+}
+
+.input-group.small {
+  input {
+    @apply text-sm h-8;
+  }
+
+  .error {
+    @apply border-red-400 dark:border-red-400;
+  }
+}
+
+// Code styling
+code {
+  font-family: 'ui-monospace', 'SFMono-Regular', 'Menlo', 'Monaco', 'Consolas',
+    '"Liberation Mono"', '"Courier New"', 'monospace';
+  @apply text-xs border-0;
+
+  &.hljs {
+    @apply bg-slate-50 dark:bg-slate-700 text-slate-800 dark:text-slate-50 rounded-lg p-5;
+
+    .hljs-number,
+    .hljs-string {
+      @apply text-red-800 dark:text-red-400;
+    }
+  }
+}
diff --git a/app/javascript/dashboard/assets/scss/widgets/_buttons.scss b/app/javascript/dashboard/assets/scss/widgets/_buttons.scss
index 1b6166a18..423a41843 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_buttons.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_buttons.scss
@@ -1,8 +1,40 @@
+// scss-lint:disable SpaceAfterPropertyColon
+// scss-lint:disable MergeableSelector
+button {
+  font-family: inherit;
+  transition:
+    background-color 0.25s ease-out,
+    color 0.25s ease-out;
+  @apply inline-block items-center mb-0 text-center align-middle cursor-pointer text-sm mt-0 mx-0 py-1 px-2.5 border border-solid border-transparent dark:border-transparent rounded-[0.3125rem];
+
+  &:disabled,
+  &.disabled {
+    @apply opacity-40 cursor-not-allowed;
+  }
+}
+
+.button-group {
+  @apply mb-0 flex flex-nowrap items-stretch;
+
+  .button {
+    flex: 0 0 auto;
+    @apply m-0 text-sm rounded-none first:rounded-tl-[0.3125rem] first:rounded-bl-[0.3125rem] last:rounded-tr-[0.3125rem] last:rounded-br-[0.3125rem] rtl:space-x-reverse;
+  }
+
+  .button--only-icon {
+    @apply w-10 justify-center pl-0 pr-0;
+  }
+}
+
+.back-button {
+  @apply m-0;
+}
+
 .button {
-  @apply items-center inline-flex h-10 mb-0 gap-2;
+  @apply items-center bg-woot-500 dark:bg-woot-500 px-2.5 text-white dark:text-white inline-flex h-10 mb-0 gap-2 font-medium;
 
   .button__content {
-    @apply w-full;
+    @apply w-full whitespace-nowrap overflow-hidden text-ellipsis;
 
     img,
     svg {
@@ -10,12 +42,61 @@
     }
   }
 
+  &:hover {
+    @apply bg-woot-600 dark:bg-woot-600;
+  }
+
+  &:disabled,
+  &.disabled {
+    @apply opacity-40 cursor-not-allowed;
+  }
+
+  &.success {
+    @apply bg-[#44ce4b] text-white dark:text-white;
+  }
+
+  &.secondary {
+    @apply bg-slate-700 dark:bg-slate-600 text-white dark:text-white;
+  }
+
+  &.primary {
+    @apply bg-woot-500 dark:bg-woot-500 text-white dark:text-white;
+  }
+
+  &.clear {
+    @apply text-woot-500 dark:text-woot-500 bg-transparent dark:bg-transparent;
+  }
+
+  &.alert {
+    @apply bg-red-500 dark:bg-red-500 text-white dark:text-white;
+
+    &.clear {
+      @apply bg-transparent dark:bg-transparent;
+    }
+  }
+
+  &.warning {
+    @apply bg-[#ffc532] dark:bg-[#ffc532] text-white dark:text-white;
+
+    &.clear {
+      @apply bg-transparent dark:bg-transparent;
+    }
+  }
+
+  &.tiny {
+    @apply h-6 text-[10px];
+  }
+
+  &.small {
+    @apply h-8 text-xs;
+  }
+
   .spinner {
     @apply px-2 py-0;
   }
 
   // @TODDO - Remove after moving all buttons to woot-button
-  .icon + .button__content {
+  .icon+.button__content {
     @apply w-auto;
   }
 
@@ -34,7 +115,7 @@
   }
 
   &.hollow {
-    @apply border border-woot-500 dark:border-woot-500 text-woot-500 dark:text-woot-500 hover:bg-woot-50 dark:hover:bg-woot-900;
+    @apply border border-woot-500 bg-transparent dark:bg-transparent dark:border-woot-500 text-woot-500 dark:text-woot-500 hover:bg-woot-50 dark:hover:bg-woot-900;
 
     &.secondary {
       @apply text-slate-700 border-slate-200 dark:border-slate-600 dark:text-slate-100 hover:bg-slate-50 dark:hover:bg-slate-700;
diff --git a/app/javascript/dashboard/assets/scss/widgets/_conv-header.scss b/app/javascript/dashboard/assets/scss/widgets/_conv-header.scss
deleted file mode 100644
index 04f610dd2..000000000
--- a/app/javascript/dashboard/assets/scss/widgets/_conv-header.scss
+++ /dev/null
@@ -1 +0,0 @@
-// File to be removed
diff --git a/app/javascript/dashboard/assets/scss/widgets/_conversation-card.scss b/app/javascript/dashboard/assets/scss/widgets/_conversation-card.scss
deleted file mode 100644
index d060dc2ee..000000000
--- a/app/javascript/dashboard/assets/scss/widgets/_conversation-card.scss
+++ /dev/null
@@ -1,16 +0,0 @@
-@keyframes left-shift-animation {
-  0%,
-  100% {
-    transform: translateX(0);
-  }
-
-  50% {
-    transform: translateX(1px);
-  }
-}
-
-.conversation {
-  &.active {
-    animation: left-shift-animation 0.25s $swift-ease-out-function;
-  }
-}
diff --git a/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss b/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss
index 5cc3caa27..ea3a9c5f1 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss
@@ -79,7 +79,7 @@
       @apply rounded-r-lg rounded-l mr-auto break-words;
 
       &:not(.is-unsupported) {
-        @apply border border-slate-50 dark:border-slate-700 bg-white dark:bg-slate-700 text-black-900 dark:text-slate-50
+        @apply border border-slate-50 dark:border-slate-700 bg-white dark:bg-slate-700 text-black-900 dark:text-slate-50;
       }
 
       &.is-image {
@@ -91,7 +91,7 @@
       }
 
       .file {
-        .text-block-title {
+        .attachment-name {
           @apply text-slate-700 dark:text-woot-300;
         }
 
diff --git a/app/javascript/dashboard/assets/scss/widgets/_forms.scss b/app/javascript/dashboard/assets/scss/widgets/_forms.scss
deleted file mode 100644
index 4688b648c..000000000
--- a/app/javascript/dashboard/assets/scss/widgets/_forms.scss
+++ /dev/null
@@ -1,78 +0,0 @@
-// scss-lint:disable QualifyingElement
-
-label {
-  @apply text-slate-800 dark:text-slate-200;
-}
-
-textarea {
-  @apply bg-white dark:bg-slate-900 focus:bg-white focus:dark:bg-slate-900 text-slate-900 dark:text-slate-100 border-slate-200 dark:border-slate-600;
-}
-
-input {
-  @apply bg-white dark:bg-slate-900 focus:bg-white focus:dark:bg-slate-900 text-slate-900 dark:text-slate-100 border-slate-200 dark:border-slate-600;
-
-  &[disabled] {
-    @apply bg-slate-200 dark:bg-slate-700 text-slate-400 dark:text-slate-400 border-slate-200 dark:border-slate-600;
-  }
-}
-
-input[type='file'] {
-  @apply bg-white dark:bg-slate-800;
-}
-
-select {
-  @apply bg-white dark:bg-slate-900 text-slate-900 dark:text-slate-100 border-slate-200 dark:border-slate-600;
-}
-
-.error {
-  input[type='color'],
-  input[type='date'],
-  input[type='datetime'],
-  input[type='datetime-local'],
-  input[type='email'],
-  input[type='month'],
-  input[type='number'],
-  input[type='password'],
-  input[type='search'],
-  input[type='tel'],
-  input[type='text'],
-  input[type='time'],
-  input[type='url'],
-  input[type='week'],
-  input:not([type]),
-  textarea,
-  select,
-  .multiselect > .multiselect__tags {
-    @apply border border-solid border-red-400 dark:border-red-400;
-  }
-
-  .message {
-    @apply text-red-400 dark:text-red-400 block text-sm mb-2.5 w-full;
-  }
-}
-
-.button,
-textarea,
-input {
-  &:focus {
-    outline: none;
-  }
-}
-
-.input-wrap {
-  @apply text-slate-800 dark:text-slate-100 text-sm font-medium;
-}
-
-.help-text {
-  @apply font-normal text-slate-600 dark:text-slate-400;
-}
-
-.input-group.small {
-  input {
-    @apply text-sm h-8;
-  }
-
-  .error {
-    @apply border-red-400 dark:border-red-400;
-  }
-}
diff --git a/app/javascript/dashboard/assets/scss/widgets/_login.scss b/app/javascript/dashboard/assets/scss/widgets/_login.scss
deleted file mode 100644
index a5b140ede..000000000
--- a/app/javascript/dashboard/assets/scss/widgets/_login.scss
+++ /dev/null
@@ -1,66 +0,0 @@
-.auth-wrap {
-  width: 100%;
-}
-
-// Outside login wrapper
-.login {
-  @include full-height;
-  overflow-y: auto;
-  padding-top: $space-larger * 1.2;
-
-  .login__hero {
-    margin-bottom: $space-larger;
-
-    .hero__logo {
-      width: 180px;
-    }
-
-    .hero__title {
-      font-weight: $font-weight-light;
-      margin-top: $space-larger;
-    }
-
-    .hero__sub {
-      color: $medium-gray;
-      font-size: $font-size-medium;
-    }
-  }
-
-  // Login box
-  .login-box {
-    @include background-white;
-    @include border-normal;
-    @include elegant-card;
-
-    border-radius: $space-smaller;
-    padding: $space-large;
-
-    label {
-      color: $color-gray;
-      font-size: $font-size-default;
-
-      input {
-        font-size: $font-size-default;
-        height: $space-larger;
-        padding: $space-slab;
-      }
-
-      .error {
-        font-size: $font-size-small;
-      }
-    }
-
-    .button {
-      height: $space-larger;
-    }
-  }
-
-  .sigin__footer {
-    font-size: $font-size-default;
-    padding: $space-medium;
-
-    > a {
-      font-weight: $font-weight-bold;
-    }
-  }
-}
diff --git a/app/javascript/dashboard/assets/scss/widgets/_modal.scss b/app/javascript/dashboard/assets/scss/widgets/_modal.scss
deleted file mode 100644
index 4a3ca61c1..000000000
--- a/app/javascript/dashboard/assets/scss/widgets/_modal.scss
+++ /dev/null
@@ -1,75 +0,0 @@
-.modal-mask {
-  // @include flex;
-  // @include flex-align(center, middle);
-  @apply flex items-center justify-center bg-modal-backdrop-light dark:bg-modal-backdrop-dark  z-[9990] h-full left-0 fixed top-0 w-full;
-}
-
-.page-top-bar {
-  @apply px-8 pt-9 pb-0;
-
-  img {
-    @apply max-h-[3.75rem];
-  }
-}
-
-.modal-container {
-  @apply shadow-md rounded-sm max-h-full overflow-auto relative w-[37.5rem];
-
-  &.medium {
-    @apply max-w-[80%] w-[56.25rem];
-  }
-
-  .content-box {
-    @apply h-auto p-0;
-  }
-
-  h2 {
-    @apply text-slate-800 dark:text-slate-100 text-lg font-semibold;
-  }
-
-  p {
-    @apply text-sm m-0 p-0 text-slate-600 mt-2 text-sm dark:text-slate-300;
-  }
-
-  .content {
-    @apply p-8;
-  }
-
-  form,
-  .modal-content {
-    @apply pt-4 pb-8 px-8 self-center;
-
-    a {
-      @apply p-4;
-    }
-  }
-
-  .modal-footer {
-    // @include flex;
-    // @include flex-align($x: flex-end, $y: middle);
-    @apply flex justify-end items-center py-2 px-0 gap-2;
-
-    &.justify-content-end {
-      @apply justify-end;
-    }
-  }
-
-  .delete-item {
-    @apply p-8;
-
-    button {
-      @apply m-0;
-    }
-  }
-}
-
-.modal-enter,
-.modal-leave {
-  @apply opacity-0;
-}
-
-.modal-enter .modal-container,
-.modal-leave .modal-container {
-  transform: scale(1.1);
-  // @apply transform scale-110;
-}
diff --git a/app/javascript/dashboard/assets/scss/widgets/_reply-box.scss b/app/javascript/dashboard/assets/scss/widgets/_reply-box.scss
deleted file mode 100644
index d15150f36..000000000
--- a/app/javascript/dashboard/assets/scss/widgets/_reply-box.scss
+++ /dev/null
@@ -1,60 +0,0 @@
-.reply-box {
-  transition: box-shadow 0.35s $swift-ease-out-function,
-    height 2s $swift-ease-out-function;
-
-  &.is-focused {
-    box-shadow: var(--shadow);
-  }
-
-  .reply-box__top {
-    .icon {
-      color: $medium-gray;
-      cursor: pointer;
-      font-size: $font-size-medium;
-      margin-right: $space-small;
-
-      &.active {
-        color: $color-woot;
-      }
-    }
-
-    .attachment {
-      cursor: pointer;
-      margin-right: $space-one;
-      padding: 0 $space-small;
-    }
-
-    .video-js {
-      background: transparent;
-      // Override min-height : 50px in foundation
-      //
-      max-height: $space-mega * 2.4;
-      min-height: 3rem;
-      padding: var(--space-normal) 0 0;
-      resize: none;
-    }
-
-    > textarea {
-      @include ghost-input();
-      background: transparent;
-      margin: 0;
-      max-height: $space-mega * 2.4;
-      // Override min-height : 50px in foundation
-      min-height: 3rem;
-      padding: var(--space-normal) 0 0;
-      resize: none;
-    }
-  }
-
-  &.is-private {
-    @apply bg-yellow-100 dark:bg-yellow-800;
-
-    .reply-box__top {
-      @apply bg-yellow-100 dark:bg-yellow-800;
-
-      > input {
-        @apply bg-yellow-100 dark:bg-yellow-800;
-      }
-    }
-  }
-}
diff --git a/app/javascript/dashboard/assets/scss/widgets/_report.scss b/app/javascript/dashboard/assets/scss/widgets/_report.scss
deleted file mode 100644
index d07f1dd3d..000000000
--- a/app/javascript/dashboard/assets/scss/widgets/_report.scss
+++ /dev/null
@@ -1,60 +0,0 @@
-.report-card {
-  @include custom-border-top(3px, transparent);
-
-  cursor: pointer;
-  margin: 0;
-  padding: var(--space-normal);
-
-  &.active {
-    @include custom-border-top(3px, var(--color-woot));
-    @include background-white;
-    .heading,
-    .metric {
-      color: var(--color-woot);
-    }
-  }
-
-  .heading {
-    align-items: center;
-    color: var(--color-heading);
-    display: flex;
-    font-size: var(--font-size-small);
-    font-weight: var(--font-weight-bold);
-    margin: 0;
-  }
-
-  .info-icon {
-    color: var(--b-400);
-    margin-left: var(--space-micro);
-  }
-
-  .metric-wrap {
-    align-items: center;
-    display: flex;
-  }
-
-  .metric {
-    font-size: var(--font-size-big);
-    font-weight: var(--font-weight-feather);
-    margin-top: var(--space-smaller);
-  }
-
-  .metric-trend {
-    font-size: var(--font-size-small);
-    margin: 0 var(--space-small);
-  }
-
-  .metric-up {
-    color: $success-color;
-  }
-
-  .metric-down {
-    color: $alert-color;
-  }
-
-  .desc {
-    font-size: var(--font-size-small);
-    margin: 0;
-    text-transform: capitalize;
-  }
-}
diff --git a/app/javascript/dashboard/assets/scss/widgets/_reports.scss b/app/javascript/dashboard/assets/scss/widgets/_reports.scss
deleted file mode 100644
index dcd65366a..000000000
--- a/app/javascript/dashboard/assets/scss/widgets/_reports.scss
+++ /dev/null
@@ -1,29 +0,0 @@
-.reports-option__rounded--item {
-  border-radius: 100%;
-  height: var(--space-two);
-  width: var(--space-two);
-}
-
-.reports-option__item {
-  flex-shrink: 0;
-  margin-right: var(--space-small);
-}
-
-.reports-option__label--swatch {
-  border: 1px solid var(--color-border);
-}
-
-.reports-option__wrap {
-  align-items: center;
-  display: flex;
-}
-
-.reports-option__title {
-  margin: 0 var(--space-small);
-}
-
-
-.switch {
-  margin-bottom: var(--space-zero);
-  margin-left: var(--space-small);
-}
diff --git a/app/javascript/dashboard/assets/scss/widgets/_search-box.scss b/app/javascript/dashboard/assets/scss/widgets/_search-box.scss
deleted file mode 100644
index 643757e60..000000000
--- a/app/javascript/dashboard/assets/scss/widgets/_search-box.scss
+++ /dev/null
@@ -1,18 +0,0 @@
-.search {
-  @include flex;
-  @include flex-align($x: left, $y: middle);
-  @include flex-shrink;
-
-  padding: $space-one $space-normal;
-  transition: all 0.3s var(--ease-in-out-quad);
-
-  > .icon {
-    color: $medium-gray;
-    font-size: $font-size-medium;
-  }
-
-  > input {
-    @include ghost-input();
-    margin: 0;
-  }
-}
diff --git a/app/javascript/dashboard/assets/scss/widgets/_sidemenu.scss b/app/javascript/dashboard/assets/scss/widgets/_sidemenu.scss
deleted file mode 100644
index 3de072a77..000000000
--- a/app/javascript/dashboard/assets/scss/widgets/_sidemenu.scss
+++ /dev/null
@@ -1,78 +0,0 @@
-.side-menu {
-  i {
-    margin-right: var(--space-smaller);
-    min-width: var(--space-two);
-  }
-}
-
-.sidebar {
-  z-index: 1024 - 1;
-
-  //logo
-  .logo {
-    img {
-      max-height: 108px;
-      padding: $woot-logo-padding;
-    }
-  }
-
-  .nested {
-    a {
-      font-size: var(--font-size-small);
-      margin-bottom: var(--space-micro);
-      margin-top: var(--space-micro);
-
-      .inbox-icon {
-        display: inline-block;
-        margin-right: var(--space-micro);
-        min-width: var(--space-normal);
-        text-align: center;
-      }
-    }
-  }
-}
-
-// bottom-nav
-.bottom-nav {
-  @include flex;
-  @include space-between-column;
-  @include border-normal-top;
-  flex-direction: column;
-  padding: var(--space-one) var(--space-normal) var(--space-one)
-    var(--space-one);
-  position: relative;
-
-  &:hover {
-    background: var(--color-background-light);
-  }
-
-  .dropdown-pane {
-    bottom: 3.75rem;
-    display: block;
-    visibility: visible;
-    width: fit-content;
-  }
-
-  .active {
-    border-bottom: 2px solid $medium-gray;
-  }
-}
-
-.hamburger--menu {
-  cursor: pointer;
-  display: block;
-  margin-right: var(--space-normal);
-}
-
-.header--icon {
-  display: block;
-  margin: 0 var(--space-small) 0 var(--space-smaller);
-
-  @media screen and (max-width: 1200px) {
-    display: none;
-  }
-}
-
-.header-title {
-  margin: 0 var(--space-small);
-}
diff --git a/app/javascript/dashboard/assets/scss/widgets/_snackbar.scss b/app/javascript/dashboard/assets/scss/widgets/_snackbar.scss
deleted file mode 100644
index ee556682f..000000000
--- a/app/javascript/dashboard/assets/scss/widgets/_snackbar.scss
+++ /dev/null
@@ -1,45 +0,0 @@
-.ui-snackbar-container {
-  left: 0;
-  margin: 0 auto;
-  max-width: 25rem;
-  overflow: hidden;
-  position: absolute;
-  right: 0;
-  text-align: center;
-  top: $space-normal;
-  z-index: 9999;
-}
-
-.ui-snackbar {
-  @include shadow;
-  background-color: $woot-snackbar-bg;
-  border-radius: $space-smaller;
-  display: inline-flex;
-  margin-bottom: $space-small;
-  max-width: 25rem;
-  min-height: 1.875rem;
-  min-width: 15rem;
-  padding: $space-slab $space-medium;
-  text-align: left;
-}
-
-.ui-snackbar-text {
-  color: $color-white;
-  font-size: $font-size-small;
-  font-weight: $font-weight-medium;
-}
-
-.ui-snackbar-action {
-  margin-left: auto;
-  padding-left: 1.875rem;
-
-  button {
-    background: none;
-    border: 0;
-    color: $woot-snackbar-button;
-    font-size: $font-size-small;
-    margin: 0;
-    padding: 0;
-    text-transform: uppercase;
-  }
-}
diff --git a/app/javascript/dashboard/assets/scss/widgets/_states.scss b/app/javascript/dashboard/assets/scss/widgets/_states.scss
deleted file mode 100644
index 7eb840221..000000000
--- a/app/javascript/dashboard/assets/scss/widgets/_states.scss
+++ /dev/null
@@ -1 +0,0 @@
-// To be removed
diff --git a/app/javascript/dashboard/assets/scss/widgets/_status-bar.scss b/app/javascript/dashboard/assets/scss/widgets/_status-bar.scss
deleted file mode 100644
index ad0f805e2..000000000
--- a/app/javascript/dashboard/assets/scss/widgets/_status-bar.scss
+++ /dev/null
@@ -1,46 +0,0 @@
-.status-bar {
-  @include flex;
-  @include flex-align($x: center, $y: middle);
-  background: lighten($warning-color, 36%);
-  flex-direction: column;
-  margin: 0;
-  padding: $space-normal $space-smaller;
-
-  .message {
-    font-weight: $font-weight-medium;
-    margin-bottom: $zero;
-  }
-
-  .button {
-    margin: $space-smaller $zero $zero;
-    padding: $space-small $space-normal;
-  }
-
-  &.danger {
-    background: lighten($alert-color, 30%);
-
-    .button {
-      // Default and disabled states
-      &,
-      &.disabled,
-      &[disabled],
-      &.disabled:hover,
-      &[disabled]:hover,
-      &.disabled:focus,
-      &[disabled]:focus {
-        background-color: $alert-color;
-        color: $color-white;
-      }
-
-      &:hover,
-      &:focus {
-        background-color: darken($alert-color, 7%);
-        color: $color-white;
-      }
-    }
-  }
-
-  &.warning {
-    background: lighten($warning-color, 36%);
-  }
-}
diff --git a/app/javascript/dashboard/assets/scss/widgets/_tabs.scss b/app/javascript/dashboard/assets/scss/widgets/_tabs.scss
index 35a9ee9ed..3ef40a137 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_tabs.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_tabs.scss
@@ -31,7 +31,7 @@
 }
 
 .tabs-title {
-  @apply flex-shrink-0 my-0 mx-2 ;
+  @apply flex-shrink-0 my-0 mx-2;
 
   .badge {
     @apply bg-slate-50 dark:bg-slate-800 rounded-md text-slate-600 dark:text-slate-100 h-5 flex items-center justify-center text-xxs font-semibold my-0 mx-1 px-1 py-0;
@@ -53,7 +53,7 @@
   }
 
   a {
-    @apply flex items-center flex-row border-b border-transparent text-slate-500 dark:text-slate-200 text-sm top-[1px] relative;
+    @apply flex items-center flex-row border-b py-2.5 select-none cursor-pointer border-transparent text-slate-500 dark:text-slate-200 text-sm top-[1px] relative;
     transition: border-color 0.15s $swift-ease-out-function;
   }
 
diff --git a/app/javascript/dashboard/assets/scss/widgets/_widget_builder.scss b/app/javascript/dashboard/assets/scss/widgets/_widget_builder.scss
deleted file mode 100644
index e69de29bb..000000000
diff --git a/app/javascript/dashboard/assets/scss/widgets/_woot-tables.scss b/app/javascript/dashboard/assets/scss/widgets/_woot-tables.scss
index e7a1adbca..97535bf0d 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_woot-tables.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_woot-tables.scss
@@ -1,9 +1,9 @@
 table {
-  @apply border-spacing-0 text-sm;
+  @apply border-spacing-0 text-sm w-full;
 
   thead {
     th {
-      @apply font-semibold tracking-[1px] text-left uppercase text-slate-900 dark:text-slate-200;
+      @apply font-semibold tracking-[1px] text-left px-2.5 uppercase text-slate-900 dark:text-slate-200;
     }
   }
 
diff --git a/app/javascript/dashboard/components/Accordion/AccordionItem.vue b/app/javascript/dashboard/components/Accordion/AccordionItem.vue
index a8f7a0e3a..87370185d 100644
--- a/app/javascript/dashboard/components/Accordion/AccordionItem.vue
+++ b/app/javascript/dashboard/components/Accordion/AccordionItem.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="-mt-px text-sm">
     <button
-      class="flex items-center select-none w-full bg-slate-50 dark:bg-slate-800 border border-l-0 border-r-0 border-solid m-0 border-slate-100 dark:border-slate-700/50 cursor-grab justify-between py-2 px-4 drag-handle"
+      class="flex items-center select-none w-full rounded-none bg-slate-50 dark:bg-slate-800 border border-l-0 border-r-0 border-solid m-0 border-slate-100 dark:border-slate-700/50 cursor-grab justify-between py-2 px-4 drag-handle"
       @click="$emit('click')"
     >
       <div class="flex justify-between mb-0.5">
diff --git a/app/javascript/dashboard/components/ChannelSelector.vue b/app/javascript/dashboard/components/ChannelSelector.vue
index e795c0afe..33877de94 100644
--- a/app/javascript/dashboard/components/ChannelSelector.vue
+++ b/app/javascript/dashboard/components/ChannelSelector.vue
@@ -1,10 +1,12 @@
 <template>
   <button
-    class="sm:w-[50%] md:w-[34%] lg:w-[25%] channel"
+    class="sm:w-[50%] md:w-1/3 lg:w-1/4 bg-white dark:bg-slate-900 cursor-pointer flex flex-col transition-all duration-200 ease-in -m-px py-4 px-0 items-center border border-solid border-slate-25 dark:border-slate-800 hover:border-woot-500 dark:hover:border-woot-500 hover:shadow-md hover:z-50 disabled:opacity-60"
     @click="$emit('click')"
   >
-    <img :src="src" :alt="title" />
-    <h3 class="channel__title">
+    <img :src="src" :alt="title" class="w-[50%] my-4 mx-auto" />
+    <h3
+      class="text-slate-800 dark:text-slate-100 text-base text-center capitalize"
+    >
       {{ title }}
     </h3>
   </button>
@@ -31,32 +33,8 @@ export default {
     filter: grayscale(100%);
   }
 
-  &.channel:hover {
+  &:hover {
     @apply border-transparent shadow-none cursor-not-allowed;
   }
 }
-
-.channel {
-  @apply bg-white dark:bg-slate-900 cursor-pointer flex flex-col transition-all duration-200 ease-in -m-px py-4 px-0 items-center border border-solid border-slate-25 dark:border-slate-800;
-
-  &:hover {
-    @apply border-woot-500 dark:border-woot-500 shadow-md z-50;
-  }
-
-  &.disabled {
-    @apply opacity-60;
-  }
-
-  img {
-    @apply w-[50%] my-4 mx-auto;
-  }
-
-  .channel__title {
-    @apply text-slate-800 dark:text-slate-100 text-base text-center capitalize;
-  }
-
-  p {
-    @apply text-slate-600 dark:text-slate-300 w-full text-sm;
-  }
-}
 </style>
diff --git a/app/javascript/dashboard/components/ChatList.vue b/app/javascript/dashboard/components/ChatList.vue
index 7fcc58127..a75f0c12b 100644
--- a/app/javascript/dashboard/components/ChatList.vue
+++ b/app/javascript/dashboard/components/ChatList.vue
@@ -16,7 +16,7 @@
     >
       <div class="flex max-w-[85%] justify-center items-center">
         <h1
-          class="text-xl break-words overflow-hidden whitespace-nowrap text-ellipsis text-black-900 dark:text-slate-100 mb-0"
+          class="text-xl break-words overflow-hidden whitespace-nowrap font-medium text-ellipsis text-black-900 dark:text-slate-100 mb-0"
           :title="pageTitle"
         >
           {{ pageTitle }}
@@ -143,7 +143,10 @@
           <div v-if="chatListLoading" class="text-center">
             <span class="spinner mt-4 mb-4" />
           </div>
-          <p v-if="showEndOfListMessage" class="text-center text-muted p-4">
+          <p
+            v-if="showEndOfListMessage"
+            class="text-center text-slate-400 dark:text-slate-300 p-4"
+          >
             {{ $t('CHAT_LIST.EOF') }}
           </p>
           <intersection-observer
diff --git a/app/javascript/dashboard/components/CustomAttribute.vue b/app/javascript/dashboard/components/CustomAttribute.vue
index c4846bcbc..f89579773 100644
--- a/app/javascript/dashboard/components/CustomAttribute.vue
+++ b/app/javascript/dashboard/components/CustomAttribute.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="py-3 px-4">
     <div class="flex items-center mb-1">
-      <h4 class="text-block-title flex items-center m-0 w-full error">
+      <h4 class="text-sm flex items-center m-0 w-full error">
         <div v-if="isAttributeTypeCheckbox" class="checkbox-wrap">
           <input
             v-model="editedValue"
@@ -12,7 +12,7 @@
         </div>
         <div class="flex items-center justify-between w-full">
           <span
-            class="attribute-name"
+            class="attribute-name w-full text-slate-800 dark:text-slate-100 font-medium text-sm mb-0"
             :class="{ error: $v.editedValue.$error }"
           >
             {{ label }}
@@ -32,19 +32,24 @@
     </div>
     <div v-if="notAttributeTypeCheckboxAndList">
       <div v-show="isEditing">
-        <div class="input-group small">
+        <div class="mb-2 w-full flex items-center">
           <input
             ref="inputfield"
             v-model="editedValue"
             :type="inputType"
-            class="input-group-field"
+            class="!h-8 ltr:rounded-r-none rtl:rounded-l-none !mb-0 !text-sm"
             autofocus="true"
             :class="{ error: $v.editedValue.$error }"
             @blur="$v.editedValue.$touch"
             @keyup.enter="onUpdate"
           />
-          <div class="input-group-button">
-            <woot-button size="small" icon="checkmark" @click="onUpdate" />
+          <div>
+            <woot-button
+              size="small"
+              icon="checkmark"
+              class="rounded-l-none rtl:rounded-r-none"
+              @click="onUpdate"
+            />
           </div>
         </div>
         <span
@@ -306,7 +311,6 @@ export default {
   @apply my-0 mr-2 ml-0;
 }
 .attribute-name {
-  @apply w-full text-slate-800 dark:text-slate-100;
   &.error {
     @apply text-red-400 dark:text-red-500;
   }
diff --git a/app/javascript/dashboard/components/Modal.vue b/app/javascript/dashboard/components/Modal.vue
index 8c9a6f6e6..3a1059692 100644
--- a/app/javascript/dashboard/components/Modal.vue
+++ b/app/javascript/dashboard/components/Modal.vue
@@ -62,9 +62,9 @@ export default {
   computed: {
     modalContainerClassName() {
       let className =
-        'modal-container bg-white dark:bg-slate-800 skip-context-menu';
+        'modal-container rtl:text-right shadow-md rounded-sm max-h-full overflow-auto relative w-[37.5rem] bg-white dark:bg-slate-800 skip-context-menu';
       if (this.fullWidth) {
-        return `${className} modal-container--full-width`;
+        return `${className} items-center rounded-none flex h-full justify-center w-full`;
       }
 
       return `${className} ${this.size}`;
@@ -109,26 +109,43 @@ export default {
 };
 </script>
 
-<style scoped lang="scss">
-.modal-container--full-width {
-  align-items: center;
-  border-radius: 0;
-  display: flex;
-  height: 100%;
-  justify-content: center;
-  width: 100%;
-}
-
-.modal-mask.right-aligned {
-  justify-content: flex-end;
-
+<style lang="scss">
+.modal-mask {
+  @apply flex items-center justify-center bg-modal-backdrop-light dark:bg-modal-backdrop-dark z-[9990] h-full left-0 fixed top-0 w-full;
   .modal-container {
-    border-radius: 0;
-    height: 100%;
-    width: 30rem;
+    &.medium {
+      @apply max-w-[80%] w-[56.25rem];
+    }
+    // .content-box {
+    //   @apply h-auto p-0;
+    // }
+    .content {
+      @apply p-8;
+    }
+    form,
+    .modal-content {
+      @apply pt-4 pb-8 px-8 self-center;
+      a {
+        @apply p-4;
+      }
+    }
   }
 }
 .modal-big {
-  width: 60%;
+  @apply w-full;
+}
+.modal-mask.right-aligned {
+  @apply justify-end;
+  .modal-container {
+    @apply rounded-none h-full w-[30rem];
+  }
+}
+.modal-enter,
+.modal-leave {
+  @apply opacity-0;
+}
+.modal-enter .modal-container,
+.modal-leave .modal-container {
+  transform: scale(1.1);
 }
 </style>
diff --git a/app/javascript/dashboard/components/ModalHeader.vue b/app/javascript/dashboard/components/ModalHeader.vue
index 7afe1784c..1e38abc30 100644
--- a/app/javascript/dashboard/components/ModalHeader.vue
+++ b/app/javascript/dashboard/components/ModalHeader.vue
@@ -3,7 +3,7 @@
     <img v-if="headerImage" :src="headerImage" alt="No image" />
     <h2
       ref="modalHeaderTitle"
-      class="text-slate-800 text-lg dark:text-slate-100"
+      class="text-slate-800 text-lg font-semibold dark:text-slate-50"
     >
       {{ headerTitle }}
     </h2>
diff --git a/app/javascript/dashboard/components/SettingsSection.vue b/app/javascript/dashboard/components/SettingsSection.vue
index 927dcbc93..d59a9dc01 100644
--- a/app/javascript/dashboard/components/SettingsSection.vue
+++ b/app/javascript/dashboard/components/SettingsSection.vue
@@ -1,19 +1,21 @@
 <template>
   <div
-    class="ml-0 mr-0 flex pt-0 pr-4 pb-4 pl-0"
+    class="ml-0 mr-0 flex py-8 w-full xl:w-3/4 flex-col xl:flex-row"
     :class="{
-      'pt-4 border-b border-solid border-slate-50 dark:border-slate-700/30':
+      'border-b border-solid border-slate-50 dark:border-slate-700/30':
         showBorder,
     }"
   >
-    <div class="w-[30%] min-w-0 max-w-[30%] pr-12">
+    <div class="w-full xl:w-1/4 min-w-0 xl:max-w-[30%] pr-12">
       <p
         v-if="title"
         class="text-base text-woot-500 dark:text-woot-500 mb-0 font-medium"
       >
         {{ title }}
       </p>
-      <p class="text-sm mb-2">
+      <p
+        class="text-sm mb-2 text-slate-700 dark:text-slate-300 leading-5 tracking-normal mt-2"
+      >
         <slot v-if="subTitle" name="subTitle">
           {{ subTitle }}
         </slot>
@@ -23,7 +25,7 @@
         {{ note }}
       </p>
     </div>
-    <div class="w-[50%] min-w-0 max-w-[50%]">
+    <div class="w-full xl:w-1/2 min-w-0 xl:max-w-[50%]">
       <slot />
     </div>
   </div>
diff --git a/app/javascript/dashboard/components/Snackbar.vue b/app/javascript/dashboard/components/Snackbar.vue
index ef475e7db..213284484 100644
--- a/app/javascript/dashboard/components/Snackbar.vue
+++ b/app/javascript/dashboard/components/Snackbar.vue
@@ -1,11 +1,17 @@
 <template>
   <div>
-    <div class="ui-snackbar">
-      <div class="ui-snackbar-text">
+    <div
+      class="shadow-sm bg-slate-800 dark:bg-slate-700 rounded-[4px] items-center gap-3 inline-flex mb-2 max-w-[25rem] min-h-[1.875rem] min-w-[15rem] px-6 py-3 text-left"
+    >
+      <div class="text-white dark:text-white text-sm font-medium">
         {{ message }}
       </div>
-      <div v-if="action" class="ui-snackbar-action">
-        <router-link v-if="action.type == 'link'" :to="action.to">
+      <div v-if="action">
+        <router-link
+          v-if="action.type == 'link'"
+          :to="action.to"
+          class="text-woot-500 dark:text-woot-500 cursor-pointer font-medium hover:text-woot-600 dark:hover:text-woot-600 select-none"
+        >
           {{ action.message }}
         </router-link>
       </div>
diff --git a/app/javascript/dashboard/components/SnackbarContainer.vue b/app/javascript/dashboard/components/SnackbarContainer.vue
index 187d7f792..553ad2a2e 100644
--- a/app/javascript/dashboard/components/SnackbarContainer.vue
+++ b/app/javascript/dashboard/components/SnackbarContainer.vue
@@ -1,5 +1,9 @@
 <template>
-  <transition-group name="toast-fade" tag="div" class="ui-snackbar-container">
+  <transition-group
+    name="toast-fade"
+    tag="div"
+    class="left-0 my-0 mx-auto max-w-[25rem] overflow-hidden absolute right-0 text-center top-4 z-[9999]"
+  >
     <woot-snackbar
       v-for="snackMessage in snackMessages"
       :key="snackMessage.key"
diff --git a/app/javascript/dashboard/components/index.js b/app/javascript/dashboard/components/index.js
index ee06ebc9a..bc515cfdf 100644
--- a/app/javascript/dashboard/components/index.js
+++ b/app/javascript/dashboard/components/index.js
@@ -18,7 +18,6 @@ import Label from './ui/Label';
 import LoadingState from './widgets/LoadingState';
 import Modal from './Modal';
 import ModalHeader from './ModalHeader';
-import ReportStatsCard from './widgets/ReportStatsCard';
 import SidemenuIcon from './SidemenuIcon';
 import Spinner from 'shared/components/Spinner';
 import SubmitButton from './buttons/FormSubmitButton';
@@ -46,7 +45,6 @@ const WootUIKit = {
   LoadingState,
   Modal,
   ModalHeader,
-  ReportStatsCard,
   SidemenuIcon,
   Spinner,
   SubmitButton,
diff --git a/app/javascript/dashboard/components/layout/config/sidebarItems/campaigns.js b/app/javascript/dashboard/components/layout/config/sidebarItems/campaigns.js
index 62598c7f1..62bdbd635 100644
--- a/app/javascript/dashboard/components/layout/config/sidebarItems/campaigns.js
+++ b/app/javascript/dashboard/components/layout/config/sidebarItems/campaigns.js
@@ -2,7 +2,7 @@ import { frontendURL } from '../../../../helper/URLHelper';
 
 const campaigns = accountId => ({
   parentNav: 'campaigns',
-  routes: ['settings_account_campaigns', 'one_off'],
+  routes: ['ongoing_campaigns', 'one_off'],
   menuItems: [
     {
       icon: 'arrow-swap',
@@ -10,7 +10,7 @@ const campaigns = accountId => ({
       key: 'ongoingCampaigns',
       hasSubMenu: false,
       toState: frontendURL(`accounts/${accountId}/campaigns/ongoing`),
-      toStateName: 'settings_account_campaigns',
+      toStateName: 'ongoing_campaigns',
     },
     {
       key: 'oneOffCampaigns',
diff --git a/app/javascript/dashboard/components/layout/config/sidebarItems/primaryMenu.js b/app/javascript/dashboard/components/layout/config/sidebarItems/primaryMenu.js
index 294b7eb7c..d68ac1c9c 100644
--- a/app/javascript/dashboard/components/layout/config/sidebarItems/primaryMenu.js
+++ b/app/javascript/dashboard/components/layout/config/sidebarItems/primaryMenu.js
@@ -34,7 +34,7 @@ const primaryMenuItems = accountId => [
     label: 'CAMPAIGNS',
     featureFlag: FEATURE_FLAGS.CAMPAIGNS,
     toState: frontendURL(`accounts/${accountId}/campaigns`),
-    toStateName: 'settings_account_campaigns',
+    toStateName: 'ongoing_campaigns',
     roles: ['administrator'],
   },
   {
diff --git a/app/javascript/dashboard/components/layout/sidebarComponents/AccountSelector.vue b/app/javascript/dashboard/components/layout/sidebarComponents/AccountSelector.vue
index d6cf24eb9..6d5a27952 100644
--- a/app/javascript/dashboard/components/layout/sidebarComponents/AccountSelector.vue
+++ b/app/javascript/dashboard/components/layout/sidebarComponents/AccountSelector.vue
@@ -45,7 +45,7 @@
 
     <div
       v-if="globalConfig.createNewAccountFromDashboard"
-      class="modal-footer delete-item"
+      class="flex justify-end items-center p-8 gap-2"
     >
       <button
         class="button success large expanded nice"
diff --git a/app/javascript/dashboard/components/layout/sidebarComponents/AgentDetails.vue b/app/javascript/dashboard/components/layout/sidebarComponents/AgentDetails.vue
index f45a81e70..7683a40b2 100644
--- a/app/javascript/dashboard/components/layout/sidebarComponents/AgentDetails.vue
+++ b/app/javascript/dashboard/components/layout/sidebarComponents/AgentDetails.vue
@@ -2,7 +2,7 @@
   <woot-button
     v-tooltip.right="$t(`SIDEBAR.PROFILE_SETTINGS`)"
     variant="link"
-    class="current-user"
+    class="items-center flex rounded-full"
     @click="handleClick"
   >
     <thumbnail
@@ -38,12 +38,3 @@ export default {
   },
 };
 </script>
-
-<style scoped lang="scss">
-.current-user {
-  align-items: center;
-  display: flex;
-  border-radius: 50%;
-  border: 2px solid var(--white);
-}
-</style>
diff --git a/app/javascript/dashboard/components/layout/sidebarComponents/NotificationBell.vue b/app/javascript/dashboard/components/layout/sidebarComponents/NotificationBell.vue
index bf99b3c07..f3a394f4b 100644
--- a/app/javascript/dashboard/components/layout/sidebarComponents/NotificationBell.vue
+++ b/app/javascript/dashboard/components/layout/sidebarComponents/NotificationBell.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="mb-4">
     <button
-      class="text-slate-600 dark:text-slate-100 w-10 h-10 my-2 flex items-center justify-center rounded-lg hover:bg-slate-25 dark:hover:bg-slate-700 dark:hover:text-slate-100 hover:text-slate-600 relative"
+      class="text-slate-600 dark:text-slate-100 w-10 h-10 my-2 p-0 flex items-center justify-center rounded-lg hover:bg-slate-25 dark:hover:bg-slate-700 dark:hover:text-slate-100 hover:text-slate-600 relative"
       :class="{
         'bg-woot-50 dark:bg-slate-800 text-woot-500 hover:bg-woot-50':
           isNotificationPanelActive,
@@ -16,7 +16,7 @@
       />
       <span
         v-if="unreadCount"
-        class="text-black-900 bg-yellow-300 absolute -top-0.5 -right-1 p-1 text-xxs min-w-[1rem] rounded-full"
+        class="text-black-900 bg-yellow-300 absolute -top-0.5 -right-1 text-xxs min-w-[1rem] rounded-full"
       >
         {{ unreadCount }}
       </span>
diff --git a/app/javascript/dashboard/components/layout/sidebarComponents/SecondaryChildNavItem.vue b/app/javascript/dashboard/components/layout/sidebarComponents/SecondaryChildNavItem.vue
index d85fedfa5..8ea982955 100644
--- a/app/javascript/dashboard/components/layout/sidebarComponents/SecondaryChildNavItem.vue
+++ b/app/javascript/dashboard/components/layout/sidebarComponents/SecondaryChildNavItem.vue
@@ -53,7 +53,7 @@
           </span>
           <span
             v-if="showChildCount"
-            class="bg-slate-50 dark:bg-slate-700 rounded text-xxs font-medium mx-1 py-0 px-1"
+            class="bg-slate-50 dark:bg-slate-700 rounded-full min-w-[18px] justify-center items-center flex text-xxs font-medium mx-1 py-0 px-1"
             :class="
               isCountZero
                 ? `text-slate-300 dark:text-slate-500`
diff --git a/app/javascript/dashboard/components/ui/Label.vue b/app/javascript/dashboard/components/ui/Label.vue
index 7b9c44a46..6e15ddce2 100644
--- a/app/javascript/dashboard/components/ui/Label.vue
+++ b/app/javascript/dashboard/components/ui/Label.vue
@@ -1,18 +1,25 @@
 <template>
-  <div :class="labelClass" :style="labelStyle" :title="description">
+  <div
+    class="ltr:mr-1 rtl:ml-1 mb-1"
+    :class="labelClass"
+    :style="labelStyle"
+    :title="description"
+  >
     <span v-if="icon" class="label-action--button">
       <fluent-icon :icon="icon" size="12" class="label--icon cursor-pointer" />
     </span>
     <span
       v-if="['smooth', 'dashed'].includes(variant) && title && !icon"
       :style="{ background: color }"
-      class="label-color-dot"
+      class="label-color-dot flex-shrink-0"
     />
-    <span v-if="!href">{{ title }}</span>
+    <span v-if="!href" class="whitespace-nowrap text-ellipsis overflow-hidden">
+      {{ title }}
+    </span>
     <a v-else :href="href" :style="anchorStyle">{{ title }}</a>
     <button
       v-if="showClose"
-      class="label-close--button"
+      class="label-close--button p-0"
       :style="{ color: textColor }"
       @click="onClick"
     >
@@ -104,7 +111,7 @@ export default {
 
 <style scoped lang="scss">
 .label {
-  @apply inline-flex items-center font-medium gap-1 mr-1 rtl:ml-1 rtl:mr-0 mb-1 p-1 bg-slate-50 dark:bg-slate-700 text-slate-800 dark:text-slate-100 border border-solid border-slate-75 dark:border-slate-600 h-6;
+  @apply inline-flex items-center font-medium text-xs rounded-[4px] gap-1 p-1 bg-slate-50 dark:bg-slate-700 text-slate-800 dark:text-slate-100 border border-solid border-slate-75 dark:border-slate-600 h-6;
 
   &.small {
     @apply text-xs py-0.5 px-1 leading-tight h-5;
diff --git a/app/javascript/dashboard/components/ui/PreviewCard.vue b/app/javascript/dashboard/components/ui/PreviewCard.vue
index fd3d7c16b..ec0dd5539 100644
--- a/app/javascript/dashboard/components/ui/PreviewCard.vue
+++ b/app/javascript/dashboard/components/ui/PreviewCard.vue
@@ -1,6 +1,18 @@
 <template>
-  <div class="preview-card--wrap" :class="{ 'active-card': active }">
-    <div class="header--wrap" :class="{ active: active }">
+  <div
+    class="flex flex-col min-w-[15rem] max-h-[21.25rem] max-w-[23.75rem] rounded-md border border-solid border-slate-75 dark:border-slate-600"
+    :class="{
+      'bg-woot-25 dark:bg-slate-700 border border-solid border-woot-300 dark:border-woot-400':
+        active,
+    }"
+  >
+    <div
+      class="flex justify-between items-center px-2 w-full h-10 bg-slate-50 dark:bg-slate-900 rounded-t-[5px] border-b border-solid border-slate-50 dark:border-slate-600"
+      :class="{
+        'bg-woot-50 border-b border-solid border-woot-75 dark:border-woot-700':
+          active,
+      }"
+    >
       <div class="items-center flex font-medium p-1 text-sm">{{ heading }}</div>
       <fluent-icon
         v-if="active"
@@ -56,21 +68,3 @@ export default {
   },
 };
 </script>
-
-<style lang="scss" scoped>
-.preview-card--wrap {
-  @apply flex flex-col min-w-[15rem] max-h-[21.25rem] max-w-[23.75rem] rounded-md border border-solid border-slate-75 dark:border-slate-600;
-
-  .header--wrap {
-    @apply flex justify-between items-center px-2 w-full h-10 bg-slate-50 dark:bg-slate-900 rounded-t-[5px] border-b border-solid border-slate-50 dark:border-slate-600;
-  }
-
-  .active {
-    @apply bg-woot-50 border-b border-solid border-woot-75 dark:border-woot-700;
-  }
-}
-
-.active-card {
-  @apply bg-woot-25 dark:bg-slate-700 border border-solid border-woot-300 dark:border-woot-400;
-}
-</style>
diff --git a/app/javascript/dashboard/components/ui/Switch.vue b/app/javascript/dashboard/components/ui/Switch.vue
index 57894de0a..3aa8f15a5 100644
--- a/app/javascript/dashboard/components/ui/Switch.vue
+++ b/app/javascript/dashboard/components/ui/Switch.vue
@@ -1,7 +1,7 @@
 <template>
   <button
     type="button"
-    class="toggle-button"
+    class="toggle-button p-0"
     :class="{ active: value, small: size === 'small' }"
     role="switch"
     :aria-checked="value.toString()"
diff --git a/app/javascript/dashboard/components/ui/Tabs/TabsItem.vue b/app/javascript/dashboard/components/ui/Tabs/TabsItem.vue
index 01742136f..340aa4f90 100644
--- a/app/javascript/dashboard/components/ui/Tabs/TabsItem.vue
+++ b/app/javascript/dashboard/components/ui/Tabs/TabsItem.vue
@@ -7,7 +7,7 @@
   >
     <a @click="onTabClick">
       {{ name }}
-      <div v-if="showBadge" class="badge">
+      <div v-if="showBadge" class="badge min-w-[20px]">
         <span>
           {{ getItemCount }}
         </span>
diff --git a/app/javascript/dashboard/components/ui/Wizard.vue b/app/javascript/dashboard/components/ui/Wizard.vue
index 31403e09c..9c887c853 100644
--- a/app/javascript/dashboard/components/ui/Wizard.vue
+++ b/app/javascript/dashboard/components/ui/Wizard.vue
@@ -13,18 +13,23 @@
     >
       <div class="flex items-center">
         <h3
-          class="overflow-hidden whitespace-nowrap text-ellipsis leading-tight"
+          class="text-slate-800 dark:text-slate-100 text-base font-medium pl-6 overflow-hidden whitespace-nowrap mb-1.5 text-ellipsis leading-tight"
         >
           {{ item.title }}
         </h3>
-        <span v-if="isOver(item)" class="completed">
+        <span
+          v-if="isOver(item)"
+          class="text-green-500 dark:text-green-500 ml-1"
+        >
           <fluent-icon icon="checkmark" />
         </span>
       </div>
       <span class="step">
         {{ items.indexOf(item) + 1 }}
       </span>
-      <p>{{ item.body }}</p>
+      <p class="text-slate-600 dark:text-slate-300 text-sm m-0 pl-6">
+        {{ item.body }}
+      </p>
     </div>
   </transition-group>
 </template>
@@ -60,3 +65,40 @@ export default {
   },
 };
 </script>
+<style lang="scss" scoped>
+.wizard-box {
+  .item {
+    @apply cursor-pointer after:bg-slate-75 before:bg-slate-75 dark:after:bg-slate-600 dark:before:bg-slate-600 py-4 pr-4 pl-6 relative before:h-4 before:top-0 last:before:h-0 first:before:h-0 last:after:h-0 before:content-[''] before:absolute before:w-0.5 after:content-[''] after:h-full after:absolute after:top-5 after:w-0.5;
+
+    &.active {
+      h3 {
+        @apply text-woot-500 dark:text-woot-500;
+      }
+
+      .step {
+        @apply bg-woot-500 dark:bg-woot-500;
+      }
+    }
+
+    &.over {
+      &::after {
+        @apply bg-woot-500 dark:bg-woot-500;
+      }
+
+      .step {
+        @apply bg-woot-500 dark:bg-woot-500;
+      }
+
+      & + .item {
+        &::before {
+          @apply bg-woot-500 dark:bg-woot-500;
+        }
+      }
+    }
+
+    .step {
+      @apply bg-slate-75 dark:bg-slate-600 rounded-2xl font-medium w-4 left-4 leading-4 z-[999] absolute text-center text-white dark:text-white text-xxs top-5;
+    }
+  }
+}
+</style>
diff --git a/app/javascript/dashboard/components/widgets/AttachmentsPreview.vue b/app/javascript/dashboard/components/widgets/AttachmentsPreview.vue
index 0a1c80fe6..f73474977 100644
--- a/app/javascript/dashboard/components/widgets/AttachmentsPreview.vue
+++ b/app/javascript/dashboard/components/widgets/AttachmentsPreview.vue
@@ -15,7 +15,7 @@
           📄
         </span>
       </div>
-      <div class="max-w-[60%] min-w-[50%] overflow-hidden text-ellipsis">
+      <div class="max-w-3/5 min-w-[50%] overflow-hidden text-ellipsis">
         <span
           class="h-4 overflow-hidden text-sm font-medium text-ellipsis whitespace-nowrap"
         >
diff --git a/app/javascript/dashboard/components/widgets/BackButton.vue b/app/javascript/dashboard/components/widgets/BackButton.vue
index c02902ed6..2528aada7 100644
--- a/app/javascript/dashboard/components/widgets/BackButton.vue
+++ b/app/javascript/dashboard/components/widgets/BackButton.vue
@@ -1,6 +1,6 @@
 <template>
   <button
-    class="header-section flex items-center text-base font-normal mr-4 ml-2 cursor-pointer text-woot-500 dark:text-woot-500"
+    class="header-section flex items-center text-base font-normal mr-4 ml-2 p-0 cursor-pointer text-woot-500 dark:text-woot-500"
     @click.capture="goBack"
   >
     <fluent-icon icon="chevron-left" />
diff --git a/app/javascript/dashboard/components/widgets/InboxName.vue b/app/javascript/dashboard/components/widgets/InboxName.vue
index 28e6931b6..8b604b323 100644
--- a/app/javascript/dashboard/components/widgets/InboxName.vue
+++ b/app/javascript/dashboard/components/widgets/InboxName.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    class="inbox--name inline-flex items-center py-0.5 px-0 leading-3 font-medium bg-none text-slate-600 dark:text-slate-500 text-xs my-0 mx-2.5"
+    class="inbox--name inline-flex items-center py-0.5 px-0 leading-3 whitespace-nowrap font-medium bg-none text-slate-600 dark:text-slate-500 text-xs my-0 mx-2.5"
   >
     <fluent-icon
       class="mr-0.5 rtl:ml-0.5 rtl:mr-0"
diff --git a/app/javascript/dashboard/components/widgets/LoadingState.vue b/app/javascript/dashboard/components/widgets/LoadingState.vue
index 3e07a405d..76aaef3eb 100644
--- a/app/javascript/dashboard/components/widgets/LoadingState.vue
+++ b/app/javascript/dashboard/components/widgets/LoadingState.vue
@@ -1,9 +1,11 @@
 <template>
   <div class="flex items-center justify-center p-8">
     <h6
-      class="block text-base text-center w-100 text-slate-800 dark:text-slate-300"
+      class="flex items-center gap-2 text-base text-center w-100 text-slate-800 dark:text-slate-300"
     >
-      <span class="mr-3">{{ message }}</span>
+      <span class="text-base font-medium text-slate-800 dark:text-slate-100">
+        {{ message }}
+      </span>
       <span class="spinner" />
     </h6>
   </div>
diff --git a/app/javascript/dashboard/components/widgets/ReportStatsCard.vue b/app/javascript/dashboard/components/widgets/ReportStatsCard.vue
deleted file mode 100644
index a074ca857..000000000
--- a/app/javascript/dashboard/components/widgets/ReportStatsCard.vue
+++ /dev/null
@@ -1,57 +0,0 @@
-<template>
-  <div
-    class="small-2 report-card"
-    :class="{ active: selected }"
-    @click="onClick(index)"
-  >
-    <h3 class="heading">
-      <span>{{ heading }}</span>
-      <fluent-icon
-        v-if="infoText"
-        v-tooltip="infoText"
-        size="14"
-        icon="info"
-        class="info-icon"
-      />
-    </h3>
-    <div class="metric-wrap">
-      <h4 class="metric">
-        {{ point }}
-      </h4>
-      <span v-if="trend !== 0" :class="trendClass">{{ trendValue }}</span>
-    </div>
-    <p class="desc">
-      {{ desc }}
-    </p>
-  </div>
-</template>
-<script>
-export default {
-  props: {
-    heading: { type: String, default: '' },
-    infoText: { type: String, default: '' },
-    point: { type: [Number, String], default: '' },
-    trend: { type: Number, default: null },
-    index: { type: Number, default: null },
-    desc: { type: String, default: '' },
-    selected: Boolean,
-    onClick: { type: Function, default: () => {} },
-  },
-  computed: {
-    trendClass() {
-      if (this.trend > 0) {
-        return 'metric-trend metric-up';
-      }
-
-      return 'metric-trend metric-down';
-    },
-    trendValue() {
-      if (this.trend > 0) {
-        return `+${this.trend}%`;
-      }
-
-      return `${this.trend}%`;
-    },
-  },
-};
-</script>
diff --git a/app/javascript/dashboard/components/widgets/SettingIntroBanner.vue b/app/javascript/dashboard/components/widgets/SettingIntroBanner.vue
index 7b143dfca..9f99d5ba2 100644
--- a/app/javascript/dashboard/components/widgets/SettingIntroBanner.vue
+++ b/app/javascript/dashboard/components/widgets/SettingIntroBanner.vue
@@ -2,7 +2,7 @@
   <div
     class="bg-slate-25 dark:bg-slate-900 pt-4 pb-0 px-8 border-b border-solid border-slate-50 dark:border-slate-800/50"
   >
-    <h2 class="text-2xl text-slate-800 dark:text-slate-100">
+    <h2 class="text-2xl text-slate-800 dark:text-slate-100 mb-1 font-medium">
       {{ headerTitle }}
     </h2>
     <p
diff --git a/app/javascript/dashboard/components/widgets/TableFooter.vue b/app/javascript/dashboard/components/widgets/TableFooter.vue
index 2ba91ae6b..050dbcb71 100644
--- a/app/javascript/dashboard/components/widgets/TableFooter.vue
+++ b/app/javascript/dashboard/components/widgets/TableFooter.vue
@@ -98,9 +98,7 @@ export default {
   },
   computed: {
     pageFooterIconClass() {
-      return this.isRTLView
-        ? 'margin-right-minus-slab'
-        : 'margin-left-minus-slab';
+      return this.isRTLView ? '-mr-3' : '-ml-3';
     },
     isFooterVisible() {
       return this.totalCount && !(this.firstIndex > this.totalCount);
diff --git a/app/javascript/dashboard/components/widgets/Thumbnail.vue b/app/javascript/dashboard/components/widgets/Thumbnail.vue
index 4c0e8f87a..6c864e95b 100644
--- a/app/javascript/dashboard/components/widgets/Thumbnail.vue
+++ b/app/javascript/dashboard/components/widgets/Thumbnail.vue
@@ -9,6 +9,7 @@
       <img
         v-show="shouldShowImage"
         :src="src"
+        draggable="false"
         :class="thumbnailClass"
         @load="onImgLoad"
         @error="onImgError"
diff --git a/app/javascript/dashboard/components/widgets/WootWriter/AudioRecorder.vue b/app/javascript/dashboard/components/widgets/WootWriter/AudioRecorder.vue
index 029c1dd56..16808ef79 100644
--- a/app/javascript/dashboard/components/widgets/WootWriter/AudioRecorder.vue
+++ b/app/javascript/dashboard/components/widgets/WootWriter/AudioRecorder.vue
@@ -225,8 +225,11 @@ export default {
 
 <style lang="scss">
 .audio-wave-wrapper {
-  min-height: 5rem;
-  height: 5rem;
+  @apply h-20 min-h-[5rem];
+
+  .video-js {
+    @apply bg-transparent max-h-60 min-h-[3rem] pt-4 px-0 pb-0 resize-none;
+  }
 }
 .video-js .vjs-control-bar {
   background-color: transparent;
diff --git a/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue b/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue
index 2984c506a..dd907f83e 100644
--- a/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue
+++ b/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue
@@ -104,7 +104,7 @@
           class="fixed top-0 bottom-0 left-0 right-0 z-20 flex flex-col items-center justify-center w-full h-full gap-2 text-slate-900 dark:text-slate-50 bg-modal-backdrop-light dark:bg-modal-backdrop-dark"
         >
           <fluent-icon icon="cloud-backup" size="40" />
-          <h4 class="page-sub-title text-slate-900 dark:text-slate-50">
+          <h4 class="text-2xl break-words text-slate-900 dark:text-slate-50">
             {{ $t('CONVERSATION.REPLYBOX.DRAG_DROP') }}
           </h4>
         </div>
diff --git a/app/javascript/dashboard/components/widgets/WootWriter/ReplyTopPanel.vue b/app/javascript/dashboard/components/widgets/WootWriter/ReplyTopPanel.vue
index d3a28c754..43f19e55a 100644
--- a/app/javascript/dashboard/components/widgets/WootWriter/ReplyTopPanel.vue
+++ b/app/javascript/dashboard/components/widgets/WootWriter/ReplyTopPanel.vue
@@ -146,6 +146,6 @@ export default {
   }
 }
 .button--note {
-  @apply text-yellow-600 dark:text-yellow-600;
+  @apply text-yellow-600 dark:text-yellow-600 bg-transparent dark:bg-transparent;
 }
 </style>
diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
index a19ac630a..44144f2d8 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
@@ -25,13 +25,12 @@
       v-if="bulkActionCheck"
       :src="currentContact.thumbnail"
       :badge="inboxBadge"
-      class="columns"
       :username="currentContact.name"
       :status="currentContact.availability_status"
       size="40px"
     />
     <div
-      class="px-0 py-3 border-b group-hover:border-transparent border-slate-50 dark:border-slate-800/75 columns"
+      class="px-0 py-3 border-b group-hover:border-transparent flex-1 border-slate-50 dark:border-slate-800/75 w-[calc(100%-40px)]"
     >
       <div class="flex justify-between">
         <inbox-name v-if="showInboxName" :inbox="inbox" />
@@ -51,7 +50,7 @@
         </div>
       </div>
       <h4
-        class="conversation--user text-sm my-0 mx-2 capitalize pt-0.5 text-ellipsis overflow-hidden whitespace-nowrap w-[60%] text-slate-900 dark:text-slate-100"
+        class="conversation--user text-sm my-0 mx-2 capitalize pt-0.5 text-ellipsis font-medium overflow-hidden whitespace-nowrap w-[calc(100%-70px)] text-slate-900 dark:text-slate-100"
       >
         {{ currentContact.name }}
       </h4>
diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue
index 42172eb23..e6c90f692 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue
@@ -5,9 +5,7 @@
     <div
       class="flex-1 w-full min-w-0 flex flex-col md:flex-row items-center justify-center"
     >
-      <div
-        class="flex justify-start items-center mr-4 rtl:mr-0 rtl:ml-4 min-w-0 w-[inherit]"
-      >
+      <div class="flex justify-start items-center min-w-0 w-fit max-w-full">
         <back-button
           v-if="showBackButton"
           :back-url="backButtonUrl"
@@ -20,9 +18,11 @@
           :status="currentContact.availability_status"
         />
         <div
-          class="items-start flex flex-col ml-2 rtl:ml-0 rtl:mr-2 min-w-0 w-[inherit] overflow-hidden"
+          class="items-start flex flex-col ml-2 rtl:ml-0 rtl:mr-2 min-w-0 w-fit overflow-hidden"
         >
-          <div class="flex items-center flex-row gap-1 m-0 p-0 w-[inherit]">
+          <div
+            class="flex items-center flex-row gap-1 m-0 p-0 w-fit max-w-full"
+          >
             <woot-button
               variant="link"
               color-scheme="secondary"
@@ -30,7 +30,7 @@
               @click.prevent="$emit('contact-panel-toggle')"
             >
               <span
-                class="text-base leading-tight text-slate-900 dark:text-slate-100"
+                class="text-base leading-tight font-medium text-slate-900 dark:text-slate-100"
               >
                 {{ currentContact.name }}
               </span>
@@ -66,7 +66,7 @@
         </div>
       </div>
       <div
-        class="header-actions-wrap items-center flex flex-row flex-grow justify-end mt-3 lg:mt-0 rtl:relative rtl:left-6"
+        class="header-actions-wrap items-center flex flex-row flex-grow justify-end mt-3 lg:mt-0"
         :class="{ 'justify-end': isContactPanelOpen }"
       >
         <more-actions :conversation-id="currentChat.id" />
diff --git a/app/javascript/dashboard/components/widgets/conversation/EmailTranscriptModal.vue b/app/javascript/dashboard/components/widgets/conversation/EmailTranscriptModal.vue
index 81759a0df..d8a54b402 100644
--- a/app/javascript/dashboard/components/widgets/conversation/EmailTranscriptModal.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/EmailTranscriptModal.vue
@@ -8,7 +8,10 @@
       />
       <form class="w-full" @submit.prevent="onSubmit">
         <div class="w-full">
-          <div v-if="currentChat.meta.sender && currentChat.meta.sender.email">
+          <div
+            v-if="currentChat.meta.sender && currentChat.meta.sender.email"
+            class="flex items-center gap-2"
+          >
             <input
               id="contact"
               v-model="selectedType"
@@ -20,7 +23,7 @@
               $t('EMAIL_TRANSCRIPT.FORM.SEND_TO_CONTACT')
             }}</label>
           </div>
-          <div v-if="currentChat.meta.assignee">
+          <div v-if="currentChat.meta.assignee" class="flex items-center gap-2">
             <input
               id="assignee"
               v-model="selectedType"
@@ -32,7 +35,7 @@
               $t('EMAIL_TRANSCRIPT.FORM.SEND_TO_AGENT')
             }}</label>
           </div>
-          <div>
+          <div class="flex items-center gap-2">
             <input
               id="other_email_address"
               v-model="selectedType"
diff --git a/app/javascript/dashboard/components/widgets/conversation/Message.vue b/app/javascript/dashboard/components/widgets/conversation/Message.vue
index 8c57b6fc2..3925312ee 100644
--- a/app/javascript/dashboard/components/widgets/conversation/Message.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/Message.vue
@@ -601,8 +601,8 @@ export default {
         @apply text-woot-400 dark:text-woot-400;
       }
 
-      .text-block-title {
-        @apply text-slate-700 dark:text-slate-700;
+      .attachment-name {
+        @apply text-slate-700 dark:text-slate-200;
       }
 
       .download.button {
diff --git a/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue b/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
index 747551e18..d6ae4d3a8 100644
--- a/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
@@ -547,6 +547,8 @@ export default {
 
 <style scoped lang="scss">
 .modal-mask {
+  @apply absolute;
+
   &::v-deep {
     .ProseMirror-woot-style {
       @apply max-h-[25rem];
diff --git a/app/javascript/dashboard/components/widgets/conversation/OnboardingView.vue b/app/javascript/dashboard/components/widgets/conversation/OnboardingView.vue
index 4f43fb923..5824da0bd 100644
--- a/app/javascript/dashboard/components/widgets/conversation/OnboardingView.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/OnboardingView.vue
@@ -1,9 +1,9 @@
 <template>
-  <div class="columns onboarding-wrap">
+  <div class="onboarding-wrap">
     <div class="onboarding">
       <div class="scroll-wrap">
         <div class="features-item">
-          <h1 class="page-title">
+          <h1 class="text-2xl text-slate-900 dark:text-slate-50">
             <span>{{
               $t('ONBOARDING.TITLE', {
                 installationName: globalConfig.installationName,
@@ -30,7 +30,7 @@
           </p>
         </div>
         <div class="features-item">
-          <h2 class="block-title text-black-900 dark:text-slate-200">
+          <h2 class="text-lg text-black-900 dark:text-slate-200">
             <span class="emoji">💬</span>
             <span class="conversation--title">{{
               $t('ONBOARDING.ALL_CONVERSATION.TITLE')
@@ -41,7 +41,7 @@
           </p>
         </div>
         <div class="features-item">
-          <h2 class="block-title text-black-900 dark:text-slate-200">
+          <h2 class="text-lg text-black-900 dark:text-slate-200">
             <span class="emoji">👥</span>
             {{ $t('ONBOARDING.TEAM_MEMBERS.TITLE') }}
           </h2>
@@ -53,7 +53,7 @@
           </router-link>
         </div>
         <div class="features-item">
-          <h2 class="block-title text-black-900 dark:text-slate-200">
+          <h2 class="text-lg text-black-900 dark:text-slate-200">
             <span class="emoji">📥</span>{{ $t('ONBOARDING.INBOXES.TITLE') }}
           </h2>
           <p class="intro-body">
@@ -64,7 +64,7 @@
           </router-link>
         </div>
         <div class="features-item">
-          <h2 class="block-title text-black-900 dark:text-slate-200">
+          <h2 class="text-lg text-black-900 dark:text-slate-200">
             <span class="emoji">🔖</span>{{ $t('ONBOARDING.LABELS.TITLE') }}
           </h2>
           <p class="intro-body">
diff --git a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
index e22a3a23a..a0174bf28 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
@@ -1202,10 +1202,28 @@ export default {
 }
 
 .reply-box {
+  transition:
+    box-shadow 0.35s cubic-bezier(0.37, 0, 0.63, 1),
+    height 2s cubic-bezier(0.37, 0, 0.63, 1);
+
   @apply relative border-t border-slate-50 dark:border-slate-700 bg-white dark:bg-slate-900;
 
+  &.is-focused {
+    box-shadow:
+      0 1px 3px 0 rgba(0, 0, 0, 0.1),
+      0 1px 2px 0 rgba(0, 0, 0, 0.06);
+  }
+
   &.is-private {
-    @apply bg-yellow-50 dark:bg-yellow-200;
+    @apply bg-yellow-100 dark:bg-yellow-800;
+
+    .reply-box__top {
+      @apply bg-yellow-100 dark:bg-yellow-800;
+
+      > input {
+        @apply bg-yellow-100 dark:bg-yellow-800;
+      }
+    }
   }
 }
 .send-button {
@@ -1214,6 +1232,10 @@ export default {
 
 .reply-box__top {
   @apply relative py-0 px-4 -mt-px border-t border-solid border-slate-50 dark:border-slate-700;
+
+  textarea {
+    @apply shadow-none border-transparent bg-transparent m-0 max-h-60 min-h-[3rem] pt-4 pb-0 px-0 resize-none;
+  }
 }
 
 .emoji-dialog {
diff --git a/app/javascript/dashboard/components/widgets/conversation/ReplyEmailHead.vue b/app/javascript/dashboard/components/widgets/conversation/ReplyEmailHead.vue
index 5a82138e2..3a1fe87b2 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ReplyEmailHead.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ReplyEmailHead.vue
@@ -5,10 +5,11 @@
         <label class="input-group-label">
           {{ $t('CONVERSATION.REPLYBOX.EMAIL_HEAD.TO') }}
         </label>
-        <div class="input-group-field">
+        <div class="rounded-none flex-1 min-w-0 m-0 whitespace-nowrap">
           <woot-input
             v-model.trim="$v.toEmailsVal.$model"
             type="text"
+            class="[&>input]:mb-0 [&>input]:border-transparent [&>input]:h-8 [&>input]:text-sm [&>input]:!border-0 [&>input]:border-none"
             :class="{ error: $v.toEmailsVal.$error }"
             :placeholder="$t('CONVERSATION.REPLYBOX.EMAIL_HEAD.CC.PLACEHOLDER')"
             @blur="onBlur"
@@ -21,9 +22,10 @@
         <label class="input-group-label">
           {{ $t('CONVERSATION.REPLYBOX.EMAIL_HEAD.CC.LABEL') }}
         </label>
-        <div class="input-group-field">
+        <div class="rounded-none flex-1 min-w-0 m-0 whitespace-nowrap">
           <woot-input
             v-model.trim="$v.ccEmailsVal.$model"
+            class="[&>input]:mb-0 [&>input]:border-transparent [&>input]:h-8 [&>input]:text-sm [&>input]:!border-0 [&>input]:border-none"
             type="text"
             :class="{ error: $v.ccEmailsVal.$error }"
             :placeholder="$t('CONVERSATION.REPLYBOX.EMAIL_HEAD.CC.PLACEHOLDER')"
@@ -48,10 +50,11 @@
         <label class="input-group-label">
           {{ $t('CONVERSATION.REPLYBOX.EMAIL_HEAD.BCC.LABEL') }}
         </label>
-        <div class="input-group-field">
+        <div class="rounded-none flex-1 min-w-0 m-0 whitespace-nowrap">
           <woot-input
             v-model.trim="$v.bccEmailsVal.$model"
             type="text"
+            class="[&>input]:mb-0 [&>input]:border-transparent [&>input]:h-8 [&>input]:text-sm [&>input]:!border-0 [&>input]:border-none"
             :class="{ error: $v.bccEmailsVal.$error }"
             :placeholder="
               $t('CONVERSATION.REPLYBOX.EMAIL_HEAD.BCC.PLACEHOLDER')
@@ -150,14 +153,11 @@ export default {
   @apply text-sm text-red-500 dark:text-red-500;
 }
 .input-group {
-  @apply border-b border-solid border-slate-75 dark:border-slate-700 my-1;
+  @apply border-b border-solid border-slate-75 dark:border-slate-700 my-1 flex items-center gap-2;
 
   .input-group-label {
     @apply border-transparent bg-transparent text-xs font-semibold pl-0;
   }
-  .input-group-field::v-deep input {
-    @apply mb-0 border-transparent;
-  }
 }
 
 .input-group.error {
diff --git a/app/javascript/dashboard/components/widgets/conversation/WhatsappTemplates/TemplatesPicker.vue b/app/javascript/dashboard/components/widgets/conversation/WhatsappTemplates/TemplatesPicker.vue
index eba064f36..7f0077f4b 100644
--- a/app/javascript/dashboard/components/widgets/conversation/WhatsappTemplates/TemplatesPicker.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/WhatsappTemplates/TemplatesPicker.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="w-full">
-    <div class="templates__list-search">
+    <div class="templates__list-search gap-1">
       <fluent-icon icon="search" class="search-icon" size="16" />
       <input
         ref="search"
@@ -17,7 +17,7 @@
           @click="$emit('onSelect', template)"
         >
           <div>
-            <div class="flex-between">
+            <div class="flex items-center justify-between mb-2.5">
               <p class="label-title">
                 {{ template.name }}
               </p>
@@ -97,10 +97,6 @@ export default {
 </script>
 
 <style scoped lang="scss">
-.flex-between {
-  @apply flex justify-between mb-2.5;
-}
-
 .templates__list-search {
   @apply items-center flex bg-slate-25 dark:bg-slate-900 mb-2.5 py-0 px-2.5 rounded-md border border-solid border-slate-100 dark:border-slate-700;
 
@@ -109,7 +105,7 @@ export default {
   }
 
   .templates__search-input {
-    @apply bg-transparent border-0 text-xs h-auto m-0;
+    @apply bg-transparent border-0 text-xs h-9 m-0;
   }
 }
 .template__list-container {
diff --git a/app/javascript/dashboard/components/widgets/conversation/bubble/File.vue b/app/javascript/dashboard/components/widgets/conversation/bubble/File.vue
index 5861e0df1..d5e0375cd 100644
--- a/app/javascript/dashboard/components/widgets/conversation/bubble/File.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/bubble/File.vue
@@ -4,7 +4,7 @@
       <fluent-icon icon="document" class="file--icon" size="32" />
     </div>
     <div class="meta">
-      <h5 class="text-block-title">
+      <h5 class="attachment-name text-slate-700 dark:text-slate-400">
         {{ decodeURI(fileName) }}
       </h5>
       <a
@@ -62,7 +62,7 @@ export default {
     margin-right: $space-slab;
   }
 
-  .text-block-title {
+  .attachment-name {
     margin: 0;
     color: $color-white;
     font-weight: $font-weight-bold;
diff --git a/app/javascript/dashboard/components/widgets/conversation/bubble/Location.vue b/app/javascript/dashboard/components/widgets/conversation/bubble/Location.vue
index 63bac79c4..3b8fcbaa0 100644
--- a/app/javascript/dashboard/components/widgets/conversation/bubble/Location.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/bubble/Location.vue
@@ -5,7 +5,7 @@
     </div>
     <div class="meta">
       <h5
-        class="text-block-title overflow-hidden whitespace-nowrap text-ellipsis"
+        class="text-sm text-slate-800 dark:text-slate-100 overflow-hidden whitespace-nowrap text-ellipsis"
       >
         {{ name }}
       </h5>
diff --git a/app/javascript/dashboard/components/widgets/conversation/bubble/TranslateModal.vue b/app/javascript/dashboard/components/widgets/conversation/bubble/TranslateModal.vue
index c7c92a164..94a24e575 100644
--- a/app/javascript/dashboard/components/widgets/conversation/bubble/TranslateModal.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/bubble/TranslateModal.vue
@@ -5,11 +5,11 @@
     show
     :on-close="onClose"
   >
-    <div class="column content">
+    <div class="content">
       <p>
         <b>{{ $t('TRANSLATE_MODAL.ORIGINAL_CONTENT') }}</b>
       </p>
-      <p v-dompurify-html="content" />
+      <p v-dompurify-html="content" class="mb-0" />
       <br />
       <hr />
       <div v-if="translationsAvailable">
diff --git a/app/javascript/dashboard/components/widgets/conversation/components/GalleryView.vue b/app/javascript/dashboard/components/widgets/conversation/components/GalleryView.vue
index 48f9fbd37..2b324527e 100644
--- a/app/javascript/dashboard/components/widgets/conversation/components/GalleryView.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/components/GalleryView.vue
@@ -20,9 +20,7 @@
           <div
             class="flex items-start flex-col justify-center ml-2 rtl:ml-0 rtl:mr-2"
           >
-            <h3
-              class="sub-block-title inline-block leading-[1.4] m-0 p-0 capitalize"
-            >
+            <h3 class="text-base inline-block leading-[1.4] m-0 p-0 capitalize">
               <span
                 class="text-slate-800 dark:text-slate-100 overflow-hidden whitespace-nowrap text-ellipsis"
               >
@@ -37,7 +35,7 @@
           </div>
         </div>
         <div
-          class="items-center text-slate-700 dark:text-slate-100 flex font-semibold justify-start min-w-0 p-1 w-auto text-block-title"
+          class="items-center text-slate-700 dark:text-slate-100 flex font-semibold justify-start min-w-0 p-1 w-auto text-sm"
         >
           <span
             class="text-slate-700 dark:text-slate-100 overflow-hidden whitespace-nowrap text-ellipsis"
@@ -147,7 +145,7 @@
       </div>
       <div class="items-center flex h-16 justify-center w-full py-2 px-6">
         <div
-          class="items-center rounded-sm flex font-semibold justify-center min-w-[5rem] p-1 bg-slate-25 dark:bg-slate-800 text-slate-600 dark:text-slate-200 text-block-title"
+          class="items-center rounded-sm flex font-semibold justify-center min-w-[5rem] p-1 bg-slate-25 dark:bg-slate-800 text-slate-600 dark:text-slate-200 text-sm"
         >
           <span class="count">
             {{ `${activeImageIndex + 1} / ${allAttachments.length}` }}
diff --git a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/AgentSelector.vue b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/AgentSelector.vue
index 04ddc8f2a..1a4b4febe 100644
--- a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/AgentSelector.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/AgentSelector.vue
@@ -5,7 +5,7 @@
         <path d="M20 12l-8-8-12 12" fill-rule="evenodd" stroke-width="1px" />
       </svg>
     </div>
-    <div class="header flex-between">
+    <div class="header flex items-center justify-between">
       <span>{{ $t('BULK_ACTION.AGENT_SELECT_LABEL') }}</span>
       <woot-button
         size="tiny"
@@ -26,7 +26,9 @@
       <div v-else class="agent__list-container">
         <ul v-if="!selectedAgent">
           <li class="search-container">
-            <div class="agent-list-search flex-between">
+            <div
+              class="agent-list-search h-8 flex justify-between items-center gap-2"
+            >
               <fluent-icon icon="search" class="search-icon" size="16" />
               <input
                 ref="search"
@@ -45,7 +47,9 @@
                 :username="agent.name"
                 size="22px"
               />
-              <span class="reports-option__title">{{ agent.name }}</span>
+              <span class="my-0 text-slate-800 dark:text-slate-75">
+                {{ agent.name }}
+              </span>
             </div>
           </li>
         </ul>
@@ -205,7 +209,7 @@ export default {
       }
 
       .agent--search_input {
-        @apply border-0 text-xs m-0 dark:bg-transparent bg-transparent h-[unset];
+        @apply border-0 text-xs m-0 dark:bg-transparent bg-transparent h-[unset] w-full;
       }
     }
   }
@@ -231,7 +235,7 @@ ul {
 }
 
 .agent-list-item {
-  @apply flex items-center p-2.5 cursor-pointer hover:bg-slate-50 dark:hover:bg-slate-900;
+  @apply flex items-center p-2.5 gap-2 cursor-pointer hover:bg-slate-50 dark:hover:bg-slate-900;
   span {
     @apply text-sm;
   }
diff --git a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/Index.vue b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/Index.vue
index a1e2bae48..699a42f57 100644
--- a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/Index.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/Index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="bulk-action__container">
-    <div class="flex-between">
-      <label class="bulk-action__panel flex-between">
+    <div class="flex items-center justify-between">
+      <label class="bulk-action__panel flex items-center justify-between">
         <input
           ref="selectAllCheck"
           type="checkbox"
@@ -18,14 +18,13 @@
           }}
         </span>
       </label>
-      <div class="bulk-action__actions flex-between">
+      <div class="bulk-action__actions flex gap-1 items-center">
         <woot-button
           v-tooltip="$t('BULK_ACTION.LABELS.ASSIGN_LABELS')"
           size="tiny"
           variant="smooth"
           color-scheme="secondary"
           icon="tag"
-          class="margin-right-smaller"
           @click="toggleLabelActions"
         />
         <woot-button
@@ -34,7 +33,6 @@
           variant="smooth"
           color-scheme="secondary"
           icon="repeat"
-          class="margin-right-smaller"
           @click="toggleUpdateActions"
         />
         <woot-button
@@ -43,7 +41,6 @@
           variant="smooth"
           color-scheme="secondary"
           icon="person-assign"
-          class="margin-right-smaller"
           @click="toggleAgentList"
         />
         <woot-button
diff --git a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/LabelActions.vue b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/LabelActions.vue
index 0ae52b044..5118ec69c 100644
--- a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/LabelActions.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/LabelActions.vue
@@ -5,7 +5,7 @@
         <path d="M20 12l-8-8-12 12" fill-rule="evenodd" stroke-width="1px" />
       </svg>
     </div>
-    <div class="header flex-between">
+    <div class="header flex items-center justify-between">
       <span>{{ $t('BULK_ACTION.LABELS.ASSIGN_LABELS') }}</span>
       <woot-button
         size="tiny"
@@ -17,7 +17,9 @@
     </div>
     <div class="labels-list">
       <header class="labels-list__header">
-        <div class="label-list-search flex-between">
+        <div
+          class="label-list-search h-8 flex justify-between items-center gap-2"
+        >
           <fluent-icon icon="search" class="search-icon" size="16" />
           <input
             ref="search"
@@ -138,7 +140,7 @@ export default {
   }
 
   .label--search_input {
-    @apply border-0 text-xs m-0 dark:bg-transparent bg-transparent h-[unset];
+    @apply border-0 text-xs m-0 dark:bg-transparent bg-transparent h-[unset] w-full;
   }
 }
 
diff --git a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/TeamActions.vue b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/TeamActions.vue
index 132708af1..bd02306e6 100644
--- a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/TeamActions.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/TeamActions.vue
@@ -5,7 +5,7 @@
         <path d="M20 12l-8-8-12 12" fill-rule="evenodd" stroke-width="1px" />
       </svg>
     </div>
-    <div class="header flex-between">
+    <div class="header flex items-center justify-between">
       <span>{{ $t('BULK_ACTION.TEAMS.TEAM_SELECT_LABEL') }}</span>
       <woot-button
         size="tiny"
@@ -19,7 +19,9 @@
       <div class="team__list-container">
         <ul>
           <li class="search-container">
-            <div class="agent-list-search flex-between">
+            <div
+              class="agent-list-search h-8 flex justify-between items-center gap-2"
+            >
               <fluent-icon icon="search" class="search-icon" size="16" />
               <input
                 ref="search"
@@ -33,15 +35,21 @@
           <template v-if="filteredTeams.length">
             <li v-for="team in filteredTeams" :key="team.id">
               <div class="team__list-item" @click="assignTeam(team)">
-                <span class="reports-option__title">{{ team.name }}</span>
+                <span
+                  class="my-0 ltr:ml-2 rtl:mr-2 text-slate-800 dark:text-slate-75"
+                >
+                  {{ team.name }}
+                </span>
               </div>
             </li>
           </template>
           <li v-else>
             <div class="team__list-item">
-              <span class="reports-option__title">{{
-                $t('BULK_ACTION.TEAMS.NO_TEAMS_AVAILABLE')
-              }}</span>
+              <span
+                class="my-0 ltr:ml-2 rtl:mr-2 text-slate-800 dark:text-slate-75"
+              >
+                {{ $t('BULK_ACTION.TEAMS.NO_TEAMS_AVAILABLE') }}
+              </span>
             </div>
           </li>
         </ul>
@@ -106,7 +114,7 @@ export default {
       }
 
       .agent--search_input {
-        @apply border-0 text-xs m-0 dark:bg-transparent bg-transparent h-[unset];
+        @apply border-0 text-xs m-0 dark:bg-transparent bg-transparent w-full h-[unset];
       }
     }
   }
diff --git a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/UpdateActions.vue b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/UpdateActions.vue
index 543ece9a6..38e13ac30 100644
--- a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/UpdateActions.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/UpdateActions.vue
@@ -5,7 +5,7 @@
         <path d="M20 12l-8-8-12 12" fill-rule="evenodd" stroke-width="1px" />
       </svg>
     </div>
-    <div class="header flex-between">
+    <div class="header flex items-center justify-between">
       <span>{{ $t('BULK_ACTION.UPDATE.CHANGE_STATUS') }}</span>
       <woot-button
         size="tiny"
diff --git a/app/javascript/dashboard/components/widgets/conversation/conversationCardComponents/CardLabels.vue b/app/javascript/dashboard/components/widgets/conversation/conversationCardComponents/CardLabels.vue
index cb480599e..a2e72caed 100644
--- a/app/javascript/dashboard/components/widgets/conversation/conversationCardComponents/CardLabels.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/conversationCardComponents/CardLabels.vue
@@ -5,7 +5,7 @@
     class="label-container mt-0.5 mx-2 mb-0"
   >
     <div
-      class="labels-wrap flex items-end min-w-0 flex-shrink"
+      class="labels-wrap flex items-end min-w-0 flex-shrink gap-y-1 flex-wrap"
       :class="{ expand: showAllLabels }"
     >
       <woot-label
@@ -15,6 +15,7 @@
         :description="label.description"
         :color="label.color"
         variant="smooth"
+        class="!mb-0 max-w-[calc(100%-0.5rem)]"
         small
         :class="{ hidden: !showAllLabels && index > labelPosition }"
       />
@@ -96,23 +97,11 @@ export default {
 .labels-wrap {
   &.expand {
     @apply h-auto overflow-visible flex-row flex-wrap;
-
-    .label {
-      @apply mb-1;
-    }
-
-    .show-more--button {
-      @apply mb-1;
-    }
   }
 
   .secondary {
     @apply border border-solid border-slate-100 dark:border-slate-700;
   }
-
-  .label {
-    @apply mb-0;
-  }
 }
 
 .hidden {
diff --git a/app/javascript/dashboard/components/widgets/forms/Input.vue b/app/javascript/dashboard/components/widgets/forms/Input.vue
index 1ad144414..92023b918 100644
--- a/app/javascript/dashboard/components/widgets/forms/Input.vue
+++ b/app/javascript/dashboard/components/widgets/forms/Input.vue
@@ -3,7 +3,6 @@
     <span v-if="label">{{ label }}</span>
     <input
       class="bg-white dark:bg-slate-900 text-slate-900 dark:text-slate-100 border-slate-200 dark:border-slate-600"
-      :class="{ 'input-margin': error }"
       :value="value"
       :type="type"
       :placeholder="placeholder"
@@ -70,9 +69,6 @@ export default {
   @apply mt-0.5 text-xs not-italic text-slate-600 dark:text-slate-400;
 }
 
-.input-margin {
-  margin-bottom: 2px !important;
-}
 .message {
   margin-top: 0 !important;
 }
diff --git a/app/javascript/dashboard/components/widgets/forms/PhoneInput.vue b/app/javascript/dashboard/components/widgets/forms/PhoneInput.vue
index d4fb3c2e7..78409fe65 100644
--- a/app/javascript/dashboard/components/widgets/forms/PhoneInput.vue
+++ b/app/javascript/dashboard/components/widgets/forms/PhoneInput.vue
@@ -13,7 +13,7 @@
       </div>
       <span
         v-if="activeDialCode"
-        class="flex bg-white dark:bg-slate-900 text-slate-800 dark:text-slate-100 font-normal text-base leading-normal py-2 pl-2 pr-0"
+        class="flex bg-white dark:bg-slate-900 font-medium text-slate-800 dark:text-slate-100 font-normal text-base leading-normal py-2 pl-2 pr-0"
       >
         {{ activeDialCode }}
       </span>
@@ -254,7 +254,7 @@ export default {
 <style scoped lang="scss">
 .phone-input--wrap {
   .phone-input {
-    @apply flex items-center justify-start mb-4 rounded-md border border-solid border-slate-200 dark:border-slate-600;
+    @apply flex items-center dark:bg-slate-900 justify-start mb-4 rounded-md border border-solid border-slate-200 dark:border-slate-600;
 
     &.has-error {
       @apply border border-solid border-red-400 dark:border-red-400;
@@ -262,7 +262,11 @@ export default {
   }
 
   .phone-input--field {
-    @apply mb-0 rounded-tl-none rounded-bl-none border-0;
+    @apply mb-0 rounded-tl-none rounded-bl-none border-0 w-full dark:bg-slate-900 text-base px-1.5;
+
+    &::placeholder {
+      @apply font-normal;
+    }
   }
 
   .country-dropdown {
diff --git a/app/javascript/dashboard/components/widgets/modal/ConfirmationModal.vue b/app/javascript/dashboard/components/widgets/modal/ConfirmationModal.vue
index 0268b8d14..63765acc0 100644
--- a/app/javascript/dashboard/components/widgets/modal/ConfirmationModal.vue
+++ b/app/javascript/dashboard/components/widgets/modal/ConfirmationModal.vue
@@ -64,8 +64,3 @@ export default {
   },
 };
 </script>
-<style lang="scss" scoped>
-.modal-container .modal-footer {
-  padding: var(--space-normal) var(--space-medium);
-}
-</style>
diff --git a/app/javascript/dashboard/components/widgets/modal/DeleteModal.vue b/app/javascript/dashboard/components/widgets/modal/DeleteModal.vue
index 8241889f5..5dbc440d5 100644
--- a/app/javascript/dashboard/components/widgets/modal/DeleteModal.vue
+++ b/app/javascript/dashboard/components/widgets/modal/DeleteModal.vue
@@ -6,7 +6,7 @@
       :header-content="message"
       :header-content-value="messageValue"
     />
-    <div class="modal-footer delete-item">
+    <div class="flex justify-end items-center gap-2 p-8">
       <woot-button variant="clear" class="action-button" @click="onClose">
         {{ rejectText }}
       </woot-button>
diff --git a/app/javascript/dashboard/modules/contact/components/ContactAttribute.vue b/app/javascript/dashboard/modules/contact/components/ContactAttribute.vue
index 9b7db2eb3..5dcfd568a 100644
--- a/app/javascript/dashboard/modules/contact/components/ContactAttribute.vue
+++ b/app/javascript/dashboard/modules/contact/components/ContactAttribute.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="contact-attribute">
     <div class="title-wrap">
-      <h4 class="text-block-title title">
+      <h4 class="text-sm title">
         <div class="title--icon">
           <emoji-or-icon :icon="icon" :emoji="emoji" />
         </div>
@@ -9,17 +9,22 @@
       </h4>
     </div>
     <div v-show="isEditing">
-      <div class="input-group small">
+      <div class="mb-2 w-full flex items-center">
         <input
           ref="inputfield"
           v-model="editedValue"
           type="text"
-          class="input-group-field"
+          class="!h-8 ltr:rounded-r-none rtl:rounded-l-none !mb-0 !text-sm"
           autofocus="true"
           @keyup.enter="onUpdate"
         />
-        <div class="input-group-button">
-          <woot-button size="small" icon="ion-checkmark" @click="onUpdate" />
+        <div>
+          <woot-button
+            size="small"
+            icon="ion-checkmark"
+            class="rounded-l-none rtl:rounded-r-none"
+            @click="onUpdate"
+          />
         </div>
       </div>
     </div>
diff --git a/app/javascript/dashboard/modules/contact/components/ContactFields.vue b/app/javascript/dashboard/modules/contact/components/ContactFields.vue
index da13f0175..b600b3185 100644
--- a/app/javascript/dashboard/modules/contact/components/ContactFields.vue
+++ b/app/javascript/dashboard/modules/contact/components/ContactFields.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="contact-fields">
-    <h3 class="block-title title">
+    <h3 class="text-lg title">
       {{ $t('CONTACTS_PAGE.FIELDS') }}
     </h3>
     <attribute
diff --git a/app/javascript/dashboard/modules/contact/components/ContactIntro.vue b/app/javascript/dashboard/modules/contact/components/ContactIntro.vue
index 05196c694..3d1b7222a 100644
--- a/app/javascript/dashboard/modules/contact/components/ContactIntro.vue
+++ b/app/javascript/dashboard/modules/contact/components/ContactIntro.vue
@@ -8,10 +8,10 @@
     />
 
     <div class="contact--details">
-      <h2 class="block-title contact--name">
+      <h2 class="text-lg contact--name">
         {{ contact.name }}
       </h2>
-      <h3 class="sub-block-title contact--work">
+      <h3 class="text-base contact--work">
         {{ contact.title }}
         <i v-if="company.name" class="icon ion-minus-round" />
         <span class="company-name">{{ company.name }}</span>
diff --git a/app/javascript/dashboard/modules/contact/components/MergeContact.vue b/app/javascript/dashboard/modules/contact/components/MergeContact.vue
index 30c1adb04..8f09a4754 100644
--- a/app/javascript/dashboard/modules/contact/components/MergeContact.vue
+++ b/app/javascript/dashboard/modules/contact/components/MergeContact.vue
@@ -102,7 +102,7 @@
       :primary-contact-name="primaryContact.name"
       :parent-contact-name="parentContactName"
     />
-    <div class="mt-6 flex justify-end">
+    <div class="mt-6 flex gap-2 justify-end">
       <woot-button variant="clear" @click.prevent="onCancel">
         {{ $t('MERGE_CONTACTS.FORM.CANCEL') }}
       </woot-button>
diff --git a/app/javascript/dashboard/modules/notes/components/NoteList.vue b/app/javascript/dashboard/modules/notes/components/NoteList.vue
index 1e39324c6..6061fc769 100644
--- a/app/javascript/dashboard/modules/notes/components/NoteList.vue
+++ b/app/javascript/dashboard/modules/notes/components/NoteList.vue
@@ -12,11 +12,11 @@
       @delete="onDeleteNote"
     />
 
-    <div v-if="isFetching" class="text-center p-normal fs-default">
+    <div v-if="isFetching" class="text-center p-4 text-base">
       <spinner size="" />
       <span>{{ $t('NOTES.FETCHING_NOTES') }}</span>
     </div>
-    <div v-else-if="!notes.length" class="text-center p-normal fs-default">
+    <div v-else-if="!notes.length" class="text-center p-4 text-base">
       <span>{{ $t('NOTES.NOT_AVAILABLE') }}</span>
     </div>
   </div>
diff --git a/app/javascript/dashboard/modules/search/components/SearchHeader.vue b/app/javascript/dashboard/modules/search/components/SearchHeader.vue
index c587b882b..c828f8b0a 100644
--- a/app/javascript/dashboard/modules/search/components/SearchHeader.vue
+++ b/app/javascript/dashboard/modules/search/components/SearchHeader.vue
@@ -6,6 +6,7 @@
     <input
       ref="searchInput"
       type="search"
+      class="dark:bg-slate-900"
       :placeholder="$t('SEARCH.INPUT_PLACEHOLDER')"
       :value="searchQuery"
       @focus="onFocus"
@@ -73,7 +74,7 @@ export default {
 <style lang="scss" scoped>
 .input-container {
   transition: border-bottom 0.2s ease-in-out;
-  @apply relative flex items-center py-2 px-4 rounded-sm border border-solid border-slate-100 dark:border-slate-800;
+  @apply relative flex items-center py-2 px-4 h-14 gap-2 rounded-sm border border-solid border-slate-100 dark:border-slate-800;
 
   input[type='search'] {
     @apply w-full m-0 shadow-none border-transparent active:border-transparent active:shadow-none hover:border-transparent hover:shadow-none focus:border-transparent focus:shadow-none;
@@ -96,6 +97,6 @@ export default {
 }
 
 .helper-label {
-  @apply m-0;
+  @apply m-0 whitespace-nowrap;
 }
 </style>
diff --git a/app/javascript/dashboard/modules/search/components/SearchInput.vue b/app/javascript/dashboard/modules/search/components/SearchInput.vue
index 20bc2c15b..cfddfcfe6 100644
--- a/app/javascript/dashboard/modules/search/components/SearchInput.vue
+++ b/app/javascript/dashboard/modules/search/components/SearchInput.vue
@@ -8,7 +8,9 @@
     >
       <div class="search-input">
         <fluent-icon icon="search" size="14px" class="search--icon" />
-        <span class="text-ellipsis search-placeholder">
+        <span
+          class="text-ellipsis overflow-hidden whitespace-nowrap search-placeholder"
+        >
           {{ $t('CONVERSATION.SEARCH_MESSAGES') }}
         </span>
       </div>
diff --git a/app/javascript/dashboard/modules/search/components/SearchResultContactItem.vue b/app/javascript/dashboard/modules/search/components/SearchResultContactItem.vue
index 2a33983fd..1f5266b5d 100644
--- a/app/javascript/dashboard/modules/search/components/SearchResultContactItem.vue
+++ b/app/javascript/dashboard/modules/search/components/SearchResultContactItem.vue
@@ -1,11 +1,13 @@
 <template>
   <router-link :to="navigateTo" class="contact-item">
     <woot-thumbnail :src="thumbnail" :username="name" size="24px" />
-    <div class="contact-details">
-      <h5 class="text-block-title name text-slate-800 dark:text-slate-200">
+    <div class="ml-2 rtl:mr-2 rtl:ml-0">
+      <h5 class="text-sm name text-slate-800 dark:text-slate-200">
         {{ name }}
       </h5>
-      <p class="details-meta">
+      <p
+        class="m-0 text-slate-600 dark:text-slate-200 gap-1 text-sm flex items-center"
+      >
         <span v-if="email" class="email text-slate-800 dark:text-slate-200">{{
           email
         }}</span>
@@ -64,14 +66,4 @@ export default {
 .contact-details {
   @apply ml-2 rtl:mr-2 rtl:ml-0;
 }
-.name {
-  @apply m-0;
-}
-.details-meta {
-  @apply m-0 text-slate-600 dark:text-slate-200 text-sm flex items-center;
-
-  span {
-    @apply ml-1 rtl:mr-1 rtl:ml-0;
-  }
-}
 </style>
diff --git a/app/javascript/dashboard/modules/search/components/SearchResultConversationItem.vue b/app/javascript/dashboard/modules/search/components/SearchResultConversationItem.vue
index eea60fcb9..52ef356be 100644
--- a/app/javascript/dashboard/modules/search/components/SearchResultConversationItem.vue
+++ b/app/javascript/dashboard/modules/search/components/SearchResultConversationItem.vue
@@ -5,7 +5,7 @@
     </div>
     <div class="conversation-details">
       <div class="meta-wrap">
-        <div class="flex-container">
+        <div class="flex">
           <woot-label
             class="conversation-id"
             :title="`#${id}`"
@@ -21,16 +21,13 @@
         </div>
       </div>
       <div class="user-details">
-        <h5
-          v-if="name"
-          class="text-block-title name text-slate-800 dark:text-slate-100"
-        >
+        <h5 v-if="name" class="text-sm name text-slate-800 dark:text-slate-100">
           <span class="pre-text"> {{ $t('SEARCH.FROM') }}: </span>
           {{ name }}
         </h5>
         <h5
           v-if="email"
-          class="text-block-title email text-slate-700 dark:text-slate-200 overflow-hidden whitespace-nowrap text-ellipsis"
+          class="text-sm email text-slate-700 dark:text-slate-200 overflow-hidden whitespace-nowrap text-ellipsis"
         >
           <span class="pre-text">{{ $t('SEARCH.EMAIL') }}:</span>
           {{ email }}
diff --git a/app/javascript/dashboard/modules/widget-preview/components/WidgetHead.vue b/app/javascript/dashboard/modules/widget-preview/components/WidgetHead.vue
index 3f2b05555..e59a00488 100644
--- a/app/javascript/dashboard/modules/widget-preview/components/WidgetHead.vue
+++ b/app/javascript/dashboard/modules/widget-preview/components/WidgetHead.vue
@@ -60,7 +60,7 @@ export default {
       align-items: center;
       display: flex;
       flex-direction: row;
-      justify-content: start;
+      justify-content: flex-start;
 
       .logo {
         border-radius: 100%;
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactInfoPanel.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactInfoPanel.vue
index 4dd28e4f7..d87615909 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactInfoPanel.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactInfoPanel.vue
@@ -1,7 +1,7 @@
 <template>
   <div
-    class="w-[25%] bg-white dark:bg-slate-900 contact--panel"
-    :class="{ 'border-left': showAvatar }"
+    class="w-1/4 bg-white dark:bg-slate-900 border-slate-50 dark:border-slate-800/50 h-full text-sm overflow-y-auto relative"
+    :class="showAvatar ? 'border-l border-solid ' : 'border-r border-solid'"
   >
     <contact-info
       :show-close-button="showCloseButton"
@@ -151,9 +151,6 @@ export default {
     @apply pb-3 mb-4;
   }
 }
-.contact--panel {
-  @apply border-r border-slate-50 dark:border-slate-800/50 h-full text-sm overflow-y-auto relative;
-}
 
 .list-group {
   .list-group-item {
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsTable.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsTable.vue
index 975277f44..6c00f9901 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsTable.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsTable.vue
@@ -135,7 +135,7 @@ export default {
                   status={row.availability_status}
                 />
                 <div class="user-block">
-                  <h6 class="sub-block-title overflow-hidden whitespace-nowrap text-ellipsis">
+                  <h6 class="text-base overflow-hidden whitespace-nowrap text-ellipsis">
                     <router-link
                       to={`/app/accounts/${this.$route.params.accountId}/contacts/${row.id}`}
                       class="user-name"
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/SectionHeader.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/SectionHeader.vue
index 6631dc457..a9e6c8cdb 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/SectionHeader.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/SectionHeader.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="wrap">
     <div class="header">
-      <h5 class="block-title text-black-900 dark:text-slate-200">
+      <h5 class="text-lg text-black-900 dark:text-slate-200">
         {{ $t('EVENTS.HEADER.TITLE') }}
       </h5>
     </div>
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/TimelineCard.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/TimelineCard.vue
index a7f74fe58..37876a62c 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/TimelineCard.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/TimelineCard.vue
@@ -6,7 +6,7 @@
     <div class="card-wrap">
       <div class="header">
         <div class="text-wrap">
-          <h6 class="text-block-title">
+          <h6 class="text-sm">
             {{ eventType }}
           </h6>
           <span class="event-path">on {{ eventPath }}</span>
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/pages/ContactManageView.vue b/app/javascript/dashboard/routes/dashboard/contacts/pages/ContactManageView.vue
index 0b7311fbe..a6f44ac6b 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/pages/ContactManageView.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/pages/ContactManageView.vue
@@ -30,7 +30,7 @@
           :show-avatar="false"
           :contact="contact"
         />
-        <div class="w-[75%] h-full">
+        <div class="w-3/4 h-full">
           <woot-tabs :index="selectedTabIndex" @change="onClickTabChange">
             <woot-tabs-item
               v-for="tab in tabs"
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/ConversationParticipant.vue b/app/javascript/dashboard/routes/dashboard/conversation/ConversationParticipant.vue
index 87a86afbc..2daf16c3f 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/ConversationParticipant.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/ConversationParticipant.vue
@@ -7,7 +7,7 @@
             <spinner v-if="watchersUiFlas.isFetching" size="tiny" />
             {{ totalWatchersText }}
           </p>
-          <p v-else class="text-muted m-0 text-sm">
+          <p v-else class="text-slate-400 dark:text-slate-700 m-0 text-sm">
             {{ $t('CONVERSATION_PARTICIPANTS.NO_PARTICIPANTS_TEXT') }}
           </p>
         </div>
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/Macros/MacroItem.vue b/app/javascript/dashboard/routes/dashboard/conversation/Macros/MacroItem.vue
index f8dfea7f4..9a1883a24 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/Macros/MacroItem.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/Macros/MacroItem.vue
@@ -3,14 +3,13 @@
     <span class="overflow-hidden whitespace-nowrap text-ellipsis">{{
       macro.name
     }}</span>
-    <div class="macros-actions">
+    <div class="macros-actions flex items-center gap-1">
       <woot-button
         v-tooltip.left-start="$t('MACROS.EXECUTE.PREVIEW')"
         size="tiny"
         variant="smooth"
         color-scheme="secondary"
         icon="info"
-        class="margin-right-smaller"
         @click="toggleMacroPreview(macro)"
       />
       <woot-button
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactForm.vue b/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactForm.vue
index c33a09d76..bbe545a3d 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactForm.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactForm.vue
@@ -1,6 +1,6 @@
 <template>
   <form
-    class="contact--form w-full pt-6 px-8 pb-8"
+    class="w-full px-8 pt-6 pb-8 contact--form"
     @submit.prevent="handleSubmit"
   >
     <div>
@@ -76,7 +76,7 @@
         </label>
         <div
           v-if="isPhoneNumberNotValid || !phoneNumber"
-          class="callout small warning text-sm dark:bg-yellow-200/20 dark:text-yellow-400"
+          class="relative mx-0 mt-0 mb-2.5 p-2 rounded-md text-sm border border-solid border-yellow-500 text-yellow-700 dark:border-yellow-700 bg-yellow-200/60 dark:bg-yellow-200/20 dark:text-yellow-400"
         >
           {{ $t('CONTACT_FORM.FORM.PHONE_NUMBER.HELP') }}
         </div>
@@ -121,17 +121,20 @@
       <div
         v-for="socialProfile in socialProfileKeys"
         :key="socialProfile.key"
-        class="input-group"
+        class="flex items-stretch w-full mb-4"
       >
-        <span class="input-group-label">{{ socialProfile.prefixURL }}</span>
+        <span
+          class="flex items-center h-10 px-2 text-sm border-solid bg-slate-50 border-y ltr:border-l rtl:border-r ltr:rounded-l-md rtl:rounded-r-md dark:bg-slate-700 text-slate-800 dark:text-slate-100 border-slate-200 dark:border-slate-600"
+          >{{ socialProfile.prefixURL }}</span
+        >
         <input
           v-model="socialProfileUserNames[socialProfile.key]"
-          class="input-group-field"
+          class="input-group-field ltr:rounded-l-none rtl:rounded-r-none !mb-0"
           type="text"
         />
       </div>
     </div>
-    <div class="flex flex-row justify-end gap-2 py-2 px-0 w-full">
+    <div class="flex flex-row justify-end w-full gap-2 px-0 py-2">
       <div class="w-full">
         <woot-submit-button
           :loading="inProgress"
@@ -416,10 +419,6 @@ export default {
 </script>
 
 <style scoped lang="scss">
-.input-group-label {
-  @apply text-sm bg-slate-50 dark:bg-slate-700 text-slate-800 dark:text-slate-100 border-slate-200 dark:border-slate-600;
-}
-
 ::v-deep {
   .multiselect .multiselect__tags .multiselect__single {
     @apply pl-0;
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue b/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue
index ad2ea5d25..b35f8ba3a 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="relative items-center p-4 bg-white dark:bg-slate-900">
-    <div class="text-left rtl:text-right">
+    <div class="text-left rtl:text-right flex flex-col gap-2">
       <div class="flex justify-between flex-row">
         <thumbnail
           v-if="showAvatar"
@@ -17,10 +17,10 @@
         />
       </div>
 
-      <div class="mt-2 w-full">
-        <div v-if="showAvatar" class="flex items-start mb-2 gap-1.5">
+      <div class="flex flex-col items-start gap-1.5 min-w-0 w-full">
+        <div v-if="showAvatar" class="flex items-start gap-2 min-w-0 w-full">
           <h3
-            class="text-base text-slate-800 dark:text-slate-100 capitalize whitespace-normal my-0"
+            class="flex-shrink min-w-0 text-base text-slate-800 dark:text-slate-100 capitalize my-0 max-w-full break-words"
           >
             {{ contact.name }}
           </h3>
@@ -38,7 +38,7 @@
             />
             <a
               :href="contactProfileLink"
-              class="fs-default"
+              class="text-base"
               target="_blank"
               rel="noopener nofollow noreferrer"
             >
@@ -52,10 +52,10 @@
           </div>
         </div>
 
-        <p v-if="additionalAttributes.description" class="break-words">
+        <p v-if="additionalAttributes.description" class="break-words mb-0.5">
           {{ additionalAttributes.description }}
         </p>
-        <div class="mb-3">
+        <div class="flex flex-col gap-2 items-start">
           <contact-info-row
             :href="contact.email ? `mailto:${contact.email}` : ''"
             :value="contact.email"
@@ -95,7 +95,7 @@
           <social-icons :social-profiles="socialProfiles" />
         </div>
       </div>
-      <div class="flex items-center w-full mt-2 gap-2">
+      <div class="flex items-center w-full mt-0.5 gap-2">
         <woot-button
           v-tooltip="$t('CONTACT_PANEL.NEW_MESSAGE')"
           title="$t('CONTACT_PANEL.NEW_MESSAGE')"
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfoRow.vue b/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfoRow.vue
index 76d706985..ff179004e 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfoRow.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfoRow.vue
@@ -1,15 +1,15 @@
 <template>
-  <div class="-ml-1">
+  <div class="ltr:-ml-1 rtl:-mr-1 h-5">
     <a
       v-if="href"
       :href="href"
-      class="flex items-center mb-2 text-slate-800 dark:text-slate-100 hover:underline"
+      class="flex items-center gap-2 text-slate-800 dark:text-slate-100 hover:underline"
     >
       <emoji-or-icon
         :icon="icon"
         :emoji="emoji"
         icon-size="14"
-        class="mr-2 ml-1 rtl:mr-1 rtl:ml-2"
+        class="ltr:ml-1 rtl:mr-1"
       />
       <span
         v-if="value"
@@ -29,20 +29,20 @@
         size="tiny"
         color-scheme="secondary"
         icon="clipboard"
-        class-names="copy-button"
+        class-names="p-0"
         @click="onCopy"
       />
     </a>
 
     <div
       v-else
-      class="flex items-center mb-2 text-slate-800 dark:text-slate-100"
+      class="flex items-center gap-2 text-slate-800 dark:text-slate-100"
     >
       <emoji-or-icon
         :icon="icon"
         :emoji="emoji"
         icon-size="14"
-        class="mr-2 ml-1 rtl:mr-1 rtl:ml-2"
+        class="ltr:ml-1 rtl:mr-1"
       />
       <span
         v-if="value"
@@ -97,8 +97,3 @@ export default {
   },
 };
 </script>
-<style scoped>
-.copy-button {
-  @apply ml-1 rtl:ml-0 rtl:mr-1;
-}
-</style>
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/contact/ConversationForm.vue b/app/javascript/dashboard/routes/dashboard/conversation/contact/ConversationForm.vue
index 695670455..075fff1d0 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/contact/ConversationForm.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/contact/ConversationForm.vue
@@ -1,7 +1,10 @@
 <template>
   <form class="conversation--form w-full" @submit.prevent="onFormSubmit">
-    <div v-if="showNoInboxAlert" class="callout warning">
-      <p>
+    <div
+      v-if="showNoInboxAlert"
+      class="relative mx-0 mt-0 mb-2.5 p-2 rounded-none text-sm border border-solid border-yellow-500 dark:border-yellow-700 bg-yellow-200/60 dark:bg-yellow-200/20 text-slate-700 dark:text-yellow-400"
+    >
+      <p class="mb-0">
         {{ $t('NEW_CONVERSATION.NO_INBOX') }}
       </p>
     </div>
@@ -226,7 +229,7 @@
         class="flex top-0 bottom-0 z-30 gap-2 right-0 left-0 items-center justify-center flex-col absolute w-full h-full bg-white/80 dark:bg-slate-700/80"
       >
         <fluent-icon icon="cloud-backup" size="40" />
-        <h4 class="page-sub-title text-slate-600 dark:text-slate-200">
+        <h4 class="text-2xl break-words text-slate-600 dark:text-slate-200">
           {{ $t('CONVERSATION.REPLYBOX.DRAG_DROP') }}
         </h4>
       </div>
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/labels/LabelBox.vue b/app/javascript/dashboard/routes/dashboard/conversation/labels/LabelBox.vue
index a92276fa1..48dbb71dd 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/labels/LabelBox.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/labels/LabelBox.vue
@@ -18,6 +18,7 @@
           :show-close="true"
           :color="label.color"
           variant="smooth"
+          class="max-w-[calc(100%-0.5rem)]"
           @click="removeLabelFromConversation"
         />
 
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleItem.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleItem.vue
index 6a4fd17f6..52ece1107 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleItem.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleItem.vue
@@ -40,7 +40,7 @@
     </span>
     <span class="article-column article-category">
       <router-link
-        class="fs-small button clear link secondary"
+        class="text-sm button clear link secondary"
         :to="getCategoryRoute(category.slug)"
       >
         <span
@@ -52,7 +52,7 @@
       </router-link>
     </span>
     <span class="article-column article-read-count">
-      <span class="fs-small" :title="formattedViewCount">
+      <span class="text-sm" :title="formattedViewCount">
         {{ readableViewCount }}
       </span>
     </span>
@@ -67,7 +67,7 @@
       </div>
     </span>
     <span class="article-column article-last-edited">
-      <span class="fs-small">
+      <span class="text-sm">
         {{ lastUpdatedAt }}
       </span>
     </span>
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleSearch/ArticleSearchResultItem.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleSearch/ArticleSearchResultItem.vue
index e603ec917..8ecff430a 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleSearch/ArticleSearchResultItem.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleSearch/ArticleSearchResultItem.vue
@@ -4,7 +4,7 @@
     @click="handlePreview"
   >
     <h4
-      class="text-block-title text-left mb-0 text-slate-900 dark:text-slate-25 px-1 -mx-1 rounded-sm width-auto hover:underline group-hover:underline"
+      class="text-sm text-left mb-0 text-slate-900 dark:text-slate-25 px-1 -mx-1 rounded-sm width-auto hover:underline group-hover:underline"
     >
       {{ title }}
     </h4>
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleSearch/Header.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleSearch/Header.vue
index 26923bfdf..a15159d3c 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleSearch/Header.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleSearch/Header.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="flex flex-col py-1">
-    <div class="flex-container align-middle align-justify py-2">
-      <h3 class="sub-block-title text-slate-900 dark:text-slate-25">
+    <div class="flex align-middle align-justify py-2">
+      <h3 class="text-base text-slate-900 dark:text-slate-25">
         {{ title }}
       </h3>
       <woot-button
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/components/Header/ArticleHeader.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/Header/ArticleHeader.vue
index 401243393..1ae19f292 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/components/Header/ArticleHeader.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/Header/ArticleHeader.vue
@@ -5,7 +5,9 @@
     <div class="flex items-center">
       <woot-sidemenu-icon />
       <div class="flex items-center my-0 mx-2">
-        <h3 class="text-2xl text-slate-800 dark:text-slate-100 mb-0">
+        <h3
+          class="text-2xl text-slate-800 dark:text-slate-100 font-medium mb-0"
+        >
           {{ headerTitle }}
         </h3>
         <span class="text-sm text-slate-600 dark:text-slate-300 my-0 mx-2">{{
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/components/PortalListItemTable.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/PortalListItemTable.vue
index df1baf39d..d07e14271 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/components/PortalListItemTable.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/PortalListItemTable.vue
@@ -85,7 +85,7 @@
             size="tiny"
             variant="smooth"
             icon="delete"
-            color-scheme="secondary"
+            color-scheme="alert"
             :disabled="locale.code === selectedLocaleCode"
             @click="deleteLocale(locale.code)"
           />
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/components/PortalSettingsBasicForm.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/PortalSettingsBasicForm.vue
index 7653d16a9..85c035a2a 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/components/PortalSettingsBasicForm.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/PortalSettingsBasicForm.vue
@@ -1,7 +1,9 @@
 <template>
-  <div class="wizard-body w-[75%] flex-shrink-0 flex-grow-0 max-w-[75%]">
+  <div
+    class="pt-3 bg-white dark:bg-slate-900 h-full border border-solid border-transparent px-6 pb-6 dark:border-transparent w-full max-w-full md:w-3/4 md:max-w-[75%] flex-shrink-0 flex-grow-0"
+  >
     <div class="w-full">
-      <h3 class="block-title text-black-900 dark:text-slate-200">
+      <h3 class="text-lg text-black-900 dark:text-slate-200">
         {{
           $t(
             'HELP_CENTER.PORTAL.ADD.CREATE_FLOW_PAGE.BASIC_SETTINGS_PAGE.TITLE'
@@ -75,7 +77,7 @@
         </div>
       </div>
     </div>
-    <div class="flex-end">
+    <div class="flex justify-end">
       <woot-button
         :is-loading="isSubmitting"
         :is-disabled="$v.$invalid"
@@ -243,10 +245,6 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.wizard-body {
-  @apply pt-3 border border-solid border-transparent dark:border-transparent;
-}
-
 ::v-deep {
   input {
     @apply mb-1;
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/components/PortalSettingsCustomizationForm.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/PortalSettingsCustomizationForm.vue
index 47904ebb3..c00ab9beb 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/components/PortalSettingsCustomizationForm.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/PortalSettingsCustomizationForm.vue
@@ -1,7 +1,9 @@
 <template>
-  <div class="wizard-body w-[75%] flex-shrink-0 flex-grow-0 max-w-[75%] h-auto">
+  <div
+    class="pt-3 bg-white dark:bg-slate-900 h-full border border-solid border-transparent px-6 pb-6 dark:border-transparent w-full max-w-full md:w-3/4 md:max-w-[75%] flex-shrink-0 flex-grow-0"
+  >
     <div class="w-full">
-      <h3 class="block-title text-black-900 dark:text-slate-200">
+      <h3 class="text-lg text-black-900 dark:text-slate-200">
         {{
           $t('HELP_CENTER.PORTAL.ADD.CREATE_FLOW_PAGE.CUSTOMIZATION_PAGE.TITLE')
         }}
@@ -57,7 +59,7 @@
         </div>
       </div>
     </div>
-    <div class="flex-end">
+    <div class="flex justify-end">
       <woot-button
         :is-loading="isSubmitting"
         :is-disabled="$v.$invalid"
@@ -150,10 +152,6 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.wizard-body {
-  @apply pt-3 border border-solid border-transparent dark:border-transparent;
-}
-
 ::v-deep {
   input {
     @apply mb-1;
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/components/PortalSwitch.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/PortalSwitch.vue
index 96cad794d..1a6ab873a 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/components/PortalSwitch.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/PortalSwitch.vue
@@ -44,7 +44,7 @@
                     </span>
                     <span
                       v-if="isLocaleDefault(locale.code)"
-                      class="fs-small text-slate-300 dark:text-slate-200"
+                      class="text-sm text-slate-300 dark:text-slate-200"
                     >
                       {{ `(${$t('HELP_CENTER.PORTAL.DEFAULT')})` }}
                     </span>
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 edc7eba40..14191ac66 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/articles/EditArticle.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/articles/EditArticle.vue
@@ -15,7 +15,7 @@
         @show="showArticleInPortal"
         @update-meta="updateMeta"
       />
-      <div v-if="isFetching" class="text-center p-normal fs-default h-full">
+      <div v-if="isFetching" class="text-center p-4 text-base h-full">
         <spinner size="" />
         <span>{{ $t('HELP_CENTER.EDIT_ARTICLE.LOADING') }}</span>
       </div>
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/categories/NameEmojiInput.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/categories/NameEmojiInput.vue
index 1d5da8b98..5d6862758 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/categories/NameEmojiInput.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/categories/NameEmojiInput.vue
@@ -2,7 +2,7 @@
   <div class="flex items-center relative">
     <woot-button
       variant="hollow"
-      class="absolute [&>span]:flex [&>span]:items-center [&>span]:justify-center z-10 top-[25px] h-[2.45rem] w-[2.45rem] !text-slate-400 dark:!text-slate-600 dark:!bg-slate-900 !p-0"
+      class="absolute [&>span]:flex [&>span]:items-center [&>span]:justify-center z-10 top-[28px] h-[2.5rem] w-[2.45rem] !text-slate-400 dark:!text-slate-600 dark:!bg-slate-900 !p-0"
       color-scheme="secondary"
       @click="toggleEmojiPicker"
     >
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/ListAllPortals.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/ListAllPortals.vue
index 90e114309..35452417f 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/ListAllPortals.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/ListAllPortals.vue
@@ -3,7 +3,9 @@
     <div class="flex justify-between items-center mt-0 mb-2 mx-0 h-12">
       <div class="flex items-center">
         <woot-sidemenu-icon />
-        <h1 class="my-0 mx-2 text-2xl text-slate-800 dark:text-slate-100">
+        <h1
+          class="my-0 mx-2 text-2xl text-slate-800 dark:text-slate-100 font-medium"
+        >
           {{ $t('HELP_CENTER.PORTAL.HEADER') }}
         </h1>
       </div>
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/NewPortal.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/NewPortal.vue
index 91814421f..e14723476 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/NewPortal.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/NewPortal.vue
@@ -13,7 +13,7 @@
       class="flex flex-row overflow-auto py-4 pl-4 rtl:pl-0 rtl:pr-4 h-full bg-slate-50 dark:bg-slate-800"
     >
       <woot-wizard
-        class="hide-for-small-only w-[25%]"
+        class="hidden md:block w-1/4"
         :global-config="globalConfig"
         :items="items"
       />
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/PortalSettingsFinish.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/PortalSettingsFinish.vue
index 6677f01d1..690f058a4 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/PortalSettingsFinish.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/portals/PortalSettingsFinish.vue
@@ -1,5 +1,7 @@
 <template>
-  <div class="wizard-body w-[75%] flex-shrink-0 flex-grow-0 max-w-[75%] h-auto">
+  <div
+    class="pt-3 bg-white dark:bg-slate-900 h-full border border-solid border-transparent px-6 pb-6 dark:border-transparent w-full max-w-full md:w-3/4 md:max-w-[75%] flex-shrink-0 flex-grow-0"
+  >
     <empty-state
       :title="$t('HELP_CENTER.PORTAL.ADD.CREATE_FLOW_PAGE.FINISH_PAGE.TITLE')"
       :message="
@@ -8,7 +10,7 @@
     >
       <div class="w-full text-center">
         <router-link
-          class="button success nice"
+          class="button success nice rounded"
           :to="{
             name: 'list_all_portals',
           }"
@@ -35,8 +37,3 @@ export default {
   },
 };
 </script>
-<style lang="scss" scoped>
-.wizard-body {
-  @apply pb-3;
-}
-</style>
diff --git a/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationPanel.vue b/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationPanel.vue
index 0d76d611b..d18e0ccdc 100644
--- a/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationPanel.vue
+++ b/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationPanel.vue
@@ -139,9 +139,7 @@ export default {
       uiFlags: 'notifications/getUIFlags',
     }),
     notificationPanelFooterIconClass() {
-      return this.isRTLView
-        ? 'margin-right-minus-slab'
-        : 'margin-left-minus-slab';
+      return this.isRTLView ? '-mr-3' : '-ml-3';
     },
     totalUnreadNotifications() {
       return this.meta.unreadCount;
diff --git a/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationPanelItem.vue b/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationPanelItem.vue
index 3a4fa0c86..28e7c232e 100644
--- a/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationPanelItem.vue
+++ b/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationPanelItem.vue
@@ -1,9 +1,10 @@
 <template>
-  <div>
+  <div class="w-full">
     <woot-button
       size="expanded"
       color-scheme="secondary"
       variant="link"
+      class="w-full"
       @click="onClickOpenNotification()"
     >
       <div
diff --git a/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationTable.vue b/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationTable.vue
index 3cc4dde62..903d09eac 100644
--- a/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationTable.vue
+++ b/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationTable.vue
@@ -1,5 +1,7 @@
 <template>
-  <section class="notification--table-wrap bg-white dark:bg-slate-900">
+  <section
+    class="h-full flex-shrink flex-grow overflow-hidden py-8 px-4 bg-white dark:bg-slate-900"
+  >
     <woot-submit-button
       v-if="notificationMetadata.unreadCount"
       class="button nice success button--fixed-top"
@@ -136,10 +138,6 @@ export default {
   @apply text-sm m-0 text-slate-800 dark:text-slate-100;
 }
 
-.notification--table-wrap {
-  @apply overflow-hidden hover:overflow-y-auto flex-shrink flex-grow h-full py-8 px-12;
-}
-
 .notifications-table {
   > tbody {
     > tr {
diff --git a/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationsView.vue b/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationsView.vue
index 7ab8369be..dafee8868 100644
--- a/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationsView.vue
+++ b/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationsView.vue
@@ -1,6 +1,6 @@
 <template>
-  <div class="columns notification--page">
-    <div class="notification--content medium-12">
+  <div class="overflow-y-auto h-full">
+    <div class="flex flex-col h-full">
       <notification-table
         :notifications="records"
         :is-loading="uiFlags.isFetching"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/SettingsHeader.vue b/app/javascript/dashboard/routes/dashboard/settings/SettingsHeader.vue
index 1c49ee91a..0b415553a 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/SettingsHeader.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/SettingsHeader.vue
@@ -15,15 +15,17 @@
         v-if="icon"
         :icon="icon"
         :class="iconClass"
-        class="mr-2 ml-4 rtl:ml-2 rtl:mr-4"
+        class="mr-2 ml-1 rtl:ml-2 rtl:mr-1 hidden md:block"
       />
       <slot />
-      <span class="text-slate-900 dark:text-slate-100">{{ headerTitle }}</span>
+      <span class="text-slate-900 font-medium text-2xl dark:text-slate-100">
+        {{ headerTitle }}
+      </span>
     </h1>
     <router-link
       v-if="showNewButton && isAdmin"
       :to="buttonRoute"
-      class="button success button--fixed-top"
+      class="button success button--fixed-top px-3.5 py-1 rounded-[5px] flex gap-2"
     >
       <fluent-icon icon="add-circle" />
       <span class="button__content">
diff --git a/app/javascript/dashboard/routes/dashboard/settings/SettingsSubPageHeader.vue b/app/javascript/dashboard/routes/dashboard/settings/SettingsSubPageHeader.vue
index 4305a6355..8f6f46601 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/SettingsSubPageHeader.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/SettingsSubPageHeader.vue
@@ -1,6 +1,8 @@
 <template>
   <div class="flex flex-col w-full items-start">
-    <h2 class="text-xl text-slate-800 dark:text-slate-100 break-words">
+    <h2
+      class="text-xl font-medium mb-1 text-slate-800 dark:text-slate-100 break-words"
+    >
       {{ headerTitle }}
     </h2>
     <p
diff --git a/app/javascript/dashboard/routes/dashboard/settings/Wrapper.vue b/app/javascript/dashboard/routes/dashboard/settings/Wrapper.vue
index 93c1cb102..2b2604ac8 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/Wrapper.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/Wrapper.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    class="flex flex-1 h-full justify-between flex-col m-0 bg-slate-25 dark:bg-slate-900"
+    class="flex flex-1 h-full justify-between flex-col m-0 bg-slate-25 dark:bg-slate-900 overflow-auto"
   >
     <settings-header
       button-route="new"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/account/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/account/Index.vue
index 3357081b1..793b577d7 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/account/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/account/Index.vue
@@ -7,7 +7,7 @@
         <div
           class="flex-grow-0 flex-shrink-0 flex-[25%] min-w-0 py-4 pr-6 pl-0"
         >
-          <h4 class="block-title text-black-900 dark:text-slate-200">
+          <h4 class="text-lg font-medium text-black-900 dark:text-slate-200">
             {{ $t('GENERAL_SETTINGS.FORM.GENERAL_SECTION.TITLE') }}
           </h4>
           <p>{{ $t('GENERAL_SETTINGS.FORM.GENERAL_SECTION.NOTE') }}</p>
@@ -87,12 +87,12 @@
       </div>
 
       <div
-        class="p-4 border-slate-25 dark:border-slate-700 text-black-900 dark:text-slate-300 row"
+        class="p-4 border-slate-25 dark:border-slate-700 text-black-900 dark:text-slate-300 flex flex-row"
       >
         <div
           class="flex-grow-0 flex-shrink-0 flex-[25%] min-w-0 py-4 pr-6 pl-0"
         >
-          <h4 class="block-title text-black-900 dark:text-slate-200">
+          <h4 class="text-lg font-medium text-black-900 dark:text-slate-200">
             {{ $t('GENERAL_SETTINGS.FORM.ACCOUNT_ID.TITLE') }}
           </h4>
           <p>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/agentBots/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/agentBots/Index.vue
index 45cedd323..b770f49f8 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/agentBots/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/agentBots/Index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="flex-1 overflow-auto p-4">
     <div class="flex flex-row gap-4">
-      <div class="w-[60%]">
+      <div class="w-full lg:w-3/5">
         <woot-loading-state
           v-if="uiFlags.isFetching"
           :message="$t('AGENT_BOTS.LIST.LOADING')"
@@ -23,7 +23,7 @@
         </p>
       </div>
 
-      <div class="w-[34%]">
+      <div class="hidden lg:block w-1/3">
         <p v-html="$t('AGENT_BOTS.SIDEBAR_TXT')" />
       </div>
     </div>
@@ -94,9 +94,11 @@ export default {
 .bots-list {
   list-style: none;
 }
+
 .nowrap {
   white-space: nowrap;
 }
+
 .white-text {
   color: white;
 }
diff --git a/app/javascript/dashboard/routes/dashboard/settings/agentBots/components/AgentBotRow.vue b/app/javascript/dashboard/routes/dashboard/settings/agentBots/components/AgentBotRow.vue
index e6d9003a3..0146e7890 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/agentBots/components/AgentBotRow.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/agentBots/components/AgentBotRow.vue
@@ -1,5 +1,5 @@
 <template>
-  <tr>
+  <tr class="space-x-2">
     <td class="agent-bot--details">
       <div class="agent-bot--link">
         {{ agentBot.name }}
@@ -9,7 +9,7 @@
         <show-more :text="agentBot.description" :limit="120" />
       </div>
     </td>
-    <td class="button-wrapper">
+    <td class="flex justify-end gap-1">
       <woot-button
         v-if="isACSMLTypeBot"
         v-tooltip.top="$t('AGENT_BOTS.EDIT.BUTTON_TEXT')"
@@ -75,13 +75,4 @@ export default {
 .agent-bot--details {
   width: 90%;
 }
-
-.button-wrapper {
-  max-width: var(--space-mega);
-  min-width: auto;
-
-  button:nth-child(2) {
-    margin-left: var(--space-normal);
-  }
-}
 </style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/agentBots/components/AgentBotType.vue b/app/javascript/dashboard/routes/dashboard/settings/agentBots/components/AgentBotType.vue
index f24c659f0..b379786a3 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/agentBots/components/AgentBotType.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/agentBots/components/AgentBotType.vue
@@ -1,5 +1,5 @@
 <template>
-  <span>
+  <span class="inline-flex items-center gap-1">
     <img
       v-tooltip="botTypeConfig[botType].label"
       class="agent-bot-type--thumbnail"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/agents/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/agents/Index.vue
index 92e37ae0a..c4d7a99f9 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/agents/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/agents/Index.vue
@@ -11,7 +11,7 @@
 
     <!-- List Agents -->
     <div class="flex flex-row gap-4">
-      <div class="w-[60%]">
+      <div class="w-full lg:w-3/5">
         <woot-loading-state
           v-if="uiFlags.isFetching"
           :message="$t('AGENT_MGMT.LOADING')"
@@ -27,7 +27,6 @@
                 <td>
                   <thumbnail
                     :src="agent.thumbnail"
-                    class="columns"
                     :username="agent.name"
                     size="40px"
                     :status="agent.availability_status"
@@ -85,7 +84,7 @@
           </table>
         </div>
       </div>
-      <div class="w-[34%]">
+      <div class="w-1/3 hidden lg:block">
         <span
           v-dompurify-html="
             useInstallationName(
diff --git a/app/javascript/dashboard/routes/dashboard/settings/attributes/CustomAttribute.vue b/app/javascript/dashboard/routes/dashboard/settings/attributes/CustomAttribute.vue
index 28ad435a4..0f540cd6e 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/attributes/CustomAttribute.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/attributes/CustomAttribute.vue
@@ -1,6 +1,6 @@
 <template>
-  <div class="flex flex-row gap-4 pl-2">
-    <div class="w-[60%]">
+  <div class="flex flex-row gap-4 p-8">
+    <div class="w-full lg:w-3/5">
       <woot-tabs :index="selectedTabIndex" @change="onClickTabChange">
         <woot-tabs-item
           v-for="tab in tabs"
@@ -81,7 +81,7 @@
         </table>
       </div>
     </div>
-    <div class="w-[34%]">
+    <div class="hidden lg:block w-1/3">
       <span v-dompurify-html="$t('ATTRIBUTES_MGMT.SIDEBAR_TXT')" />
     </div>
     <woot-modal :show.sync="showEditPopup" :on-close="hideEditPopup">
@@ -224,6 +224,7 @@ export default {
       @apply p-0;
     }
   }
+
   .tabs-title a {
     font-weight: var(--font-weight-medium);
     padding-top: 0;
diff --git a/app/javascript/dashboard/routes/dashboard/settings/attributes/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/attributes/Index.vue
index f94c6d259..1e6a56bcb 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/attributes/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/attributes/Index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="flex-1 overflow-auto p-4">
+  <div class="flex-1 overflow-auto">
     <woot-button
       color-scheme="success"
       class-names="button--fixed-top"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/auditlogs/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/auditlogs/Index.vue
index d21e06b44..9d2cd8ee2 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/auditlogs/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/auditlogs/Index.vue
@@ -19,7 +19,7 @@
           class="woot-table w-full"
         >
           <colgroup>
-            <col class="w-[60%]" />
+            <col class="w-3/5" />
             <col />
             <col />
           </colgroup>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/automation/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/automation/Index.vue
index 65aa6487a..a780c9832 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/automation/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/automation/Index.vue
@@ -9,7 +9,7 @@
       {{ $t('AUTOMATION.HEADER_BTN_TXT') }}
     </woot-button>
     <div class="flex flex-row gap-4">
-      <div class="w-[60%]">
+      <div class="w-full lg:w-3/5">
         <p
           v-if="!uiFlags.isFetching && !records.length"
           class="flex h-full items-center flex-col justify-center"
@@ -77,7 +77,7 @@
         </table>
       </div>
 
-      <div class="w-[34%]">
+      <div class="hidden lg:block w-1/3">
         <span v-dompurify-html="$t('AUTOMATION.SIDEBAR_TXT')" />
       </div>
     </div>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/campaigns/AddCampaign.vue b/app/javascript/dashboard/routes/dashboard/settings/campaigns/AddCampaign.vue
index d22708f95..c27f81399 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/campaigns/AddCampaign.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/campaigns/AddCampaign.vue
@@ -61,7 +61,7 @@
         </label>
 
         <label
-          v-if="isOnOffType"
+          v-if="isOneOffType"
           class="multiselect-wrap--small"
           :class="{ error: $v.selectedAudience.$error }"
         >
@@ -106,7 +106,7 @@
           </span>
         </label>
 
-        <label v-if="isOnOffType">
+        <label v-if="isOneOffType">
           {{ $t('CAMPAIGN.ADD.FORM.SCHEDULED_AT.LABEL') }}
           <woot-date-time-picker
             :value="scheduledAt"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/campaigns/CampaignCard.vue b/app/javascript/dashboard/routes/dashboard/settings/campaigns/CampaignCard.vue
index 1d9896cb8..2eb0c3078 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/campaigns/CampaignCard.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/campaigns/CampaignCard.vue
@@ -1,10 +1,12 @@
 <template>
   <div
-    class="bg-white dark:bg-slate-800 mb-2 border border-slate-50 dark:border-slate-900 rounded-md px-5 py-4"
+    class="px-5 py-4 mb-2 bg-white border rounded-md dark:bg-slate-800 border-slate-50 dark:border-slate-900"
   >
     <div class="flex flex-row items-start justify-between">
       <div class="flex flex-col">
-        <div class="text-base font-medium -mt-1 mb-1">
+        <div
+          class="mb-1 -mt-1 text-base font-medium text-slate-900 dark:text-slate-100"
+        >
           {{ campaign.title }}
         </div>
         <div
@@ -35,14 +37,14 @@
       </div>
     </div>
 
-    <div class="flex flex-row mt-5 items-center space-x-3">
+    <div class="flex flex-row items-center mt-5 space-x-3">
       <woot-label
         small
         :title="campaignStatus"
         :color-scheme="colorScheme"
-        class="text-xs mr-3"
+        class="mr-3 text-xs"
       />
-      <inbox-name :inbox="campaign.inbox" class="ltr:ml-0 rtl:mr-0 mb-1" />
+      <inbox-name :inbox="campaign.inbox" class="mb-1 ltr:ml-0 rtl:mr-0" />
       <user-avatar-with-name
         v-if="campaign.sender"
         :user="campaign.sender"
@@ -50,13 +52,13 @@
       />
       <div
         v-if="campaign.trigger_rules.url"
-        class="text-xs text-woot-600 mb-1 text-truncate w-1/4"
+        class="w-1/4 mb-1 text-xs text-woot-600 text-truncate"
       >
         {{ campaign.trigger_rules.url }}
       </div>
       <div
         v-if="campaign.scheduled_at"
-        class="text-xs text-slate-700 dark:text-slate-500 mb-1"
+        class="mb-1 text-xs text-slate-700 dark:text-slate-500"
       >
         {{ messageStamp(new Date(campaign.scheduled_at), 'LLL d, h:mm a') }}
       </div>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/campaigns/campaigns.routes.js b/app/javascript/dashboard/routes/dashboard/settings/campaigns/campaigns.routes.js
index 149593b7e..1ac007ed6 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/campaigns/campaigns.routes.js
+++ b/app/javascript/dashboard/routes/dashboard/settings/campaigns/campaigns.routes.js
@@ -18,7 +18,7 @@ export default {
         },
         {
           path: 'ongoing',
-          name: 'settings_account_campaigns',
+          name: 'ongoing_campaigns',
           roles: ['administrator'],
           component: Index,
         },
diff --git a/app/javascript/dashboard/routes/dashboard/settings/canned/AddCanned.vue b/app/javascript/dashboard/routes/dashboard/settings/canned/AddCanned.vue
index e4f528770..cafde905f 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/canned/AddCanned.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/canned/AddCanned.vue
@@ -25,7 +25,7 @@
           <div class="editor-wrap">
             <woot-message-editor
               v-model="content"
-              class="message-editor"
+              class="message-editor [&>div]:px-1"
               :class="{ editor_warning: $v.content.$error }"
               :enable-variables="true"
               :enable-canned-responses="false"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/canned/EditCanned.vue b/app/javascript/dashboard/routes/dashboard/settings/canned/EditCanned.vue
index 17d5579b3..16cf0d77a 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/canned/EditCanned.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/canned/EditCanned.vue
@@ -22,7 +22,7 @@
           <div class="editor-wrap">
             <woot-message-editor
               v-model="content"
-              class="message-editor"
+              class="message-editor [&>div]:px-1"
               :class="{ editor_warning: $v.content.$error }"
               :enable-variables="true"
               :enable-canned-responses="false"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/canned/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/canned/Index.vue
index 5e697f30d..dd070097a 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/canned/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/canned/Index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="flex-1 overflow-auto p-4">
+  <div class="flex-1 overflow-auto">
     <woot-button
       color-scheme="success"
       class-names="button--fixed-top"
@@ -10,11 +10,11 @@
     </woot-button>
 
     <!-- List Canned Response -->
-    <div class="flex flex-row gap-4">
-      <div class="w-[60%]">
+    <div class="flex flex-row gap-4 p-8">
+      <div class="w-full xl:w-3/5">
         <p
           v-if="!uiFlags.fetchingList && !records.length"
-          class="flex h-full items-center flex-col justify-center"
+          class="flex flex-col items-center justify-center h-full"
         >
           {{ $t('CANNED_MGMT.LIST.404') }}
         </p>
@@ -32,6 +32,7 @@
             <th
               v-for="thHeader in $t('CANNED_MGMT.LIST.TABLE_HEADER')"
               :key="thHeader"
+              class="last:text-right"
             >
               {{ thHeader }}
             </th>
@@ -42,7 +43,10 @@
               :key="cannedItem.short_code"
             >
               <!-- Short Code  -->
-              <td class="w-[8.75rem]">
+              <td
+                class="w-[8.75rem] truncate max-w-[8.75rem]"
+                :title="cannedItem.short_code"
+              >
                 {{ cannedItem.short_code }}
               </td>
               <!-- Content -->
@@ -50,7 +54,7 @@
                 {{ cannedItem.content }}
               </td>
               <!-- Action Buttons -->
-              <td class="button-wrapper">
+              <td class="flex justify-end gap-1 min-w-[12.5rem]">
                 <woot-button
                   v-tooltip.top="$t('CANNED_MGMT.EDIT.BUTTON_TEXT')"
                   variant="smooth"
@@ -75,7 +79,7 @@
         </table>
       </div>
 
-      <div class="w-[34%]">
+      <div class="hidden w-1/3 xl:block">
         <span v-dompurify-html="$t('CANNED_MGMT.SIDEBAR_TXT')" />
       </div>
     </div>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/AddAgents.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/AddAgents.vue
index c734194f4..6cd3999aa 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/AddAgents.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/AddAgents.vue
@@ -1,5 +1,7 @@
 <template>
-  <div class="wizard-body w-[75%] flex-shrink-0 flex-grow-0 max-w-[75%]">
+  <div
+    class="border border-slate-25 dark:border-slate-800/60 bg-white dark:bg-slate-900 h-full p-6 w-full max-w-full md:w-3/4 md:max-w-[75%] flex-shrink-0 flex-grow-0"
+  >
     <form class="mx-0 flex flex-wrap" @submit.prevent="addAgents()">
       <div class="w-full">
         <page-header
@@ -7,7 +9,7 @@
           :header-content="$t('INBOX_MGMT.ADD.AGENTS.DESC')"
         />
       </div>
-      <div class="w-[60%]">
+      <div class="w-3/5">
         <div class="w-full">
           <label :class="{ error: $v.selectedAgents.$error }">
             {{ $t('INBOX_MGMT.ADD.AGENTS.TITLE') }}
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/ChannelList.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/ChannelList.vue
index a277a93b7..6a55f5889 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/ChannelList.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/ChannelList.vue
@@ -1,5 +1,7 @@
 <template>
-  <div class="wizard-body w-[75%] flex-shrink-0 flex-grow-0 max-w-[75%] h-auto">
+  <div
+    class="border border-slate-25 dark:border-slate-800/60 bg-white dark:bg-slate-900 h-full p-6 w-full max-w-full md:w-3/4 md:max-w-[75%] flex-shrink-0 flex-grow-0"
+  >
     <page-header
       :header-title="$t('INBOX_MGMT.ADD.AUTH.TITLE')"
       :header-content="
@@ -82,12 +84,3 @@ export default {
   },
 };
 </script>
-<style scoped>
-.height-auto {
-  height: auto;
-}
-
-.channel-list {
-  margin-top: var(--space-medium);
-}
-</style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/FinishSetup.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/FinishSetup.vue
index d7575c10b..d9f0008d5 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/FinishSetup.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/FinishSetup.vue
@@ -1,5 +1,7 @@
 <template>
-  <div class="wizard-body w-[75%] flex-shrink-0 flex-grow-0 max-w-[75%]">
+  <div
+    class="border border-slate-25 dark:border-slate-800/60 bg-white dark:bg-slate-900 h-full p-6 w-full max-w-full md:w-3/4 md:max-w-[75%] flex-shrink-0 flex-grow-0"
+  >
     <empty-state
       :title="$t('INBOX_MGMT.FINISH.TITLE')"
       :message="message"
@@ -58,7 +60,7 @@
         </div>
         <div class="flex justify-center gap-2 mt-4">
           <router-link
-            class="button hollow primary"
+            class="button hollow primary rounded"
             :to="{
               name: 'settings_inbox_show',
               params: { inboxId: $route.params.inbox_id },
@@ -67,7 +69,7 @@
             {{ $t('INBOX_MGMT.FINISH.MORE_SETTINGS') }}
           </router-link>
           <router-link
-            class="button success"
+            class="button success rounded"
             :to="{
               name: 'inbox_dashboard',
               params: { inboxId: $route.params.inbox_id },
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/ImapSettings.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/ImapSettings.vue
index f6a7a5d8d..9e7f6dba0 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/ImapSettings.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/ImapSettings.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="settings--content">
+  <div class="mx-8">
     <settings-section
       :title="$t('INBOX_MGMT.IMAP.TITLE')"
       :sub-title="$t('INBOX_MGMT.IMAP.SUBTITLE')"
@@ -10,16 +10,17 @@
           <input
             v-model="isIMAPEnabled"
             type="checkbox"
+            class="ltr:mr-2 rtl:ml-2"
             name="toggle-imap-enable"
           />
           {{ $t('INBOX_MGMT.IMAP.TOGGLE_AVAILABILITY') }}
         </label>
         <p>{{ $t('INBOX_MGMT.IMAP.TOGGLE_HELP') }}</p>
-        <div v-if="isIMAPEnabled" class="imap-details-wrap">
+        <div v-if="isIMAPEnabled" class="mb-6">
           <woot-input
             v-model.trim="address"
             :class="{ error: $v.address.$error }"
-            class="medium-9 columns"
+            class="max-w-[75%] w-full"
             :label="$t('INBOX_MGMT.IMAP.ADDRESS.LABEL')"
             :placeholder="$t('INBOX_MGMT.IMAP.ADDRESS.PLACE_HOLDER')"
             @blur="$v.address.$touch"
@@ -28,7 +29,7 @@
             v-model="port"
             type="number"
             :class="{ error: $v.port.$error }"
-            class="medium-9 columns"
+            class="max-w-[75%] w-full"
             :label="$t('INBOX_MGMT.IMAP.PORT.LABEL')"
             :placeholder="$t('INBOX_MGMT.IMAP.PORT.PLACE_HOLDER')"
             @blur="$v.port.$touch"
@@ -36,7 +37,7 @@
           <woot-input
             v-model="login"
             :class="{ error: $v.login.$error }"
-            class="medium-9 columns"
+            class="max-w-[75%] w-full"
             :label="$t('INBOX_MGMT.IMAP.LOGIN.LABEL')"
             :placeholder="$t('INBOX_MGMT.IMAP.LOGIN.PLACE_HOLDER')"
             @blur="$v.login.$touch"
@@ -44,7 +45,7 @@
           <woot-input
             v-model="password"
             :class="{ error: $v.password.$error }"
-            class="medium-9 columns"
+            class="max-w-[75%] w-full"
             :label="$t('INBOX_MGMT.IMAP.PASSWORD.LABEL')"
             :placeholder="$t('INBOX_MGMT.IMAP.PASSWORD.PLACE_HOLDER')"
             type="password"
@@ -54,6 +55,7 @@
             <input
               v-model="isSSLEnabled"
               type="checkbox"
+              class="ltr:mr-2 rtl:ml-2"
               name="toggle-enable-ssl"
             />
             {{ $t('INBOX_MGMT.IMAP.ENABLE_SSL') }}
@@ -159,8 +161,3 @@ export default {
   },
 };
 </script>
-<style lang="scss" scoped>
-.imap-details-wrap {
-  margin-bottom: var(--space-medium);
-}
-</style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/InboxChannels.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/InboxChannels.vue
index e2a4aafdb..ec9dc1ab7 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/InboxChannels.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/InboxChannels.vue
@@ -3,7 +3,7 @@
     class="flex flex-row overflow-auto p-4 h-full bg-slate-25 dark:bg-slate-800"
   >
     <woot-wizard
-      class="hide-for-small-only w-[25%]"
+      class="hidden md:block w-1/4"
       :global-config="globalConfig"
       :items="items"
     />
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/Index.vue
index 37ca78648..67c40e2bf 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/Index.vue
@@ -1,8 +1,7 @@
 <template>
-  <div class="flex-1 overflow-auto p-4">
-    <!-- List Canned Response -->
-    <div class="flex flex-row gap-4">
-      <div class="w-[60%]">
+  <div class="flex-1 overflow-auto">
+    <div class="flex flex-row gap-4 p-8">
+      <div class="w-full lg:w-3/5">
         <p
           v-if="!inboxesList.length"
           class="flex h-full items-center flex-col justify-center"
@@ -99,7 +98,7 @@
         </table>
       </div>
 
-      <div class="w-[34%]">
+      <div class="w-1/3 hidden lg:block">
         <span
           v-dompurify-html="
             useInstallationName(
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/PreChatForm/Settings.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/PreChatForm/Settings.vue
index b02acbcc2..48bdb6bb7 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/PreChatForm/Settings.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/PreChatForm/Settings.vue
@@ -4,7 +4,7 @@
       {{ $t('INBOX_MGMT.PRE_CHAT_FORM.DESCRIPTION') }}
     </div>
     <form class="flex flex-col" @submit.prevent="updateInbox">
-      <label class="w-[25%]">
+      <label class="w-1/4">
         {{ $t('INBOX_MGMT.PRE_CHAT_FORM.ENABLE.LABEL') }}
         <select v-model="preChatFormEnabled">
           <option :value="true">
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
index 7c92674a8..87b6e6724 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
@@ -21,7 +21,7 @@
       </woot-tabs>
     </setting-intro-banner>
 
-    <div v-if="selectedTabKey === 'inbox_settings'" class="settings--content">
+    <div v-if="selectedTabKey === 'inbox_settings'" class="mx-8">
       <settings-section
         :title="$t('INBOX_MGMT.SETTINGS_POPUP.INBOX_UPDATE_TITLE')"
         :sub-title="$t('INBOX_MGMT.SETTINGS_POPUP.INBOX_UPDATE_SUB_TEXT')"
@@ -37,7 +37,7 @@
         />
         <woot-input
           v-model.trim="selectedInboxName"
-          class="w-[75%] pb-4"
+          class="w-3/4 pb-4"
           :class="{ error: $v.selectedInboxName.$error }"
           :label="inboxNameLabel"
           :placeholder="inboxNamePlaceHolder"
@@ -51,7 +51,7 @@
         <woot-input
           v-if="isAPIInbox"
           v-model.trim="webhookUrl"
-          class="w-[75%] pb-4"
+          class="w-3/4 pb-4"
           :class="{ error: $v.webhookUrl.$error }"
           :label="
             $t('INBOX_MGMT.ADD.WEBSITE_CHANNEL.CHANNEL_WEBHOOK_URL.LABEL')
@@ -69,7 +69,7 @@
         <woot-input
           v-if="isAWebWidgetInbox"
           v-model.trim="channelWebsiteUrl"
-          class="w-[75%] pb-4"
+          class="w-3/4 pb-4"
           :label="$t('INBOX_MGMT.ADD.WEBSITE_CHANNEL.CHANNEL_DOMAIN.LABEL')"
           :placeholder="
             $t('INBOX_MGMT.ADD.WEBSITE_CHANNEL.CHANNEL_DOMAIN.PLACEHOLDER')
@@ -78,7 +78,7 @@
         <woot-input
           v-if="isAWebWidgetInbox"
           v-model.trim="channelWelcomeTitle"
-          class="w-[75%] pb-4"
+          class="w-3/4 pb-4"
           :label="
             $t('INBOX_MGMT.ADD.WEBSITE_CHANNEL.CHANNEL_WELCOME_TITLE.LABEL')
           "
@@ -92,7 +92,7 @@
         <woot-input
           v-if="isAWebWidgetInbox"
           v-model.trim="channelWelcomeTagline"
-          class="w-[75%] pb-4"
+          class="w-3/4 pb-4"
           :label="
             $t('INBOX_MGMT.ADD.WEBSITE_CHANNEL.CHANNEL_WELCOME_TAGLINE.LABEL')
           "
@@ -103,17 +103,17 @@
           "
         />
 
-        <label v-if="isAWebWidgetInbox" class="w-[75%] pb-4">
+        <label v-if="isAWebWidgetInbox" class="w-3/4 pb-4">
           {{ $t('INBOX_MGMT.ADD.WEBSITE_CHANNEL.WIDGET_COLOR.LABEL') }}
           <woot-color-picker v-model="inbox.widget_color" />
         </label>
 
-        <label v-if="isAWhatsAppChannel" class="w-[75%] pb-4">
+        <label v-if="isAWhatsAppChannel" class="w-3/4 pb-4">
           {{ $t('INBOX_MGMT.ADD.WHATSAPP.PROVIDERS.LABEL') }}
           <input v-model="whatsAppAPIProviderName" type="text" disabled />
         </label>
 
-        <label class="w-[75%] pb-4">
+        <label class="w-3/4 pb-4">
           {{
             $t('INBOX_MGMT.ADD.WEBSITE_CHANNEL.CHANNEL_GREETING_TOGGLE.LABEL')
           }}
@@ -157,7 +157,7 @@
             :richtext="!textAreaChannels"
           />
         </div>
-        <label v-if="isAWebWidgetInbox" class="w-[75%] pb-4">
+        <label v-if="isAWebWidgetInbox" class="w-3/4 pb-4">
           {{ $t('INBOX_MGMT.ADD.WEBSITE_CHANNEL.REPLY_TIME.TITLE') }}
           <select v-model="replyTime">
             <option key="in_a_few_minutes" value="in_a_few_minutes">
@@ -180,7 +180,7 @@
           </p>
         </label>
 
-        <label v-if="isAWebWidgetInbox" class="w-[75%] pb-4">
+        <label v-if="isAWebWidgetInbox" class="w-3/4 pb-4">
           {{ $t('INBOX_MGMT.SETTINGS_POPUP.ENABLE_EMAIL_COLLECT_BOX') }}
           <select v-model="emailCollectEnabled">
             <option :value="true">
@@ -197,7 +197,7 @@
           </p>
         </label>
 
-        <label class="w-[75%] pb-4">
+        <label class="w-3/4 pb-4">
           {{ $t('INBOX_MGMT.SETTINGS_POPUP.ENABLE_CSAT') }}
           <select v-model="csatSurveyEnabled">
             <option :value="true">
@@ -212,7 +212,7 @@
           </p>
         </label>
 
-        <label v-if="isAWebWidgetInbox" class="w-[75%] pb-4">
+        <label v-if="isAWebWidgetInbox" class="w-3/4 pb-4">
           {{ $t('INBOX_MGMT.SETTINGS_POPUP.ALLOW_MESSAGES_AFTER_RESOLVED') }}
           <select v-model="allowMessagesAfterResolved">
             <option :value="true">
@@ -231,7 +231,7 @@
           </p>
         </label>
 
-        <label v-if="isAWebWidgetInbox" class="w-[75%] pb-4">
+        <label v-if="isAWebWidgetInbox" class="w-3/4 pb-4">
           {{ $t('INBOX_MGMT.SETTINGS_POPUP.ENABLE_CONTINUITY_VIA_EMAIL') }}
           <select v-model="continuityViaEmail">
             <option :value="true">
@@ -249,7 +249,7 @@
             }}
           </p>
         </label>
-        <div class="w-[75%] pb-4">
+        <div class="w-3/4 pb-4">
           <label>
             {{ $t('INBOX_MGMT.HELP_CENTER.LABEL') }}
           </label>
@@ -265,7 +265,7 @@
             {{ $t('INBOX_MGMT.HELP_CENTER.SUB_TEXT') }}
           </p>
         </div>
-        <label v-if="canLocktoSingleConversation" class="w-[75%] pb-4">
+        <label v-if="canLocktoSingleConversation" class="w-3/4 pb-4">
           {{ $t('INBOX_MGMT.SETTINGS_POPUP.LOCK_TO_SINGLE_CONVERSATION') }}
           <select v-model="locktoSingleConversation">
             <option :value="true">
@@ -287,7 +287,7 @@
         <label v-if="isAWebWidgetInbox">
           {{ $t('INBOX_MGMT.FEATURES.LABEL') }}
         </label>
-        <div v-if="isAWebWidgetInbox" class="pt-2 pb-4">
+        <div v-if="isAWebWidgetInbox" class="pt-2 pb-4 flex gap-2">
           <input
             v-model="selectedFeatureFlags"
             type="checkbox"
@@ -298,7 +298,7 @@
             {{ $t('INBOX_MGMT.FEATURES.DISPLAY_FILE_PICKER') }}
           </label>
         </div>
-        <div v-if="isAWebWidgetInbox" class="pb-4">
+        <div v-if="isAWebWidgetInbox" class="pb-4 flex gap-2">
           <input
             v-model="selectedFeatureFlags"
             type="checkbox"
@@ -309,7 +309,7 @@
             {{ $t('INBOX_MGMT.FEATURES.DISPLAY_EMOJI_PICKER') }}
           </label>
         </div>
-        <div v-if="isAWebWidgetInbox" class="pb-4">
+        <div v-if="isAWebWidgetInbox" class="pb-4 flex gap-2">
           <input
             v-model="selectedFeatureFlags"
             type="checkbox"
@@ -320,7 +320,7 @@
             {{ $t('INBOX_MGMT.FEATURES.ALLOW_END_CONVERSATION') }}
           </label>
         </div>
-        <div v-if="isAWebWidgetInbox" class="pb-4">
+        <div v-if="isAWebWidgetInbox" class="pb-4 flex gap-2">
           <input
             v-model="selectedFeatureFlags"
             type="checkbox"
@@ -338,7 +338,7 @@
         :sub-title="$t('INBOX_MGMT.EDIT.SENDER_NAME_SECTION.SUB_TEXT')"
         :show-border="false"
       >
-        <div class="w-[75%] pb-4">
+        <div class="w-3/4 pb-4">
           <sender-name-example-preview
             :sender-name-type="senderNameType"
             :business-name="businessName"
@@ -400,7 +400,7 @@
       <facebook-reauthorize v-if="isAFacebookInbox" :inbox-id="inbox.id" />
     </div>
 
-    <div v-if="selectedTabKey === 'collaborators'" class="settings--content">
+    <div v-if="selectedTabKey === 'collaborators'" class="mx-8">
       <collaborators-page :inbox="inbox" />
     </div>
     <div v-if="selectedTabKey === 'configuration'">
@@ -757,11 +757,9 @@ export default {
 </script>
 
 <style scoped lang="scss">
-.settings {
-  .settings--tabs {
-    ::v-deep .tabs {
-      @apply p-0;
-    }
+.settings--tabs {
+  ::v-deep .tabs {
+    @apply p-0;
   }
 }
 </style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/SmtpSettings.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/SmtpSettings.vue
index 65d630dcc..47a70d8b4 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/SmtpSettings.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/SmtpSettings.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="settings--content">
+  <div class="mx-8">
     <settings-section
       :title="$t('INBOX_MGMT.SMTP.TITLE')"
       :sub-title="$t('INBOX_MGMT.SMTP.SUBTITLE')"
@@ -14,11 +14,11 @@
           {{ $t('INBOX_MGMT.SMTP.TOGGLE_AVAILABILITY') }}
         </label>
         <p>{{ $t('INBOX_MGMT.SMTP.TOGGLE_HELP') }}</p>
-        <div v-if="isSMTPEnabled" class="smtp-details-wrap">
+        <div v-if="isSMTPEnabled" class="mb-6">
           <woot-input
             v-model.trim="address"
             :class="{ error: $v.address.$error }"
-            class="medium-9 columns"
+            class="max-w-[75%] w-full"
             :label="$t('INBOX_MGMT.SMTP.ADDRESS.LABEL')"
             :placeholder="$t('INBOX_MGMT.SMTP.ADDRESS.PLACE_HOLDER')"
             @blur="$v.address.$touch"
@@ -27,7 +27,7 @@
             v-model="port"
             type="number"
             :class="{ error: $v.port.$error }"
-            class="medium-9 columns"
+            class="max-w-[75%] w-full"
             :label="$t('INBOX_MGMT.SMTP.PORT.LABEL')"
             :placeholder="$t('INBOX_MGMT.SMTP.PORT.PLACE_HOLDER')"
             @blur="$v.port.$touch"
@@ -35,7 +35,7 @@
           <woot-input
             v-model="login"
             :class="{ error: $v.login.$error }"
-            class="medium-9 columns"
+            class="max-w-[75%] w-full"
             :label="$t('INBOX_MGMT.SMTP.LOGIN.LABEL')"
             :placeholder="$t('INBOX_MGMT.SMTP.LOGIN.PLACE_HOLDER')"
             @blur="$v.login.$touch"
@@ -43,7 +43,7 @@
           <woot-input
             v-model="password"
             :class="{ error: $v.password.$error }"
-            class="medium-9 columns"
+            class="max-w-[75%] w-full"
             :label="$t('INBOX_MGMT.SMTP.PASSWORD.LABEL')"
             :placeholder="$t('INBOX_MGMT.SMTP.PASSWORD.PLACE_HOLDER')"
             type="password"
@@ -52,7 +52,7 @@
           <woot-input
             v-model.trim="domain"
             :class="{ error: $v.domain.$error }"
-            class="medium-9 columns"
+            class="max-w-[75%] w-full"
             :label="$t('INBOX_MGMT.SMTP.DOMAIN.LABEL')"
             :placeholder="$t('INBOX_MGMT.SMTP.DOMAIN.PLACE_HOLDER')"
             @blur="$v.domain.$touch"
@@ -63,14 +63,14 @@
             :action="handleEncryptionChange"
           />
           <single-select-dropdown
-            class="medium-9 columns"
+            class="max-w-[75%] w-full"
             :label="$t('INBOX_MGMT.SMTP.OPEN_SSL_VERIFY_MODE')"
             :selected="openSSLVerifyMode"
             :options="openSSLVerifyModes"
             :action="handleSSLModeChange"
           />
           <single-select-dropdown
-            class="medium-9 columns"
+            class="max-w-[75%] w-full"
             :label="$t('INBOX_MGMT.SMTP.AUTH_MECHANISM')"
             :selected="authMechanism"
             :options="authMechanisms"
@@ -237,8 +237,3 @@ export default {
   },
 };
 </script>
-<style lang="scss" scoped>
-.smtp-details-wrap {
-  margin-bottom: var(--space-medium);
-}
-</style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/WidgetBuilder.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/WidgetBuilder.vue
index f197bf676..82dd5966c 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/WidgetBuilder.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/WidgetBuilder.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="settings--content">
+  <div class="mx-8">
     <div class="widget-builder-container">
       <div class="settings-container w-100 lg:w-[40%]">
         <div class="settings-content">
@@ -123,7 +123,7 @@
           </form>
         </div>
       </div>
-      <div class="widget-container w-100 lg:w-[60%]">
+      <div class="widget-container w-100 lg:w-3/5">
         <input-radio-group
           name="widget-view-options"
           :items="getWidgetViewOptions"
@@ -422,9 +422,9 @@ export default {
   display: flex;
   flex-direction: row;
   padding: var(--space-one);
-  @include breakpoint(900px down) {
-    flex-direction: column;
-  }
+  // @include breakpoint(900px down) {
+  //   flex-direction: column;
+  // }
 }
 
 .settings-container {
@@ -450,10 +450,11 @@ export default {
     padding: var(--space-one) var(--space-one) var(--space-one) var(--space-one);
     @apply bg-slate-50 dark:bg-slate-700;
 
-    @include breakpoint(500px down) {
-      background: none;
-    }
+    // @include breakpoint(500px down) {
+    //   background: none;
+    // }
   }
+
   .widget-script {
     @apply mx-5 p-2.5 bg-slate-50 dark:bg-slate-700;
   }
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Api.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Api.vue
index 0cbb9ce4b..701a0d5f3 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Api.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Api.vue
@@ -1,5 +1,7 @@
 <template>
-  <div class="wizard-body w-[75%] flex-shrink-0 flex-grow-0 max-w-[75%]">
+  <div
+    class="border border-slate-25 dark:border-slate-800/60 bg-white dark:bg-slate-900 h-full p-6 w-full max-w-full md:w-3/4 md:max-w-[75%] flex-shrink-0 flex-grow-0"
+  >
     <page-header
       :header-title="$t('INBOX_MGMT.ADD.API_CHANNEL.TITLE')"
       :header-content="$t('INBOX_MGMT.ADD.API_CHANNEL.DESC')"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Email.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Email.vue
index aa38ee21e..109118374 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Email.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Email.vue
@@ -1,13 +1,13 @@
 <template>
   <div
     v-if="!provider"
-    class="wizard-body small-12 medium-9 columns height-auto"
+    class="border border-slate-25 dark:border-slate-800/60 bg-white dark:bg-slate-900 h-full p-6 w-full md:w-full max-w-full md:max-w-[75%] flex-shrink-0 flex-grow-0"
   >
     <page-header
       :header-title="$t('INBOX_MGMT.ADD.EMAIL_PROVIDER.TITLE')"
       :header-content="$t('INBOX_MGMT.ADD.EMAIL_PROVIDER.DESCRIPTION')"
     />
-    <div class="row channel-list">
+    <div class="flex flex-row flex-wrap mx-0 mt-6">
       <channel-selector
         v-for="emailProvider in emailProviderList"
         :key="emailProvider.key"
@@ -63,9 +63,3 @@ export default {
   },
 };
 </script>
-
-<style scoped>
-.channel-list {
-  margin-top: var(--space-medium);
-}
-</style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Facebook.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Facebook.vue
index 8dafb3389..374a88854 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Facebook.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Facebook.vue
@@ -1,5 +1,7 @@
 <template>
-  <div class="wizard-body w-[75%] flex-shrink-0 flex-grow-0 max-w-[75%]">
+  <div
+    class="border border-slate-25 dark:border-slate-800/60 bg-white dark:bg-slate-900 h-full p-6 w-full max-w-full md:w-3/4 md:max-w-[75%] flex-shrink-0 flex-grow-0"
+  >
     <div v-if="!hasLoginStarted" class="login-init h-full">
       <a href="#" @click="startLogin()">
         <img
@@ -41,7 +43,7 @@
             "
           />
         </div>
-        <div class="w-[60%]">
+        <div class="w-3/5">
           <div class="w-full">
             <div class="input-wrap" :class="{ error: $v.selectedPage.$error }">
               {{ $t('INBOX_MGMT.ADD.FB.CHOOSE_PAGE') }}
@@ -283,3 +285,16 @@ export default {
   },
 };
 </script>
+<style scoped lang="scss">
+.login-init {
+  @apply pt-[30%] text-center;
+
+  p {
+    @apply p-6;
+  }
+
+  > a > img {
+    @apply w-60;
+  }
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Line.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Line.vue
index de5a6d014..f726b24da 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Line.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Line.vue
@@ -1,5 +1,7 @@
 <template>
-  <div class="wizard-body w-[75%] flex-shrink-0 flex-grow-0 max-w-[75%]">
+  <div
+    class="border border-slate-25 dark:border-slate-800/60 bg-white dark:bg-slate-900 h-full p-6 w-full max-w-full md:w-3/4 md:max-w-[75%] flex-shrink-0 flex-grow-0"
+  >
     <page-header
       :header-title="$t('INBOX_MGMT.ADD.LINE_CHANNEL.TITLE')"
       :header-content="$t('INBOX_MGMT.ADD.LINE_CHANNEL.DESC')"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Sms.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Sms.vue
index e40970426..81e271cbf 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Sms.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Sms.vue
@@ -1,5 +1,7 @@
 <template>
-  <div class="wizard-body w-[75%] flex-shrink-0 flex-grow-0 max-w-[75%]">
+  <div
+    class="border border-slate-25 dark:border-slate-800/60 bg-white dark:bg-slate-900 h-full p-6 w-full max-w-full md:w-3/4 md:max-w-[75%] flex-shrink-0 flex-grow-0"
+  >
     <page-header
       :header-title="$t('INBOX_MGMT.ADD.SMS.TITLE')"
       :header-content="$t('INBOX_MGMT.ADD.SMS.DESC')"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Telegram.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Telegram.vue
index 5d7115aad..1f677bd66 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Telegram.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Telegram.vue
@@ -1,5 +1,7 @@
 <template>
-  <div class="wizard-body w-[75%] flex-shrink-0 flex-grow-0 max-w-[75%]">
+  <div
+    class="border border-slate-25 dark:border-slate-800/60 bg-white dark:bg-slate-900 h-full p-6 w-full max-w-full md:w-3/4 md:max-w-[75%] flex-shrink-0 flex-grow-0"
+  >
     <page-header
       :header-title="$t('INBOX_MGMT.ADD.TELEGRAM_CHANNEL.TITLE')"
       :header-content="$t('INBOX_MGMT.ADD.TELEGRAM_CHANNEL.DESC')"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Twilio.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Twilio.vue
index f41c7d88c..b37817129 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Twilio.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Twilio.vue
@@ -54,7 +54,7 @@
       </label>
     </div>
 
-    <div class="medium-8 columns messagingServiceHelptext">
+    <div class="max-w-[65%] w-full messagingServiceHelptext">
       <label for="useMessagingService">
         <input
           id="useMessagingService"
@@ -84,7 +84,7 @@
         }}</span>
       </label>
     </div>
-    <div class="medium-8 columns messagingServiceHelptext">
+    <div class="max-w-[65%] w-full messagingServiceHelptext">
       <label for="useAPIKey">
         <input
           id="useAPIKey"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Twitter.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Twitter.vue
index 2eb6727c4..08919b978 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Twitter.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Twitter.vue
@@ -1,5 +1,7 @@
 <template>
-  <div class="wizard-body w-[75%] flex-shrink-0 flex-grow-0 max-w-[75%]">
+  <div
+    class="border border-slate-25 dark:border-slate-800/60 bg-white dark:bg-slate-900 h-full p-6 w-full max-w-full md:w-3/4 md:max-w-[75%] flex-shrink-0 flex-grow-0"
+  >
     <div class="login-init h-full text-center">
       <form @submit.prevent="requestAuthorization">
         <woot-submit-button
@@ -40,3 +42,14 @@ export default {
   },
 };
 </script>
+<style scoped lang="scss">
+.login-init {
+  @apply pt-[30%] text-center;
+  p {
+    @apply p-6;
+  }
+  > a > img {
+    @apply w-60;
+  }
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Website.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Website.vue
index 0ed7072a7..dae97dbe2 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Website.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Website.vue
@@ -1,5 +1,7 @@
 <template>
-  <div class="wizard-body w-[75%] flex-shrink-0 flex-grow-0 max-w-[75%] h-auto">
+  <div
+    class="border border-slate-25 dark:border-slate-800/60 bg-white dark:bg-slate-900 h-full p-6 w-full max-w-full md:w-3/4 md:max-w-[75%] flex-shrink-0 flex-grow-0"
+  >
     <page-header
       :header-title="$t('INBOX_MGMT.ADD.WEBSITE_CHANNEL.TITLE')"
       :header-content="$t('INBOX_MGMT.ADD.WEBSITE_CHANNEL.DESC')"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Whatsapp.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Whatsapp.vue
index 36f63f2d6..d1f8d5b8c 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Whatsapp.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Whatsapp.vue
@@ -1,5 +1,7 @@
 <template>
-  <div class="wizard-body w-[75%] flex-shrink-0 flex-grow-0 max-w-[75%]">
+  <div
+    class="border border-slate-25 dark:border-slate-800/60 bg-white dark:bg-slate-900 h-full p-6 w-full max-w-full md:w-3/4 md:max-w-[75%] flex-shrink-0 flex-grow-0"
+  >
     <page-header
       :header-title="$t('INBOX_MGMT.ADD.WHATSAPP.TITLE')"
       :header-content="$t('INBOX_MGMT.ADD.WHATSAPP.DESC')"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/emailChannels/ForwardToOption.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/emailChannels/ForwardToOption.vue
index 2eb20518a..25f59380d 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/emailChannels/ForwardToOption.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/emailChannels/ForwardToOption.vue
@@ -1,5 +1,7 @@
 <template>
-  <div class="wizard-body w-[75%] flex-shrink-0 flex-grow-0 max-w-[75%]">
+  <div
+    class="border border-slate-25 dark:border-slate-800/60 bg-white dark:bg-slate-900 h-full p-6 w-full max-w-full md:w-3/4 md:max-w-[75%] flex-shrink-0 flex-grow-0"
+  >
     <page-header
       :header-title="$t('INBOX_MGMT.ADD.EMAIL_CHANNEL.TITLE')"
       :header-content="$t('INBOX_MGMT.ADD.EMAIL_CHANNEL.DESC')"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/emailChannels/Microsoft.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/emailChannels/Microsoft.vue
index 68f26ddf9..d1b48bf65 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/emailChannels/Microsoft.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/emailChannels/Microsoft.vue
@@ -1,5 +1,7 @@
 <template>
-  <div class="wizard-body w-[75%] flex-shrink-0 flex-grow-0 max-w-[75%]">
+  <div
+    class="border border-slate-25 dark:border-slate-800/60 bg-white dark:bg-slate-900 h-full p-6 w-full max-w-full md:w-3/4 md:max-w-[75%] flex-shrink-0 flex-grow-0"
+  >
     <settings-sub-page-header
       :header-title="$t('INBOX_MGMT.ADD.MICROSOFT.TITLE')"
       :header-content="$t('INBOX_MGMT.ADD.MICROSOFT.DESCRIPTION')"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/microsoft/Reauthorize.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/microsoft/Reauthorize.vue
index d5ea23ac8..57a9d3759 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/microsoft/Reauthorize.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/microsoft/Reauthorize.vue
@@ -1,10 +1,10 @@
 <template>
-  <div class="settings--content">
+  <div class="mx-8">
     <settings-section
       :title="$t('INBOX_MGMT.MICROSOFT.TITLE')"
       :sub-title="$t('INBOX_MGMT.MICROSOFT.SUBTITLE')"
     >
-      <div class="smtp-details-wrap">
+      <div class="mb-6">
         <form @submit.prevent="requestAuthorization">
           <woot-submit-button
             icon="brand-twitter"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/components/BotConfiguration.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/components/BotConfiguration.vue
index 1237e63bd..01b39efe0 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/components/BotConfiguration.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/components/BotConfiguration.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="settings--content">
+  <div class="mx-8">
     <loading-state v-if="uiFlags.isFetching || uiFlags.isFetchingAgentBot" />
     <form
       v-else
@@ -10,7 +10,7 @@
         :title="$t('AGENT_BOTS.BOT_CONFIGURATION.TITLE')"
         :sub-title="$t('AGENT_BOTS.BOT_CONFIGURATION.DESC')"
       >
-        <div class="w-[60%]">
+        <div class="w-3/5">
           <label>
             <select v-model="selectedAgentBotId">
               <option value="" disabled selected>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/components/BusinessDay.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/components/BusinessDay.vue
index f6c2f901c..6f6e1bef1 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/components/BusinessDay.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/components/BusinessDay.vue
@@ -248,7 +248,7 @@ export default {
 }
 
 .label {
-  @apply bg-woot-50 dark:bg-woot-600 text-woot-700 dark:text-woot-100 text-xs;
+  @apply bg-woot-50 dark:bg-woot-600 text-woot-700 dark:text-woot-100 text-xs inline-block px-2 py-1 rounded-sm cursor-default whitespace-nowrap;
 }
 
 .date-error {
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/components/SenderNameExamplePreview.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/components/SenderNameExamplePreview.vue
index 585367ade..126b57198 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/components/SenderNameExamplePreview.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/components/SenderNameExamplePreview.vue
@@ -3,7 +3,7 @@
     <button
       v-for="keyOption in senderNameKeyOptions"
       :key="keyOption.key"
-      class="text-slate-800 dark:text-slate-100 cursor-pointer"
+      class="text-slate-800 dark:text-slate-100 cursor-pointer p-0"
       @click="toggleSenderNameType(keyOption.key)"
     >
       <preview-card
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 9a8f15d55..12ff70a62 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/components/WeeklyAvailability.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/components/WeeklyAvailability.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="my-2 mx-8">
+  <div class="mx-8">
     <settings-section
       :title="$t('INBOX_MGMT.BUSINESS_HOURS.TITLE')"
       :sub-title="$t('INBOX_MGMT.BUSINESS_HOURS.SUBTITLE')"
@@ -9,11 +9,14 @@
           <input
             v-model="isBusinessHoursEnabled"
             type="checkbox"
+            class="ltr:mr-2 rtl:ml-2"
             name="toggle-business-hours"
           />
           {{ $t('INBOX_MGMT.BUSINESS_HOURS.TOGGLE_AVAILABILITY') }}
         </label>
-        <p>{{ $t('INBOX_MGMT.BUSINESS_HOURS.TOGGLE_HELP') }}</p>
+        <p class="text-slate-700 dark:text-slate-300 mb-4">
+          {{ $t('INBOX_MGMT.BUSINESS_HOURS.TOGGLE_HELP') }}
+        </p>
         <div v-if="isBusinessHoursEnabled" class="mb-6">
           <div class="max-w-[37.5rem]">
             <label class="unavailable-input-wrap">
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/CollaboratorsPage.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/CollaboratorsPage.vue
index 302bf7281..2046847b3 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/CollaboratorsPage.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/CollaboratorsPage.vue
@@ -31,8 +31,8 @@
       :title="$t('INBOX_MGMT.SETTINGS_POPUP.AGENT_ASSIGNMENT')"
       :sub-title="$t('INBOX_MGMT.SETTINGS_POPUP.AGENT_ASSIGNMENT_SUB_TEXT')"
     >
-      <label class="w-[75%] settings-item">
-        <div class="enter-to-send--checkbox">
+      <label class="w-3/4 settings-item">
+        <div class="flex items-center gap-2">
           <input
             id="enableAutoAssignment"
             v-model="enableAutoAssignment"
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 5dc448e30..0aa3b1c09 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/ConfigurationPage.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/ConfigurationPage.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-if="isATwilioChannel" class="settings--content">
+  <div v-if="isATwilioChannel" class="mx-8">
     <settings-section
       :title="$t('INBOX_MGMT.ADD.TWILIO.API_CALLBACK.TITLE')"
       :sub-title="$t('INBOX_MGMT.ADD.TWILIO.API_CALLBACK.SUBTITLE')"
@@ -7,7 +7,7 @@
       <woot-code :script="inbox.callback_webhook_url" lang="html" />
     </settings-section>
   </div>
-  <div v-else-if="isALineChannel" class="settings--content">
+  <div v-else-if="isALineChannel" class="mx-8">
     <settings-section
       :title="$t('INBOX_MGMT.ADD.LINE_CHANNEL.API_CALLBACK.TITLE')"
       :sub-title="$t('INBOX_MGMT.ADD.LINE_CHANNEL.API_CALLBACK.SUBTITLE')"
@@ -16,7 +16,7 @@
     </settings-section>
   </div>
   <div v-else-if="isAWebWidgetInbox">
-    <div class="settings--content">
+    <div class="mx-8">
       <settings-section
         :title="$t('INBOX_MGMT.SETTINGS_POPUP.MESSENGER_HEADING')"
         :sub-title="$t('INBOX_MGMT.SETTINGS_POPUP.MESSENGER_SUB_HEAD')"
@@ -48,7 +48,7 @@
         :title="$t('INBOX_MGMT.SETTINGS_POPUP.HMAC_MANDATORY_VERIFICATION')"
         :sub-title="$t('INBOX_MGMT.SETTINGS_POPUP.HMAC_MANDATORY_DESCRIPTION')"
       >
-        <div class="enter-to-send--checkbox">
+        <div class="flex items-center gap-2">
           <input
             id="hmacMandatory"
             v-model="hmacMandatory"
@@ -62,7 +62,7 @@
       </settings-section>
     </div>
   </div>
-  <div v-else-if="isAPIInbox" class="settings--content">
+  <div v-else-if="isAPIInbox" class="mx-8">
     <settings-section
       :title="$t('INBOX_MGMT.SETTINGS_POPUP.INBOX_IDENTIFIER')"
       :sub-title="$t('INBOX_MGMT.SETTINGS_POPUP.INBOX_IDENTIFIER_SUB_TEXT')"
@@ -80,7 +80,7 @@
       :title="$t('INBOX_MGMT.SETTINGS_POPUP.HMAC_MANDATORY_VERIFICATION')"
       :sub-title="$t('INBOX_MGMT.SETTINGS_POPUP.HMAC_MANDATORY_DESCRIPTION')"
     >
-      <div class="enter-to-send--checkbox">
+      <div class="flex items-center gap-2">
         <input
           id="hmacMandatory"
           v-model="hmacMandatory"
@@ -94,7 +94,7 @@
     </settings-section>
   </div>
   <div v-else-if="isAnEmailChannel">
-    <div class="settings--content">
+    <div class="mx-8">
       <settings-section
         :title="$t('INBOX_MGMT.SETTINGS_POPUP.FORWARD_EMAIL_TITLE')"
         :sub-title="$t('INBOX_MGMT.SETTINGS_POPUP.FORWARD_EMAIL_SUB_TEXT')"
@@ -110,7 +110,7 @@
     />
   </div>
   <div v-else-if="isAWhatsAppChannel && !isATwilioChannel">
-    <div v-if="inbox.provider_config" class="settings--content">
+    <div v-if="inbox.provider_config" class="mx-8">
       <settings-section
         :title="$t('INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_WEBHOOK_TITLE')"
         :sub-title="$t('INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_WEBHOOK_SUBHEADER')"
@@ -129,11 +129,13 @@
           $t('INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_SECTION_UPDATE_SUBHEADER')
         "
       >
-        <div class="whatsapp-settings--content">
+        <div
+          class="whatsapp-settings--content items-center flex flex-1 justify-between mt-2"
+        >
           <woot-input
             v-model.trim="whatsAppInboxAPIKey"
             type="text"
-            class="input"
+            class="flex-1 mr-2"
             :placeholder="
               $t(
                 'INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_SECTION_UPDATE_PLACEHOLDER'
@@ -238,22 +240,8 @@ export default {
 </script>
 <style lang="scss" scoped>
 .whatsapp-settings--content {
-  align-items: center;
-  display: flex;
-  flex: 1;
-  justify-content: space-between;
-  margin-top: var(--space-small);
-
-  .input {
-    flex: 1;
-    margin-right: var(--space-small);
-    ::v-deep input {
-      margin-bottom: 0;
-    }
+  ::v-deep input {
+    margin-bottom: 0;
   }
 }
-
-.hmac-link-to-docs {
-  margin-top: var(--space-small);
-}
 </style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrationapps/IntegrationItem.vue b/app/javascript/dashboard/routes/dashboard/settings/integrationapps/IntegrationItem.vue
index 2ef74573d..151afd049 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/integrationapps/IntegrationItem.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrationapps/IntegrationItem.vue
@@ -7,10 +7,10 @@
       />
     </div>
     <div class="flex flex-col justify-center m-0 mx-4 flex-1">
-      <h3 class="text-xl text-slate-800 dark:text-slate-100">
+      <h3 class="text-xl font-medium mb-1 text-slate-800 dark:text-slate-100">
         {{ integrationName }}
       </h3>
-      <p>
+      <p class="text-slate-700 dark:text-slate-200">
         {{
           useInstallationName(
             integrationDescription,
@@ -20,7 +20,11 @@
       </p>
     </div>
     <div class="flex justify-center items-center mb-0 w-[15%]">
-      <woot-label :title="labelText" :color-scheme="labelColor" />
+      <woot-label
+        :title="labelText"
+        :color-scheme="labelColor"
+        class="text-xs rounded-sm"
+      />
     </div>
     <div class="flex justify-center items-center mb-0 w-[15%]">
       <router-link
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrationapps/MultipleIntegrationHooks.vue b/app/javascript/dashboard/routes/dashboard/settings/integrationapps/MultipleIntegrationHooks.vue
index 624e7fbf5..aea851ee7 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/integrationapps/MultipleIntegrationHooks.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrationapps/MultipleIntegrationHooks.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="flex flex-row gap-4">
-    <div class="w-[60%]">
+    <div class="w-full lg:w-3/5">
       <table v-if="hasConnectedHooks" class="woot-table">
         <thead>
           <th v-for="hookHeader in hookHeaders" :key="hookHeader">
@@ -22,7 +22,7 @@
             <td v-if="isHookTypeInbox" class="break-words">
               {{ inboxName(hook) }}
             </td>
-            <td class="button-wrapper">
+            <td class="flex justify-end gap-1">
               <woot-button
                 v-tooltip.top="$t('INTEGRATION_APPS.LIST.DELETE.BUTTON_TEXT')"
                 variant="smooth"
@@ -36,7 +36,7 @@
           </tr>
         </tbody>
       </table>
-      <p v-else class="flex h-full items-center flex-col justify-center">
+      <p v-else class="flex flex-col items-center justify-center h-full">
         {{
           $t('INTEGRATION_APPS.NO_HOOK_CONFIGURED', {
             integrationId: integration.id,
@@ -44,7 +44,7 @@
         }}
       </p>
     </div>
-    <div class="w-[34%]">
+    <div class="hidden w-1/3 lg:block">
       <p>
         <b>{{ integration.name }}</b>
       </p>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrationapps/SingleIntegrationHooks.vue b/app/javascript/dashboard/routes/dashboard/settings/integrationapps/SingleIntegrationHooks.vue
index 3c4db8a32..3f8dfccea 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/integrationapps/SingleIntegrationHooks.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrationapps/SingleIntegrationHooks.vue
@@ -12,10 +12,12 @@
             />
           </div>
           <div class="flex flex-col justify-center m-0 mx-4 flex-1">
-            <h3 class="text-xl text-slate-800 dark:text-slate-100">
+            <h3
+              class="text-xl font-medium mb-1 text-slate-800 dark:text-slate-100"
+            >
               {{ integration.name }}
             </h3>
-            <p>
+            <p class="text-slate-700 dark:text-slate-200">
               {{ integration.description }}
             </p>
           </div>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrations/DashboardApps/DashboardAppModal.vue b/app/javascript/dashboard/routes/dashboard/settings/integrations/DashboardApps/DashboardAppModal.vue
index 82952ce29..abdd99344 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/integrations/DashboardApps/DashboardAppModal.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrations/DashboardApps/DashboardAppModal.vue
@@ -1,9 +1,8 @@
 <template>
   <woot-modal :show="show" :on-close="closeModal">
-    <div class="h-auto overflow-auto flex flex-col">
+    <div class="flex flex-col h-auto overflow-auto">
       <woot-modal-header :header-title="header" />
-
-      <form class="mx-0 flex flex-wrap" @submit.prevent="submit">
+      <form class="w-full" @submit.prevent="submit">
         <woot-input
           v-model.trim="app.title"
           :class="{ error: $v.app.title.$error }"
@@ -36,7 +35,7 @@
           data-testid="app-url"
           @input="$v.app.content.url.$touch"
         />
-        <div class="flex flex-row justify-end gap-2 py-2 px-0 w-full">
+        <div class="flex flex-row justify-end w-full gap-2 px-0 py-2">
           <woot-button
             :is-loading="isLoading"
             :is-disabled="$v.$invalid"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrations/DashboardApps/DashboardAppsRow.vue b/app/javascript/dashboard/routes/dashboard/settings/integrations/DashboardApps/DashboardAppsRow.vue
index 17650d1c5..35a990724 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/integrations/DashboardApps/DashboardAppsRow.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrations/DashboardApps/DashboardAppsRow.vue
@@ -1,14 +1,12 @@
 <template>
   <tr>
-    <td>
+    <td class="w-40 max-w-[10rem] truncate" :title="app.title">
       {{ app.title }}
     </td>
-    <td class="dashboard-app-label-url">
-      <span class="overflow-hidden whitespace-nowrap text-ellipsis">
-        {{ app.content[0].url }}
-      </span>
+    <td class="max-w-xs truncate" :title="app.content[0].url">
+      {{ app.content[0].url }}
     </td>
-    <td class="button-wrapper">
+    <td class="flex justify-end gap-1">
       <woot-button
         v-tooltip.top="
           $t('INTEGRATION_SETTINGS.DASHBOARD_APPS.LIST.EDIT_TOOLTIP')
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrations/DashboardApps/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/integrations/DashboardApps/Index.vue
index 33a9a567c..5c94793c0 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/integrations/DashboardApps/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrations/DashboardApps/Index.vue
@@ -9,7 +9,7 @@
       {{ $t('INTEGRATION_SETTINGS.DASHBOARD_APPS.HEADER_BTN_TXT') }}
     </woot-button>
     <div class="flex flex-row gap-4">
-      <div class="w-[60%]">
+      <div class="w-full lg:w-3/5">
         <p
           v-if="!uiFlags.isFetching && !records.length"
           class="flex h-full items-center flex-col justify-center"
@@ -44,7 +44,7 @@
         </table>
       </div>
 
-      <div class="w-[34%]">
+      <div class="w-1/3 hidden lg:block">
         <span
           v-dompurify-html="
             useInstallationName(
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrations/Integration.vue b/app/javascript/dashboard/routes/dashboard/settings/integrations/Integration.vue
index 4efe4e003..32e239fea 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/integrations/Integration.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrations/Integration.vue
@@ -8,10 +8,10 @@
         class="p-2 h-16 w-16 mr-4"
       />
       <div>
-        <h3 class="text-xl text-slate-800 dark:text-slate-100">
+        <h3 class="text-xl font-medium mb-1 text-slate-800 dark:text-slate-100">
           {{ integrationName }}
         </h3>
-        <p>
+        <p class="text-slate-700 dark:text-slate-200">
           {{
             useInstallationName(
               integrationDescription,
@@ -49,7 +49,7 @@
         </div>
       </router-link>
       <div v-if="!integrationEnabled">
-        <a :href="integrationAction" class="button success nice">
+        <a :href="integrationAction" class="button success nice rounded">
           {{ $t('INTEGRATION_SETTINGS.CONNECT.BUTTON_TEXT') }}
         </a>
       </div>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/Index.vue
index 547f5f4cd..d1ee7ba9b 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/Index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="flex-1 overflow-auto p-4">
+  <div class="flex-1 p-4 overflow-auto">
     <woot-button
       color-scheme="success"
       class-names="button--fixed-top"
@@ -10,10 +10,10 @@
     </woot-button>
 
     <div class="flex flex-row gap-4">
-      <div class="w-[60%]">
+      <div class="w-full lg:w-3/5">
         <p
           v-if="!uiFlags.fetchingList && !records.length"
-          class="flex h-full items-center flex-col justify-center"
+          class="flex flex-col items-center justify-center h-full"
         >
           {{ $t('INTEGRATION_SETTINGS.WEBHOOK.LIST.404') }}
         </p>
@@ -32,6 +32,7 @@
                 'INTEGRATION_SETTINGS.WEBHOOK.LIST.TABLE_HEADER'
               )"
               :key="thHeader"
+              class="last:text-right"
             >
               {{ thHeader }}
             </th>
@@ -49,7 +50,7 @@
         </table>
       </div>
 
-      <div class="w-[34%]">
+      <div class="hidden w-1/3 lg:block">
         <span
           v-dompurify-html="
             useInstallationName(
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/WebhookForm.vue b/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/WebhookForm.vue
index 48a1b39fd..a917ddec5 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/WebhookForm.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/WebhookForm.vue
@@ -17,18 +17,24 @@
       <label :class="{ error: $v.url.$error }" class="mb-2">
         {{ $t('INTEGRATION_SETTINGS.WEBHOOK.FORM.SUBSCRIPTIONS.LABEL') }}
       </label>
-      <div v-for="event in supportedWebhookEvents" :key="event">
-        <input
-          :id="event"
-          v-model="subscriptions"
-          type="checkbox"
-          :value="event"
-          name="subscriptions"
-          class="checkbox"
-        />
-        <span class="text-sm">
-          {{ `${getEventLabel(event)} (${event})` }}
-        </span>
+      <div class="flex flex-col gap-2.5 mb-4">
+        <div
+          v-for="event in supportedWebhookEvents"
+          :key="event"
+          class="flex items-center"
+        >
+          <input
+            :id="event"
+            v-model="subscriptions"
+            type="checkbox"
+            :value="event"
+            name="subscriptions"
+            class="checkbox"
+          />
+          <label :for="event" class="text-sm">
+            {{ `${getEventLabel(event)} (${event})` }}
+          </label>
+        </div>
       </div>
     </div>
 
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/WebhookRow.vue b/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/WebhookRow.vue
index 72b13b4df..b27cb6162 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/WebhookRow.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/WebhookRow.vue
@@ -1,17 +1,17 @@
 <template>
-  <tr>
-    <td>
-      <div class="text-slate-700 dark:text-slate-100 font-medium break-words">
+  <tr class="space-x-2">
+    <td class="max-w-2xl">
+      <div class="font-medium break-words text-slate-700 dark:text-slate-100">
         {{ webhook.url }}
       </div>
-      <span class="text-slate-500 dark:text-slate-400 text-xs">
+      <span class="text-xs text-slate-500 dark:text-slate-400">
         <span class="font-medium">
           {{ $t('INTEGRATION_SETTINGS.WEBHOOK.SUBSCRIBED_EVENTS') }}:
         </span>
         <show-more :text="subscribedEvents" :limit="60" />
       </span>
     </td>
-    <td class="max-w-[6.25rem] min-w-[auto] flex gap-3">
+    <td class="min-w-[7rem] flex gap-1 justify-end flex-shrink-0">
       <woot-button
         v-tooltip.top="$t('INTEGRATION_SETTINGS.WEBHOOK.EDIT.BUTTON_TEXT')"
         variant="smooth"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/labels/AddLabel.vue b/app/javascript/dashboard/routes/dashboard/settings/labels/AddLabel.vue
index 86790be13..191b3149c 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/labels/AddLabel.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/labels/AddLabel.vue
@@ -32,7 +32,7 @@
           <woot-color-picker v-model="color" />
         </label>
       </div>
-      <div class="w-full">
+      <div class="w-full flex items-center gap-2">
         <input v-model="showOnSidebar" type="checkbox" :value="true" />
         <label for="conversation_creation">
           {{ $t('LABEL_MGMT.FORM.SHOW_ON_SIDEBAR.LABEL') }}
diff --git a/app/javascript/dashboard/routes/dashboard/settings/labels/EditLabel.vue b/app/javascript/dashboard/routes/dashboard/settings/labels/EditLabel.vue
index 6a434d90f..958b05a12 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/labels/EditLabel.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/labels/EditLabel.vue
@@ -26,7 +26,7 @@
           <woot-color-picker v-model="color" />
         </label>
       </div>
-      <div class="w-full">
+      <div class="w-full flex items-center gap-2">
         <input v-model="showOnSidebar" type="checkbox" :value="true" />
         <label for="conversation_creation">
           {{ $t('LABEL_MGMT.FORM.SHOW_ON_SIDEBAR.LABEL') }}
diff --git a/app/javascript/dashboard/routes/dashboard/settings/labels/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/labels/Index.vue
index bcc74f4c8..dad8af733 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/labels/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/labels/Index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="flex-1 overflow-auto p-4">
+  <div class="flex-1 overflow-auto">
     <woot-button
       color-scheme="success"
       class-names="button--fixed-top"
@@ -8,8 +8,8 @@
     >
       {{ $t('LABEL_MGMT.HEADER_BTN_TXT') }}
     </woot-button>
-    <div class="flex flex-row gap-4">
-      <div class="w-[60%]">
+    <div class="flex flex-row gap-4 p-8">
+      <div class="w-full xl:w-3/5">
         <p
           v-if="!uiFlags.isFetching && !records.length"
           class="flex h-full items-center flex-col justify-center"
@@ -73,7 +73,7 @@
         </table>
       </div>
 
-      <div class="w-[34%]">
+      <div class="w-1/3 hidden xl:block">
         <span v-dompurify-html="$t('LABEL_MGMT.SIDEBAR_TXT')" />
       </div>
     </div>
@@ -197,6 +197,7 @@ export default {
 .label-color--display {
   @apply rounded h-4 w-4 mr-1 rtl:mr-0 rtl:ml-1 border border-solid border-slate-50 dark:border-slate-700;
 }
+
 .label-title {
   span {
     @apply w-60 inline-block;
diff --git a/app/javascript/dashboard/routes/dashboard/settings/macros/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/macros/Index.vue
index c76b5e21e..f32bb6f17 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/macros/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/macros/Index.vue
@@ -1,16 +1,16 @@
 <template>
-  <div class="flex-1 overflow-auto p-4">
+  <div class="flex-1 overflow-auto">
     <router-link
       :to="addAccountScoping('settings/macros/new')"
-      class="button success button--fixed-top flex gap-1"
+      class="button success button--fixed-top button success button--fixed-top px-3.5 py-1 rounded-[5px] flex gap-2"
     >
       <fluent-icon icon="add-circle" />
       <span class="button__content">
         {{ $t('MACROS.HEADER_BTN_TXT') }}
       </span>
     </router-link>
-    <div class="flex flex-row gap-4">
-      <div class="w-[60%]">
+    <div class="flex flex-row gap-4 p-8">
+      <div class="w-full lg:w-3/5">
         <div v-if="!uiFlags.isFetching && !records.length" class="p-3">
           <p class="flex h-full items-center flex-col justify-center">
             {{ $t('MACROS.LIST.404') }}
@@ -39,7 +39,7 @@
           </tbody>
         </table>
       </div>
-      <div class="w-[34%]">
+      <div class="hidden lg:block w-1/3">
         <span v-dompurify-html="$t('MACROS.SIDEBAR_TXT')" />
       </div>
     </div>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/macros/MacroProperties.vue b/app/javascript/dashboard/routes/dashboard/settings/macros/MacroProperties.vue
index b1aab66d8..078c4b369 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/macros/MacroProperties.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/macros/MacroProperties.vue
@@ -71,10 +71,11 @@
         </p>
       </div>
     </div>
-    <div class="mt-auto">
+    <div class="mt-auto w-full">
       <woot-button
         size="expanded"
         color-scheme="success"
+        class="w-full"
         @click="$emit('submit')"
       >
         {{ $t('MACROS.HEADER_BTN_TXT_SAVE') }}
diff --git a/app/javascript/dashboard/routes/dashboard/settings/profile/ChangePassword.vue b/app/javascript/dashboard/routes/dashboard/settings/profile/ChangePassword.vue
index 9b9623948..8eb7201ae 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/profile/ChangePassword.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/profile/ChangePassword.vue
@@ -1,13 +1,15 @@
 <template>
   <form @submit.prevent="changePassword()">
-    <div class="profile--settings--row text-black-900 dark:text-slate-300 row">
-      <div class="columns small-3">
-        <h4 class="block-title text-black-900 dark:text-slate-200">
+    <div
+      class="profile--settings--row text-black-900 dark:text-slate-300 flex items-center"
+    >
+      <div class="w-1/4">
+        <h4 class="text-lg text-black-900 dark:text-slate-200">
           {{ $t('PROFILE_SETTINGS.FORM.PASSWORD_SECTION.TITLE') }}
         </h4>
         <p>{{ $t('PROFILE_SETTINGS.FORM.PASSWORD_SECTION.NOTE') }}</p>
       </div>
-      <div class="columns small-9 medium-5">
+      <div class="w-[45%] p-4">
         <woot-input
           v-model="currentPassword"
           type="password"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/profile/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/profile/Index.vue
index 4a1c81bda..f337b333b 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/profile/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/profile/Index.vue
@@ -4,8 +4,8 @@
       <div
         class="flex flex-row border-b border-slate-50 dark:border-slate-700 items-center flex p-4"
       >
-        <div class="w-[25%] py-4 pr-6 ml-0">
-          <h4 class="block-title text-black-900 dark:text-slate-200">
+        <div class="w-1/4 py-4 pr-6 ml-0">
+          <h4 class="text-lg text-black-900 dark:text-slate-200">
             {{ $t('PROFILE_SETTINGS.FORM.PROFILE_SECTION.TITLE') }}
           </h4>
           <p>{{ $t('PROFILE_SETTINGS.FORM.PROFILE_SECTION.NOTE') }}</p>
@@ -75,19 +75,19 @@
     <div
       class="border-b border-slate-50 dark:border-slate-700 items-center flex p-4 text-black-900 dark:text-slate-300 row"
     >
-      <div class="w-[25%] py-4 pr-6 ml-0">
-        <h4 class="block-title text-black-900 dark:text-slate-200">
+      <div class="w-1/4 py-4 pr-6 ml-0">
+        <h4 class="text-lg text-black-900 dark:text-slate-200">
           {{ $t('PROFILE_SETTINGS.FORM.SEND_MESSAGE.TITLE') }}
         </h4>
         <p>
           {{ $t('PROFILE_SETTINGS.FORM.SEND_MESSAGE.NOTE') }}
         </p>
       </div>
-      <div class="p-4 w-[45%] flex flex-row">
+      <div class="p-4 w-[45%] flex gap-4 flex-row">
         <button
           v-for="keyOption in keyOptions"
           :key="keyOption.key"
-          class="cursor-pointer mr-4"
+          class="cursor-pointer p-0"
           @click="toggleEditorMessageKey(keyOption.key)"
         >
           <preview-card
@@ -104,8 +104,8 @@
     <div
       class="border-b border-slate-50 dark:border-slate-700 items-center flex p-4 text-black-900 dark:text-slate-300 row"
     >
-      <div class="w-[25%] py-4 pr-6 ml-0">
-        <h4 class="block-title text-black-900 dark:text-slate-200">
+      <div class="w-1/4 py-4 pr-6 ml-0">
+        <h4 class="text-lg text-black-900 dark:text-slate-200">
           {{ $t('PROFILE_SETTINGS.FORM.ACCESS_TOKEN.TITLE') }}
         </h4>
         <p>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/profile/MessageSignature.vue b/app/javascript/dashboard/routes/dashboard/settings/profile/MessageSignature.vue
index bc2356ff4..d2eb246d5 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/profile/MessageSignature.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/profile/MessageSignature.vue
@@ -1,7 +1,9 @@
 <template>
-  <div class="profile--settings--row text-black-900 dark:text-slate-300 row">
-    <div class="w-[25%] py-4 pr-6 ml-0">
-      <h4 class="block-title text-black-900 dark:text-slate-200">
+  <div
+    class="profile--settings--row text-black-900 dark:text-slate-300 flex items-center"
+  >
+    <div class="w-1/4 py-4 pr-6 ml-0">
+      <h4 class="text-lg text-black-900 dark:text-slate-200">
         {{ $t('PROFILE_SETTINGS.FORM.MESSAGE_SIGNATURE_SECTION.TITLE') }}
       </h4>
       <p>{{ $t('PROFILE_SETTINGS.FORM.MESSAGE_SIGNATURE_SECTION.NOTE') }}</p>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/profile/NotificationSettings.vue b/app/javascript/dashboard/routes/dashboard/settings/profile/NotificationSettings.vue
index be0f338f6..7214d0deb 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/profile/NotificationSettings.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/profile/NotificationSettings.vue
@@ -1,24 +1,26 @@
 <template>
   <div id="profile-settings-notifications">
-    <div class="profile--settings--row text-black-900 dark:text-slate-300 row">
-      <div class="columns small-3">
-        <h4 class="block-title text-black-900 dark:text-slate-200">
+    <div
+      class="profile--settings--row text-black-900 dark:text-slate-300 flex items-center"
+    >
+      <div class="w-1/4">
+        <h4 class="text-lg text-black-900 dark:text-slate-200">
           {{ $t('PROFILE_SETTINGS.FORM.AUDIO_NOTIFICATIONS_SECTION.TITLE') }}
         </h4>
         <p>
           {{ $t('PROFILE_SETTINGS.FORM.AUDIO_NOTIFICATIONS_SECTION.NOTE') }}
         </p>
       </div>
-      <div class="columns small-9">
-        <div class="notification-items--wrapper">
-          <span class="text-block-title notification-label">
+      <div class="w-[45%] p-4">
+        <div class="mb-4">
+          <span class="text-sm notification-label">
             {{
               $t(
                 'PROFILE_SETTINGS.FORM.AUDIO_NOTIFICATIONS_SECTION.ALERT_TYPE.TITLE'
               )
             }}
           </span>
-          <div>
+          <div class="flex items-center gap-2 mb-1">
             <input
               id="audio_enable_alert_none"
               v-model="enableAudioAlerts"
@@ -35,7 +37,7 @@
               }}
             </label>
           </div>
-          <div>
+          <div class="flex items-center gap-2 mb-1">
             <input
               id="audio_enable_alert_mine"
               v-model="enableAudioAlerts"
@@ -52,7 +54,7 @@
               }}
             </label>
           </div>
-          <div>
+          <div class="flex items-center gap-2 mb-1">
             <input
               id="audio_enable_alert_all"
               v-model="enableAudioAlerts"
@@ -70,8 +72,8 @@
             </label>
           </div>
         </div>
-        <div class="notification-items--wrapper">
-          <span class="text-block-title notification-label">
+        <div class="mb-4">
+          <span class="text-sm notification-label">
             {{
               $t(
                 'PROFILE_SETTINGS.FORM.AUDIO_NOTIFICATIONS_SECTION.DEFAULT_TONE.TITLE'
@@ -81,7 +83,7 @@
           <div>
             <select
               v-model="notificationTone"
-              class="tone-selector"
+              class="tone-selector mb-0"
               @change="handleAudioToneChange"
             >
               <option
@@ -94,15 +96,15 @@
             </select>
           </div>
         </div>
-        <div class="notification-items--wrapper">
-          <span class="text-block-title notification-label">
+        <div class="mb-1">
+          <span class="text-sm notification-label">
             {{
               $t(
                 'PROFILE_SETTINGS.FORM.AUDIO_NOTIFICATIONS_SECTION.CONDITIONS.TITLE'
               )
             }}
           </span>
-          <div>
+          <div class="flex items-center gap-2 mb-1">
             <input
               id="audio_alert_when_tab_is_inactive"
               v-model="playAudioWhenTabIsInactive"
@@ -119,7 +121,7 @@
               }}
             </label>
           </div>
-          <div>
+          <div class="flex items-center gap-2 mb-1">
             <input
               id="audio_alert_until_all_conversations_are_read"
               v-model="alertIfUnreadConversationExist"
@@ -139,17 +141,19 @@
         </div>
       </div>
     </div>
-    <div class="profile--settings--row text-black-900 dark:text-slate-300 row">
-      <div class="columns small-3">
-        <h4 class="block-title text-black-900 dark:text-slate-200">
+    <div
+      class="profile--settings--row text-black-900 dark:text-slate-300 flex items-center"
+    >
+      <div class="w-1/4">
+        <h4 class="text-lg text-black-900 dark:text-slate-200">
           {{ $t('PROFILE_SETTINGS.FORM.EMAIL_NOTIFICATIONS_SECTION.TITLE') }}
         </h4>
         <p>
           {{ $t('PROFILE_SETTINGS.FORM.EMAIL_NOTIFICATIONS_SECTION.NOTE') }}
         </p>
       </div>
-      <div class="columns small-9">
-        <div>
+      <div class="w-[45%] p-4">
+        <div class="flex items-center gap-2 mb-1">
           <input
             v-model="selectedEmailFlags"
             class="notification--checkbox"
@@ -166,7 +170,7 @@
           </label>
         </div>
 
-        <div>
+        <div class="flex items-center gap-2 mb-1">
           <input
             v-model="selectedEmailFlags"
             class="notification--checkbox"
@@ -183,7 +187,7 @@
           </label>
         </div>
 
-        <div>
+        <div class="flex items-center gap-2 mb-1">
           <input
             v-model="selectedEmailFlags"
             class="notification--checkbox"
@@ -200,7 +204,7 @@
           </label>
         </div>
 
-        <div>
+        <div class="flex items-center gap-2 mb-1">
           <input
             v-model="selectedEmailFlags"
             class="notification--checkbox"
@@ -216,7 +220,7 @@
             }}
           </label>
         </div>
-        <div>
+        <div class="flex items-center gap-2 mb-1">
           <input
             v-model="selectedEmailFlags"
             class="notification--checkbox"
@@ -236,15 +240,15 @@
     </div>
     <div
       v-if="vapidPublicKey && hasPushAPISupport"
-      class="profile--settings--row text-black-900 dark:text-slate-300 row push-row"
+      class="profile--settings--row text-black-900 dark:text-slate-300 flex items-center push-row"
     >
-      <div class="columns small-3">
-        <h4 class="block-title text-black-900 dark:text-slate-200">
+      <div class="w-1/4">
+        <h4 class="text-lg text-black-900 dark:text-slate-200">
           {{ $t('PROFILE_SETTINGS.FORM.PUSH_NOTIFICATIONS_SECTION.TITLE') }}
         </h4>
         <p>{{ $t('PROFILE_SETTINGS.FORM.PUSH_NOTIFICATIONS_SECTION.NOTE') }}</p>
       </div>
-      <div class="columns small-9">
+      <div class="w-[45%] p-4">
         <p v-if="hasEnabledPushPermissions">
           {{
             $t(
@@ -264,7 +268,7 @@
             @click="onRequestPermissions"
           />
         </div>
-        <div>
+        <div class="flex items-center gap-2 mb-1">
           <input
             v-model="selectedPushFlags"
             class="notification--checkbox"
@@ -281,7 +285,7 @@
           </label>
         </div>
 
-        <div>
+        <div class="flex items-center gap-2 mb-1">
           <input
             v-model="selectedPushFlags"
             class="notification--checkbox"
@@ -298,7 +302,7 @@
           </label>
         </div>
 
-        <div>
+        <div class="flex items-center gap-2 mb-1">
           <input
             v-model="selectedPushFlags"
             class="notification--checkbox"
@@ -315,7 +319,7 @@
           </label>
         </div>
 
-        <div>
+        <div class="flex items-center gap-2 mb-1">
           <input
             v-model="selectedPushFlags"
             class="notification--checkbox"
@@ -332,7 +336,7 @@
           </label>
         </div>
 
-        <div>
+        <div class="flex items-center gap-2 mb-1">
           <input
             v-model="selectedPushFlags"
             class="notification--checkbox"
@@ -525,10 +529,6 @@ export default {
   margin-bottom: var(--space-one);
 }
 
-.notification-items--wrapper {
-  margin-bottom: var(--space-smaller);
-}
-
 .notification-label {
   display: flex;
   font-weight: var(--font-weight-bold);
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/LiveReports.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/LiveReports.vue
index b36b160b2..e2ff4b443 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/LiveReports.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/LiveReports.vue
@@ -1,7 +1,9 @@
 <template>
   <div class="flex-1 overflow-auto p-4">
-    <div class="row">
-      <div class="column small-12 medium-8 conversation-metric">
+    <div class="flex flex-col md:flex-row items-center">
+      <div
+        class="flex-1 w-full max-w-full md:w-[65%] md:max-w-[65%] conversation-metric"
+      >
         <metric-card
           :header="$t('OVERVIEW_REPORTS.ACCOUNT_CONVERSATIONS.HEADER')"
           :is-loading="uiFlags.isFetchingAccountConversationMetric"
@@ -12,7 +14,7 @@
           <div
             v-for="(metric, name, index) in conversationMetrics"
             :key="index"
-            class="metric-content column"
+            class="metric-content flex-1 min-w-0"
           >
             <h3 class="heading">
               {{ name }}
@@ -21,12 +23,12 @@
           </div>
         </metric-card>
       </div>
-      <div class="column small-12 medium-4">
+      <div class="flex-1 w-full max-w-full md:w-[35%] md:max-w-[35%]">
         <metric-card :header="$t('OVERVIEW_REPORTS.AGENT_STATUS.HEADER')">
           <div
             v-for="(metric, name, index) in agentStatusMetrics"
             :key="index"
-            class="metric-content column"
+            class="metric-content flex-1 min-w-0"
           >
             <h3 class="heading">
               {{ name }}
@@ -36,7 +38,7 @@
         </metric-card>
       </div>
     </div>
-    <div class="row">
+    <div class="max-w-full flex flex-wrap flex-row ml-auto mr-auto">
       <metric-card :header="$t('OVERVIEW_REPORTS.CONVERSATION_HEATMAP.HEADER')">
         <template #control>
           <woot-button
@@ -55,7 +57,7 @@
         />
       </metric-card>
     </div>
-    <div class="row">
+    <div class="max-w-full flex flex-wrap flex-row ml-auto mr-auto">
       <metric-card :header="$t('OVERVIEW_REPORTS.AGENT_CONVERSATIONS.HEADER')">
         <agent-table
           :agents="agents"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatMetrics.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatMetrics.vue
index c9f55bb68..5fe1fa358 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatMetrics.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatMetrics.vue
@@ -31,7 +31,7 @@
           <div
             v-for="(rating, key, index) in ratingPercentage"
             :key="rating + key + index"
-            class="pr-4 rtl:pl-4"
+            class="ltr:pr-4 rtl:pl-4"
           >
             <span class="my-0 mx-0.5">{{ ratingToEmoji(key) }}</span>
             <span>{{ formatToPercent(rating) }}</span>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/Filters/Labels.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/Filters/Labels.vue
index d9d2f4532..d32879507 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/Filters/Labels.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/Filters/Labels.vue
@@ -12,26 +12,26 @@
       @input="handleInput"
     >
       <template slot="singleLabel" slot-scope="props">
-        <div class="reports-option__wrap">
+        <div class="flex items-center gap-2">
           <div
             :style="{ backgroundColor: props.option.color }"
-            class="reports-option__rounded--item"
+            class="rounded-full h-5 w-5"
           />
           <span class="reports-option__desc">
-            <span class="reports-option__title">
+            <span class="my-0 text-slate-800 dark:text-slate-75">
               {{ props.option.title }}
             </span>
           </span>
         </div>
       </template>
       <template slot="option" slot-scope="props">
-        <div class="reports-option__wrap">
+        <div class="flex items-center gap-2">
           <div
             :style="{ backgroundColor: props.option.color }"
-            class="reports-option__rounded--item reports-option__item reports-option__label--swatch"
+            class="rounded-full h-5 w-5 flex-shrink-0 border border-solid border-slate-100 dark:border-slate-800"
           />
           <span class="reports-option__desc">
-            <span class="reports-option__title">
+            <span class="my-0 text-slate-800 dark:text-slate-75">
               {{ props.option.title }}
             </span>
           </span>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/Heatmap.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/Heatmap.vue
index 41fa0b995..fb7e7b5eb 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/Heatmap.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/Heatmap.vue
@@ -217,7 +217,7 @@ $marker-height: var(--space-two);
     font-weight: var(--font-weight-bold);
     display: flex;
     flex-direction: column;
-    align-items: end;
+    align-items: flex-end;
     justify-content: center;
     @apply text-slate-800 dark:text-slate-200;
 
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/ReportFilters.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/ReportFilters.vue
index ccbce83a6..88eae0541 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/ReportFilters.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/ReportFilters.vue
@@ -19,7 +19,7 @@
           @input="changeFilterSelection"
         >
           <template slot="singleLabel" slot-scope="props">
-            <div class="reports-option__wrap">
+            <div class="flex items-center gap-2">
               <thumbnail
                 :src="props.option.thumbnail"
                 :status="props.option.availability_status"
@@ -27,21 +27,23 @@
                 size="22px"
               />
               <span class="reports-option__desc">
-                <span class="reports-option__title">{{
+                <span class="my-0 text-slate-800 dark:text-slate-75">{{
                   props.option.name
                 }}</span>
               </span>
             </div>
           </template>
           <template slot="option" slot-scope="props">
-            <div class="reports-option__wrap">
+            <div class="flex items-center gap-2">
               <thumbnail
                 :src="props.option.thumbnail"
                 :status="props.option.availability_status"
                 :username="props.option.name"
                 size="22px"
               />
-              <p class="reports-option__title">{{ props.option.name }}</p>
+              <p class="my-0 text-slate-800 dark:text-slate-75">
+                {{ props.option.name }}
+              </p>
             </div>
           </template>
         </multiselect>
@@ -64,26 +66,26 @@
           @input="changeFilterSelection"
         >
           <template slot="singleLabel" slot-scope="props">
-            <div class="reports-option__wrap">
+            <div class="flex gap-2 items-center">
               <div
                 :style="{ backgroundColor: props.option.color }"
-                class="reports-option__rounded--item"
+                class="rounded-full h-5 w-5"
               />
               <span class="reports-option__desc">
-                <span class="reports-option__title">
+                <span class="my-0 text-slate-800 dark:text-slate-75">
                   {{ props.option.title }}
                 </span>
               </span>
             </div>
           </template>
           <template slot="option" slot-scope="props">
-            <div class="reports-option__wrap">
+            <div class="flex items-center gap-2">
               <div
                 :style="{ backgroundColor: props.option.color }"
-                class="reports-option__rounded--item reports-option__item reports-option__label--swatch"
+                class="rounded-full h-5 w-5 flex-shrink-0 border border-solid border-slate-100 dark:border-slate-800"
               />
               <span class="reports-option__desc">
-                <span class="reports-option__title">
+                <span class="my-0 text-slate-800 dark:text-slate-75">
                   {{ props.option.title }}
                 </span>
               </span>
@@ -318,7 +320,3 @@ export default {
   },
 };
 </script>
-
-<style lang="scss">
-@import '~dashboard/assets/scss/widgets/_reports';
-</style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/overview/MetricCard.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/overview/MetricCard.vue
index 3d47af259..d40555c9d 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/overview/MetricCard.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/overview/MetricCard.vue
@@ -1,13 +1,24 @@
 <template>
-  <div class="card">
+  <div
+    class="metric-card flex flex-col m-2 p-4 border border-solid overflow-hidden rounded-md flex-grow shadow-sm text-slate-700 dark:text-slate-100 bg-white dark:bg-slate-800 border-slate-75 dark:border-slate-700 min-h-[10rem]"
+  >
     <div class="card-header">
       <slot name="header">
-        <div class="card-header--title-area">
-          <h5>{{ header }}</h5>
-          <span class="live">
-            <span class="ellipse" /><span>{{
-              $t('OVERVIEW_REPORTS.LIVE')
-            }}</span>
+        <div class="flex items-center gap-0.5 flex-row">
+          <h5
+            class="mb-0 text-slate-800 dark:text-slate-100 font-medium text-xl"
+          >
+            {{ header }}
+          </h5>
+          <span
+            class="flex flex-row items-center pr-2 pl-2 m-1 rounded-sm text-green-400 dark:text-green-400 text-xs bg-green-100/30 dark:bg-green-100/20"
+          >
+            <span
+              class="bg-green-500 dark:bg-green-500 h-1 w-1 rounded-full mr-1 rtl:mr-0 rtl:ml-0"
+            />
+            <span>
+              {{ $t('OVERVIEW_REPORTS.LIVE') }}
+            </span>
           </span>
         </div>
         <div class="card-header--control-area">
@@ -15,12 +26,20 @@
         </div>
       </slot>
     </div>
-    <div v-if="!isLoading" class="card-body row">
+    <div
+      v-if="!isLoading"
+      class="card-body max-w-full w-full ml-auto mr-auto justify-between flex"
+    >
       <slot />
     </div>
-    <div v-else-if="isLoading" class="conversation-metric-loader">
+    <div
+      v-else-if="isLoading"
+      class="items-center flex text-base justify-center px-12 py-6"
+    >
       <spinner />
-      <span>{{ loadingMessage }}</span>
+      <span class="text-slate-300 dark:text-slate-200">
+        {{ loadingMessage }}
+      </span>
     </div>
   </div>
 </template>
@@ -49,9 +68,8 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.card {
-  @apply bg-white dark:bg-slate-800 border-slate-75 dark:border-slate-700;
-  margin: var(--space-small) !important;
+.metric-card {
+  @apply flex flex-col mb-2 p-4 border border-solid overflow-hidden rounded-md flex-grow shadow-sm text-slate-700 dark:text-slate-100 bg-white dark:bg-slate-800 border-slate-75 dark:border-slate-700 min-h-[10rem];
 
   .card-header--control-area {
     transition: opacity 0.2s ease-in-out;
@@ -70,23 +88,6 @@ export default {
   gap: var(--space-small) 0px;
   @apply grid flex-grow w-full mb-6;
 
-  .card-header--title-area {
-    @apply flex items-center flex-row;
-
-    h5 {
-      @apply mb-0 text-slate-800 dark:text-slate-100;
-    }
-
-    .live {
-      background: rgba(37, 211, 102, 0.1);
-      @apply flex flex-row items-center pr-2 pl-2 m-1 text-green-400 dark:text-green-400 text-xs;
-
-      .ellipse {
-        @apply bg-green-400 dark:bg-green-400 h-1 w-1 rounded-full mr-1 rtl:mr-0 rtl:ml-0;
-      }
-    }
-  }
-
   .card-header--control-area {
     @apply flex flex-row items-center justify-end gap-2;
   }
@@ -103,8 +104,4 @@ export default {
     }
   }
 }
-
-.conversation-metric-loader {
-  @apply items-center flex text-base justify-center p-12;
-}
 </style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/sla/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/sla/Index.vue
index 9ff510d06..c6bdb6968 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/sla/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/sla/Index.vue
@@ -9,7 +9,7 @@
       {{ $t('SLA.HEADER_BTN_TXT') }}
     </woot-button>
     <div class="flex flex-row gap-4">
-      <div class="w-[60%]">
+      <div class="w-full xl:w-3/5">
         <p
           v-if="!uiFlags.isFetching && !records.length"
           class="flex h-full items-center flex-col justify-center"
@@ -73,7 +73,7 @@
         </table>
       </div>
 
-      <div class="w-[34%]">
+      <div class="w-1/3 hidden xl:block">
         <span v-dompurify-html="$t('SLA.SIDEBAR_TXT')" />
       </div>
     </div>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/sla/SlaForm.vue b/app/javascript/dashboard/routes/dashboard/settings/sla/SlaForm.vue
index f41e8fcfc..029e2bda8 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/sla/SlaForm.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/sla/SlaForm.vue
@@ -1,6 +1,6 @@
 <template>
-  <div class="h-auto overflow-auto flex flex-col">
-    <form class="mx-0 flex flex-wrap" @submit.prevent="onSubmit">
+  <div class="flex flex-col h-auto overflow-auto">
+    <form class="flex flex-wrap mx-0" @submit.prevent="onSubmit">
       <woot-input
         v-model="name"
         :class="{ error: $v.name.$error }"
@@ -29,14 +29,14 @@
         @isInValid="handleIsInvalid(index, $event)"
       />
 
-      <div class="w-full">
+      <div class="flex items-center w-full gap-2">
         <input id="sla_bh" v-model="onlyDuringBusinessHours" type="checkbox" />
         <label for="sla_bh">
           {{ $t('SLA.FORM.BUSINESS_HOURS.PLACEHOLDER') }}
         </label>
       </div>
 
-      <div class="flex justify-end items-center py-2 px-0 gap-2 w-full">
+      <div class="flex items-center justify-end w-full gap-2 px-0 py-2">
         <woot-button
           :is-disabled="isSubmitDisabled"
           :is-loading="uiFlags.isUpdating"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/teams/AgentSelector.vue b/app/javascript/dashboard/routes/dashboard/settings/teams/AgentSelector.vue
index 5063da9ee..c3dbdfd42 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/teams/AgentSelector.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/teams/AgentSelector.vue
@@ -4,7 +4,7 @@
     <table class="woot-table">
       <thead>
         <tr>
-          <td>
+          <td class="ltr:pl-2.5 rtl:pr-2.5">
             <div class="flex items-center">
               <input
                 name="select-all-agents"
@@ -15,10 +15,10 @@
               />
             </div>
           </td>
-          <td class="text-slate-800 dark:text-slate-100">
+          <td class="text-slate-800 dark:text-slate-100 ltr:pl-2.5 rtl:pr-2.5">
             {{ $t('TEAMS_SETTINGS.AGENTS.AGENT') }}
           </td>
-          <td class="text-slate-800 dark:text-slate-100">
+          <td class="text-slate-800 dark:text-slate-100 ltr:pl-2.5 rtl:pr-2.5">
             {{ $t('TEAMS_SETTINGS.AGENTS.EMAIL') }}
           </td>
         </tr>
@@ -57,7 +57,7 @@
         </tr>
       </tbody>
     </table>
-    <div class="flex items-center justify-between">
+    <div class="flex items-center justify-between mt-2">
       <p>
         {{
           $t('TEAMS_SETTINGS.AGENTS.SELECTED_COUNT', {
diff --git a/app/javascript/dashboard/routes/dashboard/settings/teams/Create/AddAgents.vue b/app/javascript/dashboard/routes/dashboard/settings/teams/Create/AddAgents.vue
index 993f60b49..6493f20f5 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/teams/Create/AddAgents.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/teams/Create/AddAgents.vue
@@ -1,8 +1,11 @@
 <template>
   <div
-    class="wizard-body w-[75%] flex-shrink-0 flex-grow-0 max-w-[75%] overflow-y-auto"
+    class="border border-slate-25 dark:border-slate-800/60 overflow-x-auto bg-white dark:bg-slate-900 h-full p-6 w-full max-w-full md:w-3/4 md:max-w-[75%] flex-shrink-0 flex-grow-0"
   >
-    <form class="mx-0 flex flex-wrap" @submit.prevent="addAgents">
+    <form
+      class="mx-0 flex flex-wrap overflow-x-auto"
+      @submit.prevent="addAgents"
+    >
       <div class="w-full">
         <page-header
           :header-title="headerTitle"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/teams/Create/CreateTeam.vue b/app/javascript/dashboard/routes/dashboard/settings/teams/Create/CreateTeam.vue
index d6e30e571..38fcf5777 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/teams/Create/CreateTeam.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/teams/Create/CreateTeam.vue
@@ -1,5 +1,7 @@
 <template>
-  <div class="wizard-body w-[75%] flex-shrink-0 flex-grow-0 max-w-[75%]">
+  <div
+    class="border border-slate-25 dark:border-slate-800/60 bg-white dark:bg-slate-900 h-full p-6 w-full max-w-full md:w-3/4 md:max-w-[75%] flex-shrink-0 flex-grow-0"
+  >
     <page-header
       :header-title="$t('TEAMS_SETTINGS.CREATE_FLOW.CREATE.TITLE')"
       :header-content="$t('TEAMS_SETTINGS.CREATE_FLOW.CREATE.DESC')"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/teams/Create/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/teams/Create/Index.vue
index 97cdd384c..232c20527 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/teams/Create/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/teams/Create/Index.vue
@@ -1,6 +1,8 @@
 <template>
-  <div class="overflow-auto p-4 max-w-full my-auto flex flex-wrap h-full">
-    <woot-wizard class="small-3 columns" :items="items" />
+  <div
+    class="overflow-auto p-4 max-w-full my-auto flex flex-row flex-nowrap h-full bg-slate-25 dark:bg-slate-800"
+  >
+    <woot-wizard class="hidden md:block w-1/4" :items="items" />
     <router-view />
   </div>
 </template>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/teams/Edit/EditAgents.vue b/app/javascript/dashboard/routes/dashboard/settings/teams/Edit/EditAgents.vue
index 4f2d47022..0b3587bf8 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/teams/Edit/EditAgents.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/teams/Edit/EditAgents.vue
@@ -1,6 +1,11 @@
 <template>
-  <div class="wizard-body w-[75%] flex-shrink-0 flex-grow-0 max-w-[75%]">
-    <form class="mx-0 flex flex-wrap" @submit.prevent="addAgents">
+  <div
+    class="border border-slate-25 overflow-x-auto dark:border-slate-800/60 bg-white dark:bg-slate-900 h-full p-6 w-full max-w-full md:w-3/4 md:max-w-[75%] flex-shrink-0 flex-grow-0"
+  >
+    <form
+      class="mx-0 flex flex-wrap overflow-x-auto"
+      @submit.prevent="addAgents"
+    >
       <div class="w-full">
         <page-header
           :header-title="headerTitle"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/teams/Edit/EditTeam.vue b/app/javascript/dashboard/routes/dashboard/settings/teams/Edit/EditTeam.vue
index 9d335ccbe..1330340ad 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/teams/Edit/EditTeam.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/teams/Edit/EditTeam.vue
@@ -1,5 +1,7 @@
 <template>
-  <div class="wizard-body w-[75%] flex-shrink-0 flex-grow-0 max-w-[75%]">
+  <div
+    class="border border-slate-25 dark:border-slate-800/60 bg-white dark:bg-slate-900 h-full p-6 w-full max-w-full md:w-3/4 md:max-w-[75%] flex-shrink-0 flex-grow-0"
+  >
     <page-header
       :header-title="$t('TEAMS_SETTINGS.EDIT_FLOW.CREATE.TITLE')"
       :header-content="$t('TEAMS_SETTINGS.EDIT_FLOW.CREATE.DESC')"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/teams/Edit/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/teams/Edit/Index.vue
index 5cb89e6a2..9a4e768b7 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/teams/Edit/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/teams/Edit/Index.vue
@@ -1,6 +1,8 @@
 <template>
-  <div class="overflow-auto p-4 max-w-full my-auto flex flex-wrap h-full">
-    <woot-wizard class="small-3 columns" :items="items" />
+  <div
+    class="overflow-auto p-4 max-w-full my-auto flex flex-row flex-nowrap h-full bg-slate-25 dark:bg-slate-800"
+  >
+    <woot-wizard class="hidden md:block w-1/4" :items="items" />
     <router-view />
   </div>
 </template>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/teams/FinishSetup.vue b/app/javascript/dashboard/routes/dashboard/settings/teams/FinishSetup.vue
index 4f0c85979..2fa452935 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/teams/FinishSetup.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/teams/FinishSetup.vue
@@ -1,5 +1,7 @@
 <template>
-  <div class="wizard-body w-[75%] flex-shrink-0 flex-grow-0 max-w-[75%]">
+  <div
+    class="border border-slate-25 dark:border-slate-800/60 bg-white dark:bg-slate-900 h-full p-6 w-full max-w-full md:w-3/4 md:max-w-[75%] flex-shrink-0 flex-grow-0"
+  >
     <empty-state
       :title="$t('TEAMS_SETTINGS.FINISH.TITLE')"
       :message="$t('TEAMS_SETTINGS.FINISH.MESSAGE')"
@@ -7,7 +9,7 @@
     >
       <div class="w-full text-center">
         <router-link
-          class="button success nice"
+          class="button success nice rounded"
           :to="{
             name: 'settings_teams_list',
           }"
@@ -28,8 +30,3 @@ export default {
   },
 };
 </script>
-<style lang="scss" scoped>
-.website--code {
-  @apply my-4 mx-auto max-w-[70%];
-}
-</style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/teams/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/teams/Index.vue
index 59aaed912..896c7f304 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/teams/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/teams/Index.vue
@@ -1,7 +1,7 @@
 <template>
-  <div class="flex-1 overflow-auto p-4">
-    <div class="flex flex-row gap-4">
-      <div class="w-[60%]">
+  <div class="flex-1 overflow-auto">
+    <div class="flex flex-row gap-4 p-8">
+      <div class="w-full md:w-3/5">
         <p
           v-if="!teamsList.length"
           class="flex h-full items-center flex-col justify-center"
@@ -56,7 +56,7 @@
         </table>
       </div>
 
-      <div class="w-[34%]">
+      <div class="hidden md:block w-1/3">
         <span
           v-dompurify-html="
             $t('TEAMS_SETTINGS.SIDEBAR_TXT', {
diff --git a/app/javascript/dashboard/routes/dashboard/settings/teams/TeamForm.vue b/app/javascript/dashboard/routes/dashboard/settings/teams/TeamForm.vue
index 3636f7990..1f1f7ceb3 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/teams/TeamForm.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/teams/TeamForm.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="mx-0 flex flex-wrap">
-    <div class="flex-shrink-0 flex-grow-0 w-[65%]">
+    <div class="flex-shrink-0 flex-grow-0 w-full md:w-[65%]">
       <form class="mx-0 flex flex-wrap" @submit.prevent="handleSubmit">
         <woot-input
           v-model.trim="title"
@@ -20,7 +20,7 @@
           @input="$v.description.$touch"
         />
 
-        <div class="w-full">
+        <div class="w-full flex items-center gap-2">
           <input v-model="allowAutoAssign" type="checkbox" :value="true" />
           <label for="conversation_creation">
             {{ $t('TEAMS_SETTINGS.FORM.AUTO_ASSIGN.LABEL') }}
diff --git a/app/javascript/portal/components/SearchSuggestions.vue b/app/javascript/portal/components/SearchSuggestions.vue
index 97f462e1a..effbd5eec 100644
--- a/app/javascript/portal/components/SearchSuggestions.vue
+++ b/app/javascript/portal/components/SearchSuggestions.vue
@@ -34,7 +34,7 @@
           />
           <div
             v-dompurify-html="prepareContent(article.content)"
-            class="line-clamp-2 text-ellipsis text-slate-600 dark:text-slate-300 text-sm"
+            class="line-clamp-2 text-ellipsis whitespace-nowrap overflow-hidden text-slate-600 dark:text-slate-300 text-sm"
           />
         </a>
       </li>
diff --git a/app/javascript/shared/components/GreetingsEditor.vue b/app/javascript/shared/components/GreetingsEditor.vue
index 0dc72a727..d67d9c1b3 100644
--- a/app/javascript/shared/components/GreetingsEditor.vue
+++ b/app/javascript/shared/components/GreetingsEditor.vue
@@ -1,5 +1,5 @@
 <template>
-  <section class="w-[75%]">
+  <section class="w-3/4">
     <div
       v-if="richtext"
       class="py-0 px-4 rounded-md border border-solid border-slate-200 dark:border-slate-600 bg-white dark:bg-slate-900 mt-0 mx-0 mb-4"
diff --git a/app/javascript/shared/components/ui/MultiselectDropdownItems.vue b/app/javascript/shared/components/ui/MultiselectDropdownItems.vue
index ebf5b3681..4c38eb9a6 100644
--- a/app/javascript/shared/components/ui/MultiselectDropdownItems.vue
+++ b/app/javascript/shared/components/ui/MultiselectDropdownItems.vue
@@ -26,7 +26,7 @@
               }"
               @click="() => onclick(option)"
             >
-              <div class="flex items-center">
+              <div class="flex items-center gap-1.5">
                 <Thumbnail
                   v-if="hasThumbnail"
                   :src="option.thumbnail"
@@ -35,9 +35,11 @@
                   :status="option.availability_status"
                   has-border
                 />
-                <div class="flex items-center justify-between w-full min-w-0">
+                <div
+                  class="flex items-center justify-between w-full min-w-0 gap-2"
+                >
                   <span
-                    class="leading-4 my-0 mx-2 overflow-hidden whitespace-nowrap text-ellipsis text-sm"
+                    class="leading-4 my-0 overflow-hidden whitespace-nowrap text-ellipsis text-sm"
                     :title="option.name"
                   >
                     {{ option.name }}
diff --git a/app/javascript/shared/mixins/campaignMixin.js b/app/javascript/shared/mixins/campaignMixin.js
index ebf98aa37..01c20b5bb 100644
--- a/app/javascript/shared/mixins/campaignMixin.js
+++ b/app/javascript/shared/mixins/campaignMixin.js
@@ -3,13 +3,16 @@ import { CAMPAIGN_TYPES } from '../constants/campaign';
 export default {
   computed: {
     campaignType() {
-      const pageURL = window.location.href;
-      return pageURL.substring(pageURL.lastIndexOf('/') + 1);
+      const campaignTypeMap = {
+        ongoing_campaigns: CAMPAIGN_TYPES.ONGOING,
+        one_off: CAMPAIGN_TYPES.ONE_OFF,
+      };
+      return campaignTypeMap[this.$route.name];
     },
     isOngoingType() {
       return this.campaignType === CAMPAIGN_TYPES.ONGOING;
     },
-    isOnOffType() {
+    isOneOffType() {
       return this.campaignType === CAMPAIGN_TYPES.ONE_OFF;
     },
   },
diff --git a/app/javascript/shared/mixins/specs/campaignMixin.spec.js b/app/javascript/shared/mixins/specs/campaignMixin.spec.js
index 71c90673a..625b538e8 100644
--- a/app/javascript/shared/mixins/specs/campaignMixin.spec.js
+++ b/app/javascript/shared/mixins/specs/campaignMixin.spec.js
@@ -1,37 +1,34 @@
 import { shallowMount } from '@vue/test-utils';
 import campaignMixin from '../campaignMixin';
 
+const buildComponent = routeName => ({
+  template: '<div></div>',
+  computed: {
+    $route() {
+      return { name: routeName };
+    },
+  },
+  mixins: [campaignMixin],
+});
+
 describe('campaignMixin', () => {
   beforeEach(() => {
     global.window = Object.create(window);
   });
   it('returns the correct campaign type', () => {
-    const url = 'http://localhost:3000/app/accounts/1/campaigns/one_off';
-    Object.defineProperty(window, 'location', {
-      value: {
-        href: url,
-      },
-    });
-    window.location.href = url;
-    const Component = {
-      render() {},
-      mixins: [campaignMixin],
-    };
+    const Component = buildComponent('one_off');
     const wrapper = shallowMount(Component);
     expect(wrapper.vm.campaignType).toBe('one_off');
   });
-  it('isOnOffType returns true if campaign type is one_off', () => {
-    const url = 'http://localhost:3000/app/accounts/1/campaigns/one_off';
-    Object.defineProperty(window, 'location', {
-      value: {
-        href: url,
-      },
-    });
-    const Component = {
-      render() {},
-      mixins: [campaignMixin],
-    };
+  it('isOneOffType returns true if path is one_off', () => {
+    const Component = buildComponent('one_off');
     const wrapper = shallowMount(Component);
-    expect(wrapper.vm.isOnOffType).toBe(true);
+    expect(wrapper.vm.isOneOffType).toBe(true);
+  });
+
+  it('isOngoingType returns true if path is ongoing_campaigns', () => {
+    const Component = buildComponent('ongoing_campaigns');
+    const wrapper = shallowMount(Component);
+    expect(wrapper.vm.isOngoingType).toBe(true);
   });
 });
diff --git a/app/javascript/v3/views/auth/password/Edit.vue b/app/javascript/v3/views/auth/password/Edit.vue
index 0e5e65cc6..4c61ce15a 100644
--- a/app/javascript/v3/views/auth/password/Edit.vue
+++ b/app/javascript/v3/views/auth/password/Edit.vue
@@ -12,7 +12,7 @@
         {{ $t('SET_NEW_PASSWORD.TITLE') }}
       </h1>
 
-      <div class="column log-in-form space-y-5">
+      <div class="space-y-5">
         <form-input
           v-model.trim="credentials.password"
           class="mt-3"
diff --git a/app/javascript/v3/views/auth/reset/password/Index.vue b/app/javascript/v3/views/auth/reset/password/Index.vue
index 58b5531dd..4c1c6904d 100644
--- a/app/javascript/v3/views/auth/reset/password/Index.vue
+++ b/app/javascript/v3/views/auth/reset/password/Index.vue
@@ -21,7 +21,7 @@
           )
         }}
       </p>
-      <div class="column log-in-form space-y-5">
+      <div class="space-y-5">
         <form-input
           v-model.trim="credentials.email"
           name="email_address"
diff --git a/app/views/layouts/vueapp.html.erb b/app/views/layouts/vueapp.html.erb
index d81387687..2e49a7b96 100644
--- a/app/views/layouts/vueapp.html.erb
+++ b/app/views/layouts/vueapp.html.erb
@@ -63,7 +63,7 @@
     <%= javascript_pack_tag @application_pack %>
     <%= stylesheet_pack_tag @application_pack %>
   </head>
-  <body>
+  <body class="text-slate-600">
     <div id="app"></div>
     <noscript id="noscript">This app works best with JavaScript enabled.</noscript>
     <%= yield %>
diff --git a/package.json b/package.json
index 70ab8a666..ac353f186 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,6 @@
     "date-fns": "2.21.1",
     "date-fns-tz": "^1.3.3",
     "dompurify": "2.2.7",
-    "foundation-sites": "~6.5.3",
     "highlight.js": "~10.4.1",
     "idb": "^7.1.1",
     "ionicons": "~2.0.1",
diff --git a/yarn.lock b/yarn.lock
index b28813887..9e919e2f4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11497,11 +11497,6 @@ forwarded@0.2.0:
   resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811"
   integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==
 
-foundation-sites@~6.5.3:
-  version "6.5.3"
-  resolved "https://registry.yarnpkg.com/foundation-sites/-/foundation-sites-6.5.3.tgz#85373aaed72233ca0d16fdfcb034e976cc6943c9"
-  integrity sha512-ZwI0idjHHjezh6jRjpPxkczvmtUuJ1uGatZHpyloX0MvsFHfM0BFoxrqdXryXugGPdmb+yJi3JYMnz6+5t3K1A==
-
 fraction.js@^4.3.6:
   version "4.3.6"
   resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.3.6.tgz#e9e3acec6c9a28cf7bc36cbe35eea4ceb2c5c92d"

From a92639e391b4e66a08f9ada99f210b4f3d7beff3 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Wed, 28 Feb 2024 20:26:23 +0530
Subject: [PATCH 43/96] fix: Filter dropdown alignment issue in reports page
 (#9035)

* fix: Filter dropdown alignment issue in reports page

* fix: add hide class

* chore: Clean up

---------

Co-authored-by: Shivam Mishra <scm.mymail@gmail.com>
---
 app/javascript/dashboard/assets/scss/_woot.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/javascript/dashboard/assets/scss/_woot.scss b/app/javascript/dashboard/assets/scss/_woot.scss
index cdc522224..5728dd51b 100644
--- a/app/javascript/dashboard/assets/scss/_woot.scss
+++ b/app/javascript/dashboard/assets/scss/_woot.scss
@@ -36,3 +36,7 @@
 .tooltip {
   @apply bg-slate-900 text-white py-1 px-2 z-40 text-xs rounded-md dark:bg-slate-200 dark:text-slate-900;
 }
+
+.hide {
+  @apply hidden;
+}

From cb8f6f1a3979acd2feb070a3b510b6ef401b1e04 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Thu, 29 Feb 2024 01:52:09 +0530
Subject: [PATCH 44/96] fix: Update the reply time tooltip to avoid confusion
 (#9037)

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

diff --git a/app/javascript/dashboard/i18n/locale/en/report.json b/app/javascript/dashboard/i18n/locale/en/report.json
index 0b234ec16..c9a230fab 100644
--- a/app/javascript/dashboard/i18n/locale/en/report.json
+++ b/app/javascript/dashboard/i18n/locale/en/report.json
@@ -37,7 +37,7 @@
       },
       "REPLY_TIME": {
         "NAME": "Customer waiting time",
-        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} conversations)"
+        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} replies)"
       }
     },
     "DATE_RANGE_OPTIONS": {

From 9c2147aced96a281edfa9fcfc68a0dd56d67caad Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Thu, 29 Feb 2024 15:10:29 +0530
Subject: [PATCH 45/96] fix: UI breakages (#9040)

- Fixes overflow of contact details in the contact side panel.
- Fixes line height issue in article header.
- Fixes overflow of category names in the article list.
- Fixes typing indicator alignment issues
---
 .../assets/scss/widgets/_conversation-view.scss    | 14 --------------
 .../widgets/conversation/MessagesView.vue          | 11 ++++++++---
 .../dashboard/conversation/contact/ContactInfo.vue |  6 +++---
 .../conversation/contact/ContactInfoRow.vue        |  6 +++---
 .../helpcenter/components/ArticleEditor.vue        |  2 +-
 .../helpcenter/components/ArticleItem.vue          |  2 +-
 6 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss b/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss
index ea3a9c5f1..b51cbe07d 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss
@@ -222,20 +222,6 @@
   @apply flex relative flex-col;
 }
 
-.typing-indicator-wrap {
-  @apply items-center flex h-0 absolute w-full -top-8;
-
-  .typing-indicator {
-    @include elegant-card;
-    @include round-corner;
-    @apply py-2 pr-4 pl-5 bg-white dark:bg-slate-700 text-slate-800 dark:text-slate-100 text-xs font-semibold my-2.5 mx-auto;
-
-    .gif {
-      @apply ml-2 w-6;
-    }
-  }
-}
-
 .left .bubble .text-content {
   h1,
   h2,
diff --git a/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue b/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
index d6ae4d3a8..331017f96 100644
--- a/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
@@ -76,11 +76,16 @@
       class="conversation-footer"
       :class="{ 'modal-mask': isPopoutReplyBox }"
     >
-      <div v-if="isAnyoneTyping" class="typing-indicator-wrap">
-        <div class="typing-indicator">
+      <div
+        v-if="isAnyoneTyping"
+        class="items-center flex h-0 absolute w-full -top-7"
+      >
+        <div
+          class="flex py-2 pr-4 pl-5 shadow-md rounded-full bg-white dark:bg-slate-700 text-slate-800 dark:text-slate-100 text-xs font-semibold my-2.5 mx-auto"
+        >
           {{ typingUserNames }}
           <img
-            class="gif"
+            class="ltr:ml-2 rtl:mr-2 w-6"
             src="~dashboard/assets/images/typing.gif"
             alt="Someone is typing"
           />
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue b/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue
index b35f8ba3a..380b4afd3 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue
@@ -1,6 +1,6 @@
 <template>
-  <div class="relative items-center p-4 bg-white dark:bg-slate-900">
-    <div class="text-left rtl:text-right flex flex-col gap-2">
+  <div class="relative items-center p-4 bg-white dark:bg-slate-900 w-full">
+    <div class="text-left rtl:text-right flex flex-col gap-2 w-full">
       <div class="flex justify-between flex-row">
         <thumbnail
           v-if="showAvatar"
@@ -55,7 +55,7 @@
         <p v-if="additionalAttributes.description" class="break-words mb-0.5">
           {{ additionalAttributes.description }}
         </p>
-        <div class="flex flex-col gap-2 items-start">
+        <div class="flex flex-col gap-2 items-start w-full">
           <contact-info-row
             :href="contact.email ? `mailto:${contact.email}` : ''"
             :value="contact.email"
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfoRow.vue b/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfoRow.vue
index ff179004e..02bfeff09 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfoRow.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfoRow.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="ltr:-ml-1 rtl:-mr-1 h-5">
+  <div class="ltr:-ml-1 rtl:-mr-1 h-5 w-full">
     <a
       v-if="href"
       :href="href"
@@ -9,7 +9,7 @@
         :icon="icon"
         :emoji="emoji"
         icon-size="14"
-        class="ltr:ml-1 rtl:mr-1"
+        class="ltr:ml-1 rtl:mr-1 flex-shrink-0"
       />
       <span
         v-if="value"
@@ -42,7 +42,7 @@
         :icon="icon"
         :emoji="emoji"
         icon-size="14"
-        class="ltr:ml-1 rtl:mr-1"
+        class="ltr:ml-1 rtl:mr-1 flex-shrink-0"
       />
       <span
         v-if="value"
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleEditor.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleEditor.vue
index d51017703..7055005e1 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleEditor.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleEditor.vue
@@ -85,7 +85,7 @@ export default {
 }
 
 .article-heading {
-  @apply text-[2.5rem] font-semibold w-full text-slate-900 dark:text-slate-75 p-4 hover:bg-slate-25 dark:hover:bg-slate-800 hover:rounded-md resize-none min-h-[4rem] max-h-[40rem] h-auto mb-2 border-0 border-solid border-transparent dark:border-transparent;
+  @apply text-[2.5rem] font-semibold leading-normal w-full text-slate-900 dark:text-slate-75 p-4 hover:bg-slate-25 dark:hover:bg-slate-800 hover:rounded-md resize-none min-h-[4rem] max-h-[40rem] h-auto mb-2 border-0 border-solid border-transparent dark:border-transparent;
 }
 
 .article-content {
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleItem.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleItem.vue
index 52ece1107..304fd9c4e 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleItem.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleItem.vue
@@ -40,7 +40,7 @@
     </span>
     <span class="article-column article-category">
       <router-link
-        class="text-sm button clear link secondary"
+        class="text-sm button clear link secondary min-w-0 max-w-full"
         :to="getCategoryRoute(category.slug)"
       >
         <span

From 351cc940cef256ed63e454939db057107b61d205 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Fri, 1 Mar 2024 00:03:31 +0530
Subject: [PATCH 46/96] fix: Fix the button variant `success` color in dark
 mode (#9043)

---
 app/javascript/dashboard/assets/scss/widgets/_buttons.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/dashboard/assets/scss/widgets/_buttons.scss b/app/javascript/dashboard/assets/scss/widgets/_buttons.scss
index 423a41843..54fc27e25 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_buttons.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_buttons.scss
@@ -52,7 +52,7 @@ button {
   }
 
   &.success {
-    @apply bg-[#44ce4b] text-white dark:text-white;
+    @apply bg-[#44ce4b] dark:bg-[#44ce4b] text-white dark:text-white;
   }
 
   &.secondary {

From 7c5c88b17a994dec609fd717d0100cc033a42163 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Fri, 1 Mar 2024 00:04:13 +0530
Subject: [PATCH 47/96] fix: Update border radius for login/unauthenticated
 pages (#9042)

---
 app/javascript/v3/components/Form/Input.vue    | 2 +-
 app/javascript/v3/components/Form/Select.vue   | 2 +-
 app/javascript/v3/components/Form/Textarea.vue | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/javascript/v3/components/Form/Input.vue b/app/javascript/v3/components/Form/Input.vue
index 753157ab0..63064b654 100644
--- a/app/javascript/v3/components/Form/Input.vue
+++ b/app/javascript/v3/components/Form/Input.vue
@@ -28,7 +28,7 @@
         'px-3 py-2 mb-0': spacing === 'compact',
         'pl-9': icon,
       }"
-      class="block w-full border-none shadow-sm appearance-none rounded-xl outline outline-1 focus:outline-2 text-slate-900 dark:text-slate-100 placeholder:text-slate-400 sm:text-sm sm:leading-6 dark:bg-slate-800"
+      class="block w-full border-none rounded-md shadow-sm appearance-none outline outline-1 focus:outline-2 text-slate-900 dark:text-slate-100 placeholder:text-slate-400 sm:text-sm sm:leading-6 dark:bg-slate-800"
       @input="onInput"
       @blur="$emit('blur')"
     />
diff --git a/app/javascript/v3/components/Form/Select.vue b/app/javascript/v3/components/Form/Select.vue
index f04f3b312..a7165b7f2 100644
--- a/app/javascript/v3/components/Form/Select.vue
+++ b/app/javascript/v3/components/Form/Select.vue
@@ -15,7 +15,7 @@
         'text-slate-900 dark:text-slate-100': value,
         'pl-9': icon,
       }"
-      class="mb-0 block w-full px-3 py-2 pr-6 border-0 rounded-xl shadow-sm outline-none appearance-none select-caret ring-1 ring-inset placeholder:text-slate-400 focus:ring-2 focus:ring-inset focus:ring-woot-500 sm:text-sm sm:leading-6 dark:bg-slate-700 dark:ring-slate-600 dark:focus:ring-woot-500 ring-slate-200"
+      class="block w-full px-3 py-2 pr-6 mb-0 border-0 rounded-md shadow-sm outline-none appearance-none select-caret ring-1 ring-inset placeholder:text-slate-400 focus:ring-2 focus:ring-inset focus:ring-woot-500 sm:text-sm sm:leading-6 dark:bg-slate-700 dark:ring-slate-600 dark:focus:ring-woot-500 ring-slate-200"
       @input="onInput"
     >
       <option value="" disabled selected class="hidden">
diff --git a/app/javascript/v3/components/Form/Textarea.vue b/app/javascript/v3/components/Form/Textarea.vue
index e43c411f5..736d4f72b 100644
--- a/app/javascript/v3/components/Form/Textarea.vue
+++ b/app/javascript/v3/components/Form/Textarea.vue
@@ -20,7 +20,7 @@
           !hasError,
         'resize-none': !allowResize,
       }"
-      class="block w-full p-3 border-none rounded-xl shadow-sm appearance-none outline outline-1 focus:outline focus:outline-2 text-slate-900 dark:text-slate-100 placeholder:text-slate-400 bg-white dark:bg-slate-800"
+      class="block w-full p-3 bg-white border-none rounded-md shadow-sm appearance-none outline outline-1 focus:outline focus:outline-2 text-slate-900 dark:text-slate-100 placeholder:text-slate-400 dark:bg-slate-800"
       @input="onInput"
       @blur="$emit('blur')"
     />

From 9581264286c1244f693da3f3d3c4655ca220f40d Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Fri, 1 Mar 2024 13:06:33 +0530
Subject: [PATCH 48/96] fix: Broken styles (#9046)

---
 app/javascript/dashboard/assets/scss/widgets/_base.scss  | 6 ++++++
 app/javascript/dashboard/assets/scss/widgets/_tabs.scss  | 2 +-
 .../components/widgets/conversation/ConversationCard.vue | 3 ++-
 .../dashboard/components/widgets/mentions/MentionBox.vue | 2 +-
 .../routes/dashboard/inbox/components/MenuItem.vue       | 2 --
 tailwind.config.js                                       | 9 +++++++++
 6 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/app/javascript/dashboard/assets/scss/widgets/_base.scss b/app/javascript/dashboard/assets/scss/widgets/_base.scss
index 261df19e8..e64231dfc 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_base.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_base.scss
@@ -29,6 +29,12 @@ hr {
   @apply clear-both max-w-full h-0 my-5 mx-0 border-slate-300 dark:border-slate-600;
 }
 
+ul,
+ol,
+dl {
+  @apply mb-2 list-disc list-outside leading-[1.65];
+}
+
 // Form elements
 label {
   @apply text-slate-800 dark:text-slate-200 block m-0 leading-7 text-sm font-medium;
diff --git a/app/javascript/dashboard/assets/scss/widgets/_tabs.scss b/app/javascript/dashboard/assets/scss/widgets/_tabs.scss
index 3ef40a137..b9999fac9 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_tabs.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_tabs.scss
@@ -7,7 +7,7 @@
 }
 
 .tabs {
-  @apply border-r-0 border-l-0 border-t-0 flex min-w-[6.25rem] py-0 px-4;
+  @apply border-r-0 border-l-0 border-t-0 flex min-w-[6.25rem] py-0 px-4 list-none mb-0;
 }
 
 .tabs--with-scroll {
diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
index 44144f2d8..c17baac35 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
@@ -2,7 +2,8 @@
   <div
     class="relative flex items-start flex-grow-0 flex-shrink-0 w-auto max-w-full px-4 py-0 border-t-0 border-b-0 border-l-2 border-r-0 border-transparent border-solid cursor-pointer conversation hover:bg-slate-25 dark:hover:bg-slate-800 group"
     :class="{
-      'active bg-slate-25 dark:bg-slate-800 border-woot-500': isActiveChat,
+      'animate-card-select bg-slate-25 dark:bg-slate-800 border-woot-500':
+        isActiveChat,
       'unread-chat': hasUnread,
       'has-inbox-name': showInboxName,
       'conversation-selected': selected,
diff --git a/app/javascript/dashboard/components/widgets/mentions/MentionBox.vue b/app/javascript/dashboard/components/widgets/mentions/MentionBox.vue
index a3c2afac4..fb28f00c0 100644
--- a/app/javascript/dashboard/components/widgets/mentions/MentionBox.vue
+++ b/app/javascript/dashboard/components/widgets/mentions/MentionBox.vue
@@ -12,7 +12,7 @@
         @mouseover="onHover(index)"
       >
         <button
-          class="flex group flex-col gap-0.5 overflow-hidden cursor-pointer items-start py-2.5 px-2.5 justify-center w-full h-full text-left hover:bg-woot-50 dark:hover:bg-woot-800 border-b border-solid border-slate-100 dark:border-slate-700"
+          class="flex group flex-col gap-0.5 overflow-hidden cursor-pointer items-start rounded-none py-2.5 px-2.5 justify-center w-full h-full text-left hover:bg-woot-50 dark:hover:bg-woot-800 border-x-0 border-t-0 border-b border-solid border-slate-100 dark:border-slate-700"
           :class="{
             ' bg-woot-25 dark:bg-woot-800': index === selectedIndex,
           }"
diff --git a/app/javascript/dashboard/routes/dashboard/inbox/components/MenuItem.vue b/app/javascript/dashboard/routes/dashboard/inbox/components/MenuItem.vue
index ea8ea421d..cddad0d58 100644
--- a/app/javascript/dashboard/routes/dashboard/inbox/components/MenuItem.vue
+++ b/app/javascript/dashboard/routes/dashboard/inbox/components/MenuItem.vue
@@ -1,6 +1,4 @@
 <script setup>
-import { defineProps, defineEmits } from 'vue';
-
 defineProps({
   label: {
     type: String,
diff --git a/tailwind.config.js b/tailwind.config.js
index 0c0073180..aa7a2a14a 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -143,11 +143,20 @@ module.exports = {
         '50%': { opacity: 1 },
         '100%': { opacity: 0.4 },
       },
+      'card-select': {
+        '0%, 100%': {
+          transform: 'translateX(0)',
+        },
+        '50%': {
+          transform: 'translateX(1px)',
+        },
+      },
     },
     animation: {
       ...defaultTheme.animation,
       wiggle: 'wiggle 0.5s ease-in-out',
       'loader-pulse': 'loader-pulse 1.5s cubic-bezier(0.4, 0, 0.6, 1) infinite',
+      'card-select': 'card-select 0.25s ease-in-out',
     },
   },
   plugins: [

From 881d4bf6442e11345f36994ad1fe46470a084415 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Fri, 1 Mar 2024 21:50:20 +0530
Subject: [PATCH 49/96] feat: Add backend APIs for the bot metrics (#9031)

Co-authored-by: Pranav <pranav@chatwoot.com>
---
 app/builders/v2/report_builder.rb             | 10 +++
 .../v2/reports/bot_metrics_builder.rb         | 54 +++++++++++++
 .../api/v2/accounts/reports_controller.rb     | 11 +++
 app/helpers/report_helper.rb                  | 18 +++++
 .../dashboard/i18n/locale/en/report.json      |  3 +-
 .../dashboard/settings/reports/constants.js   |  1 +
 config/routes.rb                              |  2 +
 spec/builders/v2/report_builder_spec.rb       | 71 ++++++++++++++++-
 .../v2/reports/bot_metrics_builder_spec.rb    | 44 +++++++++++
 .../api/v2/accounts/report_controller_spec.rb | 79 +++++++++++++++++++
 spec/factories/agent_bots.rb                  |  2 +-
 11 files changed, 291 insertions(+), 4 deletions(-)
 create mode 100644 app/builders/v2/reports/bot_metrics_builder.rb
 create mode 100644 spec/builders/v2/reports/bot_metrics_builder_spec.rb

diff --git a/app/builders/v2/report_builder.rb b/app/builders/v2/report_builder.rb
index 2725c55a3..fb986d335 100644
--- a/app/builders/v2/report_builder.rb
+++ b/app/builders/v2/report_builder.rb
@@ -54,6 +54,13 @@ class V2::ReportBuilder
     }
   end
 
+  def bot_summary
+    {
+      bot_resolutions_count: bot_resolutions.count,
+      bot_handoffs_count: bot_handoffs.count
+    }
+  end
+
   def conversation_metrics
     if params[:type].equal?(:account)
       live_conversations
@@ -71,6 +78,8 @@ class V2::ReportBuilder
        avg_first_response_time
        avg_resolution_time reply_time
        resolutions_count
+       bot_resolutions_count
+       bot_handoffs_count
        reply_time].include?(params[:metric])
   end
 
@@ -123,6 +132,7 @@ class V2::ReportBuilder
       unattended: @open_conversations.unattended.count
     }
     metric[:unassigned] = @open_conversations.unassigned.count if params[:type].equal?(:account)
+    metric[:pending] = @open_conversations.pending.count if params[:type].equal?(:account)
     metric
   end
 end
diff --git a/app/builders/v2/reports/bot_metrics_builder.rb b/app/builders/v2/reports/bot_metrics_builder.rb
new file mode 100644
index 000000000..c46daf978
--- /dev/null
+++ b/app/builders/v2/reports/bot_metrics_builder.rb
@@ -0,0 +1,54 @@
+class V2::Reports::BotMetricsBuilder
+  include DateRangeHelper
+  attr_reader :account, :params
+
+  def initialize(account, params)
+    @account = account
+    @params = params
+  end
+
+  def metrics
+    {
+      conversation_count: bot_conversations.count,
+      message_count: bot_messages.count,
+      resolution_rate: bot_resolution_rate.to_i,
+      handoff_rate: bot_handoff_rate.to_i
+    }
+  end
+
+  private
+
+  def bot_activated_inbox_ids
+    @bot_activated_inbox_ids ||= account.inboxes.filter(&:active_bot?).map(&:id)
+  end
+
+  def bot_conversations
+    @bot_conversations ||= account.conversations.where(inbox_id: bot_activated_inbox_ids).where(created_at: range)
+  end
+
+  def bot_messages
+    @bot_messages ||= account.messages.outgoing.where(conversation_id: bot_conversations.ids).where(created_at: range)
+  end
+
+  def bot_resolutions_count
+    account.reporting_events.joins(:conversation).select(:conversation_id).where(account_id: account.id, name: :conversation_bot_resolved,
+                                                                                 created_at: range).distinct.count
+  end
+
+  def bot_handoffs_count
+    account.reporting_events.joins(:conversation).select(:conversation_id).where(account_id: account.id, name: :conversation_bot_handoff,
+                                                                                 created_at: range).distinct.count
+  end
+
+  def bot_resolution_rate
+    return 0 if bot_conversations.count.zero?
+
+    bot_resolutions_count.to_f / bot_conversations.count * 100
+  end
+
+  def bot_handoff_rate
+    return 0 if bot_conversations.count.zero?
+
+    bot_handoffs_count.to_f / bot_conversations.count * 100
+  end
+end
diff --git a/app/controllers/api/v2/accounts/reports_controller.rb b/app/controllers/api/v2/accounts/reports_controller.rb
index 260400feb..c67b74a43 100644
--- a/app/controllers/api/v2/accounts/reports_controller.rb
+++ b/app/controllers/api/v2/accounts/reports_controller.rb
@@ -14,6 +14,12 @@ class Api::V2::Accounts::ReportsController < Api::V1::Accounts::BaseController
     render json: summary_metrics
   end
 
+  def bot_summary
+    summary = V2::ReportBuilder.new(Current.account, current_summary_params).bot_summary
+    summary[:previous] = V2::ReportBuilder.new(Current.account, previous_summary_params).bot_summary
+    render json: summary
+  end
+
   def agents
     @report_data = generate_agents_report
     generate_csv('agents_report', 'api/v2/accounts/reports/agents')
@@ -48,6 +54,11 @@ class Api::V2::Accounts::ReportsController < Api::V1::Accounts::BaseController
     render json: conversation_metrics
   end
 
+  def bot_metrics
+    bot_metrics = V2::Reports::BotMetricsBuilder.new(Current.account, params).metrics
+    render json: bot_metrics
+  end
+
   private
 
   def generate_csv(filename, template)
diff --git a/app/helpers/report_helper.rb b/app/helpers/report_helper.rb
index 2b0f43b3f..99f3fd36b 100644
--- a/app/helpers/report_helper.rb
+++ b/app/helpers/report_helper.rb
@@ -32,6 +32,14 @@ module ReportHelper
     (get_grouped_values resolutions).count
   end
 
+  def bot_resolutions_count
+    (get_grouped_values bot_resolutions).count
+  end
+
+  def bot_handoffs_count
+    (get_grouped_values bot_handoffs).count
+  end
+
   def conversations
     scope.conversations.where(account_id: account.id, created_at: range)
   end
@@ -49,6 +57,16 @@ module ReportHelper
                                                                                conversations: { status: :resolved }, created_at: range).distinct
   end
 
+  def bot_resolutions
+    scope.reporting_events.joins(:conversation).select(:conversation_id).where(account_id: account.id, name: :conversation_bot_resolved,
+                                                                               conversations: { status: :resolved }, created_at: range).distinct
+  end
+
+  def bot_handoffs
+    scope.reporting_events.joins(:conversation).select(:conversation_id).where(account_id: account.id, name: :conversation_bot_handoff,
+                                                                               created_at: range).distinct
+  end
+
   def avg_first_response_time
     grouped_reporting_events = (get_grouped_values scope.reporting_events.where(name: 'first_response', account_id: account.id))
     return grouped_reporting_events.average(:value_in_business_hours) if params[:business_hours]
diff --git a/app/javascript/dashboard/i18n/locale/en/report.json b/app/javascript/dashboard/i18n/locale/en/report.json
index c9a230fab..a6d476bc9 100644
--- a/app/javascript/dashboard/i18n/locale/en/report.json
+++ b/app/javascript/dashboard/i18n/locale/en/report.json
@@ -412,7 +412,8 @@
       "LOADING_MESSAGE": "Loading conversation metrics...",
       "OPEN": "Open",
       "UNATTENDED": "Unattended",
-      "UNASSIGNED": "Unassigned"
+      "UNASSIGNED": "Unassigned",
+      "PENDING": "Pending"
     },
     "CONVERSATION_HEATMAP": {
       "HEADER": "Conversation Traffic",
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/constants.js b/app/javascript/dashboard/routes/dashboard/settings/reports/constants.js
index f4eb5a6dc..cb4e5bb6b 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/constants.js
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/constants.js
@@ -200,6 +200,7 @@ export const OVERVIEW_METRICS = {
   open: 'OPEN',
   unattended: 'UNATTENDED',
   unassigned: 'UNASSIGNED',
+  pending: 'PENDING',
   online: 'ONLINE',
   busy: 'BUSY',
   offline: 'OFFLINE',
diff --git a/config/routes.rb b/config/routes.rb
index 36b7f46a0..90317c7b2 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -303,12 +303,14 @@ Rails.application.routes.draw do
           resources :reports, only: [:index] do
             collection do
               get :summary
+              get :bot_summary
               get :agents
               get :inboxes
               get :labels
               get :teams
               get :conversations
               get :conversation_traffic
+              get :bot_metrics
             end
           end
         end
diff --git a/spec/builders/v2/report_builder_spec.rb b/spec/builders/v2/report_builder_spec.rb
index 936c070c4..2ad62e2d6 100644
--- a/spec/builders/v2/report_builder_spec.rb
+++ b/spec/builders/v2/report_builder_spec.rb
@@ -6,8 +6,6 @@ describe V2::ReportBuilder do
   let_it_be(:label_1) { create(:label, title: 'Label_1', account: account) }
   let_it_be(:label_2) { create(:label, title: 'Label_2', account: account) }
 
-  # Update this spec to use travel_to
-  # This spec breaks in certain timezone
   describe '#timeseries' do
     before do
       travel_to(Time.zone.today) do
@@ -128,6 +126,75 @@ describe V2::ReportBuilder do
         end
       end
 
+      it 'returns bot_resolutions count' do
+        travel_to(Time.zone.today) do
+          params = {
+            metric: 'bot_resolutions_count',
+            type: :account,
+            since: (Time.zone.today - 3.days).to_time.to_i.to_s,
+            until: Time.zone.today.end_of_day.to_time.to_i.to_s
+          }
+
+          create(:agent_bot_inbox, inbox: account.inboxes.first)
+          conversations = account.conversations.where('created_at < ?', 1.day.ago)
+          conversations.each do |conversation|
+            conversation.messages.outgoing.all.update(sender: nil)
+          end
+
+          perform_enqueued_jobs do
+            # Resolve all 5 conversations
+            conversations.each(&:resolved!)
+
+            # Reopen 1 conversation
+            conversations.first.open!
+          end
+
+          builder = described_class.new(account, params)
+          metrics = builder.timeseries
+          summary = builder.bot_summary
+
+          # 4 conversations are resolved
+          expect(metrics[Time.zone.today]).to be 4
+          expect(metrics[Time.zone.today - 2.days]).to be 0
+          expect(summary[:bot_resolutions_count]).to be 4
+        end
+      end
+
+      it 'return bot_handoff count' do
+        travel_to(Time.zone.today) do
+          params = {
+            metric: 'bot_handoffs_count',
+            type: :account,
+            since: (Time.zone.today - 3.days).to_time.to_i.to_s,
+            until: Time.zone.today.end_of_day.to_time.to_i.to_s
+          }
+
+          create(:agent_bot_inbox, inbox: account.inboxes.first)
+          conversations = account.conversations.where('created_at < ?', 1.day.ago)
+          conversations.each do |conversation|
+            conversation.pending!
+            conversation.messages.outgoing.all.update(sender: nil)
+          end
+
+          perform_enqueued_jobs do
+            # Resolve all 5 conversations
+            conversations.each(&:bot_handoff!)
+
+            # Reopen 1 conversation
+            conversations.first.open!
+          end
+
+          builder = described_class.new(account, params)
+          metrics = builder.timeseries
+          summary = builder.bot_summary
+
+          # 4 conversations are resolved
+          expect(metrics[Time.zone.today]).to be 5
+          expect(metrics[Time.zone.today - 2.days]).to be 0
+          expect(summary[:bot_handoffs_count]).to be 5
+        end
+      end
+
       it 'returns average first response time' do
         params = {
           metric: 'avg_first_response_time',
diff --git a/spec/builders/v2/reports/bot_metrics_builder_spec.rb b/spec/builders/v2/reports/bot_metrics_builder_spec.rb
new file mode 100644
index 000000000..53e52d595
--- /dev/null
+++ b/spec/builders/v2/reports/bot_metrics_builder_spec.rb
@@ -0,0 +1,44 @@
+require 'rails_helper'
+
+RSpec.describe V2::Reports::BotMetricsBuilder do
+  subject(:bot_metrics_builder) { described_class.new(inbox.account, params) }
+
+  let(:inbox) { create(:inbox) }
+  let!(:resolved_conversation) { create(:conversation, account: inbox.account, inbox: inbox, created_at: 2.days.ago) }
+  let!(:unresolved_conversation) { create(:conversation, account: inbox.account, inbox: inbox, created_at: 2.days.ago) }
+  let(:since) { 1.week.ago.to_i.to_s }
+  let(:until_time) { Time.now.to_i.to_s }
+  let(:params) { { since: since, until: until_time } }
+
+  before do
+    create(:agent_bot_inbox, inbox: inbox)
+    create(:message, account: inbox.account, conversation: resolved_conversation, created_at: 2.days.ago, message_type: 'outgoing')
+    create(:reporting_event, account_id: inbox.account.id, name: 'conversation_bot_resolved', conversation_id: resolved_conversation.id,
+                             created_at: 2.days.ago)
+    create(:reporting_event, account_id: inbox.account.id, name: 'conversation_bot_handoff',
+                             conversation_id: resolved_conversation.id, created_at: 2.days.ago)
+    create(:reporting_event, account_id: inbox.account.id, name: 'conversation_bot_handoff',
+                             conversation_id: unresolved_conversation.id, created_at: 2.days.ago)
+  end
+
+  describe '#metrics' do
+    context 'with valid params' do
+      it 'returns correct metrics' do
+        metrics = bot_metrics_builder.metrics
+
+        expect(metrics[:conversation_count]).to eq(2)
+        expect(metrics[:message_count]).to eq(1)
+        expect(metrics[:resolution_rate]).to eq(50)
+        expect(metrics[:handoff_rate]).to eq(100)
+      end
+    end
+
+    context 'with missing params' do
+      let(:params) { {} }
+
+      it 'handles missing since and until params gracefully' do
+        expect { bot_metrics_builder.metrics }.not_to raise_error
+      end
+    end
+  end
+end
diff --git a/spec/controllers/api/v2/accounts/report_controller_spec.rb b/spec/controllers/api/v2/accounts/report_controller_spec.rb
index 27a596243..fc0228c86 100644
--- a/spec/controllers/api/v2/accounts/report_controller_spec.rb
+++ b/spec/controllers/api/v2/accounts/report_controller_spec.rb
@@ -191,6 +191,48 @@ RSpec.describe 'Reports API', type: :request do
     end
   end
 
+  describe 'GET /api/v2/accounts/:account_id/reports/bot_summary' do
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        get "/api/v2/accounts/#{account.id}/reports/bot_summary"
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated user' do
+      let(:params) do
+        super().merge(
+          type: :account,
+          since: start_of_today.to_s,
+          until: end_of_today.to_s
+        )
+      end
+
+      it 'returns unauthorized for agents' do
+        get "/api/v2/accounts/#{account.id}/reports/bot_summary",
+            params: params,
+            headers: agent.create_new_auth_token,
+            as: :json
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+
+      it 'returns bot summary metrics' do
+        get "/api/v2/accounts/#{account.id}/reports/bot_summary",
+            params: params,
+            headers: admin.create_new_auth_token,
+            as: :json
+
+        expect(response).to have_http_status(:success)
+        json_response = response.parsed_body
+
+        expect(json_response['bot_resolutions_count']).to eq(0)
+        expect(json_response['bot_handoffs_count']).to eq(0)
+      end
+    end
+  end
+
   describe 'GET /api/v2/accounts/:account_id/reports/agents' do
     context 'when it is an unauthenticated user' do
       it 'returns unauthorized' do
@@ -399,4 +441,41 @@ RSpec.describe 'Reports API', type: :request do
       end
     end
   end
+
+  describe 'GET /api/v2/accounts/:account_id/reports/bot_metrics' do
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        get "/api/v2/accounts/#{account.id}/reports/bot_metrics"
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated user' do
+      let(:params) do
+        super().merge(
+          since: 7.days.ago.to_i.to_s,
+          until: end_of_today.to_s
+        )
+      end
+
+      it 'returns unauthorized if the user is an agent' do
+        get "/api/v2/accounts/#{account.id}/reports/bot_metrics",
+            params: params,
+            headers: agent.create_new_auth_token
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+
+      it 'returns values' do
+        expect(V2::Reports::BotMetricsBuilder).to receive(:new).and_call_original
+        get "/api/v2/accounts/#{account.id}/reports/bot_metrics",
+            params: params,
+            headers: admin.create_new_auth_token
+
+        expect(response).to have_http_status(:success)
+        expect(response.parsed_body.keys).to match_array(%w[conversation_count message_count resolution_rate handoff_rate])
+      end
+    end
+  end
 end
diff --git a/spec/factories/agent_bots.rb b/spec/factories/agent_bots.rb
index 8fc0a6bf4..286f70b5e 100644
--- a/spec/factories/agent_bots.rb
+++ b/spec/factories/agent_bots.rb
@@ -2,7 +2,7 @@ FactoryBot.define do
   factory :agent_bot do
     name { 'MyString' }
     description { 'MyString' }
-    outgoing_url { 'MyString' }
+    outgoing_url { 'localhost' }
     bot_config { {} }
     bot_type { 'webhook' }
 

From 81060a72a452d6754e5cc1d2dfb2a265952eabc9 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Mon, 4 Mar 2024 09:55:19 +0530
Subject: [PATCH 50/96] feat: Improve reply suggestions using help center
 articles (#9026)

---
 enterprise/lib/chat_gpt.rb                    |  4 ++--
 .../integrations/openai_processor_service.rb  | 20 +++++++++++++++++--
 lib/integrations/openai/processor_service.rb  |  3 +--
 lib/integrations/openai_base_service.rb       | 11 +++++-----
 4 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/enterprise/lib/chat_gpt.rb b/enterprise/lib/chat_gpt.rb
index a8dbf9537..d13ec118f 100644
--- a/enterprise/lib/chat_gpt.rb
+++ b/enterprise/lib/chat_gpt.rb
@@ -8,9 +8,9 @@ class ChatGpt
     @messages = [system_message(context_sections)]
   end
 
-  def generate_response(input, previous_messages = [])
+  def generate_response(input, previous_messages = [], role = 'user')
     @messages += previous_messages
-    @messages << { 'role': 'user', 'content': input } if input.present?
+    @messages << { 'role': role, 'content': input } if input.present?
 
     response = request_gpt
     JSON.parse(response['choices'][0]['message']['content'].strip)
diff --git a/enterprise/lib/enterprise/integrations/openai_processor_service.rb b/enterprise/lib/enterprise/integrations/openai_processor_service.rb
index bf2f4ccf3..b3cf9aeee 100644
--- a/enterprise/lib/enterprise/integrations/openai_processor_service.rb
+++ b/enterprise/lib/enterprise/integrations/openai_processor_service.rb
@@ -3,6 +3,24 @@ module Enterprise::Integrations::OpenaiProcessorService
                            make_friendly make_formal simplify].freeze
   CACHEABLE_EVENTS = %w[label_suggestion].freeze
 
+  def reply_suggestion_message
+    return super unless conversation.inbox.response_bot_enabled?
+
+    messages = conversation_messages(in_array_format: true)
+    last_message = messages.pop
+
+    robin_response = ChatGpt.new(
+      Enterprise::MessageTemplates::ResponseBotService.response_sections(last_message[:content], conversation.inbox)
+    ).generate_response(
+      last_message[:content], messages, last_message[:role]
+    )
+    message_content = robin_response['response']
+    if robin_response['context_ids'].present?
+      message_content += Enterprise::MessageTemplates::ResponseBotService.generate_sources_section(robin_response['context_ids'])
+    end
+    message_content
+  end
+
   def label_suggestion_message
     payload = label_suggestion_body
     return nil if payload.blank?
@@ -19,8 +37,6 @@ module Enterprise::Integrations::OpenaiProcessorService
   private
 
   def labels_with_messages
-    conversation = find_conversation
-
     return nil unless valid_conversation?(conversation)
 
     labels = hook.account.labels.pluck(:title).join(', ')
diff --git a/lib/integrations/openai/processor_service.rb b/lib/integrations/openai/processor_service.rb
index f71d2a7ed..1359c6aff 100644
--- a/lib/integrations/openai/processor_service.rb
+++ b/lib/integrations/openai/processor_service.rb
@@ -62,7 +62,6 @@ class Integrations::Openai::ProcessorService < Integrations::OpenaiBaseService
   end
 
   def conversation_messages(in_array_format: false)
-    conversation = find_conversation
     messages = init_messages_body(in_array_format)
 
     add_messages_until_token_limit(conversation, messages, in_array_format)
@@ -70,7 +69,7 @@ class Integrations::Openai::ProcessorService < Integrations::OpenaiBaseService
 
   def add_messages_until_token_limit(conversation, messages, in_array_format, start_from = 0)
     character_count = start_from
-    conversation.messages.chat.reorder('id desc').each do |message|
+    conversation.messages.where(message_type: [:incoming, :outgoing]).where(private: false).reorder('id desc').each do |message|
       character_count, message_added = add_message_if_within_limit(character_count, message, messages, in_array_format)
       break unless message_added
     end
diff --git a/lib/integrations/openai_base_service.rb b/lib/integrations/openai_base_service.rb
index 9cfdc71c3..da2878aab 100644
--- a/lib/integrations/openai_base_service.rb
+++ b/lib/integrations/openai_base_service.rb
@@ -1,8 +1,8 @@
 class Integrations::OpenaiBaseService
-  # 3.5 support 4,096 tokens
+  # 3.5 support 16,385 tokens
   # 1 token is approx 4 characters
-  # 4,096 * 4 = 16,384 characters, sticking to 15,000 to be safe
-  TOKEN_LIMIT = 15_000
+  # 16385 * 4 = 65540 characters, sticking to 50,000 to be safe
+  TOKEN_LIMIT = 50_000
   API_URL = 'https://api.openai.com/v1/chat/completions'.freeze
   GPT_MODEL = 'gpt-3.5-turbo'.freeze
 
@@ -31,7 +31,6 @@ class Integrations::OpenaiBaseService
   def cache_key
     return nil unless event_is_cacheable?
 
-    conversation = find_conversation
     return nil unless conversation
 
     # since the value from cache depends on the conversation last_activity_at, it will always be fresh
@@ -52,8 +51,8 @@ class Integrations::OpenaiBaseService
     Redis::Alfred.setex(cache_key, response)
   end
 
-  def find_conversation
-    hook.account.conversations.find_by(display_id: event['data']['conversation_display_id'])
+  def conversation
+    @conversation ||= hook.account.conversations.find_by(display_id: event['data']['conversation_display_id'])
   end
 
   def valid_event_name?

From a9d42e8c7e207eef40647608b629a87d9dff82c7 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Mon, 4 Mar 2024 21:58:47 +0530
Subject: [PATCH 51/96] fix: Update the broken styles in help center insert
 modal (#9062)

---
 .../ArticleSearch/ArticleSearchResultItem.vue          |  4 ++--
 .../helpcenter/components/ArticleSearch/Header.vue     | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleSearch/ArticleSearchResultItem.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleSearch/ArticleSearchResultItem.vue
index 8ecff430a..836f77250 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleSearch/ArticleSearchResultItem.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleSearch/ArticleSearchResultItem.vue
@@ -4,14 +4,14 @@
     @click="handlePreview"
   >
     <h4
-      class="text-sm text-left mb-0 text-slate-900 dark:text-slate-25 px-1 -mx-1 rounded-sm width-auto hover:underline group-hover:underline"
+      class="text-sm ltr:text-left rtl:text-right w-full mb-0 text-slate-900 dark:text-slate-25 -mx-1 rounded-sm hover:underline group-hover:underline"
     >
       {{ title }}
     </h4>
 
     <div class="flex content-between items-center gap-0.5 w-full">
       <p
-        class="text-sm text-left text-slate-600 dark:text-slate-300 mb-0 w-full"
+        class="text-sm ltr:text-left rtl:text-right text-slate-600 dark:text-slate-300 mb-0 w-full"
       >
         {{ locale }}
         {{ ` / ` }}
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleSearch/Header.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleSearch/Header.vue
index a15159d3c..3074f5eec 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleSearch/Header.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleSearch/Header.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="flex flex-col py-1">
-    <div class="flex align-middle align-justify py-2">
+    <div class="flex items-center justify-between py-2 mb-1">
       <h3 class="text-base text-slate-900 dark:text-slate-25">
         {{ title }}
       </h3>
@@ -14,14 +14,16 @@
     </div>
 
     <div class="relative">
-      <div class="absolute left-0 w-8 h-8 flex justify-center items-center">
-        <fluent-icon icon="search" class="" size="16" />
+      <div
+        class="absolute ltr:left-0 rtl:right-0 w-8 top-0.5 h-8 flex justify-center items-center"
+      >
+        <fluent-icon icon="search" class="" size="18" />
       </div>
       <input
         ref="searchInput"
         type="text"
         :placeholder="$t('HELP_CENTER.ARTICLE_SEARCH.PLACEHOLDER')"
-        class="block w-full pl-8 h-8 text-sm dark:bg-slate-700 bg-slate-25 rounded-md leading-8 py-1 text-slate-700 shadow-sm ring-2 ring-transparent ring-slate-300 border border-solid border-slate-300 placeholder:text-slate-400 focus:border-woot-600 focus:ring-woot-200 mb-0 focus:bg-slate-25 dark:focus:bg-slate-700 dark:focus:ring-woot-700"
+        class="block w-full !h-9 ltr:!pl-8 rtl:!pr-8 dark:!bg-slate-700 !bg-slate-25 text-sm rounded-md leading-8 text-slate-700 shadow-sm ring-2 ring-transparent ring-slate-300 border border-solid border-slate-300 placeholder:text-slate-400 focus:border-woot-600 focus:ring-woot-200 !mb-0 focus:bg-slate-25 dark:focus:bg-slate-700 dark:focus:ring-woot-700"
         :value="searchQuery"
         @focus="onFocus"
         @blur="onBlur"

From b4d37fa16bfa11ebf1af1f209f0f1f52460fdc20 Mon Sep 17 00:00:00 2001
From: Pranav <pranav@chatwoot.com>
Date: Mon, 4 Mar 2024 09:57:14 -0800
Subject: [PATCH 52/96] fix: Update help center styles, fix routing issues
 (#9061)

Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
---
 .../components/widgets/EmptyState.vue         |   3 +-
 .../components/widgets/TableFooter.vue        |   2 +-
 .../conversation/contextMenu/menuItem.vue     |   7 +-
 .../contextMenu/menuItemWithSubmenu.vue       |   2 +-
 .../dashboard/i18n/locale/en/helpCenter.json  |   2 +-
 .../helpcenter/components/ArticleEditor.vue   |   2 +-
 .../helpcenter/components/ArticleItem.vue     | 136 ++++++------------
 .../helpcenter/components/ArticleTable.vue    |  27 ++--
 .../components/Header/ArticleHeader.vue       |   9 +-
 .../components/Header/EditArticleHeader.vue   |   5 +-
 .../helpcenter/components/Sidebar/Sidebar.vue |   8 +-
 .../pages/articles/ArticleSettings.vue        |  28 ++--
 .../pages/articles/DefaultPortalArticles.vue  |  59 +++++---
 .../helpcenter/pages/articles/EditArticle.vue |  34 ++---
 .../pages/articles/ListAllArticles.vue        |  31 ++--
 .../helpcenter/pages/articles/NewArticle.vue  |  26 +---
 16 files changed, 163 insertions(+), 218 deletions(-)

diff --git a/app/javascript/dashboard/components/widgets/EmptyState.vue b/app/javascript/dashboard/components/widgets/EmptyState.vue
index 47ace433e..fe7b03942 100644
--- a/app/javascript/dashboard/components/widgets/EmptyState.vue
+++ b/app/javascript/dashboard/components/widgets/EmptyState.vue
@@ -2,7 +2,7 @@
   <div class="empty-state py-16 px-1 ml-0 mr-0">
     <h3
       v-if="title"
-      class="text-slate-700 dark:text-slate-200 block text-center w-full text-4xl font-thin"
+      class="text-slate-700 dark:text-slate-200 block text-center w-full text-xl font-thin"
     >
       {{ title }}
     </h3>
@@ -15,6 +15,7 @@
     <slot />
   </div>
 </template>
+
 <script>
 export default {
   props: {
diff --git a/app/javascript/dashboard/components/widgets/TableFooter.vue b/app/javascript/dashboard/components/widgets/TableFooter.vue
index 050dbcb71..e064fa02d 100644
--- a/app/javascript/dashboard/components/widgets/TableFooter.vue
+++ b/app/javascript/dashboard/components/widgets/TableFooter.vue
@@ -1,7 +1,7 @@
 <template>
   <footer
     v-if="isFooterVisible"
-    class="bg-white dark:bg-slate-800 h-[60px] border-t border-solid border-slate-75 dark:border-slate-700/50 flex items-center justify-between py-0 px-4"
+    class="bg-white dark:bg-slate-800 h-12 border-t border-solid border-slate-75 dark:border-slate-700/50 flex items-center justify-between px-6"
   >
     <div class="left-aligned-wrap">
       <div class="text-xs text-slate-600 dark:text-slate-200">
diff --git a/app/javascript/dashboard/components/widgets/conversation/contextMenu/menuItem.vue b/app/javascript/dashboard/components/widgets/conversation/contextMenu/menuItem.vue
index b7e3ef4fe..0a132de73 100644
--- a/app/javascript/dashboard/components/widgets/conversation/contextMenu/menuItem.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/contextMenu/menuItem.vue
@@ -1,5 +1,9 @@
 <template>
-  <div class="menu" role="button" @click.stop="$emit('click')">
+  <div
+    class="menu text-slate-800 dark:text-slate-100"
+    role="button"
+    @click.stop="$emit('click')"
+  >
     <fluent-icon
       v-if="variant === 'icon' && option.icon"
       :icon="option.icon"
@@ -48,6 +52,7 @@ export default {
 .menu {
   width: calc(var(--space-mega) * 2);
   @apply flex items-center flex-nowrap p-1 rounded-sm overflow-hidden cursor-pointer;
+
   .menu-label {
     @apply my-0 mx-2 text-xs flex-shrink-0;
   }
diff --git a/app/javascript/dashboard/components/widgets/conversation/contextMenu/menuItemWithSubmenu.vue b/app/javascript/dashboard/components/widgets/conversation/contextMenu/menuItemWithSubmenu.vue
index f85d68953..619b5aeab 100644
--- a/app/javascript/dashboard/components/widgets/conversation/contextMenu/menuItemWithSubmenu.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/contextMenu/menuItemWithSubmenu.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    class="menu-with-submenu min-width-calc w-full p-1 flex items-center h-7 rounded-md relative bg-white dark:bg-slate-700 justify-between hover:bg-woot-75 cursor-pointer dark:hover:bg-slate-800"
+    class="text-slate-800 dark:text-slate-100 menu-with-submenu min-width-calc w-full p-1 flex items-center h-7 rounded-md relative bg-white dark:bg-slate-700 justify-between hover:bg-woot-75 cursor-pointer dark:hover:bg-slate-800"
     :class="!subMenuAvailable ? 'opacity-50 cursor-not-allowed' : ''"
   >
     <div class="flex items-center">
diff --git a/app/javascript/dashboard/i18n/locale/en/helpCenter.json b/app/javascript/dashboard/i18n/locale/en/helpCenter.json
index d94692e3d..6c4238b92 100644
--- a/app/javascript/dashboard/i18n/locale/en/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/en/helpCenter.json
@@ -319,7 +319,7 @@
       "HEADERS": {
         "TITLE": "Title",
         "CATEGORY": "Category",
-        "READ_COUNT": "Read count",
+        "READ_COUNT": "Views",
         "STATUS": "Status",
         "LAST_EDITED": "Last edited"
       },
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleEditor.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleEditor.vue
index 7055005e1..a1d8f2dd3 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleEditor.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleEditor.vue
@@ -81,7 +81,7 @@ export default {
 
 <style lang="scss" scoped>
 .edit-article--container {
-  @apply my-8 mx-auto py-0 px-6 max-w-[56rem] w-full;
+  @apply my-8 mx-auto py-0 max-w-[56rem] w-full;
 }
 
 .article-heading {
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleItem.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleItem.vue
index 304fd9c4e..3ebdf011f 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleItem.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleItem.vue
@@ -1,12 +1,19 @@
 <template>
-  <div class="article-container--row">
-    <span class="article-column article-title">
-      <emoji-or-icon class="icon-grab" icon="grab-handle" />
-      <div class="article-block">
+  <div
+    class="text-slate-700 dark:text-slate-100 last:border-b-0 bg-white dark:bg-slate-900 my-0 -mx-4 grid grid-cols-1 lg:grid-cols-12 gap-4 border-b border-slate-50 dark:border-slate-800 px-6 py-3"
+  >
+    <span class="items-start flex gap-2 col-span-6 text-left">
+      <fluent-icon
+        v-if="showDragIcon"
+        size="20"
+        class="block cursor-move flex-shrink-0 h-4 mt-1 w-4 text-slate-200 dark:text-slate-700 hover:text-slate-400 hover:dark:text-slate-200"
+        icon="grab-handle"
+      />
+      <div class="flex flex-col truncate">
         <router-link :to="articleUrl(id)">
           <h6
             :title="title"
-            class="text-base ltr:text-left rtl:text-right text-slate-800 dark:text-slate-100 mb-0 leading-6 h-6 hover:underline overflow-hidden whitespace-nowrap text-ellipsis"
+            class="text-base ltr:text-left rtl:text-right text-slate-800 dark:text-slate-100 mb-0.5 leading-6 font-medium hover:underline overflow-hidden whitespace-nowrap text-ellipsis"
           >
             {{ title }}
           </h6>
@@ -16,14 +23,14 @@
             v-if="author"
             :src="author.thumbnail"
             :username="author.name"
-            size="16px"
+            size="14px"
           />
           <div
             v-else
             v-tooltip.right="
               $t('HELP_CENTER.TABLE.COLUMNS.AUTHOR_NOT_AVAILABLE')
             "
-            class="flex items-center justify-center rounded w-4 h-4 bg-woot-100 dark:bg-woot-700"
+            class="flex items-center justify-center rounded w-3.5 h-3.5 bg-woot-100 dark:bg-woot-700"
           >
             <fluent-icon
               icon="person"
@@ -32,61 +39,64 @@
               class="text-woot-300 dark:text-woot-300"
             />
           </div>
-          <span class="font-normal text-slate-500 dark:text-slate-200 text-sm">
+          <span class="font-normal text-slate-700 dark:text-slate-200 text-sm">
             {{ articleAuthorName }}
           </span>
         </div>
       </div>
     </span>
-    <span class="article-column article-category">
+    <span class="flex items-center col-span-2">
       <router-link
-        class="text-sm button clear link secondary min-w-0 max-w-full"
+        class="text-sm hover:underline p-0.5 truncate hover:bg-slate-25 hover:rounded-md"
         :to="getCategoryRoute(category.slug)"
       >
-        <span
-          :title="category.name"
-          class="category-link-content overflow-hidden whitespace-nowrap text-ellipsis"
-        >
+        <span :title="category.name">
           {{ category.name }}
         </span>
       </router-link>
     </span>
-    <span class="article-column article-read-count">
-      <span class="text-sm" :title="formattedViewCount">
-        {{ readableViewCount }}
+    <span
+      class="flex items-center text-xs lg:text-sm"
+      :title="formattedViewCount"
+    >
+      {{ readableViewCount }}
+      <span class="lg:hidden ml-1">
+        {{ ` ${$t('HELP_CENTER.TABLE.HEADERS.READ_COUNT')}` }}
       </span>
     </span>
-    <span class="article-column article-status">
-      <div>
-        <woot-label
-          :title="status"
-          size="small"
-          variant="smooth"
-          :color-scheme="labelColor"
-        />
-      </div>
+    <span class="flex items-center capitalize">
+      <woot-label
+        class="!mb-0"
+        :title="status"
+        size="small"
+        variant="smooth"
+        :color-scheme="labelColor"
+      />
     </span>
-    <span class="article-column article-last-edited">
-      <span class="text-sm">
-        {{ lastUpdatedAt }}
-      </span>
+    <span
+      class="flex items-center justify-end col-span-2 first-letter:uppercase text-slate-700 dark:text-slate-100 text-xs"
+    >
+      {{ lastUpdatedAt }}
     </span>
   </div>
 </template>
+
 <script>
 import timeMixin from 'dashboard/mixins/time';
 import portalMixin from '../mixins/portalMixin';
 import { frontendURL } from 'dashboard/helper/URLHelper';
-import EmojiOrIcon from '../../../../../shared/components/EmojiOrIcon.vue';
 import Thumbnail from 'dashboard/components/widgets/Thumbnail.vue';
 
 export default {
   components: {
-    EmojiOrIcon,
     Thumbnail,
   },
   mixins: [timeMixin, portalMixin],
   props: {
+    showDragIcon: {
+      type: Boolean,
+      default: false,
+    },
     id: {
       type: Number,
       required: true,
@@ -156,65 +166,3 @@ export default {
   },
 };
 </script>
-
-<style lang="scss" scoped>
-.article-container--row {
-  @apply bg-white dark:bg-slate-900 my-0 -mx-4 py-0 px-4 grid grid-cols-8 gap-4 border-b border-slate-50 dark:border-slate-800;
-
-  @media (max-width: 1024px) {
-    @apply grid-cols-7;
-  }
-
-  @media (max-width: 768px) {
-    @apply grid-cols-6;
-  }
-
-  &.draggable {
-    span.article-column.article-title {
-      @apply -ml-2;
-
-      .icon-grab {
-        @apply block cursor-move h-4 mt-1 w-4 text-slate-100 dark:text-slate-700;
-
-        &:hover {
-          @apply text-slate-300 dark:text-slate-200;
-        }
-      }
-    }
-  }
-
-  span.article-column {
-    @apply text-slate-700 dark:text-slate-100 text-sm font-semibold py-2 px-0 text-left capitalize last:text-right;
-
-    &.article-title {
-      @apply items-start flex gap-2 col-span-4 text-left;
-
-      .icon-grab {
-        @apply hidden;
-      }
-    }
-
-    // for screen sizes smaller than 1024px
-    @media (max-width: 63.9375em) {
-      &.article-read-count {
-        @apply hidden;
-      }
-    }
-
-    @media (max-width: 47.9375em) {
-      &.article-read-count,
-      &.article-last-edited {
-        @apply hidden;
-      }
-    }
-  }
-
-  .article-block {
-    @apply min-w-0;
-  }
-}
-
-span {
-  @apply font-normal text-slate-700 dark:text-slate-100 text-sm pl-0;
-}
-</style>
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleTable.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleTable.vue
index aa92ced67..eb20e1e25 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleTable.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/ArticleTable.vue
@@ -1,38 +1,38 @@
 <template>
-  <div class="w-full">
+  <div class="flex-1">
     <div
-      class="my-0 py-0 px-4 grid grid-cols-6 z-10 md:grid-cols-7 lg:grid-cols-8 gap-4 border-b border-slate-100 dark:border-slate-700 sticky top-16 bg-white dark:bg-slate-900"
+      class="hidden lg:grid py-0 px-6 h-12 content-center grid-cols-12 z-10 gap-4 border-b border-slate-50 dark:border-slate-700 sticky top-16 bg-white dark:bg-slate-900"
       :class="{ draggable: onCategoryPage }"
     >
       <div
-        class="font-semibold capitalize text-sm py-2 px-0 text-slate-700 dark:text-slate-100 ltr:text-left rtl:text-right col-span-4"
+        class="font-semibold capitalize text-sm py-2 px-0 text-slate-700 dark:text-slate-100 text-left rtl:text-right col-span-6"
       >
         {{ $t('HELP_CENTER.TABLE.HEADERS.TITLE') }}
       </div>
       <div
-        class="font-semibold capitalize text-sm py-2 px-0 text-slate-700 dark:text-slate-100 text-left"
+        class="font-semibold capitalize text-sm py-2 px-0 text-slate-700 dark:text-slate-100 text-left rtl:text-right col-span-2"
       >
         {{ $t('HELP_CENTER.TABLE.HEADERS.CATEGORY') }}
       </div>
       <div
-        class="font-semibold capitalize text-sm py-2 px-0 text-slate-700 dark:text-slate-100 text-left hidden lg:block"
+        class="font-semibold capitalize text-sm py-2 px-0 text-slate-700 dark:text-slate-100 text-left rtl:text-right hidden lg:block"
       >
         {{ $t('HELP_CENTER.TABLE.HEADERS.READ_COUNT') }}
       </div>
       <div
-        class="font-semibold capitalize text-sm py-2 px-0 text-slate-700 dark:text-slate-100 text-left"
+        class="font-semibold capitalize text-sm py-2 px-0 text-slate-700 dark:text-slate-100 text-left rtl:text-right"
       >
         {{ $t('HELP_CENTER.TABLE.HEADERS.STATUS') }}
       </div>
       <div
-        class="font-semibold capitalize text-sm py-2 px-0 text-slate-700 dark:text-slate-100 text-right hidden md:block"
+        class="font-semibold capitalize text-sm py-2 px-0 text-slate-700 dark:text-slate-100 text-right rtl:text-left hidden md:block col-span-2"
       >
         {{ $t('HELP_CENTER.TABLE.HEADERS.LAST_EDITED') }}
       </div>
     </div>
     <draggable
       tag="div"
-      class="border-t-0 px-4"
+      class="border-t-0 px-4 pb-4"
       :disabled="!dragEnabled"
       :list="localArticles"
       ghost-class="article-ghost-class"
@@ -46,6 +46,7 @@
         :class="{ draggable: onCategoryPage }"
         :title="article.title"
         :author="article.author"
+        :show-drag-icon="dragEnabled"
         :category="article.category"
         :views="article.views"
         :status="article.status"
@@ -58,7 +59,7 @@
       :current-page="currentPage"
       :total-count="totalCount"
       :page-size="pageSize"
-      class="dark:bg-slate-900 sticky bottom-0 border-t-0 px-4"
+      class="dark:bg-slate-900 sticky bottom-0"
       @page-change="onPageChange"
     />
   </div>
@@ -78,7 +79,7 @@ export default {
   props: {
     articles: {
       type: Array,
-      default: () => {},
+      default: () => [],
     },
     totalCount: {
       type: Number,
@@ -95,7 +96,7 @@ export default {
   },
   data() {
     return {
-      localArticles: [],
+      localArticles: this.articles || [],
     };
   },
   computed: {
@@ -155,6 +156,10 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+/*
+The .article-ghost-class class is maintained as the vueDraggable doesn't allow multiple classes
+to be passed in the ghost-class prop.
+ */
 .article-ghost-class {
   @apply opacity-50 bg-slate-50 dark:bg-slate-800;
 }
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/components/Header/ArticleHeader.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/Header/ArticleHeader.vue
index 1ae19f292..4235d9d9f 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/components/Header/ArticleHeader.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/Header/ArticleHeader.vue
@@ -1,16 +1,14 @@
 <template>
   <div
-    class="flex px-4 items-center justify-between w-full h-16 pt-2 sticky top-0 z-50 bg-white dark:bg-slate-900"
+    class="flex p-6 items-center justify-between w-full h-16 sticky top-0 z-50 bg-white dark:bg-slate-900"
   >
     <div class="flex items-center">
       <woot-sidemenu-icon />
       <div class="flex items-center my-0 mx-2">
-        <h3
-          class="text-2xl text-slate-800 dark:text-slate-100 font-medium mb-0"
-        >
+        <h3 class="text-xl text-slate-800 dark:text-slate-100 font-medium mb-0">
           {{ headerTitle }}
         </h3>
-        <span class="text-sm text-slate-600 dark:text-slate-300 my-0 mx-2">{{
+        <span class="text-sm text-slate-600 dark:text-slate-300 mx-2 mt-0.5">{{
           `(${count})`
         }}</span>
       </div>
@@ -234,6 +232,7 @@ export default {
 .dropdown-pane--open {
   @apply absolute top-10 right-0 z-50 min-w-[8rem];
 }
+
 .dropdown-arrow {
   @apply ml-1 rtl:ml-0 rtl:mr-1;
 }
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/components/Header/EditArticleHeader.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/Header/EditArticleHeader.vue
index 4ed23d4c8..b22d9b562 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/components/Header/EditArticleHeader.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/Header/EditArticleHeader.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="flex items-center justify-between w-full h-16 pt-2">
+  <div class="flex items-center justify-between w-full h-16">
     <div class="flex items-center">
       <woot-button
         icon="chevron-left"
@@ -240,12 +240,15 @@ export default {
     @apply absolute right-0;
   }
 }
+
 .draft-status {
   animation: fadeIn 1s;
+
   @keyframes fadeIn {
     0% {
       opacity: 0;
     }
+
     100% {
       opacity: 1;
     }
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/components/Sidebar/Sidebar.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/Sidebar/Sidebar.vue
index 3cff8c440..f6aceedf5 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/components/Sidebar/Sidebar.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/Sidebar/Sidebar.vue
@@ -1,18 +1,19 @@
 <template>
   <div
-    class="h-full overflow-auto w-60 flex flex-col bg-white dark:bg-slate-900 border-r dark:border-slate-700 rtl:border-r-0 rtl:border-l border-slate-50 text-sm px-2 pb-8"
+    class="h-full overflow-auto w-60 flex flex-col bg-white dark:bg-slate-900 border-r dark:border-slate-700 rtl:border-r-0 rtl:border-l border-slate-50 text-sm"
   >
     <sidebar-header
       :thumbnail-src="thumbnailSrc"
       :header-title="headerTitle"
       :sub-title="subTitle"
       :portal-link="portalLink"
+      class="px-4"
       @open-popover="openPortalPopover"
     />
     <transition-group
       name="menu-list"
       tag="ul"
-      class="pt-2 list-none ml-0 mb-0"
+      class="py-2 px-4 list-none ml-0 mb-0"
     >
       <secondary-nav-item
         v-for="menuItem in accessibleMenuItems"
@@ -75,9 +76,6 @@ export default {
       default: () => [],
     },
   },
-  data() {
-    return {};
-  },
   computed: {
     hasCategory() {
       return (
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/articles/ArticleSettings.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/articles/ArticleSettings.vue
index f48b79971..34df7812f 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/articles/ArticleSettings.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/articles/ArticleSettings.vue
@@ -1,10 +1,12 @@
 <template>
   <transition name="popover-animation">
-    <div class="article-settings--container">
+    <div
+      class="min-w-[15rem] max-w-[22.5rem] p-6 overflow-y-auto border-l rtl:border-r rtl:border-l-0 border-solid border-slate-50 dark:border-slate-700"
+    >
       <h3 class="text-base text-slate-800 dark:text-slate-100">
         {{ $t('HELP_CENTER.ARTICLE_SETTINGS.TITLE') }}
       </h3>
-      <div class="form-wrap">
+      <div class="mt-4 mb-6">
         <label>
           {{ $t('HELP_CENTER.ARTICLE_SETTINGS.FORM.CATEGORY.LABEL') }}
           <multiselect-dropdown
@@ -64,6 +66,7 @@
           {{ $t('HELP_CENTER.ARTICLE_SETTINGS.FORM.META_DESCRIPTION.LABEL') }}
           <textarea
             v-model="metaDescription"
+            class="text-sm"
             rows="3"
             type="text"
             :placeholder="
@@ -95,7 +98,7 @@
           />
         </label>
       </div>
-      <div class="action-buttons">
+      <div class="flex flex-col">
         <woot-button
           icon="archive"
           size="small"
@@ -241,35 +244,24 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.article-settings--container {
-  @apply flex-[0.3] min-w-[15rem] max-w-[22.5rem] py-2 pl-4 rtl:pl-0 rtl:pr-4 ml-4 rtl:ml-0 rtl:mr-4 overflow-y-auto border-l rtl:border-r rtl:border-l-0 border-solid border-slate-50 dark:border-slate-700;
-
-  .form-wrap {
-    @apply mt-4 mb-6;
-
-    textarea {
-      @apply text-sm;
-    }
-  }
-
-  .action-buttons {
-    @apply flex flex-col;
-  }
-}
 ::v-deep {
   .multiselect {
     @apply mb-0;
   }
+
   .multiselect__content-wrapper {
     @apply hidden;
   }
+
   .multiselect--active .multiselect__tags {
     padding-right: var(--space-small) !important;
     @apply rounded-md;
   }
+
   .multiselect__placeholder {
     @apply text-slate-300 dark:text-slate-200 pt-2 mb-0;
   }
+
   .multiselect__select {
     @apply hidden;
   }
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/articles/DefaultPortalArticles.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/articles/DefaultPortalArticles.vue
index ba2b51d62..0f1711ac1 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/articles/DefaultPortalArticles.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/articles/DefaultPortalArticles.vue
@@ -5,31 +5,58 @@
     Loading...
   </div>
 </template>
+
 <script>
 import uiSettingsMixin from 'dashboard/mixins/uiSettings';
+import { mapGetters } from 'vuex';
 
 export default {
   mixins: [uiSettingsMixin],
+  computed: {
+    ...mapGetters({ portals: 'portals/allPortals' }),
+  },
   mounted() {
-    const {
-      last_active_portal_slug: lastActivePortalSlug,
-      last_active_locale_code: lastActiveLocaleCode,
-    } = this.uiSettings || {};
+    this.performRouting();
+  },
+  methods: {
+    isPortalPresent(portalSlug) {
+      return !!this.portals.find(portal => portal.slug === portalSlug);
+    },
+    async performRouting() {
+      await this.$store.dispatch('portals/index');
+      this.$nextTick(() => this.routeToLastActivePortal());
+    },
+    routeToView(name, params) {
+      this.$router.replace({ name, params, replace: true });
+    },
+    async routeToLastActivePortal() {
+      // TODO: This method should be written as a navigation guard rather than
+      // a method in the component.
+      const {
+        last_active_portal_slug: lastActivePortalSlug,
+        last_active_locale_code: lastActiveLocaleCode,
+      } = this.uiSettings || {};
 
-    if (lastActivePortalSlug)
-      this.$router.replace({
-        name: 'list_all_locale_articles',
-        params: {
+      if (this.isPortalPresent(lastActivePortalSlug)) {
+        // Check if the last active portal from the user preferences is available in the current
+        // list of portals. If it is, navigate there. The last active portal is saved in the user's
+        // UI settings, regardless of the account. Consequently, it's possible that the saved portal
+        // slug is not available in the current account.
+        this.routeToView('list_all_locale_articles', {
           portalSlug: lastActivePortalSlug,
           locale: lastActiveLocaleCode,
-        },
-        replace: true,
-      });
-    else
-      this.$router.replace({
-        name: 'list_all_portals',
-        replace: true,
-      });
+        });
+      } else if (this.portals.length > 0) {
+        // If the last active portal is available, check for the exisiting list of portals and
+        // navigate to the first available portal.
+        const { slug: portalSlug, meta: { default_locale: locale } = {} } =
+          this.portals[0];
+        this.routeToView('list_all_locale_articles', { portalSlug, locale });
+      } else {
+        // If no portals are available, navigate to the portal list page to prompt creation.
+        this.$router.replace({ name: 'list_all_portals', replace: true });
+      }
+    },
   },
 };
 </script>
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 14191ac66..7268d0ed1 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/articles/EditArticle.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/articles/EditArticle.vue
@@ -1,8 +1,8 @@
 <template>
-  <div class="article-container">
+  <div class="article-container flex w-full overflow-auto">
     <div
-      class="edit-article--container"
-      :class="{ 'is-sidebar-open': showArticleSettings }"
+      class="flex-1 flex-shrink-0 overflow-auto px-6"
+      :class="{ 'flex-grow-1 flex-shrink-0': showArticleSettings }"
     >
       <edit-article-header
         :back-button-label="$t('HELP_CENTER.HEADER.TITLES.ALL_ARTICLES')"
@@ -45,6 +45,7 @@
     />
   </div>
 </template>
+
 <script>
 import { mapGetters } from 'vuex';
 import EditArticleHeader from '../../components/Header/EditArticleHeader.vue';
@@ -107,7 +108,11 @@ export default {
   },
   methods: {
     onClickGoBack() {
-      this.$router.push({ name: 'list_all_locale_articles' });
+      if (window.history.length > 2) {
+        this.$router.go(-1);
+      } else {
+        this.$router.push({ name: 'list_all_locale_articles' });
+      }
     },
     fetchArticleDetails() {
       this.$store.dispatch('articles/show', {
@@ -210,24 +215,3 @@ export default {
   },
 };
 </script>
-
-<style lang="scss" scoped>
-.article-container {
-  display: flex;
-  padding: 0 var(--space-normal);
-  width: 100%;
-  flex: 1;
-  overflow: auto;
-
-  .edit-article--container {
-    flex: 1;
-    flex-shrink: 0;
-    overflow: auto;
-  }
-
-  .is-sidebar-open {
-    flex-grow: 1;
-    flex-shrink: 0;
-  }
-}
-</style>
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/articles/ListAllArticles.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/articles/ListAllArticles.vue
index c4c14da70..ff610e44e 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/articles/ListAllArticles.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/articles/ListAllArticles.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    class="py-0 px-0 w-full max-w-full overflow-auto bg-white dark:bg-slate-900"
+    class="py-0 px-0 w-full max-w-full overflow-auto bg-white dark:bg-slate-900 flex flex-col"
   >
     <article-header
       :header-title="headerTitle"
@@ -8,31 +8,35 @@
       :selected-locale="activeLocaleName"
       :all-locales="allowedLocales"
       selected-value="Published"
+      class="border-b border-slate-50 dark:border-slate-700"
       @new-article-page="newArticlePage"
       @change-locale="onChangeLocale"
     />
-    <article-table
-      :articles="articles"
-      :current-page="Number(meta.currentPage)"
-      :total-count="Number(meta.count)"
-      @page-change="onPageChange"
-      @reorder="onReorder"
-    />
     <div
-      v-if="shouldShowLoader"
+      v-if="isFetching"
       class="items-center flex text-base justify-center py-6 px-4 text-slate-600 dark:text-slate-200"
     >
       <spinner />
-      <span class="text-slate-600 dark:text-slate-200">{{
-        $t('HELP_CENTER.TABLE.LOADING_MESSAGE')
-      }}</span>
+      <span class="text-slate-600 dark:text-slate-200">
+        {{ $t('HELP_CENTER.TABLE.LOADING_MESSAGE') }}
+      </span>
     </div>
     <empty-state
       v-else-if="shouldShowEmptyState"
       :title="$t('HELP_CENTER.TABLE.NO_ARTICLES')"
     />
+    <div v-else class="flex flex-1">
+      <article-table
+        :articles="articles"
+        :current-page="Number(meta.currentPage)"
+        :total-count="Number(meta.count)"
+        @page-change="onPageChange"
+        @reorder="onReorder"
+      />
+    </div>
   </div>
 </template>
+
 <script>
 import { mapGetters } from 'vuex';
 import allLocales from 'shared/constants/locales.js';
@@ -72,9 +76,6 @@ export default {
     shouldShowEmptyState() {
       return !this.isFetching && !this.articles.length;
     },
-    shouldShowLoader() {
-      return this.isFetching && !this.articles.length;
-    },
     selectedPortalSlug() {
       return this.$route.params.portalSlug;
     },
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/articles/NewArticle.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/articles/NewArticle.vue
index 893a5e056..7115b1d82 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/articles/NewArticle.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/articles/NewArticle.vue
@@ -1,8 +1,8 @@
 <template>
-  <div class="article-container">
+  <div class="flex flex-1 overflow-auto">
     <div
-      class="new-article--container"
-      :class="{ 'is-sidebar-open': showArticleSettings }"
+      class="flex-1 overflow-y-auto flex-shrink-0 px-6"
+      :class="{ 'flex-grow-1': showArticleSettings }"
     >
       <edit-article-header
         :back-button-label="$t('HELP_CENTER.HEADER.TITLES.ALL_ARTICLES')"
@@ -22,6 +22,7 @@
     />
   </div>
 </template>
+
 <script>
 import { mapGetters } from 'vuex';
 import EditArticleHeader from 'dashboard/routes/dashboard/helpcenter/components/Header/EditArticleHeader.vue';
@@ -116,22 +117,3 @@ export default {
   },
 };
 </script>
-
-<style lang="scss" scoped>
-.article-container {
-  display: flex;
-  padding: 0 var(--space-normal);
-  width: 100%;
-  flex: 1;
-  overflow: auto;
-}
-.new-article--container {
-  flex: 1;
-  flex-shrink: 0;
-  overflow-y: auto;
-}
-.is-sidebar-open {
-  flex: 0.7;
-  flex-grow: 1;
-}
-</style>

From e086cb0d8617b03f89f31cd7899c11e888e767d5 Mon Sep 17 00:00:00 2001
From: Matheus Rodrigues
 <65840136+matheus-rodrigues00@users.noreply.github.com>
Date: Wed, 6 Mar 2024 08:00:51 -0300
Subject: [PATCH 53/96] docs: added missing type text for messages (#9067)

- It adds the text type of message which is missing on the documentation
---
 swagger/definitions/request/conversation/create_message.yml | 2 +-
 swagger/swagger.json                                        | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/swagger/definitions/request/conversation/create_message.yml b/swagger/definitions/request/conversation/create_message.yml
index c8f4efc7f..b3c9b935b 100644
--- a/swagger/definitions/request/conversation/create_message.yml
+++ b/swagger/definitions/request/conversation/create_message.yml
@@ -13,7 +13,7 @@ properties:
     description: Flag to identify if it is a private note
   content_type:
     type: string
-    enum: ['input_email', 'cards', 'input_select', 'form' , 'article']
+    enum: ['text', 'input_email', 'cards', 'input_select', 'form' , 'article']
     example: 'cards'
     description: 'if you want to create custom message types'
   content_attributes:
diff --git a/swagger/swagger.json b/swagger/swagger.json
index 3cc128626..ec88a224b 100644
--- a/swagger/swagger.json
+++ b/swagger/swagger.json
@@ -6509,6 +6509,7 @@
         "content_type": {
           "type": "string",
           "enum": [
+            "text",
             "input_email",
             "cards",
             "input_select",

From c62c512ec45d49692de1a41a6e5bb933d560c995 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Wed, 6 Mar 2024 17:15:29 +0530
Subject: [PATCH 54/96] fix: inline attachments not handled if tag was missing
 (#9068)

---
 app/mailboxes/mailbox_helper.rb       | 11 +++++++---
 spec/mailboxes/mailbox_helper_spec.rb | 29 +++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/app/mailboxes/mailbox_helper.rb b/app/mailboxes/mailbox_helper.rb
index 6b3afc133..c8c236967 100644
--- a/app/mailboxes/mailbox_helper.rb
+++ b/app/mailboxes/mailbox_helper.rb
@@ -80,10 +80,15 @@ module MailboxHelper
 
   def embed_plain_text_email_with_inline_image(mail_attachment)
     attachment_name = mail_attachment[:original].filename
+    img_tag = "<img src=\"#{inline_image_url(mail_attachment[:blob])}\" alt=\"#{attachment_name}\">"
 
-    @text_content = @text_content.gsub(
-      "[image: #{attachment_name}]", "<img src=\"#{inline_image_url(mail_attachment[:blob])}\" alt=\"#{attachment_name}\">"
-    )
+    tag_to_replace = "[image: #{attachment_name}]"
+
+    if @text_content.include?(tag_to_replace)
+      @text_content = @text_content.gsub(tag_to_replace, img_tag)
+    else
+      @text_content += "\n\n#{img_tag}"
+    end
   end
 
   def inline_image_url(blob)
diff --git a/spec/mailboxes/mailbox_helper_spec.rb b/spec/mailboxes/mailbox_helper_spec.rb
index fbcf1423e..8352a46a1 100644
--- a/spec/mailboxes/mailbox_helper_spec.rb
+++ b/spec/mailboxes/mailbox_helper_spec.rb
@@ -48,4 +48,33 @@ RSpec.describe MailboxHelper do
       end
     end
   end
+
+  describe '#embed_plain_text_email_with_inline_image' do
+    let(:mail_attachment) do
+      {
+        original: OpenStruct.new(filename: 'image.png'),
+        blob: get_blob_for('spec/assets/avatar.png', 'image/png')
+      }
+    end
+
+    let(:helper_instance) { mailbox_helper_obj.new(conversation, processed_mail) }
+
+    it 'replaces the image tag in the text content' do
+      helper_instance.instance_variable_set(:@text_content, 'Hello [image: image.png] World')
+      helper_instance.send(:embed_plain_text_email_with_inline_image, mail_attachment)
+
+      text_content = helper_instance.instance_variable_get(:@text_content)
+
+      expect(text_content).to include(Rails.application.routes.url_helpers.url_for(mail_attachment[:blob]))
+      expect(text_content).not_to include('[image: avatar.png]')
+    end
+
+    it 'replaces the image tag in the text content even if there is not tag to replace' do
+      helper_instance.instance_variable_set(:@text_content, 'Hello World')
+      helper_instance.send(:embed_plain_text_email_with_inline_image, mail_attachment)
+
+      text_content = helper_instance.instance_variable_get(:@text_content)
+      expect(text_content).to include(Rails.application.routes.url_helpers.url_for(mail_attachment[:blob]))
+    end
+  end
 end

From 58dd2633bace7dd08142063045af274fd07ea4e6 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Wed, 6 Mar 2024 17:39:39 +0530
Subject: [PATCH 55/96] feat: Add contact helper (#8989)

---
 app/helpers/contact_helper.rb       |  83 +++++++++++++++++++++
 spec/helpers/contact_helper_spec.rb | 107 ++++++++++++++++++++++++++++
 2 files changed, 190 insertions(+)
 create mode 100644 app/helpers/contact_helper.rb
 create mode 100644 spec/helpers/contact_helper_spec.rb

diff --git a/app/helpers/contact_helper.rb b/app/helpers/contact_helper.rb
new file mode 100644
index 000000000..2bd86937f
--- /dev/null
+++ b/app/helpers/contact_helper.rb
@@ -0,0 +1,83 @@
+module ContactHelper
+  def parse_name(full_name)
+    #  If the input is nil or not a string, return a hash with all values set to nil
+    return default_name_hash if invalid_name?(full_name)
+
+    # If the input is a number, return a hash with the number as the first name
+    return numeric_name_hash(full_name) if valid_number?(full_name)
+
+    full_name = full_name.squish
+
+    # If full name consists of only one word, consider it as the first name
+    return single_word_name_hash(full_name) if single_word?(full_name)
+
+    parts = split_name(full_name)
+    parts = handle_conjunction(parts)
+    build_name_hash(parts)
+  end
+
+  private
+
+  def default_name_hash
+    { first_name: nil, last_name: nil, middle_name: nil, prefix: nil, suffix: nil }
+  end
+
+  def invalid_name?(full_name)
+    !full_name.is_a?(String) || full_name.empty?
+  end
+
+  def numeric_name_hash(full_name)
+    { first_name: full_name, last_name: nil, middle_name: nil, prefix: nil, suffix: nil }
+  end
+
+  def valid_number?(full_name)
+    full_name.gsub(/\s+/, '').match?(/\A\+?\d+\z/)
+  end
+
+  def single_word_name_hash(full_name)
+    { first_name: full_name, last_name: nil, middle_name: nil, prefix: nil, suffix: nil }
+  end
+
+  def single_word?(full_name)
+    full_name.split.size == 1
+  end
+
+  def split_name(full_name)
+    full_name.split
+  end
+
+  def handle_conjunction(parts)
+    conjunctions = ['and', '&']
+    parts.each_index do |i|
+      next unless conjunctions.include?(parts[i]) && i.positive?
+
+      parts[i - 1] = [parts[i - 1], parts[i + 1]].join(' ')
+      parts.delete_at(i)
+      parts.delete_at(i)
+    end
+    parts
+  end
+
+  def build_name_hash(parts)
+    suffix = parts.pop if parts.last.match?(/(\w+\.|[IVXLM]+|[A-Z]+)$/)
+    last_name = parts.pop
+    prefix = parts.shift if parts.first.match?(/^\w+\./)
+    first_name = parts.shift
+    middle_name = parts.join(' ')
+
+    hash = {
+      first_name: first_name,
+      last_name: last_name,
+      prefix: prefix,
+      middle_name: middle_name,
+      suffix: suffix
+    }
+
+    # Reverse name if "," was used in Last, First notation.
+    if hash[:first_name] =~ /,$/
+      hash[:first_name] = hash[:last_name]
+      hash[:last_name] = Regexp.last_match.pre_match
+    end
+    hash
+  end
+end
diff --git a/spec/helpers/contact_helper_spec.rb b/spec/helpers/contact_helper_spec.rb
new file mode 100644
index 000000000..41953fb8d
--- /dev/null
+++ b/spec/helpers/contact_helper_spec.rb
@@ -0,0 +1,107 @@
+require 'rails_helper'
+
+RSpec.describe ContactHelper do
+  describe '#parse_name' do
+    it 'correctly splits a full name into first and last name' do
+      full_name = 'John Doe Smith'
+      expected_result = { first_name: 'John', last_name: 'Smith', middle_name: 'Doe', prefix: nil, suffix: nil }
+      expect(helper.parse_name(full_name)).to eq(expected_result)
+    end
+
+    it 'handles single-word names correctly' do
+      full_name = 'Cher'
+      expected_result = { first_name: 'Cher', last_name: nil, middle_name: nil, prefix: nil, suffix: nil }
+      expect(helper.parse_name(full_name)).to eq(expected_result)
+    end
+
+    it 'handles an empty string correctly' do
+      full_name = ''
+      expected_result = { first_name: nil, last_name: nil, middle_name: nil, prefix: nil, suffix: nil }
+      expect(helper.parse_name(full_name)).to eq(expected_result)
+    end
+
+    it 'handles multiple consecutive spaces correctly' do
+      full_name = 'John    Doe Smith'
+      expected_result = { last_name: 'Smith', first_name: 'John', middle_name: 'Doe', prefix: nil, suffix: nil }
+      expect(helper.parse_name(full_name)).to eq(expected_result)
+    end
+
+    it 'returns nil for first and last name when input is nil' do
+      full_name = nil
+      expected_result = { first_name: nil, last_name: nil, middle_name: nil, prefix: nil, suffix: nil }
+      expect(helper.parse_name(full_name)).to eq(expected_result)
+    end
+
+    it 'handles names with special characters correctly' do
+      full_name = 'John Doe-Smith'
+      expected_result = { first_name: 'John', last_name: 'Doe-Smith', middle_name: '', prefix: nil, suffix: nil }
+      expect(helper.parse_name(full_name)).to eq(expected_result)
+    end
+
+    it 'handles non-Latin script names correctly' do
+      full_name = '李 小龙'
+      expected_result = { first_name: '李', last_name: '小龙', middle_name: '', prefix: nil, suffix: nil }
+      expect(helper.parse_name(full_name)).to eq(expected_result)
+    end
+
+    it 'handle name with trailing spaces correctly' do
+      full_name = 'John Doe Smith '
+      expected_result = { first_name: 'John', last_name: 'Smith', middle_name: 'Doe', prefix: nil, suffix: nil }
+      expect(helper.parse_name(full_name)).to eq(expected_result)
+    end
+
+    it 'handle name with leading spaces correctly' do
+      full_name = ' John Doe Smith'
+      expected_result = { first_name: 'John', last_name: 'Smith', middle_name: 'Doe', prefix: nil, suffix: nil }
+      expect(helper.parse_name(full_name)).to eq(expected_result)
+    end
+
+    it 'handle name with phone number correctly' do
+      full_name = '+1234567890'
+      expected_result = { first_name: '+1234567890', last_name: nil, middle_name: nil, prefix: nil, suffix: nil }
+      expect(helper.parse_name(full_name)).to eq(expected_result)
+    end
+
+    it 'handle name with mobile number with spaces correctly' do
+      full_name = '+1 234 567 890'
+      expected_result = { first_name: '+1 234 567 890', last_name: nil, middle_name: nil, prefix: nil, suffix: nil }
+      expect(helper.parse_name(full_name)).to eq(expected_result)
+    end
+
+    it 'correctly splits a full name with middle name' do
+      full_name = 'John Quincy Adams'
+      expected_result = { first_name: 'John', last_name: 'Adams', middle_name: 'Quincy', prefix: nil, suffix: nil }
+      expect(helper.parse_name(full_name)).to eq(expected_result)
+    end
+
+    it 'handles names with multiple spaces between first and last name' do
+      full_name = 'John    Quincy   Adams'
+      expected_result = { first_name: 'John', last_name: 'Adams', middle_name: 'Quincy', prefix: nil, suffix: nil }
+      expect(helper.parse_name(full_name)).to eq(expected_result)
+    end
+
+    it 'handles names with leading and trailing whitespaces' do
+      full_name = '  John  Quincy  Adams  '
+      expected_result = { first_name: 'John', last_name: 'Adams', middle_name: 'Quincy', prefix: nil, suffix: nil }
+      expect(helper.parse_name(full_name)).to eq(expected_result)
+    end
+
+    it 'handles names with leading and trailing whitespaces and a middle initial' do
+      full_name = '  John Q.  Adams  '
+      expected_result = { first_name: 'John', last_name: 'Adams', middle_name: 'Q.', prefix: nil, suffix: nil }
+      expect(helper.parse_name(full_name)).to eq(expected_result)
+    end
+
+    it 'handles names with a prefix' do
+      full_name = 'Mr. John Doe'
+      expected_result = { first_name: 'John', last_name: 'Doe', middle_name: '', prefix: 'Mr.', suffix: nil }
+      expect(helper.parse_name(full_name)).to eq(expected_result)
+    end
+
+    it 'handles names with a suffix' do
+      full_name = 'John Doe Jr.'
+      expected_result = { first_name: 'John', last_name: 'Doe', middle_name: '', prefix: nil, suffix: 'Jr.' }
+      expect(helper.parse_name(full_name)).to eq(expected_result)
+    end
+  end
+end

From ef90b7a3d88530710c184b0a3726fe551fc34e3c Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Wed, 6 Mar 2024 20:51:56 +0530
Subject: [PATCH 56/96] feat: Revamp the notification title and content (#8988)

---
 app/models/notification.rb                    |  45 ++++++--
 .../notification/push_notification_service.rb |   4 +-
 config/locales/en.yml                         |  10 +-
 spec/models/notification_spec.rb              | 105 +++++++++---------
 4 files changed, 95 insertions(+), 69 deletions(-)

diff --git a/app/models/notification.rb b/app/models/notification.rb
index 113c6cf3e..c7f8d6a2d 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -70,7 +70,8 @@ class Notification < ApplicationRecord
     }
     if primary_actor.present?
       payload[:primary_actor] = primary_actor&.push_event_data
-      payload[:push_message_title] = push_message_title
+      # TODO: Rename push_message_title to push_message_body
+      payload[:push_message_title] = push_message_body
     end
     payload
   end
@@ -93,13 +94,20 @@ class Notification < ApplicationRecord
     when 'conversation_assignment'
       I18n.t('notifications.notification_title.conversation_assignment', display_id: conversation.display_id)
     when 'assigned_conversation_new_message', 'participating_conversation_new_message'
-      I18n.t(
-        'notifications.notification_title.assigned_conversation_new_message',
-        display_id: conversation.display_id,
-        content: content
-      )
+      I18n.t('notifications.notification_title.assigned_conversation_new_message', display_id: conversation.display_id)
     when 'conversation_mention'
-      "[##{conversation&.display_id}] #{transform_user_mention_content content}"
+      I18n.t('notifications.notification_title.conversation_mention', display_id: conversation.display_id)
+    else
+      ''
+    end
+  end
+
+  def push_message_body
+    case notification_type
+    when 'conversation_creation'
+      message_body(conversation.messages.first)
+    when 'assigned_conversation_new_message', 'participating_conversation_new_message', 'conversation_assignment', 'conversation_mention'
+      message_body(secondary_actor)
     else
       ''
     end
@@ -109,11 +117,28 @@ class Notification < ApplicationRecord
     primary_actor
   end
 
-  def content
-    transform_user_mention_content(secondary_actor&.content&.truncate_words(10) || '')
+  private
+
+  def message_body(actor)
+    sender_name = sender_name(actor)
+    content = message_content(actor)
+    "#{sender_name}: #{content}"
   end
 
-  private
+  def sender_name(actor)
+    actor.try(:sender)&.name || ''
+  end
+
+  def message_content(actor)
+    content = actor.try(:content)
+    attachments = actor.try(:attachments)
+
+    if content.present?
+      transform_user_mention_content(content.truncate_words(10))
+    else
+      attachments.present? ? I18n.t('notifications.attachment') : I18n.t('notifications.no_content')
+    end
+  end
 
   def process_notification_delivery
     Notification::PushNotificationJob.perform_later(self) if user_subscribed_to_notification?('push')
diff --git a/app/services/notification/push_notification_service.rb b/app/services/notification/push_notification_service.rb
index 765483f5e..b7fc231fa 100644
--- a/app/services/notification/push_notification_service.rb
+++ b/app/services/notification/push_notification_service.rb
@@ -93,8 +93,8 @@ class Notification::PushNotificationService
   def fcm_options
     {
       notification: {
-        title: notification.notification_type.titleize,
-        body: notification.push_message_title,
+        title: notification.push_message_title,
+        body: notification.push_message_body,
         sound: 'default'
       },
       android: { priority: 'high' },
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 78f1f9490..075d27d1d 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -118,10 +118,12 @@ en:
 
   notifications:
     notification_title:
-      conversation_creation: "[New conversation] - #%{display_id} has been created in %{inbox_name}"
-      conversation_assignment: "[Assigned to you] - #%{display_id} has been assigned to you"
-      assigned_conversation_new_message: "[New message] - #%{display_id} %{content}"
-      conversation_mention: "You have been mentioned in conversation [ID - %{display_id}] by %{name}"
+      conversation_creation: "A conversation (#%{display_id}) has been created in %{inbox_name}"
+      conversation_assignment: "A conversation (#%{display_id}) has been assigned to you"
+      assigned_conversation_new_message: "A new message is created in conversation (#%{display_id})"
+      conversation_mention: "You have been mentioned in conversation (#%{display_id})"
+    attachment: "Attachment"
+    no_content: "No content"
   conversations:
     messages:
       instagram_story_content: "%{story_sender} mentioned you in the story: "
diff --git a/spec/models/notification_spec.rb b/spec/models/notification_spec.rb
index cb3679290..087e245f0 100644
--- a/spec/models/notification_spec.rb
+++ b/spec/models/notification_spec.rb
@@ -24,14 +24,14 @@ RSpec.describe Notification do
   context 'when push_title is called' do
     it 'returns appropriate title suited for the notification type conversation_creation' do
       notification = create(:notification, notification_type: 'conversation_creation')
-      expect(notification.push_message_title).to eq "[New conversation] - ##{notification.primary_actor.display_id} has\
- been created in #{notification.primary_actor.inbox.name}"
+      expect(notification.push_message_title).to eq "A conversation (##{notification.primary_actor.display_id}) \
+has been created in #{notification.primary_actor.inbox.name}"
     end
 
     it 'returns appropriate title suited for the notification type conversation_assignment' do
       notification = create(:notification, notification_type: 'conversation_assignment')
-
-      expect(notification.push_message_title).to eq "[Assigned to you] - ##{notification.primary_actor.display_id} has been assigned to you"
+      expect(notification.push_message_title).to eq "A conversation (##{notification.primary_actor.display_id}) \
+has been assigned to you"
     end
 
     it 'returns appropriate title suited for the notification type assigned_conversation_new_message' do
@@ -39,8 +39,7 @@ RSpec.describe Notification do
       notification = create(:notification, notification_type: 'assigned_conversation_new_message', primary_actor: message.conversation,
                                            secondary_actor: message)
 
-      expect(notification.push_message_title).to eq "[New message] - ##{notification.conversation.display_id} \
-#{message.content.truncate_words(10)}"
+      expect(notification.push_message_title).to eq "A new message is created in conversation (##{notification.primary_actor.display_id})"
     end
 
     it 'returns appropriate title suited for the notification type assigned_conversation_new_message when attachment message' do
@@ -49,7 +48,7 @@ RSpec.describe Notification do
       notification = create(:notification, notification_type: 'assigned_conversation_new_message', primary_actor: message.conversation,
                                            secondary_actor: message)
 
-      expect(notification.push_message_title).to eq "[New message] - ##{notification.conversation.display_id} "
+      expect(notification.push_message_title).to eq "A new message is created in conversation (##{notification.primary_actor.display_id})"
     end
 
     it 'returns appropriate title suited for the notification type participating_conversation_new_message' do
@@ -57,61 +56,61 @@ RSpec.describe Notification do
       notification = create(:notification, notification_type: 'participating_conversation_new_message', primary_actor: message.conversation,
                                            secondary_actor: message)
 
-      expect(notification.push_message_title).to eq "[New message] - ##{notification.conversation.display_id} \
-#{message.content.truncate_words(10)}"
-    end
-
-    it 'returns appropriate title suited for the notification type participating_conversation_new_message having mention' do
-      message = create(:message, sender: create(:user), content: 'Hey [@John](mention://user/1/john), can you check this ticket?')
-      notification = create(:notification, notification_type: 'participating_conversation_new_message', primary_actor: message.conversation,
-                                           secondary_actor: message)
-      expect(notification.push_message_title).to eq "[New message] - ##{notification.conversation.display_id} Hey @John, can you check this ticket?"
-    end
-
-    it 'returns appropriate title suited for the notification type participating_conversation_new_message having multple mention' do
-      message = create(:message, sender: create(:user),
-                                 content: 'Hey [@John](mention://user/1/john), [@Alisha Peter](mention://user/2/alisha) can you check this ticket?')
-      notification = create(:notification, notification_type: 'participating_conversation_new_message', primary_actor: message.conversation,
-                                           secondary_actor: message)
-
-      expect(notification.push_message_title).to eq "[New message] - ##{notification.conversation.display_id} \
-Hey @John, @Alisha Peter can you check this ticket?"
-    end
-
-    it 'returns appropriate title suited for the notification type participating_conversation_new_message if username contains white space' do
-      message = create(:message, sender: create(:user), content: 'Hey [@John Peter](mention://user/1/john%20K) please check this?')
-      notification = create(:notification, notification_type: 'participating_conversation_new_message', primary_actor: message.conversation,
-                                           secondary_actor: message)
-
-      expect(notification.push_message_title).to eq "[New message] - ##{notification.conversation.display_id} Hey @John Peter please check this?"
+      expect(notification.push_message_title).to eq "A new message is created in conversation (##{notification.primary_actor.display_id})"
     end
 
     it 'returns appropriate title suited for the notification type conversation_mention' do
       message = create(:message, sender: create(:user), content: 'Hey [@John](mention://user/1/john), can you check this ticket?')
-      notification = create(:notification, notification_type: 'conversation_mention', primary_actor: message.conversation, secondary_actor: message)
+      notification = create(:notification, notification_type: 'conversation_mention', primary_actor: message.conversation,
+                                           secondary_actor: message)
 
-      expect(notification.push_message_title).to eq "[##{message.conversation.display_id}] Hey @John, can you check this ticket?"
+      expect(notification.push_message_title).to eq "You have been mentioned in conversation (##{notification.primary_actor.display_id})"
+    end
+  end
+
+  context 'when push_message_body is called' do
+    it 'returns appropriate body suited for the notification type conversation_creation' do
+      conversation = create(:conversation)
+      message = create(:message, sender: create(:user), content: Faker::Lorem.paragraphs(number: 2), conversation: conversation)
+      notification = create(:notification, notification_type: 'conversation_creation', primary_actor: conversation, secondary_actor: message)
+      expect(notification.push_message_body).to eq "#{message.sender.name}: #{message.content.truncate_words(10)}"
     end
 
-    it 'returns appropriate title suited for the notification type conversation_mention having multiple mentions' do
-      message = create(
-        :message, sender:
-        create(:user),
-                  content: 'Hey [@John](mention://user/1/john), [@Alisha Peter](mention://user/2/alisha) can you check this ticket?'
-      )
-      notification = create(:notification, notification_type: 'conversation_mention', primary_actor: message.conversation, secondary_actor: message)
-
-      expect(notification.push_message_title).to eq "[##{message.conversation.display_id}] Hey @John, @Alisha Peter can you check this ticket?"
+    it 'returns appropriate body suited for the notification type assigned_conversation_new_message' do
+      conversation = create(:conversation)
+      message = create(:message, sender: create(:user), content: Faker::Lorem.paragraphs(number: 2), conversation: conversation)
+      notification = create(:notification, notification_type: 'assigned_conversation_new_message', primary_actor: conversation,
+                                           secondary_actor: message)
+      expect(notification.push_message_body).to eq "#{message.sender.name}: #{message.content.truncate_words(10)}"
     end
 
-    it 'returns appropriate title suited for the notification type conversation_mention if username contains white space' do
-      message = create(
-        :message, sender:
-        create(:user),
-                  content: 'Hey [@John Peter](mention://user/1/john%20K) please check this?'
-      )
-      notification = create(:notification, notification_type: 'conversation_mention', primary_actor: message.conversation, secondary_actor: message)
-      expect(notification.push_message_title).to eq "[##{message.conversation.display_id}] Hey @John Peter please check this?"
+    it 'returns appropriate body suited for the notification type assigned_conversation_new_message when attachment message' do
+      conversation = create(:conversation)
+      message = create(:message, sender: create(:user), content: nil, conversation: conversation)
+      attachment = message.attachments.new(file_type: :image, account_id: message.account_id)
+      attachment.file.attach(io: Rails.root.join('spec/assets/avatar.png').open, filename: 'avatar.png', content_type: 'image/png')
+      message.save!
+      notification = create(:notification, notification_type: 'assigned_conversation_new_message', primary_actor: conversation,
+                                           secondary_actor: message)
+      expect(notification.push_message_body).to eq "#{message.sender.name}: Attachment"
+    end
+
+    it 'returns appropriate body suited for the notification type participating_conversation_new_message having multple mention' do
+      conversation = create(:conversation)
+      message = create(:message, sender: create(:user),
+                                 content: 'Hey [@John](mention://user/1/john), [@Alisha Peter](mention://user/2/alisha) can you check this ticket?',
+                                 conversation: conversation)
+      notification = create(:notification, notification_type: 'participating_conversation_new_message', primary_actor: conversation,
+                                           secondary_actor: message)
+      expect(notification.push_message_body).to eq "#{message.sender.name}: Hey @John, @Alisha Peter can you check this ticket?"
+    end
+
+    it 'returns appropriate body suited for the notification type conversation_mention if username contains white space' do
+      conversation = create(:conversation)
+      message = create(:message, sender: create(:user), content: 'Hey [@John Peter](mention://user/1/john%20K) please check this?',
+                                 conversation: conversation)
+      notification = create(:notification, notification_type: 'conversation_mention', primary_actor: conversation, secondary_actor: message)
+      expect(notification.push_message_body).to eq "#{message.sender.name}: Hey @John Peter please check this?"
     end
 
     it 'calls remove duplicate notification job' do

From 216de4d123953d737a148b4a81f7ec3ed9a5e6ff Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Wed, 6 Mar 2024 23:05:13 +0530
Subject: [PATCH 57/96] fix: Conversation assignment notification title (#9071)

---
 app/models/notification.rb       | 4 +++-
 spec/models/notification_spec.rb | 7 +++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/models/notification.rb b/app/models/notification.rb
index c7f8d6a2d..25740b16a 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -106,8 +106,10 @@ class Notification < ApplicationRecord
     case notification_type
     when 'conversation_creation'
       message_body(conversation.messages.first)
-    when 'assigned_conversation_new_message', 'participating_conversation_new_message', 'conversation_assignment', 'conversation_mention'
+    when 'assigned_conversation_new_message', 'participating_conversation_new_message', 'conversation_mention'
       message_body(secondary_actor)
+    when 'conversation_assignment'
+      message_body(conversation.messages.incoming.last)
     else
       ''
     end
diff --git a/spec/models/notification_spec.rb b/spec/models/notification_spec.rb
index 087e245f0..282b316ee 100644
--- a/spec/models/notification_spec.rb
+++ b/spec/models/notification_spec.rb
@@ -76,6 +76,13 @@ has been assigned to you"
       expect(notification.push_message_body).to eq "#{message.sender.name}: #{message.content.truncate_words(10)}"
     end
 
+    it 'returns appropriate body suited for the notification type conversation_assignment' do
+      conversation = create(:conversation)
+      message = create(:message, sender: create(:user), content: Faker::Lorem.paragraphs(number: 2), conversation: conversation)
+      notification = create(:notification, notification_type: 'conversation_assignment', primary_actor: conversation, secondary_actor: message)
+      expect(notification.push_message_body).to eq "#{message.sender.name}: #{message.content.truncate_words(10)}"
+    end
+
     it 'returns appropriate body suited for the notification type assigned_conversation_new_message' do
       conversation = create(:conversation)
       message = create(:message, sender: create(:user), content: Faker::Lorem.paragraphs(number: 2), conversation: conversation)

From 56bf543f7e1f5a45bdea868d34ebb25365f49b13 Mon Sep 17 00:00:00 2001
From: Chatwoot Bot <92152627+chatwoot-bot@users.noreply.github.com>
Date: Wed, 6 Mar 2024 23:30:32 +0530
Subject: [PATCH 58/96] chore: Update translations (#9052)

---
 .../dashboard/i18n/locale/am/helpCenter.json  |  2 +-
 .../dashboard/i18n/locale/am/report.json      |  5 +-
 .../dashboard/i18n/locale/am/sla.json         | 15 +++---
 .../dashboard/i18n/locale/ar/helpCenter.json  |  2 +-
 .../dashboard/i18n/locale/ar/report.json      |  5 +-
 .../dashboard/i18n/locale/ar/sla.json         | 15 +++---
 .../dashboard/i18n/locale/bg/helpCenter.json  |  2 +-
 .../dashboard/i18n/locale/bg/report.json      |  5 +-
 .../dashboard/i18n/locale/bg/sla.json         | 15 +++---
 .../dashboard/i18n/locale/ca/helpCenter.json  |  2 +-
 .../dashboard/i18n/locale/ca/report.json      |  5 +-
 .../dashboard/i18n/locale/ca/sla.json         | 15 +++---
 .../dashboard/i18n/locale/cs/helpCenter.json  |  2 +-
 .../dashboard/i18n/locale/cs/report.json      |  5 +-
 .../dashboard/i18n/locale/cs/sla.json         | 15 +++---
 .../dashboard/i18n/locale/da/helpCenter.json  |  2 +-
 .../dashboard/i18n/locale/da/report.json      |  5 +-
 .../dashboard/i18n/locale/da/sla.json         | 15 +++---
 .../dashboard/i18n/locale/de/helpCenter.json  |  2 +-
 .../dashboard/i18n/locale/de/report.json      |  5 +-
 .../dashboard/i18n/locale/de/sla.json         | 15 +++---
 .../dashboard/i18n/locale/el/helpCenter.json  |  2 +-
 .../dashboard/i18n/locale/el/report.json      |  5 +-
 .../dashboard/i18n/locale/el/sla.json         | 15 +++---
 .../dashboard/i18n/locale/es/helpCenter.json  |  2 +-
 .../dashboard/i18n/locale/es/report.json      |  5 +-
 .../dashboard/i18n/locale/es/sla.json         | 15 +++---
 .../dashboard/i18n/locale/fa/helpCenter.json  |  2 +-
 .../dashboard/i18n/locale/fa/report.json      |  5 +-
 .../dashboard/i18n/locale/fa/sla.json         | 15 +++---
 .../dashboard/i18n/locale/fi/helpCenter.json  |  2 +-
 .../dashboard/i18n/locale/fi/report.json      |  5 +-
 .../dashboard/i18n/locale/fi/sla.json         | 15 +++---
 .../dashboard/i18n/locale/fr/helpCenter.json  |  2 +-
 .../dashboard/i18n/locale/fr/report.json      |  5 +-
 .../dashboard/i18n/locale/fr/sla.json         | 15 +++---
 .../dashboard/i18n/locale/he/helpCenter.json  |  2 +-
 .../dashboard/i18n/locale/he/report.json      |  5 +-
 .../dashboard/i18n/locale/he/sla.json         | 15 +++---
 .../dashboard/i18n/locale/hi/helpCenter.json  |  2 +-
 .../dashboard/i18n/locale/hi/report.json      |  5 +-
 .../dashboard/i18n/locale/hi/sla.json         | 15 +++---
 .../dashboard/i18n/locale/hr/helpCenter.json  |  2 +-
 .../dashboard/i18n/locale/hr/report.json      |  5 +-
 .../dashboard/i18n/locale/hr/sla.json         | 15 +++---
 .../dashboard/i18n/locale/hu/helpCenter.json  |  2 +-
 .../dashboard/i18n/locale/hu/report.json      |  5 +-
 .../dashboard/i18n/locale/hu/sla.json         | 15 +++---
 .../dashboard/i18n/locale/hy/helpCenter.json  |  2 +-
 .../dashboard/i18n/locale/hy/report.json      |  5 +-
 .../dashboard/i18n/locale/hy/sla.json         | 15 +++---
 .../dashboard/i18n/locale/id/helpCenter.json  |  2 +-
 .../dashboard/i18n/locale/id/report.json      |  5 +-
 .../dashboard/i18n/locale/id/sla.json         | 15 +++---
 .../dashboard/i18n/locale/is/helpCenter.json  |  2 +-
 .../dashboard/i18n/locale/is/report.json      |  5 +-
 .../dashboard/i18n/locale/is/sla.json         | 15 +++---
 .../dashboard/i18n/locale/it/helpCenter.json  |  2 +-
 .../dashboard/i18n/locale/it/report.json      |  5 +-
 .../dashboard/i18n/locale/it/sla.json         | 15 +++---
 .../dashboard/i18n/locale/ja/helpCenter.json  |  2 +-
 .../dashboard/i18n/locale/ja/report.json      |  5 +-
 .../dashboard/i18n/locale/ja/sla.json         | 15 +++---
 .../dashboard/i18n/locale/ka/helpCenter.json  |  2 +-
 .../dashboard/i18n/locale/ka/report.json      |  5 +-
 .../dashboard/i18n/locale/ka/sla.json         | 15 +++---
 .../dashboard/i18n/locale/ko/helpCenter.json  |  2 +-
 .../dashboard/i18n/locale/ko/report.json      |  5 +-
 .../dashboard/i18n/locale/ko/sla.json         | 15 +++---
 .../dashboard/i18n/locale/lt/cannedMgmt.json  |  4 +-
 .../dashboard/i18n/locale/lt/chatlist.json    | 16 +++---
 .../dashboard/i18n/locale/lt/contact.json     | 18 +++----
 .../i18n/locale/lt/conversation.json          |  8 +--
 .../i18n/locale/lt/generalSettings.json       |  4 +-
 .../dashboard/i18n/locale/lt/helpCenter.json  |  2 +-
 .../dashboard/i18n/locale/lt/inboxMgmt.json   |  2 +-
 .../i18n/locale/lt/integrations.json          |  6 +--
 .../dashboard/i18n/locale/lt/report.json      |  5 +-
 .../dashboard/i18n/locale/lt/sla.json         | 15 +++---
 .../dashboard/i18n/locale/lv/contact.json     |  8 +--
 .../dashboard/i18n/locale/lv/helpCenter.json  |  2 +-
 .../dashboard/i18n/locale/lv/report.json      |  5 +-
 .../dashboard/i18n/locale/lv/sla.json         | 15 +++---
 .../dashboard/i18n/locale/ml/helpCenter.json  |  2 +-
 .../dashboard/i18n/locale/ml/report.json      |  5 +-
 .../dashboard/i18n/locale/ml/sla.json         | 15 +++---
 .../dashboard/i18n/locale/ms/helpCenter.json  |  2 +-
 .../dashboard/i18n/locale/ms/report.json      |  5 +-
 .../dashboard/i18n/locale/ms/sla.json         | 15 +++---
 .../dashboard/i18n/locale/ne/helpCenter.json  |  2 +-
 .../dashboard/i18n/locale/ne/report.json      |  5 +-
 .../dashboard/i18n/locale/ne/sla.json         | 15 +++---
 .../dashboard/i18n/locale/nl/helpCenter.json  |  2 +-
 .../dashboard/i18n/locale/nl/report.json      |  5 +-
 .../dashboard/i18n/locale/nl/sla.json         | 15 +++---
 .../dashboard/i18n/locale/no/helpCenter.json  |  2 +-
 .../dashboard/i18n/locale/no/report.json      |  5 +-
 .../dashboard/i18n/locale/no/sla.json         | 15 +++---
 .../dashboard/i18n/locale/pl/helpCenter.json  |  2 +-
 .../dashboard/i18n/locale/pl/report.json      |  5 +-
 .../dashboard/i18n/locale/pl/sla.json         | 15 +++---
 .../dashboard/i18n/locale/pt/contact.json     |  8 +--
 .../dashboard/i18n/locale/pt/helpCenter.json  |  2 +-
 .../dashboard/i18n/locale/pt/report.json      |  3 +-
 .../dashboard/i18n/locale/pt/sla.json         | 47 ++++++++--------
 .../i18n/locale/pt_BR/helpCenter.json         |  2 +-
 .../dashboard/i18n/locale/pt_BR/report.json   |  5 +-
 .../dashboard/i18n/locale/pt_BR/sla.json      | 15 +++---
 .../dashboard/i18n/locale/ro/helpCenter.json  |  2 +-
 .../dashboard/i18n/locale/ro/report.json      |  5 +-
 .../dashboard/i18n/locale/ro/sla.json         | 15 +++---
 .../i18n/locale/ru/advancedFilters.json       |  2 +-
 .../dashboard/i18n/locale/ru/cannedMgmt.json  |  2 +-
 .../dashboard/i18n/locale/ru/contact.json     | 14 ++---
 .../i18n/locale/ru/generalSettings.json       |  4 +-
 .../dashboard/i18n/locale/ru/helpCenter.json  |  2 +-
 .../dashboard/i18n/locale/ru/inbox.json       | 16 +++---
 .../dashboard/i18n/locale/ru/report.json      |  5 +-
 .../dashboard/i18n/locale/ru/sla.json         | 47 ++++++++--------
 .../dashboard/i18n/locale/sh/helpCenter.json  |  2 +-
 .../dashboard/i18n/locale/sh/report.json      |  5 +-
 .../dashboard/i18n/locale/sh/sla.json         | 15 +++---
 .../dashboard/i18n/locale/sk/helpCenter.json  |  2 +-
 .../dashboard/i18n/locale/sk/report.json      |  5 +-
 .../dashboard/i18n/locale/sk/sla.json         | 15 +++---
 .../dashboard/i18n/locale/sl/helpCenter.json  |  2 +-
 .../dashboard/i18n/locale/sl/report.json      |  5 +-
 .../dashboard/i18n/locale/sl/sla.json         | 15 +++---
 .../dashboard/i18n/locale/sq/helpCenter.json  |  2 +-
 .../dashboard/i18n/locale/sq/report.json      |  5 +-
 .../dashboard/i18n/locale/sq/sla.json         | 15 +++---
 .../dashboard/i18n/locale/sr/helpCenter.json  |  2 +-
 .../dashboard/i18n/locale/sr/report.json      |  5 +-
 .../dashboard/i18n/locale/sr/sla.json         | 15 +++---
 .../dashboard/i18n/locale/sv/helpCenter.json  |  2 +-
 .../dashboard/i18n/locale/sv/report.json      |  5 +-
 .../dashboard/i18n/locale/sv/sla.json         | 15 +++---
 .../dashboard/i18n/locale/ta/helpCenter.json  |  2 +-
 .../dashboard/i18n/locale/ta/report.json      |  5 +-
 .../dashboard/i18n/locale/ta/sla.json         | 15 +++---
 .../dashboard/i18n/locale/th/helpCenter.json  |  2 +-
 .../dashboard/i18n/locale/th/report.json      |  5 +-
 .../dashboard/i18n/locale/th/sla.json         | 15 +++---
 .../dashboard/i18n/locale/tr/helpCenter.json  |  2 +-
 .../dashboard/i18n/locale/tr/report.json      |  5 +-
 .../dashboard/i18n/locale/tr/sla.json         | 15 +++---
 .../dashboard/i18n/locale/uk/cannedMgmt.json  | 44 +++++++--------
 .../dashboard/i18n/locale/uk/chatlist.json    | 16 +++---
 .../dashboard/i18n/locale/uk/contact.json     | 18 +++----
 .../i18n/locale/uk/conversation.json          | 20 +++----
 .../dashboard/i18n/locale/uk/csatMgmt.json    |  8 +--
 .../i18n/locale/uk/generalSettings.json       | 24 ++++-----
 .../dashboard/i18n/locale/uk/helpCenter.json  |  2 +-
 .../dashboard/i18n/locale/uk/inbox.json       | 54 +++++++++----------
 .../dashboard/i18n/locale/uk/inboxMgmt.json   | 12 ++---
 .../i18n/locale/uk/integrations.json          |  4 +-
 .../dashboard/i18n/locale/uk/labelsMgmt.json  |  2 +-
 .../dashboard/i18n/locale/uk/report.json      |  5 +-
 .../dashboard/i18n/locale/uk/settings.json    |  2 +-
 .../dashboard/i18n/locale/uk/sla.json         | 15 +++---
 .../dashboard/i18n/locale/ur/helpCenter.json  |  2 +-
 .../dashboard/i18n/locale/ur/report.json      |  5 +-
 .../dashboard/i18n/locale/ur/sla.json         | 15 +++---
 .../i18n/locale/ur_IN/helpCenter.json         |  2 +-
 .../dashboard/i18n/locale/ur_IN/report.json   |  5 +-
 .../dashboard/i18n/locale/ur_IN/sla.json      | 15 +++---
 .../dashboard/i18n/locale/vi/helpCenter.json  |  2 +-
 .../dashboard/i18n/locale/vi/report.json      |  5 +-
 .../dashboard/i18n/locale/vi/sla.json         | 15 +++---
 .../i18n/locale/zh_CN/helpCenter.json         |  2 +-
 .../dashboard/i18n/locale/zh_CN/report.json   |  5 +-
 .../dashboard/i18n/locale/zh_CN/sla.json      | 15 +++---
 .../i18n/locale/zh_TW/helpCenter.json         |  2 +-
 .../dashboard/i18n/locale/zh_TW/report.json   |  5 +-
 .../dashboard/i18n/locale/zh_TW/sla.json      | 15 +++---
 app/javascript/widget/i18n/locale/lt.json     |  2 +-
 app/javascript/widget/i18n/locale/ru.json     |  2 +-
 app/javascript/widget/i18n/locale/uk.json     |  2 +-
 config/locales/am.yml                         | 10 ++--
 config/locales/ar.yml                         | 10 ++--
 config/locales/bg.yml                         | 10 ++--
 config/locales/ca.yml                         | 10 ++--
 config/locales/cs.yml                         | 10 ++--
 config/locales/da.yml                         | 10 ++--
 config/locales/de.yml                         | 10 ++--
 config/locales/el.yml                         | 10 ++--
 config/locales/es.yml                         | 10 ++--
 config/locales/fa.yml                         | 10 ++--
 config/locales/fi.yml                         | 10 ++--
 config/locales/fr.yml                         | 10 ++--
 config/locales/he.yml                         | 10 ++--
 config/locales/hi.yml                         | 10 ++--
 config/locales/hr.yml                         | 10 ++--
 config/locales/hu.yml                         | 10 ++--
 config/locales/hy.yml                         | 10 ++--
 config/locales/id.yml                         | 10 ++--
 config/locales/is.yml                         | 10 ++--
 config/locales/it.yml                         | 10 ++--
 config/locales/ja.yml                         | 10 ++--
 config/locales/ka.yml                         | 10 ++--
 config/locales/ko.yml                         | 10 ++--
 config/locales/lt.yml                         | 10 ++--
 config/locales/lv.yml                         | 26 ++++-----
 config/locales/ml.yml                         | 10 ++--
 config/locales/ms.yml                         | 10 ++--
 config/locales/ne.yml                         | 10 ++--
 config/locales/nl.yml                         | 10 ++--
 config/locales/no.yml                         | 10 ++--
 config/locales/pl.yml                         | 10 ++--
 config/locales/pt.yml                         | 10 ++--
 config/locales/pt_BR.yml                      | 10 ++--
 config/locales/ro.yml                         | 10 ++--
 config/locales/ru.yml                         | 32 +++++------
 config/locales/sh.yml                         | 10 ++--
 config/locales/sk.yml                         | 10 ++--
 config/locales/sl.yml                         | 10 ++--
 config/locales/sq.yml                         | 10 ++--
 config/locales/sr.yml                         | 10 ++--
 config/locales/sv.yml                         | 10 ++--
 config/locales/ta.yml                         | 10 ++--
 config/locales/th.yml                         | 10 ++--
 config/locales/tr.yml                         | 10 ++--
 config/locales/uk.yml                         | 10 ++--
 config/locales/ur.yml                         | 10 ++--
 config/locales/ur_IN.yml                      | 10 ++--
 config/locales/vi.yml                         | 10 ++--
 config/locales/zh_CN.yml                      | 10 ++--
 config/locales/zh_TW.yml                      | 10 ++--
 228 files changed, 1161 insertions(+), 861 deletions(-)

diff --git a/app/javascript/dashboard/i18n/locale/am/helpCenter.json b/app/javascript/dashboard/i18n/locale/am/helpCenter.json
index d94692e3d..6c4238b92 100644
--- a/app/javascript/dashboard/i18n/locale/am/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/am/helpCenter.json
@@ -319,7 +319,7 @@
       "HEADERS": {
         "TITLE": "Title",
         "CATEGORY": "Category",
-        "READ_COUNT": "Read count",
+        "READ_COUNT": "Views",
         "STATUS": "Status",
         "LAST_EDITED": "Last edited"
       },
diff --git a/app/javascript/dashboard/i18n/locale/am/report.json b/app/javascript/dashboard/i18n/locale/am/report.json
index d19d513ae..e3a0f31d2 100644
--- a/app/javascript/dashboard/i18n/locale/am/report.json
+++ b/app/javascript/dashboard/i18n/locale/am/report.json
@@ -37,7 +37,7 @@
       },
       "REPLY_TIME": {
         "NAME": "Customer waiting time",
-        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} conversations)"
+        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} replies)"
       }
     },
     "DATE_RANGE_OPTIONS": {
@@ -441,7 +441,8 @@
       "LOADING_MESSAGE": "Loading conversation metrics...",
       "OPEN": "Open",
       "UNATTENDED": "Unattended",
-      "UNASSIGNED": "Unassigned"
+      "UNASSIGNED": "Unassigned",
+      "PENDING": "Pending"
     },
     "CONVERSATION_HEATMAP": {
       "HEADER": "Conversation Traffic",
diff --git a/app/javascript/dashboard/i18n/locale/am/sla.json b/app/javascript/dashboard/i18n/locale/am/sla.json
index 869b3ba3f..806746b75 100644
--- a/app/javascript/dashboard/i18n/locale/am/sla.json
+++ b/app/javascript/dashboard/i18n/locale/am/sla.json
@@ -31,21 +31,24 @@
         "PLACEHOLDER": "SLA for premium customers"
       },
       "FIRST_RESPONSE_TIME": {
-        "LABEL": "First Response Time(Seconds)",
-        "PLACEHOLDER": "300 for 5 minutes"
+        "LABEL": "First Response Time",
+        "PLACEHOLDER": "5"
       },
       "NEXT_RESPONSE_TIME": {
-        "LABEL": "Next Response Time(Seconds)",
-        "PLACEHOLDER": "600 for 10 minutes"
+        "LABEL": "Next Response Time",
+        "PLACEHOLDER": "5"
       },
       "RESOLUTION_TIME": {
-        "LABEL": "Resolution Time(Seconds)",
-        "PLACEHOLDER": "86400 for 1 day"
+        "LABEL": "Resolution Time",
+        "PLACEHOLDER": "60"
       },
       "BUSINESS_HOURS": {
         "LABEL": "Business Hours",
         "PLACEHOLDER": "Only during business hours"
       },
+      "THRESHOLD_TIME": {
+        "INVALID_FORMAT_ERROR": "Threshold should be a number and greater than zero"
+      },
       "EDIT": "Edit",
       "CREATE": "Create",
       "DELETE": "Delete",
diff --git a/app/javascript/dashboard/i18n/locale/ar/helpCenter.json b/app/javascript/dashboard/i18n/locale/ar/helpCenter.json
index f9d919a91..234af4b46 100644
--- a/app/javascript/dashboard/i18n/locale/ar/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ar/helpCenter.json
@@ -319,7 +319,7 @@
       "HEADERS": {
         "TITLE": "العنوان",
         "CATEGORY": "الفئة",
-        "READ_COUNT": "عدد القراءات",
+        "READ_COUNT": "Views",
         "STATUS": "الحالة",
         "LAST_EDITED": "آخر تعديل"
       },
diff --git a/app/javascript/dashboard/i18n/locale/ar/report.json b/app/javascript/dashboard/i18n/locale/ar/report.json
index 6e564e20c..00ce6cf2e 100644
--- a/app/javascript/dashboard/i18n/locale/ar/report.json
+++ b/app/javascript/dashboard/i18n/locale/ar/report.json
@@ -37,7 +37,7 @@
       },
       "REPLY_TIME": {
         "NAME": "Customer waiting time",
-        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} conversations)"
+        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} replies)"
       }
     },
     "DATE_RANGE_OPTIONS": {
@@ -441,7 +441,8 @@
       "LOADING_MESSAGE": "جارٍ تحميل مقاييس المحادثات...",
       "OPEN": "فتح",
       "UNATTENDED": "بدون حضور",
-      "UNASSIGNED": "غير مسند"
+      "UNASSIGNED": "غير مسند",
+      "PENDING": "معلق"
     },
     "CONVERSATION_HEATMAP": {
       "HEADER": "Conversation Traffic",
diff --git a/app/javascript/dashboard/i18n/locale/ar/sla.json b/app/javascript/dashboard/i18n/locale/ar/sla.json
index 9dcb07d21..2480f91f2 100644
--- a/app/javascript/dashboard/i18n/locale/ar/sla.json
+++ b/app/javascript/dashboard/i18n/locale/ar/sla.json
@@ -31,21 +31,24 @@
         "PLACEHOLDER": "SLA for premium customers"
       },
       "FIRST_RESPONSE_TIME": {
-        "LABEL": "First Response Time(Seconds)",
-        "PLACEHOLDER": "300 for 5 minutes"
+        "LABEL": "وقت الاستجابة الأولى",
+        "PLACEHOLDER": "5"
       },
       "NEXT_RESPONSE_TIME": {
-        "LABEL": "Next Response Time(Seconds)",
-        "PLACEHOLDER": "600 for 10 minutes"
+        "LABEL": "Next Response Time",
+        "PLACEHOLDER": "5"
       },
       "RESOLUTION_TIME": {
-        "LABEL": "Resolution Time(Seconds)",
-        "PLACEHOLDER": "86400 for 1 day"
+        "LABEL": "وقت إغلاق المحادثات",
+        "PLACEHOLDER": "60"
       },
       "BUSINESS_HOURS": {
         "LABEL": "ساعات العمل",
         "PLACEHOLDER": "Only during business hours"
       },
+      "THRESHOLD_TIME": {
+        "INVALID_FORMAT_ERROR": "Threshold should be a number and greater than zero"
+      },
       "EDIT": "تعديل",
       "CREATE": "إنشاء",
       "DELETE": "حذف",
diff --git a/app/javascript/dashboard/i18n/locale/bg/helpCenter.json b/app/javascript/dashboard/i18n/locale/bg/helpCenter.json
index 687dd44de..776058f54 100644
--- a/app/javascript/dashboard/i18n/locale/bg/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/bg/helpCenter.json
@@ -319,7 +319,7 @@
       "HEADERS": {
         "TITLE": "Title",
         "CATEGORY": "Category",
-        "READ_COUNT": "Read count",
+        "READ_COUNT": "Views",
         "STATUS": "Статус",
         "LAST_EDITED": "Last edited"
       },
diff --git a/app/javascript/dashboard/i18n/locale/bg/report.json b/app/javascript/dashboard/i18n/locale/bg/report.json
index e6ec077db..9b59a5bab 100644
--- a/app/javascript/dashboard/i18n/locale/bg/report.json
+++ b/app/javascript/dashboard/i18n/locale/bg/report.json
@@ -37,7 +37,7 @@
       },
       "REPLY_TIME": {
         "NAME": "Customer waiting time",
-        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} conversations)"
+        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} replies)"
       }
     },
     "DATE_RANGE_OPTIONS": {
@@ -441,7 +441,8 @@
       "LOADING_MESSAGE": "Loading conversation metrics...",
       "OPEN": "Отворен",
       "UNATTENDED": "Unattended",
-      "UNASSIGNED": "Неназначен"
+      "UNASSIGNED": "Неназначен",
+      "PENDING": "Предстоящ"
     },
     "CONVERSATION_HEATMAP": {
       "HEADER": "Conversation Traffic",
diff --git a/app/javascript/dashboard/i18n/locale/bg/sla.json b/app/javascript/dashboard/i18n/locale/bg/sla.json
index 98e085207..6bf76deec 100644
--- a/app/javascript/dashboard/i18n/locale/bg/sla.json
+++ b/app/javascript/dashboard/i18n/locale/bg/sla.json
@@ -31,21 +31,24 @@
         "PLACEHOLDER": "SLA for premium customers"
       },
       "FIRST_RESPONSE_TIME": {
-        "LABEL": "First Response Time(Seconds)",
-        "PLACEHOLDER": "300 for 5 minutes"
+        "LABEL": "First Response Time",
+        "PLACEHOLDER": "5"
       },
       "NEXT_RESPONSE_TIME": {
-        "LABEL": "Next Response Time(Seconds)",
-        "PLACEHOLDER": "600 for 10 minutes"
+        "LABEL": "Next Response Time",
+        "PLACEHOLDER": "5"
       },
       "RESOLUTION_TIME": {
-        "LABEL": "Resolution Time(Seconds)",
-        "PLACEHOLDER": "86400 for 1 day"
+        "LABEL": "Resolution Time",
+        "PLACEHOLDER": "60"
       },
       "BUSINESS_HOURS": {
         "LABEL": "Business Hours",
         "PLACEHOLDER": "Only during business hours"
       },
+      "THRESHOLD_TIME": {
+        "INVALID_FORMAT_ERROR": "Threshold should be a number and greater than zero"
+      },
       "EDIT": "Редактирай",
       "CREATE": "Създаване",
       "DELETE": "Изтрий",
diff --git a/app/javascript/dashboard/i18n/locale/ca/helpCenter.json b/app/javascript/dashboard/i18n/locale/ca/helpCenter.json
index 5aee1c9eb..232cf9424 100644
--- a/app/javascript/dashboard/i18n/locale/ca/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ca/helpCenter.json
@@ -319,7 +319,7 @@
       "HEADERS": {
         "TITLE": "Title",
         "CATEGORY": "Category",
-        "READ_COUNT": "Read count",
+        "READ_COUNT": "Views",
         "STATUS": "Estat",
         "LAST_EDITED": "Last edited"
       },
diff --git a/app/javascript/dashboard/i18n/locale/ca/report.json b/app/javascript/dashboard/i18n/locale/ca/report.json
index 51e2a5f16..307a38d72 100644
--- a/app/javascript/dashboard/i18n/locale/ca/report.json
+++ b/app/javascript/dashboard/i18n/locale/ca/report.json
@@ -37,7 +37,7 @@
       },
       "REPLY_TIME": {
         "NAME": "Customer waiting time",
-        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} conversations)"
+        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} replies)"
       }
     },
     "DATE_RANGE_OPTIONS": {
@@ -441,7 +441,8 @@
       "LOADING_MESSAGE": "Loading conversation metrics...",
       "OPEN": "Obrir",
       "UNATTENDED": "Unattended",
-      "UNASSIGNED": "Sense assignar"
+      "UNASSIGNED": "Sense assignar",
+      "PENDING": "Pendent"
     },
     "CONVERSATION_HEATMAP": {
       "HEADER": "Conversation Traffic",
diff --git a/app/javascript/dashboard/i18n/locale/ca/sla.json b/app/javascript/dashboard/i18n/locale/ca/sla.json
index 131f6742b..69cdca30b 100644
--- a/app/javascript/dashboard/i18n/locale/ca/sla.json
+++ b/app/javascript/dashboard/i18n/locale/ca/sla.json
@@ -31,21 +31,24 @@
         "PLACEHOLDER": "SLA for premium customers"
       },
       "FIRST_RESPONSE_TIME": {
-        "LABEL": "First Response Time(Seconds)",
-        "PLACEHOLDER": "300 for 5 minutes"
+        "LABEL": "First Response Time",
+        "PLACEHOLDER": "5"
       },
       "NEXT_RESPONSE_TIME": {
-        "LABEL": "Next Response Time(Seconds)",
-        "PLACEHOLDER": "600 for 10 minutes"
+        "LABEL": "Next Response Time",
+        "PLACEHOLDER": "5"
       },
       "RESOLUTION_TIME": {
-        "LABEL": "Resolution Time(Seconds)",
-        "PLACEHOLDER": "86400 for 1 day"
+        "LABEL": "Temps de resolució",
+        "PLACEHOLDER": "60"
       },
       "BUSINESS_HOURS": {
         "LABEL": "Business Hours",
         "PLACEHOLDER": "Only during business hours"
       },
+      "THRESHOLD_TIME": {
+        "INVALID_FORMAT_ERROR": "Threshold should be a number and greater than zero"
+      },
       "EDIT": "Edita",
       "CREATE": "Crear",
       "DELETE": "Esborrar",
diff --git a/app/javascript/dashboard/i18n/locale/cs/helpCenter.json b/app/javascript/dashboard/i18n/locale/cs/helpCenter.json
index 555eb25ae..95232f805 100644
--- a/app/javascript/dashboard/i18n/locale/cs/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/cs/helpCenter.json
@@ -319,7 +319,7 @@
       "HEADERS": {
         "TITLE": "Title",
         "CATEGORY": "Category",
-        "READ_COUNT": "Read count",
+        "READ_COUNT": "Views",
         "STATUS": "Stav",
         "LAST_EDITED": "Last edited"
       },
diff --git a/app/javascript/dashboard/i18n/locale/cs/report.json b/app/javascript/dashboard/i18n/locale/cs/report.json
index 2f66426a4..a97071ef7 100644
--- a/app/javascript/dashboard/i18n/locale/cs/report.json
+++ b/app/javascript/dashboard/i18n/locale/cs/report.json
@@ -37,7 +37,7 @@
       },
       "REPLY_TIME": {
         "NAME": "Customer waiting time",
-        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} conversations)"
+        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} replies)"
       }
     },
     "DATE_RANGE_OPTIONS": {
@@ -441,7 +441,8 @@
       "LOADING_MESSAGE": "Loading conversation metrics...",
       "OPEN": "Otevřít",
       "UNATTENDED": "Unattended",
-      "UNASSIGNED": "Nepřiřazeno"
+      "UNASSIGNED": "Nepřiřazeno",
+      "PENDING": "Čekající"
     },
     "CONVERSATION_HEATMAP": {
       "HEADER": "Conversation Traffic",
diff --git a/app/javascript/dashboard/i18n/locale/cs/sla.json b/app/javascript/dashboard/i18n/locale/cs/sla.json
index f75809210..e9bff62ba 100644
--- a/app/javascript/dashboard/i18n/locale/cs/sla.json
+++ b/app/javascript/dashboard/i18n/locale/cs/sla.json
@@ -31,21 +31,24 @@
         "PLACEHOLDER": "SLA for premium customers"
       },
       "FIRST_RESPONSE_TIME": {
-        "LABEL": "First Response Time(Seconds)",
-        "PLACEHOLDER": "300 for 5 minutes"
+        "LABEL": "First Response Time",
+        "PLACEHOLDER": "5"
       },
       "NEXT_RESPONSE_TIME": {
-        "LABEL": "Next Response Time(Seconds)",
-        "PLACEHOLDER": "600 for 10 minutes"
+        "LABEL": "Next Response Time",
+        "PLACEHOLDER": "5"
       },
       "RESOLUTION_TIME": {
-        "LABEL": "Resolution Time(Seconds)",
-        "PLACEHOLDER": "86400 for 1 day"
+        "LABEL": "Čas rozlišení",
+        "PLACEHOLDER": "60"
       },
       "BUSINESS_HOURS": {
         "LABEL": "Pracovní doba",
         "PLACEHOLDER": "Only during business hours"
       },
+      "THRESHOLD_TIME": {
+        "INVALID_FORMAT_ERROR": "Threshold should be a number and greater than zero"
+      },
       "EDIT": "Upravit",
       "CREATE": "Create",
       "DELETE": "Vymazat",
diff --git a/app/javascript/dashboard/i18n/locale/da/helpCenter.json b/app/javascript/dashboard/i18n/locale/da/helpCenter.json
index f3d5f75e6..8ad43b61a 100644
--- a/app/javascript/dashboard/i18n/locale/da/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/da/helpCenter.json
@@ -319,7 +319,7 @@
       "HEADERS": {
         "TITLE": "Titel",
         "CATEGORY": "Kategori",
-        "READ_COUNT": "Læse antal",
+        "READ_COUNT": "Views",
         "STATUS": "Status",
         "LAST_EDITED": "Sidst redigeret"
       },
diff --git a/app/javascript/dashboard/i18n/locale/da/report.json b/app/javascript/dashboard/i18n/locale/da/report.json
index 4081500fd..7addae06e 100644
--- a/app/javascript/dashboard/i18n/locale/da/report.json
+++ b/app/javascript/dashboard/i18n/locale/da/report.json
@@ -37,7 +37,7 @@
       },
       "REPLY_TIME": {
         "NAME": "Customer waiting time",
-        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} conversations)"
+        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} replies)"
       }
     },
     "DATE_RANGE_OPTIONS": {
@@ -441,7 +441,8 @@
       "LOADING_MESSAGE": "Indlæser samtalemetrik...",
       "OPEN": "Åbn",
       "UNATTENDED": "Unattet",
-      "UNASSIGNED": "Ikke Tildelt"
+      "UNASSIGNED": "Ikke Tildelt",
+      "PENDING": "Afventer"
     },
     "CONVERSATION_HEATMAP": {
       "HEADER": "Conversation Traffic",
diff --git a/app/javascript/dashboard/i18n/locale/da/sla.json b/app/javascript/dashboard/i18n/locale/da/sla.json
index d826fd06e..049bcc54a 100644
--- a/app/javascript/dashboard/i18n/locale/da/sla.json
+++ b/app/javascript/dashboard/i18n/locale/da/sla.json
@@ -31,21 +31,24 @@
         "PLACEHOLDER": "SLA for premium customers"
       },
       "FIRST_RESPONSE_TIME": {
-        "LABEL": "First Response Time(Seconds)",
-        "PLACEHOLDER": "300 for 5 minutes"
+        "LABEL": "Første Respons Tid",
+        "PLACEHOLDER": "5"
       },
       "NEXT_RESPONSE_TIME": {
-        "LABEL": "Next Response Time(Seconds)",
-        "PLACEHOLDER": "600 for 10 minutes"
+        "LABEL": "Next Response Time",
+        "PLACEHOLDER": "5"
       },
       "RESOLUTION_TIME": {
-        "LABEL": "Resolution Time(Seconds)",
-        "PLACEHOLDER": "86400 for 1 day"
+        "LABEL": "Løsnings Tid",
+        "PLACEHOLDER": "60"
       },
       "BUSINESS_HOURS": {
         "LABEL": "Forretningstider",
         "PLACEHOLDER": "Only during business hours"
       },
+      "THRESHOLD_TIME": {
+        "INVALID_FORMAT_ERROR": "Threshold should be a number and greater than zero"
+      },
       "EDIT": "Rediger",
       "CREATE": "Opret",
       "DELETE": "Slet",
diff --git a/app/javascript/dashboard/i18n/locale/de/helpCenter.json b/app/javascript/dashboard/i18n/locale/de/helpCenter.json
index 5d401430b..b6504f093 100644
--- a/app/javascript/dashboard/i18n/locale/de/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/de/helpCenter.json
@@ -319,7 +319,7 @@
       "HEADERS": {
         "TITLE": "Titel",
         "CATEGORY": "Kategorie",
-        "READ_COUNT": "Gelesen",
+        "READ_COUNT": "Views",
         "STATUS": "Status",
         "LAST_EDITED": "Zuletzt bearbeitet"
       },
diff --git a/app/javascript/dashboard/i18n/locale/de/report.json b/app/javascript/dashboard/i18n/locale/de/report.json
index a1caa5bcd..043381824 100644
--- a/app/javascript/dashboard/i18n/locale/de/report.json
+++ b/app/javascript/dashboard/i18n/locale/de/report.json
@@ -37,7 +37,7 @@
       },
       "REPLY_TIME": {
         "NAME": "Customer waiting time",
-        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} conversations)"
+        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} replies)"
       }
     },
     "DATE_RANGE_OPTIONS": {
@@ -441,7 +441,8 @@
       "LOADING_MESSAGE": "Konversationsdaten werden geladen...",
       "OPEN": "Öffnen",
       "UNATTENDED": "Unbeaufsichtigt",
-      "UNASSIGNED": "Nicht zugewiesen"
+      "UNASSIGNED": "Nicht zugewiesen",
+      "PENDING": "Ausstehend"
     },
     "CONVERSATION_HEATMAP": {
       "HEADER": "Gesprächsprotokoll",
diff --git a/app/javascript/dashboard/i18n/locale/de/sla.json b/app/javascript/dashboard/i18n/locale/de/sla.json
index 64e851188..6d12589ed 100644
--- a/app/javascript/dashboard/i18n/locale/de/sla.json
+++ b/app/javascript/dashboard/i18n/locale/de/sla.json
@@ -31,21 +31,24 @@
         "PLACEHOLDER": "SLA for premium customers"
       },
       "FIRST_RESPONSE_TIME": {
-        "LABEL": "First Response Time(Seconds)",
-        "PLACEHOLDER": "300 for 5 minutes"
+        "LABEL": "Erste Antwortzeit",
+        "PLACEHOLDER": "5"
       },
       "NEXT_RESPONSE_TIME": {
-        "LABEL": "Next Response Time(Seconds)",
-        "PLACEHOLDER": "600 for 10 minutes"
+        "LABEL": "Next Response Time",
+        "PLACEHOLDER": "5"
       },
       "RESOLUTION_TIME": {
-        "LABEL": "Resolution Time(Seconds)",
-        "PLACEHOLDER": "86400 for 1 day"
+        "LABEL": "Lösungszeit",
+        "PLACEHOLDER": "60"
       },
       "BUSINESS_HOURS": {
         "LABEL": "Öffnungszeiten",
         "PLACEHOLDER": "Only during business hours"
       },
+      "THRESHOLD_TIME": {
+        "INVALID_FORMAT_ERROR": "Threshold should be a number and greater than zero"
+      },
       "EDIT": "Bearbeiten",
       "CREATE": "Erstellen",
       "DELETE": "Löschen",
diff --git a/app/javascript/dashboard/i18n/locale/el/helpCenter.json b/app/javascript/dashboard/i18n/locale/el/helpCenter.json
index 71e338591..9c48d4783 100644
--- a/app/javascript/dashboard/i18n/locale/el/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/el/helpCenter.json
@@ -319,7 +319,7 @@
       "HEADERS": {
         "TITLE": "Τίτλος",
         "CATEGORY": "Κατηγορία",
-        "READ_COUNT": "Πλήθος ανάγνωσεων",
+        "READ_COUNT": "Views",
         "STATUS": "Κατάσταση",
         "LAST_EDITED": "Τελευταία επεξεργασία"
       },
diff --git a/app/javascript/dashboard/i18n/locale/el/report.json b/app/javascript/dashboard/i18n/locale/el/report.json
index f370a7bc6..c9d5a1a06 100644
--- a/app/javascript/dashboard/i18n/locale/el/report.json
+++ b/app/javascript/dashboard/i18n/locale/el/report.json
@@ -37,7 +37,7 @@
       },
       "REPLY_TIME": {
         "NAME": "Customer waiting time",
-        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} conversations)"
+        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} replies)"
       }
     },
     "DATE_RANGE_OPTIONS": {
@@ -441,7 +441,8 @@
       "LOADING_MESSAGE": "Φόρτωση μετρητών συνομιλίας...",
       "OPEN": "Άνοιγμα",
       "UNATTENDED": "Χωρίς Παρακολούθηση",
-      "UNASSIGNED": "Χωρίς Αντιστοίχιση"
+      "UNASSIGNED": "Χωρίς Αντιστοίχιση",
+      "PENDING": "Εκκρεμεί"
     },
     "CONVERSATION_HEATMAP": {
       "HEADER": "Conversation Traffic",
diff --git a/app/javascript/dashboard/i18n/locale/el/sla.json b/app/javascript/dashboard/i18n/locale/el/sla.json
index afaa7cd99..0b48005df 100644
--- a/app/javascript/dashboard/i18n/locale/el/sla.json
+++ b/app/javascript/dashboard/i18n/locale/el/sla.json
@@ -31,21 +31,24 @@
         "PLACEHOLDER": "SLA for premium customers"
       },
       "FIRST_RESPONSE_TIME": {
-        "LABEL": "First Response Time(Seconds)",
-        "PLACEHOLDER": "300 for 5 minutes"
+        "LABEL": "Χρόνος πρώτης ανταπόκρισης",
+        "PLACEHOLDER": "5"
       },
       "NEXT_RESPONSE_TIME": {
-        "LABEL": "Next Response Time(Seconds)",
-        "PLACEHOLDER": "600 for 10 minutes"
+        "LABEL": "Next Response Time",
+        "PLACEHOLDER": "5"
       },
       "RESOLUTION_TIME": {
-        "LABEL": "Resolution Time(Seconds)",
-        "PLACEHOLDER": "86400 for 1 day"
+        "LABEL": "Χρόνος ανάλυσης",
+        "PLACEHOLDER": "60"
       },
       "BUSINESS_HOURS": {
         "LABEL": "Ώρες Εργασίας",
         "PLACEHOLDER": "Only during business hours"
       },
+      "THRESHOLD_TIME": {
+        "INVALID_FORMAT_ERROR": "Threshold should be a number and greater than zero"
+      },
       "EDIT": "Επεξεργασία",
       "CREATE": "Δημιουργία",
       "DELETE": "Διαγραφή",
diff --git a/app/javascript/dashboard/i18n/locale/es/helpCenter.json b/app/javascript/dashboard/i18n/locale/es/helpCenter.json
index fa34f1181..1f54d7489 100644
--- a/app/javascript/dashboard/i18n/locale/es/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/es/helpCenter.json
@@ -319,7 +319,7 @@
       "HEADERS": {
         "TITLE": "Título",
         "CATEGORY": "Categoría",
-        "READ_COUNT": "Número de lecturas",
+        "READ_COUNT": "Views",
         "STATUS": "Estado",
         "LAST_EDITED": "Última edición"
       },
diff --git a/app/javascript/dashboard/i18n/locale/es/report.json b/app/javascript/dashboard/i18n/locale/es/report.json
index c541f7a35..896951ebf 100644
--- a/app/javascript/dashboard/i18n/locale/es/report.json
+++ b/app/javascript/dashboard/i18n/locale/es/report.json
@@ -37,7 +37,7 @@
       },
       "REPLY_TIME": {
         "NAME": "Tiempo de espera del cliente",
-        "TOOLTIP_TEXT": "El tiempo de espera es %{metricValue} (basado en %{conversationCount} conversaciones)"
+        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} replies)"
       }
     },
     "DATE_RANGE_OPTIONS": {
@@ -441,7 +441,8 @@
       "LOADING_MESSAGE": "Cargando métricas de conversación...",
       "OPEN": "Abrir",
       "UNATTENDED": "Desatendido",
-      "UNASSIGNED": "Sin asignar"
+      "UNASSIGNED": "Sin asignar",
+      "PENDING": "Pendientes"
     },
     "CONVERSATION_HEATMAP": {
       "HEADER": "Tráfico de Conversación",
diff --git a/app/javascript/dashboard/i18n/locale/es/sla.json b/app/javascript/dashboard/i18n/locale/es/sla.json
index 43053370b..9b5c74c47 100644
--- a/app/javascript/dashboard/i18n/locale/es/sla.json
+++ b/app/javascript/dashboard/i18n/locale/es/sla.json
@@ -31,21 +31,24 @@
         "PLACEHOLDER": "SLA for premium customers"
       },
       "FIRST_RESPONSE_TIME": {
-        "LABEL": "First Response Time(Seconds)",
-        "PLACEHOLDER": "300 for 5 minutes"
+        "LABEL": "Tiempo de primera respuesta",
+        "PLACEHOLDER": "5"
       },
       "NEXT_RESPONSE_TIME": {
-        "LABEL": "Next Response Time(Seconds)",
-        "PLACEHOLDER": "600 for 10 minutes"
+        "LABEL": "Next Response Time",
+        "PLACEHOLDER": "5"
       },
       "RESOLUTION_TIME": {
-        "LABEL": "Resolution Time(Seconds)",
-        "PLACEHOLDER": "86400 for 1 day"
+        "LABEL": "Tiempo de resolución",
+        "PLACEHOLDER": "60"
       },
       "BUSINESS_HOURS": {
         "LABEL": "Horarios",
         "PLACEHOLDER": "Only during business hours"
       },
+      "THRESHOLD_TIME": {
+        "INVALID_FORMAT_ERROR": "Threshold should be a number and greater than zero"
+      },
       "EDIT": "Editar",
       "CREATE": "Crear",
       "DELETE": "Eliminar",
diff --git a/app/javascript/dashboard/i18n/locale/fa/helpCenter.json b/app/javascript/dashboard/i18n/locale/fa/helpCenter.json
index 9c93d8a69..c5f5b1e37 100644
--- a/app/javascript/dashboard/i18n/locale/fa/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/fa/helpCenter.json
@@ -319,7 +319,7 @@
       "HEADERS": {
         "TITLE": "عنوان",
         "CATEGORY": "دسته‌بندی",
-        "READ_COUNT": "تعداد خوانده شده",
+        "READ_COUNT": "نمایش‌ها",
         "STATUS": "وضعیت",
         "LAST_EDITED": "آخرین ویرایش"
       },
diff --git a/app/javascript/dashboard/i18n/locale/fa/report.json b/app/javascript/dashboard/i18n/locale/fa/report.json
index 0e7267ebe..b171704d1 100644
--- a/app/javascript/dashboard/i18n/locale/fa/report.json
+++ b/app/javascript/dashboard/i18n/locale/fa/report.json
@@ -37,7 +37,7 @@
       },
       "REPLY_TIME": {
         "NAME": "Customer waiting time",
-        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} conversations)"
+        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} replies)"
       }
     },
     "DATE_RANGE_OPTIONS": {
@@ -441,7 +441,8 @@
       "LOADING_MESSAGE": "در حال بارگیری معیارهای مکالمه...",
       "OPEN": "باز",
       "UNATTENDED": "بی سرپرست",
-      "UNASSIGNED": "تخصیص داده نشده"
+      "UNASSIGNED": "تخصیص داده نشده",
+      "PENDING": "در انتظار"
     },
     "CONVERSATION_HEATMAP": {
       "HEADER": "ترافیک گفتگو",
diff --git a/app/javascript/dashboard/i18n/locale/fa/sla.json b/app/javascript/dashboard/i18n/locale/fa/sla.json
index d0701ee19..3c11516ce 100644
--- a/app/javascript/dashboard/i18n/locale/fa/sla.json
+++ b/app/javascript/dashboard/i18n/locale/fa/sla.json
@@ -31,21 +31,24 @@
         "PLACEHOLDER": "SLA for premium customers"
       },
       "FIRST_RESPONSE_TIME": {
-        "LABEL": "First Response Time(Seconds)",
-        "PLACEHOLDER": "300 for 5 minutes"
+        "LABEL": "اولین زمان پاسخگویی",
+        "PLACEHOLDER": "۵"
       },
       "NEXT_RESPONSE_TIME": {
-        "LABEL": "Next Response Time(Seconds)",
-        "PLACEHOLDER": "600 for 10 minutes"
+        "LABEL": "Next Response Time",
+        "PLACEHOLDER": "۵"
       },
       "RESOLUTION_TIME": {
-        "LABEL": "Resolution Time(Seconds)",
-        "PLACEHOLDER": "86400 for 1 day"
+        "LABEL": "زمان تا حل شدن مساله",
+        "PLACEHOLDER": "60"
       },
       "BUSINESS_HOURS": {
         "LABEL": "ساعت کاری",
         "PLACEHOLDER": "Only during business hours"
       },
+      "THRESHOLD_TIME": {
+        "INVALID_FORMAT_ERROR": "Threshold should be a number and greater than zero"
+      },
       "EDIT": "ویرایش",
       "CREATE": "ايجاد كردن",
       "DELETE": "حذف",
diff --git a/app/javascript/dashboard/i18n/locale/fi/helpCenter.json b/app/javascript/dashboard/i18n/locale/fi/helpCenter.json
index 8d123921f..f3e8e9246 100644
--- a/app/javascript/dashboard/i18n/locale/fi/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/fi/helpCenter.json
@@ -319,7 +319,7 @@
       "HEADERS": {
         "TITLE": "Title",
         "CATEGORY": "Category",
-        "READ_COUNT": "Read count",
+        "READ_COUNT": "Views",
         "STATUS": "Tila",
         "LAST_EDITED": "Last edited"
       },
diff --git a/app/javascript/dashboard/i18n/locale/fi/report.json b/app/javascript/dashboard/i18n/locale/fi/report.json
index 7bbeea71b..a5bdbd38c 100644
--- a/app/javascript/dashboard/i18n/locale/fi/report.json
+++ b/app/javascript/dashboard/i18n/locale/fi/report.json
@@ -37,7 +37,7 @@
       },
       "REPLY_TIME": {
         "NAME": "Customer waiting time",
-        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} conversations)"
+        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} replies)"
       }
     },
     "DATE_RANGE_OPTIONS": {
@@ -441,7 +441,8 @@
       "LOADING_MESSAGE": "Loading conversation metrics...",
       "OPEN": "Avaa",
       "UNATTENDED": "Unattended",
-      "UNASSIGNED": "Osoittamaton"
+      "UNASSIGNED": "Osoittamaton",
+      "PENDING": "Odottava"
     },
     "CONVERSATION_HEATMAP": {
       "HEADER": "Conversation Traffic",
diff --git a/app/javascript/dashboard/i18n/locale/fi/sla.json b/app/javascript/dashboard/i18n/locale/fi/sla.json
index 2fdc5ea44..d51922e89 100644
--- a/app/javascript/dashboard/i18n/locale/fi/sla.json
+++ b/app/javascript/dashboard/i18n/locale/fi/sla.json
@@ -31,21 +31,24 @@
         "PLACEHOLDER": "SLA for premium customers"
       },
       "FIRST_RESPONSE_TIME": {
-        "LABEL": "First Response Time(Seconds)",
-        "PLACEHOLDER": "300 for 5 minutes"
+        "LABEL": "First Response Time",
+        "PLACEHOLDER": "5"
       },
       "NEXT_RESPONSE_TIME": {
-        "LABEL": "Next Response Time(Seconds)",
-        "PLACEHOLDER": "600 for 10 minutes"
+        "LABEL": "Next Response Time",
+        "PLACEHOLDER": "5"
       },
       "RESOLUTION_TIME": {
-        "LABEL": "Resolution Time(Seconds)",
-        "PLACEHOLDER": "86400 for 1 day"
+        "LABEL": "Selviytymisen kesto",
+        "PLACEHOLDER": "60"
       },
       "BUSINESS_HOURS": {
         "LABEL": "Business Hours",
         "PLACEHOLDER": "Only during business hours"
       },
+      "THRESHOLD_TIME": {
+        "INVALID_FORMAT_ERROR": "Threshold should be a number and greater than zero"
+      },
       "EDIT": "Muokkaa",
       "CREATE": "Luo",
       "DELETE": "Poista",
diff --git a/app/javascript/dashboard/i18n/locale/fr/helpCenter.json b/app/javascript/dashboard/i18n/locale/fr/helpCenter.json
index 18af06944..3be07446f 100644
--- a/app/javascript/dashboard/i18n/locale/fr/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/fr/helpCenter.json
@@ -319,7 +319,7 @@
       "HEADERS": {
         "TITLE": "Titre",
         "CATEGORY": "Catégorie",
-        "READ_COUNT": "Nombre de lectures",
+        "READ_COUNT": "Views",
         "STATUS": "État",
         "LAST_EDITED": "Dernière modification"
       },
diff --git a/app/javascript/dashboard/i18n/locale/fr/report.json b/app/javascript/dashboard/i18n/locale/fr/report.json
index 46fd78c9c..232bbc906 100644
--- a/app/javascript/dashboard/i18n/locale/fr/report.json
+++ b/app/javascript/dashboard/i18n/locale/fr/report.json
@@ -37,7 +37,7 @@
       },
       "REPLY_TIME": {
         "NAME": "Temps d'attente du client",
-        "TOOLTIP_TEXT": "Le temps de résolution est %{metricValue} (basé sur %{conversationCount} conversations)"
+        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} replies)"
       }
     },
     "DATE_RANGE_OPTIONS": {
@@ -441,7 +441,8 @@
       "LOADING_MESSAGE": "Chargement des métriques de la conversation...",
       "OPEN": "Ouvert",
       "UNATTENDED": "Sans surveillance",
-      "UNASSIGNED": "Non assigné"
+      "UNASSIGNED": "Non assigné",
+      "PENDING": "En attente"
     },
     "CONVERSATION_HEATMAP": {
       "HEADER": "Trafic des conversations",
diff --git a/app/javascript/dashboard/i18n/locale/fr/sla.json b/app/javascript/dashboard/i18n/locale/fr/sla.json
index aea4e039e..bf9e31063 100644
--- a/app/javascript/dashboard/i18n/locale/fr/sla.json
+++ b/app/javascript/dashboard/i18n/locale/fr/sla.json
@@ -31,21 +31,24 @@
         "PLACEHOLDER": "SLA for premium customers"
       },
       "FIRST_RESPONSE_TIME": {
-        "LABEL": "First Response Time(Seconds)",
-        "PLACEHOLDER": "300 for 5 minutes"
+        "LABEL": "Délai de première réponse",
+        "PLACEHOLDER": "5"
       },
       "NEXT_RESPONSE_TIME": {
-        "LABEL": "Next Response Time(Seconds)",
-        "PLACEHOLDER": "600 for 10 minutes"
+        "LABEL": "Next Response Time",
+        "PLACEHOLDER": "5"
       },
       "RESOLUTION_TIME": {
-        "LABEL": "Resolution Time(Seconds)",
-        "PLACEHOLDER": "86400 for 1 day"
+        "LABEL": "Temps de résolution",
+        "PLACEHOLDER": "60"
       },
       "BUSINESS_HOURS": {
         "LABEL": "Heures de bureau",
         "PLACEHOLDER": "Only during business hours"
       },
+      "THRESHOLD_TIME": {
+        "INVALID_FORMAT_ERROR": "Threshold should be a number and greater than zero"
+      },
       "EDIT": "Modifier",
       "CREATE": "Créer",
       "DELETE": "Supprimer",
diff --git a/app/javascript/dashboard/i18n/locale/he/helpCenter.json b/app/javascript/dashboard/i18n/locale/he/helpCenter.json
index 9f9cd706b..03f4d9e8a 100644
--- a/app/javascript/dashboard/i18n/locale/he/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/he/helpCenter.json
@@ -319,7 +319,7 @@
       "HEADERS": {
         "TITLE": "כותרת",
         "CATEGORY": "קטגוריה",
-        "READ_COUNT": "ספירת קריאה",
+        "READ_COUNT": "Views",
         "STATUS": "מצב",
         "LAST_EDITED": "עריכה אחרונה"
       },
diff --git a/app/javascript/dashboard/i18n/locale/he/report.json b/app/javascript/dashboard/i18n/locale/he/report.json
index f0d7ea368..046805827 100644
--- a/app/javascript/dashboard/i18n/locale/he/report.json
+++ b/app/javascript/dashboard/i18n/locale/he/report.json
@@ -37,7 +37,7 @@
       },
       "REPLY_TIME": {
         "NAME": "Customer waiting time",
-        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} conversations)"
+        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} replies)"
       }
     },
     "DATE_RANGE_OPTIONS": {
@@ -441,7 +441,8 @@
       "LOADING_MESSAGE": "טוען מדדי שיחה...",
       "OPEN": "פתח",
       "UNATTENDED": "ללא השגחה",
-      "UNASSIGNED": "לא הוקצתה"
+      "UNASSIGNED": "לא הוקצתה",
+      "PENDING": "ממתין ל"
     },
     "CONVERSATION_HEATMAP": {
       "HEADER": "תנועת שיחות",
diff --git a/app/javascript/dashboard/i18n/locale/he/sla.json b/app/javascript/dashboard/i18n/locale/he/sla.json
index 3207d7f85..9f4524f2c 100644
--- a/app/javascript/dashboard/i18n/locale/he/sla.json
+++ b/app/javascript/dashboard/i18n/locale/he/sla.json
@@ -31,21 +31,24 @@
         "PLACEHOLDER": "SLA for premium customers"
       },
       "FIRST_RESPONSE_TIME": {
-        "LABEL": "First Response Time(Seconds)",
-        "PLACEHOLDER": "300 for 5 minutes"
+        "LABEL": "זמן תגובה ראשון",
+        "PLACEHOLDER": "5"
       },
       "NEXT_RESPONSE_TIME": {
-        "LABEL": "Next Response Time(Seconds)",
-        "PLACEHOLDER": "600 for 10 minutes"
+        "LABEL": "Next Response Time",
+        "PLACEHOLDER": "5"
       },
       "RESOLUTION_TIME": {
-        "LABEL": "Resolution Time(Seconds)",
-        "PLACEHOLDER": "86400 for 1 day"
+        "LABEL": "זמן רזולוציה",
+        "PLACEHOLDER": "60"
       },
       "BUSINESS_HOURS": {
         "LABEL": "שעות פעילות",
         "PLACEHOLDER": "Only during business hours"
       },
+      "THRESHOLD_TIME": {
+        "INVALID_FORMAT_ERROR": "Threshold should be a number and greater than zero"
+      },
       "EDIT": "ערוך",
       "CREATE": "צור",
       "DELETE": "מחק",
diff --git a/app/javascript/dashboard/i18n/locale/hi/helpCenter.json b/app/javascript/dashboard/i18n/locale/hi/helpCenter.json
index cd397ed1e..467b0def9 100644
--- a/app/javascript/dashboard/i18n/locale/hi/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/hi/helpCenter.json
@@ -319,7 +319,7 @@
       "HEADERS": {
         "TITLE": "Title",
         "CATEGORY": "Category",
-        "READ_COUNT": "Read count",
+        "READ_COUNT": "Views",
         "STATUS": "Status",
         "LAST_EDITED": "Last edited"
       },
diff --git a/app/javascript/dashboard/i18n/locale/hi/report.json b/app/javascript/dashboard/i18n/locale/hi/report.json
index 87c070fd1..6ff84c5f5 100644
--- a/app/javascript/dashboard/i18n/locale/hi/report.json
+++ b/app/javascript/dashboard/i18n/locale/hi/report.json
@@ -37,7 +37,7 @@
       },
       "REPLY_TIME": {
         "NAME": "Customer waiting time",
-        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} conversations)"
+        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} replies)"
       }
     },
     "DATE_RANGE_OPTIONS": {
@@ -441,7 +441,8 @@
       "LOADING_MESSAGE": "Loading conversation metrics...",
       "OPEN": "Open",
       "UNATTENDED": "Unattended",
-      "UNASSIGNED": "Unassigned"
+      "UNASSIGNED": "Unassigned",
+      "PENDING": "Pending"
     },
     "CONVERSATION_HEATMAP": {
       "HEADER": "Conversation Traffic",
diff --git a/app/javascript/dashboard/i18n/locale/hi/sla.json b/app/javascript/dashboard/i18n/locale/hi/sla.json
index 869b3ba3f..806746b75 100644
--- a/app/javascript/dashboard/i18n/locale/hi/sla.json
+++ b/app/javascript/dashboard/i18n/locale/hi/sla.json
@@ -31,21 +31,24 @@
         "PLACEHOLDER": "SLA for premium customers"
       },
       "FIRST_RESPONSE_TIME": {
-        "LABEL": "First Response Time(Seconds)",
-        "PLACEHOLDER": "300 for 5 minutes"
+        "LABEL": "First Response Time",
+        "PLACEHOLDER": "5"
       },
       "NEXT_RESPONSE_TIME": {
-        "LABEL": "Next Response Time(Seconds)",
-        "PLACEHOLDER": "600 for 10 minutes"
+        "LABEL": "Next Response Time",
+        "PLACEHOLDER": "5"
       },
       "RESOLUTION_TIME": {
-        "LABEL": "Resolution Time(Seconds)",
-        "PLACEHOLDER": "86400 for 1 day"
+        "LABEL": "Resolution Time",
+        "PLACEHOLDER": "60"
       },
       "BUSINESS_HOURS": {
         "LABEL": "Business Hours",
         "PLACEHOLDER": "Only during business hours"
       },
+      "THRESHOLD_TIME": {
+        "INVALID_FORMAT_ERROR": "Threshold should be a number and greater than zero"
+      },
       "EDIT": "Edit",
       "CREATE": "Create",
       "DELETE": "Delete",
diff --git a/app/javascript/dashboard/i18n/locale/hr/helpCenter.json b/app/javascript/dashboard/i18n/locale/hr/helpCenter.json
index 69d6e9eec..f36e69405 100644
--- a/app/javascript/dashboard/i18n/locale/hr/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/hr/helpCenter.json
@@ -319,7 +319,7 @@
       "HEADERS": {
         "TITLE": "Title",
         "CATEGORY": "Kategorija",
-        "READ_COUNT": "Read count",
+        "READ_COUNT": "Views",
         "STATUS": "Status",
         "LAST_EDITED": "Last edited"
       },
diff --git a/app/javascript/dashboard/i18n/locale/hr/report.json b/app/javascript/dashboard/i18n/locale/hr/report.json
index 87c070fd1..6ff84c5f5 100644
--- a/app/javascript/dashboard/i18n/locale/hr/report.json
+++ b/app/javascript/dashboard/i18n/locale/hr/report.json
@@ -37,7 +37,7 @@
       },
       "REPLY_TIME": {
         "NAME": "Customer waiting time",
-        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} conversations)"
+        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} replies)"
       }
     },
     "DATE_RANGE_OPTIONS": {
@@ -441,7 +441,8 @@
       "LOADING_MESSAGE": "Loading conversation metrics...",
       "OPEN": "Open",
       "UNATTENDED": "Unattended",
-      "UNASSIGNED": "Unassigned"
+      "UNASSIGNED": "Unassigned",
+      "PENDING": "Pending"
     },
     "CONVERSATION_HEATMAP": {
       "HEADER": "Conversation Traffic",
diff --git a/app/javascript/dashboard/i18n/locale/hr/sla.json b/app/javascript/dashboard/i18n/locale/hr/sla.json
index 821b717d6..244f041f1 100644
--- a/app/javascript/dashboard/i18n/locale/hr/sla.json
+++ b/app/javascript/dashboard/i18n/locale/hr/sla.json
@@ -31,21 +31,24 @@
         "PLACEHOLDER": "SLA for premium customers"
       },
       "FIRST_RESPONSE_TIME": {
-        "LABEL": "First Response Time(Seconds)",
-        "PLACEHOLDER": "300 for 5 minutes"
+        "LABEL": "First Response Time",
+        "PLACEHOLDER": "5"
       },
       "NEXT_RESPONSE_TIME": {
-        "LABEL": "Next Response Time(Seconds)",
-        "PLACEHOLDER": "600 for 10 minutes"
+        "LABEL": "Next Response Time",
+        "PLACEHOLDER": "5"
       },
       "RESOLUTION_TIME": {
-        "LABEL": "Resolution Time(Seconds)",
-        "PLACEHOLDER": "86400 for 1 day"
+        "LABEL": "Resolution Time",
+        "PLACEHOLDER": "60"
       },
       "BUSINESS_HOURS": {
         "LABEL": "Business Hours",
         "PLACEHOLDER": "Only during business hours"
       },
+      "THRESHOLD_TIME": {
+        "INVALID_FORMAT_ERROR": "Threshold should be a number and greater than zero"
+      },
       "EDIT": "Uredi",
       "CREATE": "Create",
       "DELETE": "Izbriši",
diff --git a/app/javascript/dashboard/i18n/locale/hu/helpCenter.json b/app/javascript/dashboard/i18n/locale/hu/helpCenter.json
index db7fb8be6..315bbdf54 100644
--- a/app/javascript/dashboard/i18n/locale/hu/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/hu/helpCenter.json
@@ -319,7 +319,7 @@
       "HEADERS": {
         "TITLE": "Cím",
         "CATEGORY": "Kategória",
-        "READ_COUNT": "Olvasói szám",
+        "READ_COUNT": "Views",
         "STATUS": "Státusz",
         "LAST_EDITED": "Utoljára szerkesztve"
       },
diff --git a/app/javascript/dashboard/i18n/locale/hu/report.json b/app/javascript/dashboard/i18n/locale/hu/report.json
index a796728d0..3b99acac0 100644
--- a/app/javascript/dashboard/i18n/locale/hu/report.json
+++ b/app/javascript/dashboard/i18n/locale/hu/report.json
@@ -37,7 +37,7 @@
       },
       "REPLY_TIME": {
         "NAME": "Vevő várakozási idő",
-        "TOOLTIP_TEXT": "Várakozási idő: %{metricValue} (%{conversationCount} függvényében)"
+        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} replies)"
       }
     },
     "DATE_RANGE_OPTIONS": {
@@ -441,7 +441,8 @@
       "LOADING_MESSAGE": "Beszélgetési metrikák betöltése...",
       "OPEN": "Megnyitás",
       "UNATTENDED": "Figyelmen kívül hagyott",
-      "UNASSIGNED": "Gazdátlan"
+      "UNASSIGNED": "Gazdátlan",
+      "PENDING": "Függőben lévő"
     },
     "CONVERSATION_HEATMAP": {
       "HEADER": "Beszélgetés forgalom",
diff --git a/app/javascript/dashboard/i18n/locale/hu/sla.json b/app/javascript/dashboard/i18n/locale/hu/sla.json
index 13eed7285..d56ecc835 100644
--- a/app/javascript/dashboard/i18n/locale/hu/sla.json
+++ b/app/javascript/dashboard/i18n/locale/hu/sla.json
@@ -31,21 +31,24 @@
         "PLACEHOLDER": "SLA for premium customers"
       },
       "FIRST_RESPONSE_TIME": {
-        "LABEL": "First Response Time(Seconds)",
-        "PLACEHOLDER": "300 for 5 minutes"
+        "LABEL": "Első reakció idő",
+        "PLACEHOLDER": "5"
       },
       "NEXT_RESPONSE_TIME": {
-        "LABEL": "Next Response Time(Seconds)",
-        "PLACEHOLDER": "600 for 10 minutes"
+        "LABEL": "Next Response Time",
+        "PLACEHOLDER": "5"
       },
       "RESOLUTION_TIME": {
-        "LABEL": "Resolution Time(Seconds)",
-        "PLACEHOLDER": "86400 for 1 day"
+        "LABEL": "Megoldási idő",
+        "PLACEHOLDER": "60"
       },
       "BUSINESS_HOURS": {
         "LABEL": "Nyitvatartás",
         "PLACEHOLDER": "Only during business hours"
       },
+      "THRESHOLD_TIME": {
+        "INVALID_FORMAT_ERROR": "Threshold should be a number and greater than zero"
+      },
       "EDIT": "Szerkesztés",
       "CREATE": "Létrehozás",
       "DELETE": "Törlés",
diff --git a/app/javascript/dashboard/i18n/locale/hy/helpCenter.json b/app/javascript/dashboard/i18n/locale/hy/helpCenter.json
index cd397ed1e..467b0def9 100644
--- a/app/javascript/dashboard/i18n/locale/hy/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/hy/helpCenter.json
@@ -319,7 +319,7 @@
       "HEADERS": {
         "TITLE": "Title",
         "CATEGORY": "Category",
-        "READ_COUNT": "Read count",
+        "READ_COUNT": "Views",
         "STATUS": "Status",
         "LAST_EDITED": "Last edited"
       },
diff --git a/app/javascript/dashboard/i18n/locale/hy/report.json b/app/javascript/dashboard/i18n/locale/hy/report.json
index 87c070fd1..6ff84c5f5 100644
--- a/app/javascript/dashboard/i18n/locale/hy/report.json
+++ b/app/javascript/dashboard/i18n/locale/hy/report.json
@@ -37,7 +37,7 @@
       },
       "REPLY_TIME": {
         "NAME": "Customer waiting time",
-        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} conversations)"
+        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} replies)"
       }
     },
     "DATE_RANGE_OPTIONS": {
@@ -441,7 +441,8 @@
       "LOADING_MESSAGE": "Loading conversation metrics...",
       "OPEN": "Open",
       "UNATTENDED": "Unattended",
-      "UNASSIGNED": "Unassigned"
+      "UNASSIGNED": "Unassigned",
+      "PENDING": "Pending"
     },
     "CONVERSATION_HEATMAP": {
       "HEADER": "Conversation Traffic",
diff --git a/app/javascript/dashboard/i18n/locale/hy/sla.json b/app/javascript/dashboard/i18n/locale/hy/sla.json
index 869b3ba3f..806746b75 100644
--- a/app/javascript/dashboard/i18n/locale/hy/sla.json
+++ b/app/javascript/dashboard/i18n/locale/hy/sla.json
@@ -31,21 +31,24 @@
         "PLACEHOLDER": "SLA for premium customers"
       },
       "FIRST_RESPONSE_TIME": {
-        "LABEL": "First Response Time(Seconds)",
-        "PLACEHOLDER": "300 for 5 minutes"
+        "LABEL": "First Response Time",
+        "PLACEHOLDER": "5"
       },
       "NEXT_RESPONSE_TIME": {
-        "LABEL": "Next Response Time(Seconds)",
-        "PLACEHOLDER": "600 for 10 minutes"
+        "LABEL": "Next Response Time",
+        "PLACEHOLDER": "5"
       },
       "RESOLUTION_TIME": {
-        "LABEL": "Resolution Time(Seconds)",
-        "PLACEHOLDER": "86400 for 1 day"
+        "LABEL": "Resolution Time",
+        "PLACEHOLDER": "60"
       },
       "BUSINESS_HOURS": {
         "LABEL": "Business Hours",
         "PLACEHOLDER": "Only during business hours"
       },
+      "THRESHOLD_TIME": {
+        "INVALID_FORMAT_ERROR": "Threshold should be a number and greater than zero"
+      },
       "EDIT": "Edit",
       "CREATE": "Create",
       "DELETE": "Delete",
diff --git a/app/javascript/dashboard/i18n/locale/id/helpCenter.json b/app/javascript/dashboard/i18n/locale/id/helpCenter.json
index 3e65ae78c..a51a30a14 100644
--- a/app/javascript/dashboard/i18n/locale/id/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/id/helpCenter.json
@@ -319,7 +319,7 @@
       "HEADERS": {
         "TITLE": "Judul",
         "CATEGORY": "Kategori",
-        "READ_COUNT": "Baca hitungan",
+        "READ_COUNT": "Views",
         "STATUS": "Status",
         "LAST_EDITED": "Terakhir diedit"
       },
diff --git a/app/javascript/dashboard/i18n/locale/id/report.json b/app/javascript/dashboard/i18n/locale/id/report.json
index e5f6c5971..872af13a3 100644
--- a/app/javascript/dashboard/i18n/locale/id/report.json
+++ b/app/javascript/dashboard/i18n/locale/id/report.json
@@ -37,7 +37,7 @@
       },
       "REPLY_TIME": {
         "NAME": "Customer waiting time",
-        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} conversations)"
+        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} replies)"
       }
     },
     "DATE_RANGE_OPTIONS": {
@@ -441,7 +441,8 @@
       "LOADING_MESSAGE": "Memuat metrik percakapan...",
       "OPEN": "Terbuka",
       "UNATTENDED": "Tidak Ditangani",
-      "UNASSIGNED": "Belum Ditugaskan"
+      "UNASSIGNED": "Belum Ditugaskan",
+      "PENDING": "Ditunda"
     },
     "CONVERSATION_HEATMAP": {
       "HEADER": "Lalu Lintas Percakapan",
diff --git a/app/javascript/dashboard/i18n/locale/id/sla.json b/app/javascript/dashboard/i18n/locale/id/sla.json
index 3e7194089..6b399bf87 100644
--- a/app/javascript/dashboard/i18n/locale/id/sla.json
+++ b/app/javascript/dashboard/i18n/locale/id/sla.json
@@ -31,21 +31,24 @@
         "PLACEHOLDER": "SLA for premium customers"
       },
       "FIRST_RESPONSE_TIME": {
-        "LABEL": "First Response Time(Seconds)",
-        "PLACEHOLDER": "300 for 5 minutes"
+        "LABEL": "Waktu Respon Pertama",
+        "PLACEHOLDER": "5"
       },
       "NEXT_RESPONSE_TIME": {
-        "LABEL": "Next Response Time(Seconds)",
-        "PLACEHOLDER": "600 for 10 minutes"
+        "LABEL": "Next Response Time",
+        "PLACEHOLDER": "5"
       },
       "RESOLUTION_TIME": {
-        "LABEL": "Resolution Time(Seconds)",
-        "PLACEHOLDER": "86400 for 1 day"
+        "LABEL": "Waktu Penyelesaian",
+        "PLACEHOLDER": "60"
       },
       "BUSINESS_HOURS": {
         "LABEL": "Jam Kerja",
         "PLACEHOLDER": "Only during business hours"
       },
+      "THRESHOLD_TIME": {
+        "INVALID_FORMAT_ERROR": "Threshold should be a number and greater than zero"
+      },
       "EDIT": "Edit",
       "CREATE": "Buat",
       "DELETE": "Hapus",
diff --git a/app/javascript/dashboard/i18n/locale/is/helpCenter.json b/app/javascript/dashboard/i18n/locale/is/helpCenter.json
index 7cac3184c..41fc6ebdc 100644
--- a/app/javascript/dashboard/i18n/locale/is/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/is/helpCenter.json
@@ -319,7 +319,7 @@
       "HEADERS": {
         "TITLE": "Title",
         "CATEGORY": "Category",
-        "READ_COUNT": "Read count",
+        "READ_COUNT": "Views",
         "STATUS": "Staða",
         "LAST_EDITED": "Last edited"
       },
diff --git a/app/javascript/dashboard/i18n/locale/is/report.json b/app/javascript/dashboard/i18n/locale/is/report.json
index 77ec5f0a0..c00428e51 100644
--- a/app/javascript/dashboard/i18n/locale/is/report.json
+++ b/app/javascript/dashboard/i18n/locale/is/report.json
@@ -37,7 +37,7 @@
       },
       "REPLY_TIME": {
         "NAME": "Customer waiting time",
-        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} conversations)"
+        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} replies)"
       }
     },
     "DATE_RANGE_OPTIONS": {
@@ -441,7 +441,8 @@
       "LOADING_MESSAGE": "Loading conversation metrics...",
       "OPEN": "Open",
       "UNATTENDED": "Unattended",
-      "UNASSIGNED": "Unassigned"
+      "UNASSIGNED": "Unassigned",
+      "PENDING": "Í bið"
     },
     "CONVERSATION_HEATMAP": {
       "HEADER": "Conversation Traffic",
diff --git a/app/javascript/dashboard/i18n/locale/is/sla.json b/app/javascript/dashboard/i18n/locale/is/sla.json
index 3727ca04e..4d6c9d2b3 100644
--- a/app/javascript/dashboard/i18n/locale/is/sla.json
+++ b/app/javascript/dashboard/i18n/locale/is/sla.json
@@ -31,21 +31,24 @@
         "PLACEHOLDER": "SLA for premium customers"
       },
       "FIRST_RESPONSE_TIME": {
-        "LABEL": "First Response Time(Seconds)",
-        "PLACEHOLDER": "300 for 5 minutes"
+        "LABEL": "First Response Time",
+        "PLACEHOLDER": "5"
       },
       "NEXT_RESPONSE_TIME": {
-        "LABEL": "Next Response Time(Seconds)",
-        "PLACEHOLDER": "600 for 10 minutes"
+        "LABEL": "Next Response Time",
+        "PLACEHOLDER": "5"
       },
       "RESOLUTION_TIME": {
-        "LABEL": "Resolution Time(Seconds)",
-        "PLACEHOLDER": "86400 for 1 day"
+        "LABEL": "Resolution Time",
+        "PLACEHOLDER": "60"
       },
       "BUSINESS_HOURS": {
         "LABEL": "Business Hours",
         "PLACEHOLDER": "Only during business hours"
       },
+      "THRESHOLD_TIME": {
+        "INVALID_FORMAT_ERROR": "Threshold should be a number and greater than zero"
+      },
       "EDIT": "Breyta",
       "CREATE": "Stofna",
       "DELETE": "Eyða",
diff --git a/app/javascript/dashboard/i18n/locale/it/helpCenter.json b/app/javascript/dashboard/i18n/locale/it/helpCenter.json
index bc9a0999d..d86288338 100644
--- a/app/javascript/dashboard/i18n/locale/it/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/it/helpCenter.json
@@ -319,7 +319,7 @@
       "HEADERS": {
         "TITLE": "Titolo",
         "CATEGORY": "Categoria",
-        "READ_COUNT": "Contatore delle letture",
+        "READ_COUNT": "Views",
         "STATUS": "Stato",
         "LAST_EDITED": "Ultima modifica"
       },
diff --git a/app/javascript/dashboard/i18n/locale/it/report.json b/app/javascript/dashboard/i18n/locale/it/report.json
index 84db47319..53572bfb2 100644
--- a/app/javascript/dashboard/i18n/locale/it/report.json
+++ b/app/javascript/dashboard/i18n/locale/it/report.json
@@ -37,7 +37,7 @@
       },
       "REPLY_TIME": {
         "NAME": "Customer waiting time",
-        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} conversations)"
+        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} replies)"
       }
     },
     "DATE_RANGE_OPTIONS": {
@@ -441,7 +441,8 @@
       "LOADING_MESSAGE": "Caricamento metriche conversazioni...",
       "OPEN": "Apri",
       "UNATTENDED": "Non partecipate",
-      "UNASSIGNED": "Non assegnato"
+      "UNASSIGNED": "Non assegnato",
+      "PENDING": "In sospeso"
     },
     "CONVERSATION_HEATMAP": {
       "HEADER": "Conversation Traffic",
diff --git a/app/javascript/dashboard/i18n/locale/it/sla.json b/app/javascript/dashboard/i18n/locale/it/sla.json
index 38793b184..8c8a11863 100644
--- a/app/javascript/dashboard/i18n/locale/it/sla.json
+++ b/app/javascript/dashboard/i18n/locale/it/sla.json
@@ -31,21 +31,24 @@
         "PLACEHOLDER": "SLA for premium customers"
       },
       "FIRST_RESPONSE_TIME": {
-        "LABEL": "First Response Time(Seconds)",
-        "PLACEHOLDER": "300 for 5 minutes"
+        "LABEL": "Tempo di prima risposta",
+        "PLACEHOLDER": "5"
       },
       "NEXT_RESPONSE_TIME": {
-        "LABEL": "Next Response Time(Seconds)",
-        "PLACEHOLDER": "600 for 10 minutes"
+        "LABEL": "Next Response Time",
+        "PLACEHOLDER": "5"
       },
       "RESOLUTION_TIME": {
-        "LABEL": "Resolution Time(Seconds)",
-        "PLACEHOLDER": "86400 for 1 day"
+        "LABEL": "Tempo di risoluzione",
+        "PLACEHOLDER": "60"
       },
       "BUSINESS_HOURS": {
         "LABEL": "Ore di lavoro",
         "PLACEHOLDER": "Only during business hours"
       },
+      "THRESHOLD_TIME": {
+        "INVALID_FORMAT_ERROR": "Threshold should be a number and greater than zero"
+      },
       "EDIT": "Modifica",
       "CREATE": "Crea",
       "DELETE": "Elimina",
diff --git a/app/javascript/dashboard/i18n/locale/ja/helpCenter.json b/app/javascript/dashboard/i18n/locale/ja/helpCenter.json
index 190c7daa2..872b16c52 100644
--- a/app/javascript/dashboard/i18n/locale/ja/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ja/helpCenter.json
@@ -319,7 +319,7 @@
       "HEADERS": {
         "TITLE": "Title",
         "CATEGORY": "Category",
-        "READ_COUNT": "Read count",
+        "READ_COUNT": "Views",
         "STATUS": "状況",
         "LAST_EDITED": "Last edited"
       },
diff --git a/app/javascript/dashboard/i18n/locale/ja/report.json b/app/javascript/dashboard/i18n/locale/ja/report.json
index f7fad4d92..bc99edad9 100644
--- a/app/javascript/dashboard/i18n/locale/ja/report.json
+++ b/app/javascript/dashboard/i18n/locale/ja/report.json
@@ -37,7 +37,7 @@
       },
       "REPLY_TIME": {
         "NAME": "Customer waiting time",
-        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} conversations)"
+        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} replies)"
       }
     },
     "DATE_RANGE_OPTIONS": {
@@ -441,7 +441,8 @@
       "LOADING_MESSAGE": "Loading conversation metrics...",
       "OPEN": "開く",
       "UNATTENDED": "Unattended",
-      "UNASSIGNED": "未割当"
+      "UNASSIGNED": "未割当",
+      "PENDING": "Pending"
     },
     "CONVERSATION_HEATMAP": {
       "HEADER": "Conversation Traffic",
diff --git a/app/javascript/dashboard/i18n/locale/ja/sla.json b/app/javascript/dashboard/i18n/locale/ja/sla.json
index c68050981..df3289509 100644
--- a/app/javascript/dashboard/i18n/locale/ja/sla.json
+++ b/app/javascript/dashboard/i18n/locale/ja/sla.json
@@ -31,21 +31,24 @@
         "PLACEHOLDER": "SLA for premium customers"
       },
       "FIRST_RESPONSE_TIME": {
-        "LABEL": "First Response Time(Seconds)",
-        "PLACEHOLDER": "300 for 5 minutes"
+        "LABEL": "First Response Time",
+        "PLACEHOLDER": "5"
       },
       "NEXT_RESPONSE_TIME": {
-        "LABEL": "Next Response Time(Seconds)",
-        "PLACEHOLDER": "600 for 10 minutes"
+        "LABEL": "Next Response Time",
+        "PLACEHOLDER": "5"
       },
       "RESOLUTION_TIME": {
-        "LABEL": "Resolution Time(Seconds)",
-        "PLACEHOLDER": "86400 for 1 day"
+        "LABEL": "処理時間",
+        "PLACEHOLDER": "60"
       },
       "BUSINESS_HOURS": {
         "LABEL": "Business Hours",
         "PLACEHOLDER": "Only during business hours"
       },
+      "THRESHOLD_TIME": {
+        "INVALID_FORMAT_ERROR": "Threshold should be a number and greater than zero"
+      },
       "EDIT": "編集",
       "CREATE": "作成",
       "DELETE": "削除",
diff --git a/app/javascript/dashboard/i18n/locale/ka/helpCenter.json b/app/javascript/dashboard/i18n/locale/ka/helpCenter.json
index cd397ed1e..467b0def9 100644
--- a/app/javascript/dashboard/i18n/locale/ka/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ka/helpCenter.json
@@ -319,7 +319,7 @@
       "HEADERS": {
         "TITLE": "Title",
         "CATEGORY": "Category",
-        "READ_COUNT": "Read count",
+        "READ_COUNT": "Views",
         "STATUS": "Status",
         "LAST_EDITED": "Last edited"
       },
diff --git a/app/javascript/dashboard/i18n/locale/ka/report.json b/app/javascript/dashboard/i18n/locale/ka/report.json
index 87c070fd1..6ff84c5f5 100644
--- a/app/javascript/dashboard/i18n/locale/ka/report.json
+++ b/app/javascript/dashboard/i18n/locale/ka/report.json
@@ -37,7 +37,7 @@
       },
       "REPLY_TIME": {
         "NAME": "Customer waiting time",
-        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} conversations)"
+        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} replies)"
       }
     },
     "DATE_RANGE_OPTIONS": {
@@ -441,7 +441,8 @@
       "LOADING_MESSAGE": "Loading conversation metrics...",
       "OPEN": "Open",
       "UNATTENDED": "Unattended",
-      "UNASSIGNED": "Unassigned"
+      "UNASSIGNED": "Unassigned",
+      "PENDING": "Pending"
     },
     "CONVERSATION_HEATMAP": {
       "HEADER": "Conversation Traffic",
diff --git a/app/javascript/dashboard/i18n/locale/ka/sla.json b/app/javascript/dashboard/i18n/locale/ka/sla.json
index 869b3ba3f..806746b75 100644
--- a/app/javascript/dashboard/i18n/locale/ka/sla.json
+++ b/app/javascript/dashboard/i18n/locale/ka/sla.json
@@ -31,21 +31,24 @@
         "PLACEHOLDER": "SLA for premium customers"
       },
       "FIRST_RESPONSE_TIME": {
-        "LABEL": "First Response Time(Seconds)",
-        "PLACEHOLDER": "300 for 5 minutes"
+        "LABEL": "First Response Time",
+        "PLACEHOLDER": "5"
       },
       "NEXT_RESPONSE_TIME": {
-        "LABEL": "Next Response Time(Seconds)",
-        "PLACEHOLDER": "600 for 10 minutes"
+        "LABEL": "Next Response Time",
+        "PLACEHOLDER": "5"
       },
       "RESOLUTION_TIME": {
-        "LABEL": "Resolution Time(Seconds)",
-        "PLACEHOLDER": "86400 for 1 day"
+        "LABEL": "Resolution Time",
+        "PLACEHOLDER": "60"
       },
       "BUSINESS_HOURS": {
         "LABEL": "Business Hours",
         "PLACEHOLDER": "Only during business hours"
       },
+      "THRESHOLD_TIME": {
+        "INVALID_FORMAT_ERROR": "Threshold should be a number and greater than zero"
+      },
       "EDIT": "Edit",
       "CREATE": "Create",
       "DELETE": "Delete",
diff --git a/app/javascript/dashboard/i18n/locale/ko/helpCenter.json b/app/javascript/dashboard/i18n/locale/ko/helpCenter.json
index eb1aca9fe..092aff90d 100644
--- a/app/javascript/dashboard/i18n/locale/ko/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ko/helpCenter.json
@@ -319,7 +319,7 @@
       "HEADERS": {
         "TITLE": "Title",
         "CATEGORY": "Category",
-        "READ_COUNT": "Read count",
+        "READ_COUNT": "Views",
         "STATUS": "상태",
         "LAST_EDITED": "Last edited"
       },
diff --git a/app/javascript/dashboard/i18n/locale/ko/report.json b/app/javascript/dashboard/i18n/locale/ko/report.json
index b5ef3f16a..592fbdd2a 100644
--- a/app/javascript/dashboard/i18n/locale/ko/report.json
+++ b/app/javascript/dashboard/i18n/locale/ko/report.json
@@ -37,7 +37,7 @@
       },
       "REPLY_TIME": {
         "NAME": "Customer waiting time",
-        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} conversations)"
+        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} replies)"
       }
     },
     "DATE_RANGE_OPTIONS": {
@@ -441,7 +441,8 @@
       "LOADING_MESSAGE": "Loading conversation metrics...",
       "OPEN": "열기",
       "UNATTENDED": "Unattended",
-      "UNASSIGNED": "지정되지 않음"
+      "UNASSIGNED": "지정되지 않음",
+      "PENDING": "보내는 중"
     },
     "CONVERSATION_HEATMAP": {
       "HEADER": "Conversation Traffic",
diff --git a/app/javascript/dashboard/i18n/locale/ko/sla.json b/app/javascript/dashboard/i18n/locale/ko/sla.json
index 205b57cca..a424a63d3 100644
--- a/app/javascript/dashboard/i18n/locale/ko/sla.json
+++ b/app/javascript/dashboard/i18n/locale/ko/sla.json
@@ -31,21 +31,24 @@
         "PLACEHOLDER": "SLA for premium customers"
       },
       "FIRST_RESPONSE_TIME": {
-        "LABEL": "First Response Time(Seconds)",
-        "PLACEHOLDER": "300 for 5 minutes"
+        "LABEL": "First Response Time",
+        "PLACEHOLDER": "5"
       },
       "NEXT_RESPONSE_TIME": {
-        "LABEL": "Next Response Time(Seconds)",
-        "PLACEHOLDER": "600 for 10 minutes"
+        "LABEL": "Next Response Time",
+        "PLACEHOLDER": "5"
       },
       "RESOLUTION_TIME": {
-        "LABEL": "Resolution Time(Seconds)",
-        "PLACEHOLDER": "86400 for 1 day"
+        "LABEL": "해결 시간",
+        "PLACEHOLDER": "60"
       },
       "BUSINESS_HOURS": {
         "LABEL": "영업시간",
         "PLACEHOLDER": "Only during business hours"
       },
+      "THRESHOLD_TIME": {
+        "INVALID_FORMAT_ERROR": "Threshold should be a number and greater than zero"
+      },
       "EDIT": "수정",
       "CREATE": "만들기",
       "DELETE": "삭제",
diff --git a/app/javascript/dashboard/i18n/locale/lt/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/lt/cannedMgmt.json
index 990808dc4..14f84cd59 100644
--- a/app/javascript/dashboard/i18n/locale/lt/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/lt/cannedMgmt.json
@@ -27,7 +27,7 @@
         },
         "CONTENT": {
           "LABEL": "Žinutė",
-          "PLACEHOLDER": "Please write the message you want to save as a template to use later.",
+          "PLACEHOLDER": "Parašykite žinutę, kurią norėsite išsaugoti kaip šabloną vėlesniam naudojimui.",
           "ERROR": "Yra reikalingas pranešimas."
         },
         "SUBMIT": "Pateikti"
@@ -48,7 +48,7 @@
         },
         "CONTENT": {
           "LABEL": "Žinutė",
-          "PLACEHOLDER": "Please write the message you want to save as a template to use later.",
+          "PLACEHOLDER": "Parašykite žinutę, kurią norėsite išsaugoti kaip šabloną vėlesniam naudojimui.",
           "ERROR": "Yra reikalingas pranešimas."
         },
         "SUBMIT": "Pateikti"
diff --git a/app/javascript/dashboard/i18n/locale/lt/chatlist.json b/app/javascript/dashboard/i18n/locale/lt/chatlist.json
index fe8dad5cf..61884dfbf 100644
--- a/app/javascript/dashboard/i18n/locale/lt/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/lt/chatlist.json
@@ -53,28 +53,28 @@
     },
     "SORT_ORDER_ITEMS": {
       "last_activity_at_asc": {
-        "TEXT": "Last activity: Oldest first"
+        "TEXT": "Paskutinė veikla: nuo seniausio"
       },
       "last_activity_at_desc": {
-        "TEXT": "Last activity: Newest first"
+        "TEXT": "Paskutinė veikla: nuo naujausio"
       },
       "created_at_desc": {
-        "TEXT": "Created at: Newest first"
+        "TEXT": "Sukurta: nuo naujausio"
       },
       "created_at_asc": {
-        "TEXT": "Created at: Oldest first"
+        "TEXT": "Sukurta: nuo seniausio"
       },
       "priority_desc": {
-        "TEXT": "Priority: Highest first"
+        "TEXT": "Prioritetas: nuo aukščiausio"
       },
       "priority_asc": {
-        "TEXT": "Priority: Lowest first"
+        "TEXT": "Prioritetas: nuo žemiausio"
       },
       "waiting_since_asc": {
-        "TEXT": "Pending Response: Longest first"
+        "TEXT": "Laukia atsakymo: nuo ilgiausio"
       },
       "waiting_since_desc": {
-        "TEXT": "Pending Response: Shortest first"
+        "TEXT": "Laukia atsakymo: nuo trumpiausio"
       }
     },
     "ATTACHMENTS": {
diff --git a/app/javascript/dashboard/i18n/locale/lt/contact.json b/app/javascript/dashboard/i18n/locale/lt/contact.json
index 3bf32d57a..039f4b299 100644
--- a/app/javascript/dashboard/i18n/locale/lt/contact.json
+++ b/app/javascript/dashboard/i18n/locale/lt/contact.json
@@ -39,10 +39,10 @@
     },
     "MERGE_CONTACT": "Sujungti kontaktą",
     "CONTACT_ACTIONS": "Kontakto veiksmai",
-    "MUTE_CONTACT": "Block Contact",
-    "UNMUTE_CONTACT": "Unblock Contact",
-    "MUTED_SUCCESS": "This contact is blocked successfully. You will not be notified of any future conversations.",
-    "UNMUTED_SUCCESS": "This contact is unblocked successfully.",
+    "MUTE_CONTACT": "Užblokuoti kontaktą",
+    "UNMUTE_CONTACT": "Atblokuoti kontaktą",
+    "MUTED_SUCCESS": "Šis kontaktas sėkmingai užblokuotas. Jūs negausite pranešimų apie būsimus pokalbius.",
+    "UNMUTED_SUCCESS": "Šis kontaktas sėkmingai atblokuotas.",
     "SEND_TRANSCRIPT": "Siųsti stenogramą",
     "EDIT_LABEL": "Redaguoti",
     "SIDEBAR_SECTIONS": {
@@ -71,7 +71,7 @@
       "SUBMIT": "Importuoti",
       "CANCEL": "Atšaukti"
     },
-    "SUCCESS_MESSAGE": "You will be notified via email when the import is complete.",
+    "SUCCESS_MESSAGE": "Jūs gausite pranešimą el. paštu, kai importas bus užbaigtas.",
     "ERROR_MESSAGE": "Įvyko klaida, prašau pabandykite dar kartą"
   },
   "EXPORT_CONTACTS": {
@@ -82,9 +82,9 @@
     "ERROR_MESSAGE": "Įvyko klaida, prašau pabandykite dar kartą",
     "CONFIRM": {
       "TITLE": "Eksportuoti Kontaktus",
-      "MESSAGE": "Are you sure you want to export all contacts?",
-      "YES": "Yes, Export",
-      "NO": "No, Cancel"
+      "MESSAGE": "Ar esate tikri, kad norite išeksportuoti visus kontaktus?",
+      "YES": "Taip, išeksportuoti",
+      "NO": "Ne, atšaukti"
     }
   },
   "DELETE_NOTE": {
@@ -346,7 +346,7 @@
     "VALIDATIONS": {
       "REQUIRED": "Reikalinga tinkama vertė",
       "INVALID_URL": "Neteisingas URL",
-      "INVALID_INPUT": "Invalid Input"
+      "INVALID_INPUT": "Neteisinga įvestis"
     }
   },
   "MERGE_CONTACTS": {
diff --git a/app/javascript/dashboard/i18n/locale/lt/conversation.json b/app/javascript/dashboard/i18n/locale/lt/conversation.json
index bf8e86e04..303cd9f88 100644
--- a/app/javascript/dashboard/i18n/locale/lt/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/lt/conversation.json
@@ -41,9 +41,9 @@
     "SAVE_CONTACT": "Išsaugoti",
     "UPLOADING_ATTACHMENTS": "Įkeliami priedai...",
     "REPLIED_TO_STORY": "Atsakė į tavo pasakojimą",
-    "UNSUPPORTED_MESSAGE": "This message is unsupported.",
-    "UNSUPPORTED_MESSAGE_FACEBOOK": "This message is unsupported. You can view this message on the Facebook Messenger app.",
-    "UNSUPPORTED_MESSAGE_INSTAGRAM": "This message is unsupported. You can view this message on the Instagram app.",
+    "UNSUPPORTED_MESSAGE": "Ši žinutė nepalaikoma.",
+    "UNSUPPORTED_MESSAGE_FACEBOOK": "Ši žinutė nepalaikoma. Jūs galite peržiūrėti šią žinutę Facebook Messenger programėlėje.",
+    "UNSUPPORTED_MESSAGE_INSTAGRAM": "Ši žinutė nepalaikoma. Jūs galite peržiūrėti šią žinutę Instagram programėlėje.",
     "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",
@@ -143,7 +143,7 @@
       "SEND": "Siųsti",
       "CREATE": "Pridėti pastabą",
       "INSERT_READ_MORE": "Skaityti daugiau",
-      "DISMISS_REPLY": "Dismiss reply",
+      "DISMISS_REPLY": "Atšaukti atsakymą",
       "REPLYING_TO": "Atsakant į:",
       "TIP_FORMAT_ICON": "Rodyti raiškiojo teksto redagavimo priemonę",
       "TIP_EMOJI_ICON": "Parodyti emodžio parinkiklį",
diff --git a/app/javascript/dashboard/i18n/locale/lt/generalSettings.json b/app/javascript/dashboard/i18n/locale/lt/generalSettings.json
index ab0ada9bb..83eb9a333 100644
--- a/app/javascript/dashboard/i18n/locale/lt/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/lt/generalSettings.json
@@ -113,7 +113,7 @@
       "SETTINGS": "Nustatymai",
       "AI_ASSIST": "AI pagalba",
       "APPEARANCE": "Išvaizda",
-      "SNOOZE_NOTIFICATION": "Snooze Notification"
+      "SNOOZE_NOTIFICATION": "Atidėti pranešimą"
     },
     "COMMANDS": {
       "GO_TO_CONVERSATION_DASHBOARD": "Eikite į Pokalbio informacijos skydelį",
@@ -155,7 +155,7 @@
       "LIGHT_MODE": "Šviesus",
       "DARK_MODE": "Tamsus",
       "SYSTEM_MODE": "Sistema",
-      "SNOOZE_NOTIFICATION": "Snooze Notification"
+      "SNOOZE_NOTIFICATION": "Atidėti pranešimą"
     }
   },
   "DASHBOARD_APPS": {
diff --git a/app/javascript/dashboard/i18n/locale/lt/helpCenter.json b/app/javascript/dashboard/i18n/locale/lt/helpCenter.json
index 2f9b3a771..c8652cc4a 100644
--- a/app/javascript/dashboard/i18n/locale/lt/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/lt/helpCenter.json
@@ -319,7 +319,7 @@
       "HEADERS": {
         "TITLE": "Pavadinimas",
         "CATEGORY": "Kategorija",
-        "READ_COUNT": "Peržiūrų skaičius",
+        "READ_COUNT": "Views",
         "STATUS": "Būsena",
         "LAST_EDITED": "Paskutinį kartą redaguota"
       },
diff --git a/app/javascript/dashboard/i18n/locale/lt/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/lt/inboxMgmt.json
index 27c41cf39..2ea756b30 100644
--- a/app/javascript/dashboard/i18n/locale/lt/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/lt/inboxMgmt.json
@@ -569,7 +569,7 @@
       "UPDATE": "Atnaujinti darbo laiko nustatymus",
       "TOGGLE_AVAILABILITY": "Leisti verslo pasiekiamumą šiam gautų laiškų aplankui",
       "UNAVAILABLE_MESSAGE_LABEL": "Pranešimas lankytojams apie nepasiekiamumą",
-      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours visitors can be warned with a message and a pre-chat form.",
+      "TOGGLE_HELP": "Nustačius darbo laiką, bus rodomos darbo valandos chato valdiklyje, net jei visi agentai neprisijungę. Ne darbo valandomis lankytojai gali būti įspėti pranešimu ir išankstinio pokalbio forma.",
       "DAY": {
         "ENABLE": "Įgalinti pasiekiamumą šiai dienai",
         "UNAVAILABLE": "Nepasiekiamas",
diff --git a/app/javascript/dashboard/i18n/locale/lt/integrations.json b/app/javascript/dashboard/i18n/locale/lt/integrations.json
index 73ebf7dfa..c434674ba 100644
--- a/app/javascript/dashboard/i18n/locale/lt/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/lt/integrations.json
@@ -112,7 +112,7 @@
         "FIX_SPELLING_GRAMMAR": "Pataisykite rašybą ir gramatiką",
         "SHORTEN": "Sutrumpinti",
         "EXPAND": "Išskleisti",
-        "MAKE_FRIENDLY": "Change message tone to friendly",
+        "MAKE_FRIENDLY": "Pakeisti pranešimo toną į draugišką",
         "MAKE_FORMAL": "Naudokite oficialų toną",
         "SIMPLIFY": "Supaprastinti"
       },
@@ -121,12 +121,12 @@
         "GENERATED_TITLE": "Sugeneruotas turinys",
         "AI_WRITING": "AI rašo",
         "BUTTONS": {
-          "APPLY": "Use this suggestion",
+          "APPLY": "Naudoti šį pasiūlymą",
           "CANCEL": "Atšaukti"
         }
       },
       "CTA_MODAL": {
-        "TITLE": "Integrate with OpenAI",
+        "TITLE": "Integruoti su OpenAI",
         "DESC": "Bring advanced AI features to your dashboard with OpenAI's GPT models. To begin, enter the API key from your OpenAI account.",
         "KEY_PLACEHOLDER": "Įveskite savo OpenAI API raktą",
         "BUTTONS": {
diff --git a/app/javascript/dashboard/i18n/locale/lt/report.json b/app/javascript/dashboard/i18n/locale/lt/report.json
index 013a6612a..cf87c41fd 100644
--- a/app/javascript/dashboard/i18n/locale/lt/report.json
+++ b/app/javascript/dashboard/i18n/locale/lt/report.json
@@ -37,7 +37,7 @@
       },
       "REPLY_TIME": {
         "NAME": "Kliento laukimo laikas",
-        "TOOLTIP_TEXT": "Laukimo laikas yra %{metricValue} (remiantis %{conversationCount} pokalbių)"
+        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} replies)"
       }
     },
     "DATE_RANGE_OPTIONS": {
@@ -441,7 +441,8 @@
       "LOADING_MESSAGE": "Įkeliama pokalbio metrika...",
       "OPEN": "Atidaryti",
       "UNATTENDED": "Be priežiūros",
-      "UNASSIGNED": "Ne priskirtas"
+      "UNASSIGNED": "Ne priskirtas",
+      "PENDING": "Laukiama"
     },
     "CONVERSATION_HEATMAP": {
       "HEADER": "Pokalbių srautas",
diff --git a/app/javascript/dashboard/i18n/locale/lt/sla.json b/app/javascript/dashboard/i18n/locale/lt/sla.json
index 10489e707..a7b5313f3 100644
--- a/app/javascript/dashboard/i18n/locale/lt/sla.json
+++ b/app/javascript/dashboard/i18n/locale/lt/sla.json
@@ -31,21 +31,24 @@
         "PLACEHOLDER": "SLA for premium customers"
       },
       "FIRST_RESPONSE_TIME": {
-        "LABEL": "First Response Time(Seconds)",
-        "PLACEHOLDER": "300 for 5 minutes"
+        "LABEL": "Pirmojo atsakymo laikas",
+        "PLACEHOLDER": "5"
       },
       "NEXT_RESPONSE_TIME": {
-        "LABEL": "Next Response Time(Seconds)",
-        "PLACEHOLDER": "600 for 10 minutes"
+        "LABEL": "Next Response Time",
+        "PLACEHOLDER": "5"
       },
       "RESOLUTION_TIME": {
-        "LABEL": "Resolution Time(Seconds)",
-        "PLACEHOLDER": "86400 for 1 day"
+        "LABEL": "Sprendimo laikas",
+        "PLACEHOLDER": "60"
       },
       "BUSINESS_HOURS": {
         "LABEL": "Darbo valandos",
         "PLACEHOLDER": "Only during business hours"
       },
+      "THRESHOLD_TIME": {
+        "INVALID_FORMAT_ERROR": "Threshold should be a number and greater than zero"
+      },
       "EDIT": "Redaguoti",
       "CREATE": "Sukurti",
       "DELETE": "Ištrinti",
diff --git a/app/javascript/dashboard/i18n/locale/lv/contact.json b/app/javascript/dashboard/i18n/locale/lv/contact.json
index ee98ceabb..583e5aa2a 100644
--- a/app/javascript/dashboard/i18n/locale/lv/contact.json
+++ b/app/javascript/dashboard/i18n/locale/lv/contact.json
@@ -39,10 +39,10 @@
     },
     "MERGE_CONTACT": "Apvienot kontaktu",
     "CONTACT_ACTIONS": "Kontaktpersonu darbības",
-    "MUTE_CONTACT": "Block Contact",
-    "UNMUTE_CONTACT": "Unblock Contact",
-    "MUTED_SUCCESS": "This contact is blocked successfully. You will not be notified of any future conversations.",
-    "UNMUTED_SUCCESS": "This contact is unblocked successfully.",
+    "MUTE_CONTACT": "Bloķēt Kontaktpersonu",
+    "UNMUTE_CONTACT": "Atbloķēt Kontaktpersonu",
+    "MUTED_SUCCESS": "Šī kontaktpersona ir veiksmīgi bloķēta. Jūs nesaņemsit paziņojumus par turpmākajām sarunām.",
+    "UNMUTED_SUCCESS": "Šī kontaktpersona ir veiksmīgi atbloķēta.",
     "SEND_TRANSCRIPT": "Nosūtīt Transkriptu",
     "EDIT_LABEL": "Rediģēt",
     "SIDEBAR_SECTIONS": {
diff --git a/app/javascript/dashboard/i18n/locale/lv/helpCenter.json b/app/javascript/dashboard/i18n/locale/lv/helpCenter.json
index 0fc39606f..081354415 100644
--- a/app/javascript/dashboard/i18n/locale/lv/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/lv/helpCenter.json
@@ -319,7 +319,7 @@
       "HEADERS": {
         "TITLE": "Nosaukums",
         "CATEGORY": "Kategorija",
-        "READ_COUNT": "Lasīšanas skaits",
+        "READ_COUNT": "Skatījumu skaits",
         "STATUS": "Statuss",
         "LAST_EDITED": "Pēdējo reizi rediģēts"
       },
diff --git a/app/javascript/dashboard/i18n/locale/lv/report.json b/app/javascript/dashboard/i18n/locale/lv/report.json
index 72f3ff548..6fd89a411 100644
--- a/app/javascript/dashboard/i18n/locale/lv/report.json
+++ b/app/javascript/dashboard/i18n/locale/lv/report.json
@@ -37,7 +37,7 @@
       },
       "REPLY_TIME": {
         "NAME": "Klienta gaidīšanas laiks",
-        "TOOLTIP_TEXT": "Gaidīšanas laiks ir %{metricValue} (pamatojoties uz %{conversationCount} sarunām)"
+        "TOOLTIP_TEXT": "Gaidīšanas laiks ir %{metricValue} (pamatojoties uz %{conversationCount} atbildēm)"
       }
     },
     "DATE_RANGE_OPTIONS": {
@@ -441,7 +441,8 @@
       "LOADING_MESSAGE": "Notiek sarunu metrikas ielāde...",
       "OPEN": "Atvērt",
       "UNATTENDED": "Bez uzraudzības",
-      "UNASSIGNED": "Nav piešķirtas"
+      "UNASSIGNED": "Nav piešķirtas",
+      "PENDING": "Gaida"
     },
     "CONVERSATION_HEATMAP": {
       "HEADER": "Sarunu Satiksme",
diff --git a/app/javascript/dashboard/i18n/locale/lv/sla.json b/app/javascript/dashboard/i18n/locale/lv/sla.json
index 15419ad9c..24e332661 100644
--- a/app/javascript/dashboard/i18n/locale/lv/sla.json
+++ b/app/javascript/dashboard/i18n/locale/lv/sla.json
@@ -31,21 +31,24 @@
         "PLACEHOLDER": "SLA priekš premium klientiem"
       },
       "FIRST_RESPONSE_TIME": {
-        "LABEL": "Pirmās Atbildes Laiks (Sekundes)",
-        "PLACEHOLDER": "300, priekš 5 minūtēm"
+        "LABEL": "Pirmās Atbildes Laiks",
+        "PLACEHOLDER": "5"
       },
       "NEXT_RESPONSE_TIME": {
-        "LABEL": "Nākamās Atbildes Laiks (Sekundes)",
-        "PLACEHOLDER": "600, priekš 10 minūtēm"
+        "LABEL": "Nākamās Atbildes Laiks",
+        "PLACEHOLDER": "5"
       },
       "RESOLUTION_TIME": {
-        "LABEL": "Atrisināšanas Laiks (Sekundes)",
-        "PLACEHOLDER": "86400, priekš 1 dienas"
+        "LABEL": "Atrisināšanas Laiks",
+        "PLACEHOLDER": "60"
       },
       "BUSINESS_HOURS": {
         "LABEL": "Darba Laiks",
         "PLACEHOLDER": "Tikai darba laikā"
       },
+      "THRESHOLD_TIME": {
+        "INVALID_FORMAT_ERROR": "Slieksnim ir jābūt skaitlim un lielākam par nulli"
+      },
       "EDIT": "Rediģēt",
       "CREATE": "Izveidot",
       "DELETE": "Dzēst",
diff --git a/app/javascript/dashboard/i18n/locale/ml/helpCenter.json b/app/javascript/dashboard/i18n/locale/ml/helpCenter.json
index 14d77aaec..68e4794c5 100644
--- a/app/javascript/dashboard/i18n/locale/ml/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ml/helpCenter.json
@@ -319,7 +319,7 @@
       "HEADERS": {
         "TITLE": "തലക്കെട്ട്",
         "CATEGORY": "Category",
-        "READ_COUNT": "Read count",
+        "READ_COUNT": "Views",
         "STATUS": "സ്റ്റാറ്റസ്",
         "LAST_EDITED": "Last edited"
       },
diff --git a/app/javascript/dashboard/i18n/locale/ml/report.json b/app/javascript/dashboard/i18n/locale/ml/report.json
index 074ac0321..0abfb4b34 100644
--- a/app/javascript/dashboard/i18n/locale/ml/report.json
+++ b/app/javascript/dashboard/i18n/locale/ml/report.json
@@ -37,7 +37,7 @@
       },
       "REPLY_TIME": {
         "NAME": "Customer waiting time",
-        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} conversations)"
+        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} replies)"
       }
     },
     "DATE_RANGE_OPTIONS": {
@@ -441,7 +441,8 @@
       "LOADING_MESSAGE": "Loading conversation metrics...",
       "OPEN": "സജീവം",
       "UNATTENDED": "Unattended",
-      "UNASSIGNED": "നിയുക്തമാക്കാത്തത്"
+      "UNASSIGNED": "നിയുക്തമാക്കാത്തത്",
+      "PENDING": "കെട്ടിക്കിടക്കുന്നു"
     },
     "CONVERSATION_HEATMAP": {
       "HEADER": "Conversation Traffic",
diff --git a/app/javascript/dashboard/i18n/locale/ml/sla.json b/app/javascript/dashboard/i18n/locale/ml/sla.json
index d40278f7a..927c6cd3e 100644
--- a/app/javascript/dashboard/i18n/locale/ml/sla.json
+++ b/app/javascript/dashboard/i18n/locale/ml/sla.json
@@ -31,21 +31,24 @@
         "PLACEHOLDER": "SLA for premium customers"
       },
       "FIRST_RESPONSE_TIME": {
-        "LABEL": "First Response Time(Seconds)",
-        "PLACEHOLDER": "300 for 5 minutes"
+        "LABEL": "First Response Time",
+        "PLACEHOLDER": "5"
       },
       "NEXT_RESPONSE_TIME": {
-        "LABEL": "Next Response Time(Seconds)",
-        "PLACEHOLDER": "600 for 10 minutes"
+        "LABEL": "Next Response Time",
+        "PLACEHOLDER": "5"
       },
       "RESOLUTION_TIME": {
-        "LABEL": "Resolution Time(Seconds)",
-        "PLACEHOLDER": "86400 for 1 day"
+        "LABEL": "മിഴിവ് സമയം",
+        "PLACEHOLDER": "60"
       },
       "BUSINESS_HOURS": {
         "LABEL": "Business Hours",
         "PLACEHOLDER": "Only during business hours"
       },
+      "THRESHOLD_TIME": {
+        "INVALID_FORMAT_ERROR": "Threshold should be a number and greater than zero"
+      },
       "EDIT": "എഡിറ്റുചെയ്യുക",
       "CREATE": "സൃഷ്ടിക്കുക",
       "DELETE": "ഇല്ലാതാക്കുക",
diff --git a/app/javascript/dashboard/i18n/locale/ms/helpCenter.json b/app/javascript/dashboard/i18n/locale/ms/helpCenter.json
index 66c142481..3b7dc5276 100644
--- a/app/javascript/dashboard/i18n/locale/ms/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ms/helpCenter.json
@@ -319,7 +319,7 @@
       "HEADERS": {
         "TITLE": "Title",
         "CATEGORY": "Category",
-        "READ_COUNT": "Read count",
+        "READ_COUNT": "Views",
         "STATUS": "Status",
         "LAST_EDITED": "Last edited"
       },
diff --git a/app/javascript/dashboard/i18n/locale/ms/report.json b/app/javascript/dashboard/i18n/locale/ms/report.json
index 36e57f350..38a1e7df5 100644
--- a/app/javascript/dashboard/i18n/locale/ms/report.json
+++ b/app/javascript/dashboard/i18n/locale/ms/report.json
@@ -37,7 +37,7 @@
       },
       "REPLY_TIME": {
         "NAME": "Customer waiting time",
-        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} conversations)"
+        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} replies)"
       }
     },
     "DATE_RANGE_OPTIONS": {
@@ -441,7 +441,8 @@
       "LOADING_MESSAGE": "Loading conversation metrics...",
       "OPEN": "Open",
       "UNATTENDED": "Unattended",
-      "UNASSIGNED": "Unassigned"
+      "UNASSIGNED": "Unassigned",
+      "PENDING": "Pending"
     },
     "CONVERSATION_HEATMAP": {
       "HEADER": "Conversation Traffic",
diff --git a/app/javascript/dashboard/i18n/locale/ms/sla.json b/app/javascript/dashboard/i18n/locale/ms/sla.json
index 992813cb8..6f4ef3905 100644
--- a/app/javascript/dashboard/i18n/locale/ms/sla.json
+++ b/app/javascript/dashboard/i18n/locale/ms/sla.json
@@ -31,21 +31,24 @@
         "PLACEHOLDER": "SLA for premium customers"
       },
       "FIRST_RESPONSE_TIME": {
-        "LABEL": "First Response Time(Seconds)",
-        "PLACEHOLDER": "300 for 5 minutes"
+        "LABEL": "First Response Time",
+        "PLACEHOLDER": "5"
       },
       "NEXT_RESPONSE_TIME": {
-        "LABEL": "Next Response Time(Seconds)",
-        "PLACEHOLDER": "600 for 10 minutes"
+        "LABEL": "Next Response Time",
+        "PLACEHOLDER": "5"
       },
       "RESOLUTION_TIME": {
-        "LABEL": "Resolution Time(Seconds)",
-        "PLACEHOLDER": "86400 for 1 day"
+        "LABEL": "Resolution Time",
+        "PLACEHOLDER": "60"
       },
       "BUSINESS_HOURS": {
         "LABEL": "Business Hours",
         "PLACEHOLDER": "Only during business hours"
       },
+      "THRESHOLD_TIME": {
+        "INVALID_FORMAT_ERROR": "Threshold should be a number and greater than zero"
+      },
       "EDIT": "Edit",
       "CREATE": "Create",
       "DELETE": "Padamkan",
diff --git a/app/javascript/dashboard/i18n/locale/ne/helpCenter.json b/app/javascript/dashboard/i18n/locale/ne/helpCenter.json
index 8ee4fa8b1..a417ea309 100644
--- a/app/javascript/dashboard/i18n/locale/ne/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ne/helpCenter.json
@@ -319,7 +319,7 @@
       "HEADERS": {
         "TITLE": "Title",
         "CATEGORY": "Category",
-        "READ_COUNT": "Read count",
+        "READ_COUNT": "Views",
         "STATUS": "Status",
         "LAST_EDITED": "Last edited"
       },
diff --git a/app/javascript/dashboard/i18n/locale/ne/report.json b/app/javascript/dashboard/i18n/locale/ne/report.json
index 87c070fd1..6ff84c5f5 100644
--- a/app/javascript/dashboard/i18n/locale/ne/report.json
+++ b/app/javascript/dashboard/i18n/locale/ne/report.json
@@ -37,7 +37,7 @@
       },
       "REPLY_TIME": {
         "NAME": "Customer waiting time",
-        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} conversations)"
+        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} replies)"
       }
     },
     "DATE_RANGE_OPTIONS": {
@@ -441,7 +441,8 @@
       "LOADING_MESSAGE": "Loading conversation metrics...",
       "OPEN": "Open",
       "UNATTENDED": "Unattended",
-      "UNASSIGNED": "Unassigned"
+      "UNASSIGNED": "Unassigned",
+      "PENDING": "Pending"
     },
     "CONVERSATION_HEATMAP": {
       "HEADER": "Conversation Traffic",
diff --git a/app/javascript/dashboard/i18n/locale/ne/sla.json b/app/javascript/dashboard/i18n/locale/ne/sla.json
index 869b3ba3f..806746b75 100644
--- a/app/javascript/dashboard/i18n/locale/ne/sla.json
+++ b/app/javascript/dashboard/i18n/locale/ne/sla.json
@@ -31,21 +31,24 @@
         "PLACEHOLDER": "SLA for premium customers"
       },
       "FIRST_RESPONSE_TIME": {
-        "LABEL": "First Response Time(Seconds)",
-        "PLACEHOLDER": "300 for 5 minutes"
+        "LABEL": "First Response Time",
+        "PLACEHOLDER": "5"
       },
       "NEXT_RESPONSE_TIME": {
-        "LABEL": "Next Response Time(Seconds)",
-        "PLACEHOLDER": "600 for 10 minutes"
+        "LABEL": "Next Response Time",
+        "PLACEHOLDER": "5"
       },
       "RESOLUTION_TIME": {
-        "LABEL": "Resolution Time(Seconds)",
-        "PLACEHOLDER": "86400 for 1 day"
+        "LABEL": "Resolution Time",
+        "PLACEHOLDER": "60"
       },
       "BUSINESS_HOURS": {
         "LABEL": "Business Hours",
         "PLACEHOLDER": "Only during business hours"
       },
+      "THRESHOLD_TIME": {
+        "INVALID_FORMAT_ERROR": "Threshold should be a number and greater than zero"
+      },
       "EDIT": "Edit",
       "CREATE": "Create",
       "DELETE": "Delete",
diff --git a/app/javascript/dashboard/i18n/locale/nl/helpCenter.json b/app/javascript/dashboard/i18n/locale/nl/helpCenter.json
index 9b8d2e51e..5aa0123fe 100644
--- a/app/javascript/dashboard/i18n/locale/nl/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/nl/helpCenter.json
@@ -319,7 +319,7 @@
       "HEADERS": {
         "TITLE": "Titel",
         "CATEGORY": "Categorie",
-        "READ_COUNT": "Read count",
+        "READ_COUNT": "Views",
         "STATUS": "Status",
         "LAST_EDITED": "Last edited"
       },
diff --git a/app/javascript/dashboard/i18n/locale/nl/report.json b/app/javascript/dashboard/i18n/locale/nl/report.json
index ac3e279f7..2e5f4d9d4 100644
--- a/app/javascript/dashboard/i18n/locale/nl/report.json
+++ b/app/javascript/dashboard/i18n/locale/nl/report.json
@@ -37,7 +37,7 @@
       },
       "REPLY_TIME": {
         "NAME": "Customer waiting time",
-        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} conversations)"
+        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} replies)"
       }
     },
     "DATE_RANGE_OPTIONS": {
@@ -441,7 +441,8 @@
       "LOADING_MESSAGE": "Loading conversation metrics...",
       "OPEN": "Open",
       "UNATTENDED": "Unattended",
-      "UNASSIGNED": "Niet toegewezen"
+      "UNASSIGNED": "Niet toegewezen",
+      "PENDING": "Afwachtend"
     },
     "CONVERSATION_HEATMAP": {
       "HEADER": "Conversation Traffic",
diff --git a/app/javascript/dashboard/i18n/locale/nl/sla.json b/app/javascript/dashboard/i18n/locale/nl/sla.json
index c1201f037..b7d7d36e8 100644
--- a/app/javascript/dashboard/i18n/locale/nl/sla.json
+++ b/app/javascript/dashboard/i18n/locale/nl/sla.json
@@ -31,21 +31,24 @@
         "PLACEHOLDER": "SLA for premium customers"
       },
       "FIRST_RESPONSE_TIME": {
-        "LABEL": "First Response Time(Seconds)",
-        "PLACEHOLDER": "300 for 5 minutes"
+        "LABEL": "Eerste reactietijd",
+        "PLACEHOLDER": "5"
       },
       "NEXT_RESPONSE_TIME": {
-        "LABEL": "Next Response Time(Seconds)",
-        "PLACEHOLDER": "600 for 10 minutes"
+        "LABEL": "Next Response Time",
+        "PLACEHOLDER": "5"
       },
       "RESOLUTION_TIME": {
-        "LABEL": "Resolution Time(Seconds)",
-        "PLACEHOLDER": "86400 for 1 day"
+        "LABEL": "Resolutie Tijd",
+        "PLACEHOLDER": "60"
       },
       "BUSINESS_HOURS": {
         "LABEL": "Business Hours",
         "PLACEHOLDER": "Only during business hours"
       },
+      "THRESHOLD_TIME": {
+        "INVALID_FORMAT_ERROR": "Threshold should be a number and greater than zero"
+      },
       "EDIT": "Bewerken",
       "CREATE": "Aanmaken",
       "DELETE": "Verwijderen",
diff --git a/app/javascript/dashboard/i18n/locale/no/helpCenter.json b/app/javascript/dashboard/i18n/locale/no/helpCenter.json
index ba9f561a8..ae40223f0 100644
--- a/app/javascript/dashboard/i18n/locale/no/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/no/helpCenter.json
@@ -319,7 +319,7 @@
       "HEADERS": {
         "TITLE": "Title",
         "CATEGORY": "Category",
-        "READ_COUNT": "Read count",
+        "READ_COUNT": "Views",
         "STATUS": "Satus",
         "LAST_EDITED": "Last edited"
       },
diff --git a/app/javascript/dashboard/i18n/locale/no/report.json b/app/javascript/dashboard/i18n/locale/no/report.json
index 13957b283..9f45e26f1 100644
--- a/app/javascript/dashboard/i18n/locale/no/report.json
+++ b/app/javascript/dashboard/i18n/locale/no/report.json
@@ -37,7 +37,7 @@
       },
       "REPLY_TIME": {
         "NAME": "Customer waiting time",
-        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} conversations)"
+        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} replies)"
       }
     },
     "DATE_RANGE_OPTIONS": {
@@ -441,7 +441,8 @@
       "LOADING_MESSAGE": "Loading conversation metrics...",
       "OPEN": "Åpne",
       "UNATTENDED": "Unattended",
-      "UNASSIGNED": "Ikke tildelt"
+      "UNASSIGNED": "Ikke tildelt",
+      "PENDING": "Pending"
     },
     "CONVERSATION_HEATMAP": {
       "HEADER": "Conversation Traffic",
diff --git a/app/javascript/dashboard/i18n/locale/no/sla.json b/app/javascript/dashboard/i18n/locale/no/sla.json
index 170bf1a94..506b3e5ac 100644
--- a/app/javascript/dashboard/i18n/locale/no/sla.json
+++ b/app/javascript/dashboard/i18n/locale/no/sla.json
@@ -31,21 +31,24 @@
         "PLACEHOLDER": "SLA for premium customers"
       },
       "FIRST_RESPONSE_TIME": {
-        "LABEL": "First Response Time(Seconds)",
-        "PLACEHOLDER": "300 for 5 minutes"
+        "LABEL": "First Response Time",
+        "PLACEHOLDER": "5"
       },
       "NEXT_RESPONSE_TIME": {
-        "LABEL": "Next Response Time(Seconds)",
-        "PLACEHOLDER": "600 for 10 minutes"
+        "LABEL": "Next Response Time",
+        "PLACEHOLDER": "5"
       },
       "RESOLUTION_TIME": {
-        "LABEL": "Resolution Time(Seconds)",
-        "PLACEHOLDER": "86400 for 1 day"
+        "LABEL": "Løsningstid",
+        "PLACEHOLDER": "60"
       },
       "BUSINESS_HOURS": {
         "LABEL": "Business Hours",
         "PLACEHOLDER": "Only during business hours"
       },
+      "THRESHOLD_TIME": {
+        "INVALID_FORMAT_ERROR": "Threshold should be a number and greater than zero"
+      },
       "EDIT": "Rediger",
       "CREATE": "Opprett",
       "DELETE": "Slett",
diff --git a/app/javascript/dashboard/i18n/locale/pl/helpCenter.json b/app/javascript/dashboard/i18n/locale/pl/helpCenter.json
index ba00f8a82..9353d1da8 100644
--- a/app/javascript/dashboard/i18n/locale/pl/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/pl/helpCenter.json
@@ -319,7 +319,7 @@
       "HEADERS": {
         "TITLE": "Tytuł",
         "CATEGORY": "Kategoria",
-        "READ_COUNT": "Liczba odsłon",
+        "READ_COUNT": "Views",
         "STATUS": "Status",
         "LAST_EDITED": "Ostatnio edytowane"
       },
diff --git a/app/javascript/dashboard/i18n/locale/pl/report.json b/app/javascript/dashboard/i18n/locale/pl/report.json
index 5f6fded8b..9727192bc 100644
--- a/app/javascript/dashboard/i18n/locale/pl/report.json
+++ b/app/javascript/dashboard/i18n/locale/pl/report.json
@@ -37,7 +37,7 @@
       },
       "REPLY_TIME": {
         "NAME": "Customer waiting time",
-        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} conversations)"
+        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} replies)"
       }
     },
     "DATE_RANGE_OPTIONS": {
@@ -441,7 +441,8 @@
       "LOADING_MESSAGE": "Ładowanie metryk rozmów...",
       "OPEN": "Otwarte",
       "UNATTENDED": "Nieobsługiwane",
-      "UNASSIGNED": "Nieprzypisane"
+      "UNASSIGNED": "Nieprzypisane",
+      "PENDING": "Oczekujące"
     },
     "CONVERSATION_HEATMAP": {
       "HEADER": "Ruch rozmów",
diff --git a/app/javascript/dashboard/i18n/locale/pl/sla.json b/app/javascript/dashboard/i18n/locale/pl/sla.json
index 3a60942c3..9379c3623 100644
--- a/app/javascript/dashboard/i18n/locale/pl/sla.json
+++ b/app/javascript/dashboard/i18n/locale/pl/sla.json
@@ -31,21 +31,24 @@
         "PLACEHOLDER": "SLA for premium customers"
       },
       "FIRST_RESPONSE_TIME": {
-        "LABEL": "First Response Time(Seconds)",
-        "PLACEHOLDER": "300 for 5 minutes"
+        "LABEL": "Czas pierwszej odpowiedzi",
+        "PLACEHOLDER": "5"
       },
       "NEXT_RESPONSE_TIME": {
-        "LABEL": "Next Response Time(Seconds)",
-        "PLACEHOLDER": "600 for 10 minutes"
+        "LABEL": "Next Response Time",
+        "PLACEHOLDER": "5"
       },
       "RESOLUTION_TIME": {
-        "LABEL": "Resolution Time(Seconds)",
-        "PLACEHOLDER": "86400 for 1 day"
+        "LABEL": "Czas rozwiązania",
+        "PLACEHOLDER": "60"
       },
       "BUSINESS_HOURS": {
         "LABEL": "Godziny pracy",
         "PLACEHOLDER": "Only during business hours"
       },
+      "THRESHOLD_TIME": {
+        "INVALID_FORMAT_ERROR": "Threshold should be a number and greater than zero"
+      },
       "EDIT": "Edytuj",
       "CREATE": "Stwórz",
       "DELETE": "Usuń",
diff --git a/app/javascript/dashboard/i18n/locale/pt/contact.json b/app/javascript/dashboard/i18n/locale/pt/contact.json
index 069531521..3a6edbb8a 100644
--- a/app/javascript/dashboard/i18n/locale/pt/contact.json
+++ b/app/javascript/dashboard/i18n/locale/pt/contact.json
@@ -39,10 +39,10 @@
     },
     "MERGE_CONTACT": "Unir contacto",
     "CONTACT_ACTIONS": "Ações de contacto",
-    "MUTE_CONTACT": "Block Contact",
-    "UNMUTE_CONTACT": "Unblock Contact",
-    "MUTED_SUCCESS": "This contact is blocked successfully. You will not be notified of any future conversations.",
-    "UNMUTED_SUCCESS": "This contact is unblocked successfully.",
+    "MUTE_CONTACT": "Bloquear Contato",
+    "UNMUTE_CONTACT": "Desbloquear contato",
+    "MUTED_SUCCESS": "Este contato está bloqueado. Não será notificado de nenhuma conversa futura.",
+    "UNMUTED_SUCCESS": "Este contato foi desbloqueado.",
     "SEND_TRANSCRIPT": "Enviar Transcrição",
     "EDIT_LABEL": "Alterar",
     "SIDEBAR_SECTIONS": {
diff --git a/app/javascript/dashboard/i18n/locale/pt/helpCenter.json b/app/javascript/dashboard/i18n/locale/pt/helpCenter.json
index 83889ed8b..381e2f2ce 100644
--- a/app/javascript/dashboard/i18n/locale/pt/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/pt/helpCenter.json
@@ -319,7 +319,7 @@
       "HEADERS": {
         "TITLE": "Nome",
         "CATEGORY": "Categoria",
-        "READ_COUNT": "Contagem de leituras",
+        "READ_COUNT": "Views",
         "STATUS": "SItuação",
         "LAST_EDITED": "Última edição"
       },
diff --git a/app/javascript/dashboard/i18n/locale/pt/report.json b/app/javascript/dashboard/i18n/locale/pt/report.json
index 9480d14e6..a7da66763 100644
--- a/app/javascript/dashboard/i18n/locale/pt/report.json
+++ b/app/javascript/dashboard/i18n/locale/pt/report.json
@@ -441,7 +441,8 @@
       "LOADING_MESSAGE": "A importar métricas de conversa...",
       "OPEN": "Abertas",
       "UNATTENDED": "Por tratar",
-      "UNASSIGNED": "Não atribuído"
+      "UNASSIGNED": "Não atribuído",
+      "PENDING": "Pendente"
     },
     "CONVERSATION_HEATMAP": {
       "HEADER": "Tráfego de conversa",
diff --git a/app/javascript/dashboard/i18n/locale/pt/sla.json b/app/javascript/dashboard/i18n/locale/pt/sla.json
index 08ce6b54e..54cf6fe4b 100644
--- a/app/javascript/dashboard/i18n/locale/pt/sla.json
+++ b/app/javascript/dashboard/i18n/locale/pt/sla.json
@@ -1,14 +1,14 @@
 {
   "SLA": {
     "HEADER": "SLA",
-    "HEADER_BTN_TXT": "Add SLA",
-    "LOADING": "Fetching SLAs",
+    "HEADER_BTN_TXT": "Adicionar SLA",
+    "LOADING": "A carregar SLAs",
     "SEARCH_404": "Não existem itens correspondentes a esta consulta",
-    "SIDEBAR_TXT": "<p><b>SLA</b> <p>Think of Service Level Agreements (SLAs) like friendly promises between a service provider and a customer.</p> <p> These promises set clear expectations for things like how quickly the team will respond to issues, making sure you always get a reliable and top-notch experience!</p>",
+    "SIDEBAR_TXT": "<p><b>SLA</b> <p>Pense nos Service Level Agreements (SLA) como acordos entre um fornecedor de serviço e um cliente.</p> <p> Estes acordos definem expectativas claras para parâmetros como a rapidez com que a equipa responderá a pedidos de suporte, garantindo os níveis de qualidade de serviço esperados!</p>",
     "LIST": {
-      "404": "There are no SLAs available in this account.",
-      "TITLE": "Manage SLA",
-      "DESC": "SLAs: Friendly promises for great service!",
+      "404": "Não há SLAs disponíveis nesta conta.",
+      "TITLE": "Gerir SLA",
+      "DESC": "SLAS: Acordos para um ótimo serviço!",
       "TABLE_HEADER": [
         "Nome:",
         "Descrição",
@@ -20,31 +20,34 @@
     },
     "FORM": {
       "NAME": {
-        "LABEL": "SLA Name",
-        "PLACEHOLDER": "SLA Name",
-        "REQUIRED_ERROR": "SLA name is required",
+        "LABEL": "Nome SLA",
+        "PLACEHOLDER": "Nome SLA",
+        "REQUIRED_ERROR": "Necessário nome de SLA",
         "MINIMUM_LENGTH_ERROR": "O tamanho mínimo obrigatório é 2",
         "VALID_ERROR": "Apenas são permitidos Alfabetos, Números, Hífen e Underscores"
       },
       "DESCRIPTION": {
         "LABEL": "Descrição",
-        "PLACEHOLDER": "SLA for premium customers"
+        "PLACEHOLDER": "SLA para clientes premium"
       },
       "FIRST_RESPONSE_TIME": {
-        "LABEL": "First Response Time(Seconds)",
-        "PLACEHOLDER": "300 for 5 minutes"
+        "LABEL": "Primeiro tempo de resposta",
+        "PLACEHOLDER": "5"
       },
       "NEXT_RESPONSE_TIME": {
-        "LABEL": "Next Response Time(Seconds)",
-        "PLACEHOLDER": "600 for 10 minutes"
+        "LABEL": "Próximo tempo de resposta",
+        "PLACEHOLDER": "5"
       },
       "RESOLUTION_TIME": {
-        "LABEL": "Resolution Time(Seconds)",
-        "PLACEHOLDER": "86400 for 1 day"
+        "LABEL": "Tempo de resolução",
+        "PLACEHOLDER": "60"
       },
       "BUSINESS_HOURS": {
         "LABEL": "Horário comercial",
-        "PLACEHOLDER": "Only during business hours"
+        "PLACEHOLDER": "Apenas durante o horário de trabalho"
+      },
+      "THRESHOLD_TIME": {
+        "INVALID_FORMAT_ERROR": "Limite deve ser um número e maior que zero"
       },
       "EDIT": "Alterar",
       "CREATE": "Criar",
@@ -52,17 +55,17 @@
       "CANCEL": "cancelar"
     },
     "ADD": {
-      "TITLE": "Add SLA",
-      "DESC": "SLAs: Friendly promises for great service!",
+      "TITLE": "Adicionar SLA",
+      "DESC": "SLAS: Acordos para um ótimo serviço!",
       "API": {
-        "SUCCESS_MESSAGE": "SLA added successfully",
+        "SUCCESS_MESSAGE": "SLA adicionado",
         "ERROR_MESSAGE": "Ocorreu um erro, por favor tente novamente"
       }
     },
     "EDIT": {
-      "TITLE": "Edit SLA",
+      "TITLE": "Editar SLA",
       "API": {
-        "SUCCESS_MESSAGE": "SLA updated successfully",
+        "SUCCESS_MESSAGE": "SLA atualizado",
         "ERROR_MESSAGE": "Ocorreu um erro, por favor tente novamente"
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/helpCenter.json b/app/javascript/dashboard/i18n/locale/pt_BR/helpCenter.json
index 7440f99a4..7bcd76fd5 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/helpCenter.json
@@ -319,7 +319,7 @@
       "HEADERS": {
         "TITLE": "Título",
         "CATEGORY": "Categoria",
-        "READ_COUNT": "Contagem de leituras",
+        "READ_COUNT": "Views",
         "STATUS": "SItuação",
         "LAST_EDITED": "Última edição"
       },
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/report.json b/app/javascript/dashboard/i18n/locale/pt_BR/report.json
index 1e97a61e6..35d9fca00 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/report.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/report.json
@@ -37,7 +37,7 @@
       },
       "REPLY_TIME": {
         "NAME": "Tempo de espera do cliente",
-        "TOOLTIP_TEXT": "O tempo de resposta é de %{metricValue} (baseado em %{conversationCount} conversas)"
+        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} replies)"
       }
     },
     "DATE_RANGE_OPTIONS": {
@@ -441,7 +441,8 @@
       "LOADING_MESSAGE": "Carregando métricas de conversa...",
       "OPEN": "Abertas",
       "UNATTENDED": "Não atendidas",
-      "UNASSIGNED": "Não atribuída"
+      "UNASSIGNED": "Não atribuída",
+      "PENDING": "Pendente"
     },
     "CONVERSATION_HEATMAP": {
       "HEADER": "Tráfego de conversa",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/sla.json b/app/javascript/dashboard/i18n/locale/pt_BR/sla.json
index 1f0299ced..41d5a5d8f 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/sla.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/sla.json
@@ -31,21 +31,24 @@
         "PLACEHOLDER": "SLA for premium customers"
       },
       "FIRST_RESPONSE_TIME": {
-        "LABEL": "First Response Time(Seconds)",
-        "PLACEHOLDER": "300 for 5 minutes"
+        "LABEL": "Tempo da Primeira Resposta",
+        "PLACEHOLDER": "5"
       },
       "NEXT_RESPONSE_TIME": {
-        "LABEL": "Next Response Time(Seconds)",
-        "PLACEHOLDER": "600 for 10 minutes"
+        "LABEL": "Next Response Time",
+        "PLACEHOLDER": "5"
       },
       "RESOLUTION_TIME": {
-        "LABEL": "Resolution Time(Seconds)",
-        "PLACEHOLDER": "86400 for 1 day"
+        "LABEL": "Tempo de resolução",
+        "PLACEHOLDER": "60"
       },
       "BUSINESS_HOURS": {
         "LABEL": "Horário de funcionamento",
         "PLACEHOLDER": "Only during business hours"
       },
+      "THRESHOLD_TIME": {
+        "INVALID_FORMAT_ERROR": "Threshold should be a number and greater than zero"
+      },
       "EDIT": "Alterar",
       "CREATE": "Criar",
       "DELETE": "Excluir",
diff --git a/app/javascript/dashboard/i18n/locale/ro/helpCenter.json b/app/javascript/dashboard/i18n/locale/ro/helpCenter.json
index 4b15ae822..5395606fe 100644
--- a/app/javascript/dashboard/i18n/locale/ro/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ro/helpCenter.json
@@ -319,7 +319,7 @@
       "HEADERS": {
         "TITLE": "Titlu",
         "CATEGORY": "Categorie",
-        "READ_COUNT": "Contor citire",
+        "READ_COUNT": "Views",
         "STATUS": "Status",
         "LAST_EDITED": "Ultima modificare"
       },
diff --git a/app/javascript/dashboard/i18n/locale/ro/report.json b/app/javascript/dashboard/i18n/locale/ro/report.json
index 78eb82099..f1ef47519 100644
--- a/app/javascript/dashboard/i18n/locale/ro/report.json
+++ b/app/javascript/dashboard/i18n/locale/ro/report.json
@@ -37,7 +37,7 @@
       },
       "REPLY_TIME": {
         "NAME": "Customer waiting time",
-        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} conversations)"
+        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} replies)"
       }
     },
     "DATE_RANGE_OPTIONS": {
@@ -441,7 +441,8 @@
       "LOADING_MESSAGE": "Încărcarea valorilor conversației...",
       "OPEN": "Deschide",
       "UNATTENDED": "Neasistat",
-      "UNASSIGNED": "Neatribuit"
+      "UNASSIGNED": "Neatribuit",
+      "PENDING": "În aşteptare"
     },
     "CONVERSATION_HEATMAP": {
       "HEADER": "Trafic de conversație",
diff --git a/app/javascript/dashboard/i18n/locale/ro/sla.json b/app/javascript/dashboard/i18n/locale/ro/sla.json
index c2da26c80..49ed7495c 100644
--- a/app/javascript/dashboard/i18n/locale/ro/sla.json
+++ b/app/javascript/dashboard/i18n/locale/ro/sla.json
@@ -31,21 +31,24 @@
         "PLACEHOLDER": "SLA for premium customers"
       },
       "FIRST_RESPONSE_TIME": {
-        "LABEL": "First Response Time(Seconds)",
-        "PLACEHOLDER": "300 for 5 minutes"
+        "LABEL": "Primul timp de răspuns",
+        "PLACEHOLDER": "5"
       },
       "NEXT_RESPONSE_TIME": {
-        "LABEL": "Next Response Time(Seconds)",
-        "PLACEHOLDER": "600 for 10 minutes"
+        "LABEL": "Next Response Time",
+        "PLACEHOLDER": "5"
       },
       "RESOLUTION_TIME": {
-        "LABEL": "Resolution Time(Seconds)",
-        "PLACEHOLDER": "86400 for 1 day"
+        "LABEL": "Timp Rezolutie",
+        "PLACEHOLDER": "60"
       },
       "BUSINESS_HOURS": {
         "LABEL": "Program de lucru",
         "PLACEHOLDER": "Only during business hours"
       },
+      "THRESHOLD_TIME": {
+        "INVALID_FORMAT_ERROR": "Threshold should be a number and greater than zero"
+      },
       "EDIT": "Editare",
       "CREATE": "Creeaza",
       "DELETE": "Şterge",
diff --git a/app/javascript/dashboard/i18n/locale/ru/advancedFilters.json b/app/javascript/dashboard/i18n/locale/ru/advancedFilters.json
index 2540998be..18c1c92be 100644
--- a/app/javascript/dashboard/i18n/locale/ru/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/ru/advancedFilters.json
@@ -37,7 +37,7 @@
     "ATTRIBUTES": {
       "STATUS": "Статус",
       "ASSIGNEE_NAME": "Имя назначенного",
-      "INBOX_NAME": "Inbox name",
+      "INBOX_NAME": "Имя источника",
       "TEAM_NAME": "Название команды",
       "CONVERSATION_IDENTIFIER": "Идентификатор беседы",
       "CAMPAIGN_NAME": "Название кампании",
diff --git a/app/javascript/dashboard/i18n/locale/ru/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/ru/cannedMgmt.json
index 0bb86842b..a1c1fe68d 100644
--- a/app/javascript/dashboard/i18n/locale/ru/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ru/cannedMgmt.json
@@ -4,7 +4,7 @@
     "HEADER_BTN_TXT": "Добавить шаблонный ответ",
     "LOADING": "Загружаем шаблонные ответы...",
     "SEARCH_404": "Нет категорий, соответствующих запросу.",
-    "SIDEBAR_TXT": "<p><b>Шаблонные ответы</b> </p><p> Шаблонные ответы это написаные заранее шаблоны, которые помогут вам быстрее ответить на сообщение. Чтобы вставить шаблонный ответ в чат, операторы могут ввести короткий код после символа '/'. </p><p> Вы можете управлять шаблонными ответами с этой страницы или создавать новые шаблоны, используя кнопку \"Добавить шаблонный ответ\".</p><p>Откройте <a target=\"_blank\" href=\"https://www.chatwoot.com/hc/chatwoot-user-guide-cloud-version/articles/1677501325-how-to-create-saved-reply-templates-with-canned-responses\">«Гайд по шаблонам</a> » на другой вкладке для помощи.</p><p>Кроме того, ознакомьтесь с новой библиотекой <a href=\"https://www.chatwoot.com/tools/canned-responses-library\" target=\"_blank\">Шаблонных ответов</a></p>",
+    "SIDEBAR_TXT": "<p><b>Шаблонные ответы</b> </p><p> Шаблонные ответы это написаные заранее шаблоны, которые помогут вам быстрее ответить на сообщение. Чтобы вставить шаблонный ответ в чат, операторы могут ввести короткий код после символа '/'. </p><p> Вы можете управлять шаблонными ответами с этой страницы или создавать новые шаблоны, используя кнопку \"Добавить шаблонный ответ\".</p><p>Откройте <a target=\"_blank\" href=\"https://www.chatwoot.com/hc/chatwoot-user-guide-cloud-version/articles/1677501325-how-to-create-saved-reply-templates-with-canned-responses\">«Гайд по шаблонам»</a> на другой вкладке для помощи.</p><p>Кроме того, ознакомьтесь с новой библиотекой <a href=\"https://www.chatwoot.com/tools/canned-responses-library\" target=\"_blank\">Шаблонных ответов</a></p>",
     "LIST": {
       "404": "У вас нет шаблонных ответов.",
       "TITLE": "Управление шаблонными ответами",
diff --git a/app/javascript/dashboard/i18n/locale/ru/contact.json b/app/javascript/dashboard/i18n/locale/ru/contact.json
index ce478c5d6..744134a63 100644
--- a/app/javascript/dashboard/i18n/locale/ru/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ru/contact.json
@@ -39,10 +39,10 @@
     },
     "MERGE_CONTACT": "Объединить контакты",
     "CONTACT_ACTIONS": "Действия с контактами",
-    "MUTE_CONTACT": "Block Contact",
-    "UNMUTE_CONTACT": "Unblock Contact",
-    "MUTED_SUCCESS": "This contact is blocked successfully. You will not be notified of any future conversations.",
-    "UNMUTED_SUCCESS": "This contact is unblocked successfully.",
+    "MUTE_CONTACT": "Заблокировать контакт",
+    "UNMUTE_CONTACT": "Разблокировать контакт",
+    "MUTED_SUCCESS": "Этот контакт успешно заблокирован. Вы не будете получать уведомления о будущих диалогах.",
+    "UNMUTED_SUCCESS": "Этот контакт успешно разблокирован.",
     "SEND_TRANSCRIPT": "Отправить субтитры",
     "EDIT_LABEL": "Редактировать",
     "SIDEBAR_SECTIONS": {
@@ -82,9 +82,9 @@
     "ERROR_MESSAGE": "Произошла ошибка, попробуйте еще раз",
     "CONFIRM": {
       "TITLE": "Экспорт контактов",
-      "MESSAGE": "Are you sure you want to export all contacts?",
-      "YES": "Yes, Export",
-      "NO": "No, Cancel"
+      "MESSAGE": "Вы уверены, что хотите экспортировать все контакты?",
+      "YES": "Да, экспортировать",
+      "NO": "Нет, отменить"
     }
   },
   "DELETE_NOTE": {
diff --git a/app/javascript/dashboard/i18n/locale/ru/generalSettings.json b/app/javascript/dashboard/i18n/locale/ru/generalSettings.json
index 6c3f75cb1..ece188f56 100644
--- a/app/javascript/dashboard/i18n/locale/ru/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ru/generalSettings.json
@@ -113,7 +113,7 @@
       "SETTINGS": "Настройки",
       "AI_ASSIST": "Помощь ИИ",
       "APPEARANCE": "Образец",
-      "SNOOZE_NOTIFICATION": "Snooze Notification"
+      "SNOOZE_NOTIFICATION": "Отложить уведомление"
     },
     "COMMANDS": {
       "GO_TO_CONVERSATION_DASHBOARD": "Перейти к панели разговоров",
@@ -155,7 +155,7 @@
       "LIGHT_MODE": "Светлая",
       "DARK_MODE": "Тёмная",
       "SYSTEM_MODE": "Система",
-      "SNOOZE_NOTIFICATION": "Snooze Notification"
+      "SNOOZE_NOTIFICATION": "Отложить уведомление"
     }
   },
   "DASHBOARD_APPS": {
diff --git a/app/javascript/dashboard/i18n/locale/ru/helpCenter.json b/app/javascript/dashboard/i18n/locale/ru/helpCenter.json
index 47f0cbb9c..6bbe06d49 100644
--- a/app/javascript/dashboard/i18n/locale/ru/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ru/helpCenter.json
@@ -319,7 +319,7 @@
       "HEADERS": {
         "TITLE": "Название",
         "CATEGORY": "Категория",
-        "READ_COUNT": "Счетчик просмотров",
+        "READ_COUNT": "Views",
         "STATUS": "Статус",
         "LAST_EDITED": "Последнее изменение"
       },
diff --git a/app/javascript/dashboard/i18n/locale/ru/inbox.json b/app/javascript/dashboard/i18n/locale/ru/inbox.json
index 7451c22f1..e095fd36d 100644
--- a/app/javascript/dashboard/i18n/locale/ru/inbox.json
+++ b/app/javascript/dashboard/i18n/locale/ru/inbox.json
@@ -6,7 +6,7 @@
       "LOADING": "Загрузка уведомлений",
       "EOF": "Все уведомления загружены 🎉",
       "404": "В этой группе нет активных уведомлений.",
-      "NO_NOTIFICATIONS": "No notifications",
+      "NO_NOTIFICATIONS": "Уведомления отсутствуют",
       "NOTE": "Уведомления от всех подписанных источников",
       "SNOOZED_UNTIL": "Отложить до",
       "SNOOZED_UNTIL_TOMORROW": "Отложено до завтра",
@@ -48,13 +48,13 @@
       }
     },
     "ALERTS": {
-      "MARK_AS_READ": "Notification marked as read",
-      "MARK_AS_UNREAD": "Notification marked as unread",
-      "SNOOZE": "Notification snoozed",
-      "DELETE": "Notification deleted",
-      "MARK_ALL_READ": "All notifications marked as read",
-      "DELETE_ALL": "All notifications deleted",
-      "DELETE_ALL_READ": "All read notifications deleted"
+      "MARK_AS_READ": "Уведомление отмечено как прочитанное",
+      "MARK_AS_UNREAD": "Уведомление отмечено как непрочитанное",
+      "SNOOZE": "Уведомление отложено",
+      "DELETE": "Уведомление удалено",
+      "MARK_ALL_READ": "Все уведомления отмечены как прочитанные",
+      "DELETE_ALL": "Все уведомления удалены",
+      "DELETE_ALL_READ": "Все прочитанные уведомления удалены"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ru/report.json b/app/javascript/dashboard/i18n/locale/ru/report.json
index cd11d5a26..f173ca449 100644
--- a/app/javascript/dashboard/i18n/locale/ru/report.json
+++ b/app/javascript/dashboard/i18n/locale/ru/report.json
@@ -37,7 +37,7 @@
       },
       "REPLY_TIME": {
         "NAME": "Время ожидания клиента",
-        "TOOLTIP_TEXT": "Время ожидания %{metricValue} (на основе %{conversationCount} сообщений)"
+        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} replies)"
       }
     },
     "DATE_RANGE_OPTIONS": {
@@ -441,7 +441,8 @@
       "LOADING_MESSAGE": "Загрузка метрик разговора...",
       "OPEN": "Открытых",
       "UNATTENDED": "Неотвеченные",
-      "UNASSIGNED": "Неназначен"
+      "UNASSIGNED": "Неназначен",
+      "PENDING": "В ожидании"
     },
     "CONVERSATION_HEATMAP": {
       "HEADER": "Трафик сообщений",
diff --git a/app/javascript/dashboard/i18n/locale/ru/sla.json b/app/javascript/dashboard/i18n/locale/ru/sla.json
index 7bf47cf4f..d24b3615f 100644
--- a/app/javascript/dashboard/i18n/locale/ru/sla.json
+++ b/app/javascript/dashboard/i18n/locale/ru/sla.json
@@ -1,14 +1,14 @@
 {
   "SLA": {
     "HEADER": "SLA",
-    "HEADER_BTN_TXT": "Add SLA",
-    "LOADING": "Fetching SLAs",
+    "HEADER_BTN_TXT": "Добавить SLA",
+    "LOADING": "Получение SLA",
     "SEARCH_404": "Нет вебхуков, соответствующих запросу",
-    "SIDEBAR_TXT": "<p><b>SLA</b> <p>Think of Service Level Agreements (SLAs) like friendly promises between a service provider and a customer.</p> <p> These promises set clear expectations for things like how quickly the team will respond to issues, making sure you always get a reliable and top-notch experience!</p>",
+    "SIDEBAR_TXT": "<p><b>SLA</b> <p>Подумайте о соглашениях об уровне обслуживания (SLA) как о дружественных обещаниях между поставщиком услуг и клиентом.</p> <p> Эти обещания устанавливают четкие ожидания в отношении таких вещей, как быстрое реагирование команды на проблемы, Вы всегда получите надежный и высококлассный опыт!</p>",
     "LIST": {
-      "404": "There are no SLAs available in this account.",
-      "TITLE": "Manage SLA",
-      "DESC": "SLAs: Friendly promises for great service!",
+      "404": "В этой учетной записи нет доступных SLA.",
+      "TITLE": "Настроить SLA",
+      "DESC": "SLAs: Дружеские обещания для отличного обслуживания!",
       "TABLE_HEADER": [
         "Имя",
         "Описание",
@@ -20,31 +20,34 @@
     },
     "FORM": {
       "NAME": {
-        "LABEL": "SLA Name",
-        "PLACEHOLDER": "SLA Name",
-        "REQUIRED_ERROR": "SLA name is required",
+        "LABEL": "Название SLA",
+        "PLACEHOLDER": "Название SLA",
+        "REQUIRED_ERROR": "Название SLA обязательно для заполнения",
         "MINIMUM_LENGTH_ERROR": "Минимальная длина 2 обязательна",
         "VALID_ERROR": "Разрешены только алфавиты, числа, дефисы и подчеркивание"
       },
       "DESCRIPTION": {
         "LABEL": "Описание",
-        "PLACEHOLDER": "SLA for premium customers"
+        "PLACEHOLDER": "SLA для премиум клиентов"
       },
       "FIRST_RESPONSE_TIME": {
-        "LABEL": "First Response Time(Seconds)",
-        "PLACEHOLDER": "300 for 5 minutes"
+        "LABEL": "Время первого ответа",
+        "PLACEHOLDER": "5"
       },
       "NEXT_RESPONSE_TIME": {
-        "LABEL": "Next Response Time(Seconds)",
-        "PLACEHOLDER": "600 for 10 minutes"
+        "LABEL": "Next Response Time",
+        "PLACEHOLDER": "5"
       },
       "RESOLUTION_TIME": {
-        "LABEL": "Resolution Time(Seconds)",
-        "PLACEHOLDER": "86400 for 1 day"
+        "LABEL": "Время Завершения",
+        "PLACEHOLDER": "60"
       },
       "BUSINESS_HOURS": {
         "LABEL": "Время работы",
-        "PLACEHOLDER": "Only during business hours"
+        "PLACEHOLDER": "Только в рабочее время"
+      },
+      "THRESHOLD_TIME": {
+        "INVALID_FORMAT_ERROR": "Threshold should be a number and greater than zero"
       },
       "EDIT": "Редактировать",
       "CREATE": "Создать",
@@ -52,17 +55,17 @@
       "CANCEL": "Отменить"
     },
     "ADD": {
-      "TITLE": "Add SLA",
-      "DESC": "SLAs: Friendly promises for great service!",
+      "TITLE": "Добавить SLA",
+      "DESC": "SLAs: Дружеские обещания для отличного обслуживания!",
       "API": {
-        "SUCCESS_MESSAGE": "SLA added successfully",
+        "SUCCESS_MESSAGE": "SLA успешно добавлено",
         "ERROR_MESSAGE": "Произошла ошибка, попробуйте еще раз"
       }
     },
     "EDIT": {
-      "TITLE": "Edit SLA",
+      "TITLE": "Редактировать SLA",
       "API": {
-        "SUCCESS_MESSAGE": "SLA updated successfully",
+        "SUCCESS_MESSAGE": "SLA успешно обновлено",
         "ERROR_MESSAGE": "Произошла ошибка, попробуйте еще раз"
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/sh/helpCenter.json b/app/javascript/dashboard/i18n/locale/sh/helpCenter.json
index cd397ed1e..467b0def9 100644
--- a/app/javascript/dashboard/i18n/locale/sh/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/sh/helpCenter.json
@@ -319,7 +319,7 @@
       "HEADERS": {
         "TITLE": "Title",
         "CATEGORY": "Category",
-        "READ_COUNT": "Read count",
+        "READ_COUNT": "Views",
         "STATUS": "Status",
         "LAST_EDITED": "Last edited"
       },
diff --git a/app/javascript/dashboard/i18n/locale/sh/report.json b/app/javascript/dashboard/i18n/locale/sh/report.json
index 87c070fd1..6ff84c5f5 100644
--- a/app/javascript/dashboard/i18n/locale/sh/report.json
+++ b/app/javascript/dashboard/i18n/locale/sh/report.json
@@ -37,7 +37,7 @@
       },
       "REPLY_TIME": {
         "NAME": "Customer waiting time",
-        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} conversations)"
+        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} replies)"
       }
     },
     "DATE_RANGE_OPTIONS": {
@@ -441,7 +441,8 @@
       "LOADING_MESSAGE": "Loading conversation metrics...",
       "OPEN": "Open",
       "UNATTENDED": "Unattended",
-      "UNASSIGNED": "Unassigned"
+      "UNASSIGNED": "Unassigned",
+      "PENDING": "Pending"
     },
     "CONVERSATION_HEATMAP": {
       "HEADER": "Conversation Traffic",
diff --git a/app/javascript/dashboard/i18n/locale/sh/sla.json b/app/javascript/dashboard/i18n/locale/sh/sla.json
index 869b3ba3f..806746b75 100644
--- a/app/javascript/dashboard/i18n/locale/sh/sla.json
+++ b/app/javascript/dashboard/i18n/locale/sh/sla.json
@@ -31,21 +31,24 @@
         "PLACEHOLDER": "SLA for premium customers"
       },
       "FIRST_RESPONSE_TIME": {
-        "LABEL": "First Response Time(Seconds)",
-        "PLACEHOLDER": "300 for 5 minutes"
+        "LABEL": "First Response Time",
+        "PLACEHOLDER": "5"
       },
       "NEXT_RESPONSE_TIME": {
-        "LABEL": "Next Response Time(Seconds)",
-        "PLACEHOLDER": "600 for 10 minutes"
+        "LABEL": "Next Response Time",
+        "PLACEHOLDER": "5"
       },
       "RESOLUTION_TIME": {
-        "LABEL": "Resolution Time(Seconds)",
-        "PLACEHOLDER": "86400 for 1 day"
+        "LABEL": "Resolution Time",
+        "PLACEHOLDER": "60"
       },
       "BUSINESS_HOURS": {
         "LABEL": "Business Hours",
         "PLACEHOLDER": "Only during business hours"
       },
+      "THRESHOLD_TIME": {
+        "INVALID_FORMAT_ERROR": "Threshold should be a number and greater than zero"
+      },
       "EDIT": "Edit",
       "CREATE": "Create",
       "DELETE": "Delete",
diff --git a/app/javascript/dashboard/i18n/locale/sk/helpCenter.json b/app/javascript/dashboard/i18n/locale/sk/helpCenter.json
index d0c40ce52..b7eccc358 100644
--- a/app/javascript/dashboard/i18n/locale/sk/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/sk/helpCenter.json
@@ -319,7 +319,7 @@
       "HEADERS": {
         "TITLE": "Title",
         "CATEGORY": "Category",
-        "READ_COUNT": "Read count",
+        "READ_COUNT": "Views",
         "STATUS": "Status",
         "LAST_EDITED": "Last edited"
       },
diff --git a/app/javascript/dashboard/i18n/locale/sk/report.json b/app/javascript/dashboard/i18n/locale/sk/report.json
index 1d01c9725..8f8f879ac 100644
--- a/app/javascript/dashboard/i18n/locale/sk/report.json
+++ b/app/javascript/dashboard/i18n/locale/sk/report.json
@@ -37,7 +37,7 @@
       },
       "REPLY_TIME": {
         "NAME": "Customer waiting time",
-        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} conversations)"
+        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} replies)"
       }
     },
     "DATE_RANGE_OPTIONS": {
@@ -441,7 +441,8 @@
       "LOADING_MESSAGE": "Loading conversation metrics...",
       "OPEN": "Otvoriť",
       "UNATTENDED": "Unattended",
-      "UNASSIGNED": "Nepriradené"
+      "UNASSIGNED": "Nepriradené",
+      "PENDING": "Čaká sa na"
     },
     "CONVERSATION_HEATMAP": {
       "HEADER": "Conversation Traffic",
diff --git a/app/javascript/dashboard/i18n/locale/sk/sla.json b/app/javascript/dashboard/i18n/locale/sk/sla.json
index ced225b50..40b78d1d7 100644
--- a/app/javascript/dashboard/i18n/locale/sk/sla.json
+++ b/app/javascript/dashboard/i18n/locale/sk/sla.json
@@ -31,21 +31,24 @@
         "PLACEHOLDER": "SLA for premium customers"
       },
       "FIRST_RESPONSE_TIME": {
-        "LABEL": "First Response Time(Seconds)",
-        "PLACEHOLDER": "300 for 5 minutes"
+        "LABEL": "First Response Time",
+        "PLACEHOLDER": "5"
       },
       "NEXT_RESPONSE_TIME": {
-        "LABEL": "Next Response Time(Seconds)",
-        "PLACEHOLDER": "600 for 10 minutes"
+        "LABEL": "Next Response Time",
+        "PLACEHOLDER": "5"
       },
       "RESOLUTION_TIME": {
-        "LABEL": "Resolution Time(Seconds)",
-        "PLACEHOLDER": "86400 for 1 day"
+        "LABEL": "Čas do riešenia",
+        "PLACEHOLDER": "60"
       },
       "BUSINESS_HOURS": {
         "LABEL": "Otváracie hodiny",
         "PLACEHOLDER": "Only during business hours"
       },
+      "THRESHOLD_TIME": {
+        "INVALID_FORMAT_ERROR": "Threshold should be a number and greater than zero"
+      },
       "EDIT": "Upraviť",
       "CREATE": "Create",
       "DELETE": "Vymazať",
diff --git a/app/javascript/dashboard/i18n/locale/sl/helpCenter.json b/app/javascript/dashboard/i18n/locale/sl/helpCenter.json
index d94692e3d..6c4238b92 100644
--- a/app/javascript/dashboard/i18n/locale/sl/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/sl/helpCenter.json
@@ -319,7 +319,7 @@
       "HEADERS": {
         "TITLE": "Title",
         "CATEGORY": "Category",
-        "READ_COUNT": "Read count",
+        "READ_COUNT": "Views",
         "STATUS": "Status",
         "LAST_EDITED": "Last edited"
       },
diff --git a/app/javascript/dashboard/i18n/locale/sl/report.json b/app/javascript/dashboard/i18n/locale/sl/report.json
index d19d513ae..e3a0f31d2 100644
--- a/app/javascript/dashboard/i18n/locale/sl/report.json
+++ b/app/javascript/dashboard/i18n/locale/sl/report.json
@@ -37,7 +37,7 @@
       },
       "REPLY_TIME": {
         "NAME": "Customer waiting time",
-        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} conversations)"
+        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} replies)"
       }
     },
     "DATE_RANGE_OPTIONS": {
@@ -441,7 +441,8 @@
       "LOADING_MESSAGE": "Loading conversation metrics...",
       "OPEN": "Open",
       "UNATTENDED": "Unattended",
-      "UNASSIGNED": "Unassigned"
+      "UNASSIGNED": "Unassigned",
+      "PENDING": "Pending"
     },
     "CONVERSATION_HEATMAP": {
       "HEADER": "Conversation Traffic",
diff --git a/app/javascript/dashboard/i18n/locale/sl/sla.json b/app/javascript/dashboard/i18n/locale/sl/sla.json
index 869b3ba3f..806746b75 100644
--- a/app/javascript/dashboard/i18n/locale/sl/sla.json
+++ b/app/javascript/dashboard/i18n/locale/sl/sla.json
@@ -31,21 +31,24 @@
         "PLACEHOLDER": "SLA for premium customers"
       },
       "FIRST_RESPONSE_TIME": {
-        "LABEL": "First Response Time(Seconds)",
-        "PLACEHOLDER": "300 for 5 minutes"
+        "LABEL": "First Response Time",
+        "PLACEHOLDER": "5"
       },
       "NEXT_RESPONSE_TIME": {
-        "LABEL": "Next Response Time(Seconds)",
-        "PLACEHOLDER": "600 for 10 minutes"
+        "LABEL": "Next Response Time",
+        "PLACEHOLDER": "5"
       },
       "RESOLUTION_TIME": {
-        "LABEL": "Resolution Time(Seconds)",
-        "PLACEHOLDER": "86400 for 1 day"
+        "LABEL": "Resolution Time",
+        "PLACEHOLDER": "60"
       },
       "BUSINESS_HOURS": {
         "LABEL": "Business Hours",
         "PLACEHOLDER": "Only during business hours"
       },
+      "THRESHOLD_TIME": {
+        "INVALID_FORMAT_ERROR": "Threshold should be a number and greater than zero"
+      },
       "EDIT": "Edit",
       "CREATE": "Create",
       "DELETE": "Delete",
diff --git a/app/javascript/dashboard/i18n/locale/sq/helpCenter.json b/app/javascript/dashboard/i18n/locale/sq/helpCenter.json
index d94692e3d..6c4238b92 100644
--- a/app/javascript/dashboard/i18n/locale/sq/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/sq/helpCenter.json
@@ -319,7 +319,7 @@
       "HEADERS": {
         "TITLE": "Title",
         "CATEGORY": "Category",
-        "READ_COUNT": "Read count",
+        "READ_COUNT": "Views",
         "STATUS": "Status",
         "LAST_EDITED": "Last edited"
       },
diff --git a/app/javascript/dashboard/i18n/locale/sq/report.json b/app/javascript/dashboard/i18n/locale/sq/report.json
index d19d513ae..e3a0f31d2 100644
--- a/app/javascript/dashboard/i18n/locale/sq/report.json
+++ b/app/javascript/dashboard/i18n/locale/sq/report.json
@@ -37,7 +37,7 @@
       },
       "REPLY_TIME": {
         "NAME": "Customer waiting time",
-        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} conversations)"
+        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} replies)"
       }
     },
     "DATE_RANGE_OPTIONS": {
@@ -441,7 +441,8 @@
       "LOADING_MESSAGE": "Loading conversation metrics...",
       "OPEN": "Open",
       "UNATTENDED": "Unattended",
-      "UNASSIGNED": "Unassigned"
+      "UNASSIGNED": "Unassigned",
+      "PENDING": "Pending"
     },
     "CONVERSATION_HEATMAP": {
       "HEADER": "Conversation Traffic",
diff --git a/app/javascript/dashboard/i18n/locale/sq/sla.json b/app/javascript/dashboard/i18n/locale/sq/sla.json
index 869b3ba3f..806746b75 100644
--- a/app/javascript/dashboard/i18n/locale/sq/sla.json
+++ b/app/javascript/dashboard/i18n/locale/sq/sla.json
@@ -31,21 +31,24 @@
         "PLACEHOLDER": "SLA for premium customers"
       },
       "FIRST_RESPONSE_TIME": {
-        "LABEL": "First Response Time(Seconds)",
-        "PLACEHOLDER": "300 for 5 minutes"
+        "LABEL": "First Response Time",
+        "PLACEHOLDER": "5"
       },
       "NEXT_RESPONSE_TIME": {
-        "LABEL": "Next Response Time(Seconds)",
-        "PLACEHOLDER": "600 for 10 minutes"
+        "LABEL": "Next Response Time",
+        "PLACEHOLDER": "5"
       },
       "RESOLUTION_TIME": {
-        "LABEL": "Resolution Time(Seconds)",
-        "PLACEHOLDER": "86400 for 1 day"
+        "LABEL": "Resolution Time",
+        "PLACEHOLDER": "60"
       },
       "BUSINESS_HOURS": {
         "LABEL": "Business Hours",
         "PLACEHOLDER": "Only during business hours"
       },
+      "THRESHOLD_TIME": {
+        "INVALID_FORMAT_ERROR": "Threshold should be a number and greater than zero"
+      },
       "EDIT": "Edit",
       "CREATE": "Create",
       "DELETE": "Delete",
diff --git a/app/javascript/dashboard/i18n/locale/sr/helpCenter.json b/app/javascript/dashboard/i18n/locale/sr/helpCenter.json
index 48c9726a5..b2e7aaf32 100644
--- a/app/javascript/dashboard/i18n/locale/sr/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/sr/helpCenter.json
@@ -319,7 +319,7 @@
       "HEADERS": {
         "TITLE": "Naslov",
         "CATEGORY": "Kategorija",
-        "READ_COUNT": "Broj pročitano",
+        "READ_COUNT": "Views",
         "STATUS": "Status",
         "LAST_EDITED": "Poslednje izmenjeno"
       },
diff --git a/app/javascript/dashboard/i18n/locale/sr/report.json b/app/javascript/dashboard/i18n/locale/sr/report.json
index 18a1fcba9..f97c744d3 100644
--- a/app/javascript/dashboard/i18n/locale/sr/report.json
+++ b/app/javascript/dashboard/i18n/locale/sr/report.json
@@ -37,7 +37,7 @@
       },
       "REPLY_TIME": {
         "NAME": "Customer waiting time",
-        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} conversations)"
+        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} replies)"
       }
     },
     "DATE_RANGE_OPTIONS": {
@@ -441,7 +441,8 @@
       "LOADING_MESSAGE": "Učitavanje metrike razgovora...",
       "OPEN": "Otvoreni",
       "UNATTENDED": "Nedodeljeni",
-      "UNASSIGNED": "Nedodeljen"
+      "UNASSIGNED": "Nedodeljen",
+      "PENDING": "Nerešen"
     },
     "CONVERSATION_HEATMAP": {
       "HEADER": "Conversation Traffic",
diff --git a/app/javascript/dashboard/i18n/locale/sr/sla.json b/app/javascript/dashboard/i18n/locale/sr/sla.json
index 50507ee46..2677dd02f 100644
--- a/app/javascript/dashboard/i18n/locale/sr/sla.json
+++ b/app/javascript/dashboard/i18n/locale/sr/sla.json
@@ -31,21 +31,24 @@
         "PLACEHOLDER": "SLA for premium customers"
       },
       "FIRST_RESPONSE_TIME": {
-        "LABEL": "First Response Time(Seconds)",
-        "PLACEHOLDER": "300 for 5 minutes"
+        "LABEL": "Vreme prvog odgovora",
+        "PLACEHOLDER": "5"
       },
       "NEXT_RESPONSE_TIME": {
-        "LABEL": "Next Response Time(Seconds)",
-        "PLACEHOLDER": "600 for 10 minutes"
+        "LABEL": "Next Response Time",
+        "PLACEHOLDER": "5"
       },
       "RESOLUTION_TIME": {
-        "LABEL": "Resolution Time(Seconds)",
-        "PLACEHOLDER": "86400 for 1 day"
+        "LABEL": "Vreme rešavanja",
+        "PLACEHOLDER": "60"
       },
       "BUSINESS_HOURS": {
         "LABEL": "Radno vreme",
         "PLACEHOLDER": "Only during business hours"
       },
+      "THRESHOLD_TIME": {
+        "INVALID_FORMAT_ERROR": "Threshold should be a number and greater than zero"
+      },
       "EDIT": "Uredi",
       "CREATE": "Napravi",
       "DELETE": "Izbriši",
diff --git a/app/javascript/dashboard/i18n/locale/sv/helpCenter.json b/app/javascript/dashboard/i18n/locale/sv/helpCenter.json
index c45e9f2dc..4be6a1d03 100644
--- a/app/javascript/dashboard/i18n/locale/sv/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/sv/helpCenter.json
@@ -319,7 +319,7 @@
       "HEADERS": {
         "TITLE": "Title",
         "CATEGORY": "Category",
-        "READ_COUNT": "Read count",
+        "READ_COUNT": "Visningar",
         "STATUS": "Status",
         "LAST_EDITED": "Senast redigerad"
       },
diff --git a/app/javascript/dashboard/i18n/locale/sv/report.json b/app/javascript/dashboard/i18n/locale/sv/report.json
index 0a866cd43..16884c806 100644
--- a/app/javascript/dashboard/i18n/locale/sv/report.json
+++ b/app/javascript/dashboard/i18n/locale/sv/report.json
@@ -37,7 +37,7 @@
       },
       "REPLY_TIME": {
         "NAME": "Customer waiting time",
-        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} conversations)"
+        "TOOLTIP_TEXT": "Väntetiden är %{metricValue} (baserat på %{conversationCount} svar)"
       }
     },
     "DATE_RANGE_OPTIONS": {
@@ -441,7 +441,8 @@
       "LOADING_MESSAGE": "Loading conversation metrics...",
       "OPEN": "Öppna",
       "UNATTENDED": "Unattended",
-      "UNASSIGNED": "Otilldelade"
+      "UNASSIGNED": "Otilldelade",
+      "PENDING": "Väntande"
     },
     "CONVERSATION_HEATMAP": {
       "HEADER": "Conversation Traffic",
diff --git a/app/javascript/dashboard/i18n/locale/sv/sla.json b/app/javascript/dashboard/i18n/locale/sv/sla.json
index deb61fab1..d637deaa1 100644
--- a/app/javascript/dashboard/i18n/locale/sv/sla.json
+++ b/app/javascript/dashboard/i18n/locale/sv/sla.json
@@ -31,21 +31,24 @@
         "PLACEHOLDER": "SLA for premium customers"
       },
       "FIRST_RESPONSE_TIME": {
-        "LABEL": "First Response Time(Seconds)",
-        "PLACEHOLDER": "300 for 5 minutes"
+        "LABEL": "First Response Time",
+        "PLACEHOLDER": "5"
       },
       "NEXT_RESPONSE_TIME": {
-        "LABEL": "Next Response Time(Seconds)",
-        "PLACEHOLDER": "600 for 10 minutes"
+        "LABEL": "Next Response Time",
+        "PLACEHOLDER": "5"
       },
       "RESOLUTION_TIME": {
-        "LABEL": "Resolution Time(Seconds)",
-        "PLACEHOLDER": "86400 for 1 day"
+        "LABEL": "Lösningstid",
+        "PLACEHOLDER": "60"
       },
       "BUSINESS_HOURS": {
         "LABEL": "Öppettider",
         "PLACEHOLDER": "Only during business hours"
       },
+      "THRESHOLD_TIME": {
+        "INVALID_FORMAT_ERROR": "Threshold should be a number and greater than zero"
+      },
       "EDIT": "Redigera",
       "CREATE": "Skapa",
       "DELETE": "Radera",
diff --git a/app/javascript/dashboard/i18n/locale/ta/helpCenter.json b/app/javascript/dashboard/i18n/locale/ta/helpCenter.json
index bff004dec..b861aed03 100644
--- a/app/javascript/dashboard/i18n/locale/ta/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ta/helpCenter.json
@@ -319,7 +319,7 @@
       "HEADERS": {
         "TITLE": "Title",
         "CATEGORY": "Category",
-        "READ_COUNT": "Read count",
+        "READ_COUNT": "Views",
         "STATUS": "நிலை",
         "LAST_EDITED": "Last edited"
       },
diff --git a/app/javascript/dashboard/i18n/locale/ta/report.json b/app/javascript/dashboard/i18n/locale/ta/report.json
index a536e10a1..11dd3c0a2 100644
--- a/app/javascript/dashboard/i18n/locale/ta/report.json
+++ b/app/javascript/dashboard/i18n/locale/ta/report.json
@@ -37,7 +37,7 @@
       },
       "REPLY_TIME": {
         "NAME": "Customer waiting time",
-        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} conversations)"
+        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} replies)"
       }
     },
     "DATE_RANGE_OPTIONS": {
@@ -441,7 +441,8 @@
       "LOADING_MESSAGE": "Loading conversation metrics...",
       "OPEN": "திற",
       "UNATTENDED": "Unattended",
-      "UNASSIGNED": "ஒதுக்கப்படாதது"
+      "UNASSIGNED": "ஒதுக்கப்படாதது",
+      "PENDING": "Pending"
     },
     "CONVERSATION_HEATMAP": {
       "HEADER": "Conversation Traffic",
diff --git a/app/javascript/dashboard/i18n/locale/ta/sla.json b/app/javascript/dashboard/i18n/locale/ta/sla.json
index 7eacfea2c..1d7a13ec5 100644
--- a/app/javascript/dashboard/i18n/locale/ta/sla.json
+++ b/app/javascript/dashboard/i18n/locale/ta/sla.json
@@ -31,21 +31,24 @@
         "PLACEHOLDER": "SLA for premium customers"
       },
       "FIRST_RESPONSE_TIME": {
-        "LABEL": "First Response Time(Seconds)",
-        "PLACEHOLDER": "300 for 5 minutes"
+        "LABEL": "First Response Time",
+        "PLACEHOLDER": "5"
       },
       "NEXT_RESPONSE_TIME": {
-        "LABEL": "Next Response Time(Seconds)",
-        "PLACEHOLDER": "600 for 10 minutes"
+        "LABEL": "Next Response Time",
+        "PLACEHOLDER": "5"
       },
       "RESOLUTION_TIME": {
-        "LABEL": "Resolution Time(Seconds)",
-        "PLACEHOLDER": "86400 for 1 day"
+        "LABEL": "தீர்வு வழங்க எடுத்துக்கொண்ட நேரம்",
+        "PLACEHOLDER": "60"
       },
       "BUSINESS_HOURS": {
         "LABEL": "Business Hours",
         "PLACEHOLDER": "Only during business hours"
       },
+      "THRESHOLD_TIME": {
+        "INVALID_FORMAT_ERROR": "Threshold should be a number and greater than zero"
+      },
       "EDIT": "திருத்து",
       "CREATE": "Create",
       "DELETE": "Delete",
diff --git a/app/javascript/dashboard/i18n/locale/th/helpCenter.json b/app/javascript/dashboard/i18n/locale/th/helpCenter.json
index 4558d5810..859236cc8 100644
--- a/app/javascript/dashboard/i18n/locale/th/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/th/helpCenter.json
@@ -319,7 +319,7 @@
       "HEADERS": {
         "TITLE": "หัวข้อ",
         "CATEGORY": "Category",
-        "READ_COUNT": "Read count",
+        "READ_COUNT": "Views",
         "STATUS": "สถานะ",
         "LAST_EDITED": "Last edited"
       },
diff --git a/app/javascript/dashboard/i18n/locale/th/report.json b/app/javascript/dashboard/i18n/locale/th/report.json
index 99a207c12..7501fb11f 100644
--- a/app/javascript/dashboard/i18n/locale/th/report.json
+++ b/app/javascript/dashboard/i18n/locale/th/report.json
@@ -37,7 +37,7 @@
       },
       "REPLY_TIME": {
         "NAME": "Customer waiting time",
-        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} conversations)"
+        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} replies)"
       }
     },
     "DATE_RANGE_OPTIONS": {
@@ -441,7 +441,8 @@
       "LOADING_MESSAGE": "กำโหลดตัวชี้วัดการสนทนา",
       "OPEN": "เปิด",
       "UNATTENDED": "ไม่ได้เข้าร่วม",
-      "UNASSIGNED": "ไม่ได้รับมอบหมาย"
+      "UNASSIGNED": "ไม่ได้รับมอบหมาย",
+      "PENDING": "กำลังร้องขอ"
     },
     "CONVERSATION_HEATMAP": {
       "HEADER": "Conversation Traffic",
diff --git a/app/javascript/dashboard/i18n/locale/th/sla.json b/app/javascript/dashboard/i18n/locale/th/sla.json
index 0d972ee37..54bddd0b2 100644
--- a/app/javascript/dashboard/i18n/locale/th/sla.json
+++ b/app/javascript/dashboard/i18n/locale/th/sla.json
@@ -31,21 +31,24 @@
         "PLACEHOLDER": "SLA for premium customers"
       },
       "FIRST_RESPONSE_TIME": {
-        "LABEL": "First Response Time(Seconds)",
-        "PLACEHOLDER": "300 for 5 minutes"
+        "LABEL": "ระยะเวลาการตอบกลับครั้งแรก",
+        "PLACEHOLDER": "5"
       },
       "NEXT_RESPONSE_TIME": {
-        "LABEL": "Next Response Time(Seconds)",
-        "PLACEHOLDER": "600 for 10 minutes"
+        "LABEL": "Next Response Time",
+        "PLACEHOLDER": "5"
       },
       "RESOLUTION_TIME": {
-        "LABEL": "Resolution Time(Seconds)",
-        "PLACEHOLDER": "86400 for 1 day"
+        "LABEL": "ระยะเวลาในการเสร็จสิ้นการสนทนา",
+        "PLACEHOLDER": "60"
       },
       "BUSINESS_HOURS": {
         "LABEL": "เวลาทำการ",
         "PLACEHOLDER": "Only during business hours"
       },
+      "THRESHOLD_TIME": {
+        "INVALID_FORMAT_ERROR": "Threshold should be a number and greater than zero"
+      },
       "EDIT": "เเก้ไข",
       "CREATE": "สร้าง",
       "DELETE": "ลบ",
diff --git a/app/javascript/dashboard/i18n/locale/tr/helpCenter.json b/app/javascript/dashboard/i18n/locale/tr/helpCenter.json
index a9c949ed8..7467368b2 100644
--- a/app/javascript/dashboard/i18n/locale/tr/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/tr/helpCenter.json
@@ -319,7 +319,7 @@
       "HEADERS": {
         "TITLE": "Başlık",
         "CATEGORY": "Kategori",
-        "READ_COUNT": "Okuma sayısı",
+        "READ_COUNT": "Views",
         "STATUS": "Durum",
         "LAST_EDITED": "Son düzenleme"
       },
diff --git a/app/javascript/dashboard/i18n/locale/tr/report.json b/app/javascript/dashboard/i18n/locale/tr/report.json
index 196d98349..efaa63605 100644
--- a/app/javascript/dashboard/i18n/locale/tr/report.json
+++ b/app/javascript/dashboard/i18n/locale/tr/report.json
@@ -37,7 +37,7 @@
       },
       "REPLY_TIME": {
         "NAME": "Müşteri Bekleme Süresi",
-        "TOOLTIP_TEXT": "Bekleme süresi %{metricValue} ( %{conversationCount} görüşmeye dayanmaktadır)"
+        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} replies)"
       }
     },
     "DATE_RANGE_OPTIONS": {
@@ -441,7 +441,8 @@
       "LOADING_MESSAGE": "Görüşme metrikleri yükleniyor...",
       "OPEN": "Açık",
       "UNATTENDED": "İlgilenilmemiş",
-      "UNASSIGNED": "Atanmamış"
+      "UNASSIGNED": "Atanmamış",
+      "PENDING": "Bekliyor"
     },
     "CONVERSATION_HEATMAP": {
       "HEADER": "Konuşma Trafik",
diff --git a/app/javascript/dashboard/i18n/locale/tr/sla.json b/app/javascript/dashboard/i18n/locale/tr/sla.json
index 83699d873..230ade078 100644
--- a/app/javascript/dashboard/i18n/locale/tr/sla.json
+++ b/app/javascript/dashboard/i18n/locale/tr/sla.json
@@ -31,21 +31,24 @@
         "PLACEHOLDER": "SLA for premium customers"
       },
       "FIRST_RESPONSE_TIME": {
-        "LABEL": "First Response Time(Seconds)",
-        "PLACEHOLDER": "300 for 5 minutes"
+        "LABEL": "İlk Cevap Süresi",
+        "PLACEHOLDER": "5"
       },
       "NEXT_RESPONSE_TIME": {
-        "LABEL": "Next Response Time(Seconds)",
-        "PLACEHOLDER": "600 for 10 minutes"
+        "LABEL": "Next Response Time",
+        "PLACEHOLDER": "5"
       },
       "RESOLUTION_TIME": {
-        "LABEL": "Resolution Time(Seconds)",
-        "PLACEHOLDER": "86400 for 1 day"
+        "LABEL": "Çözüm Süresi",
+        "PLACEHOLDER": "60"
       },
       "BUSINESS_HOURS": {
         "LABEL": "İş Saatleri",
         "PLACEHOLDER": "Only during business hours"
       },
+      "THRESHOLD_TIME": {
+        "INVALID_FORMAT_ERROR": "Threshold should be a number and greater than zero"
+      },
       "EDIT": "Düzenle",
       "CREATE": "Yarat",
       "DELETE": "Sil",
diff --git a/app/javascript/dashboard/i18n/locale/uk/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/uk/cannedMgmt.json
index 7b618016d..c690cee09 100644
--- a/app/javascript/dashboard/i18n/locale/uk/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/uk/cannedMgmt.json
@@ -1,75 +1,75 @@
 {
   "CANNED_MGMT": {
     "HEADER": "Швидкі відповіді",
-    "HEADER_BTN_TXT": "Add canned response",
-    "LOADING": "Fetching canned responses...",
+    "HEADER_BTN_TXT": "Додати швидку відповідь",
+    "LOADING": "Отримання швидких відповідей...",
     "SEARCH_404": "Немає елементів, що відповідають запиту.",
-    "SIDEBAR_TXT": "<p><b>Canned Responses</b> </p><p> Canned Responses are pre-written reply templates that help you quickly respond to a conversation. To insert a canned response during a chat, agents can type a short code preceded by a '/' character. </p><p> You can manage your canned responses from this page or create new ones using the \"Add canned response\" button.</p><p>Open the <a target=\"_blank\" href=\"https://www.chatwoot.com/hc/chatwoot-user-guide-cloud-version/articles/1677501325-how-to-create-saved-reply-templates-with-canned-responses\">Canned Responses handbook</a> in another tab for a helping hand.</p><p>Also, check out the all-new <a href=\"https://www.chatwoot.com/tools/canned-responses-library\" target=\"_blank\">Canned Responses Library</a>.</p>",
+    "SIDEBAR_TXT": "<p><b>Шаблони відповідей</b> </p><p> Шаблони відповідей — це попередньо написані шаблони відповідей, які допомагають швидко відповідати на діалог. Щоб вставити стандартну відповідь під час чату, агенти можуть ввести короткий код (шорт-код), перед яким стоїть символ «/». </p><p> Ви можете керувати своїми стандартними відповідями на цій сторінці або створювати нові за допомогою кнопки «Додати шаблон відповіді».</p><p>Відкрийте <a target=\"_blank\" href=\"https: //www.chatwoot.com/hc/chatwoot-user-guide-cloud-version/articles/1677501325-how-to-create-saved-reply-templates-with-canned-responses\">Посібник із шаблонів відповідей</a> на іншій вкладці.</p><p>Також перегляньте абсолютно нову <a href=\"https://www.chatwoot.com/tools/canned-responses-library\" target=\"_blank \">Бібліотеку шаблонних відповідей</a>.</p>",
     "LIST": {
       "404": "В цьому обліковому записі немає швидких відповідей.",
       "TITLE": "Керування швидкими вдіповідями",
-      "DESC": "Canned Responses are predefined reply templates which can be used to quickly send out replies to conversations.",
+      "DESC": "Швидкі відповіді - це шаблони, які можна швидко використати для відповіді на повідомлення у діалозі.",
       "TABLE_HEADER": [
-        "Short code",
+        "Шорт-код",
         "Вміст",
         "Дії"
       ]
     },
     "ADD": {
-      "TITLE": "Add canned response",
-      "DESC": "Canned Responses are predefined reply templates which can be used to quickly send out replies to conversations.",
+      "TITLE": "Додати швидку відповідь",
+      "DESC": "Швидкі відповіді - це шаблони, які можна швидко використати для відповіді на повідомлення у діалозі.",
       "CANCEL_BUTTON_TEXT": "Скасувати",
       "FORM": {
         "SHORT_CODE": {
-          "LABEL": "Short code",
-          "PLACEHOLDER": "Please enter a short code.",
-          "ERROR": "Short Code is required."
+          "LABEL": "Шорт-код",
+          "PLACEHOLDER": "Введіть шорт-код.",
+          "ERROR": "Необхідно вказати шорт-код."
         },
         "CONTENT": {
           "LABEL": "Текст повідомлення",
-          "PLACEHOLDER": "Please write the message you want to save as a template to use later.",
-          "ERROR": "Message is required."
+          "PLACEHOLDER": "Будь ласка, напишіть повідомлення, яке ви хочете зберегти як шаблон, щоб використовувати пізніше.",
+          "ERROR": "Необхідно ввести повідомлення."
         },
         "SUBMIT": "Додати"
       },
       "API": {
-        "SUCCESS_MESSAGE": "Canned response added successfully.",
+        "SUCCESS_MESSAGE": "Швидку відповідь додано.",
         "ERROR_MESSAGE": "Не вдалося підключитися до Woot сервера. Будь ласка, спробуйте ще раз."
       }
     },
     "EDIT": {
-      "TITLE": "Edit canned response",
+      "TITLE": "Редагувати швидку відповідь",
       "CANCEL_BUTTON_TEXT": "Скасувати",
       "FORM": {
         "SHORT_CODE": {
-          "LABEL": "Short code",
-          "PLACEHOLDER": "Please enter a shortcode.",
-          "ERROR": "Short code is required."
+          "LABEL": "Шорт-код",
+          "PLACEHOLDER": "Введіть шорт-код.",
+          "ERROR": "Необхідно вказати шорт-код."
         },
         "CONTENT": {
           "LABEL": "Текст повідомлення",
-          "PLACEHOLDER": "Please write the message you want to save as a template to use later.",
+          "PLACEHOLDER": "Будь ласка, напишіть повідомлення, яке ви хочете зберегти як шаблон, щоб використовувати пізніше.",
           "ERROR": "Необхідне повідомлення."
         },
         "SUBMIT": "Додати"
       },
       "BUTTON_TEXT": "Редагувати",
       "API": {
-        "SUCCESS_MESSAGE": "Canned response is updated successfully.",
+        "SUCCESS_MESSAGE": "Швидку відповідь успішно оновлено.",
         "ERROR_MESSAGE": "Не вдалося підключитися до Woot сервера. Будь ласка, спробуйте ще раз."
       }
     },
     "DELETE": {
       "BUTTON_TEXT": "Видалити",
       "API": {
-        "SUCCESS_MESSAGE": "Canned response deleted successfully.",
+        "SUCCESS_MESSAGE": "Швидку відповідь успішно видалено.",
         "ERROR_MESSAGE": "Не вдалося підключитися до Woot сервера. Будь ласка, спробуйте ще раз."
       },
       "CONFIRM": {
         "TITLE": "Підтвердіть видалення",
         "MESSAGE": "Справді бажаєте видалити ",
-        "YES": "Yes, delete ",
-        "NO": "No, keep "
+        "YES": "Так, видалити ",
+        "NO": "Ні, залишити "
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/uk/chatlist.json b/app/javascript/dashboard/i18n/locale/uk/chatlist.json
index 61c6092eb..c11115446 100644
--- a/app/javascript/dashboard/i18n/locale/uk/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/uk/chatlist.json
@@ -53,28 +53,28 @@
     },
     "SORT_ORDER_ITEMS": {
       "last_activity_at_asc": {
-        "TEXT": "Last activity: Oldest first"
+        "TEXT": "Остання активність: спочатку старіші"
       },
       "last_activity_at_desc": {
-        "TEXT": "Last activity: Newest first"
+        "TEXT": "Остання активність: спочатку нові"
       },
       "created_at_desc": {
-        "TEXT": "Created at: Newest first"
+        "TEXT": "Створено: спочатку нові"
       },
       "created_at_asc": {
-        "TEXT": "Created at: Oldest first"
+        "TEXT": "Створено у: спочатку старіші"
       },
       "priority_desc": {
-        "TEXT": "Priority: Highest first"
+        "TEXT": "Пріоритет: спочатку найвищий"
       },
       "priority_asc": {
-        "TEXT": "Priority: Lowest first"
+        "TEXT": "Пріоритет: спочатку низький"
       },
       "waiting_since_asc": {
-        "TEXT": "Pending Response: Longest first"
+        "TEXT": "Очікує відповіді: спочатку довгі"
       },
       "waiting_since_desc": {
-        "TEXT": "Pending Response: Shortest first"
+        "TEXT": "Очікує відповіді: спершу короткі"
       }
     },
     "ATTACHMENTS": {
diff --git a/app/javascript/dashboard/i18n/locale/uk/contact.json b/app/javascript/dashboard/i18n/locale/uk/contact.json
index 2033ae92a..50866de8d 100644
--- a/app/javascript/dashboard/i18n/locale/uk/contact.json
+++ b/app/javascript/dashboard/i18n/locale/uk/contact.json
@@ -34,15 +34,15 @@
         "TITLE": "Додати мітки",
         "PLACEHOLDER": "Пошук міток",
         "NO_RESULT": "Міток не знайдено",
-        "CREATE_LABEL": "Create new label"
+        "CREATE_LABEL": "Створити новий ярлик"
       }
     },
     "MERGE_CONTACT": "Об'єднати",
     "CONTACT_ACTIONS": "Дії з контактами",
-    "MUTE_CONTACT": "Block Contact",
-    "UNMUTE_CONTACT": "Unblock Contact",
-    "MUTED_SUCCESS": "This contact is blocked successfully. You will not be notified of any future conversations.",
-    "UNMUTED_SUCCESS": "This contact is unblocked successfully.",
+    "MUTE_CONTACT": "Заблокувати контакт",
+    "UNMUTE_CONTACT": "Розблокувати контакт",
+    "MUTED_SUCCESS": "Цей контакт успішно заблокований. Повідомлення не будуть надходити про будь-які майбутні розмови.",
+    "UNMUTED_SUCCESS": "Цей контакт успішно розблоковано.",
     "SEND_TRANSCRIPT": "Надіслати транскрипт",
     "EDIT_LABEL": "Редагувати",
     "SIDEBAR_SECTIONS": {
@@ -71,7 +71,7 @@
       "SUBMIT": "Імпорт",
       "CANCEL": "Скасувати"
     },
-    "SUCCESS_MESSAGE": "You will be notified via email when the import is complete.",
+    "SUCCESS_MESSAGE": "Ви будете повідомлені по електронній пошті, коли завершиться імпорт.",
     "ERROR_MESSAGE": "Сталася помилка, будь ласка, спробуйте ще раз"
   },
   "EXPORT_CONTACTS": {
@@ -211,8 +211,8 @@
         "ERROR": "Повідомлення не може бути пустим"
       },
       "ATTACHMENTS": {
-        "SELECT": "Choose files",
-        "HELP_TEXT": "Drag and drop files here or choose files to attach"
+        "SELECT": "Оберіть файли",
+        "HELP_TEXT": "Перетягніть файли сюди, або виберіть файли"
       },
       "SUBMIT": "Надіслати",
       "CANCEL": "Скасувати",
@@ -346,7 +346,7 @@
     "VALIDATIONS": {
       "REQUIRED": "Потрібне коректне значення",
       "INVALID_URL": "Недопустимий URL",
-      "INVALID_INPUT": "Invalid Input"
+      "INVALID_INPUT": "Некоректний текст"
     }
   },
   "MERGE_CONTACTS": {
diff --git a/app/javascript/dashboard/i18n/locale/uk/conversation.json b/app/javascript/dashboard/i18n/locale/uk/conversation.json
index 7676b8e6e..0cb984a02 100644
--- a/app/javascript/dashboard/i18n/locale/uk/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/uk/conversation.json
@@ -13,8 +13,8 @@
     "NO_INBOX_AGENT": "Ой! Схоже, ви не маєте доступу до скриньки \"Вхідні\". Будь ласка, зверніться до адміністратора",
     "SEARCH_MESSAGES": "Пошук повідомлень у розмовах",
     "EMPTY_STATE": {
-      "CMD_BAR": "to open command menu",
-      "KEYBOARD_SHORTCUTS": "to view keyboard shortcuts"
+      "CMD_BAR": "відкрити командне меню",
+      "KEYBOARD_SHORTCUTS": "переглянути комбінації клавіш"
     },
     "SEARCH": {
       "TITLE": "Пошук повідомлень",
@@ -41,15 +41,15 @@
     "SAVE_CONTACT": "Зберегти",
     "UPLOADING_ATTACHMENTS": "Завантаження вкладень...",
     "REPLIED_TO_STORY": "Відповів(-ла) на вашу історію",
-    "UNSUPPORTED_MESSAGE": "This message is unsupported.",
-    "UNSUPPORTED_MESSAGE_FACEBOOK": "This message is unsupported. You can view this message on the Facebook Messenger app.",
-    "UNSUPPORTED_MESSAGE_INSTAGRAM": "This message is unsupported. You can view this message on the Instagram app.",
+    "UNSUPPORTED_MESSAGE": "Це повідомлення не підтримується.",
+    "UNSUPPORTED_MESSAGE_FACEBOOK": "Це повідомлення не підтримується. Ви можете переглянути це повідомлення у додатку Facebook Messenger",
+    "UNSUPPORTED_MESSAGE_INSTAGRAM": "Це повідомлення не підтримується. Ви можете переглянути це повідомлення у додатку Instagram.",
     "SUCCESS_DELETE_MESSAGE": "Повідомлення успішно видалено",
     "FAIL_DELETE_MESSSAGE": "Не вдалося видалити повідомлення! Спробуйте ще раз",
     "NO_RESPONSE": "Немає відповіді",
     "RATING_TITLE": "Оцінка",
     "FEEDBACK_TITLE": "Зворотній зв'язок",
-    "REPLY_MESSAGE_NOT_FOUND": "Message not available",
+    "REPLY_MESSAGE_NOT_FOUND": "Повідомлення недоступне",
     "CARD": {
       "SHOW_LABELS": "Показати мітки",
       "HIDE_LABELS": "Сховати мітки"
@@ -143,8 +143,8 @@
       "SEND": "Надіслати",
       "CREATE": "Додати нотатку",
       "INSERT_READ_MORE": "Детальніше",
-      "DISMISS_REPLY": "Dismiss reply",
-      "REPLYING_TO": "Replying to:",
+      "DISMISS_REPLY": "Відхилити відповідь",
+      "REPLYING_TO": "Відповісти:",
       "TIP_FORMAT_ICON": "Показати текстовий редактор",
       "TIP_EMOJI_ICON": "Показати емодзі",
       "TIP_ATTACH_ICON": "Прикріпити файли",
@@ -156,7 +156,7 @@
       "STOP_AUDIO_RECORDING": "Зупинити аудіозапис",
       "": "",
       "EMAIL_HEAD": {
-        "TO": "TO",
+        "TO": "На",
         "ADD_BCC": "Додати bcc",
         "CC": {
           "LABEL": "CC",
@@ -199,7 +199,7 @@
     },
     "CONTEXT_MENU": {
       "COPY": "Копіювати",
-      "REPLY_TO": "Reply to this message",
+      "REPLY_TO": "Відповісти на це повідомлення",
       "DELETE": "Видалити",
       "CREATE_A_CANNED_RESPONSE": "Додати швидку відповідь",
       "TRANSLATE": "Перекласти",
diff --git a/app/javascript/dashboard/i18n/locale/uk/csatMgmt.json b/app/javascript/dashboard/i18n/locale/uk/csatMgmt.json
index e33ac458c..29aba3883 100644
--- a/app/javascript/dashboard/i18n/locale/uk/csatMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/uk/csatMgmt.json
@@ -4,10 +4,10 @@
     "PLACEHOLDER": "Розкажіть нам більше...",
     "RATINGS": {
       "POOR": "😞 Poor",
-      "FAIR": "😑 Fair",
-      "AVERAGE": "😐 Average",
-      "GOOD": "😀 Good",
-      "EXCELLENT": "😍 Excellent"
+      "FAIR": "😑 Слабо",
+      "AVERAGE": "😐 Посередньо",
+      "GOOD": "😀 Добре",
+      "EXCELLENT": "😍 Відмінно"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/uk/generalSettings.json b/app/javascript/dashboard/i18n/locale/uk/generalSettings.json
index 1f37f16dc..bf100970f 100644
--- a/app/javascript/dashboard/i18n/locale/uk/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/uk/generalSettings.json
@@ -3,7 +3,7 @@
     "TITLE": "Налаштування облікового запису",
     "SUBMIT": "Оновити налаштування",
     "BACK": "Назад",
-    "DISMISS": "Dismiss",
+    "DISMISS": "Відхилити",
     "UPDATE": {
       "ERROR": "Не вдалося оновити налаштування, спробуйте ще раз!",
       "SUCCESS": "Налаштування облікового запису успішно оновлено"
@@ -52,7 +52,7 @@
     "LEARN_MORE": "Детальніше",
     "PAYMENT_PENDING": "Очікується ваш платіж. Будь ласка, оновіть вашу платіжну інформацію, щоб продовжити використовувати Chatwoot",
     "LIMITS_UPGRADE": "В вашому обліковому записі перевищено ліміт використання, будь ласка, поновіть ваш план, щоб продовжити використання Chatwoot",
-    "OPEN_BILLING": "Open billing"
+    "OPEN_BILLING": "Відкрити рахунок"
   },
   "FORMS": {
     "MULTISELECT": {
@@ -111,9 +111,9 @@
       "ADD_LABEL": "Додати мітку до діалогу",
       "REMOVE_LABEL": "Видалити мітку з діалогу",
       "SETTINGS": "Налаштування",
-      "AI_ASSIST": "AI Assist",
-      "APPEARANCE": "Appearance",
-      "SNOOZE_NOTIFICATION": "Snooze Notification"
+      "AI_ASSIST": "ШІ асистент",
+      "APPEARANCE": "Оформлення",
+      "SNOOZE_NOTIFICATION": "Відключити сповіщення"
     },
     "COMMANDS": {
       "GO_TO_CONVERSATION_DASHBOARD": "Перейти до панелі керування бесід",
@@ -135,7 +135,7 @@
       "GO_TO_NOTIFICATIONS": "Перейти до сповіщень",
       "ADD_LABELS_TO_CONVERSATION": "Додати мітку до діалогу",
       "ASSIGN_AN_AGENT": "Призначити агента",
-      "AI_ASSIST": "AI Assist",
+      "AI_ASSIST": "ШІ асистент",
       "ASSIGN_PRIORITY": "Призначити пріоритет",
       "ASSIGN_A_TEAM": "Призначити команду",
       "MUTE_CONVERSATION": "Вимкнути звук для розмови",
@@ -148,14 +148,14 @@
       "UNTIL_NEXT_REPLY": "До наступної відповіді",
       "UNTIL_NEXT_WEEK": "До наступного тижня",
       "UNTIL_TOMORROW": "До завтра",
-      "UNTIL_NEXT_MONTH": "Until next month",
-      "AN_HOUR_FROM_NOW": "Until an hour from now",
-      "CUSTOM": "Custom...",
-      "CHANGE_APPEARANCE": "Change Appearance",
+      "UNTIL_NEXT_MONTH": "До наступного місяця",
+      "AN_HOUR_FROM_NOW": "На годину з цього моменту",
+      "CUSTOM": "Власний...",
+      "CHANGE_APPEARANCE": "Змінити зовнішній вигляд",
       "LIGHT_MODE": "Світла",
       "DARK_MODE": "Темна",
-      "SYSTEM_MODE": "System",
-      "SNOOZE_NOTIFICATION": "Snooze Notification"
+      "SYSTEM_MODE": "Система",
+      "SNOOZE_NOTIFICATION": "Відключити сповіщення"
     }
   },
   "DASHBOARD_APPS": {
diff --git a/app/javascript/dashboard/i18n/locale/uk/helpCenter.json b/app/javascript/dashboard/i18n/locale/uk/helpCenter.json
index 1539114fb..94ead9f26 100644
--- a/app/javascript/dashboard/i18n/locale/uk/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/uk/helpCenter.json
@@ -319,7 +319,7 @@
       "HEADERS": {
         "TITLE": "Назва",
         "CATEGORY": "Категорія",
-        "READ_COUNT": "Лічильник прочитань",
+        "READ_COUNT": "Views",
         "STATUS": "Статус",
         "LAST_EDITED": "Останній раз відредагований"
       },
diff --git a/app/javascript/dashboard/i18n/locale/uk/inbox.json b/app/javascript/dashboard/i18n/locale/uk/inbox.json
index 5a9485482..fcf9cc43b 100644
--- a/app/javascript/dashboard/i18n/locale/uk/inbox.json
+++ b/app/javascript/dashboard/i18n/locale/uk/inbox.json
@@ -2,59 +2,59 @@
   "INBOX": {
     "LIST": {
       "TITLE": "Вхідні",
-      "DISPLAY_DROPDOWN": "Display",
-      "LOADING": "Fetching notifications",
+      "DISPLAY_DROPDOWN": "Відобразити",
+      "LOADING": "Завантаження сповіщень",
       "EOF": "Всі сповіщення завантажено 🎉",
-      "404": "There are no active notifications in this group.",
-      "NO_NOTIFICATIONS": "No notifications",
-      "NOTE": "Notifications from all subscribed inboxes",
+      "404": "Немає активних сповіщень у цій групі.",
+      "NO_NOTIFICATIONS": "Немає сповіщень",
+      "NOTE": "Сповіщення від усіх підписок на вхідні повідомлення",
       "SNOOZED_UNTIL": "Відкладено до",
       "SNOOZED_UNTIL_TOMORROW": "Відкладено до завтра",
       "SNOOZED_UNTIL_NEXT_WEEK": "Відкладено до наступного тижня"
     },
     "ACTION_HEADER": {
-      "SNOOZE": "Snooze notification",
-      "DELETE": "Delete notification"
+      "SNOOZE": "Відключити сповіщення",
+      "DELETE": "Видалити сповіщення"
     },
     "TYPES": {
-      "CONVERSATION_MENTION": "You have been mentioned in a conversation",
-      "CONVERSATION_CREATION": "New conversation created",
-      "CONVERSATION_ASSIGNMENT": "A conversation has been assigned to you",
-      "ASSIGNED_CONVERSATION_NEW_MESSAGE": "New message in an assigned conversation",
-      "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "New message in a conversation you are participating in"
+      "CONVERSATION_MENTION": "Ви були згадані в розмові",
+      "CONVERSATION_CREATION": "Діалог створено",
+      "CONVERSATION_ASSIGNMENT": "Розмова була призначена для вас",
+      "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Нове повідомлення в призначеній розмові",
+      "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Нове повідомлення в розмові, яке ви берете участь в"
     },
     "MENU_ITEM": {
-      "MARK_AS_READ": "Mark as read",
+      "MARK_AS_READ": "Позначити як прочитане",
       "MARK_AS_UNREAD": "Позначити як непрочитане",
       "SNOOZE": "Відкласти",
       "DELETE": "Видалити",
       "MARK_ALL_READ": "Позначити всі як прочитані",
-      "DELETE_ALL": "Delete all",
-      "DELETE_ALL_READ": "Delete all read"
+      "DELETE_ALL": "Видалити все",
+      "DELETE_ALL_READ": "Видалити всі прочитані"
     },
     "DISPLAY_MENU": {
-      "SORT": "Sort",
-      "DISPLAY": "Display :",
+      "SORT": "Сортувати",
+      "DISPLAY": "Відобразити :",
       "SORT_OPTIONS": {
-        "NEWEST": "Newest",
-        "OLDEST": "Oldest",
+        "NEWEST": "Новіші",
+        "OLDEST": "Старіші",
         "PRIORITY": "Пріоритет"
       },
       "DISPLAY_OPTIONS": {
         "SNOOZED": "Відкладено",
         "READ": "Прочитано",
         "LABELS": "Мітки",
-        "CONVERSATION_ID": "Conversation ID"
+        "CONVERSATION_ID": "ID бесіди"
       }
     },
     "ALERTS": {
-      "MARK_AS_READ": "Notification marked as read",
-      "MARK_AS_UNREAD": "Notification marked as unread",
-      "SNOOZE": "Notification snoozed",
-      "DELETE": "Notification deleted",
-      "MARK_ALL_READ": "All notifications marked as read",
-      "DELETE_ALL": "All notifications deleted",
-      "DELETE_ALL_READ": "All read notifications deleted"
+      "MARK_AS_READ": "Повідомлення помічено як прочитане",
+      "MARK_AS_UNREAD": "Повідомлення помічено як непрочитане",
+      "SNOOZE": "Сповіщення відключено",
+      "DELETE": "Сповіщення видалено",
+      "MARK_ALL_READ": "Повідомлення помічено як прочитане",
+      "DELETE_ALL": "Сповіщення видалено",
+      "DELETE_ALL_READ": "Всі прочитані повідомлення видалено"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json
index 4824970fe..7abd5214b 100644
--- a/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json
@@ -112,14 +112,14 @@
           "ERROR": "Це поле є обов'язковим"
         },
         "API_KEY": {
-          "USE_API_KEY": "Use API Key Authentication",
+          "USE_API_KEY": "Використовувати API Key автентифікацію",
           "LABEL": "API Key SID",
-          "PLACEHOLDER": "Please enter your API Key SID",
+          "PLACEHOLDER": "Будь ласка, введіть ваш API Key SID",
           "ERROR": "Це поле є обов'язковим"
         },
         "API_KEY_SECRET": {
-          "LABEL": "API Key Secret",
-          "PLACEHOLDER": "Please enter your API Key Secret",
+          "LABEL": "Секретний ключ API",
+          "PLACEHOLDER": "Будь ласка, введіть ваш ключ API",
           "ERROR": "Це поле є обов'язковим"
         },
         "MESSAGING_SERVICE_SID": {
@@ -371,8 +371,8 @@
     "DETAILS": {
       "LOADING_FB": "Автентифікація через Facebook...",
       "ERROR_FB_AUTH": "Щось пішло не так. Будь ласка, оновіть сторінку...",
-      "ERROR_FB_UNAUTHORIZED": "You're not authorized to perform this action. ",
-      "ERROR_FB_UNAUTHORIZED_HELP": "Please ensure you have access to the Facebook page with full control. You can read more about Facebook roles <a href=\" https://www.facebook.com/help/187316341316631\">here</a>.",
+      "ERROR_FB_UNAUTHORIZED": "Ви не авторизовані для цієї дії. ",
+      "ERROR_FB_UNAUTHORIZED_HELP": "Переконайтеся, що ви маєте доступ до сторінки Facebook із повним доступом. Ви можете прочитати більше про ролі Facebook <a href=\" https://www.facebook.com/help/187316341316631\">тут</a>.",
       "CREATING_CHANNEL": "Створення скриньки Вхідні...",
       "TITLE": "Налаштувати подробиці Джерела",
       "DESC": ""
diff --git a/app/javascript/dashboard/i18n/locale/uk/integrations.json b/app/javascript/dashboard/i18n/locale/uk/integrations.json
index e4db53c20..e0e2bd944 100644
--- a/app/javascript/dashboard/i18n/locale/uk/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/uk/integrations.json
@@ -103,7 +103,7 @@
       "CREATE_ERROR": "Помилка при створенні посилання на зустріч, будь ласка, спробуйте знову"
     },
     "OPEN_AI": {
-      "AI_ASSIST": "AI Assist",
+      "AI_ASSIST": "ШІ асистент",
       "WITH_AI": " %{option} with AI ",
       "OPTIONS": {
         "REPLY_SUGGESTION": "Reply Suggestion",
@@ -131,7 +131,7 @@
         "KEY_PLACEHOLDER": "Enter your OpenAI API key",
         "BUTTONS": {
           "NEED_HELP": "Потрібна допомога?",
-          "DISMISS": "Dismiss",
+          "DISMISS": "Відхилити",
           "FINISH": "Finish Setup"
         },
         "DISMISS_MESSAGE": "You can setup OpenAI integration later Whenever you want.",
diff --git a/app/javascript/dashboard/i18n/locale/uk/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/uk/labelsMgmt.json
index b6db1ebcd..e9385f4bc 100644
--- a/app/javascript/dashboard/i18n/locale/uk/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/uk/labelsMgmt.json
@@ -46,7 +46,7 @@
         "DISMISS": "Dismiss suggestion"
       },
       "POWERED_BY": "Chatwoot AI",
-      "DISMISS": "Dismiss",
+      "DISMISS": "Відхилити",
       "ADD_SELECTED_LABELS": "Add selected labels",
       "ADD_SELECTED_LABEL": "Add selected label",
       "ADD_ALL_LABELS": "Add all labels"
diff --git a/app/javascript/dashboard/i18n/locale/uk/report.json b/app/javascript/dashboard/i18n/locale/uk/report.json
index 4e14f0f1d..fe8a1bda3 100644
--- a/app/javascript/dashboard/i18n/locale/uk/report.json
+++ b/app/javascript/dashboard/i18n/locale/uk/report.json
@@ -37,7 +37,7 @@
       },
       "REPLY_TIME": {
         "NAME": "Customer waiting time",
-        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} conversations)"
+        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} replies)"
       }
     },
     "DATE_RANGE_OPTIONS": {
@@ -441,7 +441,8 @@
       "LOADING_MESSAGE": "Завантаження метрик розмови...",
       "OPEN": "Відкриті",
       "UNATTENDED": "Не зв'язаний",
-      "UNASSIGNED": "Непризначені"
+      "UNASSIGNED": "Непризначені",
+      "PENDING": "Очікує"
     },
     "CONVERSATION_HEATMAP": {
       "HEADER": "Бесіди",
diff --git a/app/javascript/dashboard/i18n/locale/uk/settings.json b/app/javascript/dashboard/i18n/locale/uk/settings.json
index 50ebe8f3d..a287ddf69 100644
--- a/app/javascript/dashboard/i18n/locale/uk/settings.json
+++ b/app/javascript/dashboard/i18n/locale/uk/settings.json
@@ -152,7 +152,7 @@
     "SELECTOR_SUBTITLE": "Виберіть обліковий запис із наступного списку",
     "PROFILE_SETTINGS": "Налаштування облікового запису",
     "KEYBOARD_SHORTCUTS": "Комбінації клавіш",
-    "APPEARANCE": "Change Appearance",
+    "APPEARANCE": "Змінити зовнішній вигляд",
     "SUPER_ADMIN_CONSOLE": "Консоль адміна",
     "LOGOUT": "Вийти"
   },
diff --git a/app/javascript/dashboard/i18n/locale/uk/sla.json b/app/javascript/dashboard/i18n/locale/uk/sla.json
index ad26eede4..7eafa0c54 100644
--- a/app/javascript/dashboard/i18n/locale/uk/sla.json
+++ b/app/javascript/dashboard/i18n/locale/uk/sla.json
@@ -31,21 +31,24 @@
         "PLACEHOLDER": "SLA for premium customers"
       },
       "FIRST_RESPONSE_TIME": {
-        "LABEL": "First Response Time(Seconds)",
-        "PLACEHOLDER": "300 for 5 minutes"
+        "LABEL": "Час першої відповіді",
+        "PLACEHOLDER": "5"
       },
       "NEXT_RESPONSE_TIME": {
-        "LABEL": "Next Response Time(Seconds)",
-        "PLACEHOLDER": "600 for 10 minutes"
+        "LABEL": "Next Response Time",
+        "PLACEHOLDER": "5"
       },
       "RESOLUTION_TIME": {
-        "LABEL": "Resolution Time(Seconds)",
-        "PLACEHOLDER": "86400 for 1 day"
+        "LABEL": "Час до вирішення",
+        "PLACEHOLDER": "60"
       },
       "BUSINESS_HOURS": {
         "LABEL": "Робочий час",
         "PLACEHOLDER": "Only during business hours"
       },
+      "THRESHOLD_TIME": {
+        "INVALID_FORMAT_ERROR": "Threshold should be a number and greater than zero"
+      },
       "EDIT": "Редагувати",
       "CREATE": "Створити",
       "DELETE": "Видалити",
diff --git a/app/javascript/dashboard/i18n/locale/ur/helpCenter.json b/app/javascript/dashboard/i18n/locale/ur/helpCenter.json
index 6566ed6f6..97c88533f 100644
--- a/app/javascript/dashboard/i18n/locale/ur/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ur/helpCenter.json
@@ -319,7 +319,7 @@
       "HEADERS": {
         "TITLE": "Title",
         "CATEGORY": "Category",
-        "READ_COUNT": "Read count",
+        "READ_COUNT": "Views",
         "STATUS": "اسٹیٹس",
         "LAST_EDITED": "Last edited"
       },
diff --git a/app/javascript/dashboard/i18n/locale/ur/report.json b/app/javascript/dashboard/i18n/locale/ur/report.json
index 83875757d..b5e130dc1 100644
--- a/app/javascript/dashboard/i18n/locale/ur/report.json
+++ b/app/javascript/dashboard/i18n/locale/ur/report.json
@@ -37,7 +37,7 @@
       },
       "REPLY_TIME": {
         "NAME": "Customer waiting time",
-        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} conversations)"
+        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} replies)"
       }
     },
     "DATE_RANGE_OPTIONS": {
@@ -441,7 +441,8 @@
       "LOADING_MESSAGE": "Loading conversation metrics...",
       "OPEN": "کھولیں۔",
       "UNATTENDED": "Unattended",
-      "UNASSIGNED": "نا مقرر کیا ہوا"
+      "UNASSIGNED": "نا مقرر کیا ہوا",
+      "PENDING": "زیر التواء"
     },
     "CONVERSATION_HEATMAP": {
       "HEADER": "Conversation Traffic",
diff --git a/app/javascript/dashboard/i18n/locale/ur/sla.json b/app/javascript/dashboard/i18n/locale/ur/sla.json
index 9a30e8dde..e268bf58a 100644
--- a/app/javascript/dashboard/i18n/locale/ur/sla.json
+++ b/app/javascript/dashboard/i18n/locale/ur/sla.json
@@ -31,21 +31,24 @@
         "PLACEHOLDER": "SLA for premium customers"
       },
       "FIRST_RESPONSE_TIME": {
-        "LABEL": "First Response Time(Seconds)",
-        "PLACEHOLDER": "300 for 5 minutes"
+        "LABEL": "First Response Time",
+        "PLACEHOLDER": "5"
       },
       "NEXT_RESPONSE_TIME": {
-        "LABEL": "Next Response Time(Seconds)",
-        "PLACEHOLDER": "600 for 10 minutes"
+        "LABEL": "Next Response Time",
+        "PLACEHOLDER": "5"
       },
       "RESOLUTION_TIME": {
-        "LABEL": "Resolution Time(Seconds)",
-        "PLACEHOLDER": "86400 for 1 day"
+        "LABEL": "Resolution Time",
+        "PLACEHOLDER": "60"
       },
       "BUSINESS_HOURS": {
         "LABEL": "Business Hours",
         "PLACEHOLDER": "Only during business hours"
       },
+      "THRESHOLD_TIME": {
+        "INVALID_FORMAT_ERROR": "Threshold should be a number and greater than zero"
+      },
       "EDIT": "ترمیم",
       "CREATE": "Create",
       "DELETE": "حذف کریں۔",
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/helpCenter.json b/app/javascript/dashboard/i18n/locale/ur_IN/helpCenter.json
index cd397ed1e..467b0def9 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/helpCenter.json
@@ -319,7 +319,7 @@
       "HEADERS": {
         "TITLE": "Title",
         "CATEGORY": "Category",
-        "READ_COUNT": "Read count",
+        "READ_COUNT": "Views",
         "STATUS": "Status",
         "LAST_EDITED": "Last edited"
       },
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/report.json b/app/javascript/dashboard/i18n/locale/ur_IN/report.json
index 87c070fd1..6ff84c5f5 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/report.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/report.json
@@ -37,7 +37,7 @@
       },
       "REPLY_TIME": {
         "NAME": "Customer waiting time",
-        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} conversations)"
+        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} replies)"
       }
     },
     "DATE_RANGE_OPTIONS": {
@@ -441,7 +441,8 @@
       "LOADING_MESSAGE": "Loading conversation metrics...",
       "OPEN": "Open",
       "UNATTENDED": "Unattended",
-      "UNASSIGNED": "Unassigned"
+      "UNASSIGNED": "Unassigned",
+      "PENDING": "Pending"
     },
     "CONVERSATION_HEATMAP": {
       "HEADER": "Conversation Traffic",
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/sla.json b/app/javascript/dashboard/i18n/locale/ur_IN/sla.json
index 869b3ba3f..806746b75 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/sla.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/sla.json
@@ -31,21 +31,24 @@
         "PLACEHOLDER": "SLA for premium customers"
       },
       "FIRST_RESPONSE_TIME": {
-        "LABEL": "First Response Time(Seconds)",
-        "PLACEHOLDER": "300 for 5 minutes"
+        "LABEL": "First Response Time",
+        "PLACEHOLDER": "5"
       },
       "NEXT_RESPONSE_TIME": {
-        "LABEL": "Next Response Time(Seconds)",
-        "PLACEHOLDER": "600 for 10 minutes"
+        "LABEL": "Next Response Time",
+        "PLACEHOLDER": "5"
       },
       "RESOLUTION_TIME": {
-        "LABEL": "Resolution Time(Seconds)",
-        "PLACEHOLDER": "86400 for 1 day"
+        "LABEL": "Resolution Time",
+        "PLACEHOLDER": "60"
       },
       "BUSINESS_HOURS": {
         "LABEL": "Business Hours",
         "PLACEHOLDER": "Only during business hours"
       },
+      "THRESHOLD_TIME": {
+        "INVALID_FORMAT_ERROR": "Threshold should be a number and greater than zero"
+      },
       "EDIT": "Edit",
       "CREATE": "Create",
       "DELETE": "Delete",
diff --git a/app/javascript/dashboard/i18n/locale/vi/helpCenter.json b/app/javascript/dashboard/i18n/locale/vi/helpCenter.json
index cd0620025..90c51fe5f 100644
--- a/app/javascript/dashboard/i18n/locale/vi/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/vi/helpCenter.json
@@ -319,7 +319,7 @@
       "HEADERS": {
         "TITLE": "Tiêu đề",
         "CATEGORY": "Loại",
-        "READ_COUNT": "Số lượt đọc",
+        "READ_COUNT": "Views",
         "STATUS": "Trạng thái",
         "LAST_EDITED": "Sửa lần cuối"
       },
diff --git a/app/javascript/dashboard/i18n/locale/vi/report.json b/app/javascript/dashboard/i18n/locale/vi/report.json
index 00996f1c6..c2a540657 100644
--- a/app/javascript/dashboard/i18n/locale/vi/report.json
+++ b/app/javascript/dashboard/i18n/locale/vi/report.json
@@ -37,7 +37,7 @@
       },
       "REPLY_TIME": {
         "NAME": "Customer waiting time",
-        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} conversations)"
+        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} replies)"
       }
     },
     "DATE_RANGE_OPTIONS": {
@@ -441,7 +441,8 @@
       "LOADING_MESSAGE": "Đang tải số liệu cuộc hội thoại...",
       "OPEN": "Mở",
       "UNATTENDED": "Không giám sát",
-      "UNASSIGNED": "Chưa được phân công"
+      "UNASSIGNED": "Chưa được phân công",
+      "PENDING": "Chờ giải quyết"
     },
     "CONVERSATION_HEATMAP": {
       "HEADER": "Conversation Traffic",
diff --git a/app/javascript/dashboard/i18n/locale/vi/sla.json b/app/javascript/dashboard/i18n/locale/vi/sla.json
index 74fae1534..727a23270 100644
--- a/app/javascript/dashboard/i18n/locale/vi/sla.json
+++ b/app/javascript/dashboard/i18n/locale/vi/sla.json
@@ -31,21 +31,24 @@
         "PLACEHOLDER": "SLA for premium customers"
       },
       "FIRST_RESPONSE_TIME": {
-        "LABEL": "First Response Time(Seconds)",
-        "PLACEHOLDER": "300 for 5 minutes"
+        "LABEL": "Thời gian phản hồi đầu tiên",
+        "PLACEHOLDER": "5"
       },
       "NEXT_RESPONSE_TIME": {
-        "LABEL": "Next Response Time(Seconds)",
-        "PLACEHOLDER": "600 for 10 minutes"
+        "LABEL": "Next Response Time",
+        "PLACEHOLDER": "5"
       },
       "RESOLUTION_TIME": {
-        "LABEL": "Resolution Time(Seconds)",
-        "PLACEHOLDER": "86400 for 1 day"
+        "LABEL": "Thời gian giải quyết",
+        "PLACEHOLDER": "60"
       },
       "BUSINESS_HOURS": {
         "LABEL": "Giờ làm việc",
         "PLACEHOLDER": "Only during business hours"
       },
+      "THRESHOLD_TIME": {
+        "INVALID_FORMAT_ERROR": "Threshold should be a number and greater than zero"
+      },
       "EDIT": "Chỉnh sửa",
       "CREATE": "Tạo",
       "DELETE": "Xoá",
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/helpCenter.json b/app/javascript/dashboard/i18n/locale/zh_CN/helpCenter.json
index 1157a674c..112b238e7 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/helpCenter.json
@@ -319,7 +319,7 @@
       "HEADERS": {
         "TITLE": "标题",
         "CATEGORY": "类别",
-        "READ_COUNT": "阅读数",
+        "READ_COUNT": "Views",
         "STATUS": "状态",
         "LAST_EDITED": "Last edited"
       },
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/report.json b/app/javascript/dashboard/i18n/locale/zh_CN/report.json
index 54710254b..451f709ee 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/report.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/report.json
@@ -37,7 +37,7 @@
       },
       "REPLY_TIME": {
         "NAME": "Customer waiting time",
-        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} conversations)"
+        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} replies)"
       }
     },
     "DATE_RANGE_OPTIONS": {
@@ -441,7 +441,8 @@
       "LOADING_MESSAGE": "Loading conversation metrics...",
       "OPEN": "打开",
       "UNATTENDED": "Unattended",
-      "UNASSIGNED": "未分配的"
+      "UNASSIGNED": "未分配的",
+      "PENDING": "等待中"
     },
     "CONVERSATION_HEATMAP": {
       "HEADER": "Conversation Traffic",
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/sla.json b/app/javascript/dashboard/i18n/locale/zh_CN/sla.json
index 00d83f363..0afe05c81 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/sla.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/sla.json
@@ -31,21 +31,24 @@
         "PLACEHOLDER": "SLA for premium customers"
       },
       "FIRST_RESPONSE_TIME": {
-        "LABEL": "First Response Time(Seconds)",
-        "PLACEHOLDER": "300 for 5 minutes"
+        "LABEL": "首次响应时间",
+        "PLACEHOLDER": "5"
       },
       "NEXT_RESPONSE_TIME": {
-        "LABEL": "Next Response Time(Seconds)",
-        "PLACEHOLDER": "600 for 10 minutes"
+        "LABEL": "Next Response Time",
+        "PLACEHOLDER": "5"
       },
       "RESOLUTION_TIME": {
-        "LABEL": "Resolution Time(Seconds)",
-        "PLACEHOLDER": "86400 for 1 day"
+        "LABEL": "解决时间",
+        "PLACEHOLDER": "60"
       },
       "BUSINESS_HOURS": {
         "LABEL": "Business Hours",
         "PLACEHOLDER": "Only during business hours"
       },
+      "THRESHOLD_TIME": {
+        "INVALID_FORMAT_ERROR": "Threshold should be a number and greater than zero"
+      },
       "EDIT": "编辑",
       "CREATE": "创建",
       "DELETE": "删除",
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/helpCenter.json b/app/javascript/dashboard/i18n/locale/zh_TW/helpCenter.json
index e7b9f91ac..f936beee0 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/helpCenter.json
@@ -319,7 +319,7 @@
       "HEADERS": {
         "TITLE": "標題",
         "CATEGORY": "Category",
-        "READ_COUNT": "Read count",
+        "READ_COUNT": "Views",
         "STATUS": "狀態",
         "LAST_EDITED": "Last edited"
       },
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/report.json b/app/javascript/dashboard/i18n/locale/zh_TW/report.json
index 2d2517ebc..2923c6ace 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/report.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/report.json
@@ -37,7 +37,7 @@
       },
       "REPLY_TIME": {
         "NAME": "Customer waiting time",
-        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} conversations)"
+        "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} replies)"
       }
     },
     "DATE_RANGE_OPTIONS": {
@@ -441,7 +441,8 @@
       "LOADING_MESSAGE": "Loading conversation metrics...",
       "OPEN": "打開",
       "UNATTENDED": "Unattended",
-      "UNASSIGNED": "未指派的"
+      "UNASSIGNED": "未指派的",
+      "PENDING": "待處理"
     },
     "CONVERSATION_HEATMAP": {
       "HEADER": "Conversation Traffic",
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/sla.json b/app/javascript/dashboard/i18n/locale/zh_TW/sla.json
index ef7b9ccef..638a17e91 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/sla.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/sla.json
@@ -31,21 +31,24 @@
         "PLACEHOLDER": "SLA for premium customers"
       },
       "FIRST_RESPONSE_TIME": {
-        "LABEL": "First Response Time(Seconds)",
-        "PLACEHOLDER": "300 for 5 minutes"
+        "LABEL": "First Response Time",
+        "PLACEHOLDER": "5"
       },
       "NEXT_RESPONSE_TIME": {
-        "LABEL": "Next Response Time(Seconds)",
-        "PLACEHOLDER": "600 for 10 minutes"
+        "LABEL": "Next Response Time",
+        "PLACEHOLDER": "5"
       },
       "RESOLUTION_TIME": {
-        "LABEL": "Resolution Time(Seconds)",
-        "PLACEHOLDER": "86400 for 1 day"
+        "LABEL": "解決時間",
+        "PLACEHOLDER": "60"
       },
       "BUSINESS_HOURS": {
         "LABEL": "服務時間",
         "PLACEHOLDER": "Only during business hours"
       },
+      "THRESHOLD_TIME": {
+        "INVALID_FORMAT_ERROR": "Threshold should be a number and greater than zero"
+      },
       "EDIT": "編輯",
       "CREATE": "建立",
       "DELETE": "刪除",
diff --git a/app/javascript/widget/i18n/locale/lt.json b/app/javascript/widget/i18n/locale/lt.json
index 1ee559728..52aa279df 100644
--- a/app/javascript/widget/i18n/locale/lt.json
+++ b/app/javascript/widget/i18n/locale/lt.json
@@ -20,7 +20,7 @@
     "IN_A_FEW_MINUTES": "Paprastai atsako per kelias minutes",
     "IN_A_FEW_HOURS": "Paprastai atsako per kelias valandas",
     "IN_A_DAY": "Paprastai atsako per dieną",
-    "BACK_IN": "Mes grįšime online"
+    "BACK_IN": "Mes grįšime"
   },
   "DAY_NAMES": [
     "Sekmadienis",
diff --git a/app/javascript/widget/i18n/locale/ru.json b/app/javascript/widget/i18n/locale/ru.json
index c2c24cc12..303a7ad2f 100644
--- a/app/javascript/widget/i18n/locale/ru.json
+++ b/app/javascript/widget/i18n/locale/ru.json
@@ -20,7 +20,7 @@
     "IN_A_FEW_MINUTES": "Обычно отвечаем в течение нескольких минут",
     "IN_A_FEW_HOURS": "Обычно отвечаем в течение нескольких часов",
     "IN_A_DAY": "Обычно отвечаем в течение дня",
-    "BACK_IN": "Мы вернемся в онлайн"
+    "BACK_IN": "Мы будем онлайн"
   },
   "DAY_NAMES": [
     "Воскресенье",
diff --git a/app/javascript/widget/i18n/locale/uk.json b/app/javascript/widget/i18n/locale/uk.json
index 119c97257..e67a1b6bc 100644
--- a/app/javascript/widget/i18n/locale/uk.json
+++ b/app/javascript/widget/i18n/locale/uk.json
@@ -81,7 +81,7 @@
     "CAMPAIGN_HEADER": "Будь ласка, надайте своє ім'я та електронну пошту перед початком бесіди",
     "IS_REQUIRED": "обов'язково",
     "REQUIRED": "Обов'язково",
-    "REGEX_ERROR": "Please provide a valid input"
+    "REGEX_ERROR": "Будь ласка, введіть коректний текст"
   },
   "FILE_SIZE_LIMIT": "Файл перевищує ліміт вкладення {MAXIMUM_FILE_UPLOAD_SIZE}",
   "CHAT_FORM": {
diff --git a/config/locales/am.yml b/config/locales/am.yml
index 87b4c2c15..582d8f4b2 100644
--- a/config/locales/am.yml
+++ b/config/locales/am.yml
@@ -102,10 +102,12 @@ am:
         recorded_at: Recorded date
   notifications:
     notification_title:
-      conversation_creation: "[New conversation] - #%{display_id} has been created in %{inbox_name}"
-      conversation_assignment: "[Assigned to you] - #%{display_id} has been assigned to you"
-      assigned_conversation_new_message: "[New message] - #%{display_id} %{content}"
-      conversation_mention: "You have been mentioned in conversation [ID - %{display_id}] by %{name}"
+      conversation_creation: "A conversation (#%{display_id}) has been created in %{inbox_name}"
+      conversation_assignment: "A conversation (#%{display_id}) has been assigned to you"
+      assigned_conversation_new_message: "A new message is created in conversation (#%{display_id})"
+      conversation_mention: "You have been mentioned in conversation (#%{display_id})"
+    attachment: "Attachment"
+    no_content: "No content"
   conversations:
     messages:
       instagram_story_content: "%{story_sender} mentioned you in the story: "
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 77272fb1b..e0f4d1a68 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -102,10 +102,12 @@ ar:
         recorded_at: تاريخ التسجيل
   notifications:
     notification_title:
-      conversation_creation: "[محادثة جديدة] - #%{display_id} تم إنشاؤها في %{inbox_name}"
-      conversation_assignment: "[تعيين لك] - #%{display_id} تم تعيينه لك"
-      assigned_conversation_new_message: "[رسالة جديدة] - #%{display_id} %{content}"
-      conversation_mention: "تمت الإشارة إليك في المحادثة [ID - %{display_id}] من قبل %{name}"
+      conversation_creation: "A conversation (#%{display_id}) has been created in %{inbox_name}"
+      conversation_assignment: "A conversation (#%{display_id}) has been assigned to you"
+      assigned_conversation_new_message: "A new message is created in conversation (#%{display_id})"
+      conversation_mention: "You have been mentioned in conversation (#%{display_id})"
+    attachment: "Attachment"
+    no_content: "No content"
   conversations:
     messages:
       instagram_story_content: "أشار %{story_sender} إليك في القصة: "
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 7b5dc6736..01f11125e 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -102,10 +102,12 @@ bg:
         recorded_at: Recorded date
   notifications:
     notification_title:
-      conversation_creation: "[New conversation] - #%{display_id} has been created in %{inbox_name}"
-      conversation_assignment: "[Assigned to you] - #%{display_id} has been assigned to you"
-      assigned_conversation_new_message: "[New message] - #%{display_id} %{content}"
-      conversation_mention: "You have been mentioned in conversation [ID - %{display_id}] by %{name}"
+      conversation_creation: "A conversation (#%{display_id}) has been created in %{inbox_name}"
+      conversation_assignment: "A conversation (#%{display_id}) has been assigned to you"
+      assigned_conversation_new_message: "A new message is created in conversation (#%{display_id})"
+      conversation_mention: "You have been mentioned in conversation (#%{display_id})"
+    attachment: "Attachment"
+    no_content: "No content"
   conversations:
     messages:
       instagram_story_content: "%{story_sender} mentioned you in the story: "
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index de6d919e1..f2725983b 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -102,10 +102,12 @@ ca:
         recorded_at: Recorded date
   notifications:
     notification_title:
-      conversation_creation: "[Nova conversació] - #%{display_id} ha estat creada a %{inbox_name}"
-      conversation_assignment: "[Assignada a tu] - #%{display_id} t'ha sigut assignada"
-      assigned_conversation_new_message: "[Nou missatge] - #%{display_id} %{content}"
-      conversation_mention: "Has sigut esmentat a la conversació [ID - %{display_id} per %{name}"
+      conversation_creation: "A conversation (#%{display_id}) has been created in %{inbox_name}"
+      conversation_assignment: "A conversation (#%{display_id}) has been assigned to you"
+      assigned_conversation_new_message: "A new message is created in conversation (#%{display_id})"
+      conversation_mention: "You have been mentioned in conversation (#%{display_id})"
+    attachment: "Attachment"
+    no_content: "No content"
   conversations:
     messages:
       instagram_story_content: "%{story_sender} mentioned you in the story: "
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 54feee848..fe06057b6 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -102,10 +102,12 @@ cs:
         recorded_at: Recorded date
   notifications:
     notification_title:
-      conversation_creation: "[New conversation] - #%{display_id} has been created in %{inbox_name}"
-      conversation_assignment: "[Assigned to you] - #%{display_id} has been assigned to you"
-      assigned_conversation_new_message: "[New message] - #%{display_id} %{content}"
-      conversation_mention: "You have been mentioned in conversation [ID - %{display_id}] by %{name}"
+      conversation_creation: "A conversation (#%{display_id}) has been created in %{inbox_name}"
+      conversation_assignment: "A conversation (#%{display_id}) has been assigned to you"
+      assigned_conversation_new_message: "A new message is created in conversation (#%{display_id})"
+      conversation_mention: "You have been mentioned in conversation (#%{display_id})"
+    attachment: "Attachment"
+    no_content: "No content"
   conversations:
     messages:
       instagram_story_content: "%{story_sender} mentioned you in the story: "
diff --git a/config/locales/da.yml b/config/locales/da.yml
index c200da344..d31828dbf 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -102,10 +102,12 @@ da:
         recorded_at: Optaget dato
   notifications:
     notification_title:
-      conversation_creation: "[Ny samtale] - #%{display_id} er blevet oprettet i %{inbox_name}"
-      conversation_assignment: "[Tildelt dig] - #%{display_id} er blevet tildelt dig"
-      assigned_conversation_new_message: "[Ny besked] - #%{display_id} %{content}"
-      conversation_mention: "Du er blevet nævnt i samtalen [ID - %{display_id}] af %{name}"
+      conversation_creation: "A conversation (#%{display_id}) has been created in %{inbox_name}"
+      conversation_assignment: "A conversation (#%{display_id}) has been assigned to you"
+      assigned_conversation_new_message: "A new message is created in conversation (#%{display_id})"
+      conversation_mention: "You have been mentioned in conversation (#%{display_id})"
+    attachment: "Attachment"
+    no_content: "No content"
   conversations:
     messages:
       instagram_story_content: "%{story_sender} nævnte dig i historien: "
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 642c5078c..3b2a90202 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -102,10 +102,12 @@ de:
         recorded_at: Aufnahmedatum
   notifications:
     notification_title:
-      conversation_creation: "[Neues Gespräch] - #%{display_id} wurde in %{inbox_name} erstellt"
-      conversation_assignment: "[Ihnen zugewiesen] - #%{display_id} wurde Ihnen zugewiesen"
-      assigned_conversation_new_message: "[Neue Nachricht] - #%{display_id} %{content}"
-      conversation_mention: "Sie wurden in dem Gespräch [ID - %{display_id}] von %{name} erwähnt"
+      conversation_creation: "A conversation (#%{display_id}) has been created in %{inbox_name}"
+      conversation_assignment: "A conversation (#%{display_id}) has been assigned to you"
+      assigned_conversation_new_message: "A new message is created in conversation (#%{display_id})"
+      conversation_mention: "You have been mentioned in conversation (#%{display_id})"
+    attachment: "Attachment"
+    no_content: "No content"
   conversations:
     messages:
       instagram_story_content: "%{story_sender} erwähnte sie in der Geschichte: "
diff --git a/config/locales/el.yml b/config/locales/el.yml
index a4c829f34..4bbc3025d 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -102,10 +102,12 @@ el:
         recorded_at: Ημερομηνία καταγραφής
   notifications:
     notification_title:
-      conversation_creation: "[Νέα συνομιλία] - #%{display_id} δημιουργήθηκε στο %{inbox_name}"
-      conversation_assignment: "[Ανατέθηκε σε εσάς] - #%{display_id} σας έχει ανατεθεί"
-      assigned_conversation_new_message: "[Νέο μήνυμα] - #%{display_id} %{content}"
-      conversation_mention: "Έχετε αναφερθεί σε συζήτηση [ID - %{display_id}] από %{name}"
+      conversation_creation: "A conversation (#%{display_id}) has been created in %{inbox_name}"
+      conversation_assignment: "A conversation (#%{display_id}) has been assigned to you"
+      assigned_conversation_new_message: "A new message is created in conversation (#%{display_id})"
+      conversation_mention: "You have been mentioned in conversation (#%{display_id})"
+    attachment: "Attachment"
+    no_content: "No content"
   conversations:
     messages:
       instagram_story_content: "Ο %{story_sender} σας ανέφερε στην ιστορία: "
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 97041490e..d42fb12dc 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -102,10 +102,12 @@ es:
         recorded_at: Fecha registrada
   notifications:
     notification_title:
-      conversation_creation: "[Nueva conversación] - #%{display_id} ha sido creado en %{inbox_name}"
-      conversation_assignment: "[Asignado a usted] - #%{display_id} le ha sido asignado a usted"
-      assigned_conversation_new_message: "[Nuevo mensaje] - #%{display_id} %{content}"
-      conversation_mention: "Ha sido mencionado en la conversación [ID - %{display_id}] por %{name}"
+      conversation_creation: "A conversation (#%{display_id}) has been created in %{inbox_name}"
+      conversation_assignment: "A conversation (#%{display_id}) has been assigned to you"
+      assigned_conversation_new_message: "A new message is created in conversation (#%{display_id})"
+      conversation_mention: "You have been mentioned in conversation (#%{display_id})"
+    attachment: "Attachment"
+    no_content: "No content"
   conversations:
     messages:
       instagram_story_content: "%{story_sender} te mencionó en la historia: "
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 707359b7b..74cf650f9 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -102,10 +102,12 @@ fa:
         recorded_at: تاریخ ثبت شده
   notifications:
     notification_title:
-      conversation_creation: "[گفتگو جدید] - #%{display_id} در %{inbox_name} ایجاد شده است"
-      conversation_assignment: "[به شما اختصاص داده شده است] - #%{display_id} به شما اختصاص داده شده است"
-      assigned_conversation_new_message: "[پیام جدید] - #%{display_id} %{content}"
-      conversation_mention: "نام شما در مکالمه [ID -%{display_id}] توسط %{name} ذکر شده است"
+      conversation_creation: "A conversation (#%{display_id}) has been created in %{inbox_name}"
+      conversation_assignment: "A conversation (#%{display_id}) has been assigned to you"
+      assigned_conversation_new_message: "A new message is created in conversation (#%{display_id})"
+      conversation_mention: "You have been mentioned in conversation (#%{display_id})"
+    attachment: "Attachment"
+    no_content: "No content"
   conversations:
     messages:
       instagram_story_content: "%{story_sender} در داستان به شما اشاره کرده: "
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index d7320d360..65372e53f 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -102,10 +102,12 @@ fi:
         recorded_at: Recorded date
   notifications:
     notification_title:
-      conversation_creation: "[New conversation] - #%{display_id} has been created in %{inbox_name}"
-      conversation_assignment: "[Assigned to you] - #%{display_id} has been assigned to you"
-      assigned_conversation_new_message: "[New message] - #%{display_id} %{content}"
-      conversation_mention: "You have been mentioned in conversation [ID - %{display_id}] by %{name}"
+      conversation_creation: "A conversation (#%{display_id}) has been created in %{inbox_name}"
+      conversation_assignment: "A conversation (#%{display_id}) has been assigned to you"
+      assigned_conversation_new_message: "A new message is created in conversation (#%{display_id})"
+      conversation_mention: "You have been mentioned in conversation (#%{display_id})"
+    attachment: "Attachment"
+    no_content: "No content"
   conversations:
     messages:
       instagram_story_content: "%{story_sender} mentioned you in the story: "
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 93c270359..2b7ed027a 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -102,10 +102,12 @@ fr:
         recorded_at: Date d'enregistrement
   notifications:
     notification_title:
-      conversation_creation: "[Nouvelle conversation] - #%{display_id} a été créé dans %{inbox_name}"
-      conversation_assignment: "[Vous a été assigné] - #%{display_id} vous a été assigné"
-      assigned_conversation_new_message: "[Nouveau message] - #%{display_id} %{content}"
-      conversation_mention: "Vous avez été mentionné dans la conversation [ID - %{display_id}] par %{name}"
+      conversation_creation: "A conversation (#%{display_id}) has been created in %{inbox_name}"
+      conversation_assignment: "A conversation (#%{display_id}) has been assigned to you"
+      assigned_conversation_new_message: "A new message is created in conversation (#%{display_id})"
+      conversation_mention: "You have been mentioned in conversation (#%{display_id})"
+    attachment: "Attachment"
+    no_content: "No content"
   conversations:
     messages:
       instagram_story_content: "%{story_sender} vous a mentionné dans la story: "
diff --git a/config/locales/he.yml b/config/locales/he.yml
index ca0bf787e..40d9dae71 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -102,10 +102,12 @@ he:
         recorded_at: Recorded date
   notifications:
     notification_title:
-      conversation_creation: "[New conversation] - #%{display_id} has been created in %{inbox_name}"
-      conversation_assignment: "[Assigned to you] - #%{display_id} has been assigned to you"
-      assigned_conversation_new_message: "[New message] - #%{display_id} %{content}"
-      conversation_mention: "You have been mentioned in conversation [ID - %{display_id}] by %{name}"
+      conversation_creation: "A conversation (#%{display_id}) has been created in %{inbox_name}"
+      conversation_assignment: "A conversation (#%{display_id}) has been assigned to you"
+      assigned_conversation_new_message: "A new message is created in conversation (#%{display_id})"
+      conversation_mention: "You have been mentioned in conversation (#%{display_id})"
+    attachment: "Attachment"
+    no_content: "No content"
   conversations:
     messages:
       instagram_story_content: "%{story_sender} mentioned you in the story: "
diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index 9b6185a45..885658d23 100644
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -102,10 +102,12 @@ hi:
         recorded_at: Recorded date
   notifications:
     notification_title:
-      conversation_creation: "[New conversation] - #%{display_id} has been created in %{inbox_name}"
-      conversation_assignment: "[Assigned to you] - #%{display_id} has been assigned to you"
-      assigned_conversation_new_message: "[New message] - #%{display_id} %{content}"
-      conversation_mention: "You have been mentioned in conversation [ID - %{display_id}] by %{name}"
+      conversation_creation: "A conversation (#%{display_id}) has been created in %{inbox_name}"
+      conversation_assignment: "A conversation (#%{display_id}) has been assigned to you"
+      assigned_conversation_new_message: "A new message is created in conversation (#%{display_id})"
+      conversation_mention: "You have been mentioned in conversation (#%{display_id})"
+    attachment: "Attachment"
+    no_content: "No content"
   conversations:
     messages:
       instagram_story_content: "%{story_sender} mentioned you in the story: "
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 44bee04e9..8bc657b7d 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -102,10 +102,12 @@ hr:
         recorded_at: Recorded date
   notifications:
     notification_title:
-      conversation_creation: "[New conversation] - #%{display_id} has been created in %{inbox_name}"
-      conversation_assignment: "[Assigned to you] - #%{display_id} has been assigned to you"
-      assigned_conversation_new_message: "[New message] - #%{display_id} %{content}"
-      conversation_mention: "You have been mentioned in conversation [ID - %{display_id}] by %{name}"
+      conversation_creation: "A conversation (#%{display_id}) has been created in %{inbox_name}"
+      conversation_assignment: "A conversation (#%{display_id}) has been assigned to you"
+      assigned_conversation_new_message: "A new message is created in conversation (#%{display_id})"
+      conversation_mention: "You have been mentioned in conversation (#%{display_id})"
+    attachment: "Attachment"
+    no_content: "No content"
   conversations:
     messages:
       instagram_story_content: "%{story_sender} mentioned you in the story: "
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 0c60b3676..3136f35cb 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -102,10 +102,12 @@ hu:
         recorded_at: Felvétel időpontja
   notifications:
     notification_title:
-      conversation_creation: "[Új beszélgetés] - #%{display_id} létrejött itt:%{inbox_name}"
-      conversation_assignment: "[Hozzád rendelve] - #%{display_id} hozzád lett rendelve"
-      assigned_conversation_new_message: "[Új üzenet] - #%{display_id} %{content}"
-      conversation_mention: "%{name} megemlítet ebben a beszélgetésben [ID - %{display_id}]"
+      conversation_creation: "A conversation (#%{display_id}) has been created in %{inbox_name}"
+      conversation_assignment: "A conversation (#%{display_id}) has been assigned to you"
+      assigned_conversation_new_message: "A new message is created in conversation (#%{display_id})"
+      conversation_mention: "You have been mentioned in conversation (#%{display_id})"
+    attachment: "Attachment"
+    no_content: "No content"
   conversations:
     messages:
       instagram_story_content: "%{story_sender} megemlített egy storyban: "
diff --git a/config/locales/hy.yml b/config/locales/hy.yml
index 2546c9424..8fc81fbe1 100644
--- a/config/locales/hy.yml
+++ b/config/locales/hy.yml
@@ -102,10 +102,12 @@ hy:
         recorded_at: Recorded date
   notifications:
     notification_title:
-      conversation_creation: "[New conversation] - #%{display_id} has been created in %{inbox_name}"
-      conversation_assignment: "[Assigned to you] - #%{display_id} has been assigned to you"
-      assigned_conversation_new_message: "[New message] - #%{display_id} %{content}"
-      conversation_mention: "You have been mentioned in conversation [ID - %{display_id}] by %{name}"
+      conversation_creation: "A conversation (#%{display_id}) has been created in %{inbox_name}"
+      conversation_assignment: "A conversation (#%{display_id}) has been assigned to you"
+      assigned_conversation_new_message: "A new message is created in conversation (#%{display_id})"
+      conversation_mention: "You have been mentioned in conversation (#%{display_id})"
+    attachment: "Attachment"
+    no_content: "No content"
   conversations:
     messages:
       instagram_story_content: "%{story_sender} mentioned you in the story: "
diff --git a/config/locales/id.yml b/config/locales/id.yml
index b6213beb3..92c9fa186 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -102,10 +102,12 @@ id:
         recorded_at: Tanggal rekaman
   notifications:
     notification_title:
-      conversation_creation: "[Percakapan baru] - #%{display_id} telah dibuat di %{inbox_name}"
-      conversation_assignment: "[Ditugaskan untuk Anda] - #%{display_id} telah ditugaskan untuk Anda"
-      assigned_conversation_new_message: "[Pesan baru] - #%{display_id} %{content}"
-      conversation_mention: "Anda telah di mention dalam percakapan [ID - %{display_id}] by %{name}"
+      conversation_creation: "A conversation (#%{display_id}) has been created in %{inbox_name}"
+      conversation_assignment: "A conversation (#%{display_id}) has been assigned to you"
+      assigned_conversation_new_message: "A new message is created in conversation (#%{display_id})"
+      conversation_mention: "You have been mentioned in conversation (#%{display_id})"
+    attachment: "Attachment"
+    no_content: "No content"
   conversations:
     messages:
       instagram_story_content: "%{story_sender} menyebutmu dalam story: "
diff --git a/config/locales/is.yml b/config/locales/is.yml
index b9f4b4054..b027f57c4 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -102,10 +102,12 @@ is:
         recorded_at: Recorded date
   notifications:
     notification_title:
-      conversation_creation: "[Nýtt samtal] - #%{display_id} hefur verið búið til í %{inbox_name}"
-      conversation_assignment: "[Úthlutað þér] - #%{display_id} hefur verið úthlutað þér"
-      assigned_conversation_new_message: "[New message] - #%{display_id} %{content}"
-      conversation_mention: "%{name} hefur minnst á þig í samtali [ID - %{display_id}]"
+      conversation_creation: "A conversation (#%{display_id}) has been created in %{inbox_name}"
+      conversation_assignment: "A conversation (#%{display_id}) has been assigned to you"
+      assigned_conversation_new_message: "A new message is created in conversation (#%{display_id})"
+      conversation_mention: "You have been mentioned in conversation (#%{display_id})"
+    attachment: "Attachment"
+    no_content: "No content"
   conversations:
     messages:
       instagram_story_content: "%{story_sender} minntist á þig í sögunni: "
diff --git a/config/locales/it.yml b/config/locales/it.yml
index d73e25977..8829d94dc 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -102,10 +102,12 @@ it:
         recorded_at: Data di registrazione
   notifications:
     notification_title:
-      conversation_creation: "[Nuova conversazione] - #%{display_id} è stato creato in %{inbox_name}"
-      conversation_assignment: "[Assegnato a te] - #%{display_id} ti è stato assegnato"
-      assigned_conversation_new_message: "[Nuovo messaggio] - #%{display_id} %{content}"
-      conversation_mention: "Sei stato menzionato nella conversazione [ID - %{display_id}] da %{name}"
+      conversation_creation: "A conversation (#%{display_id}) has been created in %{inbox_name}"
+      conversation_assignment: "A conversation (#%{display_id}) has been assigned to you"
+      assigned_conversation_new_message: "A new message is created in conversation (#%{display_id})"
+      conversation_mention: "You have been mentioned in conversation (#%{display_id})"
+    attachment: "Attachment"
+    no_content: "No content"
   conversations:
     messages:
       instagram_story_content: "%{story_sender} ti ha menzionato nella storia: "
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 9f025c1e4..c7fea4afd 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -102,10 +102,12 @@ ja:
         recorded_at: Recorded date
   notifications:
     notification_title:
-      conversation_creation: "[New conversation] - #%{display_id} has been created in %{inbox_name}"
-      conversation_assignment: "[Assigned to you] - #%{display_id} has been assigned to you"
-      assigned_conversation_new_message: "[New message] - #%{display_id} %{content}"
-      conversation_mention: "You have been mentioned in conversation [ID - %{display_id}] by %{name}"
+      conversation_creation: "A conversation (#%{display_id}) has been created in %{inbox_name}"
+      conversation_assignment: "A conversation (#%{display_id}) has been assigned to you"
+      assigned_conversation_new_message: "A new message is created in conversation (#%{display_id})"
+      conversation_mention: "You have been mentioned in conversation (#%{display_id})"
+    attachment: "Attachment"
+    no_content: "No content"
   conversations:
     messages:
       instagram_story_content: "%{story_sender} mentioned you in the story: "
diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index 165935f99..b8e8729bd 100644
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -102,10 +102,12 @@ ka:
         recorded_at: Recorded date
   notifications:
     notification_title:
-      conversation_creation: "[New conversation] - #%{display_id} has been created in %{inbox_name}"
-      conversation_assignment: "[Assigned to you] - #%{display_id} has been assigned to you"
-      assigned_conversation_new_message: "[New message] - #%{display_id} %{content}"
-      conversation_mention: "You have been mentioned in conversation [ID - %{display_id}] by %{name}"
+      conversation_creation: "A conversation (#%{display_id}) has been created in %{inbox_name}"
+      conversation_assignment: "A conversation (#%{display_id}) has been assigned to you"
+      assigned_conversation_new_message: "A new message is created in conversation (#%{display_id})"
+      conversation_mention: "You have been mentioned in conversation (#%{display_id})"
+    attachment: "Attachment"
+    no_content: "No content"
   conversations:
     messages:
       instagram_story_content: "%{story_sender} mentioned you in the story: "
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index f62928f00..11a2bf966 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -102,10 +102,12 @@ ko:
         recorded_at: Recorded date
   notifications:
     notification_title:
-      conversation_creation: "[New conversation] - #%{display_id} has been created in %{inbox_name}"
-      conversation_assignment: "[Assigned to you] - #%{display_id} has been assigned to you"
-      assigned_conversation_new_message: "[New message] - #%{display_id} %{content}"
-      conversation_mention: "You have been mentioned in conversation [ID - %{display_id}] by %{name}"
+      conversation_creation: "A conversation (#%{display_id}) has been created in %{inbox_name}"
+      conversation_assignment: "A conversation (#%{display_id}) has been assigned to you"
+      assigned_conversation_new_message: "A new message is created in conversation (#%{display_id})"
+      conversation_mention: "You have been mentioned in conversation (#%{display_id})"
+    attachment: "Attachment"
+    no_content: "No content"
   conversations:
     messages:
       instagram_story_content: "%{story_sender} mentioned you in the story: "
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 8fd1b342a..8c0a2da94 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -102,10 +102,12 @@ lt:
         recorded_at: Įrašo data
   notifications:
     notification_title:
-      conversation_creation: "[Naujas pokalbis] – #%{display_id} buvo sukurtas %{inbox_name}"
-      conversation_assignment: "[Priskirta jums] – jums buvo priskirta #%{display_id}"
-      assigned_conversation_new_message: "[Naujas pranešimas] – #%{display_id} %{content}"
-      conversation_mention: "Jus %{name} paminėjo [ID - %{display_id}] pokalbyje"
+      conversation_creation: "A conversation (#%{display_id}) has been created in %{inbox_name}"
+      conversation_assignment: "A conversation (#%{display_id}) has been assigned to you"
+      assigned_conversation_new_message: "A new message is created in conversation (#%{display_id})"
+      conversation_mention: "You have been mentioned in conversation (#%{display_id})"
+    attachment: "Attachment"
+    no_content: "No content"
   conversations:
     messages:
       instagram_story_content: "%{story_sender} paminėjo jus pasakojime: "
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 6cf50833d..3b9fca4f6 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -102,10 +102,12 @@ lv:
         recorded_at: Reģistrētais datums
   notifications:
     notification_title:
-      conversation_creation: "[Jauna saruna] - #%{display_id} ir izveidota iesūtnē %{inbox_name}"
-      conversation_assignment: "[Piešķirts Jums] - Jums ir piešķirts #%{display_id}"
-      assigned_conversation_new_message: "[Jauns ziņojums] - #%{display_id} %{content}"
-      conversation_mention: "Jūs pieminēja sarunā [ID - %{display_id}] kā %{name}"
+      conversation_creation: "A conversation (#%{display_id}) has been created in %{inbox_name}"
+      conversation_assignment: "A conversation (#%{display_id}) has been assigned to you"
+      assigned_conversation_new_message: "A new message is created in conversation (#%{display_id})"
+      conversation_mention: "You have been mentioned in conversation (#%{display_id})"
+    attachment: "Attachment"
+    no_content: "No content"
   conversations:
     messages:
       instagram_story_content: "%{story_sender} pieminēja jūs stāstā: "
@@ -231,18 +233,18 @@ lv:
     button: Atvērt sarunu
   time_units:
     days:
-      zero: "%{count} days"
-      one: "%{count} day"
+      zero: "%{count} dienas"
+      one: "%{count} diena"
       other: "%{count} dienas"
     hours:
-      zero: "%{count} hours"
-      one: "%{count} hour"
+      zero: "%{count} stundas"
+      one: "%{count} stunda"
       other: "%{count} stundas"
     minutes:
-      zero: "%{count} minutes"
-      one: "%{count} minute"
+      zero: "%{count} minūtes"
+      one: "%{count} minūte"
       other: "%{count} minūtes"
     seconds:
-      zero: "%{count} seconds"
-      one: "%{count} second"
+      zero: "%{count} sekundes"
+      one: "%{count} sekunde"
       other: "%{count} sekundes"
diff --git a/config/locales/ml.yml b/config/locales/ml.yml
index 07f715d30..80426891b 100644
--- a/config/locales/ml.yml
+++ b/config/locales/ml.yml
@@ -102,10 +102,12 @@ ml:
         recorded_at: Recorded date
   notifications:
     notification_title:
-      conversation_creation: "[New conversation] - #%{display_id} has been created in %{inbox_name}"
-      conversation_assignment: "[Assigned to you] - #%{display_id} has been assigned to you"
-      assigned_conversation_new_message: "[New message] - #%{display_id} %{content}"
-      conversation_mention: "You have been mentioned in conversation [ID - %{display_id}] by %{name}"
+      conversation_creation: "A conversation (#%{display_id}) has been created in %{inbox_name}"
+      conversation_assignment: "A conversation (#%{display_id}) has been assigned to you"
+      assigned_conversation_new_message: "A new message is created in conversation (#%{display_id})"
+      conversation_mention: "You have been mentioned in conversation (#%{display_id})"
+    attachment: "Attachment"
+    no_content: "No content"
   conversations:
     messages:
       instagram_story_content: "%{story_sender} mentioned you in the story: "
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index d62ab48c9..9b7fd174c 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -102,10 +102,12 @@ ms:
         recorded_at: Recorded date
   notifications:
     notification_title:
-      conversation_creation: "[New conversation] - #%{display_id} has been created in %{inbox_name}"
-      conversation_assignment: "[Assigned to you] - #%{display_id} has been assigned to you"
-      assigned_conversation_new_message: "[New message] - #%{display_id} %{content}"
-      conversation_mention: "You have been mentioned in conversation [ID - %{display_id}] by %{name}"
+      conversation_creation: "A conversation (#%{display_id}) has been created in %{inbox_name}"
+      conversation_assignment: "A conversation (#%{display_id}) has been assigned to you"
+      assigned_conversation_new_message: "A new message is created in conversation (#%{display_id})"
+      conversation_mention: "You have been mentioned in conversation (#%{display_id})"
+    attachment: "Attachment"
+    no_content: "No content"
   conversations:
     messages:
       instagram_story_content: "%{story_sender} mentioned you in the story: "
diff --git a/config/locales/ne.yml b/config/locales/ne.yml
index a4df39498..5cad161cc 100644
--- a/config/locales/ne.yml
+++ b/config/locales/ne.yml
@@ -102,10 +102,12 @@ ne:
         recorded_at: Recorded date
   notifications:
     notification_title:
-      conversation_creation: "[New conversation] - #%{display_id} has been created in %{inbox_name}"
-      conversation_assignment: "[Assigned to you] - #%{display_id} has been assigned to you"
-      assigned_conversation_new_message: "[New message] - #%{display_id} %{content}"
-      conversation_mention: "You have been mentioned in conversation [ID - %{display_id}] by %{name}"
+      conversation_creation: "A conversation (#%{display_id}) has been created in %{inbox_name}"
+      conversation_assignment: "A conversation (#%{display_id}) has been assigned to you"
+      assigned_conversation_new_message: "A new message is created in conversation (#%{display_id})"
+      conversation_mention: "You have been mentioned in conversation (#%{display_id})"
+    attachment: "Attachment"
+    no_content: "No content"
   conversations:
     messages:
       instagram_story_content: "%{story_sender} mentioned you in the story: "
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 56bfe4d7d..5a3a8c816 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -102,10 +102,12 @@ nl:
         recorded_at: Datum opgenomen
   notifications:
     notification_title:
-      conversation_creation: "[New conversation] - #%{display_id} is aangemaakt in %{inbox_name}"
-      conversation_assignment: "[Toegewezen aan jou] - #%{display_id} is aan jou toegewezen"
-      assigned_conversation_new_message: "[Nieuw bericht] - #%{display_id} %{content}"
-      conversation_mention: "Je bent genoemd in gesprek [ID - %{display_id}] door %{name}"
+      conversation_creation: "A conversation (#%{display_id}) has been created in %{inbox_name}"
+      conversation_assignment: "A conversation (#%{display_id}) has been assigned to you"
+      assigned_conversation_new_message: "A new message is created in conversation (#%{display_id})"
+      conversation_mention: "You have been mentioned in conversation (#%{display_id})"
+    attachment: "Attachment"
+    no_content: "No content"
   conversations:
     messages:
       instagram_story_content: "%{story_sender} heeft je genoemd in het verhaal: "
diff --git a/config/locales/no.yml b/config/locales/no.yml
index d5bb49b4f..a39346a7c 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -102,10 +102,12 @@
         recorded_at: Recorded date
   notifications:
     notification_title:
-      conversation_creation: "[New conversation] - #%{display_id} has been created in %{inbox_name}"
-      conversation_assignment: "[Assigned to you] - #%{display_id} has been assigned to you"
-      assigned_conversation_new_message: "[New message] - #%{display_id} %{content}"
-      conversation_mention: "You have been mentioned in conversation [ID - %{display_id}] by %{name}"
+      conversation_creation: "A conversation (#%{display_id}) has been created in %{inbox_name}"
+      conversation_assignment: "A conversation (#%{display_id}) has been assigned to you"
+      assigned_conversation_new_message: "A new message is created in conversation (#%{display_id})"
+      conversation_mention: "You have been mentioned in conversation (#%{display_id})"
+    attachment: "Attachment"
+    no_content: "No content"
   conversations:
     messages:
       instagram_story_content: "%{story_sender} mentioned you in the story: "
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index fb9418d17..225847841 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -102,10 +102,12 @@ pl:
         recorded_at: Data nagrania
   notifications:
     notification_title:
-      conversation_creation: "[Nowa rozmowa] - #%{display_id} został utworzony w %{inbox_name}"
-      conversation_assignment: "[Przypisane do Ciebie] - #%{display_id} został przypisany do Ciebie"
-      assigned_conversation_new_message: "[Nowa wiadomość] - #%{display_id} %{content}"
-      conversation_mention: "Zostałeś wspomniany w konwersacji [ID - %{display_id}] przez %{name}"
+      conversation_creation: "A conversation (#%{display_id}) has been created in %{inbox_name}"
+      conversation_assignment: "A conversation (#%{display_id}) has been assigned to you"
+      assigned_conversation_new_message: "A new message is created in conversation (#%{display_id})"
+      conversation_mention: "You have been mentioned in conversation (#%{display_id})"
+    attachment: "Attachment"
+    no_content: "No content"
   conversations:
     messages:
       instagram_story_content: "%{story_sender} wspomniał o Tobie w historii: "
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 01f47fcf1..f95a3d67e 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -102,10 +102,12 @@ pt:
         recorded_at: Data de gravação
   notifications:
     notification_title:
-      conversation_creation: "[Nova conversa] - #%{display_id} foi criada em %{inbox_name}"
-      conversation_assignment: "[Atribuído a si] - #%{display_id} foi-lhe atribuído"
-      assigned_conversation_new_message: "[Nova mensagem] -%{display_id} %{content}"
-      conversation_mention: "Foi mencionado na conversa [ID - %{display_id}] por %{name}"
+      conversation_creation: "A conversation (#%{display_id}) has been created in %{inbox_name}"
+      conversation_assignment: "A conversation (#%{display_id}) has been assigned to you"
+      assigned_conversation_new_message: "A new message is created in conversation (#%{display_id})"
+      conversation_mention: "You have been mentioned in conversation (#%{display_id})"
+    attachment: "Attachment"
+    no_content: "No content"
   conversations:
     messages:
       instagram_story_content: "%{story_sender} mencionou você na história: "
diff --git a/config/locales/pt_BR.yml b/config/locales/pt_BR.yml
index f4d2e1c42..4edce40e6 100644
--- a/config/locales/pt_BR.yml
+++ b/config/locales/pt_BR.yml
@@ -102,10 +102,12 @@ pt_BR:
         recorded_at: Data de gravação
   notifications:
     notification_title:
-      conversation_creation: "[Nova conversa] - #%{display_id} foi criado em %{inbox_name}"
-      conversation_assignment: "[Atribuído a você] - #%{display_id} foi atribuído a você"
-      assigned_conversation_new_message: "[Nova mensagem] - #%{display_id} %{content}"
-      conversation_mention: "Você foi mencionado na conversa [ID - %{display_id}] por %{name}"
+      conversation_creation: "A conversation (#%{display_id}) has been created in %{inbox_name}"
+      conversation_assignment: "A conversation (#%{display_id}) has been assigned to you"
+      assigned_conversation_new_message: "A new message is created in conversation (#%{display_id})"
+      conversation_mention: "You have been mentioned in conversation (#%{display_id})"
+    attachment: "Attachment"
+    no_content: "No content"
   conversations:
     messages:
       instagram_story_content: "%{story_sender} mencionou você na conversa: "
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 146224d66..8cfb51968 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -102,10 +102,12 @@ ro:
         recorded_at: Data înregistrată
   notifications:
     notification_title:
-      conversation_creation: "[Conversație nouă] - #%{display_id} a fost creat în %{inbox_name}"
-      conversation_assignment: "[V-a fost atribuit] - #%{display_id} v-a fost atribuit"
-      assigned_conversation_new_message: "[Mesaj nou] - #%{display_id} %{content}"
-      conversation_mention: "Ați fost menționat în conversație [ID - %{display_id}] de către %{name}"
+      conversation_creation: "A conversation (#%{display_id}) has been created in %{inbox_name}"
+      conversation_assignment: "A conversation (#%{display_id}) has been assigned to you"
+      assigned_conversation_new_message: "A new message is created in conversation (#%{display_id})"
+      conversation_mention: "You have been mentioned in conversation (#%{display_id})"
+    attachment: "Attachment"
+    no_content: "No content"
   conversations:
     messages:
       instagram_story_content: "%{story_sender} menționat în poveste: "
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index d967b3621..94d19806a 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -42,7 +42,7 @@ ru:
       export:
         success: Мы сообщим вам, как только файл для экспорта контактов будет готов к просмотру.
       email:
-        invalid: Не верный email
+        invalid: Неверный email
       phone_number:
         invalid: должен иметь формат e164
     categories:
@@ -72,14 +72,14 @@ ru:
       avg_first_response_time: Среднее время первого ответа
       avg_resolution_time: Среднее время завершения
     inbox_csv:
-      inbox_name: Inbox name
-      inbox_type: Inbox type
-      conversations_count: No. of conversations
+      inbox_name: Имя источника
+      inbox_type: Тип входящего сообщения
+      conversations_count: Количество диалогов
       avg_first_response_time: Среднее время первого ответа
       avg_resolution_time: Среднее время завершения
     label_csv:
       label_title: Метка
-      conversations_count: No. of conversations
+      conversations_count: Количество диалогов
       avg_first_response_time: Среднее время первого ответа
       avg_resolution_time: Среднее время завершения
     team_csv:
@@ -92,20 +92,22 @@ ru:
     default_group_by: день
     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
+        contact_name: Имя контакта
+        contact_email_address: Email контакта
+        contact_phone_number: Номер телефона контакта
+        link_to_the_conversation: Ссылка на диалог
         agent_name: Имя оператора
         rating: Оценка
-        feedback: Feedback Comment
-        recorded_at: Recorded date
+        feedback: Комментарий к отзыву
+        recorded_at: Дата записи
   notifications:
     notification_title:
-      conversation_creation: "[Новая беседа] - #%{display_id} была создана в %{inbox_name}"
-      conversation_assignment: "[Назначено Вам] - #%{display_id} была назначена Вам"
-      assigned_conversation_new_message: "[Новое сообщение] - #%{display_id} %{content}"
-      conversation_mention: "Вас упомянули в разговоре [ID - %{display_id}] %{name}"
+      conversation_creation: "A conversation (#%{display_id}) has been created in %{inbox_name}"
+      conversation_assignment: "A conversation (#%{display_id}) has been assigned to you"
+      assigned_conversation_new_message: "A new message is created in conversation (#%{display_id})"
+      conversation_mention: "You have been mentioned in conversation (#%{display_id})"
+    attachment: "Attachment"
+    no_content: "No content"
   conversations:
     messages:
       instagram_story_content: "%{story_sender} упомянул Вас в истории: "
diff --git a/config/locales/sh.yml b/config/locales/sh.yml
index e01cb1183..7d9460d5f 100644
--- a/config/locales/sh.yml
+++ b/config/locales/sh.yml
@@ -102,10 +102,12 @@ sh:
         recorded_at: Recorded date
   notifications:
     notification_title:
-      conversation_creation: "[New conversation] - #%{display_id} has been created in %{inbox_name}"
-      conversation_assignment: "[Assigned to you] - #%{display_id} has been assigned to you"
-      assigned_conversation_new_message: "[New message] - #%{display_id} %{content}"
-      conversation_mention: "You have been mentioned in conversation [ID - %{display_id}] by %{name}"
+      conversation_creation: "A conversation (#%{display_id}) has been created in %{inbox_name}"
+      conversation_assignment: "A conversation (#%{display_id}) has been assigned to you"
+      assigned_conversation_new_message: "A new message is created in conversation (#%{display_id})"
+      conversation_mention: "You have been mentioned in conversation (#%{display_id})"
+    attachment: "Attachment"
+    no_content: "No content"
   conversations:
     messages:
       instagram_story_content: "%{story_sender} mentioned you in the story: "
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 2d0bcec31..c17881a5a 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -102,10 +102,12 @@ sk:
         recorded_at: Recorded date
   notifications:
     notification_title:
-      conversation_creation: "[New conversation] - #%{display_id} has been created in %{inbox_name}"
-      conversation_assignment: "[Assigned to you] - #%{display_id} has been assigned to you"
-      assigned_conversation_new_message: "[New message] - #%{display_id} %{content}"
-      conversation_mention: "You have been mentioned in conversation [ID - %{display_id}] by %{name}"
+      conversation_creation: "A conversation (#%{display_id}) has been created in %{inbox_name}"
+      conversation_assignment: "A conversation (#%{display_id}) has been assigned to you"
+      assigned_conversation_new_message: "A new message is created in conversation (#%{display_id})"
+      conversation_mention: "You have been mentioned in conversation (#%{display_id})"
+    attachment: "Attachment"
+    no_content: "No content"
   conversations:
     messages:
       instagram_story_content: "%{story_sender} mentioned you in the story: "
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 2842d1347..1bd8b9f07 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -102,10 +102,12 @@ sl:
         recorded_at: Recorded date
   notifications:
     notification_title:
-      conversation_creation: "[New conversation] - #%{display_id} has been created in %{inbox_name}"
-      conversation_assignment: "[Assigned to you] - #%{display_id} has been assigned to you"
-      assigned_conversation_new_message: "[New message] - #%{display_id} %{content}"
-      conversation_mention: "You have been mentioned in conversation [ID - %{display_id}] by %{name}"
+      conversation_creation: "A conversation (#%{display_id}) has been created in %{inbox_name}"
+      conversation_assignment: "A conversation (#%{display_id}) has been assigned to you"
+      assigned_conversation_new_message: "A new message is created in conversation (#%{display_id})"
+      conversation_mention: "You have been mentioned in conversation (#%{display_id})"
+    attachment: "Attachment"
+    no_content: "No content"
   conversations:
     messages:
       instagram_story_content: "%{story_sender} mentioned you in the story: "
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index ea8e9b19e..aacd83b72 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -102,10 +102,12 @@ sq:
         recorded_at: Recorded date
   notifications:
     notification_title:
-      conversation_creation: "[New conversation] - #%{display_id} has been created in %{inbox_name}"
-      conversation_assignment: "[Assigned to you] - #%{display_id} has been assigned to you"
-      assigned_conversation_new_message: "[New message] - #%{display_id} %{content}"
-      conversation_mention: "You have been mentioned in conversation [ID - %{display_id}] by %{name}"
+      conversation_creation: "A conversation (#%{display_id}) has been created in %{inbox_name}"
+      conversation_assignment: "A conversation (#%{display_id}) has been assigned to you"
+      assigned_conversation_new_message: "A new message is created in conversation (#%{display_id})"
+      conversation_mention: "You have been mentioned in conversation (#%{display_id})"
+    attachment: "Attachment"
+    no_content: "No content"
   conversations:
     messages:
       instagram_story_content: "%{story_sender} mentioned you in the story: "
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 652b34f42..1826e2c89 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -102,10 +102,12 @@ sr-Latn:
         recorded_at: Snimljen dana
   notifications:
     notification_title:
-      conversation_creation: "[Novi razgovor] - #%{display_id} je napravljen u %{inbox_name}"
-      conversation_assignment: "[Dodeljeno vama] - #%{display_id} je dodeljen vama"
-      assigned_conversation_new_message: "[Nova poruka] - #%{display_id} %{content}"
-      conversation_mention: "Pomenuti ste u razgovoru [ID - %{display_id}] od strane %{name}"
+      conversation_creation: "A conversation (#%{display_id}) has been created in %{inbox_name}"
+      conversation_assignment: "A conversation (#%{display_id}) has been assigned to you"
+      assigned_conversation_new_message: "A new message is created in conversation (#%{display_id})"
+      conversation_mention: "You have been mentioned in conversation (#%{display_id})"
+    attachment: "Attachment"
+    no_content: "No content"
   conversations:
     messages:
       instagram_story_content: "%{story_sender} vas je pomenuo u priči: "
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index fe894551c..0e6340aa3 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -102,10 +102,12 @@ sv:
         recorded_at: Recorded date
   notifications:
     notification_title:
-      conversation_creation: "[Ny konversation] - #%{display_id} har skapats i %{inbox_name}"
-      conversation_assignment: "[Tilldelad dig] - #%{display_id} har tilldelats dig"
-      assigned_conversation_new_message: "[Nytt meddelande] - #%{display_id} %{content}"
-      conversation_mention: "Du har nämnts i konversationen [ID - %{display_id}] av %{name}"
+      conversation_creation: "A conversation (#%{display_id}) has been created in %{inbox_name}"
+      conversation_assignment: "A conversation (#%{display_id}) has been assigned to you"
+      assigned_conversation_new_message: "A new message is created in conversation (#%{display_id})"
+      conversation_mention: "You have been mentioned in conversation (#%{display_id})"
+    attachment: "Attachment"
+    no_content: "No content"
   conversations:
     messages:
       instagram_story_content: "%{story_sender} mentioned you in the story: "
diff --git a/config/locales/ta.yml b/config/locales/ta.yml
index c2185ea8b..4a0b51bd5 100644
--- a/config/locales/ta.yml
+++ b/config/locales/ta.yml
@@ -102,10 +102,12 @@ ta:
         recorded_at: Recorded date
   notifications:
     notification_title:
-      conversation_creation: "[New conversation] - #%{display_id} has been created in %{inbox_name}"
-      conversation_assignment: "[Assigned to you] - #%{display_id} has been assigned to you"
-      assigned_conversation_new_message: "[New message] - #%{display_id} %{content}"
-      conversation_mention: "You have been mentioned in conversation [ID - %{display_id}] by %{name}"
+      conversation_creation: "A conversation (#%{display_id}) has been created in %{inbox_name}"
+      conversation_assignment: "A conversation (#%{display_id}) has been assigned to you"
+      assigned_conversation_new_message: "A new message is created in conversation (#%{display_id})"
+      conversation_mention: "You have been mentioned in conversation (#%{display_id})"
+    attachment: "Attachment"
+    no_content: "No content"
   conversations:
     messages:
       instagram_story_content: "%{story_sender} mentioned you in the story: "
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 92b4bd557..407f120ae 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -102,10 +102,12 @@ th:
         recorded_at: Recorded date
   notifications:
     notification_title:
-      conversation_creation: "[New conversation] - #%{display_id} has been created in %{inbox_name}"
-      conversation_assignment: "[Assigned to you] - #%{display_id} has been assigned to you"
-      assigned_conversation_new_message: "[New message] - #%{display_id} %{content}"
-      conversation_mention: "You have been mentioned in conversation [ID - %{display_id}] by %{name}"
+      conversation_creation: "A conversation (#%{display_id}) has been created in %{inbox_name}"
+      conversation_assignment: "A conversation (#%{display_id}) has been assigned to you"
+      assigned_conversation_new_message: "A new message is created in conversation (#%{display_id})"
+      conversation_mention: "You have been mentioned in conversation (#%{display_id})"
+    attachment: "Attachment"
+    no_content: "No content"
   conversations:
     messages:
       instagram_story_content: "%{story_sender} mentioned you in the story: "
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 907f02f56..6d6c50d4b 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -102,10 +102,12 @@ tr:
         recorded_at: Kaydedilen tarih
   notifications:
     notification_title:
-      conversation_creation: "[Yeni konuşma] - #%{display_id} %{inbox_name} içinde oluşturuldu"
-      conversation_assignment: "[Sana atandı] - #%{display_id} seninle ilişkilendirildi"
-      assigned_conversation_new_message: "[Yeni mesaj] - #%{display_id} %{content}"
-      conversation_mention: "Sen, %{name} tarafından konuşmada bahsedildin [ID - %{display_id}]"
+      conversation_creation: "A conversation (#%{display_id}) has been created in %{inbox_name}"
+      conversation_assignment: "A conversation (#%{display_id}) has been assigned to you"
+      assigned_conversation_new_message: "A new message is created in conversation (#%{display_id})"
+      conversation_mention: "You have been mentioned in conversation (#%{display_id})"
+    attachment: "Attachment"
+    no_content: "No content"
   conversations:
     messages:
       instagram_story_content: "%{story_sender} hikayesinde senden bahsetti: "
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 5eae135e4..55acdec3a 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -102,10 +102,12 @@ uk:
         recorded_at: Дата запису
   notifications:
     notification_title:
-      conversation_creation: "[Новий діалог] - #%{display_id} було створено в %{inbox_name}"
-      conversation_assignment: "[Призначено вам] - #%{display_id} було призначено вам"
-      assigned_conversation_new_message: "[Нове повідомлення] - #%{display_id} %{content}"
-      conversation_mention: "Ви були згадані в діалозі [ID - %{display_id}] від %{name}"
+      conversation_creation: "A conversation (#%{display_id}) has been created in %{inbox_name}"
+      conversation_assignment: "A conversation (#%{display_id}) has been assigned to you"
+      assigned_conversation_new_message: "A new message is created in conversation (#%{display_id})"
+      conversation_mention: "You have been mentioned in conversation (#%{display_id})"
+    attachment: "Attachment"
+    no_content: "No content"
   conversations:
     messages:
       instagram_story_content: "%{story_sender} згадав вас у сторіс: "
diff --git a/config/locales/ur.yml b/config/locales/ur.yml
index 947f9987d..2309d4725 100644
--- a/config/locales/ur.yml
+++ b/config/locales/ur.yml
@@ -102,10 +102,12 @@ ur:
         recorded_at: Recorded date
   notifications:
     notification_title:
-      conversation_creation: "[New conversation] - #%{display_id} has been created in %{inbox_name}"
-      conversation_assignment: "[Assigned to you] - #%{display_id} has been assigned to you"
-      assigned_conversation_new_message: "[New message] - #%{display_id} %{content}"
-      conversation_mention: "You have been mentioned in conversation [ID - %{display_id}] by %{name}"
+      conversation_creation: "A conversation (#%{display_id}) has been created in %{inbox_name}"
+      conversation_assignment: "A conversation (#%{display_id}) has been assigned to you"
+      assigned_conversation_new_message: "A new message is created in conversation (#%{display_id})"
+      conversation_mention: "You have been mentioned in conversation (#%{display_id})"
+    attachment: "Attachment"
+    no_content: "No content"
   conversations:
     messages:
       instagram_story_content: "%{story_sender} mentioned you in the story: "
diff --git a/config/locales/ur_IN.yml b/config/locales/ur_IN.yml
index 32b973fc1..8c0463689 100644
--- a/config/locales/ur_IN.yml
+++ b/config/locales/ur_IN.yml
@@ -102,10 +102,12 @@ ur:
         recorded_at: Recorded date
   notifications:
     notification_title:
-      conversation_creation: "[New conversation] - #%{display_id} has been created in %{inbox_name}"
-      conversation_assignment: "[Assigned to you] - #%{display_id} has been assigned to you"
-      assigned_conversation_new_message: "[New message] - #%{display_id} %{content}"
-      conversation_mention: "You have been mentioned in conversation [ID - %{display_id}] by %{name}"
+      conversation_creation: "A conversation (#%{display_id}) has been created in %{inbox_name}"
+      conversation_assignment: "A conversation (#%{display_id}) has been assigned to you"
+      assigned_conversation_new_message: "A new message is created in conversation (#%{display_id})"
+      conversation_mention: "You have been mentioned in conversation (#%{display_id})"
+    attachment: "Attachment"
+    no_content: "No content"
   conversations:
     messages:
       instagram_story_content: "%{story_sender} mentioned you in the story: "
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 7adbf7595..bcb9502a6 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -102,10 +102,12 @@ vi:
         recorded_at: Ngày nghi
   notifications:
     notification_title:
-      conversation_creation: "[Hội thoại mới] - #%{display_id} đã được tạo trong %{inbox_name}"
-      conversation_assignment: "[Phân công cho bạn] - #%{display_id} đã được phân công cho bạn"
-      assigned_conversation_new_message: "[Tin nhắn mới] - #%{display_id} %{content}"
-      conversation_mention: "Bạn đã được nhắn đến trong hội thoại [ID - %{display_id}] bởi %{name}"
+      conversation_creation: "A conversation (#%{display_id}) has been created in %{inbox_name}"
+      conversation_assignment: "A conversation (#%{display_id}) has been assigned to you"
+      assigned_conversation_new_message: "A new message is created in conversation (#%{display_id})"
+      conversation_mention: "You have been mentioned in conversation (#%{display_id})"
+    attachment: "Attachment"
+    no_content: "No content"
   conversations:
     messages:
       instagram_story_content: "%{story_sender} đã đề cập đến bạn trong hội thoại: "
diff --git a/config/locales/zh_CN.yml b/config/locales/zh_CN.yml
index 5a71b05b8..1e84f6bd9 100644
--- a/config/locales/zh_CN.yml
+++ b/config/locales/zh_CN.yml
@@ -102,10 +102,12 @@ zh_CN:
         recorded_at: 录制日期
   notifications:
     notification_title:
-      conversation_creation: "[新会话] - #%{display_id} 中创建了 %{inbox_name}"
-      conversation_assignment: "[分配给您] - #%{display_id} 已分配会话给您"
-      assigned_conversation_new_message: "[新信息] - #%{display_id} %{content}"
-      conversation_mention: "您在会话中被提及 [ID - %{display_id}] by %{name}"
+      conversation_creation: "A conversation (#%{display_id}) has been created in %{inbox_name}"
+      conversation_assignment: "A conversation (#%{display_id}) has been assigned to you"
+      assigned_conversation_new_message: "A new message is created in conversation (#%{display_id})"
+      conversation_mention: "You have been mentioned in conversation (#%{display_id})"
+    attachment: "Attachment"
+    no_content: "No content"
   conversations:
     messages:
       instagram_story_content: "%{story_sender} 会话中提到了你: "
diff --git a/config/locales/zh_TW.yml b/config/locales/zh_TW.yml
index e3dd6cde3..8bfb88181 100644
--- a/config/locales/zh_TW.yml
+++ b/config/locales/zh_TW.yml
@@ -102,10 +102,12 @@ zh_TW:
         recorded_at: Recorded date
   notifications:
     notification_title:
-      conversation_creation: "[新對話] - #%{display_id} 已經在 %{inbox_name} 中被建立"
-      conversation_assignment: "[已指派給你] - #%{display_id} 已經被指派給你"
-      assigned_conversation_new_message: "[新訊息] - #%{display_id} %{content}"
-      conversation_mention: "你在對話 %{name} 的 [ID - %{display_id}] 中被提及"
+      conversation_creation: "A conversation (#%{display_id}) has been created in %{inbox_name}"
+      conversation_assignment: "A conversation (#%{display_id}) has been assigned to you"
+      assigned_conversation_new_message: "A new message is created in conversation (#%{display_id})"
+      conversation_mention: "You have been mentioned in conversation (#%{display_id})"
+    attachment: "Attachment"
+    no_content: "No content"
   conversations:
     messages:
       instagram_story_content: "%{story_sender} mentioned you in the story: "

From 505ede2761f387a3372cd5e69bd592d0fc16b5be Mon Sep 17 00:00:00 2001
From: Pranav <pranav@chatwoot.com>
Date: Wed, 6 Mar 2024 21:43:01 -0800
Subject: [PATCH 59/96] fix: Change the column identifier from string to text
 to avoid overflow (#9073)

Fixes: https://linear.app/chatwoot/issue/CW-3118/cannot-subscribe-to-notifications-on-microsoft-edge

Fix the issue with notifications in Microsoft Edge. The Edge push notification payload identifier has more than 255 characters. The API calls were failing due to this. This PR would fix the issue.
---
 app/models/notification_subscription.rb                  | 2 +-
 ...nge_identifier_type_in_notifications_subscriptions.rb | 9 +++++++++
 db/schema.rb                                             | 5 ++---
 3 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 db/migrate/20240306201954_change_identifier_type_in_notifications_subscriptions.rb

diff --git a/app/models/notification_subscription.rb b/app/models/notification_subscription.rb
index dbe148f71..ea9f1e567 100644
--- a/app/models/notification_subscription.rb
+++ b/app/models/notification_subscription.rb
@@ -3,7 +3,7 @@
 # Table name: notification_subscriptions
 #
 #  id                      :bigint           not null, primary key
-#  identifier              :string
+#  identifier              :text
 #  subscription_attributes :jsonb            not null
 #  subscription_type       :integer          not null
 #  created_at              :datetime         not null
diff --git a/db/migrate/20240306201954_change_identifier_type_in_notifications_subscriptions.rb b/db/migrate/20240306201954_change_identifier_type_in_notifications_subscriptions.rb
new file mode 100644
index 000000000..c913afae1
--- /dev/null
+++ b/db/migrate/20240306201954_change_identifier_type_in_notifications_subscriptions.rb
@@ -0,0 +1,9 @@
+class ChangeIdentifierTypeInNotificationsSubscriptions < ActiveRecord::Migration[7.0]
+  def up
+    change_column :notification_subscriptions, :identifier, :text
+  end
+
+  def down
+    change_column :notification_subscriptions, :identifier, :string
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 775e67f96..d0499cb7b 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[7.0].define(version: 2024_02_16_055809) do
+ActiveRecord::Schema[7.0].define(version: 2024_03_06_201954) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_stat_statements"
   enable_extension "pg_trgm"
@@ -736,7 +735,7 @@ ActiveRecord::Schema[7.0].define(version: 2024_02_16_055809) do
     t.jsonb "subscription_attributes", default: {}, null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.string "identifier"
+    t.text "identifier"
     t.index ["identifier"], name: "index_notification_subscriptions_on_identifier", unique: true
     t.index ["user_id"], name: "index_notification_subscriptions_on_user_id"
   end

From 9f70b93ff3b7c98301ae581956d013cf1d783484 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Thu, 7 Mar 2024 11:58:33 +0530
Subject: [PATCH 60/96] feat: Add information about email in the transcript
 (#9020)

---
 .../conversation_transcript.html.erb          | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/app/views/mailers/conversation_reply_mailer/conversation_transcript.html.erb b/app/views/mailers/conversation_reply_mailer/conversation_transcript.html.erb
index 7bc14eabe..0ea0f301b 100644
--- a/app/views/mailers/conversation_reply_mailer/conversation_transcript.html.erb
+++ b/app/views/mailers/conversation_reply_mailer/conversation_transcript.html.erb
@@ -2,6 +2,29 @@
   <tr>
     <td>
       <b><%= message.sender&.try(:available_name) || message.sender&.name || '' %></b>
+      <% if message.conversation.inbox&.inbox_type == 'Email' %>
+        <div style="font-size: 90%; color: #899096; line-height: 16px">
+          <% if message.content_attributes.dig(:email, :from).present? %>
+            <div>From: <%= message.content_attributes.dig(:email, :from).join(", ") %></div>
+          <% else %>
+            <div>From: <%= message.sender&.try(:email) %></div>
+          <% end %>
+
+          <% if message.content_attributes.dig(:email, :subject).present? %>
+            <div>Subject: <%= message.content_attributes.dig(:email, :subject) %></div>
+          <% end %>
+
+          <% if message.content_attributes[:to_emails].present? %>
+            <div>To: <%= message.content_attributes[:to_emails].join(", ") %></div>
+          <% end %>
+          <% if message.content_attributes[:cc_emails].present? %>
+            <div>CC: <%= message.content_attributes[:cc_emails].join(", ") %></div>
+          <% end %>
+          <% if message.content_attributes[:bcc_emails].present? %>
+            <div>BCC: <%= message.content_attributes[:bcc_emails].join(", ") %></div>
+          <% end %>
+        </div>
+      <% end %>
     </td>
   </tr>
   <tr>

From b6bf6bd414400d2b1ec4524c1f2e9326e0cd8744 Mon Sep 17 00:00:00 2001
From: Pranav <pranav@chatwoot.com>
Date: Thu, 7 Mar 2024 08:57:29 -0800
Subject: [PATCH 61/96] docs: Update README.md, remove broken badge (#9080)

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 17d4e7f5e..152660fb7 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,6 @@ Customer engagement suite, an open-source alternative to Intercom, Zendesk, Sale
   <img src="https://img.shields.io/github/commit-activity/m/chatwoot/chatwoot" alt="Commits-per-month">
   <a title="Crowdin" target="_self" href="https://chatwoot.crowdin.com/chatwoot"><img src="https://badges.crowdin.net/e/37ced7eba411064bd792feb3b7a28b16/localized.svg"></a>
   <a href="https://discord.gg/cJXdrwS"><img src="https://img.shields.io/discord/647412545203994635" alt="Discord"></a>
-  <a href="https://huntr.dev/bounties/disclose"><img src="https://cdn.huntr.dev/huntr_security_badge_mono.svg" alt="Huntr"></a>
   <a href="https://status.chatwoot.com"><img src="https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fchatwoot%2Fstatus%2Fmaster%2Fapi%2Fchatwoot%2Fuptime.json" alt="uptime"></a>
   <a href="https://status.chatwoot.com"><img src="https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fchatwoot%2Fstatus%2Fmaster%2Fapi%2Fchatwoot%2Fresponse-time.json" alt="response time"></a>
   <a href="https://artifacthub.io/packages/helm/chatwoot/chatwoot"><img src="https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/artifact-hub" alt="Artifact HUB"></a>

From 0685e04aae25b17460a1b0abe5575d0eea7a9aff Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Fri, 8 Mar 2024 07:57:39 +0530
Subject: [PATCH 62/96] feat: Add inbox view under feature flag on the sidebar
 (#9049)

Co-authored-by: Pranav <pranav@chatwoot.com>
---
 .../components/buttons/ResolveAction.vue      |   2 +-
 .../layout/config/sidebarItems/primaryMenu.js |   9 +
 .../widgets/conversation/ConversationBox.vue  |   7 +-
 .../conversation/ConversationHeader.vue       |   7 +-
 .../dashboard/i18n/locale/en/inbox.json       |   5 +-
 .../dashboard/i18n/locale/en/settings.json    |   1 +
 .../conversation/conversation.routes.js       |  19 --
 .../routes/dashboard/dashboard.routes.js      |   2 +
 .../dashboard/inbox/InboxEmptyState.vue       |  40 ++++
 .../routes/dashboard/inbox/InboxList.vue      | 102 ++++----
 .../routes/dashboard/inbox/InboxView.vue      | 221 ++++++++----------
 .../dashboard/inbox/components/InboxCard.vue  |  55 ++---
 .../inbox/components/InboxItemHeader.vue      |  42 ++--
 .../inbox/components/InboxListHeader.vue      |  42 ++--
 .../inbox/components/PaginationButton.vue     |   4 +-
 .../routes/dashboard/inbox/routes.js          |  25 ++
 .../store/modules/notifications/getters.js    |   3 +
 .../specs/notifications/getters.spec.js       |  10 +
 18 files changed, 340 insertions(+), 256 deletions(-)
 create mode 100644 app/javascript/dashboard/routes/dashboard/inbox/InboxEmptyState.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/inbox/routes.js

diff --git a/app/javascript/dashboard/components/buttons/ResolveAction.vue b/app/javascript/dashboard/components/buttons/ResolveAction.vue
index 1d80defeb..84e33cc42 100644
--- a/app/javascript/dashboard/components/buttons/ResolveAction.vue
+++ b/app/javascript/dashboard/components/buttons/ResolveAction.vue
@@ -48,7 +48,7 @@
       v-on-clickaway="closeDropdown"
       class="dropdown-pane dropdown-pane--open"
     >
-      <woot-dropdown-menu>
+      <woot-dropdown-menu class="mb-0">
         <woot-dropdown-item v-if="!isPending">
           <woot-button
             variant="clear"
diff --git a/app/javascript/dashboard/components/layout/config/sidebarItems/primaryMenu.js b/app/javascript/dashboard/components/layout/config/sidebarItems/primaryMenu.js
index d68ac1c9c..7513e3d1c 100644
--- a/app/javascript/dashboard/components/layout/config/sidebarItems/primaryMenu.js
+++ b/app/javascript/dashboard/components/layout/config/sidebarItems/primaryMenu.js
@@ -2,6 +2,15 @@ import { FEATURE_FLAGS } from '../../../../featureFlags';
 import { frontendURL } from '../../../../helper/URLHelper';
 
 const primaryMenuItems = accountId => [
+  {
+    icon: 'mail-inbox',
+    key: 'inboxView',
+    label: 'INBOX_VIEW',
+    featureFlag: FEATURE_FLAGS.INBOX_VIEW,
+    toState: frontendURL(`accounts/${accountId}/inbox-view`),
+    toStateName: 'inbox_view',
+    roles: ['administrator', 'agent'],
+  },
   {
     icon: 'chat',
     key: 'conversations',
diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationBox.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationBox.vue
index dad5c9c0b..2ad77452d 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationBox.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationBox.vue
@@ -8,7 +8,7 @@
       :chat="currentChat"
       :is-inbox-view="isInboxView"
       :is-contact-panel-open="isContactPanelOpen"
-      :show-back-button="isOnExpandedLayout"
+      :show-back-button="isOnExpandedLayout && !isInboxView"
       @contact-panel-toggle="onToggleContactPanel"
     />
     <woot-tabs
@@ -35,7 +35,10 @@
         :is-contact-panel-open="isContactPanelOpen"
         @contact-panel-toggle="onToggleContactPanel"
       />
-      <empty-state v-else :is-on-expanded-layout="isOnExpandedLayout" />
+      <empty-state
+        v-if="!currentChat.id && !isInboxView"
+        :is-on-expanded-layout="isOnExpandedLayout"
+      />
       <div
         v-show="showContactPanel"
         class="conversation-sidebar-wrap basis-full sm:basis-[17.5rem] md:basis-[18.75rem] lg:basis-[19.375rem] xl:basis-[20.625rem] 2xl:basis-[25rem] rtl:border-r border-slate-50 dark:border-slate-700 h-auto overflow-auto z-10 flex-shrink-0 flex-grow-0"
diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue
index e6c90f692..b1f8c0640 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue
@@ -3,7 +3,8 @@
     class="bg-white dark:bg-slate-900 flex justify-between items-center py-2 px-4 border-b border-slate-50 dark:border-slate-800/50 flex-col md:flex-row"
   >
     <div
-      class="flex-1 w-full min-w-0 flex flex-col md:flex-row items-center justify-center"
+      class="flex-1 w-full min-w-0 flex flex-col items-center justify-center"
+      :class="isInboxView ? 'sm:flex-row' : 'md:flex-row'"
     >
       <div class="flex justify-start items-center min-w-0 w-fit max-w-full">
         <back-button
@@ -87,7 +88,6 @@ import Thumbnail from '../Thumbnail.vue';
 import wootConstants from 'dashboard/constants/globals';
 import { conversationListPageURL } from 'dashboard/helper/URLHelper';
 import { snoozedReopenTime } from 'dashboard/helper/snoozeHelpers';
-import { frontendURL } from 'dashboard/helper/URLHelper';
 
 export default {
   components: {
@@ -128,9 +128,6 @@ export default {
         params: { accountId, inbox_id: inboxId, label, teamId },
         name,
       } = this.$route;
-      if (this.isInboxView) {
-        return frontendURL(`accounts/${accountId}/inbox`);
-      }
       return conversationListPageURL({
         accountId,
         inboxId,
diff --git a/app/javascript/dashboard/i18n/locale/en/inbox.json b/app/javascript/dashboard/i18n/locale/en/inbox.json
index dcac5459f..c9f67ed1c 100644
--- a/app/javascript/dashboard/i18n/locale/en/inbox.json
+++ b/app/javascript/dashboard/i18n/locale/en/inbox.json
@@ -4,17 +4,18 @@
       "TITLE": "Inbox",
       "DISPLAY_DROPDOWN": "Display",
       "LOADING": "Fetching notifications",
-      "EOF": "All notifications loaded 🎉",
       "404": "There are no active notifications in this group.",
       "NO_NOTIFICATIONS": "No notifications",
       "NOTE": "Notifications from all subscribed inboxes",
+      "NO_MESSAGES_AVAILABLE": "Oops! Not able to fetch messages",
       "SNOOZED_UNTIL": "Snoozed until",
       "SNOOZED_UNTIL_TOMORROW": "Snoozed until tomorrow",
       "SNOOZED_UNTIL_NEXT_WEEK": "Snoozed until next week"
     },
     "ACTION_HEADER": {
       "SNOOZE": "Snooze notification",
-      "DELETE": "Delete notification"
+      "DELETE": "Delete notification",
+      "BACK": "Back"
     },
     "TYPES": {
       "CONVERSATION_MENTION": "You have been mentioned in a conversation",
diff --git a/app/javascript/dashboard/i18n/locale/en/settings.json b/app/javascript/dashboard/i18n/locale/en/settings.json
index d1d16a607..63725f949 100644
--- a/app/javascript/dashboard/i18n/locale/en/settings.json
+++ b/app/javascript/dashboard/i18n/locale/en/settings.json
@@ -195,6 +195,7 @@
   "SIDEBAR": {
     "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
     "SWITCH": "Switch",
+    "INBOX_VIEW": "Inbox View",
     "CONVERSATIONS": "Conversations",
     "INBOX": "Inbox",
     "ALL_CONVERSATIONS": "All Conversations",
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/conversation.routes.js b/app/javascript/dashboard/routes/dashboard/conversation/conversation.routes.js
index 63a32d72b..14487682e 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/conversation.routes.js
+++ b/app/javascript/dashboard/routes/dashboard/conversation/conversation.routes.js
@@ -1,28 +1,9 @@
 /* eslint arrow-body-style: 0 */
 import { frontendURL } from '../../../helper/URLHelper';
 const ConversationView = () => import('./ConversationView');
-const InboxView = () => import('../inbox/InboxView.vue');
 
 export default {
   routes: [
-    {
-      path: frontendURL('accounts/:accountId/inbox-view'),
-      name: 'inbox_view',
-      roles: ['administrator', 'agent'],
-      component: InboxView,
-      props: () => {
-        return { inboxId: 0 };
-      },
-    },
-    {
-      path: frontendURL('accounts/:accountId/inbox-view/:conversation_id'),
-      name: 'inbox_view_conversation',
-      roles: ['administrator', 'agent'],
-      component: InboxView,
-      props: route => {
-        return { inboxId: 0, conversationId: route.params.conversation_id };
-      },
-    },
     {
       path: frontendURL('accounts/:accountId/dashboard'),
       name: 'home',
diff --git a/app/javascript/dashboard/routes/dashboard/dashboard.routes.js b/app/javascript/dashboard/routes/dashboard/dashboard.routes.js
index 712e05928..9e18ca42c 100644
--- a/app/javascript/dashboard/routes/dashboard/dashboard.routes.js
+++ b/app/javascript/dashboard/routes/dashboard/dashboard.routes.js
@@ -3,6 +3,7 @@ import conversation from './conversation/conversation.routes';
 import { routes as searchRoutes } from '../../modules/search/search.routes';
 import { routes as contactRoutes } from './contacts/routes';
 import { routes as notificationRoutes } from './notifications/routes';
+import { routes as inboxRoutes } from './inbox/routes';
 import { frontendURL } from '../../helper/URLHelper';
 import helpcenterRoutes from './helpcenter/helpcenter.routes';
 
@@ -16,6 +17,7 @@ export default {
       path: frontendURL('accounts/:account_id'),
       component: AppContainer,
       children: [
+        ...inboxRoutes,
         ...conversation.routes,
         ...settings.routes,
         ...contactRoutes,
diff --git a/app/javascript/dashboard/routes/dashboard/inbox/InboxEmptyState.vue b/app/javascript/dashboard/routes/dashboard/inbox/InboxEmptyState.vue
new file mode 100644
index 000000000..49ab0a709
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/inbox/InboxEmptyState.vue
@@ -0,0 +1,40 @@
+<template>
+  <div
+    class="text-center bg-slate-25 dark:bg-slate-800 justify-center w-full h-full hidden md:flex items-center"
+  >
+    <span v-if="uiFlags.isFetching" class="spinner my-4" />
+    <div v-else class="flex flex-col items-center gap-2">
+      <fluent-icon
+        icon="mail-inbox"
+        size="40"
+        class="text-slate-600 dark:text-slate-400"
+      />
+      <span class="text-slate-500 text-sm font-medium dark:text-slate-300">
+        {{ emptyMessage }}
+      </span>
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+export default {
+  props: {
+    emptyStateMessage: {
+      type: String,
+      default: '',
+    },
+  },
+  computed: {
+    ...mapGetters({
+      uiFlags: 'notifications/getUIFlags',
+    }),
+    emptyMessage() {
+      if (this.emptyStateMessage) {
+        return this.emptyStateMessage;
+      }
+      return this.$t('INBOX.LIST.NOTE');
+    },
+  },
+};
+</script>
diff --git a/app/javascript/dashboard/routes/dashboard/inbox/InboxList.vue b/app/javascript/dashboard/routes/dashboard/inbox/InboxList.vue
index bb0f2e7df..93ba310c3 100644
--- a/app/javascript/dashboard/routes/dashboard/inbox/InboxList.vue
+++ b/app/javascript/dashboard/routes/dashboard/inbox/InboxList.vue
@@ -1,43 +1,47 @@
 <template>
-  <div
-    class="flex flex-col h-full w-full ltr:border-r border-slate-50 dark:border-slate-800/50"
-    :class="isOnExpandedLayout ? '' : 'min-w-[360px] max-w-[360px]'"
-  >
-    <inbox-list-header @filter="onFilterChange" />
+  <section class="flex w-full h-full bg-white dark:bg-slate-900">
     <div
-      ref="notificationList"
-      class="flex flex-col w-full h-[calc(100%-56px)] overflow-x-hidden overflow-y-auto"
+      class="flex flex-col h-full w-full md:min-w-[360px] md:max-w-[360px] ltr:border-r border-slate-50 dark:border-slate-800/50"
+      :class="!currentNotificationId ? 'flex' : 'hidden md:flex'"
     >
-      <inbox-card
-        v-for="notificationItem in notifications"
-        :key="notificationItem.id"
-        :notification-item="notificationItem"
-        @mark-notification-as-read="markNotificationAsRead"
-        @mark-notification-as-unread="markNotificationAsUnRead"
-        @delete-notification="deleteNotification"
+      <inbox-list-header
+        :is-context-menu-open="isInboxContextMenuOpen"
+        @filter="onFilterChange"
+        @redirect="redirectToInbox"
       />
-      <div v-if="uiFlags.isFetching" class="text-center">
-        <span class="spinner mt-4 mb-4" />
+      <div
+        ref="notificationList"
+        class="flex flex-col w-full h-[calc(100%-56px)] overflow-x-hidden overflow-y-auto"
+      >
+        <inbox-card
+          v-for="notificationItem in notifications"
+          :key="notificationItem.id"
+          :active="currentNotificationId === notificationItem.id"
+          :notification-item="notificationItem"
+          @mark-notification-as-read="markNotificationAsRead"
+          @mark-notification-as-unread="markNotificationAsUnRead"
+          @delete-notification="deleteNotification"
+          @context-menu-open="isInboxContextMenuOpen = true"
+          @context-menu-close="isInboxContextMenuOpen = false"
+        />
+        <div v-if="uiFlags.isFetching" class="text-center">
+          <span class="spinner mt-4 mb-4" />
+        </div>
+        <p
+          v-if="showEmptyState"
+          class="text-center text-slate-400 text-sm dark:text-slate-400 p-4 font-medium"
+        >
+          {{ $t('INBOX.LIST.NO_NOTIFICATIONS') }}
+        </p>
+        <intersection-observer
+          v-if="!showEndOfList && !uiFlags.isFetching"
+          :options="infiniteLoaderOptions"
+          @observed="loadMoreNotifications"
+        />
       </div>
-      <p
-        v-if="showEmptyState"
-        class="text-center text-slate-400 text-sm dark:text-slate-400 p-4 font-medium"
-      >
-        {{ $t('INBOX.LIST.NO_NOTIFICATIONS') }}
-      </p>
-      <p
-        v-if="showEndOfListMessage"
-        class="text-center text-slate-400 dark:text-slate-400 p-4"
-      >
-        {{ $t('INBOX.LIST.EOF') }}
-      </p>
-      <intersection-observer
-        v-if="!showEndOfList && !uiFlags.isFetching"
-        :options="infiniteLoaderOptions"
-        @observed="loadMoreNotifications"
-      />
     </div>
-  </div>
+    <router-view />
+  </section>
 </template>
 
 <script>
@@ -49,6 +53,7 @@ import { INBOX_EVENTS } from 'dashboard/helper/AnalyticsHelper/events';
 import IntersectionObserver from 'dashboard/components/IntersectionObserver.vue';
 import alertMixin from 'shared/mixins/alertMixin';
 import uiSettingsMixin from 'dashboard/mixins/uiSettings';
+
 export default {
   components: {
     InboxCard,
@@ -56,16 +61,6 @@ export default {
     IntersectionObserver,
   },
   mixins: [alertMixin, uiSettingsMixin],
-  props: {
-    conversationId: {
-      type: [String, Number],
-      default: 0,
-    },
-    isOnExpandedLayout: {
-      type: Boolean,
-      default: false,
-    },
-  },
   data() {
     return {
       infiniteLoaderOptions: {
@@ -76,6 +71,8 @@ export default {
       status: '',
       type: '',
       sortOrder: wootConstants.INBOX_SORT_BY.NEWEST,
+      isInboxContextMenuOpen: false,
+      notificationIdToSnooze: null,
     };
   },
   computed: {
@@ -85,6 +82,9 @@ export default {
       uiFlags: 'notifications/getUIFlags',
       notification: 'notifications/getFilteredNotifications',
     }),
+    currentNotificationId() {
+      return Number(this.$route.params.notification_id);
+    },
     inboxFilters() {
       return {
         page: this.page,
@@ -102,9 +102,6 @@ export default {
     showEmptyState() {
       return !this.uiFlags.isFetching && !this.notifications.length;
     },
-    showEndOfListMessage() {
-      return this.showEndOfList && this.notifications.length;
-    },
   },
   mounted() {
     this.setSavedFilter();
@@ -115,13 +112,11 @@ export default {
       this.page = 1;
       this.$store.dispatch('notifications/clear');
       const filter = this.inboxFilters;
-
       this.$store.dispatch('notifications/index', filter);
     },
     redirectToInbox() {
-      if (!this.conversationId) return;
       if (this.$route.name === 'inbox_view') return;
-      this.$router.push({ name: 'inbox_view' });
+      this.$router.replace({ name: 'inbox_view' });
     },
     loadMoreNotifications() {
       if (this.uiFlags.isAllNotificationsLoaded) return;
@@ -177,13 +172,14 @@ export default {
         });
     },
     onFilterChange(option) {
-      if (option.type === wootConstants.INBOX_FILTER_TYPE.STATUS) {
+      const { STATUS, TYPE, SORT_ORDER } = wootConstants.INBOX_FILTER_TYPE;
+      if (option.type === STATUS) {
         this.status = option.selected ? option.key : '';
       }
-      if (option.type === wootConstants.INBOX_FILTER_TYPE.TYPE) {
+      if (option.type === TYPE) {
         this.type = option.selected ? option.key : '';
       }
-      if (option.type === wootConstants.INBOX_FILTER_TYPE.SORT_ORDER) {
+      if (option.type === SORT_ORDER) {
         this.sortOrder = option.key;
       }
       this.fetchNotifications();
diff --git a/app/javascript/dashboard/routes/dashboard/inbox/InboxView.vue b/app/javascript/dashboard/routes/dashboard/inbox/InboxView.vue
index edc36da15..7fe8a8000 100644
--- a/app/javascript/dashboard/routes/dashboard/inbox/InboxView.vue
+++ b/app/javascript/dashboard/routes/dashboard/inbox/InboxView.vue
@@ -1,127 +1,102 @@
 <template>
-  <section class="flex w-full h-full bg-white dark:bg-slate-900">
-    <inbox-list
-      v-show="showConversationList"
-      :conversation-id="conversationId"
-      :is-on-expanded-layout="isOnExpandedLayout"
-    />
-    <div
-      v-if="showInboxMessageView"
-      class="flex flex-col h-full"
-      :class="isOnExpandedLayout ? 'w-full' : 'w-[calc(100%-360px)]'"
-    >
+  <div class="h-full w-full md:w-[calc(100%-360px)]">
+    <div v-if="showEmptyState" class="flex w-full h-full">
+      <inbox-empty-state
+        :empty-state-message="$t('INBOX.LIST.NO_MESSAGES_AVAILABLE')"
+      />
+    </div>
+    <div v-else class="flex flex-col h-full w-full">
       <inbox-item-header
-        :total-length="totalNotifications"
+        class="flex-1"
+        :total-length="totalNotificationCount"
         :current-index="activeNotificationIndex"
         :active-notification="activeNotification"
         @next="onClickNext"
         @prev="onClickPrev"
       />
+      <div
+        v-if="isConversationLoading"
+        class="flex items-center h-[calc(100%-56px)] justify-center bg-slate-25 dark:bg-slate-800"
+      >
+        <span class="spinner my-4" />
+      </div>
       <conversation-box
+        v-else
         class="h-[calc(100%-56px)]"
         is-inbox-view
         :inbox-id="inboxId"
         :is-contact-panel-open="isContactPanelOpen"
-        :is-on-expanded-layout="isOnExpandedLayout"
+        :is-on-expanded-layout="false"
         @contact-panel-toggle="onToggleContactPanel"
       />
     </div>
-    <div
-      v-if="!showInboxMessageView && !isOnExpandedLayout"
-      class="text-center bg-slate-25 dark:bg-slate-800 justify-center w-full h-full flex items-center"
-    >
-      <span v-if="uiFlags.isFetching" class="spinner mt-4 mb-4" />
-      <div v-else class="flex flex-col items-center gap-2">
-        <fluent-icon
-          icon="mail-inbox"
-          size="40"
-          class="text-slate-600 dark:text-slate-400"
-        />
-        <span class="text-slate-500 text-sm font-medium dark:text-slate-300">
-          {{ $t('INBOX.LIST.NOTE') }}
-        </span>
-      </div>
-    </div>
-  </section>
+  </div>
 </template>
 
 <script>
 import { mapGetters } from 'vuex';
-import InboxList from './InboxList.vue';
 import InboxItemHeader from './components/InboxItemHeader.vue';
 import ConversationBox from 'dashboard/components/widgets/conversation/ConversationBox.vue';
+import InboxEmptyState from './InboxEmptyState.vue';
 import uiSettingsMixin from 'dashboard/mixins/uiSettings';
-import wootConstants from 'dashboard/constants/globals';
-import { FEATURE_FLAGS } from 'dashboard/featureFlags';
 import { BUS_EVENTS } from 'shared/constants/busEvents';
 import { INBOX_EVENTS } from 'dashboard/helper/AnalyticsHelper/events';
 
 export default {
   components: {
-    InboxList,
     InboxItemHeader,
+    InboxEmptyState,
     ConversationBox,
   },
   mixins: [uiSettingsMixin],
-  props: {
-    inboxId: {
-      type: [String, Number],
-      default: 0,
-    },
-    conversationId: {
-      type: [String, Number],
-      default: 0,
-    },
+  data() {
+    return {
+      isConversationLoading: false,
+    };
   },
   computed: {
     ...mapGetters({
       currentAccountId: 'getCurrentAccountId',
-      notifications: 'notifications/getNotifications',
+      notification: 'notifications/getFilteredNotifications',
       currentChat: 'getSelectedChat',
-      allConversation: 'getAllConversations',
+      activeNotificationById: 'notifications/getNotificationById',
+      conversationById: 'getConversationById',
       uiFlags: 'notifications/getUIFlags',
+      meta: 'notifications/getMeta',
     }),
+    notifications() {
+      return this.notification({
+        sortOrder: this.activeSortOrder,
+      });
+    },
+    inboxId() {
+      return Number(this.$route.params.inboxId);
+    },
+    notificationId() {
+      return Number(this.$route.params.notification_id);
+    },
     activeNotification() {
-      return this.notifications.find(
-        n => n.primary_actor.id === Number(this.conversationId)
-      );
+      return this.activeNotificationById(this.notificationId);
     },
-    isInboxViewEnabled() {
-      return this.$store.getters['accounts/isFeatureEnabledGlobally'](
-        this.currentAccountId,
-        FEATURE_FLAGS.INBOX_VIEW
-      );
+    conversationId() {
+      return this.activeNotification?.primary_actor?.id;
     },
-    showConversationList() {
-      return this.isOnExpandedLayout ? !this.conversationId : true;
+    totalNotificationCount() {
+      return this.meta.count;
     },
-    isFetchingInitialData() {
-      return this.uiFlags.isFetching && !this.notifications.length;
-    },
-    showInboxMessageView() {
+    showEmptyState() {
       return (
-        Boolean(this.conversationId) &&
-        Boolean(this.currentChat.id) &&
-        !this.isFetchingInitialData
+        !this.conversationId ||
+        (!this.notifications?.length && this.uiFlags.isFetching)
       );
     },
-    totalNotifications() {
-      return this.notifications?.length ?? 0;
-    },
     activeNotificationIndex() {
-      const conversationId = Number(this.conversationId);
-      const notificationIndex = this.notifications.findIndex(
-        n => n.primary_actor.id === conversationId
-      );
-      return notificationIndex >= 0 ? notificationIndex + 1 : 0;
+      return this.notifications?.findIndex(n => n.id === this.notificationId);
     },
-    isOnExpandedLayout() {
-      const {
-        LAYOUT_TYPES: { CONDENSED },
-      } = wootConstants;
-      const { conversation_display_type: conversationDisplayType = CONDENSED } =
-        this.uiSettings;
-      return conversationDisplayType !== CONDENSED;
+    activeSortOrder() {
+      const { inbox_filter_by: filterBy = {} } = this.uiSettings;
+      const { sort_by: sortBy } = filterBy;
+      return sortBy || 'desc';
     },
     isContactPanelOpen() {
       if (this.currentChat.id) {
@@ -135,29 +110,29 @@ export default {
   watch: {
     conversationId: {
       immediate: true,
-      handler() {
-        this.fetchConversationById();
+      handler(newVal, oldVal) {
+        if (newVal !== oldVal) {
+          this.fetchConversationById();
+        }
       },
     },
   },
   mounted() {
-    // Open inbox view if inbox view feature is enabled, else redirect to dashboard
-    // TODO: Remove this code once inbox view feature is enabled for all accounts
-    if (!this.isInboxViewEnabled) {
-      this.$router.push({
-        name: 'home',
-      });
-    }
     this.$store.dispatch('agents/get');
   },
   methods: {
     async fetchConversationById() {
-      if (!this.conversationId) return;
-      const chat = this.findConversation();
-      if (!chat) {
-        await this.$store.dispatch('getConversation', this.conversationId);
+      if (!this.notificationId || !this.conversationId) return;
+      this.$store.dispatch('clearSelectedState');
+      const existingChat = this.findConversation();
+      if (existingChat) {
+        this.setActiveChat(existingChat);
+        return;
       }
+      this.isConversationLoading = true;
+      await this.$store.dispatch('getConversation', this.conversationId);
       this.setActiveChat();
+      this.isConversationLoading = false;
     },
     setActiveChat() {
       const selectedConversation = this.findConversation();
@@ -169,37 +144,47 @@ export default {
         });
     },
     findConversation() {
-      const conversationId = Number(this.conversationId);
-      return this.allConversation.find(c => c.id === conversationId);
+      return this.conversationById(this.conversationId);
     },
     navigateToConversation(activeIndex, direction) {
-      const indexOffset = direction === 'next' ? 0 : -2;
-      const targetNotification = this.notifications[activeIndex + indexOffset];
-      if (targetNotification) {
-        const {
-          id,
-          primary_actor_id: primaryActorId,
-          primary_actor_type: primaryActorType,
-          primary_actor: { id: conversationId, meta: { unreadCount } = {} },
-          notification_type: notificationType,
-        } = targetNotification;
-
-        this.$track(INBOX_EVENTS.OPEN_CONVERSATION_VIA_INBOX, {
-          notificationType,
-        });
-
-        this.$store.dispatch('notifications/read', {
-          id,
-          primaryActorId,
-          primaryActorType,
-          unreadCount,
-        });
-
-        this.$router.push({
-          name: 'inbox_view_conversation',
-          params: { conversation_id: conversationId },
-        });
+      let updatedIndex;
+      if (direction === 'prev' && activeIndex) {
+        updatedIndex = activeIndex - 1;
+      } else if (
+        direction === 'next' &&
+        activeIndex < this.totalNotificationCount
+      ) {
+        updatedIndex = activeIndex + 1;
       }
+      const targetNotification = this.notifications[updatedIndex];
+      if (targetNotification) {
+        this.openNotification(targetNotification);
+      }
+    },
+    openNotification(notification) {
+      const {
+        id,
+        primary_actor_id: primaryActorId,
+        primary_actor_type: primaryActorType,
+        primary_actor: { meta: { unreadCount } = {} },
+        notification_type: notificationType,
+      } = notification;
+
+      this.$track(INBOX_EVENTS.OPEN_CONVERSATION_VIA_INBOX, {
+        notificationType,
+      });
+
+      this.$store.dispatch('notifications/read', {
+        id,
+        primaryActorId,
+        primaryActorType,
+        unreadCount,
+      });
+
+      this.$router.push({
+        name: 'inbox_view_conversation',
+        params: { notification_id: id },
+      });
     },
     onClickNext() {
       this.navigateToConversation(this.activeNotificationIndex, 'next');
diff --git a/app/javascript/dashboard/routes/dashboard/inbox/components/InboxCard.vue b/app/javascript/dashboard/routes/dashboard/inbox/components/InboxCard.vue
index 8e100f7b5..cbaacf198 100644
--- a/app/javascript/dashboard/routes/dashboard/inbox/components/InboxCard.vue
+++ b/app/javascript/dashboard/routes/dashboard/inbox/components/InboxCard.vue
@@ -3,7 +3,7 @@
     role="button"
     class="flex flex-col ltr:pl-5 rtl:pl-3 rtl:pr-5 ltr:pr-3 gap-2.5 py-3 w-full border-b border-slate-50 dark:border-slate-800/50 hover:bg-slate-25 dark:hover:bg-slate-800 cursor-pointer"
     :class="
-      isInboxCardActive
+      active
         ? 'bg-slate-25 dark:bg-slate-800 click-animation'
         : 'bg-white dark:bg-slate-900'
     "
@@ -23,26 +23,21 @@
       </div>
     </div>
 
-    <div class="flex flex-row justify-between items-center w-full">
-      <div class="flex gap-1.5 items-center max-w-[calc(100%-70px)]">
-        <Thumbnail
-          v-if="assigneeMeta"
-          :src="assigneeMeta.thumbnail"
-          :username="assigneeMeta.name"
-          size="16px"
-          class="relative bottom-0.5"
-        />
-        <div class="flex min-w-0">
-          <span
-            class="text-slate-800 dark:text-slate-50 text-sm overflow-hidden text-ellipsis whitespace-nowrap"
-            :class="isUnread ? 'font-medium' : 'font-normal'"
-          >
-            {{ pushTitle }}
-          </span>
-        </div>
-      </div>
+    <div class="flex flex-row justify-between items-center w-full gap-2">
+      <Thumbnail
+        v-if="assigneeMeta"
+        :src="assigneeMeta.thumbnail"
+        :username="assigneeMeta.name"
+        size="16px"
+      />
       <span
-        class="font-medium max-w-[60px] text-slate-600 dark:text-slate-300 text-xs whitespace-nowrap"
+        class="flex-1 text-slate-800 dark:text-slate-50 text-sm overflow-hidden text-ellipsis whitespace-nowrap"
+        :class="isUnread ? 'font-medium' : 'font-normal'"
+      >
+        {{ pushTitle }}
+      </span>
+      <span
+        class="font-medium text-slate-600 dark:text-slate-300 text-xs whitespace-nowrap"
       >
         {{ lastActivityAt }}
       </span>
@@ -61,6 +56,7 @@
     />
   </div>
 </template>
+
 <script>
 import PriorityIcon from './PriorityIcon.vue';
 import StatusIcon from './StatusIcon.vue';
@@ -84,6 +80,10 @@ export default {
       type: Object,
       default: () => {},
     },
+    active: {
+      type: Boolean,
+      default: false,
+    },
   },
   data() {
     return {
@@ -95,9 +95,6 @@ export default {
     primaryActor() {
       return this.notificationItem?.primary_actor;
     },
-    isInboxCardActive() {
-      return this.$route.params.conversation_id === this.primaryActor?.id;
-    },
     inbox() {
       return this.$store.getters['inboxes/getInbox'](
         this.primaryActor.inbox_id
@@ -166,11 +163,11 @@ export default {
         id,
         primary_actor_id: primaryActorId,
         primary_actor_type: primaryActorType,
-        primary_actor: { id: conversationId, inbox_id: inboxId },
+        primary_actor: { inbox_id: inboxId },
         notification_type: notificationType,
       } = notification;
 
-      if (this.$route.params.conversation_id !== conversationId) {
+      if (this.$route.params.notification_id !== id) {
         this.$track(INBOX_EVENTS.OPEN_CONVERSATION_VIA_INBOX, {
           notificationType,
         });
@@ -184,13 +181,14 @@ export default {
 
         this.$router.push({
           name: 'inbox_view_conversation',
-          params: { inboxId, conversation_id: conversationId },
+          params: { inboxId, notification_id: id },
         });
       }
     },
     closeContextMenu() {
       this.isContextMenuOpen = false;
       this.contextMenuPosition = { x: null, y: null };
+      this.$emit('context-menu-close');
     },
     openContextMenu(e) {
       this.closeContextMenu();
@@ -200,6 +198,7 @@ export default {
         y: e.pageY || e.clientY,
       };
       this.isContextMenuOpen = true;
+      this.$emit('context-menu-open');
     },
     handleAction(key) {
       switch (key) {
@@ -218,17 +217,21 @@ export default {
   },
 };
 </script>
+
 <style scoped>
 .click-animation {
   animation: click-animation 0.3s ease-in-out;
 }
+
 @keyframes click-animation {
   0% {
     transform: scale(1);
   }
+
   50% {
     transform: scale(0.99);
   }
+
   100% {
     transform: scale(1);
   }
diff --git a/app/javascript/dashboard/routes/dashboard/inbox/components/InboxItemHeader.vue b/app/javascript/dashboard/routes/dashboard/inbox/components/InboxItemHeader.vue
index 99b642cbf..e8ac446db 100644
--- a/app/javascript/dashboard/routes/dashboard/inbox/components/InboxItemHeader.vue
+++ b/app/javascript/dashboard/routes/dashboard/inbox/components/InboxItemHeader.vue
@@ -2,10 +2,20 @@
   <div
     class="flex gap-2 py-2 ltr:pl-4 rtl:pl-2 h-14 ltr:pr-2 rtl:pr-4 rtl:border-r justify-between items-center w-full border-b border-slate-50 dark:border-slate-800/50"
   >
+    <woot-button
+      variant="clear link"
+      class="flex md:hidden !pt-1 !pb-1 rounded-md ltr:pr-1 rtl:pl-1 !no-underline"
+      size="medium"
+      color-scheme="primary"
+      icon="chevron-left"
+      @click="onClickGoToInboxList"
+    >
+      {{ $t('INBOX.ACTION_HEADER.BACK') }}
+    </woot-button>
     <pagination-button
       v-if="totalLength > 1"
       :total-length="totalLength"
-      :current-index="currentIndex"
+      :current-index="currentIndex + 1"
       @next="onClickNext"
       @prev="onClickPrev"
     />
@@ -16,6 +26,7 @@
         size="small"
         color-scheme="secondary"
         icon="snooze"
+        class="[&>span]:hidden md:[&>span]:inline-flex"
         @click="openSnoozeNotificationModal"
       >
         {{ $t('INBOX.ACTION_HEADER.SNOOZE') }}
@@ -25,6 +36,7 @@
         size="small"
         color-scheme="secondary"
         variant="hollow"
+        class="[&>span]:hidden md:[&>span]:inline-flex"
         @click="deleteNotification"
       >
         {{ $t('INBOX.ACTION_HEADER.DELETE') }}
@@ -41,6 +53,7 @@
     </woot-modal>
   </div>
 </template>
+
 <script>
 import { mapGetters } from 'vuex';
 import { getUnixTime } from 'date-fns';
@@ -73,14 +86,10 @@ export default {
     },
   },
   data() {
-    return {
-      showCustomSnoozeModal: false,
-    };
+    return { showCustomSnoozeModal: false };
   },
   computed: {
-    ...mapGetters({
-      meta: 'notifications/getMeta',
-    }),
+    ...mapGetters({ meta: 'notifications/getMeta' }),
   },
   mounted() {
     bus.$on(CMD_SNOOZE_NOTIFICATION, this.onCmdSnoozeNotification);
@@ -96,15 +105,17 @@ export default {
     hideCustomSnoozeModal() {
       this.showCustomSnoozeModal = false;
     },
-    snoozeNotification(snoozedUntil) {
-      this.$store
-        .dispatch('notifications/snooze', {
+    async snoozeNotification(snoozedUntil) {
+      try {
+        await this.$store.dispatch('notifications/snooze', {
           id: this.activeNotification?.id,
           snoozedUntil,
-        })
-        .then(() => {
-          this.showAlert(this.$t('INBOX.ALERTS.SNOOZE'));
         });
+
+        this.showAlert(this.$t('INBOX.ALERTS.SNOOZE'));
+      } catch (error) {
+        // Silently fail without any change in the UI
+      }
     },
     onCmdSnoozeNotification(snoozeType) {
       if (snoozeType === wootConstants.SNOOZE_OPTIONS.UNTIL_CUSTOM_TIME) {
@@ -132,7 +143,7 @@ export default {
         .then(() => {
           this.showAlert(this.$t('INBOX.ALERTS.DELETE'));
         });
-      this.$router.push({ name: 'inbox_view' });
+      this.$router.replace({ name: 'inbox_view' });
     },
     onClickNext() {
       this.$emit('next');
@@ -140,6 +151,9 @@ export default {
     onClickPrev() {
       this.$emit('prev');
     },
+    onClickGoToInboxList() {
+      this.$router.replace({ name: 'inbox_view' });
+    },
   },
 };
 </script>
diff --git a/app/javascript/dashboard/routes/dashboard/inbox/components/InboxListHeader.vue b/app/javascript/dashboard/routes/dashboard/inbox/components/InboxListHeader.vue
index 3f5a594b7..35411f546 100644
--- a/app/javascript/dashboard/routes/dashboard/inbox/components/InboxListHeader.vue
+++ b/app/javascript/dashboard/routes/dashboard/inbox/components/InboxListHeader.vue
@@ -26,7 +26,7 @@
         <inbox-display-menu
           v-if="showInboxDisplayMenu"
           v-on-clickaway="openInboxDisplayMenu"
-          class="absolute top-8"
+          class="absolute top-9 ltr:left-0 rtl:right-0"
           @filter="onFilterChange"
         />
       </div>
@@ -49,7 +49,7 @@
       <inbox-option-menu
         v-if="showInboxOptionMenu"
         v-on-clickaway="openInboxOptionsMenu"
-        class="absolute top-9"
+        class="absolute top-9 ltr:right-0 ltr:md:right-[unset] rtl:left-0 rtl:md:left-[unset]"
         @option-click="onInboxOptionMenuClick"
       />
     </div>
@@ -69,12 +69,29 @@ export default {
     InboxDisplayMenu,
   },
   mixins: [clickaway, alertMixin],
+  props: {
+    isContextMenuOpen: {
+      type: Boolean,
+      default: false,
+    },
+  },
   data() {
     return {
       showInboxDisplayMenu: false,
       showInboxOptionMenu: false,
     };
   },
+  watch: {
+    isContextMenuOpen: {
+      handler(val) {
+        if (val) {
+          this.showInboxDisplayMenu = false;
+          this.showInboxOptionMenu = false;
+        }
+      },
+      immediate: true,
+    },
+  },
   methods: {
     markAllRead() {
       this.$track(INBOX_EVENTS.MARK_ALL_NOTIFICATIONS_AS_READ);
@@ -99,22 +116,19 @@ export default {
       this.showInboxOptionMenu = !this.showInboxOptionMenu;
     },
     onInboxOptionMenuClick(key) {
-      this.showInboxOptionMenu = false;
-      if (key === 'mark_all_read') {
-        this.markAllRead();
-      }
-      if (key === 'delete_all') {
-        this.deleteAll();
-      }
-      if (key === 'delete_all_read') {
-        this.deleteAllRead();
-      }
+      const actions = {
+        mark_all_read: () => this.markAllRead(),
+        delete_all: () => this.deleteAll(),
+        delete_all_read: () => this.deleteAllRead(),
+      };
+      const action = actions[key];
+      if (action) action();
+      this.$emit('redirect');
     },
     onFilterChange(option) {
       this.$emit('filter', option);
       this.showInboxDisplayMenu = false;
-      if (this.$route.name === 'inbox_view') return;
-      this.$router.push({ name: 'inbox_view' });
+      this.$emit('redirect');
     },
   },
 };
diff --git a/app/javascript/dashboard/routes/dashboard/inbox/components/PaginationButton.vue b/app/javascript/dashboard/routes/dashboard/inbox/components/PaginationButton.vue
index 46ff0c3bc..e361f39df 100644
--- a/app/javascript/dashboard/routes/dashboard/inbox/components/PaginationButton.vue
+++ b/app/javascript/dashboard/routes/dashboard/inbox/components/PaginationButton.vue
@@ -19,7 +19,7 @@
       />
     </div>
     <div class="flex items-center gap-1 whitespace-nowrap">
-      <span class="text-sm font-medium text-gray-600">
+      <span class="text-sm font-medium text-gray-600 tabular-nums">
         {{ totalLength <= 1 ? '1' : currentIndex }}
       </span>
       <span
@@ -28,7 +28,7 @@
       >
         /
       </span>
-      <span v-if="totalLength > 1" class="text-sm text-slate-400">
+      <span v-if="totalLength > 1" class="text-sm text-slate-400 tabular-nums">
         {{ totalLength }}
       </span>
     </div>
diff --git a/app/javascript/dashboard/routes/dashboard/inbox/routes.js b/app/javascript/dashboard/routes/dashboard/inbox/routes.js
new file mode 100644
index 000000000..9c26fa64e
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/inbox/routes.js
@@ -0,0 +1,25 @@
+import { frontendURL } from 'dashboard/helper/URLHelper';
+const InboxListView = () => import('./InboxList.vue');
+const InboxDetailView = () => import('./InboxView.vue');
+const InboxEmptyStateView = () => import('./InboxEmptyState.vue');
+
+export const routes = [
+  {
+    path: frontendURL('accounts/:accountId/inbox-view'),
+    component: InboxListView,
+    children: [
+      {
+        path: '',
+        name: 'inbox_view',
+        component: InboxEmptyStateView,
+        roles: ['administrator', 'agent'],
+      },
+      {
+        path: ':notification_id',
+        name: 'inbox_view_conversation',
+        component: InboxDetailView,
+        roles: ['administrator', 'agent'],
+      },
+    ],
+  },
+];
diff --git a/app/javascript/dashboard/store/modules/notifications/getters.js b/app/javascript/dashboard/store/modules/notifications/getters.js
index 3fc1d9458..cafc82857 100644
--- a/app/javascript/dashboard/store/modules/notifications/getters.js
+++ b/app/javascript/dashboard/store/modules/notifications/getters.js
@@ -11,6 +11,9 @@ export const getters = {
     );
     return sortedNotifications;
   },
+  getNotificationById: $state => id => {
+    return $state.records[id] || {};
+  },
   getUIFlags($state) {
     return $state.uiFlags;
   },
diff --git a/app/javascript/dashboard/store/modules/specs/notifications/getters.spec.js b/app/javascript/dashboard/store/modules/specs/notifications/getters.spec.js
index f3ea23cb5..e9d4a5b04 100644
--- a/app/javascript/dashboard/store/modules/specs/notifications/getters.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/notifications/getters.spec.js
@@ -44,6 +44,16 @@ describe('#getters', () => {
     ]);
   });
 
+  it('getNotificationById', () => {
+    const state = {
+      records: {
+        1: { id: 1 },
+      },
+    };
+    expect(getters.getNotificationById(state)(1)).toEqual({ id: 1 });
+    expect(getters.getNotificationById(state)(2)).toEqual({});
+  });
+
   it('getUIFlags', () => {
     const state = {
       uiFlags: {

From aaf70cf1cfc3080a21dd79aad0635578aae92f81 Mon Sep 17 00:00:00 2001
From: Vishnu Narayanan <iamwishnu@gmail.com>
Date: Mon, 11 Mar 2024 21:49:41 +0530
Subject: [PATCH 63/96] feat: add push notification when SLA missed (#9078)

* feat: add push notification when SLA missed

* chore: sent notification only for inbox members

* feat: add conv particpants+admins to SLA notification list

* chore: add spec to ensure notification is created

* chore: refactor to multiple alerts for SLA conditions

* chore: add sla_policy as secondary_actor in notification
---
 .../i18n/locale/en/generalSettings.json       |  5 ++-
 .../dashboard/i18n/locale/en/inbox.json       |  5 ++-
 app/models/notification.rb                    | 38 +++++++++++++------
 config/locales/en.yml                         |  3 ++
 enterprise/app/models/sla_policy.rb           | 10 +++++
 .../sla/evaluate_applied_sla_service.rb       | 35 +++++++++++++++--
 .../sla/evaluate_applied_sla_service_spec.rb  | 37 +++++++++++++++++-
 7 files changed, 114 insertions(+), 19 deletions(-)

diff --git a/app/javascript/dashboard/i18n/locale/en/generalSettings.json b/app/javascript/dashboard/i18n/locale/en/generalSettings.json
index 185d328a5..a252d776f 100644
--- a/app/javascript/dashboard/i18n/locale/en/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/en/generalSettings.json
@@ -87,7 +87,10 @@
       "conversation_assignment": "Conversation Assigned",
       "assigned_conversation_new_message": "New Message",
       "participating_conversation_new_message": "New Message",
-      "conversation_mention": "Mention"
+      "conversation_mention": "Mention",
+      "sla_missed_first_response": "SLA Missed",
+      "sla_missed_next_response": "SLA Missed",
+      "sla_missed_resolution": "SLA Missed"
     }
   },
   "NETWORK": {
diff --git a/app/javascript/dashboard/i18n/locale/en/inbox.json b/app/javascript/dashboard/i18n/locale/en/inbox.json
index c9f67ed1c..137aac54b 100644
--- a/app/javascript/dashboard/i18n/locale/en/inbox.json
+++ b/app/javascript/dashboard/i18n/locale/en/inbox.json
@@ -22,7 +22,10 @@
       "CONVERSATION_CREATION": "New conversation created",
       "CONVERSATION_ASSIGNMENT": "A conversation has been assigned to you",
       "ASSIGNED_CONVERSATION_NEW_MESSAGE": "New message in an assigned conversation",
-      "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "New message in a conversation you are participating in"
+      "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "New message in a conversation you are participating in",
+      "SLA_MISSED_FIRST_RESPONSE": "SLA target first response missed for conversation",
+      "SLA_MISSED_NEXT_RESPONSE": "SLA target next response missed for conversation",
+      "SLA_MISSED_RESOLUTION": "SLA target resolution missed for conversation"
     },
     "MENU_ITEM": {
       "MARK_AS_READ": "Mark as read",
diff --git a/app/models/notification.rb b/app/models/notification.rb
index 25740b16a..c71bdbb62 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -39,7 +39,10 @@ class Notification < ApplicationRecord
     conversation_assignment: 2,
     assigned_conversation_new_message: 3,
     conversation_mention: 4,
-    participating_conversation_new_message: 5
+    participating_conversation_new_message: 5,
+    sla_missed_first_response: 6,
+    sla_missed_next_response: 7,
+    sla_missed_resolution: 8
   }.freeze
 
   enum notification_type: NOTIFICATION_TYPES
@@ -86,21 +89,32 @@ class Notification < ApplicationRecord
     }
   end
 
-  # TODO: move to a data presenter
+  # rubocop:disable Metrics/MethodLength
   def push_message_title
-    case notification_type
-    when 'conversation_creation'
-      I18n.t('notifications.notification_title.conversation_creation', display_id: conversation.display_id, inbox_name: primary_actor.inbox.name)
-    when 'conversation_assignment'
-      I18n.t('notifications.notification_title.conversation_assignment', display_id: conversation.display_id)
-    when 'assigned_conversation_new_message', 'participating_conversation_new_message'
-      I18n.t('notifications.notification_title.assigned_conversation_new_message', display_id: conversation.display_id)
-    when 'conversation_mention'
-      I18n.t('notifications.notification_title.conversation_mention', display_id: conversation.display_id)
+    notification_title_map = {
+      'conversation_creation' => 'notifications.notification_title.conversation_creation',
+      'conversation_assignment' => 'notifications.notification_title.conversation_assignment',
+      'assigned_conversation_new_message' => 'notifications.notification_title.assigned_conversation_new_message',
+      'participating_conversation_new_message' => 'notifications.notification_title.assigned_conversation_new_message',
+      'conversation_mention' => 'notifications.notification_title.conversation_mention',
+      'sla_missed_first_response' => 'notifications.notification_title.sla_missed_first_response',
+      'sla_missed_next_response' => 'notifications.notification_title.sla_missed_next_response',
+      'sla_missed_resolution' => 'notifications.notification_title.sla_missed_resolution'
+    }
+
+    i18n_key = notification_title_map[notification_type]
+    return '' unless i18n_key
+
+    if notification_type == 'conversation_creation'
+      I18n.t(i18n_key, display_id: conversation.display_id, inbox_name: primary_actor.inbox.name)
+    elsif %w[conversation_assignment assigned_conversation_new_message participating_conversation_new_message
+             conversation_mention].include?(notification_type)
+      I18n.t(i18n_key, display_id: conversation.display_id)
     else
-      ''
+      I18n.t(i18n_key, display_id: primary_actor.display_id)
     end
   end
+  # rubocop:enable Metrics/MethodLength
 
   def push_message_body
     case notification_type
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 075d27d1d..5a3816867 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -122,6 +122,9 @@ en:
       conversation_assignment: "A conversation (#%{display_id}) has been assigned to you"
       assigned_conversation_new_message: "A new message is created in conversation (#%{display_id})"
       conversation_mention: "You have been mentioned in conversation (#%{display_id})"
+      sla_missed_first_response: "SLA target first response missed for conversation (#%{display_id})"
+      sla_missed_next_response: "SLA target next response missed for conversation (#%{display_id})"
+      sla_missed_resolution: "SLA target resolution missed for conversation (#%{display_id})"
     attachment: "Attachment"
     no_content: "No content"
   conversations:
diff --git a/enterprise/app/models/sla_policy.rb b/enterprise/app/models/sla_policy.rb
index 328367aeb..647db2cfc 100644
--- a/enterprise/app/models/sla_policy.rb
+++ b/enterprise/app/models/sla_policy.rb
@@ -22,4 +22,14 @@ class SlaPolicy < ApplicationRecord
   validates :name, presence: true
 
   has_many :conversations, dependent: :nullify
+
+  def push_event_data
+    {
+      id: id,
+      name: name,
+      frt: first_response_time_threshold,
+      nrt: next_response_time_threshold,
+      rt: resolution_time_threshold
+    }
+  end
 end
diff --git a/enterprise/app/services/sla/evaluate_applied_sla_service.rb b/enterprise/app/services/sla/evaluate_applied_sla_service.rb
index 817a854c7..d6eb9839e 100644
--- a/enterprise/app/services/sla/evaluate_applied_sla_service.rb
+++ b/enterprise/app/services/sla/evaluate_applied_sla_service.rb
@@ -30,7 +30,7 @@ class Sla::EvaluateAppliedSlaService
     return if first_reply_was_within_threshold?(conversation, threshold)
     return if still_within_threshold?(threshold)
 
-    handle_missed_sla(applied_sla)
+    handle_missed_sla(applied_sla, 'frt')
   end
 
   def first_reply_was_within_threshold?(conversation, threshold)
@@ -46,7 +46,7 @@ class Sla::EvaluateAppliedSlaService
     threshold = conversation.waiting_since.to_i + sla_policy.next_response_time_threshold.to_i
     return if still_within_threshold?(threshold)
 
-    handle_missed_sla(applied_sla)
+    handle_missed_sla(applied_sla, 'nrt')
   end
 
   def check_resolution_time_threshold(applied_sla, conversation, sla_policy)
@@ -55,13 +55,14 @@ class Sla::EvaluateAppliedSlaService
     threshold = conversation.created_at.to_i + sla_policy.resolution_time_threshold.to_i
     return if still_within_threshold?(threshold)
 
-    handle_missed_sla(applied_sla)
+    handle_missed_sla(applied_sla, 'rt')
   end
 
-  def handle_missed_sla(applied_sla)
+  def handle_missed_sla(applied_sla, type)
     return unless applied_sla.active?
 
     applied_sla.update!(sla_status: 'missed')
+    generate_notifications_for_sla(applied_sla, type)
     Rails.logger.warn "SLA missed for conversation #{applied_sla.conversation.id} " \
                       "in account #{applied_sla.account_id} " \
                       "for sla_policy #{applied_sla.sla_policy.id}"
@@ -75,4 +76,30 @@ class Sla::EvaluateAppliedSlaService
                       "in account #{applied_sla.account_id} " \
                       "for sla_policy #{applied_sla.sla_policy.id}"
   end
+
+  def generate_notifications_for_sla(applied_sla, type)
+    notify_users = applied_sla.conversation.conversation_participants.map(&:user)
+    # add all admins from the account to notify list
+    notify_users += applied_sla.account.administrators
+    # ensure conversation assignee is notified
+    notify_users += [applied_sla.conversation.assignee] if applied_sla.conversation.assignee.present?
+
+    notification_type = if type == 'frt'
+                          'sla_missed_first_response'
+                        elsif type == 'nrt'
+                          'sla_missed_next_response'
+                        else
+                          'sla_missed_resolution'
+                        end
+
+    notify_users.uniq.each do |user|
+      NotificationBuilder.new(
+        notification_type: notification_type,
+        user: user,
+        account: applied_sla.account,
+        primary_actor: applied_sla.conversation,
+        secondary_actor: applied_sla.sla_policy
+      ).perform
+    end
+  end
 end
diff --git a/spec/enterprise/services/sla/evaluate_applied_sla_service_spec.rb b/spec/enterprise/services/sla/evaluate_applied_sla_service_spec.rb
index 0f82715c0..17c09cb0e 100644
--- a/spec/enterprise/services/sla/evaluate_applied_sla_service_spec.rb
+++ b/spec/enterprise/services/sla/evaluate_applied_sla_service_spec.rb
@@ -1,7 +1,11 @@
 require 'rails_helper'
 
 RSpec.describe Sla::EvaluateAppliedSlaService do
-  let!(:conversation) { create(:conversation, created_at: 6.hours.ago) }
+  let!(:account) { create(:account) }
+  let!(:user_1) { create(:user, account: account) }
+  let!(:user_2) { create(:user, account: account) }
+  let!(:admin) { create(:user, account: account, role: :administrator) }
+  let!(:conversation) { create(:conversation, created_at: 6.hours.ago, assignee: user_1, account: account) }
   let!(:sla_policy) do
     create(:sla_policy, account: conversation.account,
                         first_response_time_threshold: nil,
@@ -20,6 +24,16 @@ RSpec.describe Sla::EvaluateAppliedSlaService do
         expect(Rails.logger).to have_received(:warn).with("SLA missed for conversation #{conversation.id} in account " \
                                                           "#{applied_sla.account_id} for sla_policy #{sla_policy.id}")
         expect(applied_sla.reload.sla_status).to eq('missed')
+
+        expect(Notification.count).to eq(2)
+        # check if notification type is sla_missed_first_response
+        expect(Notification.where(notification_type: 'sla_missed_first_response').count).to eq(2)
+        # Check if notification is created for the assignee
+        expect(Notification.where(user_id: user_1.id).count).to eq(1)
+        # Check if notification is created for the account admin
+        expect(Notification.where(user_id: admin.id).count).to eq(1)
+        # Check if no notification is created for other user
+        expect(Notification.where(user_id: user_2.id).count).to eq(0)
       end
     end
 
@@ -35,6 +49,16 @@ RSpec.describe Sla::EvaluateAppliedSlaService do
         expect(Rails.logger).to have_received(:warn).with("SLA missed for conversation #{conversation.id} in account " \
                                                           "#{applied_sla.account_id} for sla_policy #{sla_policy.id}")
         expect(applied_sla.reload.sla_status).to eq('missed')
+
+        expect(Notification.count).to eq(2)
+        # check if notification type is sla_missed_first_response
+        expect(Notification.where(notification_type: 'sla_missed_next_response').count).to eq(2)
+        # Check if notification is created for the assignee
+        expect(Notification.where(user_id: user_1.id).count).to eq(1)
+        # Check if notification is created for the account admin
+        expect(Notification.where(user_id: admin.id).count).to eq(1)
+        # Check if no notification is created for other user
+        expect(Notification.where(user_id: user_2.id).count).to eq(0)
       end
     end
 
@@ -47,6 +71,15 @@ RSpec.describe Sla::EvaluateAppliedSlaService do
         expect(Rails.logger).to have_received(:warn).with("SLA missed for conversation #{conversation.id} in account " \
                                                           "#{applied_sla.account_id} for sla_policy #{sla_policy.id}")
         expect(applied_sla.reload.sla_status).to eq('missed')
+
+        expect(Notification.count).to eq(2)
+        expect(Notification.where(notification_type: 'sla_missed_resolution').count).to eq(2)
+        # Check if notification is created for the assignee
+        expect(Notification.where(user_id: user_1.id).count).to eq(1)
+        # Check if notification is created for the account admin
+        expect(Notification.where(user_id: admin.id).count).to eq(1)
+        # Check if no notification is created for other user
+        expect(Notification.where(user_id: user_2.id).count).to eq(0)
       end
     end
 
@@ -76,6 +109,7 @@ RSpec.describe Sla::EvaluateAppliedSlaService do
         expect(Rails.logger).to have_received(:warn).with("SLA missed for conversation #{conversation.id} in account " \
                                                           "#{applied_sla.account_id} for sla_policy #{sla_policy.id}").exactly(1).time
         expect(applied_sla.reload.sla_status).to eq('missed')
+        expect(Notification.count).to eq(2)
       end
     end
   end
@@ -99,6 +133,7 @@ RSpec.describe Sla::EvaluateAppliedSlaService do
         expect(Rails.logger).to have_received(:info).with("SLA hit for conversation #{conversation.id} in account " \
                                                           "#{applied_sla.account_id} for sla_policy #{sla_policy.id}")
         expect(applied_sla.reload.sla_status).to eq('hit')
+        expect(Notification.count).to eq(0)
       end
     end
 

From 561fafa198345901420f0c02c2cbe088742d5c61 Mon Sep 17 00:00:00 2001
From: Vishnu Narayanan <iamwishnu@gmail.com>
Date: Wed, 13 Mar 2024 01:15:46 +0530
Subject: [PATCH 64/96] feat: Update icons for the SLA feature in dashboard
 (#9101)

---
 .../dashboard/components/layout/config/sidebarItems/settings.js | 2 +-
 .../dashboard/routes/dashboard/settings/sla/sla.routes.js       | 2 +-
 .../shared/components/FluentIcon/dashboard-icons.json           | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/javascript/dashboard/components/layout/config/sidebarItems/settings.js b/app/javascript/dashboard/components/layout/config/sidebarItems/settings.js
index 444285657..3ea6d39bf 100644
--- a/app/javascript/dashboard/components/layout/config/sidebarItems/settings.js
+++ b/app/javascript/dashboard/components/layout/config/sidebarItems/settings.js
@@ -160,7 +160,7 @@ const settings = accountId => ({
       beta: true,
     },
     {
-      icon: 'key',
+      icon: 'document-list-clock',
       label: 'SLA',
       hasSubMenu: false,
       toState: frontendURL(`accounts/${accountId}/settings/sla/list`),
diff --git a/app/javascript/dashboard/routes/dashboard/settings/sla/sla.routes.js b/app/javascript/dashboard/routes/dashboard/settings/sla/sla.routes.js
index 360c5a1f5..473cb03cb 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/sla/sla.routes.js
+++ b/app/javascript/dashboard/routes/dashboard/settings/sla/sla.routes.js
@@ -10,7 +10,7 @@ export default {
       component: SettingsContent,
       props: {
         headerTitle: 'SLA.HEADER',
-        icon: 'tag',
+        icon: 'document-list-clock',
         showNewButton: true,
       },
       children: [
diff --git a/app/javascript/shared/components/FluentIcon/dashboard-icons.json b/app/javascript/shared/components/FluentIcon/dashboard-icons.json
index 678045469..30e45d489 100644
--- a/app/javascript/shared/components/FluentIcon/dashboard-icons.json
+++ b/app/javascript/shared/components/FluentIcon/dashboard-icons.json
@@ -99,6 +99,7 @@
   "document-outline": "M18.5 20a.5.5 0 0 1-.5.5H6a.5.5 0 0 1-.5-.5V4a.5.5 0 0 1 .5-.5h6V8a2 2 0 0 0 2 2h4.5v10Zm-5-15.379L17.378 8.5H14a.5.5 0 0 1-.5-.5V4.621Zm5.914 3.793-5.829-5.828c-.026-.026-.058-.046-.085-.07a2.072 2.072 0 0 0-.219-.18c-.04-.027-.086-.045-.128-.068-.071-.04-.141-.084-.216-.116a1.977 1.977 0 0 0-.624-.138C12.266 2.011 12.22 2 12.172 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V9.828a2 2 0 0 0-.586-1.414Z",
   "document-error-outline": "M6 2a2 2 0 0 0-2 2v5.207a5.48 5.48 0 0 1 1-.185V4a1 1 0 0 1 1-1h4v3.5A1.5 1.5 0 0 0 11.5 8H15v8a1 1 0 0 1-1 1h-3.6a5.507 5.507 0 0 1-.657 1H14a2 2 0 0 0 2-2V7.414a1.5 1.5 0 0 0-.44-1.06l-3.914-3.915A1.5 1.5 0 0 0 10.586 2H6Zm8.793 5H11.5a.5.5 0 0 1-.5-.5V3.207L14.793 7ZM10 14.5a4.5 4.5 0 1 1-9 0a4.5 4.5 0 0 1 9 0ZM5.5 12a.5.5 0 0 0-.5.5v2a.5.5 0 0 0 1 0v-2a.5.5 0 0 0-.5-.5Zm0 5.125a.625.625 0 1 0 0-1.25a.625.625 0 0 0 0 1.25Z",
   "document-text-link-outline": "M18 20.5a.5.5 0 0 0 .5-.5V10H14a2 2 0 0 1-2-2V3.5H6a.5.5 0 0 0-.5.5v10h-.75c-.255 0-.506.02-.75.059V4a2 2 0 0 1 2-2h6.172c.028 0 .055.004.082.007.02.003.04.006.059.007.215.015.427.056.624.138.057.024.112.056.166.087l.05.029.047.024a.652.652 0 0 1 .081.044c.078.053.148.116.219.18a.63.63 0 0 0 .036.03.491.491 0 0 1 .049.04l5.829 5.828A2 2 0 0 1 20 9.828V20a2 2 0 0 1-2 2h-6.286c.406-.432.731-.94.953-1.5H18Zm-.622-12L13.5 4.621V8a.5.5 0 0 0 .5.5h3.378Zm-7.603 5.75c.854.29 1.6.815 2.158 1.5h3.317a.75.75 0 0 0 0-1.5H9.775ZM12.667 17c.186.468.3.973.326 1.5h2.257a.75.75 0 0 0 0-1.5h-2.583ZM8.75 11.5a.75.75 0 0 0 0 1.5h6.5a.75.75 0 0 0 0-1.5h-6.5ZM12 18.75A3.75 3.75 0 0 0 8.25 15l-.102.007A.75.75 0 0 0 8.25 16.5l.154.005A2.25 2.25 0 0 1 8.25 21l-.003.005-.102.007a.75.75 0 0 0 .108 1.493V22.5l.2-.005A3.75 3.75 0 0 0 12 18.75Zm-6.5-3a.75.75 0 0 0-.75-.75l-.2.005a3.75 3.75 0 0 0 .2 7.495l.102-.007A.75.75 0 0 0 4.75 21l-.154-.005A2.25 2.25 0 0 1 4.75 16.5l.102-.007a.75.75 0 0 0 .648-.743Zm3.5 3a.75.75 0 0 0-.75-.75h-3.5l-.102.007A.75.75 0 0 0 4.75 19.5h3.5l.102-.007A.75.75 0 0 0 9 18.75Z",
+  "document-list-clock-outline": "m19.414 8.414-5.829-5.828a.493.493 0 0 0-.049-.04.626.626 0 0 1-.036-.03 2.072 2.072 0 0 0-.219-.18.652.652 0 0 0-.08-.044l-.048-.024-.05-.029c-.054-.031-.109-.063-.166-.087a1.977 1.977 0 0 0-.624-.138c-.02-.001-.04-.004-.059-.007A.605.605 0 0 0 12.172 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h6.81a6.518 6.518 0 0 1-1.078-1.5H6a.5.5 0 0 1-.5-.5V4a.5.5 0 0 1 .5-.5h6V8a2 2 0 0 0 2 2h4.5v1.076c.523.081 1.026.224 1.5.422v-1.67a2 2 0 0 0-.586-1.414ZM13.5 4.621 17.378 8.5H14a.5.5 0 0 1-.5-.5V4.621ZM10.75 17.5H11c0 .516.06 1.018.174 1.5h-.424a.75.75 0 0 1 0-1.5Zm.424-1.5c.125-.528.314-1.03.558-1.5h-.982a.75.75 0 0 0 0 1.5h.424Zm1.636-3a6.511 6.511 0 0 1 2.186-1.5H10.75a.75.75 0 0 0 0 1.5h2.06Zm-5.06-1.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5ZM7 15.25a.75.75 0 1 1 1.5 0 .75.75 0 0 1-1.5 0Zm0 3a.75.75 0 1 1 1.5 0 .75.75 0 0 1-1.5 0Zm16-.75a5.5 5.5 0 1 0-11 0 5.5 5.5 0 0 0 11 0Zm-5.78.418a.5.5 0 0 1-.219-.489L17 13.5a.5.5 0 1 1 1 0L18.001 17h2.496a.5.5 0 0 1 0 1H17.56a.507.507 0 0 1-.34-.082Z",
   "draft-outline": "m20.877 2.826.153.144.145.153a3.579 3.579 0 0 1-.145 4.908L9.062 19.999a2.25 2.25 0 0 1-1 .58l-5.115 1.395a.75.75 0 0 1-.92-.921l1.394-5.116a2.25 2.25 0 0 1 .58-.999L15.97 2.97a3.579 3.579 0 0 1 4.908-.144ZM15 6.06l-9.938 9.938a.75.75 0 0 0-.193.333l-1.05 3.85 3.85-1.05A.75.75 0 0 0 8 18.938L17.94 9 15 6.06ZM6.525 11l-1.5 1.5H2.75a.75.75 0 0 1 0-1.5h3.775Zm4-4-1.5 1.5H2.75a.75.75 0 1 1 0-1.5h7.775Zm6.505-2.97-.97.97 2.939 2.94.97-.97a2.078 2.078 0 1 0-2.939-2.94ZM14.525 3l-1.5 1.5H2.75a.75.75 0 1 1 0-1.5h11.775Z",
   "drag-outline": "M15 3.707V8.5a.5.5 0 0 0 1 0V3.707l1.146 1.147a.5.5 0 0 0 .708-.708l-2-2a.499.499 0 0 0-.708 0l-2 2a.5.5 0 0 0 .708.708L15 3.707ZM2 4.5a.5.5 0 0 1 .5-.5h6a.5.5 0 0 1 0 1h-6a.5.5 0 0 1-.5-.5Zm0 5a.5.5 0 0 1 .5-.5h9a.5.5 0 0 1 0 1h-9a.5.5 0 0 1-.5-.5Zm.5 4.5a.5.5 0 0 0 0 1h6a.5.5 0 0 0 0-1h-6ZM15 16.293V11.5a.5.5 0 0 1 1 0v4.793l1.146-1.147a.5.5 0 0 1 .708.708l-2 2a.5.5 0 0 1-.708 0l-2-2a.5.5 0 0 1 .708-.708L15 16.293Z",
   "dual-screen-clock-outline": "M10.019 6.002a6.632 6.632 0 0 0 .058 1.5H3.75a.25.25 0 0 0-.25.25v12.494c0 .138.112.25.25.25h7.498l-.001-10.167c.416.57.924 1.07 1.5 1.479v8.69h7.498a.25.25 0 0 0 .25-.25v-8.62a6.535 6.535 0 0 0 1.501-1.656V20.25a1.75 1.75 0 0 1-1.75 1.75h-8.998l-.001-.003H3.75A1.75 1.75 0 0 1 2 20.246V7.751c0-.966.784-1.75 1.75-1.75h6.269Zm6.22 11.498a.75.75 0 0 1 .101 1.493L16.24 19h-1.5a.75.75 0 0 1-.102-1.493l.102-.007h1.5Zm-6.996 0a.75.75 0 0 1 .102 1.493L9.243 19H7.74a.75.75 0 0 1-.102-1.493l.102-.007h1.502ZM16.498 1a5.5 5.5 0 1 1 0 11 5.5 5.5 0 0 1 0-11Zm-1 2a.5.5 0 0 0-.5.5v4a.5.5 0 0 0 .5.5h3.001a.5.5 0 0 0 0-1h-2.501V3.5a.5.5 0 0 0-.5-.5Z",

From 804a42c271abbf6263d78fd737ce3f0e35fbaf74 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Wed, 13 Mar 2024 16:40:21 +0530
Subject: [PATCH 65/96] feat: Update the `location` and `country_code` when
 creating or updating the contact (#9106)

* feat: Update the location and country_code when creating or updating the contact.

* chore: improve comments
---
 app/models/contact.rb       | 8 ++++++++
 spec/models/contact_spec.rb | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/app/models/contact.rb b/app/models/contact.rb
index 1e9ab8dc6..1f3d2fb90 100644
--- a/app/models/contact.rb
+++ b/app/models/contact.rb
@@ -61,6 +61,7 @@ class Contact < ApplicationRecord
   after_create_commit :dispatch_create_event, :ip_lookup
   after_update_commit :dispatch_update_event
   after_destroy_commit :dispatch_destroy_event
+  before_save :update_contact_location_and_country_code
 
   enum contact_type: { visitor: 0, lead: 1, customer: 2 }
 
@@ -206,6 +207,13 @@ class Contact < ApplicationRecord
     self.custom_attributes = {} if custom_attributes.blank?
   end
 
+  def update_contact_location_and_country_code
+    # TODO: Ensure that location and country_code are updated from additional_attributes.
+    # We will remove this once all contacts are updated and both the location and country_code fields are standardized throughout the app.
+    self.location = additional_attributes['city']
+    self.country_code = additional_attributes['country']
+  end
+
   def dispatch_create_event
     Rails.configuration.dispatcher.dispatch(CONTACT_CREATED, Time.zone.now, contact: self)
   end
diff --git a/spec/models/contact_spec.rb b/spec/models/contact_spec.rb
index 7029c89fe..ff186466a 100644
--- a/spec/models/contact_spec.rb
+++ b/spec/models/contact_spec.rb
@@ -75,4 +75,12 @@ RSpec.describe Contact do
       expect(contact.email).to eq 'test@test.com'
     end
   end
+
+  context 'when city and country code passed in additional attributes' do
+    it 'updates location and country code' do
+      contact = create(:contact, additional_attributes: { city: 'New York', country: 'US' })
+      expect(contact.location).to eq 'New York'
+      expect(contact.country_code).to eq 'US'
+    end
+  end
 end

From 7f4b2d66d4d61b9f2a0f218afb158950a35689c8 Mon Sep 17 00:00:00 2001
From: Vishnu Narayanan <iamwishnu@gmail.com>
Date: Wed, 13 Mar 2024 20:05:34 +0530
Subject: [PATCH 66/96] feat: add activity message for SLA (#9100)

* feat: add activity message for SLA

* chore: refactor to reduce method complexity

* chore: refactor

* feat: add spec for SLAactivity message

* chore: move SLA spec to enterprise folder

* chore: move team activity methods to a separate module

* chore: fix typo

* chore: move sla activity message spec to conversation model
---
 .../concerns/activity_message_handler.rb      | 85 +++++++++----------
 .../label_activity_message_handler.rb         | 20 +++++
 .../concerns/sla_activity_message_handler.rb  | 31 +++++++
 .../concerns/team_activity_message_handler.rb | 29 +++++++
 config/locales/en.yml                         |  3 +
 spec/enterprise/models/conversation_spec.rb   | 30 +++++++
 6 files changed, 153 insertions(+), 45 deletions(-)
 create mode 100644 app/models/concerns/label_activity_message_handler.rb
 create mode 100644 app/models/concerns/sla_activity_message_handler.rb
 create mode 100644 app/models/concerns/team_activity_message_handler.rb

diff --git a/app/models/concerns/activity_message_handler.rb b/app/models/concerns/activity_message_handler.rb
index 3c53b6798..d49442f10 100644
--- a/app/models/concerns/activity_message_handler.rb
+++ b/app/models/concerns/activity_message_handler.rb
@@ -2,14 +2,48 @@ module ActivityMessageHandler
   extend ActiveSupport::Concern
 
   include PriorityActivityMessageHandler
+  include LabelActivityMessageHandler
+  include SlaActivityMessageHandler
+  include TeamActivityMessageHandler
 
   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?
+    user_name = determine_user_name
+
+    handle_status_change(user_name)
+    handle_priority_change(user_name)
+    handle_label_change(user_name)
+    handle_sla_policy_change(user_name)
+  end
+
+  def determine_user_name
+    Current.user&.name
+  end
+
+  def handle_status_change(user_name)
+    return unless saved_change_to_status?
+
+    status_change_activity(user_name)
+  end
+
+  def handle_priority_change(user_name)
+    return unless saved_change_to_priority?
+
+    priority_change_activity(user_name)
+  end
+
+  def handle_label_change(user_name)
+    return unless saved_change_to_label_list?
+
+    create_label_change(activity_message_owner(user_name))
+  end
+
+  def handle_sla_policy_change(user_name)
+    return unless saved_change_to_sla_policy_id?
+
+    sla_change_type = determine_sla_change_type
+    create_sla_change_activity(sla_change_type, activity_message_owner(user_name))
   end
 
   def status_change_activity(user_name)
@@ -45,21 +79,6 @@ module ActivityMessageHandler
     { account_id: account_id, inbox_id: inbox_id, message_type: :activity, content: content }
   end
 
-  def create_label_added(user_name, labels = [])
-    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?
-
-    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
     create_mute_change_activity('muted')
   end
@@ -75,30 +94,6 @@ module ActivityMessageHandler
     ::Conversations::ActivityMessageJob.perform_later(self, activity_message_params(content)) if content
   end
 
-  def generate_team_change_activity_key
-    team = Team.find_by(id: team_id)
-    key = team.present? ? 'assigned' : 'removed'
-    key += '_with_assignee' if key == 'assigned' && saved_change_to_assignee_id? && assignee
-    key
-  end
-
-  def generate_team_name_for_activity
-    previous_team_id = previous_changes[:team_id][0]
-    Team.find_by(id: previous_team_id)&.name if previous_team_id.present?
-  end
-
-  def create_team_change_activity(user_name)
-    user_name = activity_message_ownner(user_name)
-    return unless user_name
-
-    key = generate_team_change_activity_key
-    params = { assignee_name: assignee&.name, team_name: team&.name, user_name: user_name }
-    params[:team_name] = generate_team_name_for_activity if key == 'removed'
-    content = I18n.t("conversations.activity.team.#{key}", **params)
-
-    ::Conversations::ActivityMessageJob.perform_later(self, activity_message_params(content)) if content
-  end
-
   def generate_assignee_change_activity_content(user_name)
     params = { assignee_name: assignee&.name, user_name: user_name }.compact
     key = assignee_id ? 'assigned' : 'removed'
@@ -107,7 +102,7 @@ module ActivityMessageHandler
   end
 
   def create_assignee_change_activity(user_name)
-    user_name = activity_message_ownner(user_name)
+    user_name = activity_message_owner(user_name)
 
     return unless user_name
 
@@ -115,7 +110,7 @@ module ActivityMessageHandler
     ::Conversations::ActivityMessageJob.perform_later(self, activity_message_params(content)) if content
   end
 
-  def activity_message_ownner(user_name)
+  def activity_message_owner(user_name)
     user_name = 'Automation System' if !user_name && Current.executed_by.present?
     user_name
   end
diff --git a/app/models/concerns/label_activity_message_handler.rb b/app/models/concerns/label_activity_message_handler.rb
new file mode 100644
index 000000000..d5097e00f
--- /dev/null
+++ b/app/models/concerns/label_activity_message_handler.rb
@@ -0,0 +1,20 @@
+module LabelActivityMessageHandler
+  extend ActiveSupport::Concern
+
+  private
+
+  def create_label_added(user_name, labels = [])
+    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?
+
+    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
+end
diff --git a/app/models/concerns/sla_activity_message_handler.rb b/app/models/concerns/sla_activity_message_handler.rb
new file mode 100644
index 000000000..94603161e
--- /dev/null
+++ b/app/models/concerns/sla_activity_message_handler.rb
@@ -0,0 +1,31 @@
+module SlaActivityMessageHandler
+  extend ActiveSupport::Concern
+
+  private
+
+  def create_sla_change_activity(change_type, user_name)
+    content = case change_type
+              when 'added'
+                I18n.t('conversations.activity.sla.added', user_name: user_name, sla_name: sla_policy_name)
+              when 'removed'
+                I18n.t('conversations.activity.sla.removed', user_name: user_name, sla_name: sla_policy_name)
+              when 'updated'
+                I18n.t('conversations.activity.sla.updated', user_name: user_name, sla_name: sla_policy_name)
+              end
+    ::Conversations::ActivityMessageJob.perform_later(self, activity_message_params(content)) if content
+  end
+
+  def sla_policy_name
+    SlaPolicy.find_by(id: sla_policy_id)&.name || ''
+  end
+
+  def determine_sla_change_type
+    sla_policy_id_before, sla_policy_id_after = previous_changes[:sla_policy_id]
+
+    if sla_policy_id_before.nil? && sla_policy_id_after.present?
+      'added'
+    elsif sla_policy_id_before.present? && sla_policy_id_after.nil?
+      'removed'
+    end
+  end
+end
diff --git a/app/models/concerns/team_activity_message_handler.rb b/app/models/concerns/team_activity_message_handler.rb
new file mode 100644
index 000000000..aba5237c4
--- /dev/null
+++ b/app/models/concerns/team_activity_message_handler.rb
@@ -0,0 +1,29 @@
+module TeamActivityMessageHandler
+  extend ActiveSupport::Concern
+
+  private
+
+  def create_team_change_activity(user_name)
+    user_name = activity_message_owner(user_name)
+    return unless user_name
+
+    key = generate_team_change_activity_key
+    params = { assignee_name: assignee&.name, team_name: team&.name, user_name: user_name }
+    params[:team_name] = generate_team_name_for_activity if key == 'removed'
+    content = I18n.t("conversations.activity.team.#{key}", **params)
+
+    ::Conversations::ActivityMessageJob.perform_later(self, activity_message_params(content)) if content
+  end
+
+  def generate_team_change_activity_key
+    team = Team.find_by(id: team_id)
+    key = team.present? ? 'assigned' : 'removed'
+    key += '_with_assignee' if key == 'assigned' && saved_change_to_assignee_id? && assignee
+    key
+  end
+
+  def generate_team_name_for_activity
+    previous_team_id = previous_changes[:team_id][0]
+    Team.find_by(id: previous_team_id)&.name if previous_team_id.present?
+  end
+end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 5a3816867..c19499fa5 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -158,6 +158,9 @@ en:
       labels:
         added: "%{user_name} added %{labels}"
         removed: "%{user_name} removed %{labels}"
+      sla:
+        added: "%{user_name} added SLA policy %{sla_name}"
+        removed: "%{user_name} removed SLA policy %{sla_name}"
       muted: "%{user_name} has muted the conversation"
       unmuted: "%{user_name} has unmuted the conversation"
     templates:
diff --git a/spec/enterprise/models/conversation_spec.rb b/spec/enterprise/models/conversation_spec.rb
index e91f3f885..bb3ced5b3 100644
--- a/spec/enterprise/models/conversation_spec.rb
+++ b/spec/enterprise/models/conversation_spec.rb
@@ -5,6 +5,36 @@ RSpec.describe Conversation, type: :model do
     it { is_expected.to belong_to(:sla_policy).optional }
   end
 
+  describe 'SLA policy updates' do
+    let!(:conversation) { create(:conversation) }
+    let!(:sla_policy) { create(:sla_policy) }
+
+    it 'generates an activity message when the SLA policy is updated' do
+      conversation.update(sla_policy_id: sla_policy.id)
+
+      perform_enqueued_jobs
+
+      activity_message = conversation.messages.where(message_type: 'activity').last
+
+      expect(activity_message).not_to be_nil
+      expect(activity_message.message_type).to eq('activity')
+      expect(activity_message.content).to include('added SLA policy')
+    end
+
+    it 'generates an activity message when the SLA policy is removed' do
+      conversation.update(sla_policy_id: sla_policy.id)
+      conversation.update(sla_policy_id: nil)
+
+      perform_enqueued_jobs
+
+      activity_message = conversation.messages.where(message_type: 'activity').last
+
+      expect(activity_message).not_to be_nil
+      expect(activity_message.message_type).to eq('activity')
+      expect(activity_message.content).to include('removed SLA policy')
+    end
+  end
+
   describe 'conversation sentiments' do
     include ActiveJob::TestHelper
 

From 55fcbe2ddedbeccb9c34b19587ec0b6e905e721e Mon Sep 17 00:00:00 2001
From: Matheus Rodrigues
 <65840136+matheus-rodrigues00@users.noreply.github.com>
Date: Wed, 13 Mar 2024 22:04:42 -0300
Subject: [PATCH 67/96] feat: Add the ability to zoom on chat images (#9093)

Co-authored-by: Shivam Mishra <scm.mymail@gmail.com>
Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Co-authored-by: Pranav <pranav@chatwoot.com>
---
 .../conversation/components/GalleryView.vue   | 90 +++++++++++++++----
 .../FluentIcon/dashboard-icons.json           |  9 +-
 2 files changed, 82 insertions(+), 17 deletions(-)

diff --git a/app/javascript/dashboard/components/widgets/conversation/components/GalleryView.vue b/app/javascript/dashboard/components/widgets/conversation/components/GalleryView.vue
index 2b324527e..eb4b443a7 100644
--- a/app/javascript/dashboard/components/widgets/conversation/components/GalleryView.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/components/GalleryView.vue
@@ -8,45 +8,63 @@
   >
     <div
       v-on-clickaway="onClose"
-      class="bg-white dark:bg-slate-900 flex flex-col h-[inherit] w-[inherit]"
+      class="bg-white dark:bg-slate-900 flex flex-col h-[inherit] w-[inherit] overflow-hidden"
       @click="onClose"
     >
-      <div class="items-center flex h-16 justify-between py-2 px-6 w-full">
-        <div class="items-center flex justify-start min-w-[15rem]" @click.stop>
+      <div
+        class="bg-white dark:bg-slate-900 z-10 flex items-center justify-between w-full h-16 px-6 py-2"
+        @click.stop
+      >
+        <div class="items-center flex justify-start min-w-[15rem]">
           <thumbnail
             :username="senderDetails.name"
             :src="senderDetails.avatar"
           />
           <div
-            class="flex items-start flex-col justify-center ml-2 rtl:ml-0 rtl:mr-2"
+            class="flex flex-col items-start justify-center ml-2 rtl:ml-0 rtl:mr-2"
           >
             <h3 class="text-base inline-block leading-[1.4] m-0 p-0 capitalize">
               <span
-                class="text-slate-800 dark:text-slate-100 overflow-hidden whitespace-nowrap text-ellipsis"
+                class="overflow-hidden text-slate-800 dark:text-slate-100 whitespace-nowrap text-ellipsis"
               >
                 {{ senderDetails.name }}
               </span>
             </h3>
             <span
-              class="text-xs m-0 p-0 text-slate-400 dark:text-slate-200 overflow-hidden whitespace-nowrap text-ellipsis"
+              class="p-0 m-0 overflow-hidden text-xs text-slate-400 dark:text-slate-200 whitespace-nowrap text-ellipsis"
             >
               {{ readableTime }}
             </span>
           </div>
         </div>
         <div
-          class="items-center text-slate-700 dark:text-slate-100 flex font-semibold justify-start min-w-0 p-1 w-auto text-sm"
+          class="flex items-center justify-start w-auto min-w-0 p-1 text-sm font-semibold text-slate-700 dark:text-slate-100"
         >
           <span
-            class="text-slate-700 dark:text-slate-100 overflow-hidden whitespace-nowrap text-ellipsis"
+            class="overflow-hidden text-slate-700 dark:text-slate-100 whitespace-nowrap text-ellipsis"
           >
             {{ fileNameFromDataUrl }}
           </span>
         </div>
         <div
           class="items-center flex gap-2 justify-end min-w-[8rem] sm:min-w-[15rem]"
-          @click.stop
         >
+          <woot-button
+            v-if="isImage"
+            size="large"
+            color-scheme="secondary"
+            variant="clear"
+            icon="zoom-in"
+            @click="onZoom(0.1)"
+          />
+          <woot-button
+            v-if="isImage"
+            size="large"
+            color-scheme="secondary"
+            variant="clear"
+            icon="zoom-out"
+            @click="onZoom(-0.1)"
+          />
           <woot-button
             v-if="isImage"
             size="large"
@@ -79,10 +97,11 @@
           />
         </div>
       </div>
-      <div class="items-center flex h-full justify-center w-full">
+      <div class="flex items-center justify-center w-full h-full">
         <div class="flex justify-center min-w-[6.25rem] w-[6.25rem]">
           <woot-button
             v-if="hasMoreThanOneAttachment"
+            class="z-10"
             size="large"
             variant="smooth"
             color-scheme="primary"
@@ -96,15 +115,16 @@
             "
           />
         </div>
-        <div class="flex items-center flex-col justify-center w-full h-full">
+        <div class="flex flex-col items-center justify-center w-full h-full">
           <div>
             <img
               v-if="isImage"
               :key="activeAttachment.message_id"
               :src="activeAttachment.data_url"
-              class="modal-image skip-context-menu my-0 mx-auto"
+              class="mx-auto my-0 duration-150 ease-in-out transform modal-image skip-context-menu"
               :style="imageRotationStyle"
-              @click.stop
+              @click.stop="onClickZoomImage"
+              @wheel.stop="onWheelImageZoom"
             />
             <video
               v-if="isVideo"
@@ -112,7 +132,7 @@
               :src="activeAttachment.data_url"
               controls
               playsInline
-              class="modal-video skip-context-menu my-0 mx-auto"
+              class="mx-auto my-0 modal-video skip-context-menu"
               @click.stop
             />
             <audio
@@ -129,6 +149,7 @@
         <div class="flex justify-center min-w-[6.25rem] w-[6.25rem]">
           <woot-button
             v-if="hasMoreThanOneAttachment"
+            class="z-10"
             size="large"
             variant="smooth"
             color-scheme="primary"
@@ -143,7 +164,7 @@
           />
         </div>
       </div>
-      <div class="items-center flex h-16 justify-center w-full py-2 px-6">
+      <div class="flex items-center justify-center w-full h-16 px-6 py-2 z-10">
         <div
           class="items-center rounded-sm flex font-semibold justify-center min-w-[5rem] p-1 bg-slate-25 dark:bg-slate-800 text-slate-600 dark:text-slate-200 text-sm"
         >
@@ -174,6 +195,9 @@ const ALLOWED_FILE_TYPES = {
   AUDIO: 'audio',
 };
 
+const MAX_ZOOM_LEVEL = 2;
+const MIN_ZOOM_LEVEL = 1;
+
 export default {
   components: {
     Thumbnail,
@@ -195,6 +219,7 @@ export default {
   },
   data() {
     return {
+      zoomScale: 1,
       activeAttachment: {},
       activeFileType: '',
       activeImageIndex:
@@ -250,7 +275,8 @@ export default {
     },
     imageRotationStyle() {
       return {
-        transform: `rotate(${this.activeImageRotation}deg)`,
+        transform: `rotate(${this.activeImageRotation}deg) scale(${this.zoomScale})`,
+        cursor: this.zoomScale < MAX_ZOOM_LEVEL ? 'zoom-in' : 'zoom-out',
       };
     },
   },
@@ -268,6 +294,7 @@ export default {
       this.activeImageIndex = index;
       this.setImageAndVideoSrc(attachment);
       this.activeImageRotation = 0;
+      this.zoomScale = 1;
     },
     setImageAndVideoSrc(attachment) {
       const { file_type: type } = attachment;
@@ -316,6 +343,37 @@ export default {
         this.activeImageRotation += rotation;
       }
     },
+    onClickZoomImage() {
+      this.onZoom(0.1);
+    },
+    onZoom(scale) {
+      if (!this.isImage) {
+        return;
+      }
+
+      const newZoomScale = this.zoomScale + scale;
+      // Check if the new zoom scale is within the allowed range
+      if (newZoomScale > MAX_ZOOM_LEVEL) {
+        // Set zoom to max but do not reset to default
+        this.zoomScale = MAX_ZOOM_LEVEL;
+        return;
+      }
+      if (newZoomScale < MIN_ZOOM_LEVEL) {
+        // Set zoom to min but do not reset to default
+        this.zoomScale = MIN_ZOOM_LEVEL;
+        return;
+      }
+      // If within bounds, update the zoom scale
+      this.zoomScale = newZoomScale;
+    },
+
+    onWheelImageZoom(e) {
+      if (!this.isImage) {
+        return;
+      }
+      const scale = e.deltaY > 0 ? -0.1 : 0.1;
+      this.onZoom(scale);
+    },
   },
 };
 </script>
diff --git a/app/javascript/shared/components/FluentIcon/dashboard-icons.json b/app/javascript/shared/components/FluentIcon/dashboard-icons.json
index 30e45d489..e1235bf51 100644
--- a/app/javascript/shared/components/FluentIcon/dashboard-icons.json
+++ b/app/javascript/shared/components/FluentIcon/dashboard-icons.json
@@ -126,6 +126,14 @@
   "location-outline": "M5.843 4.568a8.707 8.707 0 1 1 12.314 12.314l-1.187 1.174c-.875.858-2.01 1.962-3.406 3.312a2.25 2.25 0 0 1-3.128 0l-3.491-3.396c-.439-.431-.806-.794-1.102-1.09a8.707 8.707 0 0 1 0-12.314Zm11.253 1.06A7.207 7.207 0 1 0 6.904 15.822L8.39 17.29a753.98 753.98 0 0 0 3.088 3 .75.75 0 0 0 1.043 0l3.394-3.3c.47-.461.863-.85 1.18-1.168a7.207 7.207 0 0 0 0-10.192ZM12 7.999a3.002 3.002 0 1 1 0 6.004 3.002 3.002 0 0 1 0-6.003Zm0 1.5a1.501 1.501 0 1 0 0 3.004 1.501 1.501 0 0 0 0-3.003Z",
   "lock-closed-outline": "M12 2a4 4 0 0 1 4 4v2h1.75A2.25 2.25 0 0 1 20 10.25v9.5A2.25 2.25 0 0 1 17.75 22H6.25A2.25 2.25 0 0 1 4 19.75v-9.5A2.25 2.25 0 0 1 6.25 8H8V6a4 4 0 0 1 4-4Zm5.75 7.5H6.25a.75.75 0 0 0-.75.75v9.5c0 .414.336.75.75.75h11.5a.75.75 0 0 0 .75-.75v-9.5a.75.75 0 0 0-.75-.75Zm-5.75 4a1.5 1.5 0 1 1 0 3 1.5 1.5 0 0 1 0-3Zm0-10A2.5 2.5 0 0 0 9.5 6v2h5V6A2.5 2.5 0 0 0 12 3.5Z",
   "lock-shield-outline": "M10 2a4 4 0 0 1 4 4v2h1.75A2.25 2.25 0 0 1 18 10.25V11c-.319 0-.637.11-.896.329l-.107.1c-.164.17-.33.323-.496.457L16.5 10.25a.75.75 0 0 0-.75-.75H4.25a.75.75 0 0 0-.75.75v9.5c0 .414.336.75.75.75h9.888a6.024 6.024 0 0 0 1.54 1.5H4.25A2.25 2.25 0 0 1 2 19.75v-9.5A2.25 2.25 0 0 1 4.25 8H6V6a4 4 0 0 1 4-4Zm8.284 10.122c.992 1.036 2.091 1.545 3.316 1.545.193 0 .355.143.392.332l.008.084v2.501c0 2.682-1.313 4.506-3.873 5.395a.385.385 0 0 1-.253 0c-2.476-.86-3.785-2.592-3.87-5.13L14 16.585v-2.5c0-.23.18-.417.4-.417 1.223 0 2.323-.51 3.318-1.545a.389.389 0 0 1 .566 0ZM10 13.5a1.5 1.5 0 1 1 0 3 1.5 1.5 0 0 1 0-3Zm0-10A2.5 2.5 0 0 0 7.5 6v2h5V6A2.5 2.5 0 0 0 10 3.5Z",
+  "zoom-in-outline": [
+    "M13.5 10a.75.75 0 0 0-.75-.75h-2v-2a.75.75 0 0 0-1.5 0v2h-2a.75.75 0 1 0 0 1.5h2v2a.75.75 0 0 0 1.5 0v-2h2a.75.75 0 0 0 .75-.75Z",
+    "M10 2.75a7.25 7.25 0 0 1 5.63 11.819l4.9 4.9a.75.75 0 0 1-.976 1.134l-.084-.073-4.901-4.9A7.25 7.25 0 1 1 10 2.75Zm0 1.5a5.75 5.75 0 1 0 0 11.5 5.75 5.75 0 0 0 0-11.5Z"
+  ],
+  "zoom-out-outline": [
+    "M12.75 9.25a.75.75 0 0 1 0 1.5h-5.5a.75.75 0 0 1 0-1.5h5.5Z",
+    "M17.25 10a7.25 7.25 0 1 0-2.681 5.63l4.9 4.9.085.073a.75.75 0 0 0 .976-1.133l-4.9-4.901A7.22 7.22 0 0 0 17.25 10Zm-13 0a5.75 5.75 0 1 1 11.5 0 5.75 5.75 0 0 1-11.5 0Z"
+  ],
   "mail-inbox-outline": "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.5h-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.25v-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",
   "mail-inbox-all-outline": "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 3Zm2.075 11.5H4.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-.188Zm9.425-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.5Zm-11 5h10.5a.75.75 0 0 1 .102 1.493L17.25 11H6.75a.75.75 0 0 1-.102-1.493L6.75 9.5h10.5-10.5Zm0-3h10.5a.75.75 0 0 1 .102 1.493L17.25 8H6.75a.75.75 0 0 1-.102-1.493L6.75 6.5h10.5-10.5Z",
   "mail-unread-outline": "M16 6.5H5.25a1.75 1.75 0 0 0-1.744 1.606l-.004.1L11 12.153l6.03-3.174a3.489 3.489 0 0 0 2.97.985v6.786a3.25 3.25 0 0 1-3.066 3.245L16.75 20H5.25a3.25 3.25 0 0 1-3.245-3.066L2 16.75v-8.5a3.25 3.25 0 0 1 3.066-3.245L5.25 5h11.087A3.487 3.487 0 0 0 16 6.5Zm2.5 3.399-7.15 3.765a.75.75 0 0 1-.603.042l-.096-.042L3.5 9.9v6.85a1.75 1.75 0 0 0 1.606 1.744l.144.006h11.5a1.75 1.75 0 0 0 1.744-1.607l.006-.143V9.899ZM19.5 4a2.5 2.5 0 1 1 0 5 2.5 2.5 0 0 1 0-5Z",
@@ -233,7 +241,6 @@
     "M14 0L13.9093 0.00622212C13.7497 0.0281315 13.6035 0.107093 13.4976 0.228504C13.3917 0.349915 13.3333 0.505562 13.3333 0.666661V1.33332H12.6667L12.576 1.33954C12.4164 1.36145 12.2701 1.44041 12.1642 1.56183C12.0584 1.68324 12 1.83888 12 1.99998L12.0062 2.09065C12.0281 2.25025 12.1071 2.39652 12.2285 2.50241C12.3499 2.60829 12.5056 2.66664 12.6667 2.66664H13.3333V3.3333L13.3396 3.42397C13.3615 3.58357 13.4404 3.72984 13.5618 3.83573C13.6833 3.94162 13.8389 3.99996 14 3.99996L14.0907 3.99374C14.416 3.9493 14.6667 3.67108 14.6667 3.3333V2.66664H15.3333L15.424 2.66042C15.7493 2.61598 16 2.33776 16 1.99998L15.9938 1.90932C15.9719 1.74971 15.8929 1.60345 15.7715 1.49756C15.6501 1.39167 15.4944 1.33333 15.3333 1.33332H14.6667V0.666661L14.6605 0.575995C14.6385 0.416393 14.5596 0.270123 14.4382 0.164236C14.3168 0.0583485 14.1611 6.79363e-06 14 0Z",
     "M16 12.0001L15.8187 12.0125C15.4995 12.0563 15.2069 12.2143 14.9951 12.4571C14.7834 12.6999 14.6667 13.0112 14.6667 13.3334V14.6667H13.3333L13.152 14.6792C12.8328 14.723 12.5403 14.8809 12.3285 15.1237C12.1167 15.3665 12 15.6778 12 16L12.0124 16.1814C12.0563 16.5006 12.2142 16.7931 12.457 17.0049C12.6998 17.2167 13.0111 17.3333 13.3333 17.3334H14.6667V18.6667L14.6791 18.848C14.7229 19.1672 14.8809 19.4598 15.1237 19.6715C15.3665 19.8833 15.6778 20 16 20L16.1813 19.9876C16.832 19.8987 17.3333 19.3422 17.3333 18.6667V17.3334H18.6667L18.848 17.3209C19.4987 17.232 20 16.6756 20 16L19.9876 15.8187C19.9437 15.4995 19.7858 15.207 19.543 14.9952C19.3002 14.7834 18.9889 14.6667 18.6667 14.6667H17.3333V13.3334L17.3209 13.1521C17.2771 12.8329 17.1191 12.5403 16.8763 12.3285C16.6335 12.1168 16.3222 12.0001 16 12.0001Z"
   ],
-
   "book-copy-outline": [
     "M3.66675 15.3334V5.33341C3.66675 4.89139 3.84234 4.46746 4.1549 4.1549C4.46746 3.84234 4.89139 3.66675 5.33341 3.66675H14.5001",
     "M6.16675 13.6667H5.33341C4.89139 13.6667 4.46746 13.8423 4.1549 14.1549C3.84234 14.4675 3.66675 14.8914 3.66675 15.3334C3.66675 15.7754 3.84234 16.1994 4.1549 16.5119C4.46746 16.8245 4.89139 17.0001 5.33341 17.0001H6.16675",

From 29171565ed4f5b9ea82ce66bfb01d08e282068f5 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Thu, 14 Mar 2024 07:16:35 +0530
Subject: [PATCH 68/96] feat: Add image preview for inline images in
 `vue-letter` (#9099)

Co-authored-by: Pranav <pranav@chatwoot.com>
---
 .../widgets/conversation/bubble/Text.vue      | 53 ++++++++++++++++---
 .../conversation/components/GalleryView.vue   | 22 ++++----
 2 files changed, 58 insertions(+), 17 deletions(-)

diff --git a/app/javascript/dashboard/components/widgets/conversation/bubble/Text.vue b/app/javascript/dashboard/components/widgets/conversation/bubble/Text.vue
index a9127ac16..bc24ed90f 100644
--- a/app/javascript/dashboard/components/widgets/conversation/bubble/Text.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/bubble/Text.vue
@@ -7,11 +7,12 @@
     }"
   >
     <div v-if="!isEmail" v-dompurify-html="message" class="text-content" />
-    <letter
-      v-else
-      class="text-content bg-white dark:bg-white text-slate-900 dark:text-slate-900 p-2 rounded-[4px]"
-      :html="message"
-    />
+    <div v-else @click="handleClickOnContent">
+      <letter
+        class="text-content bg-white dark:bg-white text-slate-900 dark:text-slate-900 p-2 rounded-[4px]"
+        :html="message"
+      />
+    </div>
     <button
       v-if="showQuoteToggle"
       class="text-slate-300 dark:text-slate-300 cursor-pointer text-xs py-1"
@@ -26,14 +27,23 @@
         {{ $t('CHAT_LIST.SHOW_QUOTED_TEXT') }}
       </span>
     </button>
+    <gallery-view
+      v-if="showGalleryViewer"
+      :show.sync="showGalleryViewer"
+      :attachment="attachment"
+      :all-attachments="availableAttachments"
+      @error="onClose"
+      @close="onClose"
+    />
   </div>
 </template>
 
 <script>
 import Letter from 'vue-letter';
+import GalleryView from '../components/GalleryView.vue';
 
 export default {
-  components: { Letter },
+  components: { Letter, GalleryView },
   props: {
     message: {
       type: String,
@@ -51,6 +61,9 @@ export default {
   data() {
     return {
       showQuotedContent: false,
+      showGalleryViewer: false,
+      attachment: {},
+      availableAttachments: [],
     };
   },
   computed: {
@@ -71,6 +84,33 @@ export default {
     toggleQuotedContent() {
       this.showQuotedContent = !this.showQuotedContent;
     },
+    handleClickOnContent(event) {
+      // if event target is IMG and not close in A tag
+      // then open image preview
+      const isImageElement = event.target.tagName === 'IMG';
+      const isWrappedInLink = event.target.closest('A');
+
+      if (isImageElement && !isWrappedInLink) {
+        this.openImagePreview(event.target.src);
+      }
+    },
+    openImagePreview(src) {
+      this.showGalleryViewer = true;
+      this.attachment = {
+        file_type: 'image',
+        data_url: src,
+        message_id: Math.floor(Math.random() * 100),
+      };
+      this.availableAttachments = [{ ...this.attachment }];
+    },
+    onClose() {
+      this.showGalleryViewer = false;
+      this.resetAttachmentData();
+    },
+    resetAttachmentData() {
+      this.attachment = {};
+      this.availableAttachments = [];
+    },
   },
 };
 </script>
@@ -82,6 +122,7 @@ export default {
   ol {
     padding-left: var(--space-two);
   }
+
   table {
     margin: 0;
     border: 0;
diff --git a/app/javascript/dashboard/components/widgets/conversation/components/GalleryView.vue b/app/javascript/dashboard/components/widgets/conversation/components/GalleryView.vue
index eb4b443a7..b7b146040 100644
--- a/app/javascript/dashboard/components/widgets/conversation/components/GalleryView.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/components/GalleryView.vue
@@ -15,8 +15,12 @@
         class="bg-white dark:bg-slate-900 z-10 flex items-center justify-between w-full h-16 px-6 py-2"
         @click.stop
       >
-        <div class="items-center flex justify-start min-w-[15rem]">
+        <div
+          v-if="senderDetails"
+          class="items-center flex justify-start min-w-[15rem]"
+        >
           <thumbnail
+            v-if="senderDetails.avatar"
             :username="senderDetails.name"
             :src="senderDetails.avatar"
           />
@@ -41,10 +45,9 @@
           class="flex items-center justify-start w-auto min-w-0 p-1 text-sm font-semibold text-slate-700 dark:text-slate-100"
         >
           <span
+            v-dompurify-html="fileNameFromDataUrl"
             class="overflow-hidden text-slate-700 dark:text-slate-100 whitespace-nowrap text-ellipsis"
-          >
-            {{ fileNameFromDataUrl }}
-          </span>
+          />
         </div>
         <div
           class="items-center flex gap-2 justify-end min-w-[8rem] sm:min-w-[15rem]"
@@ -237,12 +240,9 @@ export default {
       return this.allAttachments.length > 1;
     },
     readableTime() {
-      if (!this.activeAttachment.created_at) return '';
-      const time = this.messageTimestamp(
-        this.activeAttachment.created_at,
-        'LLL d yyyy, h:mm a'
-      );
-      return time || '';
+      const { created_at: createdAt } = this.activeAttachment;
+      if (!createdAt) return '';
+      return this.messageTimestamp(createdAt, 'LLL d yyyy, h:mm a') || '';
     },
     isImage() {
       return this.activeFileType === ALLOWED_FILE_TYPES.IMAGE;
@@ -271,7 +271,7 @@ export default {
       const { data_url: dataUrl } = this.activeAttachment;
       if (!dataUrl) return '';
       const fileName = dataUrl?.split('/').pop();
-      return fileName || '';
+      return decodeURIComponent(fileName || '');
     },
     imageRotationStyle() {
       return {

From 3dae3ff3ad75baab8ecafda49e1c556e14144acc Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Thu, 14 Mar 2024 17:22:32 +0530
Subject: [PATCH 69/96] feat: Conversation update API for sla_policy_id (#8973)

- Add an endpoint for updating conversation attributes (priority / sla_policy_id )
- Swagger spec
- minor chores around the conversation API/spec

Fixes: https://linear.app/chatwoot/issue/CW-2100/feat-backend-api-to-update-the-sla-of-a-conversation
---
 .../v1/accounts/conversations_controller.rb   | 11 ++++
 .../concerns/access_token_auth_helper.rb      |  2 +-
 .../conversations/update.json.jbuilder        |  1 +
 .../partials/_conversation.json.jbuilder      |  1 +
 config/routes.rb                              |  2 +-
 .../v1/accounts/conversations_controller.rb   |  5 ++
 enterprise/app/models/applied_sla.rb          |  7 ++
 .../enterprise_conversation_concern.rb        | 30 +++++++++
 enterprise/app/models/sla_policy.rb           |  1 +
 .../app/services/enterprise/action_service.rb | 11 ----
 .../accounts/conversations_controller_spec.rb | 64 ++++++++++++++-----
 .../accounts/conversations_controller_spec.rb | 41 ++++++++++++
 spec/enterprise/models/conversation_spec.rb   | 62 ++++++++++++++----
 .../sla/evaluate_applied_sla_service_spec.rb  | 19 ++++--
 .../paths/application/conversation/update.yml | 29 +++++++++
 swagger/paths/index.yml                       |  2 +
 swagger/swagger.json                          | 58 +++++++++++++++++
 17 files changed, 301 insertions(+), 45 deletions(-)
 create mode 100644 app/views/api/v1/accounts/conversations/update.json.jbuilder
 create mode 100644 enterprise/app/controllers/enterprise/api/v1/accounts/conversations_controller.rb
 create mode 100644 spec/enterprise/controllers/enterprise/api/v1/accounts/conversations_controller_spec.rb
 create mode 100644 swagger/paths/application/conversation/update.yml

diff --git a/app/controllers/api/v1/accounts/conversations_controller.rb b/app/controllers/api/v1/accounts/conversations_controller.rb
index 281ff95de..d0d8f6d5b 100644
--- a/app/controllers/api/v1/accounts/conversations_controller.rb
+++ b/app/controllers/api/v1/accounts/conversations_controller.rb
@@ -36,6 +36,10 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
     end
   end
 
+  def update
+    @conversation.update!(permitted_update_params)
+  end
+
   def filter
     result = ::Conversations::FilterService.new(params.permit!, current_user).perform
     @conversations = result[:conversations]
@@ -110,6 +114,11 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
 
   private
 
+  def permitted_update_params
+    # TODO: Move the other conversation attributes to this method and remove specific endpoints for each attribute
+    params.permit(:priority)
+  end
+
   def update_last_seen_on_conversation(last_seen_at, update_assignee)
     # rubocop:disable Rails/SkipsModelValidations
     @conversation.update_column(:agent_last_seen_at, last_seen_at)
@@ -176,3 +185,5 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
     @conversation.assignee_id? && Current.user == @conversation.assignee
   end
 end
+
+Api::V1::Accounts::ConversationsController.prepend_mod_with('Api::V1::Accounts::ConversationsController')
diff --git a/app/controllers/concerns/access_token_auth_helper.rb b/app/controllers/concerns/access_token_auth_helper.rb
index cd760f7ce..2ee9f9854 100644
--- a/app/controllers/concerns/access_token_auth_helper.rb
+++ b/app/controllers/concerns/access_token_auth_helper.rb
@@ -1,6 +1,6 @@
 module AccessTokenAuthHelper
   BOT_ACCESSIBLE_ENDPOINTS = {
-    'api/v1/accounts/conversations' => %w[toggle_status toggle_priority create],
+    'api/v1/accounts/conversations' => %w[toggle_status toggle_priority create update],
     'api/v1/accounts/conversations/messages' => ['create'],
     'api/v1/accounts/conversations/assignments' => ['create']
   }.freeze
diff --git a/app/views/api/v1/accounts/conversations/update.json.jbuilder b/app/views/api/v1/accounts/conversations/update.json.jbuilder
new file mode 100644
index 000000000..c273dd3c6
--- /dev/null
+++ b/app/views/api/v1/accounts/conversations/update.json.jbuilder
@@ -0,0 +1 @@
+json.partial! 'api/v1/conversations/partials/conversation', formats: [:json], conversation: @conversation
diff --git a/app/views/api/v1/conversations/partials/_conversation.json.jbuilder b/app/views/api/v1/conversations/partials/_conversation.json.jbuilder
index cef56fed4..2e90e073a 100644
--- a/app/views/api/v1/conversations/partials/_conversation.json.jbuilder
+++ b/app/views/api/v1/conversations/partials/_conversation.json.jbuilder
@@ -47,3 +47,4 @@ json.last_non_activity_message conversation.messages.where(account_id: conversat
 json.last_activity_at conversation.last_activity_at.to_i
 json.priority conversation.priority
 json.waiting_since conversation.waiting_since.to_i.to_i
+json.sla_policy_id conversation.sla_policy_id
diff --git a/config/routes.rb b/config/routes.rb
index 90317c7b2..cfa14c854 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -78,7 +78,7 @@ Rails.application.routes.draw do
           namespace :channels do
             resource :twilio_channel, only: [:create]
           end
-          resources :conversations, only: [:index, :create, :show] do
+          resources :conversations, only: [:index, :create, :show, :update] do
             collection do
               get :meta
               get :search
diff --git a/enterprise/app/controllers/enterprise/api/v1/accounts/conversations_controller.rb b/enterprise/app/controllers/enterprise/api/v1/accounts/conversations_controller.rb
new file mode 100644
index 000000000..be8dfbddf
--- /dev/null
+++ b/enterprise/app/controllers/enterprise/api/v1/accounts/conversations_controller.rb
@@ -0,0 +1,5 @@
+module Enterprise::Api::V1::Accounts::ConversationsController
+  def permitted_update_params
+    super.merge(params.permit(:sla_policy_id))
+  end
+end
diff --git a/enterprise/app/models/applied_sla.rb b/enterprise/app/models/applied_sla.rb
index cb5ca508d..48fd852e4 100644
--- a/enterprise/app/models/applied_sla.rb
+++ b/enterprise/app/models/applied_sla.rb
@@ -23,6 +23,13 @@ class AppliedSla < ApplicationRecord
   belongs_to :conversation
 
   validates :account_id, uniqueness: { scope: %i[sla_policy_id conversation_id] }
+  before_validation :ensure_account_id
 
   enum sla_status: { active: 0, hit: 1, missed: 2 }
+
+  private
+
+  def ensure_account_id
+    self.account_id ||= sla_policy&.account_id
+  end
 end
diff --git a/enterprise/app/models/enterprise/enterprise_conversation_concern.rb b/enterprise/app/models/enterprise/enterprise_conversation_concern.rb
index fc39a61a9..721f069dc 100644
--- a/enterprise/app/models/enterprise/enterprise_conversation_concern.rb
+++ b/enterprise/app/models/enterprise/enterprise_conversation_concern.rb
@@ -3,5 +3,35 @@ module Enterprise::EnterpriseConversationConcern
 
   included do
     belongs_to :sla_policy, optional: true
+    has_one :applied_sla, dependent: :destroy
+    before_validation :validate_sla_policy, if: -> { sla_policy_id_changed? }
+    around_save :ensure_applied_sla_is_created, if: -> { sla_policy_id_changed? }
+  end
+
+  private
+
+  def validate_sla_policy
+    # TODO: remove these validations once we figure out how to deal with these cases
+    if sla_policy_id.nil? && changes[:sla_policy_id].first.present?
+      errors.add(:sla_policy, 'cannot remove sla policy from conversation')
+      return
+    end
+
+    if changes[:sla_policy_id].first.present?
+      errors.add(:sla_policy, 'conversation already has a different sla')
+      return
+    end
+
+    errors.add(:sla_policy, 'sla policy account mismatch') if sla_policy&.account_id != account_id
+  end
+
+  # handling inside a transaction to ensure applied sla record is also created
+  def ensure_applied_sla_is_created
+    ActiveRecord::Base.transaction do
+      yield
+      create_applied_sla(sla_policy_id: sla_policy_id) if applied_sla.blank?
+    end
+  rescue ActiveRecord::RecordInvalid
+    raise ActiveRecord::Rollback
   end
 end
diff --git a/enterprise/app/models/sla_policy.rb b/enterprise/app/models/sla_policy.rb
index 647db2cfc..f53f00ed5 100644
--- a/enterprise/app/models/sla_policy.rb
+++ b/enterprise/app/models/sla_policy.rb
@@ -22,6 +22,7 @@ class SlaPolicy < ApplicationRecord
   validates :name, presence: true
 
   has_many :conversations, dependent: :nullify
+  has_many :applied_slas, dependent: :destroy
 
   def push_event_data
     {
diff --git a/enterprise/app/services/enterprise/action_service.rb b/enterprise/app/services/enterprise/action_service.rb
index 1e4165b09..f0c3bbf9f 100644
--- a/enterprise/app/services/enterprise/action_service.rb
+++ b/enterprise/app/services/enterprise/action_service.rb
@@ -8,16 +8,5 @@ module Enterprise::ActionService
 
     Rails.logger.info "SLA:: Adding SLA #{sla_policy.id} to conversation: #{@conversation.id}"
     @conversation.update!(sla_policy_id: sla_policy.id)
-    create_applied_sla(sla_policy)
-  end
-
-  def create_applied_sla(sla_policy)
-    Rails.logger.info "SLA:: Creating Applied SLA for conversation: #{@conversation.id}"
-    AppliedSla.create!(
-      account_id: @conversation.account_id,
-      sla_policy_id: sla_policy.id,
-      conversation_id: @conversation.id,
-      sla_status: 'active'
-    )
   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 72e6603f7..70f5b82ee 100644
--- a/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
@@ -210,6 +210,55 @@ RSpec.describe 'Conversations API', type: :request do
     end
   end
 
+  describe 'PATCH /api/v1/accounts/{account.id}/conversations/:id' do
+    let(:conversation) { create(:conversation, account: account) }
+    let(:params) { { priority: 'high' } }
+
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        patch "/api/v1/accounts/#{account.id}/conversations/#{conversation.display_id}",
+              params: params
+
+        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) }
+
+      it 'does not update the conversation if you do not have access to it' do
+        patch "/api/v1/accounts/#{account.id}/conversations/#{conversation.display_id}",
+              params: params,
+              headers: agent.create_new_auth_token,
+              as: :json
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+
+      it 'updates the conversation if you are an administrator' do
+        patch "/api/v1/accounts/#{account.id}/conversations/#{conversation.display_id}",
+              params: params,
+              headers: administrator.create_new_auth_token,
+              as: :json
+
+        expect(response).to have_http_status(:success)
+        expect(JSON.parse(response.body, symbolize_names: true)[:priority]).to eq('high')
+      end
+
+      it 'updates the conversation if you are an agent with access to inbox' do
+        create(:inbox_member, user: agent, inbox: conversation.inbox)
+        patch "/api/v1/accounts/#{account.id}/conversations/#{conversation.display_id}",
+              params: params,
+              headers: agent.create_new_auth_token,
+              as: :json
+
+        expect(response).to have_http_status(:success)
+        expect(JSON.parse(response.body, symbolize_names: true)[:priority]).to eq('high')
+      end
+    end
+  end
+
   describe 'POST /api/v1/accounts/{account.id}/conversations' do
     let(:contact) { create(:contact, account: account) }
     let(:inbox) { create(:inbox, account: account) }
@@ -411,21 +460,6 @@ RSpec.describe 'Conversations API', type: :request do
         expect(conversation.reload.status).to eq('snoozed')
         expect(conversation.reload.snoozed_until.to_i).to eq(snoozed_until)
       end
-
-      # TODO: remove this spec when we remove the condition check in controller
-      # Added for backwards compatibility for bot status
-      # remove in next release
-      # it 'toggles the conversation status to pending status when parameter bot is passed' do
-      #   expect(conversation.status).to eq('open')
-
-      #   post "/api/v1/accounts/#{account.id}/conversations/#{conversation.display_id}/toggle_status",
-      #        headers: agent.create_new_auth_token,
-      #        params: { status: 'bot' },
-      #        as: :json
-
-      #   expect(response).to have_http_status(:success)
-      #   expect(conversation.reload.status).to eq('pending')
-      # end
     end
 
     context 'when it is an authenticated bot' do
diff --git a/spec/enterprise/controllers/enterprise/api/v1/accounts/conversations_controller_spec.rb b/spec/enterprise/controllers/enterprise/api/v1/accounts/conversations_controller_spec.rb
new file mode 100644
index 000000000..fb028b76f
--- /dev/null
+++ b/spec/enterprise/controllers/enterprise/api/v1/accounts/conversations_controller_spec.rb
@@ -0,0 +1,41 @@
+require 'rails_helper'
+
+RSpec.describe 'Enterprise Conversations API', type: :request do
+  let(:account) { create(:account) }
+  let(:admin) { create(:user, account: account, role: :administrator) }
+
+  describe 'PATCH /api/v1/accounts/{account.id}/conversations/:id' do
+    let(:conversation) { create(:conversation, account: account) }
+    let(:sla_policy) { create(:sla_policy, account: account) }
+    let(:params) { { sla_policy_id: sla_policy.id } }
+
+    context 'when it is an authenticated user' do
+      let(:agent) { create(:user, account: account, role: :agent) }
+
+      before do
+        create(:inbox_member, user: agent, inbox: conversation.inbox)
+      end
+
+      it 'updates the conversation if you are an agent with access to inbox' do
+        patch "/api/v1/accounts/#{account.id}/conversations/#{conversation.display_id}",
+              params: params,
+              headers: agent.create_new_auth_token,
+              as: :json
+
+        expect(response).to have_http_status(:success)
+        expect(JSON.parse(response.body, symbolize_names: true)[:sla_policy_id]).to eq(sla_policy.id)
+      end
+
+      it 'throws error if conversation already has a different sla' do
+        conversation.update(sla_policy: create(:sla_policy, account: account))
+        patch "/api/v1/accounts/#{account.id}/conversations/#{conversation.display_id}",
+              params: params,
+              headers: agent.create_new_auth_token,
+              as: :json
+
+        expect(response).to have_http_status(:unprocessable_entity)
+        expect(JSON.parse(response.body, symbolize_names: true)[:message]).to eq('Sla policy conversation already has a different sla')
+      end
+    end
+  end
+end
diff --git a/spec/enterprise/models/conversation_spec.rb b/spec/enterprise/models/conversation_spec.rb
index bb3ced5b3..e9fe811ca 100644
--- a/spec/enterprise/models/conversation_spec.rb
+++ b/spec/enterprise/models/conversation_spec.rb
@@ -7,10 +7,10 @@ RSpec.describe Conversation, type: :model do
 
   describe 'SLA policy updates' do
     let!(:conversation) { create(:conversation) }
-    let!(:sla_policy) { create(:sla_policy) }
+    let!(:sla_policy) { create(:sla_policy, account: conversation.account) }
 
     it 'generates an activity message when the SLA policy is updated' do
-      conversation.update(sla_policy_id: sla_policy.id)
+      conversation.update!(sla_policy_id: sla_policy.id)
 
       perform_enqueued_jobs
 
@@ -21,18 +21,19 @@ RSpec.describe Conversation, type: :model do
       expect(activity_message.content).to include('added SLA policy')
     end
 
-    it 'generates an activity message when the SLA policy is removed' do
-      conversation.update(sla_policy_id: sla_policy.id)
-      conversation.update(sla_policy_id: nil)
+    # TODO: Reenable this when we let the SLA policy be removed from a conversation
+    # it 'generates an activity message when the SLA policy is removed' do
+    #   conversation.update!(sla_policy_id: sla_policy.id)
+    #   conversation.update!(sla_policy_id: nil)
 
-      perform_enqueued_jobs
+    #   perform_enqueued_jobs
 
-      activity_message = conversation.messages.where(message_type: 'activity').last
+    #   activity_message = conversation.messages.where(message_type: 'activity').last
 
-      expect(activity_message).not_to be_nil
-      expect(activity_message.message_type).to eq('activity')
-      expect(activity_message.content).to include('removed SLA policy')
-    end
+    #   expect(activity_message).not_to be_nil
+    #   expect(activity_message.message_type).to eq('activity')
+    #   expect(activity_message.content).to include('removed SLA policy')
+    # end
   end
 
   describe 'conversation sentiments' do
@@ -64,4 +65,43 @@ RSpec.describe Conversation, type: :model do
       expect(sentiments[:label]).to eq('positive')
     end
   end
+
+  describe 'sla_policy' do
+    let(:account) { create(:account) }
+    let(:conversation) { create(:conversation, account: account) }
+    let(:sla_policy) { create(:sla_policy, account: account) }
+    let(:different_account_sla_policy) { create(:sla_policy) }
+
+    context 'when sla_policy is getting updated' do
+      it 'throws error if sla policy belongs to different account' do
+        conversation.sla_policy = different_account_sla_policy
+        expect(conversation.valid?).to be false
+        expect(conversation.errors[:sla_policy]).to include('sla policy account mismatch')
+      end
+
+      it 'creates applied sla record if sla policy is present' do
+        conversation.sla_policy = sla_policy
+        conversation.save!
+        expect(conversation.applied_sla.sla_policy_id).to eq(sla_policy.id)
+      end
+    end
+
+    context 'when conversation already has a different sla' do
+      before do
+        conversation.update(sla_policy: create(:sla_policy, account: account))
+      end
+
+      it 'throws error if trying to assing a different sla' do
+        conversation.sla_policy = sla_policy
+        expect(conversation.valid?).to be false
+        expect(conversation.errors[:sla_policy]).to eq(['conversation already has a different sla'])
+      end
+
+      it 'throws error if trying to set sla to nil' do
+        conversation.sla_policy = nil
+        expect(conversation.valid?).to be false
+        expect(conversation.errors[:sla_policy]).to eq(['cannot remove sla policy from conversation'])
+      end
+    end
+  end
 end
diff --git a/spec/enterprise/services/sla/evaluate_applied_sla_service_spec.rb b/spec/enterprise/services/sla/evaluate_applied_sla_service_spec.rb
index 17c09cb0e..12cb59d35 100644
--- a/spec/enterprise/services/sla/evaluate_applied_sla_service_spec.rb
+++ b/spec/enterprise/services/sla/evaluate_applied_sla_service_spec.rb
@@ -5,14 +5,21 @@ RSpec.describe Sla::EvaluateAppliedSlaService do
   let!(:user_1) { create(:user, account: account) }
   let!(:user_2) { create(:user, account: account) }
   let!(:admin) { create(:user, account: account, role: :administrator) }
-  let!(:conversation) { create(:conversation, created_at: 6.hours.ago, assignee: user_1, account: account) }
+
   let!(:sla_policy) do
-    create(:sla_policy, account: conversation.account,
-                        first_response_time_threshold: nil,
-                        next_response_time_threshold: nil,
-                        resolution_time_threshold: nil)
+    create(:sla_policy,
+           account: account,
+           first_response_time_threshold: nil,
+           next_response_time_threshold: nil,
+           resolution_time_threshold: nil)
   end
-  let!(:applied_sla) { create(:applied_sla, conversation: conversation, sla_policy: sla_policy, sla_status: 'active') }
+  let!(:conversation) do
+    create(:conversation,
+           created_at: 6.hours.ago, assignee: user_1,
+           account: sla_policy.account,
+           sla_policy: sla_policy)
+  end
+  let!(:applied_sla) { conversation.applied_sla }
 
   describe '#perform - SLA misses' do
     context 'when first response SLA is missed' do
diff --git a/swagger/paths/application/conversation/update.yml b/swagger/paths/application/conversation/update.yml
new file mode 100644
index 000000000..3add02635
--- /dev/null
+++ b/swagger/paths/application/conversation/update.yml
@@ -0,0 +1,29 @@
+tags:
+  - Conversations
+operationId: update-conversation
+summary: Update Conversation
+description: Update Conversation Attributes
+security:
+  - userApiKey: []
+  - agentBotApiKey: []
+parameters:
+  - name: data
+    in: body
+    required: true
+    schema:
+      type: object
+      properties:
+        priority:
+          type: string
+          enum:  ["urgent", "high", "medium", "low", "none"]
+          description: "The priority of the conversation"
+        sla_policy_id:
+          type: number
+          description: "The ID of the SLA policy (Available only in Enterprise edition)"
+responses:
+  200:
+    description: Success
+  404:
+    description: Conversation not found
+  401:
+    description: Unauthorized
diff --git a/swagger/paths/index.yml b/swagger/paths/index.yml
index 2c6dd3f87..6df22d06e 100644
--- a/swagger/paths/index.yml
+++ b/swagger/paths/index.yml
@@ -339,6 +339,8 @@
     - $ref: '#/parameters/conversation_id'
   get:
     $ref: ./application/conversation/show.yml
+  patch:
+    $ref: ./application/conversation/update.yml
 /api/v1/accounts/{account_id}/conversations/{conversation_id}/toggle_status:
   parameters:
     - $ref: '#/parameters/account_id'
diff --git a/swagger/swagger.json b/swagger/swagger.json
index ec88a224b..d5f94f730 100644
--- a/swagger/swagger.json
+++ b/swagger/swagger.json
@@ -3319,6 +3319,64 @@
             "description": "Access denied"
           }
         }
+      },
+      "patch": {
+        "tags": [
+          "Conversations"
+        ],
+        "operationId": "update-conversation",
+        "summary": "Update Conversation",
+        "description": "Update Conversation Attributes",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          },
+          {
+            "agentBotApiKey": [
+
+            ]
+          }
+        ],
+        "parameters": [
+          {
+            "name": "data",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "type": "object",
+              "properties": {
+                "priority": {
+                  "type": "string",
+                  "enum": [
+                    "urgent",
+                    "high",
+                    "medium",
+                    "low",
+                    "none"
+                  ],
+                  "description": "The priority of the conversation"
+                },
+                "sla_policy_id": {
+                  "type": "number",
+                  "description": "The ID of the SLA policy (Available only in Enterprise edition)"
+                }
+              }
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success"
+          },
+          "404": {
+            "description": "Conversation not found"
+          },
+          "401": {
+            "description": "Unauthorized"
+          }
+        }
       }
     },
     "/api/v1/accounts/{account_id}/conversations/{conversation_id}/toggle_status": {

From 586552013ef5556816abf141744c1de49146309f Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Fri, 15 Mar 2024 10:55:40 +0530
Subject: [PATCH 70/96] feat: Update the `contact_type` when creating or
 updating the contact (#9107)

* feat: Update location and country code when the contact create/update

* feat: Update the location and country_code when creating or updating the contact.

* chore: improve comments

* feat: Update the contact_type when the contact created/updated

* chore: add more specs

* chore: code cleanups

* chore: code cleanups

* Update contact_spec.rb

* Update inbox.rb

* Update sync_attributes_spec.rb

* chore: build fixes

* chore: check visitor type before update

* chore: review fixes
---
 app/models/contact.rb                         |  9 ++--
 app/services/contacts/sync_attributes.rb      | 37 +++++++++++++++
 spec/models/contact_spec.rb                   | 19 ++++++++
 .../services/contacts/sync_attributes_spec.rb | 46 +++++++++++++++++++
 4 files changed, 105 insertions(+), 6 deletions(-)
 create mode 100644 app/services/contacts/sync_attributes.rb
 create mode 100644 spec/services/contacts/sync_attributes_spec.rb

diff --git a/app/models/contact.rb b/app/models/contact.rb
index 1f3d2fb90..a60e9f4d2 100644
--- a/app/models/contact.rb
+++ b/app/models/contact.rb
@@ -61,7 +61,7 @@ class Contact < ApplicationRecord
   after_create_commit :dispatch_create_event, :ip_lookup
   after_update_commit :dispatch_update_event
   after_destroy_commit :dispatch_destroy_event
-  before_save :update_contact_location_and_country_code
+  before_save :sync_contact_attributes
 
   enum contact_type: { visitor: 0, lead: 1, customer: 2 }
 
@@ -207,11 +207,8 @@ class Contact < ApplicationRecord
     self.custom_attributes = {} if custom_attributes.blank?
   end
 
-  def update_contact_location_and_country_code
-    # TODO: Ensure that location and country_code are updated from additional_attributes.
-    # We will remove this once all contacts are updated and both the location and country_code fields are standardized throughout the app.
-    self.location = additional_attributes['city']
-    self.country_code = additional_attributes['country']
+  def sync_contact_attributes
+    ::Contacts::SyncAttributes.new(self).perform
   end
 
   def dispatch_create_event
diff --git a/app/services/contacts/sync_attributes.rb b/app/services/contacts/sync_attributes.rb
new file mode 100644
index 000000000..bc10def66
--- /dev/null
+++ b/app/services/contacts/sync_attributes.rb
@@ -0,0 +1,37 @@
+class Contacts::SyncAttributes
+  attr_reader :contact
+
+  def initialize(contact)
+    @contact = contact
+  end
+
+  def perform
+    update_contact_location_and_country_code
+    set_contact_type
+  end
+
+  private
+
+  def update_contact_location_and_country_code
+    # Ensure that location and country_code are updated from additional_attributes.
+    # TODO: Remove this once all contacts are updated and both the location and country_code fields are standardized throughout the app.
+    @contact.location = @contact.additional_attributes['city']
+    @contact.country_code = @contact.additional_attributes['country']
+  end
+
+  def set_contact_type
+    #  If the contact is already a lead or customer then do not change the contact type
+    return unless @contact.contact_type == 'visitor'
+    # If the contact has an email or phone number or social details( facebook_user_id, instagram_user_id, etc) then it is a lead
+    # If contact is from external channel like facebook, instagram, whatsapp, etc then it is a lead
+    return unless @contact.email.present? || @contact.phone_number.present? || social_details_present?
+
+    @contact.contact_type = 'lead'
+  end
+
+  def social_details_present?
+    @contact.additional_attributes.keys.any? do |key|
+      key.start_with?('social_') && @contact.additional_attributes[key].present?
+    end
+  end
+end
diff --git a/spec/models/contact_spec.rb b/spec/models/contact_spec.rb
index ff186466a..2ca65fa4e 100644
--- a/spec/models/contact_spec.rb
+++ b/spec/models/contact_spec.rb
@@ -22,11 +22,13 @@ RSpec.describe Contact do
     it 'sets email to lowercase' do
       contact = create(:contact, email: 'Test@test.com')
       expect(contact.email).to eq('test@test.com')
+      expect(contact.contact_type).to eq('lead')
     end
 
     it 'sets email to nil when empty string' do
       contact = create(:contact, email: '')
       expect(contact.email).to be_nil
+      expect(contact.contact_type).to eq('visitor')
     end
 
     it 'sets custom_attributes to {} when nil' do
@@ -83,4 +85,21 @@ RSpec.describe Contact do
       expect(contact.country_code).to eq 'US'
     end
   end
+
+  context 'when a contact is created' do
+    it 'has contact type "visitor" by default' do
+      contact = create(:contact)
+      expect(contact.contact_type).to eq 'visitor'
+    end
+
+    it 'has contact type "lead" when email is present' do
+      contact = create(:contact, email: 'test@test.com')
+      expect(contact.contact_type).to eq 'lead'
+    end
+
+    it 'has contact type "lead" when contacted through a social channel' do
+      contact = create(:contact, additional_attributes: { social_facebook_user_id: '123' })
+      expect(contact.contact_type).to eq 'lead'
+    end
+  end
 end
diff --git a/spec/services/contacts/sync_attributes_spec.rb b/spec/services/contacts/sync_attributes_spec.rb
new file mode 100644
index 000000000..447bcd740
--- /dev/null
+++ b/spec/services/contacts/sync_attributes_spec.rb
@@ -0,0 +1,46 @@
+# spec/services/contacts/sync_attributes_spec.rb
+
+require 'rails_helper'
+
+RSpec.describe Contacts::SyncAttributes do
+  describe '#perform' do
+    let(:contact) { create(:contact, additional_attributes: { 'city' => 'New York', 'country' => 'US' }) }
+
+    context 'when contact has neither email/phone number nor social details' do
+      it 'does not change contact type' do
+        described_class.new(contact).perform
+        expect(contact.reload.contact_type).to eq('visitor')
+      end
+    end
+
+    context 'when contact has email or phone number' do
+      it 'sets contact type to lead' do
+        contact.email = 'test@test.com'
+        contact.save
+        described_class.new(contact).perform
+
+        expect(contact.reload.contact_type).to eq('lead')
+      end
+    end
+
+    context 'when contact has social details' do
+      it 'sets contact type to lead' do
+        contact.additional_attributes['social_facebook_user_id'] = '123456789'
+        contact.save
+        described_class.new(contact).perform
+
+        expect(contact.reload.contact_type).to eq('lead')
+      end
+    end
+
+    context 'when location and country code are updated from additional attributes' do
+      it 'updates location and country code' do
+        described_class.new(contact).perform
+
+        # Expect location and country code to be updated
+        expect(contact.reload.location).to eq('New York')
+        expect(contact.reload.country_code).to eq('US')
+      end
+    end
+  end
+end

From 476077ab846e046b48fc183625137af2e48ba158 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Fri, 15 Mar 2024 11:23:43 +0530
Subject: [PATCH 71/96] fix: Update location component to avoid overflow,
 handle location title from Telegram payload (#9113)

Co-authored-by: Pranav <pranav@chatwoot.com>
---
 .../widgets/conversation/bubble/Location.vue  | 90 ++++++++-----------
 .../telegram/incoming_message_service.rb      | 11 +++
 .../telegram/incoming_message_service_spec.rb | 24 +++++
 3 files changed, 71 insertions(+), 54 deletions(-)

diff --git a/app/javascript/dashboard/components/widgets/conversation/bubble/Location.vue b/app/javascript/dashboard/components/widgets/conversation/bubble/Location.vue
index 3b8fcbaa0..e72233b88 100644
--- a/app/javascript/dashboard/components/widgets/conversation/bubble/Location.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/bubble/Location.vue
@@ -1,17 +1,45 @@
+<script setup>
+import { computed } from 'vue';
+
+const props = defineProps({
+  latitude: {
+    type: Number,
+    default: undefined,
+  },
+  longitude: {
+    type: Number,
+    default: undefined,
+  },
+  name: {
+    type: String,
+    default: '',
+  },
+});
+
+const mapUrl = computed(
+  () => `https://maps.google.com/?q=${props.latitude},${props.longitude}`
+);
+</script>
+
 <template>
-  <div class="location message-text__wrap">
-    <div class="icon-wrap">
-      <fluent-icon icon="location" class="file--icon" size="32" />
-    </div>
-    <div class="meta">
+  <div
+    class="flex flex-row items-center justify-start gap-1 w-full py-1 px-0 cursor-pointer overflow-hidden"
+  >
+    <fluent-icon
+      icon="location"
+      class="text-slate-600 dark:text-slate-200 leading-none my-0 flex items-center flex-shrink-0"
+      size="32"
+    />
+    <div class="flex flex-col items-start flex-1 min-w-0">
       <h5
-        class="text-sm text-slate-800 dark:text-slate-100 overflow-hidden whitespace-nowrap text-ellipsis"
+        class="text-sm text-slate-800 dark:text-slate-100 truncate m-0 w-full"
+        :title="name"
       >
         {{ name }}
       </h5>
-      <div class="link-wrap">
+      <div class="flex items-center">
         <a
-          class="download clear link button small"
+          class="text-woot-600 dark:text-woot-600 text-xs underline"
           rel="noreferrer noopener nofollow"
           target="_blank"
           :href="mapUrl"
@@ -22,49 +50,3 @@
     </div>
   </div>
 </template>
-
-<script>
-export default {
-  props: {
-    latitude: {
-      type: Number,
-      default: undefined,
-    },
-    longitude: {
-      type: Number,
-      default: undefined,
-    },
-    name: {
-      type: String,
-      default: '',
-    },
-  },
-  computed: {
-    mapUrl() {
-      return `https://maps.google.com/?q=${this.latitude},${this.longitude}`;
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.location {
-  @apply flex flex-row py-1 px-0 cursor-pointer;
-
-  .icon-wrap {
-    @apply text-slate-600 dark:text-slate-200 leading-none my-0 mx-1;
-  }
-
-  .text-block-title {
-    @apply m-0 text-slate-800 dark:text-slate-100 break-words;
-  }
-
-  .meta {
-    @apply flex flex-col items-center pr-4;
-  }
-
-  .link-wrap {
-    @apply flex;
-  }
-}
-</style>
diff --git a/app/services/telegram/incoming_message_service.rb b/app/services/telegram/incoming_message_service.rb
index d18994a00..a36231634 100644
--- a/app/services/telegram/incoming_message_service.rb
+++ b/app/services/telegram/incoming_message_service.rb
@@ -130,6 +130,7 @@ class Telegram::IncomingMessageService
     @message.attachments.new(
       account_id: @message.account_id,
       file_type: :location,
+      fallback_title: location_fallback_title,
       coordinates_lat: location['latitude'],
       coordinates_long: location['longitude']
     )
@@ -139,6 +140,16 @@ class Telegram::IncomingMessageService
     @file ||= visual_media_params || params[:message][:voice].presence || params[:message][:audio].presence || params[:message][:document].presence
   end
 
+  def location_fallback_title
+    return '' if venue.blank?
+
+    venue[:title] || ''
+  end
+
+  def venue
+    @venue ||= params.dig(:message, :venue).presence
+  end
+
   def location
     @location ||= params.dig(:message, :location).presence
   end
diff --git a/spec/services/telegram/incoming_message_service_spec.rb b/spec/services/telegram/incoming_message_service_spec.rb
index 795202894..3cade6343 100644
--- a/spec/services/telegram/incoming_message_service_spec.rb
+++ b/spec/services/telegram/incoming_message_service_spec.rb
@@ -255,6 +255,30 @@ describe Telegram::IncomingMessageService do
         expect(Contact.all.first.name).to eq('Sojan Jose')
         expect(telegram_channel.inbox.messages.first.attachments.first.file_type).to eq('location')
       end
+
+      it 'creates appropriate conversations, message and contacts if venue is present' do
+        params = {
+          'update_id' => 2_342_342_343_242,
+          'message' => {
+            'location': {
+              'latitude': 37.7893768,
+              'longitude': -122.3895553
+            },
+            venue: {
+              title: 'San Francisco'
+            }
+          }.merge(message_params)
+        }.with_indifferent_access
+        described_class.new(inbox: telegram_channel.inbox, params: params).perform
+        expect(telegram_channel.inbox.conversations.count).not_to eq(0)
+        expect(Contact.all.first.name).to eq('Sojan Jose')
+
+        attachment = telegram_channel.inbox.messages.first.attachments.first
+        expect(attachment.file_type).to eq('location')
+        expect(attachment.coordinates_lat).to eq(37.7893768)
+        expect(attachment.coordinates_long).to eq(-122.3895553)
+        expect(attachment.fallback_title).to eq('San Francisco')
+      end
     end
 
     context 'when valid callback_query params' do

From 89d0b2cb6eb4f65410b2e6ef225ac74685864e7f Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Fri, 15 Mar 2024 11:34:14 +0530
Subject: [PATCH 72/96] feat: Add the bot performance reports UI (#9036)

Co-authored-by: Pranav <pranav@chatwoot.com>
Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
---
 app/javascript/dashboard/api/reports.js       |  18 +++
 .../dashboard/api/specs/reports.spec.js       |  34 ++++++
 .../layout/config/sidebarItems/reports.js     |  10 ++
 app/javascript/dashboard/featureFlags.js      |   1 +
 .../dashboard/i18n/locale/en/report.json      |  76 +++++++++++--
 .../dashboard/i18n/locale/en/settings.json    |   1 +
 .../dashboard/mixins/reportMixin.js           |  10 +-
 .../mixins/specs/reportMixin.spec.js          |  31 +++++
 .../mixins/specs/reportMixinFixtures.js       |   8 ++
 .../dashboard/settings/reports/BotReports.vue | 106 ++++++++++++++++++
 .../settings/reports/ReportContainer.vue      |   2 +-
 .../reports/components/BotMetrics.vue         |  68 +++++++++++
 .../components/ChartElements/ChartStats.vue   |   6 +-
 .../reports/components/CsatMetrics.vue        |   3 +
 .../reports/components/ReportMetricCard.vue   |   2 +-
 .../dashboard/settings/reports/constants.js   |   2 +
 .../settings/reports/reports.routes.js        |  18 +++
 .../dashboard/store/modules/reports.js        |  31 +++++
 .../dashboard/store/mutation-types.js         |   1 +
 19 files changed, 414 insertions(+), 14 deletions(-)
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/reports/BotReports.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/reports/components/BotMetrics.vue

diff --git a/app/javascript/dashboard/api/reports.js b/app/javascript/dashboard/api/reports.js
index 987b69701..52fa7f444 100644
--- a/app/javascript/dashboard/api/reports.js
+++ b/app/javascript/dashboard/api/reports.js
@@ -84,6 +84,24 @@ class ReportsAPI extends ApiClient {
       params: { since, until, business_hours: businessHours },
     });
   }
+
+  getBotMetrics({ from, to } = {}) {
+    return axios.get(`${this.url}/bot_metrics`, {
+      params: { since: from, until: to },
+    });
+  }
+
+  getBotSummary({ from, to, groupBy, businessHours } = {}) {
+    return axios.get(`${this.url}/bot_summary`, {
+      params: {
+        since: from,
+        until: to,
+        type: 'account',
+        group_by: groupBy,
+        business_hours: businessHours,
+      },
+    });
+  }
 }
 
 export default new ReportsAPI();
diff --git a/app/javascript/dashboard/api/specs/reports.spec.js b/app/javascript/dashboard/api/specs/reports.spec.js
index 7822dad8f..05d4a152c 100644
--- a/app/javascript/dashboard/api/specs/reports.spec.js
+++ b/app/javascript/dashboard/api/specs/reports.spec.js
@@ -111,6 +111,40 @@ describe('#Reports API', () => {
       });
     });
 
+    it('#getBotMetrics', () => {
+      reportsAPI.getBotMetrics({ from: 1621103400, to: 1621621800 });
+      expect(axiosMock.get).toHaveBeenCalledWith(
+        '/api/v2/reports/bot_metrics',
+        {
+          params: {
+            since: 1621103400,
+            until: 1621621800,
+          },
+        }
+      );
+    });
+
+    it('#getBotSummary', () => {
+      reportsAPI.getBotSummary({
+        from: 1621103400,
+        to: 1621621800,
+        groupBy: 'date',
+        businessHours: true,
+      });
+      expect(axiosMock.get).toHaveBeenCalledWith(
+        '/api/v2/reports/bot_summary',
+        {
+          params: {
+            since: 1621103400,
+            until: 1621621800,
+            type: 'account',
+            group_by: 'date',
+            business_hours: true,
+          },
+        }
+      );
+    });
+
     it('#getConversationMetric', () => {
       reportsAPI.getConversationMetric('account');
       expect(axiosMock.get).toHaveBeenCalledWith(
diff --git a/app/javascript/dashboard/components/layout/config/sidebarItems/reports.js b/app/javascript/dashboard/components/layout/config/sidebarItems/reports.js
index 967ee44ed..551256c74 100644
--- a/app/javascript/dashboard/components/layout/config/sidebarItems/reports.js
+++ b/app/javascript/dashboard/components/layout/config/sidebarItems/reports.js
@@ -1,3 +1,4 @@
+import { FEATURE_FLAGS } from '../../../../featureFlags';
 import { frontendURL } from '../../../../helper/URLHelper';
 
 const reports = accountId => ({
@@ -6,6 +7,7 @@ const reports = accountId => ({
     'account_overview_reports',
     'conversation_reports',
     'csat_reports',
+    'bot_reports',
     'agent_reports',
     'label_reports',
     'inbox_reports',
@@ -33,6 +35,14 @@ const reports = accountId => ({
       toState: frontendURL(`accounts/${accountId}/reports/csat`),
       toStateName: 'csat_reports',
     },
+    {
+      icon: 'bot',
+      label: 'REPORTS_BOT',
+      hasSubMenu: false,
+      featureFlag: FEATURE_FLAGS.RESPONSE_BOT,
+      toState: frontendURL(`accounts/${accountId}/reports/bot`),
+      toStateName: 'bot_reports',
+    },
     {
       icon: 'people',
       label: 'REPORTS_AGENT',
diff --git a/app/javascript/dashboard/featureFlags.js b/app/javascript/dashboard/featureFlags.js
index 2936d22ea..f2fd3e757 100644
--- a/app/javascript/dashboard/featureFlags.js
+++ b/app/javascript/dashboard/featureFlags.js
@@ -19,4 +19,5 @@ export const FEATURE_FLAGS = {
   INSERT_ARTICLE_IN_REPLY: 'insert_article_in_reply',
   INBOX_VIEW: 'inbox_view',
   SLA: 'sla',
+  RESPONSE_BOT: 'response_bot',
 };
diff --git a/app/javascript/dashboard/i18n/locale/en/report.json b/app/javascript/dashboard/i18n/locale/en/report.json
index a6d476bc9..56ca21773 100644
--- a/app/javascript/dashboard/i18n/locale/en/report.json
+++ b/app/javascript/dashboard/i18n/locale/en/report.json
@@ -35,6 +35,14 @@
         "NAME": "Resolution Count",
         "DESC": "( Total )"
       },
+      "BOT_RESOLUTION_COUNT": {
+        "NAME": "Resolution Count",
+        "DESC": "( Total )"
+      },
+      "BOT_HANDOFF_COUNT": {
+        "NAME": "Handoff Count",
+        "DESC": "( Total )"
+      },
       "REPLY_TIME": {
         "NAME": "Customer waiting time",
         "TOOLTIP_TEXT": "Waiting time is %{metricValue} (based on %{conversationCount} replies)"
@@ -86,20 +94,49 @@
       "MONTH": "Month",
       "YEAR": "Year"
     },
-    "GROUP_BY_DAY_OPTIONS": [{ "id": 1, "groupBy": "Day" }],
+    "GROUP_BY_DAY_OPTIONS": [
+      {
+        "id": 1,
+        "groupBy": "Day"
+      }
+    ],
     "GROUP_BY_WEEK_OPTIONS": [
-      { "id": 1, "groupBy": "Day" },
-      { "id": 2, "groupBy": "Week" }
+      {
+        "id": 1,
+        "groupBy": "Day"
+      },
+      {
+        "id": 2,
+        "groupBy": "Week"
+      }
     ],
     "GROUP_BY_MONTH_OPTIONS": [
-      { "id": 1, "groupBy": "Day" },
-      { "id": 2, "groupBy": "Week" },
-      { "id": 3, "groupBy": "Month" }
+      {
+        "id": 1,
+        "groupBy": "Day"
+      },
+      {
+        "id": 2,
+        "groupBy": "Week"
+      },
+      {
+        "id": 3,
+        "groupBy": "Month"
+      }
     ],
     "GROUP_BY_YEAR_OPTIONS": [
-      { "id": 2, "groupBy": "Week" },
-      { "id": 3, "groupBy": "Month" },
-      { "id": 4, "groupBy": "Year" }
+      {
+        "id": 2,
+        "groupBy": "Week"
+      },
+      {
+        "id": 3,
+        "groupBy": "Month"
+      },
+      {
+        "id": 4,
+        "groupBy": "Year"
+      }
     ],
     "BUSINESS_HOURS": "Business Hours"
   },
@@ -404,6 +441,27 @@
       }
     }
   },
+  "BOT_REPORTS": {
+    "HEADER": "Bot Reports",
+    "METRIC": {
+      "TOTAL_CONVERSATIONS": {
+        "LABEL": "No. of Conversations",
+        "TOOLTIP": "Total number of conversations handled by the bot"
+      },
+      "TOTAL_RESPONSES": {
+        "LABEL": "Total Responses",
+        "TOOLTIP": "Total number of responses sent by the bot"
+      },
+      "RESOLUTION_RATE": {
+        "LABEL": "Resolution Rate",
+        "TOOLTIP": "Total number of conversations resolved by the bot / Total number of conversations handled by the bot * 100"
+      },
+      "HANDOFF_RATE": {
+        "LABEL": "Handoff Rate",
+        "TOOLTIP": "Total number of conversations handed off to agents / Total number of conversations handled by the bot * 100"
+      }
+    }
+  },
   "OVERVIEW_REPORTS": {
     "HEADER": "Overview",
     "LIVE": "Live",
diff --git a/app/javascript/dashboard/i18n/locale/en/settings.json b/app/javascript/dashboard/i18n/locale/en/settings.json
index 63725f949..9a4bde2c8 100644
--- a/app/javascript/dashboard/i18n/locale/en/settings.json
+++ b/app/javascript/dashboard/i18n/locale/en/settings.json
@@ -234,6 +234,7 @@
     "CAMPAIGNS": "Campaigns",
     "ONGOING": "Ongoing",
     "ONE_OFF": "One off",
+    "REPORTS_BOT": "Bot",
     "REPORTS_AGENT": "Agents",
     "REPORTS_LABEL": "Labels",
     "REPORTS_INBOX": "Inbox",
diff --git a/app/javascript/dashboard/mixins/reportMixin.js b/app/javascript/dashboard/mixins/reportMixin.js
index 2b8a5f87d..d57af1ad2 100644
--- a/app/javascript/dashboard/mixins/reportMixin.js
+++ b/app/javascript/dashboard/mixins/reportMixin.js
@@ -2,11 +2,19 @@ import { mapGetters } from 'vuex';
 import { formatTime } from '@chatwoot/utils';
 
 export default {
+  props: {
+    accountSummaryKey: {
+      type: String,
+      default: 'getAccountSummary',
+    },
+  },
   computed: {
     ...mapGetters({
-      accountSummary: 'getAccountSummary',
       accountReport: 'getAccountReports',
     }),
+    accountSummary() {
+      return this.$store.getters[this.accountSummaryKey];
+    },
   },
   methods: {
     calculateTrend(key) {
diff --git a/app/javascript/dashboard/mixins/specs/reportMixin.spec.js b/app/javascript/dashboard/mixins/specs/reportMixin.spec.js
index d981de4e9..c0bc1e15f 100644
--- a/app/javascript/dashboard/mixins/specs/reportMixin.spec.js
+++ b/app/javascript/dashboard/mixins/specs/reportMixin.spec.js
@@ -11,11 +11,42 @@ describe('reportMixin', () => {
   beforeEach(() => {
     getters = {
       getAccountSummary: () => reportFixtures.summary,
+      getBotSummary: () => reportFixtures.botSummary,
       getAccountReports: () => reportFixtures.report,
     };
     store = new Vuex.Store({ getters });
   });
 
+  it('display the metric for account', async () => {
+    const Component = {
+      render() {},
+      title: 'TestComponent',
+      mixins: [reportMixin],
+    };
+    const wrapper = shallowMount(Component, { store, localVue });
+    await wrapper.setProps({
+      accountSummaryKey: 'getAccountSummary',
+    });
+    expect(wrapper.vm.displayMetric('conversations_count')).toEqual('5,000');
+    expect(wrapper.vm.displayMetric('avg_first_response_time')).toEqual(
+      '3 Min 18 Sec'
+    );
+  });
+
+  it('display the metric for bot', async () => {
+    const Component = {
+      render() {},
+      title: 'TestComponent',
+      mixins: [reportMixin],
+    };
+    const wrapper = shallowMount(Component, { store, localVue });
+    await wrapper.setProps({
+      accountSummaryKey: 'getBotSummary',
+    });
+    expect(wrapper.vm.displayMetric('bot_resolutions_count')).toEqual('10');
+    expect(wrapper.vm.displayMetric('bot_handoffs_count')).toEqual('20');
+  });
+
   it('display the metric', () => {
     const Component = {
       render() {},
diff --git a/app/javascript/dashboard/mixins/specs/reportMixinFixtures.js b/app/javascript/dashboard/mixins/specs/reportMixinFixtures.js
index ab6b6fecf..591bf7c1f 100644
--- a/app/javascript/dashboard/mixins/specs/reportMixinFixtures.js
+++ b/app/javascript/dashboard/mixins/specs/reportMixinFixtures.js
@@ -15,6 +15,14 @@ export default {
     },
     resolutions_count: 3,
   },
+  botSummary: {
+    bot_resolutions_count: 10,
+    bot_handoffs_count: 20,
+    previous: {
+      bot_resolutions_count: 8,
+      bot_handoffs_count: 5,
+    },
+  },
   report: {
     data: [
       { value: '0.00', timestamp: 1647541800, count: 0 },
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/BotReports.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/BotReports.vue
new file mode 100644
index 000000000..a75051aaf
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/BotReports.vue
@@ -0,0 +1,106 @@
+<template>
+  <div class="flex-1 overflow-auto p-4">
+    <report-filter-selector
+      :show-agents-filter="false"
+      :show-group-by-filter="true"
+      :show-business-hours-switch="false"
+      @filter-change="onFilterChange"
+    />
+
+    <bot-metrics :filters="requestPayload" />
+    <report-container
+      :group-by="groupBy"
+      :report-keys="reportKeys"
+      :account-summary-key="'getBotSummary'"
+    />
+  </div>
+</template>
+<script>
+import { mapGetters } from 'vuex';
+import BotMetrics from './components/BotMetrics.vue';
+import ReportFilterSelector from './components/FilterSelector.vue';
+import { GROUP_BY_FILTER } from './constants';
+import reportMixin from 'dashboard/mixins/reportMixin';
+import ReportContainer from './ReportContainer.vue';
+import { REPORTS_EVENTS } from '../../../../helper/AnalyticsHelper/events';
+
+export default {
+  name: 'BotReports',
+  components: {
+    BotMetrics,
+    ReportFilterSelector,
+    ReportContainer,
+  },
+  mixins: [reportMixin],
+  data() {
+    return {
+      from: 0,
+      to: 0,
+      groupBy: GROUP_BY_FILTER[1],
+      reportKeys: {
+        BOT_RESOLUTION_COUNT: 'bot_resolutions_count',
+        BOT_HANDOFF_COUNT: 'bot_handoffs_count',
+      },
+      businessHours: false,
+    };
+  },
+  computed: {
+    ...mapGetters({
+      accountReport: 'getAccountReports',
+    }),
+    requestPayload() {
+      return {
+        from: this.from,
+        to: this.to,
+      };
+    },
+  },
+  methods: {
+    fetchAllData() {
+      this.fetchBotSummary();
+      this.fetchChartData();
+    },
+    fetchBotSummary() {
+      try {
+        this.$store.dispatch('fetchBotSummary', this.getRequestPayload());
+      } catch {
+        this.showAlert(this.$t('REPORT.SUMMARY_FETCHING_FAILED'));
+      }
+    },
+    fetchChartData() {
+      Object.keys(this.reportKeys).forEach(async key => {
+        try {
+          await this.$store.dispatch('fetchAccountReport', {
+            metric: this.reportKeys[key],
+            ...this.getRequestPayload(),
+          });
+        } catch {
+          this.showAlert(this.$t('REPORT.DATA_FETCHING_FAILED'));
+        }
+      });
+    },
+    getRequestPayload() {
+      const { from, to, groupBy, businessHours } = this;
+
+      return {
+        from,
+        to,
+        groupBy: groupBy?.period,
+        businessHours,
+      };
+    },
+    onFilterChange({ from, to, groupBy, businessHours }) {
+      this.from = from;
+      this.to = to;
+      this.groupBy = groupBy;
+      this.businessHours = businessHours;
+      this.fetchAllData();
+
+      this.$track(REPORTS_EVENTS.FILTER_REPORT, {
+        filterValue: { from, to, groupBy, businessHours },
+        reportType: 'bots',
+      });
+    },
+  },
+};
+</script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/ReportContainer.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/ReportContainer.vue
index c601b4277..273f814b7 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/ReportContainer.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/ReportContainer.vue
@@ -7,7 +7,7 @@
       :key="metric.KEY"
       class="p-4 rounded-md mb-3"
     >
-      <chart-stats :metric="metric" />
+      <chart-stats :metric="metric" :account-summary-key="accountSummaryKey" />
       <div class="mt-4 h-72">
         <woot-loading-state
           v-if="accountReport.isFetching[metric.KEY]"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/BotMetrics.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/BotMetrics.vue
new file mode 100644
index 000000000..46227f945
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/BotMetrics.vue
@@ -0,0 +1,68 @@
+<script setup>
+import { ref, watch, onMounted } from 'vue';
+import ReportMetricCard from './ReportMetricCard.vue';
+import ReportsAPI from 'dashboard/api/reports';
+
+const props = defineProps({
+  filters: {
+    type: Object,
+    required: true,
+  },
+});
+
+const conversationCount = ref('0');
+const messageCount = ref('0');
+const resolutionRate = ref('0');
+const handoffRate = ref('0');
+
+const formatToPercent = value => {
+  return value ? `${value}%` : '--';
+};
+
+const fetchMetrics = () => {
+  if (!props.filters.to || !props.filters.from) {
+    return;
+  }
+  ReportsAPI.getBotMetrics(props.filters).then(response => {
+    conversationCount.value = response.data.conversation_count.toLocaleString();
+    messageCount.value = response.data.message_count.toLocaleString();
+    resolutionRate.value = response.data.resolution_rate.toString();
+    handoffRate.value = response.data.handoff_rate.toString();
+  });
+};
+
+watch(() => props.filters, fetchMetrics, { deep: true });
+
+onMounted(fetchMetrics);
+</script>
+
+<template>
+  <div
+    class="flex flex-wrap mx-0 bg-white dark:bg-slate-800 rounded-[4px] p-4 mb-5 border border-solid border-slate-75 dark:border-slate-700"
+  >
+    <report-metric-card
+      :label="$t('BOT_REPORTS.METRIC.TOTAL_CONVERSATIONS.LABEL')"
+      :info-text="$t('BOT_REPORTS.METRIC.TOTAL_CONVERSATIONS.TOOLTIP')"
+      :value="conversationCount"
+      class="flex-1"
+    />
+    <report-metric-card
+      :label="$t('BOT_REPORTS.METRIC.TOTAL_RESPONSES.LABEL')"
+      :info-text="$t('BOT_REPORTS.METRIC.TOTAL_RESPONSES.TOOLTIP')"
+      :value="messageCount"
+      class="flex-1"
+    />
+    <report-metric-card
+      :label="$t('BOT_REPORTS.METRIC.RESOLUTION_RATE.LABEL')"
+      :info-text="$t('BOT_REPORTS.METRIC.RESOLUTION_RATE.TOOLTIP')"
+      :value="formatToPercent(resolutionRate)"
+      class="flex-1"
+    />
+    <report-metric-card
+      :label="$t('BOT_REPORTS.METRIC.HANDOFF_RATE.LABEL')"
+      :info-text="$t('BOT_REPORTS.METRIC.HANDOFF_RATE.TOOLTIP')"
+      :value="formatToPercent(handoffRate)"
+      class="flex-1"
+    />
+  </div>
+</template>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/ChartElements/ChartStats.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/ChartElements/ChartStats.vue
index 94fe1359d..4faf4de2b 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/ChartElements/ChartStats.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/ChartElements/ChartStats.vue
@@ -1,6 +1,8 @@
 <template>
-  <div>
-    <span class="text-sm">{{ metric.NAME }}</span>
+  <div class="text-slate-900 dark:text-slate-100">
+    <span class="text-sm">
+      {{ metric.NAME }}
+    </span>
     <div class="flex items-end">
       <div class="font-medium text-xl">
         {{ displayMetric(metric.KEY) }}
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatMetrics.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatMetrics.vue
index 5fe1fa358..77106e8d5 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatMetrics.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/CsatMetrics.vue
@@ -6,17 +6,20 @@
       :label="$t('CSAT_REPORTS.METRIC.TOTAL_RESPONSES.LABEL')"
       :info-text="$t('CSAT_REPORTS.METRIC.TOTAL_RESPONSES.TOOLTIP')"
       :value="responseCount"
+      class="xs:w-full sm:max-w-[50%] lg:w-1/6 lg:max-w-[16%]"
     />
     <csat-metric-card
       :disabled="ratingFilterEnabled"
       :label="$t('CSAT_REPORTS.METRIC.SATISFACTION_SCORE.LABEL')"
       :info-text="$t('CSAT_REPORTS.METRIC.SATISFACTION_SCORE.TOOLTIP')"
       :value="ratingFilterEnabled ? '--' : formatToPercent(satisfactionScore)"
+      class="xs:w-full sm:max-w-[50%] lg:w-1/6 lg:max-w-[16%]"
     />
     <csat-metric-card
       :label="$t('CSAT_REPORTS.METRIC.RESPONSE_RATE.LABEL')"
       :info-text="$t('CSAT_REPORTS.METRIC.RESPONSE_RATE.TOOLTIP')"
       :value="formatToPercent(responseRate)"
+      class="xs:w-full sm:max-w-[50%] lg:w-1/6 lg:max-w-[16%]"
     />
 
     <div
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/ReportMetricCard.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/ReportMetricCard.vue
index abede8c89..2369e3330 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/ReportMetricCard.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/ReportMetricCard.vue
@@ -21,7 +21,7 @@ defineProps({
 <template>
   <div
     ref="reportMetricContainer"
-    class="xs:w-full sm:max-w-[50%] lg:w-1/6 lg:max-w-[16%] m-0 p-4"
+    class="m-0 p-4"
     :class="{
       'grayscale pointer-events-none opacity-30': disabled,
     }"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/constants.js b/app/javascript/dashboard/routes/dashboard/settings/reports/constants.js
index cb4e5bb6b..d465c93b6 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/constants.js
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/constants.js
@@ -194,6 +194,8 @@ export const METRIC_CHART = {
   reply_time: TIME_CHART_CONFIG,
   avg_resolution_time: TIME_CHART_CONFIG,
   resolutions_count: DEFAULT_CHART,
+  bot_resolutions_count: DEFAULT_CHART,
+  bot_handoffs_count: DEFAULT_CHART,
 };
 
 export const OVERVIEW_METRICS = {
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/reports.routes.js b/app/javascript/dashboard/routes/dashboard/settings/reports/reports.routes.js
index 31429e9c2..5e363553d 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/reports.routes.js
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/reports.routes.js
@@ -7,6 +7,7 @@ const LabelReports = () => import('./LabelReports.vue');
 const InboxReports = () => import('./InboxReports.vue');
 const TeamReports = () => import('./TeamReports.vue');
 const CsatResponses = () => import('./CsatResponses.vue');
+const BotReports = () => import('./BotReports.vue');
 const LiveReports = () => import('./LiveReports.vue');
 
 export default {
@@ -66,6 +67,23 @@ export default {
         },
       ],
     },
+    {
+      path: frontendURL('accounts/:accountId/reports'),
+      component: SettingsContent,
+      props: {
+        headerTitle: 'BOT_REPORTS.HEADER',
+        icon: 'bot',
+        keepAlive: false,
+      },
+      children: [
+        {
+          path: 'bot',
+          name: 'bot_reports',
+          roles: ['administrator'],
+          component: BotReports,
+        },
+      ],
+    },
     {
       path: frontendURL('accounts/:accountId/reports'),
       component: SettingsContent,
diff --git a/app/javascript/dashboard/store/modules/reports.js b/app/javascript/dashboard/store/modules/reports.js
index b529730fe..c4068b54f 100644
--- a/app/javascript/dashboard/store/modules/reports.js
+++ b/app/javascript/dashboard/store/modules/reports.js
@@ -19,6 +19,8 @@ const state = {
       avg_first_response_time: false,
       avg_resolution_time: false,
       resolutions_count: false,
+      bot_resolutions_count: false,
+      bot_handoffs_count: false,
       reply_time: false,
     },
     data: {
@@ -28,6 +30,8 @@ const state = {
       avg_first_response_time: [],
       avg_resolution_time: [],
       resolutions_count: [],
+      bot_resolutions_count: [],
+      bot_handoffs_count: [],
       reply_time: [],
     },
   },
@@ -39,6 +43,13 @@ const state = {
     outgoing_messages_count: 0,
     reply_time: 0,
     resolutions_count: 0,
+    bot_resolutions_count: 0,
+    bot_handoffs_count: 0,
+    previous: {},
+  },
+  botSummary: {
+    bot_resolutions_count: 0,
+    bot_handoffs_count: 0,
     previous: {},
   },
   overview: {
@@ -60,6 +71,9 @@ const getters = {
   getAccountSummary(_state) {
     return _state.accountSummary;
   },
+  getBotSummary(_state) {
+    return _state.botSummary;
+  },
   getAccountConversationMetric(_state) {
     return _state.overview.accountConversationMetric;
   },
@@ -125,6 +139,20 @@ export const actions = {
         commit(types.default.TOGGLE_ACCOUNT_REPORT_LOADING, false);
       });
   },
+  fetchBotSummary({ commit }, reportObj) {
+    Report.getBotSummary({
+      from: reportObj.from,
+      to: reportObj.to,
+      groupBy: reportObj.groupBy,
+      businessHours: reportObj.businessHours,
+    })
+      .then(botSummary => {
+        commit(types.default.SET_BOT_SUMMARY, botSummary.data);
+      })
+      .catch(() => {
+        commit(types.default.TOGGLE_ACCOUNT_REPORT_LOADING, false);
+      });
+  },
   fetchAccountConversationMetric({ commit }, reportObj) {
     commit(types.default.TOGGLE_ACCOUNT_CONVERSATION_METRIC_LOADING, true);
     Report.getConversationMetric(reportObj.type)
@@ -243,6 +271,9 @@ const mutations = {
   [types.default.SET_ACCOUNT_SUMMARY](_state, summaryData) {
     _state.accountSummary = summaryData;
   },
+  [types.default.SET_BOT_SUMMARY](_state, summaryData) {
+    _state.botSummary = summaryData;
+  },
   [types.default.SET_ACCOUNT_CONVERSATION_METRIC](_state, metricData) {
     _state.overview.accountConversationMetric = metricData;
   },
diff --git a/app/javascript/dashboard/store/mutation-types.js b/app/javascript/dashboard/store/mutation-types.js
index c9d2d1767..6f7d36cf7 100644
--- a/app/javascript/dashboard/store/mutation-types.js
+++ b/app/javascript/dashboard/store/mutation-types.js
@@ -166,6 +166,7 @@ export default {
   SET_HEATMAP_DATA: 'SET_HEATMAP_DATA',
   TOGGLE_HEATMAP_LOADING: 'TOGGLE_HEATMAP_LOADING',
   SET_ACCOUNT_SUMMARY: 'SET_ACCOUNT_SUMMARY',
+  SET_BOT_SUMMARY: 'SET_BOT_SUMMARY',
   TOGGLE_ACCOUNT_REPORT_LOADING: 'TOGGLE_ACCOUNT_REPORT_LOADING',
   SET_ACCOUNT_CONVERSATION_METRIC: 'SET_ACCOUNT_CONVERSATION_METRIC',
   TOGGLE_ACCOUNT_CONVERSATION_METRIC_LOADING:

From 58ee2e125a06b416645c5b00a4ca34fe1b03b0f6 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Fri, 15 Mar 2024 11:37:19 +0530
Subject: [PATCH 73/96] fix: Update the error response during changing the
 password from profile settings (#9114)

---
 .../routes/dashboard/settings/profile/ChangePassword.vue  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/javascript/dashboard/routes/dashboard/settings/profile/ChangePassword.vue b/app/javascript/dashboard/routes/dashboard/settings/profile/ChangePassword.vue
index 8eb7201ae..99cee0325 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/profile/ChangePassword.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/profile/ChangePassword.vue
@@ -74,6 +74,7 @@
 import { required, minLength } from 'vuelidate/lib/validators';
 import { mapGetters } from 'vuex';
 import alertMixin from 'shared/mixins/alertMixin';
+import { parseAPIErrorResponse } from 'dashboard/store/utils/api';
 
 export default {
   mixins: [alertMixin],
@@ -125,10 +126,9 @@ export default {
         });
         this.errorMessage = this.$t('PROFILE_SETTINGS.PASSWORD_UPDATE_SUCCESS');
       } catch (error) {
-        this.errorMessage = this.$t('RESET_PASSWORD.API.ERROR_MESSAGE');
-        if (error?.response?.data?.message) {
-          this.errorMessage = error.response.data.message;
-        }
+        this.errorMessage =
+          parseAPIErrorResponse(error) ||
+          this.$t('RESET_PASSWORD.API.ERROR_MESSAGE');
       } finally {
         this.isPasswordChanging = false;
         this.showAlert(this.errorMessage);

From 29e44ac6d0b5189ce585b2f3366662e978630089 Mon Sep 17 00:00:00 2001
From: Vishnu Narayanan <iamwishnu@gmail.com>
Date: Fri, 15 Mar 2024 12:21:32 +0530
Subject: [PATCH 74/96] feat: add option to delete and disable edits for SLA
 (#9108)

* feat: add delete button for SLA

* chore: remove edit SLA

* chore: remove update related texts from i18n
---
 .../dashboard/i18n/locale/en/sla.json         | 12 +++-
 .../routes/dashboard/settings/sla/EditSLA.vue | 60 -------------------
 .../routes/dashboard/settings/sla/Index.vue   | 60 ++++++++++++++-----
 app/javascript/dashboard/store/modules/sla.js | 14 ++---
 4 files changed, 62 insertions(+), 84 deletions(-)
 delete mode 100644 app/javascript/dashboard/routes/dashboard/settings/sla/EditSLA.vue

diff --git a/app/javascript/dashboard/i18n/locale/en/sla.json b/app/javascript/dashboard/i18n/locale/en/sla.json
index d87f057eb..228f87066 100644
--- a/app/javascript/dashboard/i18n/locale/en/sla.json
+++ b/app/javascript/dashboard/i18n/locale/en/sla.json
@@ -55,11 +55,17 @@
         "ERROR_MESSAGE": "There was an error, please try again"
       }
     },
-    "EDIT": {
-      "TITLE": "Edit SLA",
+    "DELETE": {
+      "TITLE": "Delete SLA",
       "API": {
-        "SUCCESS_MESSAGE": "SLA updated successfully",
+        "SUCCESS_MESSAGE": "SLA deleted successfully",
         "ERROR_MESSAGE": "There was an error, please try again"
+      },
+      "CONFIRM": {
+        "TITLE": "Confirm Deletion",
+        "MESSAGE": "Are you sure you want to delete ",
+        "YES": "Yes, Delete ",
+        "NO": "No, Keep "
       }
     }
   }
diff --git a/app/javascript/dashboard/routes/dashboard/settings/sla/EditSLA.vue b/app/javascript/dashboard/routes/dashboard/settings/sla/EditSLA.vue
deleted file mode 100644
index 2fc577bad..000000000
--- a/app/javascript/dashboard/routes/dashboard/settings/sla/EditSLA.vue
+++ /dev/null
@@ -1,60 +0,0 @@
-<template>
-  <div class="h-auto overflow-auto flex flex-col">
-    <woot-modal-header :header-title="pageTitle" />
-    <sla-form
-      :submit-label="$t('SLA.FORM.EDIT')"
-      :selected-response="selectedResponse"
-      @submit="editSLA"
-      @close="onClose"
-    />
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import alertMixin from 'shared/mixins/alertMixin';
-import validationMixin from './validationMixin';
-import validations from './validations';
-import SlaForm from './SlaForm.vue';
-
-export default {
-  components: {
-    SlaForm,
-  },
-  mixins: [alertMixin, validationMixin],
-  props: {
-    selectedResponse: {
-      type: Object,
-      default: () => {},
-    },
-  },
-  validations,
-  computed: {
-    ...mapGetters({
-      uiFlags: 'sla/getUIFlags',
-    }),
-    pageTitle() {
-      return `${this.$t('SLA.EDIT.TITLE')} - ${this.selectedResponse.name}`;
-    },
-  },
-  methods: {
-    onClose() {
-      this.$emit('close');
-    },
-    async editSLA(payload) {
-      try {
-        await this.$store.dispatch('sla/update', {
-          id: this.selectedResponse.id,
-          ...payload,
-        });
-        this.showAlert(this.$t('SLA.EDIT.API.SUCCESS_MESSAGE'));
-        this.onClose();
-      } catch (error) {
-        const errorMessage =
-          error.message || this.$t('SLA.EDIT.API.ERROR_MESSAGE');
-        this.showAlert(errorMessage);
-      }
-    },
-  },
-};
-</script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/sla/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/sla/Index.vue
index c6bdb6968..8728a236c 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/sla/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/sla/Index.vue
@@ -58,14 +58,14 @@
               </td>
               <td class="button-wrapper">
                 <woot-button
-                  v-tooltip.top="$t('SLA.FORM.EDIT')"
+                  v-tooltip.top="$t('SLA.FORM.DELETE')"
                   variant="smooth"
+                  color-scheme="alert"
                   size="tiny"
-                  color-scheme="secondary"
+                  icon="dismiss-circle"
                   class-names="grey-btn"
                   :is-loading="loading[sla.id]"
-                  icon="edit"
-                  @click="openEditPopup(sla)"
+                  @click="openDeletePopup(sla)"
                 />
               </td>
             </tr>
@@ -81,9 +81,16 @@
       <add-SLA @close="hideAddPopup" />
     </woot-modal>
 
-    <woot-modal :show.sync="showEditPopup" :on-close="hideEditPopup">
-      <edit-SLA :selected-response="selectedResponse" @close="hideEditPopup" />
-    </woot-modal>
+    <woot-delete-modal
+      :show.sync="showDeleteConfirmationPopup"
+      :on-close="closeDeletePopup"
+      :on-confirm="confirmDeletion"
+      :title="$t('SLA.DELETE.CONFIRM.TITLE')"
+      :message="$t('SLA.DELETE.CONFIRM.MESSAGE')"
+      :message-value="deleteMessage"
+      :confirm-text="deleteConfirmText"
+      :reject-text="deleteRejectText"
+    />
   </div>
 </template>
 <script>
@@ -91,20 +98,18 @@ import { mapGetters } from 'vuex';
 import { convertSecondsToTimeUnit } from '@chatwoot/utils';
 
 import AddSLA from './AddSLA.vue';
-import EditSLA from './EditSLA.vue';
 import alertMixin from 'shared/mixins/alertMixin';
 
 export default {
   components: {
     AddSLA,
-    EditSLA,
   },
   mixins: [alertMixin],
   data() {
     return {
       loading: {},
       showAddPopup: false,
-      showEditPopup: false,
+      showDeleteConfirmationPopup: false,
       selectedResponse: {},
     };
   },
@@ -113,6 +118,15 @@ export default {
       records: 'sla/getSLA',
       uiFlags: 'sla/getUIFlags',
     }),
+    deleteConfirmText() {
+      return this.$t('SLA.DELETE.CONFIRM.YES');
+    },
+    deleteRejectText() {
+      return this.$t('SLA.DELETE.CONFIRM.NO');
+    },
+    deleteMessage() {
+      return ` ${this.selectedResponse.name}`;
+    },
   },
   mounted() {
     this.$store.dispatch('sla/get');
@@ -124,12 +138,30 @@ export default {
     hideAddPopup() {
       this.showAddPopup = false;
     },
-    openEditPopup(response) {
-      this.showEditPopup = true;
+    openDeletePopup(response) {
+      this.showDeleteConfirmationPopup = true;
       this.selectedResponse = response;
     },
-    hideEditPopup() {
-      this.showEditPopup = false;
+    closeDeletePopup() {
+      this.showDeleteConfirmationPopup = false;
+    },
+    confirmDeletion() {
+      this.loading[this.selectedResponse.id] = true;
+      this.closeDeletePopup();
+      this.deleteSla(this.selectedResponse.id);
+    },
+    deleteSla(id) {
+      this.$store
+        .dispatch('sla/delete', id)
+        .then(() => {
+          this.showAlert(this.$t('SLA.DELETE.API.SUCCESS_MESSAGE'));
+        })
+        .catch(() => {
+          this.showAlert(this.$t('SLA.DELETE.API.ERROR_MESSAGE'));
+        })
+        .finally(() => {
+          this.loading[this.selectedResponse.id] = false;
+        });
     },
     displayTime(threshold) {
       const { time, unit } = convertSecondsToTimeUnit(threshold, {
diff --git a/app/javascript/dashboard/store/modules/sla.js b/app/javascript/dashboard/store/modules/sla.js
index e1ded7f51..86d5db2ad 100644
--- a/app/javascript/dashboard/store/modules/sla.js
+++ b/app/javascript/dashboard/store/modules/sla.js
@@ -50,16 +50,16 @@ export const actions = {
     }
   },
 
-  update: async function update({ commit }, { id, ...updateObj }) {
-    commit(types.SET_SLA_UI_FLAG, { isUpdating: true });
+  delete: async function deleteSla({ commit }, id) {
+    commit(types.SET_SLA_UI_FLAG, { isDeleting: true });
     try {
-      const response = await SlaAPI.update(id, updateObj);
-      AnalyticsHelper.track(SLA_EVENTS.UPDATE);
-      commit(types.EDIT_SLA, response.data.payload);
+      await SlaAPI.delete(id);
+      AnalyticsHelper.track(SLA_EVENTS.DELETED);
+      commit(types.DELETE_SLA, id);
     } catch (error) {
       throwErrorMessage(error);
     } finally {
-      commit(types.SET_SLA_UI_FLAG, { isUpdating: false });
+      commit(types.SET_SLA_UI_FLAG, { isDeleting: false });
     }
   },
 };
@@ -74,7 +74,7 @@ export const mutations = {
 
   [types.SET_SLA]: MutationHelpers.set,
   [types.ADD_SLA]: MutationHelpers.create,
-  [types.EDIT_SLA]: MutationHelpers.update,
+  [types.DELETE_SLA]: MutationHelpers.destroy,
 };
 
 export default {

From fd832d7593d39d7ebcd343f693f7cd8e2130cc10 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Sat, 16 Mar 2024 09:23:23 +0530
Subject: [PATCH 75/96] chore: Add verbose errors for IMAP email channels
 (#9116)

---
 app/jobs/inboxes/fetch_imap_emails_job.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/jobs/inboxes/fetch_imap_emails_job.rb b/app/jobs/inboxes/fetch_imap_emails_job.rb
index 5722e76a7..c528b9d6a 100644
--- a/app/jobs/inboxes/fetch_imap_emails_job.rb
+++ b/app/jobs/inboxes/fetch_imap_emails_job.rb
@@ -12,10 +12,10 @@ class Inboxes::FetchImapEmailsJob < MutexApplicationJob
       process_email_for_channel(channel)
     end
   rescue *ExceptionList::IMAP_EXCEPTIONS => e
-    Rails.logger.error e
+    Rails.logger.error "Authorization error for email channel - #{channel.inbox.id} : #{e.message}"
     channel.authorization_error!
   rescue EOFError, OpenSSL::SSL::SSLError, Net::IMAP::NoResponseError, Net::IMAP::BadResponseError, Net::IMAP::InvalidResponseError => e
-    Rails.logger.error e
+    Rails.logger.error "Error for email channel - #{channel.inbox.id} : #{e.message}"
   rescue LockAcquisitionError
     Rails.logger.error "Lock failed for #{channel.inbox.id}"
   rescue StandardError => e

From b5c6d90abd02b0a77896307afe8f4a492c1c1d6a Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Mon, 18 Mar 2024 17:02:23 +0530
Subject: [PATCH 76/96] chore: Fix `CSATMetrics` component snap shot spec
 (#9122)

chore: Fix snapshot specs
---
 .../components/specs/__snapshots__/CSATMetrics.spec.js.snap | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/__snapshots__/CSATMetrics.spec.js.snap b/app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/__snapshots__/CSATMetrics.spec.js.snap
index 6f2a05bf5..d1e3b8b53 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/__snapshots__/CSATMetrics.spec.js.snap
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/specs/__snapshots__/CSATMetrics.spec.js.snap
@@ -2,9 +2,9 @@
 
 exports[`CsatMetrics.vue computes response count correctly 1`] = `
 <div class="flex-col lg:flex-row flex flex-wrap mx-0 bg-white dark:bg-slate-800 rounded-[4px] p-4 mb-5 border border-solid border-slate-75 dark:border-slate-700">
-  <csat-metric-card-stub label="CSAT_REPORTS.METRIC.TOTAL_RESPONSES.LABEL" value="100" infotext="CSAT_REPORTS.METRIC.TOTAL_RESPONSES.TOOLTIP"></csat-metric-card-stub>
-  <csat-metric-card-stub label="CSAT_REPORTS.METRIC.SATISFACTION_SCORE.LABEL" value="--" infotext="CSAT_REPORTS.METRIC.SATISFACTION_SCORE.TOOLTIP" disabled="true"></csat-metric-card-stub>
-  <csat-metric-card-stub label="CSAT_REPORTS.METRIC.RESPONSE_RATE.LABEL" value="90%" infotext="CSAT_REPORTS.METRIC.RESPONSE_RATE.TOOLTIP"></csat-metric-card-stub>
+  <csat-metric-card-stub label="CSAT_REPORTS.METRIC.TOTAL_RESPONSES.LABEL" value="100" infotext="CSAT_REPORTS.METRIC.TOTAL_RESPONSES.TOOLTIP" class="xs:w-full sm:max-w-[50%] lg:w-1/6 lg:max-w-[16%]"></csat-metric-card-stub>
+  <csat-metric-card-stub label="CSAT_REPORTS.METRIC.SATISFACTION_SCORE.LABEL" value="--" infotext="CSAT_REPORTS.METRIC.SATISFACTION_SCORE.TOOLTIP" disabled="true" class="xs:w-full sm:max-w-[50%] lg:w-1/6 lg:max-w-[16%]"></csat-metric-card-stub>
+  <csat-metric-card-stub label="CSAT_REPORTS.METRIC.RESPONSE_RATE.LABEL" value="90%" infotext="CSAT_REPORTS.METRIC.RESPONSE_RATE.TOOLTIP" class="xs:w-full sm:max-w-[50%] lg:w-1/6 lg:max-w-[16%]"></csat-metric-card-stub>
   <!---->
 </div>
 `;

From e1e88571958a690a6379f27ca5de67f1e7caaa81 Mon Sep 17 00:00:00 2001
From: Sojan <sojan@pepalo.com>
Date: Mon, 18 Mar 2024 17:26:09 +0530
Subject: [PATCH 77/96] Bump version to 3.7.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 99f2706e9..220fabfe7 100644
--- a/config/app.yml
+++ b/config/app.yml
@@ -1,5 +1,5 @@
 shared: &shared
-  version: '3.6.0'
+  version: '3.7.0'
 
 development:
   <<: *shared
diff --git a/package.json b/package.json
index ac353f186..fcf7e23fa 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@chatwoot/chatwoot",
-  "version": "3.6.0",
+  "version": "3.7.0",
   "license": "MIT",
   "scripts": {
     "eslint": "eslint app/**/*.{js,vue}",

From bd97226c95ce536d082326b8a0852da21a025a89 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 19 Mar 2024 18:48:59 +0530
Subject: [PATCH 78/96] fix: Locale not correct in root url when accessing help
 center with custom domain (#9110)

- Ensuring that SwitchLocale concern handles the case of custom domain for portals and set locale according to that

Co-authored-by: Sojan Jose <sojan@pepalo.com>
---
 app/controllers/concerns/domain_helper.rb         |  5 +++++
 app/controllers/concerns/switch_locale.rb         | 15 +++++++++++++++
 app/controllers/dashboard_controller.rb           |  1 +
 .../public/api/v1/portals/base_controller.rb      |  2 +-
 app/controllers/public_controller.rb              |  3 +--
 app/views/public/api/v1/portals/_header.html.erb  |  2 +-
 6 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 app/controllers/concerns/domain_helper.rb

diff --git a/app/controllers/concerns/domain_helper.rb b/app/controllers/concerns/domain_helper.rb
new file mode 100644
index 000000000..1b7d8f187
--- /dev/null
+++ b/app/controllers/concerns/domain_helper.rb
@@ -0,0 +1,5 @@
+module DomainHelper
+  def self.chatwoot_domain?(domain = request.host)
+    [URI.parse(ENV.fetch('FRONTEND_URL', '')).host, URI.parse(ENV.fetch('HELPCENTER_URL', '')).host].include?(domain)
+  end
+end
diff --git a/app/controllers/concerns/switch_locale.rb b/app/controllers/concerns/switch_locale.rb
index 744a70da9..3013ff3cc 100644
--- a/app/controllers/concerns/switch_locale.rb
+++ b/app/controllers/concerns/switch_locale.rb
@@ -6,6 +6,7 @@ module SwitchLocale
   def switch_locale(&)
     # priority is for locale set in query string (mostly for widget/from js sdk)
     locale ||= locale_from_params
+    locale ||= locale_from_custom_domain
     # if locale is not set in account, let's use DEFAULT_LOCALE env variable
     locale ||= locale_from_env_variable
     set_locale(locale, &)
@@ -16,6 +17,20 @@ module SwitchLocale
     set_locale(locale, &)
   end
 
+  # If the request is coming from a custom domain, it should be for a helpcenter portal
+  # We will use the portal locale in such cases
+  def locale_from_custom_domain(&)
+    return if params[:locale]
+
+    domain = request.host
+    return if DomainHelper.chatwoot_domain?(domain)
+
+    @portal = Portal.find_by(custom_domain: domain)
+    return unless @portal
+
+    @portal.default_locale
+  end
+
   def set_locale(locale, &)
     # if locale is empty, use default_locale
     locale ||= I18n.default_locale
diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb
index 0aea9df83..047fd10c3 100644
--- a/app/controllers/dashboard_controller.rb
+++ b/app/controllers/dashboard_controller.rb
@@ -18,6 +18,7 @@ class DashboardController < ActionController::Base
       'LOGO', 'LOGO_DARK', 'LOGO_THUMBNAIL',
       'INSTALLATION_NAME',
       'WIDGET_BRAND_URL', 'TERMS_URL',
+      'BRAND_URL', 'BRAND_NAME',
       'PRIVACY_URL',
       'DISPLAY_MANIFEST',
       'CREATE_NEW_ACCOUNT_FROM_DASHBOARD',
diff --git a/app/controllers/public/api/v1/portals/base_controller.rb b/app/controllers/public/api/v1/portals/base_controller.rb
index 4d3cc56b8..f6c10f7c4 100644
--- a/app/controllers/public/api/v1/portals/base_controller.rb
+++ b/app/controllers/public/api/v1/portals/base_controller.rb
@@ -47,7 +47,7 @@ class Public::Api::V1::Portals::BaseController < PublicController
     @locale = if article.category.present?
                 article.category.locale
               else
-                'en'
+                article.portal.default_locale
               end
 
     I18n.with_locale(@locale, &)
diff --git a/app/controllers/public_controller.rb b/app/controllers/public_controller.rb
index 0c3f52ff6..3b83a2210 100644
--- a/app/controllers/public_controller.rb
+++ b/app/controllers/public_controller.rb
@@ -8,8 +8,7 @@ class PublicController < ActionController::Base
 
   def ensure_custom_domain_request
     domain = request.host
-
-    return if [URI.parse(ENV.fetch('FRONTEND_URL', '')).host, URI.parse(ENV.fetch('HELPCENTER_URL', '')).host].include?(domain)
+    return if DomainHelper.chatwoot_domain?(domain)
 
     @portal = ::Portal.find_by(custom_domain: domain)
     return if @portal.present?
diff --git a/app/views/public/api/v1/portals/_header.html.erb b/app/views/public/api/v1/portals/_header.html.erb
index 9b875fcee..544fa1ba8 100644
--- a/app/views/public/api/v1/portals/_header.html.erb
+++ b/app/views/public/api/v1/portals/_header.html.erb
@@ -83,7 +83,7 @@
               class="w-24 overflow-hidden text-sm font-medium leading-tight bg-white appearance-none cursor-pointer dark:bg-slate-900 text-ellipsis whitespace-nowrap focus:outline-none focus:shadow-outline locale-switcher"
             >
               <% @portal.config["allowed_locales"].each do |locale| %>
-                <option <%= locale == params[:locale] ? 'selected': '' %> value="<%= locale %>"><%= "#{language_name(locale)} (#{locale})" %></option>
+                <option <%= locale == @locale ? 'selected': '' %> value="<%= locale %>"><%= "#{language_name(locale)} (#{locale})" %></option>
               <% end %>
             </select>
             <%= render partial: 'icons/chevron-down' %>

From b017d05ed93ff73ba1b968505c7117f64c95c92b Mon Sep 17 00:00:00 2001
From: Vishnu Narayanan <iamwishnu@gmail.com>
Date: Wed, 20 Mar 2024 11:59:37 +0530
Subject: [PATCH 79/96] feat: add sla events table (#9126)

* feat: add sla events table

* chore: refactor to EE namespace

* chore: refactor

* chore: fix spec

* chore: add references to account,inbox,sla_policy

* chore: update specs

* chore: update spec to check backfilling id's

* Update spec/enterprise/models/sla_event_spec.rb
---
 .../20240319062553_create_sla_events.rb       | 16 ++++++
 db/schema.rb                                  | 19 ++++++-
 enterprise/app/models/applied_sla.rb          |  2 +
 enterprise/app/models/sla_event.rb            | 52 +++++++++++++++++++
 spec/enterprise/models/sla_event_spec.rb      | 28 ++++++++++
 spec/factories/sla_events.rb                  | 10 ++++
 6 files changed, 126 insertions(+), 1 deletion(-)
 create mode 100644 db/migrate/20240319062553_create_sla_events.rb
 create mode 100644 enterprise/app/models/sla_event.rb
 create mode 100644 spec/enterprise/models/sla_event_spec.rb
 create mode 100644 spec/factories/sla_events.rb

diff --git a/db/migrate/20240319062553_create_sla_events.rb b/db/migrate/20240319062553_create_sla_events.rb
new file mode 100644
index 000000000..a6f1a5de2
--- /dev/null
+++ b/db/migrate/20240319062553_create_sla_events.rb
@@ -0,0 +1,16 @@
+class CreateSlaEvents < ActiveRecord::Migration[7.0]
+  def change
+    create_table :sla_events do |t|
+      t.references :applied_sla, null: false
+      t.references :conversation, null: false
+      t.references :account, null: false
+      t.references :sla_policy, null: false
+      t.references :inbox, null: false
+
+      t.integer :event_type
+      t.jsonb :meta, default: {}
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index d0499cb7b..498ad13d3 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: 2024_03_06_201954) do
+ActiveRecord::Schema[7.0].define(version: 2024_03_19_062553) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_stat_statements"
   enable_extension "pg_trgm"
@@ -842,6 +842,23 @@ ActiveRecord::Schema[7.0].define(version: 2024_03_06_201954) do
     t.index ["user_id"], name: "index_reporting_events_on_user_id"
   end
 
+  create_table "sla_events", force: :cascade do |t|
+    t.bigint "applied_sla_id", null: false
+    t.bigint "conversation_id", null: false
+    t.bigint "account_id", null: false
+    t.bigint "sla_policy_id", null: false
+    t.bigint "inbox_id", null: false
+    t.integer "event_type"
+    t.jsonb "meta", default: {}
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["account_id"], name: "index_sla_events_on_account_id"
+    t.index ["applied_sla_id"], name: "index_sla_events_on_applied_sla_id"
+    t.index ["conversation_id"], name: "index_sla_events_on_conversation_id"
+    t.index ["inbox_id"], name: "index_sla_events_on_inbox_id"
+    t.index ["sla_policy_id"], name: "index_sla_events_on_sla_policy_id"
+  end
+
   create_table "sla_policies", force: :cascade do |t|
     t.string "name", null: false
     t.float "first_response_time_threshold"
diff --git a/enterprise/app/models/applied_sla.rb b/enterprise/app/models/applied_sla.rb
index 48fd852e4..c2dde8377 100644
--- a/enterprise/app/models/applied_sla.rb
+++ b/enterprise/app/models/applied_sla.rb
@@ -22,6 +22,8 @@ class AppliedSla < ApplicationRecord
   belongs_to :sla_policy
   belongs_to :conversation
 
+  has_many :sla_events, dependent: :destroy
+
   validates :account_id, uniqueness: { scope: %i[sla_policy_id conversation_id] }
   before_validation :ensure_account_id
 
diff --git a/enterprise/app/models/sla_event.rb b/enterprise/app/models/sla_event.rb
new file mode 100644
index 000000000..28f709346
--- /dev/null
+++ b/enterprise/app/models/sla_event.rb
@@ -0,0 +1,52 @@
+# == Schema Information
+#
+# Table name: sla_events
+#
+#  id              :bigint           not null, primary key
+#  event_type      :integer
+#  meta            :jsonb
+#  created_at      :datetime         not null
+#  updated_at      :datetime         not null
+#  account_id      :bigint           not null
+#  applied_sla_id  :bigint           not null
+#  conversation_id :bigint           not null
+#  inbox_id        :bigint           not null
+#  sla_policy_id   :bigint           not null
+#
+# Indexes
+#
+#  index_sla_events_on_account_id       (account_id)
+#  index_sla_events_on_applied_sla_id   (applied_sla_id)
+#  index_sla_events_on_conversation_id  (conversation_id)
+#  index_sla_events_on_inbox_id         (inbox_id)
+#  index_sla_events_on_sla_policy_id    (sla_policy_id)
+#
+class SlaEvent < ApplicationRecord
+  belongs_to :account
+  belongs_to :inbox
+  belongs_to :conversation
+  belongs_to :sla_policy
+  belongs_to :applied_sla
+
+  enum event_type: { frt: 0, nrt: 1, rt: 2 }
+
+  before_validation :ensure_applied_sla_id, :ensure_account_id, :ensure_inbox_id, :ensure_sla_policy_id
+
+  private
+
+  def ensure_applied_sla_id
+    self.applied_sla_id ||= AppliedSla.find_by(conversation_id: conversation_id)&.last&.id
+  end
+
+  def ensure_account_id
+    self.account_id ||= conversation&.account_id
+  end
+
+  def ensure_inbox_id
+    self.inbox_id ||= conversation&.inbox_id
+  end
+
+  def ensure_sla_policy_id
+    self.sla_policy_id ||= applied_sla&.sla_policy_id
+  end
+end
diff --git a/spec/enterprise/models/sla_event_spec.rb b/spec/enterprise/models/sla_event_spec.rb
new file mode 100644
index 000000000..862b22e6c
--- /dev/null
+++ b/spec/enterprise/models/sla_event_spec.rb
@@ -0,0 +1,28 @@
+require 'rails_helper'
+
+RSpec.describe SlaEvent, type: :model do
+  describe 'associations' do
+    it { is_expected.to belong_to(:applied_sla) }
+    it { is_expected.to belong_to(:conversation) }
+    it { is_expected.to belong_to(:account) }
+    it { is_expected.to belong_to(:sla_policy) }
+    it { is_expected.to belong_to(:inbox) }
+  end
+
+  describe 'validates_factory' do
+    it 'creates valid sla event object' do
+      sla_event = create(:sla_event)
+      expect(sla_event.event_type).to eq 'frt'
+    end
+  end
+
+  describe 'backfilling ids' do
+    it 'automatically backfills account_id, inbox_id, and sla_id upon creation' do
+      sla_event = create(:sla_event)
+
+      expect(sla_event.account_id).to eq sla_event.conversation.account_id
+      expect(sla_event.inbox_id).to eq sla_event.conversation.inbox_id
+      expect(sla_event.sla_policy_id).to eq sla_event.applied_sla.sla_policy_id
+    end
+  end
+end
diff --git a/spec/factories/sla_events.rb b/spec/factories/sla_events.rb
new file mode 100644
index 000000000..12be18ede
--- /dev/null
+++ b/spec/factories/sla_events.rb
@@ -0,0 +1,10 @@
+FactoryBot.define do
+  factory :sla_event do
+    applied_sla
+    conversation
+    event_type { 'frt' }
+    account { conversation.account }
+    inbox { conversation.inbox }
+    sla_policy { applied_sla.sla_policy }
+  end
+end

From f78f278e2fd2f30f829c9cb6df631661787de020 Mon Sep 17 00:00:00 2001
From: Pranav <pranav@chatwoot.com>
Date: Wed, 20 Mar 2024 03:59:36 -0700
Subject: [PATCH 80/96] fix: Update validations for filter service (#8239)

- Refactor filter service for better readability and maintenance
- Add validations for the following:
   - If an invalid attribute is passed, a custom exception InvalidAttribute will be thrown.
   - If an invalid operator is passed, a custom exception InvalidOperator will be thrown.
   - If an invalid value (currently checking only null check), a custom exception InvalidValue will be thrown.

Fixes: https://linear.app/chatwoot/issue/CW-2702/activerecordstatementinvalid-pginvalidtextrepresentation-error-invalid
Fixes: https://linear.app/chatwoot/issue/CW-2703/activerecordstatementinvalid-pginvaliddatetimeformat-error-invalid
Fixes:  https://linear.app/chatwoot/issue/CW-2700/activerecordstatementinvalid-pgsyntaxerror-error-syntax-error-at-or


Co-authored-by: Sojan <sojan@pepalo.com>
---
 .../api/v1/accounts/contacts_controller.rb    |   4 +
 .../v1/accounts/conversations_controller.rb   |   4 +
 app/helpers/filter_helper.rb                  |  86 +++++++
 .../condition_validation_service.rb           |   4 +-
 .../conditions_filter_service.rb              |   5 +-
 app/services/contacts/filter_service.rb       |  41 +---
 app/services/conversations/filter_service.rb  |  40 +---
 app/services/filter_service.rb                |  26 ++-
 config/locales/en.yml                         |   4 +-
 lib/automation_rules/conditions.json          | 195 ----------------
 lib/custom_exceptions/custom_filter.rb        |  19 ++
 lib/filters/conversation_filters.json         |  92 --------
 lib/filters/filter_keys.json                  | 204 ----------------
 lib/filters/filter_keys.yml                   | 220 ++++++++++++++++++
 .../v1/accounts/contacts_controller_spec.rb   |  42 +++-
 .../accounts/conversations_controller_spec.rb |  45 +++-
 spec/services/contacts/filter_service_spec.rb |  14 +-
 .../conversations/filter_service_spec.rb      |  13 +-
 18 files changed, 470 insertions(+), 588 deletions(-)
 create mode 100644 app/helpers/filter_helper.rb
 delete mode 100644 lib/automation_rules/conditions.json
 create mode 100644 lib/custom_exceptions/custom_filter.rb
 delete mode 100644 lib/filters/conversation_filters.json
 delete mode 100644 lib/filters/filter_keys.json
 create mode 100644 lib/filters/filter_keys.yml

diff --git a/app/controllers/api/v1/accounts/contacts_controller.rb b/app/controllers/api/v1/accounts/contacts_controller.rb
index 71e9100e7..729db34b5 100644
--- a/app/controllers/api/v1/accounts/contacts_controller.rb
+++ b/app/controllers/api/v1/accounts/contacts_controller.rb
@@ -65,6 +65,10 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
     contacts = result[:contacts]
     @contacts_count = result[:count]
     @contacts = fetch_contacts(contacts)
+  rescue CustomExceptions::CustomFilter::InvalidAttribute,
+         CustomExceptions::CustomFilter::InvalidOperator,
+         CustomExceptions::CustomFilter::InvalidValue => e
+    render_could_not_create_error(e.message)
   end
 
   def contactable_inboxes
diff --git a/app/controllers/api/v1/accounts/conversations_controller.rb b/app/controllers/api/v1/accounts/conversations_controller.rb
index d0d8f6d5b..2aedf1928 100644
--- a/app/controllers/api/v1/accounts/conversations_controller.rb
+++ b/app/controllers/api/v1/accounts/conversations_controller.rb
@@ -44,6 +44,10 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
     result = ::Conversations::FilterService.new(params.permit!, current_user).perform
     @conversations = result[:conversations]
     @conversations_count = result[:count]
+  rescue CustomExceptions::CustomFilter::InvalidAttribute,
+         CustomExceptions::CustomFilter::InvalidOperator,
+         CustomExceptions::CustomFilter::InvalidValue => e
+    render_could_not_create_error(e.message)
   end
 
   def mute
diff --git a/app/helpers/filter_helper.rb b/app/helpers/filter_helper.rb
new file mode 100644
index 000000000..b3efc393a
--- /dev/null
+++ b/app/helpers/filter_helper.rb
@@ -0,0 +1,86 @@
+module FilterHelper
+  def build_condition_query(model_filters, query_hash, current_index)
+    current_filter = model_filters[query_hash['attribute_key']]
+
+    # Throw InvalidOperator Error if the attribute is a standard attribute
+    # and the operator is not allowed in the config
+    if current_filter.present? && current_filter['filter_operators'].exclude?(query_hash[:filter_operator])
+      raise CustomExceptions::CustomFilter::InvalidOperator.new(
+        attribute_name: query_hash['attribute_key'],
+        allowed_keys: current_filter['filter_operators']
+      )
+    end
+
+    # Every other filter expects a value to be present
+    if %w[is_present is_not_present].exclude?(query_hash[:filter_operator]) && query_hash['values'].blank?
+      raise CustomExceptions::CustomFilter::InvalidValue.new(attribute_name: query_hash['attribute_key'])
+    end
+
+    condition_query = build_condition_query_string(current_filter, query_hash, current_index)
+    # The query becomes empty only when it doesn't match to any supported
+    # standard attribute or custom attribute defined in the account.
+    if condition_query.empty?
+      raise CustomExceptions::CustomFilter::InvalidAttribute.new(key: query_hash['attribute_key'],
+                                                                 allowed_keys: model_filters.keys)
+    end
+
+    condition_query
+  end
+
+  def build_condition_query_string(current_filter, query_hash, current_index)
+    filter_operator_value = filter_operation(query_hash, current_index)
+
+    return handle_nil_filter(query_hash, current_index) if current_filter.nil?
+
+    case current_filter['attribute_type']
+    when 'additional_attributes'
+      handle_additional_attributes(query_hash, filter_operator_value)
+    else
+      handle_standard_attributes(current_filter, query_hash, current_index, filter_operator_value)
+    end
+  end
+
+  def handle_nil_filter(query_hash, current_index)
+    attribute_type = "#{filter_config[:entity].downcase}_attribute"
+    custom_attribute_query(query_hash, attribute_type, current_index)
+  end
+
+  # TODO: Change the reliance on entity instead introduce datatype text_case_insensive
+  # Then we can remove the condition for Contact
+  def handle_additional_attributes(query_hash, filter_operator_value)
+    if filter_config[:entity] == 'Contact'
+      "LOWER(#{filter_config[:table_name]}.additional_attributes ->> '#{query_hash[:attribute_key]}') " \
+        "#{filter_operator_value} #{query_hash[:query_operator]}"
+    else
+      "#{filter_config[:table_name]}.additional_attributes ->> '#{query_hash[:attribute_key]}' " \
+        "#{filter_operator_value} #{query_hash[:query_operator]} "
+    end
+  end
+
+  def handle_standard_attributes(current_filter, query_hash, current_index, filter_operator_value)
+    case current_filter['data_type']
+    when 'date'
+      date_filter(current_filter, query_hash, filter_operator_value)
+    when 'labels'
+      tag_filter_query(query_hash, current_index)
+    else
+      default_filter(query_hash, filter_operator_value)
+    end
+  end
+
+  def date_filter(current_filter, query_hash, filter_operator_value)
+    "(#{filter_config[:table_name]}.#{query_hash[:attribute_key]})::#{current_filter['data_type']} " \
+      "#{filter_operator_value}#{current_filter['data_type']} #{query_hash[:query_operator]}"
+  end
+
+  # TODO: Change the reliance on entity instead introduce datatype text_case_insensive
+  # Then we can remove the condition for Contact
+  def default_filter(query_hash, filter_operator_value)
+    if filter_config[:entity] == 'Contact'
+      "LOWER(#{filter_config[:table_name]}.#{query_hash[:attribute_key]}) " \
+        "#{filter_operator_value} #{query_hash[:query_operator]}"
+    else
+      "#{filter_config[:table_name]}.#{query_hash[:attribute_key]} #{filter_operator_value} #{query_hash[:query_operator]}"
+    end
+  end
+end
diff --git a/app/services/automation_rules/condition_validation_service.rb b/app/services/automation_rules/condition_validation_service.rb
index 6f9f9a7c3..63e58b5bc 100644
--- a/app/services/automation_rules/condition_validation_service.rb
+++ b/app/services/automation_rules/condition_validation_service.rb
@@ -5,8 +5,8 @@ class AutomationRules::ConditionValidationService
     @rule = rule
     @account = rule.account
 
-    file = File.read('./lib/filters/filter_keys.json')
-    @filters = JSON.parse(file)
+    file = File.read('./lib/filters/filter_keys.yml')
+    @filters = YAML.safe_load(file)
 
     @conversation_filters = @filters['conversations']
     @contact_filters = @filters['contacts']
diff --git a/app/services/automation_rules/conditions_filter_service.rb b/app/services/automation_rules/conditions_filter_service.rb
index 44b72db9e..daf9cb7e2 100644
--- a/app/services/automation_rules/conditions_filter_service.rb
+++ b/app/services/automation_rules/conditions_filter_service.rb
@@ -11,8 +11,9 @@ class AutomationRules::ConditionsFilterService < FilterService
     @account = conversation.account
 
     # setup filters from json file
-    file = File.read('./lib/filters/filter_keys.json')
-    @filters = JSON.parse(file)
+    file = File.read('./lib/filters/filter_keys.yml')
+    @filters = YAML.safe_load(file)
+
     @conversation_filters = @filters['conversations']
     @contact_filters = @filters['contacts']
     @message_filters = @filters['messages']
diff --git a/app/services/contacts/filter_service.rb b/app/services/contacts/filter_service.rb
index 70062cad0..d3b24e4e2 100644
--- a/app/services/contacts/filter_service.rb
+++ b/app/services/contacts/filter_service.rb
@@ -2,7 +2,7 @@ class Contacts::FilterService < FilterService
   ATTRIBUTE_MODEL = 'contact_attribute'.freeze
 
   def perform
-    @contacts = contact_query_builder
+    @contacts = query_builder(@filters['contacts'])
 
     {
       contacts: @contacts,
@@ -10,38 +10,6 @@ class Contacts::FilterService < FilterService
     }
   end
 
-  def contact_query_builder
-    contact_filters = @filters['contacts']
-
-    @params[:payload].each_with_index do |query_hash, current_index|
-      current_filter = contact_filters[query_hash['attribute_key']]
-      @query_string += contact_query_string(current_filter, query_hash, current_index)
-    end
-
-    base_relation.where(@query_string, @filter_values.with_indifferent_access)
-  end
-
-  def contact_query_string(current_filter, query_hash, current_index)
-    attribute_key = query_hash[:attribute_key]
-    query_operator = query_hash[:query_operator]
-    filter_operator_value = filter_operation(query_hash, current_index)
-
-    return custom_attribute_query(query_hash, 'contact_attribute', current_index) if current_filter.nil?
-
-    case current_filter['attribute_type']
-    when 'additional_attributes'
-      "  LOWER(contacts.additional_attributes ->> '#{attribute_key}') #{filter_operator_value} #{query_operator} "
-    when 'date_attributes'
-      " (contacts.#{attribute_key})::#{current_filter['data_type']} #{filter_operator_value}#{current_filter['data_type']} #{query_operator} "
-    when 'standard'
-      if attribute_key == 'labels'
-        " #{tag_filter_query('Contact', 'contacts', query_hash, current_index)} "
-      else
-        " LOWER(contacts.#{attribute_key}) #{filter_operator_value} #{query_operator} "
-      end
-    end
-  end
-
   def filter_values(query_hash)
     current_val = query_hash['values'][0]
     if query_hash['attribute_key'] == 'phone_number'
@@ -57,6 +25,13 @@ class Contacts::FilterService < FilterService
     Current.account.contacts
   end
 
+  def filter_config
+    {
+      entity: 'Contact',
+      table_name: 'contacts'
+    }
+  end
+
   private
 
   def equals_to_filter_string(filter_operator, current_index)
diff --git a/app/services/conversations/filter_service.rb b/app/services/conversations/filter_service.rb
index 87384017c..3a06959b8 100644
--- a/app/services/conversations/filter_service.rb
+++ b/app/services/conversations/filter_service.rb
@@ -7,7 +7,7 @@ class Conversations::FilterService < FilterService
   end
 
   def perform
-    @conversations = conversation_query_builder
+    @conversations = query_builder(@filters['conversations'])
     mine_count, unassigned_count, all_count, = set_count_for_all_conversations
     assigned_count = all_count - unassigned_count
 
@@ -22,37 +22,6 @@ class Conversations::FilterService < FilterService
     }
   end
 
-  def conversation_query_builder
-    conversation_filters = @filters['conversations']
-    @params[:payload].each_with_index do |query_hash, current_index|
-      current_filter = conversation_filters[query_hash['attribute_key']]
-      @query_string += conversation_query_string(current_filter, query_hash, current_index)
-    end
-
-    base_relation.where(@query_string, @filter_values.with_indifferent_access)
-  end
-
-  def conversation_query_string(current_filter, query_hash, current_index)
-    attribute_key = query_hash[:attribute_key]
-    query_operator = query_hash[:query_operator]
-    filter_operator_value = filter_operation(query_hash, current_index)
-
-    return custom_attribute_query(query_hash, 'conversation_attribute', current_index) if current_filter.nil?
-
-    case current_filter['attribute_type']
-    when 'additional_attributes'
-      " conversations.additional_attributes ->> '#{attribute_key}' #{filter_operator_value} #{query_operator} "
-    when 'date_attributes'
-      " (conversations.#{attribute_key})::#{current_filter['data_type']} #{filter_operator_value}#{current_filter['data_type']} #{query_operator} "
-    when 'standard'
-      if attribute_key == 'labels'
-        " #{tag_filter_query('Conversation', 'conversations', query_hash, current_index)} "
-      else
-        " conversations.#{attribute_key} #{filter_operator_value} #{query_operator} "
-      end
-    end
-  end
-
   def base_relation
     @account.conversations.includes(
       :taggings, :inbox, { assignee: { avatar_attachment: [:blob] } }, { contact: { avatar_attachment: [:blob] } }, :team, :messages, :contact_inbox
@@ -63,6 +32,13 @@ class Conversations::FilterService < FilterService
     @params[:page] || 1
   end
 
+  def filter_config
+    {
+      entity: 'Conversation',
+      table_name: 'conversations'
+    }
+  end
+
   def conversations
     @conversations.sort_on_last_activity_at.page(current_page)
   end
diff --git a/app/services/filter_service.rb b/app/services/filter_service.rb
index f1a699811..c545ac7d8 100644
--- a/app/services/filter_service.rb
+++ b/app/services/filter_service.rb
@@ -1,6 +1,9 @@
 require 'json'
 
 class FilterService
+  include FilterHelper
+  include CustomExceptions::CustomFilter
+
   ATTRIBUTE_MODEL = 'conversation_attribute'.freeze
   ATTRIBUTE_TYPES = {
     date: 'date', text: 'text', number: 'numeric', link: 'text', list: 'text', checkbox: 'boolean'
@@ -9,8 +12,8 @@ class FilterService
   def initialize(params, user)
     @params = params
     @user = user
-    file = File.read('./lib/filters/filter_keys.json')
-    @filters = JSON.parse(file)
+    file = File.read('./lib/filters/filter_keys.yml')
+    @filters = YAML.safe_load(file)
     @query_string = ''
     @filter_values = {}
   end
@@ -106,7 +109,9 @@ class FilterService
     ]
   end
 
-  def tag_filter_query(model_name, table_name, query_hash, current_index)
+  def tag_filter_query(query_hash, current_index)
+    model_name = filter_config[:entity]
+    table_name = filter_config[:table_name]
     query_operator = query_hash[:query_operator]
     @filter_values["value_#{current_index}"] = filter_values(query_hash)
 
@@ -130,10 +135,8 @@ class FilterService
   def custom_attribute_query(query_hash, custom_attribute_type, current_index)
     @attribute_key = query_hash[:attribute_key]
     @custom_attribute_type = custom_attribute_type
-
     attribute_data_type
-
-    return ' ' if @custom_attribute.blank?
+    return '' if @custom_attribute.blank?
 
     build_custom_attr_query(query_hash, current_index)
   end
@@ -155,9 +158,9 @@ class FilterService
     table_name = attribute_model == 'conversation_attribute' ? 'conversations' : 'contacts'
 
     query = if attribute_data_type == 'text'
-              "  LOWER(#{table_name}.custom_attributes ->> '#{@attribute_key}')::#{attribute_data_type} #{filter_operator_value} #{query_operator} "
+              "LOWER(#{table_name}.custom_attributes ->> '#{@attribute_key}')::#{attribute_data_type} #{filter_operator_value} #{query_operator} "
             else
-              "  (#{table_name}.custom_attributes ->> '#{@attribute_key}')::#{attribute_data_type} #{filter_operator_value} #{query_operator} "
+              "(#{table_name}.custom_attributes ->> '#{@attribute_key}')::#{attribute_data_type} #{filter_operator_value} #{query_operator} "
             end
 
     query + not_in_custom_attr_query(table_name, query_hash, attribute_data_type)
@@ -194,4 +197,11 @@ class FilterService
 
     "NOT LIKE :value_#{current_index}"
   end
+
+  def query_builder(model_filters)
+    @params[:payload].each_with_index do |query_hash, current_index|
+      @query_string += " #{build_condition_query(model_filters, query_hash, current_index).strip}"
+    end
+    base_relation.where(@query_string, @filter_values.with_indifferent_access)
+  end
 end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index c19499fa5..4c4f0483c 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -77,7 +77,9 @@ en:
         name: should not start or end with symbols, and it should not have < > / \ @ characters.
     custom_filters:
       number_of_records: Limit reached. The maximum number of allowed custom filters for a user per account is 50.
-
+      invalid_attribute: Invalid attribute key - [%{key}]. The key should be one of [%{allowed_keys}] or a custom attribute defined in the account.
+      invalid_operator: Invalid operator. The allowed operators for %{attribute_name} are [%{allowed_keys}].
+      invalid_value: Invalid value. The values provided for %{attribute_name} are invalid
   reports:
     period: Reporting period %{since} to %{until}
     utc_warning: The report generated is in UTC timezone
diff --git a/lib/automation_rules/conditions.json b/lib/automation_rules/conditions.json
deleted file mode 100644
index ba4bd4b5b..000000000
--- a/lib/automation_rules/conditions.json
+++ /dev/null
@@ -1,195 +0,0 @@
-{
-  "conversations": {
-    "status": {
-      "attribute_name": "Status",
-      "input_type": "multi_select",
-      "table_name": "conversations",
-      "filter_operators": [ "equal_to", "not_equal_to" ],
-      "attribute_type": "standard"
-    },
-    "assignee_id": {
-      "attribute_name": "Assignee Name",
-      "input_type": "search_box with name tags/plain text",
-       "table_name": "conversations",
-      "filter_operators": [ "equal_to", "not_equal_to", "contains", "does_not_contain", "is_present", "is_not_present" ],
-      "attribute_type": "standard"
-    },
-    "contact_id": {
-      "attribute_name": "Contact Name",
-      "input_type": "plain_text",
-       "table_name": "conversations",
-      "filter_operators": [ "equal_to", "not_equal_to", "contains", "does_not_contain", "is_present", "is_not_present" ],
-      "attribute_type": "standard"
-    },
-    "inbox_id": {
-      "attribute_name": "Inbox Name",
-      "input_type": "search_box",
-       "table_name": "conversations",
-      "filter_operators": [ "equal_to", "not_equal_to", "contains", "does_not_contain", "is_present", "is_not_present" ],
-      "attribute_type": "standard"
-    },
-    "team_id": {
-      "attribute_name": "Team Name",
-      "input_type": "search_box",
-      "table_name": "conversations",
-      "filter_operators": [ "equal_to", "not_equal_to", "contains", "does_not_contain", "is_present", "is_not_present" ],
-      "attribute_type": "standard"
-    },
-    "id": {
-      "attribute_name": "Conversation Identifier",
-      "input_type": "textbox",
-      "table_name": "conversations",
-      "filter_operators": [ "equal_to", "not_equal_to", "contains", "does_not_contain", "is_present", "is_not_present" ],
-      "attribute_type": "standard"
-    },
-    "campaign_id": {
-      "attribute_name": "Campaign Name",
-      "input_type": "textbox",
-      "data_type": "Number",
-      "filter_operators": [ "equal_to", "not_equal_to", "contains", "does_not_contain", "is_present", "is_not_present" ],
-      "attribute_type": "standard"
-    },
-    "labels": {
-      "attribute_name": "Labels",
-      "input_type": "tags",
-      "data_type": "text",
-      "filter_operators": ["exactly_equal_to", "contains", "does_not_contain" ],
-      "attribute_type": "standard"
-    },
-    "browser_language": {
-      "attribute_name": "Browser Language",
-      "input_type": "textbox",
-      "data_type": "text",
-      "filter_operators": [ "equal_to", "not_equal_to", "contains", "does_not_contain" ],
-      "attribute_type": "additional_attributes"
-    },
-    "conversation_language": {
-      "attribute_name": "Conversation Language",
-      "input_type": "textbox",
-      "data_type": "text",
-      "filter_operators": [ "equal_to", "not_equal_to" ],
-      "attribute_type": "additional_attributes"
-    },
-    "mail_subject": {
-      "attribute_name": "Email Subject",
-      "input_type": "textbox",
-      "data_type": "text",
-      "filter_operators": [ "equal_to", "not_equal_to", "contains", "does_not_contain" ],
-      "attribute_type": "additional_attributes"
-    },
-    "country_code": {
-      "attribute_name": "Country Name",
-      "input_type": "textbox",
-      "data_type": "text",
-      "filter_operators": [ "equal_to", "not_equal_to", "contains", "does_not_contain", "present", "is_not_present" ],
-      "attribute_type": "additional_attributes"
-    },
-    "referer": {
-      "attribute_name": "Referer link",
-      "input_type": "textbox",
-      "data_type": "link",
-      "filter_operators": [ "equal_to", "not_equal_to", "contains", "does_not_contain", "present", "is_not_present" ],
-      "attribute_type": "additional_attributes"
-    },
-    "plan": {
-      "attribute_name": "Plan",
-      "input_type": "multi_select",
-      "data_type": "text",
-      "filter_operators": [ "equal_to", "not_equal_to", "contains", "does_not_contain", "present", "is_not_present" ],
-      "attribute_type": "additional_attributes"
-    }
-  },
-  "contacts": {
-    "assignee_id": {
-      "attribute_name": "Assignee Name",
-      "input_type": "search_box with name tags/plain text",
-      "data_type": "text",
-      "filter_operators": [ "equal_to", "not_equal_to", "contains", "does_not_contain", "is_present", "is_not_present" ],
-      "attribute_type": "standard"
-    },
-    "phone_number": {
-      "attribute_name": "Phone Number",
-      "input_type": "textbox",
-      "data_type": "text",
-      "filter_operators": [ "equal_to", "not_equal_to", "contains", "does_not_contain", "starts_with" ],
-      "attribute_type": "standard"
-    },
-    "contact_id": {
-      "attribute_name": "Contact Name",
-      "input_type": "plain_text",
-      "data_type": "text",
-      "filter_operators": [ "equal_to", "not_equal_to", "contains", "does_not_contain", "is_present", "is_not_present" ],
-      "attribute_type": "standard"
-    },
-    "inbox_id": {
-      "attribute_name": "Inbox Name",
-      "input_type": "search_box",
-      "data_type": "text",
-      "filter_operators": [ "equal_to", "not_equal_to", "contains", "does_not_contain", "is_present", "is_not_present" ],
-      "attribute_type": "standard"
-    },
-    "team_id": {
-      "attribute_name": "Team Name",
-      "input_type": "search_box",
-      "data_type": "number",
-      "filter_operators": [ "equal_to", "not_equal_to", "contains", "does_not_contain", "is_present", "is_not_present" ],
-      "attribute_type": "standard"
-    },
-    "id": {
-      "attribute_name": "Conversation Identifier",
-      "input_type": "textbox",
-      "data_type": "Number",
-      "filter_operators": [ "equal_to", "not_equal_to", "contains", "does_not_contain", "is_present", "is_not_present" ],
-      "attribute_type": "standard"
-    },
-    "campaign_id": {
-      "attribute_name": "Campaign Name",
-      "input_type": "textbox",
-      "data_type": "Number",
-      "filter_operators": [ "equal_to", "not_equal_to", "contains", "does_not_contain", "is_present", "is_not_present" ],
-      "attribute_type": "standard"
-    },
-    "labels": {
-      "attribute_name": "Labels",
-      "input_type": "tags",
-      "data_type": "text",
-      "filter_operators": ["exactly_equal_to", "contains", "does_not_contain" ],
-      "attribute_type": "standard"
-    },
-    "browser_language": {
-      "attribute_name": "Browser Language",
-      "input_type": "textbox",
-      "data_type": "text",
-      "filter_operators": [ "equal_to", "not_equal_to", "contains", "does_not_contain" ],
-      "attribute_type": "additional_attributes"
-    },
-    "mail_subject": {
-      "attribute_name": "Email Subject",
-      "input_type": "textbox",
-      "data_type": "text",
-      "filter_operators": [ "equal_to", "not_equal_to", "contains", "does_not_contain" ],
-      "attribute_type": "additional_attributes"
-    },
-    "email": {
-      "attribute_name": "Email",
-      "input_type": "textbox",
-      "data_type": "text",
-      "filter_operators": [ "equal_to", "not_equal_to", "contains", "does_not_contain" ],
-      "attribute_type": "standard"
-    },
-    "country_code": {
-      "attribute_name": "Country Name",
-      "input_type": "textbox",
-      "data_type": "text",
-      "filter_operators": [ "equal_to", "not_equal_to", "contains", "does_not_contain", "present", "is_not_present" ],
-      "attribute_type": "additional_attributes"
-    },
-    "referer": {
-      "attribute_name": "Referer link",
-      "input_type": "textbox",
-      "data_type": "link",
-      "filter_operators": [ "equal_to", "not_equal_to", "contains", "does_not_contain", "present", "is_not_present" ],
-      "attribute_type": "additional_attributes"
-    }
-  }
-}
diff --git a/lib/custom_exceptions/custom_filter.rb b/lib/custom_exceptions/custom_filter.rb
new file mode 100644
index 000000000..03ff9ec7a
--- /dev/null
+++ b/lib/custom_exceptions/custom_filter.rb
@@ -0,0 +1,19 @@
+module CustomExceptions::CustomFilter
+  class InvalidAttribute < CustomExceptions::Base
+    def message
+      I18n.t('errors.custom_filters.invalid_attribute', key: @data[:key], allowed_keys: @data[:allowed_keys].join(','))
+    end
+  end
+
+  class InvalidOperator < CustomExceptions::Base
+    def message
+      I18n.t('errors.custom_filters.invalid_operator', attribute_name: @data[:attribute_name], allowed_keys: @data[:allowed_keys].join(','))
+    end
+  end
+
+  class InvalidValue < CustomExceptions::Base
+    def message
+      I18n.t('errors.custom_filters.invalid_value', attribute_name: @data[:attribute_name])
+    end
+  end
+end
diff --git a/lib/filters/conversation_filters.json b/lib/filters/conversation_filters.json
deleted file mode 100644
index 39f58f5c6..000000000
--- a/lib/filters/conversation_filters.json
+++ /dev/null
@@ -1,92 +0,0 @@
-{
-  "conversations": [
-    {
-      "attribute_key": "status",
-      "attribute_name": "Status",
-      "input_type": "multi_select",
-      "data_type": "text",
-      "filter_operators": [ "equal_to", "not_equal_to" ],
-      "attribute_type": "standard"
-    },
-    {
-      "attribute_key": "assigne",
-      "attribute_name": "Assignee Name",
-      "input_type": "search_box with name tags/plain text",
-      "data_type": "text",
-      "filter_operators": [ "equal_to", "not_equal_to", "contains", "does_not_contain", "is_present", "is_not_present" ],
-      "attribute_type": "standard"
-    },
-    {
-      "attribute_key": "contact",
-      "attribute_name": "Contact Name",
-      "input_type": "plain_text",
-      "data_type": "text",
-      "filter_operators": [ "equal_to", "not_equal_to", "contains", "does_not_contain", "is_present", "is_not_present" ],
-      "attribute_type": "standard"
-    },
-    {
-      "attribute_key": "inbox",
-      "attribute_name": "Inbox Name",
-      "input_type": "search_box",
-      "data_type": "text",
-      "filter_operators": [ "equal_to", "not_equal_to", "contains", "does_not_contain", "is_present", "is_not_present" ],
-      "attribute_type": "standard"
-    },
-    {
-      "attribute_key": "team_id",
-      "attribute_name": "Team Name",
-      "input_type": "search_box",
-      "data_type": "number",
-      "filter_operators": [ "equal_to", "not_equal_to", "contains", "does_not_contain", "is_present", "is_not_present" ],
-      "attribute_type": "standard"
-    },
-    {
-      "attribute_key": "id",
-      "attribute_name": "Conversation Identifier",
-      "input_type": "textbox",
-      "data_type": "Number",
-      "filter_operators": [ "equal_to", "not_equal_to", "contains", "does_not_contain", "is_present", "is_not_present" ],
-      "attribute_type": "standard"
-    },
-    {
-      "attribute_key": "campaign_id",
-      "attribute_name": "Campaign Name",
-      "input_type": "textbox",
-      "data_type": "Number",
-      "filter_operators": [ "equal_to", "not_equal_to", "contains", "does_not_contain", "is_present", "is_not_present" ],
-      "attribute_type": "standard"
-    },
-    {
-      "attribute_key": "labels",
-      "attribute_name": "Labels",
-      "input_type": "tags",
-      "data_type": "text",
-      "filter_operators": ["exactly_equal_to", "contains", "does_not_contain" ],
-      "attribute_type": "standard"
-    },
-    {
-      "attribute_key": "browser_language",
-      "attribute_name": "Browser Language",
-      "input_type": "textbox",
-      "data_type": "text",
-      "filter_operators": [ "equal_to", "not_equal_to", "contains", "does_not_contain" ],
-      "attribute_type": "additional_attributes"
-    },
-    {
-      "attribute_key": "country_code",
-      "attribute_name": "Country Name",
-      "input_type": "textbox",
-      "data_type": "text",
-      "filter_operators": [ "equal_to", "not_equal_to", "contains", "does_not_contain", "present", "is_not_present" ],
-      "attribute_type": "additional_attributes"
-    },
-    {
-      "attribute_key": "referer",
-      "attribute_name": "Referer link",
-      "input_type": "textbox",
-      "data_type": "link",
-      "filter_operators": [ "equal_to", "not_equal_to", "contains", "does_not_contain", "present", "is_not_present" ],
-      "attribute_type": "additional_attributes"
-    }
-  ]
-}
diff --git a/lib/filters/filter_keys.json b/lib/filters/filter_keys.json
deleted file mode 100644
index 9266d9bea..000000000
--- a/lib/filters/filter_keys.json
+++ /dev/null
@@ -1,204 +0,0 @@
-{
-  "conversations": {
-    "status": {
-      "attribute_name": "Status",
-      "input_type": "multi_select",
-      "data_type": "text",
-      "filter_operators": [ "equal_to", "not_equal_to" ],
-      "attribute_type": "standard"
-    },
-    "assignee_id": {
-      "attribute_name": "Assignee Name",
-      "input_type": "search_box with name tags/plain text",
-      "data_type": "text",
-      "filter_operators": [ "equal_to", "not_equal_to", "contains", "does_not_contain", "is_present", "is_not_present" ],
-      "attribute_type": "standard"
-    },
-    "contact_id": {
-      "attribute_name": "Contact Name",
-      "input_type": "plain_text",
-      "data_type": "text",
-      "filter_operators": [ "equal_to", "not_equal_to", "contains", "does_not_contain", "is_present", "is_not_present" ],
-      "attribute_type": "standard"
-    },
-    "inbox_id": {
-      "attribute_name": "Inbox Name",
-      "input_type": "search_box",
-      "data_type": "text",
-      "filter_operators": [ "equal_to", "not_equal_to", "contains", "does_not_contain", "is_present", "is_not_present" ],
-      "attribute_type": "standard"
-    },
-    "team_id": {
-      "attribute_name": "Team Name",
-      "input_type": "search_box",
-      "data_type": "number",
-      "filter_operators": [ "equal_to", "not_equal_to", "contains", "does_not_contain", "is_present", "is_not_present" ],
-      "attribute_type": "standard"
-    },
-    "display_id": {
-      "attribute_name": "Conversation Identifier",
-      "input_type": "textbox",
-      "data_type": "Number",
-      "filter_operators": [ "equal_to", "not_equal_to", "contains", "does_not_contain", "is_present", "is_not_present" ],
-      "attribute_type": "standard"
-    },
-    "campaign_id": {
-      "attribute_name": "Campaign Name",
-      "input_type": "textbox",
-      "data_type": "Number",
-      "filter_operators": [ "equal_to", "not_equal_to", "contains", "does_not_contain", "is_present", "is_not_present" ],
-      "attribute_type": "standard"
-    },
-    "labels": {
-      "attribute_name": "Labels",
-      "input_type": "tags",
-      "data_type": "text",
-      "filter_operators": ["exactly_equal_to", "contains", "does_not_contain" ],
-      "attribute_type": "standard"
-    },
-    "browser_language": {
-      "attribute_name": "Browser Language",
-      "input_type": "textbox",
-      "data_type": "text",
-      "filter_operators": [ "equal_to", "not_equal_to", "contains", "does_not_contain" ],
-      "attribute_type": "additional_attributes"
-    },
-    "conversation_language": {
-      "attribute_name": "Conversation Language",
-      "input_type": "textbox",
-      "data_type": "text",
-      "filter_operators": [ "equal_to", "not_equal_to" ],
-      "attribute_type": "additional_attributes"
-    },
-    "country_code": {
-      "attribute_name": "Country Name",
-      "input_type": "textbox",
-      "data_type": "text",
-      "filter_operators": [ "equal_to", "not_equal_to", "contains", "does_not_contain", "present", "is_not_present" ],
-      "attribute_type": "additional_attributes"
-    },
-    "referer": {
-      "attribute_name": "Referer link",
-      "input_type": "textbox",
-      "data_type": "link",
-      "filter_operators": [ "equal_to", "not_equal_to", "contains", "does_not_contain", "present", "is_not_present" ],
-      "attribute_type": "additional_attributes"
-    },
-    "created_at": {
-      "attribute_name": "Created At",
-      "input_type": "date",
-      "data_type": "date",
-      "filter_operators": [ "is_greater_than", "is_less_than", "days_before" ],
-      "attribute_type": "date_attributes"
-    },
-    "last_activity_at": {
-      "attribute_name": "Created At",
-      "input_type": "date",
-      "data_type": "date",
-      "filter_operators": [ "is_greater_than", "is_less_than", "days_before" ],
-      "attribute_type": "date_attributes"
-    },
-    "mail_subject": {
-      "attribute_name": "Email Subject",
-      "input_type": "text",
-      "data_type": "text",
-      "filter_operators": [ "equal_to", "not_equal_to", "contains", "does_not_contain"],
-      "attribute_type": "additional_attributes"
-    }
-  },
-  "contacts": {
-    "name": {
-      "attribute_name": "Name",
-      "input_type": "search_box with name tags/plain text",
-      "data_type": "text",
-      "filter_operators": [ "equal_to", "not_equal_to", "contains", "does_not_contain" ],
-      "attribute_type": "standard"
-    },
-    "phone_number": {
-      "attribute_name": "Phone Number",
-      "input_type": "text",
-      "data_type": "text",
-      "filter_operators": [ "equal_to", "not_equal_to", "contains", "does_not_contain", "starts_with"],
-      "attribute_type": "standard"
-    },
-    "email": {
-      "attribute_name": "Email",
-      "input_type":  "search_box with name tags/plain text",
-      "data_type": "text",
-      "filter_operators":  [ "equal_to", "not_equal_to", "contains", "does_not_contain" ],
-      "attribute_type": "standard"
-    },
-    "identifier": {
-      "attribute_name": "Contact Identifier",
-      "input_type": "search_box with name tags/plain text",
-      "data_type": "text",
-      "filter_operators": [ "equal_to", "not_equal_to" ],
-      "attribute_type": "standard"
-    },
-    "country_code": {
-      "attribute_name": "Country",
-      "input_type": "textbox",
-      "data_type": "text",
-      "filter_operators": [ "equal_to", "not_equal_to" ],
-      "attribute_type": "additional_attributes"
-    },
-    "city": {
-      "attribute_name": "City",
-      "input_type": "textbox",
-      "data_type": "text",
-      "filter_operators": [ "equal_to", "not_equal_to", "contains", "does_not_contain" ],
-      "attribute_type": "additional_attributes"
-    },
-    "browser_language": {
-      "attribute_name": "Browser Language",
-      "input_type": "textbox",
-      "data_type": "text",
-      "filter_operators": [ "equal_to", "not_equal_to", "contains", "does_not_contain" ],
-      "attribute_type": "additional_attributes"
-    },
-    "company": {
-      "attribute_name": "Company",
-      "input_type": "textbox",
-      "data_type": "text",
-      "filter_operators": [ "equal_to", "not_equal_to", "contains", "does_not_contain" ],
-      "attribute_type": "additional_attributes"
-    },
-    "labels": {
-      "attribute_name": "Labels",
-      "input_type": "tags",
-      "data_type": "text",
-      "filter_operators": ["exactly_equal_to", "contains", "does_not_contain" ],
-      "attribute_type": "standard"
-    },
-    "created_at": {
-      "attribute_name": "Created At",
-      "input_type": "date",
-      "data_type": "date",
-      "filter_operators": [ "is_greater_than", "is_less_than", "days_before" ],
-      "attribute_type": "date_attributes"
-    },
-    "last_activity_at": {
-      "attribute_name": "Created At",
-      "input_type": "date",
-      "data_type": "date",
-      "filter_operators": [ "is_greater_than", "is_less_than", "days_before" ],
-      "attribute_type": "date_attributes"
-    }
-  },
-  "messages": {
-    "message_type": {
-      "attribute_name": "Message Type",
-      "input_type": "search_box with name tags/plain text",
-      "data_type": "numeric",
-      "filter_operators": [ "equal_to", "not_equal_to" ],
-      "attribute_type": "standard"
-    },
-    "content": {
-      "attribute_name": "Message Content",
-      "input_type": "search_box with name tags/plain text",
-      "data_type": "text",
-      "filter_operators": [ "equal_to", "not_equal_to", "contains", "does_not_contain" ],
-      "attribute_type": "standard"
-    }
-  }
-}
diff --git a/lib/filters/filter_keys.yml b/lib/filters/filter_keys.yml
new file mode 100644
index 000000000..afdcc6be7
--- /dev/null
+++ b/lib/filters/filter_keys.yml
@@ -0,0 +1,220 @@
+## This file contains the filter configurations which we use for the following
+# 1. Conversation Filters (app/services/filter_service.rb)
+# 2. Contact Filters (app/services/filter_service.rb)
+# 3. Automation Filters  (app/services/automation_rules/conditions_filter_service.rb), (app/services/automation_rules/condition_validation_service.rb)
+
+
+# Format 
+# - Parent Key (conversation, contact, messages)
+#   - Key (attribute_name)
+#     - attribute_type: "standard" : supported ["standard", "additional_attributes (only for conversations and messages)"]
+#     - data_type: "text" :  supported ["text", "number", "labels", "date", "link"]
+#     - filter_operators: ["equal_to", "not_equal_to", "contains", "does_not_contain", "is_present", "is_not_present", "is_greater_than", "is_less_than", "days_before", "starts_with"]
+
+### ----- Conversation Filters ----- ###
+
+conversations:
+  status:
+    attribute_type: "standard"
+    data_type: "text"
+    filter_operators:
+      - "equal_to"
+      - "not_equal_to"
+  assignee_id:
+    attribute_type: "standard"
+    data_type: "text"
+    filter_operators:
+      - "equal_to"
+      - "not_equal_to"
+      - "is_present"
+      - "is_not_present"
+  inbox_id:
+    attribute_type: "standard"
+    data_type: "text"
+    filter_operators:
+      - "equal_to"
+      - "not_equal_to"
+      - "is_present"
+      - "is_not_present"
+  team_id:
+    attribute_type: "standard"
+    data_type: "number"
+    filter_operators:
+      - "equal_to"
+      - "not_equal_to"
+      - "is_present"
+      - "is_not_present"
+  display_id:
+    attribute_type: "standard"
+    data_type: "Number"
+    filter_operators:
+      - "equal_to"
+      - "not_equal_to"
+      - "contains"
+      - "does_not_contain"
+  campaign_id:
+    attribute_type: "standard"
+    data_type: "Number"
+    filter_operators:
+      - "equal_to"
+      - "not_equal_to"
+      - "is_present"
+      - "is_not_present"
+  labels:
+    attribute_type: "standard"
+    data_type: "labels"
+    filter_operators:
+      - "equal_to"
+      - "not_equal_to"
+      - "is_present"
+      - "is_not_present"
+  browser_language:
+    attribute_type: "additional_attributes"
+    data_type: "text"
+    filter_operators:
+      - "equal_to"
+      - "not_equal_to"
+  conversation_language:
+    attribute_type: "additional_attributes"
+    data_type: "text"
+    filter_operators:
+      - "equal_to"
+      - "not_equal_to"
+  country_code:
+    attribute_type: "additional_attributes"
+    data_type: "text"
+    filter_operators:
+      - "equal_to"
+      - "not_equal_to"
+  referer:
+    attribute_type: "additional_attributes"
+    data_type: "link"
+    filter_operators:
+      - "equal_to"
+      - "not_equal_to"
+      - "contains"
+      - "does_not_contain"
+  created_at:
+    attribute_type: "standard"
+    data_type: "date"
+    filter_operators:
+      - "is_greater_than"
+      - "is_less_than"
+      - "days_before"
+  last_activity_at:
+    attribute_type: "standard"
+    data_type: "date"
+    filter_operators:
+      - "is_greater_than"
+      - "is_less_than"
+      - "days_before"
+  mail_subject:
+    attribute_type: "additional_attributes"
+    data_type: "text"
+    filter_operators:
+      - "equal_to"
+      - "not_equal_to"
+      - "contains"
+      - "does_not_contain"
+
+### ----- End of Conversation Filters ----- ###
+
+
+### ----- Contact Filters ----- ###
+contacts:
+  name:
+    attribute_type: "standard"
+    data_type: "text"
+    filter_operators:
+      - "equal_to"
+      - "not_equal_to"
+      - "contains"
+      - "does_not_contain"
+  phone_number:
+    attribute_type: "standard"
+    data_type: "text"
+    filter_operators:
+      - "equal_to"
+      - "not_equal_to"
+      - "contains"
+      - "does_not_contain"
+      - "starts_with"
+  email:
+    attribute_type: "standard"
+    data_type: "text"
+    filter_operators:
+      - "equal_to"
+      - "not_equal_to"
+      - "contains"
+      - "does_not_contain"
+  identifier:
+    attribute_type: "standard"
+    data_type: "text"
+    filter_operators:
+      - "equal_to"
+      - "not_equal_to"
+  country_code:
+    attribute_type: "additional_attributes"
+    data_type: "text"
+    filter_operators:
+      - "equal_to"
+      - "not_equal_to"
+  city:
+    attribute_type: "additional_attributes"
+    data_type: "text"
+    filter_operators:
+      - "equal_to"
+      - "not_equal_to"
+      - "contains"
+      - "does_not_contain"
+  company:
+    attribute_type: "additional_attributes"
+    data_type: "text"
+    filter_operators:
+      - "equal_to"
+      - "not_equal_to"
+      - "contains"
+      - "does_not_contain"
+  labels:
+    attribute_type: "standard"
+    data_type: "labels"
+    filter_operators:
+      - "equal_to"
+      - "not_equal_to"
+      - "is_present"
+      - "is_not_present"
+  created_at:
+    attribute_type: "standard"
+    data_type: "date"
+    filter_operators:
+      - "is_greater_than"
+      - "is_less_than"
+      - "days_before"
+  last_activity_at:
+    attribute_type: "standard"
+    data_type: "date"
+    filter_operators:
+      - "is_greater_than"
+      - "is_less_than"
+      - "days_before"
+
+### ----- End of Contact Filters ----- ###
+
+### ----- Message Filters ----- ###
+messages:
+  message_type:
+    attribute_type: "standard"
+    data_type: "numeric"
+    filter_operators:
+      - "equal_to"
+      - "not_equal_to"
+  content:
+    attribute_type: "standard"
+    data_type: "text"
+    filter_operators:
+      - "equal_to"
+      - "not_equal_to"
+      - "contains"
+      - "does_not_contain"
+
+### ----- End of Message Filters ----- ###
diff --git a/spec/controllers/api/v1/accounts/contacts_controller_spec.rb b/spec/controllers/api/v1/accounts/contacts_controller_spec.rb
index d2527e6a9..37e64357f 100644
--- a/spec/controllers/api/v1/accounts/contacts_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/contacts_controller_spec.rb
@@ -338,14 +338,18 @@ RSpec.describe 'Contacts API', type: :request do
 
     context 'when it is an authenticated user' do
       let(:admin) { create(:user, account: account, role: :administrator) }
-      let!(:contact1) { create(:contact, :with_email, account: account) }
-      let!(:contact2) { create(:contact, :with_email, name: 'testcontact', account: account, email: 'test@test.com') }
+      let!(:contact1) { create(:contact, :with_email, account: account, additional_attributes: { country_code: 'US' }) }
+      let!(:contact2) do
+        create(:contact, :with_email, name: 'testcontact', account: account, email: 'test@test.com', additional_attributes: { country_code: 'US' })
+      end
 
       it 'returns all contacts when query is empty' do
         post "/api/v1/accounts/#{account.id}/contacts/filter",
-             params: {
-               payload: []
-             },
+             params: { payload: [
+               attribute_key: 'country_code',
+               filter_operator: 'equal_to',
+               values: ['US']
+             ] },
              headers: admin.create_new_auth_token,
              as: :json
 
@@ -353,6 +357,34 @@ RSpec.describe 'Contacts API', type: :request do
         expect(response.body).to include(contact2.email)
         expect(response.body).to include(contact1.email)
       end
+
+      it 'returns error the query operator is invalid' do
+        post "/api/v1/accounts/#{account.id}/contacts/filter",
+             params: { payload: [
+               attribute_key: 'country_code',
+               filter_operator: 'eq',
+               values: ['US']
+             ] },
+             headers: admin.create_new_auth_token,
+             as: :json
+
+        expect(response).to have_http_status(:unprocessable_entity)
+        expect(response.body).to include('Invalid operator. The allowed operators for country_code are [equal_to,not_equal_to]')
+      end
+
+      it 'returns error the query value is invalid' do
+        post "/api/v1/accounts/#{account.id}/contacts/filter",
+             params: { payload: [
+               attribute_key: 'country_code',
+               filter_operator: 'equal_to',
+               values: []
+             ] },
+             headers: admin.create_new_auth_token,
+             as: :json
+
+        expect(response).to have_http_status(:unprocessable_entity)
+        expect(response.body).to include('Invalid value. The values provided for country_code are invalid"')
+      end
     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 70f5b82ee..d93886fc3 100644
--- a/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
@@ -152,17 +152,56 @@ RSpec.describe 'Conversations API', type: :request do
         create(:inbox_member, user: agent, inbox: conversation.inbox)
       end
 
-      it 'returns all conversations with empty query' do
+      it 'returns all conversations matching the query' do
         post "/api/v1/accounts/#{account.id}/conversations/filter",
              headers: agent.create_new_auth_token,
-             params: { payload: [] },
+             params: {
+               payload: [{
+                 attribute_key: 'status',
+                 filter_operator: 'equal_to',
+                 values: ['open']
+               }]
+             },
              as: :json
 
         expect(response).to have_http_status(:success)
         response_data = JSON.parse(response.body, symbolize_names: true)
-
         expect(response_data.count).to eq(2)
       end
+
+      it 'returns error if the filters contain invalid attributes' do
+        post "/api/v1/accounts/#{account.id}/conversations/filter",
+             headers: agent.create_new_auth_token,
+             params: {
+               payload: [{
+                 attribute_key: 'phone_number',
+                 filter_operator: 'equal_to',
+                 values: ['open']
+               }]
+             },
+             as: :json
+
+        expect(response).to have_http_status(:unprocessable_entity)
+        response_data = JSON.parse(response.body, symbolize_names: true)
+        expect(response_data[:error]).to include('Invalid attribute key - [phone_number]')
+      end
+
+      it 'returns error if the filters contain invalid operator' do
+        post "/api/v1/accounts/#{account.id}/conversations/filter",
+             headers: agent.create_new_auth_token,
+             params: {
+               payload: [{
+                 attribute_key: 'status',
+                 filter_operator: 'eq',
+                 values: ['open']
+               }]
+             },
+             as: :json
+
+        expect(response).to have_http_status(:unprocessable_entity)
+        response_data = JSON.parse(response.body, symbolize_names: true)
+        expect(response_data[:error]).to eq('Invalid operator. The allowed operators for status are [equal_to,not_equal_to].')
+      end
     end
   end
 
diff --git a/spec/services/contacts/filter_service_spec.rb b/spec/services/contacts/filter_service_spec.rb
index 572d2b205..e8c0ff184 100644
--- a/spec/services/contacts/filter_service_spec.rb
+++ b/spec/services/contacts/filter_service_spec.rb
@@ -7,9 +7,9 @@ describe Contacts::FilterService do
   let!(:first_user) { create(:user, account: account) }
   let!(:second_user) { create(:user, account: account) }
   let!(:inbox) { create(:inbox, account: account, enable_auto_assignment: false) }
-  let(:en_contact) { create(:contact, account: account, additional_attributes: { 'browser_language': 'en' }) }
-  let(:el_contact) { create(:contact, account: account, additional_attributes: { 'browser_language': 'el' }) }
-  let(:cs_contact) { create(:contact, account: account, additional_attributes: { 'browser_language': 'cs' }) }
+  let!(:en_contact) { create(:contact, account: account, additional_attributes: { 'country_code': 'uk' }) }
+  let!(:el_contact) { create(:contact, account: account, additional_attributes: { 'country_code': 'gr' }) }
+  let!(:cs_contact) { create(:contact, account: account, additional_attributes: { 'country_code': 'cz' }) }
 
   before do
     create(:inbox_member, user: first_user, inbox: inbox)
@@ -51,9 +51,9 @@ describe Contacts::FilterService do
       let(:payload) do
         [
           {
-            attribute_key: 'browser_language',
+            attribute_key: 'country_code',
             filter_operator: 'equal_to',
-            values: ['en'],
+            values: ['uk'],
             query_operator: nil
           }.with_indifferent_access
         ]
@@ -181,9 +181,9 @@ describe Contacts::FilterService do
             query_operator: 'AND'
           }.with_indifferent_access,
           {
-            attribute_key: 'browser_language',
+            attribute_key: 'country_code',
             filter_operator: 'equal_to',
-            values: ['el'],
+            values: ['GR'],
             query_operator: 'AND'
           }.with_indifferent_access,
           {
diff --git a/spec/services/conversations/filter_service_spec.rb b/spec/services/conversations/filter_service_spec.rb
index cb2279acf..2fbaf5f61 100644
--- a/spec/services/conversations/filter_service_spec.rb
+++ b/spec/services/conversations/filter_service_spec.rb
@@ -55,7 +55,7 @@ describe Conversations::FilterService do
         [
           {
             attribute_key: 'browser_language',
-            filter_operator: 'contains',
+            filter_operator: 'equal_to',
             values: 'en',
             query_operator: 'AND',
             custom_attribute_type: ''
@@ -88,7 +88,7 @@ describe Conversations::FilterService do
       it 'filters items with contains filter_operator with values being an array' do
         params[:payload] = [{
           attribute_key: 'browser_language',
-          filter_operator: 'contains',
+          filter_operator: 'equal_to',
           values: %w[tr fr],
           query_operator: '',
           custom_attribute_type: ''
@@ -106,7 +106,7 @@ describe Conversations::FilterService do
       it 'filters items with does not contain filter operator with values being an array' do
         params[:payload] = [{
           attribute_key: 'browser_language',
-          filter_operator: 'does_not_contain',
+          filter_operator: 'not_equal_to',
           values: %w[tr en],
           query_operator: '',
           custom_attribute_type: ''
@@ -291,6 +291,11 @@ describe Conversations::FilterService do
       end
 
       it 'filter by custom_attributes and additional_attributes' do
+        conversations = user_1.conversations
+        conversations[0].update!(additional_attributes: { 'browser_language': 'en' }, custom_attributes: { conversation_type: 'silver' })
+        conversations[1].update!(additional_attributes: { 'browser_language': 'en' }, custom_attributes: { conversation_type: 'platinum' })
+        conversations[2].update!(additional_attributes: { 'browser_language': 'tr' }, custom_attributes: { conversation_type: 'platinum' })
+
         params[:payload] = [
           {
             attribute_key: 'conversation_type',
@@ -301,7 +306,7 @@ describe Conversations::FilterService do
           }.with_indifferent_access,
           {
             attribute_key: 'browser_language',
-            filter_operator: 'is_equal_to',
+            filter_operator: 'not_equal_to',
             values: 'en',
             query_operator: nil,
             custom_attribute_type: ''

From 1303469087d80706b732e8f4135c138bf7a913ac Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Wed, 20 Mar 2024 18:11:50 +0530
Subject: [PATCH 81/96] feat: Ability filter blocked contacts (#9048)

- This PR introduces the ability to filter blocked contacts from the contacts filter UI
---
 app/helpers/filter_helper.rb                  |  24 +-
 .../i18n/locale/en/contactFilters.json        |   3 +-
 .../components/ContactsAdvancedFilters.vue    |   2 +-
 .../contacts/contactFilterItems/index.js      |  12 +
 lib/filters/filter_keys.yml                   |  22 +-
 spec/services/contacts/filter_service_spec.rb | 304 ++++++++++--------
 6 files changed, 204 insertions(+), 163 deletions(-)

diff --git a/app/helpers/filter_helper.rb b/app/helpers/filter_helper.rb
index b3efc393a..bce2de5ea 100644
--- a/app/helpers/filter_helper.rb
+++ b/app/helpers/filter_helper.rb
@@ -34,7 +34,7 @@ module FilterHelper
 
     case current_filter['attribute_type']
     when 'additional_attributes'
-      handle_additional_attributes(query_hash, filter_operator_value)
+      handle_additional_attributes(query_hash, filter_operator_value, current_filter['data_type'])
     else
       handle_standard_attributes(current_filter, query_hash, current_index, filter_operator_value)
     end
@@ -45,10 +45,8 @@ module FilterHelper
     custom_attribute_query(query_hash, attribute_type, current_index)
   end
 
-  # TODO: Change the reliance on entity instead introduce datatype text_case_insensive
-  # Then we can remove the condition for Contact
-  def handle_additional_attributes(query_hash, filter_operator_value)
-    if filter_config[:entity] == 'Contact'
+  def handle_additional_attributes(query_hash, filter_operator_value, data_type)
+    if data_type == 'text_case_insensitive'
       "LOWER(#{filter_config[:table_name]}.additional_attributes ->> '#{query_hash[:attribute_key]}') " \
         "#{filter_operator_value} #{query_hash[:query_operator]}"
     else
@@ -63,6 +61,8 @@ module FilterHelper
       date_filter(current_filter, query_hash, filter_operator_value)
     when 'labels'
       tag_filter_query(query_hash, current_index)
+    when 'text_case_insensitive'
+      text_case_insensitive_filter(query_hash, filter_operator_value)
     else
       default_filter(query_hash, filter_operator_value)
     end
@@ -73,14 +73,12 @@ module FilterHelper
       "#{filter_operator_value}#{current_filter['data_type']} #{query_hash[:query_operator]}"
   end
 
-  # TODO: Change the reliance on entity instead introduce datatype text_case_insensive
-  # Then we can remove the condition for Contact
+  def text_case_insensitive_filter(query_hash, filter_operator_value)
+    "LOWER(#{filter_config[:table_name]}.#{query_hash[:attribute_key]}) " \
+      "#{filter_operator_value} #{query_hash[:query_operator]}"
+  end
+
   def default_filter(query_hash, filter_operator_value)
-    if filter_config[:entity] == 'Contact'
-      "LOWER(#{filter_config[:table_name]}.#{query_hash[:attribute_key]}) " \
-        "#{filter_operator_value} #{query_hash[:query_operator]}"
-    else
-      "#{filter_config[:table_name]}.#{query_hash[:attribute_key]} #{filter_operator_value} #{query_hash[:query_operator]}"
-    end
+    "#{filter_config[:table_name]}.#{query_hash[:attribute_key]} #{filter_operator_value} #{query_hash[:query_operator]}"
   end
 end
diff --git a/app/javascript/dashboard/i18n/locale/en/contactFilters.json b/app/javascript/dashboard/i18n/locale/en/contactFilters.json
index 09a543984..02d5dcf89 100644
--- a/app/javascript/dashboard/i18n/locale/en/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/en/contactFilters.json
@@ -44,7 +44,8 @@
       "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox",
       "CREATED_AT": "Created At",
       "LAST_ACTIVITY": "Last Activity",
-      "REFERER_LINK": "Referrer link"
+      "REFERER_LINK": "Referrer link",
+      "BLOCKED": "Blocked"
     },
     "GROUPS": {
       "STANDARD_FILTERS": "Standard Filters",
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsAdvancedFilters.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsAdvancedFilters.vue
index 41ceb25e5..6f5e92017 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsAdvancedFilters.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactsAdvancedFilters.vue
@@ -243,7 +243,7 @@ export default {
           attr.attribute_display_type === 'checkbox'
         );
       });
-      if (isCustomAttributeCheckbox) {
+      if (isCustomAttributeCheckbox || type === 'blocked') {
         return [
           {
             id: true,
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/contactFilterItems/index.js b/app/javascript/dashboard/routes/dashboard/contacts/contactFilterItems/index.js
index 2d54c37bc..59376f8ef 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/contactFilterItems/index.js
+++ b/app/javascript/dashboard/routes/dashboard/contacts/contactFilterItems/index.js
@@ -76,6 +76,14 @@ const filterTypes = [
     filterOperators: OPERATOR_TYPES_5,
     attributeModel: 'standard',
   },
+  {
+    attributeKey: 'blocked',
+    attributeI18nKey: 'BLOCKED',
+    inputType: 'search_select',
+    dataType: 'text',
+    filterOperators: OPERATOR_TYPES_1,
+    attributeModel: 'standard',
+  },
 ];
 
 export const filterAttributeGroups = [
@@ -115,6 +123,10 @@ export const filterAttributeGroups = [
         key: 'last_activity_at',
         i18nKey: 'LAST_ACTIVITY',
       },
+      {
+        key: 'blocked',
+        i18nKey: 'BLOCKED',
+      },
     ],
   },
 ];
diff --git a/lib/filters/filter_keys.yml b/lib/filters/filter_keys.yml
index afdcc6be7..598ab84d6 100644
--- a/lib/filters/filter_keys.yml
+++ b/lib/filters/filter_keys.yml
@@ -8,7 +8,7 @@
 # - Parent Key (conversation, contact, messages)
 #   - Key (attribute_name)
 #     - attribute_type: "standard" : supported ["standard", "additional_attributes (only for conversations and messages)"]
-#     - data_type: "text" :  supported ["text", "number", "labels", "date", "link"]
+#     - data_type: "text" :  supported ["text", "text_case_insensitive", "number", "boolean", "labels", "date", "link"]
 #     - filter_operators: ["equal_to", "not_equal_to", "contains", "does_not_contain", "is_present", "is_not_present", "is_greater_than", "is_less_than", "days_before", "starts_with"]
 
 ### ----- Conversation Filters ----- ###
@@ -124,7 +124,7 @@ conversations:
 contacts:
   name:
     attribute_type: "standard"
-    data_type: "text"
+    data_type: "text_case_insensitive"
     filter_operators:
       - "equal_to"
       - "not_equal_to"
@@ -132,7 +132,7 @@ contacts:
       - "does_not_contain"
   phone_number:
     attribute_type: "standard"
-    data_type: "text"
+    data_type: "text_case_insensitive"
     filter_operators:
       - "equal_to"
       - "not_equal_to"
@@ -141,7 +141,7 @@ contacts:
       - "starts_with"
   email:
     attribute_type: "standard"
-    data_type: "text"
+    data_type: "text_case_insensitive"
     filter_operators:
       - "equal_to"
       - "not_equal_to"
@@ -149,19 +149,19 @@ contacts:
       - "does_not_contain"
   identifier:
     attribute_type: "standard"
-    data_type: "text"
+    data_type: "text_case_insensitive"
     filter_operators:
       - "equal_to"
       - "not_equal_to"
   country_code:
     attribute_type: "additional_attributes"
-    data_type: "text"
+    data_type: "text_case_insensitive"
     filter_operators:
       - "equal_to"
       - "not_equal_to"
   city:
     attribute_type: "additional_attributes"
-    data_type: "text"
+    data_type: "text_case_insensitive"
     filter_operators:
       - "equal_to"
       - "not_equal_to"
@@ -169,7 +169,7 @@ contacts:
       - "does_not_contain"
   company:
     attribute_type: "additional_attributes"
-    data_type: "text"
+    data_type: "text_case_insensitive"
     filter_operators:
       - "equal_to"
       - "not_equal_to"
@@ -197,6 +197,12 @@ contacts:
       - "is_greater_than"
       - "is_less_than"
       - "days_before"
+  blocked:
+    attribute_type: "standard"
+    data_type: "boolean"
+    filter_operators:
+      - "equal_to"
+      - "not_equal_to"
 
 ### ----- End of Contact Filters ----- ###
 
diff --git a/spec/services/contacts/filter_service_spec.rb b/spec/services/contacts/filter_service_spec.rb
index e8c0ff184..a373cf81e 100644
--- a/spec/services/contacts/filter_service_spec.rb
+++ b/spec/services/contacts/filter_service_spec.rb
@@ -37,6 +37,8 @@ describe Contacts::FilterService do
   end
 
   describe '#perform' do
+    let!(:params) { { payload: [], page: 1 } }
+
     before do
       en_contact.update_labels(%w[random_label support])
       cs_contact.update_labels('support')
@@ -46,90 +48,7 @@ describe Contacts::FilterService do
       cs_contact.update!(custom_attributes: { customer_type: 'platinum', signed_in_at: '2022-01-19' })
     end
 
-    context 'with query present' do
-      let!(:params) { { payload: [], page: 1 } }
-      let(:payload) do
-        [
-          {
-            attribute_key: 'country_code',
-            filter_operator: 'equal_to',
-            values: ['uk'],
-            query_operator: nil
-          }.with_indifferent_access
-        ]
-      end
-
-      context 'with label filter' do
-        it 'returns equal_to filter results properly' do
-          params[:payload] = [
-            {
-              attribute_key: 'labels',
-              filter_operator: 'equal_to',
-              values: ['support'],
-              query_operator: nil
-            }.with_indifferent_access
-          ]
-
-          result = filter_service.new(params, first_user).perform
-          expect(result[:contacts].length).to be 2
-          expect(result[:contacts].first.label_list).to include('support')
-          expect(result[:contacts].last.label_list).to include('support')
-        end
-
-        it 'returns not_equal_to filter results properly' do
-          params[:payload] = [
-            {
-              attribute_key: 'labels',
-              filter_operator: 'not_equal_to',
-              values: ['support'],
-              query_operator: nil
-            }.with_indifferent_access
-          ]
-
-          result = filter_service.new(params, first_user).perform
-          expect(result[:contacts].length).to be 1
-          expect(result[:contacts].first.id).to eq el_contact.id
-        end
-
-        it 'returns is_present filter results properly' do
-          params[:payload] = [
-            {
-              attribute_key: 'labels',
-              filter_operator: 'is_present',
-              values: [],
-              query_operator: nil
-            }.with_indifferent_access
-          ]
-
-          result = filter_service.new(params, first_user).perform
-          expect(result[:contacts].length).to be 2
-          expect(result[:contacts].first.label_list).to include('support')
-          expect(result[:contacts].last.label_list).to include('support')
-        end
-
-        it 'returns is_not_present filter results properly' do
-          params[:payload] = [
-            {
-              attribute_key: 'labels',
-              filter_operator: 'is_not_present',
-              values: [],
-              query_operator: nil
-            }.with_indifferent_access
-          ]
-
-          result = filter_service.new(params, first_user).perform
-          expect(result[:contacts].length).to be 1
-          expect(result[:contacts].first.id).to eq el_contact.id
-        end
-      end
-
-      it 'filter contacts by additional_attributes' do
-        params[:payload] = payload
-        result = filter_service.new(params, first_user).perform
-        expect(result[:count]).to be 1
-        expect(result[:contacts].first.id).to eq(en_contact.id)
-      end
-
+    context 'with standard attributes - name' do
       it 'filter contacts by name' do
         params[:payload] = [
           {
@@ -145,7 +64,168 @@ describe Contacts::FilterService do
         expect(result[:contacts].length).to be 1
         expect(result[:contacts].first.name).to eq(en_contact.name)
       end
+    end
 
+    context 'with standard attributes - blocked' do
+      it 'filter contacts by blocked' do
+        blocked_contact = create(:contact, account: account, blocked: true)
+        params = { payload: [{ attribute_key: 'blocked', filter_operator: 'equal_to', values: ['true'],
+                               query_operator: nil }.with_indifferent_access] }
+        result = filter_service.new(params, first_user).perform
+        expect(result[:count]).to be 1
+        expect(result[:contacts].first.id).to eq(blocked_contact.id)
+      end
+
+      it 'filter contacts by not_blocked' do
+        params = { payload: [{ attribute_key: 'blocked', filter_operator: 'equal_to', values: [false],
+                               query_operator: nil }.with_indifferent_access] }
+        result = filter_service.new(params, first_user).perform
+        # existing contacts are not blocked
+        expect(result[:count]).to be 3
+      end
+    end
+
+    context 'with standard attributes - label' do
+      it 'returns equal_to filter results properly' do
+        params[:payload] = [
+          {
+            attribute_key: 'labels',
+            filter_operator: 'equal_to',
+            values: ['support'],
+            query_operator: nil
+          }.with_indifferent_access
+        ]
+
+        result = filter_service.new(params, first_user).perform
+        expect(result[:contacts].length).to be 2
+        expect(result[:contacts].first.label_list).to include('support')
+        expect(result[:contacts].last.label_list).to include('support')
+      end
+
+      it 'returns not_equal_to filter results properly' do
+        params[:payload] = [
+          {
+            attribute_key: 'labels',
+            filter_operator: 'not_equal_to',
+            values: ['support'],
+            query_operator: nil
+          }.with_indifferent_access
+        ]
+
+        result = filter_service.new(params, first_user).perform
+        expect(result[:contacts].length).to be 1
+        expect(result[:contacts].first.id).to eq el_contact.id
+      end
+
+      it 'returns is_present filter results properly' do
+        params[:payload] = [
+          {
+            attribute_key: 'labels',
+            filter_operator: 'is_present',
+            values: [],
+            query_operator: nil
+          }.with_indifferent_access
+        ]
+
+        result = filter_service.new(params, first_user).perform
+        expect(result[:contacts].length).to be 2
+        expect(result[:contacts].first.label_list).to include('support')
+        expect(result[:contacts].last.label_list).to include('support')
+      end
+
+      it 'returns is_not_present filter results properly' do
+        params[:payload] = [
+          {
+            attribute_key: 'labels',
+            filter_operator: 'is_not_present',
+            values: [],
+            query_operator: nil
+          }.with_indifferent_access
+        ]
+
+        result = filter_service.new(params, first_user).perform
+        expect(result[:contacts].length).to be 1
+        expect(result[:contacts].first.id).to eq el_contact.id
+      end
+    end
+
+    context 'with standard attributes - last_activity_at' do
+      before do
+        Time.zone = 'UTC'
+        el_contact.update(last_activity_at: (Time.zone.today - 4.days))
+        cs_contact.update(last_activity_at: (Time.zone.today - 5.days))
+        en_contact.update(last_activity_at: (Time.zone.today - 2.days))
+      end
+
+      it 'filter by last_activity_at 3_days_before and custom_attributes' do
+        params[:payload] = [
+          {
+            attribute_key: 'last_activity_at',
+            filter_operator: 'days_before',
+            values: [3],
+            query_operator: 'AND'
+          }.with_indifferent_access,
+          {
+            attribute_key: 'contact_additional_information',
+            filter_operator: 'equal_to',
+            values: ['test custom data'],
+            query_operator: nil
+          }.with_indifferent_access
+        ]
+
+        expected_count = Contact.where(
+          "last_activity_at < ? AND
+          custom_attributes->>'contact_additional_information' = ?",
+          (Time.zone.today - 3.days),
+          'test custom data'
+        ).count
+
+        result = filter_service.new(params, first_user).perform
+        expect(result[:contacts].length).to be expected_count
+        expect(result[:contacts].first.id).to eq(el_contact.id)
+      end
+
+      it 'filter by last_activity_at 2_days_before and custom_attributes' do
+        params[:payload] = [
+          {
+            attribute_key: 'last_activity_at',
+            filter_operator: 'days_before',
+            values: [2],
+            query_operator: nil
+          }.with_indifferent_access
+        ]
+
+        expected_count = Contact.where('last_activity_at < ?', (Time.zone.today - 2.days)).count
+
+        result = filter_service.new(params, first_user).perform
+        expect(result[:contacts].length).to be expected_count
+        expect(result[:contacts].pluck(:id)).to include(el_contact.id)
+        expect(result[:contacts].pluck(:id)).to include(cs_contact.id)
+        expect(result[:contacts].pluck(:id)).not_to include(en_contact.id)
+      end
+    end
+
+    context 'with additional attributes' do
+      let(:payload) do
+        [
+          {
+            attribute_key: 'country_code',
+            filter_operator: 'equal_to',
+            values: ['uk'],
+            query_operator: nil
+          }.with_indifferent_access
+        ]
+      end
+
+      it 'filter contacts by additional_attributes' do
+        params[:payload] = payload
+        result = filter_service.new(params, first_user).perform
+        expect(result[:count]).to be 1
+        expect(result[:contacts].first.id).to eq(en_contact.id)
+      end
+    end
+
+    context 'with custom attributes' do
       it 'filter by custom_attributes and labels' do
         params[:payload] = [
           {
@@ -220,62 +300,6 @@ describe Contacts::FilterService do
         expect(result[:contacts].length).to be expected_count
         expect(result[:contacts].pluck(:id)).to include(el_contact.id)
       end
-
-      context 'with x_days_before filter' do
-        before do
-          Time.zone = 'UTC'
-          el_contact.update(last_activity_at: (Time.zone.today - 4.days))
-          cs_contact.update(last_activity_at: (Time.zone.today - 5.days))
-          en_contact.update(last_activity_at: (Time.zone.today - 2.days))
-        end
-
-        it 'filter by last_activity_at 3_days_before and custom_attributes' do
-          params[:payload] = [
-            {
-              attribute_key: 'last_activity_at',
-              filter_operator: 'days_before',
-              values: [3],
-              query_operator: 'AND'
-            }.with_indifferent_access,
-            {
-              attribute_key: 'contact_additional_information',
-              filter_operator: 'equal_to',
-              values: ['test custom data'],
-              query_operator: nil
-            }.with_indifferent_access
-          ]
-
-          expected_count = Contact.where(
-            "last_activity_at < ? AND
-            custom_attributes->>'contact_additional_information' = ?",
-            (Time.zone.today - 3.days),
-            'test custom data'
-          ).count
-
-          result = filter_service.new(params, first_user).perform
-          expect(result[:contacts].length).to be expected_count
-          expect(result[:contacts].first.id).to eq(el_contact.id)
-        end
-
-        it 'filter by last_activity_at 2_days_before and custom_attributes' do
-          params[:payload] = [
-            {
-              attribute_key: 'last_activity_at',
-              filter_operator: 'days_before',
-              values: [2],
-              query_operator: nil
-            }.with_indifferent_access
-          ]
-
-          expected_count = Contact.where('last_activity_at < ?', (Time.zone.today - 2.days)).count
-
-          result = filter_service.new(params, first_user).perform
-          expect(result[:contacts].length).to be expected_count
-          expect(result[:contacts].pluck(:id)).to include(el_contact.id)
-          expect(result[:contacts].pluck(:id)).to include(cs_contact.id)
-          expect(result[:contacts].pluck(:id)).not_to include(en_contact.id)
-        end
-      end
     end
   end
 end

From 44956176a17f397dbb56655deef9b33d3b3d1f99 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Thu, 21 Mar 2024 09:34:44 +0530
Subject: [PATCH 82/96] feat: Add SLA header component (#9129)

Co-authored-by: Shivam Mishra <scm.mymail@gmail.com>
Co-authored-by: Pranav <pranav@chatwoot.com>
---
 .../dashboard/i18n/locale/en/sla.json         |  12 ++-
 .../dashboard/settings/SettingsWrapper.vue    |  21 ++++
 .../components/BaseSettingsHeader.vue         | 100 ++++++++++++++++++
 .../settings/sla/components/SLAHeader.vue     |  23 ++++
 .../shared/components/EmojiOrIcon.vue         |   1 +
 .../FluentIcon/dashboard-icons.json           |   2 +
 6 files changed, 158 insertions(+), 1 deletion(-)
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/SettingsWrapper.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/components/BaseSettingsHeader.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/sla/components/SLAHeader.vue

diff --git a/app/javascript/dashboard/i18n/locale/en/sla.json b/app/javascript/dashboard/i18n/locale/en/sla.json
index 228f87066..d2a4f1d2a 100644
--- a/app/javascript/dashboard/i18n/locale/en/sla.json
+++ b/app/javascript/dashboard/i18n/locale/en/sla.json
@@ -1,6 +1,9 @@
 {
   "SLA": {
     "HEADER": "SLA",
+    "ADD_ACTION": "Add SLA",
+    "DESCRIPTION": "Service Level Agreements (SLAs) are contracts that define clear expectations between your team and customers. They establish standards for response and resolution times, creating a framework for accountability and ensures a consistent, high-quality experience.",
+    "LEARN_MORE": "Learn more about SLA",
     "HEADER_BTN_TXT": "Add SLA",
     "LOADING": "Fetching SLAs",
     "SEARCH_404": "There are no items matching this query",
@@ -9,7 +12,14 @@
       "404": "There are no SLAs available in this account.",
       "TITLE": "Manage SLA",
       "DESC": "SLAs: Friendly promises for great service!",
-      "TABLE_HEADER": ["Name", "Description", "FRT", "NRT", "RT", "Business Hours"]
+      "TABLE_HEADER": [
+        "Name",
+        "Description",
+        "FRT",
+        "NRT",
+        "RT",
+        "Business Hours"
+      ]
     },
     "FORM": {
       "NAME": {
diff --git a/app/javascript/dashboard/routes/dashboard/settings/SettingsWrapper.vue b/app/javascript/dashboard/routes/dashboard/settings/SettingsWrapper.vue
new file mode 100644
index 000000000..293a093af
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/SettingsWrapper.vue
@@ -0,0 +1,21 @@
+<script setup>
+defineProps({
+  keepAlive: {
+    type: Boolean,
+    default: true,
+  },
+});
+</script>
+
+<template>
+  <div
+    class="flex flex-col w-full h-full px-5 pt-8 m-0 overflow-auto bg-white sm:px-16 sm:pt-16 dark:bg-slate-900"
+  >
+    <div class="flex items-start max-w-[900px] w-full">
+      <keep-alive v-if="keepAlive">
+        <router-view />
+      </keep-alive>
+      <router-view v-else />
+    </div>
+  </div>
+</template>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/components/BaseSettingsHeader.vue b/app/javascript/dashboard/routes/dashboard/settings/components/BaseSettingsHeader.vue
new file mode 100644
index 000000000..a888b5093
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/components/BaseSettingsHeader.vue
@@ -0,0 +1,100 @@
+<script setup>
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+  description: {
+    type: String,
+    required: true,
+  },
+  iconName: {
+    type: String,
+    required: true,
+  },
+  href: {
+    type: String,
+    default: '',
+  },
+  linkText: {
+    type: String,
+    default: '',
+  },
+});
+
+const openInNewTab = url => {
+  if (!url) return;
+  window.open(url, '_blank', 'noopener noreferrer');
+};
+</script>
+
+<template>
+  <div class="flex flex-col items-start w-full gap-4">
+    <!-- Header section with icon, title and action button -->
+    <div class="flex items-center justify-between w-full gap-4">
+      <!-- Icon and title container -->
+      <div class="flex items-center gap-3">
+        <div
+          class="flex items-center w-10 h-10 p-1 rounded-full bg-woot-25/60 dark:bg-woot-900/60"
+        >
+          <div
+            class="flex items-center justify-center w-full h-full rounded-full bg-woot-75/70 dark:bg-woot-800/40"
+          >
+            <fluent-icon
+              size="14"
+              :icon="iconName"
+              type="outline"
+              class="flex-shrink-0 text-woot-500 dark:text-woot-500"
+            />
+          </div>
+        </div>
+        <h1
+          class="text-2xl font-medium tracking-tight text-slate-900 dark:text-slate-25"
+        >
+          {{ title }}
+        </h1>
+      </div>
+      <!-- Slot for additional actions on larger screens -->
+      <div class="hidden gap-2 sm:flex">
+        <slot name="actions" />
+      </div>
+    </div>
+    <!-- Description and optional link -->
+    <div
+      class="flex flex-col gap-2 text-slate-600 dark:text-slate-300 max-w-[721px] w-full"
+    >
+      <p class="mb-0 text-sm font-normal">
+        <slot name="description">{{ description }}</slot>
+      </p>
+      <!-- Conditional link -->
+      <a
+        v-if="href && linkText"
+        :href="href"
+        target="_blank"
+        rel="noopener noreferrer"
+        class="sm:inline-flex hidden gap-1 w-fit items-center text-woot-500 dark:text-woot-500 text-sm font-medium tracking=[-0.6%] hover:underline"
+      >
+        {{ linkText }}
+        <fluent-icon
+          size="16"
+          icon="chevron-right"
+          type="outline"
+          class="flex-shrink-0 text-woot-500 dark:text-woot-500"
+        />
+      </a>
+    </div>
+    <!-- Mobile view for actions and link -->
+    <div class="flex items-start justify-start w-full gap-3 sm:hidden">
+      <slot name="actions" />
+      <woot-button
+        v-if="href && linkText"
+        color-scheme="secondary"
+        icon="arrow-outwards"
+        class="flex-row-reverse rounded-xl min-w-0 !bg-slate-50 !text-slate-900 dark:!text-white dark:!bg-slate-800"
+        @click="openInNewTab(href)"
+      >
+        {{ linkText }}
+      </woot-button>
+    </div>
+  </div>
+</template>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/sla/components/SLAHeader.vue b/app/javascript/dashboard/routes/dashboard/settings/sla/components/SLAHeader.vue
new file mode 100644
index 000000000..8b3236836
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/sla/components/SLAHeader.vue
@@ -0,0 +1,23 @@
+<script setup>
+import BaseSettingsHeader from '../../components/BaseSettingsHeader.vue';
+</script>
+<template>
+  <base-settings-header
+    :title="$t('SLA.HEADER')"
+    :description="$t('SLA.DESCRIPTION')"
+    :link-text="$t('SLA.LEARN_MORE')"
+    href="/"
+    icon-name="document-list-clock"
+  >
+    <template #actions>
+      <woot-button
+        color-scheme="primary"
+        icon="plus-sign"
+        class="rounded-xl"
+        @click="$emit('click')"
+      >
+        {{ $t('SLA.ADD_ACTION') }}
+      </woot-button>
+    </template>
+  </base-settings-header>
+</template>
diff --git a/app/javascript/shared/components/EmojiOrIcon.vue b/app/javascript/shared/components/EmojiOrIcon.vue
index 5cde463fe..2a93dc06f 100644
--- a/app/javascript/shared/components/EmojiOrIcon.vue
+++ b/app/javascript/shared/components/EmojiOrIcon.vue
@@ -4,6 +4,7 @@
     v-else-if="showIcon"
     :size="iconSize"
     :icon="icon"
+    class="flex-shrink-0"
     :class="className"
   />
 </template>
diff --git a/app/javascript/shared/components/FluentIcon/dashboard-icons.json b/app/javascript/shared/components/FluentIcon/dashboard-icons.json
index e1235bf51..efff6fddf 100644
--- a/app/javascript/shared/components/FluentIcon/dashboard-icons.json
+++ b/app/javascript/shared/components/FluentIcon/dashboard-icons.json
@@ -9,6 +9,7 @@
   "arrow-clockwise-outline": "M12 4.75a7.25 7.25 0 1 0 7.201 6.406c-.068-.588.358-1.156.95-1.156.515 0 .968.358 1.03.87a9.25 9.25 0 1 1-3.432-6.116V4.25a1 1 0 1 1 2.001 0v2.698l.034.052h-.034v.25a1 1 0 0 1-1 1h-3a1 1 0 1 1 0-2h.666A7.219 7.219 0 0 0 12 4.75Z",
   "arrow-download-outline": "M18.25 20.5a.75.75 0 1 1 0 1.5l-13 .004a.75.75 0 1 1 0-1.5l13-.004ZM11.648 2.012l.102-.007a.75.75 0 0 1 .743.648l.007.102-.001 13.685 3.722-3.72a.75.75 0 0 1 .976-.073l.085.073a.75.75 0 0 1 .072.976l-.073.084-4.997 4.997a.75.75 0 0 1-.976.073l-.085-.073-5.003-4.996a.75.75 0 0 1 .976-1.134l.084.072 3.719 3.714L11 2.755a.75.75 0 0 1 .648-.743l.102-.007-.102.007Z",
   "arrow-expand-outline": "M7.669 14.923a1 1 0 0 1 1.414 1.414l-2.668 2.667H8a1 1 0 0 1 .993.884l.007.116a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1v-4a1 1 0 1 1 2 0v1.587l2.669-2.668Zm8.336 6.081a1 1 0 1 1 0-2h1.583l-2.665-2.667a1 1 0 0 1-.083-1.32l.083-.094a1 1 0 0 1 1.414 0l2.668 2.67v-1.589a1 1 0 0 1 .883-.993l.117-.007a1 1 0 0 1 1 1v4a1 1 0 0 1-1 1h-4ZM8 3a1 1 0 0 1 0 2H6.417l2.665 2.668a1 1 0 0 1 .083 1.32l-.083.094a1 1 0 0 1-1.414 0L5 6.412V8a1 1 0 0 1-.883.993L4 9a1 1 0 0 1-1-1V4a1 1 0 0 1 1-1h4Zm12.005 0a1 1 0 0 1 1 1v4a1 1 0 1 1-2 0V6.412l-2.668 2.67a1 1 0 0 1-1.32.083l-.094-.083a1 1 0 0 1 0-1.414L17.589 5h-1.584a1 1 0 0 1-.993-.883L15.005 4a1 1 0 0 1 1-1h4Z",
+  "arrow-outwards-outline": "m16 8.4l-8.875 8.9q-.3.3-.713.3t-.712-.3q-.3-.3-.3-.713t.3-.712L14.6 7H7q-.425 0-.713-.288T6 6q0-.425.288-.713T7 5h10q.425 0 .713.288T18 6v10q0 .425-.288.713T17 17q-.425 0-.713-.288T16 16V8.4Z",
   "arrow-redo-outline": "M19.25 2a.75.75 0 0 0-.743.648l-.007.102v5.69l-4.574-4.56a6.41 6.41 0 0 0-8.878-.179l-.186.18a6.41 6.41 0 0 0 0 9.063l8.845 8.84a.75.75 0 0 0 1.06-1.062l-8.845-8.838a4.91 4.91 0 0 1 6.766-7.112l.178.17L17.438 9.5H11.75a.75.75 0 0 0-.743.648L11 10.25c0 .38.282.694.648.743l.102.007h7.5a.75.75 0 0 0 .743-.648L20 10.25v-7.5a.75.75 0 0 0-.75-.75Z",
   "arrow-right-import-outline": "M21.25 4.5a.75.75 0 0 1 .743.648L22 5.25v13.004a.75.75 0 0 1-1.493.102l-.007-.102V5.25a.75.75 0 0 1 .75-.75Zm-8.603 1.804l.072-.084a.75.75 0 0 1 .977-.073l.084.073l4.997 4.997a.75.75 0 0 1 .073.976l-.073.085l-4.997 5.003a.75.75 0 0 1-1.133-.976l.072-.084l3.711-3.717H2.75a.75.75 0 0 1-.743-.647L2 11.755a.75.75 0 0 1 .648-.743l.102-.007l13.693-.001l-3.724-3.724a.75.75 0 0 1-.072-.976l.072-.084l-.072.084Z",
   "arrow-reply-outline": "M9.277 16.221a.75.75 0 0 1-1.061 1.06l-4.997-5.003a.75.75 0 0 1 0-1.06L8.217 6.22a.75.75 0 0 1 1.061 1.06L5.557 11h7.842c1.595 0 2.81.242 3.889.764l.246.126a6.203 6.203 0 0 1 2.576 2.576c.61 1.14.89 2.418.89 4.135a.75.75 0 0 1-1.5 0c0-1.484-.228-2.52-.713-3.428a4.702 4.702 0 0 0-1.96-1.96c-.838-.448-1.786-.676-3.094-.709L13.4 12.5H5.562l3.715 3.721Z",
@@ -166,6 +167,7 @@
   "person-outline": "M17.754 14a2.249 2.249 0 0 1 2.25 2.249v.575c0 .894-.32 1.76-.902 2.438-1.57 1.834-3.957 2.739-7.102 2.739-3.146 0-5.532-.905-7.098-2.74a3.75 3.75 0 0 1-.898-2.435v-.577a2.249 2.249 0 0 1 2.249-2.25h11.501Zm0 1.5H6.253a.749.749 0 0 0-.75.749v.577c0 .536.192 1.054.54 1.461 1.253 1.468 3.219 2.214 5.957 2.214s4.706-.746 5.962-2.214a2.25 2.25 0 0 0 .541-1.463v-.575a.749.749 0 0 0-.749-.75ZM12 2.004a5 5 0 1 1 0 10 5 5 0 0 1 0-10Zm0 1.5a3.5 3.5 0 1 0 0 7 3.5 3.5 0 0 0 0-7Z",
   "person-filled": "M17.754 14a2.249 2.249 0 0 1 2.249 2.25v.918a2.75 2.75 0 0 1-.513 1.598c-1.545 2.164-4.07 3.235-7.49 3.235c-3.421 0-5.944-1.072-7.486-3.236a2.75 2.75 0 0 1-.51-1.596v-.92A2.249 2.249 0 0 1 6.251 14h11.502ZM12 2.005a5 5 0 1 1 0 10a5 5 0 0 1 0-10Z",
   "play-circle-outline": "M2 12C2 6.477 6.477 2 12 2s10 4.477 10 10s-4.477 10-10 10S2 17.523 2 12Zm8.856-3.845A1.25 1.25 0 0 0 9 9.248v5.504a1.25 1.25 0 0 0 1.856 1.093l5.757-3.189a.75.75 0 0 0 0-1.312l-5.757-3.189Z",
+  "plus-sign-outline": "M12 19q-.425 0-.713-.288T11 18v-5H6q-.425 0-.713-.288T5 12q0-.425.288-.713T6 11h5V6q0-.425.288-.713T12 5q.425 0 .713.288T13 6v5h5q.425 0 .713.288T19 12q0 .425-.288.713T18 13h-5v5q0 .425-.288.713T12 19Z",
   "power-outline": "M8.204 4.82a.75.75 0 0 1 .634 1.36A7.51 7.51 0 0 0 4.5 12.991c0 4.148 3.358 7.51 7.499 7.51s7.499-3.362 7.499-7.51a7.51 7.51 0 0 0-4.323-6.804.75.75 0 1 1 .637-1.358 9.01 9.01 0 0 1 5.186 8.162c0 4.976-4.029 9.01-9 9.01C7.029 22 3 17.966 3 12.99a9.01 9.01 0 0 1 5.204-8.17ZM12 2.496a.75.75 0 0 1 .743.648l.007.102v7.5a.75.75 0 0 1-1.493.102l-.007-.102v-7.5a.75.75 0 0 1 .75-.75Z",
   "quote-outline": "M7.5 6a2.5 2.5 0 0 1 2.495 2.336l.005.206c-.01 3.555-1.24 6.614-3.705 9.223a.75.75 0 1 1-1.09-1.03c1.64-1.737 2.66-3.674 3.077-5.859A2.5 2.5 0 1 1 7.5 6Zm9 0a2.5 2.5 0 0 1 2.495 2.336l.005.206c-.01 3.56-1.238 6.614-3.705 9.223a.75.75 0 1 1-1.09-1.03c1.643-1.738 2.662-3.672 3.078-5.859A2.5 2.5 0 1 1 16.5 6Zm-9 1.5a1 1 0 1 0 .993 1.117l.007-.124a1 1 0 0 0-1-.993Zm9 0a1 1 0 1 0 .993 1.117l.007-.124a1 1 0 0 0-1-.993Z",
   "repeat-outline": "m14.712 2.289l-.087-.078a1 1 0 0 0-1.327.078l-.078.087a.999.999 0 0 0 .078 1.326l1.299 1.297H8.999l-.24.004A6.997 6.997 0 0 0 2 11.993a6.94 6.94 0 0 0 1.189 3.899a.999.999 0 0 0 1.626-1.163l-.135-.218A4.997 4.997 0 0 1 9 6.998h5.595l-1.297 1.297l-.078.087a.999.999 0 0 0 1.492 1.326l3.006-3.003l.077-.087a.999.999 0 0 0-.078-1.326l-3.005-3.003Zm6.075 5.771A.999.999 0 0 0 19 8.677c0 .209.064.402.172.561a4.997 4.997 0 0 1-4.17 7.75H9.414l1.294-1.29l.083-.096a1 1 0 0 0-.006-1.23l-.077-.088l-.095-.084a1.001 1.001 0 0 0-1.232.006l-.088.078l-3.005 3.003l-.083.095a1 1 0 0 0 .006 1.231l.077.087l3.005 3.003l.095.084a1 1 0 0 0 1.397-1.41l-.077-.087l-1.304-1.303H15l.24-.003a6.997 6.997 0 0 0 5.546-10.927v.003Z",

From 762a39330a678d309fb00e32bb7088d290c3ead7 Mon Sep 17 00:00:00 2001
From: Ryan Kon <ryan@windrushlabs.com>
Date: Thu, 21 Mar 2024 06:14:04 -0700
Subject: [PATCH 83/96] fix: use safe nav when downcasing email in from_email
 (#9139)

Use safe nav when downcasing email in from_email
---
 app/models/contact.rb | 2 +-
 app/models/user.rb    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/contact.rb b/app/models/contact.rb
index a60e9f4d2..95ee69c75 100644
--- a/app/models/contact.rb
+++ b/app/models/contact.rb
@@ -169,7 +169,7 @@ class Contact < ApplicationRecord
   end
 
   def self.from_email(email)
-    find_by(email: email.downcase)
+    find_by(email: email&.downcase)
   end
 
   private
diff --git a/app/models/user.rb b/app/models/user.rb
index 3fdaf7f25..faadb3271 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -157,7 +157,7 @@ class User < ApplicationRecord
   end
 
   def self.from_email(email)
-    find_by(email: email.downcase)
+    find_by(email: email&.downcase)
   end
 
   private

From c51492c6747f06f373e59feec9d167e284c366d8 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Thu, 21 Mar 2024 19:30:11 +0530
Subject: [PATCH 84/96] feat: SLA List Item component (#9135)

- Base settings list and list item components.
- SLA list item component.

Fixes: https://linear.app/chatwoot/issue/CW-3126/create-a-sla-list-item-component-with-the-new-design


Co-authored-by: Shivam Mishra <scm.mymail@gmail.com>
Co-authored-by: Pranav <pranav@chatwoot.com>
---
 .../dashboard/assets/scss/_layout.scss        |  5 +-
 .../dashboard/i18n/locale/en/sla.json         | 14 +++-
 .../dashboard/settings/SettingsLayout.vue     |  6 ++
 .../dashboard/settings/SettingsWrapper.vue    |  2 +-
 .../components/BaseSettingsHeader.vue         |  8 ++-
 .../components/BaseSettingsListItem.vue       | 53 +++++++++++++++
 .../sla/components/SLABusinessHoursLabel.vue  | 39 +++++++++++
 .../settings/sla/components/SLAListItem.vue   | 64 +++++++++++++++++++
 .../sla/components/SLAResponseTime.vue        | 36 +++++++++++
 .../FluentIcon/dashboard-icons.json           |  3 +
 tailwind.config.js                            |  5 ++
 11 files changed, 227 insertions(+), 8 deletions(-)
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/SettingsLayout.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/components/BaseSettingsListItem.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/sla/components/SLABusinessHoursLabel.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/sla/components/SLAListItem.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/sla/components/SLAResponseTime.vue

diff --git a/app/javascript/dashboard/assets/scss/_layout.scss b/app/javascript/dashboard/assets/scss/_layout.scss
index ea40c1f3a..54a03c403 100644
--- a/app/javascript/dashboard/assets/scss/_layout.scss
+++ b/app/javascript/dashboard/assets/scss/_layout.scss
@@ -1,11 +1,10 @@
 // scss-lint:disable SpaceAfterPropertyColon
-// @import 'shared/assets/fonts/inter';
-
+@import 'shared/assets/fonts/inter';
+// Inter,
 html,
 body {
   font-family:
     'PlusJakarta',
-    Inter,
     -apple-system,
     system-ui,
     BlinkMacSystemFont,
diff --git a/app/javascript/dashboard/i18n/locale/en/sla.json b/app/javascript/dashboard/i18n/locale/en/sla.json
index d2a4f1d2a..dcf8d2dca 100644
--- a/app/javascript/dashboard/i18n/locale/en/sla.json
+++ b/app/javascript/dashboard/i18n/locale/en/sla.json
@@ -19,7 +19,19 @@
         "NRT",
         "RT",
         "Business Hours"
-      ]
+      ],
+      "BUSINESS_HOURS_ON": "Business hours on",
+      "BUSINESS_HOURS_OFF": "Business hours off",
+      "RESPONSE_TYPES": {
+        "FRT": "First response time threshold",
+        "NRT": "Next response time threshold",
+        "RT": "Resolution time threshold",
+        "SHORT_HAND": {
+          "FRT": "FRT",
+          "NRT": "NRT",
+          "RT": "RT"
+        }
+      }
     },
     "FORM": {
       "NAME": {
diff --git a/app/javascript/dashboard/routes/dashboard/settings/SettingsLayout.vue b/app/javascript/dashboard/routes/dashboard/settings/SettingsLayout.vue
new file mode 100644
index 000000000..6dd3c306b
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/SettingsLayout.vue
@@ -0,0 +1,6 @@
+<template>
+  <div class="flex flex-col w-full h-full gap-10 font-inter">
+    <slot name="header" />
+    <slot name="body" />
+  </div>
+</template>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/SettingsWrapper.vue b/app/javascript/dashboard/routes/dashboard/settings/SettingsWrapper.vue
index 293a093af..3f5bf16f9 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/SettingsWrapper.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/SettingsWrapper.vue
@@ -9,7 +9,7 @@ defineProps({
 
 <template>
   <div
-    class="flex flex-col w-full h-full px-5 pt-8 m-0 overflow-auto bg-white sm:px-16 sm:pt-16 dark:bg-slate-900"
+    class="flex flex-col w-full h-full px-5 pt-8 pb-3 m-0 overflow-auto bg-white sm:px-16 sm:pt-16 dark:bg-slate-900"
   >
     <div class="flex items-start max-w-[900px] w-full">
       <keep-alive v-if="keepAlive">
diff --git a/app/javascript/dashboard/routes/dashboard/settings/components/BaseSettingsHeader.vue b/app/javascript/dashboard/routes/dashboard/settings/components/BaseSettingsHeader.vue
index a888b5093..e70358cc9 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/components/BaseSettingsHeader.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/components/BaseSettingsHeader.vue
@@ -49,7 +49,7 @@ const openInNewTab = url => {
           </div>
         </div>
         <h1
-          class="text-2xl font-medium tracking-tight text-slate-900 dark:text-slate-25"
+          class="text-2xl font-medium tracking-[-1.5%] text-slate-900 dark:text-slate-25"
         >
           {{ title }}
         </h1>
@@ -63,7 +63,9 @@ const openInNewTab = url => {
     <div
       class="flex flex-col gap-2 text-slate-600 dark:text-slate-300 max-w-[721px] w-full"
     >
-      <p class="mb-0 text-sm font-normal">
+      <p
+        class="mb-0 text-sm font-normal tracking-[0.5%] line-clamp-5 sm:line-clamp-none"
+      >
         <slot name="description">{{ description }}</slot>
       </p>
       <!-- Conditional link -->
@@ -72,7 +74,7 @@ const openInNewTab = url => {
         :href="href"
         target="_blank"
         rel="noopener noreferrer"
-        class="sm:inline-flex hidden gap-1 w-fit items-center text-woot-500 dark:text-woot-500 text-sm font-medium tracking=[-0.6%] hover:underline"
+        class="sm:inline-flex hidden tracking-[-0.6%] gap-1 w-fit items-center text-woot-500 dark:text-woot-500 text-sm font-medium tracking=[-0.6%] hover:underline"
       >
         {{ linkText }}
         <fluent-icon
diff --git a/app/javascript/dashboard/routes/dashboard/settings/components/BaseSettingsListItem.vue b/app/javascript/dashboard/routes/dashboard/settings/components/BaseSettingsListItem.vue
new file mode 100644
index 000000000..005eece80
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/components/BaseSettingsListItem.vue
@@ -0,0 +1,53 @@
+<script setup>
+defineProps({
+  title: {
+    type: String,
+    default: '',
+  },
+  description: {
+    type: String,
+    default: '',
+  },
+});
+</script>
+<template>
+  <div
+    class="flex relative flex-col sm:flex-row p-4 gap-4 sm:p-6 justify-between shadow-sm sm:divide-x sm:divide-slate-75 sm:dark:divide-slate-700/50 group bg-white border border-solid rounded-xl dark:bg-slate-800 border-slate-75 dark:border-slate-700/50 max-w-[900px] w-full"
+  >
+    <!-- left side section -->
+    <slot name="leftSection">
+      <div class="flex flex-col min-w-0 items-start gap-3 max-w-[480px] w-full">
+        <div
+          class="flex items-center justify-between w-full gap-3 sm:justify-normal whitespace-nowrap"
+        >
+          <h3
+            class="justify-between text-sm tracking-[-0.6%] font-medium truncate w-fit sm:justify-normal text-slate-900 dark:text-slate-25"
+          >
+            <slot name="title">
+              {{ title }}
+            </slot>
+          </h3>
+          <slot name="label" />
+        </div>
+        <p
+          class="text-sm text-slate-600 tracking-[0.5%] dark:text-slate-300 max-w-[400px] w-full line-clamp-2"
+        >
+          <slot name="description">
+            {{ description }}
+          </slot>
+        </p>
+      </div>
+    </slot>
+
+    <!-- right side section -->
+    <slot name="rightSection" />
+
+    <!-- actions section -->
+    <div
+      v-if="$slots.actions"
+      class="absolute flex-col items-center hidden gap-1 border-none ltr:-right-3 rtl:-left-3 top-3 group-hover:flex"
+    >
+      <slot name="actions" />
+    </div>
+  </div>
+</template>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/sla/components/SLABusinessHoursLabel.vue b/app/javascript/dashboard/routes/dashboard/settings/sla/components/SLABusinessHoursLabel.vue
new file mode 100644
index 000000000..8790fe2a8
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/sla/components/SLABusinessHoursLabel.vue
@@ -0,0 +1,39 @@
+<script setup>
+defineProps({
+  hasBusinessHours: {
+    type: Boolean,
+    required: true,
+  },
+});
+</script>
+<template>
+  <div
+    class="inline-flex items-center min-w-0 gap-1 px-1.5 sm:px-2 py-1 border border-solid rounded-lg border-slate-75 dark:border-slate-700/50"
+  >
+    <fluent-icon
+      size="14"
+      :icon="hasBusinessHours ? 'alarm-on' : 'alarm-off'"
+      type="outline"
+      class="flex-shrink-0"
+      :class="
+        hasBusinessHours
+          ? 'text-slate-600 dark:text-slate-400'
+          : 'text-slate-300 dark:text-slate-700'
+      "
+    />
+    <span
+      class="hidden text-xs tracking-[0.2%] font-normal truncate sm:block"
+      :class="
+        hasBusinessHours
+          ? 'text-slate-600 dark:text-slate-400'
+          : 'text-slate-300 dark:text-slate-700'
+      "
+    >
+      {{
+        hasBusinessHours
+          ? $t('SLA.LIST.BUSINESS_HOURS_ON')
+          : $t('SLA.LIST.BUSINESS_HOURS_OFF')
+      }}
+    </span>
+  </div>
+</template>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/sla/components/SLAListItem.vue b/app/javascript/dashboard/routes/dashboard/settings/sla/components/SLAListItem.vue
new file mode 100644
index 000000000..9a5fd0380
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/sla/components/SLAListItem.vue
@@ -0,0 +1,64 @@
+<script setup>
+import BaseSettingsListItem from '../../components/BaseSettingsListItem.vue';
+import SLAResponseTime from './SLAResponseTime.vue';
+import SLABusinessHoursLabel from './SLABusinessHoursLabel.vue';
+
+defineProps({
+  slaName: {
+    type: String,
+    required: true,
+  },
+  description: {
+    type: String,
+    required: true,
+  },
+  firstResponse: {
+    type: String,
+    required: true,
+  },
+  nextResponse: {
+    type: String,
+    required: true,
+  },
+  resolutionTime: {
+    type: String,
+    required: true,
+  },
+  hasBusinessHours: {
+    type: Boolean,
+    required: true,
+  },
+  isLoading: {
+    type: Boolean,
+    default: false,
+  },
+});
+</script>
+<template>
+  <base-settings-list-item :title="slaName" :description="description">
+    <template #label>
+      <SLA-business-hours-label :has-business-hours="hasBusinessHours" />
+    </template>
+    <template #rightSection>
+      <div
+        class="flex items-center divide-x rtl:divide-x-reverse sm:rtl:!border-l-0 sm:rtl:!border-r sm:rtl:border-solid sm:rtl:border-slate-75 sm:rtl:dark:border-slate-700/50 gap-1.5 w-fit sm:w-full sm:gap-0 sm:justify-between divide-slate-75 dark:divide-slate-700/50"
+      >
+        <SLA-response-time response-type="FRT" :response-time="firstResponse" />
+        <SLA-response-time response-type="NRT" :response-time="nextResponse" />
+        <SLA-response-time response-type="RT" :response-time="resolutionTime" />
+      </div>
+    </template>
+    <template #actions>
+      <woot-button
+        v-tooltip.top="$t('SLA.FORM.DELETE')"
+        variant="smooth"
+        color-scheme="alert"
+        size="tiny"
+        icon="delete"
+        class-names="grey-btn"
+        :is-loading="isLoading"
+        @click="$emit('click')"
+      />
+    </template>
+  </base-settings-list-item>
+</template>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/sla/components/SLAResponseTime.vue b/app/javascript/dashboard/routes/dashboard/settings/sla/components/SLAResponseTime.vue
new file mode 100644
index 000000000..a2caaa4e5
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/sla/components/SLAResponseTime.vue
@@ -0,0 +1,36 @@
+<script setup>
+defineProps({
+  responseType: {
+    type: String,
+    default: '',
+  },
+  responseTime: {
+    type: String,
+    default: '',
+  },
+});
+</script>
+<template>
+  <div
+    class="flex flex-row items-start w-full h-full gap-1 sm:items-end sm:px-6 sm:py-2 sm:gap-2 sm:flex-col"
+  >
+    <span
+      class="inline-flex items-center gap-1 tracking-[-0.6%] text-sm ltr:pl-1.5 sm:ltr:pl-0 rtl:pr-1.5 sm:rtl:pr-0 text-slate-600 dark:text-slate-300"
+    >
+      <fluent-icon
+        v-tooltip.left="$t(`SLA.LIST.RESPONSE_TYPES.${responseType}`)"
+        size="14"
+        icon="information"
+        type="outline"
+        class="flex-shrink-0 hidden text-sm font-normal sm:flex sm:font-medium text-slate-500 dark:text-slate-500"
+      />
+      {{ $t(`SLA.LIST.RESPONSE_TYPES.SHORT_HAND.${responseType}`) }}
+      <span class="flex sm:hidden">:</span>
+    </span>
+    <span
+      class="text-sm sm:text-2xl font-medium tracking-[-1.5%] text-slate-900 dark:text-slate-25"
+    >
+      {{ responseTime }}
+    </span>
+  </div>
+</template>
diff --git a/app/javascript/shared/components/FluentIcon/dashboard-icons.json b/app/javascript/shared/components/FluentIcon/dashboard-icons.json
index efff6fddf..8c1ba6069 100644
--- a/app/javascript/shared/components/FluentIcon/dashboard-icons.json
+++ b/app/javascript/shared/components/FluentIcon/dashboard-icons.json
@@ -2,6 +2,8 @@
   "add-circle-outline": "M12 2c5.523 0 10 4.477 10 10s-4.477 10-10 10S2 17.523 2 12 6.477 2 12 2Zm0 1.5a8.5 8.5 0 1 0 0 17 8.5 8.5 0 0 0 0-17ZM12 7a.75.75 0 0 1 .75.75v3.5h3.5a.75.75 0 0 1 0 1.5h-3.5v3.5a.75.75 0 0 1-1.5 0v-3.5h-3.5a.75.75 0 0 1 0-1.5h3.5v-3.5A.75.75 0 0 1 12 7Z",
   "add-outline": "M11.75 3a.75.75 0 0 1 .743.648l.007.102.001 7.25h7.253a.75.75 0 0 1 .102 1.493l-.102.007h-7.253l.002 7.25a.75.75 0 0 1-1.493.101l-.007-.102-.002-7.249H3.752a.75.75 0 0 1-.102-1.493L3.752 11h7.25L11 3.75a.75.75 0 0 1 .75-.75Z",
   "add-solid": "M11.883 3.007 12 3a1 1 0 0 1 .993.883L13 4v7h7a1 1 0 0 1 .993.883L21 12a1 1 0 0 1-.883.993L20 13h-7v7a1 1 0 0 1-.883.993L12 21a1 1 0 0 1-.993-.883L11 20v-7H4a1 1 0 0 1-.993-.883L3 12a1 1 0 0 1 .883-.993L4 11h7V4a1 1 0 0 1 .883-.993L12 3l-.117.007Z",
+  "alarm-on-outline": "m10.95 13.7l-1.425-1.425q-.3-.3-.7-.3t-.7.3q-.3.3-.3.713t.3.712l2.125 2.15q.3.3.7.3t.7-.3l4.25-4.25q.3-.3.3-.712t-.3-.713q-.3-.3-.713-.3t-.712.3L10.95 13.7ZM12 22q-1.875 0-3.512-.713t-2.85-1.924q-1.213-1.213-1.925-2.85T3 13q0-1.875.713-3.513t1.924-2.85q1.213-1.212 2.85-1.924T12 4q1.875 0 3.513.713t2.85 1.925q1.212 1.212 1.925 2.85T21 13q0 1.875-.713 3.513t-1.924 2.85q-1.213 1.212-2.85 1.925T12 22Zm0-9ZM2.05 7.3q-.275-.275-.275-.7t.275-.7L4.9 3.05q.275-.275.7-.275t.7.275q.275.275.275.7t-.275.7L3.45 7.3q-.275.275-.7.275t-.7-.275Zm19.9 0q-.275.275-.7.275t-.7-.275L17.7 4.45q-.275-.275-.275-.7t.275-.7q.275-.275.7-.275t.7.275l2.85 2.85q.275.275.275.7t-.275.7ZM12 20q2.925 0 4.963-2.038T19 13q0-2.925-2.038-4.963T12 6Q9.075 6 7.037 8.038T5 13q0 2.925 2.038 4.963T12 20Z",
+  "alarm-off-outline": "m19.95 17.25l-1.5-1.5q.275-.675.413-1.313T19 13.1q0-2.9-2.05-5T12 6q-.7 0-1.35.113t-1.3.387L7.85 5q.95-.5 1.988-.75T12 4q1.85 0 3.488.7t2.862 1.938q1.225 1.237 1.938 2.887T21 13.1q0 1.125-.275 2.163t-.775 1.987ZM17.7 4.45q-.275-.275-.275-.7t.275-.7q.275-.275.7-.275t.7.275l2.85 2.85q.275.275.275.7t-.275.7q-.275.275-.7.275t-.7-.275L17.7 4.45ZM12 22q-1.85 0-3.488-.7T5.65 19.4q-1.225-1.2-1.938-2.825T3 13.1q0-1.55.463-2.912T4.8 7.7l-.85-.85l-.5.5q-.275.275-.7.275t-.7-.275q-.275-.275-.275-.7t.275-.7l.5-.5L1.4 4.3q-.275-.275-.275-.7t.275-.7q.275-.275.7-.275t.7.275l18.4 18.4q.275.275.275.7t-.275.7q-.275.275-.7.275t-.7-.275l-2.45-2.45q-1.125.825-2.487 1.288T12 22Zm0-1.975q1.05 0 2.05-.325t1.85-.9L6.2 9.15q-.575.875-.887 1.888T5 13.1q0 2.9 2.05 4.913T12 20.025Zm-.95-6.05Zm2.85-2.85Z",
   "alert-outline": "M12 1.996a7.49 7.49 0 0 1 7.496 7.25l.004.25v4.097l1.38 3.156a1.25 1.25 0 0 1-1.145 1.75L15 18.502a3 3 0 0 1-5.995.177L9 18.499H4.275a1.251 1.251 0 0 1-1.147-1.747L4.5 13.594V9.496c0-4.155 3.352-7.5 7.5-7.5ZM13.5 18.5l-3 .002a1.5 1.5 0 0 0 2.993.145l.006-.147ZM12 3.496c-3.32 0-6 2.674-6 6v4.41L4.656 17h14.697L18 13.907V9.509l-.004-.225A5.988 5.988 0 0 0 12 3.496Z",
   "archive-outline": "M19.25 3c.966 0 1.75.784 1.75 1.75v2c0 .698-.408 1.3-1 1.581v9.919A3.75 3.75 0 0 1 16.25 22h-8.5A3.75 3.75 0 0 1 4 18.25V8.332A1.75 1.75 0 0 1 3 6.75v-2C3 3.784 3.784 3 4.75 3h14.5Zm-.75 5.5h-13v9.75a2.25 2.25 0 0 0 2.25 2.25h8.5a2.25 2.25 0 0 0 2.25-2.25V8.5Zm-8.5 3h4a.75.75 0 0 1 .102 1.493L14 13h-4a.75.75 0 0 1-.102-1.493L10 11.5h4-4Zm9.25-7H4.75a.25.25 0 0 0-.25.25v2c0 .138.112.25.25.25h14.5a.25.25 0 0 0 .25-.25v-2a.25.25 0 0 0-.25-.25Z",
   "arrow-chevron-left-outline": "M15 17.898c0 1.074-1.265 1.648-2.073.941l-6.31-5.522a1.75 1.75 0 0 1 0-2.634l6.31-5.522c.808-.707 2.073-.133 2.073.941v11.796Z",
@@ -119,6 +121,7 @@
   "headphones-sound-wave-outline": "M3.5 12a8.5 8.5 0 0 1 17 0v2h-2.25a.75.75 0 0 0-.75.75v6.5c0 .414.336.75.75.75H19a3 3 0 0 0 3-3v-7c0-5.523-4.477-10-10-10S2 6.477 2 12v7a3 3 0 0 0 3 3h.75a.75.75 0 0 0 .75-.75v-6.5a.75.75 0 0 0-.75-.75H3.5v-2Zm17 3.5V19a1.5 1.5 0 0 1-1.5 1.5v-5h1.5ZM3.5 19v-3.5H5v5A1.5 1.5 0 0 1 3.5 19Zm9.25-7.25a.75.75 0 0 0-1.5 0v10.5a.75.75 0 0 0 1.5 0v-10.5Zm-4 2.25a.75.75 0 0 1 .75.75v4.5a.75.75 0 0 1-1.5 0v-4.5a.75.75 0 0 1 .75-.75Zm7.25.75a.75.75 0 0 0-1.5 0v4.5a.75.75 0 0 0 1.5 0v-4.5Z",
   "image-outline": "M17.75 3A3.25 3.25 0 0 1 21 6.25v11.5A3.25 3.25 0 0 1 17.75 21H6.25A3.25 3.25 0 0 1 3 17.75V6.25A3.25 3.25 0 0 1 6.25 3h11.5Zm.58 16.401-5.805-5.686a.75.75 0 0 0-.966-.071l-.084.07-5.807 5.687c.182.064.378.099.582.099h11.5c.203 0 .399-.035.58-.099l-5.805-5.686L18.33 19.4ZM17.75 4.5H6.25A1.75 1.75 0 0 0 4.5 6.25v11.5c0 .208.036.408.103.594l5.823-5.701a2.25 2.25 0 0 1 3.02-.116l.128.116 5.822 5.702c.067-.186.104-.386.104-.595V6.25a1.75 1.75 0 0 0-1.75-1.75Zm-2.498 2a2.252 2.252 0 1 1 0 4.504 2.252 2.252 0 0 1 0-4.504Zm0 1.5a.752.752 0 1 0 0 1.504.752.752 0 0 0 0-1.504Z",
   "info-outline": "M12 1.999c5.524 0 10.002 4.478 10.002 10.002 0 5.523-4.478 10.001-10.002 10.001-5.524 0-10.002-4.478-10.002-10.001C1.998 6.477 6.476 1.999 12 1.999Zm0 1.5a8.502 8.502 0 1 0 0 17.003A8.502 8.502 0 0 0 12 3.5Zm-.004 7a.75.75 0 0 1 .744.648l.007.102.003 5.502a.75.75 0 0 1-1.493.102l-.007-.101-.003-5.502a.75.75 0 0 1 .75-.75ZM12 7.003a.999.999 0 1 1 0 1.997.999.999 0 0 1 0-1.997Z",
+  "information-outline": "M12 17q.425 0 .713-.288T13 16v-4q0-.425-.288-.713T12 11q-.425 0-.713.288T11 12v4q0 .425.288.713T12 17Zm0-8q.425 0 .713-.288T13 8q0-.425-.288-.713T12 7q-.425 0-.713.288T11 8q0 .425.288.713T12 9Zm0 13q-2.075 0-3.9-.788t-3.175-2.137q-1.35-1.35-2.137-3.175T2 12q0-2.075.788-3.9t2.137-3.175q1.35-1.35 3.175-2.137T12 2q2.075 0 3.9.788t3.175 2.137q1.35 1.35 2.138 3.175T22 12q0 2.075-.788 3.9t-2.137 3.175q-1.35 1.35-3.175 2.138T12 22Zm0-2q3.35 0 5.675-2.325T20 12q0-3.35-2.325-5.675T12 4Q8.65 4 6.325 6.325T4 12q0 3.35 2.325 5.675T12 20Zm0-8Z",
   "key-outline": "M15 6a1 1 0 1 1-2 0a1 1 0 0 1 2 0Zm-2.5-4C9.424 2 7 4.424 7 7.5c0 .397.04.796.122 1.175c.058.27-.008.504-.142.638l-4.54 4.54A1.5 1.5 0 0 0 2 14.915V16.5A1.5 1.5 0 0 0 3.5 18h2A1.5 1.5 0 0 0 7 16.5V16h1a1 1 0 0 0 1-1v-1h1a1 1 0 0 0 1-1v-.18c.493.134 1.007.18 1.5.18c3.076 0 5.5-2.424 5.5-5.5S15.576 2 12.5 2ZM8 7.5C8 4.976 9.976 3 12.5 3S17 4.976 17 7.5S15.024 12 12.5 12c-.66 0-1.273-.095-1.776-.347A.5.5 0 0 0 10 12.1v.9H9a1 1 0 0 0-1 1v1H7a1 1 0 0 0-1 1v.5a.5.5 0 0 1-.5.5h-2a.5.5 0 0 1-.5-.5v-1.586a.5.5 0 0 1 .146-.353l4.541-4.541c.432-.432.522-1.044.412-1.556A4.619 4.619 0 0 1 8 7.5Z",
   "keyboard-outline": "M19.745 5a2.25 2.25 0 0 1 2.25 2.25v9.505a2.25 2.25 0 0 1-2.25 2.25H4.25A2.25 2.25 0 0 1 2 16.755V7.25A2.25 2.25 0 0 1 4.25 5h15.495Zm0 1.5H4.25a.75.75 0 0 0-.75.75v9.505c0 .414.336.75.75.75h15.495a.75.75 0 0 0 .75-.75V7.25a.75.75 0 0 0-.75-.75Zm-12.995 8h10.5a.75.75 0 0 1 .102 1.493L17.25 16H6.75a.75.75 0 0 1-.102-1.493l.102-.007h10.5-10.5ZM16.5 11a1 1 0 1 1 0 2 1 1 0 0 1 0-2Zm-5.995 0a1 1 0 1 1 0 2 1 1 0 0 1 0-2Zm-3 0a1 1 0 1 1 0 2 1 1 0 0 1 0-2Zm6 0a1 1 0 1 1 0 2 1 1 0 0 1 0-2ZM6 8a1 1 0 1 1 0 2 1 1 0 0 1 0-2Zm2.995 0a1 1 0 1 1 0 2 1 1 0 0 1 0-2Zm3 0a1 1 0 1 1 0 2 1 1 0 0 1 0-2Zm3 0a1 1 0 1 1 0 2 1 1 0 0 1 0-2Zm3 0a1 1 0 1 1 0 2 1 1 0 0 1 0-2Z",
   "library-outline": "M4 3h1c1.054 0 1.918.816 1.995 1.85L7 5v14a2.001 2.001 0 0 1-1.85 1.994L5 21H4a2.001 2.001 0 0 1-1.995-1.85L2 19V5c0-1.054.816-1.918 1.85-1.995L4 3h1-1Zm6 0h1c1.054 0 1.918.816 1.995 1.85L13 5v14a2.001 2.001 0 0 1-1.85 1.994L11 21h-1a2.001 2.001 0 0 1-1.995-1.85L8 19V5c0-1.054.816-1.918 1.85-1.995L10 3h1-1Zm6.974 2c.84 0 1.608.531 1.89 1.346l.047.157 3.015 11.745a2 2 0 0 1-1.296 2.392l-.144.043-.969.248a2.002 2.002 0 0 1-2.387-1.284l-.047-.155-3.016-11.745a2 2 0 0 1 1.298-2.392l.143-.043.968-.248c.166-.043.334-.064.498-.064ZM5 4.5H4a.501.501 0 0 0-.492.41L3.5 5v14c0 .244.177.45.41.492L4 19.5h1c.245 0 .45-.178.492-.41L5.5 19V5a.501.501 0 0 0-.41-.492L5 4.5Zm6 0h-1a.501.501 0 0 0-.492.41L9.5 5v14c0 .244.177.45.41.492l.09.008h1c.245 0 .45-.178.492-.41L11.5 19V5a.501.501 0 0 0-.41-.492L11 4.5Zm5.975 2-.063.004-.063.013-.968.247a.498.498 0 0 0-.376.51l.015.1 3.016 11.745a.5.5 0 0 0 .483.375l.063-.003.062-.012.97-.25a.5.5 0 0 0 .374-.519l-.015-.088-3.015-11.747a.501.501 0 0 0-.483-.375Z",
diff --git a/tailwind.config.js b/tailwind.config.js
index aa7a2a14a..a34650fb5 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -26,6 +26,11 @@ module.exports = {
     './app/views/**/*.html.erb',
   ],
   theme: {
+    extend: {
+      fontFamily: {
+        inter: ['Inter', ...defaultTheme.fontFamily.sans],
+      },
+    },
     fontSize: {
       ...defaultTheme.fontSize,
       xxs: '0.625rem',

From e94b276f642f511108ba9e595288657e1ab3a5df Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Thu, 21 Mar 2024 23:00:46 +0530
Subject: [PATCH 85/96] feat: Add help URLs for features in features.yml
 (#9134)

Co-authored-by: Pranav <pranav@chatwoot.com>
---
 app/helpers/application_helper.rb                |  7 +++++++
 app/javascript/dashboard/featureFlags.js         | 10 ++++++++++
 app/javascript/dashboard/helper/featureHelper.js |  4 ++++
 app/views/layouts/vueapp.html.erb                |  1 +
 config/features.yml                              | 13 ++++++++++++-
 5 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 app/javascript/dashboard/helper/featureHelper.js

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index b52b2300e..76d0bacc8 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -2,4 +2,11 @@ module ApplicationHelper
   def available_locales_with_name
     LANGUAGES_CONFIG.map { |_key, val| val.slice(:name, :iso_639_1_code) }
   end
+
+  def feature_help_urls
+    features = YAML.safe_load(Rails.root.join('config/features.yml').read).freeze
+    features.each_with_object({}) do |feature, hash|
+      hash[feature['name']] = feature['help_url'] if feature['help_url']
+    end
+  end
 end
diff --git a/app/javascript/dashboard/featureFlags.js b/app/javascript/dashboard/featureFlags.js
index f2fd3e757..a0453b7d3 100644
--- a/app/javascript/dashboard/featureFlags.js
+++ b/app/javascript/dashboard/featureFlags.js
@@ -20,4 +20,14 @@ export const FEATURE_FLAGS = {
   INBOX_VIEW: 'inbox_view',
   SLA: 'sla',
   RESPONSE_BOT: 'response_bot',
+  CHANNEL_EMAIL: 'channel_email',
+  CHANNEL_FACEBOOK: 'channel_facebook',
+  CHANNEL_TWITTER: 'channel_twitter',
+  CHANNEL_WEBSITE: 'channel_website',
+  CUSTOM_REPLY_DOMAIN: 'custom_reply_domain',
+  CUSTOM_REPLY_EMAIL: 'custom_reply_email',
+  DISABLE_BRANDING: 'disable_branding',
+  EMAIL_CONTINUITY_ON_API_CHANNEL: 'email_continuity_on_api_channel',
+  INBOUND_EMAILS: 'inbound_emails',
+  IP_LOOKUP: 'ip_lookup',
 };
diff --git a/app/javascript/dashboard/helper/featureHelper.js b/app/javascript/dashboard/helper/featureHelper.js
new file mode 100644
index 000000000..edbbf4472
--- /dev/null
+++ b/app/javascript/dashboard/helper/featureHelper.js
@@ -0,0 +1,4 @@
+export function getHelpUrlForFeature(featureName) {
+  const { helpUrls } = window.chatwootConfig;
+  return helpUrls[featureName];
+}
diff --git a/app/views/layouts/vueapp.html.erb b/app/views/layouts/vueapp.html.erb
index 2e49a7b96..a80f23cce 100644
--- a/app/views/layouts/vueapp.html.erb
+++ b/app/views/layouts/vueapp.html.erb
@@ -44,6 +44,7 @@
         vapidPublicKey: new Uint8Array(<%= Base64.urlsafe_decode64(@global_config['VAPID_PUBLIC_KEY']).bytes %>),
         <% end %>
         enabledLanguages: <%= available_locales_with_name.to_json.html_safe %>,
+        helpUrls: <%= feature_help_urls.to_json.html_safe %>,
         selectedLocale: '<%= I18n.locale %>'
       }
       window.globalConfig = <%= raw @global_config.to_json %>
diff --git a/config/features.yml b/config/features.yml
index f0477c297..37439c31f 100644
--- a/config/features.yml
+++ b/config/features.yml
@@ -3,37 +3,45 @@
   enabled: true
 - name: channel_email
   enabled: true
+  help_url: https://chwt.app/hc/email
 - name: channel_facebook
   enabled: true
+  help_url: https://chwt.app/hc/fb
 - name: channel_twitter
   enabled: true
 - name: ip_lookup
   enabled: false
 - name: disable_branding
   enabled: false
-  premium:  true
+  premium: true
 - name: email_continuity_on_api_channel
   enabled: false
 - name: help_center
   enabled: true
+  help_url: https://chwt.app/hc/help-center
 - name: agent_bots
   enabled: false
+  help_url: https://chwt.app/hc/agent-bots
 - name: macros
   enabled: true
 - name: agent_management
   enabled: true
 - name: team_management
   enabled: true
+  help_url: https://chwt.app/hc/teams
 - name: inbox_management
   enabled: true
 - name: labels
   enabled: true
+  help_url: https://chwt.app/hc/labels
 - name: custom_attributes
   enabled: true
+  help_url: https://chwt.app/hc/custom-attributes
 - name: automations
   enabled: true
 - name: canned_responses
   enabled: true
+  help_url: https://chwt.app/hc/canned
 - name: integrations
   enabled: true
 - name: voice_recorder
@@ -44,8 +52,10 @@
   enabled: true
 - name: campaigns
   enabled: true
+  help_url: https://chwt.app/hc/campaigns
 - name: reports
   enabled: true
+  help_url: https://chwt.app/hc/reports
 - name: crm
   enabled: true
 - name: auto_resolve_conversations
@@ -62,6 +72,7 @@
   premium: true
 - name: message_reply_to
   enabled: false
+  help_url: https://chwt.app/hc/reply-to
 - name: insert_article_in_reply
   enabled: false
 - name: inbox_view

From 6d4551bca228f7f3247fffcab0ecd559fae1b338 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Sat, 23 Mar 2024 03:09:09 +0530
Subject: [PATCH 86/96] feat: Update the design for SLA policy management pages
 (#9136)

Co-authored-by: Shivam Mishra <scm.mymail@gmail.com>
Co-authored-by: Pranav <pranav@chatwoot.com>
---
 .../dashboard/i18n/locale/en/sla.json         |  13 --
 .../dashboard/settings/SettingsLayout.vue     |  19 ++-
 .../components/BaseSettingsListItem.vue       |   2 +-
 .../routes/dashboard/settings/sla/Index.vue   | 141 +++++++-----------
 .../settings/sla/components/SLAListItem.vue   |   6 +-
 .../sla/components/SLAListItemLoading.vue     |  30 ++++
 .../dashboard/settings/sla/sla.routes.js      |  10 +-
 7 files changed, 109 insertions(+), 112 deletions(-)
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/sla/components/SLAListItemLoading.vue

diff --git a/app/javascript/dashboard/i18n/locale/en/sla.json b/app/javascript/dashboard/i18n/locale/en/sla.json
index dcf8d2dca..d9670eb06 100644
--- a/app/javascript/dashboard/i18n/locale/en/sla.json
+++ b/app/javascript/dashboard/i18n/locale/en/sla.json
@@ -4,22 +4,9 @@
     "ADD_ACTION": "Add SLA",
     "DESCRIPTION": "Service Level Agreements (SLAs) are contracts that define clear expectations between your team and customers. They establish standards for response and resolution times, creating a framework for accountability and ensures a consistent, high-quality experience.",
     "LEARN_MORE": "Learn more about SLA",
-    "HEADER_BTN_TXT": "Add SLA",
     "LOADING": "Fetching SLAs",
-    "SEARCH_404": "There are no items matching this query",
-    "SIDEBAR_TXT": "<p><b>SLA</b> <p>Think of Service Level Agreements (SLAs) like friendly promises between a service provider and a customer.</p> <p> These promises set clear expectations for things like how quickly the team will respond to issues, making sure you always get a reliable and top-notch experience!</p>",
     "LIST": {
       "404": "There are no SLAs available in this account.",
-      "TITLE": "Manage SLA",
-      "DESC": "SLAs: Friendly promises for great service!",
-      "TABLE_HEADER": [
-        "Name",
-        "Description",
-        "FRT",
-        "NRT",
-        "RT",
-        "Business Hours"
-      ],
       "BUSINESS_HOURS_ON": "Business hours on",
       "BUSINESS_HOURS_OFF": "Business hours off",
       "RESPONSE_TYPES": {
diff --git a/app/javascript/dashboard/routes/dashboard/settings/SettingsLayout.vue b/app/javascript/dashboard/routes/dashboard/settings/SettingsLayout.vue
index 6dd3c306b..618805309 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/SettingsLayout.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/SettingsLayout.vue
@@ -1,6 +1,23 @@
+<script setup>
+defineProps({
+  isLoading: {
+    type: Boolean,
+    default: false,
+  },
+  loadingMessage: {
+    type: String,
+    default: '',
+  },
+});
+</script>
 <template>
   <div class="flex flex-col w-full h-full gap-10 font-inter">
     <slot name="header" />
-    <slot name="body" />
+    <div>
+      <slot v-if="isLoading" name="loading">
+        <woot-loading-state :message="loadingMessage" />
+      </slot>
+      <slot v-else name="body" />
+    </div>
   </div>
 </template>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/components/BaseSettingsListItem.vue b/app/javascript/dashboard/routes/dashboard/settings/components/BaseSettingsListItem.vue
index 005eece80..337c370cd 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/components/BaseSettingsListItem.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/components/BaseSettingsListItem.vue
@@ -12,7 +12,7 @@ defineProps({
 </script>
 <template>
   <div
-    class="flex relative flex-col sm:flex-row p-4 gap-4 sm:p-6 justify-between shadow-sm sm:divide-x sm:divide-slate-75 sm:dark:divide-slate-700/50 group bg-white border border-solid rounded-xl dark:bg-slate-800 border-slate-75 dark:border-slate-700/50 max-w-[900px] w-full"
+    class="flex relative flex-col sm:flex-row p-4 gap-4 sm:p-6 justify-between shadow-sm group bg-white border border-solid rounded-xl dark:bg-slate-800 border-slate-75 dark:border-slate-700/50 max-w-[900px] w-full"
   >
     <!-- left side section -->
     <slot name="leftSection">
diff --git a/app/javascript/dashboard/routes/dashboard/settings/sla/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/sla/Index.vue
index 8728a236c..278927d33 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/sla/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/sla/Index.vue
@@ -1,99 +1,58 @@
 <template>
-  <div class="flex-1 overflow-auto p-4">
-    <woot-button
-      color-scheme="success"
-      class-names="button--fixed-top"
-      icon="add-circle"
-      @click="openAddPopup"
-    >
-      {{ $t('SLA.HEADER_BTN_TXT') }}
-    </woot-button>
-    <div class="flex flex-row gap-4">
-      <div class="w-full xl:w-3/5">
-        <p
-          v-if="!uiFlags.isFetching && !records.length"
-          class="flex h-full items-center flex-col justify-center"
-        >
-          {{ $t('SLA.LIST.404') }}
-        </p>
-        <woot-loading-state
-          v-if="uiFlags.isFetching"
-          :message="$t('SLA.LOADING')"
+  <settings-layout
+    :is-loading="uiFlags.isFetching"
+    :loading-message="$t('SLA.LOADING')"
+  >
+    <template #header>
+      <SLA-header @click="openAddPopup" />
+    </template>
+    <template #loading>
+      <SLAListItemLoading v-for="ii in 2" :key="ii" class="mb-3" />
+    </template>
+    <template #body>
+      <p
+        v-if="!records.length"
+        class="flex flex-col items-center justify-center h-full"
+      >
+        {{ $t('SLA.LIST.404') }}
+      </p>
+      <div v-if="records.length" class="flex flex-col w-full h-full gap-3">
+        <SLA-list-item
+          v-for="sla in records"
+          :key="sla.title"
+          :sla-name="sla.name"
+          :description="sla.description"
+          :first-response="displayTime(sla.first_response_time_threshold)"
+          :next-response="displayTime(sla.next_response_time_threshold)"
+          :resolution-time="displayTime(sla.resolution_time_threshold)"
+          :has-business-hours="sla.only_during_business_hours"
+          :is-loading="loading[sla.id]"
+          @click="openDeletePopup(sla)"
         />
-        <table v-if="!uiFlags.isFetching && records.length" class="woot-table">
-          <thead>
-            <th v-for="thHeader in $t('SLA.LIST.TABLE_HEADER')" :key="thHeader">
-              {{ thHeader }}
-            </th>
-          </thead>
-          <tbody>
-            <tr v-for="sla in records" :key="sla.title">
-              <td>
-                <span
-                  class="inline-block overflow-hidden whitespace-nowrap text-ellipsis"
-                >
-                  {{ sla.name }}
-                </span>
-              </td>
-              <td>{{ sla.description }}</td>
-              <td>
-                <span class="flex items-center">
-                  {{ displayTime(sla.first_response_time_threshold) }}
-                </span>
-              </td>
-              <td>
-                <span class="flex items-center">
-                  {{ displayTime(sla.next_response_time_threshold) }}
-                </span>
-              </td>
-              <td>
-                <span class="flex items-center">
-                  {{ displayTime(sla.resolution_time_threshold) }}
-                </span>
-              </td>
-              <td>
-                <span class="flex items-center">
-                  {{ sla.only_during_business_hours }}
-                </span>
-              </td>
-              <td class="button-wrapper">
-                <woot-button
-                  v-tooltip.top="$t('SLA.FORM.DELETE')"
-                  variant="smooth"
-                  color-scheme="alert"
-                  size="tiny"
-                  icon="dismiss-circle"
-                  class-names="grey-btn"
-                  :is-loading="loading[sla.id]"
-                  @click="openDeletePopup(sla)"
-                />
-              </td>
-            </tr>
-          </tbody>
-        </table>
       </div>
 
-      <div class="w-1/3 hidden xl:block">
-        <span v-dompurify-html="$t('SLA.SIDEBAR_TXT')" />
-      </div>
-    </div>
-    <woot-modal :show.sync="showAddPopup" :on-close="hideAddPopup">
-      <add-SLA @close="hideAddPopup" />
-    </woot-modal>
+      <woot-modal :show.sync="showAddPopup" :on-close="hideAddPopup">
+        <add-SLA @close="hideAddPopup" />
+      </woot-modal>
 
-    <woot-delete-modal
-      :show.sync="showDeleteConfirmationPopup"
-      :on-close="closeDeletePopup"
-      :on-confirm="confirmDeletion"
-      :title="$t('SLA.DELETE.CONFIRM.TITLE')"
-      :message="$t('SLA.DELETE.CONFIRM.MESSAGE')"
-      :message-value="deleteMessage"
-      :confirm-text="deleteConfirmText"
-      :reject-text="deleteRejectText"
-    />
-  </div>
+      <woot-delete-modal
+        :show.sync="showDeleteConfirmationPopup"
+        :on-close="closeDeletePopup"
+        :on-confirm="confirmDeletion"
+        :title="$t('SLA.DELETE.CONFIRM.TITLE')"
+        :message="$t('SLA.DELETE.CONFIRM.MESSAGE')"
+        :message-value="deleteMessage"
+        :confirm-text="deleteConfirmText"
+        :reject-text="deleteRejectText"
+      />
+    </template>
+  </settings-layout>
 </template>
 <script>
+import SettingsLayout from '../SettingsLayout.vue';
+import SLAHeader from './components/SLAHeader.vue';
+import SLAListItem from './components/SLAListItem.vue';
+import SLAListItemLoading from './components/SLAListItemLoading.vue';
 import { mapGetters } from 'vuex';
 import { convertSecondsToTimeUnit } from '@chatwoot/utils';
 
@@ -103,6 +62,10 @@ import alertMixin from 'shared/mixins/alertMixin';
 export default {
   components: {
     AddSLA,
+    SLAHeader,
+    SLAListItem,
+    SLAListItemLoading,
+    SettingsLayout,
   },
   mixins: [alertMixin],
   data() {
diff --git a/app/javascript/dashboard/routes/dashboard/settings/sla/components/SLAListItem.vue b/app/javascript/dashboard/routes/dashboard/settings/sla/components/SLAListItem.vue
index 9a5fd0380..08e66dbfe 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/sla/components/SLAListItem.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/sla/components/SLAListItem.vue
@@ -35,7 +35,11 @@ defineProps({
 });
 </script>
 <template>
-  <base-settings-list-item :title="slaName" :description="description">
+  <base-settings-list-item
+    class="sm:divide-x sm:divide-slate-75 sm:dark:divide-slate-700/50"
+    :title="slaName"
+    :description="description"
+  >
     <template #label>
       <SLA-business-hours-label :has-business-hours="hasBusinessHours" />
     </template>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/sla/components/SLAListItemLoading.vue b/app/javascript/dashboard/routes/dashboard/settings/sla/components/SLAListItemLoading.vue
new file mode 100644
index 000000000..7521ef9f5
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/sla/components/SLAListItemLoading.vue
@@ -0,0 +1,30 @@
+<script setup>
+import BaseSettingsListItem from '../../components/BaseSettingsListItem.vue';
+</script>
+<template>
+  <base-settings-list-item class="opacity-50">
+    <template #title>
+      <div class="w-24 h-[26px] rounded-md bg-slate-50 animate-pulse" />
+    </template>
+    <template #description>
+      <div class="w-64 h-4 mb-0.5 rounded-md bg-slate-50 animate-pulse" />
+      <div class="w-48 h-4 rounded-md bg-slate-50 animate-pulse" />
+    </template>
+    <template #label>
+      <div class="w-32 h-[26px] bg-slate-50 animate-pulse rounded-md" />
+    </template>
+    <template #rightSection>
+      <div
+        class="flex items-center sm:rtl:!border-l-0 sm:rtl:!border-r sm:rtl:border-solid sm:rtl:border-slate-75 sm:rtl:dark:border-slate-700/50 gap-1.5 w-fit sm:w-full sm:gap-0 sm:justify-between"
+      >
+        <div
+          v-for="ii in 3"
+          :key="ii"
+          class="flex justify-end w-1/3 h-full px-4"
+        >
+          <div class="w-32 h-full rounded-md bg-slate-50 animate-pulse" />
+        </div>
+      </div>
+    </template>
+  </base-settings-list-item>
+</template>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/sla/sla.routes.js b/app/javascript/dashboard/routes/dashboard/settings/sla/sla.routes.js
index 473cb03cb..a9c68470a 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/sla/sla.routes.js
+++ b/app/javascript/dashboard/routes/dashboard/settings/sla/sla.routes.js
@@ -1,18 +1,14 @@
 import { frontendURL } from '../../../../helper/URLHelper';
 
-const SettingsContent = () => import('../Wrapper.vue');
+const SettingsWrapper = () => import('../SettingsWrapper.vue');
 const Index = () => import('./Index.vue');
 
 export default {
   routes: [
     {
       path: frontendURL('accounts/:accountId/settings/sla'),
-      component: SettingsContent,
-      props: {
-        headerTitle: 'SLA.HEADER',
-        icon: 'document-list-clock',
-        showNewButton: true,
-      },
+      component: SettingsWrapper,
+      props: {},
       children: [
         {
           path: '',

From 48452a42f4ee37ec56735b578d6416dd54155f18 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Mon, 25 Mar 2024 12:24:43 +0530
Subject: [PATCH 87/96] feat: Add SLA metrics API (#9132)

---
 config/routes.rb                              |   5 +
 .../v1/accounts/applied_slas_controller.rb    |  58 ++++++
 enterprise/app/models/applied_sla.rb          |  11 +
 .../accounts/applied_slas/index.json.jbuilder |  14 ++
 .../applied_slas/metrics.json.jbuilder        |   3 +
 .../api/v1/models/_sla_event.json.jbuilder    |   5 +
 .../accounts/applied_slas_controller_spec.rb  | 188 ++++++++++++++++++
 7 files changed, 284 insertions(+)
 create mode 100644 enterprise/app/controllers/api/v1/accounts/applied_slas_controller.rb
 create mode 100644 enterprise/app/views/api/v1/accounts/applied_slas/index.json.jbuilder
 create mode 100644 enterprise/app/views/api/v1/accounts/applied_slas/metrics.json.jbuilder
 create mode 100644 enterprise/app/views/api/v1/models/_sla_event.json.jbuilder
 create mode 100644 spec/enterprise/controllers/api/v1/accounts/applied_slas_controller_spec.rb

diff --git a/config/routes.rb b/config/routes.rb
index cfa14c854..6be458e07 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -144,6 +144,11 @@ Rails.application.routes.draw do
               get :download
             end
           end
+          resources :applied_slas, only: [:index] do
+            collection do
+              get :metrics
+            end
+          end
           resources :custom_attribute_definitions, only: [:index, :show, :create, :update, :destroy]
           resources :custom_filters, only: [:index, :show, :create, :update, :destroy]
           resources :inboxes, only: [:index, :show, :create, :update, :destroy] do
diff --git a/enterprise/app/controllers/api/v1/accounts/applied_slas_controller.rb b/enterprise/app/controllers/api/v1/accounts/applied_slas_controller.rb
new file mode 100644
index 000000000..5eaaf2d68
--- /dev/null
+++ b/enterprise/app/controllers/api/v1/accounts/applied_slas_controller.rb
@@ -0,0 +1,58 @@
+class Api::V1::Accounts::AppliedSlasController < Api::V1::Accounts::EnterpriseAccountsController
+  include Sift
+  include DateRangeHelper
+
+  RESULTS_PER_PAGE = 25
+
+  before_action :set_applied_slas, only: [:index, :metrics]
+  before_action :set_current_page, only: [:index]
+  before_action :paginate_slas, only: [:index]
+  before_action :check_admin_authorization?
+
+  sort_on :created_at, type: :datetime
+
+  def index; end
+
+  def metrics
+    @total_applied_slas = total_applied_slas
+    @number_of_sla_breaches = number_of_sla_breaches
+    @hit_rate = hit_rate
+  end
+
+  private
+
+  def total_applied_slas
+    @total_applied_slas ||= @applied_slas.count
+  end
+
+  def number_of_sla_breaches
+    @number_of_sla_breaches ||= @applied_slas.missed.count
+  end
+
+  def hit_rate
+    number_of_sla_breaches.zero? ? '100%' : "#{hit_rate_percentage}%"
+  end
+
+  def hit_rate_percentage
+    ((total_applied_slas - number_of_sla_breaches) / total_applied_slas.to_f * 100).round(2)
+  end
+
+  def set_applied_slas
+    initial_query = Current.account.applied_slas.includes(:conversation)
+    @applied_slas = initial_query
+                    .filter_by_date_range(range)
+                    .filter_by_inbox_id(params[:inbox_id])
+                    .filter_by_team_id(params[:team_id])
+                    .filter_by_sla_policy_id(params[:sla_policy_id])
+                    .filter_by_label_list(params[:label_list])
+                    .filter_by_assigned_agent_id(params[:assigned_agent_id])
+  end
+
+  def paginate_slas
+    @applied_slas = @applied_slas.page(@current_page).per(RESULTS_PER_PAGE)
+  end
+
+  def set_current_page
+    @current_page = params[:page] || 1
+  end
+end
diff --git a/enterprise/app/models/applied_sla.rb b/enterprise/app/models/applied_sla.rb
index c2dde8377..4558d5d23 100644
--- a/enterprise/app/models/applied_sla.rb
+++ b/enterprise/app/models/applied_sla.rb
@@ -29,6 +29,17 @@ class AppliedSla < ApplicationRecord
 
   enum sla_status: { active: 0, hit: 1, missed: 2 }
 
+  scope :filter_by_date_range, ->(range) { where(created_at: range) if range.present? }
+  scope :filter_by_inbox_id, ->(inbox_id) { where(inbox_id: inbox_id) if inbox_id.present? }
+  scope :filter_by_team_id, ->(team_id) { where(team_id: team_id) if team_id.present? }
+  scope :filter_by_sla_policy_id, ->(sla_policy_id) { where(sla_policy_id: sla_policy_id) if sla_policy_id.present? }
+  scope :filter_by_label_list, ->(label_list) { joins(:conversation).where(conversations: { cached_label_list: label_list }) if label_list.present? }
+  scope :filter_by_assigned_agent_id, lambda { |assigned_agent_id|
+                                        if assigned_agent_id.present?
+                                          joins(:conversation).where(conversations: { assigned_agent_id: assigned_agent_id })
+                                        end
+                                      }
+  scope :missed, -> { where(sla_status: :missed) }
   private
 
   def ensure_account_id
diff --git a/enterprise/app/views/api/v1/accounts/applied_slas/index.json.jbuilder b/enterprise/app/views/api/v1/accounts/applied_slas/index.json.jbuilder
new file mode 100644
index 000000000..e9a905d56
--- /dev/null
+++ b/enterprise/app/views/api/v1/accounts/applied_slas/index.json.jbuilder
@@ -0,0 +1,14 @@
+json.array! @applied_slas do |applied_sla|
+  json.id applied_sla.id
+  json.sla_policy_id applied_sla.sla_policy_id
+  json.conversation_id applied_sla.conversation_id
+  json.sla_status applied_sla.sla_status
+  json.created_at applied_sla.created_at
+  json.updated_at applied_sla.updated_at
+  json.conversation do
+    json.partial! 'api/v1/models/conversation', conversation: applied_sla.conversation
+  end
+  json.sla_events applied_sla.sla_events do |sla_event|
+    json.partial! 'api/v1/models/sla_event', formats: [:json], sla_event: sla_event
+  end
+end
diff --git a/enterprise/app/views/api/v1/accounts/applied_slas/metrics.json.jbuilder b/enterprise/app/views/api/v1/accounts/applied_slas/metrics.json.jbuilder
new file mode 100644
index 000000000..13f184845
--- /dev/null
+++ b/enterprise/app/views/api/v1/accounts/applied_slas/metrics.json.jbuilder
@@ -0,0 +1,3 @@
+json.total_applied_slas @total_applied_slas
+json.number_of_sla_breaches @number_of_sla_breaches
+json.hit_rate @hit_rate
diff --git a/enterprise/app/views/api/v1/models/_sla_event.json.jbuilder b/enterprise/app/views/api/v1/models/_sla_event.json.jbuilder
new file mode 100644
index 000000000..e51defc0a
--- /dev/null
+++ b/enterprise/app/views/api/v1/models/_sla_event.json.jbuilder
@@ -0,0 +1,5 @@
+json.id sla_event.id
+json.event_type sla_event.event_type
+json.meta sla_event.meta
+json.updated_at sla_event.updated_at.to_i
+json.created_at sla_event.created_at.to_i
diff --git a/spec/enterprise/controllers/api/v1/accounts/applied_slas_controller_spec.rb b/spec/enterprise/controllers/api/v1/accounts/applied_slas_controller_spec.rb
new file mode 100644
index 000000000..e10d08f85
--- /dev/null
+++ b/spec/enterprise/controllers/api/v1/accounts/applied_slas_controller_spec.rb
@@ -0,0 +1,188 @@
+require 'rails_helper'
+
+RSpec.describe 'Applied SLAs API', type: :request do
+  let(:account) { create(:account) }
+  let(:administrator) { create(:user, account: account, role: :administrator) }
+  let(:agent1) { create(:user, account: account, role: :agent) }
+  let(:agent2) { create(:user, account: account, role: :agent) }
+  let(:conversation1) { create(:conversation, account: account, assignee: agent1) }
+  let(:conversation2) { create(:conversation, account: account, assignee: agent2) }
+  let(:conversation3) { create(:conversation, account: account, assignee: agent2) }
+  let(:sla_policy1) { create(:sla_policy, account: account) }
+  let(:sla_policy2) { create(:sla_policy, account: account) }
+
+  before do
+    AppliedSla.destroy_all
+  end
+
+  describe 'GET /api/v1/accounts/{account.id}/applied_slas/metrics' do
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        get "/api/v1/accounts/#{account.id}/applied_slas/metrics"
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated user' do
+      it 'returns the sla metrics' do
+        create(:applied_sla, sla_policy: sla_policy1, conversation: conversation1, sla_status: 'missed')
+
+        get "/api/v1/accounts/#{account.id}/applied_slas/metrics",
+            headers: administrator.create_new_auth_token
+        expect(response).to have_http_status(:success)
+        body = JSON.parse(response.body)
+
+        expect(body).to include('total_applied_slas' => 1)
+        expect(body).to include('number_of_sla_breaches' => 1)
+        expect(body).to include('hit_rate' => '0.0%')
+      end
+
+      it 'filters sla metrics based on a date range' do
+        create(:applied_sla, sla_policy: sla_policy1, conversation: conversation1, created_at: 10.days.ago)
+        create(:applied_sla, sla_policy: sla_policy1, conversation: conversation2, created_at: 3.days.ago)
+
+        get "/api/v1/accounts/#{account.id}/applied_slas/metrics",
+            params: { since: 5.days.ago.to_time.to_i.to_s, until: Time.zone.today.to_time.to_i.to_s },
+            headers: administrator.create_new_auth_token
+        expect(response).to have_http_status(:success)
+        body = JSON.parse(response.body)
+
+        expect(body).to include('total_applied_slas' => 1)
+        expect(body).to include('number_of_sla_breaches' => 0)
+        expect(body).to include('hit_rate' => '100%')
+      end
+
+      it 'filters sla metrics based on a date range and agent ids' do
+        create(:applied_sla, sla_policy: sla_policy1, conversation: conversation1, created_at: 10.days.ago)
+        create(:applied_sla, sla_policy: sla_policy1, conversation: conversation3, created_at: 3.days.ago)
+        create(:applied_sla, sla_policy: sla_policy1, conversation: conversation2, created_at: 3.days.ago, sla_status: 'missed')
+
+        get "/api/v1/accounts/#{account.id}/applied_slas/metrics",
+            params: { agent_ids: [agent2.id] },
+            headers: administrator.create_new_auth_token
+        expect(response).to have_http_status(:success)
+        body = JSON.parse(response.body)
+
+        expect(body).to include('total_applied_slas' => 3)
+        expect(body).to include('number_of_sla_breaches' => 1)
+        expect(body).to include('hit_rate' => '66.67%')
+      end
+
+      it 'filters sla metrics based on sla policy ids' do
+        create(:applied_sla, sla_policy: sla_policy1, conversation: conversation1)
+        create(:applied_sla, sla_policy: sla_policy1, conversation: conversation2, sla_status: 'missed')
+        create(:applied_sla, sla_policy: sla_policy2, conversation: conversation2, sla_status: 'missed')
+
+        get "/api/v1/accounts/#{account.id}/applied_slas/metrics",
+            params: { sla_policy_id: sla_policy1.id },
+            headers: administrator.create_new_auth_token
+        expect(response).to have_http_status(:success)
+        body = JSON.parse(response.body)
+
+        expect(body).to include('total_applied_slas' => 2)
+        expect(body).to include('number_of_sla_breaches' => 1)
+        expect(body).to include('hit_rate' => '50.0%')
+      end
+
+      it 'filters sla metrics based on labels' do
+        conversation2.update_labels('label1')
+        conversation3.update_labels('label1')
+        create(:applied_sla, sla_policy: sla_policy1, conversation: conversation1, created_at: 10.days.ago)
+        create(:applied_sla, sla_policy: sla_policy1, conversation: conversation2, created_at: 3.days.ago, sla_status: 'missed')
+        create(:applied_sla, sla_policy: sla_policy1, conversation: conversation3, created_at: 3.days.ago)
+
+        get "/api/v1/accounts/#{account.id}/applied_slas/metrics",
+            params: { label_list: ['label1'] },
+            headers: administrator.create_new_auth_token
+        expect(response).to have_http_status(:success)
+        body = JSON.parse(response.body)
+
+        expect(body).to include('total_applied_slas' => 2)
+        expect(body).to include('number_of_sla_breaches' => 1)
+        expect(body).to include('hit_rate' => '50.0%')
+      end
+    end
+  end
+
+  describe 'GET /api/v1/accounts/{account.id}/applied_slas' do
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        get "/api/v1/accounts/#{account.id}/applied_slas"
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated user' do
+      it 'returns the applied slas' do
+        create(:applied_sla, sla_policy: sla_policy1, conversation: conversation1)
+        create(:applied_sla, sla_policy: sla_policy1, conversation: conversation2)
+        get "/api/v1/accounts/#{account.id}/applied_slas",
+            headers: administrator.create_new_auth_token
+        expect(response).to have_http_status(:success)
+        body = JSON.parse(response.body)
+
+        expect(body.size).to eq(2)
+        expect(body.first).to include('id')
+        expect(body.first).to include('sla_policy_id' => sla_policy1.id)
+        expect(body.first).to include('conversation_id' => conversation1.id)
+      end
+
+      it 'filters applied slas based on a date range' do
+        create(:applied_sla, sla_policy: sla_policy1, conversation: conversation1, created_at: 10.days.ago)
+        create(:applied_sla, sla_policy: sla_policy1, conversation: conversation2, created_at: 3.days.ago)
+
+        get "/api/v1/accounts/#{account.id}/applied_slas",
+            params: { since: 5.days.ago.to_time.to_i.to_s, until: Time.zone.today.to_time.to_i.to_s },
+            headers: administrator.create_new_auth_token
+        expect(response).to have_http_status(:success)
+        body = JSON.parse(response.body)
+
+        expect(body.size).to eq(1)
+      end
+
+      it 'filters applied slas based on a date range and agent ids' do
+        create(:applied_sla, sla_policy: sla_policy1, conversation: conversation1, created_at: 10.days.ago)
+        create(:applied_sla, sla_policy: sla_policy1, conversation: conversation3, created_at: 3.days.ago)
+        create(:applied_sla, sla_policy: sla_policy1, conversation: conversation2, created_at: 3.days.ago)
+
+        get "/api/v1/accounts/#{account.id}/applied_slas",
+            params: { agent_ids: [agent2.id] },
+            headers: administrator.create_new_auth_token
+        expect(response).to have_http_status(:success)
+        body = JSON.parse(response.body)
+
+        expect(body.size).to eq(3)
+      end
+
+      it 'filters applied slas based on sla policy ids' do
+        create(:applied_sla, sla_policy: sla_policy1, conversation: conversation1)
+        create(:applied_sla, sla_policy: sla_policy1, conversation: conversation2)
+        create(:applied_sla, sla_policy: sla_policy2, conversation: conversation2)
+
+        get "/api/v1/accounts/#{account.id}/applied_slas",
+            params: { sla_policy_id: sla_policy1.id },
+            headers: administrator.create_new_auth_token
+        expect(response).to have_http_status(:success)
+        body = JSON.parse(response.body)
+
+        expect(body.size).to eq(2)
+      end
+
+      it 'filters applied slas based on labels' do
+        conversation2.update_labels('label1')
+        conversation3.update_labels('label1')
+        create(:applied_sla, sla_policy: sla_policy1, conversation: conversation1, created_at: 10.days.ago)
+        create(:applied_sla, sla_policy: sla_policy1, conversation: conversation2, created_at: 3.days.ago)
+        create(:applied_sla, sla_policy: sla_policy1, conversation: conversation3, created_at: 3.days.ago)
+
+        get "/api/v1/accounts/#{account.id}/applied_slas",
+            params: { label_list: ['label1'] },
+            headers: administrator.create_new_auth_token
+        expect(response).to have_http_status(:success)
+        body = JSON.parse(response.body)
+
+        expect(body.size).to eq(2)
+      end
+    end
+  end
+end

From 9917cb42730f3f61d51f2c0465bf0005d314f8cf Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 26 Mar 2024 07:17:08 +0530
Subject: [PATCH 88/96] fix: Convert `cached_label_list` to text (#9143)

---
 app/models/conversation.rb                    |  2 +-
 ...71629_convert_cached_label_list_to_text.rb | 32 +++++++++++++++++++
 db/schema.rb                                  |  4 +--
 3 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 db/migrate/20240322071629_convert_cached_label_list_to_text.rb

diff --git a/app/models/conversation.rb b/app/models/conversation.rb
index 72518f250..513c993da 100644
--- a/app/models/conversation.rb
+++ b/app/models/conversation.rb
@@ -6,7 +6,7 @@
 #  additional_attributes  :jsonb
 #  agent_last_seen_at     :datetime
 #  assignee_last_seen_at  :datetime
-#  cached_label_list      :string
+#  cached_label_list      :text
 #  contact_last_seen_at   :datetime
 #  custom_attributes      :jsonb
 #  first_reply_created_at :datetime
diff --git a/db/migrate/20240322071629_convert_cached_label_list_to_text.rb b/db/migrate/20240322071629_convert_cached_label_list_to_text.rb
new file mode 100644
index 000000000..91dfb428a
--- /dev/null
+++ b/db/migrate/20240322071629_convert_cached_label_list_to_text.rb
@@ -0,0 +1,32 @@
+class ConvertCachedLabelListToText < ActiveRecord::Migration[7.0]
+  def up
+    change_column :conversations, :cached_label_list, :text
+  end
+
+  def down
+    # This might cause data loss if the text is longer than 255 characters
+    # lets start by truncating the data to 255 characters
+    Conversation.where('LENGTH(cached_label_list) > 255').find_in_batches do |conversation_batch|
+      Conversation.transaction do
+        conversation_batch.each do |conversation|
+          conversation.update!(cached_label_list: truncate_list(conversation.cached_label_list))
+        end
+      end
+    end
+
+    change_column :conversations, :cached_label_list, :string
+  end
+
+  private
+
+  # Truncate the list to 255 characters or less
+  # by removing the last element until the length is less than 255
+  def truncate_list(label_list)
+    labels = label_list.split(',')
+
+    # we add the `labels.length - 1` to account for the commas
+    labels.pop while (labels.join(',').length + labels.length - 1) > 255
+
+    labels.join(',')
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 498ad13d3..a877bf05d 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: 2024_03_19_062553) do
+ActiveRecord::Schema[7.0].define(version: 2024_03_22_071629) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_stat_statements"
   enable_extension "pg_trgm"
@@ -472,7 +472,7 @@ ActiveRecord::Schema[7.0].define(version: 2024_03_19_062553) do
     t.integer "priority"
     t.bigint "sla_policy_id"
     t.datetime "waiting_since"
-    t.string "cached_label_list"
+    t.text "cached_label_list"
     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"

From d1dd319091f0c5e323049228e597d9f51c29e783 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 26 Mar 2024 09:22:49 +0530
Subject: [PATCH 89/96] feat: API to download breached conversations (#9150)

* feat: add download conversations endpoint

* feat: template for conversation list download

* feat: setup download API and tests

* chore: revert formatting change

* feat: rename download method

* feat: rename template

* feat: include sla_policy table in download query

* refactor: add nil safety to assignee

* chore: Update en.yml

* fix: remove applied_sla relation
---
 config/locales/en.yml                         |  9 ++++++
 config/routes.rb                              |  1 +
 .../v1/accounts/applied_slas_controller.rb    | 16 +++++++++-
 .../v1/accounts/applied_slas/download.csv.erb | 26 ++++++++++++++++
 .../accounts/applied_slas_controller_spec.rb  | 30 +++++++++++++++++++
 5 files changed, 81 insertions(+), 1 deletion(-)
 create mode 100644 enterprise/app/views/api/v1/accounts/applied_slas/download.csv.erb

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4c4f0483c..92c56574d 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -106,6 +106,15 @@ en:
       avg_resolution_time: Avg resolution time
     conversation_traffic_csv:
       timezone: Timezone
+    sla_csv:
+      conversation_id: Conversation ID
+      sla_policy_breached: SLA Policy
+      assignee: Assignee
+      team: Team
+      inbox: Inbox
+      labels: Labels
+      conversation_link: Link to the Conversation
+      breached_events: Breached Events
     default_group_by: day
     csat:
       headers:
diff --git a/config/routes.rb b/config/routes.rb
index 6be458e07..d002bd142 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -147,6 +147,7 @@ Rails.application.routes.draw do
           resources :applied_slas, only: [:index] do
             collection do
               get :metrics
+              get :download
             end
           end
           resources :custom_attribute_definitions, only: [:index, :show, :create, :update, :destroy]
diff --git a/enterprise/app/controllers/api/v1/accounts/applied_slas_controller.rb b/enterprise/app/controllers/api/v1/accounts/applied_slas_controller.rb
index 5eaaf2d68..4ec27bbbb 100644
--- a/enterprise/app/controllers/api/v1/accounts/applied_slas_controller.rb
+++ b/enterprise/app/controllers/api/v1/accounts/applied_slas_controller.rb
@@ -4,7 +4,7 @@ class Api::V1::Accounts::AppliedSlasController < Api::V1::Accounts::EnterpriseAc
 
   RESULTS_PER_PAGE = 25
 
-  before_action :set_applied_slas, only: [:index, :metrics]
+  before_action :set_applied_slas, only: [:index, :metrics, :download]
   before_action :set_current_page, only: [:index]
   before_action :paginate_slas, only: [:index]
   before_action :check_admin_authorization?
@@ -19,8 +19,22 @@ class Api::V1::Accounts::AppliedSlasController < Api::V1::Accounts::EnterpriseAc
     @hit_rate = hit_rate
   end
 
+  def download
+    @breached_slas = breached_slas
+
+    response.headers['Content-Type'] = 'text/csv'
+    response.headers['Content-Disposition'] = 'attachment; filename=breached_conversation.csv'
+    render layout: false, formats: [:csv]
+  end
+
   private
 
+  def breached_slas
+    @applied_slas.includes(:sla_policy).joins(:conversation)
+                 .where.not(conversations: { status: :resolved })
+                 .where(applied_slas: { sla_status: :missed })
+  end
+
   def total_applied_slas
     @total_applied_slas ||= @applied_slas.count
   end
diff --git a/enterprise/app/views/api/v1/accounts/applied_slas/download.csv.erb b/enterprise/app/views/api/v1/accounts/applied_slas/download.csv.erb
new file mode 100644
index 000000000..676d6d680
--- /dev/null
+++ b/enterprise/app/views/api/v1/accounts/applied_slas/download.csv.erb
@@ -0,0 +1,26 @@
+<% headers = [
+  I18n.t('reports.sla_csv.conversation_id'),
+  I18n.t('reports.sla_csv.sla_policy_breached'),
+  I18n.t('reports.sla_csv.assignee'),
+  I18n.t('reports.sla_csv.team'),
+  I18n.t('reports.sla_csv.inbox'),
+  I18n.t('reports.sla_csv.labels'),
+  I18n.t('reports.sla_csv.conversation_link'),
+  I18n.t('reports.sla_csv.breached_events')
+] %>
+<%= CSV.generate_line headers %>
+
+<% @breached_slas.each do |sla| %>
+  <% breached_events = sla.sla_events.map(&:event_type).join(', ') %>
+  <% conversation = sla.conversation %>
+  <%= CSV.generate_line([
+    conversation.display_id,
+    sla.sla_policy.name,
+    conversation.assignee&.name,
+    conversation.team&.name,
+    conversation.inbox&.name,
+    conversation.cached_label_list,
+    app_account_conversation_url(account_id: conversation.account_id, id: conversation.display_id),
+    breached_events
+  ]) %>
+<% end %>
diff --git a/spec/enterprise/controllers/api/v1/accounts/applied_slas_controller_spec.rb b/spec/enterprise/controllers/api/v1/accounts/applied_slas_controller_spec.rb
index e10d08f85..3945c8c93 100644
--- a/spec/enterprise/controllers/api/v1/accounts/applied_slas_controller_spec.rb
+++ b/spec/enterprise/controllers/api/v1/accounts/applied_slas_controller_spec.rb
@@ -104,6 +104,36 @@ RSpec.describe 'Applied SLAs API', type: :request do
     end
   end
 
+  describe 'GET /api/v1/accounts/{account.id}/applied_slas/download' do
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        get "/api/v1/accounts/#{account.id}/applied_slas/download"
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated user' do
+      it 'returns a CSV file with breached conversations' do
+        create(:applied_sla, sla_policy: sla_policy1, conversation: conversation1, sla_status: 'missed')
+        create(:applied_sla, sla_policy: sla_policy1, conversation: conversation2, sla_status: 'missed')
+        conversation1.update(status: 'open')
+        conversation2.update(status: 'resolved')
+
+        get "/api/v1/accounts/#{account.id}/applied_slas/download",
+            headers: administrator.create_new_auth_token
+
+        expect(response).to have_http_status(:success)
+        expect(response.headers['Content-Type']).to eq('text/csv')
+        expect(response.headers['Content-Disposition']).to include('attachment; filename=breached_conversation.csv')
+
+        csv_data = CSV.parse(response.body)
+        csv_data.reject! { |row| row.all?(&:nil?) }
+        expect(csv_data.size).to eq(2)
+        expect(csv_data[1][0].to_i).to eq(conversation1.display_id)
+      end
+    end
+  end
+
   describe 'GET /api/v1/accounts/{account.id}/applied_slas' do
     context 'when it is an unauthenticated user' do
       it 'returns unauthorized' do

From 3b7694b163c37d0343ebe16e7107102f85bb170b Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Wed, 27 Mar 2024 03:42:09 +0530
Subject: [PATCH 90/96] chore(snyk): Security upgrade markdown-it from 13.0.1
 to 13.0.2 (#9153)

fix: package.json & yarn.lock to reduce vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-MARKDOWNIT-6483324

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

diff --git a/package.json b/package.json
index fcf7e23fa..313821424 100644
--- a/package.json
+++ b/package.json
@@ -63,7 +63,7 @@
     "libphonenumber-js": "^1.10.24",
     "logrocket": "^3.0.1",
     "logrocket-vuex": "^0.0.3",
-    "markdown-it": "^13.0.1",
+    "markdown-it": "^13.0.2",
     "markdown-it-link-attributes": "^4.0.1",
     "md5": "^2.3.0",
     "ninja-keys": "^1.2.2",
diff --git a/yarn.lock b/yarn.lock
index 9e919e2f4..80d048fa2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14551,10 +14551,10 @@ markdown-it@^10.0.0:
     mdurl "^1.0.1"
     uc.micro "^1.0.5"
 
-markdown-it@^13.0.1:
-  version "13.0.1"
-  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-13.0.1.tgz#c6ecc431cacf1a5da531423fc6a42807814af430"
-  integrity sha512-lTlxriVoy2criHP0JKRhO2VDG9c2ypWCsT237eDiLqi09rmbKoUetyGHq2uOIRoRS//kfoJckS0eUzzkDR+k2Q==
+markdown-it@^13.0.2:
+  version "13.0.2"
+  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-13.0.2.tgz#1bc22e23379a6952e5d56217fbed881e0c94d536"
+  integrity sha512-FtwnEuuK+2yVU7goGn/MJ0WBZMM9ZPgU9spqlFs7/A/pDIUNSOQZhUgOqYCficIuR2QaFnrt8LHqBWsbTAoI5w==
   dependencies:
     argparse "^2.0.1"
     entities "~3.0.1"

From cdcf02c94340c92322c6f4c18e279ee362982698 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Mar 2024 15:12:39 -0700
Subject: [PATCH 91/96] chore(deps): bump follow-redirects from 1.15.3 to
 1.15.6 (#9119)

Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.3 to 1.15.6.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.15.3...v1.15.6)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

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

diff --git a/yarn.lock b/yarn.lock
index 80d048fa2..c23d9fb70 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11407,9 +11407,9 @@ flush-write-stream@^1.0.0:
     readable-stream "^2.3.6"
 
 follow-redirects@^1.0.0, follow-redirects@^1.15.0:
-  version "1.15.3"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.3.tgz#fe2f3ef2690afce7e82ed0b44db08165b207123a"
-  integrity sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==
+  version "1.15.6"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b"
+  integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==
 
 for-each@^0.3.3:
   version "0.3.3"

From 2ee911e33a86c05ab1fb115a99487f36074e05e3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Mar 2024 15:22:06 -0700
Subject: [PATCH 92/96] chore(deps): bump express from 4.18.2 to 4.19.2 (#9159)

Bumps [express](https://github.com/expressjs/express) from 4.18.2 to 4.19.2.
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/master/History.md)
- [Commits](https://github.com/expressjs/express/compare/4.18.2...4.19.2)

---
updated-dependencies:
- dependency-name: express
  dependency-type: indirect
...

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

diff --git a/yarn.lock b/yarn.lock
index c23d9fb70..71040ce17 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8140,13 +8140,13 @@ bn.js@^5.2.1:
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.1.tgz#0bc527a6a0d18d0aa8d5b0538ce4a77dccfa7b70"
   integrity sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==
 
-body-parser@1.20.1:
-  version "1.20.1"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.1.tgz#b1812a8912c195cd371a3ee5e66faa2338a5c668"
-  integrity sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==
+body-parser@1.20.2:
+  version "1.20.2"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.2.tgz#6feb0e21c4724d06de7ff38da36dad4f57a747fd"
+  integrity sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==
   dependencies:
     bytes "3.1.2"
-    content-type "~1.0.4"
+    content-type "~1.0.5"
     debug "2.6.9"
     depd "2.0.0"
     destroy "1.2.0"
@@ -8154,7 +8154,7 @@ body-parser@1.20.1:
     iconv-lite "0.4.24"
     on-finished "2.4.1"
     qs "6.11.0"
-    raw-body "2.5.1"
+    raw-body "2.5.2"
     type-is "~1.6.18"
     unpipe "1.0.0"
 
@@ -9129,6 +9129,11 @@ content-type@~1.0.4:
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
   integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
 
+content-type@~1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918"
+  integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==
+
 convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
@@ -9146,10 +9151,10 @@ cookie-signature@1.0.6:
   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
   integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==
 
-cookie@0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b"
-  integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==
+cookie@0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.6.0.tgz#2798b04b071b0ecbff0dbb62a505a8efa4e19051"
+  integrity sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==
 
 copy-concurrently@^1.0.0:
   version "1.0.5"
@@ -11054,16 +11059,16 @@ expect@^29.0.0, expect@^29.7.0:
     jest-util "^29.7.0"
 
 express@^4.17.1:
-  version "4.18.2"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.18.2.tgz#3fabe08296e930c796c19e3c516979386ba9fd59"
-  integrity sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==
+  version "4.19.2"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.19.2.tgz#e25437827a3aa7f2a827bc8171bbbb664a356465"
+  integrity sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==
   dependencies:
     accepts "~1.3.8"
     array-flatten "1.1.1"
-    body-parser "1.20.1"
+    body-parser "1.20.2"
     content-disposition "0.5.4"
     content-type "~1.0.4"
-    cookie "0.5.0"
+    cookie "0.6.0"
     cookie-signature "1.0.6"
     debug "2.6.9"
     depd "2.0.0"
@@ -17578,10 +17583,10 @@ range-parser@^1.2.1, range-parser@~1.2.1:
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
   integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
 
-raw-body@2.5.1:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.1.tgz#fe1b1628b181b700215e5fd42389f98b71392857"
-  integrity sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==
+raw-body@2.5.2:
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.2.tgz#99febd83b90e08975087e8f1f9419a149366b68a"
+  integrity sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==
   dependencies:
     bytes "3.1.2"
     http-errors "2.0.0"

From 125326438273c2092b6806c6faa9b68fa7712f51 Mon Sep 17 00:00:00 2001
From: Shivam Kumar <76581658+shivamkb17@users.noreply.github.com>
Date: Wed, 27 Mar 2024 07:28:45 +0530
Subject: [PATCH 93/96] fix: Avoid duplicate invitation emails when adding an
 agent (#9131)

Co-authored-by: Sojan <sojan@pepalo.com>
Co-authored-by: Shivam Mishra <scm.mymail@gmail.com>
Co-authored-by: Pranav <pranav@chatwoot.com>
---
 app/builders/agent_builder.rb       |  6 ------
 spec/builders/agent_builder_spec.rb | 16 ----------------
 2 files changed, 22 deletions(-)

diff --git a/app/builders/agent_builder.rb b/app/builders/agent_builder.rb
index 07b0e7345..54f478920 100644
--- a/app/builders/agent_builder.rb
+++ b/app/builders/agent_builder.rb
@@ -16,7 +16,6 @@ class AgentBuilder
   def perform
     ActiveRecord::Base.transaction do
       @user = find_or_create_user
-      send_confirmation_if_required
       create_account_user
     end
     @user
@@ -34,11 +33,6 @@ class AgentBuilder
     User.create!(email: email, name: name, password: temp_password, password_confirmation: temp_password)
   end
 
-  # Sends confirmation instructions if the user is persisted and not confirmed.
-  def send_confirmation_if_required
-    @user.send_confirmation_instructions if user_needs_confirmation?
-  end
-
   # Checks if the user needs confirmation.
   # @return [Boolean] true if the user is persisted and not confirmed, false otherwise.
   def user_needs_confirmation?
diff --git a/spec/builders/agent_builder_spec.rb b/spec/builders/agent_builder_spec.rb
index 9d7667306..ac8a3229a 100644
--- a/spec/builders/agent_builder_spec.rb
+++ b/spec/builders/agent_builder_spec.rb
@@ -67,21 +67,5 @@ RSpec.describe AgentBuilder, type: :model do
         expect(user.encrypted_password).not_to be_empty
       end
     end
-
-    context 'with confirmation required' do
-      let(:unconfirmed_user) { create(:user, email: email) }
-
-      before do
-        unconfirmed_user.confirmed_at = nil
-        unconfirmed_user.save(validate: false)
-        allow(unconfirmed_user).to receive(:confirmed?).and_return(false)
-      end
-
-      it 'sends confirmation instructions' do
-        user = agent_builder.perform
-        expect(user).to receive(:send_confirmation_instructions)
-        agent_builder.send(:send_confirmation_if_required)
-      end
-    end
   end
 end

From 3e07320d226acc07573c5e2a94d4e1193912698f Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Wed, 27 Mar 2024 13:19:51 +0530
Subject: [PATCH 94/96] feat: SLA threshold card component (#9163)

- Component to display SLA timer in the conversation card and header
---
 .../conversation/components/SLACardLabel.vue  | 103 ++++++++++++++++++
 .../dashboard/helper/directives/resize.js     |  41 +++++++
 .../helper/specs/directives/resize.spec.js    |  78 +++++++++++++
 .../i18n/locale/en/conversation.json          |   9 +-
 app/javascript/packs/application.js           |   2 +
 5 files changed, 232 insertions(+), 1 deletion(-)
 create mode 100644 app/javascript/dashboard/components/widgets/conversation/components/SLACardLabel.vue
 create mode 100644 app/javascript/dashboard/helper/directives/resize.js
 create mode 100644 app/javascript/dashboard/helper/specs/directives/resize.spec.js

diff --git a/app/javascript/dashboard/components/widgets/conversation/components/SLACardLabel.vue b/app/javascript/dashboard/components/widgets/conversation/components/SLACardLabel.vue
new file mode 100644
index 000000000..381ca53b1
--- /dev/null
+++ b/app/javascript/dashboard/components/widgets/conversation/components/SLACardLabel.vue
@@ -0,0 +1,103 @@
+<template>
+  <div
+    class="flex items-center px-2 truncate border min-w-fit border-slate-75 dark:border-slate-700"
+    :class="showExtendedInfo ? 'py-[5px] rounded-lg' : 'py-0.5 gap-1 rounded'"
+  >
+    <div
+      class="flex items-center gap-1"
+      :class="
+        showExtendedInfo &&
+        'ltr:pr-1.5 rtl:pl-1.5 ltr:border-r rtl:border-l border-solid border-slate-75 dark:border-slate-700'
+      "
+    >
+      <fluent-icon
+        size="14"
+        :icon="slaStatus.icon"
+        type="outline"
+        :icon-lib="isSlaMissed ? 'lucide' : 'fluent'"
+        class="flex-shrink-0"
+        :class="slaTextStyles"
+      />
+      <span
+        v-if="showExtendedInfo"
+        class="text-xs font-medium"
+        :class="slaTextStyles"
+      >
+        {{ slaStatusText }}
+      </span>
+    </div>
+    <span
+      class="text-xs font-medium"
+      :class="[slaTextStyles, showExtendedInfo && 'ltr:pl-1.5 rtl:pr-1.5']"
+    >
+      {{ slaStatus.threshold }}
+    </span>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import { evaluateSLAStatus } from '../helpers/SLAHelper';
+
+// const REFRESH_INTERVAL = 60000;
+
+export default {
+  props: {
+    chat: {
+      type: Object,
+      default: () => ({}),
+    },
+    showExtendedInfo: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data() {
+    return {
+      timer: null,
+      slaStatus: {},
+    };
+  },
+  computed: {
+    ...mapGetters({
+      activeSLA: 'sla/getSLAById',
+    }),
+    slaPolicyId() {
+      return this.chat?.sla_policy_id;
+    },
+    sla() {
+      if (!this.slaPolicyId) return null;
+      return this.activeSLA(this.slaPolicyId);
+    },
+    isSlaMissed() {
+      return this.slaStatus?.isSlaMissed;
+    },
+    slaTextStyles() {
+      return this.isSlaMissed
+        ? 'text-red-400 dark:text-red-300'
+        : 'text-yellow-600 dark:text-yellow-500';
+    },
+    slaStatusText() {
+      const upperCaseType = this.slaStatus?.type?.toUpperCase(); // FRT, NRT, or RT
+      const statusKey = this.isSlaMissed ? 'BREACH' : 'DUE';
+
+      return this.$t(`CONVERSATION.HEADER.SLA_STATUS.${upperCaseType}`, {
+        status: this.$t(`CONVERSATION.HEADER.SLA_STATUS.${statusKey}`),
+      });
+    },
+  },
+  watch: {
+    chat() {
+      this.updateSlaStatus();
+    },
+  },
+  mounted() {
+    this.updateSlaStatus();
+  },
+  methods: {
+    updateSlaStatus() {
+      this.slaStatus = evaluateSLAStatus(this.sla, this.chat);
+    },
+  },
+};
+</script>
diff --git a/app/javascript/dashboard/helper/directives/resize.js b/app/javascript/dashboard/helper/directives/resize.js
new file mode 100644
index 000000000..35e5315b0
--- /dev/null
+++ b/app/javascript/dashboard/helper/directives/resize.js
@@ -0,0 +1,41 @@
+import { debounce } from '@chatwoot/utils';
+
+const RESIZE_OBSERVER_DEBOUNCE_TIME = 100;
+
+function createResizeObserver(el, binding) {
+  const { value } = binding;
+  const observer = new ResizeObserver(
+    debounce(entries => {
+      const entry = entries[0];
+      if (entry && value && typeof value === 'function') {
+        value(entry);
+      }
+    }, RESIZE_OBSERVER_DEBOUNCE_TIME)
+  );
+
+  el.cwResizeObserver = observer;
+  observer.observe(el);
+}
+
+function destroyResizeObserver(el) {
+  if (el.cwResizeObserver) {
+    el.cwResizeObserver.unobserve(el);
+    el.cwResizeObserver.disconnect();
+    delete el.cwResizeObserver;
+  }
+}
+
+export default {
+  bind(el, binding) {
+    createResizeObserver(el, binding);
+  },
+  update(el, binding) {
+    if (binding.oldValue !== binding.value) {
+      destroyResizeObserver(el);
+      createResizeObserver(el, binding);
+    }
+  },
+  unbind(el) {
+    destroyResizeObserver(el);
+  },
+};
diff --git a/app/javascript/dashboard/helper/specs/directives/resize.spec.js b/app/javascript/dashboard/helper/specs/directives/resize.spec.js
new file mode 100644
index 000000000..fa099f40a
--- /dev/null
+++ b/app/javascript/dashboard/helper/specs/directives/resize.spec.js
@@ -0,0 +1,78 @@
+import resize from '../../directives/resize';
+
+class ResizeObserverMock {
+  // eslint-disable-next-line class-methods-use-this
+  observe() {}
+
+  // eslint-disable-next-line class-methods-use-this
+  unobserve() {}
+
+  // eslint-disable-next-line class-methods-use-this
+  disconnect() {}
+}
+
+describe('resize directive', () => {
+  let el;
+  let binding;
+  let observer;
+
+  beforeEach(() => {
+    el = document.createElement('div');
+    binding = {
+      value: jest.fn(),
+    };
+    observer = {
+      observe: jest.fn(),
+      unobserve: jest.fn(),
+      disconnect: jest.fn(),
+    };
+    window.ResizeObserver = ResizeObserverMock;
+    jest.spyOn(window, 'ResizeObserver').mockImplementation(() => observer);
+  });
+
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('should create ResizeObserver on bind', () => {
+    resize.bind(el, binding);
+
+    expect(ResizeObserver).toHaveBeenCalled();
+    expect(observer.observe).toHaveBeenCalledWith(el);
+  });
+
+  it('should call callback on observer callback', () => {
+    el = document.createElement('div');
+    binding = {
+      value: jest.fn(),
+    };
+
+    resize.bind(el, binding);
+
+    const entries = [{ contentRect: { width: 100, height: 100 } }];
+    const callback = binding.value;
+    callback(entries[0]);
+
+    expect(binding.value).toHaveBeenCalledWith(entries[0]);
+  });
+
+  it('should destroy and recreate observer on update', () => {
+    resize.bind(el, binding);
+
+    resize.update(el, { ...binding, oldValue: 'old' });
+
+    expect(observer.unobserve).toHaveBeenCalledWith(el);
+    expect(observer.disconnect).toHaveBeenCalled();
+    expect(ResizeObserver).toHaveBeenCalledTimes(2);
+    expect(observer.observe).toHaveBeenCalledTimes(2);
+  });
+
+  it('should destroy observer on unbind', () => {
+    resize.bind(el, binding);
+
+    resize.unbind(el);
+
+    expect(observer.unobserve).toHaveBeenCalledWith(el);
+    expect(observer.disconnect).toHaveBeenCalled();
+  });
+});
diff --git a/app/javascript/dashboard/i18n/locale/en/conversation.json b/app/javascript/dashboard/i18n/locale/en/conversation.json
index 227c802d6..2bdf2af7a 100644
--- a/app/javascript/dashboard/i18n/locale/en/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/en/conversation.json
@@ -64,7 +64,14 @@
       "SNOOZED_UNTIL": "Snoozed until",
       "SNOOZED_UNTIL_TOMORROW": "Snoozed until tomorrow",
       "SNOOZED_UNTIL_NEXT_WEEK": "Snoozed until next week",
-      "SNOOZED_UNTIL_NEXT_REPLY": "Snoozed until next reply"
+      "SNOOZED_UNTIL_NEXT_REPLY": "Snoozed until next reply",
+      "SLA_STATUS": {
+        "FRT": "FRT {status}",
+        "NRT": "NRT {status}",
+        "RT": "RT {status}",
+        "BREACH": "breach",
+        "DUE": "due"
+      }
     },
     "RESOLVE_DROPDOWN": {
       "MARK_PENDING": "Mark as pending",
diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js
index 18354bc62..61d6dec8d 100644
--- a/app/javascript/packs/application.js
+++ b/app/javascript/packs/application.js
@@ -30,6 +30,7 @@ import FluentIcon from 'shared/components/FluentIcon/DashboardIcon';
 import VueDOMPurifyHTML from 'vue-dompurify-html';
 import { domPurifyConfig } from '../shared/helpers/HTMLSanitizer';
 import AnalyticsPlugin from '../dashboard/helper/AnalyticsHelper/plugin';
+import resizeDirective from '../dashboard/helper/directives/resize.js';
 
 Vue.config.env = process.env;
 
@@ -78,6 +79,7 @@ Vue.component('woot-switch', WootSwitch);
 Vue.component('woot-wizard', WootWizard);
 Vue.component('fluent-icon', FluentIcon);
 
+Vue.directive('resize', resizeDirective);
 const i18nConfig = new VueI18n({
   locale: 'en',
   messages: i18n,

From 9a1c54a82d55b2eab3db1f1685cdaf56e0b42ee9 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Thu, 28 Mar 2024 13:14:16 +0530
Subject: [PATCH 95/96] feat: disable automation rules if condition fails
 multiple times (#9017)

* feat: add email for disabling automation rule

* feat: disable automation rules and notify admin

* feat: reset error count after update

* feat: trigger invalid_condition_error if rule is invalid

* feat: setup error trackable concern

* refactor: use ErrorTrackable in Reauthorizable

* fix: optional argument

* feat: separate reauthorization_required_key

* test: update case to use ERROR_TRACKABLE_COUNT

* Revert "test: update case to use ERROR_TRACKABLE_COUNT"

This reverts commit f439847147556a02759a7597a7fcf1d66091cafc.

* Revert "feat: separate reauthorization_required_key"

This reverts commit f4514fce217b0a2f2c2bf701a15de0a8b47acbc4.

* Revert "fix: optional argument"

This reverts commit 93b4194ec3f10f67e2402388c966c071c4d3b4fd.

* Revert "refactor: use ErrorTrackable in Reauthorizable"

This reverts commit 513c2a522bc782e73ea4b0f5ae34ce01e70e042c.

* Revert "feat: setup error trackable concern"

This reverts commit 278683060cf422f60af5d5c77100aa5272141141.

* feat: use reauthorizable for automation rule

* feat: remove redis key

* test: fix method names

* chore: refactor

---------

Co-authored-by: Vishnu Narayanan <iamwishnu@gmail.com>
Co-authored-by: Sojan <sojan@pepalo.com>
---
 .../channel_notifications_mailer.rb           | 12 +++++++
 app/models/automation_rule.rb                 |  3 ++
 app/models/concerns/reauthorizable.rb         |  3 ++
 .../conditions_filter_service.rb              |  2 +-
 .../automation_rule_disabled.liquid           |  8 +++++
 spec/models/automation_rule_spec.rb           | 36 +++++++++++++++++++
 spec/models/concerns/reauthorizable_shared.rb |  9 +++++
 7 files changed, 72 insertions(+), 1 deletion(-)
 create mode 100644 app/views/mailers/administrator_notifications/channel_notifications_mailer/automation_rule_disabled.liquid

diff --git a/app/mailers/administrator_notifications/channel_notifications_mailer.rb b/app/mailers/administrator_notifications/channel_notifications_mailer.rb
index 6c0f7cee2..dc4e6d7fe 100644
--- a/app/mailers/administrator_notifications/channel_notifications_mailer.rb
+++ b/app/mailers/administrator_notifications/channel_notifications_mailer.rb
@@ -69,6 +69,18 @@ class AdministratorNotifications::ChannelNotificationsMailer < ApplicationMailer
     send_mail_with_liquid(to: email_to, subject: subject) and return
   end
 
+  def automation_rule_disabled(rule)
+    return unless smtp_config_set_or_development?
+
+    @action_url ||= "#{ENV.fetch('FRONTEND_URL', nil)}/app/accounts/#{Current.account.id}/settings/automation/list"
+
+    subject = 'Automation rule disabled due to validation errors.'.freeze
+    @meta = {}
+    @meta['rule_name'] = rule.name
+
+    send_mail_with_liquid(to: admin_emails, subject: subject) and return
+  end
+
   private
 
   def admin_emails
diff --git a/app/models/automation_rule.rb b/app/models/automation_rule.rb
index 955df7497..9f7da28a0 100644
--- a/app/models/automation_rule.rb
+++ b/app/models/automation_rule.rb
@@ -19,6 +19,7 @@
 #
 class AutomationRule < ApplicationRecord
   include Rails.application.routes.url_helpers
+  include Reauthorizable
 
   belongs_to :account
   has_many_attached :files
@@ -28,6 +29,8 @@ class AutomationRule < ApplicationRecord
   validate :query_operator_presence
   validates :account_id, presence: true
 
+  after_update_commit :reauthorized!, if: -> { saved_change_to_conditions? }
+
   scope :active, -> { where(active: true) }
 
   def conditions_attributes
diff --git a/app/models/concerns/reauthorizable.rb b/app/models/concerns/reauthorizable.rb
index fa46d0060..0fc234ada 100644
--- a/app/models/concerns/reauthorizable.rb
+++ b/app/models/concerns/reauthorizable.rb
@@ -50,6 +50,9 @@ module Reauthorizable
       mailer.whatsapp_disconnect(inbox).deliver_later
     when 'Channel::Email'
       mailer.email_disconnect(inbox).deliver_later
+    when 'AutomationRule'
+      update!(active: false)
+      mailer.automation_rule_disabled(self).deliver_later
     end
   end
 
diff --git a/app/services/automation_rules/conditions_filter_service.rb b/app/services/automation_rules/conditions_filter_service.rb
index daf9cb7e2..23873371d 100644
--- a/app/services/automation_rules/conditions_filter_service.rb
+++ b/app/services/automation_rules/conditions_filter_service.rb
@@ -45,8 +45,8 @@ class AutomationRules::ConditionsFilterService < FilterService
 
   def rule_valid?
     is_valid = AutomationRules::ConditionValidationService.new(@rule).perform
-
     Rails.logger.info "Automation rule condition validation failed for rule id: #{@rule.id}" unless is_valid
+    @rule.authorization_error! unless is_valid
 
     is_valid
   end
diff --git a/app/views/mailers/administrator_notifications/channel_notifications_mailer/automation_rule_disabled.liquid b/app/views/mailers/administrator_notifications/channel_notifications_mailer/automation_rule_disabled.liquid
new file mode 100644
index 000000000..56aefd6b7
--- /dev/null
+++ b/app/views/mailers/administrator_notifications/channel_notifications_mailer/automation_rule_disabled.liquid
@@ -0,0 +1,8 @@
+<p>Hello there,</p>
+
+<p>The automation rule <b>{{meta['rule_name']}}</b> has been disabled becuase it has invalid conditions.</p>
+<p>This typically happens when you delete any custom attributes which are still being used in automation rules.</p>
+
+<p>
+Click <a href="{{action_url}}">here</a> to update the conditions.
+</p>
diff --git a/spec/models/automation_rule_spec.rb b/spec/models/automation_rule_spec.rb
index a20d3d71d..53ebfa0c7 100644
--- a/spec/models/automation_rule_spec.rb
+++ b/spec/models/automation_rule_spec.rb
@@ -1,6 +1,11 @@
 require 'rails_helper'
+require Rails.root.join 'spec/models/concerns/reauthorizable_shared.rb'
 
 RSpec.describe AutomationRule do
+  describe 'concerns' do
+    it_behaves_like 'reauthorizable'
+  end
+
   describe 'associations' do
     let(:account) { create(:account) }
     let(:params) do
@@ -56,4 +61,35 @@ RSpec.describe AutomationRule do
       expect(rule.errors.messages[:conditions]).to eq(['Automation conditions should have query operator.'])
     end
   end
+
+  describe 'reauthorizable' do
+    context 'when prompt_reauthorization!' do
+      it 'marks the rule inactive' do
+        rule = create(:automation_rule)
+        expect(rule.active).to be true
+        rule.prompt_reauthorization!
+        expect(rule.active).to be false
+      end
+    end
+
+    context 'when reauthorization_required?' do
+      it 'unsets the error count if conditions are updated' do
+        rule = create(:automation_rule)
+        rule.prompt_reauthorization!
+        expect(rule.reauthorization_required?).to be true
+
+        rule.update!(conditions: [{ attribute_key: 'browser_language', filter_operator: 'equal_to', values: ['en'], query_operator: 'AND' }])
+        expect(rule.reauthorization_required?).to be false
+      end
+
+      it 'will not unset the error count if conditions are not updated' do
+        rule = create(:automation_rule)
+        rule.prompt_reauthorization!
+        expect(rule.reauthorization_required?).to be true
+
+        rule.update!(name: 'Updated name')
+        expect(rule.reauthorization_required?).to be true
+      end
+    end
+  end
 end
diff --git a/spec/models/concerns/reauthorizable_shared.rb b/spec/models/concerns/reauthorizable_shared.rb
index 0bfa112c4..9efe232e8 100644
--- a/spec/models/concerns/reauthorizable_shared.rb
+++ b/spec/models/concerns/reauthorizable_shared.rb
@@ -25,10 +25,19 @@ shared_examples_for 'reauthorizable' do
 
   it 'prompt_reauthorization!' do
     obj = FactoryBot.create(model.to_s.underscore.tr('/', '_').to_sym)
+    mailer = double
+    mailer_method = double
+    allow(AdministratorNotifications::ChannelNotificationsMailer).to receive(:with).and_return(mailer)
+    # allow mailer to receive any methods and return mailer
+    allow(mailer).to receive(:method_missing).and_return(mailer_method)
+    allow(mailer_method).to receive(:deliver_later)
+
     expect(obj.reauthorization_required?).to be false
 
     obj.prompt_reauthorization!
     expect(obj.reauthorization_required?).to be true
+    expect(AdministratorNotifications::ChannelNotificationsMailer).to have_received(:with).with(account: obj.account)
+    expect(mailer_method).to have_received(:deliver_later)
   end
 
   it 'reauthorized!' do

From 6956436a76c7fe6f7e32044cc8b216f9c4780b47 Mon Sep 17 00:00:00 2001
From: Vishnu Narayanan <iamwishnu@gmail.com>
Date: Fri, 29 Mar 2024 02:01:43 +1100
Subject: [PATCH 96/96] feat: refactor SLA evaluation logic (#9133)

* feat: update SLA evaluation logic

* chore: handle nrt

* chore: handle applied_sla status

* chore: refactor spec to bring down expecations in a single block

* chore: fix process_account_applied_sla spec

* chore: add spec to test multiple nrt misses

* feat: persist sla notifications

* feat: revert persist sla notifications

* chore: refactor sla_status to include active_with_misses

* chore: refactor spec

* Update evaluate_applied_sla_service.rb

* minor refactors

* clean up

* move notification related spec

* chore: refactor notifications spec to sla_event model

---------

Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
Co-authored-by: Sojan Jose <sojan@pepalo.com>
---
 .../sla/process_account_applied_slas_job.rb   |   2 +-
 enterprise/app/models/applied_sla.rb          |   2 +-
 enterprise/app/models/sla_event.rb            |  26 ++++
 .../sla/evaluate_applied_sla_service.rb       |  77 ++++++------
 .../process_account_applied_slas_job_spec.rb  |   6 +-
 spec/enterprise/models/sla_event_spec.rb      |  33 +++++
 .../sla/evaluate_applied_sla_service_spec.rb  | 118 ++++++++++++------
 7 files changed, 184 insertions(+), 80 deletions(-)

diff --git a/enterprise/app/jobs/sla/process_account_applied_slas_job.rb b/enterprise/app/jobs/sla/process_account_applied_slas_job.rb
index 153749267..d8786565c 100644
--- a/enterprise/app/jobs/sla/process_account_applied_slas_job.rb
+++ b/enterprise/app/jobs/sla/process_account_applied_slas_job.rb
@@ -2,7 +2,7 @@ class Sla::ProcessAccountAppliedSlasJob < ApplicationJob
   queue_as :medium
 
   def perform(account)
-    account.applied_slas.where(sla_status: 'active').each do |applied_sla|
+    account.applied_slas.where(sla_status: %w[active active_with_misses]).each do |applied_sla|
       Sla::ProcessAppliedSlaJob.perform_later(applied_sla)
     end
   end
diff --git a/enterprise/app/models/applied_sla.rb b/enterprise/app/models/applied_sla.rb
index 4558d5d23..111b78e84 100644
--- a/enterprise/app/models/applied_sla.rb
+++ b/enterprise/app/models/applied_sla.rb
@@ -27,7 +27,7 @@ class AppliedSla < ApplicationRecord
   validates :account_id, uniqueness: { scope: %i[sla_policy_id conversation_id] }
   before_validation :ensure_account_id
 
-  enum sla_status: { active: 0, hit: 1, missed: 2 }
+  enum sla_status: { active: 0, hit: 1, missed: 2, active_with_misses: 3 }
 
   scope :filter_by_date_range, ->(range) { where(created_at: range) if range.present? }
   scope :filter_by_inbox_id, ->(inbox_id) { where(inbox_id: inbox_id) if inbox_id.present? }
diff --git a/enterprise/app/models/sla_event.rb b/enterprise/app/models/sla_event.rb
index 28f709346..59068684e 100644
--- a/enterprise/app/models/sla_event.rb
+++ b/enterprise/app/models/sla_event.rb
@@ -32,6 +32,8 @@ class SlaEvent < ApplicationRecord
 
   before_validation :ensure_applied_sla_id, :ensure_account_id, :ensure_inbox_id, :ensure_sla_policy_id
 
+  after_create_commit :create_notifications
+
   private
 
   def ensure_applied_sla_id
@@ -49,4 +51,28 @@ class SlaEvent < ApplicationRecord
   def ensure_sla_policy_id
     self.sla_policy_id ||= applied_sla&.sla_policy_id
   end
+
+  def create_notifications
+    notify_users = conversation.conversation_participants.map(&:user)
+    # Add all admins from the account to notify list
+    notify_users += account.administrators
+    # Ensure conversation assignee is notified
+    notify_users += [conversation.assignee] if conversation.assignee.present?
+
+    notification_type = {
+      'frt' => 'sla_missed_first_response',
+      'nrt' => 'sla_missed_next_response',
+      'rt' => 'sla_missed_resolution'
+    }[event_type]
+
+    notify_users.uniq.each do |user|
+      NotificationBuilder.new(
+        notification_type: notification_type,
+        user: user,
+        account: account,
+        primary_actor: conversation,
+        secondary_actor: sla_policy
+      ).perform
+    end
+  end
 end
diff --git a/enterprise/app/services/sla/evaluate_applied_sla_service.rb b/enterprise/app/services/sla/evaluate_applied_sla_service.rb
index d6eb9839e..4cc953899 100644
--- a/enterprise/app/services/sla/evaluate_applied_sla_service.rb
+++ b/enterprise/app/services/sla/evaluate_applied_sla_service.rb
@@ -7,8 +7,8 @@ class Sla::EvaluateAppliedSlaService
     # We will calculate again in the next iteration
     return unless applied_sla.conversation.resolved?
 
-    # No SLA missed, so marking as hit as conversation is resolved
-    handle_hit_sla(applied_sla) if applied_sla.active?
+    # after conversation is resolved, we will check if the SLA was hit or missed
+    handle_hit_sla(applied_sla)
   end
 
   private
@@ -49,6 +49,14 @@ class Sla::EvaluateAppliedSlaService
     handle_missed_sla(applied_sla, 'nrt')
   end
 
+  def get_last_message_id(conversation)
+    conversation.messages.where(message_type: :incoming).last&.id
+  end
+
+  def already_missed?(applied_sla, type, meta = {})
+    SlaEvent.exists?(applied_sla: applied_sla, event_type: type, meta: meta)
+  end
+
   def check_resolution_time_threshold(applied_sla, conversation, sla_policy)
     return if conversation.resolved?
 
@@ -58,48 +66,41 @@ class Sla::EvaluateAppliedSlaService
     handle_missed_sla(applied_sla, 'rt')
   end
 
-  def handle_missed_sla(applied_sla, type)
-    return unless applied_sla.active?
+  def handle_missed_sla(applied_sla, type, meta = {})
+    meta = { message_id: get_last_message_id(applied_sla.conversation) } if type == 'nrt'
+    return if already_missed?(applied_sla, type, meta)
 
-    applied_sla.update!(sla_status: 'missed')
-    generate_notifications_for_sla(applied_sla, type)
-    Rails.logger.warn "SLA missed for conversation #{applied_sla.conversation.id} " \
+    create_sla_event(applied_sla, type, meta)
+    Rails.logger.warn "SLA #{type} missed for conversation #{applied_sla.conversation.id} " \
                       "in account #{applied_sla.account_id} " \
                       "for sla_policy #{applied_sla.sla_policy.id}"
+
+    applied_sla.update!(sla_status: 'active_with_misses') if applied_sla.sla_status != 'active_with_misses'
   end
 
   def handle_hit_sla(applied_sla)
-    return unless applied_sla.active?
-
-    applied_sla.update!(sla_status: 'hit')
-    Rails.logger.info "SLA hit for conversation #{applied_sla.conversation.id} " \
-                      "in account #{applied_sla.account_id} " \
-                      "for sla_policy #{applied_sla.sla_policy.id}"
-  end
-
-  def generate_notifications_for_sla(applied_sla, type)
-    notify_users = applied_sla.conversation.conversation_participants.map(&:user)
-    # add all admins from the account to notify list
-    notify_users += applied_sla.account.administrators
-    # ensure conversation assignee is notified
-    notify_users += [applied_sla.conversation.assignee] if applied_sla.conversation.assignee.present?
-
-    notification_type = if type == 'frt'
-                          'sla_missed_first_response'
-                        elsif type == 'nrt'
-                          'sla_missed_next_response'
-                        else
-                          'sla_missed_resolution'
-                        end
-
-    notify_users.uniq.each do |user|
-      NotificationBuilder.new(
-        notification_type: notification_type,
-        user: user,
-        account: applied_sla.account,
-        primary_actor: applied_sla.conversation,
-        secondary_actor: applied_sla.sla_policy
-      ).perform
+    if applied_sla.active?
+      applied_sla.update!(sla_status: 'hit')
+      Rails.logger.info "SLA hit for conversation #{applied_sla.conversation.id} " \
+                        "in account #{applied_sla.account_id} " \
+                        "for sla_policy #{applied_sla.sla_policy.id}"
+    else
+      applied_sla.update!(sla_status: 'missed')
+      Rails.logger.info "SLA missed for conversation #{applied_sla.conversation.id} " \
+                        "in account #{applied_sla.account_id} " \
+                        "for sla_policy #{applied_sla.sla_policy.id}"
     end
   end
+
+  def create_sla_event(applied_sla, event_type, meta = {})
+    SlaEvent.create!(
+      applied_sla: applied_sla,
+      conversation: applied_sla.conversation,
+      event_type: event_type,
+      meta: meta,
+      account: applied_sla.account,
+      inbox: applied_sla.conversation.inbox,
+      sla_policy: applied_sla.sla_policy
+    )
+  end
 end
diff --git a/spec/enterprise/jobs/sla/process_account_applied_slas_job_spec.rb b/spec/enterprise/jobs/sla/process_account_applied_slas_job_spec.rb
index beae967db..5d628f71e 100644
--- a/spec/enterprise/jobs/sla/process_account_applied_slas_job_spec.rb
+++ b/spec/enterprise/jobs/sla/process_account_applied_slas_job_spec.rb
@@ -7,18 +7,20 @@ RSpec.describe Sla::ProcessAccountAppliedSlasJob do
     let!(:applied_sla) { create(:applied_sla, account: account, sla_policy: sla_policy, sla_status: 'active') }
     let!(:hit_applied_sla) { create(:applied_sla, account: account, sla_policy: sla_policy, sla_status: 'hit') }
     let!(:miss_applied_sla) { create(:applied_sla, account: account, sla_policy: sla_policy, sla_status: 'missed') }
+    let!(:active_with_misses_applied_sla) { create(:applied_sla, account: account, sla_policy: sla_policy, sla_status: 'active_with_misses') }
 
     it 'enqueues the job' do
       expect { described_class.perform_later }.to have_enqueued_job(described_class)
         .on_queue('medium')
     end
 
-    it 'calls the ProcessAppliedSlaJob' do
+    it 'calls the ProcessAppliedSlaJob for both active and active_with_misses' do
+      expect(Sla::ProcessAppliedSlaJob).to receive(:perform_later).with(active_with_misses_applied_sla).and_call_original
       expect(Sla::ProcessAppliedSlaJob).to receive(:perform_later).with(applied_sla).and_call_original
       described_class.perform_now(account)
     end
 
-    it 'does not call the ProcessAppliedSlaJob for not active applied slas' do
+    it 'does not call the ProcessAppliedSlaJob for applied slas that are hit or miss' do
       expect(Sla::ProcessAppliedSlaJob).not_to receive(:perform_later).with(hit_applied_sla)
       expect(Sla::ProcessAppliedSlaJob).not_to receive(:perform_later).with(miss_applied_sla)
       described_class.perform_now(account)
diff --git a/spec/enterprise/models/sla_event_spec.rb b/spec/enterprise/models/sla_event_spec.rb
index 862b22e6c..3c44d3961 100644
--- a/spec/enterprise/models/sla_event_spec.rb
+++ b/spec/enterprise/models/sla_event_spec.rb
@@ -25,4 +25,37 @@ RSpec.describe SlaEvent, type: :model do
       expect(sla_event.sla_policy_id).to eq sla_event.applied_sla.sla_policy_id
     end
   end
+
+  describe 'create notifications' do
+    # create account, user and inbox
+    let!(:account) { create(:account) }
+    let!(:assignee) { create(:user, account: account) }
+    let!(:participant) { create(:user, account: account) }
+    let!(:admin) { create(:user, account: account, role: :administrator) }
+    let!(:inbox) { create(:inbox, account: account) }
+    let(:conversation) { create(:conversation, inbox: inbox, assignee: assignee, account: account) }
+    let(:sla_policy) { create(:sla_policy, account: conversation.account) }
+    let(:sla_event) { create(:sla_event, event_type: 'frt', conversation: conversation, sla_policy: sla_policy) }
+
+    before do
+      # to ensure notifications are not sent to other users
+      create(:user, account: account)
+      create(:inbox_member, inbox: inbox, user: participant)
+      create(:conversation_participant, conversation: conversation, user: participant)
+    end
+
+    it 'creates notifications for conversation participants, admins, and assignee' do
+      sla_event
+
+      expect(Notification.count).to eq(3)
+      # check if notification type is sla_missed_first_response
+      expect(Notification.where(notification_type: 'sla_missed_first_response').count).to eq(3)
+      # Check if notification is created for the assignee
+      expect(Notification.where(user_id: assignee.id).count).to eq(1)
+      # Check if notification is created for the account admin
+      expect(Notification.where(user_id: admin.id).count).to eq(1)
+      # Check if notification is created for participant
+      expect(Notification.where(user_id: participant.id).count).to eq(1)
+    end
+  end
 end
diff --git a/spec/enterprise/services/sla/evaluate_applied_sla_service_spec.rb b/spec/enterprise/services/sla/evaluate_applied_sla_service_spec.rb
index 12cb59d35..f6cd657be 100644
--- a/spec/enterprise/services/sla/evaluate_applied_sla_service_spec.rb
+++ b/spec/enterprise/services/sla/evaluate_applied_sla_service_spec.rb
@@ -3,8 +3,6 @@ require 'rails_helper'
 RSpec.describe Sla::EvaluateAppliedSlaService do
   let!(:account) { create(:account) }
   let!(:user_1) { create(:user, account: account) }
-  let!(:user_2) { create(:user, account: account) }
-  let!(:admin) { create(:user, account: account, role: :administrator) }
 
   let!(:sla_policy) do
     create(:sla_policy,
@@ -28,19 +26,17 @@ RSpec.describe Sla::EvaluateAppliedSlaService do
       it 'updates the SLA status to missed and logs a warning' do
         allow(Rails.logger).to receive(:warn)
         described_class.new(applied_sla: applied_sla).perform
-        expect(Rails.logger).to have_received(:warn).with("SLA missed for conversation #{conversation.id} in account " \
+        expect(Rails.logger).to have_received(:warn).with("SLA frt missed for conversation #{conversation.id} in account " \
                                                           "#{applied_sla.account_id} for sla_policy #{sla_policy.id}")
-        expect(applied_sla.reload.sla_status).to eq('missed')
+        expect(applied_sla.reload.sla_status).to eq('active_with_misses')
+      end
 
-        expect(Notification.count).to eq(2)
-        # check if notification type is sla_missed_first_response
-        expect(Notification.where(notification_type: 'sla_missed_first_response').count).to eq(2)
-        # Check if notification is created for the assignee
-        expect(Notification.where(user_id: user_1.id).count).to eq(1)
-        # Check if notification is created for the account admin
-        expect(Notification.where(user_id: admin.id).count).to eq(1)
-        # Check if no notification is created for other user
-        expect(Notification.where(user_id: user_2.id).count).to eq(0)
+      it 'creates SlaEvent only for frt miss' do
+        described_class.new(applied_sla: applied_sla).perform
+
+        expect(SlaEvent.where(applied_sla: applied_sla, event_type: 'frt').count).to eq(1)
+        expect(SlaEvent.where(applied_sla: applied_sla, event_type: 'nrt').count).to eq(0)
+        expect(SlaEvent.where(applied_sla: applied_sla, event_type: 'rt').count).to eq(0)
       end
     end
 
@@ -53,19 +49,17 @@ RSpec.describe Sla::EvaluateAppliedSlaService do
       it 'updates the SLA status to missed and logs a warning' do
         allow(Rails.logger).to receive(:warn)
         described_class.new(applied_sla: applied_sla).perform
-        expect(Rails.logger).to have_received(:warn).with("SLA missed for conversation #{conversation.id} in account " \
+        expect(Rails.logger).to have_received(:warn).with("SLA nrt missed for conversation #{conversation.id} in account " \
                                                           "#{applied_sla.account_id} for sla_policy #{sla_policy.id}")
-        expect(applied_sla.reload.sla_status).to eq('missed')
+        expect(applied_sla.reload.sla_status).to eq('active_with_misses')
+      end
 
-        expect(Notification.count).to eq(2)
-        # check if notification type is sla_missed_first_response
-        expect(Notification.where(notification_type: 'sla_missed_next_response').count).to eq(2)
-        # Check if notification is created for the assignee
-        expect(Notification.where(user_id: user_1.id).count).to eq(1)
-        # Check if notification is created for the account admin
-        expect(Notification.where(user_id: admin.id).count).to eq(1)
-        # Check if no notification is created for other user
-        expect(Notification.where(user_id: user_2.id).count).to eq(0)
+      it 'creates SlaEvent only for nrt miss' do
+        described_class.new(applied_sla: applied_sla).perform
+
+        expect(SlaEvent.where(applied_sla: applied_sla, event_type: 'frt').count).to eq(0)
+        expect(SlaEvent.where(applied_sla: applied_sla, event_type: 'nrt').count).to eq(1)
+        expect(SlaEvent.where(applied_sla: applied_sla, event_type: 'rt').count).to eq(0)
       end
     end
 
@@ -75,18 +69,18 @@ RSpec.describe Sla::EvaluateAppliedSlaService do
       it 'updates the SLA status to missed and logs a warning' do
         allow(Rails.logger).to receive(:warn)
         described_class.new(applied_sla: applied_sla).perform
-        expect(Rails.logger).to have_received(:warn).with("SLA missed for conversation #{conversation.id} in account " \
+        expect(Rails.logger).to have_received(:warn).with("SLA rt missed for conversation #{conversation.id} in account " \
                                                           "#{applied_sla.account_id} for sla_policy #{sla_policy.id}")
-        expect(applied_sla.reload.sla_status).to eq('missed')
 
-        expect(Notification.count).to eq(2)
-        expect(Notification.where(notification_type: 'sla_missed_resolution').count).to eq(2)
-        # Check if notification is created for the assignee
-        expect(Notification.where(user_id: user_1.id).count).to eq(1)
-        # Check if notification is created for the account admin
-        expect(Notification.where(user_id: admin.id).count).to eq(1)
-        # Check if no notification is created for other user
-        expect(Notification.where(user_id: user_2.id).count).to eq(0)
+        expect(applied_sla.reload.sla_status).to eq('active_with_misses')
+      end
+
+      it 'creates SlaEvent only for rt miss' do
+        described_class.new(applied_sla: applied_sla).perform
+
+        expect(SlaEvent.where(applied_sla: applied_sla, event_type: 'frt').count).to eq(0)
+        expect(SlaEvent.where(applied_sla: applied_sla, event_type: 'nrt').count).to eq(0)
+        expect(SlaEvent.where(applied_sla: applied_sla, event_type: 'rt').count).to eq(1)
       end
     end
 
@@ -110,13 +104,14 @@ RSpec.describe Sla::EvaluateAppliedSlaService do
         conversation.update(first_reply_created_at: 5.hours.ago, waiting_since: 5.hours.ago)
       end
 
-      it 'updates the SLA status to missed and logs a warning' do
+      it 'updates the SLA status to missed and logs multiple warnings' do
         allow(Rails.logger).to receive(:warn)
         described_class.new(applied_sla: applied_sla).perform
-        expect(Rails.logger).to have_received(:warn).with("SLA missed for conversation #{conversation.id} in account " \
+        expect(Rails.logger).to have_received(:warn).with("SLA rt missed for conversation #{conversation.id} in account " \
                                                           "#{applied_sla.account_id} for sla_policy #{sla_policy.id}").exactly(1).time
-        expect(applied_sla.reload.sla_status).to eq('missed')
-        expect(Notification.count).to eq(2)
+        expect(Rails.logger).to have_received(:warn).with("SLA nrt missed for conversation #{conversation.id} in account " \
+                                                          "#{applied_sla.account_id} for sla_policy #{sla_policy.id}").exactly(1).time
+        expect(applied_sla.reload.sla_status).to eq('active_with_misses')
       end
     end
   end
@@ -140,6 +135,7 @@ RSpec.describe Sla::EvaluateAppliedSlaService do
         expect(Rails.logger).to have_received(:info).with("SLA hit for conversation #{conversation.id} in account " \
                                                           "#{applied_sla.account_id} for sla_policy #{sla_policy.id}")
         expect(applied_sla.reload.sla_status).to eq('hit')
+        expect(SlaEvent.count).to eq(0)
         expect(Notification.count).to eq(0)
       end
     end
@@ -162,6 +158,7 @@ RSpec.describe Sla::EvaluateAppliedSlaService do
         expect(Rails.logger).to have_received(:info).with("SLA hit for conversation #{conversation.id} in account " \
                                                           "#{applied_sla.account_id} for sla_policy #{sla_policy.id}")
         expect(applied_sla.reload.sla_status).to eq('hit')
+        expect(SlaEvent.count).to eq(0)
       end
     end
 
@@ -177,7 +174,52 @@ RSpec.describe Sla::EvaluateAppliedSlaService do
         expect(Rails.logger).to have_received(:info).with("SLA hit for conversation #{conversation.id} in account " \
                                                           "#{applied_sla.account_id} for sla_policy #{sla_policy.id}")
         expect(applied_sla.reload.sla_status).to eq('hit')
+        expect(SlaEvent.count).to eq(0)
       end
     end
   end
+
+  describe 'SLA evaluation with frt hit, multiple nrt misses and rt miss' do
+    before do
+      # Setup SLA Policy thresholds
+      sla_policy.update(
+        first_response_time_threshold: 2.hours, # Hit frt
+        next_response_time_threshold: 1.hour, # Miss nrt multiple times
+        resolution_time_threshold: 4.hours # Miss rt
+      )
+
+      # Simulate conversation timeline
+      # Hit frt
+      # incoming message from customer
+      create(:message, conversation: conversation, created_at: 6.hours.ago, message_type: :incoming)
+      # outgoing message from agent within frt
+      create(:message, conversation: conversation, created_at: 5.hours.ago, message_type: :outgoing)
+
+      # Miss nrt first time
+      create(:message, conversation: conversation, created_at: 4.hours.ago, message_type: :incoming)
+      described_class.new(applied_sla: applied_sla).perform
+
+      # Miss nrt second time
+      create(:message, conversation: conversation, created_at: 3.hours.ago, message_type: :incoming)
+      described_class.new(applied_sla: applied_sla).perform
+
+      # Conversation is resolved missing rt
+      conversation.update(status: 'resolved')
+
+      # this will not create a new notification for rt miss as conversation is resolved
+      # but we would have already created an rt miss notification during previous evaluation
+      described_class.new(applied_sla: applied_sla).perform
+    end
+
+    it 'updates the SLA status to missed' do
+      # the status would be missed as the conversation is resolved
+      expect(applied_sla.reload.sla_status).to eq('missed')
+    end
+
+    it 'creates necessary sla events' do
+      expect(SlaEvent.where(applied_sla: applied_sla, event_type: 'frt').count).to eq(0)
+      expect(SlaEvent.where(applied_sla: applied_sla, event_type: 'nrt').count).to eq(2)
+      expect(SlaEvent.where(applied_sla: applied_sla, event_type: 'rt').count).to eq(1)
+    end
+  end
 end