diff --git a/.husky/pre-commit b/.husky/pre-commit
index 2525dde4e..adda426ad 100755
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -1,11 +1,11 @@
-# #!/bin/sh
-# . "$(dirname "$0")/_/husky.sh"
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
 
-# # lint js and vue files
-# npx --no-install lint-staged
+# lint js and vue files
+npx --no-install lint-staged
 
-# # lint only staged ruby files
-# git diff --name-only --cached | xargs ls -1 2>/dev/null | grep '\.rb$' | xargs bundle exec rubocop --force-exclusion -a
+# lint only staged ruby files
+git diff --name-only --cached | xargs ls -1 2>/dev/null | grep '\.rb$' | xargs bundle exec rubocop --force-exclusion -a
 
-# # stage rubocop changes to files
-# git diff --name-only --cached | xargs git add
+# stage rubocop changes to files
+git diff --name-only --cached | xargs git add
diff --git a/Gemfile b/Gemfile
index 45e194e13..e8639a5bd 100644
--- a/Gemfile
+++ b/Gemfile
@@ -94,7 +94,7 @@ gem 'twitty', '~> 0.1.5'
 # facebook client
 gem 'koala'
 # slack client
-gem 'slack-ruby-client', '~> 2.2.0'
+gem 'slack-ruby-client', '~> 2.5.1'
 # for dialogflow integrations
 gem 'google-cloud-dialogflow-v2', '>= 0.24.0'
 gem 'grpc'
@@ -138,9 +138,7 @@ gem 'procore-sift'
 # parse email
 gem 'email_reply_trimmer'
 
-# TODO: we might have to fork this gem since 0.3.1 has hard depency on nokogir 1.10.
-# and this gem hasn't been updated for a while.
-gem 'html2text', git: 'https://github.com/chatwoot/html2text_ruby', branch: 'chatwoot'
+gem 'html2text'
 
 # to calculate working hours
 gem 'working_hours'
diff --git a/Gemfile.lock b/Gemfile.lock
index fa45d1e89..080883b67 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -22,14 +22,6 @@ GIT
       devise (>= 4.0.0, < 5.0.0)
       railties (>= 5.0.0, < 8.0.0)
 
-GIT
-  remote: https://github.com/chatwoot/html2text_ruby
-  revision: cdbdbbbf898d846d0136d69d688a003c6b26074b
-  branch: chatwoot
-  specs:
-    html2text (0.3.1)
-      nokogiri (>= 1.13.6)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -280,7 +272,8 @@ GEM
       googleauth (~> 1.0)
       grpc (~> 1.36)
     geocoder (1.8.1)
-    gli (2.21.1)
+    gli (2.22.2)
+      ostruct
     globalid (1.2.1)
       activesupport (>= 6.1)
     gmail_xoauth (0.4.3)
@@ -361,6 +354,8 @@ GEM
     hana (1.3.7)
     hashdiff (1.1.0)
     hashie (5.0.0)
+    html2text (0.4.0)
+      nokogiri (>= 1.0, < 2.0)
     http (5.1.1)
       addressable (~> 2.8)
       http-cookie (~> 1.0)
@@ -503,14 +498,14 @@ GEM
     newrelic_rpm (9.6.0)
       base64
     nio4r (2.7.3)
-    nokogiri (1.17.1)
+    nokogiri (1.18.2)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.17.1-arm64-darwin)
+    nokogiri (1.18.2-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.17.1-x86_64-darwin)
+    nokogiri (1.18.2-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.17.1-x86_64-linux)
+    nokogiri (1.18.2-x86_64-linux-gnu)
       racc (~> 1.4)
     oauth (1.1.0)
       oauth-tty (~> 1.0, >= 1.0.1)
@@ -543,6 +538,7 @@ GEM
     openssl (3.2.0)
     orm_adapter (0.5.0)
     os (1.1.4)
+    ostruct (0.6.1)
     parallel (1.23.0)
     parser (3.2.2.1)
       ast (~> 2.4.1)
@@ -565,7 +561,7 @@ GEM
       activesupport (>= 3.0.0)
     raabro (1.4.0)
     racc (1.8.1)
-    rack (2.2.10)
+    rack (2.2.11)
     rack-attack (6.7.0)
       rack (>= 1.0, < 4)
     rack-contrib (2.5.0)
@@ -751,12 +747,13 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    slack-ruby-client (2.2.0)
+    slack-ruby-client (2.5.1)
       faraday (>= 2.0)
       faraday-mashify
       faraday-multipart
       gli
       hashie
+      logger
     snaky_hash (2.0.1)
       hashie
       version_gem (~> 1.1, >= 1.1.1)
@@ -897,7 +894,7 @@ DEPENDENCIES
   haikunator
   hairtrigger
   hashie
-  html2text!
+  html2text
   image_processing
   jbuilder
   json_refs
@@ -957,7 +954,7 @@ DEPENDENCIES
   sidekiq (>= 7.3.1)
   sidekiq-cron (>= 1.12.0)
   simplecov (= 0.17.1)
-  slack-ruby-client (~> 2.2.0)
+  slack-ruby-client (~> 2.5.1)
   spring
   spring-watcher-listen
   squasher
diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb
index 6ddaab73b..f63e8f6bf 100644
--- a/app/controllers/dashboard_controller.rb
+++ b/app/controllers/dashboard_controller.rb
@@ -7,13 +7,17 @@ class DashboardController < ActionController::Base
   around_action :switch_locale
   before_action :ensure_installation_onboarding, only: [:index]
   before_action :render_hc_if_custom_domain, only: [:index]
-
+  before_action :ensure_html_format
   layout 'vueapp'
 
   def index; end
 
   private
 
+  def ensure_html_format
+    head :not_acceptable unless request.format.html?
+  end
+
   def set_global_config
     @global_config = GlobalConfig.get(
       'LOGO', 'LOGO_DARK', 'LOGO_THUMBNAIL',
diff --git a/app/helpers/super_admin/account_features_helper.rb b/app/helpers/super_admin/account_features_helper.rb
index 759aec134..515c82000 100644
--- a/app/helpers/super_admin/account_features_helper.rb
+++ b/app/helpers/super_admin/account_features_helper.rb
@@ -6,4 +6,14 @@ module SuperAdmin::AccountFeaturesHelper
   def self.account_premium_features
     account_features.filter { |feature| feature['premium'] }.pluck('name')
   end
+
+  # Accepts account.features as argument
+  def self.filtered_features(features)
+    deployment_env = GlobalConfig.get_value('DEPLOYMENT_ENV')
+    return features if deployment_env == 'cloud'
+
+    # Filter out internal features for non-cloud environments
+    internal_features = account_features.select { |f| f['chatwoot_internal'] }.pluck('name')
+    features.except(*internal_features)
+  end
 end
diff --git a/app/javascript/dashboard/components-next/Campaigns/Pages/CampaignPage/LiveChatCampaign/LiveChatCampaignDialog.vue b/app/javascript/dashboard/components-next/Campaigns/Pages/CampaignPage/LiveChatCampaign/LiveChatCampaignDialog.vue
index 2c4b9848c..ea76c6130 100644
--- a/app/javascript/dashboard/components-next/Campaigns/Pages/CampaignPage/LiveChatCampaign/LiveChatCampaignDialog.vue
+++ b/app/javascript/dashboard/components-next/Campaigns/Pages/CampaignPage/LiveChatCampaign/LiveChatCampaignDialog.vue
@@ -21,11 +21,11 @@ const addCampaign = async campaignDetails => {
       type: CAMPAIGN_TYPES.ONGOING,
     });
 
-    useAlert(t('CAMPAIGN.SMS.CREATE.FORM.API.SUCCESS_MESSAGE'));
+    useAlert(t('CAMPAIGN.LIVE_CHAT.CREATE.FORM.API.SUCCESS_MESSAGE'));
   } catch (error) {
     const errorMessage =
       error?.response?.message ||
-      t('CAMPAIGN.SMS.CREATE.FORM.API.ERROR_MESSAGE');
+      t('CAMPAIGN.LIVE_CHAT.CREATE.FORM.API.ERROR_MESSAGE');
     useAlert(errorMessage);
   }
 };
diff --git a/app/javascript/dashboard/components-next/Contacts/ContactsDetailsLayout.vue b/app/javascript/dashboard/components-next/Contacts/ContactsDetailsLayout.vue
index ad007af1c..57c4ba7c8 100644
--- a/app/javascript/dashboard/components-next/Contacts/ContactsDetailsLayout.vue
+++ b/app/javascript/dashboard/components-next/Contacts/ContactsDetailsLayout.vue
@@ -8,17 +8,17 @@ import Breadcrumb from 'dashboard/components-next/breadcrumb/Breadcrumb.vue';
 import ComposeConversation from 'dashboard/components-next/NewConversation/ComposeConversation.vue';
 
 const props = defineProps({
-  buttonLabel: {
-    type: String,
-    default: '',
-  },
   selectedContact: {
     type: Object,
     default: () => ({}),
   },
+  isUpdating: {
+    type: Boolean,
+    default: false,
+  },
 });
 
-const emit = defineEmits(['goToContactsList']);
+const emit = defineEmits(['goToContactsList', 'toggleBlock']);
 
 const { t } = useI18n();
 const slots = useSlots();
@@ -45,9 +45,17 @@ const breadcrumbItems = computed(() => {
   return items;
 });
 
+const isContactBlocked = computed(() => {
+  return props.selectedContact?.blocked;
+});
+
 const handleBreadcrumbClick = () => {
   emit('goToContactsList');
 };
+
+const toggleBlock = () => {
+  emit('toggleBlock', isContactBlocked.value);
+};
 </script>
 
 <template>
@@ -64,11 +72,29 @@ const handleBreadcrumbClick = () => {
               :items="breadcrumbItems"
               @click="handleBreadcrumbClick"
             />
-            <ComposeConversation :contact-id="contactId">
-              <template #trigger="{ toggle }">
-                <Button :label="buttonLabel" size="sm" @click="toggle" />
-              </template>
-            </ComposeConversation>
+            <div class="flex items-center gap-2">
+              <Button
+                :label="
+                  !isContactBlocked
+                    ? $t('CONTACTS_LAYOUT.HEADER.BLOCK_CONTACT')
+                    : $t('CONTACTS_LAYOUT.HEADER.UNBLOCK_CONTACT')
+                "
+                size="sm"
+                slate
+                :is-loading="isUpdating"
+                :disabled="isUpdating"
+                @click="toggleBlock"
+              />
+              <ComposeConversation :contact-id="contactId">
+                <template #trigger="{ toggle }">
+                  <Button
+                    :label="$t('CONTACTS_LAYOUT.HEADER.SEND_MESSAGE')"
+                    size="sm"
+                    @click="toggle"
+                  />
+                </template>
+              </ComposeConversation>
+            </div>
           </div>
         </div>
       </header>
diff --git a/app/javascript/dashboard/components-next/message/bubbles/Dyte.vue b/app/javascript/dashboard/components-next/message/bubbles/Dyte.vue
index 61d3cf31d..71d60b28f 100644
--- a/app/javascript/dashboard/components-next/message/bubbles/Dyte.vue
+++ b/app/javascript/dashboard/components-next/message/bubbles/Dyte.vue
@@ -9,7 +9,7 @@ import { useI18n } from 'vue-i18n';
 import { useMessageContext } from '../provider.js';
 import BaseAttachmentBubble from './BaseAttachment.vue';
 
-const { content, sender, contentAttributes } = useMessageContext();
+const { content, sender, contentAttributes, id } = useMessageContext();
 
 const { t } = useI18n();
 
@@ -28,7 +28,7 @@ const joinTheCall = async () => {
   isLoading.value = true;
   try {
     const { data: { authResponse: { authToken } = {} } = {} } =
-      await DyteAPI.addParticipantToMeeting(meetingData.value.messageId);
+      await DyteAPI.addParticipantToMeeting(id.value);
     dyteAuthToken.value = authToken;
   } catch (err) {
     useAlert(t('INTEGRATION_SETTINGS.DYTE.JOIN_ERROR'));
@@ -53,7 +53,7 @@ const action = computed(() => ({
     sender-translation-key="CONVERSATION.SHARED_ATTACHMENT.MEETING"
     :action="action"
   >
-    <div v-if="!sender" class="text-n-slate-12 text-sm truncate">
+    <div v-if="!sender" class="text-sm truncate text-n-slate-12">
       <!-- Added as a fallback, where the sender is not available (Deleted) -->
       <!-- Will show the content, if senderName in BaseAttachment.vue is empty -->
       {{ content }}
@@ -64,7 +64,7 @@ const action = computed(() => ({
         allow="camera;microphone;fullscreen;display-capture;picture-in-picture;clipboard-write;"
       />
       <button
-        class="bg-n-solid-3 px-4 py-2 rounded-lg text-sm"
+        class="px-4 py-2 text-sm rounded-lg bg-n-solid-3"
         @click="leaveTheRoom"
       >
         {{ $t('INTEGRATION_SETTINGS.DYTE.LEAVE_THE_ROOM') }}
diff --git a/app/javascript/dashboard/components-next/message/bubbles/Email/Index.vue b/app/javascript/dashboard/components-next/message/bubbles/Email/Index.vue
index 4d0658ed2..37c4f77d7 100644
--- a/app/javascript/dashboard/components-next/message/bubbles/Email/Index.vue
+++ b/app/javascript/dashboard/components-next/message/bubbles/Email/Index.vue
@@ -1,6 +1,7 @@
 <script setup>
 import { computed, useTemplateRef, ref, onMounted } from 'vue';
 import { Letter } from 'vue-letter';
+import { allowedCssProperties } from 'lettersanitizer';
 
 import Icon from 'next/icon/Icon.vue';
 import { EmailQuoteExtractor } from './removeReply.js';
@@ -29,8 +30,15 @@ const isOutgoing = computed(() => {
 });
 const isIncoming = computed(() => !isOutgoing.value);
 
+const textToShow = computed(() => {
+  const text =
+    contentAttributes?.value?.email?.textContent?.full ?? content.value;
+  return text?.replace(/\n/g, '<br>');
+});
+
+// Use TextContent as the default to fullHTML
 const fullHTML = computed(() => {
-  return contentAttributes?.value?.email?.htmlContent?.full ?? content.value;
+  return contentAttributes?.value?.email?.htmlContent?.full ?? textToShow.value;
 });
 
 const unquotedHTML = computed(() => {
@@ -40,12 +48,6 @@ const unquotedHTML = computed(() => {
 const hasQuotedMessage = computed(() => {
   return EmailQuoteExtractor.hasQuotes(fullHTML.value);
 });
-
-const textToShow = computed(() => {
-  const text =
-    contentAttributes?.value?.email?.textContent?.full ?? content.value;
-  return text?.replace(/\n/g, '<br>');
-});
 </script>
 
 <template>
@@ -92,6 +94,11 @@ const textToShow = computed(() => {
           <Letter
             v-if="showQuotedMessage"
             class-name="prose prose-bubble !max-w-none"
+            :allowed-css-properties="[
+              ...allowedCssProperties,
+              'transform',
+              'transform-origin',
+            ]"
             :html="fullHTML"
             :text="textToShow"
           />
@@ -99,6 +106,11 @@ const textToShow = computed(() => {
             v-else
             class-name="prose prose-bubble !max-w-none"
             :html="unquotedHTML"
+            :allowed-css-properties="[
+              ...allowedCssProperties,
+              'transform',
+              'transform-origin',
+            ]"
             :text="textToShow"
           />
         </template>
diff --git a/app/javascript/dashboard/components-next/sidebar/SidebarProfileMenu.vue b/app/javascript/dashboard/components-next/sidebar/SidebarProfileMenu.vue
index ba6d84ad1..dcf44b2dc 100644
--- a/app/javascript/dashboard/components-next/sidebar/SidebarProfileMenu.vue
+++ b/app/javascript/dashboard/components-next/sidebar/SidebarProfileMenu.vue
@@ -5,6 +5,7 @@ import { useMapGetter } from 'dashboard/composables/store';
 import { useI18n } from 'vue-i18n';
 import Avatar from 'next/avatar/Avatar.vue';
 import SidebarProfileMenuStatus from './SidebarProfileMenuStatus.vue';
+import { FEATURE_FLAGS } from 'dashboard/featureFlags';
 
 import {
   DropdownContainer,
@@ -21,14 +22,27 @@ defineOptions({
 
 const { t } = useI18n();
 
-const globalConfig = useMapGetter('globalConfig/get');
 const currentUser = useMapGetter('getCurrentUser');
 const currentUserAvailability = useMapGetter('getCurrentUserAvailability');
+const accountId = useMapGetter('getCurrentAccountId');
+const globalConfig = useMapGetter('globalConfig/get');
+const isFeatureEnabledonAccount = useMapGetter(
+  'accounts/isFeatureEnabledonAccount'
+);
+
+const showChatSupport = computed(() => {
+  return (
+    isFeatureEnabledonAccount.value(
+      accountId.value,
+      FEATURE_FLAGS.CONTACT_CHATWOOT_SUPPORT_TEAM
+    ) && globalConfig.value.chatwootInboxToken
+  );
+});
 
 const menuItems = computed(() => {
   return [
     {
-      show: !!globalConfig.value.chatwootInboxToken,
+      show: showChatSupport.value,
       label: t('SIDEBAR_ITEMS.CONTACT_SUPPORT'),
       icon: 'i-lucide-life-buoy',
       click: () => {
diff --git a/app/javascript/dashboard/components/layout/sidebarComponents/OptionsMenu.vue b/app/javascript/dashboard/components/layout/sidebarComponents/OptionsMenu.vue
index 73364f195..4c1367957 100644
--- a/app/javascript/dashboard/components/layout/sidebarComponents/OptionsMenu.vue
+++ b/app/javascript/dashboard/components/layout/sidebarComponents/OptionsMenu.vue
@@ -4,6 +4,7 @@ import Auth from '../../../api/auth';
 import WootDropdownItem from 'shared/components/ui/dropdown/DropdownItem.vue';
 import WootDropdownMenu from 'shared/components/ui/dropdown/DropdownMenu.vue';
 import AvailabilityStatus from 'dashboard/components/layout/AvailabilityStatus.vue';
+import { FEATURE_FLAGS } from '../../../featureFlags';
 
 export default {
   components: {
@@ -28,6 +29,7 @@ export default {
       currentUser: 'getCurrentUser',
       globalConfig: 'globalConfig/get',
       accountId: 'getCurrentAccountId',
+      isFeatureEnabledonAccount: 'accounts/isFeatureEnabledonAccount',
     }),
     showChangeAccountOption() {
       if (this.globalConfig.createNewAccountFromDashboard) {
@@ -37,6 +39,14 @@ export default {
       const { accounts = [] } = this.currentUser;
       return accounts.length > 1;
     },
+    showChatSupport() {
+      return (
+        this.isFeatureEnabledonAccount(
+          this.accountId,
+          FEATURE_FLAGS.CONTACT_CHATWOOT_SUPPORT_TEAM
+        ) && this.globalConfig.chatwootInboxToken
+      );
+    },
   },
   methods: {
     handleProfileSettingClick(e, navigate) {
@@ -82,7 +92,7 @@ export default {
             {{ $t('SIDEBAR_ITEMS.CHANGE_ACCOUNTS') }}
           </woot-button>
         </WootDropdownItem>
-        <WootDropdownItem v-if="globalConfig.chatwootInboxToken">
+        <WootDropdownItem v-if="showChatSupport">
           <woot-button
             variant="clear"
             color-scheme="secondary"
diff --git a/app/javascript/dashboard/featureFlags.js b/app/javascript/dashboard/featureFlags.js
index 094fbfa27..0695be473 100644
--- a/app/javascript/dashboard/featureFlags.js
+++ b/app/javascript/dashboard/featureFlags.js
@@ -34,4 +34,5 @@ export const FEATURE_FLAGS = {
   CUSTOM_ROLES: 'custom_roles',
   CHATWOOT_V4: 'chatwoot_v4',
   REPORT_V4: 'report_v4',
+  CONTACT_CHATWOOT_SUPPORT_TEAM: 'contact_chatwoot_support_team',
 };
diff --git a/app/javascript/dashboard/helper/scriptHelpers.js b/app/javascript/dashboard/helper/scriptHelpers.js
index 55ad6eb13..cb9bffbea 100644
--- a/app/javascript/dashboard/helper/scriptHelpers.js
+++ b/app/javascript/dashboard/helper/scriptHelpers.js
@@ -8,6 +8,7 @@ import DashboardAudioNotificationHelper from './AudioAlerts/DashboardAudioNotifi
 import { emitter } from 'shared/helpers/mitt';
 
 export const initializeAnalyticsEvents = () => {
+  AnalyticsHelper.init();
   emitter.on(ANALYTICS_IDENTITY, ({ user }) => {
     AnalyticsHelper.identify(user);
   });
diff --git a/app/javascript/dashboard/i18n/locale/am/index.js b/app/javascript/dashboard/i18n/locale/am/index.js
new file mode 100644
index 000000000..213387d0c
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/am/index.js
@@ -0,0 +1,77 @@
+import advancedFilters from './advancedFilters.json';
+import agentBots from './agentBots.json';
+import agentMgmt from './agentMgmt.json';
+import attributesMgmt from './attributesMgmt.json';
+import auditLogs from './auditLogs.json';
+import automation from './automation.json';
+import bulkActions from './bulkActions.json';
+import campaign from './campaign.json';
+import cannedMgmt from './cannedMgmt.json';
+import chatlist from './chatlist.json';
+import components from './components.json';
+import contact from './contact.json';
+import contactFilters from './contactFilters.json';
+import conversation from './conversation.json';
+import csatMgmt from './csatMgmt.json';
+import customRole from './customRole.json';
+import datePicker from './datePicker.json';
+import emoji from './emoji.json';
+import general from './general.json';
+import generalSettings from './generalSettings.json';
+import helpCenter from './helpCenter.json';
+import inbox from './inbox.json';
+import inboxMgmt from './inboxMgmt.json';
+import integrationApps from './integrationApps.json';
+import integrations from './integrations.json';
+import labelsMgmt from './labelsMgmt.json';
+import login from './login.json';
+import macros from './macros.json';
+import report from './report.json';
+import resetPassword from './resetPassword.json';
+import search from './search.json';
+import setNewPassword from './setNewPassword.json';
+import settings from './settings.json';
+import signup from './signup.json';
+import sla from './sla.json';
+import teamsSettings from './teamsSettings.json';
+import whatsappTemplates from './whatsappTemplates.json';
+
+export default {
+  ...advancedFilters,
+  ...agentBots,
+  ...agentMgmt,
+  ...attributesMgmt,
+  ...auditLogs,
+  ...automation,
+  ...bulkActions,
+  ...campaign,
+  ...cannedMgmt,
+  ...chatlist,
+  ...components,
+  ...contact,
+  ...contactFilters,
+  ...conversation,
+  ...csatMgmt,
+  ...customRole,
+  ...datePicker,
+  ...emoji,
+  ...general,
+  ...generalSettings,
+  ...helpCenter,
+  ...inbox,
+  ...inboxMgmt,
+  ...integrationApps,
+  ...integrations,
+  ...labelsMgmt,
+  ...login,
+  ...macros,
+  ...report,
+  ...resetPassword,
+  ...search,
+  ...setNewPassword,
+  ...settings,
+  ...signup,
+  ...sla,
+  ...teamsSettings,
+  ...whatsappTemplates,
+};
diff --git a/app/javascript/dashboard/i18n/locale/ar/index.js b/app/javascript/dashboard/i18n/locale/ar/index.js
index 434e50e1d..213387d0c 100644
--- a/app/javascript/dashboard/i18n/locale/ar/index.js
+++ b/app/javascript/dashboard/i18n/locale/ar/index.js
@@ -8,13 +8,18 @@ import bulkActions from './bulkActions.json';
 import campaign from './campaign.json';
 import cannedMgmt from './cannedMgmt.json';
 import chatlist from './chatlist.json';
+import components from './components.json';
 import contact from './contact.json';
 import contactFilters from './contactFilters.json';
 import conversation from './conversation.json';
 import csatMgmt from './csatMgmt.json';
+import customRole from './customRole.json';
+import datePicker from './datePicker.json';
 import emoji from './emoji.json';
+import general from './general.json';
 import generalSettings from './generalSettings.json';
 import helpCenter from './helpCenter.json';
+import inbox from './inbox.json';
 import inboxMgmt from './inboxMgmt.json';
 import integrationApps from './integrationApps.json';
 import integrations from './integrations.json';
@@ -27,6 +32,7 @@ import search from './search.json';
 import setNewPassword from './setNewPassword.json';
 import settings from './settings.json';
 import signup from './signup.json';
+import sla from './sla.json';
 import teamsSettings from './teamsSettings.json';
 import whatsappTemplates from './whatsappTemplates.json';
 
@@ -41,13 +47,18 @@ export default {
   ...campaign,
   ...cannedMgmt,
   ...chatlist,
+  ...components,
   ...contact,
   ...contactFilters,
   ...conversation,
   ...csatMgmt,
+  ...customRole,
+  ...datePicker,
   ...emoji,
+  ...general,
   ...generalSettings,
   ...helpCenter,
+  ...inbox,
   ...inboxMgmt,
   ...integrationApps,
   ...integrations,
@@ -60,6 +71,7 @@ export default {
   ...setNewPassword,
   ...settings,
   ...signup,
+  ...sla,
   ...teamsSettings,
   ...whatsappTemplates,
 };
diff --git a/app/javascript/dashboard/i18n/locale/az/index.js b/app/javascript/dashboard/i18n/locale/az/index.js
new file mode 100644
index 000000000..213387d0c
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/az/index.js
@@ -0,0 +1,77 @@
+import advancedFilters from './advancedFilters.json';
+import agentBots from './agentBots.json';
+import agentMgmt from './agentMgmt.json';
+import attributesMgmt from './attributesMgmt.json';
+import auditLogs from './auditLogs.json';
+import automation from './automation.json';
+import bulkActions from './bulkActions.json';
+import campaign from './campaign.json';
+import cannedMgmt from './cannedMgmt.json';
+import chatlist from './chatlist.json';
+import components from './components.json';
+import contact from './contact.json';
+import contactFilters from './contactFilters.json';
+import conversation from './conversation.json';
+import csatMgmt from './csatMgmt.json';
+import customRole from './customRole.json';
+import datePicker from './datePicker.json';
+import emoji from './emoji.json';
+import general from './general.json';
+import generalSettings from './generalSettings.json';
+import helpCenter from './helpCenter.json';
+import inbox from './inbox.json';
+import inboxMgmt from './inboxMgmt.json';
+import integrationApps from './integrationApps.json';
+import integrations from './integrations.json';
+import labelsMgmt from './labelsMgmt.json';
+import login from './login.json';
+import macros from './macros.json';
+import report from './report.json';
+import resetPassword from './resetPassword.json';
+import search from './search.json';
+import setNewPassword from './setNewPassword.json';
+import settings from './settings.json';
+import signup from './signup.json';
+import sla from './sla.json';
+import teamsSettings from './teamsSettings.json';
+import whatsappTemplates from './whatsappTemplates.json';
+
+export default {
+  ...advancedFilters,
+  ...agentBots,
+  ...agentMgmt,
+  ...attributesMgmt,
+  ...auditLogs,
+  ...automation,
+  ...bulkActions,
+  ...campaign,
+  ...cannedMgmt,
+  ...chatlist,
+  ...components,
+  ...contact,
+  ...contactFilters,
+  ...conversation,
+  ...csatMgmt,
+  ...customRole,
+  ...datePicker,
+  ...emoji,
+  ...general,
+  ...generalSettings,
+  ...helpCenter,
+  ...inbox,
+  ...inboxMgmt,
+  ...integrationApps,
+  ...integrations,
+  ...labelsMgmt,
+  ...login,
+  ...macros,
+  ...report,
+  ...resetPassword,
+  ...search,
+  ...setNewPassword,
+  ...settings,
+  ...signup,
+  ...sla,
+  ...teamsSettings,
+  ...whatsappTemplates,
+};
diff --git a/app/javascript/dashboard/i18n/locale/bg/index.js b/app/javascript/dashboard/i18n/locale/bg/index.js
index 434e50e1d..213387d0c 100644
--- a/app/javascript/dashboard/i18n/locale/bg/index.js
+++ b/app/javascript/dashboard/i18n/locale/bg/index.js
@@ -8,13 +8,18 @@ import bulkActions from './bulkActions.json';
 import campaign from './campaign.json';
 import cannedMgmt from './cannedMgmt.json';
 import chatlist from './chatlist.json';
+import components from './components.json';
 import contact from './contact.json';
 import contactFilters from './contactFilters.json';
 import conversation from './conversation.json';
 import csatMgmt from './csatMgmt.json';
+import customRole from './customRole.json';
+import datePicker from './datePicker.json';
 import emoji from './emoji.json';
+import general from './general.json';
 import generalSettings from './generalSettings.json';
 import helpCenter from './helpCenter.json';
+import inbox from './inbox.json';
 import inboxMgmt from './inboxMgmt.json';
 import integrationApps from './integrationApps.json';
 import integrations from './integrations.json';
@@ -27,6 +32,7 @@ import search from './search.json';
 import setNewPassword from './setNewPassword.json';
 import settings from './settings.json';
 import signup from './signup.json';
+import sla from './sla.json';
 import teamsSettings from './teamsSettings.json';
 import whatsappTemplates from './whatsappTemplates.json';
 
@@ -41,13 +47,18 @@ export default {
   ...campaign,
   ...cannedMgmt,
   ...chatlist,
+  ...components,
   ...contact,
   ...contactFilters,
   ...conversation,
   ...csatMgmt,
+  ...customRole,
+  ...datePicker,
   ...emoji,
+  ...general,
   ...generalSettings,
   ...helpCenter,
+  ...inbox,
   ...inboxMgmt,
   ...integrationApps,
   ...integrations,
@@ -60,6 +71,7 @@ export default {
   ...setNewPassword,
   ...settings,
   ...signup,
+  ...sla,
   ...teamsSettings,
   ...whatsappTemplates,
 };
diff --git a/app/javascript/dashboard/i18n/locale/ca/index.js b/app/javascript/dashboard/i18n/locale/ca/index.js
index 434e50e1d..213387d0c 100644
--- a/app/javascript/dashboard/i18n/locale/ca/index.js
+++ b/app/javascript/dashboard/i18n/locale/ca/index.js
@@ -8,13 +8,18 @@ import bulkActions from './bulkActions.json';
 import campaign from './campaign.json';
 import cannedMgmt from './cannedMgmt.json';
 import chatlist from './chatlist.json';
+import components from './components.json';
 import contact from './contact.json';
 import contactFilters from './contactFilters.json';
 import conversation from './conversation.json';
 import csatMgmt from './csatMgmt.json';
+import customRole from './customRole.json';
+import datePicker from './datePicker.json';
 import emoji from './emoji.json';
+import general from './general.json';
 import generalSettings from './generalSettings.json';
 import helpCenter from './helpCenter.json';
+import inbox from './inbox.json';
 import inboxMgmt from './inboxMgmt.json';
 import integrationApps from './integrationApps.json';
 import integrations from './integrations.json';
@@ -27,6 +32,7 @@ import search from './search.json';
 import setNewPassword from './setNewPassword.json';
 import settings from './settings.json';
 import signup from './signup.json';
+import sla from './sla.json';
 import teamsSettings from './teamsSettings.json';
 import whatsappTemplates from './whatsappTemplates.json';
 
@@ -41,13 +47,18 @@ export default {
   ...campaign,
   ...cannedMgmt,
   ...chatlist,
+  ...components,
   ...contact,
   ...contactFilters,
   ...conversation,
   ...csatMgmt,
+  ...customRole,
+  ...datePicker,
   ...emoji,
+  ...general,
   ...generalSettings,
   ...helpCenter,
+  ...inbox,
   ...inboxMgmt,
   ...integrationApps,
   ...integrations,
@@ -60,6 +71,7 @@ export default {
   ...setNewPassword,
   ...settings,
   ...signup,
+  ...sla,
   ...teamsSettings,
   ...whatsappTemplates,
 };
diff --git a/app/javascript/dashboard/i18n/locale/cs/index.js b/app/javascript/dashboard/i18n/locale/cs/index.js
index 434e50e1d..213387d0c 100644
--- a/app/javascript/dashboard/i18n/locale/cs/index.js
+++ b/app/javascript/dashboard/i18n/locale/cs/index.js
@@ -8,13 +8,18 @@ import bulkActions from './bulkActions.json';
 import campaign from './campaign.json';
 import cannedMgmt from './cannedMgmt.json';
 import chatlist from './chatlist.json';
+import components from './components.json';
 import contact from './contact.json';
 import contactFilters from './contactFilters.json';
 import conversation from './conversation.json';
 import csatMgmt from './csatMgmt.json';
+import customRole from './customRole.json';
+import datePicker from './datePicker.json';
 import emoji from './emoji.json';
+import general from './general.json';
 import generalSettings from './generalSettings.json';
 import helpCenter from './helpCenter.json';
+import inbox from './inbox.json';
 import inboxMgmt from './inboxMgmt.json';
 import integrationApps from './integrationApps.json';
 import integrations from './integrations.json';
@@ -27,6 +32,7 @@ import search from './search.json';
 import setNewPassword from './setNewPassword.json';
 import settings from './settings.json';
 import signup from './signup.json';
+import sla from './sla.json';
 import teamsSettings from './teamsSettings.json';
 import whatsappTemplates from './whatsappTemplates.json';
 
@@ -41,13 +47,18 @@ export default {
   ...campaign,
   ...cannedMgmt,
   ...chatlist,
+  ...components,
   ...contact,
   ...contactFilters,
   ...conversation,
   ...csatMgmt,
+  ...customRole,
+  ...datePicker,
   ...emoji,
+  ...general,
   ...generalSettings,
   ...helpCenter,
+  ...inbox,
   ...inboxMgmt,
   ...integrationApps,
   ...integrations,
@@ -60,6 +71,7 @@ export default {
   ...setNewPassword,
   ...settings,
   ...signup,
+  ...sla,
   ...teamsSettings,
   ...whatsappTemplates,
 };
diff --git a/app/javascript/dashboard/i18n/locale/da/index.js b/app/javascript/dashboard/i18n/locale/da/index.js
index 434e50e1d..213387d0c 100644
--- a/app/javascript/dashboard/i18n/locale/da/index.js
+++ b/app/javascript/dashboard/i18n/locale/da/index.js
@@ -8,13 +8,18 @@ import bulkActions from './bulkActions.json';
 import campaign from './campaign.json';
 import cannedMgmt from './cannedMgmt.json';
 import chatlist from './chatlist.json';
+import components from './components.json';
 import contact from './contact.json';
 import contactFilters from './contactFilters.json';
 import conversation from './conversation.json';
 import csatMgmt from './csatMgmt.json';
+import customRole from './customRole.json';
+import datePicker from './datePicker.json';
 import emoji from './emoji.json';
+import general from './general.json';
 import generalSettings from './generalSettings.json';
 import helpCenter from './helpCenter.json';
+import inbox from './inbox.json';
 import inboxMgmt from './inboxMgmt.json';
 import integrationApps from './integrationApps.json';
 import integrations from './integrations.json';
@@ -27,6 +32,7 @@ import search from './search.json';
 import setNewPassword from './setNewPassword.json';
 import settings from './settings.json';
 import signup from './signup.json';
+import sla from './sla.json';
 import teamsSettings from './teamsSettings.json';
 import whatsappTemplates from './whatsappTemplates.json';
 
@@ -41,13 +47,18 @@ export default {
   ...campaign,
   ...cannedMgmt,
   ...chatlist,
+  ...components,
   ...contact,
   ...contactFilters,
   ...conversation,
   ...csatMgmt,
+  ...customRole,
+  ...datePicker,
   ...emoji,
+  ...general,
   ...generalSettings,
   ...helpCenter,
+  ...inbox,
   ...inboxMgmt,
   ...integrationApps,
   ...integrations,
@@ -60,6 +71,7 @@ export default {
   ...setNewPassword,
   ...settings,
   ...signup,
+  ...sla,
   ...teamsSettings,
   ...whatsappTemplates,
 };
diff --git a/app/javascript/dashboard/i18n/locale/de/index.js b/app/javascript/dashboard/i18n/locale/de/index.js
index 434e50e1d..213387d0c 100644
--- a/app/javascript/dashboard/i18n/locale/de/index.js
+++ b/app/javascript/dashboard/i18n/locale/de/index.js
@@ -8,13 +8,18 @@ import bulkActions from './bulkActions.json';
 import campaign from './campaign.json';
 import cannedMgmt from './cannedMgmt.json';
 import chatlist from './chatlist.json';
+import components from './components.json';
 import contact from './contact.json';
 import contactFilters from './contactFilters.json';
 import conversation from './conversation.json';
 import csatMgmt from './csatMgmt.json';
+import customRole from './customRole.json';
+import datePicker from './datePicker.json';
 import emoji from './emoji.json';
+import general from './general.json';
 import generalSettings from './generalSettings.json';
 import helpCenter from './helpCenter.json';
+import inbox from './inbox.json';
 import inboxMgmt from './inboxMgmt.json';
 import integrationApps from './integrationApps.json';
 import integrations from './integrations.json';
@@ -27,6 +32,7 @@ import search from './search.json';
 import setNewPassword from './setNewPassword.json';
 import settings from './settings.json';
 import signup from './signup.json';
+import sla from './sla.json';
 import teamsSettings from './teamsSettings.json';
 import whatsappTemplates from './whatsappTemplates.json';
 
@@ -41,13 +47,18 @@ export default {
   ...campaign,
   ...cannedMgmt,
   ...chatlist,
+  ...components,
   ...contact,
   ...contactFilters,
   ...conversation,
   ...csatMgmt,
+  ...customRole,
+  ...datePicker,
   ...emoji,
+  ...general,
   ...generalSettings,
   ...helpCenter,
+  ...inbox,
   ...inboxMgmt,
   ...integrationApps,
   ...integrations,
@@ -60,6 +71,7 @@ export default {
   ...setNewPassword,
   ...settings,
   ...signup,
+  ...sla,
   ...teamsSettings,
   ...whatsappTemplates,
 };
diff --git a/app/javascript/dashboard/i18n/locale/el/index.js b/app/javascript/dashboard/i18n/locale/el/index.js
index 434e50e1d..213387d0c 100644
--- a/app/javascript/dashboard/i18n/locale/el/index.js
+++ b/app/javascript/dashboard/i18n/locale/el/index.js
@@ -8,13 +8,18 @@ import bulkActions from './bulkActions.json';
 import campaign from './campaign.json';
 import cannedMgmt from './cannedMgmt.json';
 import chatlist from './chatlist.json';
+import components from './components.json';
 import contact from './contact.json';
 import contactFilters from './contactFilters.json';
 import conversation from './conversation.json';
 import csatMgmt from './csatMgmt.json';
+import customRole from './customRole.json';
+import datePicker from './datePicker.json';
 import emoji from './emoji.json';
+import general from './general.json';
 import generalSettings from './generalSettings.json';
 import helpCenter from './helpCenter.json';
+import inbox from './inbox.json';
 import inboxMgmt from './inboxMgmt.json';
 import integrationApps from './integrationApps.json';
 import integrations from './integrations.json';
@@ -27,6 +32,7 @@ import search from './search.json';
 import setNewPassword from './setNewPassword.json';
 import settings from './settings.json';
 import signup from './signup.json';
+import sla from './sla.json';
 import teamsSettings from './teamsSettings.json';
 import whatsappTemplates from './whatsappTemplates.json';
 
@@ -41,13 +47,18 @@ export default {
   ...campaign,
   ...cannedMgmt,
   ...chatlist,
+  ...components,
   ...contact,
   ...contactFilters,
   ...conversation,
   ...csatMgmt,
+  ...customRole,
+  ...datePicker,
   ...emoji,
+  ...general,
   ...generalSettings,
   ...helpCenter,
+  ...inbox,
   ...inboxMgmt,
   ...integrationApps,
   ...integrations,
@@ -60,6 +71,7 @@ export default {
   ...setNewPassword,
   ...settings,
   ...signup,
+  ...sla,
   ...teamsSettings,
   ...whatsappTemplates,
 };
diff --git a/app/javascript/dashboard/i18n/locale/en/contact.json b/app/javascript/dashboard/i18n/locale/en/contact.json
index f26c6ed46..cd5889ebb 100644
--- a/app/javascript/dashboard/i18n/locale/en/contact.json
+++ b/app/javascript/dashboard/i18n/locale/en/contact.json
@@ -289,6 +289,8 @@
       "SEARCH_PLACEHOLDER": "Search...",
       "MESSAGE_BUTTON": "Message",
       "SEND_MESSAGE": "Send message",
+      "BLOCK_CONTACT": "Block contact",
+      "UNBLOCK_CONTACT": "Unblock contact",
       "BREADCRUMB": {
         "CONTACTS": "Contacts"
       },
@@ -303,6 +305,10 @@
           "SUCCESS_MESSAGE": "Contact saved successfully",
           "ERROR_MESSAGE": "Unable to save contact. Please try again later."
         },
+        "BLOCK_SUCCESS_MESSAGE": "This contact is blocked successfully",
+        "BLOCK_ERROR_MESSAGE": "Unable to block contact. Please try again later.",
+        "UNBLOCK_SUCCESS_MESSAGE": "This contact is unblocked successfully",
+        "UNBLOCK_ERROR_MESSAGE": "Unable to unblock contact. Please try again later.",
         "IMPORT_CONTACT": {
           "TITLE": "Import contacts",
           "DESCRIPTION": "Import contacts through a CSV file.",
diff --git a/app/javascript/dashboard/i18n/locale/en/index.js b/app/javascript/dashboard/i18n/locale/en/index.js
index 1700a3850..213387d0c 100644
--- a/app/javascript/dashboard/i18n/locale/en/index.js
+++ b/app/javascript/dashboard/i18n/locale/en/index.js
@@ -1,4 +1,3 @@
-import components from './components.json';
 import advancedFilters from './advancedFilters.json';
 import agentBots from './agentBots.json';
 import agentMgmt from './agentMgmt.json';
@@ -9,6 +8,7 @@ import bulkActions from './bulkActions.json';
 import campaign from './campaign.json';
 import cannedMgmt from './cannedMgmt.json';
 import chatlist from './chatlist.json';
+import components from './components.json';
 import contact from './contact.json';
 import contactFilters from './contactFilters.json';
 import conversation from './conversation.json';
@@ -37,7 +37,6 @@ import teamsSettings from './teamsSettings.json';
 import whatsappTemplates from './whatsappTemplates.json';
 
 export default {
-  ...components,
   ...advancedFilters,
   ...agentBots,
   ...agentMgmt,
@@ -48,13 +47,18 @@ export default {
   ...campaign,
   ...cannedMgmt,
   ...chatlist,
+  ...components,
   ...contact,
   ...contactFilters,
   ...conversation,
   ...csatMgmt,
+  ...customRole,
+  ...datePicker,
   ...emoji,
+  ...general,
   ...generalSettings,
   ...helpCenter,
+  ...inbox,
   ...inboxMgmt,
   ...integrationApps,
   ...integrations,
@@ -70,8 +74,4 @@ export default {
   ...sla,
   ...teamsSettings,
   ...whatsappTemplates,
-  ...inbox,
-  ...general,
-  ...datePicker,
-  ...customRole,
 };
diff --git a/app/javascript/dashboard/i18n/locale/es/index.js b/app/javascript/dashboard/i18n/locale/es/index.js
index 434e50e1d..213387d0c 100644
--- a/app/javascript/dashboard/i18n/locale/es/index.js
+++ b/app/javascript/dashboard/i18n/locale/es/index.js
@@ -8,13 +8,18 @@ import bulkActions from './bulkActions.json';
 import campaign from './campaign.json';
 import cannedMgmt from './cannedMgmt.json';
 import chatlist from './chatlist.json';
+import components from './components.json';
 import contact from './contact.json';
 import contactFilters from './contactFilters.json';
 import conversation from './conversation.json';
 import csatMgmt from './csatMgmt.json';
+import customRole from './customRole.json';
+import datePicker from './datePicker.json';
 import emoji from './emoji.json';
+import general from './general.json';
 import generalSettings from './generalSettings.json';
 import helpCenter from './helpCenter.json';
+import inbox from './inbox.json';
 import inboxMgmt from './inboxMgmt.json';
 import integrationApps from './integrationApps.json';
 import integrations from './integrations.json';
@@ -27,6 +32,7 @@ import search from './search.json';
 import setNewPassword from './setNewPassword.json';
 import settings from './settings.json';
 import signup from './signup.json';
+import sla from './sla.json';
 import teamsSettings from './teamsSettings.json';
 import whatsappTemplates from './whatsappTemplates.json';
 
@@ -41,13 +47,18 @@ export default {
   ...campaign,
   ...cannedMgmt,
   ...chatlist,
+  ...components,
   ...contact,
   ...contactFilters,
   ...conversation,
   ...csatMgmt,
+  ...customRole,
+  ...datePicker,
   ...emoji,
+  ...general,
   ...generalSettings,
   ...helpCenter,
+  ...inbox,
   ...inboxMgmt,
   ...integrationApps,
   ...integrations,
@@ -60,6 +71,7 @@ export default {
   ...setNewPassword,
   ...settings,
   ...signup,
+  ...sla,
   ...teamsSettings,
   ...whatsappTemplates,
 };
diff --git a/app/javascript/dashboard/i18n/locale/fa/index.js b/app/javascript/dashboard/i18n/locale/fa/index.js
index 434e50e1d..213387d0c 100644
--- a/app/javascript/dashboard/i18n/locale/fa/index.js
+++ b/app/javascript/dashboard/i18n/locale/fa/index.js
@@ -8,13 +8,18 @@ import bulkActions from './bulkActions.json';
 import campaign from './campaign.json';
 import cannedMgmt from './cannedMgmt.json';
 import chatlist from './chatlist.json';
+import components from './components.json';
 import contact from './contact.json';
 import contactFilters from './contactFilters.json';
 import conversation from './conversation.json';
 import csatMgmt from './csatMgmt.json';
+import customRole from './customRole.json';
+import datePicker from './datePicker.json';
 import emoji from './emoji.json';
+import general from './general.json';
 import generalSettings from './generalSettings.json';
 import helpCenter from './helpCenter.json';
+import inbox from './inbox.json';
 import inboxMgmt from './inboxMgmt.json';
 import integrationApps from './integrationApps.json';
 import integrations from './integrations.json';
@@ -27,6 +32,7 @@ import search from './search.json';
 import setNewPassword from './setNewPassword.json';
 import settings from './settings.json';
 import signup from './signup.json';
+import sla from './sla.json';
 import teamsSettings from './teamsSettings.json';
 import whatsappTemplates from './whatsappTemplates.json';
 
@@ -41,13 +47,18 @@ export default {
   ...campaign,
   ...cannedMgmt,
   ...chatlist,
+  ...components,
   ...contact,
   ...contactFilters,
   ...conversation,
   ...csatMgmt,
+  ...customRole,
+  ...datePicker,
   ...emoji,
+  ...general,
   ...generalSettings,
   ...helpCenter,
+  ...inbox,
   ...inboxMgmt,
   ...integrationApps,
   ...integrations,
@@ -60,6 +71,7 @@ export default {
   ...setNewPassword,
   ...settings,
   ...signup,
+  ...sla,
   ...teamsSettings,
   ...whatsappTemplates,
 };
diff --git a/app/javascript/dashboard/i18n/locale/fi/index.js b/app/javascript/dashboard/i18n/locale/fi/index.js
index 434e50e1d..213387d0c 100644
--- a/app/javascript/dashboard/i18n/locale/fi/index.js
+++ b/app/javascript/dashboard/i18n/locale/fi/index.js
@@ -8,13 +8,18 @@ import bulkActions from './bulkActions.json';
 import campaign from './campaign.json';
 import cannedMgmt from './cannedMgmt.json';
 import chatlist from './chatlist.json';
+import components from './components.json';
 import contact from './contact.json';
 import contactFilters from './contactFilters.json';
 import conversation from './conversation.json';
 import csatMgmt from './csatMgmt.json';
+import customRole from './customRole.json';
+import datePicker from './datePicker.json';
 import emoji from './emoji.json';
+import general from './general.json';
 import generalSettings from './generalSettings.json';
 import helpCenter from './helpCenter.json';
+import inbox from './inbox.json';
 import inboxMgmt from './inboxMgmt.json';
 import integrationApps from './integrationApps.json';
 import integrations from './integrations.json';
@@ -27,6 +32,7 @@ import search from './search.json';
 import setNewPassword from './setNewPassword.json';
 import settings from './settings.json';
 import signup from './signup.json';
+import sla from './sla.json';
 import teamsSettings from './teamsSettings.json';
 import whatsappTemplates from './whatsappTemplates.json';
 
@@ -41,13 +47,18 @@ export default {
   ...campaign,
   ...cannedMgmt,
   ...chatlist,
+  ...components,
   ...contact,
   ...contactFilters,
   ...conversation,
   ...csatMgmt,
+  ...customRole,
+  ...datePicker,
   ...emoji,
+  ...general,
   ...generalSettings,
   ...helpCenter,
+  ...inbox,
   ...inboxMgmt,
   ...integrationApps,
   ...integrations,
@@ -60,6 +71,7 @@ export default {
   ...setNewPassword,
   ...settings,
   ...signup,
+  ...sla,
   ...teamsSettings,
   ...whatsappTemplates,
 };
diff --git a/app/javascript/dashboard/i18n/locale/fr/index.js b/app/javascript/dashboard/i18n/locale/fr/index.js
index 434e50e1d..213387d0c 100644
--- a/app/javascript/dashboard/i18n/locale/fr/index.js
+++ b/app/javascript/dashboard/i18n/locale/fr/index.js
@@ -8,13 +8,18 @@ import bulkActions from './bulkActions.json';
 import campaign from './campaign.json';
 import cannedMgmt from './cannedMgmt.json';
 import chatlist from './chatlist.json';
+import components from './components.json';
 import contact from './contact.json';
 import contactFilters from './contactFilters.json';
 import conversation from './conversation.json';
 import csatMgmt from './csatMgmt.json';
+import customRole from './customRole.json';
+import datePicker from './datePicker.json';
 import emoji from './emoji.json';
+import general from './general.json';
 import generalSettings from './generalSettings.json';
 import helpCenter from './helpCenter.json';
+import inbox from './inbox.json';
 import inboxMgmt from './inboxMgmt.json';
 import integrationApps from './integrationApps.json';
 import integrations from './integrations.json';
@@ -27,6 +32,7 @@ import search from './search.json';
 import setNewPassword from './setNewPassword.json';
 import settings from './settings.json';
 import signup from './signup.json';
+import sla from './sla.json';
 import teamsSettings from './teamsSettings.json';
 import whatsappTemplates from './whatsappTemplates.json';
 
@@ -41,13 +47,18 @@ export default {
   ...campaign,
   ...cannedMgmt,
   ...chatlist,
+  ...components,
   ...contact,
   ...contactFilters,
   ...conversation,
   ...csatMgmt,
+  ...customRole,
+  ...datePicker,
   ...emoji,
+  ...general,
   ...generalSettings,
   ...helpCenter,
+  ...inbox,
   ...inboxMgmt,
   ...integrationApps,
   ...integrations,
@@ -60,6 +71,7 @@ export default {
   ...setNewPassword,
   ...settings,
   ...signup,
+  ...sla,
   ...teamsSettings,
   ...whatsappTemplates,
 };
diff --git a/app/javascript/dashboard/i18n/locale/he/index.js b/app/javascript/dashboard/i18n/locale/he/index.js
index 434e50e1d..213387d0c 100644
--- a/app/javascript/dashboard/i18n/locale/he/index.js
+++ b/app/javascript/dashboard/i18n/locale/he/index.js
@@ -8,13 +8,18 @@ import bulkActions from './bulkActions.json';
 import campaign from './campaign.json';
 import cannedMgmt from './cannedMgmt.json';
 import chatlist from './chatlist.json';
+import components from './components.json';
 import contact from './contact.json';
 import contactFilters from './contactFilters.json';
 import conversation from './conversation.json';
 import csatMgmt from './csatMgmt.json';
+import customRole from './customRole.json';
+import datePicker from './datePicker.json';
 import emoji from './emoji.json';
+import general from './general.json';
 import generalSettings from './generalSettings.json';
 import helpCenter from './helpCenter.json';
+import inbox from './inbox.json';
 import inboxMgmt from './inboxMgmt.json';
 import integrationApps from './integrationApps.json';
 import integrations from './integrations.json';
@@ -27,6 +32,7 @@ import search from './search.json';
 import setNewPassword from './setNewPassword.json';
 import settings from './settings.json';
 import signup from './signup.json';
+import sla from './sla.json';
 import teamsSettings from './teamsSettings.json';
 import whatsappTemplates from './whatsappTemplates.json';
 
@@ -41,13 +47,18 @@ export default {
   ...campaign,
   ...cannedMgmt,
   ...chatlist,
+  ...components,
   ...contact,
   ...contactFilters,
   ...conversation,
   ...csatMgmt,
+  ...customRole,
+  ...datePicker,
   ...emoji,
+  ...general,
   ...generalSettings,
   ...helpCenter,
+  ...inbox,
   ...inboxMgmt,
   ...integrationApps,
   ...integrations,
@@ -60,6 +71,7 @@ export default {
   ...setNewPassword,
   ...settings,
   ...signup,
+  ...sla,
   ...teamsSettings,
   ...whatsappTemplates,
 };
diff --git a/app/javascript/dashboard/i18n/locale/hi/index.js b/app/javascript/dashboard/i18n/locale/hi/index.js
index 434e50e1d..213387d0c 100644
--- a/app/javascript/dashboard/i18n/locale/hi/index.js
+++ b/app/javascript/dashboard/i18n/locale/hi/index.js
@@ -8,13 +8,18 @@ import bulkActions from './bulkActions.json';
 import campaign from './campaign.json';
 import cannedMgmt from './cannedMgmt.json';
 import chatlist from './chatlist.json';
+import components from './components.json';
 import contact from './contact.json';
 import contactFilters from './contactFilters.json';
 import conversation from './conversation.json';
 import csatMgmt from './csatMgmt.json';
+import customRole from './customRole.json';
+import datePicker from './datePicker.json';
 import emoji from './emoji.json';
+import general from './general.json';
 import generalSettings from './generalSettings.json';
 import helpCenter from './helpCenter.json';
+import inbox from './inbox.json';
 import inboxMgmt from './inboxMgmt.json';
 import integrationApps from './integrationApps.json';
 import integrations from './integrations.json';
@@ -27,6 +32,7 @@ import search from './search.json';
 import setNewPassword from './setNewPassword.json';
 import settings from './settings.json';
 import signup from './signup.json';
+import sla from './sla.json';
 import teamsSettings from './teamsSettings.json';
 import whatsappTemplates from './whatsappTemplates.json';
 
@@ -41,13 +47,18 @@ export default {
   ...campaign,
   ...cannedMgmt,
   ...chatlist,
+  ...components,
   ...contact,
   ...contactFilters,
   ...conversation,
   ...csatMgmt,
+  ...customRole,
+  ...datePicker,
   ...emoji,
+  ...general,
   ...generalSettings,
   ...helpCenter,
+  ...inbox,
   ...inboxMgmt,
   ...integrationApps,
   ...integrations,
@@ -60,6 +71,7 @@ export default {
   ...setNewPassword,
   ...settings,
   ...signup,
+  ...sla,
   ...teamsSettings,
   ...whatsappTemplates,
 };
diff --git a/app/javascript/dashboard/i18n/locale/hr/index.js b/app/javascript/dashboard/i18n/locale/hr/index.js
index 434e50e1d..213387d0c 100644
--- a/app/javascript/dashboard/i18n/locale/hr/index.js
+++ b/app/javascript/dashboard/i18n/locale/hr/index.js
@@ -8,13 +8,18 @@ import bulkActions from './bulkActions.json';
 import campaign from './campaign.json';
 import cannedMgmt from './cannedMgmt.json';
 import chatlist from './chatlist.json';
+import components from './components.json';
 import contact from './contact.json';
 import contactFilters from './contactFilters.json';
 import conversation from './conversation.json';
 import csatMgmt from './csatMgmt.json';
+import customRole from './customRole.json';
+import datePicker from './datePicker.json';
 import emoji from './emoji.json';
+import general from './general.json';
 import generalSettings from './generalSettings.json';
 import helpCenter from './helpCenter.json';
+import inbox from './inbox.json';
 import inboxMgmt from './inboxMgmt.json';
 import integrationApps from './integrationApps.json';
 import integrations from './integrations.json';
@@ -27,6 +32,7 @@ import search from './search.json';
 import setNewPassword from './setNewPassword.json';
 import settings from './settings.json';
 import signup from './signup.json';
+import sla from './sla.json';
 import teamsSettings from './teamsSettings.json';
 import whatsappTemplates from './whatsappTemplates.json';
 
@@ -41,13 +47,18 @@ export default {
   ...campaign,
   ...cannedMgmt,
   ...chatlist,
+  ...components,
   ...contact,
   ...contactFilters,
   ...conversation,
   ...csatMgmt,
+  ...customRole,
+  ...datePicker,
   ...emoji,
+  ...general,
   ...generalSettings,
   ...helpCenter,
+  ...inbox,
   ...inboxMgmt,
   ...integrationApps,
   ...integrations,
@@ -60,6 +71,7 @@ export default {
   ...setNewPassword,
   ...settings,
   ...signup,
+  ...sla,
   ...teamsSettings,
   ...whatsappTemplates,
 };
diff --git a/app/javascript/dashboard/i18n/locale/hu/index.js b/app/javascript/dashboard/i18n/locale/hu/index.js
index 434e50e1d..213387d0c 100644
--- a/app/javascript/dashboard/i18n/locale/hu/index.js
+++ b/app/javascript/dashboard/i18n/locale/hu/index.js
@@ -8,13 +8,18 @@ import bulkActions from './bulkActions.json';
 import campaign from './campaign.json';
 import cannedMgmt from './cannedMgmt.json';
 import chatlist from './chatlist.json';
+import components from './components.json';
 import contact from './contact.json';
 import contactFilters from './contactFilters.json';
 import conversation from './conversation.json';
 import csatMgmt from './csatMgmt.json';
+import customRole from './customRole.json';
+import datePicker from './datePicker.json';
 import emoji from './emoji.json';
+import general from './general.json';
 import generalSettings from './generalSettings.json';
 import helpCenter from './helpCenter.json';
+import inbox from './inbox.json';
 import inboxMgmt from './inboxMgmt.json';
 import integrationApps from './integrationApps.json';
 import integrations from './integrations.json';
@@ -27,6 +32,7 @@ import search from './search.json';
 import setNewPassword from './setNewPassword.json';
 import settings from './settings.json';
 import signup from './signup.json';
+import sla from './sla.json';
 import teamsSettings from './teamsSettings.json';
 import whatsappTemplates from './whatsappTemplates.json';
 
@@ -41,13 +47,18 @@ export default {
   ...campaign,
   ...cannedMgmt,
   ...chatlist,
+  ...components,
   ...contact,
   ...contactFilters,
   ...conversation,
   ...csatMgmt,
+  ...customRole,
+  ...datePicker,
   ...emoji,
+  ...general,
   ...generalSettings,
   ...helpCenter,
+  ...inbox,
   ...inboxMgmt,
   ...integrationApps,
   ...integrations,
@@ -60,6 +71,7 @@ export default {
   ...setNewPassword,
   ...settings,
   ...signup,
+  ...sla,
   ...teamsSettings,
   ...whatsappTemplates,
 };
diff --git a/app/javascript/dashboard/i18n/locale/hy/index.js b/app/javascript/dashboard/i18n/locale/hy/index.js
index 434e50e1d..213387d0c 100644
--- a/app/javascript/dashboard/i18n/locale/hy/index.js
+++ b/app/javascript/dashboard/i18n/locale/hy/index.js
@@ -8,13 +8,18 @@ import bulkActions from './bulkActions.json';
 import campaign from './campaign.json';
 import cannedMgmt from './cannedMgmt.json';
 import chatlist from './chatlist.json';
+import components from './components.json';
 import contact from './contact.json';
 import contactFilters from './contactFilters.json';
 import conversation from './conversation.json';
 import csatMgmt from './csatMgmt.json';
+import customRole from './customRole.json';
+import datePicker from './datePicker.json';
 import emoji from './emoji.json';
+import general from './general.json';
 import generalSettings from './generalSettings.json';
 import helpCenter from './helpCenter.json';
+import inbox from './inbox.json';
 import inboxMgmt from './inboxMgmt.json';
 import integrationApps from './integrationApps.json';
 import integrations from './integrations.json';
@@ -27,6 +32,7 @@ import search from './search.json';
 import setNewPassword from './setNewPassword.json';
 import settings from './settings.json';
 import signup from './signup.json';
+import sla from './sla.json';
 import teamsSettings from './teamsSettings.json';
 import whatsappTemplates from './whatsappTemplates.json';
 
@@ -41,13 +47,18 @@ export default {
   ...campaign,
   ...cannedMgmt,
   ...chatlist,
+  ...components,
   ...contact,
   ...contactFilters,
   ...conversation,
   ...csatMgmt,
+  ...customRole,
+  ...datePicker,
   ...emoji,
+  ...general,
   ...generalSettings,
   ...helpCenter,
+  ...inbox,
   ...inboxMgmt,
   ...integrationApps,
   ...integrations,
@@ -60,6 +71,7 @@ export default {
   ...setNewPassword,
   ...settings,
   ...signup,
+  ...sla,
   ...teamsSettings,
   ...whatsappTemplates,
 };
diff --git a/app/javascript/dashboard/i18n/locale/id/index.js b/app/javascript/dashboard/i18n/locale/id/index.js
index 434e50e1d..213387d0c 100644
--- a/app/javascript/dashboard/i18n/locale/id/index.js
+++ b/app/javascript/dashboard/i18n/locale/id/index.js
@@ -8,13 +8,18 @@ import bulkActions from './bulkActions.json';
 import campaign from './campaign.json';
 import cannedMgmt from './cannedMgmt.json';
 import chatlist from './chatlist.json';
+import components from './components.json';
 import contact from './contact.json';
 import contactFilters from './contactFilters.json';
 import conversation from './conversation.json';
 import csatMgmt from './csatMgmt.json';
+import customRole from './customRole.json';
+import datePicker from './datePicker.json';
 import emoji from './emoji.json';
+import general from './general.json';
 import generalSettings from './generalSettings.json';
 import helpCenter from './helpCenter.json';
+import inbox from './inbox.json';
 import inboxMgmt from './inboxMgmt.json';
 import integrationApps from './integrationApps.json';
 import integrations from './integrations.json';
@@ -27,6 +32,7 @@ import search from './search.json';
 import setNewPassword from './setNewPassword.json';
 import settings from './settings.json';
 import signup from './signup.json';
+import sla from './sla.json';
 import teamsSettings from './teamsSettings.json';
 import whatsappTemplates from './whatsappTemplates.json';
 
@@ -41,13 +47,18 @@ export default {
   ...campaign,
   ...cannedMgmt,
   ...chatlist,
+  ...components,
   ...contact,
   ...contactFilters,
   ...conversation,
   ...csatMgmt,
+  ...customRole,
+  ...datePicker,
   ...emoji,
+  ...general,
   ...generalSettings,
   ...helpCenter,
+  ...inbox,
   ...inboxMgmt,
   ...integrationApps,
   ...integrations,
@@ -60,6 +71,7 @@ export default {
   ...setNewPassword,
   ...settings,
   ...signup,
+  ...sla,
   ...teamsSettings,
   ...whatsappTemplates,
 };
diff --git a/app/javascript/dashboard/i18n/locale/is/index.js b/app/javascript/dashboard/i18n/locale/is/index.js
index 434e50e1d..213387d0c 100644
--- a/app/javascript/dashboard/i18n/locale/is/index.js
+++ b/app/javascript/dashboard/i18n/locale/is/index.js
@@ -8,13 +8,18 @@ import bulkActions from './bulkActions.json';
 import campaign from './campaign.json';
 import cannedMgmt from './cannedMgmt.json';
 import chatlist from './chatlist.json';
+import components from './components.json';
 import contact from './contact.json';
 import contactFilters from './contactFilters.json';
 import conversation from './conversation.json';
 import csatMgmt from './csatMgmt.json';
+import customRole from './customRole.json';
+import datePicker from './datePicker.json';
 import emoji from './emoji.json';
+import general from './general.json';
 import generalSettings from './generalSettings.json';
 import helpCenter from './helpCenter.json';
+import inbox from './inbox.json';
 import inboxMgmt from './inboxMgmt.json';
 import integrationApps from './integrationApps.json';
 import integrations from './integrations.json';
@@ -27,6 +32,7 @@ import search from './search.json';
 import setNewPassword from './setNewPassword.json';
 import settings from './settings.json';
 import signup from './signup.json';
+import sla from './sla.json';
 import teamsSettings from './teamsSettings.json';
 import whatsappTemplates from './whatsappTemplates.json';
 
@@ -41,13 +47,18 @@ export default {
   ...campaign,
   ...cannedMgmt,
   ...chatlist,
+  ...components,
   ...contact,
   ...contactFilters,
   ...conversation,
   ...csatMgmt,
+  ...customRole,
+  ...datePicker,
   ...emoji,
+  ...general,
   ...generalSettings,
   ...helpCenter,
+  ...inbox,
   ...inboxMgmt,
   ...integrationApps,
   ...integrations,
@@ -60,6 +71,7 @@ export default {
   ...setNewPassword,
   ...settings,
   ...signup,
+  ...sla,
   ...teamsSettings,
   ...whatsappTemplates,
 };
diff --git a/app/javascript/dashboard/i18n/locale/it/index.js b/app/javascript/dashboard/i18n/locale/it/index.js
index 434e50e1d..213387d0c 100644
--- a/app/javascript/dashboard/i18n/locale/it/index.js
+++ b/app/javascript/dashboard/i18n/locale/it/index.js
@@ -8,13 +8,18 @@ import bulkActions from './bulkActions.json';
 import campaign from './campaign.json';
 import cannedMgmt from './cannedMgmt.json';
 import chatlist from './chatlist.json';
+import components from './components.json';
 import contact from './contact.json';
 import contactFilters from './contactFilters.json';
 import conversation from './conversation.json';
 import csatMgmt from './csatMgmt.json';
+import customRole from './customRole.json';
+import datePicker from './datePicker.json';
 import emoji from './emoji.json';
+import general from './general.json';
 import generalSettings from './generalSettings.json';
 import helpCenter from './helpCenter.json';
+import inbox from './inbox.json';
 import inboxMgmt from './inboxMgmt.json';
 import integrationApps from './integrationApps.json';
 import integrations from './integrations.json';
@@ -27,6 +32,7 @@ import search from './search.json';
 import setNewPassword from './setNewPassword.json';
 import settings from './settings.json';
 import signup from './signup.json';
+import sla from './sla.json';
 import teamsSettings from './teamsSettings.json';
 import whatsappTemplates from './whatsappTemplates.json';
 
@@ -41,13 +47,18 @@ export default {
   ...campaign,
   ...cannedMgmt,
   ...chatlist,
+  ...components,
   ...contact,
   ...contactFilters,
   ...conversation,
   ...csatMgmt,
+  ...customRole,
+  ...datePicker,
   ...emoji,
+  ...general,
   ...generalSettings,
   ...helpCenter,
+  ...inbox,
   ...inboxMgmt,
   ...integrationApps,
   ...integrations,
@@ -60,6 +71,7 @@ export default {
   ...setNewPassword,
   ...settings,
   ...signup,
+  ...sla,
   ...teamsSettings,
   ...whatsappTemplates,
 };
diff --git a/app/javascript/dashboard/i18n/locale/ja/index.js b/app/javascript/dashboard/i18n/locale/ja/index.js
index 434e50e1d..213387d0c 100644
--- a/app/javascript/dashboard/i18n/locale/ja/index.js
+++ b/app/javascript/dashboard/i18n/locale/ja/index.js
@@ -8,13 +8,18 @@ import bulkActions from './bulkActions.json';
 import campaign from './campaign.json';
 import cannedMgmt from './cannedMgmt.json';
 import chatlist from './chatlist.json';
+import components from './components.json';
 import contact from './contact.json';
 import contactFilters from './contactFilters.json';
 import conversation from './conversation.json';
 import csatMgmt from './csatMgmt.json';
+import customRole from './customRole.json';
+import datePicker from './datePicker.json';
 import emoji from './emoji.json';
+import general from './general.json';
 import generalSettings from './generalSettings.json';
 import helpCenter from './helpCenter.json';
+import inbox from './inbox.json';
 import inboxMgmt from './inboxMgmt.json';
 import integrationApps from './integrationApps.json';
 import integrations from './integrations.json';
@@ -27,6 +32,7 @@ import search from './search.json';
 import setNewPassword from './setNewPassword.json';
 import settings from './settings.json';
 import signup from './signup.json';
+import sla from './sla.json';
 import teamsSettings from './teamsSettings.json';
 import whatsappTemplates from './whatsappTemplates.json';
 
@@ -41,13 +47,18 @@ export default {
   ...campaign,
   ...cannedMgmt,
   ...chatlist,
+  ...components,
   ...contact,
   ...contactFilters,
   ...conversation,
   ...csatMgmt,
+  ...customRole,
+  ...datePicker,
   ...emoji,
+  ...general,
   ...generalSettings,
   ...helpCenter,
+  ...inbox,
   ...inboxMgmt,
   ...integrationApps,
   ...integrations,
@@ -60,6 +71,7 @@ export default {
   ...setNewPassword,
   ...settings,
   ...signup,
+  ...sla,
   ...teamsSettings,
   ...whatsappTemplates,
 };
diff --git a/app/javascript/dashboard/i18n/locale/ka/index.js b/app/javascript/dashboard/i18n/locale/ka/index.js
index 434e50e1d..213387d0c 100644
--- a/app/javascript/dashboard/i18n/locale/ka/index.js
+++ b/app/javascript/dashboard/i18n/locale/ka/index.js
@@ -8,13 +8,18 @@ import bulkActions from './bulkActions.json';
 import campaign from './campaign.json';
 import cannedMgmt from './cannedMgmt.json';
 import chatlist from './chatlist.json';
+import components from './components.json';
 import contact from './contact.json';
 import contactFilters from './contactFilters.json';
 import conversation from './conversation.json';
 import csatMgmt from './csatMgmt.json';
+import customRole from './customRole.json';
+import datePicker from './datePicker.json';
 import emoji from './emoji.json';
+import general from './general.json';
 import generalSettings from './generalSettings.json';
 import helpCenter from './helpCenter.json';
+import inbox from './inbox.json';
 import inboxMgmt from './inboxMgmt.json';
 import integrationApps from './integrationApps.json';
 import integrations from './integrations.json';
@@ -27,6 +32,7 @@ import search from './search.json';
 import setNewPassword from './setNewPassword.json';
 import settings from './settings.json';
 import signup from './signup.json';
+import sla from './sla.json';
 import teamsSettings from './teamsSettings.json';
 import whatsappTemplates from './whatsappTemplates.json';
 
@@ -41,13 +47,18 @@ export default {
   ...campaign,
   ...cannedMgmt,
   ...chatlist,
+  ...components,
   ...contact,
   ...contactFilters,
   ...conversation,
   ...csatMgmt,
+  ...customRole,
+  ...datePicker,
   ...emoji,
+  ...general,
   ...generalSettings,
   ...helpCenter,
+  ...inbox,
   ...inboxMgmt,
   ...integrationApps,
   ...integrations,
@@ -60,6 +71,7 @@ export default {
   ...setNewPassword,
   ...settings,
   ...signup,
+  ...sla,
   ...teamsSettings,
   ...whatsappTemplates,
 };
diff --git a/app/javascript/dashboard/i18n/locale/ko/index.js b/app/javascript/dashboard/i18n/locale/ko/index.js
index 434e50e1d..213387d0c 100644
--- a/app/javascript/dashboard/i18n/locale/ko/index.js
+++ b/app/javascript/dashboard/i18n/locale/ko/index.js
@@ -8,13 +8,18 @@ import bulkActions from './bulkActions.json';
 import campaign from './campaign.json';
 import cannedMgmt from './cannedMgmt.json';
 import chatlist from './chatlist.json';
+import components from './components.json';
 import contact from './contact.json';
 import contactFilters from './contactFilters.json';
 import conversation from './conversation.json';
 import csatMgmt from './csatMgmt.json';
+import customRole from './customRole.json';
+import datePicker from './datePicker.json';
 import emoji from './emoji.json';
+import general from './general.json';
 import generalSettings from './generalSettings.json';
 import helpCenter from './helpCenter.json';
+import inbox from './inbox.json';
 import inboxMgmt from './inboxMgmt.json';
 import integrationApps from './integrationApps.json';
 import integrations from './integrations.json';
@@ -27,6 +32,7 @@ import search from './search.json';
 import setNewPassword from './setNewPassword.json';
 import settings from './settings.json';
 import signup from './signup.json';
+import sla from './sla.json';
 import teamsSettings from './teamsSettings.json';
 import whatsappTemplates from './whatsappTemplates.json';
 
@@ -41,13 +47,18 @@ export default {
   ...campaign,
   ...cannedMgmt,
   ...chatlist,
+  ...components,
   ...contact,
   ...contactFilters,
   ...conversation,
   ...csatMgmt,
+  ...customRole,
+  ...datePicker,
   ...emoji,
+  ...general,
   ...generalSettings,
   ...helpCenter,
+  ...inbox,
   ...inboxMgmt,
   ...integrationApps,
   ...integrations,
@@ -60,6 +71,7 @@ export default {
   ...setNewPassword,
   ...settings,
   ...signup,
+  ...sla,
   ...teamsSettings,
   ...whatsappTemplates,
 };
diff --git a/app/javascript/dashboard/i18n/locale/lt/index.js b/app/javascript/dashboard/i18n/locale/lt/index.js
index 434e50e1d..213387d0c 100644
--- a/app/javascript/dashboard/i18n/locale/lt/index.js
+++ b/app/javascript/dashboard/i18n/locale/lt/index.js
@@ -8,13 +8,18 @@ import bulkActions from './bulkActions.json';
 import campaign from './campaign.json';
 import cannedMgmt from './cannedMgmt.json';
 import chatlist from './chatlist.json';
+import components from './components.json';
 import contact from './contact.json';
 import contactFilters from './contactFilters.json';
 import conversation from './conversation.json';
 import csatMgmt from './csatMgmt.json';
+import customRole from './customRole.json';
+import datePicker from './datePicker.json';
 import emoji from './emoji.json';
+import general from './general.json';
 import generalSettings from './generalSettings.json';
 import helpCenter from './helpCenter.json';
+import inbox from './inbox.json';
 import inboxMgmt from './inboxMgmt.json';
 import integrationApps from './integrationApps.json';
 import integrations from './integrations.json';
@@ -27,6 +32,7 @@ import search from './search.json';
 import setNewPassword from './setNewPassword.json';
 import settings from './settings.json';
 import signup from './signup.json';
+import sla from './sla.json';
 import teamsSettings from './teamsSettings.json';
 import whatsappTemplates from './whatsappTemplates.json';
 
@@ -41,13 +47,18 @@ export default {
   ...campaign,
   ...cannedMgmt,
   ...chatlist,
+  ...components,
   ...contact,
   ...contactFilters,
   ...conversation,
   ...csatMgmt,
+  ...customRole,
+  ...datePicker,
   ...emoji,
+  ...general,
   ...generalSettings,
   ...helpCenter,
+  ...inbox,
   ...inboxMgmt,
   ...integrationApps,
   ...integrations,
@@ -60,6 +71,7 @@ export default {
   ...setNewPassword,
   ...settings,
   ...signup,
+  ...sla,
   ...teamsSettings,
   ...whatsappTemplates,
 };
diff --git a/app/javascript/dashboard/i18n/locale/lv/index.js b/app/javascript/dashboard/i18n/locale/lv/index.js
index 434e50e1d..213387d0c 100644
--- a/app/javascript/dashboard/i18n/locale/lv/index.js
+++ b/app/javascript/dashboard/i18n/locale/lv/index.js
@@ -8,13 +8,18 @@ import bulkActions from './bulkActions.json';
 import campaign from './campaign.json';
 import cannedMgmt from './cannedMgmt.json';
 import chatlist from './chatlist.json';
+import components from './components.json';
 import contact from './contact.json';
 import contactFilters from './contactFilters.json';
 import conversation from './conversation.json';
 import csatMgmt from './csatMgmt.json';
+import customRole from './customRole.json';
+import datePicker from './datePicker.json';
 import emoji from './emoji.json';
+import general from './general.json';
 import generalSettings from './generalSettings.json';
 import helpCenter from './helpCenter.json';
+import inbox from './inbox.json';
 import inboxMgmt from './inboxMgmt.json';
 import integrationApps from './integrationApps.json';
 import integrations from './integrations.json';
@@ -27,6 +32,7 @@ import search from './search.json';
 import setNewPassword from './setNewPassword.json';
 import settings from './settings.json';
 import signup from './signup.json';
+import sla from './sla.json';
 import teamsSettings from './teamsSettings.json';
 import whatsappTemplates from './whatsappTemplates.json';
 
@@ -41,13 +47,18 @@ export default {
   ...campaign,
   ...cannedMgmt,
   ...chatlist,
+  ...components,
   ...contact,
   ...contactFilters,
   ...conversation,
   ...csatMgmt,
+  ...customRole,
+  ...datePicker,
   ...emoji,
+  ...general,
   ...generalSettings,
   ...helpCenter,
+  ...inbox,
   ...inboxMgmt,
   ...integrationApps,
   ...integrations,
@@ -60,6 +71,7 @@ export default {
   ...setNewPassword,
   ...settings,
   ...signup,
+  ...sla,
   ...teamsSettings,
   ...whatsappTemplates,
 };
diff --git a/app/javascript/dashboard/i18n/locale/ml/index.js b/app/javascript/dashboard/i18n/locale/ml/index.js
index 434e50e1d..213387d0c 100644
--- a/app/javascript/dashboard/i18n/locale/ml/index.js
+++ b/app/javascript/dashboard/i18n/locale/ml/index.js
@@ -8,13 +8,18 @@ import bulkActions from './bulkActions.json';
 import campaign from './campaign.json';
 import cannedMgmt from './cannedMgmt.json';
 import chatlist from './chatlist.json';
+import components from './components.json';
 import contact from './contact.json';
 import contactFilters from './contactFilters.json';
 import conversation from './conversation.json';
 import csatMgmt from './csatMgmt.json';
+import customRole from './customRole.json';
+import datePicker from './datePicker.json';
 import emoji from './emoji.json';
+import general from './general.json';
 import generalSettings from './generalSettings.json';
 import helpCenter from './helpCenter.json';
+import inbox from './inbox.json';
 import inboxMgmt from './inboxMgmt.json';
 import integrationApps from './integrationApps.json';
 import integrations from './integrations.json';
@@ -27,6 +32,7 @@ import search from './search.json';
 import setNewPassword from './setNewPassword.json';
 import settings from './settings.json';
 import signup from './signup.json';
+import sla from './sla.json';
 import teamsSettings from './teamsSettings.json';
 import whatsappTemplates from './whatsappTemplates.json';
 
@@ -41,13 +47,18 @@ export default {
   ...campaign,
   ...cannedMgmt,
   ...chatlist,
+  ...components,
   ...contact,
   ...contactFilters,
   ...conversation,
   ...csatMgmt,
+  ...customRole,
+  ...datePicker,
   ...emoji,
+  ...general,
   ...generalSettings,
   ...helpCenter,
+  ...inbox,
   ...inboxMgmt,
   ...integrationApps,
   ...integrations,
@@ -60,6 +71,7 @@ export default {
   ...setNewPassword,
   ...settings,
   ...signup,
+  ...sla,
   ...teamsSettings,
   ...whatsappTemplates,
 };
diff --git a/app/javascript/dashboard/i18n/locale/ms/index.js b/app/javascript/dashboard/i18n/locale/ms/index.js
index 434e50e1d..213387d0c 100644
--- a/app/javascript/dashboard/i18n/locale/ms/index.js
+++ b/app/javascript/dashboard/i18n/locale/ms/index.js
@@ -8,13 +8,18 @@ import bulkActions from './bulkActions.json';
 import campaign from './campaign.json';
 import cannedMgmt from './cannedMgmt.json';
 import chatlist from './chatlist.json';
+import components from './components.json';
 import contact from './contact.json';
 import contactFilters from './contactFilters.json';
 import conversation from './conversation.json';
 import csatMgmt from './csatMgmt.json';
+import customRole from './customRole.json';
+import datePicker from './datePicker.json';
 import emoji from './emoji.json';
+import general from './general.json';
 import generalSettings from './generalSettings.json';
 import helpCenter from './helpCenter.json';
+import inbox from './inbox.json';
 import inboxMgmt from './inboxMgmt.json';
 import integrationApps from './integrationApps.json';
 import integrations from './integrations.json';
@@ -27,6 +32,7 @@ import search from './search.json';
 import setNewPassword from './setNewPassword.json';
 import settings from './settings.json';
 import signup from './signup.json';
+import sla from './sla.json';
 import teamsSettings from './teamsSettings.json';
 import whatsappTemplates from './whatsappTemplates.json';
 
@@ -41,13 +47,18 @@ export default {
   ...campaign,
   ...cannedMgmt,
   ...chatlist,
+  ...components,
   ...contact,
   ...contactFilters,
   ...conversation,
   ...csatMgmt,
+  ...customRole,
+  ...datePicker,
   ...emoji,
+  ...general,
   ...generalSettings,
   ...helpCenter,
+  ...inbox,
   ...inboxMgmt,
   ...integrationApps,
   ...integrations,
@@ -60,6 +71,7 @@ export default {
   ...setNewPassword,
   ...settings,
   ...signup,
+  ...sla,
   ...teamsSettings,
   ...whatsappTemplates,
 };
diff --git a/app/javascript/dashboard/i18n/locale/ne/index.js b/app/javascript/dashboard/i18n/locale/ne/index.js
index 434e50e1d..213387d0c 100644
--- a/app/javascript/dashboard/i18n/locale/ne/index.js
+++ b/app/javascript/dashboard/i18n/locale/ne/index.js
@@ -8,13 +8,18 @@ import bulkActions from './bulkActions.json';
 import campaign from './campaign.json';
 import cannedMgmt from './cannedMgmt.json';
 import chatlist from './chatlist.json';
+import components from './components.json';
 import contact from './contact.json';
 import contactFilters from './contactFilters.json';
 import conversation from './conversation.json';
 import csatMgmt from './csatMgmt.json';
+import customRole from './customRole.json';
+import datePicker from './datePicker.json';
 import emoji from './emoji.json';
+import general from './general.json';
 import generalSettings from './generalSettings.json';
 import helpCenter from './helpCenter.json';
+import inbox from './inbox.json';
 import inboxMgmt from './inboxMgmt.json';
 import integrationApps from './integrationApps.json';
 import integrations from './integrations.json';
@@ -27,6 +32,7 @@ import search from './search.json';
 import setNewPassword from './setNewPassword.json';
 import settings from './settings.json';
 import signup from './signup.json';
+import sla from './sla.json';
 import teamsSettings from './teamsSettings.json';
 import whatsappTemplates from './whatsappTemplates.json';
 
@@ -41,13 +47,18 @@ export default {
   ...campaign,
   ...cannedMgmt,
   ...chatlist,
+  ...components,
   ...contact,
   ...contactFilters,
   ...conversation,
   ...csatMgmt,
+  ...customRole,
+  ...datePicker,
   ...emoji,
+  ...general,
   ...generalSettings,
   ...helpCenter,
+  ...inbox,
   ...inboxMgmt,
   ...integrationApps,
   ...integrations,
@@ -60,6 +71,7 @@ export default {
   ...setNewPassword,
   ...settings,
   ...signup,
+  ...sla,
   ...teamsSettings,
   ...whatsappTemplates,
 };
diff --git a/app/javascript/dashboard/i18n/locale/nl/index.js b/app/javascript/dashboard/i18n/locale/nl/index.js
index 434e50e1d..213387d0c 100644
--- a/app/javascript/dashboard/i18n/locale/nl/index.js
+++ b/app/javascript/dashboard/i18n/locale/nl/index.js
@@ -8,13 +8,18 @@ import bulkActions from './bulkActions.json';
 import campaign from './campaign.json';
 import cannedMgmt from './cannedMgmt.json';
 import chatlist from './chatlist.json';
+import components from './components.json';
 import contact from './contact.json';
 import contactFilters from './contactFilters.json';
 import conversation from './conversation.json';
 import csatMgmt from './csatMgmt.json';
+import customRole from './customRole.json';
+import datePicker from './datePicker.json';
 import emoji from './emoji.json';
+import general from './general.json';
 import generalSettings from './generalSettings.json';
 import helpCenter from './helpCenter.json';
+import inbox from './inbox.json';
 import inboxMgmt from './inboxMgmt.json';
 import integrationApps from './integrationApps.json';
 import integrations from './integrations.json';
@@ -27,6 +32,7 @@ import search from './search.json';
 import setNewPassword from './setNewPassword.json';
 import settings from './settings.json';
 import signup from './signup.json';
+import sla from './sla.json';
 import teamsSettings from './teamsSettings.json';
 import whatsappTemplates from './whatsappTemplates.json';
 
@@ -41,13 +47,18 @@ export default {
   ...campaign,
   ...cannedMgmt,
   ...chatlist,
+  ...components,
   ...contact,
   ...contactFilters,
   ...conversation,
   ...csatMgmt,
+  ...customRole,
+  ...datePicker,
   ...emoji,
+  ...general,
   ...generalSettings,
   ...helpCenter,
+  ...inbox,
   ...inboxMgmt,
   ...integrationApps,
   ...integrations,
@@ -60,6 +71,7 @@ export default {
   ...setNewPassword,
   ...settings,
   ...signup,
+  ...sla,
   ...teamsSettings,
   ...whatsappTemplates,
 };
diff --git a/app/javascript/dashboard/i18n/locale/no/index.js b/app/javascript/dashboard/i18n/locale/no/index.js
index 434e50e1d..213387d0c 100644
--- a/app/javascript/dashboard/i18n/locale/no/index.js
+++ b/app/javascript/dashboard/i18n/locale/no/index.js
@@ -8,13 +8,18 @@ import bulkActions from './bulkActions.json';
 import campaign from './campaign.json';
 import cannedMgmt from './cannedMgmt.json';
 import chatlist from './chatlist.json';
+import components from './components.json';
 import contact from './contact.json';
 import contactFilters from './contactFilters.json';
 import conversation from './conversation.json';
 import csatMgmt from './csatMgmt.json';
+import customRole from './customRole.json';
+import datePicker from './datePicker.json';
 import emoji from './emoji.json';
+import general from './general.json';
 import generalSettings from './generalSettings.json';
 import helpCenter from './helpCenter.json';
+import inbox from './inbox.json';
 import inboxMgmt from './inboxMgmt.json';
 import integrationApps from './integrationApps.json';
 import integrations from './integrations.json';
@@ -27,6 +32,7 @@ import search from './search.json';
 import setNewPassword from './setNewPassword.json';
 import settings from './settings.json';
 import signup from './signup.json';
+import sla from './sla.json';
 import teamsSettings from './teamsSettings.json';
 import whatsappTemplates from './whatsappTemplates.json';
 
@@ -41,13 +47,18 @@ export default {
   ...campaign,
   ...cannedMgmt,
   ...chatlist,
+  ...components,
   ...contact,
   ...contactFilters,
   ...conversation,
   ...csatMgmt,
+  ...customRole,
+  ...datePicker,
   ...emoji,
+  ...general,
   ...generalSettings,
   ...helpCenter,
+  ...inbox,
   ...inboxMgmt,
   ...integrationApps,
   ...integrations,
@@ -60,6 +71,7 @@ export default {
   ...setNewPassword,
   ...settings,
   ...signup,
+  ...sla,
   ...teamsSettings,
   ...whatsappTemplates,
 };
diff --git a/app/javascript/dashboard/i18n/locale/pl/index.js b/app/javascript/dashboard/i18n/locale/pl/index.js
index 434e50e1d..213387d0c 100644
--- a/app/javascript/dashboard/i18n/locale/pl/index.js
+++ b/app/javascript/dashboard/i18n/locale/pl/index.js
@@ -8,13 +8,18 @@ import bulkActions from './bulkActions.json';
 import campaign from './campaign.json';
 import cannedMgmt from './cannedMgmt.json';
 import chatlist from './chatlist.json';
+import components from './components.json';
 import contact from './contact.json';
 import contactFilters from './contactFilters.json';
 import conversation from './conversation.json';
 import csatMgmt from './csatMgmt.json';
+import customRole from './customRole.json';
+import datePicker from './datePicker.json';
 import emoji from './emoji.json';
+import general from './general.json';
 import generalSettings from './generalSettings.json';
 import helpCenter from './helpCenter.json';
+import inbox from './inbox.json';
 import inboxMgmt from './inboxMgmt.json';
 import integrationApps from './integrationApps.json';
 import integrations from './integrations.json';
@@ -27,6 +32,7 @@ import search from './search.json';
 import setNewPassword from './setNewPassword.json';
 import settings from './settings.json';
 import signup from './signup.json';
+import sla from './sla.json';
 import teamsSettings from './teamsSettings.json';
 import whatsappTemplates from './whatsappTemplates.json';
 
@@ -41,13 +47,18 @@ export default {
   ...campaign,
   ...cannedMgmt,
   ...chatlist,
+  ...components,
   ...contact,
   ...contactFilters,
   ...conversation,
   ...csatMgmt,
+  ...customRole,
+  ...datePicker,
   ...emoji,
+  ...general,
   ...generalSettings,
   ...helpCenter,
+  ...inbox,
   ...inboxMgmt,
   ...integrationApps,
   ...integrations,
@@ -60,6 +71,7 @@ export default {
   ...setNewPassword,
   ...settings,
   ...signup,
+  ...sla,
   ...teamsSettings,
   ...whatsappTemplates,
 };
diff --git a/app/javascript/dashboard/i18n/locale/pt/index.js b/app/javascript/dashboard/i18n/locale/pt/index.js
index 434e50e1d..213387d0c 100644
--- a/app/javascript/dashboard/i18n/locale/pt/index.js
+++ b/app/javascript/dashboard/i18n/locale/pt/index.js
@@ -8,13 +8,18 @@ import bulkActions from './bulkActions.json';
 import campaign from './campaign.json';
 import cannedMgmt from './cannedMgmt.json';
 import chatlist from './chatlist.json';
+import components from './components.json';
 import contact from './contact.json';
 import contactFilters from './contactFilters.json';
 import conversation from './conversation.json';
 import csatMgmt from './csatMgmt.json';
+import customRole from './customRole.json';
+import datePicker from './datePicker.json';
 import emoji from './emoji.json';
+import general from './general.json';
 import generalSettings from './generalSettings.json';
 import helpCenter from './helpCenter.json';
+import inbox from './inbox.json';
 import inboxMgmt from './inboxMgmt.json';
 import integrationApps from './integrationApps.json';
 import integrations from './integrations.json';
@@ -27,6 +32,7 @@ import search from './search.json';
 import setNewPassword from './setNewPassword.json';
 import settings from './settings.json';
 import signup from './signup.json';
+import sla from './sla.json';
 import teamsSettings from './teamsSettings.json';
 import whatsappTemplates from './whatsappTemplates.json';
 
@@ -41,13 +47,18 @@ export default {
   ...campaign,
   ...cannedMgmt,
   ...chatlist,
+  ...components,
   ...contact,
   ...contactFilters,
   ...conversation,
   ...csatMgmt,
+  ...customRole,
+  ...datePicker,
   ...emoji,
+  ...general,
   ...generalSettings,
   ...helpCenter,
+  ...inbox,
   ...inboxMgmt,
   ...integrationApps,
   ...integrations,
@@ -60,6 +71,7 @@ export default {
   ...setNewPassword,
   ...settings,
   ...signup,
+  ...sla,
   ...teamsSettings,
   ...whatsappTemplates,
 };
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/pt_BR/cannedMgmt.json
index d7eaf607d..6e62b5ee7 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/cannedMgmt.json
@@ -22,7 +22,7 @@
       "CANCEL_BUTTON_TEXT": "Cancelar",
       "FORM": {
         "SHORT_CODE": {
-          "LABEL": "Respostas prontas",
+          "LABEL": "Atalho",
           "PLACEHOLDER": "Por favor, insira um atalho.",
           "ERROR": "O atalho é obrigatório."
         },
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/chatlist.json b/app/javascript/dashboard/i18n/locale/pt_BR/chatlist.json
index e47ae16c0..5f4b16d1f 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/chatlist.json
@@ -37,7 +37,7 @@
       }
     },
     "VIEW_FILTER": "Visualizar",
-    "SORT_TOOLTIP_LABEL": "Classificar conversas",
+    "SORT_TOOLTIP_LABEL": "Ordenar conversas",
     "CHAT_SORT": {
       "STATUS": "Situação",
       "ORDER_BY": "Ordenar por"
@@ -105,7 +105,7 @@
       }
     },
     "CHAT_SORT_BY_FILTER": {
-      "TITLE": "Classificar conversas",
+      "TITLE": "Ordenar conversas",
       "DROPDOWN_TITLE": "Ordenar por",
       "ITEMS": {
         "LATEST": {
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/contact.json b/app/javascript/dashboard/i18n/locale/pt_BR/contact.json
index 998dd4f0c..e8bce3177 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/contact.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/contact.json
@@ -33,7 +33,7 @@
       "LABEL_SELECT": {
         "TITLE": "Adicionar marcador",
         "PLACEHOLDER": "Pesquisar marcador ",
-        "NO_RESULT": "Nenhum rótulo encontrado",
+        "NO_RESULT": "Nenhuma etiqueta encontrada",
         "CREATE_LABEL": "Criar etiqueta"
       }
     },
@@ -53,8 +53,8 @@
     }
   },
   "EDIT_CONTACT": {
-    "BUTTON_LABEL": "Alterar Contato",
-    "TITLE": "Alterar contato",
+    "BUTTON_LABEL": "Editar Contato",
+    "TITLE": "Editar contato",
     "DESC": "Alterar detalhes do contato"
   },
   "DELETE_CONTACT": {
@@ -113,7 +113,7 @@
         "PLACEHOLDER": "Digite o nome do país ",
         "LABEL": "Nome do País",
         "SELECT_PLACEHOLDER": "Selecionar",
-        "REMOVE": "Excluir",
+        "REMOVE": "Remover",
         "SELECT_COUNTRY": "Selecione o país"
       },
       "CITY": {
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/inbox.json b/app/javascript/dashboard/i18n/locale/pt_BR/inbox.json
index 170e332ec..e3099a4ab 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/inbox.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/inbox.json
@@ -47,7 +47,7 @@
       "DELETE": "Excluir",
       "MARK_ALL_READ": "Marcar todas como lidas",
       "DELETE_ALL": "Excluir todos",
-      "DELETE_ALL_READ": "Excluir todos os lidos"
+      "DELETE_ALL_READ": "Excluir todas as lidas"
     },
     "DISPLAY_MENU": {
       "SORT": "Ordenar",
@@ -60,8 +60,8 @@
       "DISPLAY_OPTIONS": {
         "SNOOZED": "Adiado",
         "READ": "Lida",
-        "LABELS": "Marcadores",
-        "CONVERSATION_ID": "Conversas"
+        "LABELS": "Etiquetas",
+        "CONVERSATION_ID": "ID da conversa"
       }
     },
     "ALERTS": {
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/index.js b/app/javascript/dashboard/i18n/locale/pt_BR/index.js
index 434e50e1d..213387d0c 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/index.js
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/index.js
@@ -8,13 +8,18 @@ import bulkActions from './bulkActions.json';
 import campaign from './campaign.json';
 import cannedMgmt from './cannedMgmt.json';
 import chatlist from './chatlist.json';
+import components from './components.json';
 import contact from './contact.json';
 import contactFilters from './contactFilters.json';
 import conversation from './conversation.json';
 import csatMgmt from './csatMgmt.json';
+import customRole from './customRole.json';
+import datePicker from './datePicker.json';
 import emoji from './emoji.json';
+import general from './general.json';
 import generalSettings from './generalSettings.json';
 import helpCenter from './helpCenter.json';
+import inbox from './inbox.json';
 import inboxMgmt from './inboxMgmt.json';
 import integrationApps from './integrationApps.json';
 import integrations from './integrations.json';
@@ -27,6 +32,7 @@ import search from './search.json';
 import setNewPassword from './setNewPassword.json';
 import settings from './settings.json';
 import signup from './signup.json';
+import sla from './sla.json';
 import teamsSettings from './teamsSettings.json';
 import whatsappTemplates from './whatsappTemplates.json';
 
@@ -41,13 +47,18 @@ export default {
   ...campaign,
   ...cannedMgmt,
   ...chatlist,
+  ...components,
   ...contact,
   ...contactFilters,
   ...conversation,
   ...csatMgmt,
+  ...customRole,
+  ...datePicker,
   ...emoji,
+  ...general,
   ...generalSettings,
   ...helpCenter,
+  ...inbox,
   ...inboxMgmt,
   ...integrationApps,
   ...integrations,
@@ -60,6 +71,7 @@ export default {
   ...setNewPassword,
   ...settings,
   ...signup,
+  ...sla,
   ...teamsSettings,
   ...whatsappTemplates,
 };
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/integrations.json b/app/javascript/dashboard/i18n/locale/pt_BR/integrations.json
index 79e42a64b..79334d9f7 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/integrations.json
@@ -307,10 +307,10 @@
     "NAME": "Capitão",
     "COPILOT": {
       "SEND_MESSAGE": "Enviar mensagem...",
-      "LOADER": "Captain está pensando",
+      "LOADER": "Capitão está pensando",
       "YOU": "Você",
       "USE": "Use isto",
-      "RESET": "Reset"
+      "RESET": "Reiniciar"
     },
     "PAYWALL": {
       "TITLE": "Atualize para usar o Capitão IA",
diff --git a/app/javascript/dashboard/i18n/locale/ro/index.js b/app/javascript/dashboard/i18n/locale/ro/index.js
index 434e50e1d..213387d0c 100644
--- a/app/javascript/dashboard/i18n/locale/ro/index.js
+++ b/app/javascript/dashboard/i18n/locale/ro/index.js
@@ -8,13 +8,18 @@ import bulkActions from './bulkActions.json';
 import campaign from './campaign.json';
 import cannedMgmt from './cannedMgmt.json';
 import chatlist from './chatlist.json';
+import components from './components.json';
 import contact from './contact.json';
 import contactFilters from './contactFilters.json';
 import conversation from './conversation.json';
 import csatMgmt from './csatMgmt.json';
+import customRole from './customRole.json';
+import datePicker from './datePicker.json';
 import emoji from './emoji.json';
+import general from './general.json';
 import generalSettings from './generalSettings.json';
 import helpCenter from './helpCenter.json';
+import inbox from './inbox.json';
 import inboxMgmt from './inboxMgmt.json';
 import integrationApps from './integrationApps.json';
 import integrations from './integrations.json';
@@ -27,6 +32,7 @@ import search from './search.json';
 import setNewPassword from './setNewPassword.json';
 import settings from './settings.json';
 import signup from './signup.json';
+import sla from './sla.json';
 import teamsSettings from './teamsSettings.json';
 import whatsappTemplates from './whatsappTemplates.json';
 
@@ -41,13 +47,18 @@ export default {
   ...campaign,
   ...cannedMgmt,
   ...chatlist,
+  ...components,
   ...contact,
   ...contactFilters,
   ...conversation,
   ...csatMgmt,
+  ...customRole,
+  ...datePicker,
   ...emoji,
+  ...general,
   ...generalSettings,
   ...helpCenter,
+  ...inbox,
   ...inboxMgmt,
   ...integrationApps,
   ...integrations,
@@ -60,6 +71,7 @@ export default {
   ...setNewPassword,
   ...settings,
   ...signup,
+  ...sla,
   ...teamsSettings,
   ...whatsappTemplates,
 };
diff --git a/app/javascript/dashboard/i18n/locale/ru/index.js b/app/javascript/dashboard/i18n/locale/ru/index.js
index 434e50e1d..213387d0c 100644
--- a/app/javascript/dashboard/i18n/locale/ru/index.js
+++ b/app/javascript/dashboard/i18n/locale/ru/index.js
@@ -8,13 +8,18 @@ import bulkActions from './bulkActions.json';
 import campaign from './campaign.json';
 import cannedMgmt from './cannedMgmt.json';
 import chatlist from './chatlist.json';
+import components from './components.json';
 import contact from './contact.json';
 import contactFilters from './contactFilters.json';
 import conversation from './conversation.json';
 import csatMgmt from './csatMgmt.json';
+import customRole from './customRole.json';
+import datePicker from './datePicker.json';
 import emoji from './emoji.json';
+import general from './general.json';
 import generalSettings from './generalSettings.json';
 import helpCenter from './helpCenter.json';
+import inbox from './inbox.json';
 import inboxMgmt from './inboxMgmt.json';
 import integrationApps from './integrationApps.json';
 import integrations from './integrations.json';
@@ -27,6 +32,7 @@ import search from './search.json';
 import setNewPassword from './setNewPassword.json';
 import settings from './settings.json';
 import signup from './signup.json';
+import sla from './sla.json';
 import teamsSettings from './teamsSettings.json';
 import whatsappTemplates from './whatsappTemplates.json';
 
@@ -41,13 +47,18 @@ export default {
   ...campaign,
   ...cannedMgmt,
   ...chatlist,
+  ...components,
   ...contact,
   ...contactFilters,
   ...conversation,
   ...csatMgmt,
+  ...customRole,
+  ...datePicker,
   ...emoji,
+  ...general,
   ...generalSettings,
   ...helpCenter,
+  ...inbox,
   ...inboxMgmt,
   ...integrationApps,
   ...integrations,
@@ -60,6 +71,7 @@ export default {
   ...setNewPassword,
   ...settings,
   ...signup,
+  ...sla,
   ...teamsSettings,
   ...whatsappTemplates,
 };
diff --git a/app/javascript/dashboard/i18n/locale/sh/index.js b/app/javascript/dashboard/i18n/locale/sh/index.js
index 434e50e1d..213387d0c 100644
--- a/app/javascript/dashboard/i18n/locale/sh/index.js
+++ b/app/javascript/dashboard/i18n/locale/sh/index.js
@@ -8,13 +8,18 @@ import bulkActions from './bulkActions.json';
 import campaign from './campaign.json';
 import cannedMgmt from './cannedMgmt.json';
 import chatlist from './chatlist.json';
+import components from './components.json';
 import contact from './contact.json';
 import contactFilters from './contactFilters.json';
 import conversation from './conversation.json';
 import csatMgmt from './csatMgmt.json';
+import customRole from './customRole.json';
+import datePicker from './datePicker.json';
 import emoji from './emoji.json';
+import general from './general.json';
 import generalSettings from './generalSettings.json';
 import helpCenter from './helpCenter.json';
+import inbox from './inbox.json';
 import inboxMgmt from './inboxMgmt.json';
 import integrationApps from './integrationApps.json';
 import integrations from './integrations.json';
@@ -27,6 +32,7 @@ import search from './search.json';
 import setNewPassword from './setNewPassword.json';
 import settings from './settings.json';
 import signup from './signup.json';
+import sla from './sla.json';
 import teamsSettings from './teamsSettings.json';
 import whatsappTemplates from './whatsappTemplates.json';
 
@@ -41,13 +47,18 @@ export default {
   ...campaign,
   ...cannedMgmt,
   ...chatlist,
+  ...components,
   ...contact,
   ...contactFilters,
   ...conversation,
   ...csatMgmt,
+  ...customRole,
+  ...datePicker,
   ...emoji,
+  ...general,
   ...generalSettings,
   ...helpCenter,
+  ...inbox,
   ...inboxMgmt,
   ...integrationApps,
   ...integrations,
@@ -60,6 +71,7 @@ export default {
   ...setNewPassword,
   ...settings,
   ...signup,
+  ...sla,
   ...teamsSettings,
   ...whatsappTemplates,
 };
diff --git a/app/javascript/dashboard/i18n/locale/sk/index.js b/app/javascript/dashboard/i18n/locale/sk/index.js
index 434e50e1d..213387d0c 100644
--- a/app/javascript/dashboard/i18n/locale/sk/index.js
+++ b/app/javascript/dashboard/i18n/locale/sk/index.js
@@ -8,13 +8,18 @@ import bulkActions from './bulkActions.json';
 import campaign from './campaign.json';
 import cannedMgmt from './cannedMgmt.json';
 import chatlist from './chatlist.json';
+import components from './components.json';
 import contact from './contact.json';
 import contactFilters from './contactFilters.json';
 import conversation from './conversation.json';
 import csatMgmt from './csatMgmt.json';
+import customRole from './customRole.json';
+import datePicker from './datePicker.json';
 import emoji from './emoji.json';
+import general from './general.json';
 import generalSettings from './generalSettings.json';
 import helpCenter from './helpCenter.json';
+import inbox from './inbox.json';
 import inboxMgmt from './inboxMgmt.json';
 import integrationApps from './integrationApps.json';
 import integrations from './integrations.json';
@@ -27,6 +32,7 @@ import search from './search.json';
 import setNewPassword from './setNewPassword.json';
 import settings from './settings.json';
 import signup from './signup.json';
+import sla from './sla.json';
 import teamsSettings from './teamsSettings.json';
 import whatsappTemplates from './whatsappTemplates.json';
 
@@ -41,13 +47,18 @@ export default {
   ...campaign,
   ...cannedMgmt,
   ...chatlist,
+  ...components,
   ...contact,
   ...contactFilters,
   ...conversation,
   ...csatMgmt,
+  ...customRole,
+  ...datePicker,
   ...emoji,
+  ...general,
   ...generalSettings,
   ...helpCenter,
+  ...inbox,
   ...inboxMgmt,
   ...integrationApps,
   ...integrations,
@@ -60,6 +71,7 @@ export default {
   ...setNewPassword,
   ...settings,
   ...signup,
+  ...sla,
   ...teamsSettings,
   ...whatsappTemplates,
 };
diff --git a/app/javascript/dashboard/i18n/locale/sl/index.js b/app/javascript/dashboard/i18n/locale/sl/index.js
new file mode 100644
index 000000000..213387d0c
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sl/index.js
@@ -0,0 +1,77 @@
+import advancedFilters from './advancedFilters.json';
+import agentBots from './agentBots.json';
+import agentMgmt from './agentMgmt.json';
+import attributesMgmt from './attributesMgmt.json';
+import auditLogs from './auditLogs.json';
+import automation from './automation.json';
+import bulkActions from './bulkActions.json';
+import campaign from './campaign.json';
+import cannedMgmt from './cannedMgmt.json';
+import chatlist from './chatlist.json';
+import components from './components.json';
+import contact from './contact.json';
+import contactFilters from './contactFilters.json';
+import conversation from './conversation.json';
+import csatMgmt from './csatMgmt.json';
+import customRole from './customRole.json';
+import datePicker from './datePicker.json';
+import emoji from './emoji.json';
+import general from './general.json';
+import generalSettings from './generalSettings.json';
+import helpCenter from './helpCenter.json';
+import inbox from './inbox.json';
+import inboxMgmt from './inboxMgmt.json';
+import integrationApps from './integrationApps.json';
+import integrations from './integrations.json';
+import labelsMgmt from './labelsMgmt.json';
+import login from './login.json';
+import macros from './macros.json';
+import report from './report.json';
+import resetPassword from './resetPassword.json';
+import search from './search.json';
+import setNewPassword from './setNewPassword.json';
+import settings from './settings.json';
+import signup from './signup.json';
+import sla from './sla.json';
+import teamsSettings from './teamsSettings.json';
+import whatsappTemplates from './whatsappTemplates.json';
+
+export default {
+  ...advancedFilters,
+  ...agentBots,
+  ...agentMgmt,
+  ...attributesMgmt,
+  ...auditLogs,
+  ...automation,
+  ...bulkActions,
+  ...campaign,
+  ...cannedMgmt,
+  ...chatlist,
+  ...components,
+  ...contact,
+  ...contactFilters,
+  ...conversation,
+  ...csatMgmt,
+  ...customRole,
+  ...datePicker,
+  ...emoji,
+  ...general,
+  ...generalSettings,
+  ...helpCenter,
+  ...inbox,
+  ...inboxMgmt,
+  ...integrationApps,
+  ...integrations,
+  ...labelsMgmt,
+  ...login,
+  ...macros,
+  ...report,
+  ...resetPassword,
+  ...search,
+  ...setNewPassword,
+  ...settings,
+  ...signup,
+  ...sla,
+  ...teamsSettings,
+  ...whatsappTemplates,
+};
diff --git a/app/javascript/dashboard/i18n/locale/sq/index.js b/app/javascript/dashboard/i18n/locale/sq/index.js
new file mode 100644
index 000000000..213387d0c
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sq/index.js
@@ -0,0 +1,77 @@
+import advancedFilters from './advancedFilters.json';
+import agentBots from './agentBots.json';
+import agentMgmt from './agentMgmt.json';
+import attributesMgmt from './attributesMgmt.json';
+import auditLogs from './auditLogs.json';
+import automation from './automation.json';
+import bulkActions from './bulkActions.json';
+import campaign from './campaign.json';
+import cannedMgmt from './cannedMgmt.json';
+import chatlist from './chatlist.json';
+import components from './components.json';
+import contact from './contact.json';
+import contactFilters from './contactFilters.json';
+import conversation from './conversation.json';
+import csatMgmt from './csatMgmt.json';
+import customRole from './customRole.json';
+import datePicker from './datePicker.json';
+import emoji from './emoji.json';
+import general from './general.json';
+import generalSettings from './generalSettings.json';
+import helpCenter from './helpCenter.json';
+import inbox from './inbox.json';
+import inboxMgmt from './inboxMgmt.json';
+import integrationApps from './integrationApps.json';
+import integrations from './integrations.json';
+import labelsMgmt from './labelsMgmt.json';
+import login from './login.json';
+import macros from './macros.json';
+import report from './report.json';
+import resetPassword from './resetPassword.json';
+import search from './search.json';
+import setNewPassword from './setNewPassword.json';
+import settings from './settings.json';
+import signup from './signup.json';
+import sla from './sla.json';
+import teamsSettings from './teamsSettings.json';
+import whatsappTemplates from './whatsappTemplates.json';
+
+export default {
+  ...advancedFilters,
+  ...agentBots,
+  ...agentMgmt,
+  ...attributesMgmt,
+  ...auditLogs,
+  ...automation,
+  ...bulkActions,
+  ...campaign,
+  ...cannedMgmt,
+  ...chatlist,
+  ...components,
+  ...contact,
+  ...contactFilters,
+  ...conversation,
+  ...csatMgmt,
+  ...customRole,
+  ...datePicker,
+  ...emoji,
+  ...general,
+  ...generalSettings,
+  ...helpCenter,
+  ...inbox,
+  ...inboxMgmt,
+  ...integrationApps,
+  ...integrations,
+  ...labelsMgmt,
+  ...login,
+  ...macros,
+  ...report,
+  ...resetPassword,
+  ...search,
+  ...setNewPassword,
+  ...settings,
+  ...signup,
+  ...sla,
+  ...teamsSettings,
+  ...whatsappTemplates,
+};
diff --git a/app/javascript/dashboard/i18n/locale/sr/index.js b/app/javascript/dashboard/i18n/locale/sr/index.js
index 434e50e1d..213387d0c 100644
--- a/app/javascript/dashboard/i18n/locale/sr/index.js
+++ b/app/javascript/dashboard/i18n/locale/sr/index.js
@@ -8,13 +8,18 @@ import bulkActions from './bulkActions.json';
 import campaign from './campaign.json';
 import cannedMgmt from './cannedMgmt.json';
 import chatlist from './chatlist.json';
+import components from './components.json';
 import contact from './contact.json';
 import contactFilters from './contactFilters.json';
 import conversation from './conversation.json';
 import csatMgmt from './csatMgmt.json';
+import customRole from './customRole.json';
+import datePicker from './datePicker.json';
 import emoji from './emoji.json';
+import general from './general.json';
 import generalSettings from './generalSettings.json';
 import helpCenter from './helpCenter.json';
+import inbox from './inbox.json';
 import inboxMgmt from './inboxMgmt.json';
 import integrationApps from './integrationApps.json';
 import integrations from './integrations.json';
@@ -27,6 +32,7 @@ import search from './search.json';
 import setNewPassword from './setNewPassword.json';
 import settings from './settings.json';
 import signup from './signup.json';
+import sla from './sla.json';
 import teamsSettings from './teamsSettings.json';
 import whatsappTemplates from './whatsappTemplates.json';
 
@@ -41,13 +47,18 @@ export default {
   ...campaign,
   ...cannedMgmt,
   ...chatlist,
+  ...components,
   ...contact,
   ...contactFilters,
   ...conversation,
   ...csatMgmt,
+  ...customRole,
+  ...datePicker,
   ...emoji,
+  ...general,
   ...generalSettings,
   ...helpCenter,
+  ...inbox,
   ...inboxMgmt,
   ...integrationApps,
   ...integrations,
@@ -60,6 +71,7 @@ export default {
   ...setNewPassword,
   ...settings,
   ...signup,
+  ...sla,
   ...teamsSettings,
   ...whatsappTemplates,
 };
diff --git a/app/javascript/dashboard/i18n/locale/sv/index.js b/app/javascript/dashboard/i18n/locale/sv/index.js
index 434e50e1d..213387d0c 100644
--- a/app/javascript/dashboard/i18n/locale/sv/index.js
+++ b/app/javascript/dashboard/i18n/locale/sv/index.js
@@ -8,13 +8,18 @@ import bulkActions from './bulkActions.json';
 import campaign from './campaign.json';
 import cannedMgmt from './cannedMgmt.json';
 import chatlist from './chatlist.json';
+import components from './components.json';
 import contact from './contact.json';
 import contactFilters from './contactFilters.json';
 import conversation from './conversation.json';
 import csatMgmt from './csatMgmt.json';
+import customRole from './customRole.json';
+import datePicker from './datePicker.json';
 import emoji from './emoji.json';
+import general from './general.json';
 import generalSettings from './generalSettings.json';
 import helpCenter from './helpCenter.json';
+import inbox from './inbox.json';
 import inboxMgmt from './inboxMgmt.json';
 import integrationApps from './integrationApps.json';
 import integrations from './integrations.json';
@@ -27,6 +32,7 @@ import search from './search.json';
 import setNewPassword from './setNewPassword.json';
 import settings from './settings.json';
 import signup from './signup.json';
+import sla from './sla.json';
 import teamsSettings from './teamsSettings.json';
 import whatsappTemplates from './whatsappTemplates.json';
 
@@ -41,13 +47,18 @@ export default {
   ...campaign,
   ...cannedMgmt,
   ...chatlist,
+  ...components,
   ...contact,
   ...contactFilters,
   ...conversation,
   ...csatMgmt,
+  ...customRole,
+  ...datePicker,
   ...emoji,
+  ...general,
   ...generalSettings,
   ...helpCenter,
+  ...inbox,
   ...inboxMgmt,
   ...integrationApps,
   ...integrations,
@@ -60,6 +71,7 @@ export default {
   ...setNewPassword,
   ...settings,
   ...signup,
+  ...sla,
   ...teamsSettings,
   ...whatsappTemplates,
 };
diff --git a/app/javascript/dashboard/i18n/locale/ta/index.js b/app/javascript/dashboard/i18n/locale/ta/index.js
index 434e50e1d..213387d0c 100644
--- a/app/javascript/dashboard/i18n/locale/ta/index.js
+++ b/app/javascript/dashboard/i18n/locale/ta/index.js
@@ -8,13 +8,18 @@ import bulkActions from './bulkActions.json';
 import campaign from './campaign.json';
 import cannedMgmt from './cannedMgmt.json';
 import chatlist from './chatlist.json';
+import components from './components.json';
 import contact from './contact.json';
 import contactFilters from './contactFilters.json';
 import conversation from './conversation.json';
 import csatMgmt from './csatMgmt.json';
+import customRole from './customRole.json';
+import datePicker from './datePicker.json';
 import emoji from './emoji.json';
+import general from './general.json';
 import generalSettings from './generalSettings.json';
 import helpCenter from './helpCenter.json';
+import inbox from './inbox.json';
 import inboxMgmt from './inboxMgmt.json';
 import integrationApps from './integrationApps.json';
 import integrations from './integrations.json';
@@ -27,6 +32,7 @@ import search from './search.json';
 import setNewPassword from './setNewPassword.json';
 import settings from './settings.json';
 import signup from './signup.json';
+import sla from './sla.json';
 import teamsSettings from './teamsSettings.json';
 import whatsappTemplates from './whatsappTemplates.json';
 
@@ -41,13 +47,18 @@ export default {
   ...campaign,
   ...cannedMgmt,
   ...chatlist,
+  ...components,
   ...contact,
   ...contactFilters,
   ...conversation,
   ...csatMgmt,
+  ...customRole,
+  ...datePicker,
   ...emoji,
+  ...general,
   ...generalSettings,
   ...helpCenter,
+  ...inbox,
   ...inboxMgmt,
   ...integrationApps,
   ...integrations,
@@ -60,6 +71,7 @@ export default {
   ...setNewPassword,
   ...settings,
   ...signup,
+  ...sla,
   ...teamsSettings,
   ...whatsappTemplates,
 };
diff --git a/app/javascript/dashboard/i18n/locale/th/index.js b/app/javascript/dashboard/i18n/locale/th/index.js
index 434e50e1d..213387d0c 100644
--- a/app/javascript/dashboard/i18n/locale/th/index.js
+++ b/app/javascript/dashboard/i18n/locale/th/index.js
@@ -8,13 +8,18 @@ import bulkActions from './bulkActions.json';
 import campaign from './campaign.json';
 import cannedMgmt from './cannedMgmt.json';
 import chatlist from './chatlist.json';
+import components from './components.json';
 import contact from './contact.json';
 import contactFilters from './contactFilters.json';
 import conversation from './conversation.json';
 import csatMgmt from './csatMgmt.json';
+import customRole from './customRole.json';
+import datePicker from './datePicker.json';
 import emoji from './emoji.json';
+import general from './general.json';
 import generalSettings from './generalSettings.json';
 import helpCenter from './helpCenter.json';
+import inbox from './inbox.json';
 import inboxMgmt from './inboxMgmt.json';
 import integrationApps from './integrationApps.json';
 import integrations from './integrations.json';
@@ -27,6 +32,7 @@ import search from './search.json';
 import setNewPassword from './setNewPassword.json';
 import settings from './settings.json';
 import signup from './signup.json';
+import sla from './sla.json';
 import teamsSettings from './teamsSettings.json';
 import whatsappTemplates from './whatsappTemplates.json';
 
@@ -41,13 +47,18 @@ export default {
   ...campaign,
   ...cannedMgmt,
   ...chatlist,
+  ...components,
   ...contact,
   ...contactFilters,
   ...conversation,
   ...csatMgmt,
+  ...customRole,
+  ...datePicker,
   ...emoji,
+  ...general,
   ...generalSettings,
   ...helpCenter,
+  ...inbox,
   ...inboxMgmt,
   ...integrationApps,
   ...integrations,
@@ -60,6 +71,7 @@ export default {
   ...setNewPassword,
   ...settings,
   ...signup,
+  ...sla,
   ...teamsSettings,
   ...whatsappTemplates,
 };
diff --git a/app/javascript/dashboard/i18n/locale/tl/index.js b/app/javascript/dashboard/i18n/locale/tl/index.js
new file mode 100644
index 000000000..213387d0c
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/tl/index.js
@@ -0,0 +1,77 @@
+import advancedFilters from './advancedFilters.json';
+import agentBots from './agentBots.json';
+import agentMgmt from './agentMgmt.json';
+import attributesMgmt from './attributesMgmt.json';
+import auditLogs from './auditLogs.json';
+import automation from './automation.json';
+import bulkActions from './bulkActions.json';
+import campaign from './campaign.json';
+import cannedMgmt from './cannedMgmt.json';
+import chatlist from './chatlist.json';
+import components from './components.json';
+import contact from './contact.json';
+import contactFilters from './contactFilters.json';
+import conversation from './conversation.json';
+import csatMgmt from './csatMgmt.json';
+import customRole from './customRole.json';
+import datePicker from './datePicker.json';
+import emoji from './emoji.json';
+import general from './general.json';
+import generalSettings from './generalSettings.json';
+import helpCenter from './helpCenter.json';
+import inbox from './inbox.json';
+import inboxMgmt from './inboxMgmt.json';
+import integrationApps from './integrationApps.json';
+import integrations from './integrations.json';
+import labelsMgmt from './labelsMgmt.json';
+import login from './login.json';
+import macros from './macros.json';
+import report from './report.json';
+import resetPassword from './resetPassword.json';
+import search from './search.json';
+import setNewPassword from './setNewPassword.json';
+import settings from './settings.json';
+import signup from './signup.json';
+import sla from './sla.json';
+import teamsSettings from './teamsSettings.json';
+import whatsappTemplates from './whatsappTemplates.json';
+
+export default {
+  ...advancedFilters,
+  ...agentBots,
+  ...agentMgmt,
+  ...attributesMgmt,
+  ...auditLogs,
+  ...automation,
+  ...bulkActions,
+  ...campaign,
+  ...cannedMgmt,
+  ...chatlist,
+  ...components,
+  ...contact,
+  ...contactFilters,
+  ...conversation,
+  ...csatMgmt,
+  ...customRole,
+  ...datePicker,
+  ...emoji,
+  ...general,
+  ...generalSettings,
+  ...helpCenter,
+  ...inbox,
+  ...inboxMgmt,
+  ...integrationApps,
+  ...integrations,
+  ...labelsMgmt,
+  ...login,
+  ...macros,
+  ...report,
+  ...resetPassword,
+  ...search,
+  ...setNewPassword,
+  ...settings,
+  ...signup,
+  ...sla,
+  ...teamsSettings,
+  ...whatsappTemplates,
+};
diff --git a/app/javascript/dashboard/i18n/locale/tr/index.js b/app/javascript/dashboard/i18n/locale/tr/index.js
index 434e50e1d..213387d0c 100644
--- a/app/javascript/dashboard/i18n/locale/tr/index.js
+++ b/app/javascript/dashboard/i18n/locale/tr/index.js
@@ -8,13 +8,18 @@ import bulkActions from './bulkActions.json';
 import campaign from './campaign.json';
 import cannedMgmt from './cannedMgmt.json';
 import chatlist from './chatlist.json';
+import components from './components.json';
 import contact from './contact.json';
 import contactFilters from './contactFilters.json';
 import conversation from './conversation.json';
 import csatMgmt from './csatMgmt.json';
+import customRole from './customRole.json';
+import datePicker from './datePicker.json';
 import emoji from './emoji.json';
+import general from './general.json';
 import generalSettings from './generalSettings.json';
 import helpCenter from './helpCenter.json';
+import inbox from './inbox.json';
 import inboxMgmt from './inboxMgmt.json';
 import integrationApps from './integrationApps.json';
 import integrations from './integrations.json';
@@ -27,6 +32,7 @@ import search from './search.json';
 import setNewPassword from './setNewPassword.json';
 import settings from './settings.json';
 import signup from './signup.json';
+import sla from './sla.json';
 import teamsSettings from './teamsSettings.json';
 import whatsappTemplates from './whatsappTemplates.json';
 
@@ -41,13 +47,18 @@ export default {
   ...campaign,
   ...cannedMgmt,
   ...chatlist,
+  ...components,
   ...contact,
   ...contactFilters,
   ...conversation,
   ...csatMgmt,
+  ...customRole,
+  ...datePicker,
   ...emoji,
+  ...general,
   ...generalSettings,
   ...helpCenter,
+  ...inbox,
   ...inboxMgmt,
   ...integrationApps,
   ...integrations,
@@ -60,6 +71,7 @@ export default {
   ...setNewPassword,
   ...settings,
   ...signup,
+  ...sla,
   ...teamsSettings,
   ...whatsappTemplates,
 };
diff --git a/app/javascript/dashboard/i18n/locale/uk/index.js b/app/javascript/dashboard/i18n/locale/uk/index.js
index 434e50e1d..213387d0c 100644
--- a/app/javascript/dashboard/i18n/locale/uk/index.js
+++ b/app/javascript/dashboard/i18n/locale/uk/index.js
@@ -8,13 +8,18 @@ import bulkActions from './bulkActions.json';
 import campaign from './campaign.json';
 import cannedMgmt from './cannedMgmt.json';
 import chatlist from './chatlist.json';
+import components from './components.json';
 import contact from './contact.json';
 import contactFilters from './contactFilters.json';
 import conversation from './conversation.json';
 import csatMgmt from './csatMgmt.json';
+import customRole from './customRole.json';
+import datePicker from './datePicker.json';
 import emoji from './emoji.json';
+import general from './general.json';
 import generalSettings from './generalSettings.json';
 import helpCenter from './helpCenter.json';
+import inbox from './inbox.json';
 import inboxMgmt from './inboxMgmt.json';
 import integrationApps from './integrationApps.json';
 import integrations from './integrations.json';
@@ -27,6 +32,7 @@ import search from './search.json';
 import setNewPassword from './setNewPassword.json';
 import settings from './settings.json';
 import signup from './signup.json';
+import sla from './sla.json';
 import teamsSettings from './teamsSettings.json';
 import whatsappTemplates from './whatsappTemplates.json';
 
@@ -41,13 +47,18 @@ export default {
   ...campaign,
   ...cannedMgmt,
   ...chatlist,
+  ...components,
   ...contact,
   ...contactFilters,
   ...conversation,
   ...csatMgmt,
+  ...customRole,
+  ...datePicker,
   ...emoji,
+  ...general,
   ...generalSettings,
   ...helpCenter,
+  ...inbox,
   ...inboxMgmt,
   ...integrationApps,
   ...integrations,
@@ -60,6 +71,7 @@ export default {
   ...setNewPassword,
   ...settings,
   ...signup,
+  ...sla,
   ...teamsSettings,
   ...whatsappTemplates,
 };
diff --git a/app/javascript/dashboard/i18n/locale/ur/index.js b/app/javascript/dashboard/i18n/locale/ur/index.js
index 434e50e1d..213387d0c 100644
--- a/app/javascript/dashboard/i18n/locale/ur/index.js
+++ b/app/javascript/dashboard/i18n/locale/ur/index.js
@@ -8,13 +8,18 @@ import bulkActions from './bulkActions.json';
 import campaign from './campaign.json';
 import cannedMgmt from './cannedMgmt.json';
 import chatlist from './chatlist.json';
+import components from './components.json';
 import contact from './contact.json';
 import contactFilters from './contactFilters.json';
 import conversation from './conversation.json';
 import csatMgmt from './csatMgmt.json';
+import customRole from './customRole.json';
+import datePicker from './datePicker.json';
 import emoji from './emoji.json';
+import general from './general.json';
 import generalSettings from './generalSettings.json';
 import helpCenter from './helpCenter.json';
+import inbox from './inbox.json';
 import inboxMgmt from './inboxMgmt.json';
 import integrationApps from './integrationApps.json';
 import integrations from './integrations.json';
@@ -27,6 +32,7 @@ import search from './search.json';
 import setNewPassword from './setNewPassword.json';
 import settings from './settings.json';
 import signup from './signup.json';
+import sla from './sla.json';
 import teamsSettings from './teamsSettings.json';
 import whatsappTemplates from './whatsappTemplates.json';
 
@@ -41,13 +47,18 @@ export default {
   ...campaign,
   ...cannedMgmt,
   ...chatlist,
+  ...components,
   ...contact,
   ...contactFilters,
   ...conversation,
   ...csatMgmt,
+  ...customRole,
+  ...datePicker,
   ...emoji,
+  ...general,
   ...generalSettings,
   ...helpCenter,
+  ...inbox,
   ...inboxMgmt,
   ...integrationApps,
   ...integrations,
@@ -60,6 +71,7 @@ export default {
   ...setNewPassword,
   ...settings,
   ...signup,
+  ...sla,
   ...teamsSettings,
   ...whatsappTemplates,
 };
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/index.js b/app/javascript/dashboard/i18n/locale/ur_IN/index.js
index 434e50e1d..213387d0c 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/index.js
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/index.js
@@ -8,13 +8,18 @@ import bulkActions from './bulkActions.json';
 import campaign from './campaign.json';
 import cannedMgmt from './cannedMgmt.json';
 import chatlist from './chatlist.json';
+import components from './components.json';
 import contact from './contact.json';
 import contactFilters from './contactFilters.json';
 import conversation from './conversation.json';
 import csatMgmt from './csatMgmt.json';
+import customRole from './customRole.json';
+import datePicker from './datePicker.json';
 import emoji from './emoji.json';
+import general from './general.json';
 import generalSettings from './generalSettings.json';
 import helpCenter from './helpCenter.json';
+import inbox from './inbox.json';
 import inboxMgmt from './inboxMgmt.json';
 import integrationApps from './integrationApps.json';
 import integrations from './integrations.json';
@@ -27,6 +32,7 @@ import search from './search.json';
 import setNewPassword from './setNewPassword.json';
 import settings from './settings.json';
 import signup from './signup.json';
+import sla from './sla.json';
 import teamsSettings from './teamsSettings.json';
 import whatsappTemplates from './whatsappTemplates.json';
 
@@ -41,13 +47,18 @@ export default {
   ...campaign,
   ...cannedMgmt,
   ...chatlist,
+  ...components,
   ...contact,
   ...contactFilters,
   ...conversation,
   ...csatMgmt,
+  ...customRole,
+  ...datePicker,
   ...emoji,
+  ...general,
   ...generalSettings,
   ...helpCenter,
+  ...inbox,
   ...inboxMgmt,
   ...integrationApps,
   ...integrations,
@@ -60,6 +71,7 @@ export default {
   ...setNewPassword,
   ...settings,
   ...signup,
+  ...sla,
   ...teamsSettings,
   ...whatsappTemplates,
 };
diff --git a/app/javascript/dashboard/i18n/locale/vi/index.js b/app/javascript/dashboard/i18n/locale/vi/index.js
index 434e50e1d..213387d0c 100644
--- a/app/javascript/dashboard/i18n/locale/vi/index.js
+++ b/app/javascript/dashboard/i18n/locale/vi/index.js
@@ -8,13 +8,18 @@ import bulkActions from './bulkActions.json';
 import campaign from './campaign.json';
 import cannedMgmt from './cannedMgmt.json';
 import chatlist from './chatlist.json';
+import components from './components.json';
 import contact from './contact.json';
 import contactFilters from './contactFilters.json';
 import conversation from './conversation.json';
 import csatMgmt from './csatMgmt.json';
+import customRole from './customRole.json';
+import datePicker from './datePicker.json';
 import emoji from './emoji.json';
+import general from './general.json';
 import generalSettings from './generalSettings.json';
 import helpCenter from './helpCenter.json';
+import inbox from './inbox.json';
 import inboxMgmt from './inboxMgmt.json';
 import integrationApps from './integrationApps.json';
 import integrations from './integrations.json';
@@ -27,6 +32,7 @@ import search from './search.json';
 import setNewPassword from './setNewPassword.json';
 import settings from './settings.json';
 import signup from './signup.json';
+import sla from './sla.json';
 import teamsSettings from './teamsSettings.json';
 import whatsappTemplates from './whatsappTemplates.json';
 
@@ -41,13 +47,18 @@ export default {
   ...campaign,
   ...cannedMgmt,
   ...chatlist,
+  ...components,
   ...contact,
   ...contactFilters,
   ...conversation,
   ...csatMgmt,
+  ...customRole,
+  ...datePicker,
   ...emoji,
+  ...general,
   ...generalSettings,
   ...helpCenter,
+  ...inbox,
   ...inboxMgmt,
   ...integrationApps,
   ...integrations,
@@ -60,6 +71,7 @@ export default {
   ...setNewPassword,
   ...settings,
   ...signup,
+  ...sla,
   ...teamsSettings,
   ...whatsappTemplates,
 };
diff --git a/app/javascript/dashboard/i18n/locale/zh/index.js b/app/javascript/dashboard/i18n/locale/zh/index.js
index 434e50e1d..213387d0c 100644
--- a/app/javascript/dashboard/i18n/locale/zh/index.js
+++ b/app/javascript/dashboard/i18n/locale/zh/index.js
@@ -8,13 +8,18 @@ import bulkActions from './bulkActions.json';
 import campaign from './campaign.json';
 import cannedMgmt from './cannedMgmt.json';
 import chatlist from './chatlist.json';
+import components from './components.json';
 import contact from './contact.json';
 import contactFilters from './contactFilters.json';
 import conversation from './conversation.json';
 import csatMgmt from './csatMgmt.json';
+import customRole from './customRole.json';
+import datePicker from './datePicker.json';
 import emoji from './emoji.json';
+import general from './general.json';
 import generalSettings from './generalSettings.json';
 import helpCenter from './helpCenter.json';
+import inbox from './inbox.json';
 import inboxMgmt from './inboxMgmt.json';
 import integrationApps from './integrationApps.json';
 import integrations from './integrations.json';
@@ -27,6 +32,7 @@ import search from './search.json';
 import setNewPassword from './setNewPassword.json';
 import settings from './settings.json';
 import signup from './signup.json';
+import sla from './sla.json';
 import teamsSettings from './teamsSettings.json';
 import whatsappTemplates from './whatsappTemplates.json';
 
@@ -41,13 +47,18 @@ export default {
   ...campaign,
   ...cannedMgmt,
   ...chatlist,
+  ...components,
   ...contact,
   ...contactFilters,
   ...conversation,
   ...csatMgmt,
+  ...customRole,
+  ...datePicker,
   ...emoji,
+  ...general,
   ...generalSettings,
   ...helpCenter,
+  ...inbox,
   ...inboxMgmt,
   ...integrationApps,
   ...integrations,
@@ -60,6 +71,7 @@ export default {
   ...setNewPassword,
   ...settings,
   ...signup,
+  ...sla,
   ...teamsSettings,
   ...whatsappTemplates,
 };
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/index.js b/app/javascript/dashboard/i18n/locale/zh_CN/index.js
index 434e50e1d..213387d0c 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/index.js
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/index.js
@@ -8,13 +8,18 @@ import bulkActions from './bulkActions.json';
 import campaign from './campaign.json';
 import cannedMgmt from './cannedMgmt.json';
 import chatlist from './chatlist.json';
+import components from './components.json';
 import contact from './contact.json';
 import contactFilters from './contactFilters.json';
 import conversation from './conversation.json';
 import csatMgmt from './csatMgmt.json';
+import customRole from './customRole.json';
+import datePicker from './datePicker.json';
 import emoji from './emoji.json';
+import general from './general.json';
 import generalSettings from './generalSettings.json';
 import helpCenter from './helpCenter.json';
+import inbox from './inbox.json';
 import inboxMgmt from './inboxMgmt.json';
 import integrationApps from './integrationApps.json';
 import integrations from './integrations.json';
@@ -27,6 +32,7 @@ import search from './search.json';
 import setNewPassword from './setNewPassword.json';
 import settings from './settings.json';
 import signup from './signup.json';
+import sla from './sla.json';
 import teamsSettings from './teamsSettings.json';
 import whatsappTemplates from './whatsappTemplates.json';
 
@@ -41,13 +47,18 @@ export default {
   ...campaign,
   ...cannedMgmt,
   ...chatlist,
+  ...components,
   ...contact,
   ...contactFilters,
   ...conversation,
   ...csatMgmt,
+  ...customRole,
+  ...datePicker,
   ...emoji,
+  ...general,
   ...generalSettings,
   ...helpCenter,
+  ...inbox,
   ...inboxMgmt,
   ...integrationApps,
   ...integrations,
@@ -60,6 +71,7 @@ export default {
   ...setNewPassword,
   ...settings,
   ...signup,
+  ...sla,
   ...teamsSettings,
   ...whatsappTemplates,
 };
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/index.js b/app/javascript/dashboard/i18n/locale/zh_TW/index.js
index 434e50e1d..213387d0c 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/index.js
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/index.js
@@ -8,13 +8,18 @@ import bulkActions from './bulkActions.json';
 import campaign from './campaign.json';
 import cannedMgmt from './cannedMgmt.json';
 import chatlist from './chatlist.json';
+import components from './components.json';
 import contact from './contact.json';
 import contactFilters from './contactFilters.json';
 import conversation from './conversation.json';
 import csatMgmt from './csatMgmt.json';
+import customRole from './customRole.json';
+import datePicker from './datePicker.json';
 import emoji from './emoji.json';
+import general from './general.json';
 import generalSettings from './generalSettings.json';
 import helpCenter from './helpCenter.json';
+import inbox from './inbox.json';
 import inboxMgmt from './inboxMgmt.json';
 import integrationApps from './integrationApps.json';
 import integrations from './integrations.json';
@@ -27,6 +32,7 @@ import search from './search.json';
 import setNewPassword from './setNewPassword.json';
 import settings from './settings.json';
 import signup from './signup.json';
+import sla from './sla.json';
 import teamsSettings from './teamsSettings.json';
 import whatsappTemplates from './whatsappTemplates.json';
 
@@ -41,13 +47,18 @@ export default {
   ...campaign,
   ...cannedMgmt,
   ...chatlist,
+  ...components,
   ...contact,
   ...contactFilters,
   ...conversation,
   ...csatMgmt,
+  ...customRole,
+  ...datePicker,
   ...emoji,
+  ...general,
   ...generalSettings,
   ...helpCenter,
+  ...inbox,
   ...inboxMgmt,
   ...integrationApps,
   ...integrations,
@@ -60,6 +71,7 @@ export default {
   ...setNewPassword,
   ...settings,
   ...signup,
+  ...sla,
   ...teamsSettings,
   ...whatsappTemplates,
 };
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/pages/ContactManageView.vue b/app/javascript/dashboard/routes/dashboard/contacts/pages/ContactManageView.vue
index 9f99157e6..8497f349a 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/pages/ContactManageView.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/pages/ContactManageView.vue
@@ -1,6 +1,7 @@
 <script setup>
 import { onMounted, computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
+import { useAlert } from 'dashboard/composables';
 import { useStore, useMapGetter } from 'dashboard/composables/store';
 import { useRoute, useRouter } from 'vue-router';
 
@@ -25,6 +26,7 @@ const contactMergeRef = ref(null);
 
 const isFetchingItem = computed(() => uiFlags.value.isFetchingItem);
 const isMergingContact = computed(() => uiFlags.value.isMerging);
+const isUpdatingContact = computed(() => uiFlags.value.isUpdating);
 
 const selectedContact = computed(() => contact.value(route.params.contactId));
 
@@ -88,6 +90,33 @@ const fetchAttributes = () => {
   store.dispatch('attributes/get');
 };
 
+const toggleContactBlock = async isBlocked => {
+  const ALERT_MESSAGES = {
+    success: {
+      block: t('CONTACTS_LAYOUT.HEADER.ACTIONS.BLOCK_SUCCESS_MESSAGE'),
+      unblock: t('CONTACTS_LAYOUT.HEADER.ACTIONS.UNBLOCK_SUCCESS_MESSAGE'),
+    },
+    error: {
+      block: t('CONTACTS_LAYOUT.HEADER.ACTIONS.BLOCK_ERROR_MESSAGE'),
+      unblock: t('CONTACTS_LAYOUT.HEADER.ACTIONS.UNBLOCK_ERROR_MESSAGE'),
+    },
+  };
+
+  try {
+    await store.dispatch(`contacts/update`, {
+      ...selectedContact.value,
+      blocked: !isBlocked,
+    });
+    useAlert(
+      isBlocked ? ALERT_MESSAGES.success.unblock : ALERT_MESSAGES.success.block
+    );
+  } catch (error) {
+    useAlert(
+      isBlocked ? ALERT_MESSAGES.error.unblock : ALERT_MESSAGES.error.block
+    );
+  }
+};
+
 onMounted(() => {
   fetchActiveContact();
   fetchContactNotes();
@@ -105,7 +134,9 @@ onMounted(() => {
       :selected-contact="selectedContact"
       is-detail-view
       :show-pagination-footer="false"
+      :is-updating="isUpdatingContact"
       @go-to-contacts-list="goToContactsList"
+      @toggle-block="toggleContactBlock"
     >
       <div
         v-if="showSpinner"
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/Macros/List.vue b/app/javascript/dashboard/routes/dashboard/conversation/Macros/List.vue
index 6cda0ff7f..5e734517e 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/Macros/List.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/Macros/List.vue
@@ -1,83 +1,113 @@
-<script>
-import { mapGetters } from 'vuex';
+<script setup>
+import { computed, onMounted, ref } from 'vue';
+import { useStore, useMapGetter } from 'dashboard/composables/store';
 import { useAccount } from 'dashboard/composables/useAccount';
+import { useUISettings } from 'dashboard/composables/useUISettings';
+
+import Draggable from 'vuedraggable';
+import Spinner from 'dashboard/components-next/spinner/Spinner.vue';
 import MacroItem from './MacroItem.vue';
 
-export default {
-  components: {
-    MacroItem,
+defineProps({
+  conversationId: {
+    type: [Number, String],
+    required: true,
   },
-  props: {
-    conversationId: {
-      type: [Number, String],
-      required: true,
-    },
-  },
-  setup() {
-    const { accountScopedUrl } = useAccount();
+});
 
-    return {
-      accountScopedUrl,
-    };
+const store = useStore();
+const { accountScopedUrl } = useAccount();
+const { uiSettings, updateUISettings } = useUISettings();
+
+const dragging = ref(false);
+
+const macros = useMapGetter('macros/getMacros');
+const uiFlags = useMapGetter('macros/getUIFlags');
+
+const MACROS_ORDER_KEY = 'macros_display_order';
+
+const orderedMacros = computed({
+  get: () => {
+    // Get saved order array and current macros
+    const savedOrder = uiSettings.value?.[MACROS_ORDER_KEY] ?? [];
+    const currentMacros = macros.value ?? [];
+
+    // Return unmodified macros if not present or macro is not available
+    if (!savedOrder.length || !currentMacros.length) {
+      return currentMacros;
+    }
+
+    // Create a Map of id -> position for faster lookups
+    const orderMap = new Map(savedOrder.map((id, index) => [id, index]));
+
+    return [...currentMacros].sort((a, b) => {
+      // Use Infinity for items not in saved order (pushes them to end)
+      const aPos = orderMap.get(a.id) ?? Infinity;
+      const bPos = orderMap.get(b.id) ?? Infinity;
+      return aPos - bPos;
+    });
   },
-  computed: {
-    ...mapGetters({
-      macros: ['macros/getMacros'],
-      uiFlags: 'macros/getUIFlags',
-    }),
-  },
-  mounted() {
-    this.$store.dispatch('macros/get');
+  set: newOrder => {
+    // Update settings with array of ids from new order
+    updateUISettings({
+      [MACROS_ORDER_KEY]: newOrder.map(({ id }) => id),
+    });
   },
+});
+
+const onDragEnd = () => {
+  dragging.value = false;
 };
+
+onMounted(() => {
+  store.dispatch('macros/get');
+});
 </script>
 
 <template>
   <div>
-    <div
-      v-if="!uiFlags.isFetching && !macros.length"
-      class="macros_list--empty-state"
-    >
+    <div v-if="!uiFlags.isFetching && !macros.length" class="p-3">
       <p class="flex flex-col items-center justify-center h-full">
         {{ $t('MACROS.LIST.404') }}
       </p>
       <router-link :to="accountScopedUrl('settings/macros')">
-        <woot-button
-          variant="smooth"
-          icon="add"
-          size="tiny"
-          class="macros_add-button"
-        >
+        <woot-button variant="smooth" icon="add" size="tiny" class="mt-1">
           {{ $t('MACROS.HEADER_BTN_TXT') }}
         </woot-button>
       </router-link>
     </div>
-    <woot-loading-state
+    <div
       v-if="uiFlags.isFetching"
-      :message="$t('MACROS.LOADING')"
-    />
-    <div v-if="!uiFlags.isFetching && macros.length" class="macros-list">
-      <MacroItem
-        v-for="macro in macros"
-        :key="macro.id"
-        :macro="macro"
-        :conversation-id="conversationId"
-      />
+      class="flex items-center gap-2 justify-center p-6 text-n-slate-12"
+    >
+      <span class="text-sm">{{ $t('MACROS.LOADING') }}</span>
+      <Spinner class="size-5" />
     </div>
+    <Draggable
+      v-if="!uiFlags.isFetching && macros.length"
+      v-model="orderedMacros"
+      class="p-1"
+      animation="200"
+      ghost-class="ghost"
+      handle=".drag-handle"
+      item-key="id"
+      @start="dragging = true"
+      @end="onDragEnd"
+    >
+      <template #item="{ element }">
+        <MacroItem
+          :key="element.id"
+          :macro="element"
+          :conversation-id="conversationId"
+          class="drag-handle cursor-grab"
+        />
+      </template>
+    </Draggable>
   </div>
 </template>
 
 <style scoped lang="scss">
-.macros-list {
-  padding: var(--space-smaller);
-}
-.macros_list--empty-state {
-  padding: var(--space-slab);
-  p {
-    margin: 0;
-  }
-}
-.macros_add-button {
-  margin: var(--space-small) auto 0;
+.ghost {
+  @apply opacity-50 bg-n-slate-3 dark:bg-n-slate-9;
 }
 </style>
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/Macros/MacroItem.vue b/app/javascript/dashboard/routes/dashboard/conversation/Macros/MacroItem.vue
index daad9e42a..995e003bd 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/Macros/MacroItem.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/Macros/MacroItem.vue
@@ -1,75 +1,78 @@
-<script>
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
 import { useAlert } from 'dashboard/composables';
-import MacroPreview from './MacroPreview.vue';
+import { useStore } from 'dashboard/composables/store';
 import { CONVERSATION_EVENTS } from '../../../../helper/AnalyticsHelper/events';
 import { useTrack } from 'dashboard/composables';
 
-export default {
-  components: {
-    MacroPreview,
+import NextButton from 'dashboard/components-next/button/Button.vue';
+import MacroPreview from './MacroPreview.vue';
+
+const props = defineProps({
+  macro: {
+    type: Object,
+    required: true,
   },
-  props: {
-    macro: {
-      type: Object,
-      required: true,
-    },
-    conversationId: {
-      type: [Number, String],
-      required: true,
-    },
-  },
-  data() {
-    return {
-      isExecuting: false,
-      showPreview: false,
-    };
-  },
-  methods: {
-    async executeMacro(macro) {
-      try {
-        this.isExecuting = true;
-        await this.$store.dispatch('macros/execute', {
-          macroId: macro.id,
-          conversationIds: [this.conversationId],
-        });
-        useTrack(CONVERSATION_EVENTS.EXECUTED_A_MACRO);
-        useAlert(this.$t('MACROS.EXECUTE.EXECUTED_SUCCESSFULLY'));
-      } catch (error) {
-        useAlert(this.$t('MACROS.ERROR'));
-      } finally {
-        this.isExecuting = false;
-      }
-    },
-    toggleMacroPreview() {
-      this.showPreview = !this.showPreview;
-    },
-    closeMacroPreview() {
-      this.showPreview = false;
-    },
+  conversationId: {
+    type: [Number, String],
+    required: true,
   },
+});
+
+const store = useStore();
+const { t } = useI18n();
+
+const isExecuting = ref(false);
+const showPreview = ref(false);
+
+const executeMacro = async macro => {
+  try {
+    isExecuting.value = true;
+    await store.dispatch('macros/execute', {
+      macroId: macro.id,
+      conversationIds: [props.conversationId],
+    });
+    useTrack(CONVERSATION_EVENTS.EXECUTED_A_MACRO);
+    useAlert(t('MACROS.EXECUTE.EXECUTED_SUCCESSFULLY'));
+  } catch (error) {
+    useAlert(t('MACROS.ERROR'));
+  } finally {
+    isExecuting.value = false;
+  }
+};
+
+const toggleMacroPreview = () => {
+  showPreview.value = !showPreview.value;
+};
+
+const closeMacroPreview = () => {
+  showPreview.value = false;
 };
 </script>
 
 <template>
-  <div class="macro button secondary clear">
-    <span class="overflow-hidden whitespace-nowrap text-ellipsis">{{
-      macro.name
-    }}</span>
-    <div class="flex items-center gap-1 macros-actions">
-      <woot-button
+  <div
+    class="relative flex items-center justify-between leading-4 rounded-md button secondary clear"
+  >
+    <span class="overflow-hidden whitespace-nowrap text-ellipsis">
+      {{ macro.name }}
+    </span>
+    <div class="flex items-center gap-1 justify-end">
+      <NextButton
         v-tooltip.left-start="$t('MACROS.EXECUTE.PREVIEW')"
-        size="tiny"
-        variant="smooth"
-        color-scheme="secondary"
-        icon="info"
-        @click="toggleMacroPreview(macro)"
+        icon="i-lucide-info"
+        slate
+        faded
+        xs
+        @click="toggleMacroPreview"
       />
-      <woot-button
+      <NextButton
         v-tooltip.left-start="$t('MACROS.EXECUTE.BUTTON_TOOLTIP')"
-        size="tiny"
-        variant="smooth"
-        color-scheme="secondary"
-        icon="play-circle"
+        icon="i-lucide-play"
+        slate
+        faded
+        xs
         :is-loading="isExecuting"
         @click="executeMacro(macro)"
       />
@@ -83,13 +86,3 @@ export default {
     </transition>
   </div>
 </template>
-
-<style scoped lang="scss">
-.macro {
-  @apply relative flex items-center justify-between leading-4 rounded-md;
-
-  .macros-actions {
-    @apply flex items-center justify-end;
-  }
-}
-</style>
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/Macros/MacroPreview.vue b/app/javascript/dashboard/routes/dashboard/conversation/Macros/MacroPreview.vue
index 38154dc98..ac0feadd1 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/Macros/MacroPreview.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/Macros/MacroPreview.vue
@@ -1,57 +1,48 @@
-<script>
+<script setup>
+import { computed } from 'vue';
+import { useMapGetter } from 'dashboard/composables/store.js';
 import {
   resolveActionName,
   resolveTeamIds,
   resolveLabels,
   resolveAgents,
 } from 'dashboard/routes/dashboard/settings/macros/macroHelper';
-import { mapGetters } from 'vuex';
 
-export default {
-  props: {
-    macro: {
-      type: Object,
-      required: true,
-    },
-  },
-  computed: {
-    resolvedMacro() {
-      return this.macro.actions.map(action => {
-        return {
-          actionName: resolveActionName(action.action_name),
-          actionValue: this.getActionValue(
-            action.action_name,
-            action.action_params
-          ),
-        };
-      });
-    },
-    ...mapGetters({
-      labels: 'labels/getLabels',
-      teams: 'teams/getTeams',
-      agents: 'agents/getAgents',
-    }),
-  },
-  methods: {
-    getActionValue(key, params) {
-      const actionsMap = {
-        assign_team: resolveTeamIds(this.teams, params),
-        add_label: resolveLabels(this.labels, params),
-        remove_label: resolveLabels(this.labels, params),
-        assign_agent: resolveAgents(this.agents, params),
-        mute_conversation: null,
-        snooze_conversation: null,
-        resolve_conversation: null,
-        remove_assigned_team: null,
-        send_webhook_event: params[0],
-        send_message: params[0],
-        send_email_transcript: params[0],
-        add_private_note: params[0],
-      };
-      return actionsMap[key] || '';
-    },
+const props = defineProps({
+  macro: {
+    type: Object,
+    required: true,
   },
+});
+
+const labels = useMapGetter('labels/getLabels');
+const teams = useMapGetter('teams/getTeams');
+const agents = useMapGetter('agents/getAgents');
+
+const getActionValue = (key, params) => {
+  const actionsMap = {
+    assign_team: resolveTeamIds(teams.value, params),
+    add_label: resolveLabels(labels.value, params),
+    remove_label: resolveLabels(labels.value, params),
+    assign_agent: resolveAgents(agents.value, params),
+    mute_conversation: null,
+    snooze_conversation: null,
+    resolve_conversation: null,
+    remove_assigned_team: null,
+    send_webhook_event: params[0],
+    send_message: params[0],
+    send_email_transcript: params[0],
+    add_private_note: params[0],
+  };
+  return actionsMap[key] || '';
 };
+
+const resolvedMacro = computed(() => {
+  return props.macro.actions.map(action => ({
+    actionName: resolveActionName(action.action_name),
+    actionValue: getActionValue(action.action_name, action.action_params),
+  }));
+});
 </script>
 
 <template>
diff --git a/app/javascript/dashboard/routes/dashboard/inbox/components/InboxDisplayMenu.vue b/app/javascript/dashboard/routes/dashboard/inbox/components/InboxDisplayMenu.vue
index ff61b01aa..71e506294 100644
--- a/app/javascript/dashboard/routes/dashboard/inbox/components/InboxDisplayMenu.vue
+++ b/app/javascript/dashboard/routes/dashboard/inbox/components/InboxDisplayMenu.vue
@@ -115,12 +115,12 @@ export default {
 
 <template>
   <div
-    class="flex flex-col bg-n-alpha-3 backdrop-blur-[100px] border-0 outline outline-1 outline-n-container shadow-lg z-50 w-[170px] rounded-xl divide-y divide-n-weak dark:divide-n-strong"
+    class="flex flex-col bg-n-alpha-3 backdrop-blur-[100px] border-0 outline outline-1 outline-n-container shadow-lg z-50 max-w-64 min-w-[170px] w-fit rounded-xl divide-y divide-n-weak dark:divide-n-strong"
   >
-    <div class="flex items-center justify-between p-3 rounded-t-lg h-11">
-      <div class="flex gap-1.5">
+    <div class="flex items-center gap-2 justify-between p-3 rounded-t-lg h-11">
+      <div class="flex gap-1.5 min-w-0">
         <span class="i-lucide-arrow-down-up size-3.5 text-n-slate-12" />
-        <span class="text-xs font-medium text-n-slate-12">
+        <span class="text-xs font-medium text-n-slate-12 truncate min-w-0">
           {{ $t('INBOX.DISPLAY_MENU.SORT') }}
         </span>
       </div>
@@ -132,25 +132,25 @@ export default {
           trailing-icon
           xs
           outline
-          class="w-20"
+          class="w-fit min-w-20 max-w-32"
           @click="openSortMenu"
         />
         <div
           v-if="showSortMenu"
-          class="absolute flex flex-col gap-0.5 bg-n-alpha-3 backdrop-blur-[100px] z-60 rounded-lg p-0.5 w-20 top-px outline outline-1 outline-n-container dark:outline-n-strong"
+          class="absolute flex flex-col gap-0.5 bg-n-alpha-3 backdrop-blur-[100px] z-60 rounded-lg p-0.5 w-fit min-w-20 max-w-32 top-px outline outline-1 outline-n-container dark:outline-n-strong"
         >
           <div
             v-for="option in sortOptions"
             :key="option.key"
             role="button"
-            class="flex rounded-md h-5 w-full items-center justify-between px-1.5 py-0.5 gap-1"
+            class="flex rounded-md h-5 w-full items-center justify-between px-1.5 py-0.5 gap-2 whitespace-nowrap"
             :class="{
               'bg-n-brand/10 dark:bg-n-brand/10': activeSort === option.key,
             }"
             @click.stop="onSortOptionClick(option)"
           >
             <span
-              class="text-xs font-medium hover:text-n-brand dark:hover:text-n-brand"
+              class="text-xs font-medium hover:text-n-brand truncate min-w-0 dark:hover:text-n-brand"
               :class="{
                 'text-n-blue-text dark:text-n-blue-text':
                   activeSort === option.key,
@@ -161,7 +161,7 @@ export default {
             </span>
             <span
               v-if="activeSort === option.key"
-              class="i-lucide-check size-2.5 text-n-blue-text"
+              class="i-lucide-check size-2.5 flex-shrink-0 text-n-blue-text"
             />
           </div>
         </div>
diff --git a/app/javascript/dashboard/routes/dashboard/inbox/components/InboxListHeader.vue b/app/javascript/dashboard/routes/dashboard/inbox/components/InboxListHeader.vue
index aa981eba5..7694bec2f 100644
--- a/app/javascript/dashboard/routes/dashboard/inbox/components/InboxListHeader.vue
+++ b/app/javascript/dashboard/routes/dashboard/inbox/components/InboxListHeader.vue
@@ -113,7 +113,7 @@ export default {
       <InboxOptionMenu
         v-if="showInboxOptionMenu"
         v-on-clickaway="openInboxOptionsMenu"
-        class="absolute top-full mt-1 ltr:right-0 ltr:lg:right-[unset] rtl:left-0 rtl:md:left-[unset]"
+        class="absolute top-full mt-1 ltr:right-0 ltr:lg:right-[unset] rtl:left-0 rtl:lg:left-[unset]"
         @option-click="onInboxOptionMenuClick"
       />
     </div>
diff --git a/app/javascript/dashboard/routes/dashboard/inbox/components/InboxOptionMenu.vue b/app/javascript/dashboard/routes/dashboard/inbox/components/InboxOptionMenu.vue
index 228730d74..024b1f69a 100644
--- a/app/javascript/dashboard/routes/dashboard/inbox/components/InboxOptionMenu.vue
+++ b/app/javascript/dashboard/routes/dashboard/inbox/components/InboxOptionMenu.vue
@@ -33,7 +33,7 @@ export default {
 
 <template>
   <div
-    class="z-50 flex flex-col w-40 gap-1 bg-n-alpha-3 backdrop-blur-[100px] divide-y py-2 px-2 outline outline-1 outline-n-container shadow-lg rounded-xl divide-n-weak dark:divide-n-strong"
+    class="z-50 flex flex-col max-w-64 min-w-40 gap-1 bg-n-alpha-3 backdrop-blur-[100px] divide-y py-2 px-2 outline outline-1 outline-n-container shadow-lg rounded-xl divide-n-weak dark:divide-n-strong"
   >
     <div class="flex flex-col">
       <MenuItem
diff --git a/app/javascript/dashboard/routes/dashboard/inbox/components/MenuItem.vue b/app/javascript/dashboard/routes/dashboard/inbox/components/MenuItem.vue
index f10b7d7b7..fa515fdaa 100644
--- a/app/javascript/dashboard/routes/dashboard/inbox/components/MenuItem.vue
+++ b/app/javascript/dashboard/routes/dashboard/inbox/components/MenuItem.vue
@@ -10,8 +10,10 @@ defineProps({
 <template>
   <div
     role="button"
-    class="flex items-center w-full h-8 px-2 py-1 overflow-hidden text-xs font-medium rounded-md cursor-pointer text-n-slate-12 whitespace-nowrap text-ellipsis hover:text-n-blue-text"
+    class="flex items-center w-full h-8 px-2 py-1 rounded-md cursor-pointer hover:text-n-blue-text min-w-0"
   >
-    {{ label }}
+    <span class="text-xs font-medium truncate text-n-slate-12">
+      {{ label }}
+    </span>
   </div>
 </template>
diff --git a/app/models/contact.rb b/app/models/contact.rb
index b3bebf01d..d9555f5fa 100644
--- a/app/models/contact.rb
+++ b/app/models/contact.rb
@@ -142,6 +142,7 @@ class Contact < ApplicationRecord
       name: name,
       phone_number: phone_number,
       thumbnail: avatar_url,
+      blocked: blocked,
       type: 'contact'
     }
   end
@@ -157,7 +158,8 @@ class Contact < ApplicationRecord
       identifier: identifier,
       name: name,
       phone_number: phone_number,
-      thumbnail: avatar_url
+      thumbnail: avatar_url,
+      blocked: blocked
     }
   end
 
diff --git a/app/views/api/v1/models/_contact.json.jbuilder b/app/views/api/v1/models/_contact.json.jbuilder
index 6f86ad125..4e998ddf1 100644
--- a/app/views/api/v1/models/_contact.json.jbuilder
+++ b/app/views/api/v1/models/_contact.json.jbuilder
@@ -4,6 +4,7 @@ json.email resource.email
 json.id resource.id
 json.name resource.name
 json.phone_number resource.phone_number
+json.blocked resource.blocked
 json.identifier resource.identifier
 json.thumbnail resource.avatar_url
 json.custom_attributes resource.custom_attributes
diff --git a/app/views/fields/account_features_field/_form.html.erb b/app/views/fields/account_features_field/_form.html.erb
index ebaa23803..67fdfb73a 100644
--- a/app/views/fields/account_features_field/_form.html.erb
+++ b/app/views/fields/account_features_field/_form.html.erb
@@ -2,17 +2,17 @@
   <%= f.label field.attribute %>
 </div>
 <div class="field-unit__field feature-container">
-    <% field.data.each do |key,val| %>
+  <% SuperAdmin::AccountFeaturesHelper.filtered_features(field.data).each do |key, val| %>
     <div class='feature-cell'>
-    <% is_premium = SuperAdmin::AccountFeaturesHelper.account_premium_features.include? key %>
-    <% if is_premium  %>
-    <span class='icon-container'>
-      <svg class="inline" xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 512 512"><path d="M480 224l-186.828 7.487L401.688 64l-59.247-32L256 208 169.824 32l-59.496 32 108.5 167.487L32 224v64l185.537-10.066L113.65 448l55.969 32L256 304l86.381 176 55.949-32-103.867-170.066L480 288z" fill="currentColor"/></svg>
-    </span>
-    <% end %>
-    <span><%= key %></span> 
-    <% should_disable = is_premium && ChatwootHub.pricing_plan == 'community' %>
-    <span class='value-container'><%= check_box "enabled_features", "feature_#{key}", { checked: val, disabled: should_disable  }, true, false  %> </span>
+      <% is_premium = SuperAdmin::AccountFeaturesHelper.account_premium_features.include? key %>
+      <% if is_premium %>
+        <span class='icon-container'>
+          <svg class="inline" xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 512 512"><path d="M480 224l-186.828 7.487L401.688 64l-59.247-32L256 208 169.824 32l-59.496 32 108.5 167.487L32 224v64l185.537-10.066L113.65 448l55.969 32L256 304l86.381 176 55.949-32-103.867-170.066L480 288z" fill="currentColor"/></svg>
+        </span>
+      <% end %>
+      <span><%= key %></span> 
+      <% should_disable = is_premium && ChatwootHub.pricing_plan == 'community' %>
+      <span class='value-container'><%= check_box "enabled_features", "feature_#{key}", { checked: val, disabled: should_disable }, true, false %></span>
     </div>
   <% end %>
 </div>
diff --git a/app/views/fields/account_features_field/_show.html.erb b/app/views/fields/account_features_field/_show.html.erb
index c34665393..3bc6cf15e 100644
--- a/app/views/fields/account_features_field/_show.html.erb
+++ b/app/views/fields/account_features_field/_show.html.erb
@@ -1,5 +1,5 @@
 <div class='feature-container'>
-  <% field.data.each do |key,val| %>
+  <% SuperAdmin::AccountFeaturesHelper.filtered_features(field.data).each do |key, val| %>
     <div class='feature-cell'>
     <% if SuperAdmin::AccountFeaturesHelper.account_premium_features.include? key %>
     <span class='icon-container'>
diff --git a/app/views/layouts/portal.html.erb b/app/views/layouts/portal.html.erb
index c4c8f9c75..5d8983621 100644
--- a/app/views/layouts/portal.html.erb
+++ b/app/views/layouts/portal.html.erb
@@ -64,7 +64,7 @@ By default, it renders:
           <%= render "public/api/v1/portals/header", portal: @portal %>
         <% end %>
         <%= yield %>
-        <% if !@is_plain_layout_enabled %>
+        <% if !(@is_plain_layout_enabled || @portal.account.feature_enabled?('disable_branding')) %>
           <%= render "public/api/v1/portals/footer" %>
         <% end %>
       </main>
diff --git a/bin/sync_i18n_file_change b/bin/sync_i18n_file_change
new file mode 100755
index 000000000..bcd2a9ef0
--- /dev/null
+++ b/bin/sync_i18n_file_change
@@ -0,0 +1,52 @@
+#!/bin/bash
+
+# Pre-commit hook to sync en/index.js to other locale folders
+# Place this file in .git/hooks/pre-commit and make it executable
+
+# Colors for output
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+NC='\033[0m' # No Color
+
+# Path to the source index.js file
+SOURCE_FILE="app/javascript/dashboard/i18n/locale/en/index.js"
+
+# Check if en/index.js is among the staged files
+STAGED_EN_INDEX=$(git diff --cached --name-only | grep "^app/javascript/dashboard/i18n/locale/en/index.js$")
+
+if [ -n "$STAGED_EN_INDEX" ]; then
+    echo -e "${YELLOW}Changes detected in en/index.js. Syncing to other locale folders...${NC}"
+
+    # Check if source file exists
+    if [ ! -f "$SOURCE_FILE" ]; then
+        echo "Error: Source file $SOURCE_FILE not found"
+        exit 1
+    fi
+
+    # Keep track if any copies were made
+    COPIES_MADE=false
+
+    # Loop through all directories in locales folder
+    for dir in app/javascript/dashboard/i18n/locale/*/; do
+        # Skip the 'en' directory since it's the source
+        if [ "$dir" != "app/javascript/dashboard/i18n/locale/en/" ]; then
+            # Copy the file
+            cp "$SOURCE_FILE" "$dir"
+
+            # Stage the copied file
+            git add "${dir}index.js"
+
+            echo "Copied and staged index.js to $dir"
+            COPIES_MADE=true
+        fi
+    done
+
+    if [ "$COPIES_MADE" = true ]; then
+        echo -e "${GREEN}Successfully synced en/index.js to all locale folders${NC}"
+    else
+        echo "No other locale folders found to sync to"
+    fi
+fi
+
+sleep 1
+# exit 0
diff --git a/config/features.yml b/config/features.yml
index 8fdab0e3b..59a37a7cf 100644
--- a/config/features.yml
+++ b/config/features.yml
@@ -71,6 +71,7 @@
 - name: response_bot
   enabled: false
   premium: true
+  chatwoot_internal: true
 - name: message_reply_to
   enabled: false
   help_url: https://chwt.app/hc/reply-to
@@ -96,3 +97,6 @@
   enabled: false
 - name: report_v4
   enabled: false
+- name: contact_chatwoot_support_team
+  enabled: true
+  chatwoot_internal: true
diff --git a/config/locales/am.yml b/config/locales/am.yml
index c81e4fef2..c7ea8a171 100644
--- a/config/locales/am.yml
+++ b/config/locales/am.yml
@@ -165,6 +165,7 @@ am:
         removed: '%{user_name} removed SLA policy %{sla_name}'
       muted: '%{user_name} has muted the conversation'
       unmuted: '%{user_name} has unmuted the conversation'
+      auto_resolution_message: 'Resolving the conversation as it has been inactive for a while. Please start a new conversation if you need further assistance.'
     templates:
       greeting_message_body: '%{account_name} typically replies in a few hours.'
       ways_to_reach_you_message_body: 'Give the team a way to reach you.'
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 7007749ae..869346c8d 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -165,6 +165,7 @@ ar:
         removed: '%{user_name} أزال سياسة مستوى الخدمة %{sla_name}'
       muted: '%{user_name} كتم صوت المحادثة'
       unmuted: '%{user_name} قام بإلغاء كتم المحادثة'
+      auto_resolution_message: 'Resolving the conversation as it has been inactive for a while. Please start a new conversation if you need further assistance.'
     templates:
       greeting_message_body: '%{account_name} يرد عادة خلال بضع ساعات.'
       ways_to_reach_you_message_body: 'زودنا بوسيلة للتواصل معك.'
diff --git a/config/locales/az.yml b/config/locales/az.yml
index 6b21175ea..6601310f6 100644
--- a/config/locales/az.yml
+++ b/config/locales/az.yml
@@ -165,6 +165,7 @@ az:
         removed: '%{user_name} removed SLA policy %{sla_name}'
       muted: '%{user_name} has muted the conversation'
       unmuted: '%{user_name} has unmuted the conversation'
+      auto_resolution_message: 'Resolving the conversation as it has been inactive for a while. Please start a new conversation if you need further assistance.'
     templates:
       greeting_message_body: '%{account_name} typically replies in a few hours.'
       ways_to_reach_you_message_body: 'Give the team a way to reach you.'
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 828eeb6c3..6ff3193e6 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -165,6 +165,7 @@ bg:
         removed: '%{user_name} removed SLA policy %{sla_name}'
       muted: '%{user_name} has muted the conversation'
       unmuted: '%{user_name} has unmuted the conversation'
+      auto_resolution_message: 'Resolving the conversation as it has been inactive for a while. Please start a new conversation if you need further assistance.'
     templates:
       greeting_message_body: '%{account_name} typically replies in a few hours.'
       ways_to_reach_you_message_body: 'Give the team a way to reach you.'
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 2db260209..1c1b6cee1 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -165,6 +165,7 @@ ca:
         removed: '%{user_name} ha eliminat la política de SLA %{sla_name}'
       muted: '%{user_name} ha silenciat la conversa'
       unmuted: '%{user_name} ha desactivat el silenci de la conversa'
+      auto_resolution_message: 'Resolving the conversation as it has been inactive for a while. Please start a new conversation if you need further assistance.'
     templates:
       greeting_message_body: '%{account_name} normalment respon a les poques hores.'
       ways_to_reach_you_message_body: 'Fes saber a l''equip la forma de posar-nos en contacte amb tu.'
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index ae53eba94..b94669586 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -165,6 +165,7 @@ cs:
         removed: '%{user_name} removed SLA policy %{sla_name}'
       muted: '%{user_name} ztlumil/a konverzaci'
       unmuted: '%{user_name} has unmuted the conversation'
+      auto_resolution_message: 'Resolving the conversation as it has been inactive for a while. Please start a new conversation if you need further assistance.'
     templates:
       greeting_message_body: '%{account_name} typically replies in a few hours.'
       ways_to_reach_you_message_body: 'Dejte týmu způsob, jak se k vám dostat.'
diff --git a/config/locales/da.yml b/config/locales/da.yml
index fbbb1bcb2..603c0268c 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -165,6 +165,7 @@ da:
         removed: '%{user_name} removed SLA policy %{sla_name}'
       muted: '%{user_name} har slukket for samtalen'
       unmuted: '%{user_name} har genaktiveret samtalen'
+      auto_resolution_message: 'Resolving the conversation as it has been inactive for a while. Please start a new conversation if you need further assistance.'
     templates:
       greeting_message_body: '%{account_name} svarer typisk på et par timer.'
       ways_to_reach_you_message_body: 'Giv teamet en måde at kontakte dig på.'
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 8d891a4f5..142f31859 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -165,6 +165,7 @@ de:
         removed: '%{user_name} hat SLA-Richtlinie %{sla_name} entfernt'
       muted: '%{user_name} hat das Gespräch stumm geschaltet'
       unmuted: '%{user_name} hat das Gespräch laut gestellt'
+      auto_resolution_message: 'Resolving the conversation as it has been inactive for a while. Please start a new conversation if you need further assistance.'
     templates:
       greeting_message_body: '%{account_name} antwortet in der Regel in wenigen Stunden.'
       ways_to_reach_you_message_body: 'Geben Sie dem Team einen Weg, Sie zu erreichen.'
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 2dcc7abef..3236f5272 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -165,6 +165,7 @@ el:
         removed: '%{user_name} removed SLA policy %{sla_name}'
       muted: 'Ο χρήστης %{user_name} σίγασε την συνομιλία'
       unmuted: 'Ο χρήστης %{user_name} επανάφερε από την σίγαση την συνομιλία'
+      auto_resolution_message: 'Resolving the conversation as it has been inactive for a while. Please start a new conversation if you need further assistance.'
     templates:
       greeting_message_body: 'Στον λογαριασμό %{account_name} τυπικά έχετε απάντηση σε μερικές ώρες.'
       ways_to_reach_you_message_body: 'Δώστε στην ομάδα ένα τρόπο να φτάσει σε σας.'
diff --git a/config/locales/en.yml b/config/locales/en.yml
index c525074cf..16d13ab71 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -132,7 +132,6 @@ en:
         rating: Rating
         feedback: Feedback Comment
         recorded_at: Recorded date
-
   notifications:
     notification_title:
       conversation_creation: 'A conversation (#%{display_id}) has been created in %{inbox_name}'
@@ -180,6 +179,7 @@ en:
         removed: '%{user_name} removed SLA policy %{sla_name}'
       muted: '%{user_name} has muted the conversation'
       unmuted: '%{user_name} has unmuted the conversation'
+      auto_resolution_message: 'Resolving the conversation as it has been inactive for a while. Please start a new conversation if you need further assistance.'
     templates:
       greeting_message_body: '%{account_name} typically replies in a few hours.'
       ways_to_reach_you_message_body: 'Give the team a way to reach you.'
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 9b7721bf4..166524f28 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -165,6 +165,7 @@ es:
         removed: '%{user_name} eliminó la política de SLA %{sla_name}'
       muted: '%{user_name} ha silenciado la conversación'
       unmuted: '%{user_name} ha anulado el silenciado de la conversación'
+      auto_resolution_message: 'Resolving the conversation as it has been inactive for a while. Please start a new conversation if you need further assistance.'
     templates:
       greeting_message_body: '%{account_name} normalmente responde en unas pocas horas.'
       ways_to_reach_you_message_body: 'Dale al equipo una forma de llegar a ti.'
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 1c5482ec3..6954ddf3e 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -165,6 +165,7 @@ fa:
         removed: '%{user_name} سیاست SLA %{sla_name} را حذف کرد'
       muted: '%{user_name} مکالمه را بی صدا کرد'
       unmuted: '%{user_name} مکالمه را از حالت بی صدا خراج کرد'
+      auto_resolution_message: 'Resolving the conversation as it has been inactive for a while. Please start a new conversation if you need further assistance.'
     templates:
       greeting_message_body: '%{account_name} معمولا ظرف مدت کوتاهی پاسخ می‌دهد.'
       ways_to_reach_you_message_body: 'راهی برای ارتباط گرفتن تیم با شما قرار دهید'
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 66683cadc..4227c654a 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -165,6 +165,7 @@ fi:
         removed: '%{user_name} removed SLA policy %{sla_name}'
       muted: '%{user_name} mykisti keskustelun'
       unmuted: '%{user_name} poisti keskustelun mykistyksen'
+      auto_resolution_message: 'Resolving the conversation as it has been inactive for a while. Please start a new conversation if you need further assistance.'
     templates:
       greeting_message_body: '%{account_name} vastaa tyypillisesti muutamassa tunnissa.'
       ways_to_reach_you_message_body: 'Anna tiimillemme tapa tavoittaa sinut.'
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index eca93b376..ce2db80a5 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -165,6 +165,7 @@ fr:
         removed: '%{user_name} removed SLA policy %{sla_name}'
       muted: '%{user_name} a mis la conversation en sourdine'
       unmuted: '%{user_name} a rétabli le son de la conversation'
+      auto_resolution_message: 'Resolving the conversation as it has been inactive for a while. Please start a new conversation if you need further assistance.'
     templates:
       greeting_message_body: '%{account_name} répond généralement en quelques heures.'
       ways_to_reach_you_message_body: 'Donnez à l''équipe un moyen de vous recontacter.'
diff --git a/config/locales/he.yml b/config/locales/he.yml
index e23eafd8d..f794d5716 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -165,6 +165,7 @@ he:
         removed: '%{user_name} removed SLA policy %{sla_name}'
       muted: '%{user_name} has muted the conversation'
       unmuted: '%{user_name} has unmuted the conversation'
+      auto_resolution_message: 'Resolving the conversation as it has been inactive for a while. Please start a new conversation if you need further assistance.'
     templates:
       greeting_message_body: '%{account_name} typically replies in a few hours.'
       ways_to_reach_you_message_body: '"תן לצוות דרך להגיע אליך".'
diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index eb3b508b3..8c4db36c4 100644
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -165,6 +165,7 @@ hi:
         removed: '%{user_name} removed SLA policy %{sla_name}'
       muted: '%{user_name} has muted the conversation'
       unmuted: '%{user_name} has unmuted the conversation'
+      auto_resolution_message: 'Resolving the conversation as it has been inactive for a while. Please start a new conversation if you need further assistance.'
     templates:
       greeting_message_body: '%{account_name} typically replies in a few hours.'
       ways_to_reach_you_message_body: 'Give the team a way to reach you.'
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 7fb3edd3b..340421661 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -165,6 +165,7 @@ hr:
         removed: '%{user_name} removed SLA policy %{sla_name}'
       muted: '%{user_name} has muted the conversation'
       unmuted: '%{user_name} has unmuted the conversation'
+      auto_resolution_message: 'Resolving the conversation as it has been inactive for a while. Please start a new conversation if you need further assistance.'
     templates:
       greeting_message_body: '%{account_name} typically replies in a few hours.'
       ways_to_reach_you_message_body: 'Give the team a way to reach you.'
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 64e10aa1c..915ef64fc 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -165,6 +165,7 @@ hu:
         removed: '%{user_name} removed SLA policy %{sla_name}'
       muted: '%{user_name} elnémította a beszélgetést'
       unmuted: '%{user_name} kikapcsolta a beszélgetés elnémítását'
+      auto_resolution_message: 'Resolving the conversation as it has been inactive for a while. Please start a new conversation if you need further assistance.'
     templates:
       greeting_message_body: '%{account_name} általában néhány órán belül válaszol.'
       ways_to_reach_you_message_body: 'Adj egy elérhetőséget hogy megkereshessenek.'
diff --git a/config/locales/hy.yml b/config/locales/hy.yml
index ce4d588be..a3c2874df 100644
--- a/config/locales/hy.yml
+++ b/config/locales/hy.yml
@@ -165,6 +165,7 @@ hy:
         removed: '%{user_name} removed SLA policy %{sla_name}'
       muted: '%{user_name} has muted the conversation'
       unmuted: '%{user_name} has unmuted the conversation'
+      auto_resolution_message: 'Resolving the conversation as it has been inactive for a while. Please start a new conversation if you need further assistance.'
     templates:
       greeting_message_body: '%{account_name} typically replies in a few hours.'
       ways_to_reach_you_message_body: 'Give the team a way to reach you.'
diff --git a/config/locales/id.yml b/config/locales/id.yml
index 1fdd832cd..4d554a31c 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -165,6 +165,7 @@ id:
         removed: '%{user_name} removed SLA policy %{sla_name}'
       muted: '%{user_name} me-mute percakapan'
       unmuted: '%{user_name} telah un-mute percakapan'
+      auto_resolution_message: 'Resolving the conversation as it has been inactive for a while. Please start a new conversation if you need further assistance.'
     templates:
       greeting_message_body: '%{account_name} biasanya membalas dalam beberapa jam.'
       ways_to_reach_you_message_body: 'Beri tim cara untuk menghubungi Anda.'
diff --git a/config/locales/is.yml b/config/locales/is.yml
index 047b7b88b..40d63365d 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -165,6 +165,7 @@ is:
         removed: '%{user_name} removed SLA policy %{sla_name}'
       muted: '%{user_name} has muted the conversation'
       unmuted: '%{user_name} has unmuted the conversation'
+      auto_resolution_message: 'Resolving the conversation as it has been inactive for a while. Please start a new conversation if you need further assistance.'
     templates:
       greeting_message_body: '%{account_name} svarar iðulega innan nokkura klukkustunda.'
       ways_to_reach_you_message_body: 'Give the team a way to reach you.'
diff --git a/config/locales/it.yml b/config/locales/it.yml
index b70afe98d..bbde04589 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -165,6 +165,7 @@ it:
         removed: '%{user_name} removed SLA policy %{sla_name}'
       muted: '%{user_name} ha silenziato la conversazione'
       unmuted: '%{user_name} ha riattivato l''audio della conversazione'
+      auto_resolution_message: 'Resolving the conversation as it has been inactive for a while. Please start a new conversation if you need further assistance.'
     templates:
       greeting_message_body: '%{account_name}, in genere, risponde in poche ore.'
       ways_to_reach_you_message_body: 'Offri al team un modo per raggiungerti.'
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index e1c480c77..37ce00de8 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -165,6 +165,7 @@ ja:
         removed: '%{user_name} がSLAポリシー "%{sla_name}" を削除しました'
       muted: '%{user_name} が会話をミュートしました'
       unmuted: '%{user_name} が会話のミュートを解除しました'
+      auto_resolution_message: 'Resolving the conversation as it has been inactive for a while. Please start a new conversation if you need further assistance.'
     templates:
       greeting_message_body: '%{account_name} は通常数時間以内に返信します。'
       ways_to_reach_you_message_body: 'ご連絡先をご入力ください。'
diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index 51b332a61..980b7b161 100644
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -165,6 +165,7 @@ ka:
         removed: '%{user_name} removed SLA policy %{sla_name}'
       muted: '%{user_name} has muted the conversation'
       unmuted: '%{user_name} has unmuted the conversation'
+      auto_resolution_message: 'Resolving the conversation as it has been inactive for a while. Please start a new conversation if you need further assistance.'
     templates:
       greeting_message_body: '%{account_name} typically replies in a few hours.'
       ways_to_reach_you_message_body: 'Give the team a way to reach you.'
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index b283fe3b3..7e1156b68 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -165,6 +165,7 @@ ko:
         removed: '%{user_name} removed SLA policy %{sla_name}'
       muted: '%{user_name} has muted the conversation'
       unmuted: '%{user_name} has unmuted the conversation'
+      auto_resolution_message: 'Resolving the conversation as it has been inactive for a while. Please start a new conversation if you need further assistance.'
     templates:
       greeting_message_body: '%{account_name} typically replies in a few hours.'
       ways_to_reach_you_message_body: '저희가 연락드릴 방법을 알려주세요.'
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index bc9f9d6e3..d073c0fc7 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -165,6 +165,7 @@ lt:
         removed: '%{user_name} removed SLA policy %{sla_name}'
       muted: '%{user_name} nutildė pokalbį'
       unmuted: '%{user_name} įjungė pokalbio garsą'
+      auto_resolution_message: 'Resolving the conversation as it has been inactive for a while. Please start a new conversation if you need further assistance.'
     templates:
       greeting_message_body: '%{account_name} paprastai atsako per kelias valandas.'
       ways_to_reach_you_message_body: 'Suteikite komandai būdą, kaip su jumis susisiekti.'
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index a4f2ea3fb..084956d42 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -165,6 +165,7 @@ lv:
         removed: '%{user_name} noņēma SLA politiku %{sla_name}'
       muted: '%{user_name} izslēdza sarunu'
       unmuted: '%{user_name} ieslēdza sarunu'
+      auto_resolution_message: 'Resolving the conversation as it has been inactive for a while. Please start a new conversation if you need further assistance.'
     templates:
       greeting_message_body: '%{account_name} parasti atbild dažu stundu laikā.'
       ways_to_reach_you_message_body: 'Dodiet komandai iespēju ar jums sazināties.'
diff --git a/config/locales/ml.yml b/config/locales/ml.yml
index 224721d60..c1c7a4e3f 100644
--- a/config/locales/ml.yml
+++ b/config/locales/ml.yml
@@ -165,6 +165,7 @@ ml:
         removed: '%{user_name} removed SLA policy %{sla_name}'
       muted: '%{user_name} has muted the conversation'
       unmuted: '%{user_name} has unmuted the conversation'
+      auto_resolution_message: 'Resolving the conversation as it has been inactive for a while. Please start a new conversation if you need further assistance.'
     templates:
       greeting_message_body: '%{account_name} സാധാരണ കുറച്ച് മണിക്കൂറിനുള്ളിൽ മറുപടി നൽകുന്നു.'
       ways_to_reach_you_message_body: 'നിങ്ങളിലേക്ക് എത്താൻ ടീമിന് ഒരു വഴി നൽകുക.'
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index bf488c918..4023cca51 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -165,6 +165,7 @@ ms:
         removed: '%{user_name} removed SLA policy %{sla_name}'
       muted: '%{user_name} has muted the conversation'
       unmuted: '%{user_name} has unmuted the conversation'
+      auto_resolution_message: 'Resolving the conversation as it has been inactive for a while. Please start a new conversation if you need further assistance.'
     templates:
       greeting_message_body: '%{account_name} typically replies in a few hours.'
       ways_to_reach_you_message_body: 'Give the team a way to reach you.'
diff --git a/config/locales/ne.yml b/config/locales/ne.yml
index 7490658f9..8e4d45483 100644
--- a/config/locales/ne.yml
+++ b/config/locales/ne.yml
@@ -165,6 +165,7 @@ ne:
         removed: '%{user_name} removed SLA policy %{sla_name}'
       muted: '%{user_name} has muted the conversation'
       unmuted: '%{user_name} has unmuted the conversation'
+      auto_resolution_message: 'Resolving the conversation as it has been inactive for a while. Please start a new conversation if you need further assistance.'
     templates:
       greeting_message_body: '%{account_name} typically replies in a few hours.'
       ways_to_reach_you_message_body: 'Give the team a way to reach you.'
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index f76c41196..2e73b8bd3 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -165,6 +165,7 @@ nl:
         removed: '%{user_name} removed SLA policy %{sla_name}'
       muted: '%{user_name} has muted the conversation'
       unmuted: '%{user_name} has unmuted the conversation'
+      auto_resolution_message: 'Resolving the conversation as it has been inactive for a while. Please start a new conversation if you need further assistance.'
     templates:
       greeting_message_body: '%{account_name} reageert meestal binnen een paar uur.'
       ways_to_reach_you_message_body: 'Geef het team een manier om je te bereiken.'
diff --git a/config/locales/no.yml b/config/locales/no.yml
index 676a39663..52e3902e7 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -165,6 +165,7 @@
         removed: '%{user_name} removed SLA policy %{sla_name}'
       muted: '%{user_name} har dempet samtalen'
       unmuted: '%{user_name} har opphevet dempingen av samtalen'
+      auto_resolution_message: 'Resolving the conversation as it has been inactive for a while. Please start a new conversation if you need further assistance.'
     templates:
       greeting_message_body: '%{account_name} svarer vanligvis innen et par timer.'
       ways_to_reach_you_message_body: 'Gi oss en måte å ta kontakt med deg på.'
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 4ba973743..69dd0fc5a 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -165,6 +165,7 @@ pl:
         removed: '%{user_name} removed SLA policy %{sla_name}'
       muted: '%{user_name} wyciszył/a rozmowę'
       unmuted: '%{user_name} cofnął wyciszenie rozmowy'
+      auto_resolution_message: 'Resolving the conversation as it has been inactive for a while. Please start a new conversation if you need further assistance.'
     templates:
       greeting_message_body: '%{account_name} zazwyczaj odpowiada w ciągu kilku godzin.'
       ways_to_reach_you_message_body: 'Daj zespołowi możliwość dotarcia do Ciebie.'
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 512e9c3f2..c498a8deb 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -165,6 +165,7 @@ pt:
         removed: '%{user_name} removeu a política de SLA de %{sla_name}'
       muted: '%{user_name} bloqueou a conversa'
       unmuted: '%{user_name} reativou a conversa'
+      auto_resolution_message: 'Resolving the conversation as it has been inactive for a while. Please start a new conversation if you need further assistance.'
     templates:
       greeting_message_body: '%{account_name} normalmente responde em poucas horas.'
       ways_to_reach_you_message_body: 'Dê à equipe um jeito de contatá-lo.'
diff --git a/config/locales/pt_BR.yml b/config/locales/pt_BR.yml
index 172943755..30d0d141f 100644
--- a/config/locales/pt_BR.yml
+++ b/config/locales/pt_BR.yml
@@ -99,7 +99,7 @@ pt_BR:
     conversation_traffic_csv:
       timezone: Fuso horário
     sla_csv:
-      conversation_id: Conversas
+      conversation_id: ID da conversa
       sla_policy_breached: Política SLA
       assignee: Responsável
       team: Times
@@ -165,6 +165,7 @@ pt_BR:
         removed: '%{user_name} removeu a política de SLA %{sla_name}'
       muted: '%{user_name} silenciou a conversa'
       unmuted: '%{user_name} reativou a conversa'
+      auto_resolution_message: 'Resolving the conversation as it has been inactive for a while. Please start a new conversation if you need further assistance.'
     templates:
       greeting_message_body: '%{account_name} normalmente responde em algumas horas.'
       ways_to_reach_you_message_body: 'Informe uma forma para entrarmos em contato com você.'
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 119996271..ff5e7d032 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -165,6 +165,7 @@ ro:
         removed: '%{user_name} removed SLA policy %{sla_name}'
       muted: '%{user_name} a dezactivat conversația'
       unmuted: '%{user_name} a activat conversația'
+      auto_resolution_message: 'Resolving the conversation as it has been inactive for a while. Please start a new conversation if you need further assistance.'
     templates:
       greeting_message_body: '%{account_name} răspunde de obicei în câteva ore.'
       ways_to_reach_you_message_body: 'Dă-i echipei o modalitate de a te contacta.'
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index f16141e3d..cf12f801d 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -165,6 +165,7 @@ ru:
         removed: '%{user_name} удалил политику SLA %{sla_name}'
       muted: '%{user_name} заглушил(а) этот разговор'
       unmuted: '%{user_name} включил(а) уведомления для разговора'
+      auto_resolution_message: 'Resolving the conversation as it has been inactive for a while. Please start a new conversation if you need further assistance.'
     templates:
       greeting_message_body: '%{account_name} как правило отвечает в течении несколько часов.'
       ways_to_reach_you_message_body: 'Оставьте ваш email для связи'
diff --git a/config/locales/sh.yml b/config/locales/sh.yml
index e165d8198..577146912 100644
--- a/config/locales/sh.yml
+++ b/config/locales/sh.yml
@@ -165,6 +165,7 @@ sh:
         removed: '%{user_name} removed SLA policy %{sla_name}'
       muted: '%{user_name} has muted the conversation'
       unmuted: '%{user_name} has unmuted the conversation'
+      auto_resolution_message: 'Resolving the conversation as it has been inactive for a while. Please start a new conversation if you need further assistance.'
     templates:
       greeting_message_body: '%{account_name} typically replies in a few hours.'
       ways_to_reach_you_message_body: 'Give the team a way to reach you.'
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index ac93195ed..c211c4a5a 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -165,6 +165,7 @@ sk:
         removed: '%{user_name} removed SLA policy %{sla_name}'
       muted: '%{user_name} stlmil konverzáciu'
       unmuted: '%{user_name} odtlmil konverzáciu'
+      auto_resolution_message: 'Resolving the conversation as it has been inactive for a while. Please start a new conversation if you need further assistance.'
     templates:
       greeting_message_body: '%{account_name} zvyčajne odpovedá do niekoľkých hodín.'
       ways_to_reach_you_message_body: 'Poskytnite tímu spôsob, ako sa s vami spojiť.'
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index ca91f1d4f..c622ce4ff 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -165,6 +165,7 @@ sl:
         removed: '%{user_name} je odstranil politiko SLA %{sla_name}'
       muted: '%{user_name} je utišal pogovor'
       unmuted: '%{user_name} je vklopil sporočila pogovora'
+      auto_resolution_message: 'Resolving the conversation as it has been inactive for a while. Please start a new conversation if you need further assistance.'
     templates:
       greeting_message_body: '%{account_name} običajno odgovori v nekaj urah.'
       ways_to_reach_you_message_body: 'Omogočite ekipi, da stopi v stik z vami.'
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 79e243163..67a8034bb 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -165,6 +165,7 @@ sq:
         removed: '%{user_name} removed SLA policy %{sla_name}'
       muted: '%{user_name} has muted the conversation'
       unmuted: '%{user_name} has unmuted the conversation'
+      auto_resolution_message: 'Resolving the conversation as it has been inactive for a while. Please start a new conversation if you need further assistance.'
     templates:
       greeting_message_body: '%{account_name} typically replies in a few hours.'
       ways_to_reach_you_message_body: 'Give the team a way to reach you.'
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index d4c1b5700..246c8a103 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -165,6 +165,7 @@ sr-Latn:
         removed: '%{user_name} removed SLA policy %{sla_name}'
       muted: '%{user_name} je utišao razgovor'
       unmuted: '%{user_name} je uklonio utišanje razgovora'
+      auto_resolution_message: 'Resolving the conversation as it has been inactive for a while. Please start a new conversation if you need further assistance.'
     templates:
       greeting_message_body: '%{account_name} obično odgovara za nekoliko sati.'
       ways_to_reach_you_message_body: 'Pružite timu način da vas kontaktira.'
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 743043f45..a437a6c9f 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -165,6 +165,7 @@ sv:
         removed: '%{user_name} removed SLA policy %{sla_name}'
       muted: '%{user_name} har tystat konversationen'
       unmuted: '%{user_name} har avtystat konversationen'
+      auto_resolution_message: 'Resolving the conversation as it has been inactive for a while. Please start a new conversation if you need further assistance.'
     templates:
       greeting_message_body: '%{account_name} svarar vanligtvis inom några timmar.'
       ways_to_reach_you_message_body: 'Ge teamet ett sätt att nå dig.'
diff --git a/config/locales/ta.yml b/config/locales/ta.yml
index 40abf0354..3d8b775d9 100644
--- a/config/locales/ta.yml
+++ b/config/locales/ta.yml
@@ -165,6 +165,7 @@ ta:
         removed: '%{user_name} removed SLA policy %{sla_name}'
       muted: '%{user_name} has muted the conversation'
       unmuted: '%{user_name} has unmuted the conversation'
+      auto_resolution_message: 'Resolving the conversation as it has been inactive for a while. Please start a new conversation if you need further assistance.'
     templates:
       greeting_message_body: '%{account_name} பொதுவாக சில மணிநேரங்களில் பதிலளிப்பார்.'
       ways_to_reach_you_message_body: 'உங்களை அடைய அணிக்கு ஒரு வழியைக் கொடுங்கள்.'
diff --git a/config/locales/th.yml b/config/locales/th.yml
index d4d6cbac2..ef04f4dba 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -165,6 +165,7 @@ th:
         removed: '%{user_name} removed SLA policy %{sla_name}'
       muted: '%{user_name} has muted the conversation'
       unmuted: '%{user_name} has unmuted the conversation'
+      auto_resolution_message: 'Resolving the conversation as it has been inactive for a while. Please start a new conversation if you need further assistance.'
     templates:
       greeting_message_body: '%{account_name} typically replies in a few hours.'
       ways_to_reach_you_message_body: 'Give the team a way to reach you.'
diff --git a/config/locales/tl.yml b/config/locales/tl.yml
index 3e39cb709..5f246d546 100644
--- a/config/locales/tl.yml
+++ b/config/locales/tl.yml
@@ -165,6 +165,7 @@ tl:
         removed: '%{user_name} removed SLA policy %{sla_name}'
       muted: '%{user_name} has muted the conversation'
       unmuted: '%{user_name} has unmuted the conversation'
+      auto_resolution_message: 'Resolving the conversation as it has been inactive for a while. Please start a new conversation if you need further assistance.'
     templates:
       greeting_message_body: '%{account_name} typically replies in a few hours.'
       ways_to_reach_you_message_body: 'Give the team a way to reach you.'
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index afa72604a..57a4dbd1f 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -165,6 +165,7 @@ tr:
         removed: '%{user_name} removed SLA policy %{sla_name}'
       muted: '%{user_name}, sohbeti sessize aldı'
       unmuted: '%{user_name} konuşmanın sesini açtı'
+      auto_resolution_message: 'Resolving the conversation as it has been inactive for a while. Please start a new conversation if you need further assistance.'
     templates:
       greeting_message_body: '%{account_name} genellikle birkaç saat içinde yanıt verir.'
       ways_to_reach_you_message_body: 'Ekibin size ulaşması için bir bilgi verin.'
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 321b2d18d..687508a52 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -165,6 +165,7 @@ uk:
         removed: '%{user_name} видалив політику SLA %{sla_name}'
       muted: '%{user_name} включив безвучний режим'
       unmuted: '%{user_name} виключив безвучний режим'
+      auto_resolution_message: 'Resolving the conversation as it has been inactive for a while. Please start a new conversation if you need further assistance.'
     templates:
       greeting_message_body: '%{account_name} зазвичай відповідає за кілька годин.'
       ways_to_reach_you_message_body: 'Дайте команді можливість з вами зв''язатися.'
diff --git a/config/locales/ur.yml b/config/locales/ur.yml
index 5bcf1f080..771abb0b7 100644
--- a/config/locales/ur.yml
+++ b/config/locales/ur.yml
@@ -165,6 +165,7 @@ ur:
         removed: '%{user_name} removed SLA policy %{sla_name}'
       muted: '%{user_name} has muted the conversation'
       unmuted: '%{user_name} has unmuted the conversation'
+      auto_resolution_message: 'Resolving the conversation as it has been inactive for a while. Please start a new conversation if you need further assistance.'
     templates:
       greeting_message_body: '%{account_name} typically replies in a few hours.'
       ways_to_reach_you_message_body: 'Give the team a way to reach you.'
diff --git a/config/locales/ur_IN.yml b/config/locales/ur_IN.yml
index 489208f38..dadbb2ba0 100644
--- a/config/locales/ur_IN.yml
+++ b/config/locales/ur_IN.yml
@@ -165,6 +165,7 @@ ur:
         removed: '%{user_name} removed SLA policy %{sla_name}'
       muted: '%{user_name} has muted the conversation'
       unmuted: '%{user_name} has unmuted the conversation'
+      auto_resolution_message: 'Resolving the conversation as it has been inactive for a while. Please start a new conversation if you need further assistance.'
     templates:
       greeting_message_body: '%{account_name} typically replies in a few hours.'
       ways_to_reach_you_message_body: 'Give the team a way to reach you.'
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 59422d56b..22054f141 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -165,6 +165,7 @@ vi:
         removed: '%{user_name} removed SLA policy %{sla_name}'
       muted: '%{user_name} đã tắt tiếng hội thoại'
       unmuted: '%{user_name} đã bật tiếng cuộc trò chuyện'
+      auto_resolution_message: 'Resolving the conversation as it has been inactive for a while. Please start a new conversation if you need further assistance.'
     templates:
       greeting_message_body: '%{account_name} thường trả lời trong vài giờ.'
       ways_to_reach_you_message_body: 'Trong lúc chờ đội ngũ hỗ trợ phản hồi, bạn hãy để lại email để nhận được thông báo nhanh nhất nhé.'
diff --git a/config/locales/zh_CN.yml b/config/locales/zh_CN.yml
index edaea36e8..4c672e8a3 100644
--- a/config/locales/zh_CN.yml
+++ b/config/locales/zh_CN.yml
@@ -165,6 +165,7 @@ zh_CN:
         removed: '%{user_name} removed SLA policy %{sla_name}'
       muted: '%{user_name} 已将会话静音'
       unmuted: '%{user_name} 已将会话取消静音'
+      auto_resolution_message: 'Resolving the conversation as it has been inactive for a while. Please start a new conversation if you need further assistance.'
     templates:
       greeting_message_body: '%{account_name} 通常在几小时内回复。'
       ways_to_reach_you_message_body: '给团队一个联系您的方法。'
diff --git a/config/locales/zh_TW.yml b/config/locales/zh_TW.yml
index 4f4dca827..f5648913b 100644
--- a/config/locales/zh_TW.yml
+++ b/config/locales/zh_TW.yml
@@ -165,6 +165,7 @@ zh_TW:
         removed: '%{user_name} removed SLA policy %{sla_name}'
       muted: '%{user_name} 已將對話靜音'
       unmuted: '%{user_name} 將對話解除靜音'
+      auto_resolution_message: 'Resolving the conversation as it has been inactive for a while. Please start a new conversation if you need further assistance.'
     templates:
       greeting_message_body: '%{account_name} 通常在幾小時內回覆'
       ways_to_reach_you_message_body: '給個聯繫方式讓團隊可以聯繫到您。'
diff --git a/enterprise/app/jobs/captain/inbox_pending_conversations_resolution_job.rb b/enterprise/app/jobs/captain/inbox_pending_conversations_resolution_job.rb
index 39c08af64..657d31bd3 100644
--- a/enterprise/app/jobs/captain/inbox_pending_conversations_resolution_job.rb
+++ b/enterprise/app/jobs/captain/inbox_pending_conversations_resolution_job.rb
@@ -10,7 +10,7 @@ class Captain::InboxPendingConversationsResolutionJob < ApplicationJob
           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.'
+          content: I18n.t('conversations.activity.auto_resolution_message')
         }
       )
       conversation.resolved!
diff --git a/lib/integrations/slack/send_on_slack_service.rb b/lib/integrations/slack/send_on_slack_service.rb
index 20a65905c..c1454b869 100644
--- a/lib/integrations/slack/send_on_slack_service.rb
+++ b/lib/integrations/slack/send_on_slack_service.rb
@@ -119,12 +119,14 @@ class Integrations::Slack::SendOnSlackService < Base::SendOnChannelService
   def upload_file
     return unless message.attachments.first.with_attached_file?
 
-    result = slack_client.files_upload({
-      channels: hook.reference_id,
+    result = slack_client.files_upload_v2(
+      filename: message.attachments.first.file.filename,
+      content: message.attachments.first.file.download,
       initial_comment: 'Attached File!',
-      thread_ts: conversation.identifier
-    }.merge(file_information))
-    Rails.logger.info(result)
+      thread_ts: conversation.identifier,
+      channel_id: hook.reference_id
+    )
+    Rails.logger.info "slack_upload_result: #{result}"
   end
 
   def file_type
diff --git a/package.json b/package.json
index 5e026a488..50f5a98c0 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,8 @@
     "size": "size-limit",
     "story:dev": "histoire dev",
     "story:build": "histoire build",
-    "story:preview": "histoire preview"
+    "story:preview": "histoire preview",
+    "sync:i18n": "bin/sync_i18n_file_change"
   },
   "size-limit": [
     {
@@ -71,6 +72,7 @@
     "highlight.js": "^11.10.0",
     "idb": "^8.0.0",
     "js-cookie": "^3.0.5",
+    "lettersanitizer": "^1.0.6",
     "libphonenumber-js": "^1.11.9",
     "markdown-it": "^13.0.2",
     "markdown-it-link-attributes": "^4.0.1",
@@ -91,7 +93,7 @@
     "vue-datepicker-next": "^1.0.3",
     "vue-dompurify-html": "^5.1.0",
     "vue-i18n": "9.14.2",
-    "vue-letter": "^0.2.0",
+    "vue-letter": "^0.2.1",
     "vue-multiselect": "3.1.0",
     "vue-router": "~4.4.5",
     "vue-upload-component": "^3.1.17",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index bb3403914..96737e1cc 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -136,6 +136,9 @@ importers:
       js-cookie:
         specifier: ^3.0.5
         version: 3.0.5
+      lettersanitizer:
+        specifier: ^1.0.6
+        version: 1.0.6
       libphonenumber-js:
         specifier: ^1.11.9
         version: 1.11.9
@@ -197,8 +200,8 @@ importers:
         specifier: 9.14.2
         version: 9.14.2(vue@3.5.12(typescript@5.6.2))
       vue-letter:
-        specifier: ^0.2.0
-        version: 0.2.0
+        specifier: ^0.2.1
+        version: 0.2.1
       vue-multiselect:
         specifier: 3.1.0
         version: 3.1.0
@@ -3336,8 +3339,8 @@ packages:
   launch-editor@2.9.1:
     resolution: {integrity: sha512-Gcnl4Bd+hRO9P9icCP/RVVT2o8SFlPXofuCxvA2SaZuH45whSvf5p8x5oih5ftLiVhEI4sp5xDY+R+b3zJBh5w==}
 
-  lettersanitizer@1.0.5:
-    resolution: {integrity: sha512-OEJjdlRE96uKB0VfMi4nb3hBctYl1Ss6DQg9SPXRpGcjaBjcmDaibp0ZIdQu1TPwMAEvWC8xRqIcTAooElSDIg==}
+  lettersanitizer@1.0.6:
+    resolution: {integrity: sha512-2vj0tUtBRjlmTCFsgVlFmfi04p049Zwv/4eBGWBUOKropEoL+q+jTQQfFyDu50j7gL76pycMvrqD0uV0vxX2zg==}
 
   levn@0.4.1:
     resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
@@ -4848,8 +4851,8 @@ packages:
     peerDependencies:
       vue: ^3.0.0
 
-  vue-letter@0.2.0:
-    resolution: {integrity: sha512-p4qHpw89GKidKyGcg4J4IjUcMQuVaTJq83c6UE4616claaLF9rj2Bg/Hq19uDCmokd+SvzEwxq6/ctfaaednkw==}
+  vue-letter@0.2.1:
+    resolution: {integrity: sha512-IYWp47XUikjKfEniWYlFxeJFKABZwAE5IEjz866qCBytBr2dzqVDdjoMDpBP//krxkzN/QZYyHe6C09y/IODYg==}
 
   vue-multiselect@3.1.0:
     resolution: {integrity: sha512-+i/fjTqFBpaay9NP+lU7obBeNaw2DdFDFs4mqhsM0aEtKRdvIf7CfREAx2o2B4XDmPrBt1r7x1YCM3BOMLaUgQ==}
@@ -8558,7 +8561,7 @@ snapshots:
       picocolors: 1.1.0
       shell-quote: 1.8.1
 
-  lettersanitizer@1.0.5: {}
+  lettersanitizer@1.0.6: {}
 
   levn@0.4.1:
     dependencies:
@@ -10224,9 +10227,9 @@ snapshots:
       '@vue/devtools-api': 6.6.4
       vue: 3.5.12(typescript@5.6.2)
 
-  vue-letter@0.2.0:
+  vue-letter@0.2.1:
     dependencies:
-      lettersanitizer: 1.0.5
+      lettersanitizer: 1.0.6
 
   vue-multiselect@3.1.0: {}
 
diff --git a/spec/controllers/dashboard_controller_spec.rb b/spec/controllers/dashboard_controller_spec.rb
index 31187aeb6..517443858 100644
--- a/spec/controllers/dashboard_controller_spec.rb
+++ b/spec/controllers/dashboard_controller_spec.rb
@@ -18,6 +18,13 @@ describe '/app/login', type: :request do
     end
   end
 
+  context 'with non-HTML format' do
+    it 'returns not acceptable for JSON' do
+      get '/app/login', params: { format: 'json' }
+      expect(response).to have_http_status(:not_acceptable)
+    end
+  end
+
   # Routes are loaded once on app start
   # hence Rails.application.reload_routes! is used in this spec
   # ref : https://stackoverflow.com/a/63584877/939299
diff --git a/spec/lib/integrations/slack/send_on_slack_service_spec.rb b/spec/lib/integrations/slack/send_on_slack_service_spec.rb
index 6524154b4..684f2bc54 100644
--- a/spec/lib/integrations/slack/send_on_slack_service_spec.rb
+++ b/spec/lib/integrations/slack/send_on_slack_service_spec.rb
@@ -162,15 +162,13 @@ describe Integrations::Slack::SendOnSlackService do
         attachment = message.attachments.new(account_id: message.account_id, file_type: :image)
         attachment.file.attach(io: Rails.root.join('spec/assets/avatar.png').open, filename: 'avatar.png', content_type: 'image/png')
 
-        expect(slack_client).to receive(:files_upload).with(hash_including(
-                                                              channels: hook.reference_id,
-                                                              thread_ts: conversation.identifier,
-                                                              initial_comment: 'Attached File!',
-                                                              filetype: 'png',
-                                                              content: anything,
-                                                              filename: attachment.file.filename,
-                                                              title: attachment.file.filename
-                                                            )).and_return(file_attachment)
+        expect(slack_client).to receive(:files_upload_v2).with(
+          filename: attachment.file.filename,
+          content: anything,
+          channel_id: hook.reference_id,
+          thread_ts: conversation.identifier,
+          initial_comment: 'Attached File!'
+        ).and_return(file_attachment)
 
         message.save!