diff --git a/.circleci/config.yml b/.circleci/config.yml
index 804c63857..24119bc75 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -218,6 +218,49 @@ jobs:
             source ~/.rvm/scripts/rvm
             bundle install
 
+      # Install and configure OpenSearch
+      - run:
+          name: Install OpenSearch
+          command: |
+            # Download and install OpenSearch 2.11.0 (compatible with Elasticsearch 7.x clients)
+            wget https://artifacts.opensearch.org/releases/bundle/opensearch/2.11.0/opensearch-2.11.0-linux-x64.tar.gz
+            tar -xzf opensearch-2.11.0-linux-x64.tar.gz
+            sudo mv opensearch-2.11.0 /opt/opensearch
+
+      - run:
+          name: Configure and Start OpenSearch
+          command: |
+            # Configure OpenSearch for single-node testing
+            cat > /opt/opensearch/config/opensearch.yml \<< EOF
+            cluster.name: chatwoot-test
+            node.name: node-1
+            network.host: 0.0.0.0
+            http.port: 9200
+            discovery.type: single-node
+            plugins.security.disabled: true
+            EOF
+
+            # Set ownership and permissions
+            sudo chown -R $USER:$USER /opt/opensearch
+
+            # Start OpenSearch in background
+            /opt/opensearch/bin/opensearch -d -p /tmp/opensearch.pid
+
+      - run:
+          name: Wait for OpenSearch to be ready
+          command: |
+            echo "Waiting for OpenSearch to start..."
+            for i in {1..30}; do
+              if curl -s http://localhost:9200/_cluster/health | grep -q '"status"'; then
+                echo "OpenSearch is ready!"
+                exit 0
+              fi
+              echo "Waiting... ($i/30)"
+              sleep 2
+            done
+            echo "OpenSearch failed to start"
+            exit 1
+
       # Configure environment and database
       - run:
           name: Database Setup and Configure Environment Variables
@@ -234,6 +277,7 @@ jobs:
             sed -i -e '/POSTGRES_USERNAME/ s/=.*/=chatwoot/' .env
             sed -i -e "/POSTGRES_PASSWORD/ s/=.*/=$pg_pass/" .env
             echo -en "\nINSTALLATION_ENV=circleci" >> ".env"
+            echo -en "\nOPENSEARCH_URL=http://localhost:9200" >> ".env"
 
       # Database setup
       - run:
diff --git a/Gemfile.lock b/Gemfile.lock
index 0a669b606..1cdfabee0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -441,7 +441,8 @@ GEM
     http-cookie (1.0.5)
       domain_name (~> 0.5)
     http-form_data (2.3.0)
-    httparty (0.21.0)
+    httparty (0.24.0)
+      csv
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
     httpclient (2.8.3)
@@ -555,7 +556,8 @@ GEM
       ruby2_keywords
     msgpack (1.8.0)
     multi_json (1.15.0)
-    multi_xml (0.6.0)
+    multi_xml (0.8.0)
+      bigdecimal (>= 3.1, < 5)
     multipart-post (2.3.0)
     mutex_m (0.3.0)
     neighbor (0.2.3)
diff --git a/README.md b/README.md
index 21316b422..d8b8ae7a2 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,6 @@ ___
 The modern customer support platform, an open-source alternative to Intercom, Zendesk, Salesforce Service Cloud etc.
 
 <p>
-  <a href="https://codeclimate.com/github/chatwoot/chatwoot/maintainability"><img src="https://api.codeclimate.com/v1/badges/e6e3f66332c91e5a4c0c/maintainability" alt="Maintainability"></a>
   <img src="https://img.shields.io/circleci/build/github/chatwoot/chatwoot" alt="CircleCI Badge">
     <a href="https://hub.docker.com/r/chatwoot/chatwoot/"><img src="https://img.shields.io/docker/pulls/chatwoot/chatwoot" alt="Docker Pull Badge"></a>
   <a href="https://hub.docker.com/r/chatwoot/chatwoot/"><img src="https://img.shields.io/docker/cloud/build/chatwoot/chatwoot" alt="Docker Build Badge"></a>
@@ -137,4 +136,4 @@ Thanks goes to all these [wonderful people](https://www.chatwoot.com/docs/contri
 <a href="https://github.com/chatwoot/chatwoot/graphs/contributors"><img src="https://opencollective.com/chatwoot/contributors.svg?width=890&button=false" /></a>
 
 
-*Chatwoot* &copy; 2017-2025, Chatwoot Inc - Released under the MIT License.
+*Chatwoot* &copy; 2017-2026, Chatwoot Inc - Released under the MIT License.
diff --git a/app/controllers/api/v1/accounts/search_controller.rb b/app/controllers/api/v1/accounts/search_controller.rb
index 13e3a6a6c..7ee25e02e 100644
--- a/app/controllers/api/v1/accounts/search_controller.rb
+++ b/app/controllers/api/v1/accounts/search_controller.rb
@@ -28,5 +28,7 @@ class Api::V1::Accounts::SearchController < Api::V1::Accounts::BaseController
       search_type: search_type,
       params: params
     ).perform
+  rescue ArgumentError => e
+    render json: { error: e.message }, status: :unprocessable_entity
   end
 end
diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb
index abf42517c..d57ad0e53 100644
--- a/app/controllers/dashboard_controller.rb
+++ b/app/controllers/dashboard_controller.rb
@@ -16,7 +16,7 @@ class DashboardController < ActionController::Base
     CHATWOOT_INBOX_TOKEN
     API_CHANNEL_NAME
     API_CHANNEL_THUMBNAIL
-    ANALYTICS_TOKEN
+    CLOUD_ANALYTICS_TOKEN
     DIRECT_UPLOADS_ENABLED
     MAXIMUM_FILE_UPLOAD_SIZE
     HCAPTCHA_SITE_KEY
diff --git a/app/javascript/dashboard/api/inboxes.js b/app/javascript/dashboard/api/inboxes.js
index 361b9472f..83ba3e9ba 100644
--- a/app/javascript/dashboard/api/inboxes.js
+++ b/app/javascript/dashboard/api/inboxes.js
@@ -32,6 +32,16 @@ class Inboxes extends CacheEnabledApiClient {
   syncTemplates(inboxId) {
     return axios.post(`${this.url}/${inboxId}/sync_templates`);
   }
+
+  createCSATTemplate(inboxId, template) {
+    return axios.post(`${this.url}/${inboxId}/csat_template`, {
+      template,
+    });
+  }
+
+  getCSATTemplateStatus(inboxId) {
+    return axios.get(`${this.url}/${inboxId}/csat_template`);
+  }
 }
 
 export default new Inboxes();
diff --git a/app/javascript/dashboard/api/search.js b/app/javascript/dashboard/api/search.js
index d533c2f28..10214f3f5 100644
--- a/app/javascript/dashboard/api/search.js
+++ b/app/javascript/dashboard/api/search.js
@@ -14,38 +14,48 @@ class SearchAPI extends ApiClient {
     });
   }
 
-  contacts({ q, page = 1 }) {
+  contacts({ q, page = 1, since, until }) {
     return axios.get(`${this.url}/contacts`, {
       params: {
         q,
         page: page,
+        since,
+        until,
       },
     });
   }
 
-  conversations({ q, page = 1 }) {
+  conversations({ q, page = 1, since, until }) {
     return axios.get(`${this.url}/conversations`, {
       params: {
         q,
         page: page,
+        since,
+        until,
       },
     });
   }
 
-  messages({ q, page = 1 }) {
+  messages({ q, page = 1, since, until, from, inboxId }) {
     return axios.get(`${this.url}/messages`, {
       params: {
         q,
         page: page,
+        since,
+        until,
+        from,
+        inbox_id: inboxId,
       },
     });
   }
 
-  articles({ q, page = 1 }) {
+  articles({ q, page = 1, since, until }) {
     return axios.get(`${this.url}/articles`, {
       params: {
         q,
         page: page,
+        since,
+        until,
       },
     });
   }
diff --git a/app/javascript/dashboard/api/specs/search.spec.js b/app/javascript/dashboard/api/specs/search.spec.js
new file mode 100644
index 000000000..251ea760e
--- /dev/null
+++ b/app/javascript/dashboard/api/specs/search.spec.js
@@ -0,0 +1,134 @@
+import searchAPI from '../search';
+import ApiClient from '../ApiClient';
+
+describe('#SearchAPI', () => {
+  it('creates correct instance', () => {
+    expect(searchAPI).toBeInstanceOf(ApiClient);
+    expect(searchAPI).toHaveProperty('get');
+    expect(searchAPI).toHaveProperty('contacts');
+    expect(searchAPI).toHaveProperty('conversations');
+    expect(searchAPI).toHaveProperty('messages');
+    expect(searchAPI).toHaveProperty('articles');
+  });
+
+  describe('API calls', () => {
+    const originalAxios = window.axios;
+    const axiosMock = {
+      get: vi.fn(() => Promise.resolve()),
+    };
+
+    beforeEach(() => {
+      window.axios = axiosMock;
+    });
+
+    afterEach(() => {
+      window.axios = originalAxios;
+      vi.clearAllMocks();
+    });
+
+    it('#get', () => {
+      searchAPI.get({ q: 'test query' });
+      expect(axiosMock.get).toHaveBeenCalledWith('/api/v1/search', {
+        params: { q: 'test query' },
+      });
+    });
+
+    it('#contacts', () => {
+      searchAPI.contacts({ q: 'test', page: 1 });
+      expect(axiosMock.get).toHaveBeenCalledWith('/api/v1/search/contacts', {
+        params: { q: 'test', page: 1, since: undefined, until: undefined },
+      });
+    });
+
+    it('#contacts with date filters', () => {
+      searchAPI.contacts({
+        q: 'test',
+        page: 2,
+        since: 1700000000,
+        until: 1732000000,
+      });
+      expect(axiosMock.get).toHaveBeenCalledWith('/api/v1/search/contacts', {
+        params: { q: 'test', page: 2, since: 1700000000, until: 1732000000 },
+      });
+    });
+
+    it('#conversations', () => {
+      searchAPI.conversations({ q: 'test', page: 1 });
+      expect(axiosMock.get).toHaveBeenCalledWith(
+        '/api/v1/search/conversations',
+        {
+          params: { q: 'test', page: 1, since: undefined, until: undefined },
+        }
+      );
+    });
+
+    it('#conversations with date filters', () => {
+      searchAPI.conversations({
+        q: 'test',
+        page: 1,
+        since: 1700000000,
+        until: 1732000000,
+      });
+      expect(axiosMock.get).toHaveBeenCalledWith(
+        '/api/v1/search/conversations',
+        {
+          params: { q: 'test', page: 1, since: 1700000000, until: 1732000000 },
+        }
+      );
+    });
+
+    it('#messages', () => {
+      searchAPI.messages({ q: 'test', page: 1 });
+      expect(axiosMock.get).toHaveBeenCalledWith('/api/v1/search/messages', {
+        params: {
+          q: 'test',
+          page: 1,
+          since: undefined,
+          until: undefined,
+          from: undefined,
+          inbox_id: undefined,
+        },
+      });
+    });
+
+    it('#messages with all filters', () => {
+      searchAPI.messages({
+        q: 'test',
+        page: 1,
+        since: 1700000000,
+        until: 1732000000,
+        from: 'contact:42',
+        inboxId: 10,
+      });
+      expect(axiosMock.get).toHaveBeenCalledWith('/api/v1/search/messages', {
+        params: {
+          q: 'test',
+          page: 1,
+          since: 1700000000,
+          until: 1732000000,
+          from: 'contact:42',
+          inbox_id: 10,
+        },
+      });
+    });
+
+    it('#articles', () => {
+      searchAPI.articles({ q: 'test', page: 1 });
+      expect(axiosMock.get).toHaveBeenCalledWith('/api/v1/search/articles', {
+        params: { q: 'test', page: 1, since: undefined, until: undefined },
+      });
+    });
+
+    it('#articles with date filters', () => {
+      searchAPI.articles({
+        q: 'test',
+        page: 2,
+        since: 1700000000,
+        until: 1732000000,
+      });
+      expect(axiosMock.get).toHaveBeenCalledWith('/api/v1/search/articles', {
+        params: { q: 'test', page: 2, since: 1700000000, until: 1732000000 },
+      });
+    });
+  });
+});
diff --git a/app/javascript/dashboard/components-next/CardLayout.vue b/app/javascript/dashboard/components-next/CardLayout.vue
index 462402167..166f5ea4c 100644
--- a/app/javascript/dashboard/components-next/CardLayout.vue
+++ b/app/javascript/dashboard/components-next/CardLayout.vue
@@ -19,7 +19,7 @@ const handleClick = () => {
 
 <template>
   <div
-    class="flex flex-col w-full shadow outline-1 outline outline-n-container group/cardLayout rounded-2xl bg-n-solid-2"
+    class="flex flex-col w-full outline-1 outline outline-n-container group/cardLayout rounded-xl bg-n-solid-2"
   >
     <div
       class="flex w-full gap-3 py-5"
diff --git a/app/javascript/dashboard/components-next/Companies/CompaniesHeader/components/CompanySortMenu.vue b/app/javascript/dashboard/components-next/Companies/CompaniesHeader/components/CompanySortMenu.vue
index 768123b9f..8cf75d555 100644
--- a/app/javascript/dashboard/components-next/Companies/CompaniesHeader/components/CompanySortMenu.vue
+++ b/app/javascript/dashboard/components-next/Companies/CompaniesHeader/components/CompanySortMenu.vue
@@ -35,6 +35,10 @@ const sortMenus = [
     label: t('COMPANIES.SORT_BY.OPTIONS.CREATED_AT'),
     value: 'created_at',
   },
+  {
+    label: t('COMPANIES.SORT_BY.OPTIONS.CONTACTS_COUNT'),
+    value: 'contacts_count',
+  },
 ];
 
 const orderingMenus = [
diff --git a/app/javascript/dashboard/components-next/dropdown-menu/DropdownMenu.vue b/app/javascript/dashboard/components-next/dropdown-menu/DropdownMenu.vue
index 6276dfec6..548e646b2 100644
--- a/app/javascript/dashboard/components-next/dropdown-menu/DropdownMenu.vue
+++ b/app/javascript/dashboard/components-next/dropdown-menu/DropdownMenu.vue
@@ -4,6 +4,7 @@ import { useI18n } from 'vue-i18n';
 
 import Icon from 'dashboard/components-next/icon/Icon.vue';
 import Avatar from 'dashboard/components-next/avatar/Avatar.vue';
+import Spinner from 'dashboard/components-next/spinner/Spinner.vue';
 
 const props = defineProps({
   menuItems: {
@@ -37,9 +38,13 @@ const props = defineProps({
     type: String,
     default: '',
   },
+  disableLocalFiltering: {
+    type: Boolean,
+    default: false,
+  },
 });
 
-const emit = defineEmits(['action']);
+const emit = defineEmits(['action', 'search']);
 
 const { t } = useI18n();
 
@@ -57,6 +62,7 @@ const flattenedMenuItems = computed(() => {
 });
 
 const filteredMenuItems = computed(() => {
+  if (props.disableLocalFiltering) return props.menuItems;
   if (!searchQuery.value) return flattenedMenuItems.value;
 
   return flattenedMenuItems.value.filter(item =>
@@ -69,7 +75,7 @@ const filteredMenuSections = computed(() => {
     return [];
   }
 
-  if (!searchQuery.value) {
+  if (props.disableLocalFiltering || !searchQuery.value) {
     return props.menuSections;
   }
 
@@ -89,6 +95,12 @@ const filteredMenuSections = computed(() => {
     .filter(section => section.items.length > 0);
 });
 
+const handleSearchInput = event => {
+  if (props.disableLocalFiltering) {
+    emit('search', event.target.value);
+  }
+};
+
 const handleAction = item => {
   const { action, value, ...rest } = item;
   emit('action', { action, value, ...rest });
@@ -118,7 +130,7 @@ onMounted(() => {
   >
     <div
       v-if="showSearch"
-      class="sticky top-0 bg-n-alpha-3 backdrop-blur-sm pt-2"
+      class="sticky top-0 bg-n-alpha-3 backdrop-blur-sm pt-2 z-20"
     >
       <div class="relative">
         <span class="absolute i-lucide-search size-3.5 top-2 left-3" />
@@ -130,6 +142,7 @@ onMounted(() => {
             searchPlaceholder || t('DROPDOWN_MENU.SEARCH_PLACEHOLDER')
           "
           class="reset-base w-full h-8 py-2 pl-10 pr-2 text-sm focus:outline-none border-none rounded-lg bg-n-alpha-black2 dark:bg-n-solid-1 text-n-slate-12"
+          @input="handleSearchInput"
         />
       </div>
     </div>
@@ -141,10 +154,23 @@ onMounted(() => {
       >
         <p
           v-if="section.title"
-          class="px-2 pt-2 text-xs font-medium text-n-slate-11 uppercase tracking-wide"
+          class="px-2 py-2 text-xs mb-0 font-medium text-n-slate-11 uppercase tracking-wide sticky z-10 bg-n-alpha-3 backdrop-blur-sm"
+          :class="showSearch ? 'top-10' : 'top-0'"
         >
           {{ section.title }}
         </p>
+        <div
+          v-if="section.isLoading"
+          class="flex items-center justify-center py-2"
+        >
+          <Spinner :size="24" />
+        </div>
+        <div
+          v-else-if="!section.items.length && section.emptyState"
+          class="text-sm text-n-slate-11 px-2 py-1.5"
+        >
+          {{ section.emptyState }}
+        </div>
         <button
           v-for="(item, itemIndex) in section.items"
           :key="item.value || itemIndex"
@@ -235,5 +261,6 @@ onMounted(() => {
           : t('DROPDOWN_MENU.EMPTY_STATE')
       }}
     </div>
+    <slot name="footer" />
   </div>
 </template>
diff --git a/app/javascript/dashboard/components-next/message/MessageList.vue b/app/javascript/dashboard/components-next/message/MessageList.vue
index b73b44d5a..fd725f808 100644
--- a/app/javascript/dashboard/components-next/message/MessageList.vue
+++ b/app/javascript/dashboard/components-next/message/MessageList.vue
@@ -42,7 +42,10 @@ const props = defineProps({
 const emit = defineEmits(['retry']);
 
 const allMessages = computed(() => {
-  return useCamelCase(props.messages, { deep: true });
+  return useCamelCase(props.messages, {
+    deep: true,
+    stopPaths: ['content_attributes.translations'],
+  });
 });
 
 const currentChat = useMapGetter('getSelectedChat');
diff --git a/app/javascript/dashboard/components-next/message/bubbles/Template/CSAT.vue b/app/javascript/dashboard/components-next/message/bubbles/Template/CSAT.vue
new file mode 100644
index 000000000..d1c9ebb37
--- /dev/null
+++ b/app/javascript/dashboard/components-next/message/bubbles/Template/CSAT.vue
@@ -0,0 +1,28 @@
+<script setup>
+import Button from 'dashboard/components-next/button/Button.vue';
+
+defineProps({
+  message: {
+    type: Object,
+    required: true,
+  },
+  buttonText: {
+    type: String,
+    required: true,
+  },
+});
+</script>
+
+<template>
+  <div class="flex flex-col gap-2.5 text-n-slate-12 max-w-80">
+    <div class="p-3 rounded-xl bg-n-alpha-2">
+      <span
+        v-dompurify-html="message.content"
+        class="text-sm font-medium prose prose-bubble"
+      />
+    </div>
+    <div class="flex gap-2">
+      <Button :label="buttonText" slate class="!text-n-blue-text w-full" />
+    </div>
+  </div>
+</template>
diff --git a/app/javascript/dashboard/components-next/message/chips/Audio.vue b/app/javascript/dashboard/components-next/message/chips/Audio.vue
index 667d2d7b6..9c7a44b23 100644
--- a/app/javascript/dashboard/components-next/message/chips/Audio.vue
+++ b/app/javascript/dashboard/components-next/message/chips/Audio.vue
@@ -17,6 +17,10 @@ const { attachment } = defineProps({
     type: Object,
     required: true,
   },
+  showTranscribedText: {
+    type: Boolean,
+    default: true,
+  },
 });
 
 defineOptions({
@@ -182,7 +186,7 @@ const downloadAudio = async () => {
     </div>
 
     <div
-      v-if="attachment.transcribedText"
+      v-if="attachment.transcribedText && showTranscribedText"
       class="text-n-slate-12 p-3 text-sm bg-n-alpha-1 rounded-lg w-full break-words"
     >
       {{ attachment.transcribedText }}
diff --git a/app/javascript/dashboard/components-next/sidebar/Sidebar.vue b/app/javascript/dashboard/components-next/sidebar/Sidebar.vue
index a37cde89f..95baafcfd 100644
--- a/app/javascript/dashboard/components-next/sidebar/Sidebar.vue
+++ b/app/javascript/dashboard/components-next/sidebar/Sidebar.vue
@@ -1,12 +1,11 @@
 <script setup>
-import { h, computed, onMounted } from 'vue';
+import { h, ref, computed, onMounted } from 'vue';
 import { provideSidebarContext } from './provider';
 import { useAccount } from 'dashboard/composables/useAccount';
 import { useKbd } from 'dashboard/composables/utils/useKbd';
 import { useMapGetter } from 'dashboard/composables/store';
 import { useStore } from 'vuex';
 import { useI18n } from 'vue-i18n';
-import { useStorage } from '@vueuse/core';
 import { useSidebarKeyboardShortcuts } from './useSidebarKeyboardShortcuts';
 import { vOnClickOutside } from '@vueuse/components';
 import { emitter } from 'shared/helpers/mitt';
@@ -55,14 +54,7 @@ const toggleShortcutModalFn = show => {
 
 useSidebarKeyboardShortcuts(toggleShortcutModalFn);
 
-// We're using localStorage to store the expanded item in the sidebar
-// This helps preserve context when navigating between portal and dashboard layouts
-// and also when the user refreshes the page
-const expandedItem = useStorage(
-  'next-sidebar-expanded-item',
-  null,
-  sessionStorage
-);
+const expandedItem = ref(null);
 
 const setExpandedItem = name => {
   expandedItem.value = expandedItem.value === name ? null : name;
diff --git a/app/javascript/dashboard/components-next/sidebar/SidebarGroup.vue b/app/javascript/dashboard/components-next/sidebar/SidebarGroup.vue
index 090bc2c42..097f29c7d 100644
--- a/app/javascript/dashboard/components-next/sidebar/SidebarGroup.vue
+++ b/app/javascript/dashboard/components-next/sidebar/SidebarGroup.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { computed, onMounted, nextTick } from 'vue';
+import { computed, onMounted, watch, nextTick } from 'vue';
 import { useSidebarContext } from './provider';
 import { useRoute, useRouter } from 'vue-router';
 import Policy from 'dashboard/components/policy.vue';
@@ -126,6 +126,16 @@ onMounted(async () => {
     setExpandedItem(props.name);
   }
 });
+
+watch(
+  hasActiveChild,
+  hasNewActiveChild => {
+    if (hasNewActiveChild && !isExpanded.value) {
+      setExpandedItem(props.name);
+    }
+  },
+  { once: true }
+);
 </script>
 
 <!-- eslint-disable-next-line vue/no-root-v-if -->
diff --git a/app/javascript/dashboard/components-next/tabbar/TabBar.vue b/app/javascript/dashboard/components-next/tabbar/TabBar.vue
index 1b08b838c..fbe105825 100644
--- a/app/javascript/dashboard/components-next/tabbar/TabBar.vue
+++ b/app/javascript/dashboard/components-next/tabbar/TabBar.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { computed, ref, onMounted, nextTick } from 'vue';
+import { computed, ref, onMounted, nextTick, watch } from 'vue';
 import { useResizeObserver } from '@vueuse/core';
 
 const props = defineProps({
@@ -31,20 +31,24 @@ const enableTransition = ref(false);
 const activeElement = computed(() => tabRefs.value[activeTab.value]);
 
 const updateIndicator = () => {
-  if (!activeElement.value) return;
+  nextTick(() => {
+    if (!activeElement.value) return;
 
-  indicatorStyle.value = {
-    left: `${activeElement.value.offsetLeft}px`,
-    width: `${activeElement.value.offsetWidth}px`,
-  };
+    indicatorStyle.value = {
+      left: `${activeElement.value.offsetLeft}px`,
+      width: `${activeElement.value.offsetWidth}px`,
+    };
+  });
 };
 
-useResizeObserver(activeElement, () => {
-  if (enableTransition.value || !activeElement.value) updateIndicator();
+useResizeObserver(activeElement, updateIndicator);
+
+// Watch for prop/tabs changes to update indicator position
+watch([() => props.initialActiveTab, () => props.tabs], updateIndicator, {
+  immediate: true,
 });
 
 onMounted(() => {
-  updateIndicator();
   nextTick(() => {
     enableTransition.value = true;
   });
@@ -66,7 +70,7 @@ const showDivider = index => {
 
 <template>
   <div
-    class="relative flex items-center h-8 rounded-lg bg-n-alpha-1 w-fit transition-all duration-200 ease-out has-[button:active]:scale-[1.01]"
+    class="relative flex items-center h-8 rounded-lg bg-n-alpha-1 dark:bg-n-solid-1 w-fit transition-all duration-200 ease-out has-[button:active]:scale-[1.01]"
   >
     <div
       class="absolute rounded-lg bg-n-solid-active shadow-sm pointer-events-none h-8 outline-1 outline outline-n-container inset-y-0"
diff --git a/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue b/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue
index 4b83556de..850ca5f4b 100644
--- a/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue
+++ b/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue
@@ -55,6 +55,7 @@ import {
   getSelectionCoords,
   calculateMenuPosition,
   getEffectiveChannelType,
+  stripUnsupportedFormatting,
 } from 'dashboard/helper/editorHelper';
 import {
   hasPressedEnterAndNotCmdOrShift,
@@ -131,8 +132,10 @@ const editorMenuOptions = computed(() => {
 
 const createState = (content, placeholder, plugins = [], methods = {}) => {
   const schema = editorSchema.value;
+  // Strip unsupported formatting before parsing to prevent "Token type not supported" errors
+  const sanitizedContent = stripUnsupportedFormatting(content, schema);
   return EditorState.create({
-    doc: new MessageMarkdownTransformer(schema).parse(content),
+    doc: new MessageMarkdownTransformer(schema).parse(sanitizedContent),
     plugins: buildEditor({
       schema,
       placeholder,
@@ -859,6 +862,7 @@ useEmitter(BUS_EVENTS.INSERT_INTO_RICH_EDITOR, insertContentIntoEditor);
     max-height: none !important;
     min-height: 0 !important;
     padding: 0 !important;
+    display: none !important;
   }
 
   > .ProseMirror {
diff --git a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
index aa67cda0b..a2e7fe103 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
@@ -7,9 +7,7 @@ import { useTrack } from 'dashboard/composables';
 import keyboardEventListenerMixins from 'shared/mixins/keyboardEventListenerMixins';
 import { FEATURE_FLAGS } from 'dashboard/featureFlags';
 
-import CannedResponse from './CannedResponse.vue';
 import ReplyToMessage from './ReplyToMessage.vue';
-import ResizableTextArea from 'shared/components/ResizableTextArea.vue';
 import AttachmentPreview from 'dashboard/components/widgets/AttachmentsPreview.vue';
 import ReplyTopPanel from 'dashboard/components/widgets/WootWriter/ReplyTopPanel.vue';
 import ReplyEmailHead from './ReplyEmailHead.vue';
@@ -46,7 +44,6 @@ import {
   appendSignature,
   removeSignature,
   getEffectiveChannelType,
-  extractTextFromMarkdown,
 } from 'dashboard/helper/editorHelper';
 
 import { LOCAL_STORAGE_KEYS } from 'dashboard/constants/localStorage';
@@ -72,8 +69,6 @@ export default {
     WhatsappTemplates,
     WootMessageEditor,
     QuotedEmailPreview,
-    ResizableTextArea,
-    CannedResponse,
   },
   mixins: [inboxMixin, fileUploadMixin, keyboardEventListenerMixins],
   props: {
@@ -114,8 +109,6 @@ export default {
       recordingAudioState: '',
       recordingAudioDurationText: '',
       replyType: REPLY_EDITOR_MODES.REPLY,
-      mentionSearchKey: '',
-      hasSlashCommand: false,
       bccEmails: '',
       ccEmails: '',
       toEmails: '',
@@ -148,9 +141,6 @@ export default {
       if (!senderId) return {};
       return this.$store.getters['contacts/getContact'](senderId);
     },
-    isRichEditorEnabled() {
-      return this.isAWebWidgetInbox || this.isAnEmailChannel || this.isAPIInbox;
-    },
     shouldShowReplyToMessage() {
       return (
         this.inReplyTo?.id &&
@@ -409,19 +399,6 @@ export default {
         !!this.quotedEmailText
       );
     },
-    showRichContentEditor() {
-      if (this.isOnPrivateNote || this.isRichEditorEnabled) {
-        return true;
-      }
-
-      return false;
-    },
-    // ensure that the signature is plain text depending on `showRichContentEditor`
-    signatureToApply() {
-      return this.showRichContentEditor
-        ? this.messageSignature
-        : extractTextFromMarkdown(this.messageSignature);
-    },
   },
   watch: {
     currentChat(conversation, oldConversation) {
@@ -464,25 +441,7 @@ export default {
         this.resetRecorderAndClearAttachments();
       }
     },
-    message(updatedMessage) {
-      // Check if the message starts with a slash.
-      const bodyWithoutSignature = removeSignature(
-        updatedMessage,
-        this.signatureToApply
-      );
-      const startsWithSlash = bodyWithoutSignature.startsWith('/');
-
-      // Determine if the user is potentially typing a slash command.
-      // This is true if the message starts with a slash and the rich content editor is not active.
-      this.hasSlashCommand = startsWithSlash && !this.showRichContentEditor;
-      this.showMentions = this.hasSlashCommand;
-
-      // If a slash command is active, extract the command text after the slash.
-      // If not, reset the mentionSearchKey.
-      this.mentionSearchKey = this.hasSlashCommand
-        ? bodyWithoutSignature.substring(1)
-        : '';
-
+    message() {
       // Autosave the current message draft.
       this.doAutoSaveDraft();
     },
@@ -532,20 +491,14 @@ export default {
   methods: {
     handleInsert(article) {
       const { url, title } = article;
-      if (this.isRichEditorEnabled) {
-        // Removing empty lines from the title
-        const lines = title.split('\n');
-        const nonEmptyLines = lines.filter(line => line.trim() !== '');
-        const filteredMarkdown = nonEmptyLines.join(' ');
-        emitter.emit(
-          BUS_EVENTS.INSERT_INTO_RICH_EDITOR,
-          `[${filteredMarkdown}](${url})`
-        );
-      } else {
-        this.addIntoEditor(
-          `${this.$t('CONVERSATION.REPLYBOX.INSERT_READ_MORE')} ${url}`
-        );
-      }
+      // Removing empty lines from the title
+      const lines = title.split('\n');
+      const nonEmptyLines = lines.filter(line => line.trim() !== '');
+      const filteredMarkdown = nonEmptyLines.join(' ');
+      emitter.emit(
+        BUS_EVENTS.INSERT_INTO_RICH_EDITOR,
+        `[${filteredMarkdown}](${url})`
+      );
 
       useTrack(CONVERSATION_EVENTS.INSERT_ARTICLE_LINK);
     },
@@ -614,26 +567,14 @@ export default {
       if (this.isPrivate) {
         return message;
       }
-      if (this.showRichContentEditor) {
-        const effectiveChannelType = getEffectiveChannelType(
-          this.channelType,
-          this.inbox?.medium || ''
-        );
-        return this.sendWithSignature
-          ? appendSignature(
-              message,
-              this.messageSignature,
-              effectiveChannelType
-            )
-          : removeSignature(
-              message,
-              this.messageSignature,
-              effectiveChannelType
-            );
-      }
+
+      const effectiveChannelType = getEffectiveChannelType(
+        this.channelType,
+        this.inbox?.medium || ''
+      );
       return this.sendWithSignature
-        ? appendSignature(message, this.signatureToApply)
-        : removeSignature(message, this.signatureToApply);
+        ? appendSignature(message, this.messageSignature, effectiveChannelType)
+        : removeSignature(message, this.messageSignature, effectiveChannelType);
     },
     removeFromDraft() {
       if (this.conversationIdByRoute) {
@@ -649,7 +590,6 @@ export default {
         Escape: {
           action: () => {
             this.hideEmojiPicker();
-            this.hideMentions();
           },
           allowOnFocusedInput: true,
         },
@@ -694,11 +634,6 @@ export default {
       // Don't handle paste if compose new conversation modal is open
       if (this.newConversationModalActive) return;
 
-      const data = e.clipboardData.files;
-      if (!this.showRichContentEditor && data.length !== 0) {
-        this.$refs.messageInput?.$el?.blur();
-      }
-
       // Filter valid files (non-zero size)
       Array.from(e.clipboardData.files)
         .filter(file => file.size > 0)
@@ -832,19 +767,15 @@ export default {
         // if signature is enabled, append it to the message
         // appendSignature ensures that the signature is not duplicated
         // so we don't need to check if the signature is already present
-        if (this.showRichContentEditor) {
-          const effectiveChannelType = getEffectiveChannelType(
-            this.channelType,
-            this.inbox?.medium || ''
-          );
-          message = appendSignature(
-            message,
-            this.messageSignature,
-            effectiveChannelType
-          );
-        } else {
-          message = appendSignature(message, this.signatureToApply);
-        }
+        const effectiveChannelType = getEffectiveChannelType(
+          this.channelType,
+          this.inbox?.medium || ''
+        );
+        message = appendSignature(
+          message,
+          this.messageSignature,
+          effectiveChannelType
+        );
       }
 
       const updatedMessage = replaceVariablesInMessage({
@@ -868,52 +799,30 @@ export default {
       });
       if (canReply || this.isAWhatsAppChannel || this.isAPIInbox)
         this.replyType = mode;
-      if (this.showRichContentEditor) {
-        if (this.isRecordingAudio) {
-          this.toggleAudioRecorder();
-        }
-        return;
+      if (this.isRecordingAudio) {
+        this.toggleAudioRecorder();
       }
-      this.$nextTick(() => this.$refs.messageInput.focus());
     },
     clearEditorSelection() {
       this.updateEditorSelectionWith = '';
     },
-    insertIntoTextEditor(text, selectionStart, selectionEnd) {
-      const { message } = this;
-      const newMessage =
-        message.slice(0, selectionStart) +
-        text +
-        message.slice(selectionEnd, message.length);
-      this.message = newMessage;
-    },
     addIntoEditor(content) {
-      if (this.showRichContentEditor) {
-        this.updateEditorSelectionWith = content;
-        this.onFocus();
-      }
-      if (!this.showRichContentEditor) {
-        const { selectionStart, selectionEnd } = this.$refs.messageInput.$el;
-        this.insertIntoTextEditor(content, selectionStart, selectionEnd);
-      }
+      this.updateEditorSelectionWith = content;
+      this.onFocus();
     },
     clearMessage() {
       this.message = '';
       if (this.sendWithSignature && !this.isPrivate) {
         // if signature is enabled, append it to the message
-        if (this.showRichContentEditor) {
-          const effectiveChannelType = getEffectiveChannelType(
-            this.channelType,
-            this.inbox?.medium || ''
-          );
-          this.message = appendSignature(
-            this.message,
-            this.messageSignature,
-            effectiveChannelType
-          );
-        } else {
-          this.message = appendSignature(this.message, this.signatureToApply);
-        }
+        const effectiveChannelType = getEffectiveChannelType(
+          this.channelType,
+          this.inbox?.medium || ''
+        );
+        this.message = appendSignature(
+          this.message,
+          this.messageSignature,
+          effectiveChannelType
+        );
       }
       this.attachedFiles = [];
       this.isRecordingAudio = false;
@@ -948,9 +857,6 @@ export default {
         this.toggleEmojiPicker();
       }
     },
-    hideMentions() {
-      this.showMentions = false;
-    },
     onTypingOn() {
       this.toggleTyping('on');
     },
@@ -1197,13 +1103,6 @@ export default {
         :message="inReplyTo"
         @dismiss="resetReplyToMessage"
       />
-      <CannedResponse
-        v-if="showMentions && hasSlashCommand"
-        v-on-clickaway="hideMentions"
-        class="normal-editor__canned-box"
-        :search-key="mentionSearchKey"
-        @replace="replaceText"
-      />
       <EmojiInput
         v-if="showEmojiPicker"
         v-on-clickaway="hideEmojiPicker"
@@ -1227,23 +1126,7 @@ export default {
         @play="recordingAudioState = 'playing'"
         @pause="recordingAudioState = 'paused'"
       />
-      <ResizableTextArea
-        v-else-if="!showRichContentEditor"
-        ref="messageInput"
-        v-model="message"
-        class="rounded-none input"
-        :placeholder="messagePlaceHolder"
-        :min-height="4"
-        :signature="signatureToApply"
-        allow-signature
-        :send-with-signature="sendWithSignature"
-        @typing-off="onTypingOff"
-        @typing-on="onTypingOn"
-        @focus="onFocus"
-        @blur="onBlur"
-      />
       <WootMessageEditor
-        v-else
         v-model="message"
         :editor-id="editorStateId"
         class="input popover-prosemirror-menu"
@@ -1369,10 +1252,6 @@ export default {
 
 .reply-box__top {
   @apply relative py-0 px-4 -mt-px;
-
-  textarea {
-    @apply shadow-none outline-none border-transparent bg-transparent m-0 max-h-60 min-h-[3rem] pt-4 pb-0 px-0 resize-none;
-  }
 }
 
 .emoji-dialog {
@@ -1392,9 +1271,4 @@ export default {
     @apply ltr:left-1 rtl:right-1 -bottom-2;
   }
 }
-
-.normal-editor__canned-box {
-  width: calc(100% - 2 * 1rem);
-  left: 1rem;
-}
 </style>
diff --git a/app/javascript/dashboard/components/widgets/mentions/MentionBox.vue b/app/javascript/dashboard/components/widgets/mentions/MentionBox.vue
index 999ec758d..dc00bdb4c 100644
--- a/app/javascript/dashboard/components/widgets/mentions/MentionBox.vue
+++ b/app/javascript/dashboard/components/widgets/mentions/MentionBox.vue
@@ -1,6 +1,7 @@
 <script setup>
 import { ref, watch, computed, nextTick } from 'vue';
 import { useKeyboardNavigableList } from 'dashboard/composables/useKeyboardNavigableList';
+import { useMessageFormatter } from 'shared/composables/useMessageFormatter';
 
 const props = defineProps({
   items: {
@@ -15,6 +16,8 @@ const props = defineProps({
 
 const emit = defineEmits(['mentionSelect']);
 
+const { getPlainText } = useMessageFormatter();
+
 const mentionsListContainerRef = ref(null);
 const selectedIndex = ref(0);
 
@@ -94,7 +97,7 @@ const variableKey = (item = {}) => {
                 'text-n-slate-12': index === selectedIndex,
               }"
             >
-              {{ item.description }}
+              {{ getPlainText(item.description) }}
             </p>
             <p
               class="max-w-full min-w-0 mb-0 overflow-hidden text-xs text-n-slate-11 group-hover:text-n-slate-12 text-ellipsis whitespace-nowrap"
diff --git a/app/javascript/dashboard/composables/spec/useTranslations.spec.js b/app/javascript/dashboard/composables/spec/useTranslations.spec.js
index c7ed3cb88..7f8e29bc5 100644
--- a/app/javascript/dashboard/composables/spec/useTranslations.spec.js
+++ b/app/javascript/dashboard/composables/spec/useTranslations.spec.js
@@ -1,39 +1,31 @@
-import { ref } from 'vue';
-import { useTranslations } from '../useTranslations';
+import { selectTranslation } from '../useTranslations';
 
-describe('useTranslations', () => {
-  it('returns false and null when contentAttributes is null', () => {
-    const contentAttributes = ref(null);
-    const { hasTranslations, translationContent } =
-      useTranslations(contentAttributes);
-    expect(hasTranslations.value).toBe(false);
-    expect(translationContent.value).toBeNull();
+describe('selectTranslation', () => {
+  it('returns null when translations is null', () => {
+    expect(selectTranslation(null, 'en', 'en')).toBeNull();
   });
 
-  it('returns false and null when translations are missing', () => {
-    const contentAttributes = ref({});
-    const { hasTranslations, translationContent } =
-      useTranslations(contentAttributes);
-    expect(hasTranslations.value).toBe(false);
-    expect(translationContent.value).toBeNull();
+  it('returns null when translations is empty', () => {
+    expect(selectTranslation({}, 'en', 'en')).toBeNull();
   });
 
-  it('returns false and null when translations is an empty object', () => {
-    const contentAttributes = ref({ translations: {} });
-    const { hasTranslations, translationContent } =
-      useTranslations(contentAttributes);
-    expect(hasTranslations.value).toBe(false);
-    expect(translationContent.value).toBeNull();
+  it('returns first translation when no locale matches', () => {
+    const translations = { en: 'Hello', es: 'Hola' };
+    expect(selectTranslation(translations, 'fr', 'de')).toBe('Hello');
   });
 
-  it('returns true and correct translation content when translations exist', () => {
-    const contentAttributes = ref({
-      translations: { en: 'Hello' },
-    });
-    const { hasTranslations, translationContent } =
-      useTranslations(contentAttributes);
-    expect(hasTranslations.value).toBe(true);
-    // Should return the first translation (en: 'Hello')
-    expect(translationContent.value).toBe('Hello');
+  it('returns translation matching agent locale', () => {
+    const translations = { en: 'Hello', es: 'Hola', zh_CN: '你好' };
+    expect(selectTranslation(translations, 'es', 'en')).toBe('Hola');
+  });
+
+  it('falls back to account locale when agent locale not found', () => {
+    const translations = { en: 'Hello', zh_CN: '你好' };
+    expect(selectTranslation(translations, 'fr', 'zh_CN')).toBe('你好');
+  });
+
+  it('returns first translation when both locales are undefined', () => {
+    const translations = { en: 'Hello', es: 'Hola' };
+    expect(selectTranslation(translations, undefined, undefined)).toBe('Hello');
   });
 });
diff --git a/app/javascript/dashboard/composables/useTranslations.js b/app/javascript/dashboard/composables/useTranslations.js
index 0b18ea3da..5be0c011f 100644
--- a/app/javascript/dashboard/composables/useTranslations.js
+++ b/app/javascript/dashboard/composables/useTranslations.js
@@ -1,4 +1,25 @@
 import { computed } from 'vue';
+import { useUISettings } from './useUISettings';
+import { useAccount } from './useAccount';
+
+/**
+ * Select translation based on locale priority.
+ * @param {Object} translations - Translations object with locale keys
+ * @param {string} agentLocale - Agent's preferred locale
+ * @param {string} accountLocale - Account's default locale
+ * @returns {string|null} Selected translation or null
+ */
+export function selectTranslation(translations, agentLocale, accountLocale) {
+  if (!translations || Object.keys(translations).length === 0) return null;
+
+  if (agentLocale && translations[agentLocale]) {
+    return translations[agentLocale];
+  }
+  if (accountLocale && translations[accountLocale]) {
+    return translations[accountLocale];
+  }
+  return translations[Object.keys(translations)[0]];
+}
 
 /**
  * Composable to extract translation state/content from contentAttributes.
@@ -6,6 +27,9 @@ import { computed } from 'vue';
  * @returns {Object} { hasTranslations, translationContent }
  */
 export function useTranslations(contentAttributes) {
+  const { uiSettings } = useUISettings();
+  const { currentAccount } = useAccount();
+
   const hasTranslations = computed(() => {
     if (!contentAttributes.value) return false;
     const { translations = {} } = contentAttributes.value;
@@ -14,8 +38,11 @@ export function useTranslations(contentAttributes) {
 
   const translationContent = computed(() => {
     if (!hasTranslations.value) return null;
-    const translations = contentAttributes.value.translations;
-    return translations[Object.keys(translations)[0]];
+    return selectTranslation(
+      contentAttributes.value.translations,
+      uiSettings.value?.locale,
+      currentAccount.value?.locale
+    );
   });
 
   return { hasTranslations, translationContent };
diff --git a/app/javascript/dashboard/constants/editor.js b/app/javascript/dashboard/constants/editor.js
index a1e4da28d..2aa98477e 100644
--- a/app/javascript/dashboard/constants/editor.js
+++ b/app/javascript/dashboard/constants/editor.js
@@ -140,6 +140,11 @@ export const FORMATTING = {
     nodes: [],
     menu: ['strong', 'em', 'link', 'undo', 'redo'],
   },
+  'Context::Plain': {
+    marks: [],
+    nodes: [],
+    menu: [],
+  },
 };
 
 // Editor menu options for Full Editor
@@ -232,8 +237,12 @@ export const MARKDOWN_PATTERNS = [
     patterns: [{ pattern: /`([^`]+)`/g, replacement: '$1' }],
   },
   {
-    type: 'link', // PM: link, eg: [text](url)
-    patterns: [{ pattern: /\[([^\]]+)\]\([^)]+\)/g, replacement: '$1' }],
+    type: 'link', // PM: link
+    patterns: [
+      { pattern: /\[([^\]]+)\]\([^)]+\)/g, replacement: '$1' }, // [text](url) -> text
+      { pattern: /<([a-zA-Z][a-zA-Z0-9+.-]*:[^\s>]+)>/g, replacement: '$1' }, // <https://...>, <mailto:...>, <tel:...>, <ftp://...>, etc
+      { pattern: /<([^\s@]+@[^\s@>]+)>/g, replacement: '$1' }, // <user@example.com> -> user@example.com
+    ],
   },
 ];
 
diff --git a/app/javascript/dashboard/constants/localStorage.js b/app/javascript/dashboard/constants/localStorage.js
index ee6a4357a..32eb9b23b 100644
--- a/app/javascript/dashboard/constants/localStorage.js
+++ b/app/javascript/dashboard/constants/localStorage.js
@@ -5,4 +5,5 @@ export const LOCAL_STORAGE_KEYS = {
   COLOR_SCHEME: 'color_scheme',
   DISMISSED_LABEL_SUGGESTIONS: 'labelSuggestionsDismissed',
   MESSAGE_REPLY_TO: 'messageReplyTo',
+  RECENT_SEARCHES: 'recentSearches',
 };
diff --git a/app/javascript/dashboard/featureFlags.js b/app/javascript/dashboard/featureFlags.js
index 803f88de3..479340ede 100644
--- a/app/javascript/dashboard/featureFlags.js
+++ b/app/javascript/dashboard/featureFlags.js
@@ -43,6 +43,7 @@ export const FEATURE_FLAGS = {
   SAML: 'saml',
   QUOTED_EMAIL_REPLY: 'quoted_email_reply',
   COMPANIES: 'companies',
+  ADVANCED_SEARCH: 'advanced_search',
 };
 
 export const PREMIUM_FEATURES = [
diff --git a/app/javascript/dashboard/helper/AnalyticsHelper/index.js b/app/javascript/dashboard/helper/AnalyticsHelper/index.js
index ba3b5c7e6..e4392f473 100644
--- a/app/javascript/dashboard/helper/AnalyticsHelper/index.js
+++ b/app/javascript/dashboard/helper/AnalyticsHelper/index.js
@@ -1,4 +1,4 @@
-import posthog from 'posthog-js';
+import * as amplitude from '@amplitude/analytics-browser';
 
 /**
  * AnalyticsHelper class to initialize and track user analytics
@@ -26,12 +26,10 @@ export class AnalyticsHelper {
       return;
     }
 
-    posthog.init(this.analyticsToken, {
-      api_host: 'https://app.posthog.com',
-      capture_pageview: false,
-      persistence: 'localStorage+cookie',
+    amplitude.init(this.analyticsToken, {
+      defaultTracking: false,
     });
-    this.analytics = posthog;
+    this.analytics = amplitude;
   }
 
   /**
@@ -45,20 +43,26 @@ export class AnalyticsHelper {
     }
 
     this.user = user;
-    this.analytics.identify(this.user.id.toString(), {
-      email: this.user.email,
-      name: this.user.name,
-      avatar: this.user.avatar_url,
-    });
+    this.analytics.setUserId(`user-${this.user.id.toString()}`);
+
+    const identifyEvent = new amplitude.Identify();
+    identifyEvent.set('email', this.user.email);
+    identifyEvent.set('name', this.user.name);
+    identifyEvent.set('avatar', this.user.avatar_url);
+    this.analytics.identify(identifyEvent);
 
     const { accounts, account_id: accountId } = this.user;
     const [currentAccount] = accounts.filter(
       account => account.id === accountId
     );
     if (currentAccount) {
-      this.analytics.group('company', currentAccount.id.toString(), {
-        name: currentAccount.name,
-      });
+      const groupId = `account-${currentAccount.id.toString()}`;
+
+      this.analytics.setGroup('company', groupId);
+
+      const groupIdentify = new amplitude.Identify();
+      groupIdentify.set('name', currentAccount.name);
+      this.analytics.groupIdentify('company', groupId, groupIdentify);
     }
   }
 
@@ -72,20 +76,21 @@ export class AnalyticsHelper {
     if (!this.analytics) {
       return;
     }
-    this.analytics.capture(eventName, properties);
+    this.analytics.track(eventName, properties);
   }
 
   /**
    * Track the page views
    * @function
-   * @param {Object} params - Page view properties
+   * @param {string} pageName - Page name
+   * @param {Object} [properties={}] - Page view properties
    */
-  page(params) {
+  page(pageName, properties = {}) {
     if (!this.analytics) {
       return;
     }
 
-    this.analytics.capture('$pageview', params);
+    this.analytics.track('$pageview', { pageName, ...properties });
   }
 }
 
diff --git a/app/javascript/dashboard/helper/AnalyticsHelper/specs/helper.spec.js b/app/javascript/dashboard/helper/AnalyticsHelper/specs/helper.spec.js
index dacf7a5e0..da8553779 100644
--- a/app/javascript/dashboard/helper/AnalyticsHelper/specs/helper.spec.js
+++ b/app/javascript/dashboard/helper/AnalyticsHelper/specs/helper.spec.js
@@ -1,12 +1,15 @@
 import helperObject, { AnalyticsHelper } from '../';
 
-vi.mock('posthog-js', () => ({
-  default: {
-    init: vi.fn(),
-    identify: vi.fn(),
-    capture: vi.fn(),
-    group: vi.fn(),
-  },
+vi.mock('@amplitude/analytics-browser', () => ({
+  init: vi.fn(),
+  setUserId: vi.fn(),
+  identify: vi.fn(),
+  setGroup: vi.fn(),
+  groupIdentify: vi.fn(),
+  track: vi.fn(),
+  Identify: vi.fn(() => ({
+    set: vi.fn(),
+  })),
 }));
 
 describe('helperObject', () => {
@@ -22,12 +25,12 @@ describe('AnalyticsHelper', () => {
   });
 
   describe('init', () => {
-    it('should initialize posthog with the correct token', async () => {
+    it('should initialize amplitude with the correct token', async () => {
       await analyticsHelper.init();
       expect(analyticsHelper.analytics).not.toBe(null);
     });
 
-    it('should not initialize posthog if token is not provided', async () => {
+    it('should not initialize amplitude if token is not provided', async () => {
       analyticsHelper = new AnalyticsHelper();
       await analyticsHelper.init();
       expect(analyticsHelper.analytics).toBe(null);
@@ -36,10 +39,15 @@ describe('AnalyticsHelper', () => {
 
   describe('identify', () => {
     beforeEach(() => {
-      analyticsHelper.analytics = { identify: vi.fn(), group: vi.fn() };
+      analyticsHelper.analytics = {
+        setUserId: vi.fn(),
+        identify: vi.fn(),
+        setGroup: vi.fn(),
+        groupIdentify: vi.fn(),
+      };
     });
 
-    it('should call identify on posthog with correct arguments', () => {
+    it('should call setUserId and identify on amplitude with correct arguments', () => {
       analyticsHelper.identify({
         id: 123,
         email: 'test@example.com',
@@ -49,19 +57,18 @@ describe('AnalyticsHelper', () => {
         account_id: 1,
       });
 
-      expect(analyticsHelper.analytics.identify).toHaveBeenCalledWith('123', {
-        email: 'test@example.com',
-        name: 'Test User',
-        avatar: 'avatar_url',
-      });
-      expect(analyticsHelper.analytics.group).toHaveBeenCalledWith(
-        'company',
-        '1',
-        { name: 'Account 1' }
+      expect(analyticsHelper.analytics.setUserId).toHaveBeenCalledWith(
+        'user-123'
       );
+      expect(analyticsHelper.analytics.identify).toHaveBeenCalled();
+      expect(analyticsHelper.analytics.setGroup).toHaveBeenCalledWith(
+        'company',
+        'account-1'
+      );
+      expect(analyticsHelper.analytics.groupIdentify).toHaveBeenCalled();
     });
 
-    it('should call identify on posthog without group', () => {
+    it('should call identify on amplitude without group', () => {
       analyticsHelper.identify({
         id: 123,
         email: 'test@example.com',
@@ -71,10 +78,10 @@ describe('AnalyticsHelper', () => {
         account_id: 5,
       });
 
-      expect(analyticsHelper.analytics.group).not.toHaveBeenCalled();
+      expect(analyticsHelper.analytics.setGroup).not.toHaveBeenCalled();
     });
 
-    it('should not call analytics.page if analytics is null', () => {
+    it('should not call analytics methods if analytics is null', () => {
       analyticsHelper.analytics = null;
       analyticsHelper.identify({});
       expect(analyticsHelper.analytics).toBe(null);
@@ -83,27 +90,27 @@ describe('AnalyticsHelper', () => {
 
   describe('track', () => {
     beforeEach(() => {
-      analyticsHelper.analytics = { capture: vi.fn() };
+      analyticsHelper.analytics = { track: vi.fn() };
       analyticsHelper.user = { id: 123 };
     });
 
-    it('should call capture on posthog with correct arguments', () => {
+    it('should call track on amplitude with correct arguments', () => {
       analyticsHelper.track('Test Event', { prop1: 'value1', prop2: 'value2' });
-      expect(analyticsHelper.analytics.capture).toHaveBeenCalledWith(
+      expect(analyticsHelper.analytics.track).toHaveBeenCalledWith(
         'Test Event',
         { prop1: 'value1', prop2: 'value2' }
       );
     });
 
-    it('should call capture on posthog with default properties', () => {
+    it('should call track on amplitude with default properties', () => {
       analyticsHelper.track('Test Event');
-      expect(analyticsHelper.analytics.capture).toHaveBeenCalledWith(
+      expect(analyticsHelper.analytics.track).toHaveBeenCalledWith(
         'Test Event',
         {}
       );
     });
 
-    it('should not call capture on posthog if analytics is not initialized', () => {
+    it('should not call track on amplitude if analytics is not initialized', () => {
       analyticsHelper.analytics = null;
       analyticsHelper.track('Test Event', { prop1: 'value1', prop2: 'value2' });
       expect(analyticsHelper.analytics).toBe(null);
@@ -112,24 +119,25 @@ describe('AnalyticsHelper', () => {
 
   describe('page', () => {
     beforeEach(() => {
-      analyticsHelper.analytics = { capture: vi.fn() };
+      analyticsHelper.analytics = { track: vi.fn() };
     });
 
-    it('should call the capture method for pageview with the correct arguments', () => {
-      const params = {
-        name: 'Test page',
-        url: '/test',
+    it('should call the track method for pageview with the correct arguments', () => {
+      const pageName = 'home';
+      const properties = {
+        path: '/test',
+        name: 'home',
       };
-      analyticsHelper.page(params);
-      expect(analyticsHelper.analytics.capture).toHaveBeenCalledWith(
+      analyticsHelper.page(pageName, properties);
+      expect(analyticsHelper.analytics.track).toHaveBeenCalledWith(
         '$pageview',
-        params
+        { pageName: 'home', path: '/test', name: 'home' }
       );
     });
 
-    it('should not call analytics.capture if analytics is null', () => {
+    it('should not call analytics.track if analytics is null', () => {
       analyticsHelper.analytics = null;
-      analyticsHelper.page();
+      analyticsHelper.page('home');
       expect(analyticsHelper.analytics).toBe(null);
     });
   });
diff --git a/app/javascript/dashboard/helper/editorHelper.js b/app/javascript/dashboard/helper/editorHelper.js
index 1d8a97186..e126a2766 100644
--- a/app/javascript/dashboard/helper/editorHelper.js
+++ b/app/javascript/dashboard/helper/editorHelper.js
@@ -34,6 +34,7 @@ export function extractTextFromMarkdown(markdown) {
 
 /**
  * Strip unsupported markdown formatting based on channel capabilities.
+ * Uses MARKDOWN_PATTERNS from editor constants.
  *
  * @param {string} markdown - markdown text to process
  * @param {string} channelType - The channel type to check supported formatting
@@ -43,35 +44,16 @@ export function stripUnsupportedSignatureMarkdown(markdown, channelType) {
   if (!markdown) return '';
 
   const { marks = [], nodes = [] } = FORMATTING[channelType] || {};
-  const has = (arr, key) => arr.includes(key);
+  const supported = [...marks, ...nodes];
 
-  // Define stripping rules: [condition, pattern, replacement]
-  const rules = [
-    [!has(nodes, 'image'), /!\[.*?\]\(.*?\)/g, ''],
-    [!has(marks, 'link'), /\[([^\]]+)\]\([^)]+\)/g, '$1'],
-    [!has(nodes, 'codeBlock'), /```[\s\S]*?```/g, ''],
-    [!has(marks, 'code'), /`([^`]+)`/g, '$1'],
-    [!has(marks, 'strong'), /\*\*([^*]+)\*\*/g, '$1'],
-    [!has(marks, 'strong'), /__([^_]+)__/g, '$1'],
-    [!has(marks, 'em'), /\*([^*]+)\*/g, '$1'],
-    // Match _text_ only at word boundaries (whitespace/string start/end)
-    // Preserves underscores in URLs (e.g., https://example.com/path_name) and variable names
-    [
-      !has(marks, 'em'),
-      /(?<=^|[\s])_([^_\s][^_]*[^_\s]|[^_\s])_(?=$|[\s])/g,
-      '$1',
-    ],
-    [!has(marks, 'strike'), /~~([^~]+)~~/g, '$1'],
-    [!has(nodes, 'blockquote'), /^>\s?/gm, ''],
-    [!has(nodes, 'bulletList'), /^[-*+]\s+/gm, ''],
-    [!has(nodes, 'orderedList'), /^\d+\.\s+/gm, ''],
-  ];
-
-  const result = rules.reduce(
-    (text, [shouldStrip, pattern, replacement]) =>
-      shouldStrip ? text.replace(pattern, replacement) : text,
-    markdown
-  );
+  // Apply patterns from MARKDOWN_PATTERNS for unsupported types
+  const result = MARKDOWN_PATTERNS.reduce((text, { type, patterns }) => {
+    if (supported.includes(type)) return text;
+    return patterns.reduce(
+      (t, { pattern, replacement }) => t.replace(pattern, replacement),
+      text
+    );
+  }, markdown);
 
   return result
     .split('\n')
@@ -186,27 +168,22 @@ export function appendSignature(body, signature, channelType) {
 
 /**
  * Removes the signature from the body, along with the signature delimiter.
- * Tries to find both the original signature and the stripped version.
+ * Tries multiple signature variants: original, channel-stripped, and fully stripped.
  *
  * @param {string} body - The body to remove the signature from.
  * @param {string} signature - The signature to remove.
  * @param {string} channelType - Optional. The effective channel type for channel-specific stripping.
- *                               For Twilio channels, pass the result of getEffectiveChannelType().
  * @returns {string} - The body with the signature removed.
  */
 export function removeSignature(body, signature, channelType) {
-  // Build list of signatures to try: original, channel-stripped, and fully stripped
-  const cleanedSignature = cleanSignature(signature);
+  // Build unique list of signature variants to try
   const channelStripped = channelType
     ? cleanSignature(stripUnsupportedSignatureMarkdown(signature, channelType))
     : null;
-  const fullyStripped = cleanSignature(extractTextFromMarkdown(signature));
-
-  // Try signatures in order: original → channel-specific → fully stripped
   const signaturesToTry = [
-    cleanedSignature,
+    cleanSignature(signature),
     channelStripped,
-    fullyStripped,
+    cleanSignature(extractTextFromMarkdown(signature)),
   ].filter((sig, i, arr) => sig && arr.indexOf(sig) === i); // Remove nulls and duplicates
 
   // Find the first matching signature
@@ -225,17 +202,12 @@ export function removeSignature(body, signature, channelType) {
     newBody = newBody.substring(0, signatureIndex).trimEnd();
   }
 
-  // let's find the delimiter and remove it
-  const delimiterIndex = newBody.lastIndexOf(SIGNATURE_DELIMITER);
-  if (
-    delimiterIndex !== -1 &&
-    delimiterIndex === newBody.length - SIGNATURE_DELIMITER.length // this will ensure the delimiter is at the end
-  ) {
+  // Remove delimiter if it's at the end
+  if (newBody.endsWith(SIGNATURE_DELIMITER)) {
     // if the delimiter is at the end, remove it
-    newBody = newBody.substring(0, delimiterIndex);
+    newBody = newBody.slice(0, -SIGNATURE_DELIMITER.length);
   }
 
-  // return the value
   return newBody;
 }
 
diff --git a/app/javascript/dashboard/helper/specs/editorHelper.spec.js b/app/javascript/dashboard/helper/specs/editorHelper.spec.js
index 1ae765ca7..abbef420f 100644
--- a/app/javascript/dashboard/helper/specs/editorHelper.spec.js
+++ b/app/javascript/dashboard/helper/specs/editorHelper.spec.js
@@ -896,6 +896,22 @@ describe('stripUnsupportedFormatting', () => {
       expect(stripUnsupportedFormatting(content, fullSchema)).toBe(content);
     });
 
+    it('preserves autolinks when schema supports links', () => {
+      const content = 'Check out <https://cegrafic.com/catalogo/>';
+      expect(stripUnsupportedFormatting(content, fullSchema)).toBe(content);
+    });
+
+    it('preserves various URI scheme autolinks', () => {
+      const content =
+        'Email <mailto:user@example.com> or call <tel:+1234567890>';
+      expect(stripUnsupportedFormatting(content, fullSchema)).toBe(content);
+    });
+
+    it('preserves email autolinks', () => {
+      const content = 'Contact us at <support@chatwoot.com>';
+      expect(stripUnsupportedFormatting(content, fullSchema)).toBe(content);
+    });
+
     it('preserves lists when schema supports them', () => {
       const content = '- item 1\n- item 2\n1. first\n2. second';
       expect(stripUnsupportedFormatting(content, fullSchema)).toBe(content);
@@ -967,6 +983,38 @@ describe('stripUnsupportedFormatting', () => {
       ).toBe('Check this link');
     });
 
+    it('converts autolinks to plain URLs when schema does not support links', () => {
+      const content = 'Visit <https://cegrafic.com/catalogo/> for more info';
+      const expected = 'Visit https://cegrafic.com/catalogo/ for more info';
+      expect(stripUnsupportedFormatting(content, emptySchema)).toBe(expected);
+    });
+
+    it('handles multiple autolinks in content', () => {
+      const content = 'Check <https://example.com> and <https://test.com>';
+      const expected = 'Check https://example.com and https://test.com';
+      expect(stripUnsupportedFormatting(content, emptySchema)).toBe(expected);
+    });
+
+    it('converts URI scheme autolinks to plain text', () => {
+      const content =
+        'Email <mailto:support@example.com> or call <tel:+1234567890>';
+      const expected =
+        'Email mailto:support@example.com or call tel:+1234567890';
+      expect(stripUnsupportedFormatting(content, emptySchema)).toBe(expected);
+    });
+
+    it('converts email autolinks to plain text', () => {
+      const content = 'Reach us at <admin@chatwoot.com> for help';
+      const expected = 'Reach us at admin@chatwoot.com for help';
+      expect(stripUnsupportedFormatting(content, emptySchema)).toBe(expected);
+    });
+
+    it('handles mixed autolink types', () => {
+      const content = 'Visit <https://example.com> or email <info@example.com>';
+      const expected = 'Visit https://example.com or email info@example.com';
+      expect(stripUnsupportedFormatting(content, emptySchema)).toBe(expected);
+    });
+
     it('strips bullet list markers', () => {
       expect(
         stripUnsupportedFormatting('- item 1\n- item 2', emptySchema)
diff --git a/app/javascript/dashboard/i18n/locale/am/companies.json b/app/javascript/dashboard/i18n/locale/am/companies.json
index 86190831b..0d64a4abd 100644
--- a/app/javascript/dashboard/i18n/locale/am/companies.json
+++ b/app/javascript/dashboard/i18n/locale/am/companies.json
@@ -6,7 +6,8 @@
       "OPTIONS": {
         "NAME": "Name",
         "DOMAIN": "Domain",
-        "CREATED_AT": "Created at"
+        "CREATED_AT": "Created at",
+        "CONTACTS_COUNT": "Contacts count"
       }
     },
     "ORDER": {
diff --git a/app/javascript/dashboard/i18n/locale/am/contentTemplates.json b/app/javascript/dashboard/i18n/locale/am/contentTemplates.json
index a9b1d54c4..79c2c8c64 100644
--- a/app/javascript/dashboard/i18n/locale/am/contentTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/am/contentTemplates.json
@@ -28,6 +28,7 @@
       "TYPES": {
         "MEDIA": "Media",
         "QUICK_REPLY": "Quick Reply",
+        "CALL_TO_ACTION": "Call to Action",
         "TEXT": "Text"
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/am/conversation.json b/app/javascript/dashboard/i18n/locale/am/conversation.json
index da9539c9c..f82d4ba23 100644
--- a/app/javascript/dashboard/i18n/locale/am/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/am/conversation.json
@@ -275,6 +275,16 @@
     "SIDEBAR": {
       "CONTACT": "Contact",
       "COPILOT": "Copilot"
+    },
+    "VOICE_WIDGET": {
+      "INCOMING_CALL": "Incoming call",
+      "OUTGOING_CALL": "Outgoing call",
+      "CALL_IN_PROGRESS": "Call in progress",
+      "NOT_ANSWERED_YET": "Not answered yet",
+      "HANDLED_IN_ANOTHER_TAB": "Being handled in another tab",
+      "REJECT_CALL": "Reject",
+      "JOIN_CALL": "Join call",
+      "END_CALL": "End call"
     }
   },
   "EMAIL_TRANSCRIPT": {
diff --git a/app/javascript/dashboard/i18n/locale/am/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/am/inboxMgmt.json
index 1314733fa..2efba4716 100644
--- a/app/javascript/dashboard/i18n/locale/am/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/am/inboxMgmt.json
@@ -808,6 +808,35 @@
         "LABEL": "Message",
         "PLACEHOLDER": "Please enter a message to show users with the form"
       },
+      "BUTTON_TEXT": {
+        "LABEL": "Button text",
+        "PLACEHOLDER": "Please rate us"
+      },
+      "LANGUAGE": {
+        "LABEL": "Language",
+        "PLACEHOLDER": "Select template language"
+      },
+      "MESSAGE_PREVIEW": {
+        "LABEL": "Message preview",
+        "TOOLTIP": "This may vary slightly when rendered on WhatsApp's platform."
+      },
+      "TEMPLATE_STATUS": {
+        "APPROVED": "Approved by WhatsApp",
+        "PENDING": "Pending WhatsApp approval",
+        "REJECTED": "Meta rejected the template",
+        "DEFAULT": "Needs WhatsApp approval",
+        "NOT_FOUND": "The template does not exist in the Meta platform."
+      },
+      "TEMPLATE_CREATION": {
+        "SUCCESS_MESSAGE": "WhatsApp template created successfully and sent for approval",
+        "ERROR_MESSAGE": "Failed to create WhatsApp template"
+      },
+      "TEMPLATE_UPDATE_DIALOG": {
+        "TITLE": "Edit survey details",
+        "DESCRIPTION": "We will delete the previous template and make a new one which will be sent again for WhatsApp approval",
+        "CONFIRM": "Create new template",
+        "CANCEL": "Go back"
+      },
       "SURVEY_RULE": {
         "LABEL": "Survey rule",
         "DESCRIPTION_PREFIX": "Send the survey if the conversation",
@@ -819,6 +848,7 @@
         "SELECT_PLACEHOLDER": "select labels"
       },
       "NOTE": "Note: CSAT surveys are sent only once per conversation",
+      "WHATSAPP_NOTE": "Note: We will create a template and send it for WhatsApp approval. After being approved, surveys will be sent only once per conversation as per the survey rule.",
       "API": {
         "SUCCESS_MESSAGE": "CSAT settings updated successfully",
         "ERROR_MESSAGE": "We couldn't update CSAT settings. Please try again later."
diff --git a/app/javascript/dashboard/i18n/locale/am/search.json b/app/javascript/dashboard/i18n/locale/am/search.json
index e8510ab97..2fc8e7998 100644
--- a/app/javascript/dashboard/i18n/locale/am/search.json
+++ b/app/javascript/dashboard/i18n/locale/am/search.json
@@ -1,7 +1,7 @@
 {
   "SEARCH": {
     "TABS": {
-      "ALL": "All",
+      "ALL": "All results",
       "CONTACTS": "Contacts",
       "CONVERSATIONS": "Conversations",
       "MESSAGES": "Messages",
@@ -19,14 +19,50 @@
     "LOADING_DATA": "Loading",
     "EMPTY_STATE": "No {item} found for query '{query}'",
     "EMPTY_STATE_FULL": "No results found for query '{query}'",
-    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "PLACEHOLDER_KEYBINDING": "/to focus",
     "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "RECENT_SEARCHES": "Recent searches",
+    "CLEAR_ALL": "Clear all",
+    "MOST_RECENT": "Most recent",
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
+    "READ_LESS": "Read less",
     "WROTE": "wrote:",
-    "FROM": "from",
-    "EMAIL": "email",
-    "EMAIL_SUBJECT": "subject"
+    "FROM": "From",
+    "EMAIL": "Email",
+    "EMAIL_SUBJECT": "Subject",
+    "PRIVATE": "Private note",
+    "TRANSCRIPT": "Transcript",
+    "CREATED_AT": "created {time}",
+    "UPDATED_AT": "updated {time}",
+    "SORT_BY": {
+      "RELEVANCE": "Relevance"
+    },
+    "DATE_RANGE": {
+      "LAST_7_DAYS": "Last 7 days",
+      "LAST_30_DAYS": "Last 30 days",
+      "LAST_60_DAYS": "Last 60 days",
+      "LAST_90_DAYS": "Last 90 days",
+      "CUSTOM_RANGE": "Custom range:",
+      "CREATED_BETWEEN": "Created between",
+      "AND": "and",
+      "APPLY": "Apply",
+      "BEFORE_DATE": "Before {date}",
+      "AFTER_DATE": "After {date}",
+      "TIME_RANGE": "Filter by time",
+      "CLEAR_FILTER": "Clear filter"
+    },
+    "FILTERS": {
+      "FILTER_MESSAGE": "Filter messages by:",
+      "FROM": "Sender",
+      "IN": "Inbox",
+      "AGENTS": "Agents",
+      "CONTACTS": "Contacts",
+      "INBOXES": "Inboxes",
+      "NO_AGENTS": "No agents found",
+      "NO_CONTACTS": "Start by searching to see results",
+      "NO_INBOXES": "No inboxes found"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ar/companies.json b/app/javascript/dashboard/i18n/locale/ar/companies.json
index 5c8beeba1..95a078caa 100644
--- a/app/javascript/dashboard/i18n/locale/ar/companies.json
+++ b/app/javascript/dashboard/i18n/locale/ar/companies.json
@@ -6,7 +6,8 @@
       "OPTIONS": {
         "NAME": "الاسم",
         "DOMAIN": "النطاق",
-        "CREATED_AT": "تم إنشاؤها في"
+        "CREATED_AT": "تم إنشاؤها في",
+        "CONTACTS_COUNT": "Contacts count"
       }
     },
     "ORDER": {
diff --git a/app/javascript/dashboard/i18n/locale/ar/contentTemplates.json b/app/javascript/dashboard/i18n/locale/ar/contentTemplates.json
index cdb8b3968..b2d99891d 100644
--- a/app/javascript/dashboard/i18n/locale/ar/contentTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/ar/contentTemplates.json
@@ -28,6 +28,7 @@
       "TYPES": {
         "MEDIA": "Media",
         "QUICK_REPLY": "Quick Reply",
+        "CALL_TO_ACTION": "Call to Action",
         "TEXT": "النص"
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/ar/conversation.json b/app/javascript/dashboard/i18n/locale/ar/conversation.json
index 39097ac57..493471c82 100644
--- a/app/javascript/dashboard/i18n/locale/ar/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ar/conversation.json
@@ -275,6 +275,16 @@
     "SIDEBAR": {
       "CONTACT": "جهات الاتصال",
       "COPILOT": "Copilot"
+    },
+    "VOICE_WIDGET": {
+      "INCOMING_CALL": "Incoming call",
+      "OUTGOING_CALL": "Outgoing call",
+      "CALL_IN_PROGRESS": "Call in progress",
+      "NOT_ANSWERED_YET": "Not answered yet",
+      "HANDLED_IN_ANOTHER_TAB": "Being handled in another tab",
+      "REJECT_CALL": "Reject",
+      "JOIN_CALL": "Join call",
+      "END_CALL": "End call"
     }
   },
   "EMAIL_TRANSCRIPT": {
diff --git a/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json
index 07d065285..e3d8f0549 100644
--- a/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json
@@ -808,6 +808,35 @@
         "LABEL": "رسالة",
         "PLACEHOLDER": "Please enter a message to show users with the form"
       },
+      "BUTTON_TEXT": {
+        "LABEL": "Button text",
+        "PLACEHOLDER": "Please rate us"
+      },
+      "LANGUAGE": {
+        "LABEL": "اللغة",
+        "PLACEHOLDER": "Select template language"
+      },
+      "MESSAGE_PREVIEW": {
+        "LABEL": "Message preview",
+        "TOOLTIP": "This may vary slightly when rendered on WhatsApp's platform."
+      },
+      "TEMPLATE_STATUS": {
+        "APPROVED": "Approved by WhatsApp",
+        "PENDING": "Pending WhatsApp approval",
+        "REJECTED": "Meta rejected the template",
+        "DEFAULT": "Needs WhatsApp approval",
+        "NOT_FOUND": "The template does not exist in the Meta platform."
+      },
+      "TEMPLATE_CREATION": {
+        "SUCCESS_MESSAGE": "WhatsApp template created successfully and sent for approval",
+        "ERROR_MESSAGE": "Failed to create WhatsApp template"
+      },
+      "TEMPLATE_UPDATE_DIALOG": {
+        "TITLE": "Edit survey details",
+        "DESCRIPTION": "We will delete the previous template and make a new one which will be sent again for WhatsApp approval",
+        "CONFIRM": "Create new template",
+        "CANCEL": "العودة للخلف"
+      },
       "SURVEY_RULE": {
         "LABEL": "Survey rule",
         "DESCRIPTION_PREFIX": "Send the survey if the conversation",
@@ -819,6 +848,7 @@
         "SELECT_PLACEHOLDER": "select labels"
       },
       "NOTE": "Note: CSAT surveys are sent only once per conversation",
+      "WHATSAPP_NOTE": "Note: We will create a template and send it for WhatsApp approval. After being approved, surveys will be sent only once per conversation as per the survey rule.",
       "API": {
         "SUCCESS_MESSAGE": "CSAT settings updated successfully",
         "ERROR_MESSAGE": "We couldn't update CSAT settings. Please try again later."
diff --git a/app/javascript/dashboard/i18n/locale/ar/search.json b/app/javascript/dashboard/i18n/locale/ar/search.json
index c0137a9e2..e653f7934 100644
--- a/app/javascript/dashboard/i18n/locale/ar/search.json
+++ b/app/javascript/dashboard/i18n/locale/ar/search.json
@@ -1,7 +1,7 @@
 {
   "SEARCH": {
     "TABS": {
-      "ALL": "الكل",
+      "ALL": "All results",
       "CONTACTS": "جهات الاتصال",
       "CONVERSATIONS": "المحادثات",
       "MESSAGES": "الرسائل",
@@ -19,14 +19,50 @@
     "LOADING_DATA": "جار التحميل",
     "EMPTY_STATE": "لم يتم العثور على {item} للطلب '{query}'",
     "EMPTY_STATE_FULL": "لم يتم العثور على نتائج للطلب '{query}'",
-    "PLACEHOLDER_KEYBINDING": "/ للتركيز",
+    "PLACEHOLDER_KEYBINDING": "/للتركيز",
     "INPUT_PLACEHOLDER": "أكتب 3 أحرف أو أكثر للبحث",
+    "RECENT_SEARCHES": "Recent searches",
+    "CLEAR_ALL": "Clear all",
+    "MOST_RECENT": "Most recent",
     "EMPTY_STATE_DEFAULT": "البحث عن طريق معرف المحادثة أو البريد الإلكتروني أو رقم الهاتف أو الرسائل للحصول على نتائج بحث أفضل. ",
     "BOT_LABEL": "رد آلي",
     "READ_MORE": "اقرأ المزيد",
+    "READ_LESS": "Read less",
     "WROTE": "كتب:",
     "FROM": "من",
     "EMAIL": "البريد الإلكتروني",
-    "EMAIL_SUBJECT": "الموضوع"
+    "EMAIL_SUBJECT": "الموضوع",
+    "PRIVATE": "Private note",
+    "TRANSCRIPT": "Transcript",
+    "CREATED_AT": "created {time}",
+    "UPDATED_AT": "updated {time}",
+    "SORT_BY": {
+      "RELEVANCE": "Relevance"
+    },
+    "DATE_RANGE": {
+      "LAST_7_DAYS": "آخر 7 أيام",
+      "LAST_30_DAYS": "آخر 30 يوماً",
+      "LAST_60_DAYS": "آخر 60 يوماً",
+      "LAST_90_DAYS": "آخر 90 يوماً",
+      "CUSTOM_RANGE": "Custom range:",
+      "CREATED_BETWEEN": "Created between",
+      "AND": "و",
+      "APPLY": "تطبيق",
+      "BEFORE_DATE": "Before {date}",
+      "AFTER_DATE": "After {date}",
+      "TIME_RANGE": "Filter by time",
+      "CLEAR_FILTER": "Clear filter"
+    },
+    "FILTERS": {
+      "FILTER_MESSAGE": "Filter messages by:",
+      "FROM": "المرسل",
+      "IN": "صندوق الوارد",
+      "AGENTS": "الوكلاء",
+      "CONTACTS": "جهات الاتصال",
+      "INBOXES": "قنوات التواصل",
+      "NO_AGENTS": "لم يتم العثور على وكلاء",
+      "NO_CONTACTS": "Start by searching to see results",
+      "NO_INBOXES": "No inboxes found"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/az/companies.json b/app/javascript/dashboard/i18n/locale/az/companies.json
index 86190831b..0d64a4abd 100644
--- a/app/javascript/dashboard/i18n/locale/az/companies.json
+++ b/app/javascript/dashboard/i18n/locale/az/companies.json
@@ -6,7 +6,8 @@
       "OPTIONS": {
         "NAME": "Name",
         "DOMAIN": "Domain",
-        "CREATED_AT": "Created at"
+        "CREATED_AT": "Created at",
+        "CONTACTS_COUNT": "Contacts count"
       }
     },
     "ORDER": {
diff --git a/app/javascript/dashboard/i18n/locale/az/contentTemplates.json b/app/javascript/dashboard/i18n/locale/az/contentTemplates.json
index a9b1d54c4..79c2c8c64 100644
--- a/app/javascript/dashboard/i18n/locale/az/contentTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/az/contentTemplates.json
@@ -28,6 +28,7 @@
       "TYPES": {
         "MEDIA": "Media",
         "QUICK_REPLY": "Quick Reply",
+        "CALL_TO_ACTION": "Call to Action",
         "TEXT": "Text"
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/az/conversation.json b/app/javascript/dashboard/i18n/locale/az/conversation.json
index 49a228610..59ad61c1d 100644
--- a/app/javascript/dashboard/i18n/locale/az/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/az/conversation.json
@@ -275,6 +275,16 @@
     "SIDEBAR": {
       "CONTACT": "Contact",
       "COPILOT": "Copilot"
+    },
+    "VOICE_WIDGET": {
+      "INCOMING_CALL": "Incoming call",
+      "OUTGOING_CALL": "Outgoing call",
+      "CALL_IN_PROGRESS": "Call in progress",
+      "NOT_ANSWERED_YET": "Not answered yet",
+      "HANDLED_IN_ANOTHER_TAB": "Being handled in another tab",
+      "REJECT_CALL": "Reject",
+      "JOIN_CALL": "Join call",
+      "END_CALL": "End call"
     }
   },
   "EMAIL_TRANSCRIPT": {
diff --git a/app/javascript/dashboard/i18n/locale/az/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/az/inboxMgmt.json
index 1314733fa..2efba4716 100644
--- a/app/javascript/dashboard/i18n/locale/az/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/az/inboxMgmt.json
@@ -808,6 +808,35 @@
         "LABEL": "Message",
         "PLACEHOLDER": "Please enter a message to show users with the form"
       },
+      "BUTTON_TEXT": {
+        "LABEL": "Button text",
+        "PLACEHOLDER": "Please rate us"
+      },
+      "LANGUAGE": {
+        "LABEL": "Language",
+        "PLACEHOLDER": "Select template language"
+      },
+      "MESSAGE_PREVIEW": {
+        "LABEL": "Message preview",
+        "TOOLTIP": "This may vary slightly when rendered on WhatsApp's platform."
+      },
+      "TEMPLATE_STATUS": {
+        "APPROVED": "Approved by WhatsApp",
+        "PENDING": "Pending WhatsApp approval",
+        "REJECTED": "Meta rejected the template",
+        "DEFAULT": "Needs WhatsApp approval",
+        "NOT_FOUND": "The template does not exist in the Meta platform."
+      },
+      "TEMPLATE_CREATION": {
+        "SUCCESS_MESSAGE": "WhatsApp template created successfully and sent for approval",
+        "ERROR_MESSAGE": "Failed to create WhatsApp template"
+      },
+      "TEMPLATE_UPDATE_DIALOG": {
+        "TITLE": "Edit survey details",
+        "DESCRIPTION": "We will delete the previous template and make a new one which will be sent again for WhatsApp approval",
+        "CONFIRM": "Create new template",
+        "CANCEL": "Go back"
+      },
       "SURVEY_RULE": {
         "LABEL": "Survey rule",
         "DESCRIPTION_PREFIX": "Send the survey if the conversation",
@@ -819,6 +848,7 @@
         "SELECT_PLACEHOLDER": "select labels"
       },
       "NOTE": "Note: CSAT surveys are sent only once per conversation",
+      "WHATSAPP_NOTE": "Note: We will create a template and send it for WhatsApp approval. After being approved, surveys will be sent only once per conversation as per the survey rule.",
       "API": {
         "SUCCESS_MESSAGE": "CSAT settings updated successfully",
         "ERROR_MESSAGE": "We couldn't update CSAT settings. Please try again later."
diff --git a/app/javascript/dashboard/i18n/locale/az/search.json b/app/javascript/dashboard/i18n/locale/az/search.json
index e8510ab97..2fc8e7998 100644
--- a/app/javascript/dashboard/i18n/locale/az/search.json
+++ b/app/javascript/dashboard/i18n/locale/az/search.json
@@ -1,7 +1,7 @@
 {
   "SEARCH": {
     "TABS": {
-      "ALL": "All",
+      "ALL": "All results",
       "CONTACTS": "Contacts",
       "CONVERSATIONS": "Conversations",
       "MESSAGES": "Messages",
@@ -19,14 +19,50 @@
     "LOADING_DATA": "Loading",
     "EMPTY_STATE": "No {item} found for query '{query}'",
     "EMPTY_STATE_FULL": "No results found for query '{query}'",
-    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "PLACEHOLDER_KEYBINDING": "/to focus",
     "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "RECENT_SEARCHES": "Recent searches",
+    "CLEAR_ALL": "Clear all",
+    "MOST_RECENT": "Most recent",
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
+    "READ_LESS": "Read less",
     "WROTE": "wrote:",
-    "FROM": "from",
-    "EMAIL": "email",
-    "EMAIL_SUBJECT": "subject"
+    "FROM": "From",
+    "EMAIL": "Email",
+    "EMAIL_SUBJECT": "Subject",
+    "PRIVATE": "Private note",
+    "TRANSCRIPT": "Transcript",
+    "CREATED_AT": "created {time}",
+    "UPDATED_AT": "updated {time}",
+    "SORT_BY": {
+      "RELEVANCE": "Relevance"
+    },
+    "DATE_RANGE": {
+      "LAST_7_DAYS": "Last 7 days",
+      "LAST_30_DAYS": "Last 30 days",
+      "LAST_60_DAYS": "Last 60 days",
+      "LAST_90_DAYS": "Last 90 days",
+      "CUSTOM_RANGE": "Custom range:",
+      "CREATED_BETWEEN": "Created between",
+      "AND": "and",
+      "APPLY": "Apply",
+      "BEFORE_DATE": "Before {date}",
+      "AFTER_DATE": "After {date}",
+      "TIME_RANGE": "Filter by time",
+      "CLEAR_FILTER": "Clear filter"
+    },
+    "FILTERS": {
+      "FILTER_MESSAGE": "Filter messages by:",
+      "FROM": "Sender",
+      "IN": "Inbox",
+      "AGENTS": "Agents",
+      "CONTACTS": "Contacts",
+      "INBOXES": "Inboxes",
+      "NO_AGENTS": "No agents found",
+      "NO_CONTACTS": "Start by searching to see results",
+      "NO_INBOXES": "No inboxes found"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/bg/companies.json b/app/javascript/dashboard/i18n/locale/bg/companies.json
index 0e273cfca..474441c86 100644
--- a/app/javascript/dashboard/i18n/locale/bg/companies.json
+++ b/app/javascript/dashboard/i18n/locale/bg/companies.json
@@ -6,7 +6,8 @@
       "OPTIONS": {
         "NAME": "Име",
         "DOMAIN": "Domain",
-        "CREATED_AT": "Създаден в"
+        "CREATED_AT": "Създаден в",
+        "CONTACTS_COUNT": "Contacts count"
       }
     },
     "ORDER": {
diff --git a/app/javascript/dashboard/i18n/locale/bg/contentTemplates.json b/app/javascript/dashboard/i18n/locale/bg/contentTemplates.json
index a9b1d54c4..79c2c8c64 100644
--- a/app/javascript/dashboard/i18n/locale/bg/contentTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/bg/contentTemplates.json
@@ -28,6 +28,7 @@
       "TYPES": {
         "MEDIA": "Media",
         "QUICK_REPLY": "Quick Reply",
+        "CALL_TO_ACTION": "Call to Action",
         "TEXT": "Text"
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/bg/conversation.json b/app/javascript/dashboard/i18n/locale/bg/conversation.json
index 61be85cd7..8b0cd5413 100644
--- a/app/javascript/dashboard/i18n/locale/bg/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/bg/conversation.json
@@ -275,6 +275,16 @@
     "SIDEBAR": {
       "CONTACT": "Контакт",
       "COPILOT": "Copilot"
+    },
+    "VOICE_WIDGET": {
+      "INCOMING_CALL": "Incoming call",
+      "OUTGOING_CALL": "Outgoing call",
+      "CALL_IN_PROGRESS": "Call in progress",
+      "NOT_ANSWERED_YET": "Not answered yet",
+      "HANDLED_IN_ANOTHER_TAB": "Being handled in another tab",
+      "REJECT_CALL": "Reject",
+      "JOIN_CALL": "Join call",
+      "END_CALL": "End call"
     }
   },
   "EMAIL_TRANSCRIPT": {
diff --git a/app/javascript/dashboard/i18n/locale/bg/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/bg/inboxMgmt.json
index 08b07bf23..78b0901e2 100644
--- a/app/javascript/dashboard/i18n/locale/bg/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/bg/inboxMgmt.json
@@ -808,6 +808,35 @@
         "LABEL": "Съобщение",
         "PLACEHOLDER": "Please enter a message to show users with the form"
       },
+      "BUTTON_TEXT": {
+        "LABEL": "Button text",
+        "PLACEHOLDER": "Please rate us"
+      },
+      "LANGUAGE": {
+        "LABEL": "Language",
+        "PLACEHOLDER": "Select template language"
+      },
+      "MESSAGE_PREVIEW": {
+        "LABEL": "Message preview",
+        "TOOLTIP": "This may vary slightly when rendered on WhatsApp's platform."
+      },
+      "TEMPLATE_STATUS": {
+        "APPROVED": "Approved by WhatsApp",
+        "PENDING": "Pending WhatsApp approval",
+        "REJECTED": "Meta rejected the template",
+        "DEFAULT": "Needs WhatsApp approval",
+        "NOT_FOUND": "The template does not exist in the Meta platform."
+      },
+      "TEMPLATE_CREATION": {
+        "SUCCESS_MESSAGE": "WhatsApp template created successfully and sent for approval",
+        "ERROR_MESSAGE": "Failed to create WhatsApp template"
+      },
+      "TEMPLATE_UPDATE_DIALOG": {
+        "TITLE": "Edit survey details",
+        "DESCRIPTION": "We will delete the previous template and make a new one which will be sent again for WhatsApp approval",
+        "CONFIRM": "Create new template",
+        "CANCEL": "Go back"
+      },
       "SURVEY_RULE": {
         "LABEL": "Survey rule",
         "DESCRIPTION_PREFIX": "Send the survey if the conversation",
@@ -819,6 +848,7 @@
         "SELECT_PLACEHOLDER": "select labels"
       },
       "NOTE": "Note: CSAT surveys are sent only once per conversation",
+      "WHATSAPP_NOTE": "Note: We will create a template and send it for WhatsApp approval. After being approved, surveys will be sent only once per conversation as per the survey rule.",
       "API": {
         "SUCCESS_MESSAGE": "CSAT settings updated successfully",
         "ERROR_MESSAGE": "We couldn't update CSAT settings. Please try again later."
diff --git a/app/javascript/dashboard/i18n/locale/bg/search.json b/app/javascript/dashboard/i18n/locale/bg/search.json
index a8fbc9775..8396cd0e4 100644
--- a/app/javascript/dashboard/i18n/locale/bg/search.json
+++ b/app/javascript/dashboard/i18n/locale/bg/search.json
@@ -1,7 +1,7 @@
 {
   "SEARCH": {
     "TABS": {
-      "ALL": "Всички",
+      "ALL": "All results",
       "CONTACTS": "Контакти",
       "CONVERSATIONS": "Разговори",
       "MESSAGES": "Messages",
@@ -19,14 +19,50 @@
     "LOADING_DATA": "Loading",
     "EMPTY_STATE": "No {item} found for query '{query}'",
     "EMPTY_STATE_FULL": "No results found for query '{query}'",
-    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "PLACEHOLDER_KEYBINDING": "/to focus",
     "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "RECENT_SEARCHES": "Recent searches",
+    "CLEAR_ALL": "Clear all",
+    "MOST_RECENT": "Most recent",
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Бот",
     "READ_MORE": "Read more",
+    "READ_LESS": "Read less",
     "WROTE": "wrote:",
-    "FROM": "от",
-    "EMAIL": "имейл",
-    "EMAIL_SUBJECT": "тема"
+    "FROM": "From",
+    "EMAIL": "Email",
+    "EMAIL_SUBJECT": "Subject",
+    "PRIVATE": "Private note",
+    "TRANSCRIPT": "Transcript",
+    "CREATED_AT": "created {time}",
+    "UPDATED_AT": "updated {time}",
+    "SORT_BY": {
+      "RELEVANCE": "Relevance"
+    },
+    "DATE_RANGE": {
+      "LAST_7_DAYS": "Last 7 days",
+      "LAST_30_DAYS": "Last 30 days",
+      "LAST_60_DAYS": "Last 60 days",
+      "LAST_90_DAYS": "Last 90 days",
+      "CUSTOM_RANGE": "Custom range:",
+      "CREATED_BETWEEN": "Created between",
+      "AND": "and",
+      "APPLY": "Apply",
+      "BEFORE_DATE": "Before {date}",
+      "AFTER_DATE": "After {date}",
+      "TIME_RANGE": "Filter by time",
+      "CLEAR_FILTER": "Clear filter"
+    },
+    "FILTERS": {
+      "FILTER_MESSAGE": "Filter messages by:",
+      "FROM": "Sender",
+      "IN": "Входяща кутия",
+      "AGENTS": "Агенти",
+      "CONTACTS": "Контакти",
+      "INBOXES": "Inboxes",
+      "NO_AGENTS": "Няма намерени агенти",
+      "NO_CONTACTS": "Start by searching to see results",
+      "NO_INBOXES": "No inboxes found"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/bn/companies.json b/app/javascript/dashboard/i18n/locale/bn/companies.json
index 86190831b..0d64a4abd 100644
--- a/app/javascript/dashboard/i18n/locale/bn/companies.json
+++ b/app/javascript/dashboard/i18n/locale/bn/companies.json
@@ -6,7 +6,8 @@
       "OPTIONS": {
         "NAME": "Name",
         "DOMAIN": "Domain",
-        "CREATED_AT": "Created at"
+        "CREATED_AT": "Created at",
+        "CONTACTS_COUNT": "Contacts count"
       }
     },
     "ORDER": {
diff --git a/app/javascript/dashboard/i18n/locale/bn/contentTemplates.json b/app/javascript/dashboard/i18n/locale/bn/contentTemplates.json
index a9b1d54c4..79c2c8c64 100644
--- a/app/javascript/dashboard/i18n/locale/bn/contentTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/bn/contentTemplates.json
@@ -28,6 +28,7 @@
       "TYPES": {
         "MEDIA": "Media",
         "QUICK_REPLY": "Quick Reply",
+        "CALL_TO_ACTION": "Call to Action",
         "TEXT": "Text"
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/bn/conversation.json b/app/javascript/dashboard/i18n/locale/bn/conversation.json
index 49a228610..59ad61c1d 100644
--- a/app/javascript/dashboard/i18n/locale/bn/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/bn/conversation.json
@@ -275,6 +275,16 @@
     "SIDEBAR": {
       "CONTACT": "Contact",
       "COPILOT": "Copilot"
+    },
+    "VOICE_WIDGET": {
+      "INCOMING_CALL": "Incoming call",
+      "OUTGOING_CALL": "Outgoing call",
+      "CALL_IN_PROGRESS": "Call in progress",
+      "NOT_ANSWERED_YET": "Not answered yet",
+      "HANDLED_IN_ANOTHER_TAB": "Being handled in another tab",
+      "REJECT_CALL": "Reject",
+      "JOIN_CALL": "Join call",
+      "END_CALL": "End call"
     }
   },
   "EMAIL_TRANSCRIPT": {
diff --git a/app/javascript/dashboard/i18n/locale/bn/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/bn/inboxMgmt.json
index 1314733fa..2efba4716 100644
--- a/app/javascript/dashboard/i18n/locale/bn/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/bn/inboxMgmt.json
@@ -808,6 +808,35 @@
         "LABEL": "Message",
         "PLACEHOLDER": "Please enter a message to show users with the form"
       },
+      "BUTTON_TEXT": {
+        "LABEL": "Button text",
+        "PLACEHOLDER": "Please rate us"
+      },
+      "LANGUAGE": {
+        "LABEL": "Language",
+        "PLACEHOLDER": "Select template language"
+      },
+      "MESSAGE_PREVIEW": {
+        "LABEL": "Message preview",
+        "TOOLTIP": "This may vary slightly when rendered on WhatsApp's platform."
+      },
+      "TEMPLATE_STATUS": {
+        "APPROVED": "Approved by WhatsApp",
+        "PENDING": "Pending WhatsApp approval",
+        "REJECTED": "Meta rejected the template",
+        "DEFAULT": "Needs WhatsApp approval",
+        "NOT_FOUND": "The template does not exist in the Meta platform."
+      },
+      "TEMPLATE_CREATION": {
+        "SUCCESS_MESSAGE": "WhatsApp template created successfully and sent for approval",
+        "ERROR_MESSAGE": "Failed to create WhatsApp template"
+      },
+      "TEMPLATE_UPDATE_DIALOG": {
+        "TITLE": "Edit survey details",
+        "DESCRIPTION": "We will delete the previous template and make a new one which will be sent again for WhatsApp approval",
+        "CONFIRM": "Create new template",
+        "CANCEL": "Go back"
+      },
       "SURVEY_RULE": {
         "LABEL": "Survey rule",
         "DESCRIPTION_PREFIX": "Send the survey if the conversation",
@@ -819,6 +848,7 @@
         "SELECT_PLACEHOLDER": "select labels"
       },
       "NOTE": "Note: CSAT surveys are sent only once per conversation",
+      "WHATSAPP_NOTE": "Note: We will create a template and send it for WhatsApp approval. After being approved, surveys will be sent only once per conversation as per the survey rule.",
       "API": {
         "SUCCESS_MESSAGE": "CSAT settings updated successfully",
         "ERROR_MESSAGE": "We couldn't update CSAT settings. Please try again later."
diff --git a/app/javascript/dashboard/i18n/locale/bn/search.json b/app/javascript/dashboard/i18n/locale/bn/search.json
index e8510ab97..2fc8e7998 100644
--- a/app/javascript/dashboard/i18n/locale/bn/search.json
+++ b/app/javascript/dashboard/i18n/locale/bn/search.json
@@ -1,7 +1,7 @@
 {
   "SEARCH": {
     "TABS": {
-      "ALL": "All",
+      "ALL": "All results",
       "CONTACTS": "Contacts",
       "CONVERSATIONS": "Conversations",
       "MESSAGES": "Messages",
@@ -19,14 +19,50 @@
     "LOADING_DATA": "Loading",
     "EMPTY_STATE": "No {item} found for query '{query}'",
     "EMPTY_STATE_FULL": "No results found for query '{query}'",
-    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "PLACEHOLDER_KEYBINDING": "/to focus",
     "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "RECENT_SEARCHES": "Recent searches",
+    "CLEAR_ALL": "Clear all",
+    "MOST_RECENT": "Most recent",
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
+    "READ_LESS": "Read less",
     "WROTE": "wrote:",
-    "FROM": "from",
-    "EMAIL": "email",
-    "EMAIL_SUBJECT": "subject"
+    "FROM": "From",
+    "EMAIL": "Email",
+    "EMAIL_SUBJECT": "Subject",
+    "PRIVATE": "Private note",
+    "TRANSCRIPT": "Transcript",
+    "CREATED_AT": "created {time}",
+    "UPDATED_AT": "updated {time}",
+    "SORT_BY": {
+      "RELEVANCE": "Relevance"
+    },
+    "DATE_RANGE": {
+      "LAST_7_DAYS": "Last 7 days",
+      "LAST_30_DAYS": "Last 30 days",
+      "LAST_60_DAYS": "Last 60 days",
+      "LAST_90_DAYS": "Last 90 days",
+      "CUSTOM_RANGE": "Custom range:",
+      "CREATED_BETWEEN": "Created between",
+      "AND": "and",
+      "APPLY": "Apply",
+      "BEFORE_DATE": "Before {date}",
+      "AFTER_DATE": "After {date}",
+      "TIME_RANGE": "Filter by time",
+      "CLEAR_FILTER": "Clear filter"
+    },
+    "FILTERS": {
+      "FILTER_MESSAGE": "Filter messages by:",
+      "FROM": "Sender",
+      "IN": "Inbox",
+      "AGENTS": "Agents",
+      "CONTACTS": "Contacts",
+      "INBOXES": "Inboxes",
+      "NO_AGENTS": "No agents found",
+      "NO_CONTACTS": "Start by searching to see results",
+      "NO_INBOXES": "No inboxes found"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ca/companies.json b/app/javascript/dashboard/i18n/locale/ca/companies.json
index 9f4cffdac..322eeb973 100644
--- a/app/javascript/dashboard/i18n/locale/ca/companies.json
+++ b/app/javascript/dashboard/i18n/locale/ca/companies.json
@@ -6,7 +6,8 @@
       "OPTIONS": {
         "NAME": "Nom",
         "DOMAIN": "Domini",
-        "CREATED_AT": "Creat per"
+        "CREATED_AT": "Creat per",
+        "CONTACTS_COUNT": "Contacts count"
       }
     },
     "ORDER": {
diff --git a/app/javascript/dashboard/i18n/locale/ca/contentTemplates.json b/app/javascript/dashboard/i18n/locale/ca/contentTemplates.json
index 51522c0ac..26a642faa 100644
--- a/app/javascript/dashboard/i18n/locale/ca/contentTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/ca/contentTemplates.json
@@ -28,6 +28,7 @@
       "TYPES": {
         "MEDIA": "Media",
         "QUICK_REPLY": "Quick Reply",
+        "CALL_TO_ACTION": "Call to Action",
         "TEXT": "Llista"
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/ca/conversation.json b/app/javascript/dashboard/i18n/locale/ca/conversation.json
index dbecca4a6..c297f78dc 100644
--- a/app/javascript/dashboard/i18n/locale/ca/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ca/conversation.json
@@ -275,6 +275,16 @@
     "SIDEBAR": {
       "CONTACT": "Contacte",
       "COPILOT": "Copilot"
+    },
+    "VOICE_WIDGET": {
+      "INCOMING_CALL": "Incoming call",
+      "OUTGOING_CALL": "Outgoing call",
+      "CALL_IN_PROGRESS": "Call in progress",
+      "NOT_ANSWERED_YET": "Not answered yet",
+      "HANDLED_IN_ANOTHER_TAB": "Being handled in another tab",
+      "REJECT_CALL": "Reject",
+      "JOIN_CALL": "Join call",
+      "END_CALL": "End call"
     }
   },
   "EMAIL_TRANSCRIPT": {
diff --git a/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json
index bef6b9c2f..287b5bcc6 100644
--- a/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json
@@ -808,6 +808,35 @@
         "LABEL": "Missatge",
         "PLACEHOLDER": "Please enter a message to show users with the form"
       },
+      "BUTTON_TEXT": {
+        "LABEL": "Button text",
+        "PLACEHOLDER": "Please rate us"
+      },
+      "LANGUAGE": {
+        "LABEL": "Idioma",
+        "PLACEHOLDER": "Select template language"
+      },
+      "MESSAGE_PREVIEW": {
+        "LABEL": "Message preview",
+        "TOOLTIP": "This may vary slightly when rendered on WhatsApp's platform."
+      },
+      "TEMPLATE_STATUS": {
+        "APPROVED": "Approved by WhatsApp",
+        "PENDING": "Pending WhatsApp approval",
+        "REJECTED": "Meta rejected the template",
+        "DEFAULT": "Needs WhatsApp approval",
+        "NOT_FOUND": "The template does not exist in the Meta platform."
+      },
+      "TEMPLATE_CREATION": {
+        "SUCCESS_MESSAGE": "WhatsApp template created successfully and sent for approval",
+        "ERROR_MESSAGE": "Failed to create WhatsApp template"
+      },
+      "TEMPLATE_UPDATE_DIALOG": {
+        "TITLE": "Edit survey details",
+        "DESCRIPTION": "We will delete the previous template and make a new one which will be sent again for WhatsApp approval",
+        "CONFIRM": "Create new template",
+        "CANCEL": "Torna"
+      },
       "SURVEY_RULE": {
         "LABEL": "Survey rule",
         "DESCRIPTION_PREFIX": "Send the survey if the conversation",
@@ -819,6 +848,7 @@
         "SELECT_PLACEHOLDER": "select labels"
       },
       "NOTE": "Note: CSAT surveys are sent only once per conversation",
+      "WHATSAPP_NOTE": "Note: We will create a template and send it for WhatsApp approval. After being approved, surveys will be sent only once per conversation as per the survey rule.",
       "API": {
         "SUCCESS_MESSAGE": "CSAT settings updated successfully",
         "ERROR_MESSAGE": "We couldn't update CSAT settings. Please try again later."
diff --git a/app/javascript/dashboard/i18n/locale/ca/search.json b/app/javascript/dashboard/i18n/locale/ca/search.json
index 599d13a78..9a2866f60 100644
--- a/app/javascript/dashboard/i18n/locale/ca/search.json
+++ b/app/javascript/dashboard/i18n/locale/ca/search.json
@@ -1,7 +1,7 @@
 {
   "SEARCH": {
     "TABS": {
-      "ALL": "Totes",
+      "ALL": "All results",
       "CONTACTS": "Contactes",
       "CONVERSATIONS": "Converses",
       "MESSAGES": "Missatges",
@@ -19,14 +19,50 @@
     "LOADING_DATA": "Carregant",
     "EMPTY_STATE": "No s'ha trobat cap {item} per a la consulta '{query}'",
     "EMPTY_STATE_FULL": "No s'han trobat resultats per a la consulta '{query}'",
-    "PLACEHOLDER_KEYBINDING": "/ centrar",
+    "PLACEHOLDER_KEYBINDING": "/centrar",
     "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "RECENT_SEARCHES": "Recent searches",
+    "CLEAR_ALL": "Esborrar tot",
+    "MOST_RECENT": "Most recent",
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Llegir més",
+    "READ_LESS": "Read less",
     "WROTE": "va escriure:",
-    "FROM": "des de",
-    "EMAIL": "correu electrònic",
-    "EMAIL_SUBJECT": "assumpte"
+    "FROM": "Des de",
+    "EMAIL": "Correu electrònic",
+    "EMAIL_SUBJECT": "Assumpte",
+    "PRIVATE": "Private note",
+    "TRANSCRIPT": "Transcript",
+    "CREATED_AT": "created {time}",
+    "UPDATED_AT": "updated {time}",
+    "SORT_BY": {
+      "RELEVANCE": "Relevance"
+    },
+    "DATE_RANGE": {
+      "LAST_7_DAYS": "Últims 7 dies",
+      "LAST_30_DAYS": "Últims 30 dies",
+      "LAST_60_DAYS": "Últims 60 dies",
+      "LAST_90_DAYS": "Últims 90 dies",
+      "CUSTOM_RANGE": "Custom range:",
+      "CREATED_BETWEEN": "Created between",
+      "AND": "and",
+      "APPLY": "Aplica",
+      "BEFORE_DATE": "Before {date}",
+      "AFTER_DATE": "After {date}",
+      "TIME_RANGE": "Filter by time",
+      "CLEAR_FILTER": "Esborra els filtres"
+    },
+    "FILTERS": {
+      "FILTER_MESSAGE": "Filter messages by:",
+      "FROM": "Remitent",
+      "IN": "Safata d'entrada",
+      "AGENTS": "Agents",
+      "CONTACTS": "Contactes",
+      "INBOXES": "Safates d'entrada",
+      "NO_AGENTS": "No s'han trobat agents",
+      "NO_CONTACTS": "Start by searching to see results",
+      "NO_INBOXES": "No inboxes found"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/cs/companies.json b/app/javascript/dashboard/i18n/locale/cs/companies.json
index bb414d854..cec3c80cc 100644
--- a/app/javascript/dashboard/i18n/locale/cs/companies.json
+++ b/app/javascript/dashboard/i18n/locale/cs/companies.json
@@ -6,7 +6,8 @@
       "OPTIONS": {
         "NAME": "Název",
         "DOMAIN": "Domain",
-        "CREATED_AT": "Vytvořeno"
+        "CREATED_AT": "Vytvořeno",
+        "CONTACTS_COUNT": "Contacts count"
       }
     },
     "ORDER": {
diff --git a/app/javascript/dashboard/i18n/locale/cs/contentTemplates.json b/app/javascript/dashboard/i18n/locale/cs/contentTemplates.json
index f98c668d2..ee85b11d8 100644
--- a/app/javascript/dashboard/i18n/locale/cs/contentTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/cs/contentTemplates.json
@@ -28,6 +28,7 @@
       "TYPES": {
         "MEDIA": "Media",
         "QUICK_REPLY": "Quick Reply",
+        "CALL_TO_ACTION": "Call to Action",
         "TEXT": "Text"
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/cs/conversation.json b/app/javascript/dashboard/i18n/locale/cs/conversation.json
index 3f2578a48..ebba05695 100644
--- a/app/javascript/dashboard/i18n/locale/cs/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/cs/conversation.json
@@ -275,6 +275,16 @@
     "SIDEBAR": {
       "CONTACT": "Contact",
       "COPILOT": "Copilot"
+    },
+    "VOICE_WIDGET": {
+      "INCOMING_CALL": "Incoming call",
+      "OUTGOING_CALL": "Outgoing call",
+      "CALL_IN_PROGRESS": "Call in progress",
+      "NOT_ANSWERED_YET": "Not answered yet",
+      "HANDLED_IN_ANOTHER_TAB": "Being handled in another tab",
+      "REJECT_CALL": "Reject",
+      "JOIN_CALL": "Join call",
+      "END_CALL": "End call"
     }
   },
   "EMAIL_TRANSCRIPT": {
diff --git a/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json
index 87f1046d2..8e51f4050 100644
--- a/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json
@@ -808,6 +808,35 @@
         "LABEL": "Zpráva",
         "PLACEHOLDER": "Please enter a message to show users with the form"
       },
+      "BUTTON_TEXT": {
+        "LABEL": "Button text",
+        "PLACEHOLDER": "Please rate us"
+      },
+      "LANGUAGE": {
+        "LABEL": "Language",
+        "PLACEHOLDER": "Select template language"
+      },
+      "MESSAGE_PREVIEW": {
+        "LABEL": "Message preview",
+        "TOOLTIP": "This may vary slightly when rendered on WhatsApp's platform."
+      },
+      "TEMPLATE_STATUS": {
+        "APPROVED": "Approved by WhatsApp",
+        "PENDING": "Pending WhatsApp approval",
+        "REJECTED": "Meta rejected the template",
+        "DEFAULT": "Needs WhatsApp approval",
+        "NOT_FOUND": "The template does not exist in the Meta platform."
+      },
+      "TEMPLATE_CREATION": {
+        "SUCCESS_MESSAGE": "WhatsApp template created successfully and sent for approval",
+        "ERROR_MESSAGE": "Failed to create WhatsApp template"
+      },
+      "TEMPLATE_UPDATE_DIALOG": {
+        "TITLE": "Edit survey details",
+        "DESCRIPTION": "We will delete the previous template and make a new one which will be sent again for WhatsApp approval",
+        "CONFIRM": "Create new template",
+        "CANCEL": "Go back"
+      },
       "SURVEY_RULE": {
         "LABEL": "Survey rule",
         "DESCRIPTION_PREFIX": "Send the survey if the conversation",
@@ -819,6 +848,7 @@
         "SELECT_PLACEHOLDER": "select labels"
       },
       "NOTE": "Note: CSAT surveys are sent only once per conversation",
+      "WHATSAPP_NOTE": "Note: We will create a template and send it for WhatsApp approval. After being approved, surveys will be sent only once per conversation as per the survey rule.",
       "API": {
         "SUCCESS_MESSAGE": "CSAT settings updated successfully",
         "ERROR_MESSAGE": "We couldn't update CSAT settings. Please try again later."
diff --git a/app/javascript/dashboard/i18n/locale/cs/search.json b/app/javascript/dashboard/i18n/locale/cs/search.json
index 4da840c17..0d90f9ba0 100644
--- a/app/javascript/dashboard/i18n/locale/cs/search.json
+++ b/app/javascript/dashboard/i18n/locale/cs/search.json
@@ -1,7 +1,7 @@
 {
   "SEARCH": {
     "TABS": {
-      "ALL": "Vše",
+      "ALL": "All results",
       "CONTACTS": "Kontakty",
       "CONVERSATIONS": "Konverzace",
       "MESSAGES": "Zprávy",
@@ -19,14 +19,50 @@
     "LOADING_DATA": "Loading",
     "EMPTY_STATE": "No {item} found for query '{query}'",
     "EMPTY_STATE_FULL": "No results found for query '{query}'",
-    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "PLACEHOLDER_KEYBINDING": "/to focus",
     "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "RECENT_SEARCHES": "Recent searches",
+    "CLEAR_ALL": "Clear all",
+    "MOST_RECENT": "Most recent",
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
+    "READ_LESS": "Read less",
     "WROTE": "wrote:",
-    "FROM": "od",
-    "EMAIL": "e-mailová adresa",
-    "EMAIL_SUBJECT": "předmět"
+    "FROM": "Od",
+    "EMAIL": "E-mailová adresa",
+    "EMAIL_SUBJECT": "Předmět",
+    "PRIVATE": "Private note",
+    "TRANSCRIPT": "Transcript",
+    "CREATED_AT": "created {time}",
+    "UPDATED_AT": "updated {time}",
+    "SORT_BY": {
+      "RELEVANCE": "Relevance"
+    },
+    "DATE_RANGE": {
+      "LAST_7_DAYS": "Posledních 7 dní",
+      "LAST_30_DAYS": "Posledních 30 dní",
+      "LAST_60_DAYS": "Posledních 60 dní",
+      "LAST_90_DAYS": "Posledních 90 dní",
+      "CUSTOM_RANGE": "Custom range:",
+      "CREATED_BETWEEN": "Created between",
+      "AND": "and",
+      "APPLY": "Použít",
+      "BEFORE_DATE": "Before {date}",
+      "AFTER_DATE": "After {date}",
+      "TIME_RANGE": "Filter by time",
+      "CLEAR_FILTER": "Clear filter"
+    },
+    "FILTERS": {
+      "FILTER_MESSAGE": "Filter messages by:",
+      "FROM": "Sender",
+      "IN": "Inbox",
+      "AGENTS": "Agenti",
+      "CONTACTS": "Kontakty",
+      "INBOXES": "Schránky",
+      "NO_AGENTS": "Nenalezeni žádní agenti",
+      "NO_CONTACTS": "Start by searching to see results",
+      "NO_INBOXES": "No inboxes found"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/da/companies.json b/app/javascript/dashboard/i18n/locale/da/companies.json
index 11843f089..31a8157b9 100644
--- a/app/javascript/dashboard/i18n/locale/da/companies.json
+++ b/app/javascript/dashboard/i18n/locale/da/companies.json
@@ -6,7 +6,8 @@
       "OPTIONS": {
         "NAME": "Navn",
         "DOMAIN": "Domæne",
-        "CREATED_AT": "Oprettet den"
+        "CREATED_AT": "Oprettet den",
+        "CONTACTS_COUNT": "Contacts count"
       }
     },
     "ORDER": {
diff --git a/app/javascript/dashboard/i18n/locale/da/contentTemplates.json b/app/javascript/dashboard/i18n/locale/da/contentTemplates.json
index 398a507c6..34a16c814 100644
--- a/app/javascript/dashboard/i18n/locale/da/contentTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/da/contentTemplates.json
@@ -28,6 +28,7 @@
       "TYPES": {
         "MEDIA": "Media",
         "QUICK_REPLY": "Quick Reply",
+        "CALL_TO_ACTION": "Call to Action",
         "TEXT": "Tekst"
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/da/conversation.json b/app/javascript/dashboard/i18n/locale/da/conversation.json
index c6c994f99..1cc101304 100644
--- a/app/javascript/dashboard/i18n/locale/da/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/da/conversation.json
@@ -275,6 +275,16 @@
     "SIDEBAR": {
       "CONTACT": "Kontakt",
       "COPILOT": "Copilot"
+    },
+    "VOICE_WIDGET": {
+      "INCOMING_CALL": "Incoming call",
+      "OUTGOING_CALL": "Outgoing call",
+      "CALL_IN_PROGRESS": "Call in progress",
+      "NOT_ANSWERED_YET": "Not answered yet",
+      "HANDLED_IN_ANOTHER_TAB": "Being handled in another tab",
+      "REJECT_CALL": "Reject",
+      "JOIN_CALL": "Join call",
+      "END_CALL": "End call"
     }
   },
   "EMAIL_TRANSCRIPT": {
diff --git a/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json
index 0d682a8b6..a2d3cf391 100644
--- a/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json
@@ -808,6 +808,35 @@
         "LABEL": "Besked",
         "PLACEHOLDER": "Please enter a message to show users with the form"
       },
+      "BUTTON_TEXT": {
+        "LABEL": "Button text",
+        "PLACEHOLDER": "Please rate us"
+      },
+      "LANGUAGE": {
+        "LABEL": "Sprog",
+        "PLACEHOLDER": "Select template language"
+      },
+      "MESSAGE_PREVIEW": {
+        "LABEL": "Message preview",
+        "TOOLTIP": "This may vary slightly when rendered on WhatsApp's platform."
+      },
+      "TEMPLATE_STATUS": {
+        "APPROVED": "Approved by WhatsApp",
+        "PENDING": "Pending WhatsApp approval",
+        "REJECTED": "Meta rejected the template",
+        "DEFAULT": "Needs WhatsApp approval",
+        "NOT_FOUND": "The template does not exist in the Meta platform."
+      },
+      "TEMPLATE_CREATION": {
+        "SUCCESS_MESSAGE": "WhatsApp template created successfully and sent for approval",
+        "ERROR_MESSAGE": "Failed to create WhatsApp template"
+      },
+      "TEMPLATE_UPDATE_DIALOG": {
+        "TITLE": "Edit survey details",
+        "DESCRIPTION": "We will delete the previous template and make a new one which will be sent again for WhatsApp approval",
+        "CONFIRM": "Create new template",
+        "CANCEL": "Gå tilbage"
+      },
       "SURVEY_RULE": {
         "LABEL": "Survey rule",
         "DESCRIPTION_PREFIX": "Send the survey if the conversation",
@@ -819,6 +848,7 @@
         "SELECT_PLACEHOLDER": "select labels"
       },
       "NOTE": "Note: CSAT surveys are sent only once per conversation",
+      "WHATSAPP_NOTE": "Note: We will create a template and send it for WhatsApp approval. After being approved, surveys will be sent only once per conversation as per the survey rule.",
       "API": {
         "SUCCESS_MESSAGE": "CSAT settings updated successfully",
         "ERROR_MESSAGE": "We couldn't update CSAT settings. Please try again later."
diff --git a/app/javascript/dashboard/i18n/locale/da/search.json b/app/javascript/dashboard/i18n/locale/da/search.json
index 4605d432a..e0c7c1af0 100644
--- a/app/javascript/dashboard/i18n/locale/da/search.json
+++ b/app/javascript/dashboard/i18n/locale/da/search.json
@@ -1,7 +1,7 @@
 {
   "SEARCH": {
     "TABS": {
-      "ALL": "Alle",
+      "ALL": "All results",
       "CONTACTS": "Kontakter",
       "CONVERSATIONS": "Samtaler",
       "MESSAGES": "Beskeder",
@@ -19,14 +19,50 @@
     "LOADING_DATA": "Loading",
     "EMPTY_STATE": "No {item} found for query '{query}'",
     "EMPTY_STATE_FULL": "No results found for query '{query}'",
-    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "PLACEHOLDER_KEYBINDING": "/to focus",
     "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "RECENT_SEARCHES": "Recent searches",
+    "CLEAR_ALL": "Clear all",
+    "MOST_RECENT": "Most recent",
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
+    "READ_LESS": "Read less",
     "WROTE": "wrote:",
-    "FROM": "fra",
-    "EMAIL": "e-mail",
-    "EMAIL_SUBJECT": "emne"
+    "FROM": "Fra",
+    "EMAIL": "E-mail",
+    "EMAIL_SUBJECT": "Emne",
+    "PRIVATE": "Private note",
+    "TRANSCRIPT": "Transcript",
+    "CREATED_AT": "created {time}",
+    "UPDATED_AT": "updated {time}",
+    "SORT_BY": {
+      "RELEVANCE": "Relevance"
+    },
+    "DATE_RANGE": {
+      "LAST_7_DAYS": "Seneste 7 dage",
+      "LAST_30_DAYS": "Seneste 30 dage",
+      "LAST_60_DAYS": "Seneste 60 dage",
+      "LAST_90_DAYS": "Seneste 90 dage",
+      "CUSTOM_RANGE": "Custom range:",
+      "CREATED_BETWEEN": "Created between",
+      "AND": "and",
+      "APPLY": "Anvend",
+      "BEFORE_DATE": "Before {date}",
+      "AFTER_DATE": "After {date}",
+      "TIME_RANGE": "Filter by time",
+      "CLEAR_FILTER": "Clear filter"
+    },
+    "FILTERS": {
+      "FILTER_MESSAGE": "Filter messages by:",
+      "FROM": "Afsender",
+      "IN": "Indbakke",
+      "AGENTS": "Agenter",
+      "CONTACTS": "Kontakter",
+      "INBOXES": "Indbakker",
+      "NO_AGENTS": "Ingen agenter fundet",
+      "NO_CONTACTS": "Start by searching to see results",
+      "NO_INBOXES": "No inboxes found"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/de/companies.json b/app/javascript/dashboard/i18n/locale/de/companies.json
index 5e96c0365..0144ac7d3 100644
--- a/app/javascript/dashboard/i18n/locale/de/companies.json
+++ b/app/javascript/dashboard/i18n/locale/de/companies.json
@@ -6,7 +6,8 @@
       "OPTIONS": {
         "NAME": "Name",
         "DOMAIN": "Domain",
-        "CREATED_AT": "Erstellt am"
+        "CREATED_AT": "Erstellt am",
+        "CONTACTS_COUNT": "Contacts count"
       }
     },
     "ORDER": {
diff --git a/app/javascript/dashboard/i18n/locale/de/contentTemplates.json b/app/javascript/dashboard/i18n/locale/de/contentTemplates.json
index 95f4163f0..e4f382aef 100644
--- a/app/javascript/dashboard/i18n/locale/de/contentTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/de/contentTemplates.json
@@ -28,6 +28,7 @@
       "TYPES": {
         "MEDIA": "Media",
         "QUICK_REPLY": "Quick Reply",
+        "CALL_TO_ACTION": "Call to Action",
         "TEXT": "Text"
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/de/conversation.json b/app/javascript/dashboard/i18n/locale/de/conversation.json
index 6ced2c391..86cc4d002 100644
--- a/app/javascript/dashboard/i18n/locale/de/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/de/conversation.json
@@ -275,6 +275,16 @@
     "SIDEBAR": {
       "CONTACT": "Kontakt",
       "COPILOT": "Copilot"
+    },
+    "VOICE_WIDGET": {
+      "INCOMING_CALL": "Eingehender Anruf",
+      "OUTGOING_CALL": "Ausgehender Anruf",
+      "CALL_IN_PROGRESS": "Anruf läuft",
+      "NOT_ANSWERED_YET": "Noch nicht beantwortet",
+      "HANDLED_IN_ANOTHER_TAB": "Being handled in another tab",
+      "REJECT_CALL": "Reject",
+      "JOIN_CALL": "Join call",
+      "END_CALL": "End call"
     }
   },
   "EMAIL_TRANSCRIPT": {
diff --git a/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
index a7dd02903..43cd5f23e 100644
--- a/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
@@ -808,6 +808,35 @@
         "LABEL": "Nachricht",
         "PLACEHOLDER": "Please enter a message to show users with the form"
       },
+      "BUTTON_TEXT": {
+        "LABEL": "Button text",
+        "PLACEHOLDER": "Please rate us"
+      },
+      "LANGUAGE": {
+        "LABEL": "Sprache",
+        "PLACEHOLDER": "Select template language"
+      },
+      "MESSAGE_PREVIEW": {
+        "LABEL": "Message preview",
+        "TOOLTIP": "This may vary slightly when rendered on WhatsApp's platform."
+      },
+      "TEMPLATE_STATUS": {
+        "APPROVED": "Approved by WhatsApp",
+        "PENDING": "Pending WhatsApp approval",
+        "REJECTED": "Meta rejected the template",
+        "DEFAULT": "Needs WhatsApp approval",
+        "NOT_FOUND": "The template does not exist in the Meta platform."
+      },
+      "TEMPLATE_CREATION": {
+        "SUCCESS_MESSAGE": "WhatsApp template created successfully and sent for approval",
+        "ERROR_MESSAGE": "Failed to create WhatsApp template"
+      },
+      "TEMPLATE_UPDATE_DIALOG": {
+        "TITLE": "Edit survey details",
+        "DESCRIPTION": "We will delete the previous template and make a new one which will be sent again for WhatsApp approval",
+        "CONFIRM": "Create new template",
+        "CANCEL": "Zurück"
+      },
       "SURVEY_RULE": {
         "LABEL": "Survey rule",
         "DESCRIPTION_PREFIX": "Send the survey if the conversation",
@@ -819,6 +848,7 @@
         "SELECT_PLACEHOLDER": "select labels"
       },
       "NOTE": "Note: CSAT surveys are sent only once per conversation",
+      "WHATSAPP_NOTE": "Note: We will create a template and send it for WhatsApp approval. After being approved, surveys will be sent only once per conversation as per the survey rule.",
       "API": {
         "SUCCESS_MESSAGE": "CSAT settings updated successfully",
         "ERROR_MESSAGE": "We couldn't update CSAT settings. Please try again later."
diff --git a/app/javascript/dashboard/i18n/locale/de/search.json b/app/javascript/dashboard/i18n/locale/de/search.json
index 562c63abe..9694e40d5 100644
--- a/app/javascript/dashboard/i18n/locale/de/search.json
+++ b/app/javascript/dashboard/i18n/locale/de/search.json
@@ -1,7 +1,7 @@
 {
   "SEARCH": {
     "TABS": {
-      "ALL": "Alle",
+      "ALL": "All results",
       "CONTACTS": "Kontakte",
       "CONVERSATIONS": "Gespräche",
       "MESSAGES": "Nachrichten",
@@ -19,14 +19,50 @@
     "LOADING_DATA": "Wird geladen",
     "EMPTY_STATE": "Keine {item} für Abfrage '{query} ' gefunden",
     "EMPTY_STATE_FULL": "Kein Ergebnis für Abfrage '{query} ' gefunden",
-    "PLACEHOLDER_KEYBINDING": "/ fokussieren",
+    "PLACEHOLDER_KEYBINDING": "/fokussieren",
     "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "RECENT_SEARCHES": "Recent searches",
+    "CLEAR_ALL": "Alle löschen",
+    "MOST_RECENT": "Most recent",
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Mehr erfahren",
+    "READ_LESS": "Read less",
     "WROTE": "schrieb:",
-    "FROM": "von",
-    "EMAIL": "e-Mail",
-    "EMAIL_SUBJECT": "betreff"
+    "FROM": "Von",
+    "EMAIL": "E-Mail",
+    "EMAIL_SUBJECT": "Betreff",
+    "PRIVATE": "Private note",
+    "TRANSCRIPT": "Transcript",
+    "CREATED_AT": "erstellt am {time}",
+    "UPDATED_AT": "updated {time}",
+    "SORT_BY": {
+      "RELEVANCE": "Relevance"
+    },
+    "DATE_RANGE": {
+      "LAST_7_DAYS": "Letzte 7 Tage",
+      "LAST_30_DAYS": "Letzte 30 Tage",
+      "LAST_60_DAYS": "Letzten 60 Tage",
+      "LAST_90_DAYS": "Letzten 90 Tage",
+      "CUSTOM_RANGE": "Custom range:",
+      "CREATED_BETWEEN": "Created between",
+      "AND": "und",
+      "APPLY": "Übernehmen",
+      "BEFORE_DATE": "Before {date}",
+      "AFTER_DATE": "After {date}",
+      "TIME_RANGE": "Filter by time",
+      "CLEAR_FILTER": "Filter löschen"
+    },
+    "FILTERS": {
+      "FILTER_MESSAGE": "Filter messages by:",
+      "FROM": "Absender",
+      "IN": "Posteingang",
+      "AGENTS": "Agenten",
+      "CONTACTS": "Kontakte",
+      "INBOXES": "Posteingänge",
+      "NO_AGENTS": "Keine Agenten gefunden",
+      "NO_CONTACTS": "Start by searching to see results",
+      "NO_INBOXES": "No inboxes found"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/el/companies.json b/app/javascript/dashboard/i18n/locale/el/companies.json
index e91236a74..1d5b43e4a 100644
--- a/app/javascript/dashboard/i18n/locale/el/companies.json
+++ b/app/javascript/dashboard/i18n/locale/el/companies.json
@@ -6,7 +6,8 @@
       "OPTIONS": {
         "NAME": "Όνομα",
         "DOMAIN": "Domain",
-        "CREATED_AT": "Δημιουργήθηκε στις"
+        "CREATED_AT": "Δημιουργήθηκε στις",
+        "CONTACTS_COUNT": "Contacts count"
       }
     },
     "ORDER": {
diff --git a/app/javascript/dashboard/i18n/locale/el/contentTemplates.json b/app/javascript/dashboard/i18n/locale/el/contentTemplates.json
index af5f698fd..561da40b5 100644
--- a/app/javascript/dashboard/i18n/locale/el/contentTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/el/contentTemplates.json
@@ -28,6 +28,7 @@
       "TYPES": {
         "MEDIA": "Media",
         "QUICK_REPLY": "Quick Reply",
+        "CALL_TO_ACTION": "Call to Action",
         "TEXT": "Κείμενο"
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/el/conversation.json b/app/javascript/dashboard/i18n/locale/el/conversation.json
index 46a3e9312..6be18fc2f 100644
--- a/app/javascript/dashboard/i18n/locale/el/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/el/conversation.json
@@ -275,6 +275,16 @@
     "SIDEBAR": {
       "CONTACT": "Επαφές",
       "COPILOT": "Copilot"
+    },
+    "VOICE_WIDGET": {
+      "INCOMING_CALL": "Incoming call",
+      "OUTGOING_CALL": "Outgoing call",
+      "CALL_IN_PROGRESS": "Call in progress",
+      "NOT_ANSWERED_YET": "Not answered yet",
+      "HANDLED_IN_ANOTHER_TAB": "Being handled in another tab",
+      "REJECT_CALL": "Reject",
+      "JOIN_CALL": "Join call",
+      "END_CALL": "End call"
     }
   },
   "EMAIL_TRANSCRIPT": {
diff --git a/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json
index 508ea7653..d635b83aa 100644
--- a/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json
@@ -808,6 +808,35 @@
         "LABEL": "Μήνυμα",
         "PLACEHOLDER": "Please enter a message to show users with the form"
       },
+      "BUTTON_TEXT": {
+        "LABEL": "Button text",
+        "PLACEHOLDER": "Please rate us"
+      },
+      "LANGUAGE": {
+        "LABEL": "Γλώσσα",
+        "PLACEHOLDER": "Select template language"
+      },
+      "MESSAGE_PREVIEW": {
+        "LABEL": "Message preview",
+        "TOOLTIP": "This may vary slightly when rendered on WhatsApp's platform."
+      },
+      "TEMPLATE_STATUS": {
+        "APPROVED": "Approved by WhatsApp",
+        "PENDING": "Pending WhatsApp approval",
+        "REJECTED": "Meta rejected the template",
+        "DEFAULT": "Needs WhatsApp approval",
+        "NOT_FOUND": "The template does not exist in the Meta platform."
+      },
+      "TEMPLATE_CREATION": {
+        "SUCCESS_MESSAGE": "WhatsApp template created successfully and sent for approval",
+        "ERROR_MESSAGE": "Failed to create WhatsApp template"
+      },
+      "TEMPLATE_UPDATE_DIALOG": {
+        "TITLE": "Edit survey details",
+        "DESCRIPTION": "We will delete the previous template and make a new one which will be sent again for WhatsApp approval",
+        "CONFIRM": "Create new template",
+        "CANCEL": "Πίσω"
+      },
       "SURVEY_RULE": {
         "LABEL": "Survey rule",
         "DESCRIPTION_PREFIX": "Send the survey if the conversation",
@@ -819,6 +848,7 @@
         "SELECT_PLACEHOLDER": "select labels"
       },
       "NOTE": "Note: CSAT surveys are sent only once per conversation",
+      "WHATSAPP_NOTE": "Note: We will create a template and send it for WhatsApp approval. After being approved, surveys will be sent only once per conversation as per the survey rule.",
       "API": {
         "SUCCESS_MESSAGE": "CSAT settings updated successfully",
         "ERROR_MESSAGE": "We couldn't update CSAT settings. Please try again later."
diff --git a/app/javascript/dashboard/i18n/locale/el/search.json b/app/javascript/dashboard/i18n/locale/el/search.json
index ab73f8a4f..27fb2f390 100644
--- a/app/javascript/dashboard/i18n/locale/el/search.json
+++ b/app/javascript/dashboard/i18n/locale/el/search.json
@@ -1,7 +1,7 @@
 {
   "SEARCH": {
     "TABS": {
-      "ALL": "Όλες",
+      "ALL": "All results",
       "CONTACTS": "Επαφές",
       "CONVERSATIONS": "Συζητήσεις",
       "MESSAGES": "Μηνύματα",
@@ -19,14 +19,50 @@
     "LOADING_DATA": "Loading",
     "EMPTY_STATE": "No {item} found for query '{query}'",
     "EMPTY_STATE_FULL": "No results found for query '{query}'",
-    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "PLACEHOLDER_KEYBINDING": "/to focus",
     "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "RECENT_SEARCHES": "Recent searches",
+    "CLEAR_ALL": "Clear all",
+    "MOST_RECENT": "Most recent",
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
+    "READ_LESS": "Read less",
     "WROTE": "wrote:",
-    "FROM": "από",
-    "EMAIL": "email",
-    "EMAIL_SUBJECT": "θέμα"
+    "FROM": "Από",
+    "EMAIL": "Email",
+    "EMAIL_SUBJECT": "Θέμα",
+    "PRIVATE": "Private note",
+    "TRANSCRIPT": "Transcript",
+    "CREATED_AT": "created {time}",
+    "UPDATED_AT": "updated {time}",
+    "SORT_BY": {
+      "RELEVANCE": "Relevance"
+    },
+    "DATE_RANGE": {
+      "LAST_7_DAYS": "Τελευταίες 7 ημέρες",
+      "LAST_30_DAYS": "Τελευταίες 30 ημέρες",
+      "LAST_60_DAYS": "Τελευταίες 60 ημέρες",
+      "LAST_90_DAYS": "Τελευταίες 90 ημέρες",
+      "CUSTOM_RANGE": "Custom range:",
+      "CREATED_BETWEEN": "Created between",
+      "AND": "και",
+      "APPLY": "Εφαρμογή",
+      "BEFORE_DATE": "Before {date}",
+      "AFTER_DATE": "After {date}",
+      "TIME_RANGE": "Filter by time",
+      "CLEAR_FILTER": "Clear filter"
+    },
+    "FILTERS": {
+      "FILTER_MESSAGE": "Filter messages by:",
+      "FROM": "Αποστολέας",
+      "IN": "Εισερχόμενα",
+      "AGENTS": "Πράκτορες",
+      "CONTACTS": "Επαφές",
+      "INBOXES": "Κιβώτια Εισερχομένων",
+      "NO_AGENTS": "Δεν βρέθηκαν Πράκτορες",
+      "NO_CONTACTS": "Start by searching to see results",
+      "NO_INBOXES": "No inboxes found"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/en/companies.json b/app/javascript/dashboard/i18n/locale/en/companies.json
index 86190831b..0d64a4abd 100644
--- a/app/javascript/dashboard/i18n/locale/en/companies.json
+++ b/app/javascript/dashboard/i18n/locale/en/companies.json
@@ -6,7 +6,8 @@
       "OPTIONS": {
         "NAME": "Name",
         "DOMAIN": "Domain",
-        "CREATED_AT": "Created at"
+        "CREATED_AT": "Created at",
+        "CONTACTS_COUNT": "Contacts count"
       }
     },
     "ORDER": {
diff --git a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
index fa15f5f4d..51cae8679 100644
--- a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
@@ -808,6 +808,35 @@
         "LABEL": "Message",
         "PLACEHOLDER": "Please enter a message to show users with the form"
       },
+      "BUTTON_TEXT": {
+        "LABEL": "Button text",
+        "PLACEHOLDER": "Please rate us"
+      },
+      "LANGUAGE": {
+        "LABEL": "Language",
+        "PLACEHOLDER": "Select template language"
+      },
+      "MESSAGE_PREVIEW": {
+        "LABEL": "Message preview",
+        "TOOLTIP": "This may vary slightly when rendered on WhatsApp's platform."
+      },
+      "TEMPLATE_STATUS": {
+        "APPROVED": "Approved by WhatsApp",
+        "PENDING": "Pending WhatsApp approval",
+        "REJECTED": "Meta rejected the template",
+        "DEFAULT": "Needs WhatsApp approval",
+        "NOT_FOUND": "The template does not exist in the Meta platform."
+      },
+      "TEMPLATE_CREATION": {
+        "SUCCESS_MESSAGE": "WhatsApp template created successfully and sent for approval",
+        "ERROR_MESSAGE": "Failed to create WhatsApp template"
+      },
+      "TEMPLATE_UPDATE_DIALOG": {
+        "TITLE": "Edit survey details",
+        "DESCRIPTION": "We will delete the previous template and make a new one which will be sent again for WhatsApp approval",
+        "CONFIRM": "Create new template",
+        "CANCEL": "Go back"
+      },
       "SURVEY_RULE": {
         "LABEL": "Survey rule",
         "DESCRIPTION_PREFIX": "Send the survey if the conversation",
@@ -819,6 +848,7 @@
         "SELECT_PLACEHOLDER": "select labels"
       },
       "NOTE": "Note: CSAT surveys are sent only once per conversation",
+      "WHATSAPP_NOTE": "Note: We will create a template and send it for WhatsApp approval. After being approved, surveys will be sent only once per conversation as per the survey rule.",
       "API": {
         "SUCCESS_MESSAGE": "CSAT settings updated successfully",
         "ERROR_MESSAGE": "We couldn't update CSAT settings. Please try again later."
diff --git a/app/javascript/dashboard/i18n/locale/en/search.json b/app/javascript/dashboard/i18n/locale/en/search.json
index e8510ab97..2fc8e7998 100644
--- a/app/javascript/dashboard/i18n/locale/en/search.json
+++ b/app/javascript/dashboard/i18n/locale/en/search.json
@@ -1,7 +1,7 @@
 {
   "SEARCH": {
     "TABS": {
-      "ALL": "All",
+      "ALL": "All results",
       "CONTACTS": "Contacts",
       "CONVERSATIONS": "Conversations",
       "MESSAGES": "Messages",
@@ -19,14 +19,50 @@
     "LOADING_DATA": "Loading",
     "EMPTY_STATE": "No {item} found for query '{query}'",
     "EMPTY_STATE_FULL": "No results found for query '{query}'",
-    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "PLACEHOLDER_KEYBINDING": "/to focus",
     "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "RECENT_SEARCHES": "Recent searches",
+    "CLEAR_ALL": "Clear all",
+    "MOST_RECENT": "Most recent",
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
+    "READ_LESS": "Read less",
     "WROTE": "wrote:",
-    "FROM": "from",
-    "EMAIL": "email",
-    "EMAIL_SUBJECT": "subject"
+    "FROM": "From",
+    "EMAIL": "Email",
+    "EMAIL_SUBJECT": "Subject",
+    "PRIVATE": "Private note",
+    "TRANSCRIPT": "Transcript",
+    "CREATED_AT": "created {time}",
+    "UPDATED_AT": "updated {time}",
+    "SORT_BY": {
+      "RELEVANCE": "Relevance"
+    },
+    "DATE_RANGE": {
+      "LAST_7_DAYS": "Last 7 days",
+      "LAST_30_DAYS": "Last 30 days",
+      "LAST_60_DAYS": "Last 60 days",
+      "LAST_90_DAYS": "Last 90 days",
+      "CUSTOM_RANGE": "Custom range:",
+      "CREATED_BETWEEN": "Created between",
+      "AND": "and",
+      "APPLY": "Apply",
+      "BEFORE_DATE": "Before {date}",
+      "AFTER_DATE": "After {date}",
+      "TIME_RANGE": "Filter by time",
+      "CLEAR_FILTER": "Clear filter"
+    },
+    "FILTERS": {
+      "FILTER_MESSAGE": "Filter messages by:",
+      "FROM": "Sender",
+      "IN": "Inbox",
+      "AGENTS": "Agents",
+      "CONTACTS": "Contacts",
+      "INBOXES": "Inboxes",
+      "NO_AGENTS": "No agents found",
+      "NO_CONTACTS": "Start by searching to see results",
+      "NO_INBOXES": "No inboxes found"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/es/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/es/attributesMgmt.json
index 35051e5ad..50fd988c9 100644
--- a/app/javascript/dashboard/i18n/locale/es/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/es/attributesMgmt.json
@@ -132,7 +132,7 @@
     },
     "BADGES": {
       "PRE_CHAT": "Pre-chat",
-      "RESOLUTION": "Resolution"
+      "RESOLUTION": "Resolución"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/es/chatlist.json b/app/javascript/dashboard/i18n/locale/es/chatlist.json
index 4fdd26adc..2aab0bb43 100644
--- a/app/javascript/dashboard/i18n/locale/es/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/es/chatlist.json
@@ -104,7 +104,7 @@
         "CONTENT": "Contacto compartido"
       },
       "embed": {
-        "CONTENT": "Embedded content"
+        "CONTENT": "Contenido incrustado"
       }
     },
     "CHAT_SORT_BY_FILTER": {
diff --git a/app/javascript/dashboard/i18n/locale/es/companies.json b/app/javascript/dashboard/i18n/locale/es/companies.json
index e29050706..432db2643 100644
--- a/app/javascript/dashboard/i18n/locale/es/companies.json
+++ b/app/javascript/dashboard/i18n/locale/es/companies.json
@@ -1,32 +1,33 @@
 {
   "COMPANIES": {
-    "HEADER": "Companies",
+    "HEADER": "Empresas",
     "SORT_BY": {
       "LABEL": "Ordenar por",
       "OPTIONS": {
         "NAME": "Nombre",
         "DOMAIN": "Dominio",
-        "CREATED_AT": "Creado el"
+        "CREATED_AT": "Creado el",
+        "CONTACTS_COUNT": "Contacts count"
       }
     },
     "ORDER": {
-      "LABEL": "Order",
+      "LABEL": "Orden",
       "OPTIONS": {
         "ASCENDING": "Ascendente",
         "DESCENDING": "Descendente"
       }
     },
-    "SEARCH_PLACEHOLDER": "Search companies...",
-    "LOADING": "Loading companies...",
-    "UNNAMED": "Unnamed Company",
-    "CONTACTS_COUNT": "{n} contact | {n} contacts",
+    "SEARCH_PLACEHOLDER": "Buscar empresas...",
+    "LOADING": "Cargando empresas...",
+    "UNNAMED": "Empresa sin nombre",
+    "CONTACTS_COUNT": "{n} contacto | {n} contactos",
     "EMPTY_STATE": {
-      "TITLE": "No companies found"
+      "TITLE": "No se encontraron empresas"
     }
   },
   "COMPANIES_LAYOUT": {
     "PAGINATION_FOOTER": {
-      "SHOWING": "Showing {startItem} – {endItem} of {totalItems} company | Showing {startItem} – {endItem} of {totalItems} companies"
+      "SHOWING": "Mostrando {startItem} – {endItem} de {totalItems} empresa | Mostrando {startItem} – {endItem} de {totalItems} empresas"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/es/contact.json b/app/javascript/dashboard/i18n/locale/es/contact.json
index 5ea2434db..fe62c481d 100644
--- a/app/javascript/dashboard/i18n/locale/es/contact.json
+++ b/app/javascript/dashboard/i18n/locale/es/contact.json
@@ -458,7 +458,7 @@
             "PLACEHOLDER": "Agregar Instagram"
           },
           "TIKTOK": {
-            "PLACEHOLDER": "Add TikTok"
+            "PLACEHOLDER": "Añadir TikTok"
           },
           "LINKEDIN": {
             "PLACEHOLDER": "Agregar LinkedIn"
diff --git a/app/javascript/dashboard/i18n/locale/es/contentTemplates.json b/app/javascript/dashboard/i18n/locale/es/contentTemplates.json
index a9187b6dd..b0dd36772 100644
--- a/app/javascript/dashboard/i18n/locale/es/contentTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/es/contentTemplates.json
@@ -28,6 +28,7 @@
       "TYPES": {
         "MEDIA": "Media",
         "QUICK_REPLY": "Quick Reply",
+        "CALL_TO_ACTION": "Call to Action",
         "TEXT": "Texto"
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/es/conversation.json b/app/javascript/dashboard/i18n/locale/es/conversation.json
index 7b2a42f13..b279cee14 100644
--- a/app/javascript/dashboard/i18n/locale/es/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/es/conversation.json
@@ -275,6 +275,16 @@
     "SIDEBAR": {
       "CONTACT": "Contacto",
       "COPILOT": "Copilot"
+    },
+    "VOICE_WIDGET": {
+      "INCOMING_CALL": "Incoming call",
+      "OUTGOING_CALL": "Outgoing call",
+      "CALL_IN_PROGRESS": "Call in progress",
+      "NOT_ANSWERED_YET": "Not answered yet",
+      "HANDLED_IN_ANOTHER_TAB": "Atendido en otra pestaña",
+      "REJECT_CALL": "Rechazar",
+      "JOIN_CALL": "Unirse a la llamada",
+      "END_CALL": "Terminar llamada"
     }
   },
   "EMAIL_TRANSCRIPT": {
diff --git a/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json
index 8029453b5..9e0fe210c 100644
--- a/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json
@@ -808,6 +808,35 @@
         "LABEL": "Mensaje",
         "PLACEHOLDER": "Please enter a message to show users with the form"
       },
+      "BUTTON_TEXT": {
+        "LABEL": "Button text",
+        "PLACEHOLDER": "Please rate us"
+      },
+      "LANGUAGE": {
+        "LABEL": "Idioma",
+        "PLACEHOLDER": "Select template language"
+      },
+      "MESSAGE_PREVIEW": {
+        "LABEL": "Message preview",
+        "TOOLTIP": "This may vary slightly when rendered on WhatsApp's platform."
+      },
+      "TEMPLATE_STATUS": {
+        "APPROVED": "Approved by WhatsApp",
+        "PENDING": "Pending WhatsApp approval",
+        "REJECTED": "Meta rejected the template",
+        "DEFAULT": "Needs WhatsApp approval",
+        "NOT_FOUND": "The template does not exist in the Meta platform."
+      },
+      "TEMPLATE_CREATION": {
+        "SUCCESS_MESSAGE": "WhatsApp template created successfully and sent for approval",
+        "ERROR_MESSAGE": "Failed to create WhatsApp template"
+      },
+      "TEMPLATE_UPDATE_DIALOG": {
+        "TITLE": "Edit survey details",
+        "DESCRIPTION": "We will delete the previous template and make a new one which will be sent again for WhatsApp approval",
+        "CONFIRM": "Create new template",
+        "CANCEL": "Volver"
+      },
       "SURVEY_RULE": {
         "LABEL": "Survey rule",
         "DESCRIPTION_PREFIX": "Send the survey if the conversation",
@@ -819,6 +848,7 @@
         "SELECT_PLACEHOLDER": "select labels"
       },
       "NOTE": "Note: CSAT surveys are sent only once per conversation",
+      "WHATSAPP_NOTE": "Note: We will create a template and send it for WhatsApp approval. After being approved, surveys will be sent only once per conversation as per the survey rule.",
       "API": {
         "SUCCESS_MESSAGE": "CSAT settings updated successfully",
         "ERROR_MESSAGE": "We couldn't update CSAT settings. Please try again later."
diff --git a/app/javascript/dashboard/i18n/locale/es/search.json b/app/javascript/dashboard/i18n/locale/es/search.json
index 99e3bd070..1c0a13a8d 100644
--- a/app/javascript/dashboard/i18n/locale/es/search.json
+++ b/app/javascript/dashboard/i18n/locale/es/search.json
@@ -1,7 +1,7 @@
 {
   "SEARCH": {
     "TABS": {
-      "ALL": "Todos",
+      "ALL": "All results",
       "CONTACTS": "Contactos",
       "CONVERSATIONS": "Conversaciones",
       "MESSAGES": "Mensajes",
@@ -19,14 +19,50 @@
     "LOADING_DATA": "Cargando",
     "EMPTY_STATE": "Ningún {item} encontrado para la consulta '{query}'",
     "EMPTY_STATE_FULL": "No se han encontrado resultados para la consulta '{query}'",
-    "PLACEHOLDER_KEYBINDING": "/ para enfocar",
+    "PLACEHOLDER_KEYBINDING": "/para enfocar",
     "INPUT_PLACEHOLDER": "Buscar mensajes, contactos o conversaciones",
+    "RECENT_SEARCHES": "Recent searches",
+    "CLEAR_ALL": "Limpiar todo",
+    "MOST_RECENT": "Most recent",
     "EMPTY_STATE_DEFAULT": "Buscar por Id de conversación, correo electrónico, número de teléfono, mensajes para mejores resultados de búsqueda.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Leer más",
+    "READ_LESS": "Read less",
     "WROTE": "escribió:",
-    "FROM": "De",
-    "EMAIL": "email",
-    "EMAIL_SUBJECT": "asunto"
+    "FROM": "Desde",
+    "EMAIL": "E-mail",
+    "EMAIL_SUBJECT": "Asunto",
+    "PRIVATE": "Private note",
+    "TRANSCRIPT": "Transcript",
+    "CREATED_AT": "creado {time}",
+    "UPDATED_AT": "updated {time}",
+    "SORT_BY": {
+      "RELEVANCE": "Relevance"
+    },
+    "DATE_RANGE": {
+      "LAST_7_DAYS": "Últimos 7 días",
+      "LAST_30_DAYS": "Últimos 30 días",
+      "LAST_60_DAYS": "Últimos 60 días",
+      "LAST_90_DAYS": "Últimos 90 días",
+      "CUSTOM_RANGE": "Custom range:",
+      "CREATED_BETWEEN": "Created between",
+      "AND": "y",
+      "APPLY": "Aplicar",
+      "BEFORE_DATE": "Before {date}",
+      "AFTER_DATE": "After {date}",
+      "TIME_RANGE": "Filter by time",
+      "CLEAR_FILTER": "Limpiar filtros"
+    },
+    "FILTERS": {
+      "FILTER_MESSAGE": "Filter messages by:",
+      "FROM": "Remitente",
+      "IN": "Bandeja de entrada",
+      "AGENTS": "Agentes",
+      "CONTACTS": "Contactos",
+      "INBOXES": "Entradas",
+      "NO_AGENTS": "No se encontraron agentes",
+      "NO_CONTACTS": "Start by searching to see results",
+      "NO_INBOXES": "No inboxes found"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/es/settings.json b/app/javascript/dashboard/i18n/locale/es/settings.json
index 15b5a4ef8..f29a7fb2b 100644
--- a/app/javascript/dashboard/i18n/locale/es/settings.json
+++ b/app/javascript/dashboard/i18n/locale/es/settings.json
@@ -234,7 +234,7 @@
     "CONTACT_SUPPORT": "Contactar a soporte",
     "SELECTOR_SUBTITLE": "Seleccione una cuenta de la siguiente lista",
     "PROFILE_SETTINGS": "Ajustes del perfil",
-    "YEAR_IN_REVIEW": "Year in Review",
+    "YEAR_IN_REVIEW": "Resumen del año",
     "KEYBOARD_SHORTCUTS": "Atajos de teclado",
     "APPEARANCE": "Cambiar apariencia",
     "SUPER_ADMIN_CONSOLE": "Consola SuperAdmin",
@@ -307,7 +307,7 @@
     "SETTINGS": "Ajustes",
     "CONTACTS": "Contactos",
     "ACTIVE": "Activo",
-    "COMPANIES": "Companies",
+    "COMPANIES": "Empresas",
     "ALL_COMPANIES": "All Companies",
     "CAPTAIN": "Capitán",
     "CAPTAIN_ASSISTANTS": "Asistentes",
diff --git a/app/javascript/dashboard/i18n/locale/es/yearInReview.json b/app/javascript/dashboard/i18n/locale/es/yearInReview.json
index 2d57dda04..742644506 100644
--- a/app/javascript/dashboard/i18n/locale/es/yearInReview.json
+++ b/app/javascript/dashboard/i18n/locale/es/yearInReview.json
@@ -1,62 +1,62 @@
 {
   "YEAR_IN_REVIEW": {
-    "TITLE": "Year in Review",
-    "LOADING": "Loading your year in review...",
-    "ERROR": "Failed to load year in review",
+    "TITLE": "Resumen del año",
+    "LOADING": "Cargando tu resumen del año...",
+    "ERROR": "No se pudo cargar el resumen del año",
     "CLOSE": "Cerrar",
     "CONVERSATIONS": {
-      "TITLE": "You have handled",
+      "TITLE": "Has gestionado",
       "SUBTITLE": "conversaciones",
-      "FALLBACK": "This year wasn't about the numbers. It was about showing up.",
+      "FALLBACK": "Este año no se trató de los números. Se trató de estar presente.",
       "COMPARISON": {
-        "0_50": "You showed up, and that's how every good inbox begins.",
-        "50_100": "You kept the replies flowing and the conversations alive.",
-        "100_500": "You handled serious volume and kept everything on track.",
-        "500_2000": "You kept things moving while the volume kept climbing.",
-        "2000_10000": "You ran high traffic through your inbox without breaking a sweat.",
-        "10000_PLUS": "That's a full city of customers knocking on your door. You made it look effortless."
+        "0_50": "Estuviste ahí, y así comienza toda buena bandeja de entrada.",
+        "50_100": "Mantuviste las respuestas fluyendo y las conversaciones vivas.",
+        "100_500": "Gestionaste un volumen considerable y mantuviste todo bajo control.",
+        "500_2000": "Hiciste que todo siguiera avanzando mientras el volumen no dejaba de crecer.",
+        "2000_10000": "Manejaste un alto tráfico en tu bandeja de entrada sin despeinarte.",
+        "10000_PLUS": "Una ciudad entera de clientes tocando a tu puerta. Y lo hiciste parecer fácil."
       }
     },
     "BUSIEST_DAY": {
-      "TITLE": "Your busiest day was",
-      "MESSAGE": "{count} conversations that day.",
+      "TITLE": "Tu día más ocupado fue",
+      "MESSAGE": "{count} conversaciones ese día.",
       "COMPARISON": {
-        "0_5": "A warm-up lap that barely woke the inbox.",
-        "5_10": "Enough action to justify a second cup of coffee.",
-        "10_25": "Things got busy and the inbox stayed on its toes.",
-        "25_50": "A proper rush that barely broke a sweat.",
-        "50_100": "Controlled chaos, handled like a normal Tuesday.",
-        "100_500": "Absolute dumpster fire, somehow still shipping replies.",
-        "500_PLUS": "The inbox lost all chill and never slowed down."
+        "0_5": "Un calentamiento que apenas despertó la bandeja de entrada.",
+        "5_10": "Suficiente movimiento como para justificar una segunda taza de café.",
+        "10_25": "La cosa se puso intensa y la bandeja de entrada se mantuvo alerta.",
+        "25_50": "Un buen pico de actividad que apenas hizo sudar.",
+        "50_100": "Caos controlado, gestionado como un martes cualquiera.",
+        "100_500": "Caos absoluto, y aun así las respuestas siguieron saliendo.",
+        "500_PLUS": "La bandeja de entrada perdió toda la calma y no se detuvo en ningún momento."
       }
     },
     "PERSONALITY": {
-      "TITLE": "Your support personality is",
+      "TITLE": "Tu estilo de soporte es",
       "MESSAGES": {
-        "SWIFT_HELPER": "You replied in {time} on average. Faster than most notifications.",
-        "QUICK_RESPONDER": "You replied in {time} on average. The inbox barely waited.",
-        "STEADY_SUPPORT": "You replied in {time} on average. Calm pace, solid replies.",
-        "THOUGHTFUL_ADVISOR": "You replied in {time} on average. Took the time to get it right."
+        "SWIFT_HELPER": "Respondías en {time} de media. Más rápido que la mayoría de las notificaciones.",
+        "QUICK_RESPONDER": "Respondías en {time} de media. La bandeja de entrada casi no esperó.",
+        "STEADY_SUPPORT": "Respondías en {time} de media. Ritmo constante y respuestas sólidas.",
+        "THOUGHTFUL_ADVISOR": "Respondías en {time} de media. Te tomaste el tiempo para hacerlo bien."
       }
     },
     "THANK_YOU": {
-      "TITLE": "Congratulations on surviving the inbox of {year}.",
-      "MESSAGE": "Thank you for your incredible dedication to supporting customers throughout this year. Your hard work has made a real difference, and we're grateful to have you on this journey. Here's to making {nextYear} even better together!"
+      "TITLE": "Felicidades por sobrevivir a la bandeja de entrada del {year}.",
+      "MESSAGE": "Gracias por tu increíble dedicación al soporte de clientes durante este año. Tu trabajo ha marcado una diferencia real y estamos agradecidos de tenerte en este camino. ¡Vamos a hacer que {nextYear} sea aún mejor juntos!"
     },
     "SHARE_MODAL": {
-      "TITLE": "Share Your Year in Review",
-      "PREPARING": "Preparing your image...",
+      "TITLE": "Comparte tu resumen del año",
+      "PREPARING": "Preparando tu imagen...",
       "DOWNLOAD": "Descargar",
-      "SHARE_TITLE": "My {year} Year in Review",
-      "SHARE_TEXT": "Check out my {year} Year in Review with Chatwoot!",
-      "BRANDING": "Made with Chatwoot"
+      "SHARE_TITLE": "Mi resumen del año {year}",
+      "SHARE_TEXT": "¡Mira mi resumen del año {year} con Chatwoot!",
+      "BRANDING": "Hecho con Chatwoot"
     },
     "BANNER": {
-      "TITLE": "Your {year} Year in Review is here",
-      "BUTTON": "See your impact"
+      "TITLE": "Tu resumen del año {year} ya está aquí",
+      "BUTTON": "Ver tu impacto"
     },
     "NAVIGATION": {
-      "PREVIOUS": "Previous",
+      "PREVIOUS": "Anterior",
       "NEXT": "Siguiente",
       "SHARE": "Compartir la conversación"
     }
diff --git a/app/javascript/dashboard/i18n/locale/et/companies.json b/app/javascript/dashboard/i18n/locale/et/companies.json
index 86190831b..0d64a4abd 100644
--- a/app/javascript/dashboard/i18n/locale/et/companies.json
+++ b/app/javascript/dashboard/i18n/locale/et/companies.json
@@ -6,7 +6,8 @@
       "OPTIONS": {
         "NAME": "Name",
         "DOMAIN": "Domain",
-        "CREATED_AT": "Created at"
+        "CREATED_AT": "Created at",
+        "CONTACTS_COUNT": "Contacts count"
       }
     },
     "ORDER": {
diff --git a/app/javascript/dashboard/i18n/locale/et/contentTemplates.json b/app/javascript/dashboard/i18n/locale/et/contentTemplates.json
index a9b1d54c4..79c2c8c64 100644
--- a/app/javascript/dashboard/i18n/locale/et/contentTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/et/contentTemplates.json
@@ -28,6 +28,7 @@
       "TYPES": {
         "MEDIA": "Media",
         "QUICK_REPLY": "Quick Reply",
+        "CALL_TO_ACTION": "Call to Action",
         "TEXT": "Text"
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/et/conversation.json b/app/javascript/dashboard/i18n/locale/et/conversation.json
index 49a228610..59ad61c1d 100644
--- a/app/javascript/dashboard/i18n/locale/et/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/et/conversation.json
@@ -275,6 +275,16 @@
     "SIDEBAR": {
       "CONTACT": "Contact",
       "COPILOT": "Copilot"
+    },
+    "VOICE_WIDGET": {
+      "INCOMING_CALL": "Incoming call",
+      "OUTGOING_CALL": "Outgoing call",
+      "CALL_IN_PROGRESS": "Call in progress",
+      "NOT_ANSWERED_YET": "Not answered yet",
+      "HANDLED_IN_ANOTHER_TAB": "Being handled in another tab",
+      "REJECT_CALL": "Reject",
+      "JOIN_CALL": "Join call",
+      "END_CALL": "End call"
     }
   },
   "EMAIL_TRANSCRIPT": {
diff --git a/app/javascript/dashboard/i18n/locale/et/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/et/inboxMgmt.json
index 1314733fa..2efba4716 100644
--- a/app/javascript/dashboard/i18n/locale/et/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/et/inboxMgmt.json
@@ -808,6 +808,35 @@
         "LABEL": "Message",
         "PLACEHOLDER": "Please enter a message to show users with the form"
       },
+      "BUTTON_TEXT": {
+        "LABEL": "Button text",
+        "PLACEHOLDER": "Please rate us"
+      },
+      "LANGUAGE": {
+        "LABEL": "Language",
+        "PLACEHOLDER": "Select template language"
+      },
+      "MESSAGE_PREVIEW": {
+        "LABEL": "Message preview",
+        "TOOLTIP": "This may vary slightly when rendered on WhatsApp's platform."
+      },
+      "TEMPLATE_STATUS": {
+        "APPROVED": "Approved by WhatsApp",
+        "PENDING": "Pending WhatsApp approval",
+        "REJECTED": "Meta rejected the template",
+        "DEFAULT": "Needs WhatsApp approval",
+        "NOT_FOUND": "The template does not exist in the Meta platform."
+      },
+      "TEMPLATE_CREATION": {
+        "SUCCESS_MESSAGE": "WhatsApp template created successfully and sent for approval",
+        "ERROR_MESSAGE": "Failed to create WhatsApp template"
+      },
+      "TEMPLATE_UPDATE_DIALOG": {
+        "TITLE": "Edit survey details",
+        "DESCRIPTION": "We will delete the previous template and make a new one which will be sent again for WhatsApp approval",
+        "CONFIRM": "Create new template",
+        "CANCEL": "Go back"
+      },
       "SURVEY_RULE": {
         "LABEL": "Survey rule",
         "DESCRIPTION_PREFIX": "Send the survey if the conversation",
@@ -819,6 +848,7 @@
         "SELECT_PLACEHOLDER": "select labels"
       },
       "NOTE": "Note: CSAT surveys are sent only once per conversation",
+      "WHATSAPP_NOTE": "Note: We will create a template and send it for WhatsApp approval. After being approved, surveys will be sent only once per conversation as per the survey rule.",
       "API": {
         "SUCCESS_MESSAGE": "CSAT settings updated successfully",
         "ERROR_MESSAGE": "We couldn't update CSAT settings. Please try again later."
diff --git a/app/javascript/dashboard/i18n/locale/et/search.json b/app/javascript/dashboard/i18n/locale/et/search.json
index e8510ab97..2fc8e7998 100644
--- a/app/javascript/dashboard/i18n/locale/et/search.json
+++ b/app/javascript/dashboard/i18n/locale/et/search.json
@@ -1,7 +1,7 @@
 {
   "SEARCH": {
     "TABS": {
-      "ALL": "All",
+      "ALL": "All results",
       "CONTACTS": "Contacts",
       "CONVERSATIONS": "Conversations",
       "MESSAGES": "Messages",
@@ -19,14 +19,50 @@
     "LOADING_DATA": "Loading",
     "EMPTY_STATE": "No {item} found for query '{query}'",
     "EMPTY_STATE_FULL": "No results found for query '{query}'",
-    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "PLACEHOLDER_KEYBINDING": "/to focus",
     "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "RECENT_SEARCHES": "Recent searches",
+    "CLEAR_ALL": "Clear all",
+    "MOST_RECENT": "Most recent",
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
+    "READ_LESS": "Read less",
     "WROTE": "wrote:",
-    "FROM": "from",
-    "EMAIL": "email",
-    "EMAIL_SUBJECT": "subject"
+    "FROM": "From",
+    "EMAIL": "Email",
+    "EMAIL_SUBJECT": "Subject",
+    "PRIVATE": "Private note",
+    "TRANSCRIPT": "Transcript",
+    "CREATED_AT": "created {time}",
+    "UPDATED_AT": "updated {time}",
+    "SORT_BY": {
+      "RELEVANCE": "Relevance"
+    },
+    "DATE_RANGE": {
+      "LAST_7_DAYS": "Last 7 days",
+      "LAST_30_DAYS": "Last 30 days",
+      "LAST_60_DAYS": "Last 60 days",
+      "LAST_90_DAYS": "Last 90 days",
+      "CUSTOM_RANGE": "Custom range:",
+      "CREATED_BETWEEN": "Created between",
+      "AND": "and",
+      "APPLY": "Apply",
+      "BEFORE_DATE": "Before {date}",
+      "AFTER_DATE": "After {date}",
+      "TIME_RANGE": "Filter by time",
+      "CLEAR_FILTER": "Clear filter"
+    },
+    "FILTERS": {
+      "FILTER_MESSAGE": "Filter messages by:",
+      "FROM": "Sender",
+      "IN": "Inbox",
+      "AGENTS": "Agents",
+      "CONTACTS": "Contacts",
+      "INBOXES": "Inboxes",
+      "NO_AGENTS": "No agents found",
+      "NO_CONTACTS": "Start by searching to see results",
+      "NO_INBOXES": "No inboxes found"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fa/companies.json b/app/javascript/dashboard/i18n/locale/fa/companies.json
index 788e53ca7..4a488cb4c 100644
--- a/app/javascript/dashboard/i18n/locale/fa/companies.json
+++ b/app/javascript/dashboard/i18n/locale/fa/companies.json
@@ -6,7 +6,8 @@
       "OPTIONS": {
         "NAME": "نام",
         "DOMAIN": "دامنه",
-        "CREATED_AT": "ایجاد شده در"
+        "CREATED_AT": "ایجاد شده در",
+        "CONTACTS_COUNT": "Contacts count"
       }
     },
     "ORDER": {
diff --git a/app/javascript/dashboard/i18n/locale/fa/contentTemplates.json b/app/javascript/dashboard/i18n/locale/fa/contentTemplates.json
index a14569c18..83b6e1814 100644
--- a/app/javascript/dashboard/i18n/locale/fa/contentTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/fa/contentTemplates.json
@@ -28,6 +28,7 @@
       "TYPES": {
         "MEDIA": "Media",
         "QUICK_REPLY": "Quick Reply",
+        "CALL_TO_ACTION": "Call to Action",
         "TEXT": "متن"
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/fa/conversation.json b/app/javascript/dashboard/i18n/locale/fa/conversation.json
index 97b48caa6..872e629df 100644
--- a/app/javascript/dashboard/i18n/locale/fa/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/fa/conversation.json
@@ -275,6 +275,16 @@
     "SIDEBAR": {
       "CONTACT": "مخاطب",
       "COPILOT": "Copilot"
+    },
+    "VOICE_WIDGET": {
+      "INCOMING_CALL": "Incoming call",
+      "OUTGOING_CALL": "Outgoing call",
+      "CALL_IN_PROGRESS": "Call in progress",
+      "NOT_ANSWERED_YET": "Not answered yet",
+      "HANDLED_IN_ANOTHER_TAB": "Being handled in another tab",
+      "REJECT_CALL": "Reject",
+      "JOIN_CALL": "Join call",
+      "END_CALL": "End call"
     }
   },
   "EMAIL_TRANSCRIPT": {
diff --git a/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json
index 0d6bd821e..3b3218357 100644
--- a/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json
@@ -808,6 +808,35 @@
         "LABEL": "پیام",
         "PLACEHOLDER": "Please enter a message to show users with the form"
       },
+      "BUTTON_TEXT": {
+        "LABEL": "Button text",
+        "PLACEHOLDER": "Please rate us"
+      },
+      "LANGUAGE": {
+        "LABEL": "زبان",
+        "PLACEHOLDER": "Select template language"
+      },
+      "MESSAGE_PREVIEW": {
+        "LABEL": "Message preview",
+        "TOOLTIP": "This may vary slightly when rendered on WhatsApp's platform."
+      },
+      "TEMPLATE_STATUS": {
+        "APPROVED": "Approved by WhatsApp",
+        "PENDING": "Pending WhatsApp approval",
+        "REJECTED": "Meta rejected the template",
+        "DEFAULT": "Needs WhatsApp approval",
+        "NOT_FOUND": "The template does not exist in the Meta platform."
+      },
+      "TEMPLATE_CREATION": {
+        "SUCCESS_MESSAGE": "WhatsApp template created successfully and sent for approval",
+        "ERROR_MESSAGE": "Failed to create WhatsApp template"
+      },
+      "TEMPLATE_UPDATE_DIALOG": {
+        "TITLE": "Edit survey details",
+        "DESCRIPTION": "We will delete the previous template and make a new one which will be sent again for WhatsApp approval",
+        "CONFIRM": "Create new template",
+        "CANCEL": "بازگشت"
+      },
       "SURVEY_RULE": {
         "LABEL": "Survey rule",
         "DESCRIPTION_PREFIX": "Send the survey if the conversation",
@@ -819,6 +848,7 @@
         "SELECT_PLACEHOLDER": "select labels"
       },
       "NOTE": "Note: CSAT surveys are sent only once per conversation",
+      "WHATSAPP_NOTE": "Note: We will create a template and send it for WhatsApp approval. After being approved, surveys will be sent only once per conversation as per the survey rule.",
       "API": {
         "SUCCESS_MESSAGE": "CSAT settings updated successfully",
         "ERROR_MESSAGE": "We couldn't update CSAT settings. Please try again later."
diff --git a/app/javascript/dashboard/i18n/locale/fa/search.json b/app/javascript/dashboard/i18n/locale/fa/search.json
index d2b9fbc8f..a06efcd1c 100644
--- a/app/javascript/dashboard/i18n/locale/fa/search.json
+++ b/app/javascript/dashboard/i18n/locale/fa/search.json
@@ -1,7 +1,7 @@
 {
   "SEARCH": {
     "TABS": {
-      "ALL": "همه",
+      "ALL": "All results",
       "CONTACTS": "مخاطبین",
       "CONVERSATIONS": "گفتگوها",
       "MESSAGES": "پیام‌ها",
@@ -19,14 +19,50 @@
     "LOADING_DATA": "Loading",
     "EMPTY_STATE": "هیچ {item} برای درخواست '{query}' یافت نشد",
     "EMPTY_STATE_FULL": "هیچ نتیجه ای برای پرس و جو «{query}» یافت نشد",
-    "PLACEHOLDER_KEYBINDING": "/ برای تمرکز",
+    "PLACEHOLDER_KEYBINDING": "/برای تمرکز",
     "INPUT_PLACEHOLDER": "جستجوی پیام‌ها، مخاطبین یا گفتگوها",
+    "RECENT_SEARCHES": "Recent searches",
+    "CLEAR_ALL": "حذف همه",
+    "MOST_RECENT": "Most recent",
     "EMPTY_STATE_DEFAULT": "جستجو بر اساس شناسه گفتگو، ایمیل، شماره تلفن، پیام‌ها برای نتایج جستجوی بهتر.",
     "BOT_LABEL": "ربات",
     "READ_MORE": "ادامه مطلب",
+    "READ_LESS": "Read less",
     "WROTE": "نوشت:",
     "FROM": "از",
     "EMAIL": "ایمیل",
-    "EMAIL_SUBJECT": "موضوع"
+    "EMAIL_SUBJECT": "موضوع",
+    "PRIVATE": "Private note",
+    "TRANSCRIPT": "Transcript",
+    "CREATED_AT": "created {time}",
+    "UPDATED_AT": "updated {time}",
+    "SORT_BY": {
+      "RELEVANCE": "Relevance"
+    },
+    "DATE_RANGE": {
+      "LAST_7_DAYS": "در ۷ روز گذشته",
+      "LAST_30_DAYS": "در ۳۰ روز گذشته",
+      "LAST_60_DAYS": "Last 60 days",
+      "LAST_90_DAYS": "Last 90 days",
+      "CUSTOM_RANGE": "Custom range:",
+      "CREATED_BETWEEN": "Created between",
+      "AND": "و",
+      "APPLY": "درخواست دادن",
+      "BEFORE_DATE": "Before {date}",
+      "AFTER_DATE": "After {date}",
+      "TIME_RANGE": "Filter by time",
+      "CLEAR_FILTER": "پاک کردن فیلتر"
+    },
+    "FILTERS": {
+      "FILTER_MESSAGE": "Filter messages by:",
+      "FROM": "فرستنده",
+      "IN": "صندوق ورودی",
+      "AGENTS": "ایجنت ها",
+      "CONTACTS": "مخاطبین",
+      "INBOXES": "صندوق‌های ورودی",
+      "NO_AGENTS": "اپراتوری یافت نشد",
+      "NO_CONTACTS": "Start by searching to see results",
+      "NO_INBOXES": "No inboxes found"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fi/companies.json b/app/javascript/dashboard/i18n/locale/fi/companies.json
index 28701dfe3..af5665d06 100644
--- a/app/javascript/dashboard/i18n/locale/fi/companies.json
+++ b/app/javascript/dashboard/i18n/locale/fi/companies.json
@@ -6,7 +6,8 @@
       "OPTIONS": {
         "NAME": "Nimi",
         "DOMAIN": "Domain",
-        "CREATED_AT": "Created at"
+        "CREATED_AT": "Created at",
+        "CONTACTS_COUNT": "Contacts count"
       }
     },
     "ORDER": {
diff --git a/app/javascript/dashboard/i18n/locale/fi/contentTemplates.json b/app/javascript/dashboard/i18n/locale/fi/contentTemplates.json
index d9509a6a6..56aba3a69 100644
--- a/app/javascript/dashboard/i18n/locale/fi/contentTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/fi/contentTemplates.json
@@ -28,6 +28,7 @@
       "TYPES": {
         "MEDIA": "Media",
         "QUICK_REPLY": "Quick Reply",
+        "CALL_TO_ACTION": "Call to Action",
         "TEXT": "Text"
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/fi/conversation.json b/app/javascript/dashboard/i18n/locale/fi/conversation.json
index a06151b3d..d1aa292ac 100644
--- a/app/javascript/dashboard/i18n/locale/fi/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/fi/conversation.json
@@ -275,6 +275,16 @@
     "SIDEBAR": {
       "CONTACT": "Contact",
       "COPILOT": "Copilot"
+    },
+    "VOICE_WIDGET": {
+      "INCOMING_CALL": "Incoming call",
+      "OUTGOING_CALL": "Outgoing call",
+      "CALL_IN_PROGRESS": "Call in progress",
+      "NOT_ANSWERED_YET": "Not answered yet",
+      "HANDLED_IN_ANOTHER_TAB": "Being handled in another tab",
+      "REJECT_CALL": "Reject",
+      "JOIN_CALL": "Join call",
+      "END_CALL": "End call"
     }
   },
   "EMAIL_TRANSCRIPT": {
diff --git a/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json
index 378f12f5c..6f780eddc 100644
--- a/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json
@@ -808,6 +808,35 @@
         "LABEL": "Viesti",
         "PLACEHOLDER": "Please enter a message to show users with the form"
       },
+      "BUTTON_TEXT": {
+        "LABEL": "Button text",
+        "PLACEHOLDER": "Please rate us"
+      },
+      "LANGUAGE": {
+        "LABEL": "Language",
+        "PLACEHOLDER": "Select template language"
+      },
+      "MESSAGE_PREVIEW": {
+        "LABEL": "Message preview",
+        "TOOLTIP": "This may vary slightly when rendered on WhatsApp's platform."
+      },
+      "TEMPLATE_STATUS": {
+        "APPROVED": "Approved by WhatsApp",
+        "PENDING": "Pending WhatsApp approval",
+        "REJECTED": "Meta rejected the template",
+        "DEFAULT": "Needs WhatsApp approval",
+        "NOT_FOUND": "The template does not exist in the Meta platform."
+      },
+      "TEMPLATE_CREATION": {
+        "SUCCESS_MESSAGE": "WhatsApp template created successfully and sent for approval",
+        "ERROR_MESSAGE": "Failed to create WhatsApp template"
+      },
+      "TEMPLATE_UPDATE_DIALOG": {
+        "TITLE": "Edit survey details",
+        "DESCRIPTION": "We will delete the previous template and make a new one which will be sent again for WhatsApp approval",
+        "CONFIRM": "Create new template",
+        "CANCEL": "Mene takaisin"
+      },
       "SURVEY_RULE": {
         "LABEL": "Survey rule",
         "DESCRIPTION_PREFIX": "Send the survey if the conversation",
@@ -819,6 +848,7 @@
         "SELECT_PLACEHOLDER": "select labels"
       },
       "NOTE": "Note: CSAT surveys are sent only once per conversation",
+      "WHATSAPP_NOTE": "Note: We will create a template and send it for WhatsApp approval. After being approved, surveys will be sent only once per conversation as per the survey rule.",
       "API": {
         "SUCCESS_MESSAGE": "CSAT settings updated successfully",
         "ERROR_MESSAGE": "We couldn't update CSAT settings. Please try again later."
diff --git a/app/javascript/dashboard/i18n/locale/fi/search.json b/app/javascript/dashboard/i18n/locale/fi/search.json
index 89368d3b6..e9bd6b9c5 100644
--- a/app/javascript/dashboard/i18n/locale/fi/search.json
+++ b/app/javascript/dashboard/i18n/locale/fi/search.json
@@ -1,7 +1,7 @@
 {
   "SEARCH": {
     "TABS": {
-      "ALL": "Kaikki",
+      "ALL": "All results",
       "CONTACTS": "Yhteystiedot",
       "CONVERSATIONS": "Keskustelut",
       "MESSAGES": "Messages",
@@ -19,14 +19,50 @@
     "LOADING_DATA": "Loading",
     "EMPTY_STATE": "No {item} found for query '{query}'",
     "EMPTY_STATE_FULL": "No results found for query '{query}'",
-    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "PLACEHOLDER_KEYBINDING": "/to focus",
     "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "RECENT_SEARCHES": "Recent searches",
+    "CLEAR_ALL": "Clear all",
+    "MOST_RECENT": "Most recent",
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Botti",
     "READ_MORE": "Read more",
+    "READ_LESS": "Read less",
     "WROTE": "wrote:",
-    "FROM": "lähettäjä",
-    "EMAIL": "sähköposti",
-    "EMAIL_SUBJECT": "subject"
+    "FROM": "From",
+    "EMAIL": "Sähköposti",
+    "EMAIL_SUBJECT": "Subject",
+    "PRIVATE": "Private note",
+    "TRANSCRIPT": "Transcript",
+    "CREATED_AT": "created {time}",
+    "UPDATED_AT": "updated {time}",
+    "SORT_BY": {
+      "RELEVANCE": "Relevance"
+    },
+    "DATE_RANGE": {
+      "LAST_7_DAYS": "Viimeiset 7 päivää",
+      "LAST_30_DAYS": "Viimeiset 30 päivää",
+      "LAST_60_DAYS": "Viimeiset 60 päivää",
+      "LAST_90_DAYS": "Viimeiset 90 päivää",
+      "CUSTOM_RANGE": "Custom range:",
+      "CREATED_BETWEEN": "Created between",
+      "AND": "and",
+      "APPLY": "Apply",
+      "BEFORE_DATE": "Before {date}",
+      "AFTER_DATE": "After {date}",
+      "TIME_RANGE": "Filter by time",
+      "CLEAR_FILTER": "Clear filter"
+    },
+    "FILTERS": {
+      "FILTER_MESSAGE": "Filter messages by:",
+      "FROM": "Sender",
+      "IN": "Inbox",
+      "AGENTS": "Edustajat",
+      "CONTACTS": "Yhteystiedot",
+      "INBOXES": "Saapuneet-kansiot",
+      "NO_AGENTS": "Edustajia ei löytynyt",
+      "NO_CONTACTS": "Start by searching to see results",
+      "NO_INBOXES": "No inboxes found"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fr/companies.json b/app/javascript/dashboard/i18n/locale/fr/companies.json
index 65c96cfbb..3f9c1fc57 100644
--- a/app/javascript/dashboard/i18n/locale/fr/companies.json
+++ b/app/javascript/dashboard/i18n/locale/fr/companies.json
@@ -6,7 +6,8 @@
       "OPTIONS": {
         "NAME": "Nom",
         "DOMAIN": "Domaine",
-        "CREATED_AT": "Créé le"
+        "CREATED_AT": "Créé le",
+        "CONTACTS_COUNT": "Contacts count"
       }
     },
     "ORDER": {
diff --git a/app/javascript/dashboard/i18n/locale/fr/contentTemplates.json b/app/javascript/dashboard/i18n/locale/fr/contentTemplates.json
index acd139f27..a5ca74d7c 100644
--- a/app/javascript/dashboard/i18n/locale/fr/contentTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/fr/contentTemplates.json
@@ -28,6 +28,7 @@
       "TYPES": {
         "MEDIA": "Média",
         "QUICK_REPLY": "Réponse rapide",
+        "CALL_TO_ACTION": "Call to Action",
         "TEXT": "Texte"
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/fr/conversation.json b/app/javascript/dashboard/i18n/locale/fr/conversation.json
index 05011b8e9..da74fce54 100644
--- a/app/javascript/dashboard/i18n/locale/fr/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/fr/conversation.json
@@ -275,6 +275,16 @@
     "SIDEBAR": {
       "CONTACT": "Contact",
       "COPILOT": "Copilot"
+    },
+    "VOICE_WIDGET": {
+      "INCOMING_CALL": "Appel entrant",
+      "OUTGOING_CALL": "Appel sortant",
+      "CALL_IN_PROGRESS": "Appel en cours",
+      "NOT_ANSWERED_YET": "Pas encore répondu",
+      "HANDLED_IN_ANOTHER_TAB": "Being handled in another tab",
+      "REJECT_CALL": "Reject",
+      "JOIN_CALL": "Join call",
+      "END_CALL": "End call"
     }
   },
   "EMAIL_TRANSCRIPT": {
diff --git a/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json
index 35c0850a4..6b1b2d342 100644
--- a/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json
@@ -808,6 +808,35 @@
         "LABEL": "Message",
         "PLACEHOLDER": "Please enter a message to show users with the form"
       },
+      "BUTTON_TEXT": {
+        "LABEL": "Button text",
+        "PLACEHOLDER": "Please rate us"
+      },
+      "LANGUAGE": {
+        "LABEL": "Langue",
+        "PLACEHOLDER": "Select template language"
+      },
+      "MESSAGE_PREVIEW": {
+        "LABEL": "Message preview",
+        "TOOLTIP": "This may vary slightly when rendered on WhatsApp's platform."
+      },
+      "TEMPLATE_STATUS": {
+        "APPROVED": "Approved by WhatsApp",
+        "PENDING": "Pending WhatsApp approval",
+        "REJECTED": "Meta rejected the template",
+        "DEFAULT": "Needs WhatsApp approval",
+        "NOT_FOUND": "The template does not exist in the Meta platform."
+      },
+      "TEMPLATE_CREATION": {
+        "SUCCESS_MESSAGE": "WhatsApp template created successfully and sent for approval",
+        "ERROR_MESSAGE": "Failed to create WhatsApp template"
+      },
+      "TEMPLATE_UPDATE_DIALOG": {
+        "TITLE": "Edit survey details",
+        "DESCRIPTION": "We will delete the previous template and make a new one which will be sent again for WhatsApp approval",
+        "CONFIRM": "Create new template",
+        "CANCEL": "Retour"
+      },
       "SURVEY_RULE": {
         "LABEL": "Survey rule",
         "DESCRIPTION_PREFIX": "Send the survey if the conversation",
@@ -819,6 +848,7 @@
         "SELECT_PLACEHOLDER": "select labels"
       },
       "NOTE": "Note: CSAT surveys are sent only once per conversation",
+      "WHATSAPP_NOTE": "Note: We will create a template and send it for WhatsApp approval. After being approved, surveys will be sent only once per conversation as per the survey rule.",
       "API": {
         "SUCCESS_MESSAGE": "CSAT settings updated successfully",
         "ERROR_MESSAGE": "We couldn't update CSAT settings. Please try again later."
diff --git a/app/javascript/dashboard/i18n/locale/fr/search.json b/app/javascript/dashboard/i18n/locale/fr/search.json
index 55b0ab530..381be001e 100644
--- a/app/javascript/dashboard/i18n/locale/fr/search.json
+++ b/app/javascript/dashboard/i18n/locale/fr/search.json
@@ -1,7 +1,7 @@
 {
   "SEARCH": {
     "TABS": {
-      "ALL": "Tous",
+      "ALL": "All results",
       "CONTACTS": "Contacts",
       "CONVERSATIONS": "Conversations",
       "MESSAGES": "Messages",
@@ -19,14 +19,50 @@
     "LOADING_DATA": "Loading",
     "EMPTY_STATE": "Aucun {item} trouvé pour la requête '{query}'",
     "EMPTY_STATE_FULL": "Aucun résultat pour la requête '{query}'",
-    "PLACEHOLDER_KEYBINDING": "/ pour cibler",
+    "PLACEHOLDER_KEYBINDING": "/pour cibler",
     "INPUT_PLACEHOLDER": "Tapez 3 caractères ou plus pour lancer la recherche",
+    "RECENT_SEARCHES": "Recent searches",
+    "CLEAR_ALL": "Clear all",
+    "MOST_RECENT": "Most recent",
     "EMPTY_STATE_DEFAULT": "Recherche par identifiant de conversation, e-mail, numéro de téléphone, messages pour de meilleurs résultats de recherche. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "En savoir plus",
+    "READ_LESS": "Read less",
     "WROTE": "a écrit :",
-    "FROM": "de",
-    "EMAIL": "courriel",
-    "EMAIL_SUBJECT": "objet"
+    "FROM": "De",
+    "EMAIL": "Courriel",
+    "EMAIL_SUBJECT": "Objet",
+    "PRIVATE": "Private note",
+    "TRANSCRIPT": "Transcript",
+    "CREATED_AT": "created {time}",
+    "UPDATED_AT": "updated {time}",
+    "SORT_BY": {
+      "RELEVANCE": "Relevance"
+    },
+    "DATE_RANGE": {
+      "LAST_7_DAYS": "7 derniers jours",
+      "LAST_30_DAYS": "30 derniers jours",
+      "LAST_60_DAYS": "60 derniers jours",
+      "LAST_90_DAYS": "90 derniers jours",
+      "CUSTOM_RANGE": "Custom range:",
+      "CREATED_BETWEEN": "Created between",
+      "AND": "et",
+      "APPLY": "Appliquer",
+      "BEFORE_DATE": "Before {date}",
+      "AFTER_DATE": "After {date}",
+      "TIME_RANGE": "Filter by time",
+      "CLEAR_FILTER": "Clear filter"
+    },
+    "FILTERS": {
+      "FILTER_MESSAGE": "Filter messages by:",
+      "FROM": "Expéditeur",
+      "IN": "Boîte de réception",
+      "AGENTS": "Agents",
+      "CONTACTS": "Contacts",
+      "INBOXES": "Boîtes de réception",
+      "NO_AGENTS": "Aucun agent trouvé",
+      "NO_CONTACTS": "Start by searching to see results",
+      "NO_INBOXES": "No inboxes found"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/he/companies.json b/app/javascript/dashboard/i18n/locale/he/companies.json
index 0ed34a067..1b721abf0 100644
--- a/app/javascript/dashboard/i18n/locale/he/companies.json
+++ b/app/javascript/dashboard/i18n/locale/he/companies.json
@@ -6,7 +6,8 @@
       "OPTIONS": {
         "NAME": "שם",
         "DOMAIN": "דומיין",
-        "CREATED_AT": "נוצר בזמן"
+        "CREATED_AT": "נוצר בזמן",
+        "CONTACTS_COUNT": "Contacts count"
       }
     },
     "ORDER": {
diff --git a/app/javascript/dashboard/i18n/locale/he/contentTemplates.json b/app/javascript/dashboard/i18n/locale/he/contentTemplates.json
index 611a5c725..138290ca1 100644
--- a/app/javascript/dashboard/i18n/locale/he/contentTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/he/contentTemplates.json
@@ -28,6 +28,7 @@
       "TYPES": {
         "MEDIA": "מדיה",
         "QUICK_REPLY": "תגובה מהירה",
+        "CALL_TO_ACTION": "Call to Action",
         "TEXT": "טקסט"
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/he/conversation.json b/app/javascript/dashboard/i18n/locale/he/conversation.json
index 03ab3b429..f4c1cd3c1 100644
--- a/app/javascript/dashboard/i18n/locale/he/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/he/conversation.json
@@ -275,6 +275,16 @@
     "SIDEBAR": {
       "CONTACT": "איש קשר",
       "COPILOT": "טייס משנה"
+    },
+    "VOICE_WIDGET": {
+      "INCOMING_CALL": "שיחה נכנסת",
+      "OUTGOING_CALL": "שיחה יוצאת",
+      "CALL_IN_PROGRESS": "שיחה מתבצעת",
+      "NOT_ANSWERED_YET": "עדיין לא נענה",
+      "HANDLED_IN_ANOTHER_TAB": "Being handled in another tab",
+      "REJECT_CALL": "Reject",
+      "JOIN_CALL": "Join call",
+      "END_CALL": "End call"
     }
   },
   "EMAIL_TRANSCRIPT": {
diff --git a/app/javascript/dashboard/i18n/locale/he/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/he/inboxMgmt.json
index 5794409b0..4ed1ec7bb 100644
--- a/app/javascript/dashboard/i18n/locale/he/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/he/inboxMgmt.json
@@ -808,6 +808,35 @@
         "LABEL": "הודעה",
         "PLACEHOLDER": "אנא הזן הודעה להצגה למשתמשים עם הטופס"
       },
+      "BUTTON_TEXT": {
+        "LABEL": "Button text",
+        "PLACEHOLDER": "Please rate us"
+      },
+      "LANGUAGE": {
+        "LABEL": "שפה",
+        "PLACEHOLDER": "Select template language"
+      },
+      "MESSAGE_PREVIEW": {
+        "LABEL": "Message preview",
+        "TOOLTIP": "This may vary slightly when rendered on WhatsApp's platform."
+      },
+      "TEMPLATE_STATUS": {
+        "APPROVED": "Approved by WhatsApp",
+        "PENDING": "Pending WhatsApp approval",
+        "REJECTED": "Meta rejected the template",
+        "DEFAULT": "Needs WhatsApp approval",
+        "NOT_FOUND": "The template does not exist in the Meta platform."
+      },
+      "TEMPLATE_CREATION": {
+        "SUCCESS_MESSAGE": "WhatsApp template created successfully and sent for approval",
+        "ERROR_MESSAGE": "Failed to create WhatsApp template"
+      },
+      "TEMPLATE_UPDATE_DIALOG": {
+        "TITLE": "Edit survey details",
+        "DESCRIPTION": "We will delete the previous template and make a new one which will be sent again for WhatsApp approval",
+        "CONFIRM": "Create new template",
+        "CANCEL": "חזור"
+      },
       "SURVEY_RULE": {
         "LABEL": "כלל סקר",
         "DESCRIPTION_PREFIX": "שלח את הסקר אם השיחה",
@@ -819,6 +848,7 @@
         "SELECT_PLACEHOLDER": "בחר תוויות"
       },
       "NOTE": "הערה: סקרי CSAT נשלחים פעם אחת בלבד לכל שיחה",
+      "WHATSAPP_NOTE": "Note: We will create a template and send it for WhatsApp approval. After being approved, surveys will be sent only once per conversation as per the survey rule.",
       "API": {
         "SUCCESS_MESSAGE": "הגדרות CSAT עודכנו בהצלחה",
         "ERROR_MESSAGE": "לא הצלחנו לעדכן את הגדרות CSAT. אנא נסה שוב מאוחר יותר."
diff --git a/app/javascript/dashboard/i18n/locale/he/search.json b/app/javascript/dashboard/i18n/locale/he/search.json
index 2ef094e01..0aaaa9d17 100644
--- a/app/javascript/dashboard/i18n/locale/he/search.json
+++ b/app/javascript/dashboard/i18n/locale/he/search.json
@@ -1,7 +1,7 @@
 {
   "SEARCH": {
     "TABS": {
-      "ALL": "הכל",
+      "ALL": "All results",
       "CONTACTS": "איש קשר",
       "CONVERSATIONS": "שיחות",
       "MESSAGES": "הודעות",
@@ -19,14 +19,50 @@
     "LOADING_DATA": "טוען",
     "EMPTY_STATE": "לא נמצא {item} עבור השאילתה '{query}'",
     "EMPTY_STATE_FULL": "לא נמצאו תוצאות עבור השאילתה '{query}'",
-    "PLACEHOLDER_KEYBINDING": "/ להתמקד",
+    "PLACEHOLDER_KEYBINDING": "/להתמקד",
     "INPUT_PLACEHOLDER": "חפש הודעות, אנשי קשר או שיחות",
+    "RECENT_SEARCHES": "Recent searches",
+    "CLEAR_ALL": "נקה הכל",
+    "MOST_RECENT": "Most recent",
     "EMPTY_STATE_DEFAULT": "חפש לפי מזהה שיחה, אימייל, מספר טלפון, הודעות לתוצאות חיפוש טובות יותר.",
     "BOT_LABEL": "בוט",
     "READ_MORE": "קרא עוד",
+    "READ_LESS": "Read less",
     "WROTE": "נכתב:",
-    "FROM": "מ",
+    "FROM": "מאת",
     "EMAIL": "אימייל",
-    "EMAIL_SUBJECT": "נושא"
+    "EMAIL_SUBJECT": "נושא",
+    "PRIVATE": "Private note",
+    "TRANSCRIPT": "Transcript",
+    "CREATED_AT": "נוצר ב-{time}",
+    "UPDATED_AT": "updated {time}",
+    "SORT_BY": {
+      "RELEVANCE": "Relevance"
+    },
+    "DATE_RANGE": {
+      "LAST_7_DAYS": "7 הימים האחרונים",
+      "LAST_30_DAYS": "30 הימים האחרונים",
+      "LAST_60_DAYS": "60 הימים האחרונים",
+      "LAST_90_DAYS": "90 הימים האחרונים",
+      "CUSTOM_RANGE": "Custom range:",
+      "CREATED_BETWEEN": "Created between",
+      "AND": "and",
+      "APPLY": "להגיש מועמדות",
+      "BEFORE_DATE": "Before {date}",
+      "AFTER_DATE": "After {date}",
+      "TIME_RANGE": "Filter by time",
+      "CLEAR_FILTER": "נקה מסנן"
+    },
+    "FILTERS": {
+      "FILTER_MESSAGE": "Filter messages by:",
+      "FROM": "שולח",
+      "IN": "תיבת הדואר הנכנס",
+      "AGENTS": "סוכנים",
+      "CONTACTS": "איש קשר",
+      "INBOXES": "תיבות דואר נכנס",
+      "NO_AGENTS": "לא נמצאו סוכנים",
+      "NO_CONTACTS": "Start by searching to see results",
+      "NO_INBOXES": "No inboxes found"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hi/companies.json b/app/javascript/dashboard/i18n/locale/hi/companies.json
index 86190831b..0d64a4abd 100644
--- a/app/javascript/dashboard/i18n/locale/hi/companies.json
+++ b/app/javascript/dashboard/i18n/locale/hi/companies.json
@@ -6,7 +6,8 @@
       "OPTIONS": {
         "NAME": "Name",
         "DOMAIN": "Domain",
-        "CREATED_AT": "Created at"
+        "CREATED_AT": "Created at",
+        "CONTACTS_COUNT": "Contacts count"
       }
     },
     "ORDER": {
diff --git a/app/javascript/dashboard/i18n/locale/hi/contentTemplates.json b/app/javascript/dashboard/i18n/locale/hi/contentTemplates.json
index a9b1d54c4..79c2c8c64 100644
--- a/app/javascript/dashboard/i18n/locale/hi/contentTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/hi/contentTemplates.json
@@ -28,6 +28,7 @@
       "TYPES": {
         "MEDIA": "Media",
         "QUICK_REPLY": "Quick Reply",
+        "CALL_TO_ACTION": "Call to Action",
         "TEXT": "Text"
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/hi/conversation.json b/app/javascript/dashboard/i18n/locale/hi/conversation.json
index 49a228610..59ad61c1d 100644
--- a/app/javascript/dashboard/i18n/locale/hi/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/hi/conversation.json
@@ -275,6 +275,16 @@
     "SIDEBAR": {
       "CONTACT": "Contact",
       "COPILOT": "Copilot"
+    },
+    "VOICE_WIDGET": {
+      "INCOMING_CALL": "Incoming call",
+      "OUTGOING_CALL": "Outgoing call",
+      "CALL_IN_PROGRESS": "Call in progress",
+      "NOT_ANSWERED_YET": "Not answered yet",
+      "HANDLED_IN_ANOTHER_TAB": "Being handled in another tab",
+      "REJECT_CALL": "Reject",
+      "JOIN_CALL": "Join call",
+      "END_CALL": "End call"
     }
   },
   "EMAIL_TRANSCRIPT": {
diff --git a/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json
index e2d947db7..e4acfe9a0 100644
--- a/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json
@@ -808,6 +808,35 @@
         "LABEL": "Message",
         "PLACEHOLDER": "Please enter a message to show users with the form"
       },
+      "BUTTON_TEXT": {
+        "LABEL": "Button text",
+        "PLACEHOLDER": "Please rate us"
+      },
+      "LANGUAGE": {
+        "LABEL": "Language",
+        "PLACEHOLDER": "Select template language"
+      },
+      "MESSAGE_PREVIEW": {
+        "LABEL": "Message preview",
+        "TOOLTIP": "This may vary slightly when rendered on WhatsApp's platform."
+      },
+      "TEMPLATE_STATUS": {
+        "APPROVED": "Approved by WhatsApp",
+        "PENDING": "Pending WhatsApp approval",
+        "REJECTED": "Meta rejected the template",
+        "DEFAULT": "Needs WhatsApp approval",
+        "NOT_FOUND": "The template does not exist in the Meta platform."
+      },
+      "TEMPLATE_CREATION": {
+        "SUCCESS_MESSAGE": "WhatsApp template created successfully and sent for approval",
+        "ERROR_MESSAGE": "Failed to create WhatsApp template"
+      },
+      "TEMPLATE_UPDATE_DIALOG": {
+        "TITLE": "Edit survey details",
+        "DESCRIPTION": "We will delete the previous template and make a new one which will be sent again for WhatsApp approval",
+        "CONFIRM": "Create new template",
+        "CANCEL": "Go back"
+      },
       "SURVEY_RULE": {
         "LABEL": "Survey rule",
         "DESCRIPTION_PREFIX": "Send the survey if the conversation",
@@ -819,6 +848,7 @@
         "SELECT_PLACEHOLDER": "select labels"
       },
       "NOTE": "Note: CSAT surveys are sent only once per conversation",
+      "WHATSAPP_NOTE": "Note: We will create a template and send it for WhatsApp approval. After being approved, surveys will be sent only once per conversation as per the survey rule.",
       "API": {
         "SUCCESS_MESSAGE": "CSAT settings updated successfully",
         "ERROR_MESSAGE": "We couldn't update CSAT settings. Please try again later."
diff --git a/app/javascript/dashboard/i18n/locale/hi/search.json b/app/javascript/dashboard/i18n/locale/hi/search.json
index 09c22ae3d..f23a14630 100644
--- a/app/javascript/dashboard/i18n/locale/hi/search.json
+++ b/app/javascript/dashboard/i18n/locale/hi/search.json
@@ -1,7 +1,7 @@
 {
   "SEARCH": {
     "TABS": {
-      "ALL": "All",
+      "ALL": "All results",
       "CONTACTS": "Contacts",
       "CONVERSATIONS": "Conversations",
       "MESSAGES": "Messages",
@@ -19,14 +19,50 @@
     "LOADING_DATA": "Loading",
     "EMPTY_STATE": "No {item} found for query '{query}'",
     "EMPTY_STATE_FULL": "No results found for query '{query}'",
-    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "PLACEHOLDER_KEYBINDING": "/to focus",
     "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "RECENT_SEARCHES": "Recent searches",
+    "CLEAR_ALL": "Clear all",
+    "MOST_RECENT": "Most recent",
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
+    "READ_LESS": "Read less",
     "WROTE": "wrote:",
-    "FROM": "from",
-    "EMAIL": "email",
-    "EMAIL_SUBJECT": "subject"
+    "FROM": "From",
+    "EMAIL": "Email",
+    "EMAIL_SUBJECT": "Subject",
+    "PRIVATE": "Private note",
+    "TRANSCRIPT": "Transcript",
+    "CREATED_AT": "created {time}",
+    "UPDATED_AT": "updated {time}",
+    "SORT_BY": {
+      "RELEVANCE": "Relevance"
+    },
+    "DATE_RANGE": {
+      "LAST_7_DAYS": "Last 7 days",
+      "LAST_30_DAYS": "Last 30 days",
+      "LAST_60_DAYS": "Last 60 days",
+      "LAST_90_DAYS": "Last 90 days",
+      "CUSTOM_RANGE": "Custom range:",
+      "CREATED_BETWEEN": "Created between",
+      "AND": "and",
+      "APPLY": "Apply",
+      "BEFORE_DATE": "Before {date}",
+      "AFTER_DATE": "After {date}",
+      "TIME_RANGE": "Filter by time",
+      "CLEAR_FILTER": "Clear filter"
+    },
+    "FILTERS": {
+      "FILTER_MESSAGE": "Filter messages by:",
+      "FROM": "Sender",
+      "IN": "Inbox",
+      "AGENTS": "Agents",
+      "CONTACTS": "Contacts",
+      "INBOXES": "Inboxes",
+      "NO_AGENTS": "No agents found",
+      "NO_CONTACTS": "Start by searching to see results",
+      "NO_INBOXES": "No inboxes found"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hr/companies.json b/app/javascript/dashboard/i18n/locale/hr/companies.json
index 0fa7220bb..0d1235c9e 100644
--- a/app/javascript/dashboard/i18n/locale/hr/companies.json
+++ b/app/javascript/dashboard/i18n/locale/hr/companies.json
@@ -6,7 +6,8 @@
       "OPTIONS": {
         "NAME": "Ime",
         "DOMAIN": "Domain",
-        "CREATED_AT": "Kreirano"
+        "CREATED_AT": "Kreirano",
+        "CONTACTS_COUNT": "Contacts count"
       }
     },
     "ORDER": {
diff --git a/app/javascript/dashboard/i18n/locale/hr/contentTemplates.json b/app/javascript/dashboard/i18n/locale/hr/contentTemplates.json
index d923b0254..f30f38504 100644
--- a/app/javascript/dashboard/i18n/locale/hr/contentTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/hr/contentTemplates.json
@@ -28,6 +28,7 @@
       "TYPES": {
         "MEDIA": "Media",
         "QUICK_REPLY": "Quick Reply",
+        "CALL_TO_ACTION": "Call to Action",
         "TEXT": "Tekst"
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/hr/conversation.json b/app/javascript/dashboard/i18n/locale/hr/conversation.json
index aa0cb09f4..d14f64b2d 100644
--- a/app/javascript/dashboard/i18n/locale/hr/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/hr/conversation.json
@@ -275,6 +275,16 @@
     "SIDEBAR": {
       "CONTACT": "Contact",
       "COPILOT": "Copilot"
+    },
+    "VOICE_WIDGET": {
+      "INCOMING_CALL": "Incoming call",
+      "OUTGOING_CALL": "Outgoing call",
+      "CALL_IN_PROGRESS": "Call in progress",
+      "NOT_ANSWERED_YET": "Not answered yet",
+      "HANDLED_IN_ANOTHER_TAB": "Being handled in another tab",
+      "REJECT_CALL": "Reject",
+      "JOIN_CALL": "Join call",
+      "END_CALL": "End call"
     }
   },
   "EMAIL_TRANSCRIPT": {
diff --git a/app/javascript/dashboard/i18n/locale/hr/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/hr/inboxMgmt.json
index ed83b7197..1576edc83 100644
--- a/app/javascript/dashboard/i18n/locale/hr/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hr/inboxMgmt.json
@@ -808,6 +808,35 @@
         "LABEL": "Poruka",
         "PLACEHOLDER": "Please enter a message to show users with the form"
       },
+      "BUTTON_TEXT": {
+        "LABEL": "Button text",
+        "PLACEHOLDER": "Please rate us"
+      },
+      "LANGUAGE": {
+        "LABEL": "Jezik",
+        "PLACEHOLDER": "Select template language"
+      },
+      "MESSAGE_PREVIEW": {
+        "LABEL": "Message preview",
+        "TOOLTIP": "This may vary slightly when rendered on WhatsApp's platform."
+      },
+      "TEMPLATE_STATUS": {
+        "APPROVED": "Approved by WhatsApp",
+        "PENDING": "Pending WhatsApp approval",
+        "REJECTED": "Meta rejected the template",
+        "DEFAULT": "Needs WhatsApp approval",
+        "NOT_FOUND": "The template does not exist in the Meta platform."
+      },
+      "TEMPLATE_CREATION": {
+        "SUCCESS_MESSAGE": "WhatsApp template created successfully and sent for approval",
+        "ERROR_MESSAGE": "Failed to create WhatsApp template"
+      },
+      "TEMPLATE_UPDATE_DIALOG": {
+        "TITLE": "Edit survey details",
+        "DESCRIPTION": "We will delete the previous template and make a new one which will be sent again for WhatsApp approval",
+        "CONFIRM": "Create new template",
+        "CANCEL": "Go back"
+      },
       "SURVEY_RULE": {
         "LABEL": "Survey rule",
         "DESCRIPTION_PREFIX": "Send the survey if the conversation",
@@ -819,6 +848,7 @@
         "SELECT_PLACEHOLDER": "select labels"
       },
       "NOTE": "Note: CSAT surveys are sent only once per conversation",
+      "WHATSAPP_NOTE": "Note: We will create a template and send it for WhatsApp approval. After being approved, surveys will be sent only once per conversation as per the survey rule.",
       "API": {
         "SUCCESS_MESSAGE": "CSAT settings updated successfully",
         "ERROR_MESSAGE": "We couldn't update CSAT settings. Please try again later."
diff --git a/app/javascript/dashboard/i18n/locale/hr/search.json b/app/javascript/dashboard/i18n/locale/hr/search.json
index 9c54b01bc..98dc87537 100644
--- a/app/javascript/dashboard/i18n/locale/hr/search.json
+++ b/app/javascript/dashboard/i18n/locale/hr/search.json
@@ -1,7 +1,7 @@
 {
   "SEARCH": {
     "TABS": {
-      "ALL": "Sve",
+      "ALL": "All results",
       "CONTACTS": "Kontakti",
       "CONVERSATIONS": "Razgovori",
       "MESSAGES": "Poruke",
@@ -19,14 +19,50 @@
     "LOADING_DATA": "Loading",
     "EMPTY_STATE": "Pronađeno {item} za traženi pojam '{query}'",
     "EMPTY_STATE_FULL": "Ništa nije pronađeno za traženi pojam '{query}'",
-    "PLACEHOLDER_KEYBINDING": "/ za fokusiranje",
+    "PLACEHOLDER_KEYBINDING": "/za fokusiranje",
     "INPUT_PLACEHOLDER": "Unesi 3 ili više znakova za pretragu",
+    "RECENT_SEARCHES": "Recent searches",
+    "CLEAR_ALL": "Clear all",
+    "MOST_RECENT": "Most recent",
     "EMPTY_STATE_DEFAULT": "Traži po conversation id, e-mail, broj telefona, poruke za bolje rezultate pretrage. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Pročitaj više",
+    "READ_LESS": "Read less",
     "WROTE": "napisao/la:",
-    "FROM": "od",
-    "EMAIL": "email",
-    "EMAIL_SUBJECT": "subject"
+    "FROM": "From",
+    "EMAIL": "Email",
+    "EMAIL_SUBJECT": "Subject",
+    "PRIVATE": "Private note",
+    "TRANSCRIPT": "Transcript",
+    "CREATED_AT": "created {time}",
+    "UPDATED_AT": "updated {time}",
+    "SORT_BY": {
+      "RELEVANCE": "Relevance"
+    },
+    "DATE_RANGE": {
+      "LAST_7_DAYS": "Last 7 days",
+      "LAST_30_DAYS": "Last 30 days",
+      "LAST_60_DAYS": "Last 60 days",
+      "LAST_90_DAYS": "Last 90 days",
+      "CUSTOM_RANGE": "Custom range:",
+      "CREATED_BETWEEN": "Created between",
+      "AND": "and",
+      "APPLY": "Apply",
+      "BEFORE_DATE": "Before {date}",
+      "AFTER_DATE": "After {date}",
+      "TIME_RANGE": "Filter by time",
+      "CLEAR_FILTER": "Clear filter"
+    },
+    "FILTERS": {
+      "FILTER_MESSAGE": "Filter messages by:",
+      "FROM": "Sender",
+      "IN": "Inbox",
+      "AGENTS": "Agenti",
+      "CONTACTS": "Contacts",
+      "INBOXES": "Inboxes",
+      "NO_AGENTS": "No agents found",
+      "NO_CONTACTS": "Start by searching to see results",
+      "NO_INBOXES": "No inboxes found"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hu/companies.json b/app/javascript/dashboard/i18n/locale/hu/companies.json
index 0c803bb1b..c26dd0d0a 100644
--- a/app/javascript/dashboard/i18n/locale/hu/companies.json
+++ b/app/javascript/dashboard/i18n/locale/hu/companies.json
@@ -6,7 +6,8 @@
       "OPTIONS": {
         "NAME": "Név",
         "DOMAIN": "Domain",
-        "CREATED_AT": "Létrehozva"
+        "CREATED_AT": "Létrehozva",
+        "CONTACTS_COUNT": "Contacts count"
       }
     },
     "ORDER": {
diff --git a/app/javascript/dashboard/i18n/locale/hu/contentTemplates.json b/app/javascript/dashboard/i18n/locale/hu/contentTemplates.json
index 6a1956151..dee0184f5 100644
--- a/app/javascript/dashboard/i18n/locale/hu/contentTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/hu/contentTemplates.json
@@ -28,6 +28,7 @@
       "TYPES": {
         "MEDIA": "Media",
         "QUICK_REPLY": "Quick Reply",
+        "CALL_TO_ACTION": "Call to Action",
         "TEXT": "Szöveg"
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/hu/conversation.json b/app/javascript/dashboard/i18n/locale/hu/conversation.json
index 204cec778..715f04a41 100644
--- a/app/javascript/dashboard/i18n/locale/hu/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/hu/conversation.json
@@ -275,6 +275,16 @@
     "SIDEBAR": {
       "CONTACT": "Kontakt",
       "COPILOT": "Copilot"
+    },
+    "VOICE_WIDGET": {
+      "INCOMING_CALL": "Incoming call",
+      "OUTGOING_CALL": "Outgoing call",
+      "CALL_IN_PROGRESS": "Call in progress",
+      "NOT_ANSWERED_YET": "Not answered yet",
+      "HANDLED_IN_ANOTHER_TAB": "Being handled in another tab",
+      "REJECT_CALL": "Reject",
+      "JOIN_CALL": "Join call",
+      "END_CALL": "End call"
     }
   },
   "EMAIL_TRANSCRIPT": {
diff --git a/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json
index 60c01d1ee..1ed0d14dd 100644
--- a/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json
@@ -808,6 +808,35 @@
         "LABEL": "Üzenet",
         "PLACEHOLDER": "Please enter a message to show users with the form"
       },
+      "BUTTON_TEXT": {
+        "LABEL": "Button text",
+        "PLACEHOLDER": "Please rate us"
+      },
+      "LANGUAGE": {
+        "LABEL": "Nyelv",
+        "PLACEHOLDER": "Select template language"
+      },
+      "MESSAGE_PREVIEW": {
+        "LABEL": "Message preview",
+        "TOOLTIP": "This may vary slightly when rendered on WhatsApp's platform."
+      },
+      "TEMPLATE_STATUS": {
+        "APPROVED": "Approved by WhatsApp",
+        "PENDING": "Pending WhatsApp approval",
+        "REJECTED": "Meta rejected the template",
+        "DEFAULT": "Needs WhatsApp approval",
+        "NOT_FOUND": "The template does not exist in the Meta platform."
+      },
+      "TEMPLATE_CREATION": {
+        "SUCCESS_MESSAGE": "WhatsApp template created successfully and sent for approval",
+        "ERROR_MESSAGE": "Failed to create WhatsApp template"
+      },
+      "TEMPLATE_UPDATE_DIALOG": {
+        "TITLE": "Edit survey details",
+        "DESCRIPTION": "We will delete the previous template and make a new one which will be sent again for WhatsApp approval",
+        "CONFIRM": "Create new template",
+        "CANCEL": "Visszaugrás"
+      },
       "SURVEY_RULE": {
         "LABEL": "Survey rule",
         "DESCRIPTION_PREFIX": "Send the survey if the conversation",
@@ -819,6 +848,7 @@
         "SELECT_PLACEHOLDER": "select labels"
       },
       "NOTE": "Note: CSAT surveys are sent only once per conversation",
+      "WHATSAPP_NOTE": "Note: We will create a template and send it for WhatsApp approval. After being approved, surveys will be sent only once per conversation as per the survey rule.",
       "API": {
         "SUCCESS_MESSAGE": "CSAT settings updated successfully",
         "ERROR_MESSAGE": "We couldn't update CSAT settings. Please try again later."
diff --git a/app/javascript/dashboard/i18n/locale/hu/search.json b/app/javascript/dashboard/i18n/locale/hu/search.json
index c2da826c8..ddba63e94 100644
--- a/app/javascript/dashboard/i18n/locale/hu/search.json
+++ b/app/javascript/dashboard/i18n/locale/hu/search.json
@@ -1,7 +1,7 @@
 {
   "SEARCH": {
     "TABS": {
-      "ALL": "Mind",
+      "ALL": "All results",
       "CONTACTS": "Kontaktok",
       "CONVERSATIONS": "Beszélgetések",
       "MESSAGES": "Üzenetek",
@@ -19,14 +19,50 @@
     "LOADING_DATA": "Loading",
     "EMPTY_STATE": "Nem található {item}, a keresésre: '{query}'",
     "EMPTY_STATE_FULL": "Nincs eredménye a következő keresésnek: '{query}'",
-    "PLACEHOLDER_KEYBINDING": "/ a fókuszáláshoz",
+    "PLACEHOLDER_KEYBINDING": "/a fókuszáláshoz",
     "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "RECENT_SEARCHES": "Recent searches",
+    "CLEAR_ALL": "Clear all",
+    "MOST_RECENT": "Most recent",
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Tudj meg többet",
+    "READ_LESS": "Read less",
     "WROTE": "írta:",
-    "FROM": "innen",
-    "EMAIL": "e-mail",
-    "EMAIL_SUBJECT": "tárgy"
+    "FROM": "Innen",
+    "EMAIL": "E-mail",
+    "EMAIL_SUBJECT": "Tárgy",
+    "PRIVATE": "Private note",
+    "TRANSCRIPT": "Transcript",
+    "CREATED_AT": "created {time}",
+    "UPDATED_AT": "updated {time}",
+    "SORT_BY": {
+      "RELEVANCE": "Relevance"
+    },
+    "DATE_RANGE": {
+      "LAST_7_DAYS": "Utolsó 7 nap",
+      "LAST_30_DAYS": "Utolsó 30 nap",
+      "LAST_60_DAYS": "Utolsó 60 nap",
+      "LAST_90_DAYS": "Utolsó 90 nap",
+      "CUSTOM_RANGE": "Custom range:",
+      "CREATED_BETWEEN": "Created between",
+      "AND": "and",
+      "APPLY": "Alkalmaz",
+      "BEFORE_DATE": "Before {date}",
+      "AFTER_DATE": "After {date}",
+      "TIME_RANGE": "Filter by time",
+      "CLEAR_FILTER": "Clear filter"
+    },
+    "FILTERS": {
+      "FILTER_MESSAGE": "Filter messages by:",
+      "FROM": "Küldő",
+      "IN": "Fiók",
+      "AGENTS": "Ügynökök",
+      "CONTACTS": "Kontaktok",
+      "INBOXES": "Fiókok",
+      "NO_AGENTS": "Nem találunk ügynököt",
+      "NO_CONTACTS": "Start by searching to see results",
+      "NO_INBOXES": "No inboxes found"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hy/companies.json b/app/javascript/dashboard/i18n/locale/hy/companies.json
index 86190831b..0d64a4abd 100644
--- a/app/javascript/dashboard/i18n/locale/hy/companies.json
+++ b/app/javascript/dashboard/i18n/locale/hy/companies.json
@@ -6,7 +6,8 @@
       "OPTIONS": {
         "NAME": "Name",
         "DOMAIN": "Domain",
-        "CREATED_AT": "Created at"
+        "CREATED_AT": "Created at",
+        "CONTACTS_COUNT": "Contacts count"
       }
     },
     "ORDER": {
diff --git a/app/javascript/dashboard/i18n/locale/hy/contentTemplates.json b/app/javascript/dashboard/i18n/locale/hy/contentTemplates.json
index a9b1d54c4..79c2c8c64 100644
--- a/app/javascript/dashboard/i18n/locale/hy/contentTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/hy/contentTemplates.json
@@ -28,6 +28,7 @@
       "TYPES": {
         "MEDIA": "Media",
         "QUICK_REPLY": "Quick Reply",
+        "CALL_TO_ACTION": "Call to Action",
         "TEXT": "Text"
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/hy/conversation.json b/app/javascript/dashboard/i18n/locale/hy/conversation.json
index 49a228610..59ad61c1d 100644
--- a/app/javascript/dashboard/i18n/locale/hy/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/hy/conversation.json
@@ -275,6 +275,16 @@
     "SIDEBAR": {
       "CONTACT": "Contact",
       "COPILOT": "Copilot"
+    },
+    "VOICE_WIDGET": {
+      "INCOMING_CALL": "Incoming call",
+      "OUTGOING_CALL": "Outgoing call",
+      "CALL_IN_PROGRESS": "Call in progress",
+      "NOT_ANSWERED_YET": "Not answered yet",
+      "HANDLED_IN_ANOTHER_TAB": "Being handled in another tab",
+      "REJECT_CALL": "Reject",
+      "JOIN_CALL": "Join call",
+      "END_CALL": "End call"
     }
   },
   "EMAIL_TRANSCRIPT": {
diff --git a/app/javascript/dashboard/i18n/locale/hy/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/hy/inboxMgmt.json
index 847eb1b24..7aaed0119 100644
--- a/app/javascript/dashboard/i18n/locale/hy/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hy/inboxMgmt.json
@@ -808,6 +808,35 @@
         "LABEL": "Message",
         "PLACEHOLDER": "Please enter a message to show users with the form"
       },
+      "BUTTON_TEXT": {
+        "LABEL": "Button text",
+        "PLACEHOLDER": "Please rate us"
+      },
+      "LANGUAGE": {
+        "LABEL": "Language",
+        "PLACEHOLDER": "Select template language"
+      },
+      "MESSAGE_PREVIEW": {
+        "LABEL": "Message preview",
+        "TOOLTIP": "This may vary slightly when rendered on WhatsApp's platform."
+      },
+      "TEMPLATE_STATUS": {
+        "APPROVED": "Approved by WhatsApp",
+        "PENDING": "Pending WhatsApp approval",
+        "REJECTED": "Meta rejected the template",
+        "DEFAULT": "Needs WhatsApp approval",
+        "NOT_FOUND": "The template does not exist in the Meta platform."
+      },
+      "TEMPLATE_CREATION": {
+        "SUCCESS_MESSAGE": "WhatsApp template created successfully and sent for approval",
+        "ERROR_MESSAGE": "Failed to create WhatsApp template"
+      },
+      "TEMPLATE_UPDATE_DIALOG": {
+        "TITLE": "Edit survey details",
+        "DESCRIPTION": "We will delete the previous template and make a new one which will be sent again for WhatsApp approval",
+        "CONFIRM": "Create new template",
+        "CANCEL": "Go back"
+      },
       "SURVEY_RULE": {
         "LABEL": "Survey rule",
         "DESCRIPTION_PREFIX": "Send the survey if the conversation",
@@ -819,6 +848,7 @@
         "SELECT_PLACEHOLDER": "select labels"
       },
       "NOTE": "Note: CSAT surveys are sent only once per conversation",
+      "WHATSAPP_NOTE": "Note: We will create a template and send it for WhatsApp approval. After being approved, surveys will be sent only once per conversation as per the survey rule.",
       "API": {
         "SUCCESS_MESSAGE": "CSAT settings updated successfully",
         "ERROR_MESSAGE": "We couldn't update CSAT settings. Please try again later."
diff --git a/app/javascript/dashboard/i18n/locale/hy/search.json b/app/javascript/dashboard/i18n/locale/hy/search.json
index 09c22ae3d..f23a14630 100644
--- a/app/javascript/dashboard/i18n/locale/hy/search.json
+++ b/app/javascript/dashboard/i18n/locale/hy/search.json
@@ -1,7 +1,7 @@
 {
   "SEARCH": {
     "TABS": {
-      "ALL": "All",
+      "ALL": "All results",
       "CONTACTS": "Contacts",
       "CONVERSATIONS": "Conversations",
       "MESSAGES": "Messages",
@@ -19,14 +19,50 @@
     "LOADING_DATA": "Loading",
     "EMPTY_STATE": "No {item} found for query '{query}'",
     "EMPTY_STATE_FULL": "No results found for query '{query}'",
-    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "PLACEHOLDER_KEYBINDING": "/to focus",
     "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "RECENT_SEARCHES": "Recent searches",
+    "CLEAR_ALL": "Clear all",
+    "MOST_RECENT": "Most recent",
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
+    "READ_LESS": "Read less",
     "WROTE": "wrote:",
-    "FROM": "from",
-    "EMAIL": "email",
-    "EMAIL_SUBJECT": "subject"
+    "FROM": "From",
+    "EMAIL": "Email",
+    "EMAIL_SUBJECT": "Subject",
+    "PRIVATE": "Private note",
+    "TRANSCRIPT": "Transcript",
+    "CREATED_AT": "created {time}",
+    "UPDATED_AT": "updated {time}",
+    "SORT_BY": {
+      "RELEVANCE": "Relevance"
+    },
+    "DATE_RANGE": {
+      "LAST_7_DAYS": "Last 7 days",
+      "LAST_30_DAYS": "Last 30 days",
+      "LAST_60_DAYS": "Last 60 days",
+      "LAST_90_DAYS": "Last 90 days",
+      "CUSTOM_RANGE": "Custom range:",
+      "CREATED_BETWEEN": "Created between",
+      "AND": "and",
+      "APPLY": "Apply",
+      "BEFORE_DATE": "Before {date}",
+      "AFTER_DATE": "After {date}",
+      "TIME_RANGE": "Filter by time",
+      "CLEAR_FILTER": "Clear filter"
+    },
+    "FILTERS": {
+      "FILTER_MESSAGE": "Filter messages by:",
+      "FROM": "Sender",
+      "IN": "Inbox",
+      "AGENTS": "Agents",
+      "CONTACTS": "Contacts",
+      "INBOXES": "Inboxes",
+      "NO_AGENTS": "No agents found",
+      "NO_CONTACTS": "Start by searching to see results",
+      "NO_INBOXES": "No inboxes found"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/id/companies.json b/app/javascript/dashboard/i18n/locale/id/companies.json
index 19a384a1b..3a69a8332 100644
--- a/app/javascript/dashboard/i18n/locale/id/companies.json
+++ b/app/javascript/dashboard/i18n/locale/id/companies.json
@@ -6,7 +6,8 @@
       "OPTIONS": {
         "NAME": "Nama",
         "DOMAIN": "Domain",
-        "CREATED_AT": "Dibuat pada"
+        "CREATED_AT": "Dibuat pada",
+        "CONTACTS_COUNT": "Contacts count"
       }
     },
     "ORDER": {
diff --git a/app/javascript/dashboard/i18n/locale/id/contentTemplates.json b/app/javascript/dashboard/i18n/locale/id/contentTemplates.json
index 82385d2de..7745a365b 100644
--- a/app/javascript/dashboard/i18n/locale/id/contentTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/id/contentTemplates.json
@@ -28,6 +28,7 @@
       "TYPES": {
         "MEDIA": "Media",
         "QUICK_REPLY": "Quick Reply",
+        "CALL_TO_ACTION": "Call to Action",
         "TEXT": "Teks"
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/id/conversation.json b/app/javascript/dashboard/i18n/locale/id/conversation.json
index ea751a726..d64dd82b3 100644
--- a/app/javascript/dashboard/i18n/locale/id/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/id/conversation.json
@@ -275,6 +275,16 @@
     "SIDEBAR": {
       "CONTACT": "Kontak",
       "COPILOT": "Copilot"
+    },
+    "VOICE_WIDGET": {
+      "INCOMING_CALL": "Incoming call",
+      "OUTGOING_CALL": "Outgoing call",
+      "CALL_IN_PROGRESS": "Call in progress",
+      "NOT_ANSWERED_YET": "Not answered yet",
+      "HANDLED_IN_ANOTHER_TAB": "Being handled in another tab",
+      "REJECT_CALL": "Reject",
+      "JOIN_CALL": "Join call",
+      "END_CALL": "End call"
     }
   },
   "EMAIL_TRANSCRIPT": {
diff --git a/app/javascript/dashboard/i18n/locale/id/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/id/inboxMgmt.json
index a23411cf0..92df9bee0 100644
--- a/app/javascript/dashboard/i18n/locale/id/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/id/inboxMgmt.json
@@ -808,6 +808,35 @@
         "LABEL": "Pesan",
         "PLACEHOLDER": "Please enter a message to show users with the form"
       },
+      "BUTTON_TEXT": {
+        "LABEL": "Button text",
+        "PLACEHOLDER": "Please rate us"
+      },
+      "LANGUAGE": {
+        "LABEL": "Bahasa",
+        "PLACEHOLDER": "Select template language"
+      },
+      "MESSAGE_PREVIEW": {
+        "LABEL": "Message preview",
+        "TOOLTIP": "This may vary slightly when rendered on WhatsApp's platform."
+      },
+      "TEMPLATE_STATUS": {
+        "APPROVED": "Approved by WhatsApp",
+        "PENDING": "Pending WhatsApp approval",
+        "REJECTED": "Meta rejected the template",
+        "DEFAULT": "Needs WhatsApp approval",
+        "NOT_FOUND": "The template does not exist in the Meta platform."
+      },
+      "TEMPLATE_CREATION": {
+        "SUCCESS_MESSAGE": "WhatsApp template created successfully and sent for approval",
+        "ERROR_MESSAGE": "Failed to create WhatsApp template"
+      },
+      "TEMPLATE_UPDATE_DIALOG": {
+        "TITLE": "Edit survey details",
+        "DESCRIPTION": "We will delete the previous template and make a new one which will be sent again for WhatsApp approval",
+        "CONFIRM": "Create new template",
+        "CANCEL": "Kembali"
+      },
       "SURVEY_RULE": {
         "LABEL": "Survey rule",
         "DESCRIPTION_PREFIX": "Send the survey if the conversation",
@@ -819,6 +848,7 @@
         "SELECT_PLACEHOLDER": "select labels"
       },
       "NOTE": "Note: CSAT surveys are sent only once per conversation",
+      "WHATSAPP_NOTE": "Note: We will create a template and send it for WhatsApp approval. After being approved, surveys will be sent only once per conversation as per the survey rule.",
       "API": {
         "SUCCESS_MESSAGE": "CSAT settings updated successfully",
         "ERROR_MESSAGE": "We couldn't update CSAT settings. Please try again later."
diff --git a/app/javascript/dashboard/i18n/locale/id/search.json b/app/javascript/dashboard/i18n/locale/id/search.json
index f62b6a30d..467781adc 100644
--- a/app/javascript/dashboard/i18n/locale/id/search.json
+++ b/app/javascript/dashboard/i18n/locale/id/search.json
@@ -1,7 +1,7 @@
 {
   "SEARCH": {
     "TABS": {
-      "ALL": "Semua",
+      "ALL": "All results",
       "CONTACTS": "Kontak",
       "CONVERSATIONS": "Percakapan",
       "MESSAGES": "Pesan",
@@ -19,14 +19,50 @@
     "LOADING_DATA": "Loading",
     "EMPTY_STATE": "Tidak ada {item} ditemukan untuk kueri '{query}'",
     "EMPTY_STATE_FULL": "Tidak ada hasil ditemukan untuk kueri '{query}'",
-    "PLACEHOLDER_KEYBINDING": "/ untuk fokus",
+    "PLACEHOLDER_KEYBINDING": "/untuk fokus",
     "INPUT_PLACEHOLDER": "Cari pesan, kontak, atau percakapan",
+    "RECENT_SEARCHES": "Recent searches",
+    "CLEAR_ALL": "Clear all",
+    "MOST_RECENT": "Most recent",
     "EMPTY_STATE_DEFAULT": "Cari dengan ID percakapan, email, nomor telepon, atau pesan untuk hasil pencarian yang lebih baik.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Baca lebih lanjut",
+    "READ_LESS": "Read less",
     "WROTE": "menulis:",
-    "FROM": "dari",
-    "EMAIL": "email",
-    "EMAIL_SUBJECT": "masukkan subjek"
+    "FROM": "Dari",
+    "EMAIL": "Email",
+    "EMAIL_SUBJECT": "Subjek",
+    "PRIVATE": "Private note",
+    "TRANSCRIPT": "Transcript",
+    "CREATED_AT": "created {time}",
+    "UPDATED_AT": "updated {time}",
+    "SORT_BY": {
+      "RELEVANCE": "Relevance"
+    },
+    "DATE_RANGE": {
+      "LAST_7_DAYS": "7 hari terakhir",
+      "LAST_30_DAYS": "30 hari terakhir",
+      "LAST_60_DAYS": "60 hari terakhir",
+      "LAST_90_DAYS": "90 hari terakhir",
+      "CUSTOM_RANGE": "Custom range:",
+      "CREATED_BETWEEN": "Created between",
+      "AND": "and",
+      "APPLY": "Terapkan",
+      "BEFORE_DATE": "Before {date}",
+      "AFTER_DATE": "After {date}",
+      "TIME_RANGE": "Filter by time",
+      "CLEAR_FILTER": "Clear filter"
+    },
+    "FILTERS": {
+      "FILTER_MESSAGE": "Filter messages by:",
+      "FROM": "Pengirim",
+      "IN": "Kotak masuk",
+      "AGENTS": "Agen",
+      "CONTACTS": "Kontak",
+      "INBOXES": "Kotak masuk",
+      "NO_AGENTS": "Tidak ada agen",
+      "NO_CONTACTS": "Start by searching to see results",
+      "NO_INBOXES": "No inboxes found"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/is/companies.json b/app/javascript/dashboard/i18n/locale/is/companies.json
index 3b999b723..c38b7d292 100644
--- a/app/javascript/dashboard/i18n/locale/is/companies.json
+++ b/app/javascript/dashboard/i18n/locale/is/companies.json
@@ -6,7 +6,8 @@
       "OPTIONS": {
         "NAME": "Nafn",
         "DOMAIN": "Lén",
-        "CREATED_AT": "Created at"
+        "CREATED_AT": "Created at",
+        "CONTACTS_COUNT": "Contacts count"
       }
     },
     "ORDER": {
diff --git a/app/javascript/dashboard/i18n/locale/is/contentTemplates.json b/app/javascript/dashboard/i18n/locale/is/contentTemplates.json
index ce5ab5aad..138505458 100644
--- a/app/javascript/dashboard/i18n/locale/is/contentTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/is/contentTemplates.json
@@ -28,6 +28,7 @@
       "TYPES": {
         "MEDIA": "Media",
         "QUICK_REPLY": "Quick Reply",
+        "CALL_TO_ACTION": "Call to Action",
         "TEXT": "Text"
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/is/conversation.json b/app/javascript/dashboard/i18n/locale/is/conversation.json
index 7c5b443ed..3f42732c9 100644
--- a/app/javascript/dashboard/i18n/locale/is/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/is/conversation.json
@@ -275,6 +275,16 @@
     "SIDEBAR": {
       "CONTACT": "Contact",
       "COPILOT": "Copilot"
+    },
+    "VOICE_WIDGET": {
+      "INCOMING_CALL": "Incoming call",
+      "OUTGOING_CALL": "Outgoing call",
+      "CALL_IN_PROGRESS": "Call in progress",
+      "NOT_ANSWERED_YET": "Not answered yet",
+      "HANDLED_IN_ANOTHER_TAB": "Being handled in another tab",
+      "REJECT_CALL": "Reject",
+      "JOIN_CALL": "Join call",
+      "END_CALL": "End call"
     }
   },
   "EMAIL_TRANSCRIPT": {
diff --git a/app/javascript/dashboard/i18n/locale/is/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/is/inboxMgmt.json
index 2ee41a20f..e545296a7 100644
--- a/app/javascript/dashboard/i18n/locale/is/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/is/inboxMgmt.json
@@ -808,6 +808,35 @@
         "LABEL": "Skilaboð",
         "PLACEHOLDER": "Please enter a message to show users with the form"
       },
+      "BUTTON_TEXT": {
+        "LABEL": "Button text",
+        "PLACEHOLDER": "Please rate us"
+      },
+      "LANGUAGE": {
+        "LABEL": "Language",
+        "PLACEHOLDER": "Select template language"
+      },
+      "MESSAGE_PREVIEW": {
+        "LABEL": "Message preview",
+        "TOOLTIP": "This may vary slightly when rendered on WhatsApp's platform."
+      },
+      "TEMPLATE_STATUS": {
+        "APPROVED": "Approved by WhatsApp",
+        "PENDING": "Pending WhatsApp approval",
+        "REJECTED": "Meta rejected the template",
+        "DEFAULT": "Needs WhatsApp approval",
+        "NOT_FOUND": "The template does not exist in the Meta platform."
+      },
+      "TEMPLATE_CREATION": {
+        "SUCCESS_MESSAGE": "WhatsApp template created successfully and sent for approval",
+        "ERROR_MESSAGE": "Failed to create WhatsApp template"
+      },
+      "TEMPLATE_UPDATE_DIALOG": {
+        "TITLE": "Edit survey details",
+        "DESCRIPTION": "We will delete the previous template and make a new one which will be sent again for WhatsApp approval",
+        "CONFIRM": "Create new template",
+        "CANCEL": "Go back"
+      },
       "SURVEY_RULE": {
         "LABEL": "Survey rule",
         "DESCRIPTION_PREFIX": "Send the survey if the conversation",
@@ -819,6 +848,7 @@
         "SELECT_PLACEHOLDER": "select labels"
       },
       "NOTE": "Note: CSAT surveys are sent only once per conversation",
+      "WHATSAPP_NOTE": "Note: We will create a template and send it for WhatsApp approval. After being approved, surveys will be sent only once per conversation as per the survey rule.",
       "API": {
         "SUCCESS_MESSAGE": "CSAT settings updated successfully",
         "ERROR_MESSAGE": "We couldn't update CSAT settings. Please try again later."
diff --git a/app/javascript/dashboard/i18n/locale/is/search.json b/app/javascript/dashboard/i18n/locale/is/search.json
index 794166710..20231817c 100644
--- a/app/javascript/dashboard/i18n/locale/is/search.json
+++ b/app/javascript/dashboard/i18n/locale/is/search.json
@@ -1,7 +1,7 @@
 {
   "SEARCH": {
     "TABS": {
-      "ALL": "Allt",
+      "ALL": "All results",
       "CONTACTS": "Tengiliðir",
       "CONVERSATIONS": "Samtöl",
       "MESSAGES": "Skilaboð",
@@ -19,14 +19,50 @@
     "LOADING_DATA": "Loading",
     "EMPTY_STATE": "No {item} found for query '{query}'",
     "EMPTY_STATE_FULL": "No results found for query '{query}'",
-    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "PLACEHOLDER_KEYBINDING": "/to focus",
     "INPUT_PLACEHOLDER": "Search messages, contacts or conversations",
+    "RECENT_SEARCHES": "Recent searches",
+    "CLEAR_ALL": "Clear all",
+    "MOST_RECENT": "Most recent",
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
+    "READ_LESS": "Read less",
     "WROTE": "wrote:",
-    "FROM": "frá",
-    "EMAIL": "tölvupóstfang",
-    "EMAIL_SUBJECT": "viðfangsefni"
+    "FROM": "From",
+    "EMAIL": "Tölvupóstfang",
+    "EMAIL_SUBJECT": "Subject",
+    "PRIVATE": "Private note",
+    "TRANSCRIPT": "Transcript",
+    "CREATED_AT": "created {time}",
+    "UPDATED_AT": "updated {time}",
+    "SORT_BY": {
+      "RELEVANCE": "Relevance"
+    },
+    "DATE_RANGE": {
+      "LAST_7_DAYS": "Síðustu 7 daga",
+      "LAST_30_DAYS": "Síðustu 30 daga",
+      "LAST_60_DAYS": "Síðustu 60 daga",
+      "LAST_90_DAYS": "Síðustu 90 daga",
+      "CUSTOM_RANGE": "Custom range:",
+      "CREATED_BETWEEN": "Created between",
+      "AND": "and",
+      "APPLY": "Apply",
+      "BEFORE_DATE": "Before {date}",
+      "AFTER_DATE": "After {date}",
+      "TIME_RANGE": "Filter by time",
+      "CLEAR_FILTER": "Clear filter"
+    },
+    "FILTERS": {
+      "FILTER_MESSAGE": "Filter messages by:",
+      "FROM": "Sender",
+      "IN": "Innhólf",
+      "AGENTS": "Þjónustufulltrúar",
+      "CONTACTS": "Tengiliðir",
+      "INBOXES": "Innhólf",
+      "NO_AGENTS": "Engir þjónustufulltrúar fundust",
+      "NO_CONTACTS": "Start by searching to see results",
+      "NO_INBOXES": "No inboxes found"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/it/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/it/attributesMgmt.json
index 92180f86f..f23da232a 100644
--- a/app/javascript/dashboard/i18n/locale/it/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/it/attributesMgmt.json
@@ -132,7 +132,7 @@
     },
     "BADGES": {
       "PRE_CHAT": "Pre-chat",
-      "RESOLUTION": "Resolution"
+      "RESOLUTION": "Risoluzione"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/it/chatlist.json b/app/javascript/dashboard/i18n/locale/it/chatlist.json
index 5e748eafd..0e0c7f597 100644
--- a/app/javascript/dashboard/i18n/locale/it/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/it/chatlist.json
@@ -104,7 +104,7 @@
         "CONTENT": "Contatto condiviso"
       },
       "embed": {
-        "CONTENT": "Embedded content"
+        "CONTENT": "Contenuto embeddato"
       }
     },
     "CHAT_SORT_BY_FILTER": {
diff --git a/app/javascript/dashboard/i18n/locale/it/companies.json b/app/javascript/dashboard/i18n/locale/it/companies.json
index 4f241178c..96c4d3823 100644
--- a/app/javascript/dashboard/i18n/locale/it/companies.json
+++ b/app/javascript/dashboard/i18n/locale/it/companies.json
@@ -6,7 +6,8 @@
       "OPTIONS": {
         "NAME": "Nome",
         "DOMAIN": "Dominio",
-        "CREATED_AT": "Creata alle"
+        "CREATED_AT": "Creata alle",
+        "CONTACTS_COUNT": "Contacts count"
       }
     },
     "ORDER": {
diff --git a/app/javascript/dashboard/i18n/locale/it/contact.json b/app/javascript/dashboard/i18n/locale/it/contact.json
index 0b0436cd7..710a694cf 100644
--- a/app/javascript/dashboard/i18n/locale/it/contact.json
+++ b/app/javascript/dashboard/i18n/locale/it/contact.json
@@ -458,7 +458,7 @@
             "PLACEHOLDER": "Aggiungi Instagram"
           },
           "TIKTOK": {
-            "PLACEHOLDER": "Add TikTok"
+            "PLACEHOLDER": "Aggiungi TikTok"
           },
           "LINKEDIN": {
             "PLACEHOLDER": "Aggiungi LinkedIn"
@@ -607,7 +607,7 @@
       "NO_INBOX_ALERT": "Non ci sono inbox disponibili per avviare una conversazione con questo contatto.",
       "CONTACT_SELECTOR": {
         "LABEL": "A:",
-        "TAG_INPUT_PLACEHOLDER": "Cerca un contatto con nome, email o numero di telefono",
+        "TAG_INPUT_PLACEHOLDER": "Cerca un contatto tramite nome, email o numero di telefono",
         "CONTACT_CREATING": "Creazione contatto..."
       },
       "INBOX_SELECTOR": {
diff --git a/app/javascript/dashboard/i18n/locale/it/contentTemplates.json b/app/javascript/dashboard/i18n/locale/it/contentTemplates.json
index 76b77eaf9..57c5ce52b 100644
--- a/app/javascript/dashboard/i18n/locale/it/contentTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/it/contentTemplates.json
@@ -28,6 +28,7 @@
       "TYPES": {
         "MEDIA": "Media",
         "QUICK_REPLY": "Risposta Rapida",
+        "CALL_TO_ACTION": "Call to Action",
         "TEXT": "Testo"
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/it/conversation.json b/app/javascript/dashboard/i18n/locale/it/conversation.json
index 671608908..fdc691c0e 100644
--- a/app/javascript/dashboard/i18n/locale/it/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/it/conversation.json
@@ -275,6 +275,16 @@
     "SIDEBAR": {
       "CONTACT": "Contatto",
       "COPILOT": "Copilot"
+    },
+    "VOICE_WIDGET": {
+      "INCOMING_CALL": "Chiamata in arrivo",
+      "OUTGOING_CALL": "Chiamata in uscita",
+      "CALL_IN_PROGRESS": "Chiamata in corso",
+      "NOT_ANSWERED_YET": "Non ancora risposta",
+      "HANDLED_IN_ANOTHER_TAB": "Gestita in un'altra scheda",
+      "REJECT_CALL": "Rifiuta",
+      "JOIN_CALL": "Entra nella chiamata",
+      "END_CALL": "Termina chiamata"
     }
   },
   "EMAIL_TRANSCRIPT": {
diff --git a/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json
index 8a90c7956..0963fd3f3 100644
--- a/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json
@@ -58,11 +58,11 @@
         "DUPLICATE_INBOX_BANNER": "Questo account Instagram è stato migrato alla nuova Inbox del canale Instagram. Non sarai più in grado di inviare/ricevere messaggi Instagram da questa Inbox."
       },
       "TIKTOK": {
-        "CONTINUE_WITH_TIKTOK": "Continue with TikTok",
-        "CONNECT_YOUR_TIKTOK_PROFILE": "Connect your TikTok Profile",
-        "HELP": "To add your TikTok profile as a channel, you need to authenticate your TikTok Profile by clicking on 'Continue with TikTok' ",
-        "ERROR_MESSAGE": "There was an error connecting to TikTok, please try again",
-        "ERROR_AUTH": "There was an error connecting to TikTok, please try again"
+        "CONTINUE_WITH_TIKTOK": "Continua con TikTok",
+        "CONNECT_YOUR_TIKTOK_PROFILE": "Connetti il tuo profilo TikTok",
+        "HELP": "Per aggiungere il tuo profilo TikTok come canale, devi autenticare il tuo profilo TikTok cliccando su 'Continua con TikTok' ",
+        "ERROR_MESSAGE": "Si è verificato un errore nella connessione a TikTok, riprova",
+        "ERROR_AUTH": "Si è verificato un errore nella connessione a TikTok, riprova"
       },
       "TWITTER": {
         "HELP": "Per aggiungere il tuo profilo Twitter come canale, devi autenticare il tuo profilo Twitter cliccando su 'Accedi con Twitter' ",
@@ -480,7 +480,7 @@
           },
           "TIKTOK": {
             "TITLE": "TikTok",
-            "DESCRIPTION": "Connect your TikTok account"
+            "DESCRIPTION": "Collega il tuo account TikTok"
           },
           "VOICE": {
             "TITLE": "Voce",
@@ -690,7 +690,7 @@
     },
     "SETTINGS_POPUP": {
       "MESSENGER_HEADING": "Script Messenger",
-      "MESSENGER_SUB_HEAD": "Posiziona questo pulsante all'interno del tuo tag body",
+      "MESSENGER_SUB_HEAD": "Incolla questo script alla fine del tag body",
       "ALLOWED_DOMAINS": {
         "TITLE": "Domini Consentiti",
         "SUBTITLE": "Aggiungi caratteri jolly o domini regolari separati da virgole (lasciare vuoto per consentire tutti), ad esempio *.chatwoot.dev, chatwoot.com.",
@@ -808,6 +808,35 @@
         "LABEL": "Messaggio",
         "PLACEHOLDER": "Inserisci un messaggio per mostrare gli utenti con il modulo"
       },
+      "BUTTON_TEXT": {
+        "LABEL": "Testo pulsante",
+        "PLACEHOLDER": "Lascia una valutazione"
+      },
+      "LANGUAGE": {
+        "LABEL": "Lingua",
+        "PLACEHOLDER": "Seleziona la lingua del modello"
+      },
+      "MESSAGE_PREVIEW": {
+        "LABEL": "Anteprima messaggio",
+        "TOOLTIP": "Può variare leggermente quando visualizzato sulle app di WhatsApp."
+      },
+      "TEMPLATE_STATUS": {
+        "APPROVED": "Approvato da WhatsApp",
+        "PENDING": "In attesa di approvazione da WhatsApp",
+        "REJECTED": "Meta ha rifiutato il modello",
+        "DEFAULT": "Richiede l'approvazione di WhatsApp",
+        "NOT_FOUND": "Il modello non esiste nella piattaforma Meta."
+      },
+      "TEMPLATE_CREATION": {
+        "SUCCESS_MESSAGE": "Modello WhatsApp creato con successo e inviato per l'approvazione",
+        "ERROR_MESSAGE": "Creazione del modello WhatsApp non riuscita"
+      },
+      "TEMPLATE_UPDATE_DIALOG": {
+        "TITLE": "Modifica dettagli sondaggio",
+        "DESCRIPTION": "Elimineremo il modello precedente e ne creeremo uno nuovo che verrà inviato di nuovo per l'approvazione da WhatsApp",
+        "CONFIRM": "Crea nuovo modello",
+        "CANCEL": "Torna indietro"
+      },
       "SURVEY_RULE": {
         "LABEL": "Regola sondaggio",
         "DESCRIPTION_PREFIX": "Invia il sondaggio se la conversazione",
@@ -819,6 +848,7 @@
         "SELECT_PLACEHOLDER": "seleziona etichette"
       },
       "NOTE": "Nota: I sondaggi CSAT vengono inviati solo una volta per conversazione",
+      "WHATSAPP_NOTE": "Nota: Creeremo un modello e lo invieremo a WhatsApp per l'approvazione. Dopo essere stati approvati, i sondaggi saranno inviati solo una volta per conversazione, in base alle regole dei sondaggi.",
       "API": {
         "SUCCESS_MESSAGE": "Impostazioni CSAT aggiornate correttamente",
         "ERROR_MESSAGE": "Impossibile aggiornare le impostazioni CSAT. Riprova più tardi."
@@ -845,7 +875,7 @@
     "IMAP": {
       "TITLE": "IMAP",
       "SUBTITLE": "Imposta i dettagli IMAP",
-      "NOTE_TEXT": "Per abilitare SMTP, configurare IMAP.",
+      "NOTE_TEXT": "Prima di abilitare SMTP, configura IMAP.",
       "UPDATE": "Aggiorna impostazioni IMAP",
       "TOGGLE_AVAILABILITY": "Abilita la configurazione IMAP per questa Inbox",
       "TOGGLE_HELP": "Abilitare IMAP aiuterà l'utente a ricevere email",
@@ -854,7 +884,7 @@
         "ERROR_MESSAGE": "Impossibile aggiornare le impostazioni IMAP"
       },
       "ADDRESS": {
-        "LABEL": "Indirizzo",
+        "LABEL": "Indirizzo server IMAP",
         "PLACE_HOLDER": "Indirizzo (ad esempio: imap.gmail.com)"
       },
       "PORT": {
@@ -862,8 +892,8 @@
         "PLACE_HOLDER": "Porta"
       },
       "LOGIN": {
-        "LABEL": "Accedi",
-        "PLACE_HOLDER": "Accedi"
+        "LABEL": "Indirizzo email",
+        "PLACE_HOLDER": "Indirizzo email"
       },
       "PASSWORD": {
         "LABEL": "Password",
@@ -886,7 +916,7 @@
         "ERROR_MESSAGE": "Impossibile aggiornare le impostazioni SMTP"
       },
       "ADDRESS": {
-        "LABEL": "Indirizzo",
+        "LABEL": "Indirizzo server SMTP",
         "PLACE_HOLDER": "Indirizzo (ad esempio: smtp.gmail.com)"
       },
       "PORT": {
@@ -894,8 +924,8 @@
         "PLACE_HOLDER": "Porta"
       },
       "LOGIN": {
-        "LABEL": "Accedi",
-        "PLACE_HOLDER": "Accedi"
+        "LABEL": "Indirizzo email",
+        "PLACE_HOLDER": "Indirizzo email"
       },
       "PASSWORD": {
         "LABEL": "Password",
@@ -908,7 +938,7 @@
       "ENCRYPTION": "Cifratura",
       "SSL_TLS": "SSL/TLS",
       "START_TLS": "STARTTLS",
-      "OPEN_SSL_VERIFY_MODE": "Apri modalità di verifica SSL",
+      "OPEN_SSL_VERIFY_MODE": "Modalità di verifica SSL",
       "AUTH_MECHANISM": "Autenticazione"
     },
     "NOTE": "Nota: ",
diff --git a/app/javascript/dashboard/i18n/locale/it/search.json b/app/javascript/dashboard/i18n/locale/it/search.json
index 13de2d956..f5ae0f026 100644
--- a/app/javascript/dashboard/i18n/locale/it/search.json
+++ b/app/javascript/dashboard/i18n/locale/it/search.json
@@ -1,7 +1,7 @@
 {
   "SEARCH": {
     "TABS": {
-      "ALL": "Tutti",
+      "ALL": "Tutti i risultati",
       "CONTACTS": "Contatti",
       "CONVERSATIONS": "Conversazioni",
       "MESSAGES": "Messaggi",
@@ -19,14 +19,50 @@
     "LOADING_DATA": "Caricamento",
     "EMPTY_STATE": "Nessun {item} trovato per la ricerca '{query}'",
     "EMPTY_STATE_FULL": "Nessun risultato trovato per la ricerca '{query}'",
-    "PLACEHOLDER_KEYBINDING": "/ per evidenziare",
+    "PLACEHOLDER_KEYBINDING": "/per evidenziare",
     "INPUT_PLACEHOLDER": "Digita 3 o più caratteri da cercare",
+    "RECENT_SEARCHES": "Ricerche recenti",
+    "CLEAR_ALL": "Rimuovi tutto",
+    "MOST_RECENT": "Più recenti",
     "EMPTY_STATE_DEFAULT": "Ricerca per id conversazione, email, numero di telefono, messaggi per risultati di ricerca migliori. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Leggi di più",
+    "READ_LESS": "Leggi meno",
     "WROTE": "ha scritto:",
-    "FROM": "da",
-    "EMAIL": "email",
-    "EMAIL_SUBJECT": "oggetto"
+    "FROM": "Da",
+    "EMAIL": "Email",
+    "EMAIL_SUBJECT": "Oggetto",
+    "PRIVATE": "Nota Privata",
+    "TRANSCRIPT": "Trascrizione",
+    "CREATED_AT": "creato {time}",
+    "UPDATED_AT": "aggiornato {time}",
+    "SORT_BY": {
+      "RELEVANCE": "Rilevanza"
+    },
+    "DATE_RANGE": {
+      "LAST_7_DAYS": "Ultimi 7 giorni",
+      "LAST_30_DAYS": "Ultimi 30 giorni",
+      "LAST_60_DAYS": "Ultimi 60 giorni",
+      "LAST_90_DAYS": "Ultimi 90 giorni",
+      "CUSTOM_RANGE": "Range personalizzato:",
+      "CREATED_BETWEEN": "Creato tra",
+      "AND": "e",
+      "APPLY": "Applica",
+      "BEFORE_DATE": "Prima del {date}",
+      "AFTER_DATE": "Dopo il {date}",
+      "TIME_RANGE": "Filtra per orario",
+      "CLEAR_FILTER": "Rimuovi filtro"
+    },
+    "FILTERS": {
+      "FILTER_MESSAGE": "Filtra i messaggi per:",
+      "FROM": "Mittente",
+      "IN": "Inbox",
+      "AGENTS": "Operatori",
+      "CONTACTS": "Contatti",
+      "INBOXES": "Inbox",
+      "NO_AGENTS": "Nessun operatore trovato",
+      "NO_CONTACTS": "Avvia una ricerca per vedere risultati",
+      "NO_INBOXES": "Nessuna Inbox trovata"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/it/yearInReview.json b/app/javascript/dashboard/i18n/locale/it/yearInReview.json
index dc0209aed..d1bef2095 100644
--- a/app/javascript/dashboard/i18n/locale/it/yearInReview.json
+++ b/app/javascript/dashboard/i18n/locale/it/yearInReview.json
@@ -1,63 +1,63 @@
 {
   "YEAR_IN_REVIEW": {
     "TITLE": "Year in Review",
-    "LOADING": "Loading your year in review...",
-    "ERROR": "Failed to load year in review",
+    "LOADING": "Caricamento del tuo Year in Review...",
+    "ERROR": "Impossibile caricare lo Year in Review",
     "CLOSE": "Chiudi",
     "CONVERSATIONS": {
-      "TITLE": "You have handled",
+      "TITLE": "Hai gestito",
       "SUBTITLE": "conversazioni",
-      "FALLBACK": "This year wasn't about the numbers. It was about showing up.",
+      "FALLBACK": "Quest’anno non contavano i numeri. Contava esserci.",
       "COMPARISON": {
-        "0_50": "You showed up, and that's how every good inbox begins.",
-        "50_100": "You kept the replies flowing and the conversations alive.",
-        "100_500": "You handled serious volume and kept everything on track.",
-        "500_2000": "You kept things moving while the volume kept climbing.",
-        "2000_10000": "You ran high traffic through your inbox without breaking a sweat.",
-        "10000_PLUS": "That's a full city of customers knocking on your door. You made it look effortless."
+        "0_50": "Ti sei fatto trovare pronto. È così che nasce ogni inbox che si rispetti.",
+        "50_100": "Hai tenuto le risposte in movimento e le conversazioni ben vive.",
+        "100_500": "Hai gestito un bel po’ di traffico senza perdere il controllo.",
+        "500_2000": "Tutto è andato avanti, anche mentre il volume saliva.",
+        "2000_10000": "Hai fatto passare un traffico da ora di punta senza sudare.",
+        "10000_PLUS": "Una città intera di clienti che bussa alla porta. Tu? Tutto liscio come niente."
       }
     },
     "BUSIEST_DAY": {
-      "TITLE": "Your busiest day was",
-      "MESSAGE": "{count} conversations that day.",
+      "TITLE": "Il tuo giorno più intenso è stato",
+      "MESSAGE": "{count} conversazioni quel giorno.",
       "COMPARISON": {
-        "0_5": "A warm-up lap that barely woke the inbox.",
-        "5_10": "Enough action to justify a second cup of coffee.",
-        "10_25": "Things got busy and the inbox stayed on its toes.",
-        "25_50": "A proper rush that barely broke a sweat.",
-        "50_100": "Controlled chaos, handled like a normal Tuesday.",
-        "100_500": "Absolute dumpster fire, somehow still shipping replies.",
-        "500_PLUS": "The inbox lost all chill and never slowed down."
+        "0_5": "Un giro di riscaldamento. L’inbox quasi non se n’è accorta.",
+        "5_10": "Abbastanza azione da giustificare un secondo caffè.",
+        "10_25": "Il ritmo è salito e l’inbox è rimasta sull’attenti.",
+        "25_50": "Una vera corsa, ma senza neanche sudare.",
+        "50_100": "Caos controllato, gestito come fosse un martedì qualunque.",
+        "100_500": "Un incendio totale. Eppure le risposte continuavano a partire.",
+        "500_PLUS": "L’inbox ha perso ogni calma e non ha mai rallentato."
       }
     },
     "PERSONALITY": {
-      "TITLE": "Your support personality is",
+      "TITLE": "Il tuo stile di supporto è",
       "MESSAGES": {
-        "SWIFT_HELPER": "You replied in {time} on average. Faster than most notifications.",
-        "QUICK_RESPONDER": "You replied in {time} on average. The inbox barely waited.",
-        "STEADY_SUPPORT": "You replied in {time} on average. Calm pace, solid replies.",
-        "THOUGHTFUL_ADVISOR": "You replied in {time} on average. Took the time to get it right."
+        "SWIFT_HELPER": "In media hai risposto in {time}. Più veloce della maggior parte delle notifiche.",
+        "QUICK_RESPONDER": "In media hai risposto in {time}. L’inbox non ha quasi mai aspettato.",
+        "STEADY_SUPPORT": "In media hai risposto in {time}. Ritmo tranquillo, risposte solide.",
+        "THOUGHTFUL_ADVISOR": "In media hai risposto in {time}. Il tempo giusto per fare le cose per bene."
       }
     },
     "THANK_YOU": {
-      "TITLE": "Congratulations on surviving the inbox of {year}.",
-      "MESSAGE": "Thank you for your incredible dedication to supporting customers throughout this year. Your hard work has made a real difference, and we're grateful to have you on this journey. Here's to making {nextYear} even better together!"
+      "TITLE": "Congratulazioni per essere sopravvissuto all’inbox del {year}.",
+      "MESSAGE": "Grazie per la dedizione incredibile con cui hai supportato i clienti durante quest’anno. Il tuo lavoro ha fatto davvero la differenza e siamo felici di averti in questo viaggio. Rendiamo il {nextYear} ancora migliore, insieme!"
     },
     "SHARE_MODAL": {
-      "TITLE": "Share Your Year in Review",
-      "PREPARING": "Preparing your image...",
+      "TITLE": "Condividi il tuo Year in Review",
+      "PREPARING": "Preparazione dell'immagine...",
       "DOWNLOAD": "Scarica",
-      "SHARE_TITLE": "My {year} Year in Review",
-      "SHARE_TEXT": "Check out my {year} Year in Review with Chatwoot!",
-      "BRANDING": "Made with Chatwoot"
+      "SHARE_TITLE": "Il mio Year in Review {year}",
+      "SHARE_TEXT": "Dai un'occhiata al mio Year in Review {year} con Chatwoot!",
+      "BRANDING": "Realizzato con Chatwoot"
     },
     "BANNER": {
-      "TITLE": "Your {year} Year in Review is here",
-      "BUTTON": "See your impact"
+      "TITLE": "Il tuo Year in Review {year} è qui",
+      "BUTTON": "Vedi il tuo impatto"
     },
     "NAVIGATION": {
-      "PREVIOUS": "Previous",
-      "NEXT": "Next",
+      "PREVIOUS": "Precedente",
+      "NEXT": "Successivo",
       "SHARE": "Condividi conversazione"
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/ja/companies.json b/app/javascript/dashboard/i18n/locale/ja/companies.json
index 575cf93e2..591e5fe26 100644
--- a/app/javascript/dashboard/i18n/locale/ja/companies.json
+++ b/app/javascript/dashboard/i18n/locale/ja/companies.json
@@ -6,7 +6,8 @@
       "OPTIONS": {
         "NAME": "名前",
         "DOMAIN": "ドメイン",
-        "CREATED_AT": "作成日時"
+        "CREATED_AT": "作成日時",
+        "CONTACTS_COUNT": "Contacts count"
       }
     },
     "ORDER": {
diff --git a/app/javascript/dashboard/i18n/locale/ja/contentTemplates.json b/app/javascript/dashboard/i18n/locale/ja/contentTemplates.json
index 2cbbf06de..99d2e51a6 100644
--- a/app/javascript/dashboard/i18n/locale/ja/contentTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/ja/contentTemplates.json
@@ -28,6 +28,7 @@
       "TYPES": {
         "MEDIA": "Media",
         "QUICK_REPLY": "Quick Reply",
+        "CALL_TO_ACTION": "Call to Action",
         "TEXT": "テキスト"
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/ja/conversation.json b/app/javascript/dashboard/i18n/locale/ja/conversation.json
index 4c17a0120..f24d8f208 100644
--- a/app/javascript/dashboard/i18n/locale/ja/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ja/conversation.json
@@ -275,6 +275,16 @@
     "SIDEBAR": {
       "CONTACT": "連絡先",
       "COPILOT": "コパイロット"
+    },
+    "VOICE_WIDGET": {
+      "INCOMING_CALL": "Incoming call",
+      "OUTGOING_CALL": "Outgoing call",
+      "CALL_IN_PROGRESS": "Call in progress",
+      "NOT_ANSWERED_YET": "Not answered yet",
+      "HANDLED_IN_ANOTHER_TAB": "Being handled in another tab",
+      "REJECT_CALL": "Reject",
+      "JOIN_CALL": "Join call",
+      "END_CALL": "End call"
     }
   },
   "EMAIL_TRANSCRIPT": {
diff --git a/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json
index 844c1e512..bbc4a0d30 100644
--- a/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json
@@ -808,6 +808,35 @@
         "LABEL": "メッセージ",
         "PLACEHOLDER": "Please enter a message to show users with the form"
       },
+      "BUTTON_TEXT": {
+        "LABEL": "Button text",
+        "PLACEHOLDER": "Please rate us"
+      },
+      "LANGUAGE": {
+        "LABEL": "言語",
+        "PLACEHOLDER": "Select template language"
+      },
+      "MESSAGE_PREVIEW": {
+        "LABEL": "Message preview",
+        "TOOLTIP": "This may vary slightly when rendered on WhatsApp's platform."
+      },
+      "TEMPLATE_STATUS": {
+        "APPROVED": "Approved by WhatsApp",
+        "PENDING": "Pending WhatsApp approval",
+        "REJECTED": "Meta rejected the template",
+        "DEFAULT": "Needs WhatsApp approval",
+        "NOT_FOUND": "The template does not exist in the Meta platform."
+      },
+      "TEMPLATE_CREATION": {
+        "SUCCESS_MESSAGE": "WhatsApp template created successfully and sent for approval",
+        "ERROR_MESSAGE": "Failed to create WhatsApp template"
+      },
+      "TEMPLATE_UPDATE_DIALOG": {
+        "TITLE": "Edit survey details",
+        "DESCRIPTION": "We will delete the previous template and make a new one which will be sent again for WhatsApp approval",
+        "CONFIRM": "Create new template",
+        "CANCEL": "戻る"
+      },
       "SURVEY_RULE": {
         "LABEL": "Survey rule",
         "DESCRIPTION_PREFIX": "Send the survey if the conversation",
@@ -819,6 +848,7 @@
         "SELECT_PLACEHOLDER": "select labels"
       },
       "NOTE": "Note: CSAT surveys are sent only once per conversation",
+      "WHATSAPP_NOTE": "Note: We will create a template and send it for WhatsApp approval. After being approved, surveys will be sent only once per conversation as per the survey rule.",
       "API": {
         "SUCCESS_MESSAGE": "CSAT settings updated successfully",
         "ERROR_MESSAGE": "We couldn't update CSAT settings. Please try again later."
diff --git a/app/javascript/dashboard/i18n/locale/ja/search.json b/app/javascript/dashboard/i18n/locale/ja/search.json
index 6d9e388d6..9ad632459 100644
--- a/app/javascript/dashboard/i18n/locale/ja/search.json
+++ b/app/javascript/dashboard/i18n/locale/ja/search.json
@@ -1,7 +1,7 @@
 {
   "SEARCH": {
     "TABS": {
-      "ALL": "すべて",
+      "ALL": "All results",
       "CONTACTS": "連絡先",
       "CONVERSATIONS": "会話データ",
       "MESSAGES": "メッセージ",
@@ -19,14 +19,50 @@
     "LOADING_DATA": "読み込み中",
     "EMPTY_STATE": "{item} がクエリ '{query}' に対して見つかりませんでした。",
     "EMPTY_STATE_FULL": "クエリ '{query}' に対して結果が見つかりませんでした。",
-    "PLACEHOLDER_KEYBINDING": "/ を押してフォーカス",
+    "PLACEHOLDER_KEYBINDING": "/を押してフォーカス",
     "INPUT_PLACEHOLDER": "検索するには3文字以上入力してください",
+    "RECENT_SEARCHES": "Recent searches",
+    "CLEAR_ALL": "すべてクリア",
+    "MOST_RECENT": "Most recent",
     "EMPTY_STATE_DEFAULT": "会話ID、メール、電話番号、メッセージで検索すると、より良い検索結果が得られます。",
     "BOT_LABEL": "ボット",
     "READ_MORE": "さらに読む",
+    "READ_LESS": "Read less",
     "WROTE": "書き込み:",
     "FROM": "差出人:",
-    "EMAIL": "eメール",
-    "EMAIL_SUBJECT": "件名を入力してください"
+    "EMAIL": "Eメール",
+    "EMAIL_SUBJECT": "件名",
+    "PRIVATE": "Private note",
+    "TRANSCRIPT": "Transcript",
+    "CREATED_AT": "{time} に作成",
+    "UPDATED_AT": "updated {time}",
+    "SORT_BY": {
+      "RELEVANCE": "Relevance"
+    },
+    "DATE_RANGE": {
+      "LAST_7_DAYS": "過去3か月",
+      "LAST_30_DAYS": "過去6か月",
+      "LAST_60_DAYS": "過去 60 日間",
+      "LAST_90_DAYS": "過去 90 日間",
+      "CUSTOM_RANGE": "Custom range:",
+      "CREATED_BETWEEN": "Created between",
+      "AND": "と",
+      "APPLY": "適用",
+      "BEFORE_DATE": "Before {date}",
+      "AFTER_DATE": "After {date}",
+      "TIME_RANGE": "Filter by time",
+      "CLEAR_FILTER": "フィルターをクリア"
+    },
+    "FILTERS": {
+      "FILTER_MESSAGE": "Filter messages by:",
+      "FROM": "Sender",
+      "IN": "受信トレイ",
+      "AGENTS": "担当者",
+      "CONTACTS": "連絡先",
+      "INBOXES": "受信トレイ",
+      "NO_AGENTS": "担当者が見つかりません",
+      "NO_CONTACTS": "Start by searching to see results",
+      "NO_INBOXES": "No inboxes found"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ka/companies.json b/app/javascript/dashboard/i18n/locale/ka/companies.json
index 548fec562..0eee6cb42 100644
--- a/app/javascript/dashboard/i18n/locale/ka/companies.json
+++ b/app/javascript/dashboard/i18n/locale/ka/companies.json
@@ -6,7 +6,8 @@
       "OPTIONS": {
         "NAME": "Name",
         "DOMAIN": "Domain",
-        "CREATED_AT": "Created at"
+        "CREATED_AT": "Created at",
+        "CONTACTS_COUNT": "Contacts count"
       }
     },
     "ORDER": {
diff --git a/app/javascript/dashboard/i18n/locale/ka/contentTemplates.json b/app/javascript/dashboard/i18n/locale/ka/contentTemplates.json
index a9b1d54c4..79c2c8c64 100644
--- a/app/javascript/dashboard/i18n/locale/ka/contentTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/ka/contentTemplates.json
@@ -28,6 +28,7 @@
       "TYPES": {
         "MEDIA": "Media",
         "QUICK_REPLY": "Quick Reply",
+        "CALL_TO_ACTION": "Call to Action",
         "TEXT": "Text"
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/ka/conversation.json b/app/javascript/dashboard/i18n/locale/ka/conversation.json
index b31fbb0d2..3e0ebeda4 100644
--- a/app/javascript/dashboard/i18n/locale/ka/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ka/conversation.json
@@ -275,6 +275,16 @@
     "SIDEBAR": {
       "CONTACT": "Contact",
       "COPILOT": "Copilot"
+    },
+    "VOICE_WIDGET": {
+      "INCOMING_CALL": "შემომავალი ზარი",
+      "OUTGOING_CALL": "გამავალი ზარი",
+      "CALL_IN_PROGRESS": "ზარი მიმდინარეობს",
+      "NOT_ANSWERED_YET": "ჯერ არ უპასუხიათ",
+      "HANDLED_IN_ANOTHER_TAB": "Being handled in another tab",
+      "REJECT_CALL": "Reject",
+      "JOIN_CALL": "Join call",
+      "END_CALL": "End call"
     }
   },
   "EMAIL_TRANSCRIPT": {
diff --git a/app/javascript/dashboard/i18n/locale/ka/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ka/inboxMgmt.json
index e2d947db7..e4acfe9a0 100644
--- a/app/javascript/dashboard/i18n/locale/ka/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ka/inboxMgmt.json
@@ -808,6 +808,35 @@
         "LABEL": "Message",
         "PLACEHOLDER": "Please enter a message to show users with the form"
       },
+      "BUTTON_TEXT": {
+        "LABEL": "Button text",
+        "PLACEHOLDER": "Please rate us"
+      },
+      "LANGUAGE": {
+        "LABEL": "Language",
+        "PLACEHOLDER": "Select template language"
+      },
+      "MESSAGE_PREVIEW": {
+        "LABEL": "Message preview",
+        "TOOLTIP": "This may vary slightly when rendered on WhatsApp's platform."
+      },
+      "TEMPLATE_STATUS": {
+        "APPROVED": "Approved by WhatsApp",
+        "PENDING": "Pending WhatsApp approval",
+        "REJECTED": "Meta rejected the template",
+        "DEFAULT": "Needs WhatsApp approval",
+        "NOT_FOUND": "The template does not exist in the Meta platform."
+      },
+      "TEMPLATE_CREATION": {
+        "SUCCESS_MESSAGE": "WhatsApp template created successfully and sent for approval",
+        "ERROR_MESSAGE": "Failed to create WhatsApp template"
+      },
+      "TEMPLATE_UPDATE_DIALOG": {
+        "TITLE": "Edit survey details",
+        "DESCRIPTION": "We will delete the previous template and make a new one which will be sent again for WhatsApp approval",
+        "CONFIRM": "Create new template",
+        "CANCEL": "Go back"
+      },
       "SURVEY_RULE": {
         "LABEL": "Survey rule",
         "DESCRIPTION_PREFIX": "Send the survey if the conversation",
@@ -819,6 +848,7 @@
         "SELECT_PLACEHOLDER": "select labels"
       },
       "NOTE": "Note: CSAT surveys are sent only once per conversation",
+      "WHATSAPP_NOTE": "Note: We will create a template and send it for WhatsApp approval. After being approved, surveys will be sent only once per conversation as per the survey rule.",
       "API": {
         "SUCCESS_MESSAGE": "CSAT settings updated successfully",
         "ERROR_MESSAGE": "We couldn't update CSAT settings. Please try again later."
diff --git a/app/javascript/dashboard/i18n/locale/ka/search.json b/app/javascript/dashboard/i18n/locale/ka/search.json
index e654cef1a..2cca57bee 100644
--- a/app/javascript/dashboard/i18n/locale/ka/search.json
+++ b/app/javascript/dashboard/i18n/locale/ka/search.json
@@ -1,7 +1,7 @@
 {
   "SEARCH": {
     "TABS": {
-      "ALL": "All",
+      "ALL": "All results",
       "CONTACTS": "Contacts",
       "CONVERSATIONS": "Conversations",
       "MESSAGES": "Messages",
@@ -19,14 +19,50 @@
     "LOADING_DATA": "Loading",
     "EMPTY_STATE": "No {item} found for query '{query}'",
     "EMPTY_STATE_FULL": "No results found for query '{query}'",
-    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "PLACEHOLDER_KEYBINDING": "/to focus",
     "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "RECENT_SEARCHES": "Recent searches",
+    "CLEAR_ALL": "Clear all",
+    "MOST_RECENT": "Most recent",
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
+    "READ_LESS": "Read less",
     "WROTE": "wrote:",
-    "FROM": "from",
-    "EMAIL": "email",
-    "EMAIL_SUBJECT": "subject"
+    "FROM": "From",
+    "EMAIL": "Email",
+    "EMAIL_SUBJECT": "Subject",
+    "PRIVATE": "Private note",
+    "TRANSCRIPT": "Transcript",
+    "CREATED_AT": "created {time}",
+    "UPDATED_AT": "updated {time}",
+    "SORT_BY": {
+      "RELEVANCE": "Relevance"
+    },
+    "DATE_RANGE": {
+      "LAST_7_DAYS": "Last 7 days",
+      "LAST_30_DAYS": "Last 30 days",
+      "LAST_60_DAYS": "Last 60 days",
+      "LAST_90_DAYS": "Last 90 days",
+      "CUSTOM_RANGE": "Custom range:",
+      "CREATED_BETWEEN": "Created between",
+      "AND": "and",
+      "APPLY": "Apply",
+      "BEFORE_DATE": "Before {date}",
+      "AFTER_DATE": "After {date}",
+      "TIME_RANGE": "Filter by time",
+      "CLEAR_FILTER": "Clear filter"
+    },
+    "FILTERS": {
+      "FILTER_MESSAGE": "Filter messages by:",
+      "FROM": "Sender",
+      "IN": "Inbox",
+      "AGENTS": "Agents",
+      "CONTACTS": "Contacts",
+      "INBOXES": "Inboxes",
+      "NO_AGENTS": "No agents found",
+      "NO_CONTACTS": "Start by searching to see results",
+      "NO_INBOXES": "No inboxes found"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ko/companies.json b/app/javascript/dashboard/i18n/locale/ko/companies.json
index df603be55..cf62d963a 100644
--- a/app/javascript/dashboard/i18n/locale/ko/companies.json
+++ b/app/javascript/dashboard/i18n/locale/ko/companies.json
@@ -6,7 +6,8 @@
       "OPTIONS": {
         "NAME": "이름",
         "DOMAIN": "Domain",
-        "CREATED_AT": "에 만들어짐"
+        "CREATED_AT": "에 만들어짐",
+        "CONTACTS_COUNT": "Contacts count"
       }
     },
     "ORDER": {
diff --git a/app/javascript/dashboard/i18n/locale/ko/contentTemplates.json b/app/javascript/dashboard/i18n/locale/ko/contentTemplates.json
index 913d8b537..75eb0f17f 100644
--- a/app/javascript/dashboard/i18n/locale/ko/contentTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/ko/contentTemplates.json
@@ -28,6 +28,7 @@
       "TYPES": {
         "MEDIA": "Media",
         "QUICK_REPLY": "Quick Reply",
+        "CALL_TO_ACTION": "Call to Action",
         "TEXT": "텍스트"
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/ko/conversation.json b/app/javascript/dashboard/i18n/locale/ko/conversation.json
index e9c52aea2..00ef976ca 100644
--- a/app/javascript/dashboard/i18n/locale/ko/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ko/conversation.json
@@ -275,6 +275,16 @@
     "SIDEBAR": {
       "CONTACT": "Contact",
       "COPILOT": "Copilot"
+    },
+    "VOICE_WIDGET": {
+      "INCOMING_CALL": "Incoming call",
+      "OUTGOING_CALL": "Outgoing call",
+      "CALL_IN_PROGRESS": "Call in progress",
+      "NOT_ANSWERED_YET": "Not answered yet",
+      "HANDLED_IN_ANOTHER_TAB": "Being handled in another tab",
+      "REJECT_CALL": "Reject",
+      "JOIN_CALL": "Join call",
+      "END_CALL": "End call"
     }
   },
   "EMAIL_TRANSCRIPT": {
diff --git a/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json
index e65bd2b21..9e6ec80de 100644
--- a/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json
@@ -808,6 +808,35 @@
         "LABEL": "메시지",
         "PLACEHOLDER": "Please enter a message to show users with the form"
       },
+      "BUTTON_TEXT": {
+        "LABEL": "Button text",
+        "PLACEHOLDER": "Please rate us"
+      },
+      "LANGUAGE": {
+        "LABEL": "언어",
+        "PLACEHOLDER": "Select template language"
+      },
+      "MESSAGE_PREVIEW": {
+        "LABEL": "Message preview",
+        "TOOLTIP": "This may vary slightly when rendered on WhatsApp's platform."
+      },
+      "TEMPLATE_STATUS": {
+        "APPROVED": "Approved by WhatsApp",
+        "PENDING": "Pending WhatsApp approval",
+        "REJECTED": "Meta rejected the template",
+        "DEFAULT": "Needs WhatsApp approval",
+        "NOT_FOUND": "The template does not exist in the Meta platform."
+      },
+      "TEMPLATE_CREATION": {
+        "SUCCESS_MESSAGE": "WhatsApp template created successfully and sent for approval",
+        "ERROR_MESSAGE": "Failed to create WhatsApp template"
+      },
+      "TEMPLATE_UPDATE_DIALOG": {
+        "TITLE": "Edit survey details",
+        "DESCRIPTION": "We will delete the previous template and make a new one which will be sent again for WhatsApp approval",
+        "CONFIRM": "Create new template",
+        "CANCEL": "Go back"
+      },
       "SURVEY_RULE": {
         "LABEL": "Survey rule",
         "DESCRIPTION_PREFIX": "Send the survey if the conversation",
@@ -819,6 +848,7 @@
         "SELECT_PLACEHOLDER": "select labels"
       },
       "NOTE": "Note: CSAT surveys are sent only once per conversation",
+      "WHATSAPP_NOTE": "Note: We will create a template and send it for WhatsApp approval. After being approved, surveys will be sent only once per conversation as per the survey rule.",
       "API": {
         "SUCCESS_MESSAGE": "CSAT settings updated successfully",
         "ERROR_MESSAGE": "We couldn't update CSAT settings. Please try again later."
diff --git a/app/javascript/dashboard/i18n/locale/ko/search.json b/app/javascript/dashboard/i18n/locale/ko/search.json
index c88467065..6546b02b4 100644
--- a/app/javascript/dashboard/i18n/locale/ko/search.json
+++ b/app/javascript/dashboard/i18n/locale/ko/search.json
@@ -1,7 +1,7 @@
 {
   "SEARCH": {
     "TABS": {
-      "ALL": "모두",
+      "ALL": "All results",
       "CONTACTS": "연락처",
       "CONVERSATIONS": "대화",
       "MESSAGES": "메시지",
@@ -19,14 +19,50 @@
     "LOADING_DATA": "Loading",
     "EMPTY_STATE": "No {item} found for query '{query}'",
     "EMPTY_STATE_FULL": "No results found for query '{query}'",
-    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "PLACEHOLDER_KEYBINDING": "/to focus",
     "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "RECENT_SEARCHES": "Recent searches",
+    "CLEAR_ALL": "Clear all",
+    "MOST_RECENT": "Most recent",
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "봇",
     "READ_MORE": "Read more",
+    "READ_LESS": "Read less",
     "WROTE": "wrote:",
-    "FROM": "에서",
+    "FROM": "From",
     "EMAIL": "이메일",
-    "EMAIL_SUBJECT": "subject"
+    "EMAIL_SUBJECT": "Subject",
+    "PRIVATE": "Private note",
+    "TRANSCRIPT": "Transcript",
+    "CREATED_AT": "created {time}",
+    "UPDATED_AT": "updated {time}",
+    "SORT_BY": {
+      "RELEVANCE": "Relevance"
+    },
+    "DATE_RANGE": {
+      "LAST_7_DAYS": "지난 7일",
+      "LAST_30_DAYS": "지난 30일",
+      "LAST_60_DAYS": "지난 60일",
+      "LAST_90_DAYS": "지난 90일",
+      "CUSTOM_RANGE": "Custom range:",
+      "CREATED_BETWEEN": "Created between",
+      "AND": "and",
+      "APPLY": "Apply",
+      "BEFORE_DATE": "Before {date}",
+      "AFTER_DATE": "After {date}",
+      "TIME_RANGE": "Filter by time",
+      "CLEAR_FILTER": "Clear filter"
+    },
+    "FILTERS": {
+      "FILTER_MESSAGE": "Filter messages by:",
+      "FROM": "Sender",
+      "IN": "받은 메시지함",
+      "AGENTS": "에이전트",
+      "CONTACTS": "연락처",
+      "INBOXES": "받은 메시지함",
+      "NO_AGENTS": "에이전트를 찾을 수 없음",
+      "NO_CONTACTS": "Start by searching to see results",
+      "NO_INBOXES": "No inboxes found"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/lt/companies.json b/app/javascript/dashboard/i18n/locale/lt/companies.json
index 260396444..f38b5b954 100644
--- a/app/javascript/dashboard/i18n/locale/lt/companies.json
+++ b/app/javascript/dashboard/i18n/locale/lt/companies.json
@@ -6,7 +6,8 @@
       "OPTIONS": {
         "NAME": "Vardas",
         "DOMAIN": "Domenas",
-        "CREATED_AT": "Sukurta"
+        "CREATED_AT": "Sukurta",
+        "CONTACTS_COUNT": "Contacts count"
       }
     },
     "ORDER": {
diff --git a/app/javascript/dashboard/i18n/locale/lt/contentTemplates.json b/app/javascript/dashboard/i18n/locale/lt/contentTemplates.json
index 159e33d62..81d2ee80f 100644
--- a/app/javascript/dashboard/i18n/locale/lt/contentTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/lt/contentTemplates.json
@@ -28,6 +28,7 @@
       "TYPES": {
         "MEDIA": "Media",
         "QUICK_REPLY": "Quick Reply",
+        "CALL_TO_ACTION": "Call to Action",
         "TEXT": "Tekstas"
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/lt/conversation.json b/app/javascript/dashboard/i18n/locale/lt/conversation.json
index eeddc4f96..6d8fca82f 100644
--- a/app/javascript/dashboard/i18n/locale/lt/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/lt/conversation.json
@@ -275,6 +275,16 @@
     "SIDEBAR": {
       "CONTACT": "Kontaktas",
       "COPILOT": "Copilot"
+    },
+    "VOICE_WIDGET": {
+      "INCOMING_CALL": "Incoming call",
+      "OUTGOING_CALL": "Outgoing call",
+      "CALL_IN_PROGRESS": "Call in progress",
+      "NOT_ANSWERED_YET": "Not answered yet",
+      "HANDLED_IN_ANOTHER_TAB": "Being handled in another tab",
+      "REJECT_CALL": "Reject",
+      "JOIN_CALL": "Join call",
+      "END_CALL": "End call"
     }
   },
   "EMAIL_TRANSCRIPT": {
diff --git a/app/javascript/dashboard/i18n/locale/lt/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/lt/inboxMgmt.json
index 6abccdbaa..366129760 100644
--- a/app/javascript/dashboard/i18n/locale/lt/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/lt/inboxMgmt.json
@@ -808,6 +808,35 @@
         "LABEL": "Žinutė",
         "PLACEHOLDER": "Please enter a message to show users with the form"
       },
+      "BUTTON_TEXT": {
+        "LABEL": "Button text",
+        "PLACEHOLDER": "Please rate us"
+      },
+      "LANGUAGE": {
+        "LABEL": "Kalba",
+        "PLACEHOLDER": "Select template language"
+      },
+      "MESSAGE_PREVIEW": {
+        "LABEL": "Message preview",
+        "TOOLTIP": "This may vary slightly when rendered on WhatsApp's platform."
+      },
+      "TEMPLATE_STATUS": {
+        "APPROVED": "Approved by WhatsApp",
+        "PENDING": "Pending WhatsApp approval",
+        "REJECTED": "Meta rejected the template",
+        "DEFAULT": "Needs WhatsApp approval",
+        "NOT_FOUND": "The template does not exist in the Meta platform."
+      },
+      "TEMPLATE_CREATION": {
+        "SUCCESS_MESSAGE": "WhatsApp template created successfully and sent for approval",
+        "ERROR_MESSAGE": "Failed to create WhatsApp template"
+      },
+      "TEMPLATE_UPDATE_DIALOG": {
+        "TITLE": "Edit survey details",
+        "DESCRIPTION": "We will delete the previous template and make a new one which will be sent again for WhatsApp approval",
+        "CONFIRM": "Create new template",
+        "CANCEL": "Grįžti"
+      },
       "SURVEY_RULE": {
         "LABEL": "Survey rule",
         "DESCRIPTION_PREFIX": "Send the survey if the conversation",
@@ -819,6 +848,7 @@
         "SELECT_PLACEHOLDER": "select labels"
       },
       "NOTE": "Note: CSAT surveys are sent only once per conversation",
+      "WHATSAPP_NOTE": "Note: We will create a template and send it for WhatsApp approval. After being approved, surveys will be sent only once per conversation as per the survey rule.",
       "API": {
         "SUCCESS_MESSAGE": "CSAT settings updated successfully",
         "ERROR_MESSAGE": "We couldn't update CSAT settings. Please try again later."
diff --git a/app/javascript/dashboard/i18n/locale/lt/search.json b/app/javascript/dashboard/i18n/locale/lt/search.json
index 79f249960..ecd5e228c 100644
--- a/app/javascript/dashboard/i18n/locale/lt/search.json
+++ b/app/javascript/dashboard/i18n/locale/lt/search.json
@@ -1,7 +1,7 @@
 {
   "SEARCH": {
     "TABS": {
-      "ALL": "Visi",
+      "ALL": "All results",
       "CONTACTS": "Kontaktai",
       "CONVERSATIONS": "Pokalbiai",
       "MESSAGES": "Pranešimai",
@@ -19,14 +19,50 @@
     "LOADING_DATA": "Loading",
     "EMPTY_STATE": "Nerasta {item} pagal užklausą '{query}'",
     "EMPTY_STATE_FULL": "Nerasta rezultatų pagal užklausą '{query}'",
-    "PLACEHOLDER_KEYBINDING": "/ sutelkti dėmesį",
+    "PLACEHOLDER_KEYBINDING": "/sutelkti dėmesį",
     "INPUT_PLACEHOLDER": "Įveskite 3 ar daugiau smibolius paieškai",
+    "RECENT_SEARCHES": "Recent searches",
+    "CLEAR_ALL": "Clear all",
+    "MOST_RECENT": "Most recent",
     "EMPTY_STATE_DEFAULT": "Norėdami gauti geresnių paieškos rezultatų, ieškokite pagal pokalbio ID, el. pašto adresą, telefono numerį, žinutes.",
     "BOT_LABEL": "Botas",
     "READ_MORE": "Skaityti daugiau",
+    "READ_LESS": "Read less",
     "WROTE": "parašei:",
-    "FROM": "nuo",
-    "EMAIL": "el. paštas",
-    "EMAIL_SUBJECT": "tema"
+    "FROM": "Nuo",
+    "EMAIL": "El. paštas",
+    "EMAIL_SUBJECT": "Tema",
+    "PRIVATE": "Private note",
+    "TRANSCRIPT": "Transcript",
+    "CREATED_AT": "created {time}",
+    "UPDATED_AT": "updated {time}",
+    "SORT_BY": {
+      "RELEVANCE": "Relevance"
+    },
+    "DATE_RANGE": {
+      "LAST_7_DAYS": "Paskutines 7 dienas",
+      "LAST_30_DAYS": "Paskutines 30 dienų",
+      "LAST_60_DAYS": "Paskutines 60 dienų",
+      "LAST_90_DAYS": "Paskutines 90 dienų",
+      "CUSTOM_RANGE": "Custom range:",
+      "CREATED_BETWEEN": "Created between",
+      "AND": "and",
+      "APPLY": "Taikyti",
+      "BEFORE_DATE": "Before {date}",
+      "AFTER_DATE": "After {date}",
+      "TIME_RANGE": "Filter by time",
+      "CLEAR_FILTER": "Clear filter"
+    },
+    "FILTERS": {
+      "FILTER_MESSAGE": "Filter messages by:",
+      "FROM": "Siuntėjas",
+      "IN": "Gautų laiškų aplankas",
+      "AGENTS": "Agentai",
+      "CONTACTS": "Kontaktai",
+      "INBOXES": "Gautų laiškų aplankai",
+      "NO_AGENTS": "Agentų nerasta",
+      "NO_CONTACTS": "Start by searching to see results",
+      "NO_INBOXES": "No inboxes found"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/lv/companies.json b/app/javascript/dashboard/i18n/locale/lv/companies.json
index 7d662acd4..1fb6b7041 100644
--- a/app/javascript/dashboard/i18n/locale/lv/companies.json
+++ b/app/javascript/dashboard/i18n/locale/lv/companies.json
@@ -6,7 +6,8 @@
       "OPTIONS": {
         "NAME": "Nosaukums",
         "DOMAIN": "Domēns",
-        "CREATED_AT": "Izveidots plkst"
+        "CREATED_AT": "Izveidots plkst",
+        "CONTACTS_COUNT": "Contacts count"
       }
     },
     "ORDER": {
diff --git a/app/javascript/dashboard/i18n/locale/lv/contentTemplates.json b/app/javascript/dashboard/i18n/locale/lv/contentTemplates.json
index b4a712b09..1fd0df160 100644
--- a/app/javascript/dashboard/i18n/locale/lv/contentTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/lv/contentTemplates.json
@@ -28,6 +28,7 @@
       "TYPES": {
         "MEDIA": "Media",
         "QUICK_REPLY": "Quick Reply",
+        "CALL_TO_ACTION": "Call to Action",
         "TEXT": "Teksts"
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/lv/conversation.json b/app/javascript/dashboard/i18n/locale/lv/conversation.json
index 7b59bac90..d3528c104 100644
--- a/app/javascript/dashboard/i18n/locale/lv/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/lv/conversation.json
@@ -275,6 +275,16 @@
     "SIDEBAR": {
       "CONTACT": "Kontaktpersona",
       "COPILOT": "Kopilots"
+    },
+    "VOICE_WIDGET": {
+      "INCOMING_CALL": "Incoming call",
+      "OUTGOING_CALL": "Outgoing call",
+      "CALL_IN_PROGRESS": "Call in progress",
+      "NOT_ANSWERED_YET": "Not answered yet",
+      "HANDLED_IN_ANOTHER_TAB": "Being handled in another tab",
+      "REJECT_CALL": "Reject",
+      "JOIN_CALL": "Join call",
+      "END_CALL": "End call"
     }
   },
   "EMAIL_TRANSCRIPT": {
diff --git a/app/javascript/dashboard/i18n/locale/lv/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/lv/inboxMgmt.json
index e9f8b1ffb..1080f8983 100644
--- a/app/javascript/dashboard/i18n/locale/lv/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/lv/inboxMgmt.json
@@ -808,6 +808,35 @@
         "LABEL": "Ziņojums",
         "PLACEHOLDER": "Please enter a message to show users with the form"
       },
+      "BUTTON_TEXT": {
+        "LABEL": "Button text",
+        "PLACEHOLDER": "Please rate us"
+      },
+      "LANGUAGE": {
+        "LABEL": "Valoda",
+        "PLACEHOLDER": "Select template language"
+      },
+      "MESSAGE_PREVIEW": {
+        "LABEL": "Message preview",
+        "TOOLTIP": "This may vary slightly when rendered on WhatsApp's platform."
+      },
+      "TEMPLATE_STATUS": {
+        "APPROVED": "Approved by WhatsApp",
+        "PENDING": "Pending WhatsApp approval",
+        "REJECTED": "Meta rejected the template",
+        "DEFAULT": "Needs WhatsApp approval",
+        "NOT_FOUND": "The template does not exist in the Meta platform."
+      },
+      "TEMPLATE_CREATION": {
+        "SUCCESS_MESSAGE": "WhatsApp template created successfully and sent for approval",
+        "ERROR_MESSAGE": "Failed to create WhatsApp template"
+      },
+      "TEMPLATE_UPDATE_DIALOG": {
+        "TITLE": "Edit survey details",
+        "DESCRIPTION": "We will delete the previous template and make a new one which will be sent again for WhatsApp approval",
+        "CONFIRM": "Create new template",
+        "CANCEL": "Atgriezties"
+      },
       "SURVEY_RULE": {
         "LABEL": "Survey rule",
         "DESCRIPTION_PREFIX": "Send the survey if the conversation",
@@ -819,6 +848,7 @@
         "SELECT_PLACEHOLDER": "select labels"
       },
       "NOTE": "Note: CSAT surveys are sent only once per conversation",
+      "WHATSAPP_NOTE": "Note: We will create a template and send it for WhatsApp approval. After being approved, surveys will be sent only once per conversation as per the survey rule.",
       "API": {
         "SUCCESS_MESSAGE": "CSAT settings updated successfully",
         "ERROR_MESSAGE": "We couldn't update CSAT settings. Please try again later."
diff --git a/app/javascript/dashboard/i18n/locale/lv/search.json b/app/javascript/dashboard/i18n/locale/lv/search.json
index 0aecb6b4e..2c5225216 100644
--- a/app/javascript/dashboard/i18n/locale/lv/search.json
+++ b/app/javascript/dashboard/i18n/locale/lv/search.json
@@ -1,7 +1,7 @@
 {
   "SEARCH": {
     "TABS": {
-      "ALL": "Visi",
+      "ALL": "All results",
       "CONTACTS": "Kontaktpersonas",
       "CONVERSATIONS": "Sarunas",
       "MESSAGES": "Ziņojumi",
@@ -19,14 +19,50 @@
     "LOADING_DATA": "Notiek ielāde",
     "EMPTY_STATE": "Vaicājumam '{query}' nav atrasts neviens {item} vienums",
     "EMPTY_STATE_FULL": "Vaicājumam '{query}' nav atrasts neviens rezultāts",
-    "PLACEHOLDER_KEYBINDING": "/ fokusēt",
+    "PLACEHOLDER_KEYBINDING": "/fokusēt",
     "INPUT_PLACEHOLDER": "Ievadiet 3, vai vairāk, rakstzīmes, lai meklētu",
+    "RECENT_SEARCHES": "Recent searches",
+    "CLEAR_ALL": "Notīrīt visu",
+    "MOST_RECENT": "Most recent",
     "EMPTY_STATE_DEFAULT": "Lai iegūtu labākus meklēšanas rezultātus, meklējiet pēc sarunas Id, e-pasta, tālruņa numura vai ziņām. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Lasīt vairāk",
+    "READ_LESS": "Read less",
     "WROTE": "rakstīja:",
-    "FROM": "no",
-    "EMAIL": "e-pasts",
-    "EMAIL_SUBJECT": "tēma"
+    "FROM": "No",
+    "EMAIL": "E-pasts",
+    "EMAIL_SUBJECT": "Tēma",
+    "PRIVATE": "Private note",
+    "TRANSCRIPT": "Transcript",
+    "CREATED_AT": "izveidots {time}",
+    "UPDATED_AT": "updated {time}",
+    "SORT_BY": {
+      "RELEVANCE": "Relevance"
+    },
+    "DATE_RANGE": {
+      "LAST_7_DAYS": "Pēdējās 7 dienas",
+      "LAST_30_DAYS": "Pēdējās 30 dienas",
+      "LAST_60_DAYS": "Pēdējās 60 dienas",
+      "LAST_90_DAYS": "Pēdējās 90 dienas",
+      "CUSTOM_RANGE": "Custom range:",
+      "CREATED_BETWEEN": "Created between",
+      "AND": "and",
+      "APPLY": "Pielietot",
+      "BEFORE_DATE": "Before {date}",
+      "AFTER_DATE": "After {date}",
+      "TIME_RANGE": "Filter by time",
+      "CLEAR_FILTER": "Notīrīt filtru"
+    },
+    "FILTERS": {
+      "FILTER_MESSAGE": "Filter messages by:",
+      "FROM": "Sūtītājs",
+      "IN": "Iesūtne",
+      "AGENTS": "Aģenti",
+      "CONTACTS": "Kontaktpersonas",
+      "INBOXES": "Iesūtnes",
+      "NO_AGENTS": "Aģenti nav atrasti",
+      "NO_CONTACTS": "Start by searching to see results",
+      "NO_INBOXES": "No inboxes found"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ml/companies.json b/app/javascript/dashboard/i18n/locale/ml/companies.json
index e7a3c3a25..64930411b 100644
--- a/app/javascript/dashboard/i18n/locale/ml/companies.json
+++ b/app/javascript/dashboard/i18n/locale/ml/companies.json
@@ -6,7 +6,8 @@
       "OPTIONS": {
         "NAME": "പേര്",
         "DOMAIN": "Domain",
-        "CREATED_AT": "എന്ന സ്ഥലത്ത് സൃഷ്ടിച്ചു"
+        "CREATED_AT": "എന്ന സ്ഥലത്ത് സൃഷ്ടിച്ചു",
+        "CONTACTS_COUNT": "Contacts count"
       }
     },
     "ORDER": {
diff --git a/app/javascript/dashboard/i18n/locale/ml/contentTemplates.json b/app/javascript/dashboard/i18n/locale/ml/contentTemplates.json
index 5b34d0989..ff9caa482 100644
--- a/app/javascript/dashboard/i18n/locale/ml/contentTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/ml/contentTemplates.json
@@ -28,6 +28,7 @@
       "TYPES": {
         "MEDIA": "Media",
         "QUICK_REPLY": "Quick Reply",
+        "CALL_TO_ACTION": "Call to Action",
         "TEXT": "Text"
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/ml/conversation.json b/app/javascript/dashboard/i18n/locale/ml/conversation.json
index 1c07017d6..2b8a41dde 100644
--- a/app/javascript/dashboard/i18n/locale/ml/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ml/conversation.json
@@ -275,6 +275,16 @@
     "SIDEBAR": {
       "CONTACT": "ബന്ധപ്പെടുക",
       "COPILOT": "Copilot"
+    },
+    "VOICE_WIDGET": {
+      "INCOMING_CALL": "Incoming call",
+      "OUTGOING_CALL": "Outgoing call",
+      "CALL_IN_PROGRESS": "Call in progress",
+      "NOT_ANSWERED_YET": "Not answered yet",
+      "HANDLED_IN_ANOTHER_TAB": "Being handled in another tab",
+      "REJECT_CALL": "Reject",
+      "JOIN_CALL": "Join call",
+      "END_CALL": "End call"
     }
   },
   "EMAIL_TRANSCRIPT": {
diff --git a/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json
index 3bb41af36..278a964f3 100644
--- a/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json
@@ -808,6 +808,35 @@
         "LABEL": "സന്ദേശം",
         "PLACEHOLDER": "Please enter a message to show users with the form"
       },
+      "BUTTON_TEXT": {
+        "LABEL": "Button text",
+        "PLACEHOLDER": "Please rate us"
+      },
+      "LANGUAGE": {
+        "LABEL": "Language",
+        "PLACEHOLDER": "Select template language"
+      },
+      "MESSAGE_PREVIEW": {
+        "LABEL": "Message preview",
+        "TOOLTIP": "This may vary slightly when rendered on WhatsApp's platform."
+      },
+      "TEMPLATE_STATUS": {
+        "APPROVED": "Approved by WhatsApp",
+        "PENDING": "Pending WhatsApp approval",
+        "REJECTED": "Meta rejected the template",
+        "DEFAULT": "Needs WhatsApp approval",
+        "NOT_FOUND": "The template does not exist in the Meta platform."
+      },
+      "TEMPLATE_CREATION": {
+        "SUCCESS_MESSAGE": "WhatsApp template created successfully and sent for approval",
+        "ERROR_MESSAGE": "Failed to create WhatsApp template"
+      },
+      "TEMPLATE_UPDATE_DIALOG": {
+        "TITLE": "Edit survey details",
+        "DESCRIPTION": "We will delete the previous template and make a new one which will be sent again for WhatsApp approval",
+        "CONFIRM": "Create new template",
+        "CANCEL": "Go back"
+      },
       "SURVEY_RULE": {
         "LABEL": "Survey rule",
         "DESCRIPTION_PREFIX": "Send the survey if the conversation",
@@ -819,6 +848,7 @@
         "SELECT_PLACEHOLDER": "select labels"
       },
       "NOTE": "Note: CSAT surveys are sent only once per conversation",
+      "WHATSAPP_NOTE": "Note: We will create a template and send it for WhatsApp approval. After being approved, surveys will be sent only once per conversation as per the survey rule.",
       "API": {
         "SUCCESS_MESSAGE": "CSAT settings updated successfully",
         "ERROR_MESSAGE": "We couldn't update CSAT settings. Please try again later."
diff --git a/app/javascript/dashboard/i18n/locale/ml/search.json b/app/javascript/dashboard/i18n/locale/ml/search.json
index 5c6c2804f..cf4c56e93 100644
--- a/app/javascript/dashboard/i18n/locale/ml/search.json
+++ b/app/javascript/dashboard/i18n/locale/ml/search.json
@@ -1,7 +1,7 @@
 {
   "SEARCH": {
     "TABS": {
-      "ALL": "എല്ലാം",
+      "ALL": "All results",
       "CONTACTS": "കോൺ‌ടാക്റ്റുകൾ",
       "CONVERSATIONS": "സംഭാഷണങ്ങൾ",
       "MESSAGES": "Messages",
@@ -19,14 +19,50 @@
     "LOADING_DATA": "Loading",
     "EMPTY_STATE": "No {item} found for query '{query}'",
     "EMPTY_STATE_FULL": "No results found for query '{query}'",
-    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "PLACEHOLDER_KEYBINDING": "/to focus",
     "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "RECENT_SEARCHES": "Recent searches",
+    "CLEAR_ALL": "Clear all",
+    "MOST_RECENT": "Most recent",
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "ബോട്ട്",
     "READ_MORE": "Read more",
+    "READ_LESS": "Read less",
     "WROTE": "wrote:",
-    "FROM": "നിന്ന്",
+    "FROM": "From",
     "EMAIL": "ഇമെയിൽ",
-    "EMAIL_SUBJECT": "വിഷയം"
+    "EMAIL_SUBJECT": "Subject",
+    "PRIVATE": "Private note",
+    "TRANSCRIPT": "Transcript",
+    "CREATED_AT": "created {time}",
+    "UPDATED_AT": "updated {time}",
+    "SORT_BY": {
+      "RELEVANCE": "Relevance"
+    },
+    "DATE_RANGE": {
+      "LAST_7_DAYS": "കഴിഞ്ഞ 7 ദിവസം",
+      "LAST_30_DAYS": "കഴിഞ്ഞ 30 ദിവസം",
+      "LAST_60_DAYS": "കഴിഞ്ഞ 60 ദിവസം",
+      "LAST_90_DAYS": "കഴിഞ്ഞ 90 ദിവസം",
+      "CUSTOM_RANGE": "Custom range:",
+      "CREATED_BETWEEN": "Created between",
+      "AND": "and",
+      "APPLY": "അപേക്ഷിക്കുക",
+      "BEFORE_DATE": "Before {date}",
+      "AFTER_DATE": "After {date}",
+      "TIME_RANGE": "Filter by time",
+      "CLEAR_FILTER": "Clear filter"
+    },
+    "FILTERS": {
+      "FILTER_MESSAGE": "Filter messages by:",
+      "FROM": "അയച്ചയാൾ",
+      "IN": "ഇൻബോക്സ്",
+      "AGENTS": "ഏജന്റുമാർ",
+      "CONTACTS": "കോൺ‌ടാക്റ്റുകൾ",
+      "INBOXES": "ഇൻ‌ബോക്സുകൾ",
+      "NO_AGENTS": "ഏജന്റകളെ ഒന്നും കണ്ടെത്താൻ സാധിച്ചില്ല",
+      "NO_CONTACTS": "Start by searching to see results",
+      "NO_INBOXES": "No inboxes found"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ms/companies.json b/app/javascript/dashboard/i18n/locale/ms/companies.json
index bd9d08023..ed7a7183d 100644
--- a/app/javascript/dashboard/i18n/locale/ms/companies.json
+++ b/app/javascript/dashboard/i18n/locale/ms/companies.json
@@ -6,7 +6,8 @@
       "OPTIONS": {
         "NAME": "Nama",
         "DOMAIN": "Domain",
-        "CREATED_AT": "Created at"
+        "CREATED_AT": "Created at",
+        "CONTACTS_COUNT": "Contacts count"
       }
     },
     "ORDER": {
diff --git a/app/javascript/dashboard/i18n/locale/ms/contentTemplates.json b/app/javascript/dashboard/i18n/locale/ms/contentTemplates.json
index 5368e202c..68b6b100a 100644
--- a/app/javascript/dashboard/i18n/locale/ms/contentTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/ms/contentTemplates.json
@@ -28,6 +28,7 @@
       "TYPES": {
         "MEDIA": "Media",
         "QUICK_REPLY": "Quick Reply",
+        "CALL_TO_ACTION": "Call to Action",
         "TEXT": "Teks"
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/ms/conversation.json b/app/javascript/dashboard/i18n/locale/ms/conversation.json
index b5b2202d3..11c34769d 100644
--- a/app/javascript/dashboard/i18n/locale/ms/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ms/conversation.json
@@ -275,6 +275,16 @@
     "SIDEBAR": {
       "CONTACT": "Contact",
       "COPILOT": "Copilot"
+    },
+    "VOICE_WIDGET": {
+      "INCOMING_CALL": "Incoming call",
+      "OUTGOING_CALL": "Outgoing call",
+      "CALL_IN_PROGRESS": "Call in progress",
+      "NOT_ANSWERED_YET": "Not answered yet",
+      "HANDLED_IN_ANOTHER_TAB": "Being handled in another tab",
+      "REJECT_CALL": "Reject",
+      "JOIN_CALL": "Join call",
+      "END_CALL": "End call"
     }
   },
   "EMAIL_TRANSCRIPT": {
diff --git a/app/javascript/dashboard/i18n/locale/ms/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ms/inboxMgmt.json
index 363a68d8c..558244207 100644
--- a/app/javascript/dashboard/i18n/locale/ms/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ms/inboxMgmt.json
@@ -808,6 +808,35 @@
         "LABEL": "Message",
         "PLACEHOLDER": "Please enter a message to show users with the form"
       },
+      "BUTTON_TEXT": {
+        "LABEL": "Button text",
+        "PLACEHOLDER": "Please rate us"
+      },
+      "LANGUAGE": {
+        "LABEL": "Language",
+        "PLACEHOLDER": "Select template language"
+      },
+      "MESSAGE_PREVIEW": {
+        "LABEL": "Message preview",
+        "TOOLTIP": "This may vary slightly when rendered on WhatsApp's platform."
+      },
+      "TEMPLATE_STATUS": {
+        "APPROVED": "Approved by WhatsApp",
+        "PENDING": "Pending WhatsApp approval",
+        "REJECTED": "Meta rejected the template",
+        "DEFAULT": "Needs WhatsApp approval",
+        "NOT_FOUND": "The template does not exist in the Meta platform."
+      },
+      "TEMPLATE_CREATION": {
+        "SUCCESS_MESSAGE": "WhatsApp template created successfully and sent for approval",
+        "ERROR_MESSAGE": "Failed to create WhatsApp template"
+      },
+      "TEMPLATE_UPDATE_DIALOG": {
+        "TITLE": "Edit survey details",
+        "DESCRIPTION": "We will delete the previous template and make a new one which will be sent again for WhatsApp approval",
+        "CONFIRM": "Create new template",
+        "CANCEL": "Go back"
+      },
       "SURVEY_RULE": {
         "LABEL": "Survey rule",
         "DESCRIPTION_PREFIX": "Send the survey if the conversation",
@@ -819,6 +848,7 @@
         "SELECT_PLACEHOLDER": "select labels"
       },
       "NOTE": "Note: CSAT surveys are sent only once per conversation",
+      "WHATSAPP_NOTE": "Note: We will create a template and send it for WhatsApp approval. After being approved, surveys will be sent only once per conversation as per the survey rule.",
       "API": {
         "SUCCESS_MESSAGE": "CSAT settings updated successfully",
         "ERROR_MESSAGE": "We couldn't update CSAT settings. Please try again later."
diff --git a/app/javascript/dashboard/i18n/locale/ms/search.json b/app/javascript/dashboard/i18n/locale/ms/search.json
index e8510ab97..747956e00 100644
--- a/app/javascript/dashboard/i18n/locale/ms/search.json
+++ b/app/javascript/dashboard/i18n/locale/ms/search.json
@@ -1,7 +1,7 @@
 {
   "SEARCH": {
     "TABS": {
-      "ALL": "All",
+      "ALL": "All results",
       "CONTACTS": "Contacts",
       "CONVERSATIONS": "Conversations",
       "MESSAGES": "Messages",
@@ -19,14 +19,50 @@
     "LOADING_DATA": "Loading",
     "EMPTY_STATE": "No {item} found for query '{query}'",
     "EMPTY_STATE_FULL": "No results found for query '{query}'",
-    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "PLACEHOLDER_KEYBINDING": "/to focus",
     "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "RECENT_SEARCHES": "Recent searches",
+    "CLEAR_ALL": "Clear all",
+    "MOST_RECENT": "Most recent",
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
+    "READ_LESS": "Read less",
     "WROTE": "wrote:",
-    "FROM": "from",
-    "EMAIL": "email",
-    "EMAIL_SUBJECT": "subject"
+    "FROM": "From",
+    "EMAIL": "Email",
+    "EMAIL_SUBJECT": "Subject",
+    "PRIVATE": "Private note",
+    "TRANSCRIPT": "Transcript",
+    "CREATED_AT": "created {time}",
+    "UPDATED_AT": "updated {time}",
+    "SORT_BY": {
+      "RELEVANCE": "Relevance"
+    },
+    "DATE_RANGE": {
+      "LAST_7_DAYS": "Last 7 days",
+      "LAST_30_DAYS": "Last 30 days",
+      "LAST_60_DAYS": "Last 60 days",
+      "LAST_90_DAYS": "Last 90 days",
+      "CUSTOM_RANGE": "Custom range:",
+      "CREATED_BETWEEN": "Created between",
+      "AND": "and",
+      "APPLY": "Apply",
+      "BEFORE_DATE": "Before {date}",
+      "AFTER_DATE": "After {date}",
+      "TIME_RANGE": "Filter by time",
+      "CLEAR_FILTER": "Clear filter"
+    },
+    "FILTERS": {
+      "FILTER_MESSAGE": "Filter messages by:",
+      "FROM": "Sender",
+      "IN": "Inbox",
+      "AGENTS": "Ejen",
+      "CONTACTS": "Contacts",
+      "INBOXES": "Inboxes",
+      "NO_AGENTS": "Tiada ejen dijumpa",
+      "NO_CONTACTS": "Start by searching to see results",
+      "NO_INBOXES": "No inboxes found"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ne/companies.json b/app/javascript/dashboard/i18n/locale/ne/companies.json
index 86190831b..0d64a4abd 100644
--- a/app/javascript/dashboard/i18n/locale/ne/companies.json
+++ b/app/javascript/dashboard/i18n/locale/ne/companies.json
@@ -6,7 +6,8 @@
       "OPTIONS": {
         "NAME": "Name",
         "DOMAIN": "Domain",
-        "CREATED_AT": "Created at"
+        "CREATED_AT": "Created at",
+        "CONTACTS_COUNT": "Contacts count"
       }
     },
     "ORDER": {
diff --git a/app/javascript/dashboard/i18n/locale/ne/contentTemplates.json b/app/javascript/dashboard/i18n/locale/ne/contentTemplates.json
index a9b1d54c4..79c2c8c64 100644
--- a/app/javascript/dashboard/i18n/locale/ne/contentTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/ne/contentTemplates.json
@@ -28,6 +28,7 @@
       "TYPES": {
         "MEDIA": "Media",
         "QUICK_REPLY": "Quick Reply",
+        "CALL_TO_ACTION": "Call to Action",
         "TEXT": "Text"
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/ne/conversation.json b/app/javascript/dashboard/i18n/locale/ne/conversation.json
index aa61ac718..45560d95f 100644
--- a/app/javascript/dashboard/i18n/locale/ne/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ne/conversation.json
@@ -275,6 +275,16 @@
     "SIDEBAR": {
       "CONTACT": "Contact",
       "COPILOT": "Copilot"
+    },
+    "VOICE_WIDGET": {
+      "INCOMING_CALL": "Incoming call",
+      "OUTGOING_CALL": "Outgoing call",
+      "CALL_IN_PROGRESS": "Call in progress",
+      "NOT_ANSWERED_YET": "Not answered yet",
+      "HANDLED_IN_ANOTHER_TAB": "Being handled in another tab",
+      "REJECT_CALL": "Reject",
+      "JOIN_CALL": "Join call",
+      "END_CALL": "End call"
     }
   },
   "EMAIL_TRANSCRIPT": {
diff --git a/app/javascript/dashboard/i18n/locale/ne/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ne/inboxMgmt.json
index 083660947..887963cae 100644
--- a/app/javascript/dashboard/i18n/locale/ne/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ne/inboxMgmt.json
@@ -808,6 +808,35 @@
         "LABEL": "Message",
         "PLACEHOLDER": "Please enter a message to show users with the form"
       },
+      "BUTTON_TEXT": {
+        "LABEL": "Button text",
+        "PLACEHOLDER": "Please rate us"
+      },
+      "LANGUAGE": {
+        "LABEL": "Language",
+        "PLACEHOLDER": "Select template language"
+      },
+      "MESSAGE_PREVIEW": {
+        "LABEL": "Message preview",
+        "TOOLTIP": "This may vary slightly when rendered on WhatsApp's platform."
+      },
+      "TEMPLATE_STATUS": {
+        "APPROVED": "Approved by WhatsApp",
+        "PENDING": "Pending WhatsApp approval",
+        "REJECTED": "Meta rejected the template",
+        "DEFAULT": "Needs WhatsApp approval",
+        "NOT_FOUND": "The template does not exist in the Meta platform."
+      },
+      "TEMPLATE_CREATION": {
+        "SUCCESS_MESSAGE": "WhatsApp template created successfully and sent for approval",
+        "ERROR_MESSAGE": "Failed to create WhatsApp template"
+      },
+      "TEMPLATE_UPDATE_DIALOG": {
+        "TITLE": "Edit survey details",
+        "DESCRIPTION": "We will delete the previous template and make a new one which will be sent again for WhatsApp approval",
+        "CONFIRM": "Create new template",
+        "CANCEL": "Go back"
+      },
       "SURVEY_RULE": {
         "LABEL": "Survey rule",
         "DESCRIPTION_PREFIX": "Send the survey if the conversation",
@@ -819,6 +848,7 @@
         "SELECT_PLACEHOLDER": "select labels"
       },
       "NOTE": "Note: CSAT surveys are sent only once per conversation",
+      "WHATSAPP_NOTE": "Note: We will create a template and send it for WhatsApp approval. After being approved, surveys will be sent only once per conversation as per the survey rule.",
       "API": {
         "SUCCESS_MESSAGE": "CSAT settings updated successfully",
         "ERROR_MESSAGE": "We couldn't update CSAT settings. Please try again later."
diff --git a/app/javascript/dashboard/i18n/locale/ne/search.json b/app/javascript/dashboard/i18n/locale/ne/search.json
index e8510ab97..2fc8e7998 100644
--- a/app/javascript/dashboard/i18n/locale/ne/search.json
+++ b/app/javascript/dashboard/i18n/locale/ne/search.json
@@ -1,7 +1,7 @@
 {
   "SEARCH": {
     "TABS": {
-      "ALL": "All",
+      "ALL": "All results",
       "CONTACTS": "Contacts",
       "CONVERSATIONS": "Conversations",
       "MESSAGES": "Messages",
@@ -19,14 +19,50 @@
     "LOADING_DATA": "Loading",
     "EMPTY_STATE": "No {item} found for query '{query}'",
     "EMPTY_STATE_FULL": "No results found for query '{query}'",
-    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "PLACEHOLDER_KEYBINDING": "/to focus",
     "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "RECENT_SEARCHES": "Recent searches",
+    "CLEAR_ALL": "Clear all",
+    "MOST_RECENT": "Most recent",
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
+    "READ_LESS": "Read less",
     "WROTE": "wrote:",
-    "FROM": "from",
-    "EMAIL": "email",
-    "EMAIL_SUBJECT": "subject"
+    "FROM": "From",
+    "EMAIL": "Email",
+    "EMAIL_SUBJECT": "Subject",
+    "PRIVATE": "Private note",
+    "TRANSCRIPT": "Transcript",
+    "CREATED_AT": "created {time}",
+    "UPDATED_AT": "updated {time}",
+    "SORT_BY": {
+      "RELEVANCE": "Relevance"
+    },
+    "DATE_RANGE": {
+      "LAST_7_DAYS": "Last 7 days",
+      "LAST_30_DAYS": "Last 30 days",
+      "LAST_60_DAYS": "Last 60 days",
+      "LAST_90_DAYS": "Last 90 days",
+      "CUSTOM_RANGE": "Custom range:",
+      "CREATED_BETWEEN": "Created between",
+      "AND": "and",
+      "APPLY": "Apply",
+      "BEFORE_DATE": "Before {date}",
+      "AFTER_DATE": "After {date}",
+      "TIME_RANGE": "Filter by time",
+      "CLEAR_FILTER": "Clear filter"
+    },
+    "FILTERS": {
+      "FILTER_MESSAGE": "Filter messages by:",
+      "FROM": "Sender",
+      "IN": "Inbox",
+      "AGENTS": "Agents",
+      "CONTACTS": "Contacts",
+      "INBOXES": "Inboxes",
+      "NO_AGENTS": "No agents found",
+      "NO_CONTACTS": "Start by searching to see results",
+      "NO_INBOXES": "No inboxes found"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/nl/companies.json b/app/javascript/dashboard/i18n/locale/nl/companies.json
index c61cc01b6..c6fb4a2d3 100644
--- a/app/javascript/dashboard/i18n/locale/nl/companies.json
+++ b/app/javascript/dashboard/i18n/locale/nl/companies.json
@@ -6,7 +6,8 @@
       "OPTIONS": {
         "NAME": "Naam",
         "DOMAIN": "Domeinnaam",
-        "CREATED_AT": "Aangemaakt op"
+        "CREATED_AT": "Aangemaakt op",
+        "CONTACTS_COUNT": "Contacts count"
       }
     },
     "ORDER": {
diff --git a/app/javascript/dashboard/i18n/locale/nl/contentTemplates.json b/app/javascript/dashboard/i18n/locale/nl/contentTemplates.json
index 95c2b64ee..2de75cd6f 100644
--- a/app/javascript/dashboard/i18n/locale/nl/contentTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/nl/contentTemplates.json
@@ -28,6 +28,7 @@
       "TYPES": {
         "MEDIA": "Media",
         "QUICK_REPLY": "Quick Reply",
+        "CALL_TO_ACTION": "Call to Action",
         "TEXT": "Tekst"
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/nl/conversation.json b/app/javascript/dashboard/i18n/locale/nl/conversation.json
index cdc905167..8466f1ca5 100644
--- a/app/javascript/dashboard/i18n/locale/nl/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/nl/conversation.json
@@ -275,6 +275,16 @@
     "SIDEBAR": {
       "CONTACT": "Contact",
       "COPILOT": "Copilot"
+    },
+    "VOICE_WIDGET": {
+      "INCOMING_CALL": "Incoming call",
+      "OUTGOING_CALL": "Outgoing call",
+      "CALL_IN_PROGRESS": "Call in progress",
+      "NOT_ANSWERED_YET": "Not answered yet",
+      "HANDLED_IN_ANOTHER_TAB": "Being handled in another tab",
+      "REJECT_CALL": "Reject",
+      "JOIN_CALL": "Join call",
+      "END_CALL": "End call"
     }
   },
   "EMAIL_TRANSCRIPT": {
diff --git a/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json
index bb116ca9c..e2d663281 100644
--- a/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json
@@ -808,6 +808,35 @@
         "LABEL": "Bericht",
         "PLACEHOLDER": "Please enter a message to show users with the form"
       },
+      "BUTTON_TEXT": {
+        "LABEL": "Button text",
+        "PLACEHOLDER": "Please rate us"
+      },
+      "LANGUAGE": {
+        "LABEL": "Taal",
+        "PLACEHOLDER": "Select template language"
+      },
+      "MESSAGE_PREVIEW": {
+        "LABEL": "Message preview",
+        "TOOLTIP": "This may vary slightly when rendered on WhatsApp's platform."
+      },
+      "TEMPLATE_STATUS": {
+        "APPROVED": "Approved by WhatsApp",
+        "PENDING": "Pending WhatsApp approval",
+        "REJECTED": "Meta rejected the template",
+        "DEFAULT": "Needs WhatsApp approval",
+        "NOT_FOUND": "The template does not exist in the Meta platform."
+      },
+      "TEMPLATE_CREATION": {
+        "SUCCESS_MESSAGE": "WhatsApp template created successfully and sent for approval",
+        "ERROR_MESSAGE": "Failed to create WhatsApp template"
+      },
+      "TEMPLATE_UPDATE_DIALOG": {
+        "TITLE": "Edit survey details",
+        "DESCRIPTION": "We will delete the previous template and make a new one which will be sent again for WhatsApp approval",
+        "CONFIRM": "Create new template",
+        "CANCEL": "Ga terug"
+      },
       "SURVEY_RULE": {
         "LABEL": "Survey rule",
         "DESCRIPTION_PREFIX": "Send the survey if the conversation",
@@ -819,6 +848,7 @@
         "SELECT_PLACEHOLDER": "select labels"
       },
       "NOTE": "Note: CSAT surveys are sent only once per conversation",
+      "WHATSAPP_NOTE": "Note: We will create a template and send it for WhatsApp approval. After being approved, surveys will be sent only once per conversation as per the survey rule.",
       "API": {
         "SUCCESS_MESSAGE": "CSAT settings updated successfully",
         "ERROR_MESSAGE": "We couldn't update CSAT settings. Please try again later."
diff --git a/app/javascript/dashboard/i18n/locale/nl/search.json b/app/javascript/dashboard/i18n/locale/nl/search.json
index 52cc72e53..1f84ae5fa 100644
--- a/app/javascript/dashboard/i18n/locale/nl/search.json
+++ b/app/javascript/dashboard/i18n/locale/nl/search.json
@@ -1,7 +1,7 @@
 {
   "SEARCH": {
     "TABS": {
-      "ALL": "Allemaal",
+      "ALL": "All results",
       "CONTACTS": "Contacten",
       "CONVERSATIONS": "Gesprekken",
       "MESSAGES": "Berichten",
@@ -19,14 +19,50 @@
     "LOADING_DATA": "Loading",
     "EMPTY_STATE": "Geen {item} gevonden voor query '{query}'",
     "EMPTY_STATE_FULL": "Geen resultaten gevonden voor query '{query}'",
-    "PLACEHOLDER_KEYBINDING": "/ om te focussen",
+    "PLACEHOLDER_KEYBINDING": "/om te focussen",
     "INPUT_PLACEHOLDER": "Voer 3 of meer tekens in om te zoeken",
+    "RECENT_SEARCHES": "Recent searches",
+    "CLEAR_ALL": "Clear all",
+    "MOST_RECENT": "Most recent",
     "EMPTY_STATE_DEFAULT": "Zoeken op gesprek id, e-mail, telefoonnummer, berichten voor betere zoekresultaten. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Meer lezen",
+    "READ_LESS": "Read less",
     "WROTE": "schreef:",
     "FROM": "van",
-    "EMAIL": "e-mailadres",
-    "EMAIL_SUBJECT": "onderwerp"
+    "EMAIL": "E-mailadres",
+    "EMAIL_SUBJECT": "Onderwerp",
+    "PRIVATE": "Private note",
+    "TRANSCRIPT": "Transcript",
+    "CREATED_AT": "created {time}",
+    "UPDATED_AT": "updated {time}",
+    "SORT_BY": {
+      "RELEVANCE": "Relevance"
+    },
+    "DATE_RANGE": {
+      "LAST_7_DAYS": "Afgelopen 7 dagen",
+      "LAST_30_DAYS": "Laatste 30 dagen",
+      "LAST_60_DAYS": "Afgelopen 60 dagen",
+      "LAST_90_DAYS": "Afgelopen 90 dagen",
+      "CUSTOM_RANGE": "Custom range:",
+      "CREATED_BETWEEN": "Created between",
+      "AND": "en",
+      "APPLY": "Apply",
+      "BEFORE_DATE": "Before {date}",
+      "AFTER_DATE": "After {date}",
+      "TIME_RANGE": "Filter by time",
+      "CLEAR_FILTER": "Clear filter"
+    },
+    "FILTERS": {
+      "FILTER_MESSAGE": "Filter messages by:",
+      "FROM": "Sender",
+      "IN": "Postvak In",
+      "AGENTS": "Medewerkers",
+      "CONTACTS": "Contacten",
+      "INBOXES": "Inboxen",
+      "NO_AGENTS": "Geen medewerkers gevonden",
+      "NO_CONTACTS": "Start by searching to see results",
+      "NO_INBOXES": "No inboxes found"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/no/companies.json b/app/javascript/dashboard/i18n/locale/no/companies.json
index 0f7143a38..98233d9b1 100644
--- a/app/javascript/dashboard/i18n/locale/no/companies.json
+++ b/app/javascript/dashboard/i18n/locale/no/companies.json
@@ -6,7 +6,8 @@
       "OPTIONS": {
         "NAME": "Navn",
         "DOMAIN": "Domain",
-        "CREATED_AT": "Created at"
+        "CREATED_AT": "Created at",
+        "CONTACTS_COUNT": "Contacts count"
       }
     },
     "ORDER": {
diff --git a/app/javascript/dashboard/i18n/locale/no/contentTemplates.json b/app/javascript/dashboard/i18n/locale/no/contentTemplates.json
index e754b6a7c..dc2f79e82 100644
--- a/app/javascript/dashboard/i18n/locale/no/contentTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/no/contentTemplates.json
@@ -28,6 +28,7 @@
       "TYPES": {
         "MEDIA": "Media",
         "QUICK_REPLY": "Quick Reply",
+        "CALL_TO_ACTION": "Call to Action",
         "TEXT": "Text"
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/no/conversation.json b/app/javascript/dashboard/i18n/locale/no/conversation.json
index 5961e8381..f282e5833 100644
--- a/app/javascript/dashboard/i18n/locale/no/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/no/conversation.json
@@ -275,6 +275,16 @@
     "SIDEBAR": {
       "CONTACT": "Contact",
       "COPILOT": "Copilot"
+    },
+    "VOICE_WIDGET": {
+      "INCOMING_CALL": "Incoming call",
+      "OUTGOING_CALL": "Outgoing call",
+      "CALL_IN_PROGRESS": "Call in progress",
+      "NOT_ANSWERED_YET": "Not answered yet",
+      "HANDLED_IN_ANOTHER_TAB": "Being handled in another tab",
+      "REJECT_CALL": "Reject",
+      "JOIN_CALL": "Join call",
+      "END_CALL": "End call"
     }
   },
   "EMAIL_TRANSCRIPT": {
diff --git a/app/javascript/dashboard/i18n/locale/no/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/no/inboxMgmt.json
index bf5b785d9..4e6a60af7 100644
--- a/app/javascript/dashboard/i18n/locale/no/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/no/inboxMgmt.json
@@ -808,6 +808,35 @@
         "LABEL": "Melding",
         "PLACEHOLDER": "Please enter a message to show users with the form"
       },
+      "BUTTON_TEXT": {
+        "LABEL": "Button text",
+        "PLACEHOLDER": "Please rate us"
+      },
+      "LANGUAGE": {
+        "LABEL": "Language",
+        "PLACEHOLDER": "Select template language"
+      },
+      "MESSAGE_PREVIEW": {
+        "LABEL": "Message preview",
+        "TOOLTIP": "This may vary slightly when rendered on WhatsApp's platform."
+      },
+      "TEMPLATE_STATUS": {
+        "APPROVED": "Approved by WhatsApp",
+        "PENDING": "Pending WhatsApp approval",
+        "REJECTED": "Meta rejected the template",
+        "DEFAULT": "Needs WhatsApp approval",
+        "NOT_FOUND": "The template does not exist in the Meta platform."
+      },
+      "TEMPLATE_CREATION": {
+        "SUCCESS_MESSAGE": "WhatsApp template created successfully and sent for approval",
+        "ERROR_MESSAGE": "Failed to create WhatsApp template"
+      },
+      "TEMPLATE_UPDATE_DIALOG": {
+        "TITLE": "Edit survey details",
+        "DESCRIPTION": "We will delete the previous template and make a new one which will be sent again for WhatsApp approval",
+        "CONFIRM": "Create new template",
+        "CANCEL": "Go back"
+      },
       "SURVEY_RULE": {
         "LABEL": "Survey rule",
         "DESCRIPTION_PREFIX": "Send the survey if the conversation",
@@ -819,6 +848,7 @@
         "SELECT_PLACEHOLDER": "select labels"
       },
       "NOTE": "Note: CSAT surveys are sent only once per conversation",
+      "WHATSAPP_NOTE": "Note: We will create a template and send it for WhatsApp approval. After being approved, surveys will be sent only once per conversation as per the survey rule.",
       "API": {
         "SUCCESS_MESSAGE": "CSAT settings updated successfully",
         "ERROR_MESSAGE": "We couldn't update CSAT settings. Please try again later."
diff --git a/app/javascript/dashboard/i18n/locale/no/search.json b/app/javascript/dashboard/i18n/locale/no/search.json
index 3078c3af6..c418d5ba0 100644
--- a/app/javascript/dashboard/i18n/locale/no/search.json
+++ b/app/javascript/dashboard/i18n/locale/no/search.json
@@ -1,7 +1,7 @@
 {
   "SEARCH": {
     "TABS": {
-      "ALL": "Alle",
+      "ALL": "All results",
       "CONTACTS": "Kontakter",
       "CONVERSATIONS": "Samtaler",
       "MESSAGES": "Messages",
@@ -19,14 +19,50 @@
     "LOADING_DATA": "Loading",
     "EMPTY_STATE": "No {item} found for query '{query}'",
     "EMPTY_STATE_FULL": "No results found for query '{query}'",
-    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "PLACEHOLDER_KEYBINDING": "/to focus",
     "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "RECENT_SEARCHES": "Recent searches",
+    "CLEAR_ALL": "Clear all",
+    "MOST_RECENT": "Most recent",
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
+    "READ_LESS": "Read less",
     "WROTE": "wrote:",
-    "FROM": "fra",
-    "EMAIL": "e-post",
-    "EMAIL_SUBJECT": "subject"
+    "FROM": "From",
+    "EMAIL": "E-post",
+    "EMAIL_SUBJECT": "Subject",
+    "PRIVATE": "Private note",
+    "TRANSCRIPT": "Transcript",
+    "CREATED_AT": "created {time}",
+    "UPDATED_AT": "updated {time}",
+    "SORT_BY": {
+      "RELEVANCE": "Relevance"
+    },
+    "DATE_RANGE": {
+      "LAST_7_DAYS": "Siste 7 dager",
+      "LAST_30_DAYS": "Siste 30 dager",
+      "LAST_60_DAYS": "Siste 60 dager",
+      "LAST_90_DAYS": "Siste 90 dager",
+      "CUSTOM_RANGE": "Custom range:",
+      "CREATED_BETWEEN": "Created between",
+      "AND": "and",
+      "APPLY": "Apply",
+      "BEFORE_DATE": "Before {date}",
+      "AFTER_DATE": "After {date}",
+      "TIME_RANGE": "Filter by time",
+      "CLEAR_FILTER": "Clear filter"
+    },
+    "FILTERS": {
+      "FILTER_MESSAGE": "Filter messages by:",
+      "FROM": "Sender",
+      "IN": "Inbox",
+      "AGENTS": "Agenter",
+      "CONTACTS": "Kontakter",
+      "INBOXES": "Innbokser",
+      "NO_AGENTS": "Ingen agenter funnet",
+      "NO_CONTACTS": "Start by searching to see results",
+      "NO_INBOXES": "No inboxes found"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pl/companies.json b/app/javascript/dashboard/i18n/locale/pl/companies.json
index 2e08643d8..bc89b2516 100644
--- a/app/javascript/dashboard/i18n/locale/pl/companies.json
+++ b/app/javascript/dashboard/i18n/locale/pl/companies.json
@@ -6,7 +6,8 @@
       "OPTIONS": {
         "NAME": "Imię",
         "DOMAIN": "Domena",
-        "CREATED_AT": "Data utworzenia"
+        "CREATED_AT": "Data utworzenia",
+        "CONTACTS_COUNT": "Contacts count"
       }
     },
     "ORDER": {
diff --git a/app/javascript/dashboard/i18n/locale/pl/contentTemplates.json b/app/javascript/dashboard/i18n/locale/pl/contentTemplates.json
index e1b5509b6..5ecb6250c 100644
--- a/app/javascript/dashboard/i18n/locale/pl/contentTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/pl/contentTemplates.json
@@ -28,6 +28,7 @@
       "TYPES": {
         "MEDIA": "Media",
         "QUICK_REPLY": "Quick Reply",
+        "CALL_TO_ACTION": "Call to Action",
         "TEXT": "Tekst"
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/pl/conversation.json b/app/javascript/dashboard/i18n/locale/pl/conversation.json
index a5bd9c824..62b4a1065 100644
--- a/app/javascript/dashboard/i18n/locale/pl/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/pl/conversation.json
@@ -275,6 +275,16 @@
     "SIDEBAR": {
       "CONTACT": "Kontakt",
       "COPILOT": "Copilot"
+    },
+    "VOICE_WIDGET": {
+      "INCOMING_CALL": "Incoming call",
+      "OUTGOING_CALL": "Outgoing call",
+      "CALL_IN_PROGRESS": "Call in progress",
+      "NOT_ANSWERED_YET": "Not answered yet",
+      "HANDLED_IN_ANOTHER_TAB": "Being handled in another tab",
+      "REJECT_CALL": "Reject",
+      "JOIN_CALL": "Join call",
+      "END_CALL": "End call"
     }
   },
   "EMAIL_TRANSCRIPT": {
diff --git a/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json
index ec9cd2f66..c30424272 100644
--- a/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json
@@ -808,6 +808,35 @@
         "LABEL": "Wiadomość",
         "PLACEHOLDER": "Please enter a message to show users with the form"
       },
+      "BUTTON_TEXT": {
+        "LABEL": "Button text",
+        "PLACEHOLDER": "Please rate us"
+      },
+      "LANGUAGE": {
+        "LABEL": "Język",
+        "PLACEHOLDER": "Select template language"
+      },
+      "MESSAGE_PREVIEW": {
+        "LABEL": "Message preview",
+        "TOOLTIP": "This may vary slightly when rendered on WhatsApp's platform."
+      },
+      "TEMPLATE_STATUS": {
+        "APPROVED": "Approved by WhatsApp",
+        "PENDING": "Pending WhatsApp approval",
+        "REJECTED": "Meta rejected the template",
+        "DEFAULT": "Needs WhatsApp approval",
+        "NOT_FOUND": "The template does not exist in the Meta platform."
+      },
+      "TEMPLATE_CREATION": {
+        "SUCCESS_MESSAGE": "WhatsApp template created successfully and sent for approval",
+        "ERROR_MESSAGE": "Failed to create WhatsApp template"
+      },
+      "TEMPLATE_UPDATE_DIALOG": {
+        "TITLE": "Edit survey details",
+        "DESCRIPTION": "We will delete the previous template and make a new one which will be sent again for WhatsApp approval",
+        "CONFIRM": "Create new template",
+        "CANCEL": "Powróć"
+      },
       "SURVEY_RULE": {
         "LABEL": "Survey rule",
         "DESCRIPTION_PREFIX": "Send the survey if the conversation",
@@ -819,6 +848,7 @@
         "SELECT_PLACEHOLDER": "select labels"
       },
       "NOTE": "Note: CSAT surveys are sent only once per conversation",
+      "WHATSAPP_NOTE": "Note: We will create a template and send it for WhatsApp approval. After being approved, surveys will be sent only once per conversation as per the survey rule.",
       "API": {
         "SUCCESS_MESSAGE": "CSAT settings updated successfully",
         "ERROR_MESSAGE": "We couldn't update CSAT settings. Please try again later."
diff --git a/app/javascript/dashboard/i18n/locale/pl/search.json b/app/javascript/dashboard/i18n/locale/pl/search.json
index cae507868..c1f6ed5ac 100644
--- a/app/javascript/dashboard/i18n/locale/pl/search.json
+++ b/app/javascript/dashboard/i18n/locale/pl/search.json
@@ -1,7 +1,7 @@
 {
   "SEARCH": {
     "TABS": {
-      "ALL": "Wszystkie",
+      "ALL": "All results",
       "CONTACTS": "Kontakty",
       "CONVERSATIONS": "Rozmowy",
       "MESSAGES": "Wiadomości",
@@ -19,14 +19,50 @@
     "LOADING_DATA": "Loading",
     "EMPTY_STATE": "Nie znaleziono {item} dla zapytania '{query}'",
     "EMPTY_STATE_FULL": "Nie znaleziono wyników dla zapytania '{query}'",
-    "PLACEHOLDER_KEYBINDING": "/ aby skupić się",
+    "PLACEHOLDER_KEYBINDING": "/aby skupić się",
     "INPUT_PLACEHOLDER": "Wpisz co najmniej 3 znaki, aby wyszukać",
+    "RECENT_SEARCHES": "Recent searches",
+    "CLEAR_ALL": "Clear all",
+    "MOST_RECENT": "Most recent",
     "EMPTY_STATE_DEFAULT": "Wyszukaj według identyfikatora rozmowy, adresu e-mail, numeru telefonu lub treści wiadomości, aby uzyskać lepsze wyniki wyszukiwania.",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Czytaj więcej",
+    "READ_LESS": "Read less",
     "WROTE": "napisał/a:",
-    "FROM": "od",
-    "EMAIL": "e-mail",
-    "EMAIL_SUBJECT": "temat"
+    "FROM": "Od",
+    "EMAIL": "E-mail",
+    "EMAIL_SUBJECT": "Temat",
+    "PRIVATE": "Private note",
+    "TRANSCRIPT": "Transcript",
+    "CREATED_AT": "created {time}",
+    "UPDATED_AT": "updated {time}",
+    "SORT_BY": {
+      "RELEVANCE": "Relevance"
+    },
+    "DATE_RANGE": {
+      "LAST_7_DAYS": "Ostatnie 7 dni",
+      "LAST_30_DAYS": "Ostatnie 30 dni",
+      "LAST_60_DAYS": "Ostatnie 60 dni",
+      "LAST_90_DAYS": "Ostatnie 90 dni",
+      "CUSTOM_RANGE": "Custom range:",
+      "CREATED_BETWEEN": "Created between",
+      "AND": "and",
+      "APPLY": "Zastosuj",
+      "BEFORE_DATE": "Before {date}",
+      "AFTER_DATE": "After {date}",
+      "TIME_RANGE": "Filter by time",
+      "CLEAR_FILTER": "Clear filter"
+    },
+    "FILTERS": {
+      "FILTER_MESSAGE": "Filter messages by:",
+      "FROM": "Nadawca",
+      "IN": "Skrzynka odbiorcza",
+      "AGENTS": "Agenci",
+      "CONTACTS": "Kontakty",
+      "INBOXES": "Zarządzanie skrzynkami",
+      "NO_AGENTS": "Nie znaleziono agentów",
+      "NO_CONTACTS": "Start by searching to see results",
+      "NO_INBOXES": "No inboxes found"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt/companies.json b/app/javascript/dashboard/i18n/locale/pt/companies.json
index 6bfa6ff9b..24d8d55fc 100644
--- a/app/javascript/dashboard/i18n/locale/pt/companies.json
+++ b/app/javascript/dashboard/i18n/locale/pt/companies.json
@@ -6,7 +6,8 @@
       "OPTIONS": {
         "NAME": "Nome:",
         "DOMAIN": "Domínio",
-        "CREATED_AT": "Criada em"
+        "CREATED_AT": "Criada em",
+        "CONTACTS_COUNT": "Contacts count"
       }
     },
     "ORDER": {
diff --git a/app/javascript/dashboard/i18n/locale/pt/contentTemplates.json b/app/javascript/dashboard/i18n/locale/pt/contentTemplates.json
index 0a24e2378..0875e6803 100644
--- a/app/javascript/dashboard/i18n/locale/pt/contentTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/pt/contentTemplates.json
@@ -28,6 +28,7 @@
       "TYPES": {
         "MEDIA": "Media",
         "QUICK_REPLY": "Quick Reply",
+        "CALL_TO_ACTION": "Call to Action",
         "TEXT": "Texto"
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/pt/conversation.json b/app/javascript/dashboard/i18n/locale/pt/conversation.json
index 329169ec4..2846cfec8 100644
--- a/app/javascript/dashboard/i18n/locale/pt/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/pt/conversation.json
@@ -275,6 +275,16 @@
     "SIDEBAR": {
       "CONTACT": "Contacto",
       "COPILOT": "Copilot"
+    },
+    "VOICE_WIDGET": {
+      "INCOMING_CALL": "Incoming call",
+      "OUTGOING_CALL": "Outgoing call",
+      "CALL_IN_PROGRESS": "Call in progress",
+      "NOT_ANSWERED_YET": "Not answered yet",
+      "HANDLED_IN_ANOTHER_TAB": "Being handled in another tab",
+      "REJECT_CALL": "Reject",
+      "JOIN_CALL": "Join call",
+      "END_CALL": "End call"
     }
   },
   "EMAIL_TRANSCRIPT": {
diff --git a/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json
index 8a88ccd92..e31d85eee 100644
--- a/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json
@@ -808,6 +808,35 @@
         "LABEL": "Messagem",
         "PLACEHOLDER": "Por favor, insira uma mensagem para mostrar aos utilizadores com o formulário"
       },
+      "BUTTON_TEXT": {
+        "LABEL": "Button text",
+        "PLACEHOLDER": "Please rate us"
+      },
+      "LANGUAGE": {
+        "LABEL": "Idioma",
+        "PLACEHOLDER": "Select template language"
+      },
+      "MESSAGE_PREVIEW": {
+        "LABEL": "Message preview",
+        "TOOLTIP": "This may vary slightly when rendered on WhatsApp's platform."
+      },
+      "TEMPLATE_STATUS": {
+        "APPROVED": "Approved by WhatsApp",
+        "PENDING": "Pending WhatsApp approval",
+        "REJECTED": "Meta rejected the template",
+        "DEFAULT": "Needs WhatsApp approval",
+        "NOT_FOUND": "The template does not exist in the Meta platform."
+      },
+      "TEMPLATE_CREATION": {
+        "SUCCESS_MESSAGE": "WhatsApp template created successfully and sent for approval",
+        "ERROR_MESSAGE": "Failed to create WhatsApp template"
+      },
+      "TEMPLATE_UPDATE_DIALOG": {
+        "TITLE": "Edit survey details",
+        "DESCRIPTION": "We will delete the previous template and make a new one which will be sent again for WhatsApp approval",
+        "CONFIRM": "Create new template",
+        "CANCEL": "Voltar"
+      },
       "SURVEY_RULE": {
         "LABEL": "Regra do inquérito",
         "DESCRIPTION_PREFIX": "Enviar o inquérito se a conversa",
@@ -819,6 +848,7 @@
         "SELECT_PLACEHOLDER": "selecionar etiquetas"
       },
       "NOTE": "Nota: Os inquéritos CSAT são enviados apenas uma vez por conversa",
+      "WHATSAPP_NOTE": "Note: We will create a template and send it for WhatsApp approval. After being approved, surveys will be sent only once per conversation as per the survey rule.",
       "API": {
         "SUCCESS_MESSAGE": "Definições de CSAT atualizadas com sucesso",
         "ERROR_MESSAGE": "Não foi possível atualizar as definições de CSAT. Por favor, tente novamente mais tarde."
diff --git a/app/javascript/dashboard/i18n/locale/pt/search.json b/app/javascript/dashboard/i18n/locale/pt/search.json
index 26646a36a..cf2a44d86 100644
--- a/app/javascript/dashboard/i18n/locale/pt/search.json
+++ b/app/javascript/dashboard/i18n/locale/pt/search.json
@@ -1,7 +1,7 @@
 {
   "SEARCH": {
     "TABS": {
-      "ALL": "TODOS",
+      "ALL": "All results",
       "CONTACTS": "Contactos",
       "CONVERSATIONS": "Conversas",
       "MESSAGES": "Mensagens",
@@ -19,14 +19,50 @@
     "LOADING_DATA": "A carregar",
     "EMPTY_STATE": "Não foi encontrado {item} para a consulta '{query}'",
     "EMPTY_STATE_FULL": "Nenhum resultado encontrado para a consulta '{query}'",
-    "PLACEHOLDER_KEYBINDING": "/ para focar",
+    "PLACEHOLDER_KEYBINDING": "/para focar",
     "INPUT_PLACEHOLDER": "Digite 3 ou mais caracteres para pesquisar",
+    "RECENT_SEARCHES": "Recent searches",
+    "CLEAR_ALL": "Limpar tudo",
+    "MOST_RECENT": "Most recent",
     "EMPTY_STATE_DEFAULT": "Procurar por ID da conversa, email, número de telefone, mensagens para obter melhores resultados. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Ler mais",
+    "READ_LESS": "Read less",
     "WROTE": "escreveu:",
-    "FROM": "de",
-    "EMAIL": "e-mail",
-    "EMAIL_SUBJECT": "assunto"
+    "FROM": "De",
+    "EMAIL": "E-mail",
+    "EMAIL_SUBJECT": "Assunto",
+    "PRIVATE": "Private note",
+    "TRANSCRIPT": "Transcript",
+    "CREATED_AT": "created {time}",
+    "UPDATED_AT": "updated {time}",
+    "SORT_BY": {
+      "RELEVANCE": "Relevance"
+    },
+    "DATE_RANGE": {
+      "LAST_7_DAYS": "Últimos 7 Dias",
+      "LAST_30_DAYS": "Últimos 30 Dias",
+      "LAST_60_DAYS": "Últimos 60 Dias",
+      "LAST_90_DAYS": "Últimos 90 Dias",
+      "CUSTOM_RANGE": "Custom range:",
+      "CREATED_BETWEEN": "Created between",
+      "AND": "and",
+      "APPLY": "Confirmar",
+      "BEFORE_DATE": "Before {date}",
+      "AFTER_DATE": "After {date}",
+      "TIME_RANGE": "Filter by time",
+      "CLEAR_FILTER": "Limpar filtros"
+    },
+    "FILTERS": {
+      "FILTER_MESSAGE": "Filter messages by:",
+      "FROM": "Remetente",
+      "IN": "Caixa de entrada",
+      "AGENTS": "Agentes",
+      "CONTACTS": "Contactos",
+      "INBOXES": "Caixas de Entrada",
+      "NO_AGENTS": "Nenhum agente encontrado",
+      "NO_CONTACTS": "Start by searching to see results",
+      "NO_INBOXES": "No inboxes found"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/pt_BR/attributesMgmt.json
index 94d93c661..71530e68d 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/attributesMgmt.json
@@ -131,8 +131,8 @@
       }
     },
     "BADGES": {
-      "PRE_CHAT": "Pre-chat",
-      "RESOLUTION": "Resolution"
+      "PRE_CHAT": "Pré-chat",
+      "RESOLUTION": "Resolução"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/chatlist.json b/app/javascript/dashboard/i18n/locale/pt_BR/chatlist.json
index 6908efd1e..30364e366 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/chatlist.json
@@ -104,7 +104,7 @@
         "CONTENT": "Contato compartilhado"
       },
       "embed": {
-        "CONTENT": "Embedded content"
+        "CONTENT": "Conteúdo incorporado"
       }
     },
     "CHAT_SORT_BY_FILTER": {
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/companies.json b/app/javascript/dashboard/i18n/locale/pt_BR/companies.json
index 6bec64830..56f6856bd 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/companies.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/companies.json
@@ -1,12 +1,13 @@
 {
   "COMPANIES": {
-    "HEADER": "Companies",
+    "HEADER": "Empresas",
     "SORT_BY": {
       "LABEL": "Classificar por",
       "OPTIONS": {
         "NAME": "Nome",
         "DOMAIN": "Domínio",
-        "CREATED_AT": "Criado em"
+        "CREATED_AT": "Criado em",
+        "CONTACTS_COUNT": "Contacts count"
       }
     },
     "ORDER": {
@@ -16,17 +17,17 @@
         "DESCENDING": "Decrescente"
       }
     },
-    "SEARCH_PLACEHOLDER": "Search companies...",
-    "LOADING": "Loading companies...",
-    "UNNAMED": "Unnamed Company",
-    "CONTACTS_COUNT": "{n} contact | {n} contacts",
+    "SEARCH_PLACEHOLDER": "Buscar empresas...",
+    "LOADING": "Carregando empresas...",
+    "UNNAMED": "Empresa sem nome",
+    "CONTACTS_COUNT": "{n} contato | {n} contatos",
     "EMPTY_STATE": {
-      "TITLE": "No companies found"
+      "TITLE": "Nenhuma empresa encontrada"
     }
   },
   "COMPANIES_LAYOUT": {
     "PAGINATION_FOOTER": {
-      "SHOWING": "Showing {startItem} – {endItem} of {totalItems} company | Showing {startItem} – {endItem} of {totalItems} companies"
+      "SHOWING": "Mostrando {startItem} – {endItem} de {totalItems} empresa | Mostrando {startItem} – {endItem} de {totalItems} empresas"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/contact.json b/app/javascript/dashboard/i18n/locale/pt_BR/contact.json
index 2020e5a6d..57ac2ec00 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/contact.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/contact.json
@@ -18,8 +18,8 @@
     "CREATED_AT_LABEL": "Criado",
     "NEW_MESSAGE": "Nova Mensagem",
     "CALL": "Chamada",
-    "CALL_INITIATED": "Calling the contact…",
-    "CALL_FAILED": "Unable to start the call. Please try again.",
+    "CALL_INITIATED": "Efetuando chamada…",
+    "CALL_FAILED": "Não foi possível iniciar a chamada. Tente novamente.",
     "VOICE_INBOX_PICKER": {
       "TITLE": "Escolha uma caixa de entrada de voz"
     },
@@ -458,7 +458,7 @@
             "PLACEHOLDER": "Adicionar Instagram"
           },
           "TIKTOK": {
-            "PLACEHOLDER": "Add TikTok"
+            "PLACEHOLDER": "Adicionar TikTok"
           },
           "LINKEDIN": {
             "PLACEHOLDER": "Adicionar LinkedIn"
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/contentTemplates.json b/app/javascript/dashboard/i18n/locale/pt_BR/contentTemplates.json
index 07c69c434..478fb164b 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/contentTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/contentTemplates.json
@@ -28,6 +28,7 @@
       "TYPES": {
         "MEDIA": "Mídia",
         "QUICK_REPLY": "Resposta Rápida",
+        "CALL_TO_ACTION": "Chamada para Ação",
         "TEXT": "Texto"
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json b/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json
index b77f4e3f6..75382b880 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json
@@ -275,6 +275,16 @@
     "SIDEBAR": {
       "CONTACT": "Contatos",
       "COPILOT": "Copiloto"
+    },
+    "VOICE_WIDGET": {
+      "INCOMING_CALL": "Chamada recebida",
+      "OUTGOING_CALL": "Chamada realizada",
+      "CALL_IN_PROGRESS": "Chamada em andamento",
+      "NOT_ANSWERED_YET": "Ainda não respondido",
+      "HANDLED_IN_ANOTHER_TAB": "Sendo atendida em outra aba",
+      "REJECT_CALL": "Recusar",
+      "JOIN_CALL": "Entrar na chamada",
+      "END_CALL": "Encerrar chamada"
     }
   },
   "EMAIL_TRANSCRIPT": {
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/helpCenter.json b/app/javascript/dashboard/i18n/locale/pt_BR/helpCenter.json
index effc982ae..02896fc60 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/helpCenter.json
@@ -848,7 +848,7 @@
       "DESCRIPTION": "Upload PDF documents to automatically generate FAQ content using AI",
       "UPLOAD_TITLE": "Upload PDF Document",
       "DRAG_DROP": "Arraste e solte seu arquivo PDF aqui, clique para selecionar",
-      "SELECT_FILE": "",
+      "SELECT_FILE": "Selecionar Arquivo PDF",
       "UPLOADING": "Processing document...",
       "UPLOAD_SUCCESS": "Document processed successfully!",
       "UPLOAD_ERROR": "Failed to upload document. Please try again.",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
index dbc45df3c..20ccdce2d 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
@@ -58,11 +58,11 @@
         "DUPLICATE_INBOX_BANNER": "Esta conta do Instagram foi migrada para a nova caixa de entrada de canal do Instagram. Você não poderá mais enviar/receber mensagens do Instagram desta caixa de entrada."
       },
       "TIKTOK": {
-        "CONTINUE_WITH_TIKTOK": "Continue with TikTok",
-        "CONNECT_YOUR_TIKTOK_PROFILE": "Connect your TikTok Profile",
-        "HELP": "To add your TikTok profile as a channel, you need to authenticate your TikTok Profile by clicking on 'Continue with TikTok' ",
-        "ERROR_MESSAGE": "There was an error connecting to TikTok, please try again",
-        "ERROR_AUTH": "There was an error connecting to TikTok, please try again"
+        "CONTINUE_WITH_TIKTOK": "Continuar com TikTok",
+        "CONNECT_YOUR_TIKTOK_PROFILE": "Conecte seu perfil do TikTok",
+        "HELP": "Para adicionar seu perfil do TikTok como um canal, é necessário autenticar seu perfil clicando em 'Continuar com TikTok'. ",
+        "ERROR_MESSAGE": "Ocorreu um erro ao conectar com o TikTok. Tente novamente",
+        "ERROR_AUTH": "Ocorreu um erro ao conectar com o TikTok. Tente novamente"
       },
       "TWITTER": {
         "HELP": "Para adicionar seu perfil do Twitter como um canal, você precisa autenticar seu perfil do Twitter clicando em 'Entrar com o Twitter' ",
@@ -389,10 +389,10 @@
           "ERROR_MESSAGE": "Não foi possível salvar o canal de e-mail"
         },
         "FINISH_MESSAGE": "Comece a encaminhar seus e-mails para o seguinte endereço de e-mail.",
-        "FINISH_MESSAGE_NO_FORWARDING": "Your email inbox has been created successfully! You need to configure SMTP and IMAP credentials to send and receive emails. Without these settings, no emails will be processed.",
-        "FORWARDING_ADDRESS_LABEL": "Forward emails to this address:",
+        "FINISH_MESSAGE_NO_FORWARDING": "Sua caixa de entrada de e-mail foi criada com sucesso! É necessário configurar as credenciais de SMTP e IMAP para enviar e receber e-mails. Sem essas configurações, nenhum e-mail será processado.",
+        "FORWARDING_ADDRESS_LABEL": "Encaminhe os e-mails para este endereço:",
         "CONFIGURE_SMTP_IMAP_LINK": "Clique aqui",
-        "CONFIGURE_SMTP_IMAP_TEXT": " to configure IMAP and SMTP settings"
+        "CONFIGURE_SMTP_IMAP_TEXT": " para configurar IMAP e SMTP"
       },
       "LINE_CHANNEL": {
         "TITLE": "Canal LINE",
@@ -480,7 +480,7 @@
           },
           "TIKTOK": {
             "TITLE": "TikTok",
-            "DESCRIPTION": "Connect your TikTok account"
+            "DESCRIPTION": "Conecte sua conta do TikTok"
           },
           "VOICE": {
             "TITLE": "Voz",
@@ -722,7 +722,7 @@
       "INBOX_IDENTIFIER_SUB_TEXT": "Use o token 'inbox_identifier' mostrado aqui para autenticar os seus clientes API.",
       "FORWARD_EMAIL_TITLE": "Encaminhar para o E-mail",
       "FORWARD_EMAIL_SUB_TEXT": "Comece a encaminhar seus e-mails para o seguinte endereço de e-mail.",
-      "FORWARD_EMAIL_NOT_CONFIGURED": "Forwarding emails to your inbox is currently disabled on this installation. To use this feature, it must be enabled by your administrator. Please get in touch with them to proceed.",
+      "FORWARD_EMAIL_NOT_CONFIGURED": "O encaminhamento de e-mails para sua caixa de entrada está desativado nesta instalação. Para utilizar esse recurso, ele deve ser habilitado pelo administrador. Entre em contato com um para prosseguir.",
       "ALLOW_MESSAGES_AFTER_RESOLVED": "Permitir mensagens após a resolução da conversa",
       "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Permite que os usuários finais enviem mensagens mesmo depois que a conversa for resolvida.",
       "WHATSAPP_SECTION_SUBHEADER": "Esta chave de API é usada para a integração com as APIs do WhatsApp.",
@@ -808,6 +808,35 @@
         "LABEL": "Mensagem",
         "PLACEHOLDER": "Digite uma mensagem para mostrar aos usuários com o formulário"
       },
+      "BUTTON_TEXT": {
+        "LABEL": "Texto do botão",
+        "PLACEHOLDER": "Por favor, avalie-nos"
+      },
+      "LANGUAGE": {
+        "LABEL": "Idioma",
+        "PLACEHOLDER": "Selecione o idioma do modelo"
+      },
+      "MESSAGE_PREVIEW": {
+        "LABEL": "Pré-visualização da mensagem",
+        "TOOLTIP": "Isso pode variar ligeiramente quando exibido na plataforma do WhatsApp."
+      },
+      "TEMPLATE_STATUS": {
+        "APPROVED": "Aprovado pelo WhatsApp",
+        "PENDING": "Aguardando aprovação do WhatsApp",
+        "REJECTED": "A Meta rejeitou o modelo",
+        "DEFAULT": "Precisa de aprovação do WhatsApp",
+        "NOT_FOUND": "O modelo não existe na plataforma da Meta."
+      },
+      "TEMPLATE_CREATION": {
+        "SUCCESS_MESSAGE": "Modelo do WhatsApp criado com sucesso e enviado para aprovação",
+        "ERROR_MESSAGE": "Falha ao criar o modelo do WhatsApp"
+      },
+      "TEMPLATE_UPDATE_DIALOG": {
+        "TITLE": "Editar detalhes da pesquisa",
+        "DESCRIPTION": "Vamos excluir o modelo anterior e criar um que será enviado novamente para aprovação do WhatsApp",
+        "CONFIRM": "Criar novo modelo",
+        "CANCEL": "Voltar atrás"
+      },
       "SURVEY_RULE": {
         "LABEL": "Regra de pesquisa",
         "DESCRIPTION_PREFIX": "Enviar a pesquisa se a conversa",
@@ -819,6 +848,7 @@
         "SELECT_PLACEHOLDER": "selecionar etiquetas"
       },
       "NOTE": "Nota: pesquisas de CSAT são enviadas apenas uma vez por conversa",
+      "WHATSAPP_NOTE": "Nota: Vamos criar um modelo e enviá-lo para aprovação do WhatsApp. Após a aprovação, as pesquisas serão enviadas apenas uma vez por conversa, conforme a regra da pesquisa.",
       "API": {
         "SUCCESS_MESSAGE": "Configurações de CSAT atualizadas com sucesso",
         "ERROR_MESSAGE": "Não foi possível atualizar as configurações do CSAT. Por favor, tente novamente mais tarde."
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/search.json b/app/javascript/dashboard/i18n/locale/pt_BR/search.json
index ff2905a82..2cb8f25c2 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/search.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/search.json
@@ -1,7 +1,7 @@
 {
   "SEARCH": {
     "TABS": {
-      "ALL": "Tudo",
+      "ALL": "Todos os resultados",
       "CONTACTS": "Contatos",
       "CONVERSATIONS": "Conversas",
       "MESSAGES": "Mensagens",
@@ -19,14 +19,50 @@
     "LOADING_DATA": "Carregando",
     "EMPTY_STATE": "Nenhum {item} foi encontrado para a consulta '{query}'",
     "EMPTY_STATE_FULL": "Nenhum resultado encontrado para a consulta '{query}'",
-    "PLACEHOLDER_KEYBINDING": "/ para focar",
+    "PLACEHOLDER_KEYBINDING": "/para focar",
     "INPUT_PLACEHOLDER": "Digite 3 ou mais caracteres para pesquisar",
+    "RECENT_SEARCHES": "Pesquisas recentes",
+    "CLEAR_ALL": "Limpar tudo",
+    "MOST_RECENT": "Mais recentes",
     "EMPTY_STATE_DEFAULT": "Procurar por ID de conversa, e-mail, número de telefone, mensagens para melhores resultados de busca.",
     "BOT_LABEL": "Robôs",
     "READ_MORE": "Saiba mais",
+    "READ_LESS": "Ler menos",
     "WROTE": "escreveu:",
-    "FROM": "de",
-    "EMAIL": "e-mail",
-    "EMAIL_SUBJECT": "assunto"
+    "FROM": "De",
+    "EMAIL": "E-mail",
+    "EMAIL_SUBJECT": "Assunto",
+    "PRIVATE": "Nota privada",
+    "TRANSCRIPT": "Transcrição",
+    "CREATED_AT": "criado {time}",
+    "UPDATED_AT": "atualizado em {time}",
+    "SORT_BY": {
+      "RELEVANCE": "Relevância"
+    },
+    "DATE_RANGE": {
+      "LAST_7_DAYS": "Últimos 7 dias",
+      "LAST_30_DAYS": "Últimos 30 dias",
+      "LAST_60_DAYS": "Últimos 60 dias",
+      "LAST_90_DAYS": "Últimos 90 dias",
+      "CUSTOM_RANGE": "Intervalo personalizado:",
+      "CREATED_BETWEEN": "Criado entre",
+      "AND": "e",
+      "APPLY": "Aplicar",
+      "BEFORE_DATE": "Antes de {date}",
+      "AFTER_DATE": "Depois de {date}",
+      "TIME_RANGE": "Filtrar por horário",
+      "CLEAR_FILTER": "Limpar filtros"
+    },
+    "FILTERS": {
+      "FILTER_MESSAGE": "Filtrar mensagens por:",
+      "FROM": "Remetente",
+      "IN": "Caixa de Entrada",
+      "AGENTS": "Agentes",
+      "CONTACTS": "Contatos",
+      "INBOXES": "Caixas de Entrada",
+      "NO_AGENTS": "Nenhum agente encontrado",
+      "NO_CONTACTS": "Comece a pesquisar para ver os resultados",
+      "NO_INBOXES": "Nenhuma caixa de entrada encontrada"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/settings.json b/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
index d7a34cbdf..ed73d733d 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
@@ -234,7 +234,7 @@
     "CONTACT_SUPPORT": "Contate o suporte",
     "SELECTOR_SUBTITLE": "Selecione uma conta da lista a seguir",
     "PROFILE_SETTINGS": "Configurações do Perfil",
-    "YEAR_IN_REVIEW": "Year in Review",
+    "YEAR_IN_REVIEW": "Retrospectiva do Ano",
     "KEYBOARD_SHORTCUTS": "Atalhos do teclado",
     "APPEARANCE": "Alterar Tema",
     "SUPER_ADMIN_CONSOLE": "Console de Super Admin",
@@ -416,21 +416,21 @@
       "MODAL_DESCRIPTION": "Comprar créditos adicionais para o Capitão AI.",
       "CREDITS": "CRÉDITOS",
       "ONE_TIME": "única vez",
-      "POPULAR": "Most Popular",
+      "POPULAR": "Mais populares",
       "NOTE_TITLE": "Nota:",
-      "NOTE_DESCRIPTION": "Credits are added immediately and expire in 6 months. An active subscription is required to use credits. Purchased credits are consumed after your monthly plan credits.",
+      "NOTE_DESCRIPTION": "Créditos são adicionados imediatamente e expiram em 6 meses. Uma assinatura ativa é necessária para usar créditos. Créditos adquiridos são consumidos após seus créditos do plano mensal.",
       "CANCEL": "Cancelar",
-      "PURCHASE": "Purchase Credits",
-      "LOADING": "Loading options...",
-      "FETCH_ERROR": "Failed to load credit options. Please try again.",
-      "PURCHASE_ERROR": "Failed to process purchase. Please try again.",
-      "PURCHASE_SUCCESS": "Successfully added {credits} credits to your account",
+      "PURCHASE": "Comprar Créditos",
+      "LOADING": "Carregando opções...",
+      "FETCH_ERROR": "Falha ao carregar opções de crédito. Por favor, tente novamente.",
+      "PURCHASE_ERROR": "Falha ao processar a compra. Por favor, tente novamente.",
+      "PURCHASE_SUCCESS": "Foram adicionados {credits} créditos com sucesso à sua conta",
       "CONFIRM": {
-        "TITLE": "Confirm Purchase",
-        "DESCRIPTION": "You are about to purchase {credits} credits for {amount}.",
-        "INSTANT_DEDUCTION_NOTE": "Your saved card will be charged immediately upon confirmation.",
+        "TITLE": "Confirmar compra",
+        "DESCRIPTION": "Você está prestes a comprar {credits} créditos por {amount}.",
+        "INSTANT_DEDUCTION_NOTE": "Seu cartão salvo será cobrado imediatamente após a confirmação.",
         "GO_BACK": "Voltar",
-        "CONFIRM_PURCHASE": "Confirm Purchase"
+        "CONFIRM_PURCHASE": "Confirmar compra"
       }
     }
   },
@@ -438,7 +438,7 @@
     "TITLE": "Segurança",
     "DESCRIPTION": "Gerencie as configurações de segurança da sua conta.",
     "LINK_TEXT": "Saiba mais sobre o SAML SSO",
-    "SAML_DISABLED_MESSAGE": "SAML SSO is currently disabled. Please contact your administrator to enable this feature.",
+    "SAML_DISABLED_MESSAGE": "O SSO via SAML está desativado no momento. Entre em contato com o administrador para habilitar esse recurso.",
     "SAML": {
       "TITLE": "SAML SSO",
       "NOTE": "Configure SAML single sign-on for your account. Users will authenticate through your identity provider instead of using email/password.",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/yearInReview.json b/app/javascript/dashboard/i18n/locale/pt_BR/yearInReview.json
index 1c4e88f0b..b62ec1875 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/yearInReview.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/yearInReview.json
@@ -1,62 +1,62 @@
 {
   "YEAR_IN_REVIEW": {
-    "TITLE": "Year in Review",
-    "LOADING": "Loading your year in review...",
-    "ERROR": "Failed to load year in review",
+    "TITLE": "Retrospectiva do ano",
+    "LOADING": "Carregando sua retrospectiva do ano...",
+    "ERROR": "Falha ao carregar a retrospectiva do ano",
     "CLOSE": "Fechar",
     "CONVERSATIONS": {
-      "TITLE": "You have handled",
+      "TITLE": "Você atendeu",
       "SUBTITLE": "conversas",
-      "FALLBACK": "This year wasn't about the numbers. It was about showing up.",
+      "FALLBACK": "Este ano não foi sobre números. Foi sobre estar presente.",
       "COMPARISON": {
-        "0_50": "You showed up, and that's how every good inbox begins.",
-        "50_100": "You kept the replies flowing and the conversations alive.",
-        "100_500": "You handled serious volume and kept everything on track.",
-        "500_2000": "You kept things moving while the volume kept climbing.",
-        "2000_10000": "You ran high traffic through your inbox without breaking a sweat.",
-        "10000_PLUS": "That's a full city of customers knocking on your door. You made it look effortless."
+        "0_50": "Você esteve presente e é assim que toda boa caixa de entrada começa.",
+        "50_100": "Você manteve as respostas fluindo e as conversas vivas.",
+        "100_500": "Você lidou com um grande volume e manteve tudo em ordem.",
+        "500_2000": "Você manteve tudo em movimento enquanto o volume continuava crescendo.",
+        "2000_10000": "Você lidou com alto tráfego na sua caixa de entrada com tranquilidade.",
+        "10000_PLUS": "Era uma cidade inteira de clientes batendo à sua porta. E você fez parecer fácil."
       }
     },
     "BUSIEST_DAY": {
-      "TITLE": "Your busiest day was",
-      "MESSAGE": "{count} conversations that day.",
+      "TITLE": "Seu dia mais movimentado foi",
+      "MESSAGE": "{count} conversas nesse dia.",
       "COMPARISON": {
-        "0_5": "A warm-up lap that barely woke the inbox.",
-        "5_10": "Enough action to justify a second cup of coffee.",
-        "10_25": "Things got busy and the inbox stayed on its toes.",
-        "25_50": "A proper rush that barely broke a sweat.",
-        "50_100": "Controlled chaos, handled like a normal Tuesday.",
-        "100_500": "Absolute dumpster fire, somehow still shipping replies.",
-        "500_PLUS": "The inbox lost all chill and never slowed down."
+        "0_5": "Só um aquecimento leve, mal deu tempo da caixa de entrada acordar.",
+        "5_10": "Movimento suficiente para justificar uma segunda xícara de café.",
+        "10_25": "A coisa começou a esquentar e a caixa de entrada teve que ficar ligada o tempo todo.",
+        "25_50": "Uma correria daquelas, mas sem nem suar.",
+        "50_100": "Caos controlado, resolvido como se fosse uma terça-feira qualquer.",
+        "100_500": "Um caos total, mas as respostas continuaram saindo mesmo assim.",
+        "500_PLUS": "A caixa de entrada perdeu totalmente a calma e não deu trégua em nenhum momento."
       }
     },
     "PERSONALITY": {
-      "TITLE": "Your support personality is",
+      "TITLE": "Seu estilo de atendimento é",
       "MESSAGES": {
-        "SWIFT_HELPER": "You replied in {time} on average. Faster than most notifications.",
-        "QUICK_RESPONDER": "You replied in {time} on average. The inbox barely waited.",
-        "STEADY_SUPPORT": "You replied in {time} on average. Calm pace, solid replies.",
-        "THOUGHTFUL_ADVISOR": "You replied in {time} on average. Took the time to get it right."
+        "SWIFT_HELPER": "Você respondia em média em {time}. Mais rápido que a maioria das notificações.",
+        "QUICK_RESPONDER": "Você respondia em média em {time}. A caixa de entrada mal teve tempo de esperar.",
+        "STEADY_SUPPORT": "Você respondia em média em {time}. Ritmo tranquilo, respostas bem feitas.",
+        "THOUGHTFUL_ADVISOR": "Você respondia em média em {time}. Sem pressa, mas com capricho."
       }
     },
     "THANK_YOU": {
-      "TITLE": "Congratulations on surviving the inbox of {year}.",
-      "MESSAGE": "Thank you for your incredible dedication to supporting customers throughout this year. Your hard work has made a real difference, and we're grateful to have you on this journey. Here's to making {nextYear} even better together!"
+      "TITLE": "Parabéns por sobreviver à caixa de entrada de {year}.",
+      "MESSAGE": "Obrigado pela sua dedicação incrível em apoiar os clientes ao longo deste ano. Seu trabalho árduo fez uma diferença real, e somos gratos por ter você nessa jornada. Que possamos tornar {nextYear} ainda melhor juntos!"
     },
     "SHARE_MODAL": {
-      "TITLE": "Share Your Year in Review",
-      "PREPARING": "Preparing your image...",
+      "TITLE": "Compartilhe sua Retrospectiva",
+      "PREPARING": "Preparando sua imagem...",
       "DOWNLOAD": "Baixar",
-      "SHARE_TITLE": "My {year} Year in Review",
-      "SHARE_TEXT": "Check out my {year} Year in Review with Chatwoot!",
-      "BRANDING": "Made with Chatwoot"
+      "SHARE_TITLE": "Minha retrospectiva de {year}",
+      "SHARE_TEXT": "Confira minha retrospectiva de {year} com o Chatwoot!",
+      "BRANDING": "Feito com Chatwoot"
     },
     "BANNER": {
-      "TITLE": "Your {year} Year in Review is here",
-      "BUTTON": "See your impact"
+      "TITLE": "Sua retrospectiva de {year} chegou",
+      "BUTTON": "Veja seu impacto"
     },
     "NAVIGATION": {
-      "PREVIOUS": "Previous",
+      "PREVIOUS": "Anterior",
       "NEXT": "Próximo",
       "SHARE": "Compartilhar"
     }
diff --git a/app/javascript/dashboard/i18n/locale/ro/companies.json b/app/javascript/dashboard/i18n/locale/ro/companies.json
index a432b7717..bcb887cd0 100644
--- a/app/javascript/dashboard/i18n/locale/ro/companies.json
+++ b/app/javascript/dashboard/i18n/locale/ro/companies.json
@@ -6,7 +6,8 @@
       "OPTIONS": {
         "NAME": "Nume",
         "DOMAIN": "Domeniu",
-        "CREATED_AT": "Creat la"
+        "CREATED_AT": "Creat la",
+        "CONTACTS_COUNT": "Contacts count"
       }
     },
     "ORDER": {
diff --git a/app/javascript/dashboard/i18n/locale/ro/contentTemplates.json b/app/javascript/dashboard/i18n/locale/ro/contentTemplates.json
index 0b6c888f3..dc7fd51e4 100644
--- a/app/javascript/dashboard/i18n/locale/ro/contentTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/ro/contentTemplates.json
@@ -28,6 +28,7 @@
       "TYPES": {
         "MEDIA": "Media",
         "QUICK_REPLY": "Quick Reply",
+        "CALL_TO_ACTION": "Call to Action",
         "TEXT": "Text"
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/ro/conversation.json b/app/javascript/dashboard/i18n/locale/ro/conversation.json
index 59f63b82e..ff48ec626 100644
--- a/app/javascript/dashboard/i18n/locale/ro/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ro/conversation.json
@@ -275,6 +275,16 @@
     "SIDEBAR": {
       "CONTACT": "Contact",
       "COPILOT": "Copilot"
+    },
+    "VOICE_WIDGET": {
+      "INCOMING_CALL": "Incoming call",
+      "OUTGOING_CALL": "Outgoing call",
+      "CALL_IN_PROGRESS": "Call in progress",
+      "NOT_ANSWERED_YET": "Not answered yet",
+      "HANDLED_IN_ANOTHER_TAB": "Being handled in another tab",
+      "REJECT_CALL": "Reject",
+      "JOIN_CALL": "Join call",
+      "END_CALL": "End call"
     }
   },
   "EMAIL_TRANSCRIPT": {
diff --git a/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json
index 4df176488..5b11a23e0 100644
--- a/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json
@@ -808,6 +808,35 @@
         "LABEL": "Mesaj",
         "PLACEHOLDER": "Please enter a message to show users with the form"
       },
+      "BUTTON_TEXT": {
+        "LABEL": "Button text",
+        "PLACEHOLDER": "Please rate us"
+      },
+      "LANGUAGE": {
+        "LABEL": "Limbă",
+        "PLACEHOLDER": "Select template language"
+      },
+      "MESSAGE_PREVIEW": {
+        "LABEL": "Message preview",
+        "TOOLTIP": "This may vary slightly when rendered on WhatsApp's platform."
+      },
+      "TEMPLATE_STATUS": {
+        "APPROVED": "Approved by WhatsApp",
+        "PENDING": "Pending WhatsApp approval",
+        "REJECTED": "Meta rejected the template",
+        "DEFAULT": "Needs WhatsApp approval",
+        "NOT_FOUND": "The template does not exist in the Meta platform."
+      },
+      "TEMPLATE_CREATION": {
+        "SUCCESS_MESSAGE": "WhatsApp template created successfully and sent for approval",
+        "ERROR_MESSAGE": "Failed to create WhatsApp template"
+      },
+      "TEMPLATE_UPDATE_DIALOG": {
+        "TITLE": "Edit survey details",
+        "DESCRIPTION": "We will delete the previous template and make a new one which will be sent again for WhatsApp approval",
+        "CONFIRM": "Create new template",
+        "CANCEL": "Mergeți înapoi"
+      },
       "SURVEY_RULE": {
         "LABEL": "Survey rule",
         "DESCRIPTION_PREFIX": "Send the survey if the conversation",
@@ -819,6 +848,7 @@
         "SELECT_PLACEHOLDER": "select labels"
       },
       "NOTE": "Note: CSAT surveys are sent only once per conversation",
+      "WHATSAPP_NOTE": "Note: We will create a template and send it for WhatsApp approval. After being approved, surveys will be sent only once per conversation as per the survey rule.",
       "API": {
         "SUCCESS_MESSAGE": "CSAT settings updated successfully",
         "ERROR_MESSAGE": "We couldn't update CSAT settings. Please try again later."
diff --git a/app/javascript/dashboard/i18n/locale/ro/search.json b/app/javascript/dashboard/i18n/locale/ro/search.json
index e2e0c3f09..abe4a472e 100644
--- a/app/javascript/dashboard/i18n/locale/ro/search.json
+++ b/app/javascript/dashboard/i18n/locale/ro/search.json
@@ -1,7 +1,7 @@
 {
   "SEARCH": {
     "TABS": {
-      "ALL": "Toate",
+      "ALL": "All results",
       "CONTACTS": "Contacte",
       "CONVERSATIONS": "Conversații",
       "MESSAGES": "Mesaje",
@@ -19,14 +19,50 @@
     "LOADING_DATA": "Loading",
     "EMPTY_STATE": "Nu s-a găsit niciun {item} pentru interogarea \"{query}\"",
     "EMPTY_STATE_FULL": "Nu s-au găsit rezultate pentru interogarea \"{query}\"",
-    "PLACEHOLDER_KEYBINDING": "/ să se concentreze",
+    "PLACEHOLDER_KEYBINDING": "/să se concentreze",
     "INPUT_PLACEHOLDER": "Tastați 3 sau mai multe caractere de căutat",
+    "RECENT_SEARCHES": "Recent searches",
+    "CLEAR_ALL": "Clear all",
+    "MOST_RECENT": "Most recent",
     "EMPTY_STATE_DEFAULT": "Căutați după id-ul conversației, e-mail, numărul de telefon, mesajele pentru rezultate de căutare mai bune. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Citeşte mai mult",
+    "READ_LESS": "Read less",
     "WROTE": "scrisese:",
-    "FROM": "de la",
-    "EMAIL": "e-mail",
-    "EMAIL_SUBJECT": "subiect"
+    "FROM": "De la",
+    "EMAIL": "E-mail",
+    "EMAIL_SUBJECT": "Subiect",
+    "PRIVATE": "Private note",
+    "TRANSCRIPT": "Transcript",
+    "CREATED_AT": "created {time}",
+    "UPDATED_AT": "updated {time}",
+    "SORT_BY": {
+      "RELEVANCE": "Relevance"
+    },
+    "DATE_RANGE": {
+      "LAST_7_DAYS": "Ultimele 7 zile",
+      "LAST_30_DAYS": "Ultimele 30 zile",
+      "LAST_60_DAYS": "Ultimele 60 zile",
+      "LAST_90_DAYS": "Ultimele 90 zile",
+      "CUSTOM_RANGE": "Custom range:",
+      "CREATED_BETWEEN": "Created between",
+      "AND": "şi",
+      "APPLY": "Aplică",
+      "BEFORE_DATE": "Before {date}",
+      "AFTER_DATE": "After {date}",
+      "TIME_RANGE": "Filter by time",
+      "CLEAR_FILTER": "Clear filter"
+    },
+    "FILTERS": {
+      "FILTER_MESSAGE": "Filter messages by:",
+      "FROM": "Expeditor",
+      "IN": "Inbox",
+      "AGENTS": "Agenți",
+      "CONTACTS": "Contacte",
+      "INBOXES": "Căsuțe",
+      "NO_AGENTS": "Niciun agent găsit",
+      "NO_CONTACTS": "Start by searching to see results",
+      "NO_INBOXES": "No inboxes found"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ru/companies.json b/app/javascript/dashboard/i18n/locale/ru/companies.json
index af09d9382..85c9cf86e 100644
--- a/app/javascript/dashboard/i18n/locale/ru/companies.json
+++ b/app/javascript/dashboard/i18n/locale/ru/companies.json
@@ -6,7 +6,8 @@
       "OPTIONS": {
         "NAME": "Имя",
         "DOMAIN": "Домен",
-        "CREATED_AT": "Дата создания"
+        "CREATED_AT": "Дата создания",
+        "CONTACTS_COUNT": "Contacts count"
       }
     },
     "ORDER": {
diff --git a/app/javascript/dashboard/i18n/locale/ru/contentTemplates.json b/app/javascript/dashboard/i18n/locale/ru/contentTemplates.json
index 32433e791..afcd7bc5e 100644
--- a/app/javascript/dashboard/i18n/locale/ru/contentTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/ru/contentTemplates.json
@@ -28,6 +28,7 @@
       "TYPES": {
         "MEDIA": "Медиа",
         "QUICK_REPLY": "Быстрый ответ",
+        "CALL_TO_ACTION": "Call to Action",
         "TEXT": "Текст"
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/ru/conversation.json b/app/javascript/dashboard/i18n/locale/ru/conversation.json
index 735c63373..9d4901b9b 100644
--- a/app/javascript/dashboard/i18n/locale/ru/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ru/conversation.json
@@ -275,6 +275,16 @@
     "SIDEBAR": {
       "CONTACT": "Контакт",
       "COPILOT": "Copilot"
+    },
+    "VOICE_WIDGET": {
+      "INCOMING_CALL": "Входящий звонок",
+      "OUTGOING_CALL": "Исходящий звонок",
+      "CALL_IN_PROGRESS": "Идёт звонок",
+      "NOT_ANSWERED_YET": "Пока нет ответа",
+      "HANDLED_IN_ANOTHER_TAB": "Being handled in another tab",
+      "REJECT_CALL": "Reject",
+      "JOIN_CALL": "Join call",
+      "END_CALL": "End call"
     }
   },
   "EMAIL_TRANSCRIPT": {
diff --git a/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json
index ede3f3d97..1cffc97e6 100644
--- a/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json
@@ -808,6 +808,35 @@
         "LABEL": "Сообщение",
         "PLACEHOLDER": "Добавьте сообщение, которое будет отображено в форме обратной связи"
       },
+      "BUTTON_TEXT": {
+        "LABEL": "Button text",
+        "PLACEHOLDER": "Please rate us"
+      },
+      "LANGUAGE": {
+        "LABEL": "Язык",
+        "PLACEHOLDER": "Select template language"
+      },
+      "MESSAGE_PREVIEW": {
+        "LABEL": "Message preview",
+        "TOOLTIP": "This may vary slightly when rendered on WhatsApp's platform."
+      },
+      "TEMPLATE_STATUS": {
+        "APPROVED": "Approved by WhatsApp",
+        "PENDING": "Pending WhatsApp approval",
+        "REJECTED": "Meta rejected the template",
+        "DEFAULT": "Needs WhatsApp approval",
+        "NOT_FOUND": "The template does not exist in the Meta platform."
+      },
+      "TEMPLATE_CREATION": {
+        "SUCCESS_MESSAGE": "WhatsApp template created successfully and sent for approval",
+        "ERROR_MESSAGE": "Failed to create WhatsApp template"
+      },
+      "TEMPLATE_UPDATE_DIALOG": {
+        "TITLE": "Edit survey details",
+        "DESCRIPTION": "We will delete the previous template and make a new one which will be sent again for WhatsApp approval",
+        "CONFIRM": "Create new template",
+        "CANCEL": "Вернуться"
+      },
       "SURVEY_RULE": {
         "LABEL": "Условие опросы",
         "DESCRIPTION_PREFIX": "Отправить опрос если диалог",
@@ -819,6 +848,7 @@
         "SELECT_PLACEHOLDER": "Выбрать метки"
       },
       "NOTE": "Примечание: опросы CSAT отправляются только один раз для диалога",
+      "WHATSAPP_NOTE": "Note: We will create a template and send it for WhatsApp approval. After being approved, surveys will be sent only once per conversation as per the survey rule.",
       "API": {
         "SUCCESS_MESSAGE": "Настройки CSAT успешно обновлены",
         "ERROR_MESSAGE": "Не удалось обновить CSAT настройки. Повторите попытку позже."
diff --git a/app/javascript/dashboard/i18n/locale/ru/search.json b/app/javascript/dashboard/i18n/locale/ru/search.json
index 757ee2634..a9d72c611 100644
--- a/app/javascript/dashboard/i18n/locale/ru/search.json
+++ b/app/javascript/dashboard/i18n/locale/ru/search.json
@@ -1,7 +1,7 @@
 {
   "SEARCH": {
     "TABS": {
-      "ALL": "Все",
+      "ALL": "All results",
       "CONTACTS": "Контакты",
       "CONVERSATIONS": "Диалоги",
       "MESSAGES": "Сообщения",
@@ -19,14 +19,50 @@
     "LOADING_DATA": "Загрузка",
     "EMPTY_STATE": "Не найдено {item} для запроса '{query}'",
     "EMPTY_STATE_FULL": "Ничего не найдено по запросу '{query}'",
-    "PLACEHOLDER_KEYBINDING": "/ фокусироваться",
+    "PLACEHOLDER_KEYBINDING": "/фокусироваться",
     "INPUT_PLACEHOLDER": "Введите 3 или более символов для поиска",
+    "RECENT_SEARCHES": "Recent searches",
+    "CLEAR_ALL": "Очистить всё",
+    "MOST_RECENT": "Most recent",
     "EMPTY_STATE_DEFAULT": "Поиск по идентификатору разговора, электронной почте, номеру телефона, сообщениям для улучшения результатов поиска. ",
     "BOT_LABEL": "Бот",
     "READ_MORE": "Читать далее",
+    "READ_LESS": "Read less",
     "WROTE": "написал:",
-    "FROM": "от",
-    "EMAIL": "почта",
-    "EMAIL_SUBJECT": "тема"
+    "FROM": "От",
+    "EMAIL": "Email",
+    "EMAIL_SUBJECT": "Тема",
+    "PRIVATE": "Private note",
+    "TRANSCRIPT": "Transcript",
+    "CREATED_AT": "создано {time}",
+    "UPDATED_AT": "updated {time}",
+    "SORT_BY": {
+      "RELEVANCE": "Relevance"
+    },
+    "DATE_RANGE": {
+      "LAST_7_DAYS": "Последние 7 дней",
+      "LAST_30_DAYS": "Последние 30 дней",
+      "LAST_60_DAYS": "Последние 60 дней",
+      "LAST_90_DAYS": "Последние 90 дней",
+      "CUSTOM_RANGE": "Custom range:",
+      "CREATED_BETWEEN": "Created between",
+      "AND": "и",
+      "APPLY": "Применить",
+      "BEFORE_DATE": "Before {date}",
+      "AFTER_DATE": "After {date}",
+      "TIME_RANGE": "Filter by time",
+      "CLEAR_FILTER": "Очистить фильтр"
+    },
+    "FILTERS": {
+      "FILTER_MESSAGE": "Filter messages by:",
+      "FROM": "Отправитель",
+      "IN": "Электронная почта",
+      "AGENTS": "Операторы",
+      "CONTACTS": "Контакты",
+      "INBOXES": "Источники",
+      "NO_AGENTS": "Операторы не найдены",
+      "NO_CONTACTS": "Start by searching to see results",
+      "NO_INBOXES": "No inboxes found"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sh/companies.json b/app/javascript/dashboard/i18n/locale/sh/companies.json
index 86190831b..0d64a4abd 100644
--- a/app/javascript/dashboard/i18n/locale/sh/companies.json
+++ b/app/javascript/dashboard/i18n/locale/sh/companies.json
@@ -6,7 +6,8 @@
       "OPTIONS": {
         "NAME": "Name",
         "DOMAIN": "Domain",
-        "CREATED_AT": "Created at"
+        "CREATED_AT": "Created at",
+        "CONTACTS_COUNT": "Contacts count"
       }
     },
     "ORDER": {
diff --git a/app/javascript/dashboard/i18n/locale/sh/contentTemplates.json b/app/javascript/dashboard/i18n/locale/sh/contentTemplates.json
index a9b1d54c4..79c2c8c64 100644
--- a/app/javascript/dashboard/i18n/locale/sh/contentTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/sh/contentTemplates.json
@@ -28,6 +28,7 @@
       "TYPES": {
         "MEDIA": "Media",
         "QUICK_REPLY": "Quick Reply",
+        "CALL_TO_ACTION": "Call to Action",
         "TEXT": "Text"
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/sh/conversation.json b/app/javascript/dashboard/i18n/locale/sh/conversation.json
index 49a228610..59ad61c1d 100644
--- a/app/javascript/dashboard/i18n/locale/sh/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/sh/conversation.json
@@ -275,6 +275,16 @@
     "SIDEBAR": {
       "CONTACT": "Contact",
       "COPILOT": "Copilot"
+    },
+    "VOICE_WIDGET": {
+      "INCOMING_CALL": "Incoming call",
+      "OUTGOING_CALL": "Outgoing call",
+      "CALL_IN_PROGRESS": "Call in progress",
+      "NOT_ANSWERED_YET": "Not answered yet",
+      "HANDLED_IN_ANOTHER_TAB": "Being handled in another tab",
+      "REJECT_CALL": "Reject",
+      "JOIN_CALL": "Join call",
+      "END_CALL": "End call"
     }
   },
   "EMAIL_TRANSCRIPT": {
diff --git a/app/javascript/dashboard/i18n/locale/sh/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/sh/inboxMgmt.json
index 514257708..a71d8a8d4 100644
--- a/app/javascript/dashboard/i18n/locale/sh/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sh/inboxMgmt.json
@@ -808,6 +808,35 @@
         "LABEL": "Message",
         "PLACEHOLDER": "Please enter a message to show users with the form"
       },
+      "BUTTON_TEXT": {
+        "LABEL": "Button text",
+        "PLACEHOLDER": "Please rate us"
+      },
+      "LANGUAGE": {
+        "LABEL": "Language",
+        "PLACEHOLDER": "Select template language"
+      },
+      "MESSAGE_PREVIEW": {
+        "LABEL": "Message preview",
+        "TOOLTIP": "This may vary slightly when rendered on WhatsApp's platform."
+      },
+      "TEMPLATE_STATUS": {
+        "APPROVED": "Approved by WhatsApp",
+        "PENDING": "Pending WhatsApp approval",
+        "REJECTED": "Meta rejected the template",
+        "DEFAULT": "Needs WhatsApp approval",
+        "NOT_FOUND": "The template does not exist in the Meta platform."
+      },
+      "TEMPLATE_CREATION": {
+        "SUCCESS_MESSAGE": "WhatsApp template created successfully and sent for approval",
+        "ERROR_MESSAGE": "Failed to create WhatsApp template"
+      },
+      "TEMPLATE_UPDATE_DIALOG": {
+        "TITLE": "Edit survey details",
+        "DESCRIPTION": "We will delete the previous template and make a new one which will be sent again for WhatsApp approval",
+        "CONFIRM": "Create new template",
+        "CANCEL": "Go back"
+      },
       "SURVEY_RULE": {
         "LABEL": "Survey rule",
         "DESCRIPTION_PREFIX": "Send the survey if the conversation",
@@ -819,6 +848,7 @@
         "SELECT_PLACEHOLDER": "select labels"
       },
       "NOTE": "Note: CSAT surveys are sent only once per conversation",
+      "WHATSAPP_NOTE": "Note: We will create a template and send it for WhatsApp approval. After being approved, surveys will be sent only once per conversation as per the survey rule.",
       "API": {
         "SUCCESS_MESSAGE": "CSAT settings updated successfully",
         "ERROR_MESSAGE": "We couldn't update CSAT settings. Please try again later."
diff --git a/app/javascript/dashboard/i18n/locale/sh/search.json b/app/javascript/dashboard/i18n/locale/sh/search.json
index e8510ab97..2fc8e7998 100644
--- a/app/javascript/dashboard/i18n/locale/sh/search.json
+++ b/app/javascript/dashboard/i18n/locale/sh/search.json
@@ -1,7 +1,7 @@
 {
   "SEARCH": {
     "TABS": {
-      "ALL": "All",
+      "ALL": "All results",
       "CONTACTS": "Contacts",
       "CONVERSATIONS": "Conversations",
       "MESSAGES": "Messages",
@@ -19,14 +19,50 @@
     "LOADING_DATA": "Loading",
     "EMPTY_STATE": "No {item} found for query '{query}'",
     "EMPTY_STATE_FULL": "No results found for query '{query}'",
-    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "PLACEHOLDER_KEYBINDING": "/to focus",
     "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "RECENT_SEARCHES": "Recent searches",
+    "CLEAR_ALL": "Clear all",
+    "MOST_RECENT": "Most recent",
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
+    "READ_LESS": "Read less",
     "WROTE": "wrote:",
-    "FROM": "from",
-    "EMAIL": "email",
-    "EMAIL_SUBJECT": "subject"
+    "FROM": "From",
+    "EMAIL": "Email",
+    "EMAIL_SUBJECT": "Subject",
+    "PRIVATE": "Private note",
+    "TRANSCRIPT": "Transcript",
+    "CREATED_AT": "created {time}",
+    "UPDATED_AT": "updated {time}",
+    "SORT_BY": {
+      "RELEVANCE": "Relevance"
+    },
+    "DATE_RANGE": {
+      "LAST_7_DAYS": "Last 7 days",
+      "LAST_30_DAYS": "Last 30 days",
+      "LAST_60_DAYS": "Last 60 days",
+      "LAST_90_DAYS": "Last 90 days",
+      "CUSTOM_RANGE": "Custom range:",
+      "CREATED_BETWEEN": "Created between",
+      "AND": "and",
+      "APPLY": "Apply",
+      "BEFORE_DATE": "Before {date}",
+      "AFTER_DATE": "After {date}",
+      "TIME_RANGE": "Filter by time",
+      "CLEAR_FILTER": "Clear filter"
+    },
+    "FILTERS": {
+      "FILTER_MESSAGE": "Filter messages by:",
+      "FROM": "Sender",
+      "IN": "Inbox",
+      "AGENTS": "Agents",
+      "CONTACTS": "Contacts",
+      "INBOXES": "Inboxes",
+      "NO_AGENTS": "No agents found",
+      "NO_CONTACTS": "Start by searching to see results",
+      "NO_INBOXES": "No inboxes found"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sk/companies.json b/app/javascript/dashboard/i18n/locale/sk/companies.json
index 352daa2f6..37e921d26 100644
--- a/app/javascript/dashboard/i18n/locale/sk/companies.json
+++ b/app/javascript/dashboard/i18n/locale/sk/companies.json
@@ -6,7 +6,8 @@
       "OPTIONS": {
         "NAME": "Meno",
         "DOMAIN": "Doména",
-        "CREATED_AT": "Created at"
+        "CREATED_AT": "Created at",
+        "CONTACTS_COUNT": "Contacts count"
       }
     },
     "ORDER": {
diff --git a/app/javascript/dashboard/i18n/locale/sk/contentTemplates.json b/app/javascript/dashboard/i18n/locale/sk/contentTemplates.json
index 5c9451243..af093c871 100644
--- a/app/javascript/dashboard/i18n/locale/sk/contentTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/sk/contentTemplates.json
@@ -28,6 +28,7 @@
       "TYPES": {
         "MEDIA": "Media",
         "QUICK_REPLY": "Quick Reply",
+        "CALL_TO_ACTION": "Call to Action",
         "TEXT": "Text"
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/sk/conversation.json b/app/javascript/dashboard/i18n/locale/sk/conversation.json
index 0297ae442..b2952230d 100644
--- a/app/javascript/dashboard/i18n/locale/sk/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/sk/conversation.json
@@ -275,6 +275,16 @@
     "SIDEBAR": {
       "CONTACT": "Contact",
       "COPILOT": "Copilot"
+    },
+    "VOICE_WIDGET": {
+      "INCOMING_CALL": "Incoming call",
+      "OUTGOING_CALL": "Outgoing call",
+      "CALL_IN_PROGRESS": "Call in progress",
+      "NOT_ANSWERED_YET": "Not answered yet",
+      "HANDLED_IN_ANOTHER_TAB": "Being handled in another tab",
+      "REJECT_CALL": "Reject",
+      "JOIN_CALL": "Join call",
+      "END_CALL": "End call"
     }
   },
   "EMAIL_TRANSCRIPT": {
diff --git a/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json
index 045649950..9e2fb73d3 100644
--- a/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json
@@ -808,6 +808,35 @@
         "LABEL": "Správa",
         "PLACEHOLDER": "Please enter a message to show users with the form"
       },
+      "BUTTON_TEXT": {
+        "LABEL": "Button text",
+        "PLACEHOLDER": "Please rate us"
+      },
+      "LANGUAGE": {
+        "LABEL": "Language",
+        "PLACEHOLDER": "Select template language"
+      },
+      "MESSAGE_PREVIEW": {
+        "LABEL": "Message preview",
+        "TOOLTIP": "This may vary slightly when rendered on WhatsApp's platform."
+      },
+      "TEMPLATE_STATUS": {
+        "APPROVED": "Approved by WhatsApp",
+        "PENDING": "Pending WhatsApp approval",
+        "REJECTED": "Meta rejected the template",
+        "DEFAULT": "Needs WhatsApp approval",
+        "NOT_FOUND": "The template does not exist in the Meta platform."
+      },
+      "TEMPLATE_CREATION": {
+        "SUCCESS_MESSAGE": "WhatsApp template created successfully and sent for approval",
+        "ERROR_MESSAGE": "Failed to create WhatsApp template"
+      },
+      "TEMPLATE_UPDATE_DIALOG": {
+        "TITLE": "Edit survey details",
+        "DESCRIPTION": "We will delete the previous template and make a new one which will be sent again for WhatsApp approval",
+        "CONFIRM": "Create new template",
+        "CANCEL": "Go back"
+      },
       "SURVEY_RULE": {
         "LABEL": "Survey rule",
         "DESCRIPTION_PREFIX": "Send the survey if the conversation",
@@ -819,6 +848,7 @@
         "SELECT_PLACEHOLDER": "select labels"
       },
       "NOTE": "Note: CSAT surveys are sent only once per conversation",
+      "WHATSAPP_NOTE": "Note: We will create a template and send it for WhatsApp approval. After being approved, surveys will be sent only once per conversation as per the survey rule.",
       "API": {
         "SUCCESS_MESSAGE": "CSAT settings updated successfully",
         "ERROR_MESSAGE": "We couldn't update CSAT settings. Please try again later."
diff --git a/app/javascript/dashboard/i18n/locale/sk/search.json b/app/javascript/dashboard/i18n/locale/sk/search.json
index c2dad4d7c..d59383f4d 100644
--- a/app/javascript/dashboard/i18n/locale/sk/search.json
+++ b/app/javascript/dashboard/i18n/locale/sk/search.json
@@ -1,7 +1,7 @@
 {
   "SEARCH": {
     "TABS": {
-      "ALL": "Všetko",
+      "ALL": "All results",
       "CONTACTS": "Kontakty",
       "CONVERSATIONS": "Rozhovory",
       "MESSAGES": "Messages",
@@ -19,14 +19,50 @@
     "LOADING_DATA": "Loading",
     "EMPTY_STATE": "No {item} found for query '{query}'",
     "EMPTY_STATE_FULL": "No results found for query '{query}'",
-    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "PLACEHOLDER_KEYBINDING": "/to focus",
     "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "RECENT_SEARCHES": "Recent searches",
+    "CLEAR_ALL": "Clear all",
+    "MOST_RECENT": "Most recent",
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
+    "READ_LESS": "Read less",
     "WROTE": "wrote:",
-    "FROM": "od",
-    "EMAIL": "e-mail",
-    "EMAIL_SUBJECT": "predmet"
+    "FROM": "From",
+    "EMAIL": "Email",
+    "EMAIL_SUBJECT": "Predmet",
+    "PRIVATE": "Private note",
+    "TRANSCRIPT": "Transcript",
+    "CREATED_AT": "created {time}",
+    "UPDATED_AT": "updated {time}",
+    "SORT_BY": {
+      "RELEVANCE": "Relevance"
+    },
+    "DATE_RANGE": {
+      "LAST_7_DAYS": "Posledných 7 dní",
+      "LAST_30_DAYS": "Posledných 30 dní",
+      "LAST_60_DAYS": "Posledných 60 dní",
+      "LAST_90_DAYS": "Posledných 90 dní",
+      "CUSTOM_RANGE": "Custom range:",
+      "CREATED_BETWEEN": "Created between",
+      "AND": "and",
+      "APPLY": "Použiť",
+      "BEFORE_DATE": "Before {date}",
+      "AFTER_DATE": "After {date}",
+      "TIME_RANGE": "Filter by time",
+      "CLEAR_FILTER": "Clear filter"
+    },
+    "FILTERS": {
+      "FILTER_MESSAGE": "Filter messages by:",
+      "FROM": "Sender",
+      "IN": "Schránka",
+      "AGENTS": "Agenti",
+      "CONTACTS": "Kontakty",
+      "INBOXES": "Inboxes",
+      "NO_AGENTS": "Žiadni agenti neboli nájdení",
+      "NO_CONTACTS": "Start by searching to see results",
+      "NO_INBOXES": "No inboxes found"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sl/companies.json b/app/javascript/dashboard/i18n/locale/sl/companies.json
index 86190831b..0d64a4abd 100644
--- a/app/javascript/dashboard/i18n/locale/sl/companies.json
+++ b/app/javascript/dashboard/i18n/locale/sl/companies.json
@@ -6,7 +6,8 @@
       "OPTIONS": {
         "NAME": "Name",
         "DOMAIN": "Domain",
-        "CREATED_AT": "Created at"
+        "CREATED_AT": "Created at",
+        "CONTACTS_COUNT": "Contacts count"
       }
     },
     "ORDER": {
diff --git a/app/javascript/dashboard/i18n/locale/sl/contentTemplates.json b/app/javascript/dashboard/i18n/locale/sl/contentTemplates.json
index d2491677e..a27361031 100644
--- a/app/javascript/dashboard/i18n/locale/sl/contentTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/sl/contentTemplates.json
@@ -28,6 +28,7 @@
       "TYPES": {
         "MEDIA": "Media",
         "QUICK_REPLY": "Quick Reply",
+        "CALL_TO_ACTION": "Call to Action",
         "TEXT": "Tekst"
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/sl/conversation.json b/app/javascript/dashboard/i18n/locale/sl/conversation.json
index 3f516475a..b894f2f2f 100644
--- a/app/javascript/dashboard/i18n/locale/sl/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/sl/conversation.json
@@ -275,6 +275,16 @@
     "SIDEBAR": {
       "CONTACT": "Contact",
       "COPILOT": "Copilot"
+    },
+    "VOICE_WIDGET": {
+      "INCOMING_CALL": "Incoming call",
+      "OUTGOING_CALL": "Outgoing call",
+      "CALL_IN_PROGRESS": "Call in progress",
+      "NOT_ANSWERED_YET": "Not answered yet",
+      "HANDLED_IN_ANOTHER_TAB": "Being handled in another tab",
+      "REJECT_CALL": "Reject",
+      "JOIN_CALL": "Join call",
+      "END_CALL": "End call"
     }
   },
   "EMAIL_TRANSCRIPT": {
diff --git a/app/javascript/dashboard/i18n/locale/sl/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/sl/inboxMgmt.json
index 8a2ddef88..6238b3092 100644
--- a/app/javascript/dashboard/i18n/locale/sl/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sl/inboxMgmt.json
@@ -808,6 +808,35 @@
         "LABEL": "Sporočilo",
         "PLACEHOLDER": "Please enter a message to show users with the form"
       },
+      "BUTTON_TEXT": {
+        "LABEL": "Button text",
+        "PLACEHOLDER": "Please rate us"
+      },
+      "LANGUAGE": {
+        "LABEL": "Jezik",
+        "PLACEHOLDER": "Select template language"
+      },
+      "MESSAGE_PREVIEW": {
+        "LABEL": "Message preview",
+        "TOOLTIP": "This may vary slightly when rendered on WhatsApp's platform."
+      },
+      "TEMPLATE_STATUS": {
+        "APPROVED": "Approved by WhatsApp",
+        "PENDING": "Pending WhatsApp approval",
+        "REJECTED": "Meta rejected the template",
+        "DEFAULT": "Needs WhatsApp approval",
+        "NOT_FOUND": "The template does not exist in the Meta platform."
+      },
+      "TEMPLATE_CREATION": {
+        "SUCCESS_MESSAGE": "WhatsApp template created successfully and sent for approval",
+        "ERROR_MESSAGE": "Failed to create WhatsApp template"
+      },
+      "TEMPLATE_UPDATE_DIALOG": {
+        "TITLE": "Edit survey details",
+        "DESCRIPTION": "We will delete the previous template and make a new one which will be sent again for WhatsApp approval",
+        "CONFIRM": "Create new template",
+        "CANCEL": "Go back"
+      },
       "SURVEY_RULE": {
         "LABEL": "Survey rule",
         "DESCRIPTION_PREFIX": "Send the survey if the conversation",
@@ -819,6 +848,7 @@
         "SELECT_PLACEHOLDER": "select labels"
       },
       "NOTE": "Note: CSAT surveys are sent only once per conversation",
+      "WHATSAPP_NOTE": "Note: We will create a template and send it for WhatsApp approval. After being approved, surveys will be sent only once per conversation as per the survey rule.",
       "API": {
         "SUCCESS_MESSAGE": "CSAT settings updated successfully",
         "ERROR_MESSAGE": "We couldn't update CSAT settings. Please try again later."
diff --git a/app/javascript/dashboard/i18n/locale/sl/search.json b/app/javascript/dashboard/i18n/locale/sl/search.json
index 7ad94f0a2..9280656b8 100644
--- a/app/javascript/dashboard/i18n/locale/sl/search.json
+++ b/app/javascript/dashboard/i18n/locale/sl/search.json
@@ -1,7 +1,7 @@
 {
   "SEARCH": {
     "TABS": {
-      "ALL": "Vse",
+      "ALL": "All results",
       "CONTACTS": "Kontakti",
       "CONVERSATIONS": "Pogovori",
       "MESSAGES": "Sporočila",
@@ -19,14 +19,50 @@
     "LOADING_DATA": "Loading",
     "EMPTY_STATE": "Za poizvedbo '{query}' ni bil najden {item}",
     "EMPTY_STATE_FULL": "Ni rezultatov za poizvedbo '{query}'",
-    "PLACEHOLDER_KEYBINDING": "/ za fokus",
+    "PLACEHOLDER_KEYBINDING": "/za fokus",
     "INPUT_PLACEHOLDER": "Za iskanje vnesite 3 ali več znakov",
+    "RECENT_SEARCHES": "Recent searches",
+    "CLEAR_ALL": "Clear all",
+    "MOST_RECENT": "Most recent",
     "EMPTY_STATE_DEFAULT": "Iščite po ID-ju pogovora, e-pošti, telefonski številki in sporočilih za boljše rezultate iskanja. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Preberite več",
+    "READ_LESS": "Read less",
     "WROTE": "je napisal/a:",
-    "FROM": "Od",
-    "EMAIL": "e-pošta",
-    "EMAIL_SUBJECT": "subject"
+    "FROM": "From",
+    "EMAIL": "E-pošta",
+    "EMAIL_SUBJECT": "Subject",
+    "PRIVATE": "Private note",
+    "TRANSCRIPT": "Transcript",
+    "CREATED_AT": "created {time}",
+    "UPDATED_AT": "updated {time}",
+    "SORT_BY": {
+      "RELEVANCE": "Relevance"
+    },
+    "DATE_RANGE": {
+      "LAST_7_DAYS": "Last 7 days",
+      "LAST_30_DAYS": "Last 30 days",
+      "LAST_60_DAYS": "Last 60 days",
+      "LAST_90_DAYS": "Last 90 days",
+      "CUSTOM_RANGE": "Custom range:",
+      "CREATED_BETWEEN": "Created between",
+      "AND": "and",
+      "APPLY": "Apply",
+      "BEFORE_DATE": "Before {date}",
+      "AFTER_DATE": "After {date}",
+      "TIME_RANGE": "Filter by time",
+      "CLEAR_FILTER": "Clear filter"
+    },
+    "FILTERS": {
+      "FILTER_MESSAGE": "Filter messages by:",
+      "FROM": "Sender",
+      "IN": "Inbox",
+      "AGENTS": "Agents",
+      "CONTACTS": "Contacts",
+      "INBOXES": "Inboxes",
+      "NO_AGENTS": "No agents found",
+      "NO_CONTACTS": "Start by searching to see results",
+      "NO_INBOXES": "No inboxes found"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sq/companies.json b/app/javascript/dashboard/i18n/locale/sq/companies.json
index 86190831b..0d64a4abd 100644
--- a/app/javascript/dashboard/i18n/locale/sq/companies.json
+++ b/app/javascript/dashboard/i18n/locale/sq/companies.json
@@ -6,7 +6,8 @@
       "OPTIONS": {
         "NAME": "Name",
         "DOMAIN": "Domain",
-        "CREATED_AT": "Created at"
+        "CREATED_AT": "Created at",
+        "CONTACTS_COUNT": "Contacts count"
       }
     },
     "ORDER": {
diff --git a/app/javascript/dashboard/i18n/locale/sq/contentTemplates.json b/app/javascript/dashboard/i18n/locale/sq/contentTemplates.json
index 5f8b4851c..588248b03 100644
--- a/app/javascript/dashboard/i18n/locale/sq/contentTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/sq/contentTemplates.json
@@ -28,6 +28,7 @@
       "TYPES": {
         "MEDIA": "Media",
         "QUICK_REPLY": "Quick Reply",
+        "CALL_TO_ACTION": "Call to Action",
         "TEXT": "Text"
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/sq/conversation.json b/app/javascript/dashboard/i18n/locale/sq/conversation.json
index 211522318..bb904eac7 100644
--- a/app/javascript/dashboard/i18n/locale/sq/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/sq/conversation.json
@@ -275,6 +275,16 @@
     "SIDEBAR": {
       "CONTACT": "Contact",
       "COPILOT": "Copilot"
+    },
+    "VOICE_WIDGET": {
+      "INCOMING_CALL": "Incoming call",
+      "OUTGOING_CALL": "Outgoing call",
+      "CALL_IN_PROGRESS": "Call in progress",
+      "NOT_ANSWERED_YET": "Not answered yet",
+      "HANDLED_IN_ANOTHER_TAB": "Being handled in another tab",
+      "REJECT_CALL": "Reject",
+      "JOIN_CALL": "Join call",
+      "END_CALL": "End call"
     }
   },
   "EMAIL_TRANSCRIPT": {
diff --git a/app/javascript/dashboard/i18n/locale/sq/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/sq/inboxMgmt.json
index 8e32fa89e..caa282a8b 100644
--- a/app/javascript/dashboard/i18n/locale/sq/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sq/inboxMgmt.json
@@ -808,6 +808,35 @@
         "LABEL": "Message",
         "PLACEHOLDER": "Please enter a message to show users with the form"
       },
+      "BUTTON_TEXT": {
+        "LABEL": "Button text",
+        "PLACEHOLDER": "Please rate us"
+      },
+      "LANGUAGE": {
+        "LABEL": "Language",
+        "PLACEHOLDER": "Select template language"
+      },
+      "MESSAGE_PREVIEW": {
+        "LABEL": "Message preview",
+        "TOOLTIP": "This may vary slightly when rendered on WhatsApp's platform."
+      },
+      "TEMPLATE_STATUS": {
+        "APPROVED": "Approved by WhatsApp",
+        "PENDING": "Pending WhatsApp approval",
+        "REJECTED": "Meta rejected the template",
+        "DEFAULT": "Needs WhatsApp approval",
+        "NOT_FOUND": "The template does not exist in the Meta platform."
+      },
+      "TEMPLATE_CREATION": {
+        "SUCCESS_MESSAGE": "WhatsApp template created successfully and sent for approval",
+        "ERROR_MESSAGE": "Failed to create WhatsApp template"
+      },
+      "TEMPLATE_UPDATE_DIALOG": {
+        "TITLE": "Edit survey details",
+        "DESCRIPTION": "We will delete the previous template and make a new one which will be sent again for WhatsApp approval",
+        "CONFIRM": "Create new template",
+        "CANCEL": "Go back"
+      },
       "SURVEY_RULE": {
         "LABEL": "Survey rule",
         "DESCRIPTION_PREFIX": "Send the survey if the conversation",
@@ -819,6 +848,7 @@
         "SELECT_PLACEHOLDER": "select labels"
       },
       "NOTE": "Note: CSAT surveys are sent only once per conversation",
+      "WHATSAPP_NOTE": "Note: We will create a template and send it for WhatsApp approval. After being approved, surveys will be sent only once per conversation as per the survey rule.",
       "API": {
         "SUCCESS_MESSAGE": "CSAT settings updated successfully",
         "ERROR_MESSAGE": "We couldn't update CSAT settings. Please try again later."
diff --git a/app/javascript/dashboard/i18n/locale/sq/search.json b/app/javascript/dashboard/i18n/locale/sq/search.json
index 7e129f7d6..2fc8e7998 100644
--- a/app/javascript/dashboard/i18n/locale/sq/search.json
+++ b/app/javascript/dashboard/i18n/locale/sq/search.json
@@ -1,7 +1,7 @@
 {
   "SEARCH": {
     "TABS": {
-      "ALL": "All",
+      "ALL": "All results",
       "CONTACTS": "Contacts",
       "CONVERSATIONS": "Conversations",
       "MESSAGES": "Messages",
@@ -19,14 +19,50 @@
     "LOADING_DATA": "Loading",
     "EMPTY_STATE": "No {item} found for query '{query}'",
     "EMPTY_STATE_FULL": "No results found for query '{query}'",
-    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "PLACEHOLDER_KEYBINDING": "/to focus",
     "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "RECENT_SEARCHES": "Recent searches",
+    "CLEAR_ALL": "Clear all",
+    "MOST_RECENT": "Most recent",
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
+    "READ_LESS": "Read less",
     "WROTE": "wrote:",
-    "FROM": "form",
-    "EMAIL": "email",
-    "EMAIL_SUBJECT": "subject"
+    "FROM": "From",
+    "EMAIL": "Email",
+    "EMAIL_SUBJECT": "Subject",
+    "PRIVATE": "Private note",
+    "TRANSCRIPT": "Transcript",
+    "CREATED_AT": "created {time}",
+    "UPDATED_AT": "updated {time}",
+    "SORT_BY": {
+      "RELEVANCE": "Relevance"
+    },
+    "DATE_RANGE": {
+      "LAST_7_DAYS": "Last 7 days",
+      "LAST_30_DAYS": "Last 30 days",
+      "LAST_60_DAYS": "Last 60 days",
+      "LAST_90_DAYS": "Last 90 days",
+      "CUSTOM_RANGE": "Custom range:",
+      "CREATED_BETWEEN": "Created between",
+      "AND": "and",
+      "APPLY": "Apply",
+      "BEFORE_DATE": "Before {date}",
+      "AFTER_DATE": "After {date}",
+      "TIME_RANGE": "Filter by time",
+      "CLEAR_FILTER": "Clear filter"
+    },
+    "FILTERS": {
+      "FILTER_MESSAGE": "Filter messages by:",
+      "FROM": "Sender",
+      "IN": "Inbox",
+      "AGENTS": "Agents",
+      "CONTACTS": "Contacts",
+      "INBOXES": "Inboxes",
+      "NO_AGENTS": "No agents found",
+      "NO_CONTACTS": "Start by searching to see results",
+      "NO_INBOXES": "No inboxes found"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sr/companies.json b/app/javascript/dashboard/i18n/locale/sr/companies.json
index 20fdc887f..260560347 100644
--- a/app/javascript/dashboard/i18n/locale/sr/companies.json
+++ b/app/javascript/dashboard/i18n/locale/sr/companies.json
@@ -6,7 +6,8 @@
       "OPTIONS": {
         "NAME": "Ime",
         "DOMAIN": "Domen",
-        "CREATED_AT": "Napravljena u"
+        "CREATED_AT": "Napravljena u",
+        "CONTACTS_COUNT": "Contacts count"
       }
     },
     "ORDER": {
diff --git a/app/javascript/dashboard/i18n/locale/sr/contentTemplates.json b/app/javascript/dashboard/i18n/locale/sr/contentTemplates.json
index ad67b2ccc..45202c535 100644
--- a/app/javascript/dashboard/i18n/locale/sr/contentTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/sr/contentTemplates.json
@@ -28,6 +28,7 @@
       "TYPES": {
         "MEDIA": "Media",
         "QUICK_REPLY": "Quick Reply",
+        "CALL_TO_ACTION": "Call to Action",
         "TEXT": "Tekst"
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/sr/conversation.json b/app/javascript/dashboard/i18n/locale/sr/conversation.json
index 00a97c6a1..3403d3383 100644
--- a/app/javascript/dashboard/i18n/locale/sr/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/sr/conversation.json
@@ -275,6 +275,16 @@
     "SIDEBAR": {
       "CONTACT": "Kontakt",
       "COPILOT": "Copilot"
+    },
+    "VOICE_WIDGET": {
+      "INCOMING_CALL": "Incoming call",
+      "OUTGOING_CALL": "Outgoing call",
+      "CALL_IN_PROGRESS": "Call in progress",
+      "NOT_ANSWERED_YET": "Not answered yet",
+      "HANDLED_IN_ANOTHER_TAB": "Being handled in another tab",
+      "REJECT_CALL": "Reject",
+      "JOIN_CALL": "Join call",
+      "END_CALL": "End call"
     }
   },
   "EMAIL_TRANSCRIPT": {
diff --git a/app/javascript/dashboard/i18n/locale/sr/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/sr/inboxMgmt.json
index 4f4b837d1..2153ec562 100644
--- a/app/javascript/dashboard/i18n/locale/sr/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sr/inboxMgmt.json
@@ -808,6 +808,35 @@
         "LABEL": "Poruka",
         "PLACEHOLDER": "Please enter a message to show users with the form"
       },
+      "BUTTON_TEXT": {
+        "LABEL": "Button text",
+        "PLACEHOLDER": "Please rate us"
+      },
+      "LANGUAGE": {
+        "LABEL": "Jezik",
+        "PLACEHOLDER": "Select template language"
+      },
+      "MESSAGE_PREVIEW": {
+        "LABEL": "Message preview",
+        "TOOLTIP": "This may vary slightly when rendered on WhatsApp's platform."
+      },
+      "TEMPLATE_STATUS": {
+        "APPROVED": "Approved by WhatsApp",
+        "PENDING": "Pending WhatsApp approval",
+        "REJECTED": "Meta rejected the template",
+        "DEFAULT": "Needs WhatsApp approval",
+        "NOT_FOUND": "The template does not exist in the Meta platform."
+      },
+      "TEMPLATE_CREATION": {
+        "SUCCESS_MESSAGE": "WhatsApp template created successfully and sent for approval",
+        "ERROR_MESSAGE": "Failed to create WhatsApp template"
+      },
+      "TEMPLATE_UPDATE_DIALOG": {
+        "TITLE": "Edit survey details",
+        "DESCRIPTION": "We will delete the previous template and make a new one which will be sent again for WhatsApp approval",
+        "CONFIRM": "Create new template",
+        "CANCEL": "Povratak"
+      },
       "SURVEY_RULE": {
         "LABEL": "Survey rule",
         "DESCRIPTION_PREFIX": "Send the survey if the conversation",
@@ -819,6 +848,7 @@
         "SELECT_PLACEHOLDER": "select labels"
       },
       "NOTE": "Note: CSAT surveys are sent only once per conversation",
+      "WHATSAPP_NOTE": "Note: We will create a template and send it for WhatsApp approval. After being approved, surveys will be sent only once per conversation as per the survey rule.",
       "API": {
         "SUCCESS_MESSAGE": "CSAT settings updated successfully",
         "ERROR_MESSAGE": "We couldn't update CSAT settings. Please try again later."
diff --git a/app/javascript/dashboard/i18n/locale/sr/search.json b/app/javascript/dashboard/i18n/locale/sr/search.json
index c97c418ca..d03ff0fdc 100644
--- a/app/javascript/dashboard/i18n/locale/sr/search.json
+++ b/app/javascript/dashboard/i18n/locale/sr/search.json
@@ -1,7 +1,7 @@
 {
   "SEARCH": {
     "TABS": {
-      "ALL": "Sve",
+      "ALL": "All results",
       "CONTACTS": "Kontakti",
       "CONVERSATIONS": "Razgovori",
       "MESSAGES": "Poruke",
@@ -19,14 +19,50 @@
     "LOADING_DATA": "Loading",
     "EMPTY_STATE": "No {item} found for query '{query}'",
     "EMPTY_STATE_FULL": "No results found for query '{query}'",
-    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "PLACEHOLDER_KEYBINDING": "/to focus",
     "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "RECENT_SEARCHES": "Recent searches",
+    "CLEAR_ALL": "Clear all",
+    "MOST_RECENT": "Most recent",
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
+    "READ_LESS": "Read less",
     "WROTE": "wrote:",
-    "FROM": "od",
-    "EMAIL": "e-pošta",
-    "EMAIL_SUBJECT": "naslov"
+    "FROM": "Od",
+    "EMAIL": "E-pošta",
+    "EMAIL_SUBJECT": "Naslov",
+    "PRIVATE": "Private note",
+    "TRANSCRIPT": "Transcript",
+    "CREATED_AT": "created {time}",
+    "UPDATED_AT": "updated {time}",
+    "SORT_BY": {
+      "RELEVANCE": "Relevance"
+    },
+    "DATE_RANGE": {
+      "LAST_7_DAYS": "Poslednjih 7 dana",
+      "LAST_30_DAYS": "Poslednjih 30 dana",
+      "LAST_60_DAYS": "Poslednjih 60 dana",
+      "LAST_90_DAYS": "Poslednjih 90 dana",
+      "CUSTOM_RANGE": "Custom range:",
+      "CREATED_BETWEEN": "Created between",
+      "AND": "and",
+      "APPLY": "Primeni",
+      "BEFORE_DATE": "Before {date}",
+      "AFTER_DATE": "After {date}",
+      "TIME_RANGE": "Filter by time",
+      "CLEAR_FILTER": "Clear filter"
+    },
+    "FILTERS": {
+      "FILTER_MESSAGE": "Filter messages by:",
+      "FROM": "Pošiljalac",
+      "IN": "Prijemno sanduče",
+      "AGENTS": "Agenti",
+      "CONTACTS": "Kontakti",
+      "INBOXES": "Prijemni sandučići",
+      "NO_AGENTS": "Nema pronađenih agenata",
+      "NO_CONTACTS": "Start by searching to see results",
+      "NO_INBOXES": "No inboxes found"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sv/companies.json b/app/javascript/dashboard/i18n/locale/sv/companies.json
index e049ee933..75a3af307 100644
--- a/app/javascript/dashboard/i18n/locale/sv/companies.json
+++ b/app/javascript/dashboard/i18n/locale/sv/companies.json
@@ -6,7 +6,8 @@
       "OPTIONS": {
         "NAME": "Namn",
         "DOMAIN": "Domain",
-        "CREATED_AT": "Created at"
+        "CREATED_AT": "Created at",
+        "CONTACTS_COUNT": "Contacts count"
       }
     },
     "ORDER": {
diff --git a/app/javascript/dashboard/i18n/locale/sv/contentTemplates.json b/app/javascript/dashboard/i18n/locale/sv/contentTemplates.json
index 6ed3b34f6..d3ab512ed 100644
--- a/app/javascript/dashboard/i18n/locale/sv/contentTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/sv/contentTemplates.json
@@ -28,6 +28,7 @@
       "TYPES": {
         "MEDIA": "Media",
         "QUICK_REPLY": "Quick Reply",
+        "CALL_TO_ACTION": "Call to Action",
         "TEXT": "Text"
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/sv/conversation.json b/app/javascript/dashboard/i18n/locale/sv/conversation.json
index 5aa84f9c9..22ff5544b 100644
--- a/app/javascript/dashboard/i18n/locale/sv/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/sv/conversation.json
@@ -275,6 +275,16 @@
     "SIDEBAR": {
       "CONTACT": "Contact",
       "COPILOT": "Copilot"
+    },
+    "VOICE_WIDGET": {
+      "INCOMING_CALL": "Incoming call",
+      "OUTGOING_CALL": "Outgoing call",
+      "CALL_IN_PROGRESS": "Call in progress",
+      "NOT_ANSWERED_YET": "Not answered yet",
+      "HANDLED_IN_ANOTHER_TAB": "Being handled in another tab",
+      "REJECT_CALL": "Reject",
+      "JOIN_CALL": "Join call",
+      "END_CALL": "End call"
     }
   },
   "EMAIL_TRANSCRIPT": {
diff --git a/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json
index 8da008e51..c667c91a3 100644
--- a/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json
@@ -808,6 +808,35 @@
         "LABEL": "Meddelande",
         "PLACEHOLDER": "Please enter a message to show users with the form"
       },
+      "BUTTON_TEXT": {
+        "LABEL": "Button text",
+        "PLACEHOLDER": "Please rate us"
+      },
+      "LANGUAGE": {
+        "LABEL": "Language",
+        "PLACEHOLDER": "Select template language"
+      },
+      "MESSAGE_PREVIEW": {
+        "LABEL": "Message preview",
+        "TOOLTIP": "This may vary slightly when rendered on WhatsApp's platform."
+      },
+      "TEMPLATE_STATUS": {
+        "APPROVED": "Approved by WhatsApp",
+        "PENDING": "Pending WhatsApp approval",
+        "REJECTED": "Meta rejected the template",
+        "DEFAULT": "Needs WhatsApp approval",
+        "NOT_FOUND": "The template does not exist in the Meta platform."
+      },
+      "TEMPLATE_CREATION": {
+        "SUCCESS_MESSAGE": "WhatsApp template created successfully and sent for approval",
+        "ERROR_MESSAGE": "Failed to create WhatsApp template"
+      },
+      "TEMPLATE_UPDATE_DIALOG": {
+        "TITLE": "Edit survey details",
+        "DESCRIPTION": "We will delete the previous template and make a new one which will be sent again for WhatsApp approval",
+        "CONFIRM": "Create new template",
+        "CANCEL": "Go back"
+      },
       "SURVEY_RULE": {
         "LABEL": "Survey rule",
         "DESCRIPTION_PREFIX": "Send the survey if the conversation",
@@ -819,6 +848,7 @@
         "SELECT_PLACEHOLDER": "select labels"
       },
       "NOTE": "Note: CSAT surveys are sent only once per conversation",
+      "WHATSAPP_NOTE": "Note: We will create a template and send it for WhatsApp approval. After being approved, surveys will be sent only once per conversation as per the survey rule.",
       "API": {
         "SUCCESS_MESSAGE": "CSAT settings updated successfully",
         "ERROR_MESSAGE": "We couldn't update CSAT settings. Please try again later."
diff --git a/app/javascript/dashboard/i18n/locale/sv/search.json b/app/javascript/dashboard/i18n/locale/sv/search.json
index 31b2ea97a..f9a75d65e 100644
--- a/app/javascript/dashboard/i18n/locale/sv/search.json
+++ b/app/javascript/dashboard/i18n/locale/sv/search.json
@@ -1,7 +1,7 @@
 {
   "SEARCH": {
     "TABS": {
-      "ALL": "Alla",
+      "ALL": "All results",
       "CONTACTS": "Kontakter",
       "CONVERSATIONS": "Konversationer",
       "MESSAGES": "Meddelanden",
@@ -19,14 +19,50 @@
     "LOADING_DATA": "Loading",
     "EMPTY_STATE": "Ingen {item} hittades med orden '{query}'",
     "EMPTY_STATE_FULL": "Inga resultat hittades med orden '{query}'",
-    "PLACEHOLDER_KEYBINDING": "/ att fokusera",
+    "PLACEHOLDER_KEYBINDING": "/att fokusera",
     "INPUT_PLACEHOLDER": "Skriv 3 eller fler tecken för att söka",
+    "RECENT_SEARCHES": "Recent searches",
+    "CLEAR_ALL": "Clear all",
+    "MOST_RECENT": "Most recent",
     "EMPTY_STATE_DEFAULT": "Sök via konversations-id, e-post, telefonnummer, meddelanden, för bättre sökresultat. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Läs mer",
+    "READ_LESS": "Read less",
     "WROTE": "skrev:",
-    "FROM": "från",
-    "EMAIL": "e-post",
-    "EMAIL_SUBJECT": "ämne"
+    "FROM": "Från",
+    "EMAIL": "E-post",
+    "EMAIL_SUBJECT": "Ämne",
+    "PRIVATE": "Private note",
+    "TRANSCRIPT": "Transcript",
+    "CREATED_AT": "created {time}",
+    "UPDATED_AT": "updated {time}",
+    "SORT_BY": {
+      "RELEVANCE": "Relevance"
+    },
+    "DATE_RANGE": {
+      "LAST_7_DAYS": "Senaste 7 dagarna",
+      "LAST_30_DAYS": "Senaste 30 dagarna",
+      "LAST_60_DAYS": "De senaste 60 dagarna",
+      "LAST_90_DAYS": "De senaste 90 dagarna",
+      "CUSTOM_RANGE": "Custom range:",
+      "CREATED_BETWEEN": "Created between",
+      "AND": "and",
+      "APPLY": "Apply",
+      "BEFORE_DATE": "Before {date}",
+      "AFTER_DATE": "After {date}",
+      "TIME_RANGE": "Filter by time",
+      "CLEAR_FILTER": "Clear filter"
+    },
+    "FILTERS": {
+      "FILTER_MESSAGE": "Filter messages by:",
+      "FROM": "Sender",
+      "IN": "Inkorg",
+      "AGENTS": "Agenter",
+      "CONTACTS": "Kontakter",
+      "INBOXES": "Inkorgar",
+      "NO_AGENTS": "Inga agenter hittades",
+      "NO_CONTACTS": "Start by searching to see results",
+      "NO_INBOXES": "No inboxes found"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ta/companies.json b/app/javascript/dashboard/i18n/locale/ta/companies.json
index f54d33e7f..9a8f21021 100644
--- a/app/javascript/dashboard/i18n/locale/ta/companies.json
+++ b/app/javascript/dashboard/i18n/locale/ta/companies.json
@@ -6,7 +6,8 @@
       "OPTIONS": {
         "NAME": "பெயர்",
         "DOMAIN": "களம்",
-        "CREATED_AT": "Created at"
+        "CREATED_AT": "Created at",
+        "CONTACTS_COUNT": "Contacts count"
       }
     },
     "ORDER": {
diff --git a/app/javascript/dashboard/i18n/locale/ta/contentTemplates.json b/app/javascript/dashboard/i18n/locale/ta/contentTemplates.json
index a9b1d54c4..79c2c8c64 100644
--- a/app/javascript/dashboard/i18n/locale/ta/contentTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/ta/contentTemplates.json
@@ -28,6 +28,7 @@
       "TYPES": {
         "MEDIA": "Media",
         "QUICK_REPLY": "Quick Reply",
+        "CALL_TO_ACTION": "Call to Action",
         "TEXT": "Text"
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/ta/conversation.json b/app/javascript/dashboard/i18n/locale/ta/conversation.json
index c0d244459..850fbab9c 100644
--- a/app/javascript/dashboard/i18n/locale/ta/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ta/conversation.json
@@ -275,6 +275,16 @@
     "SIDEBAR": {
       "CONTACT": "Contact",
       "COPILOT": "Copilot"
+    },
+    "VOICE_WIDGET": {
+      "INCOMING_CALL": "Incoming call",
+      "OUTGOING_CALL": "Outgoing call",
+      "CALL_IN_PROGRESS": "Call in progress",
+      "NOT_ANSWERED_YET": "Not answered yet",
+      "HANDLED_IN_ANOTHER_TAB": "Being handled in another tab",
+      "REJECT_CALL": "Reject",
+      "JOIN_CALL": "Join call",
+      "END_CALL": "End call"
     }
   },
   "EMAIL_TRANSCRIPT": {
diff --git a/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json
index 08525498e..7bf59f2cd 100644
--- a/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json
@@ -808,6 +808,35 @@
         "LABEL": "Message",
         "PLACEHOLDER": "Please enter a message to show users with the form"
       },
+      "BUTTON_TEXT": {
+        "LABEL": "Button text",
+        "PLACEHOLDER": "Please rate us"
+      },
+      "LANGUAGE": {
+        "LABEL": "Language",
+        "PLACEHOLDER": "Select template language"
+      },
+      "MESSAGE_PREVIEW": {
+        "LABEL": "Message preview",
+        "TOOLTIP": "This may vary slightly when rendered on WhatsApp's platform."
+      },
+      "TEMPLATE_STATUS": {
+        "APPROVED": "Approved by WhatsApp",
+        "PENDING": "Pending WhatsApp approval",
+        "REJECTED": "Meta rejected the template",
+        "DEFAULT": "Needs WhatsApp approval",
+        "NOT_FOUND": "The template does not exist in the Meta platform."
+      },
+      "TEMPLATE_CREATION": {
+        "SUCCESS_MESSAGE": "WhatsApp template created successfully and sent for approval",
+        "ERROR_MESSAGE": "Failed to create WhatsApp template"
+      },
+      "TEMPLATE_UPDATE_DIALOG": {
+        "TITLE": "Edit survey details",
+        "DESCRIPTION": "We will delete the previous template and make a new one which will be sent again for WhatsApp approval",
+        "CONFIRM": "Create new template",
+        "CANCEL": "Go back"
+      },
       "SURVEY_RULE": {
         "LABEL": "Survey rule",
         "DESCRIPTION_PREFIX": "Send the survey if the conversation",
@@ -819,6 +848,7 @@
         "SELECT_PLACEHOLDER": "select labels"
       },
       "NOTE": "Note: CSAT surveys are sent only once per conversation",
+      "WHATSAPP_NOTE": "Note: We will create a template and send it for WhatsApp approval. After being approved, surveys will be sent only once per conversation as per the survey rule.",
       "API": {
         "SUCCESS_MESSAGE": "CSAT settings updated successfully",
         "ERROR_MESSAGE": "We couldn't update CSAT settings. Please try again later."
diff --git a/app/javascript/dashboard/i18n/locale/ta/search.json b/app/javascript/dashboard/i18n/locale/ta/search.json
index 41120b398..9d3ec49a1 100644
--- a/app/javascript/dashboard/i18n/locale/ta/search.json
+++ b/app/javascript/dashboard/i18n/locale/ta/search.json
@@ -1,7 +1,7 @@
 {
   "SEARCH": {
     "TABS": {
-      "ALL": "எல்லாம்",
+      "ALL": "All results",
       "CONTACTS": "Contacts",
       "CONVERSATIONS": "உரையாடல்கள்",
       "MESSAGES": "Messages",
@@ -19,14 +19,50 @@
     "LOADING_DATA": "Loading",
     "EMPTY_STATE": "No {item} found for query '{query}'",
     "EMPTY_STATE_FULL": "No results found for query '{query}'",
-    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "PLACEHOLDER_KEYBINDING": "/to focus",
     "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "RECENT_SEARCHES": "Recent searches",
+    "CLEAR_ALL": "Clear all",
+    "MOST_RECENT": "Most recent",
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
+    "READ_LESS": "Read less",
     "WROTE": "wrote:",
-    "FROM": "from",
+    "FROM": "From",
     "EMAIL": "இமெயில்",
-    "EMAIL_SUBJECT": "subject"
+    "EMAIL_SUBJECT": "Subject",
+    "PRIVATE": "Private note",
+    "TRANSCRIPT": "Transcript",
+    "CREATED_AT": "created {time}",
+    "UPDATED_AT": "updated {time}",
+    "SORT_BY": {
+      "RELEVANCE": "Relevance"
+    },
+    "DATE_RANGE": {
+      "LAST_7_DAYS": "கடந்த 7 நாட்கள்",
+      "LAST_30_DAYS": "கடந்த 30 நாட்கள்",
+      "LAST_60_DAYS": "கடந்த 60 நாட்கள்",
+      "LAST_90_DAYS": "கடந்த 90 நாட்கள்",
+      "CUSTOM_RANGE": "Custom range:",
+      "CREATED_BETWEEN": "Created between",
+      "AND": "மற்றும்",
+      "APPLY": "Apply",
+      "BEFORE_DATE": "Before {date}",
+      "AFTER_DATE": "After {date}",
+      "TIME_RANGE": "Filter by time",
+      "CLEAR_FILTER": "Clear filter"
+    },
+    "FILTERS": {
+      "FILTER_MESSAGE": "Filter messages by:",
+      "FROM": "Sender",
+      "IN": "Inbox",
+      "AGENTS": "ஏஜென்ட்கள்",
+      "CONTACTS": "Contacts",
+      "INBOXES": "இன்பாக்ஸ்கள்",
+      "NO_AGENTS": "No agents found",
+      "NO_CONTACTS": "Start by searching to see results",
+      "NO_INBOXES": "No inboxes found"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/th/companies.json b/app/javascript/dashboard/i18n/locale/th/companies.json
index be193cc27..cc68f1af3 100644
--- a/app/javascript/dashboard/i18n/locale/th/companies.json
+++ b/app/javascript/dashboard/i18n/locale/th/companies.json
@@ -6,7 +6,8 @@
       "OPTIONS": {
         "NAME": "ชื่อ",
         "DOMAIN": "โดเมน",
-        "CREATED_AT": "สร้างเมื่อ"
+        "CREATED_AT": "สร้างเมื่อ",
+        "CONTACTS_COUNT": "Contacts count"
       }
     },
     "ORDER": {
diff --git a/app/javascript/dashboard/i18n/locale/th/contentTemplates.json b/app/javascript/dashboard/i18n/locale/th/contentTemplates.json
index 2f26bad2f..7e4545f39 100644
--- a/app/javascript/dashboard/i18n/locale/th/contentTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/th/contentTemplates.json
@@ -28,6 +28,7 @@
       "TYPES": {
         "MEDIA": "Media",
         "QUICK_REPLY": "Quick Reply",
+        "CALL_TO_ACTION": "Call to Action",
         "TEXT": "ข้อความ"
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/th/conversation.json b/app/javascript/dashboard/i18n/locale/th/conversation.json
index dcf252b20..0390157a4 100644
--- a/app/javascript/dashboard/i18n/locale/th/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/th/conversation.json
@@ -275,6 +275,16 @@
     "SIDEBAR": {
       "CONTACT": "ผู้ติดต่อ",
       "COPILOT": "Copilot"
+    },
+    "VOICE_WIDGET": {
+      "INCOMING_CALL": "Incoming call",
+      "OUTGOING_CALL": "Outgoing call",
+      "CALL_IN_PROGRESS": "Call in progress",
+      "NOT_ANSWERED_YET": "Not answered yet",
+      "HANDLED_IN_ANOTHER_TAB": "Being handled in another tab",
+      "REJECT_CALL": "Reject",
+      "JOIN_CALL": "Join call",
+      "END_CALL": "End call"
     }
   },
   "EMAIL_TRANSCRIPT": {
diff --git a/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json
index 225544298..03419dda7 100644
--- a/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json
@@ -808,6 +808,35 @@
         "LABEL": "ข้อความ",
         "PLACEHOLDER": "Please enter a message to show users with the form"
       },
+      "BUTTON_TEXT": {
+        "LABEL": "Button text",
+        "PLACEHOLDER": "Please rate us"
+      },
+      "LANGUAGE": {
+        "LABEL": "Language",
+        "PLACEHOLDER": "Select template language"
+      },
+      "MESSAGE_PREVIEW": {
+        "LABEL": "Message preview",
+        "TOOLTIP": "This may vary slightly when rendered on WhatsApp's platform."
+      },
+      "TEMPLATE_STATUS": {
+        "APPROVED": "Approved by WhatsApp",
+        "PENDING": "Pending WhatsApp approval",
+        "REJECTED": "Meta rejected the template",
+        "DEFAULT": "Needs WhatsApp approval",
+        "NOT_FOUND": "The template does not exist in the Meta platform."
+      },
+      "TEMPLATE_CREATION": {
+        "SUCCESS_MESSAGE": "WhatsApp template created successfully and sent for approval",
+        "ERROR_MESSAGE": "Failed to create WhatsApp template"
+      },
+      "TEMPLATE_UPDATE_DIALOG": {
+        "TITLE": "Edit survey details",
+        "DESCRIPTION": "We will delete the previous template and make a new one which will be sent again for WhatsApp approval",
+        "CONFIRM": "Create new template",
+        "CANCEL": "Go back"
+      },
       "SURVEY_RULE": {
         "LABEL": "Survey rule",
         "DESCRIPTION_PREFIX": "Send the survey if the conversation",
@@ -819,6 +848,7 @@
         "SELECT_PLACEHOLDER": "select labels"
       },
       "NOTE": "Note: CSAT surveys are sent only once per conversation",
+      "WHATSAPP_NOTE": "Note: We will create a template and send it for WhatsApp approval. After being approved, surveys will be sent only once per conversation as per the survey rule.",
       "API": {
         "SUCCESS_MESSAGE": "CSAT settings updated successfully",
         "ERROR_MESSAGE": "We couldn't update CSAT settings. Please try again later."
diff --git a/app/javascript/dashboard/i18n/locale/th/search.json b/app/javascript/dashboard/i18n/locale/th/search.json
index 7332709db..a67befa95 100644
--- a/app/javascript/dashboard/i18n/locale/th/search.json
+++ b/app/javascript/dashboard/i18n/locale/th/search.json
@@ -1,7 +1,7 @@
 {
   "SEARCH": {
     "TABS": {
-      "ALL": "ทั้งหมด",
+      "ALL": "All results",
       "CONTACTS": "ผู้ติดต่อ",
       "CONVERSATIONS": "การสนทนา",
       "MESSAGES": "ข้อความทั้งหมด",
@@ -19,14 +19,50 @@
     "LOADING_DATA": "Loading",
     "EMPTY_STATE": "No {item} found for query '{query}'",
     "EMPTY_STATE_FULL": "No results found for query '{query}'",
-    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "PLACEHOLDER_KEYBINDING": "/to focus",
     "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "RECENT_SEARCHES": "Recent searches",
+    "CLEAR_ALL": "Clear all",
+    "MOST_RECENT": "Most recent",
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "บอท",
     "READ_MORE": "Read more",
+    "READ_LESS": "Read less",
     "WROTE": "wrote:",
     "FROM": "จาก",
     "EMAIL": "อีเมล์",
-    "EMAIL_SUBJECT": "หัวเรื่อง"
+    "EMAIL_SUBJECT": "หัวเรื่อง",
+    "PRIVATE": "Private note",
+    "TRANSCRIPT": "Transcript",
+    "CREATED_AT": "created {time}",
+    "UPDATED_AT": "updated {time}",
+    "SORT_BY": {
+      "RELEVANCE": "Relevance"
+    },
+    "DATE_RANGE": {
+      "LAST_7_DAYS": "7 วันที่ผ่านมา",
+      "LAST_30_DAYS": "30 วันที่ผ่านมา",
+      "LAST_60_DAYS": "60 วันที่ผ่านมา",
+      "LAST_90_DAYS": "90 วันที่ผ่านมา",
+      "CUSTOM_RANGE": "Custom range:",
+      "CREATED_BETWEEN": "Created between",
+      "AND": "and",
+      "APPLY": "ใช้งาน",
+      "BEFORE_DATE": "Before {date}",
+      "AFTER_DATE": "After {date}",
+      "TIME_RANGE": "Filter by time",
+      "CLEAR_FILTER": "Clear filter"
+    },
+    "FILTERS": {
+      "FILTER_MESSAGE": "Filter messages by:",
+      "FROM": "ผู้ส่ง",
+      "IN": "กล่องข้อความ",
+      "AGENTS": "พนักงาน",
+      "CONTACTS": "ผู้ติดต่อ",
+      "INBOXES": "กล่องข้อความ",
+      "NO_AGENTS": "ไม่พบพนักงาน",
+      "NO_CONTACTS": "Start by searching to see results",
+      "NO_INBOXES": "No inboxes found"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/tl/companies.json b/app/javascript/dashboard/i18n/locale/tl/companies.json
index 86190831b..0d64a4abd 100644
--- a/app/javascript/dashboard/i18n/locale/tl/companies.json
+++ b/app/javascript/dashboard/i18n/locale/tl/companies.json
@@ -6,7 +6,8 @@
       "OPTIONS": {
         "NAME": "Name",
         "DOMAIN": "Domain",
-        "CREATED_AT": "Created at"
+        "CREATED_AT": "Created at",
+        "CONTACTS_COUNT": "Contacts count"
       }
     },
     "ORDER": {
diff --git a/app/javascript/dashboard/i18n/locale/tl/contentTemplates.json b/app/javascript/dashboard/i18n/locale/tl/contentTemplates.json
index a9b1d54c4..79c2c8c64 100644
--- a/app/javascript/dashboard/i18n/locale/tl/contentTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/tl/contentTemplates.json
@@ -28,6 +28,7 @@
       "TYPES": {
         "MEDIA": "Media",
         "QUICK_REPLY": "Quick Reply",
+        "CALL_TO_ACTION": "Call to Action",
         "TEXT": "Text"
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/tl/conversation.json b/app/javascript/dashboard/i18n/locale/tl/conversation.json
index 49a228610..59ad61c1d 100644
--- a/app/javascript/dashboard/i18n/locale/tl/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/tl/conversation.json
@@ -275,6 +275,16 @@
     "SIDEBAR": {
       "CONTACT": "Contact",
       "COPILOT": "Copilot"
+    },
+    "VOICE_WIDGET": {
+      "INCOMING_CALL": "Incoming call",
+      "OUTGOING_CALL": "Outgoing call",
+      "CALL_IN_PROGRESS": "Call in progress",
+      "NOT_ANSWERED_YET": "Not answered yet",
+      "HANDLED_IN_ANOTHER_TAB": "Being handled in another tab",
+      "REJECT_CALL": "Reject",
+      "JOIN_CALL": "Join call",
+      "END_CALL": "End call"
     }
   },
   "EMAIL_TRANSCRIPT": {
diff --git a/app/javascript/dashboard/i18n/locale/tl/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/tl/inboxMgmt.json
index 1314733fa..2efba4716 100644
--- a/app/javascript/dashboard/i18n/locale/tl/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/tl/inboxMgmt.json
@@ -808,6 +808,35 @@
         "LABEL": "Message",
         "PLACEHOLDER": "Please enter a message to show users with the form"
       },
+      "BUTTON_TEXT": {
+        "LABEL": "Button text",
+        "PLACEHOLDER": "Please rate us"
+      },
+      "LANGUAGE": {
+        "LABEL": "Language",
+        "PLACEHOLDER": "Select template language"
+      },
+      "MESSAGE_PREVIEW": {
+        "LABEL": "Message preview",
+        "TOOLTIP": "This may vary slightly when rendered on WhatsApp's platform."
+      },
+      "TEMPLATE_STATUS": {
+        "APPROVED": "Approved by WhatsApp",
+        "PENDING": "Pending WhatsApp approval",
+        "REJECTED": "Meta rejected the template",
+        "DEFAULT": "Needs WhatsApp approval",
+        "NOT_FOUND": "The template does not exist in the Meta platform."
+      },
+      "TEMPLATE_CREATION": {
+        "SUCCESS_MESSAGE": "WhatsApp template created successfully and sent for approval",
+        "ERROR_MESSAGE": "Failed to create WhatsApp template"
+      },
+      "TEMPLATE_UPDATE_DIALOG": {
+        "TITLE": "Edit survey details",
+        "DESCRIPTION": "We will delete the previous template and make a new one which will be sent again for WhatsApp approval",
+        "CONFIRM": "Create new template",
+        "CANCEL": "Go back"
+      },
       "SURVEY_RULE": {
         "LABEL": "Survey rule",
         "DESCRIPTION_PREFIX": "Send the survey if the conversation",
@@ -819,6 +848,7 @@
         "SELECT_PLACEHOLDER": "select labels"
       },
       "NOTE": "Note: CSAT surveys are sent only once per conversation",
+      "WHATSAPP_NOTE": "Note: We will create a template and send it for WhatsApp approval. After being approved, surveys will be sent only once per conversation as per the survey rule.",
       "API": {
         "SUCCESS_MESSAGE": "CSAT settings updated successfully",
         "ERROR_MESSAGE": "We couldn't update CSAT settings. Please try again later."
diff --git a/app/javascript/dashboard/i18n/locale/tl/search.json b/app/javascript/dashboard/i18n/locale/tl/search.json
index e8510ab97..2fc8e7998 100644
--- a/app/javascript/dashboard/i18n/locale/tl/search.json
+++ b/app/javascript/dashboard/i18n/locale/tl/search.json
@@ -1,7 +1,7 @@
 {
   "SEARCH": {
     "TABS": {
-      "ALL": "All",
+      "ALL": "All results",
       "CONTACTS": "Contacts",
       "CONVERSATIONS": "Conversations",
       "MESSAGES": "Messages",
@@ -19,14 +19,50 @@
     "LOADING_DATA": "Loading",
     "EMPTY_STATE": "No {item} found for query '{query}'",
     "EMPTY_STATE_FULL": "No results found for query '{query}'",
-    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "PLACEHOLDER_KEYBINDING": "/to focus",
     "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "RECENT_SEARCHES": "Recent searches",
+    "CLEAR_ALL": "Clear all",
+    "MOST_RECENT": "Most recent",
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
+    "READ_LESS": "Read less",
     "WROTE": "wrote:",
-    "FROM": "from",
-    "EMAIL": "email",
-    "EMAIL_SUBJECT": "subject"
+    "FROM": "From",
+    "EMAIL": "Email",
+    "EMAIL_SUBJECT": "Subject",
+    "PRIVATE": "Private note",
+    "TRANSCRIPT": "Transcript",
+    "CREATED_AT": "created {time}",
+    "UPDATED_AT": "updated {time}",
+    "SORT_BY": {
+      "RELEVANCE": "Relevance"
+    },
+    "DATE_RANGE": {
+      "LAST_7_DAYS": "Last 7 days",
+      "LAST_30_DAYS": "Last 30 days",
+      "LAST_60_DAYS": "Last 60 days",
+      "LAST_90_DAYS": "Last 90 days",
+      "CUSTOM_RANGE": "Custom range:",
+      "CREATED_BETWEEN": "Created between",
+      "AND": "and",
+      "APPLY": "Apply",
+      "BEFORE_DATE": "Before {date}",
+      "AFTER_DATE": "After {date}",
+      "TIME_RANGE": "Filter by time",
+      "CLEAR_FILTER": "Clear filter"
+    },
+    "FILTERS": {
+      "FILTER_MESSAGE": "Filter messages by:",
+      "FROM": "Sender",
+      "IN": "Inbox",
+      "AGENTS": "Agents",
+      "CONTACTS": "Contacts",
+      "INBOXES": "Inboxes",
+      "NO_AGENTS": "No agents found",
+      "NO_CONTACTS": "Start by searching to see results",
+      "NO_INBOXES": "No inboxes found"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/tr/agentMgmt.json b/app/javascript/dashboard/i18n/locale/tr/agentMgmt.json
index c69172907..c1ee0dc69 100644
--- a/app/javascript/dashboard/i18n/locale/tr/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/tr/agentMgmt.json
@@ -11,7 +11,7 @@
     },
     "LIST": {
       "404": "Bu hesapla ilişkilendirilmiş hesap yok",
-      "TITLE": "Bu hesapla ilişkilendirilmiş kullanıcı yok",
+      "TITLE": "Ekibinizdeki temsilcileri yönetin",
       "DESC": "Ekibinize kullanıcı ekleyebilir veya kaldırabilirsiniz.",
       "NAME": "İsim",
       "EMAIL": "E-Posta",
@@ -32,8 +32,8 @@
         },
         "AGENT_TYPE": {
           "LABEL": "Agent Type",
-          "PLACEHOLDER": "Please select a type",
-          "ERROR": "Agent type is required"
+          "PLACEHOLDER": "Lütfen bir rol seçin",
+          "ERROR": "Rol gereklidir"
         },
         "EMAIL": {
           "LABEL": "E-posta adresi",
diff --git a/app/javascript/dashboard/i18n/locale/tr/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/tr/attributesMgmt.json
index 096e29c84..5a4d9d2cb 100644
--- a/app/javascript/dashboard/i18n/locale/tr/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/tr/attributesMgmt.json
@@ -3,7 +3,7 @@
     "HEADER": "Özel Nitelikler",
     "HEADER_BTN_TXT": "Nitelik Ekle",
     "LOADING": "Özel Nitelikler getiriliyor",
-    "DESCRIPTION": "A custom attribute tracks additional details about your contacts or conversations—such as the subscription plan or the date of their first purchase. You can add different types of custom attributes, such as text, lists, or numbers, to capture the specific information you need.",
+    "DESCRIPTION": "Özel nitelikler, kişileriniz veya konuşmalarınız hakkında ek ayrıntıları takip etmenizi sağlar — örneğin abonelik planı veya ilk satın alma tarihi gibi. İhtiyacınız olan belirli bilgileri toplamak için metin, liste veya sayı gibi farklı türlerde özel nitelikler ekleyebilirsiniz.",
     "LEARN_MORE": "Learn more about custom attributes",
     "ATTRIBUTE_MODELS": {
       "CONVERSATION": "Sohbet",
diff --git a/app/javascript/dashboard/i18n/locale/tr/automation.json b/app/javascript/dashboard/i18n/locale/tr/automation.json
index 9c8cd885f..4f7220a09 100644
--- a/app/javascript/dashboard/i18n/locale/tr/automation.json
+++ b/app/javascript/dashboard/i18n/locale/tr/automation.json
@@ -122,7 +122,7 @@
       "FILTER_OPERATOR_REQUIRED": "Filter operator is required",
       "VALUE_REQUIRED": "Değer gereklidir",
       "VALUE_MUST_BE_BETWEEN_1_AND_998": "Değer 1 ile 998 arasında olmalıdır",
-      "ACTION_PARAMETERS_REQUIRED": "Action parameters are required",
+      "ACTION_PARAMETERS_REQUIRED": "Eylem parametreleri gereklidir",
       "ATLEAST_ONE_CONDITION_REQUIRED": "At least one condition is required",
       "ATLEAST_ONE_ACTION_REQUIRED": "At least one action is required"
     },
diff --git a/app/javascript/dashboard/i18n/locale/tr/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/tr/cannedMgmt.json
index 0a7b850a0..3cbc908b4 100644
--- a/app/javascript/dashboard/i18n/locale/tr/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/tr/cannedMgmt.json
@@ -2,7 +2,7 @@
   "CANNED_MGMT": {
     "HEADER": "Hazır Yanıtlar",
     "LEARN_MORE": "Learn more about canned responses",
-    "DESCRIPTION": "Canned Responses are pre-written reply templates that help you quickly respond to a conversation. Agents can type the '/' character followed by the shortcode to insert a canned response during a conversation. ",
+    "DESCRIPTION": "Hazır Yanıtlar, bir konuşmaya hızlı yanıt vermenizi sağlayan önceden hazırlanmış şablonlardır. Temsilciler, bir konuşma sırasında hazır yanıt eklemek için '/' karakterini ve ardından kısa kodu yazabilirler. ",
     "HEADER_BTN_TXT": "Hazır yanıt ekle",
     "LOADING": "Hazır yanıtlar getiriliyor...",
     "SEARCH_404": "Bu sorgu ile eşleşen öğe yok.",
diff --git a/app/javascript/dashboard/i18n/locale/tr/companies.json b/app/javascript/dashboard/i18n/locale/tr/companies.json
index 6c0555036..195e8356e 100644
--- a/app/javascript/dashboard/i18n/locale/tr/companies.json
+++ b/app/javascript/dashboard/i18n/locale/tr/companies.json
@@ -1,12 +1,13 @@
 {
   "COMPANIES": {
-    "HEADER": "Companies",
+    "HEADER": "Şirketler",
     "SORT_BY": {
       "LABEL": "Sırala",
       "OPTIONS": {
         "NAME": "İsim",
         "DOMAIN": "Alan",
-        "CREATED_AT": "Oluşturma zamanı"
+        "CREATED_AT": "Oluşturma zamanı",
+        "CONTACTS_COUNT": "Contacts count"
       }
     },
     "ORDER": {
@@ -16,17 +17,17 @@
         "DESCENDING": "Azalan"
       }
     },
-    "SEARCH_PLACEHOLDER": "Search companies...",
-    "LOADING": "Loading companies...",
-    "UNNAMED": "Unnamed Company",
-    "CONTACTS_COUNT": "{n} contact | {n} contacts",
+    "SEARCH_PLACEHOLDER": "Şirketleri ara...",
+    "LOADING": "Şirketler yükleniyor...",
+    "UNNAMED": "İsimsiz Şirket",
+    "CONTACTS_COUNT": "{n} kişi | {n} kişi",
     "EMPTY_STATE": {
-      "TITLE": "No companies found"
+      "TITLE": "Hiçbir şirket bulunamadı"
     }
   },
   "COMPANIES_LAYOUT": {
     "PAGINATION_FOOTER": {
-      "SHOWING": "Showing {startItem} – {endItem} of {totalItems} company | Showing {startItem} – {endItem} of {totalItems} companies"
+      "SHOWING": "{totalItems} şirketten {startItem} – {endItem} arası gösteriliyor  | {totalItems} şirketten {startItem} – {endItem} arası gösteriliyor"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/tr/contact.json b/app/javascript/dashboard/i18n/locale/tr/contact.json
index 99dfb77fd..7346bb1a4 100644
--- a/app/javascript/dashboard/i18n/locale/tr/contact.json
+++ b/app/javascript/dashboard/i18n/locale/tr/contact.json
@@ -557,12 +557,12 @@
         "PLACEHOLDER": "Not ekleyin",
         "WROTE": "wrote",
         "YOU": "Sen",
-        "SAVE": "Save note",
+        "SAVE": "Notu Kaydet",
         "ADD_NOTE": "Kişi notu ekle",
         "EXPAND": "Genişlet",
         "COLLAPSE": "Daralt",
         "NO_NOTES": "Not yok, kişi detayları sayfasından not ekleyebilirsiniz.",
-        "EMPTY_STATE": "There are no notes associated to this contact. You can add a note by typing in the box above.",
+        "EMPTY_STATE": "Bu kişiyle ilişkili not bulunmamaktadır. Yukarıdaki kutuya yazarak not ekleyebilirsiniz.",
         "CONVERSATION_EMPTY_STATE": "Henüz not yok. Not eklemek için Not ekle düğmesini kullanın."
       }
     },
@@ -647,7 +647,7 @@
         }
       },
       "ACTION_BUTTONS": {
-        "DISCARD": "Discard",
+        "DISCARD": "Yoksay",
         "SEND": "Send ({keyCode})"
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/tr/contentTemplates.json b/app/javascript/dashboard/i18n/locale/tr/contentTemplates.json
index 86020d9c1..588b3f27f 100644
--- a/app/javascript/dashboard/i18n/locale/tr/contentTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/tr/contentTemplates.json
@@ -28,6 +28,7 @@
       "TYPES": {
         "MEDIA": "Medya",
         "QUICK_REPLY": "Hızlı Yanıt",
+        "CALL_TO_ACTION": "Call to Action",
         "TEXT": "Metin"
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/tr/conversation.json b/app/javascript/dashboard/i18n/locale/tr/conversation.json
index e3f5f1ab0..78cbe01c7 100644
--- a/app/javascript/dashboard/i18n/locale/tr/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/tr/conversation.json
@@ -275,6 +275,16 @@
     "SIDEBAR": {
       "CONTACT": "İletişim",
       "COPILOT": "Copilot"
+    },
+    "VOICE_WIDGET": {
+      "INCOMING_CALL": "Gelen arama",
+      "OUTGOING_CALL": "Giden arama",
+      "CALL_IN_PROGRESS": "Arama devam ediyor",
+      "NOT_ANSWERED_YET": "Henüz yanıtlanmadı",
+      "HANDLED_IN_ANOTHER_TAB": "Being handled in another tab",
+      "REJECT_CALL": "Reject",
+      "JOIN_CALL": "Join call",
+      "END_CALL": "End call"
     }
   },
   "EMAIL_TRANSCRIPT": {
@@ -421,7 +431,7 @@
     "MULTIPLE": "{user} and {count} others are typing"
   },
   "COPILOT": {
-    "TRY_THESE_PROMPTS": "Try these prompts"
+    "TRY_THESE_PROMPTS": "Bu komutları deneyin"
   },
   "GALLERY_VIEW": {
     "ERROR_DOWNLOADING": "Unable to download attachment. Please try again"
diff --git a/app/javascript/dashboard/i18n/locale/tr/customRole.json b/app/javascript/dashboard/i18n/locale/tr/customRole.json
index 82e338b7b..6acfa5336 100644
--- a/app/javascript/dashboard/i18n/locale/tr/customRole.json
+++ b/app/javascript/dashboard/i18n/locale/tr/customRole.json
@@ -1,13 +1,13 @@
 {
   "CUSTOM_ROLE": {
-    "HEADER": "Custom Roles",
-    "LEARN_MORE": "Learn more about custom roles",
-    "DESCRIPTION": "Custom roles are roles that are created by the account owner or admin. These roles can be assigned to agents to define their access and permissions within the account. Custom roles can be created with specific permissions and access levels to suit the requirements of the organization.",
+    "HEADER": "Özel Roller",
+    "LEARN_MORE": "Özel roller hakkında daha fazla bilgi edinin",
+    "DESCRIPTION": "Özel roller, hesap sahibi veya yöneticiler tarafından oluşturulan rollerdir. Bu roller, temsilcilere hesabın içinde hangi erişim ve yetkilere sahip olacaklarını belirlemek için atanabilir. Özel roller, organizasyonun ihtiyaçlarına uygun olarak belirli izinler ve erişim seviyeleriyle oluşturulabilir.",
     "HEADER_BTN_TXT": "Add custom role",
-    "LOADING": "Fetching custom roles...",
+    "LOADING": "Özel roller alınıyor...",
     "SEARCH_404": "Bu sorgu ile eşleşen öğe yok.",
     "PAYWALL": {
-      "TITLE": "Upgrade to create custom roles",
+      "TITLE": "Özel roller oluşturmak için yükseltin",
       "AVAILABLE_ON": "The custom role feature is only available in the Business and Enterprise plans.",
       "UPGRADE_PROMPT": "Upgrade your plan to get access to advanced features like team management, automations, custom attributes, and more.",
       "UPGRADE_NOW": "Upgrade now",
@@ -19,9 +19,9 @@
       "ASK_ADMIN": "Please reach out to your administrator for the upgrade."
     },
     "LIST": {
-      "404": "There are no custom roles available in this account.",
-      "TITLE": "Manage custom roles",
-      "DESC": "Custom roles are roles that are created by the account owner or admin. These roles can be assigned to agents to define their access and permissions within the account. Custom roles can be created with specific permissions and access levels to suit the requirements of the organization.",
+      "404": "Bu hesapta kullanılabilir özel rol bulunmamaktadır.",
+      "TITLE": "Özel rolleri yönet",
+      "DESC": "Özel roller, hesap sahibi veya yöneticiler tarafından oluşturulan rollerdir. Bu roller, temsilcilere hesap içindeki erişim ve yetkilerini tanımlamak için atanabilir. Özel roller, organizasyonun ihtiyaçlarına uygun olarak belirli izinler ve erişim seviyeleriyle oluşturulabilir.",
       "TABLE_HEADER": {
         "NAME": "İsim",
         "DESCRIPTION": "Açıklama",
@@ -59,7 +59,7 @@
     },
     "ADD": {
       "TITLE": "Add custom role",
-      "DESC": " Custom roles allows you to create roles with specific permissions and access levels to suit the requirements of the organization.",
+      "DESC": " Özel roller, organizasyonun ihtiyaçlarına uygun olarak belirli izinler ve erişim seviyeleriyle roller oluşturmanıza olanak tanır.",
       "SUBMIT": "Gönder",
       "API": {
         "SUCCESS_MESSAGE": "Custom role added successfully."
@@ -68,7 +68,7 @@
     "EDIT": {
       "BUTTON_TEXT": "Düzenle",
       "TITLE": "Edit custom role",
-      "DESC": " Custom roles allows you to create roles with specific permissions and access levels to suit the requirements of the organization.",
+      "DESC": " Özel roller, organizasyonun ihtiyaçlarına uygun olarak belirli izinler ve erişim seviyeleriyle roller oluşturmanıza olanak tanır.",
       "SUBMIT": "Güncelleme",
       "API": {
         "SUCCESS_MESSAGE": "Custom role updated successfully."
diff --git a/app/javascript/dashboard/i18n/locale/tr/helpCenter.json b/app/javascript/dashboard/i18n/locale/tr/helpCenter.json
index 34656741b..c9cb6e7cc 100644
--- a/app/javascript/dashboard/i18n/locale/tr/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/tr/helpCenter.json
@@ -18,7 +18,7 @@
       },
       "TITLES": {
         "ALL_ARTICLES": "Tüm Makaleler",
-        "MINE": "Benim Makalelerim",
+        "MINE": "Makalelerim",
         "DRAFT": "Taslak Makaleler",
         "ARCHIVED": "Arşivlenmiş Makaleler"
       },
@@ -111,7 +111,7 @@
       "POPOVER": {
         "TITLE": "Portallar",
         "PORTAL_SETTINGS": "Portal Ayarları",
-        "SUBTITLE": "Birden çok portalınız var ve her bir portal için farklı yerelleriniz olabilir.",
+        "SUBTITLE": "Birden fazla portalınız olabilir ve her portal için farklı diller belirleyebilirsiniz.",
         "CANCEL_BUTTON_LABEL": "İptal Et",
         "CHOOSE_LOCALE_BUTTON": "Yerel Seç"
       },
@@ -136,7 +136,7 @@
             }
           },
           "AVAILABLE_LOCALES": {
-            "TITLE": "Kullanılabilir yereller",
+            "TITLE": "Kullanılabilir diller",
             "TABLE": {
               "NAME": "Yerel adı",
               "CODE": "Yerel kod",
@@ -178,7 +178,7 @@
             "TITLE": "Kategoriler"
           },
           "LOCALE_SETTINGS": {
-            "TITLE": "Yereller"
+            "TITLE": "Diller"
           }
         },
         "CATEGORIES": {
@@ -253,15 +253,15 @@
           "ERROR": "Slug gereklidir"
         },
         "DOMAIN": {
-          "LABEL": "Özel Domain",
-          "PLACEHOLDER": "Portal özel domain",
-          "HELP_TEXT": "Add only If you want to use a custom domain for your portals. Eg: {exampleURL}",
+          "LABEL": "Özel Alan Adı",
+          "PLACEHOLDER": "Portal özel alan adı",
+          "HELP_TEXT": "Yalnızca portallarınız için özel bir alan adı kullanmak istiyorsanız ekleyin. Örnek: {exampleURL}",
           "ERROR": "Geçerli bir domain URL girin"
         },
         "HOME_PAGE_LINK": {
           "LABEL": "Ana Sayfa Bağlantısı",
           "PLACEHOLDER": "Portal ana sayfa bağlantısı",
-          "HELP_TEXT": "The link used to return from the portal to the home page. Eg: {exampleURL}",
+          "HELP_TEXT": "Portaldan ana sayfaya dönmek için kullanılan bağlantı. Örnek: {exampleURL}",
           "ERROR": "Geçerli bir ana sayfa URL girin"
         },
         "THEME_COLOR": {
@@ -498,11 +498,11 @@
     "ARTICLES_PAGE": {
       "ARTICLE_CARD": {
         "CARD": {
-          "VIEWS": "{count} view | {count} views",
+          "VIEWS": "{count} görüntüleme | {count} görüntüleme",
           "DROPDOWN_MENU": {
             "PUBLISH": "Yayınla",
             "DRAFT": "Taslak",
-            "ARCHIVE": "Archive",
+            "ARCHIVE": "Arşiv",
             "DELETE": "Sil"
           },
           "STATUS": {
@@ -511,51 +511,51 @@
             "ARCHIVED": "Arşivlendi"
           },
           "CATEGORY": {
-            "UNCATEGORISED": "Uncategorised"
+            "UNCATEGORISED": "Kategorilendirilmemiş"
           }
         }
       },
       "ARTICLES_HEADER": {
         "TABS": {
-          "ALL": "All articles",
+          "ALL": "Tüm Makaleler",
           "MINE": "Benim",
           "DRAFT": "Taslak",
           "PUBLISHED": "Yayınlandı",
           "ARCHIVED": "Arşivlendi"
         },
         "CATEGORY": {
-          "ALL": "All categories"
+          "ALL": "Tüm Kategoriler"
         },
         "LOCALE": {
-          "ALL": "All locales"
+          "ALL": "Tüm Diller"
         },
-        "NEW_ARTICLE": "New article"
+        "NEW_ARTICLE": "Yeni Makale"
       },
       "EMPTY_STATE": {
         "ALL": {
-          "TITLE": "Write an article",
-          "SUBTITLE": "Write a rich article, let’s get started!",
-          "BUTTON_LABEL": "New article"
+          "TITLE": "Bir makale yazın",
+          "SUBTITLE": "Detaylı bir makale yazın, haydi başlayalım!",
+          "BUTTON_LABEL": "Yeni Makale"
         },
         "MINE": {
-          "TITLE": "You haven't written any articles here",
-          "SUBTITLE": "All articles written by you show up here for quick access."
+          "TITLE": "Burada herhangi bir makale yazmadınız",
+          "SUBTITLE": "Tarafınızdan yazılan tüm makaleler, hızlı erişim için burada görüntülenir."
         },
         "DRAFT": {
-          "TITLE": "There are no articles in drafts",
-          "SUBTITLE": "Draft articles will appear here"
+          "TITLE": "Taslaklarda herhangi bir makale bulunmamaktadır",
+          "SUBTITLE": "Taslak makaleler burada görüntülenecektir"
         },
         "PUBLISHED": {
-          "TITLE": "There are no published articles",
-          "SUBTITLE": "Published articles will appear here"
+          "TITLE": "Yayınlanmış makale bulunmamaktadır",
+          "SUBTITLE": "Yayınlanmış makaleler burada görüntülenecektir"
         },
         "ARCHIVED": {
-          "TITLE": "There are no articles in the archive",
-          "SUBTITLE": "Archived articles don't show up on the portal, you can use it to mark deprecated or outdated pages"
+          "TITLE": "Arşivde herhangi bir makale bulunmamaktadır",
+          "SUBTITLE": "Arşivlenen makaleler portalda görünmez; bu özelliği kullanarak artık geçerli olmayan veya güncelliğini yitirmiş sayfaları işaretleyebilirsiniz"
         },
         "CATEGORY": {
-          "TITLE": "There are no articles in this category",
-          "SUBTITLE": "Articles in this category will appear here"
+          "TITLE": "Bu kategoride makale bulunmamaktadır",
+          "SUBTITLE": "Bu kategorideki makaleler burada görünecektir"
         }
       }
     },
@@ -563,10 +563,10 @@
       "CATEGORY_HEADER": {
         "NEW_CATEGORY": "Yeni kategori",
         "EDIT_CATEGORY": "Kategori düzenle",
-        "CATEGORIES_COUNT": "{n} category | {n} categories",
+        "CATEGORIES_COUNT": "{n} kategori | {n} kategori",
         "BREADCRUMB": {
-          "CATEGORY_LOCALE": "Categories ({localeCode})",
-          "ACTIVE_CATEGORY": "{categoryName} ({categoryCount} articles) | {categoryName} ({categoryCount} article)"
+          "CATEGORY_LOCALE": "Kategoriler ({localeCode})",
+          "ACTIVE_CATEGORY": "{categoryName} ({categoryCount} makale) | {categoryName} ({categoryCount} makale)"
         }
       },
       "CATEGORY_EMPTY_STATE": {
@@ -574,7 +574,7 @@
         "SUBTITLE": "Categories will appear here. You can add a category by clicking the 'New Category' button."
       },
       "CATEGORY_CARD": {
-        "ARTICLES_COUNT": "{count} article | {count} articles"
+        "ARTICLES_COUNT": "{count} makale | {count} makale"
       },
       "CATEGORY_DIALOG": {
         "CREATE": {
@@ -631,8 +631,8 @@
       "LOCALES_COUNT": "No locales available | {n} locale | {n} locales",
       "NEW_LOCALE_BUTTON_TEXT": "Yeni Dil",
       "LOCALE_CARD": {
-        "ARTICLES_COUNT": "{count} article | {count} articles",
-        "CATEGORIES_COUNT": "{count} category | {count} categories",
+        "ARTICLES_COUNT": "{count} makale | {count} makale",
+        "CATEGORIES_COUNT": "{count} kategori | {count} kategori",
         "DEFAULT": "Varsayılan",
         "DROPDOWN_MENU": {
           "MAKE_DEFAULT": "Make default",
@@ -661,7 +661,7 @@
         "PUBLISH": "Yayınla",
         "DRAFT": "Taslak",
         "ARCHIVE": "Archive",
-        "BACK_TO_ARTICLES": "Back to articles"
+        "BACK_TO_ARTICLES": "Makalelere geri dön"
       },
       "EDIT_ARTICLE": {
         "MORE_PROPERTIES": "More properties",
@@ -711,7 +711,7 @@
         "AVATAR": {
           "LABEL": "Logo",
           "IMAGE_UPLOAD_ERROR": "Resim yüklenemedi! Tekrar deneyin",
-          "IMAGE_UPLOAD_SUCCESS": "Image added successfully. Please click on save changes to save the logo",
+          "IMAGE_UPLOAD_SUCCESS": "Resim başarıyla eklendi. Logoyu kaydetmek için lütfen 'Değişiklikleri Kaydet' butonuna tıklayın",
           "IMAGE_DELETE_SUCCESS": "Logo başarıyla silindi",
           "IMAGE_DELETE_ERROR": "Unable to delete logo",
           "IMAGE_UPLOAD_SIZE_ERROR": "Resim boyutu %{size}MB'dan küçük olmalıdır"
@@ -730,7 +730,7 @@
           "PLACEHOLDER": "Portal sayfa başlığı"
         },
         "HOME_PAGE_LINK": {
-          "LABEL": "Home page link",
+          "LABEL": "Ana Sayfa Bağlantısı",
           "PLACEHOLDER": "Portal ana sayfa bağlantısı",
           "ERROR": "Geçerli bir URL girin. Ana sayfa bağlantısı ‘http://’ veya ‘https://’ ile başlamalıdır."
         },
@@ -741,32 +741,32 @@
         "LIVE_CHAT_WIDGET": {
           "LABEL": "Live chat widget",
           "PLACEHOLDER": "Select live chat widget",
-          "HELP_TEXT": "Select a live chat widget that will appear on your help center",
+          "HELP_TEXT": "Yardım merkezinizde görünecek bir canlı widget seçin",
           "NONE_OPTION": "Widget yok"
         },
         "BRAND_COLOR": {
-          "LABEL": "Brand color"
+          "LABEL": "Marka rengi"
         },
-        "SAVE_CHANGES": "Save changes"
+        "SAVE_CHANGES": "Değişiklikleri Kaydet"
       },
       "CONFIGURATION_FORM": {
         "CUSTOM_DOMAIN": {
           "HEADER": "Özel domain",
           "LABEL": "Özel domain:",
-          "DESCRIPTION": "You can host your portal on a custom domain. For instance, if your website is yourdomain.com and you want your portal available at docs.yourdomain.com, simply enter that in this field.",
+          "DESCRIPTION": "Portalınızı özel bir alan adında barındırabilirsiniz. Örneğin, web siteniz yourdomain.com ise ve portalınızın docs.yourdomain.com adresinde erişilebilir olmasını istiyorsanız, bu alanı buna göre doldurmanız yeterlidir.",
           "STATUS_DESCRIPTION": "Özel portalınız, doğrulandıktan sonra hemen çalışmaya başlayacaktır.",
           "PLACEHOLDER": "Portal özel domain",
           "EDIT_BUTTON": "Düzenle",
-          "ADD_BUTTON": "Add custom domain",
+          "ADD_BUTTON": "Özel Alan Adı Ekle",
           "STATUS": {
             "LIVE": "Canlı",
             "PENDING": "Doğrulama bekleniyor",
             "ERROR": "Doğrulama başarısız"
           },
           "DIALOG": {
-            "ADD_HEADER": "Add custom domain",
+            "ADD_HEADER": "Özel Alan Adı Ekle",
             "EDIT_HEADER": "Edit custom domain",
-            "ADD_CONFIRM_BUTTON_LABEL": "Add domain",
+            "ADD_CONFIRM_BUTTON_LABEL": "Alan Adı Ekle",
             "EDIT_CONFIRM_BUTTON_LABEL": "Update domain",
             "LABEL": "Özel domain",
             "PLACEHOLDER": "Portal özel domain",
@@ -775,7 +775,7 @@
           },
           "DNS_CONFIGURATION_DIALOG": {
             "HEADER": "DNS configuration",
-            "DESCRIPTION": "Log in to the account you have with your DNS provider, and add a CNAME record for subdomain pointing to chatwoot.help",
+            "DESCRIPTION": "DNS sağlayıcınızda sahip olduğunuz hesaba giriş yapın ve chatwoot.help adresine yönlendiren alt alan adı için bir CNAME kaydı ekleyin",
             "COPY": "CNAME başarıyla kopyalandı",
             "SEND_INSTRUCTIONS": {
               "HEADER": "Talimatları gönder",
@@ -789,7 +789,7 @@
         "DELETE_PORTAL": {
           "BUTTON": "Delete {portalName}",
           "HEADER": "Portali Sil",
-          "DESCRIPTION": "Permanently delete this portal. This action is irreversible",
+          "DESCRIPTION": "Bu portalı kalıcı olarak silin. Bu işlem geri alınamaz",
           "DIALOG": {
             "HEADER": "Sure you want to delete {portalName}?",
             "DESCRIPTION": "This is a permanent action that cannot be reversed.",
diff --git a/app/javascript/dashboard/i18n/locale/tr/inbox.json b/app/javascript/dashboard/i18n/locale/tr/inbox.json
index 3602e0eaf..ff5c6a0cd 100644
--- a/app/javascript/dashboard/i18n/locale/tr/inbox.json
+++ b/app/javascript/dashboard/i18n/locale/tr/inbox.json
@@ -1,7 +1,7 @@
 {
   "INBOX": {
     "LIST": {
-      "TITLE": "My Inbox",
+      "TITLE": "Gelen Kutusu",
       "DISPLAY_DROPDOWN": "Görüntüle",
       "LOADING": "Bildirimler yükleniyor",
       "404": "Bu grupta aktif görüşme yok.",
diff --git a/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json
index b342d8929..9807238b4 100644
--- a/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json
@@ -1,7 +1,7 @@
 {
   "INBOX_MGMT": {
     "HEADER": "Gelen kutuları",
-    "DESCRIPTION": "A channel is the mode of communication your customer chooses to interact with you. An inbox is where you manage interactions for a specific channel. It can include communications from various sources such as email, live chat, and social media.",
+    "DESCRIPTION": "Kanal, müşterinizin sizinle iletişim kurmak için seçtiği yöntemdir. Gelen kutusu (inbox) ise belirli bir kanal üzerinden gerçekleşen etkileşimleri yönettiğiniz yerdir. Gelen kutusu; e-posta, canlı sohbet ve sosyal medya gibi farklı kaynaklardan gelen iletişimleri içerebilir.",
     "LEARN_MORE": "Learn more about inboxes",
     "RECONNECTION_REQUIRED": "Your inbox is disconnected. You won't receive new messages until you reauthorize it.",
     "CLICK_TO_RECONNECT": "Click here to reconnect.",
@@ -808,6 +808,35 @@
         "LABEL": "Mesaj",
         "PLACEHOLDER": "Form ile kullanıcılara göstermek için bir mesaj girin"
       },
+      "BUTTON_TEXT": {
+        "LABEL": "Button text",
+        "PLACEHOLDER": "Please rate us"
+      },
+      "LANGUAGE": {
+        "LABEL": "Dil",
+        "PLACEHOLDER": "Select template language"
+      },
+      "MESSAGE_PREVIEW": {
+        "LABEL": "Message preview",
+        "TOOLTIP": "This may vary slightly when rendered on WhatsApp's platform."
+      },
+      "TEMPLATE_STATUS": {
+        "APPROVED": "Approved by WhatsApp",
+        "PENDING": "Pending WhatsApp approval",
+        "REJECTED": "Meta rejected the template",
+        "DEFAULT": "Needs WhatsApp approval",
+        "NOT_FOUND": "The template does not exist in the Meta platform."
+      },
+      "TEMPLATE_CREATION": {
+        "SUCCESS_MESSAGE": "WhatsApp template created successfully and sent for approval",
+        "ERROR_MESSAGE": "Failed to create WhatsApp template"
+      },
+      "TEMPLATE_UPDATE_DIALOG": {
+        "TITLE": "Edit survey details",
+        "DESCRIPTION": "We will delete the previous template and make a new one which will be sent again for WhatsApp approval",
+        "CONFIRM": "Create new template",
+        "CANCEL": "Geri git"
+      },
       "SURVEY_RULE": {
         "LABEL": "Anket kuralı",
         "DESCRIPTION_PREFIX": "Sohbet olursa anketi gönder",
@@ -819,6 +848,7 @@
         "SELECT_PLACEHOLDER": "etiketleri seç"
       },
       "NOTE": "Not: CSAT anketleri, konuşma başına yalnızca bir kez gönderilir",
+      "WHATSAPP_NOTE": "Note: We will create a template and send it for WhatsApp approval. After being approved, surveys will be sent only once per conversation as per the survey rule.",
       "API": {
         "SUCCESS_MESSAGE": "CSAT ayarları başarıyla güncellendi",
         "ERROR_MESSAGE": "CSAT ayarları güncellenemedi. Lütfen daha sonra tekrar deneyin."
diff --git a/app/javascript/dashboard/i18n/locale/tr/integrationApps.json b/app/javascript/dashboard/i18n/locale/tr/integrationApps.json
index aed2ae938..3965bc93a 100644
--- a/app/javascript/dashboard/i18n/locale/tr/integrationApps.json
+++ b/app/javascript/dashboard/i18n/locale/tr/integrationApps.json
@@ -56,7 +56,7 @@
       "BUTTON_TEXT": "Bağlantıyı Kes"
     },
     "SIDEBAR_DESCRIPTION": {
-      "DIALOGFLOW": "Dialogflow is a natural language processing platform for building conversational interfaces. Integrating it with {installationName} lets bots handle queries first and transfer them to agents when needed. It helps qualify leads and reduce agent workload by answering FAQs. To add Dialogflow, create a Service Account in Google Console and share the credentials. Refer to the docs for details"
+      "DIALOGFLOW": "Dialogflow, konuşmaya dayalı arayüzler oluşturmak için kullanılan bir doğal dil işleme platformudur. Bu platformu {installationName} ile entegre etmek, botların önce sorguları ele almasını ve gerektiğinde temsilcilere aktarmasını sağlar. Sıkça sorulan soruları yanıtlayarak potansiyel müşterileri nitelendirmeye ve temsilci iş yükünü azaltmaya yardımcı olur. Dialogflow eklemek için, Google Console'da bir Hizmet Hesabı (Service Account) oluşturun ve kimlik bilgilerini paylaşın. Detaylar için belgelere bakın"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/tr/integrations.json b/app/javascript/dashboard/i18n/locale/tr/integrations.json
index ba19f8e73..c43462695 100644
--- a/app/javascript/dashboard/i18n/locale/tr/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/tr/integrations.json
@@ -16,7 +16,7 @@
       "ERROR": "There was an error connecting to Shopify. Please try again or contact support if the issue persists."
     },
     "HEADER": "Entegrasyonlar",
-    "DESCRIPTION": "Chatwoot integrates with multiple tools and services to improve your team's efficiency. Explore the list below to configure your favorite apps.",
+    "DESCRIPTION": "Chatwoot, ekibinizin verimliliğini artırmak için birden fazla araç ve hizmetle entegre olur. Favori uygulamalarınızı yapılandırmak için aşağıdaki listeyi inceleyin.",
     "LEARN_MORE": "Learn more about integrations",
     "LOADING": "Fetching integrations",
     "CAPTAIN": {
@@ -338,8 +338,8 @@
     },
     "NOTION": {
       "DELETE": {
-        "TITLE": "Are you sure you want to delete the Notion integration?",
-        "MESSAGE": "Deleting this integration will remove access to your Notion workspace and stop all related functionality.",
+        "TITLE": "Notion entegrasyonunu silmek istediğinizden emin misiniz?",
+        "MESSAGE": "Bu entegrasyonu silmek, Notion çalışma alanınıza erişimi kaldıracak ve ilgili tüm işlevleri durduracaktır.",
         "CONFIRM": "Evet, sil",
         "CANCEL": "İptal Et"
       }
@@ -347,16 +347,16 @@
   },
   "CAPTAIN": {
     "NAME": "Captain",
-    "HEADER_KNOW_MORE": "Know more",
+    "HEADER_KNOW_MORE": "Daha fazla bilgi edinin",
     "ASSISTANT_SWITCHER": {
-      "ASSISTANTS": "Assistants",
-      "SWITCH_ASSISTANT": "Switch between assistants",
-      "NEW_ASSISTANT": "Create Assistant",
+      "ASSISTANTS": "Asistanlar",
+      "SWITCH_ASSISTANT": "Asistanlar arasında geçiş yap",
+      "NEW_ASSISTANT": "Asistan Oluştur",
       "EMPTY_LIST": "Asistan bulunamadı, başlamak için bir tane oluşturun"
     },
     "COPILOT": {
       "TITLE": "Copilot",
-      "TRY_THESE_PROMPTS": "Try these prompts",
+      "TRY_THESE_PROMPTS": "Bu komutları deneyin",
       "PANEL_TITLE": "Copilot ile başlayın",
       "KICK_OFF_MESSAGE": "Hızlı bir özet mi gerekiyor, geçmiş konuşmaları mı kontrol etmek istiyorsunuz, yoksa daha iyi bir yanıt mı tasarlamak istiyorsunuz? Copilot işleri hızlandırmak için burada.",
       "SEND_MESSAGE": "Mesajı Gönder...",
@@ -401,17 +401,17 @@
     "PAYWALL": {
       "TITLE": "Upgrade to use Captain AI",
       "AVAILABLE_ON": "Captain is not available on the free plan.",
-      "UPGRADE_PROMPT": "Upgrade your plan to get access to our assistants, copilot and more.",
+      "UPGRADE_PROMPT": "Asistanlarımıza, Copilot'a ve daha fazlasına erişim sağlamak için planınızı yükseltin.",
       "UPGRADE_NOW": "Upgrade now",
       "CANCEL_ANYTIME": "You can change or cancel your plan anytime"
     },
     "ENTERPRISE_PAYWALL": {
-      "UPGRADE_PROMPT": "Upgrade your plan to get access to our assistants, copilot and more.",
+      "UPGRADE_PROMPT": "Asistanlarımıza, Copilot'a ve daha fazlasına erişim sağlamak için planınızı yükseltin.",
       "ASK_ADMIN": "Please reach out to your administrator for the upgrade."
     },
     "BANNER": {
       "RESPONSES": "You've used over 80% of your response limit. To continue using Captain AI, please upgrade.",
-      "DOCUMENTS": "Document limit reached. Upgrade to continue using Captain AI."
+      "DOCUMENTS": "Belge sınırı aşıldı. Captain AI'yı kullanmaya devam etmek için yükseltme yapın."
     },
     "FORM": {
       "CANCEL": "İptal Et",
@@ -419,24 +419,24 @@
       "EDIT": "Güncelleme"
     },
     "ASSISTANTS": {
-      "HEADER": "Assistants",
+      "HEADER": "Asistanlar",
       "NO_ASSISTANTS_AVAILABLE": "Hesabınızda kullanılabilir asistan yok.",
-      "ADD_NEW": "Create a new assistant",
+      "ADD_NEW": "Yeni bir asistan oluştur",
       "DELETE": {
-        "TITLE": "Are you sure to delete the assistant?",
-        "DESCRIPTION": "This action is permanent. Deleting this assistant will remove it from all connected inboxes and permanently erase all generated knowledge.",
+        "TITLE": "Asistanı silmek istediğinizden emin misiniz?",
+        "DESCRIPTION": "Bu işlem kalıcıdır. Bu asistanı silmek, onu tüm bağlı gelen kutularından kaldıracak ve oluşturulan tüm bilgileri kalıcı olarak silecektir.",
         "CONFIRM": "Evet, sil",
-        "SUCCESS_MESSAGE": "The assistant has been successfully deleted",
-        "ERROR_MESSAGE": "There was an error deleting the assistant, please try again."
+        "SUCCESS_MESSAGE": "Asistan başarıyla silindi",
+        "ERROR_MESSAGE": "Asistanı silerken bir hata oluştu, lütfen tekrar deneyin."
       },
-      "FORM_DESCRIPTION": "Fill out the details below to name your assistant, describe its purpose, and specify the product it will support.",
+      "FORM_DESCRIPTION": "Asistanınıza isim vermek, amacını tanımlamak ve destekleyeceği ürünü belirtmek için aşağıdaki ayrıntıları doldurun.",
       "CREATE": {
-        "TITLE": "Create an assistant",
-        "SUCCESS_MESSAGE": "The assistant has been successfully created",
-        "ERROR_MESSAGE": "There was an error creating the assistant, please try again."
+        "TITLE": "Bir asistan oluşturun",
+        "SUCCESS_MESSAGE": "Asistan başarıyla oluşturuldu",
+        "ERROR_MESSAGE": "Asistan oluşturulurken bir hata oluştu, lütfen tekrar deneyin."
       },
       "FORM": {
-        "UPDATE": "Güncelleme",
+        "UPDATE": "Güncelle",
         "SECTIONS": {
           "BASIC_INFO": "Temel Bilgiler",
           "SYSTEM_MESSAGES": "Sistem Mesajları",
@@ -481,9 +481,9 @@
         },
         "FEATURES": {
           "TITLE": "Özellikleri",
-          "ALLOW_CONVERSATION_FAQS": "Generate FAQs from resolved conversations",
-          "ALLOW_MEMORIES": "Capture key details as memories from customer interactions.",
-          "ALLOW_CITATIONS": "Include source citations in responses"
+          "ALLOW_CONVERSATION_FAQS": "Çözümlenmiş konuşmalardan SSS oluştur",
+          "ALLOW_MEMORIES": "Müşteri etkileşimlerinden önemli detayları anı olarak yakala.",
+          "ALLOW_CITATIONS": "Yanıtlara kaynak alıntıları ekle"
         }
       },
       "EDIT": {
@@ -503,41 +503,41 @@
           "DESCRIPTION": "Konuşmayı sonlandırırken veya bir operatöre aktarırken asistanın söyleyeceği sözleri özelleştirin."
         },
         "CONTROL_ITEMS": {
-          "TITLE": "The Fun Stuff",
-          "DESCRIPTION": "Add more control to the assistant. (a bit more visual like a story : Query guardrail → scenarios → output) Nudges user to actually utilise these.",
+          "TITLE": "Eğlenceli Şeyler",
+          "DESCRIPTION": "Asistana daha fazla kontrol ekleyin. (hikaye gibi biraz daha görsel: Sorgu koruma çiti → senaryolar → çıktı) Kullanıcıyı bunları gerçekten kullanmaya teşvik edin.",
           "OPTIONS": {
             "GUARDRAILS": {
-              "TITLE": "Guardrails",
-              "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic."
+              "TITLE": "Sorgu Korumaları",
+              "DESCRIPTION": "Her şeyi yolunda tutar; asistanınız sadece sizin istediğiniz soruları yanıtlar, sınır dışı veya konu dışı hiçbir şeye izin vermez."
             },
             "RESPONSE_GUIDELINES": {
-              "TITLE": "Response guidelines",
-              "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
+              "TITLE": "Yanıt kılavuzları",
+              "DESCRIPTION": "Asistanınızın yanıtlarının havası ve yapısı nasıl? Açık ve samimi mi? Kısa ve öz mü? Ayrıntılı ve resmi mi?"
             }
           }
         },
         "DELETE": {
-          "TITLE": "Delete Assistant",
-          "DESCRIPTION": "This action is permanent. Deleting this assistant will remove it from all connected inboxes and permanently erase all generated knowledge.",
-          "BUTTON_TEXT": "Delete {assistantName}"
+          "TITLE": "Asistanı Sil",
+          "DESCRIPTION": "Bu işlem kalıcıdır. Bu asistanı silmek, onu tüm bağlı gelen kutularından kaldıracak ve oluşturulan tüm bilgileri kalıcı olarak silecektir.",
+          "BUTTON_TEXT": "Sil {assistantName}"
         }
       },
       "OPTIONS": {
         "EDIT_ASSISTANT": "Edit Assistant",
-        "DELETE_ASSISTANT": "Delete Assistant",
+        "DELETE_ASSISTANT": "Asistanı Sil",
         "VIEW_CONNECTED_INBOXES": "View connected inboxes"
       },
       "EMPTY_STATE": {
         "TITLE": "No assistants available",
-        "SUBTITLE": "Create an assistant to provide quick and accurate responses to your users. It can learn from your help articles and past conversations.",
+        "SUBTITLE": "Kullanıcılara hızlı ve doğru yanıtlar sağlayacak bir asistan oluşturun. Asistan, yardım makalelerinizden ve geçmiş konuşmalardan öğrenebilir.",
         "FEATURE_SPOTLIGHT": {
           "TITLE": "Captain Assistant",
-          "NOTE": "Captain Assistant engages directly with customers, learns from your help docs and past conversations, and delivers instant, accurate responses. It handles the initial queries, providing quick resolutions before  transferring to an agent when needed."
+          "NOTE": "Captain Asistan, doğrudan müşterilerle etkileşim kurar, yardım belgelerinizden ve geçmiş konuşmalardan öğrenir ve anında, doğru yanıtlar sunar. Başlangıçtaki sorgulamaları ele alır, hızlı çözümler sunar ve gerektiğinde bir temsilciye aktarır."
         }
       },
       "GUARDRAILS": {
-        "TITLE": "Guardrails",
-        "DESCRIPTION": "Keeps things on track—only the kinds of questions you want your assistant to answer, nothing off-limits or off-topic.",
+        "TITLE": "Sorgu Korumaları",
+        "DESCRIPTION": "Her şeyi rayında tutar; asistanınız sadece yanıtlamasını istediğiniz soru türlerine odaklanır, sınır dışı veya konu dışı hiçbir şeye geçit vermez.",
         "BULK_ACTION": {
           "SELECTED": "{count} eşya seçildi | {count} eşya seçildi",
           "SELECT_ALL": "Tümünü seç ({count})",
@@ -546,43 +546,43 @@
         },
         "ADD": {
           "SUGGESTED": {
-            "TITLE": "Example guardrails",
+            "TITLE": "Örnek Sorgu Korumaları",
             "ADD": "Tümünü ekle",
             "ADD_SINGLE": "Bunu ekle",
             "SAVE": "Ekle ve kaydet (↵)",
-            "PLACEHOLDER": "Type in another guardrail..."
+            "PLACEHOLDER": "Başka bir sorgu kontrolü yazın..."
           },
           "NEW": {
-            "TITLE": "Add a guardrail",
-            "CREATE": "Yarat",
+            "TITLE": "Sorgu Kontrolü Ekle",
+            "CREATE": "Oluştur",
             "CANCEL": "İptal Et",
-            "PLACEHOLDER": "Type in another guardrail...",
+            "PLACEHOLDER": "Başka bir sorgu kontrolü yazın...",
             "TEST_ALL": "Tümünü test et"
           }
         },
         "LIST": {
           "SEARCH_PLACEHOLDER": "Ara..."
         },
-        "EMPTY_MESSAGE": "No guardrails found. Create or add examples to begin.",
+        "EMPTY_MESSAGE": "Sorgu Kontrolü bulunamadı. Başlamak için örnekler oluşturun veya ekleyin.",
         "SEARCH_EMPTY_MESSAGE": "No guardrails found for this search.",
         "API": {
           "ADD": {
-            "SUCCESS": "Guardrails added successfully",
-            "ERROR": "There was an error adding guardrails, please try again."
+            "SUCCESS": "Sorgu Kontrolleri başarıyla eklendi",
+            "ERROR": "Sorgu Kontrolü ekleme sırasında bir hata oluştu, lütfen tekrar deneyin."
           },
           "UPDATE": {
             "SUCCESS": "Guardrails updated successfully",
             "ERROR": "There was an error updating guardrails, please try again."
           },
           "DELETE": {
-            "SUCCESS": "Guardrails deleted successfully",
+            "SUCCESS": "Sorgu Kontrolü başarıyla silindi",
             "ERROR": "There was an error deleting guardrails, please try again."
           }
         }
       },
       "RESPONSE_GUIDELINES": {
-        "TITLE": "Response Guidelines",
-        "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?",
+        "TITLE": "Yanıt Kılavuzları",
+        "DESCRIPTION": "Asistanınızın yanıtlarının havası ve yapısı nasıl? Açık ve samimi mi? Kısa ve öz mü? Ayrıntılı ve resmi mi?",
         "BULK_ACTION": {
           "SELECTED": "{count} eşya seçildi | {count} eşya seçildi",
           "SELECT_ALL": "Tümünü seç ({count})",
@@ -591,15 +591,15 @@
         },
         "ADD": {
           "SUGGESTED": {
-            "TITLE": "Example response guidelines",
+            "TITLE": "Örnek yanıt kılavuzları",
             "ADD": "Tümünü ekle",
             "ADD_SINGLE": "Bunu ekle",
             "SAVE": "Ekle ve kaydet (↵)",
-            "PLACEHOLDER": "Type in another response guideline..."
+            "PLACEHOLDER": "Başka bir yanıt kılavuzu yazın..."
           },
           "NEW": {
-            "TITLE": "Add a response guideline",
-            "CREATE": "Yarat",
+            "TITLE": "Yanıt kılavuzu ekle",
+            "CREATE": "Oluştur",
             "CANCEL": "İptal Et",
             "PLACEHOLDER": "Type in another response guideline...",
             "TEST_ALL": "Tümünü test et"
@@ -626,8 +626,8 @@
         }
       },
       "SCENARIOS": {
-        "TITLE": "Scenarios",
-        "DESCRIPTION": "Give your assistant some context—like “what to do when a user is stuck,” or “how to act during a refund request.”",
+        "TITLE": "Senaryolar",
+        "DESCRIPTION": "Asistanınıza bazı bilgiler verin, örneğin “kullanıcı takıldığında ne yapmalı” veya “geri ödeme talebi sırasında nasıl davranmalı”.",
         "BULK_ACTION": {
           "SELECTED": "{count} eşya seçildi | {count} eşya seçildi",
           "SELECT_ALL": "Tümünü seç ({count})",
@@ -636,31 +636,31 @@
         },
         "ADD": {
           "SUGGESTED": {
-            "TITLE": "Example scenarios",
+            "TITLE": "Örnek senaryolar",
             "ADD": "Tümünü ekle",
             "ADD_SINGLE": "Bunu ekle",
             "TOOLS_USED": "Tools used :"
           },
           "NEW": {
-            "CREATE": "Add a scenario",
-            "TITLE": "Create a scenario",
+            "CREATE": "Senaryo ekle",
+            "TITLE": "Senaryo Oluştur",
             "FORM": {
               "TITLE": {
                 "LABEL": "Başlık",
-                "PLACEHOLDER": "Enter a name for the scenario",
-                "ERROR": "Scenario name is required"
+                "PLACEHOLDER": "Senaryo için bir isim girin",
+                "ERROR": "Senaryo ismi gereklidir"
               },
               "DESCRIPTION": {
                 "LABEL": "Açıklama",
-                "PLACEHOLDER": "Describe how and where this scenario will be used",
-                "ERROR": "Scenario description is required"
+                "PLACEHOLDER": "Bu senaryonun nasıl ve nerede kullanılacağını açıklayın",
+                "ERROR": "Senaryo açıklaması gereklidir"
               },
               "INSTRUCTION": {
-                "LABEL": "How to handle",
-                "PLACEHOLDER": "Describe how and where this scenario will be handled",
-                "ERROR": "Scenario content is required"
+                "LABEL": "Nasıl uygulanır",
+                "PLACEHOLDER": "Bu senaryonun nasıl ve nerede ele alınacağını açıklayın",
+                "ERROR": "Senaryo içeriği gereklidir"
               },
-              "CREATE": "Yarat",
+              "CREATE": "Oluştur",
               "CANCEL": "İptal Et"
             }
           }
@@ -691,17 +691,17 @@
       }
     },
     "DOCUMENTS": {
-      "HEADER": "Documents",
-      "ADD_NEW": "Create a new document",
+      "HEADER": "Belgeler",
+      "ADD_NEW": "Yeni belge oluştur",
       "RELATED_RESPONSES": {
-        "TITLE": "Related FAQs",
-        "DESCRIPTION": "These FAQs are generated directly from the document."
+        "TITLE": "İlgili SSS",
+        "DESCRIPTION": "Bu SSS'ler doğrudan belgeden oluşturulmuştur."
       },
-      "FORM_DESCRIPTION": "Enter the URL of the document to add it as a knowledge source and choose the assistant to associate it with.",
+      "FORM_DESCRIPTION": "Bilgi kaynağı olarak eklemek için belgenin URL'sini girin ve ilişkilendirmek istediğiniz asistanı seçin.",
       "CREATE": {
-        "TITLE": "Add a document",
-        "SUCCESS_MESSAGE": "The document has been successfully created",
-        "ERROR_MESSAGE": "There was an error creating the document, please try again."
+        "TITLE": "Belge ekle",
+        "SUCCESS_MESSAGE": "Belge başarıyla oluşturuldu",
+        "ERROR_MESSAGE": "Belge oluşturulurken bir hata oluştu, lütfen tekrar deneyin."
       },
       "FORM": {
         "TYPE": {
@@ -711,7 +711,7 @@
         },
         "URL": {
           "LABEL": "URL",
-          "PLACEHOLDER": "Enter the URL of the document",
+          "PLACEHOLDER": "Belgenin URL'sini girin",
           "ERROR": "Lütfen belge için geçerli bir URL sağlayın"
         },
         "PDF_FILE": {
@@ -728,31 +728,31 @@
         }
       },
       "DELETE": {
-        "TITLE": "Are you sure to delete the document?",
-        "DESCRIPTION": "This action is permanent. Deleting this document will permanently erase all generated knowledge.",
+        "TITLE": "Belgeyi silmek istediğinizden emin misiniz?",
+        "DESCRIPTION": "Bu işlem kalıcıdır. Bu belgeyi silmek, oluşturulan tüm bilgileri kalıcı olarak silecektir.",
         "CONFIRM": "Evet, sil",
-        "SUCCESS_MESSAGE": "The document has been successfully deleted",
-        "ERROR_MESSAGE": "There was an error deleting the document, please try again."
+        "SUCCESS_MESSAGE": "Belge başarıyla silindi",
+        "ERROR_MESSAGE": "Belgeyi silerken bir hata oluştu, lütfen tekrar deneyin."
       },
       "OPTIONS": {
-        "VIEW_RELATED_RESPONSES": "View Related Responses",
-        "DELETE_DOCUMENT": "Delete Document"
+        "VIEW_RELATED_RESPONSES": "İlgili Yanıtları Görüntüle",
+        "DELETE_DOCUMENT": "Belgeyi Sil"
       },
       "EMPTY_STATE": {
-        "TITLE": "No documents available",
-        "SUBTITLE": "Documents are used by your assistant to generate FAQs. You can import documents to provide context for your assistant.",
+        "TITLE": "Kullanılabilir belge yok",
+        "SUBTITLE": "Belgeler, asistanınız tarafından SSS oluşturmak için kullanılır. Asistanınıza içerik sağlamak için belge aktarabilirsiniz.",
         "FEATURE_SPOTLIGHT": {
-          "TITLE": "Captain Document",
-          "NOTE": "A document in Captain serves as a knowledge resource for the assistant. By connecting your help center or guides, Captain can analyze the content and provide accurate responses for customer inquiries."
+          "TITLE": "Captain Belge",
+          "NOTE": "Captain'daki bir belge, asistan için bir bilgi kaynağı görevi görür. Yardım merkezinizi veya kılavuzlarınızı bağlayarak Captain, içeriği analiz edebilir ve müşteri sorularına doğru yanıtlar sağlayabilir."
         }
       }
     },
     "CUSTOM_TOOLS": {
       "HEADER": "Araçlar",
-      "ADD_NEW": "Create a new tool",
+      "ADD_NEW": "Yeni bir araç oluşturun",
       "EMPTY_STATE": {
-        "TITLE": "No custom tools available",
-        "SUBTITLE": "Create custom tools to connect your assistant with external APIs and services, enabling it to fetch data and perform actions on your behalf.",
+        "TITLE": "Özel araçlar mevcut değil",
+        "SUBTITLE": "Asistanınızın harici API'lere ve hizmetlere bağlanmasını sağlamak için özel araçlar oluşturun; böylece asistanınız sizin adınıza veri çekebilir ve işlemler gerçekleştirebilir.",
         "FEATURE_SPOTLIGHT": {
           "TITLE": "Özel Araçlar",
           "NOTE": "Özel araçlar, asistanınızın harici API'ler ve hizmetlerle etkileşim kurmasını sağlar. Asistanınızın yeteneklerini artırmak için veri çekme, eylemler gerçekleştirme veya mevcut sistemlerinizle entegrasyon sağlama amaçlı araçlar oluşturun."
@@ -820,10 +820,10 @@
           "API_VALUE_PLACEHOLDER": "Enter API key value"
         },
         "PARAMETERS": {
-          "LABEL": "Parameters",
-          "HELP_TEXT": "Define the parameters that will be extracted from user queries"
+          "LABEL": "Parametreler",
+          "HELP_TEXT": "Kullanıcı sorgularından çıkarılacak parametreleri tanımlayın"
         },
-        "ADD_PARAMETER": "Add Parameter",
+        "ADD_PARAMETER": "Parametre Ekle",
         "PARAM_NAME": {
           "PLACEHOLDER": "Parameter name (e.g., order_id)"
         },
@@ -848,7 +848,7 @@
           "PLACEHOLDER": "{'{'}\n  \"order_id\": \"{'{{'} order_id {'}}'}\"\n{'}'}"
         },
         "RESPONSE_TEMPLATE": {
-          "LABEL": "Response Template (Optional)",
+          "LABEL": "Yanıt Şablonu (İsteğe Bağlı)",
           "PLACEHOLDER": "Order {'{{'} order_id {'}}'} status: {'{{'} status {'}}'}"
         },
         "ERRORS": {
@@ -857,9 +857,9 @@
       }
     },
     "RESPONSES": {
-      "HEADER": "FAQs",
+      "HEADER": "SSS",
       "PENDING_FAQS": "Pending FAQs",
-      "ADD_NEW": "Create new FAQ",
+      "ADD_NEW": "Yeni SSS oluştur",
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
       },
@@ -870,15 +870,15 @@
       "BULK_APPROVE_BUTTON": "Approve",
       "BULK_DELETE_BUTTON": "Sil",
       "BULK_APPROVE": {
-        "SUCCESS_MESSAGE": "FAQs approved successfully",
-        "ERROR_MESSAGE": "There was an error approving the FAQs, please try again."
+        "SUCCESS_MESSAGE": "Sıkça sorulan sorular başarıyla onaylandı",
+        "ERROR_MESSAGE": "Sıkça sorulan soruların onaylanmasında bir hata oluştu, lütfen tekrar deneyin."
       },
       "BULK_DELETE": {
-        "TITLE": "Delete FAQs?",
-        "DESCRIPTION": "Are you sure you want to delete the selected FAQs? This action cannot be undone.",
+        "TITLE": "Sıkça Sorulan Soruları Sil?",
+        "DESCRIPTION": "Seçilen SSS'leri silmek istediğinizden emin misiniz? Bu işlem geri alınamaz.",
         "CONFIRM": "Yes, delete all",
-        "SUCCESS_MESSAGE": "FAQs deleted successfully",
-        "ERROR_MESSAGE": "There was an error deleting the FAQs, please try again."
+        "SUCCESS_MESSAGE": "SSS'ler başarıyla silindi",
+        "ERROR_MESSAGE": "Sıkça sorulan soruları silerken bir hata oluştu, lütfen tekrar deneyin."
       },
       "DELETE": {
         "TITLE": "Are you sure to delete the FAQ?",
@@ -932,13 +932,13 @@
         "DELETE_RESPONSE": "Sil"
       },
       "EMPTY_STATE": {
-        "TITLE": "No FAQs Found",
+        "TITLE": "SSS Bulunamadı",
         "NO_PENDING_TITLE": "There are no more pending FAQs to review",
-        "SUBTITLE": "FAQs help your assistant provide quick and accurate answers to questions from your customers. They can be generated automatically from your content or can be added manually.",
+        "SUBTITLE": "SSS, asistanınızın müşterilerinizden gelen sorulara hızlı ve doğru yanıtlar vermesine yardımcı olur. Bunlar içeriğinizden otomatik olarak oluşturulabilir veya manuel olarak eklenebilir.",
         "CLEAR_SEARCH": "Clear active filters",
         "FEATURE_SPOTLIGHT": {
           "TITLE": "Captain FAQ",
-          "NOTE": "Captain FAQs detects common customer questions—whether missing from your knowledge base or frequently asked—and generates relevant FAQs to improve support. You can review each suggestion and decide whether to approve or reject it."
+          "NOTE": "Captain SSS, bilgi tabanınızda eksik olan veya sıkça sorulan yaygın müşteri sorularını tespit eder ve desteği geliştirmek için ilgili SSS'leri oluşturur. Her öneriyi inceleyebilir ve onaylayıp onaylamamaya karar verebilirsiniz."
         }
       }
     },
@@ -970,7 +970,7 @@
       },
       "EMPTY_STATE": {
         "TITLE": "No Connected Inboxes",
-        "SUBTITLE": "Connecting an inbox allows the assistant to handle initial questions from your customers before transferring them to you."
+        "SUBTITLE": "Bir gelen kutusunu bağlamak, asistanın müşterilerinizden gelen ilk soruları size aktarmadan önce ele almasını sağlar."
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/tr/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/tr/labelsMgmt.json
index bb820ebd9..dbe76f8cc 100644
--- a/app/javascript/dashboard/i18n/locale/tr/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/tr/labelsMgmt.json
@@ -3,7 +3,7 @@
     "HEADER": "Etiketler",
     "HEADER_BTN_TXT": "Etiket ekleyin",
     "LOADING": "Etiketler getiriliyor",
-    "DESCRIPTION": "Labels help you categorize and prioritize conversations and leads. You can assign a label to a conversation or contact using the side panel.",
+    "DESCRIPTION": "Etiketler, konuşmaları ve potansiyel müşterileri kategorize etmenize ve önceliklendirmenize yardımcı olur. Yan paneli kullanarak bir konuşmaya veya kişiye etiket atayabilirsiniz.",
     "LEARN_MORE": "Learn more about labels",
     "SEARCH_404": "Bu sorgu ile eşleşen öğe yok",
     "LIST": {
diff --git a/app/javascript/dashboard/i18n/locale/tr/report.json b/app/javascript/dashboard/i18n/locale/tr/report.json
index ae3d54d3f..30a414d98 100644
--- a/app/javascript/dashboard/i18n/locale/tr/report.json
+++ b/app/javascript/dashboard/i18n/locale/tr/report.json
@@ -40,7 +40,7 @@
         "DESC": "( Toplam )"
       },
       "BOT_HANDOFF_COUNT": {
-        "NAME": "Handoff Count",
+        "NAME": "Aktarım Sayısı",
         "DESC": "( Toplam )"
       },
       "REPLY_TIME": {
@@ -128,7 +128,7 @@
   },
   "AGENT_REPORTS": {
     "HEADER": "Temsilci Genel Bakış",
-    "DESCRIPTION": "Easily track agent performance with key metrics such as conversations, response times, resolution times, and resolved cases. Click an agent’s name to learn more.",
+    "DESCRIPTION": "Konuşmalar, yanıt süreleri, çözüm süreleri ve çözülen vakalar gibi temel metriklerle temsilci performansını kolayca takip edin. Daha fazla bilgi için bir temsilcinin adına tıklayın.",
     "LOADING_CHART": "Grafik verileri yükleniyor...",
     "NO_ENOUGH_DATA": "Rapor oluşturmak için yeterli veri yok, Lütfen daha sonra tekrar deneyin.",
     "DOWNLOAD_AGENT_REPORTS": "Etken raporları indir",
@@ -264,12 +264,12 @@
   },
   "INBOX_REPORTS": {
     "HEADER": "Gelen Kutusu Genel Bakış",
-    "DESCRIPTION": "Quickly view your inbox performance with key metrics like conversations, response times, resolution times, and resolved cases—all in one place. Click an inbox name for more details.",
+    "DESCRIPTION": "Konuşmalar, yanıt süreleri, çözüm süreleri ve çözülen vakalar gibi temel metriklerle gelen kutunuzun performansını hızlıca tek bir yerden görüntüleyin. Daha fazla detay için bir gelen kutusunun adına tıklayın.",
     "LOADING_CHART": "Grafik verileri yükleniyor...",
     "NO_ENOUGH_DATA": "Rapor oluşturmak için yeterli veri yok, Lütfen daha sonra tekrar deneyin.",
     "DOWNLOAD_INBOX_REPORTS": "Gelen Kutu Raporlarını İndir",
     "FILTER_DROPDOWN_LABEL": "Gelen kutusu seç",
-    "ALL_INBOXES": "All Inboxes",
+    "ALL_INBOXES": "Tüm Gelen Kutuları",
     "SEARCH_INBOX": "Search Inbox",
     "METRICS": {
       "CONVERSATIONS": {
@@ -334,7 +334,7 @@
   },
   "TEAM_REPORTS": {
     "HEADER": "Ekip Genel Bakışı",
-    "DESCRIPTION": "Get a snapshot of your team’s performance with essential metrics, including conversations, response times, resolution times, and resolved cases. Click a team name for more details.",
+    "DESCRIPTION": "Konuşmalar, yanıt süreleri, çözüm süreleri ve çözülen vakalar gibi temel metriklerle ekibinizin performansına hızlı bir bakış edinin. Daha fazla detay için bir ekibin adına tıklayın.",
     "LOADING_CHART": "Grafik verileri yükleniyor...",
     "NO_ENOUGH_DATA": "Rapor oluşturmak için yeterli veri yok, Lütfen daha sonra tekrar deneyin.",
     "DOWNLOAD_TEAM_REPORTS": "Ekip raporlarını indir",
@@ -434,11 +434,11 @@
     }
   },
   "BOT_REPORTS": {
-    "HEADER": "Bot Reports",
+    "HEADER": "Bot Raporları",
     "METRIC": {
       "TOTAL_CONVERSATIONS": {
         "LABEL": "Konuşma sayısı",
-        "TOOLTIP": "Total number of conversations handled by the bot"
+        "TOOLTIP": "Bot tarafından gerçekleştirilen toplam konuşma sayısı"
       },
       "TOTAL_RESPONSES": {
         "LABEL": "Toplam yanıt",
@@ -446,11 +446,11 @@
       },
       "RESOLUTION_RATE": {
         "LABEL": "Çözüm Oranı",
-        "TOOLTIP": "Total number of conversations resolved by the bot / Total number of conversations handled by the bot * 100"
+        "TOOLTIP": "Bot tarafından çözülen toplam konuşma sayısı / Bot tarafından işlenen toplam konuşma sayısı * 100"
       },
       "HANDOFF_RATE": {
-        "LABEL": "Handoff Rate",
-        "TOOLTIP": "Total number of conversations handed off to agents / Total number of conversations handled by the bot * 100"
+        "LABEL": "Temsilci Devir Oranı",
+        "TOOLTIP": "Temsilcilere devredilen toplam konuşma sayısı / Bot tarafından yönetilen toplam konuşma sayısı * 100"
       }
     }
   },
@@ -473,7 +473,7 @@
       "DOWNLOAD_REPORT": "Download report"
     },
     "RESOLUTION_HEATMAP": {
-      "HEADER": "Resolutions",
+      "HEADER": "Çözümler",
       "NO_CONVERSATIONS": "Hiç konuşma yok",
       "CONVERSATION": "{count} konuşma",
       "CONVERSATIONS": "{count} konuşmalar",
@@ -491,8 +491,8 @@
       }
     },
     "TEAM_CONVERSATIONS": {
-      "ALL_TEAMS": "All Teams",
-      "HEADER": "Conversations by teams",
+      "ALL_TEAMS": "Tüm Ekipler",
+      "HEADER": "Ekipler tarafından yapılan konuşmalar",
       "LOADING_MESSAGE": "Loading team metrics...",
       "NO_TEAMS": "There is no data available",
       "TABLE_HEADER": {
@@ -520,7 +520,7 @@
   },
   "SLA_REPORTS": {
     "HEADER": "SLA Reports",
-    "NO_RECORDS": "SLA applied conversations are not available.",
+    "NO_RECORDS": "SLA uygulanan konuşmalar mevcut değil.",
     "LOADING": "Loading SLA data...",
     "DOWNLOAD_SLA_REPORTS": "Download SLA reports",
     "DOWNLOAD_FAILED": "Failed to download SLA Reports",
@@ -573,9 +573,9 @@
     "AGENT": "Kullanıcı",
     "TEAM": "Ekip",
     "LABEL": "Etiket",
-    "AVG_RESOLUTION_TIME": "Avg. Resolution Time",
-    "AVG_FIRST_RESPONSE_TIME": "Avg. First Response Time",
-    "AVG_REPLY_TIME": "Avg. Customer Waiting Time",
+    "AVG_RESOLUTION_TIME": "Ort. Çözüm Süresi",
+    "AVG_FIRST_RESPONSE_TIME": "Ort. İlk Yanıt Süresi",
+    "AVG_REPLY_TIME": "Ort. Müşteri Bekleme Süresi",
     "RESOLUTION_COUNT": "Çözünürlük Sayısı",
     "CONVERSATIONS": "Konuşmaların sayısı"
   }
diff --git a/app/javascript/dashboard/i18n/locale/tr/search.json b/app/javascript/dashboard/i18n/locale/tr/search.json
index ef7724c88..e0f8722cc 100644
--- a/app/javascript/dashboard/i18n/locale/tr/search.json
+++ b/app/javascript/dashboard/i18n/locale/tr/search.json
@@ -1,17 +1,17 @@
 {
   "SEARCH": {
     "TABS": {
-      "ALL": "Hepsi",
+      "ALL": "Tüm sonuçlar",
       "CONTACTS": "Kişiler",
       "CONVERSATIONS": "Konuşmalar",
       "MESSAGES": "Mesajlar",
-      "ARTICLES": "Articles"
+      "ARTICLES": "Makaleler"
     },
     "SECTION": {
       "CONTACTS": "Kişiler",
       "CONVERSATIONS": "Konuşmalar",
       "MESSAGES": "Mesajlar",
-      "ARTICLES": "Articles"
+      "ARTICLES": "Makaleler"
     },
     "VIEW_MORE": "View more",
     "LOAD_MORE": "Load more",
@@ -19,14 +19,50 @@
     "LOADING_DATA": "Loading",
     "EMPTY_STATE": "{query} sorgusunda hiç bir {item} bulunamadı",
     "EMPTY_STATE_FULL": "{query} sorgusu için hiç bir sonuç bulunamadı",
-    "PLACEHOLDER_KEYBINDING": "odaklanmak için / basın",
+    "PLACEHOLDER_KEYBINDING": "/to focus",
     "INPUT_PLACEHOLDER": "Aramak için 3 veya daha fazla karakter yazın",
+    "RECENT_SEARCHES": "Son aramalar",
+    "CLEAR_ALL": "Clear all",
+    "MOST_RECENT": "En son",
     "EMPTY_STATE_DEFAULT": "Daha iyi arama sonuçları için konuşma id si, e-posta, telefon numarası, mesajlara göre arama yapın. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Daha fazla bilgi edinin",
+    "READ_LESS": "Daha az göster",
     "WROTE": "wrote:",
-    "FROM": "dan",
-    "EMAIL": "e-Posta",
-    "EMAIL_SUBJECT": "konu"
+    "FROM": "Kimden",
+    "EMAIL": "E-Posta",
+    "EMAIL_SUBJECT": "Konu",
+    "PRIVATE": "Özel not",
+    "TRANSCRIPT": "Transkript",
+    "CREATED_AT": "{time} oluşturuldu",
+    "UPDATED_AT": "{time} güncellendi",
+    "SORT_BY": {
+      "RELEVANCE": "Alaka düzeyi"
+    },
+    "DATE_RANGE": {
+      "LAST_7_DAYS": "Son 7 gün",
+      "LAST_30_DAYS": "Son 30 gün",
+      "LAST_60_DAYS": "Son 60 gün",
+      "LAST_90_DAYS": "Son 90 gün",
+      "CUSTOM_RANGE": "Özel aralık:",
+      "CREATED_BETWEEN": "Oluşturulma aralığı",
+      "AND": "ve",
+      "APPLY": "Uygula",
+      "BEFORE_DATE": "{date} tarihinden önce",
+      "AFTER_DATE": "{date} tarihinden sonra",
+      "TIME_RANGE": "Zamana göre filtrele",
+      "CLEAR_FILTER": "Filtreyi temizle"
+    },
+    "FILTERS": {
+      "FILTER_MESSAGE": "Mesajları şuna göre filtrele:",
+      "FROM": "Gönderen",
+      "IN": "Gelen Kutusu",
+      "AGENTS": "Kullanıcılar",
+      "CONTACTS": "Kişiler",
+      "INBOXES": "Gelen kutuları",
+      "NO_AGENTS": "Kullanıcı bulunamadı",
+      "NO_CONTACTS": "Sonuçları görmek için aramaya başlayın",
+      "NO_INBOXES": "Gelen kutusu bulunamadı"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/tr/settings.json b/app/javascript/dashboard/i18n/locale/tr/settings.json
index 9f64262b0..ee47d2026 100644
--- a/app/javascript/dashboard/i18n/locale/tr/settings.json
+++ b/app/javascript/dashboard/i18n/locale/tr/settings.json
@@ -298,7 +298,7 @@
     "SWITCH": "Değiştir",
     "INBOX_VIEW": "Inbox View",
     "CONVERSATIONS": "Konuşmalar",
-    "INBOX": "My Inbox",
+    "INBOX": "Gelen Kutusu",
     "ALL_CONVERSATIONS": "Tüm Görüşmeler",
     "MENTIONED_CONVERSATIONS": "Bahsedilmeler",
     "PARTICIPATING_CONVERSATIONS": "Katılımcılar",
@@ -307,12 +307,12 @@
     "SETTINGS": "Ayarlar",
     "CONTACTS": "Kişiler",
     "ACTIVE": "Aktif",
-    "COMPANIES": "Companies",
-    "ALL_COMPANIES": "All Companies",
+    "COMPANIES": "Şirketler",
+    "ALL_COMPANIES": "Tüm Şirketler",
     "CAPTAIN": "Captain",
     "CAPTAIN_ASSISTANTS": "Assistants",
-    "CAPTAIN_DOCUMENTS": "Documents",
-    "CAPTAIN_RESPONSES": "FAQs",
+    "CAPTAIN_DOCUMENTS": "Belgeler",
+    "CAPTAIN_RESPONSES": "SSS",
     "CAPTAIN_TOOLS": "Araçlar",
     "CAPTAIN_SCENARIOS": "Scenarios",
     "CAPTAIN_PLAYGROUND": "Oyun Alanı",
@@ -360,15 +360,15 @@
     "SET_AVAILABILITY_TITLE": "Kendini şu şekilde ayarla",
     "SET_YOUR_AVAILABILITY": "Uygunluk Durumunuzu Ayarlayın",
     "SLA": "SLA",
-    "CUSTOM_ROLES": "Custom Roles",
+    "CUSTOM_ROLES": "Özel Roller",
     "BETA": "Beta",
     "REPORTS_OVERVIEW": "Önizleme",
-    "REAUTHORIZE": "Your inbox connection has expired, please reconnect\n to continue receiving and sending messages",
+    "REAUTHORIZE": "Gelen kutusu bağlantınızın süresi doldu, lütfen yeniden bağlanarak\n mesaj almaya ve göndermeye devam edin",
     "HELP_CENTER": {
       "TITLE": "Yardım Merkezi",
-      "ARTICLES": "Articles",
+      "ARTICLES": "Makaleler",
       "CATEGORIES": "Kategoriler",
-      "LOCALES": "Yereller",
+      "LOCALES": "Diller",
       "SETTINGS": "Ayarlar"
     },
     "CHANNELS": "Kanallar",
@@ -399,7 +399,7 @@
       "TITLE": "Captain",
       "DESCRIPTION": "Manage usage and credits for Captain AI.",
       "BUTTON_TXT": "Buy more credits",
-      "DOCUMENTS": "Documents",
+      "DOCUMENTS": "Belgeler",
       "RESPONSES": "Responses",
       "UPGRADE": "Captain is not available on the free plan, upgrade now to get access to assistants, copilot and more.",
       "REFRESH_CREDITS": "Yenile"
@@ -428,7 +428,7 @@
       "CONFIRM": {
         "TITLE": "Confirm Purchase",
         "DESCRIPTION": "You are about to purchase {credits} credits for {amount}.",
-        "INSTANT_DEDUCTION_NOTE": "Your saved card will be charged immediately upon confirmation.",
+        "INSTANT_DEDUCTION_NOTE": "Kaydettiğiniz kart, onaylandıktan hemen sonra ücretlendirilecektir.",
         "GO_BACK": "Geri Git",
         "CONFIRM_PURCHASE": "Confirm Purchase"
       }
@@ -627,7 +627,7 @@
         },
         "DESCRIPTION": {
           "LABEL": "Açıklama:",
-          "PLACEHOLDER": "Enter description"
+          "PLACEHOLDER": "Açıklama girin"
         },
         "STATUS": {
           "LABEL": "Durum:",
@@ -642,7 +642,7 @@
             "DESCRIPTION": "Assign conversations evenly among agents."
           },
           "BALANCED": {
-            "LABEL": "Balanced",
+            "LABEL": "Dengeli",
             "DESCRIPTION": "Assign conversations based on available capacity."
           }
         },
@@ -711,7 +711,7 @@
         },
         "EDIT_BUTTON": "Update policy",
         "CONFIRM_ADD_AGENT_DIALOG": {
-          "TITLE": "Add agent",
+          "TITLE": "Temsilci ekle",
           "DESCRIPTION": "{agentName} is already linked to another policy. Are you sure you want to link it to this policy? It will be unlinked from the other policy.",
           "CONFIRM_BUTTON_LABEL": "Devam et",
           "CANCEL_BUTTON_LABEL": "İptal Et"
@@ -738,13 +738,13 @@
         },
         "DESCRIPTION": {
           "LABEL": "Açıklama:",
-          "PLACEHOLDER": "Enter description"
+          "PLACEHOLDER": "Açıklama girin"
         },
         "INBOX_CAPACITY_LIMIT": {
-          "LABEL": "Inbox capacity limits",
-          "ADD_BUTTON": "Add inbox",
+          "LABEL": "Gelen Kutusu kapasite limiti",
+          "ADD_BUTTON": "Gelen Kutusu ekle",
           "FIELD": {
-            "SELECT_INBOX": "Select inbox",
+            "SELECT_INBOX": "Gelen Kutusu seç",
             "MAX_CONVERSATIONS": "Maksimum Konuşma",
             "SET_LIMIT": "Sınır belirle"
           },
@@ -787,8 +787,8 @@
       }
     },
     "DELETE_POLICY": {
-      "TITLE": "Delete policy",
-      "DESCRIPTION": "Are you sure you want to delete this policy? This action cannot be undone.",
+      "TITLE": "Politikayı sil",
+      "DESCRIPTION": "Bu politikayı silmek istediğinizden emin misiniz? Bu işlem geri alınamaz.",
       "CONFIRM_BUTTON_LABEL": "Sil",
       "CANCEL_BUTTON_LABEL": "İptal Et"
     }
diff --git a/app/javascript/dashboard/i18n/locale/tr/sla.json b/app/javascript/dashboard/i18n/locale/tr/sla.json
index bb8d8973d..fbcf0b143 100644
--- a/app/javascript/dashboard/i18n/locale/tr/sla.json
+++ b/app/javascript/dashboard/i18n/locale/tr/sla.json
@@ -1,21 +1,21 @@
 {
   "SLA": {
-    "HEADER": "Service Level Agreements",
+    "HEADER": "Hizmet Seviyesi Anlaşmaları (SLA)",
     "ADD_ACTION": "Add SLA",
     "ADD_ACTION_LONG": "Create a new SLA Policy",
-    "DESCRIPTION": "Service Level Agreements (SLAs) are contracts that define clear expectations between your team and customers. They establish standards for response and resolution times, creating a framework for accountability and ensures a consistent, high-quality experience.",
-    "LEARN_MORE": "Learn more about SLA",
+    "DESCRIPTION": "Hizmet Seviyesi Anlaşmaları (SLA’lar), ekibiniz ile müşterileriniz arasındaki beklentileri net bir şekilde tanımlayan sözleşmelerdir. Yanıt ve çözüm süreleri için standartlar belirleyerek sorumluluk çerçevesi oluşturur ve tutarlı, yüksek kaliteli bir deneyim sağlar.",
+    "LEARN_MORE": "SLA hakkında daha fazla bilgi edinin",
     "LOADING": "Fetching SLAs",
     "PAYWALL": {
-      "TITLE": "Upgrade to create SLAs",
+      "TITLE": "SLA oluşturmak için yükseltin",
       "AVAILABLE_ON": "The SLA feature is only available in the Business and Enterprise plans.",
       "UPGRADE_PROMPT": "Upgrade your plan to get access to advanced features like team management, automations, custom attributes, and more.",
-      "UPGRADE_NOW": "Upgrade now",
+      "UPGRADE_NOW": "Şimdi yükselt",
       "CANCEL_ANYTIME": "You can change or cancel your plan anytime"
     },
     "ENTERPRISE_PAYWALL": {
-      "AVAILABLE_ON": "The SLA feature is only available in the paid plans.",
-      "UPGRADE_PROMPT": "Upgrade to a paid plan to access advanced features like audit logs, agent capacity, and more.",
+      "AVAILABLE_ON": "SLA özelliği yalnızca ücretli planlarda mevcuttur.",
+      "UPGRADE_PROMPT": "Denetim kayıtları, temsilci kapasitesi ve daha fazlası gibi gelişmiş özelliklere erişmek için ücretli plana geçin.",
       "ASK_ADMIN": "Please reach out to your administrator for the upgrade."
     },
     "LIST": {
diff --git a/app/javascript/dashboard/i18n/locale/tr/teamsSettings.json b/app/javascript/dashboard/i18n/locale/tr/teamsSettings.json
index 761c77982..53cfab154 100644
--- a/app/javascript/dashboard/i18n/locale/tr/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/tr/teamsSettings.json
@@ -3,8 +3,8 @@
     "NEW_TEAM": "Yeni ekip oluştur",
     "HEADER": "Ekipler",
     "LOADING": "Fetching teams",
-    "DESCRIPTION": "Teams allow you to organize agents into groups based on their responsibilities. An agent can belong to multiple teams. When working collaboratively, you can assign conversations to specific teams.",
-    "LEARN_MORE": "Learn more about teams",
+    "DESCRIPTION": "Ekipler, temsilcileri sorumluluklarına göre gruplar halinde organize etmenizi sağlar. Bir temsilci birden fazla ekibe ait olabilir. Ortak çalışırken, konuşmaları belirli ekiplere atayabilirsiniz.",
+    "LEARN_MORE": "Ekipler hakkında daha fazla bilgi edinin",
     "LIST": {
       "404": "Bu hesap üzerine oluşturulmuş ekip bulunmamaktadır.",
       "EDIT_TEAM": "Ekibi düzenle",
diff --git a/app/javascript/dashboard/i18n/locale/uk/companies.json b/app/javascript/dashboard/i18n/locale/uk/companies.json
index c06fb11c0..a1b662235 100644
--- a/app/javascript/dashboard/i18n/locale/uk/companies.json
+++ b/app/javascript/dashboard/i18n/locale/uk/companies.json
@@ -6,7 +6,8 @@
       "OPTIONS": {
         "NAME": "Ім'я",
         "DOMAIN": "Домен",
-        "CREATED_AT": "Створений в"
+        "CREATED_AT": "Створений в",
+        "CONTACTS_COUNT": "Contacts count"
       }
     },
     "ORDER": {
diff --git a/app/javascript/dashboard/i18n/locale/uk/contentTemplates.json b/app/javascript/dashboard/i18n/locale/uk/contentTemplates.json
index 24b6195af..fcf733290 100644
--- a/app/javascript/dashboard/i18n/locale/uk/contentTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/uk/contentTemplates.json
@@ -28,6 +28,7 @@
       "TYPES": {
         "MEDIA": "Media",
         "QUICK_REPLY": "Quick Reply",
+        "CALL_TO_ACTION": "Call to Action",
         "TEXT": "Текст"
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/uk/conversation.json b/app/javascript/dashboard/i18n/locale/uk/conversation.json
index 02c04d729..5eed7bb56 100644
--- a/app/javascript/dashboard/i18n/locale/uk/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/uk/conversation.json
@@ -275,6 +275,16 @@
     "SIDEBAR": {
       "CONTACT": "Контакт",
       "COPILOT": "Copilot"
+    },
+    "VOICE_WIDGET": {
+      "INCOMING_CALL": "Incoming call",
+      "OUTGOING_CALL": "Outgoing call",
+      "CALL_IN_PROGRESS": "Call in progress",
+      "NOT_ANSWERED_YET": "Not answered yet",
+      "HANDLED_IN_ANOTHER_TAB": "Being handled in another tab",
+      "REJECT_CALL": "Reject",
+      "JOIN_CALL": "Join call",
+      "END_CALL": "End call"
     }
   },
   "EMAIL_TRANSCRIPT": {
diff --git a/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json
index 6d8e81f0d..1b1e32968 100644
--- a/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json
@@ -808,6 +808,35 @@
         "LABEL": "Текст повідомлення",
         "PLACEHOLDER": "Please enter a message to show users with the form"
       },
+      "BUTTON_TEXT": {
+        "LABEL": "Button text",
+        "PLACEHOLDER": "Please rate us"
+      },
+      "LANGUAGE": {
+        "LABEL": "Мова",
+        "PLACEHOLDER": "Select template language"
+      },
+      "MESSAGE_PREVIEW": {
+        "LABEL": "Message preview",
+        "TOOLTIP": "This may vary slightly when rendered on WhatsApp's platform."
+      },
+      "TEMPLATE_STATUS": {
+        "APPROVED": "Approved by WhatsApp",
+        "PENDING": "Pending WhatsApp approval",
+        "REJECTED": "Meta rejected the template",
+        "DEFAULT": "Needs WhatsApp approval",
+        "NOT_FOUND": "The template does not exist in the Meta platform."
+      },
+      "TEMPLATE_CREATION": {
+        "SUCCESS_MESSAGE": "WhatsApp template created successfully and sent for approval",
+        "ERROR_MESSAGE": "Failed to create WhatsApp template"
+      },
+      "TEMPLATE_UPDATE_DIALOG": {
+        "TITLE": "Edit survey details",
+        "DESCRIPTION": "We will delete the previous template and make a new one which will be sent again for WhatsApp approval",
+        "CONFIRM": "Create new template",
+        "CANCEL": "Повернутися назад"
+      },
       "SURVEY_RULE": {
         "LABEL": "Survey rule",
         "DESCRIPTION_PREFIX": "Send the survey if the conversation",
@@ -819,6 +848,7 @@
         "SELECT_PLACEHOLDER": "select labels"
       },
       "NOTE": "Note: CSAT surveys are sent only once per conversation",
+      "WHATSAPP_NOTE": "Note: We will create a template and send it for WhatsApp approval. After being approved, surveys will be sent only once per conversation as per the survey rule.",
       "API": {
         "SUCCESS_MESSAGE": "CSAT settings updated successfully",
         "ERROR_MESSAGE": "We couldn't update CSAT settings. Please try again later."
diff --git a/app/javascript/dashboard/i18n/locale/uk/search.json b/app/javascript/dashboard/i18n/locale/uk/search.json
index 86c6ae9c1..b55576b6a 100644
--- a/app/javascript/dashboard/i18n/locale/uk/search.json
+++ b/app/javascript/dashboard/i18n/locale/uk/search.json
@@ -1,7 +1,7 @@
 {
   "SEARCH": {
     "TABS": {
-      "ALL": "Всі",
+      "ALL": "All results",
       "CONTACTS": "Контакти",
       "CONVERSATIONS": "Бесіди",
       "MESSAGES": "Текст повідомлень",
@@ -19,14 +19,50 @@
     "LOADING_DATA": "Loading",
     "EMPTY_STATE": "На запит '{query} не знайдено {item}",
     "EMPTY_STATE_FULL": "Немає результатів за запитом '{query}",
-    "PLACEHOLDER_KEYBINDING": "/ фокус",
+    "PLACEHOLDER_KEYBINDING": "/фокус",
     "INPUT_PLACEHOLDER": "Введіть 3 або більше символів для пошуку",
+    "RECENT_SEARCHES": "Recent searches",
+    "CLEAR_ALL": "Очистити все",
+    "MOST_RECENT": "Most recent",
     "EMPTY_STATE_DEFAULT": "Пошук бесід по id, email, тел. номеру, повідомлень для кращого пошуку результатів. ",
     "BOT_LABEL": "Бот",
     "READ_MORE": "Детальніше",
+    "READ_LESS": "Read less",
     "WROTE": "написав(ла):",
-    "FROM": "від",
-    "EMAIL": "email",
-    "EMAIL_SUBJECT": "тема"
+    "FROM": "Від",
+    "EMAIL": "Email",
+    "EMAIL_SUBJECT": "Тема",
+    "PRIVATE": "Private note",
+    "TRANSCRIPT": "Transcript",
+    "CREATED_AT": "created {time}",
+    "UPDATED_AT": "updated {time}",
+    "SORT_BY": {
+      "RELEVANCE": "Relevance"
+    },
+    "DATE_RANGE": {
+      "LAST_7_DAYS": "Останні 7 днів",
+      "LAST_30_DAYS": "Останні 30 днів",
+      "LAST_60_DAYS": "Останні 60 днів",
+      "LAST_90_DAYS": "Останні 90 днів",
+      "CUSTOM_RANGE": "Custom range:",
+      "CREATED_BETWEEN": "Created between",
+      "AND": "and",
+      "APPLY": "Підтвердити",
+      "BEFORE_DATE": "Before {date}",
+      "AFTER_DATE": "After {date}",
+      "TIME_RANGE": "Filter by time",
+      "CLEAR_FILTER": "Очистити фільтр"
+    },
+    "FILTERS": {
+      "FILTER_MESSAGE": "Filter messages by:",
+      "FROM": "Відправник",
+      "IN": "Вхідні",
+      "AGENTS": "Агенти",
+      "CONTACTS": "Контакти",
+      "INBOXES": "Вхідні",
+      "NO_AGENTS": "Агентів не знайдено",
+      "NO_CONTACTS": "Start by searching to see results",
+      "NO_INBOXES": "No inboxes found"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ur/companies.json b/app/javascript/dashboard/i18n/locale/ur/companies.json
index 2d8280e58..b8255a4a2 100644
--- a/app/javascript/dashboard/i18n/locale/ur/companies.json
+++ b/app/javascript/dashboard/i18n/locale/ur/companies.json
@@ -6,7 +6,8 @@
       "OPTIONS": {
         "NAME": "نام",
         "DOMAIN": "Domain",
-        "CREATED_AT": "Created at"
+        "CREATED_AT": "Created at",
+        "CONTACTS_COUNT": "Contacts count"
       }
     },
     "ORDER": {
diff --git a/app/javascript/dashboard/i18n/locale/ur/contentTemplates.json b/app/javascript/dashboard/i18n/locale/ur/contentTemplates.json
index a9b1d54c4..79c2c8c64 100644
--- a/app/javascript/dashboard/i18n/locale/ur/contentTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/ur/contentTemplates.json
@@ -28,6 +28,7 @@
       "TYPES": {
         "MEDIA": "Media",
         "QUICK_REPLY": "Quick Reply",
+        "CALL_TO_ACTION": "Call to Action",
         "TEXT": "Text"
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/ur/conversation.json b/app/javascript/dashboard/i18n/locale/ur/conversation.json
index 7cf3e6100..b41b1d4b4 100644
--- a/app/javascript/dashboard/i18n/locale/ur/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ur/conversation.json
@@ -275,6 +275,16 @@
     "SIDEBAR": {
       "CONTACT": "Contact",
       "COPILOT": "Copilot"
+    },
+    "VOICE_WIDGET": {
+      "INCOMING_CALL": "Incoming call",
+      "OUTGOING_CALL": "Outgoing call",
+      "CALL_IN_PROGRESS": "Call in progress",
+      "NOT_ANSWERED_YET": "Not answered yet",
+      "HANDLED_IN_ANOTHER_TAB": "Being handled in another tab",
+      "REJECT_CALL": "Reject",
+      "JOIN_CALL": "Join call",
+      "END_CALL": "End call"
     }
   },
   "EMAIL_TRANSCRIPT": {
diff --git a/app/javascript/dashboard/i18n/locale/ur/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ur/inboxMgmt.json
index cafbf4550..a74d2cefb 100644
--- a/app/javascript/dashboard/i18n/locale/ur/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ur/inboxMgmt.json
@@ -808,6 +808,35 @@
         "LABEL": "Message",
         "PLACEHOLDER": "Please enter a message to show users with the form"
       },
+      "BUTTON_TEXT": {
+        "LABEL": "Button text",
+        "PLACEHOLDER": "Please rate us"
+      },
+      "LANGUAGE": {
+        "LABEL": "Language",
+        "PLACEHOLDER": "Select template language"
+      },
+      "MESSAGE_PREVIEW": {
+        "LABEL": "Message preview",
+        "TOOLTIP": "This may vary slightly when rendered on WhatsApp's platform."
+      },
+      "TEMPLATE_STATUS": {
+        "APPROVED": "Approved by WhatsApp",
+        "PENDING": "Pending WhatsApp approval",
+        "REJECTED": "Meta rejected the template",
+        "DEFAULT": "Needs WhatsApp approval",
+        "NOT_FOUND": "The template does not exist in the Meta platform."
+      },
+      "TEMPLATE_CREATION": {
+        "SUCCESS_MESSAGE": "WhatsApp template created successfully and sent for approval",
+        "ERROR_MESSAGE": "Failed to create WhatsApp template"
+      },
+      "TEMPLATE_UPDATE_DIALOG": {
+        "TITLE": "Edit survey details",
+        "DESCRIPTION": "We will delete the previous template and make a new one which will be sent again for WhatsApp approval",
+        "CONFIRM": "Create new template",
+        "CANCEL": "Go back"
+      },
       "SURVEY_RULE": {
         "LABEL": "Survey rule",
         "DESCRIPTION_PREFIX": "Send the survey if the conversation",
@@ -819,6 +848,7 @@
         "SELECT_PLACEHOLDER": "select labels"
       },
       "NOTE": "Note: CSAT surveys are sent only once per conversation",
+      "WHATSAPP_NOTE": "Note: We will create a template and send it for WhatsApp approval. After being approved, surveys will be sent only once per conversation as per the survey rule.",
       "API": {
         "SUCCESS_MESSAGE": "CSAT settings updated successfully",
         "ERROR_MESSAGE": "We couldn't update CSAT settings. Please try again later."
diff --git a/app/javascript/dashboard/i18n/locale/ur/search.json b/app/javascript/dashboard/i18n/locale/ur/search.json
index bf0da44ef..4986af2d3 100644
--- a/app/javascript/dashboard/i18n/locale/ur/search.json
+++ b/app/javascript/dashboard/i18n/locale/ur/search.json
@@ -1,7 +1,7 @@
 {
   "SEARCH": {
     "TABS": {
-      "ALL": "تمام",
+      "ALL": "All results",
       "CONTACTS": "کانٹیکٹس",
       "CONVERSATIONS": "مکالمات",
       "MESSAGES": "Messages",
@@ -19,14 +19,50 @@
     "LOADING_DATA": "Loading",
     "EMPTY_STATE": "No {item} found for query '{query}'",
     "EMPTY_STATE_FULL": "No results found for query '{query}'",
-    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "PLACEHOLDER_KEYBINDING": "/to focus",
     "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "RECENT_SEARCHES": "Recent searches",
+    "CLEAR_ALL": "Clear all",
+    "MOST_RECENT": "Most recent",
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
+    "READ_LESS": "Read less",
     "WROTE": "wrote:",
-    "FROM": "from",
-    "EMAIL": "email",
-    "EMAIL_SUBJECT": "مضمون"
+    "FROM": "From",
+    "EMAIL": "Email",
+    "EMAIL_SUBJECT": "Subject",
+    "PRIVATE": "Private note",
+    "TRANSCRIPT": "Transcript",
+    "CREATED_AT": "created {time}",
+    "UPDATED_AT": "updated {time}",
+    "SORT_BY": {
+      "RELEVANCE": "Relevance"
+    },
+    "DATE_RANGE": {
+      "LAST_7_DAYS": "Last 7 days",
+      "LAST_30_DAYS": "Last 30 days",
+      "LAST_60_DAYS": "Last 60 days",
+      "LAST_90_DAYS": "Last 90 days",
+      "CUSTOM_RANGE": "Custom range:",
+      "CREATED_BETWEEN": "Created between",
+      "AND": "and",
+      "APPLY": "Apply",
+      "BEFORE_DATE": "Before {date}",
+      "AFTER_DATE": "After {date}",
+      "TIME_RANGE": "Filter by time",
+      "CLEAR_FILTER": "Clear filter"
+    },
+    "FILTERS": {
+      "FILTER_MESSAGE": "Filter messages by:",
+      "FROM": "Sender",
+      "IN": "ان باکس",
+      "AGENTS": "ایجنٹ",
+      "CONTACTS": "کانٹیکٹس",
+      "INBOXES": "Inboxes",
+      "NO_AGENTS": "کوئی ایجنٹ نہیں ملا",
+      "NO_CONTACTS": "Start by searching to see results",
+      "NO_INBOXES": "No inboxes found"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/companies.json b/app/javascript/dashboard/i18n/locale/ur_IN/companies.json
index 86190831b..0d64a4abd 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/companies.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/companies.json
@@ -6,7 +6,8 @@
       "OPTIONS": {
         "NAME": "Name",
         "DOMAIN": "Domain",
-        "CREATED_AT": "Created at"
+        "CREATED_AT": "Created at",
+        "CONTACTS_COUNT": "Contacts count"
       }
     },
     "ORDER": {
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/contentTemplates.json b/app/javascript/dashboard/i18n/locale/ur_IN/contentTemplates.json
index a9b1d54c4..79c2c8c64 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/contentTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/contentTemplates.json
@@ -28,6 +28,7 @@
       "TYPES": {
         "MEDIA": "Media",
         "QUICK_REPLY": "Quick Reply",
+        "CALL_TO_ACTION": "Call to Action",
         "TEXT": "Text"
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/conversation.json b/app/javascript/dashboard/i18n/locale/ur_IN/conversation.json
index 49a228610..59ad61c1d 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/conversation.json
@@ -275,6 +275,16 @@
     "SIDEBAR": {
       "CONTACT": "Contact",
       "COPILOT": "Copilot"
+    },
+    "VOICE_WIDGET": {
+      "INCOMING_CALL": "Incoming call",
+      "OUTGOING_CALL": "Outgoing call",
+      "CALL_IN_PROGRESS": "Call in progress",
+      "NOT_ANSWERED_YET": "Not answered yet",
+      "HANDLED_IN_ANOTHER_TAB": "Being handled in another tab",
+      "REJECT_CALL": "Reject",
+      "JOIN_CALL": "Join call",
+      "END_CALL": "End call"
     }
   },
   "EMAIL_TRANSCRIPT": {
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ur_IN/inboxMgmt.json
index 25698d533..0eee718fe 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/inboxMgmt.json
@@ -808,6 +808,35 @@
         "LABEL": "Message",
         "PLACEHOLDER": "Please enter a message to show users with the form"
       },
+      "BUTTON_TEXT": {
+        "LABEL": "Button text",
+        "PLACEHOLDER": "Please rate us"
+      },
+      "LANGUAGE": {
+        "LABEL": "Language",
+        "PLACEHOLDER": "Select template language"
+      },
+      "MESSAGE_PREVIEW": {
+        "LABEL": "Message preview",
+        "TOOLTIP": "This may vary slightly when rendered on WhatsApp's platform."
+      },
+      "TEMPLATE_STATUS": {
+        "APPROVED": "Approved by WhatsApp",
+        "PENDING": "Pending WhatsApp approval",
+        "REJECTED": "Meta rejected the template",
+        "DEFAULT": "Needs WhatsApp approval",
+        "NOT_FOUND": "The template does not exist in the Meta platform."
+      },
+      "TEMPLATE_CREATION": {
+        "SUCCESS_MESSAGE": "WhatsApp template created successfully and sent for approval",
+        "ERROR_MESSAGE": "Failed to create WhatsApp template"
+      },
+      "TEMPLATE_UPDATE_DIALOG": {
+        "TITLE": "Edit survey details",
+        "DESCRIPTION": "We will delete the previous template and make a new one which will be sent again for WhatsApp approval",
+        "CONFIRM": "Create new template",
+        "CANCEL": "Go back"
+      },
       "SURVEY_RULE": {
         "LABEL": "Survey rule",
         "DESCRIPTION_PREFIX": "Send the survey if the conversation",
@@ -819,6 +848,7 @@
         "SELECT_PLACEHOLDER": "select labels"
       },
       "NOTE": "Note: CSAT surveys are sent only once per conversation",
+      "WHATSAPP_NOTE": "Note: We will create a template and send it for WhatsApp approval. After being approved, surveys will be sent only once per conversation as per the survey rule.",
       "API": {
         "SUCCESS_MESSAGE": "CSAT settings updated successfully",
         "ERROR_MESSAGE": "We couldn't update CSAT settings. Please try again later."
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/search.json b/app/javascript/dashboard/i18n/locale/ur_IN/search.json
index e8510ab97..2fc8e7998 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/search.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/search.json
@@ -1,7 +1,7 @@
 {
   "SEARCH": {
     "TABS": {
-      "ALL": "All",
+      "ALL": "All results",
       "CONTACTS": "Contacts",
       "CONVERSATIONS": "Conversations",
       "MESSAGES": "Messages",
@@ -19,14 +19,50 @@
     "LOADING_DATA": "Loading",
     "EMPTY_STATE": "No {item} found for query '{query}'",
     "EMPTY_STATE_FULL": "No results found for query '{query}'",
-    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "PLACEHOLDER_KEYBINDING": "/to focus",
     "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "RECENT_SEARCHES": "Recent searches",
+    "CLEAR_ALL": "Clear all",
+    "MOST_RECENT": "Most recent",
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
+    "READ_LESS": "Read less",
     "WROTE": "wrote:",
-    "FROM": "from",
-    "EMAIL": "email",
-    "EMAIL_SUBJECT": "subject"
+    "FROM": "From",
+    "EMAIL": "Email",
+    "EMAIL_SUBJECT": "Subject",
+    "PRIVATE": "Private note",
+    "TRANSCRIPT": "Transcript",
+    "CREATED_AT": "created {time}",
+    "UPDATED_AT": "updated {time}",
+    "SORT_BY": {
+      "RELEVANCE": "Relevance"
+    },
+    "DATE_RANGE": {
+      "LAST_7_DAYS": "Last 7 days",
+      "LAST_30_DAYS": "Last 30 days",
+      "LAST_60_DAYS": "Last 60 days",
+      "LAST_90_DAYS": "Last 90 days",
+      "CUSTOM_RANGE": "Custom range:",
+      "CREATED_BETWEEN": "Created between",
+      "AND": "and",
+      "APPLY": "Apply",
+      "BEFORE_DATE": "Before {date}",
+      "AFTER_DATE": "After {date}",
+      "TIME_RANGE": "Filter by time",
+      "CLEAR_FILTER": "Clear filter"
+    },
+    "FILTERS": {
+      "FILTER_MESSAGE": "Filter messages by:",
+      "FROM": "Sender",
+      "IN": "Inbox",
+      "AGENTS": "Agents",
+      "CONTACTS": "Contacts",
+      "INBOXES": "Inboxes",
+      "NO_AGENTS": "No agents found",
+      "NO_CONTACTS": "Start by searching to see results",
+      "NO_INBOXES": "No inboxes found"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/vi/companies.json b/app/javascript/dashboard/i18n/locale/vi/companies.json
index 43a2d7567..d7f1fc288 100644
--- a/app/javascript/dashboard/i18n/locale/vi/companies.json
+++ b/app/javascript/dashboard/i18n/locale/vi/companies.json
@@ -6,7 +6,8 @@
       "OPTIONS": {
         "NAME": "Tên",
         "DOMAIN": "Miền",
-        "CREATED_AT": "Tạo vào lúc"
+        "CREATED_AT": "Tạo vào lúc",
+        "CONTACTS_COUNT": "Contacts count"
       }
     },
     "ORDER": {
diff --git a/app/javascript/dashboard/i18n/locale/vi/contentTemplates.json b/app/javascript/dashboard/i18n/locale/vi/contentTemplates.json
index b15490394..5b316fb99 100644
--- a/app/javascript/dashboard/i18n/locale/vi/contentTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/vi/contentTemplates.json
@@ -28,6 +28,7 @@
       "TYPES": {
         "MEDIA": "Media",
         "QUICK_REPLY": "Quick Reply",
+        "CALL_TO_ACTION": "Call to Action",
         "TEXT": "Văn bản"
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/vi/conversation.json b/app/javascript/dashboard/i18n/locale/vi/conversation.json
index 4647b90ac..c28dba1e9 100644
--- a/app/javascript/dashboard/i18n/locale/vi/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/vi/conversation.json
@@ -275,6 +275,16 @@
     "SIDEBAR": {
       "CONTACT": "Liên hệ",
       "COPILOT": "Copilot"
+    },
+    "VOICE_WIDGET": {
+      "INCOMING_CALL": "Incoming call",
+      "OUTGOING_CALL": "Outgoing call",
+      "CALL_IN_PROGRESS": "Call in progress",
+      "NOT_ANSWERED_YET": "Not answered yet",
+      "HANDLED_IN_ANOTHER_TAB": "Being handled in another tab",
+      "REJECT_CALL": "Reject",
+      "JOIN_CALL": "Join call",
+      "END_CALL": "End call"
     }
   },
   "EMAIL_TRANSCRIPT": {
diff --git a/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json
index 6f9187a4e..e6c00a4ed 100644
--- a/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json
@@ -808,6 +808,35 @@
         "LABEL": "Tin nhắn",
         "PLACEHOLDER": "Please enter a message to show users with the form"
       },
+      "BUTTON_TEXT": {
+        "LABEL": "Button text",
+        "PLACEHOLDER": "Please rate us"
+      },
+      "LANGUAGE": {
+        "LABEL": "Ngôn ngữ",
+        "PLACEHOLDER": "Select template language"
+      },
+      "MESSAGE_PREVIEW": {
+        "LABEL": "Message preview",
+        "TOOLTIP": "This may vary slightly when rendered on WhatsApp's platform."
+      },
+      "TEMPLATE_STATUS": {
+        "APPROVED": "Approved by WhatsApp",
+        "PENDING": "Pending WhatsApp approval",
+        "REJECTED": "Meta rejected the template",
+        "DEFAULT": "Needs WhatsApp approval",
+        "NOT_FOUND": "The template does not exist in the Meta platform."
+      },
+      "TEMPLATE_CREATION": {
+        "SUCCESS_MESSAGE": "WhatsApp template created successfully and sent for approval",
+        "ERROR_MESSAGE": "Failed to create WhatsApp template"
+      },
+      "TEMPLATE_UPDATE_DIALOG": {
+        "TITLE": "Edit survey details",
+        "DESCRIPTION": "We will delete the previous template and make a new one which will be sent again for WhatsApp approval",
+        "CONFIRM": "Create new template",
+        "CANCEL": "Trở về"
+      },
       "SURVEY_RULE": {
         "LABEL": "Survey rule",
         "DESCRIPTION_PREFIX": "Send the survey if the conversation",
@@ -819,6 +848,7 @@
         "SELECT_PLACEHOLDER": "select labels"
       },
       "NOTE": "Note: CSAT surveys are sent only once per conversation",
+      "WHATSAPP_NOTE": "Note: We will create a template and send it for WhatsApp approval. After being approved, surveys will be sent only once per conversation as per the survey rule.",
       "API": {
         "SUCCESS_MESSAGE": "CSAT settings updated successfully",
         "ERROR_MESSAGE": "We couldn't update CSAT settings. Please try again later."
diff --git a/app/javascript/dashboard/i18n/locale/vi/search.json b/app/javascript/dashboard/i18n/locale/vi/search.json
index c9155c953..7e0029d6e 100644
--- a/app/javascript/dashboard/i18n/locale/vi/search.json
+++ b/app/javascript/dashboard/i18n/locale/vi/search.json
@@ -1,7 +1,7 @@
 {
   "SEARCH": {
     "TABS": {
-      "ALL": "Tất cả",
+      "ALL": "All results",
       "CONTACTS": "Danh bạ",
       "CONVERSATIONS": "Các cuộc hội thoại",
       "MESSAGES": "Tin nhắn",
@@ -19,14 +19,50 @@
     "LOADING_DATA": "Loading",
     "EMPTY_STATE": "No {item} found for query '{query}'",
     "EMPTY_STATE_FULL": "No results found for query '{query}'",
-    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "PLACEHOLDER_KEYBINDING": "/to focus",
     "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "RECENT_SEARCHES": "Recent searches",
+    "CLEAR_ALL": "Clear all",
+    "MOST_RECENT": "Most recent",
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
+    "READ_LESS": "Read less",
     "WROTE": "wrote:",
-    "FROM": "từ",
-    "EMAIL": "email",
-    "EMAIL_SUBJECT": "chủ đề"
+    "FROM": "Từ",
+    "EMAIL": "Email",
+    "EMAIL_SUBJECT": "Chủ đề",
+    "PRIVATE": "Private note",
+    "TRANSCRIPT": "Transcript",
+    "CREATED_AT": "created {time}",
+    "UPDATED_AT": "updated {time}",
+    "SORT_BY": {
+      "RELEVANCE": "Relevance"
+    },
+    "DATE_RANGE": {
+      "LAST_7_DAYS": "7 ngày cuối",
+      "LAST_30_DAYS": "30 ngày cuối",
+      "LAST_60_DAYS": "60 ngày cuối",
+      "LAST_90_DAYS": "90 ngày cuối",
+      "CUSTOM_RANGE": "Custom range:",
+      "CREATED_BETWEEN": "Created between",
+      "AND": "and",
+      "APPLY": "Áp dụng",
+      "BEFORE_DATE": "Before {date}",
+      "AFTER_DATE": "After {date}",
+      "TIME_RANGE": "Filter by time",
+      "CLEAR_FILTER": "Clear filter"
+    },
+    "FILTERS": {
+      "FILTER_MESSAGE": "Filter messages by:",
+      "FROM": "Người gửi",
+      "IN": "Hộp thư đến",
+      "AGENTS": "Nhà cung cấp",
+      "CONTACTS": "Liên hệ",
+      "INBOXES": "Hộp thư đến",
+      "NO_AGENTS": "Không tìm thấy nhà cung cấp",
+      "NO_CONTACTS": "Start by searching to see results",
+      "NO_INBOXES": "No inboxes found"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/chatlist.json b/app/javascript/dashboard/i18n/locale/zh_CN/chatlist.json
index dc673d709..92d976a12 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/chatlist.json
@@ -104,7 +104,7 @@
         "CONTENT": "共享联系人"
       },
       "embed": {
-        "CONTENT": "Embedded content"
+        "CONTENT": ""
       }
     },
     "CHAT_SORT_BY_FILTER": {
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/companies.json b/app/javascript/dashboard/i18n/locale/zh_CN/companies.json
index 1a61b29b2..036952ae4 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/companies.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/companies.json
@@ -6,7 +6,8 @@
       "OPTIONS": {
         "NAME": "姓名：",
         "DOMAIN": "域名",
-        "CREATED_AT": "创建于"
+        "CREATED_AT": "创建于",
+        "CONTACTS_COUNT": "Contacts count"
       }
     },
     "ORDER": {
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/contentTemplates.json b/app/javascript/dashboard/i18n/locale/zh_CN/contentTemplates.json
index 92c9d6a49..62f505496 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/contentTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/contentTemplates.json
@@ -28,6 +28,7 @@
       "TYPES": {
         "MEDIA": "媒体",
         "QUICK_REPLY": "快速回复",
+        "CALL_TO_ACTION": "Call to Action",
         "TEXT": "文本"
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/conversation.json b/app/javascript/dashboard/i18n/locale/zh_CN/conversation.json
index 2ce58dfb5..7ff51e4d5 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/conversation.json
@@ -275,6 +275,16 @@
     "SIDEBAR": {
       "CONTACT": "联系人",
       "COPILOT": "Copilot"
+    },
+    "VOICE_WIDGET": {
+      "INCOMING_CALL": "来电",
+      "OUTGOING_CALL": "已拨出电话",
+      "CALL_IN_PROGRESS": "呼叫进行中",
+      "NOT_ANSWERED_YET": "尚未回复",
+      "HANDLED_IN_ANOTHER_TAB": "Being handled in another tab",
+      "REJECT_CALL": "Reject",
+      "JOIN_CALL": "Join call",
+      "END_CALL": "End call"
     }
   },
   "EMAIL_TRANSCRIPT": {
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json
index 27146c00d..33f77a004 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json
@@ -808,6 +808,35 @@
         "LABEL": "消息",
         "PLACEHOLDER": "请输入一条消息以将此表格显示给用户"
       },
+      "BUTTON_TEXT": {
+        "LABEL": "Button text",
+        "PLACEHOLDER": "Please rate us"
+      },
+      "LANGUAGE": {
+        "LABEL": "语言",
+        "PLACEHOLDER": "Select template language"
+      },
+      "MESSAGE_PREVIEW": {
+        "LABEL": "Message preview",
+        "TOOLTIP": "This may vary slightly when rendered on WhatsApp's platform."
+      },
+      "TEMPLATE_STATUS": {
+        "APPROVED": "Approved by WhatsApp",
+        "PENDING": "Pending WhatsApp approval",
+        "REJECTED": "Meta rejected the template",
+        "DEFAULT": "Needs WhatsApp approval",
+        "NOT_FOUND": "The template does not exist in the Meta platform."
+      },
+      "TEMPLATE_CREATION": {
+        "SUCCESS_MESSAGE": "WhatsApp template created successfully and sent for approval",
+        "ERROR_MESSAGE": "Failed to create WhatsApp template"
+      },
+      "TEMPLATE_UPDATE_DIALOG": {
+        "TITLE": "Edit survey details",
+        "DESCRIPTION": "We will delete the previous template and make a new one which will be sent again for WhatsApp approval",
+        "CONFIRM": "Create new template",
+        "CANCEL": "返回"
+      },
       "SURVEY_RULE": {
         "LABEL": "问卷规则",
         "DESCRIPTION_PREFIX": "发送此问卷如果对话",
@@ -819,6 +848,7 @@
         "SELECT_PLACEHOLDER": "选择标签"
       },
       "NOTE": "注：每次对话只发送一次 CSAT 问卷",
+      "WHATSAPP_NOTE": "Note: We will create a template and send it for WhatsApp approval. After being approved, surveys will be sent only once per conversation as per the survey rule.",
       "API": {
         "SUCCESS_MESSAGE": "CSAT 设置更新成功",
         "ERROR_MESSAGE": "我们无法更新 CSAT 设置。请稍后再试。"
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/search.json b/app/javascript/dashboard/i18n/locale/zh_CN/search.json
index 4870e551b..a1a8d090f 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/search.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/search.json
@@ -1,7 +1,7 @@
 {
   "SEARCH": {
     "TABS": {
-      "ALL": "全部",
+      "ALL": "All results",
       "CONTACTS": "联系人",
       "CONVERSATIONS": "会话",
       "MESSAGES": "消息",
@@ -19,14 +19,50 @@
     "LOADING_DATA": "加载中",
     "EMPTY_STATE": "未找到与查询 '{query}' 相关的 {item}",
     "EMPTY_STATE_FULL": "未找到与查询 '{query}' 相关的结果",
-    "PLACEHOLDER_KEYBINDING": "/ 聚焦搜索框",
+    "PLACEHOLDER_KEYBINDING": "/聚焦搜索框",
     "INPUT_PLACEHOLDER": "输入 3 个或更多字符以进行搜索",
+    "RECENT_SEARCHES": "Recent searches",
+    "CLEAR_ALL": "清除全部",
+    "MOST_RECENT": "Most recent",
     "EMPTY_STATE_DEFAULT": "通过会话 Id、电子邮件、电话号码、消息等进行搜索以获得更好的搜索结果。 ",
     "BOT_LABEL": "机器人",
     "READ_MORE": "查看更多",
+    "READ_LESS": "Read less",
     "WROTE": "写道：",
     "FROM": "来自",
-    "EMAIL": "电子邮件",
-    "EMAIL_SUBJECT": "主题"
+    "EMAIL": "Email",
+    "EMAIL_SUBJECT": "主题",
+    "PRIVATE": "Private note",
+    "TRANSCRIPT": "Transcript",
+    "CREATED_AT": "创建于 {time}",
+    "UPDATED_AT": "updated {time}",
+    "SORT_BY": {
+      "RELEVANCE": "Relevance"
+    },
+    "DATE_RANGE": {
+      "LAST_7_DAYS": "最近7天",
+      "LAST_30_DAYS": "最近30天",
+      "LAST_60_DAYS": "最近60天",
+      "LAST_90_DAYS": "最近90天",
+      "CUSTOM_RANGE": "Custom range:",
+      "CREATED_BETWEEN": "Created between",
+      "AND": "和",
+      "APPLY": "应用",
+      "BEFORE_DATE": "Before {date}",
+      "AFTER_DATE": "After {date}",
+      "TIME_RANGE": "Filter by time",
+      "CLEAR_FILTER": "清除筛选条件"
+    },
+    "FILTERS": {
+      "FILTER_MESSAGE": "Filter messages by:",
+      "FROM": "Sender",
+      "IN": "收件箱",
+      "AGENTS": "客服",
+      "CONTACTS": "联系人",
+      "INBOXES": "收件箱",
+      "NO_AGENTS": "未找到客服代表",
+      "NO_CONTACTS": "Start by searching to see results",
+      "NO_INBOXES": "No inboxes found"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/companies.json b/app/javascript/dashboard/i18n/locale/zh_TW/companies.json
index dd24c5fda..883018155 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/companies.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/companies.json
@@ -6,7 +6,8 @@
       "OPTIONS": {
         "NAME": "姓名",
         "DOMAIN": "Domain",
-        "CREATED_AT": "建立於"
+        "CREATED_AT": "建立於",
+        "CONTACTS_COUNT": "Contacts count"
       }
     },
     "ORDER": {
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/contentTemplates.json b/app/javascript/dashboard/i18n/locale/zh_TW/contentTemplates.json
index f490c40d1..fe96c9f23 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/contentTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/contentTemplates.json
@@ -28,6 +28,7 @@
       "TYPES": {
         "MEDIA": "Media",
         "QUICK_REPLY": "Quick Reply",
+        "CALL_TO_ACTION": "Call to Action",
         "TEXT": "文字"
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/conversation.json b/app/javascript/dashboard/i18n/locale/zh_TW/conversation.json
index 273579a4b..41c506b97 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/conversation.json
@@ -275,6 +275,16 @@
     "SIDEBAR": {
       "CONTACT": "聯絡人",
       "COPILOT": "Copilot"
+    },
+    "VOICE_WIDGET": {
+      "INCOMING_CALL": "Incoming call",
+      "OUTGOING_CALL": "Outgoing call",
+      "CALL_IN_PROGRESS": "Call in progress",
+      "NOT_ANSWERED_YET": "Not answered yet",
+      "HANDLED_IN_ANOTHER_TAB": "Being handled in another tab",
+      "REJECT_CALL": "Reject",
+      "JOIN_CALL": "Join call",
+      "END_CALL": "End call"
     }
   },
   "EMAIL_TRANSCRIPT": {
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json
index 7aeac5fd3..9d33efd0b 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json
@@ -808,6 +808,35 @@
         "LABEL": "訊息",
         "PLACEHOLDER": "Please enter a message to show users with the form"
       },
+      "BUTTON_TEXT": {
+        "LABEL": "Button text",
+        "PLACEHOLDER": "Please rate us"
+      },
+      "LANGUAGE": {
+        "LABEL": "Language",
+        "PLACEHOLDER": "Select template language"
+      },
+      "MESSAGE_PREVIEW": {
+        "LABEL": "Message preview",
+        "TOOLTIP": "This may vary slightly when rendered on WhatsApp's platform."
+      },
+      "TEMPLATE_STATUS": {
+        "APPROVED": "Approved by WhatsApp",
+        "PENDING": "Pending WhatsApp approval",
+        "REJECTED": "Meta rejected the template",
+        "DEFAULT": "Needs WhatsApp approval",
+        "NOT_FOUND": "The template does not exist in the Meta platform."
+      },
+      "TEMPLATE_CREATION": {
+        "SUCCESS_MESSAGE": "WhatsApp template created successfully and sent for approval",
+        "ERROR_MESSAGE": "Failed to create WhatsApp template"
+      },
+      "TEMPLATE_UPDATE_DIALOG": {
+        "TITLE": "Edit survey details",
+        "DESCRIPTION": "We will delete the previous template and make a new one which will be sent again for WhatsApp approval",
+        "CONFIRM": "Create new template",
+        "CANCEL": "返回"
+      },
       "SURVEY_RULE": {
         "LABEL": "Survey rule",
         "DESCRIPTION_PREFIX": "Send the survey if the conversation",
@@ -819,6 +848,7 @@
         "SELECT_PLACEHOLDER": "select labels"
       },
       "NOTE": "Note: CSAT surveys are sent only once per conversation",
+      "WHATSAPP_NOTE": "Note: We will create a template and send it for WhatsApp approval. After being approved, surveys will be sent only once per conversation as per the survey rule.",
       "API": {
         "SUCCESS_MESSAGE": "CSAT settings updated successfully",
         "ERROR_MESSAGE": "We couldn't update CSAT settings. Please try again later."
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/search.json b/app/javascript/dashboard/i18n/locale/zh_TW/search.json
index f94719070..2c46086f0 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/search.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/search.json
@@ -1,7 +1,7 @@
 {
   "SEARCH": {
     "TABS": {
-      "ALL": "所有的",
+      "ALL": "All results",
       "CONTACTS": "聯絡人",
       "CONVERSATIONS": "對話",
       "MESSAGES": "訊息",
@@ -19,14 +19,50 @@
     "LOADING_DATA": "Loading",
     "EMPTY_STATE": "No {item} found for query '{query}'",
     "EMPTY_STATE_FULL": "查無 {query} 條件的結果",
-    "PLACEHOLDER_KEYBINDING": "/ to focus",
+    "PLACEHOLDER_KEYBINDING": "/to focus",
     "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
+    "RECENT_SEARCHES": "Recent searches",
+    "CLEAR_ALL": "Clear all",
+    "MOST_RECENT": "Most recent",
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "機器人",
     "READ_MORE": "Read more",
+    "READ_LESS": "Read less",
     "WROTE": "wrote:",
-    "FROM": "from",
-    "EMAIL": "email",
-    "EMAIL_SUBJECT": "主旨"
+    "FROM": "From",
+    "EMAIL": "Email",
+    "EMAIL_SUBJECT": "主旨",
+    "PRIVATE": "Private note",
+    "TRANSCRIPT": "Transcript",
+    "CREATED_AT": "created {time}",
+    "UPDATED_AT": "updated {time}",
+    "SORT_BY": {
+      "RELEVANCE": "Relevance"
+    },
+    "DATE_RANGE": {
+      "LAST_7_DAYS": "最近7天",
+      "LAST_30_DAYS": "最近30天",
+      "LAST_60_DAYS": "最近60天",
+      "LAST_90_DAYS": "最近90天",
+      "CUSTOM_RANGE": "Custom range:",
+      "CREATED_BETWEEN": "Created between",
+      "AND": "and",
+      "APPLY": "套用",
+      "BEFORE_DATE": "Before {date}",
+      "AFTER_DATE": "After {date}",
+      "TIME_RANGE": "Filter by time",
+      "CLEAR_FILTER": "Clear filter"
+    },
+    "FILTERS": {
+      "FILTER_MESSAGE": "Filter messages by:",
+      "FROM": "發送者",
+      "IN": "收件匣",
+      "AGENTS": "客服",
+      "CONTACTS": "聯絡人",
+      "INBOXES": "收件匣",
+      "NO_AGENTS": "查無客服",
+      "NO_CONTACTS": "Start by searching to see results",
+      "NO_INBOXES": "No inboxes found"
+    }
   }
 }
diff --git a/app/javascript/dashboard/modules/conversations/components/MessageContextMenu.vue b/app/javascript/dashboard/modules/conversations/components/MessageContextMenu.vue
index 632425feb..b55949428 100644
--- a/app/javascript/dashboard/modules/conversations/components/MessageContextMenu.vue
+++ b/app/javascript/dashboard/modules/conversations/components/MessageContextMenu.vue
@@ -62,6 +62,7 @@ export default {
     ...mapGetters({
       getAccount: 'accounts/getAccount',
       currentAccountId: 'getCurrentAccountId',
+      getUISettings: 'getUISettings',
     }),
     plainTextContent() {
       return this.getPlainText(this.messageContent);
@@ -117,11 +118,13 @@ export default {
       this.$emit('close', e);
     },
     handleTranslate() {
-      const { locale } = this.getAccount(this.currentAccountId);
+      const { locale: accountLocale } = this.getAccount(this.currentAccountId);
+      const agentLocale = this.getUISettings?.locale;
+      const targetLanguage = agentLocale || accountLocale || 'en';
       this.$store.dispatch('translateMessage', {
         conversationId: this.conversationId,
         messageId: this.messageId,
-        targetLanguage: locale || 'en',
+        targetLanguage,
       });
       useTrack(CONVERSATION_EVENTS.TRANSLATE_A_MESSAGE);
       this.handleClose();
diff --git a/app/javascript/dashboard/modules/search/components/MessageContent.vue b/app/javascript/dashboard/modules/search/components/MessageContent.vue
index 9ec425919..1c2d1c231 100644
--- a/app/javascript/dashboard/modules/search/components/MessageContent.vue
+++ b/app/javascript/dashboard/modules/search/components/MessageContent.vue
@@ -1,7 +1,8 @@
 <script setup>
-import { ref, useTemplateRef, onMounted, watch, nextTick, computed } from 'vue';
+import { computed } from 'vue';
+import { useI18n } from 'vue-i18n';
 import { useMessageFormatter } from 'shared/composables/useMessageFormatter';
-import ReadMore from './ReadMore.vue';
+import { useExpandableContent } from 'shared/composables/useExpandableContent';
 
 const props = defineProps({
   author: {
@@ -18,6 +19,12 @@ const props = defineProps({
   },
 });
 
+const { t } = useI18n();
+const { highlightContent } = useMessageFormatter();
+
+const { contentElement, showReadMore, showReadLess, toggleExpanded } =
+  useExpandableContent();
+
 const messageContent = computed(() => {
   // We perform search on either content or email subject or transcribed text
   if (props.message.content) {
@@ -30,33 +37,19 @@ const messageContent = computed(() => {
     return email.subject;
   }
 
-  const audioAttachment = props.message.attachments.find(
+  const audioAttachment = props.message.attachments?.find(
     attachment => attachment.file_type === 'audio'
   );
   return audioAttachment?.transcribed_text || '';
 });
 
-const { highlightContent } = useMessageFormatter();
-
-const messageContainer = useTemplateRef('messageContainer');
-const isOverflowing = ref(false);
-
-const setOverflow = () => {
-  const wrap = messageContainer.value;
-  if (wrap) {
-    const message = wrap.querySelector('.message-content');
-    isOverflowing.value = message.offsetHeight > 150;
-  }
-};
-
 const escapeHtml = html => {
-  var text = document.createTextNode(html);
-  var p = document.createElement('p');
-  p.appendChild(text);
-  return p.innerText;
+  const wrapper = document.createElement('p');
+  wrapper.textContent = html;
+  return wrapper.textContent;
 };
 
-const prepareContent = () => {
+const highlightedContent = computed(() => {
   const content = messageContent.value || '';
   const escapedText = escapeHtml(content);
   return highlightContent(
@@ -64,50 +57,59 @@ const prepareContent = () => {
     props.searchTerm,
     'searchkey--highlight'
   );
-};
+});
 
-onMounted(() => {
-  watch(() => {
-    return messageContainer.value;
-  }, setOverflow);
-
-  nextTick(setOverflow);
+const authorText = computed(() => {
+  const author = props.author || '';
+  const wroteText = t('SEARCH.WROTE');
+  return author ? `${author} ${wroteText} ` : '';
 });
 </script>
 
 <template>
-  <blockquote ref="messageContainer" class="message border-l-2 border-n-weak">
-    <p class="header">
-      <strong class="text-n-slate-11">
-        {{ author }}
-      </strong>
-      {{ $t('SEARCH.WROTE') }}
-    </p>
-    <ReadMore :shrink="isOverflowing" @expand="isOverflowing = false">
-      <div v-dompurify-html="prepareContent()" class="message-content" />
-    </ReadMore>
-  </blockquote>
+  <div
+    ref="contentElement"
+    class="break-words grid items-center text-n-slate-11 text-sm leading-relaxed"
+    :class="showReadMore ? 'grid-cols-[1fr_auto]' : 'grid-cols-1'"
+  >
+    <div
+      class="min-w-0"
+      :class="{
+        'overflow-hidden whitespace-nowrap text-ellipsis': showReadMore,
+      }"
+    >
+      <span v-if="authorText" class="text-n-slate-11 font-medium leading-4">{{
+        authorText
+      }}</span>
+      <span
+        v-dompurify-html="highlightedContent"
+        class="message-content text-n-slate-12 [&_.searchkey--highlight]:text-n-slate-12 [&_.searchkey--highlight]:font-semibold"
+      />
+      <button
+        v-if="showReadLess"
+        class="text-sm text-n-slate-11 underline cursor-pointer bg-transparent border-0 p-0 hover:text-n-slate-12 font-medium ltr:ml-0.5 rtl:mr-0.5"
+        @click.prevent="toggleExpanded(false)"
+      >
+        {{ t('SEARCH.READ_LESS') }}
+      </button>
+    </div>
+    <button
+      v-if="showReadMore"
+      class="text-sm text-n-slate-11 underline cursor-pointer bg-transparent border-0 p-0 hover:text-n-slate-12 font-medium justify-self-end ltr:ml-0.5 rtl:mr-0.5"
+      @click.prevent="toggleExpanded(true)"
+    >
+      {{ t('SEARCH.READ_MORE') }}
+    </button>
+  </div>
 </template>
 
 <style scoped lang="scss">
-.message {
-  @apply py-0 px-2 mt-2;
+.message-content::v-deep p {
+  @apply inline;
+  margin: 0;
 }
 
-.message-content::v-deep p,
-.message-content::v-deep li::marker {
-  @apply text-n-slate-11 mb-1;
-}
-
-.header {
-  @apply text-n-slate-11 mb-1;
-}
-
-.message-content {
-  @apply break-words text-n-slate-11;
-}
-
-.message-content::v-deep .searchkey--highlight {
-  @apply text-n-slate-12 text-sm font-semibold;
+.message-content::v-deep br {
+  display: none;
 }
 </style>
diff --git a/app/javascript/dashboard/modules/search/components/ReadMore.vue b/app/javascript/dashboard/modules/search/components/ReadMore.vue
deleted file mode 100644
index 7b4296c89..000000000
--- a/app/javascript/dashboard/modules/search/components/ReadMore.vue
+++ /dev/null
@@ -1,38 +0,0 @@
-<script setup>
-import NextButton from 'dashboard/components-next/button/Button.vue';
-
-defineProps({
-  shrink: {
-    type: Boolean,
-    default: false,
-  },
-});
-
-defineEmits(['expand']);
-</script>
-
-<template>
-  <div>
-    <div
-      :class="{
-        'max-h-[100px] overflow-hidden relative': shrink,
-      }"
-    >
-      <slot />
-      <div
-        v-if="shrink"
-        class="absolute inset-x-0 bottom-0 h-16 bg-gradient-to-t to-transparent from-n-background flex items-end justify-center pb-2"
-      >
-        <NextButton
-          :label="$t('SEARCH.READ_MORE')"
-          icon="i-lucide-chevrons-down"
-          blue
-          xs
-          faded
-          class="backdrop-filter backdrop-blur-[2px]"
-          @click.prevent="$emit('expand')"
-        />
-      </div>
-    </div>
-  </div>
-</template>
diff --git a/app/javascript/dashboard/modules/search/components/RecentSearches.vue b/app/javascript/dashboard/modules/search/components/RecentSearches.vue
new file mode 100644
index 000000000..0c52ea3ac
--- /dev/null
+++ b/app/javascript/dashboard/modules/search/components/RecentSearches.vue
@@ -0,0 +1,116 @@
+<script setup>
+import { ref, computed, onMounted } from 'vue';
+import { LocalStorage } from 'shared/helpers/localStorage';
+import { LOCAL_STORAGE_KEYS } from 'dashboard/constants/localStorage';
+
+import Icon from 'dashboard/components-next/icon/Icon.vue';
+import Button from 'dashboard/components-next/button/Button.vue';
+
+const emit = defineEmits(['selectSearch', 'clearAll']);
+
+const MAX_RECENT_SEARCHES = 3;
+const recentSearches = ref([]);
+
+const loadRecentSearches = () => {
+  const stored = LocalStorage.get(LOCAL_STORAGE_KEYS.RECENT_SEARCHES) || [];
+  recentSearches.value = Array.isArray(stored) ? stored : [];
+};
+
+const saveRecentSearches = () => {
+  LocalStorage.set(LOCAL_STORAGE_KEYS.RECENT_SEARCHES, recentSearches.value);
+};
+
+const addRecentSearch = query => {
+  if (!query || query.trim().length < 2) return;
+
+  const trimmedQuery = query.trim();
+
+  const existingIndex = recentSearches.value.findIndex(
+    search => search.toLowerCase() === trimmedQuery.toLowerCase()
+  );
+
+  if (existingIndex !== -1) {
+    recentSearches.value.splice(existingIndex, 1);
+  }
+
+  recentSearches.value.unshift(trimmedQuery);
+
+  if (recentSearches.value.length > MAX_RECENT_SEARCHES) {
+    recentSearches.value = recentSearches.value.slice(0, MAX_RECENT_SEARCHES);
+  }
+
+  saveRecentSearches();
+};
+
+const clearRecentSearches = () => {
+  recentSearches.value = [];
+  LocalStorage.remove(LOCAL_STORAGE_KEYS.RECENT_SEARCHES);
+};
+
+const hasRecentSearches = computed(() => recentSearches.value?.length > 0);
+
+const onSelectSearch = query => {
+  emit('selectSearch', query);
+};
+
+const onClearAll = () => {
+  clearRecentSearches();
+  emit('clearAll');
+};
+
+defineExpose({
+  addRecentSearch,
+  loadRecentSearches,
+});
+
+onMounted(() => {
+  loadRecentSearches();
+});
+</script>
+
+<template>
+  <div v-if="hasRecentSearches" class="px-4 pb-4 w-full pt-2">
+    <div class="flex items-center justify-between mb-4">
+      <div class="flex items-center gap-2.5">
+        <Icon icon="i-lucide-rotate-ccw" class="text-n-slate-10 size-4" />
+        <h3 class="text-base font-medium text-n-slate-10">
+          {{ $t('SEARCH.RECENT_SEARCHES') }}
+        </h3>
+      </div>
+      <Button
+        type="button"
+        xs
+        slate
+        ghost
+        class="!text-n-slate-10 hover:!text-n-slate-12"
+        @mousedown.prevent
+        @click="onClearAll"
+      >
+        {{ $t('SEARCH.CLEAR_ALL') }}
+      </Button>
+    </div>
+
+    <div class="flex flex-col gap-4 items-start">
+      <button
+        v-for="(search, index) in recentSearches"
+        :key="search"
+        type="button"
+        class="w-full flex items-center gap-2.5 text-left text-base text-n-slate-12 rounded-lg transition-all duration-150 group p-0"
+        @mousedown.prevent
+        @click="onSelectSearch(search)"
+      >
+        <Icon
+          icon="i-lucide-search"
+          class="text-n-slate-10 group-hover:text-n-slate-11 transition-colors duration-150 size-4"
+        />
+        <span class="flex-1 truncate">{{ search }}</span>
+        <span
+          class="text-xs text-n-slate-8 opacity-0 group-hover:opacity-100 transition-opacity duration-150"
+        >
+          {{ index === 0 ? $t('SEARCH.MOST_RECENT') : '' }}
+        </span>
+      </button>
+    </div>
+  </div>
+  <template v-else />
+</template>
diff --git a/app/javascript/dashboard/modules/search/components/SearchContactAgentSelector.vue b/app/javascript/dashboard/modules/search/components/SearchContactAgentSelector.vue
new file mode 100644
index 000000000..ff09c9467
--- /dev/null
+++ b/app/javascript/dashboard/modules/search/components/SearchContactAgentSelector.vue
@@ -0,0 +1,239 @@
+<script setup>
+import { ref, computed, defineModel, watch } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useToggle } from '@vueuse/core';
+import { vOnClickOutside } from '@vueuse/components';
+import { debounce } from '@chatwoot/utils';
+import { useMapGetter } from 'dashboard/composables/store.js';
+import { searchContacts } from 'dashboard/components-next/NewConversation/helpers/composeConversationHelper';
+import { useCamelCase } from 'dashboard/composables/useTransformKeys';
+import { fetchContactDetails } from '../helpers/searchHelper';
+
+import DropdownMenu from 'dashboard/components-next/dropdown-menu/DropdownMenu.vue';
+import Button from 'dashboard/components-next/button/Button.vue';
+
+const props = defineProps({
+  label: { type: String, required: true },
+});
+
+const emit = defineEmits(['change']);
+
+const FROM_TYPE = {
+  CONTACT: 'contact',
+  AGENT: 'agent',
+};
+
+const MENU_ACTIONS_SELECT = 'select';
+
+const modelValue = defineModel({ type: String, default: null });
+
+const { t } = useI18n();
+const [showDropdown, toggleDropdown] = useToggle();
+
+const searchQuery = ref('');
+const searchedContacts = ref([]);
+const isSearching = ref(false);
+const selectedContact = ref(null);
+
+const agentsList = useMapGetter('agents/getVerifiedAgents');
+
+const createMenuItem = (item, type, isAgent = false) => {
+  const transformed = useCamelCase(item, { deep: true });
+  const value = `${type}:${transformed.id}`;
+  return {
+    label: transformed.name,
+    value,
+    action: MENU_ACTIONS_SELECT,
+    type,
+    thumbnail: {
+      name: transformed.name,
+      src: isAgent ? transformed.avatarUrl : transformed.thumbnail,
+    },
+    ...(isAgent
+      ? {}
+      : { description: transformed.email || transformed.phoneNumber }),
+    isSelected: modelValue.value === value,
+  };
+};
+
+const agentsSection = computed(() => {
+  const agents =
+    agentsList.value?.map(agent =>
+      createMenuItem(agent, FROM_TYPE.AGENT, true)
+    ) || [];
+  return searchQuery.value
+    ? agents.filter(agent =>
+        agent.label.toLowerCase().includes(searchQuery.value.toLowerCase())
+      )
+    : agents;
+});
+
+const contactsSection = computed(
+  () =>
+    searchedContacts.value?.map(contact =>
+      createMenuItem(contact, FROM_TYPE.CONTACT)
+    ) || []
+);
+
+const menuSections = computed(() => [
+  {
+    title: t('SEARCH.FILTERS.CONTACTS'),
+    items: contactsSection.value,
+    isLoading: isSearching.value,
+    emptyState: t('SEARCH.FILTERS.NO_CONTACTS'),
+  },
+  {
+    title: t('SEARCH.FILTERS.AGENTS'),
+    items: agentsSection.value,
+    emptyState: t('SEARCH.FILTERS.NO_AGENTS'),
+  },
+]);
+
+const selectedLabel = computed(() => {
+  if (!modelValue.value) return props.label;
+
+  const [type, id] = modelValue.value.split(':');
+  const numericId = Number(id);
+
+  if (type === FROM_TYPE.CONTACT) {
+    if (selectedContact.value?.id === numericId) {
+      return `${props.label}: ${selectedContact.value.name}`;
+    }
+    const contact = searchedContacts.value?.find(c => c.id === numericId);
+    if (contact) return `${props.label}: ${contact.name}`;
+  } else if (type === FROM_TYPE.AGENT) {
+    const agent = agentsList.value?.find(a => a.id === numericId);
+    if (agent) return `${props.label}: ${agent.name}`;
+  }
+
+  return `${props.label}: ${numericId}`;
+});
+
+const debouncedSearch = debounce(async query => {
+  if (!query) {
+    searchedContacts.value = selectedContact.value
+      ? [selectedContact.value]
+      : [];
+    isSearching.value = false;
+    return;
+  }
+
+  try {
+    const contacts = await searchContacts({
+      keys: ['name', 'email', 'phone_number'],
+      query,
+    });
+
+    // Add selected contact to top if not already in results
+    const allContacts = selectedContact.value
+      ? [
+          selectedContact.value,
+          ...contacts.filter(c => c.id !== selectedContact.value.id),
+        ]
+      : contacts;
+
+    searchedContacts.value = allContacts;
+  } catch {
+    // Ignore error
+  } finally {
+    isSearching.value = false;
+  }
+}, 300);
+
+const performSearch = query => {
+  searchQuery.value = query;
+  if (query) {
+    searchedContacts.value = selectedContact.value
+      ? [selectedContact.value]
+      : [];
+    isSearching.value = true;
+  }
+  debouncedSearch(query);
+};
+
+const onToggleDropdown = () => {
+  if (!showDropdown.value) {
+    // Reset search when opening dropdown
+    searchQuery.value = '';
+    searchedContacts.value = selectedContact.value
+      ? [selectedContact.value]
+      : [];
+  }
+  toggleDropdown();
+};
+
+const handleAction = item => {
+  if (modelValue.value === item.value) {
+    modelValue.value = null;
+    selectedContact.value = null;
+  } else {
+    modelValue.value = item.value;
+
+    if (item.type === FROM_TYPE.CONTACT) {
+      const [, id] = item.value.split(':');
+      selectedContact.value = {
+        id: Number(id),
+        name: item.label,
+        thumbnail: item.thumbnail?.src,
+      };
+    } else {
+      selectedContact.value = null;
+    }
+  }
+
+  toggleDropdown(false);
+  emit('change');
+};
+
+const resolveContactName = async () => {
+  if (!modelValue.value) return;
+
+  const [type, id] = modelValue.value.split(':');
+  if (type !== FROM_TYPE.CONTACT) return;
+
+  const numericId = Number(id);
+  if (selectedContact.value?.id === numericId) return;
+
+  const contact = await fetchContactDetails(numericId);
+  if (contact) {
+    selectedContact.value = {
+      id: contact.id,
+      name: contact.name,
+      thumbnail: contact.thumbnail,
+    };
+    if (!searchedContacts.value.some(c => c.id === contact.id)) {
+      searchedContacts.value.push(selectedContact.value);
+    }
+  }
+};
+
+watch(() => modelValue.value, resolveContactName, { immediate: true });
+</script>
+
+<template>
+  <div
+    v-on-click-outside="() => toggleDropdown(false)"
+    class="relative flex items-center group min-w-0 max-w-full"
+  >
+    <Button
+      sm
+      :variant="showDropdown ? 'faded' : 'ghost'"
+      slate
+      :label="selectedLabel"
+      trailing-icon
+      icon="i-lucide-chevron-down"
+      class="!px-2 max-w-full"
+      @click="onToggleDropdown"
+    />
+    <DropdownMenu
+      v-if="showDropdown"
+      :menu-sections="menuSections"
+      show-search
+      disable-local-filtering
+      :is-searching="isSearching"
+      class="mt-1 ltr:left-0 rtl:right-0 top-full w-64 max-h-80 overflow-y-auto"
+      @search="performSearch"
+      @action="handleAction"
+    />
+  </div>
+</template>
diff --git a/app/javascript/dashboard/modules/search/components/SearchDateRangeSelector.vue b/app/javascript/dashboard/modules/search/components/SearchDateRangeSelector.vue
new file mode 100644
index 000000000..63c99f72f
--- /dev/null
+++ b/app/javascript/dashboard/modules/search/components/SearchDateRangeSelector.vue
@@ -0,0 +1,271 @@
+<script setup>
+import { computed, ref, defineModel } from 'vue';
+import { useToggle } from '@vueuse/core';
+import { useI18n } from 'vue-i18n';
+import { vOnClickOutside } from '@vueuse/components';
+import {
+  subDays,
+  subMonths,
+  subYears,
+  startOfDay,
+  endOfDay,
+  format,
+  getUnixTime,
+  fromUnixTime,
+} from 'date-fns';
+import { DATE_RANGE_TYPES } from '../helpers/searchHelper';
+
+import Button from 'dashboard/components-next/button/Button.vue';
+import DropdownMenu from 'dashboard/components-next/dropdown-menu/DropdownMenu.vue';
+
+const emit = defineEmits(['change']);
+const modelValue = defineModel({
+  type: Object,
+  default: () => ({ type: null, from: null, to: null }),
+});
+
+const { t } = useI18n();
+const [showDropdown, toggleDropdown] = useToggle();
+
+const customFrom = ref('');
+const customTo = ref('');
+const rangeType = ref(DATE_RANGE_TYPES.BETWEEN);
+
+// Calculate min date (90 days ago) for date inputs
+const minDate = computed(() => format(subDays(new Date(), 90), 'yyyy-MM-dd'));
+const maxDate = computed(() => format(new Date(), 'yyyy-MM-dd'));
+
+// Check if both custom date inputs have values
+const hasCustomDates = computed(() => customFrom.value && customTo.value);
+
+const DATE_FILTER_ACTIONS = {
+  PRESET: 'preset',
+  SELECT: 'select',
+};
+
+const PRESET_RANGES = computed(() => [
+  {
+    label: t('SEARCH.DATE_RANGE.LAST_7_DAYS'),
+    value: DATE_RANGE_TYPES.LAST_7_DAYS,
+    days: 7,
+  },
+  {
+    label: t('SEARCH.DATE_RANGE.LAST_30_DAYS'),
+    value: DATE_RANGE_TYPES.LAST_30_DAYS,
+    days: 30,
+  },
+  {
+    label: t('SEARCH.DATE_RANGE.LAST_60_DAYS'),
+    value: DATE_RANGE_TYPES.LAST_60_DAYS,
+    days: 60,
+  },
+  {
+    label: t('SEARCH.DATE_RANGE.LAST_90_DAYS'),
+    value: DATE_RANGE_TYPES.LAST_90_DAYS,
+    days: 90,
+  },
+]);
+
+const computeDateRange = config => {
+  const end = endOfDay(new Date());
+  let start;
+
+  if (config.days) {
+    start = startOfDay(subDays(end, config.days));
+  } else if (config.months) {
+    start = startOfDay(subMonths(end, config.months));
+  } else {
+    start = startOfDay(subYears(end, config.years));
+  }
+
+  return { type: config.value, from: getUnixTime(start), to: getUnixTime(end) };
+};
+
+const selectedValue = computed(() => {
+  const { from, to, type } = modelValue.value || {};
+  if (!from && !to && !type) return '';
+  return type || DATE_RANGE_TYPES.CUSTOM;
+});
+
+const menuItems = computed(() =>
+  PRESET_RANGES.value.map(item => ({
+    ...item,
+    action: DATE_FILTER_ACTIONS.PRESET,
+    isSelected: selectedValue.value === item.value,
+  }))
+);
+
+const applySelection = ({ type, from, to }) => {
+  const newValue = { type, from, to };
+  modelValue.value = newValue;
+  emit('change', newValue);
+};
+
+const clearFilter = () => {
+  applySelection({ type: null, from: null, to: null });
+  customFrom.value = '';
+  customTo.value = '';
+  toggleDropdown(false);
+};
+
+const handlePresetAction = item => {
+  if (selectedValue.value === item.value) {
+    clearFilter();
+    return;
+  }
+  customFrom.value = '';
+  customTo.value = '';
+  applySelection(computeDateRange(item));
+  toggleDropdown(false);
+};
+
+const applyCustomRange = () => {
+  const customFromDate = customFrom.value
+    ? startOfDay(new Date(customFrom.value))
+    : null;
+  const customToDate = customTo.value
+    ? endOfDay(new Date(customTo.value))
+    : null;
+
+  // Only BETWEEN mode - require both dates
+  if (customFromDate && customToDate) {
+    applySelection({
+      type: DATE_RANGE_TYPES.BETWEEN,
+      from: getUnixTime(customFromDate),
+      to: getUnixTime(customToDate),
+    });
+    toggleDropdown(false);
+  }
+};
+
+const clearCustomRange = () => {
+  customFrom.value = '';
+  customTo.value = '';
+};
+
+const formatDate = timestamp => format(fromUnixTime(timestamp), 'MMM d, yyyy'); // (e.g., "Jan 15, 2024")
+
+const selectedLabel = computed(() => {
+  const prefix = t('SEARCH.DATE_RANGE.TIME_RANGE');
+  if (!selectedValue.value) return prefix;
+
+  // Check if it's a preset
+  const preset = PRESET_RANGES.value.find(p => p.value === selectedValue.value);
+  if (preset) return `${prefix}: ${preset.label}`;
+
+  // Custom range - only BETWEEN mode with both dates
+  const { from, to } = modelValue.value;
+  if (from && to) return `${prefix}: ${formatDate(from)} - ${formatDate(to)}`;
+
+  return `${prefix}: ${t('SEARCH.DATE_RANGE.CUSTOM_RANGE')}`;
+});
+
+const CUSTOM_RANGE_TYPES = [DATE_RANGE_TYPES.BETWEEN, DATE_RANGE_TYPES.CUSTOM];
+
+const onToggleDropdown = () => {
+  if (!showDropdown.value) {
+    const { type, from, to } = modelValue.value || {};
+
+    rangeType.value = CUSTOM_RANGE_TYPES.includes(type)
+      ? type
+      : DATE_RANGE_TYPES.BETWEEN;
+
+    if (CUSTOM_RANGE_TYPES.includes(type)) {
+      try {
+        customFrom.value = from ? format(fromUnixTime(from), 'yyyy-MM-dd') : '';
+        customTo.value = to ? format(fromUnixTime(to), 'yyyy-MM-dd') : '';
+      } catch {
+        customFrom.value = '';
+        customTo.value = '';
+      }
+    } else {
+      customFrom.value = '';
+      customTo.value = '';
+    }
+  }
+  toggleDropdown();
+};
+</script>
+
+<template>
+  <div
+    v-on-click-outside="() => toggleDropdown(false)"
+    class="relative flex items-center group min-w-0 max-w-full"
+  >
+    <Button
+      sm
+      slate
+      :variant="showDropdown ? 'faded' : 'solid'"
+      :label="selectedLabel"
+      class="group-hover:bg-n-alpha-2 max-w-full"
+      trailing-icon
+      icon="i-lucide-chevron-down"
+      @click="onToggleDropdown()"
+    />
+    <DropdownMenu
+      v-if="showDropdown"
+      :menu-items="menuItems"
+      class="mt-1 ltr:left-0 rtl:right-0 top-full w-64"
+      @action="handlePresetAction"
+    >
+      <template #footer>
+        <div class="h-px bg-n-strong" />
+        <div class="flex flex-col gap-2">
+          <div class="flex items-center justify-between gap-2 px-1 h-9">
+            <span class="text-sm text-n-slate-11">
+              {{ t('SEARCH.DATE_RANGE.CUSTOM_RANGE') }}
+            </span>
+            <span class="text-sm text-n-slate-12">
+              {{ t('SEARCH.DATE_RANGE.CREATED_BETWEEN') }}
+            </span>
+          </div>
+
+          <input
+            v-model="customFrom"
+            type="date"
+            :min="minDate"
+            :max="customTo || maxDate"
+            class="!w-full !mb-0 !rounded-lg !bg-n-alpha-black2 !outline-n-strong -outline-offset-1 !px-3 !py-2 !text-sm text-n-slate-12 !h-8"
+          />
+
+          <div class="flex items-center gap-3 h-5 px-1">
+            <div class="flex-1 h-px bg-n-weak" />
+            <span class="text-sm text-n-slate-11">
+              {{ t('SEARCH.DATE_RANGE.AND') }}
+            </span>
+            <div class="flex-1 h-px bg-n-weak" />
+          </div>
+
+          <input
+            v-model="customTo"
+            type="date"
+            :min="customFrom || minDate"
+            :max="maxDate"
+            class="!w-full !mb-0 !rounded-lg !bg-n-alpha-black2 !outline-n-strong -outline-offset-1 !px-3 !py-2 !text-sm text-n-slate-12 !h-8"
+          />
+
+          <div class="flex items-center gap-2 mt-2">
+            <Button
+              sm
+              slate
+              faded
+              :label="t('SEARCH.DATE_RANGE.CLEAR_FILTER')"
+              :disabled="!hasCustomDates"
+              class="flex-1 justify-center"
+              @click="clearCustomRange"
+            />
+            <Button
+              sm
+              solid
+              color="blue"
+              :label="t('SEARCH.DATE_RANGE.APPLY')"
+              :disabled="!hasCustomDates"
+              class="flex-1 justify-center"
+              @click="applyCustomRange"
+            />
+          </div>
+        </div>
+      </template>
+    </DropdownMenu>
+  </div>
+</template>
diff --git a/app/javascript/dashboard/modules/search/components/SearchFilters.vue b/app/javascript/dashboard/modules/search/components/SearchFilters.vue
new file mode 100644
index 000000000..be5fa4d4c
--- /dev/null
+++ b/app/javascript/dashboard/modules/search/components/SearchFilters.vue
@@ -0,0 +1,104 @@
+<script setup>
+import { computed, defineModel } from 'vue';
+import { useI18n } from 'vue-i18n';
+import SearchDateRangeSelector from './SearchDateRangeSelector.vue';
+import SearchContactAgentSelector from './SearchContactAgentSelector.vue';
+import SearchInboxSelector from './SearchInboxSelector.vue';
+import Button from 'dashboard/components-next/button/Button.vue';
+
+const emit = defineEmits(['updateFilters']);
+const { t } = useI18n();
+
+const filters = defineModel({
+  type: Object,
+  default: () => ({
+    from: null, // Contact id and Agent id
+    in: null, // Inbox id
+    dateRange: { type: null, from: null, to: null },
+  }),
+});
+
+const hasActiveFilters = computed(
+  () =>
+    filters.value.from ||
+    filters.value.in ||
+    filters.value.dateRange?.type ||
+    filters.value.dateRange?.from ||
+    filters.value.dateRange?.to
+);
+
+const onFilterChange = () => {
+  emit('updateFilters', filters.value);
+};
+
+const clearAllFilters = () => {
+  filters.value = {
+    from: null,
+    in: null,
+    dateRange: { type: null, from: null, to: null },
+  };
+  onFilterChange();
+};
+</script>
+
+<template>
+  <div
+    class="flex flex-col lg:flex-row items-start lg:items-center gap-3 p-4 w-full min-w-0"
+  >
+    <div class="flex items-center gap-3 min-w-0 max-w-full">
+      <Button
+        v-if="hasActiveFilters"
+        sm
+        slate
+        solid
+        :label="t('SEARCH.DATE_RANGE.CLEAR_FILTER')"
+        icon="i-lucide-x"
+        class="flex-shrink-0 lg:hidden"
+        @click="clearAllFilters"
+      />
+
+      <SearchDateRangeSelector
+        v-model="filters.dateRange"
+        class="min-w-0 max-w-full"
+        @change="onFilterChange"
+      />
+    </div>
+
+    <div class="w-px h-4 bg-n-weak flex-shrink-0 hidden lg:block" />
+
+    <div class="flex items-center gap-1.5 min-w-0 flex-1 max-w-full">
+      <span class="text-sm text-n-slate-10 flex-shrink-0 whitespace-nowrap">
+        {{ t('SEARCH.FILTERS.FILTER_MESSAGE') }}
+      </span>
+
+      <div class="min-w-0">
+        <SearchContactAgentSelector
+          v-model="filters.from"
+          :label="$t('SEARCH.FILTERS.FROM')"
+          @change="onFilterChange"
+        />
+      </div>
+
+      <div class="w-px h-3 bg-n-weak rounded-lg flex-shrink-0" />
+
+      <div class="min-w-0">
+        <SearchInboxSelector
+          v-model="filters.in"
+          :label="$t('SEARCH.FILTERS.IN')"
+          @change="onFilterChange"
+        />
+      </div>
+    </div>
+
+    <Button
+      v-if="hasActiveFilters"
+      sm
+      slate
+      solid
+      :label="t('SEARCH.DATE_RANGE.CLEAR_FILTER')"
+      icon="i-lucide-x"
+      class="flex-shrink-0 hidden lg:inline-flex"
+      @click="clearAllFilters"
+    />
+  </div>
+</template>
diff --git a/app/javascript/dashboard/modules/search/components/SearchHeader.vue b/app/javascript/dashboard/modules/search/components/SearchHeader.vue
index af7decbfc..2e91d4279 100644
--- a/app/javascript/dashboard/modules/search/components/SearchHeader.vue
+++ b/app/javascript/dashboard/modules/search/components/SearchHeader.vue
@@ -1,48 +1,34 @@
 <script setup>
-import { ref, useTemplateRef, onMounted, onUnmounted, watch } from 'vue';
-import { debounce } from '@chatwoot/utils';
+import { ref, watch, useTemplateRef, defineModel } from 'vue';
+import { FEATURE_FLAGS } from 'dashboard/featureFlags';
+import { INSTALLATION_TYPES } from 'dashboard/constants/installationTypes';
+import { ROLES } from 'dashboard/constants/permissions';
+
+import SearchInput from './SearchInput.vue';
+import SearchFilters from './SearchFilters.vue';
+import Policy from 'dashboard/components/policy.vue';
 
 const props = defineProps({
-  initialQuery: {
-    type: String,
-    default: '',
-  },
+  initialQuery: { type: String, default: '' },
 });
 
-const emit = defineEmits(['search']);
+const emit = defineEmits(['search', 'filterChange']);
 
+const filters = defineModel('filters', { type: Object, default: () => ({}) });
+
+const searchInputRef = useTemplateRef('searchInputRef');
 const searchQuery = ref(props.initialQuery);
-const isInputFocused = ref(false);
 
-const searchInput = useTemplateRef('searchInput');
-
-const handler = e => {
-  if (e.key === '/' && document.activeElement.tagName !== 'INPUT') {
-    e.preventDefault();
-    searchInput.value.focus();
-  } else if (e.key === 'Escape' && document.activeElement.tagName === 'INPUT') {
-    e.preventDefault();
-    searchInput.value.blur();
+const onSearch = query => {
+  if (query?.trim() && searchInputRef.value) {
+    searchInputRef.value.addToRecentSearches(query.trim());
   }
+  emit('search', query);
 };
 
-const debouncedEmit = debounce(
-  value =>
-    emit('search', value.length > 1 || value.match(/^[0-9]+$/) ? value : ''),
-  500
-);
-
-const onInput = e => {
-  searchQuery.value = e.target.value;
-  debouncedEmit(searchQuery.value);
-};
-
-const onFocus = () => {
-  isInputFocused.value = true;
-};
-
-const onBlur = () => {
-  isInputFocused.value = false;
+const onSelectRecentSearch = query => {
+  searchQuery.value = query;
+  onSearch(query);
 };
 
 watch(
@@ -54,51 +40,30 @@ watch(
   },
   { immediate: true }
 );
-
-onMounted(() => {
-  searchInput.value.focus();
-  document.addEventListener('keydown', handler);
-});
-
-onUnmounted(() => {
-  document.removeEventListener('keydown', handler);
-});
 </script>
 
 <template>
-  <div
-    class="input-container rounded-xl transition-[border-bottom] duration-[0.2s] ease-[ease-in-out] relative flex items-center py-2 px-4 h-14 gap-2 border border-solid bg-n-alpha-black2"
-    :class="{
-      'border-n-brand': isInputFocused,
-      'border-n-weak': !isInputFocused,
-    }"
-  >
-    <div class="flex items-center">
-      <fluent-icon
-        icon="search"
-        class="icon"
-        aria-hidden="true"
-        :class="{
-          'text-n-blue-text': isInputFocused,
-          'text-n-slate-10': !isInputFocused,
-        }"
-      />
-    </div>
-    <input
-      ref="searchInput"
-      type="search"
-      class="reset-base outline-none w-full m-0 bg-transparent border-transparent shadow-none text-n-slate-12 dark:text-n-slate-12 active:border-transparent active:shadow-none hover:border-transparent hover:shadow-none focus:border-transparent focus:shadow-none"
-      :placeholder="$t('SEARCH.INPUT_PLACEHOLDER')"
-      :value="searchQuery"
-      @focus="onFocus"
-      @blur="onBlur"
-      @input="onInput"
-    />
-    <woot-label
-      :title="$t('SEARCH.PLACEHOLDER_KEYBINDING')"
-      :show-close="false"
-      small
-      class="!m-0 whitespace-nowrap !bg-n-slate-3 dark:!bg-n-solid-3 !border-n-weak dark:!border-n-strong"
-    />
+  <div class="flex flex-col gap-2">
+    <SearchInput
+      ref="searchInputRef"
+      v-model="searchQuery"
+      @search="onSearch"
+      @select-recent-search="onSelectRecentSearch"
+    >
+      <Policy
+        :permissions="ROLES"
+        :installation-types="[
+          INSTALLATION_TYPES.ENTERPRISE,
+          INSTALLATION_TYPES.CLOUD,
+        ]"
+        :feature-flag="FEATURE_FLAGS.ADVANCED_SEARCH"
+        class="w-full"
+      >
+        <SearchFilters
+          v-model="filters"
+          @update-filters="$emit('filterChange', $event)"
+        />
+      </Policy>
+    </SearchInput>
   </div>
 </template>
diff --git a/app/javascript/dashboard/modules/search/components/SearchInboxSelector.vue b/app/javascript/dashboard/modules/search/components/SearchInboxSelector.vue
new file mode 100644
index 000000000..91c556ec2
--- /dev/null
+++ b/app/javascript/dashboard/modules/search/components/SearchInboxSelector.vue
@@ -0,0 +1,125 @@
+<script setup>
+import { ref, computed, defineModel } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useToggle } from '@vueuse/core';
+import { vOnClickOutside } from '@vueuse/components';
+import { useMapGetter } from 'dashboard/composables/store.js';
+import { useCamelCase } from 'dashboard/composables/useTransformKeys';
+import DropdownMenu from 'dashboard/components-next/dropdown-menu/DropdownMenu.vue';
+import Button from 'dashboard/components-next/button/Button.vue';
+
+const props = defineProps({
+  label: {
+    type: String,
+    required: true,
+  },
+});
+
+const emit = defineEmits(['change']);
+const modelValue = defineModel({
+  type: [String, Number],
+  default: null,
+});
+
+const MENU_ITEM_TYPES = {
+  INBOX: 'inbox',
+};
+
+const MENU_ACTIONS = {
+  SELECT: 'select',
+};
+
+const { t } = useI18n();
+const [showDropdown, toggleDropdown] = useToggle();
+
+const searchQuery = ref('');
+
+const inboxesList = useMapGetter('inboxes/getInboxes');
+
+const inboxesSection = computed(() => {
+  const inboxes = inboxesList.value?.map(inbox => {
+    const transformedInbox = useCamelCase(inbox, { deep: true });
+    return {
+      label: transformedInbox.name,
+      value: transformedInbox.id,
+      action: MENU_ACTIONS.SELECT,
+      type: MENU_ITEM_TYPES.INBOX,
+      thumbnail: {
+        name: transformedInbox.name,
+        src: transformedInbox.avatarUrl,
+      },
+      isSelected: modelValue.value === transformedInbox.id,
+    };
+  });
+
+  if (!searchQuery.value) return inboxes;
+
+  return inboxes.filter(inbox =>
+    inbox.label.toLowerCase().includes(searchQuery.value.toLowerCase())
+  );
+});
+
+const menuSections = computed(() => {
+  return [
+    {
+      title: t('SEARCH.FILTERS.INBOXES'),
+      items: inboxesSection.value,
+      emptyState: t('SEARCH.FILTERS.NO_INBOXES'),
+    },
+  ];
+});
+
+const selectedLabel = computed(() => {
+  if (!modelValue.value) return props.label;
+
+  // Find the selected inbox
+  const inbox = inboxesList.value?.find(i => i.id === modelValue.value);
+  if (inbox) return `${props.label}: ${inbox.name}`;
+
+  return `${props.label}: ${modelValue.value}`;
+});
+
+const handleAction = item => {
+  if (modelValue.value === item.value) {
+    modelValue.value = null;
+  } else {
+    modelValue.value = item.value;
+  }
+  toggleDropdown(false);
+  emit('change');
+};
+
+const onToggleDropdown = () => {
+  if (!showDropdown.value) {
+    searchQuery.value = '';
+  }
+  toggleDropdown();
+};
+</script>
+
+<template>
+  <div
+    v-on-click-outside="() => toggleDropdown(false)"
+    class="relative flex items-center group min-w-0 max-w-full"
+  >
+    <Button
+      sm
+      :variant="showDropdown ? 'faded' : 'ghost'"
+      slate
+      :label="selectedLabel"
+      trailing-icon
+      icon="i-lucide-chevron-down"
+      class="!px-2 max-w-full"
+      @click="onToggleDropdown"
+    />
+    <DropdownMenu
+      v-if="showDropdown"
+      :menu-sections="menuSections"
+      show-search
+      disable-local-filtering
+      class="mt-1 ltr:right-0 rtl:left-0 top-full w-64 max-h-80 overflow-y-auto"
+      @search="searchQuery = $event"
+      @action="handleAction"
+    />
+  </div>
+</template>
diff --git a/app/javascript/dashboard/modules/search/components/SearchInput.vue b/app/javascript/dashboard/modules/search/components/SearchInput.vue
new file mode 100644
index 000000000..9d05afbc0
--- /dev/null
+++ b/app/javascript/dashboard/modules/search/components/SearchInput.vue
@@ -0,0 +1,136 @@
+<script setup>
+import { ref, useTemplateRef, onMounted, onUnmounted } from 'vue';
+import { debounce } from '@chatwoot/utils';
+import RecentSearches from './RecentSearches.vue';
+
+const emit = defineEmits(['search', 'selectRecentSearch']);
+
+const searchQuery = defineModel({
+  type: String,
+  default: '',
+});
+const isInputFocused = ref(false);
+const showRecentSearches = ref(false);
+const searchInput = useTemplateRef('searchInput');
+const recentSearchesRef = useTemplateRef('recentSearchesRef');
+
+const handler = e => {
+  if (e.key === '/' && document.activeElement.tagName !== 'INPUT') {
+    e.preventDefault();
+    searchInput.value.focus();
+  } else if (e.key === 'Escape' && document.activeElement.tagName === 'INPUT') {
+    e.preventDefault();
+    searchInput.value.blur();
+  }
+};
+
+const debouncedEmit = debounce(
+  value =>
+    emit('search', value.length > 1 || value.match(/^[0-9]+$/) ? value : ''),
+  500
+);
+
+const onInput = () => {
+  debouncedEmit(searchQuery.value);
+
+  if (searchQuery.value.trim()) {
+    showRecentSearches.value = false;
+  } else if (isInputFocused.value) {
+    showRecentSearches.value = true;
+  }
+};
+
+const onFocus = () => {
+  isInputFocused.value = true;
+  if (!searchQuery.value.trim()) {
+    showRecentSearches.value = true;
+  }
+};
+
+const onBlur = () => {
+  isInputFocused.value = false;
+  showRecentSearches.value = false;
+};
+
+const onSelectRecentSearch = query => {
+  searchQuery.value = query;
+  emit('selectRecentSearch', query);
+  showRecentSearches.value = false;
+  searchInput.value.focus();
+};
+
+const addToRecentSearches = query => {
+  if (recentSearchesRef.value) {
+    recentSearchesRef.value.addRecentSearch(query);
+  }
+};
+
+defineExpose({
+  addToRecentSearches,
+});
+
+onMounted(() => {
+  searchInput.value.focus();
+  document.addEventListener('keydown', handler);
+});
+
+onUnmounted(() => {
+  document.removeEventListener('keydown', handler);
+});
+</script>
+
+<template>
+  <div
+    class="rounded-xl transition-[border-bottom] duration-[0.2s] ease-[ease-in-out] relative flex items-start flex-col border border-solid bg-n-solid-1 divide-y divide-n-strong"
+    :class="{
+      'border-n-brand': isInputFocused,
+      'border-n-strong': !isInputFocused,
+    }"
+  >
+    <div class="flex items-center w-full h-[3.25rem] px-4 gap-2">
+      <div class="flex items-center">
+        <fluent-icon
+          icon="search"
+          class="icon"
+          aria-hidden="true"
+          :class="{
+            'text-n-blue-text': isInputFocused,
+            'text-n-slate-10': !isInputFocused,
+          }"
+        />
+      </div>
+      <input
+        ref="searchInput"
+        v-model="searchQuery"
+        type="search"
+        class="reset-base outline-none w-full m-0 bg-transparent border-transparent shadow-none text-n-slate-12 dark:text-n-slate-12 active:border-transparent active:shadow-none hover:border-transparent hover:shadow-none focus:border-transparent focus:shadow-none placeholder:text-n-slate-10 text-base"
+        :placeholder="$t('SEARCH.INPUT_PLACEHOLDER')"
+        @focus="onFocus"
+        @blur="onBlur"
+        @input="onInput"
+      />
+      <span class="text-sm text-n-slate-10 flex-shrink-0">
+        {{ $t('SEARCH.PLACEHOLDER_KEYBINDING') }}
+      </span>
+    </div>
+
+    <slot />
+
+    <div
+      class="transition-all duration-200 ease-out grid overflow-hidden w-full !border-t-0"
+      :class="
+        showRecentSearches
+          ? 'grid-rows-[1fr] opacity-100'
+          : 'grid-rows-[0fr] opacity-0'
+      "
+    >
+      <div class="overflow-hidden w-full">
+        <RecentSearches
+          ref="recentSearchesRef"
+          @select-search="onSelectRecentSearch"
+          @clear-all="showRecentSearches = false"
+        />
+      </div>
+    </div>
+  </div>
+</template>
diff --git a/app/javascript/dashboard/modules/search/components/SearchResultArticleItem.vue b/app/javascript/dashboard/modules/search/components/SearchResultArticleItem.vue
index 7e2da950e..0d2588083 100644
--- a/app/javascript/dashboard/modules/search/components/SearchResultArticleItem.vue
+++ b/app/javascript/dashboard/modules/search/components/SearchResultArticleItem.vue
@@ -1,7 +1,10 @@
 <script setup>
 import { computed } from 'vue';
-import Icon from 'next/icon/Icon.vue';
 import { frontendURL } from 'dashboard/helper/URLHelper';
+import { dynamicTime } from 'shared/helpers/timeHelper';
+import { ARTICLE_STATUSES } from 'dashboard/helper/portalHelper';
+
+import CardLayout from 'dashboard/components-next/CardLayout.vue';
 import MessageFormatter from 'shared/helpers/MessageFormatter';
 
 const props = defineProps({
@@ -13,6 +16,8 @@ const props = defineProps({
   content: { type: String, default: '' },
   portalSlug: { type: String, required: true },
   accountId: { type: [String, Number], default: 0 },
+  status: { type: String, default: '' },
+  updatedAt: { type: Number, default: 0 },
 });
 
 const MAX_LENGTH = 300;
@@ -23,6 +28,11 @@ const navigateTo = computed(() => {
   );
 });
 
+const updatedAtTime = computed(() => {
+  if (!props.updatedAt) return '';
+  return dynamicTime(props.updatedAt);
+});
+
 const truncatedContent = computed(() => {
   if (!props.content) return props.description || '';
 
@@ -34,36 +44,62 @@ const truncatedContent = computed(() => {
     ? `${plainText.substring(0, MAX_LENGTH)}...`
     : plainText;
 });
+
+const statusTextColor = computed(() => {
+  switch (props.status) {
+    case ARTICLE_STATUSES.ARCHIVED:
+      return 'text-n-slate-12';
+    case ARTICLE_STATUSES.DRAFT:
+      return 'text-n-amber-11';
+    default:
+      return 'text-n-teal-11';
+  }
+});
 </script>
 
 <template>
-  <router-link
-    :to="navigateTo"
-    class="flex items-start p-2 rounded-xl cursor-pointer hover:bg-n-slate-2"
-  >
-    <div
-      class="flex items-center justify-center w-6 h-6 mt-0.5 rounded bg-n-slate-3"
+  <router-link :to="navigateTo">
+    <CardLayout
+      layout="col"
+      class="[&>div]:justify-start [&>div]:gap-2 [&>div]:px-4 [&>div]:pt-4 [&>div]:pb-5 [&>div]:items-start hover:bg-n-slate-2 dark:hover:bg-n-solid-3"
     >
-      <Icon icon="i-lucide-library-big" class="text-n-slate-10" />
-    </div>
-    <div class="ltr:ml-2 rtl:mr-2 min-w-0 flex-1">
-      <div class="flex items-center gap-2">
-        <h5 class="text-sm font-medium truncate min-w-0 text-n-slate-12">
-          {{ title }}
-        </h5>
-        <span
-          v-if="category"
-          class="text-xs font-medium whitespace-nowrap capitalize bg-n-slate-3 px-1 py-0.5 rounded text-n-slate-10"
+      <div class="min-w-0 flex-1 flex flex-col items-start gap-2 w-full">
+        <div class="flex items-center min-w-0 justify-between gap-2 w-full">
+          <div class="flex items-center gap-2">
+            <h5
+              class="text-sm font-medium leading-4 truncate min-w-0 text-n-slate-12"
+            >
+              {{ title }}
+            </h5>
+            <div v-if="category" class="w-px h-4 bg-n-strong mx-2" />
+            <span
+              v-if="category"
+              class="text-xs inline-flex items-center font-medium rounded-md whitespace-nowrap capitalize bg-n-alpha-2 px-1.5 h-6 text-n-slate-12"
+            >
+              {{ category }}
+            </span>
+            <span
+              v-if="status"
+              class="text-xs inline-flex items-center font-medium rounded-md whitespace-nowrap capitalize bg-n-alpha-2 px-2 h-6"
+              :class="statusTextColor"
+            >
+              {{ status }}
+            </span>
+          </div>
+          <span
+            v-if="updatedAtTime"
+            class="text-sm font-normal min-w-0 truncate text-n-slate-11"
+          >
+            {{ updatedAtTime }}
+          </span>
+        </div>
+        <p
+          v-if="truncatedContent"
+          class="text-sm leading-6 text-n-slate-11 line-clamp-2"
         >
-          {{ category }}
-        </span>
+          {{ truncatedContent }}
+        </p>
       </div>
-      <p
-        v-if="truncatedContent"
-        class="mt-1 text-sm text-n-slate-11 line-clamp-2"
-      >
-        {{ truncatedContent }}
-      </p>
-    </div>
+    </CardLayout>
   </router-link>
 </template>
diff --git a/app/javascript/dashboard/modules/search/components/SearchResultArticlesList.vue b/app/javascript/dashboard/modules/search/components/SearchResultArticlesList.vue
index 679e411c2..f8489874a 100644
--- a/app/javascript/dashboard/modules/search/components/SearchResultArticlesList.vue
+++ b/app/javascript/dashboard/modules/search/components/SearchResultArticlesList.vue
@@ -34,18 +34,19 @@ const accountId = useMapGetter('getCurrentAccountId');
     :show-title="showTitle"
     :is-fetching="isFetching"
   >
-    <ul v-if="articles.length" class="space-y-1.5 list-none">
+    <ul v-if="articles.length" class="space-y-3 list-none">
       <li v-for="article in articles" :key="article.id">
         <SearchResultArticleItem
           :id="article.id"
           :title="article.title"
           :description="article.description"
           :content="article.content"
-          :portal-slug="article.portal_slug"
+          :portal-slug="article.portalSlug"
           :locale="article.locale"
           :account-id="accountId"
-          :category="article.category_name"
+          :category="article.categoryName"
           :status="article.status"
+          :updated-at="article.updatedAt"
         />
       </li>
     </ul>
diff --git a/app/javascript/dashboard/modules/search/components/SearchResultContactItem.vue b/app/javascript/dashboard/modules/search/components/SearchResultContactItem.vue
index 30c6f0557..a8ce1220b 100644
--- a/app/javascript/dashboard/modules/search/components/SearchResultContactItem.vue
+++ b/app/javascript/dashboard/modules/search/components/SearchResultContactItem.vue
@@ -1,8 +1,12 @@
 <script setup>
 import { computed } from 'vue';
 import { frontendURL } from 'dashboard/helper/URLHelper';
+import countries from 'shared/constants/countries';
+import { dynamicTime } from 'shared/helpers/timeHelper';
 
+import CardLayout from 'dashboard/components-next/CardLayout.vue';
 import Avatar from 'dashboard/components-next/avatar/Avatar.vue';
+import Flag from 'dashboard/components-next/flag/Flag.vue';
 
 const props = defineProps({
   id: {
@@ -29,38 +33,122 @@ const props = defineProps({
     type: [String, Number],
     default: 0,
   },
+  additionalAttributes: {
+    type: Object,
+    default: () => ({}),
+  },
+  updatedAt: {
+    type: Number,
+    default: 0,
+  },
 });
 
 const navigateTo = computed(() => {
   return frontendURL(`accounts/${props.accountId}/contacts/${props.id}`);
 });
+
+const countriesMap = computed(() => {
+  return countries.reduce((acc, country) => {
+    acc[country.code] = country;
+    acc[country.id] = country;
+    return acc;
+  }, {});
+});
+
+const updatedAtTime = computed(() => {
+  if (!props.updatedAt) return '';
+  return dynamicTime(props.updatedAt);
+});
+
+const countryDetails = computed(() => {
+  const { country, countryCode, city } = props.additionalAttributes;
+
+  if (!country && !countryCode) return null;
+
+  const activeCountry =
+    countriesMap.value[country] || countriesMap.value[countryCode];
+
+  if (!activeCountry) return null;
+
+  return {
+    countryCode: activeCountry.id,
+    city: city ? `${city},` : null,
+    name: activeCountry.name,
+  };
+});
+
+const formattedLocation = computed(() => {
+  if (!countryDetails.value) return '';
+
+  return [countryDetails.value.city, countryDetails.value.name]
+    .filter(Boolean)
+    .join(' ');
+});
 </script>
 
 <template>
-  <router-link
-    :to="navigateTo"
-    class="flex items-start p-2 rounded-xl cursor-pointer hover:bg-n-slate-2"
-  >
-    <Avatar
-      :name="name"
-      :src="thumbnail"
-      :size="24"
-      rounded-full
-      class="mt-0.5"
-    />
-    <div class="ml-2 rtl:mr-2 min-w-0 rtl:ml-0">
-      <h5 class="text-sm name truncate min-w-0 text-n-slate-12">
-        {{ name }}
-      </h5>
-      <p
-        class="grid items-center m-0 gap-1 text-sm grid-cols-[minmax(0,1fr)_auto_auto]"
-      >
-        <span v-if="email" class="truncate text-n-slate-12" :title="email">
-          {{ email }}
-        </span>
-        <span v-if="phone" class="text-n-slate-10">•</span>
-        <span v-if="phone" class="text-n-slate-12">{{ phone }}</span>
-      </p>
-    </div>
+  <router-link :to="navigateTo">
+    <CardLayout
+      layout="row"
+      class="[&>div]:justify-start [&>div]:px-4 [&>div]:py-3 [&>div]:items-start hover:bg-n-slate-2 dark:hover:bg-n-solid-3"
+    >
+      <Avatar
+        :name="name"
+        :src="thumbnail"
+        :size="24"
+        rounded-full
+        class="mt-1 flex-shrink-0"
+      />
+      <div class="min-w-0 flex flex-col items-start gap-1.5 w-full">
+        <div class="flex items-center min-w-0 justify-between gap-2 w-full">
+          <h5 class="text-sm font-medium truncate min-w-0 text-n-slate-12 py-1">
+            {{ name }}
+          </h5>
+          <span
+            v-if="updatedAtTime"
+            class="text-sm font-normal min-w-0 truncate text-n-slate-11"
+          >
+            {{ $t('SEARCH.UPDATED_AT', { time: updatedAtTime }) }}
+          </span>
+        </div>
+        <div
+          class="grid items-center gap-3 m-0 text-sm overflow-hidden min-w-0 grid-cols-[minmax(0,max-content)_auto_minmax(0,max-content)_auto_minmax(0,max-content)]"
+        >
+          <span
+            v-if="email"
+            class="truncate text-n-slate-11 min-w-0"
+            :title="email"
+          >
+            {{ email }}
+          </span>
+
+          <div v-if="email && phone" class="w-px h-3 bg-n-slate-6 rounded" />
+
+          <span
+            v-if="phone"
+            :title="phone"
+            class="truncate text-n-slate-11 min-w-0"
+          >
+            {{ phone }}
+          </span>
+
+          <div
+            v-if="(email || phone) && countryDetails"
+            class="w-px h-3 bg-n-slate-6 rounded"
+          />
+
+          <span
+            v-if="countryDetails"
+            class="truncate text-n-slate-11 flex items-center gap-1 min-w-0"
+          >
+            <Flag
+              :country="countryDetails.countryCode"
+              class="size-3 shrink-0"
+            />
+            <span class="truncate min-w-0">{{ formattedLocation }}</span>
+          </span>
+        </div>
+      </div>
+    </CardLayout>
   </router-link>
 </template>
diff --git a/app/javascript/dashboard/modules/search/components/SearchResultContactsList.vue b/app/javascript/dashboard/modules/search/components/SearchResultContactsList.vue
index 9e1c93587..85f76d6c4 100644
--- a/app/javascript/dashboard/modules/search/components/SearchResultContactsList.vue
+++ b/app/javascript/dashboard/modules/search/components/SearchResultContactsList.vue
@@ -34,15 +34,17 @@ const accountId = useMapGetter('getCurrentAccountId');
     :show-title="showTitle"
     :is-fetching="isFetching"
   >
-    <ul v-if="contacts.length" class="space-y-1.5 list-none">
+    <ul v-if="contacts.length" class="space-y-3 list-none">
       <li v-for="contact in contacts" :key="contact.id">
         <SearchResultContactItem
           :id="contact.id"
           :name="contact.name"
           :email="contact.email"
-          :phone="contact.phone_number"
+          :phone="contact.phoneNumber"
+          :additional-attributes="contact.additionalAttributes"
           :account-id="accountId"
           :thumbnail="contact.thumbnail"
+          :updated-at="contact.lastActivityAt"
         />
       </li>
     </ul>
diff --git a/app/javascript/dashboard/modules/search/components/SearchResultConversationItem.vue b/app/javascript/dashboard/modules/search/components/SearchResultConversationItem.vue
index 26a11eba3..e0047a65e 100644
--- a/app/javascript/dashboard/modules/search/components/SearchResultConversationItem.vue
+++ b/app/javascript/dashboard/modules/search/components/SearchResultConversationItem.vue
@@ -1,10 +1,12 @@
 <script setup>
 import { computed } from 'vue';
-
 import { frontendURL } from 'dashboard/helper/URLHelper.js';
 import { dynamicTime } from 'shared/helpers/timeHelper';
-import InboxName from 'dashboard/components/widgets/InboxName.vue';
-import Avatar from 'dashboard/components-next/avatar/Avatar.vue';
+import { useInbox } from 'dashboard/composables/useInbox';
+import { getInboxIconByType } from 'dashboard/helper/inbox';
+
+import CardLayout from 'dashboard/components-next/CardLayout.vue';
+import Icon from 'dashboard/components-next/icon/Icon.vue';
 
 const props = defineProps({
   id: {
@@ -41,6 +43,8 @@ const props = defineProps({
   },
 });
 
+const { inbox } = useInbox(props.inbox?.id);
+
 const navigateTo = computed(() => {
   const params = {};
   if (props.messageId) {
@@ -52,7 +56,10 @@ const navigateTo = computed(() => {
   );
 });
 
-const createdAtTime = dynamicTime(props.createdAt);
+const createdAtTime = computed(() => {
+  if (!props.createdAt) return '';
+  return dynamicTime(props.createdAt);
+});
 
 const infoItems = computed(() => [
   {
@@ -75,58 +82,76 @@ const infoItems = computed(() => [
 const visibleInfoItems = computed(() =>
   infoItems.value.filter(item => item.show)
 );
+
+const inboxName = computed(() => props.inbox?.name);
+
+const inboxIcon = computed(() => {
+  if (!inbox.value) return null;
+  const { channelType, medium } = inbox.value;
+  return getInboxIconByType(channelType, medium);
+});
 </script>
 
 <template>
-  <router-link
-    :to="navigateTo"
-    class="flex p-2 rounded-xl cursor-pointer hover:bg-n-slate-2"
-  >
-    <Avatar
-      name="chats"
-      :size="24"
-      icon-name="i-lucide-messages-square"
-      class="[&>span]:rounded"
-    />
-    <div class="flex-grow min-w-0 ml-2">
-      <div class="flex items-center min-w-0 justify-between gap-1 mb-1">
-        <div class="flex">
-          <woot-label
-            class="!bg-n-slate-3 dark:!bg-n-solid-3 !border-n-weak dark:!border-n-strong m-0"
-            :title="`#${id}`"
-            :show-close="false"
-            small
-          />
-          <div
-            class="flex items-center justify-center h-5 ml-1 rounded bg-n-slate-3 dark:bg-n-solid-3 w-fit rtl:ml-0 rtl:mr-1"
-          >
-            <InboxName
-              :inbox="inbox"
-              class="mx-2 bg-n-slate-3 dark:bg-n-solid-3 text-n-slate-11 dark:text-n-slate-11"
+  <router-link :to="navigateTo">
+    <CardLayout
+      layout="col"
+      class="[&>div]:justify-start [&>div]:gap-2 [&>div]:px-4 [&>div]:py-3 [&>div]:items-start hover:bg-n-slate-2 dark:hover:bg-n-solid-3"
+    >
+      <div
+        class="flex items-center min-w-0 justify-between gap-2 w-full h-7 mb-1"
+      >
+        <div class="flex items-center gap-3">
+          <div class="flex items-center gap-1.5 flex-shrink-0">
+            <Icon
+              icon="i-lucide-hash"
+              class="flex-shrink-0 text-n-slate-11 size-4"
             />
+            <span class="text-n-slate-12 text-sm leading-4">
+              {{ id }}
+            </span>
+          </div>
+          <div v-if="inboxName" class="w-px h-3 bg-n-strong" />
+          <div v-if="inboxName" class="flex items-center gap-1.5 flex-shrink-0">
+            <div
+              v-if="inboxIcon"
+              class="flex items-center justify-center flex-shrink-0 rounded-full bg-n-alpha-2 size-4"
+            >
+              <Icon
+                :icon="inboxIcon"
+                class="flex-shrink-0 text-n-slate-11 size-2.5"
+              />
+            </div>
+            <span class="text-sm leading-4 text-n-slate-12">
+              {{ inboxName }}
+            </span>
           </div>
         </div>
         <span
-          class="text-xs font-normal min-w-0 truncate text-n-slate-11 dark:text-n-slate-11"
+          v-if="createdAtTime"
+          class="text-sm font-normal min-w-0 truncate text-n-slate-11"
         >
           {{ createdAtTime }}
         </span>
       </div>
-      <div class="flex flex-wrap gap-x-2 gap-y-1.5">
-        <h5
-          v-for="item in visibleInfoItems"
-          :key="item.label"
-          class="m-0 text-sm min-w-0 text-n-slate-12 dark:text-n-slate-12 truncate"
+      <div class="flex flex-wrap gap-x-2 gap-y-1.5 items-center">
+        <template
+          v-for="(item, index) in visibleInfoItems"
+          :key="`info-${index}`"
         >
-          <span
-            class="text-xs font-normal text-n-slate-11 dark:text-n-slate-11"
-          >
-            {{ $t(item.label) }}:
-          </span>
-          {{ item.value }}
-        </h5>
+          <h5 class="m-0 text-sm min-w-0 text-n-slate-12 truncate">
+            <span class="text-sm leading-4 font-normal text-n-slate-11">
+              {{ $t(item.label) + ':' }}
+            </span>
+            {{ item.value }}
+          </h5>
+          <div
+            v-if="index < visibleInfoItems.length - 1"
+            class="w-px h-3 bg-n-strong"
+          />
+        </template>
       </div>
       <slot />
-    </div>
+    </CardLayout>
   </router-link>
 </template>
diff --git a/app/javascript/dashboard/modules/search/components/SearchResultConversationsList.vue b/app/javascript/dashboard/modules/search/components/SearchResultConversationsList.vue
index 55c6cdb43..c990dafcd 100644
--- a/app/javascript/dashboard/modules/search/components/SearchResultConversationsList.vue
+++ b/app/javascript/dashboard/modules/search/components/SearchResultConversationsList.vue
@@ -1,6 +1,7 @@
 <script setup>
 import { defineProps, computed } from 'vue';
 import { useMapGetter } from 'dashboard/composables/store.js';
+
 import SearchResultSection from './SearchResultSection.vue';
 import SearchResultConversationItem from './SearchResultConversationItem.vue';
 
@@ -28,7 +29,7 @@ const accountId = useMapGetter('getCurrentAccountId');
 const conversationsWithSubject = computed(() => {
   return props.conversations.map(conversation => ({
     ...conversation,
-    mail_subject: conversation.additional_attributes?.mail_subject || '',
+    mailSubject: conversation.additionalAttributes?.mailSubject || '',
   }));
 });
 </script>
@@ -41,7 +42,7 @@ const conversationsWithSubject = computed(() => {
     :show-title="showTitle"
     :is-fetching="isFetching"
   >
-    <ul v-if="conversations.length" class="space-y-1.5 list-none">
+    <ul v-if="conversations.length" class="space-y-3 list-none">
       <li
         v-for="conversation in conversationsWithSubject"
         :key="conversation.id"
@@ -52,8 +53,8 @@ const conversationsWithSubject = computed(() => {
           :email="conversation.contact.email"
           :account-id="accountId"
           :inbox="conversation.inbox"
-          :created-at="conversation.created_at"
-          :email-subject="conversation.mail_subject"
+          :created-at="conversation.createdAt"
+          :email-subject="conversation.mailSubject"
         />
       </li>
     </ul>
diff --git a/app/javascript/dashboard/modules/search/components/SearchResultMessageItem.vue b/app/javascript/dashboard/modules/search/components/SearchResultMessageItem.vue
new file mode 100644
index 000000000..b9272c928
--- /dev/null
+++ b/app/javascript/dashboard/modules/search/components/SearchResultMessageItem.vue
@@ -0,0 +1,169 @@
+<script setup>
+import { computed } from 'vue';
+import { frontendURL } from 'dashboard/helper/URLHelper.js';
+import { dynamicTime } from 'shared/helpers/timeHelper';
+import { getInboxIconByType } from 'dashboard/helper/inbox';
+import { useInbox } from 'dashboard/composables/useInbox';
+import { ATTACHMENT_TYPES } from 'dashboard/components-next/message/constants.js';
+
+import CardLayout from 'dashboard/components-next/CardLayout.vue';
+import Icon from 'dashboard/components-next/icon/Icon.vue';
+import FileChip from 'next/message/chips/File.vue';
+import AudioChip from 'next/message/chips/Audio.vue';
+import TranscribedText from './TranscribedText.vue';
+
+const props = defineProps({
+  id: {
+    type: Number,
+    default: 0,
+  },
+  inboxId: {
+    type: Number,
+    default: 0,
+  },
+  isPrivate: {
+    type: Boolean,
+    default: false,
+  },
+  accountId: {
+    type: [String, Number],
+    default: '',
+  },
+  createdAt: {
+    type: [String, Date, Number],
+    default: '',
+  },
+  messageId: {
+    type: Number,
+    default: 0,
+  },
+  attachments: {
+    type: Array,
+    default: () => [],
+  },
+});
+
+const { inbox } = useInbox(props.inboxId);
+
+const navigateTo = computed(() => {
+  const params = {};
+  if (props.messageId) {
+    params.messageId = props.messageId;
+  }
+  return frontendURL(
+    `accounts/${props.accountId}/conversations/${props.id}`,
+    params
+  );
+});
+
+const createdAtTime = computed(() => {
+  if (!props.createdAt) return '';
+  return dynamicTime(props.createdAt);
+});
+
+const inboxName = computed(() => inbox.value?.name);
+
+const inboxIcon = computed(() => {
+  if (!inbox.value) return null;
+  const { channelType, medium } = inbox.value;
+  return getInboxIconByType(channelType, medium);
+});
+
+const fileAttachments = computed(() => {
+  return props.attachments.filter(
+    attachment => attachment.fileType !== ATTACHMENT_TYPES.AUDIO
+  );
+});
+
+const audioAttachments = computed(() => {
+  return props.attachments.filter(
+    attachment => attachment.fileType === ATTACHMENT_TYPES.AUDIO
+  );
+});
+</script>
+
+<template>
+  <router-link :to="navigateTo">
+    <CardLayout
+      layout="col"
+      class="[&>div]:justify-start [&>div]:gap-2 [&>div]:px-4 [&>div]:py-3 [&>div]:items-start hover:bg-n-slate-2 dark:hover:bg-n-solid-3"
+    >
+      <div
+        class="flex items-center min-w-0 justify-between gap-2 w-full h-7 mb-1"
+      >
+        <div class="flex items-center gap-3">
+          <div class="flex items-center gap-1.5 flex-shrink-0">
+            <Icon
+              icon="i-lucide-hash"
+              class="flex-shrink-0 text-n-slate-11 size-4"
+            />
+            <span class="text-n-slate-12 text-sm leading-4">
+              {{ id }}
+            </span>
+          </div>
+          <div v-if="inboxName" class="w-px h-3 bg-n-strong" />
+          <div v-if="inboxName" class="flex items-center gap-1.5 flex-shrink-0">
+            <div
+              v-if="inboxIcon"
+              class="flex items-center justify-center flex-shrink-0 rounded-full bg-n-alpha-2 size-4"
+            >
+              <Icon
+                :icon="inboxIcon"
+                class="flex-shrink-0 text-n-slate-11 size-2.5"
+              />
+            </div>
+            <span class="text-sm leading-4 text-n-slate-12">
+              {{ inboxName }}
+            </span>
+          </div>
+          <div v-if="isPrivate" class="w-px h-3 bg-n-strong" />
+          <div
+            v-if="isPrivate"
+            class="flex items-center text-n-amber-11 gap-1.5 flex-shrink-0"
+          >
+            <Icon icon="i-lucide-lock-keyhole" class="flex-shrink-0 size-3.5" />
+            <span class="text-sm leading-4">
+              {{ $t('SEARCH.PRIVATE') }}
+            </span>
+          </div>
+        </div>
+        <span
+          v-if="createdAtTime"
+          class="text-sm font-normal min-w-0 truncate text-n-slate-11"
+        >
+          {{ createdAtTime }}
+        </span>
+      </div>
+      <slot />
+      <div v-if="audioAttachments.length" class="mt-1.5 space-y-4 w-full">
+        <div
+          v-for="attachment in audioAttachments"
+          :key="attachment.id"
+          class="w-full"
+        >
+          <AudioChip
+            class="bg-n-alpha-2 dark:bg-n-alpha-2 text-n-slate-12"
+            :attachment="attachment"
+            :show-transcribed-text="false"
+            @click.prevent
+          />
+          <div v-if="attachment.transcribedText" class="pt-2">
+            <TranscribedText :text="attachment.transcribedText" />
+          </div>
+        </div>
+      </div>
+      <div
+        v-if="fileAttachments.length"
+        class="flex gap-2 flex-wrap items-center mt-1.5"
+      >
+        <FileChip
+          v-for="attachment in fileAttachments"
+          :key="attachment.id"
+          :attachment="attachment"
+          class="!h-8"
+          @click.stop
+        />
+      </div>
+    </CardLayout>
+  </router-link>
+</template>
diff --git a/app/javascript/dashboard/modules/search/components/SearchResultMessagesList.vue b/app/javascript/dashboard/modules/search/components/SearchResultMessagesList.vue
index 956a6e220..40fd7e013 100644
--- a/app/javascript/dashboard/modules/search/components/SearchResultMessagesList.vue
+++ b/app/javascript/dashboard/modules/search/components/SearchResultMessagesList.vue
@@ -2,7 +2,7 @@
 import { useI18n } from 'vue-i18n';
 import { useMapGetter } from 'dashboard/composables/store.js';
 
-import SearchResultConversationItem from './SearchResultConversationItem.vue';
+import SearchResultMessageItem from './SearchResultMessageItem.vue';
 import SearchResultSection from './SearchResultSection.vue';
 import MessageContent from './MessageContent.vue';
 
@@ -43,21 +43,23 @@ const getName = message => {
     :show-title="showTitle"
     :is-fetching="isFetching"
   >
-    <ul v-if="messages.length" class="space-y-1.5 list-none">
+    <ul v-if="messages.length" class="space-y-3 list-none">
       <li v-for="message in messages" :key="message.id">
-        <SearchResultConversationItem
-          :id="message.conversation_id"
+        <SearchResultMessageItem
+          :id="message.conversationId"
           :account-id="accountId"
-          :inbox="message.inbox"
-          :created-at="message.created_at"
+          :inbox-id="message.inboxId"
+          :created-at="message.createdAt"
           :message-id="message.id"
+          :is-private="message.private"
+          :attachments="message.attachments"
         >
           <MessageContent
             :author="getName(message)"
             :message="message"
             :search-term="query"
           />
-        </SearchResultConversationItem>
+        </SearchResultMessageItem>
       </li>
     </ul>
   </SearchResultSection>
diff --git a/app/javascript/dashboard/modules/search/components/SearchResultSection.vue b/app/javascript/dashboard/modules/search/components/SearchResultSection.vue
index 13ba1ce87..40d1ca6c6 100644
--- a/app/javascript/dashboard/modules/search/components/SearchResultSection.vue
+++ b/app/javascript/dashboard/modules/search/components/SearchResultSection.vue
@@ -1,6 +1,8 @@
 <script setup>
 import { computed } from 'vue';
 
+import Icon from 'dashboard/components-next/icon/Icon.vue';
+
 const props = defineProps({
   title: {
     type: String,
@@ -28,9 +30,12 @@ const titleCase = computed(() => props.title.toLowerCase());
 </script>
 
 <template>
-  <section class="mx-0 my-2">
-    <div v-if="showTitle" class="sticky top-0 p-2 z-50 mb-0.5 bg-n-background">
-      <h3 class="text-sm text-n-slate-12">{{ title }}</h3>
+  <section class="mx-0 mb-3">
+    <div
+      v-if="showTitle"
+      class="sticky top-0 pt-2 py-3 z-50 bg-gradient-to-b from-n-background from-80% to-transparent mb-3 -mx-1.5 px-1.5"
+    >
+      <h3 class="text-sm text-n-slate-11">{{ title }}</h3>
     </div>
     <slot />
     <woot-loading-state
@@ -39,9 +44,12 @@ const titleCase = computed(() => props.title.toLowerCase());
     />
     <div
       v-if="empty && !isFetching"
-      class="flex items-center justify-center px-4 py-6 m-2 rounded-xl bg-n-slate-2 dark:bg-n-solid-1"
+      class="flex items-start justify-center px-4 py-6 rounded-xl bg-n-slate-2 dark:bg-n-solid-1"
     >
-      <fluent-icon icon="info" size="16px" class="text-n-slate-11" />
+      <Icon
+        icon="i-lucide-info"
+        class="text-n-slate-11 size-4 flex-shrink-0 mt-[3px]"
+      />
       <p class="mx-2 my-0 text-center text-n-slate-11">
         {{ $t('SEARCH.EMPTY_STATE', { item: titleCase, query }) }}
       </p>
diff --git a/app/javascript/dashboard/modules/search/components/SearchTabs.vue b/app/javascript/dashboard/modules/search/components/SearchTabs.vue
index 9260796ef..86e40df57 100644
--- a/app/javascript/dashboard/modules/search/components/SearchTabs.vue
+++ b/app/javascript/dashboard/modules/search/components/SearchTabs.vue
@@ -1,5 +1,8 @@
 <script setup>
-import { ref, watch } from 'vue';
+import { computed, watch, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import TabBar from 'dashboard/components-next/tabbar/TabBar.vue';
+import Button from 'dashboard/components-next/button/Button.vue';
 
 const props = defineProps({
   tabs: {
@@ -14,6 +17,8 @@ const props = defineProps({
 
 const emit = defineEmits(['tabChange']);
 
+const { t } = useI18n();
+
 const activeTab = ref(props.selectedTab);
 
 watch(
@@ -25,24 +30,35 @@ watch(
   }
 );
 
-const onTabChange = index => {
+const tabBarTabs = computed(() => {
+  return props.tabs.map(tab => ({
+    label: tab.name,
+    count: tab.showBadge ? tab.count : null,
+  }));
+});
+
+const onTabChange = selectedTab => {
+  const index = props.tabs.findIndex(tab => tab.name === selectedTab.label);
   activeTab.value = index;
   emit('tabChange', props.tabs[index].key);
 };
 </script>
 
 <template>
-  <div class="mt-1 border-b border-n-weak">
-    <woot-tabs :index="activeTab" :border="false" @change="onTabChange">
-      <woot-tabs-item
-        v-for="(item, index) in tabs"
-        :key="item.key"
-        :index="index"
-        :name="item.name"
-        :count="item.count"
-        :show-badge="item.showBadge"
-        is-compact
-      />
-    </woot-tabs>
+  <div class="flex items-center justify-between mt-7 mb-4">
+    <TabBar
+      :tabs="tabBarTabs"
+      :initial-active-tab="activeTab"
+      @tab-changed="onTabChange"
+    />
+
+    <Button
+      :label="t('SEARCH.SORT_BY.RELEVANCE')"
+      sm
+      link
+      slate
+      class="hover:!no-underline pointer-events-none lg:inline-flex hidden"
+      icon="i-lucide-arrow-up-down"
+    />
   </div>
 </template>
diff --git a/app/javascript/dashboard/modules/search/components/SearchView.vue b/app/javascript/dashboard/modules/search/components/SearchView.vue
index 88fe43d3e..792ce23e6 100644
--- a/app/javascript/dashboard/modules/search/components/SearchView.vue
+++ b/app/javascript/dashboard/modules/search/components/SearchView.vue
@@ -4,6 +4,8 @@ import { useMapGetter, useStore } from 'dashboard/composables/store.js';
 import { useRouter, useRoute } from 'vue-router';
 import { useTrack } from 'dashboard/composables';
 import { useI18n } from 'vue-i18n';
+import { useCamelCase } from 'dashboard/composables/useTransformKeys';
+import { generateURLParams, parseURLParams } from '../helpers/searchHelper';
 import {
   ROLES,
   CONVERSATION_PERMISSIONS,
@@ -47,7 +49,7 @@ const articleRecords = useMapGetter('conversationSearch/getArticleRecords');
 const uiFlags = useMapGetter('conversationSearch/getUIFlags');
 
 const addTypeToRecords = (records, type) =>
-  records.value.map(item => ({ ...item, type }));
+  records.value.map(item => ({ ...useCamelCase(item, { deep: true }), type }));
 
 const mappedContacts = computed(() =>
   addTypeToRecords(contactRecords, 'contact')
@@ -64,6 +66,11 @@ const mappedArticles = computed(() =>
 
 const isSelectedTabAll = computed(() => selectedTab.value === 'all');
 
+const searchResultSectionClass = computed(() => ({
+  'mt-4': isSelectedTabAll.value,
+  'mt-0.5': !isSelectedTabAll.value,
+}));
+
 const sliceRecordsIfAllTab = items =>
   isSelectedTabAll.value ? items.value.slice(0, 5) : items.value;
 
@@ -227,30 +234,55 @@ const showViewMore = computed(() => ({
   articles: mappedArticles.value?.length > 5 && isSelectedTabAll.value,
 }));
 
+const filters = ref({
+  from: null,
+  in: null,
+  dateRange: { type: null, from: null, to: null },
+});
+
 const clearSearchResult = () => {
   pages.value = { contacts: 1, conversations: 1, messages: 1, articles: 1 };
   store.dispatch('conversationSearch/clearSearchResults');
 };
 
+const buildSearchPayload = (basePayload = {}, searchType = 'message') => {
+  const payload = { ...basePayload };
+
+  // Only include filters if advanced search is enabled
+  if (isFeatureFlagEnabled(FEATURE_FLAGS.ADVANCED_SEARCH)) {
+    // Date filters apply to all search types
+    if (filters.value.dateRange.from) {
+      payload.since = filters.value.dateRange.from;
+    }
+    if (filters.value.dateRange.to) {
+      payload.until = filters.value.dateRange.to;
+    }
+
+    // Only messages support 'from' and 'inboxId' filters
+    if (searchType === 'message') {
+      if (filters.value.from) payload.from = filters.value.from;
+      if (filters.value.in) payload.inboxId = filters.value.in;
+    }
+  }
+
+  return payload;
+};
+
 const updateURL = () => {
-  // Update route with tab as URL parameter and query as query parameter
-  const params = { accountId: route.params.accountId };
-  const queryParams = {};
+  const params = {
+    accountId: route.params.accountId,
+    ...(selectedTab.value !== 'all' && { tab: selectedTab.value }),
+  };
 
-  // Only add tab param if not 'all'
-  if (selectedTab.value !== 'all') {
-    params.tab = selectedTab.value;
-  }
+  const queryParams = {
+    ...(query.value?.trim() && { q: query.value.trim() }),
+    ...generateURLParams(
+      filters.value,
+      isFeatureFlagEnabled(FEATURE_FLAGS.ADVANCED_SEARCH)
+    ),
+  };
 
-  if (query.value?.trim()) {
-    queryParams.q = query.value.trim();
-  }
-
-  router.replace({
-    name: 'search',
-    params,
-    query: queryParams,
-  });
+  router.replace({ name: 'search', params, query: queryParams });
 };
 
 const onSearch = q => {
@@ -259,7 +291,13 @@ const onSearch = q => {
   updateURL();
   if (!q) return;
   useTrack(CONVERSATION_EVENTS.SEARCH_CONVERSATION);
-  store.dispatch('conversationSearch/fullSearch', { q, page: 1 });
+
+  const searchPayload = buildSearchPayload({ q, page: 1 });
+  store.dispatch('conversationSearch/fullSearch', searchPayload);
+};
+
+const onFilterChange = () => {
+  onSearch(query.value);
 };
 
 const onBack = () => {
@@ -280,12 +318,16 @@ const loadMore = () => {
   };
 
   if (uiFlags.value.isFetching || selectedTab.value === 'all') return;
+
   const tab = selectedTab.value;
   pages.value[tab] += 1;
-  store.dispatch(SEARCH_ACTIONS[tab], {
-    q: query.value,
-    page: pages.value[tab],
-  });
+
+  const payload = buildSearchPayload(
+    { q: query.value, page: pages.value[tab] },
+    tab
+  );
+
+  store.dispatch(SEARCH_ACTIONS[tab], payload);
 };
 
 const onTabChange = tab => {
@@ -295,6 +337,13 @@ const onTabChange = tab => {
 
 onMounted(() => {
   store.dispatch('conversationSearch/clearSearchResults');
+  store.dispatch('agents/get');
+
+  const parsedFilters = parseURLParams(
+    route.query,
+    isFeatureFlagEnabled(FEATURE_FLAGS.ADVANCED_SEARCH)
+  );
+  filters.value = parsedFilters;
 
   // Auto-execute search if query parameter exists
   if (route.query.q) {
@@ -321,9 +370,14 @@ onUnmounted(() => {
       />
     </div>
     <section class="flex flex-col flex-grow w-full h-full overflow-hidden">
-      <div class="w-full max-w-4xl mx-auto">
+      <div class="w-full max-w-5xl mx-auto z-[60]">
         <div class="flex flex-col w-full px-4">
-          <SearchHeader :initial-query="query" @search="onSearch" />
+          <SearchHeader
+            v-model:filters="filters"
+            :initial-query="query"
+            @search="onSearch"
+            @filter-change="onFilterChange"
+          />
           <SearchTabs
             v-if="query"
             :tabs="tabs"
@@ -333,7 +387,7 @@ onUnmounted(() => {
         </div>
       </div>
       <div class="flex-grow w-full h-full overflow-y-auto">
-        <div class="w-full max-w-4xl mx-auto px-4 pb-6">
+        <div class="w-full max-w-5xl mx-auto px-4 pb-6">
           <div v-if="showResultsSection">
             <Policy
               :permissions="[...ROLES, CONTACT_PERMISSIONS]"
@@ -345,6 +399,7 @@ onUnmounted(() => {
                 :contacts="contacts"
                 :query="query"
                 :show-title="isSelectedTabAll"
+                class="mt-0.5"
               />
               <NextButton
                 v-if="showViewMore.contacts"
@@ -367,6 +422,7 @@ onUnmounted(() => {
                 :messages="messages"
                 :query="query"
                 :show-title="isSelectedTabAll"
+                :class="searchResultSectionClass"
               />
               <NextButton
                 v-if="showViewMore.messages"
@@ -389,6 +445,7 @@ onUnmounted(() => {
                 :conversations="conversations"
                 :query="query"
                 :show-title="isSelectedTabAll"
+                :class="searchResultSectionClass"
               />
               <NextButton
                 v-if="showViewMore.conversations"
@@ -413,6 +470,7 @@ onUnmounted(() => {
                 :articles="articles"
                 :query="query"
                 :show-title="isSelectedTabAll"
+                :class="searchResultSectionClass"
               />
               <NextButton
                 v-if="showViewMore.articles"
@@ -425,7 +483,7 @@ onUnmounted(() => {
               />
             </Policy>
 
-            <div v-if="showLoadMore" class="flex justify-center mt-4 mb-6">
+            <div v-if="showLoadMore" class="flex justify-center mt-3 mb-6">
               <NextButton
                 v-if="!isSelectedTabAll"
                 :label="t(`SEARCH.LOAD_MORE`)"
diff --git a/app/javascript/dashboard/modules/search/components/TranscribedText.vue b/app/javascript/dashboard/modules/search/components/TranscribedText.vue
new file mode 100644
index 000000000..c9e3e32ba
--- /dev/null
+++ b/app/javascript/dashboard/modules/search/components/TranscribedText.vue
@@ -0,0 +1,45 @@
+<script setup>
+import { useExpandableContent } from 'shared/composables/useExpandableContent';
+
+defineProps({
+  text: {
+    type: String,
+    default: '',
+  },
+});
+
+const { contentElement, showReadMore, showReadLess, toggleExpanded } =
+  useExpandableContent({ useResizeObserverForCheck: true });
+</script>
+
+<template>
+  <span class="py-2 text-xs font-medium">
+    {{ $t('SEARCH.TRANSCRIPT') }}
+  </span>
+  <div
+    class="text-n-slate-11 pt-1 text-sm rounded-lg w-full break-words grid items-center"
+    :class="showReadMore ? 'grid-cols-[1fr_auto]' : 'grid-cols-1'"
+  >
+    <div
+      ref="contentElement"
+      class="min-w-0"
+      :class="{ 'overflow-hidden line-clamp-1': showReadMore }"
+    >
+      {{ text }}
+      <button
+        v-if="showReadLess"
+        class="text-sm text-n-slate-11 underline cursor-pointer bg-transparent border-0 p-0 hover:text-n-slate-12 font-medium ltr:ml-0.5 rtl:mr-0.5"
+        @click.prevent.stop="toggleExpanded(false)"
+      >
+        {{ $t('SEARCH.READ_LESS') }}
+      </button>
+    </div>
+    <button
+      v-if="showReadMore"
+      class="text-sm text-n-slate-11 underline cursor-pointer bg-transparent border-0 p-0 hover:text-n-slate-12 font-medium justify-self-end ltr:ml-0.5 rtl:mr-0.5"
+      @click.prevent.stop="toggleExpanded(true)"
+    >
+      {{ $t('SEARCH.READ_MORE') }}
+    </button>
+  </div>
+</template>
diff --git a/app/javascript/dashboard/modules/search/helpers/searchHelper.js b/app/javascript/dashboard/modules/search/helpers/searchHelper.js
new file mode 100644
index 000000000..ebdb3e579
--- /dev/null
+++ b/app/javascript/dashboard/modules/search/helpers/searchHelper.js
@@ -0,0 +1,75 @@
+import ContactAPI from 'dashboard/api/contacts';
+
+export const DATE_RANGE_TYPES = {
+  LAST_7_DAYS: 'last_7_days',
+  LAST_30_DAYS: 'last_30_days',
+  LAST_60_DAYS: 'last_60_days',
+  LAST_90_DAYS: 'last_90_days',
+  CUSTOM: 'custom',
+  BETWEEN: 'between',
+};
+
+export const generateURLParams = (
+  { from, in: inboxId, dateRange },
+  isAdvancedSearchEnabled = true
+) => {
+  const params = {};
+
+  // Only include filter params if advanced search is enabled
+  if (isAdvancedSearchEnabled) {
+    if (from) params.from = from;
+    if (inboxId) params.inbox_id = inboxId;
+
+    if (dateRange?.type) {
+      const { type, from: dateFrom, to: dateTo } = dateRange;
+      params.range = type;
+
+      if (dateFrom) params.since = dateFrom;
+      if (dateTo) params.until = dateTo;
+    }
+  }
+
+  return params;
+};
+
+export const parseURLParams = (query, isAdvancedSearchEnabled = true) => {
+  // If advanced search is disabled, return empty filters
+  if (!isAdvancedSearchEnabled) {
+    return {
+      from: null,
+      in: null,
+      dateRange: {
+        type: null,
+        from: null,
+        to: null,
+      },
+    };
+  }
+
+  const { from, inbox_id, since, until, range } = query;
+
+  let type = range;
+  if (!type && (since || until)) {
+    type = DATE_RANGE_TYPES.BETWEEN;
+  }
+
+  return {
+    from: from || null,
+    in: inbox_id ? Number(inbox_id) : null,
+    dateRange: {
+      type,
+      from: since ? Number(since) : null,
+      to: until ? Number(until) : null,
+    },
+  };
+};
+
+export const fetchContactDetails = async id => {
+  try {
+    const response = await ContactAPI.show(id);
+    return response.data.payload;
+  } catch (error) {
+    // error
+    return null;
+  }
+};
diff --git a/app/javascript/dashboard/modules/search/helpers/specs/searchHelper.spec.js b/app/javascript/dashboard/modules/search/helpers/specs/searchHelper.spec.js
new file mode 100644
index 000000000..5f34e32f2
--- /dev/null
+++ b/app/javascript/dashboard/modules/search/helpers/specs/searchHelper.spec.js
@@ -0,0 +1,379 @@
+import ContactAPI from 'dashboard/api/contacts';
+import {
+  DATE_RANGE_TYPES,
+  generateURLParams,
+  parseURLParams,
+  fetchContactDetails,
+} from '../searchHelper';
+
+// Mock ContactAPI
+vi.mock('dashboard/api/contacts', () => ({
+  default: {
+    show: vi.fn(),
+  },
+}));
+
+describe('#generateURLParams', () => {
+  it('returns empty object when no parameters provided', () => {
+    expect(generateURLParams({})).toEqual({});
+  });
+
+  it('generates params with from parameter', () => {
+    const result = generateURLParams({ from: 'agent:123' });
+    expect(result).toEqual({ from: 'agent:123' });
+  });
+
+  it('generates params with inbox_id parameter', () => {
+    const result = generateURLParams({ in: 456 });
+    expect(result).toEqual({ inbox_id: 456 });
+  });
+
+  it('generates params with all basic parameters', () => {
+    const result = generateURLParams({
+      from: 'contact:789',
+      in: 123,
+    });
+    expect(result).toEqual({
+      from: 'contact:789',
+      inbox_id: 123,
+    });
+  });
+
+  describe('with date range', () => {
+    it('generates params with date range type only', () => {
+      const result = generateURLParams({
+        dateRange: { type: DATE_RANGE_TYPES.LAST_7_DAYS },
+      });
+      expect(result).toEqual({
+        range: 'last_7_days',
+      });
+    });
+
+    it('generates params with BETWEEN date range', () => {
+      const result = generateURLParams({
+        dateRange: {
+          type: DATE_RANGE_TYPES.BETWEEN,
+          from: 1640995200,
+          to: 1672531199,
+        },
+      });
+      expect(result).toEqual({
+        range: 'between',
+        since: 1640995200,
+        until: 1672531199,
+      });
+    });
+
+    it('generates params with CUSTOM date range', () => {
+      const result = generateURLParams({
+        dateRange: {
+          type: DATE_RANGE_TYPES.CUSTOM,
+          from: 1640995200,
+          to: 1672531199,
+        },
+      });
+      expect(result).toEqual({
+        range: 'custom',
+        since: 1640995200,
+        until: 1672531199,
+      });
+    });
+
+    it('handles date range with missing from/to values', () => {
+      const result = generateURLParams({
+        dateRange: {
+          type: DATE_RANGE_TYPES.BETWEEN,
+          from: null,
+          to: undefined,
+        },
+      });
+      expect(result).toEqual({
+        range: 'between',
+      });
+    });
+  });
+
+  it('generates params with all parameters combined', () => {
+    const result = generateURLParams({
+      from: 'agent:456',
+      in: 789,
+      dateRange: {
+        type: DATE_RANGE_TYPES.BETWEEN,
+        from: 1640995200,
+        to: 1672531199,
+      },
+    });
+    expect(result).toEqual({
+      from: 'agent:456',
+      inbox_id: 789,
+      range: 'between',
+      since: 1640995200,
+      until: 1672531199,
+    });
+  });
+
+  describe('when advanced search is disabled', () => {
+    it('returns empty object when isAdvancedSearchEnabled is false', () => {
+      const result = generateURLParams(
+        {
+          from: 'agent:123',
+          in: 456,
+          dateRange: {
+            type: DATE_RANGE_TYPES.BETWEEN,
+            from: 1640995200,
+            to: 1672531199,
+          },
+        },
+        false
+      );
+      expect(result).toEqual({});
+    });
+
+    it('strips all filter params when feature flag is disabled', () => {
+      const result = generateURLParams(
+        {
+          from: 'contact:789',
+          in: 123,
+        },
+        false
+      );
+      expect(result).toEqual({});
+    });
+
+    it('strips date range params when feature flag is disabled', () => {
+      const result = generateURLParams(
+        {
+          dateRange: {
+            type: DATE_RANGE_TYPES.LAST_7_DAYS,
+            from: 1640995200,
+            to: 1672531199,
+          },
+        },
+        false
+      );
+      expect(result).toEqual({});
+    });
+  });
+});
+
+describe('#parseURLParams', () => {
+  it('returns default values for empty query', () => {
+    const result = parseURLParams({});
+    expect(result).toEqual({
+      from: null,
+      in: null,
+      dateRange: {
+        type: undefined,
+        from: null,
+        to: null,
+      },
+    });
+  });
+
+  it('parses from parameter', () => {
+    const result = parseURLParams({ from: 'agent:123' });
+    expect(result).toEqual({
+      from: 'agent:123',
+      in: null,
+      dateRange: {
+        type: undefined,
+        from: null,
+        to: null,
+      },
+    });
+  });
+
+  it('parses inbox_id parameter as number', () => {
+    const result = parseURLParams({ inbox_id: '456' });
+    expect(result).toEqual({
+      from: null,
+      in: 456,
+      dateRange: {
+        type: undefined,
+        from: null,
+        to: null,
+      },
+    });
+  });
+
+  it('parses explicit range parameter', () => {
+    const result = parseURLParams({
+      range: 'last_7_days',
+      since: '1640995200',
+      until: '1672531199',
+    });
+    expect(result).toEqual({
+      from: null,
+      in: null,
+      dateRange: {
+        type: 'last_7_days',
+        from: 1640995200,
+        to: 1672531199,
+      },
+    });
+  });
+
+  describe('inferred date range types', () => {
+    it('infers BETWEEN type when both since and until are present', () => {
+      const result = parseURLParams({
+        since: '1640995200',
+        until: '1672531199',
+      });
+      expect(result).toEqual({
+        from: null,
+        in: null,
+        dateRange: {
+          type: 'between',
+          from: 1640995200,
+          to: 1672531199,
+        },
+      });
+    });
+
+    it('prioritizes explicit range over inferred type', () => {
+      const result = parseURLParams({
+        range: 'custom',
+        since: '1640995200',
+        until: '1672531199',
+      });
+      expect(result).toEqual({
+        from: null,
+        in: null,
+        dateRange: {
+          type: 'custom',
+          from: 1640995200,
+          to: 1672531199,
+        },
+      });
+    });
+  });
+
+  it('parses all parameters combined', () => {
+    const result = parseURLParams({
+      from: 'contact:789',
+      inbox_id: '123',
+      range: 'between',
+      since: '1640995200',
+      until: '1672531199',
+    });
+    expect(result).toEqual({
+      from: 'contact:789',
+      in: 123,
+      dateRange: {
+        type: 'between',
+        from: 1640995200,
+        to: 1672531199,
+      },
+    });
+  });
+
+  describe('when advanced search is disabled', () => {
+    it('returns empty filters when isAdvancedSearchEnabled is false', () => {
+      const result = parseURLParams(
+        {
+          from: 'agent:123',
+          inbox_id: '456',
+          range: 'between',
+          since: '1640995200',
+          until: '1672531199',
+        },
+        false
+      );
+      expect(result).toEqual({
+        from: null,
+        in: null,
+        dateRange: {
+          type: null,
+          from: null,
+          to: null,
+        },
+      });
+    });
+
+    it('ignores all filter params from URL when feature flag is disabled', () => {
+      const result = parseURLParams(
+        {
+          from: 'contact:789',
+          inbox_id: '123',
+        },
+        false
+      );
+      expect(result).toEqual({
+        from: null,
+        in: null,
+        dateRange: {
+          type: null,
+          from: null,
+          to: null,
+        },
+      });
+    });
+
+    it('ignores date range params from URL when feature flag is disabled', () => {
+      const result = parseURLParams(
+        {
+          range: 'last_7_days',
+          since: '1640995200',
+          until: '1672531199',
+        },
+        false
+      );
+      expect(result).toEqual({
+        from: null,
+        in: null,
+        dateRange: {
+          type: null,
+          from: null,
+          to: null,
+        },
+      });
+    });
+  });
+});
+
+describe('#fetchContactDetails', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it('returns contact data on successful API call', async () => {
+    const mockContactData = {
+      id: 123,
+      name: 'John Doe',
+      email: 'john@example.com',
+    };
+
+    ContactAPI.show.mockResolvedValue({
+      data: {
+        payload: mockContactData,
+      },
+    });
+
+    const result = await fetchContactDetails(123);
+    expect(result).toEqual(mockContactData);
+    expect(ContactAPI.show).toHaveBeenCalledWith(123);
+  });
+
+  it('returns null on API error', async () => {
+    ContactAPI.show.mockRejectedValue(new Error('API Error'));
+
+    const result = await fetchContactDetails(123);
+    expect(result).toBeNull();
+    expect(ContactAPI.show).toHaveBeenCalledWith(123);
+  });
+
+  it('handles different contact ID types', async () => {
+    const mockContactData = { id: 456, name: 'Jane Doe' };
+    ContactAPI.show.mockResolvedValue({
+      data: { payload: mockContactData },
+    });
+
+    // Test with string ID
+    await fetchContactDetails('456');
+    expect(ContactAPI.show).toHaveBeenCalledWith('456');
+
+    // Test with number ID
+    await fetchContactDetails(456);
+    expect(ContactAPI.show).toHaveBeenCalledWith(456);
+  });
+});
diff --git a/app/javascript/dashboard/routes/dashboard/companies/pages/CompaniesIndex.vue b/app/javascript/dashboard/routes/dashboard/companies/pages/CompaniesIndex.vue
index cab05b8f4..236de594a 100644
--- a/app/javascript/dashboard/routes/dashboard/companies/pages/CompaniesIndex.vue
+++ b/app/javascript/dashboard/routes/dashboard/companies/pages/CompaniesIndex.vue
@@ -9,7 +9,7 @@ import { useCompaniesStore } from 'dashboard/stores/companies';
 import CompaniesListLayout from 'dashboard/components-next/Companies/CompaniesListLayout.vue';
 import CompaniesCard from 'dashboard/components-next/Companies/CompaniesCard/CompaniesCard.vue';
 
-const DEFAULT_SORT_FIELD = 'created_at';
+const DEFAULT_SORT_FIELD = 'name';
 const DEBOUNCE_DELAY = 300;
 
 const companiesStore = useCompaniesStore();
@@ -37,7 +37,7 @@ const parseSortSettings = (sortString = '') => {
   };
 };
 
-const { companies_sort_by: companySortBy = `-${DEFAULT_SORT_FIELD}` } =
+const { companies_sort_by: companySortBy = DEFAULT_SORT_FIELD } =
   uiSettings.value ?? {};
 const { sort: initialSort, order: initialOrder } =
   parseSortSettings(companySortBy);
diff --git a/app/javascript/dashboard/routes/dashboard/settings/canned/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/canned/Index.vue
index 216aa1923..0071eab03 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/canned/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/canned/Index.vue
@@ -6,6 +6,7 @@ import BaseSettingsHeader from '../components/BaseSettingsHeader.vue';
 import { computed, onMounted, ref, defineOptions } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useStoreGetters, useStore } from 'dashboard/composables/store';
+import { useMessageFormatter } from 'shared/composables/useMessageFormatter';
 
 import Button from 'dashboard/components-next/button/Button.vue';
 
@@ -17,6 +18,8 @@ const getters = useStoreGetters();
 const store = useStore();
 const { t } = useI18n();
 
+const { getPlainText } = useMessageFormatter();
+
 const showAddPopup = ref(false);
 const loading = ref({});
 const showEditPopup = ref(false);
@@ -182,7 +185,7 @@ const tableHeaders = computed(() => {
               {{ cannedItem.short_code }}
             </td>
             <td class="py-4 ltr:pr-4 rtl:pl-4 md:break-all whitespace-normal">
-              {{ cannedItem.content }}
+              {{ getPlainText(cannedItem.content) }}
             </td>
             <td class="py-4 flex justify-end gap-1">
               <Button
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/CustomerSatisfactionPage.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/CustomerSatisfactionPage.vue
index 807f1ad0f..9cf9c688f 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/CustomerSatisfactionPage.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/CustomerSatisfactionPage.vue
@@ -3,15 +3,22 @@ import { reactive, onMounted, ref, defineProps, watch, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useAlert } from 'dashboard/composables';
 import { useStore, useMapGetter } from 'dashboard/composables/store';
+import { useInbox } from 'dashboard/composables/useInbox';
 import { CSAT_DISPLAY_TYPES } from 'shared/constants/messages';
 
+import Icon from 'dashboard/components-next/icon/Icon.vue';
 import WithLabel from 'v3/components/Form/WithLabel.vue';
 import SectionLayout from 'dashboard/routes/dashboard/settings/account/components/SectionLayout.vue';
 import CSATDisplayTypeSelector from './components/CSATDisplayTypeSelector.vue';
+import CSATTemplate from 'dashboard/components-next/message/bubbles/Template/CSAT.vue';
 import Editor from 'dashboard/components-next/Editor/Editor.vue';
 import FilterSelect from 'dashboard/components-next/filter/inputs/FilterSelect.vue';
 import NextButton from 'dashboard/components-next/button/Button.vue';
 import Switch from 'next/switch/Switch.vue';
+import Input from 'dashboard/components-next/input/Input.vue';
+import ComboBox from 'dashboard/components-next/combobox/ComboBox.vue';
+import languages from 'dashboard/components/widgets/conversation/advancedFilterItems/languages.js';
+import ConfirmTemplateUpdateDialog from './components/ConfirmTemplateUpdateDialog.vue';
 
 const props = defineProps({
   inbox: { type: Object, required: true },
@@ -21,6 +28,10 @@ const { t } = useI18n();
 const store = useStore();
 const labels = useMapGetter('labels/getLabels');
 
+const { isAWhatsAppCloudChannel: isWhatsAppChannel } = useInbox(
+  props.inbox?.id
+);
+
 const isUpdating = ref(false);
 const selectedLabelValues = ref([]);
 const currentLabel = ref('');
@@ -29,7 +40,19 @@ const state = reactive({
   csatSurveyEnabled: false,
   displayType: 'emoji',
   message: '',
+  templateButtonText: 'Please rate us',
   surveyRuleOperator: 'contains',
+  templateLanguage: '',
+});
+
+const templateStatus = ref(null);
+const templateLoading = ref(false);
+const confirmDialog = ref(null);
+
+const originalTemplateValues = ref({
+  message: '',
+  templateButtonText: '',
+  templateLanguage: '',
 });
 
 const filterTypes = [
@@ -51,6 +74,59 @@ const labelOptions = computed(() =>
     : []
 );
 
+const languageOptions = computed(() =>
+  languages.map(({ name, id }) => ({ label: `${name} (${id})`, value: id }))
+);
+
+const messagePreviewData = computed(() => ({
+  content: state.message || t('INBOX_MGMT.CSAT.MESSAGE.PLACEHOLDER'),
+}));
+
+const shouldShowTemplateStatus = computed(
+  () => templateStatus.value && !templateLoading.value
+);
+
+const templateApprovalStatus = computed(() => {
+  const statusMap = {
+    APPROVED: {
+      text: t('INBOX_MGMT.CSAT.TEMPLATE_STATUS.APPROVED'),
+      icon: 'i-lucide-circle-check',
+      color: 'text-n-teal-11',
+    },
+    PENDING: {
+      text: t('INBOX_MGMT.CSAT.TEMPLATE_STATUS.PENDING'),
+      icon: 'i-lucide-clock',
+      color: 'text-n-amber-11',
+    },
+    REJECTED: {
+      text: t('INBOX_MGMT.CSAT.TEMPLATE_STATUS.REJECTED'),
+      icon: 'i-lucide-circle-x',
+      color: 'text-n-ruby-10',
+    },
+  };
+
+  // Handle template not found case
+  if (templateStatus.value?.error === 'TEMPLATE_NOT_FOUND') {
+    return {
+      text: t('INBOX_MGMT.CSAT.TEMPLATE_STATUS.NOT_FOUND'),
+      icon: 'i-lucide-alert-triangle',
+      color: 'text-n-ruby-10',
+    };
+  }
+
+  // Handle existing template with status
+  if (templateStatus.value?.template_exists && templateStatus.value.status) {
+    return statusMap[templateStatus.value.status] || statusMap.PENDING;
+  }
+
+  // Default case - no template exists
+  return {
+    text: t('INBOX_MGMT.CSAT.TEMPLATE_STATUS.DEFAULT'),
+    icon: 'i-lucide-stamp',
+    color: 'text-n-slate-11',
+  };
+});
+
 const initializeState = () => {
   if (!props.inbox) return;
 
@@ -63,21 +139,63 @@ const initializeState = () => {
   const {
     display_type: displayType = CSAT_DISPLAY_TYPES.EMOJI,
     message = '',
+    button_text: buttonText = 'Please rate us',
+    language = 'en',
     survey_rules: surveyRules = {},
   } = csat_config;
 
   state.displayType = displayType;
   state.message = message;
+  state.templateButtonText = buttonText;
+  state.templateLanguage = language;
   state.surveyRuleOperator = surveyRules.operator || 'contains';
 
   selectedLabelValues.value = Array.isArray(surveyRules.values)
     ? [...surveyRules.values]
     : [];
+
+  // Store original template values for change detection
+  if (isWhatsAppChannel.value) {
+    originalTemplateValues.value = {
+      message: state.message,
+      templateButtonText: state.templateButtonText,
+      templateLanguage: state.templateLanguage,
+    };
+  }
+};
+
+const checkTemplateStatus = async () => {
+  if (!isWhatsAppChannel.value) return;
+
+  try {
+    templateLoading.value = true;
+    const response = await store.dispatch('inboxes/getCSATTemplateStatus', {
+      inboxId: props.inbox.id,
+    });
+
+    // Handle case where template doesn't exist
+    if (!response.template_exists && response.error === 'Template not found') {
+      templateStatus.value = {
+        template_exists: false,
+        error: 'TEMPLATE_NOT_FOUND',
+      };
+    } else {
+      templateStatus.value = response;
+    }
+  } catch (error) {
+    templateStatus.value = {
+      template_exists: false,
+      error: 'API_ERROR',
+    };
+  } finally {
+    templateLoading.value = false;
+  }
 };
 
 onMounted(() => {
   initializeState();
   if (!labels.value?.length) store.dispatch('labels/get');
+  if (isWhatsAppChannel.value) checkTemplateStatus();
 });
 
 watch(() => props.inbox, initializeState, { immediate: true });
@@ -105,6 +223,49 @@ const removeLabel = label => {
   }
 };
 
+// Check if template-related fields have changed
+const hasTemplateChanges = () => {
+  if (!isWhatsAppChannel.value) return false;
+
+  const original = originalTemplateValues.value;
+  return (
+    original.message !== state.message ||
+    original.templateButtonText !== state.templateButtonText ||
+    original.templateLanguage !== state.templateLanguage
+  );
+};
+
+// Check if there's an existing template
+const hasExistingTemplate = () => {
+  const { template_exists, error } = templateStatus.value || {};
+  return template_exists && !error;
+};
+
+// Check if we should create a template
+const shouldCreateTemplate = () => {
+  // Create template if no existing template
+  if (!hasExistingTemplate()) {
+    return true;
+  }
+
+  // Create template if there are changes to template fields
+  return hasTemplateChanges();
+};
+
+// Build template config for saving
+const buildTemplateConfig = () => {
+  if (!hasExistingTemplate()) return null;
+
+  const { template_name, template_id, template, status } =
+    templateStatus.value || {};
+  return {
+    name: template_name,
+    template_id,
+    language: template?.language || state.templateLanguage,
+    status,
+  };
+};
+
 const updateInbox = async attributes => {
   const payload = {
     id: props.inbox.id,
@@ -115,31 +276,103 @@ const updateInbox = async attributes => {
   return store.dispatch('inboxes/updateInbox', payload);
 };
 
-const saveSettings = async () => {
+const createTemplate = async () => {
+  if (!isWhatsAppChannel.value) return null;
+
+  const response = await store.dispatch('inboxes/createCSATTemplate', {
+    inboxId: props.inbox.id,
+    template: {
+      message: state.message,
+      button_text: state.templateButtonText,
+      language: state.templateLanguage,
+    },
+  });
+  useAlert(t('INBOX_MGMT.CSAT.TEMPLATE_CREATION.SUCCESS_MESSAGE'));
+  return response.template;
+};
+
+const performSave = async () => {
   try {
     isUpdating.value = true;
+    let newTemplateData = null;
+
+    // For WhatsApp channels, create template first if needed
+    if (
+      isWhatsAppChannel.value &&
+      state.csatSurveyEnabled &&
+      shouldCreateTemplate()
+    ) {
+      try {
+        newTemplateData = await createTemplate();
+      } catch (error) {
+        const errorMessage =
+          error.response?.data?.error ||
+          t('INBOX_MGMT.CSAT.TEMPLATE_CREATION.ERROR_MESSAGE');
+        useAlert(errorMessage);
+        return;
+      }
+    }
 
     const csatConfig = {
       display_type: state.displayType,
       message: state.message,
+      button_text: state.templateButtonText,
+      language: state.templateLanguage,
       survey_rules: {
         operator: state.surveyRuleOperator,
         values: selectedLabelValues.value,
       },
     };
 
+    // Use new template data if created, otherwise preserve existing template information
+    if (newTemplateData) {
+      csatConfig.template = {
+        name: newTemplateData.name,
+        template_id: newTemplateData.template_id,
+        language: newTemplateData.language,
+        status: newTemplateData.status,
+        created_at: new Date().toISOString(),
+      };
+    } else {
+      const templateConfig = buildTemplateConfig();
+      if (templateConfig) {
+        csatConfig.template = templateConfig;
+      }
+    }
+
     await updateInbox({
       csat_survey_enabled: state.csatSurveyEnabled,
       csat_config: csatConfig,
     });
 
     useAlert(t('INBOX_MGMT.CSAT.API.SUCCESS_MESSAGE'));
+    checkTemplateStatus();
   } catch (error) {
     useAlert(t('INBOX_MGMT.CSAT.API.ERROR_MESSAGE'));
   } finally {
     isUpdating.value = false;
   }
 };
+
+const saveSettings = async () => {
+  // Check if we need to show confirmation dialog for WhatsApp template changes
+  if (
+    isWhatsAppChannel.value &&
+    state.csatSurveyEnabled &&
+    hasExistingTemplate() &&
+    hasTemplateChanges()
+  ) {
+    confirmDialog.value?.open();
+    return;
+  }
+
+  await performSave();
+};
+
+const handleConfirmTemplateUpdate = async () => {
+  // We will delete the template before creating the template
+  await performSave();
+};
 </script>
 
 <template>
@@ -155,7 +388,9 @@ const saveSettings = async () => {
       </template>
 
       <div class="grid gap-5">
+        <!-- Show display type only for non-WhatsApp channels -->
         <WithLabel
+          v-if="!isWhatsAppChannel"
           :label="$t('INBOX_MGMT.CSAT.DISPLAY_TYPE.LABEL')"
           name="display_type"
         >
@@ -165,14 +400,97 @@ const saveSettings = async () => {
           />
         </WithLabel>
 
-        <WithLabel :label="$t('INBOX_MGMT.CSAT.MESSAGE.LABEL')" name="message">
-          <Editor
-            v-model="state.message"
-            :placeholder="$t('INBOX_MGMT.CSAT.MESSAGE.PLACEHOLDER')"
-            :max-length="200"
-            class="w-full"
-          />
-        </WithLabel>
+        <template v-if="isWhatsAppChannel">
+          <div
+            class="flex flex-col gap-4 justify-between w-full lg:flex-row lg:gap-6"
+          >
+            <div class="flex flex-col gap-3 basis-3/5">
+              <WithLabel
+                :label="$t('INBOX_MGMT.CSAT.MESSAGE.LABEL')"
+                name="message"
+              >
+                <Editor
+                  v-model="state.message"
+                  :placeholder="$t('INBOX_MGMT.CSAT.MESSAGE.PLACEHOLDER')"
+                  :max-length="200"
+                  channel-type="Context::Plain"
+                  class="w-full"
+                />
+              </WithLabel>
+              <Input
+                v-model="state.templateButtonText"
+                :label="$t('INBOX_MGMT.CSAT.BUTTON_TEXT.LABEL')"
+                :placeholder="$t('INBOX_MGMT.CSAT.BUTTON_TEXT.PLACEHOLDER')"
+                class="w-full"
+              />
+
+              <WithLabel
+                :label="$t('INBOX_MGMT.CSAT.LANGUAGE.LABEL')"
+                name="language"
+              >
+                <ComboBox
+                  v-model="state.templateLanguage"
+                  :options="languageOptions"
+                  :placeholder="$t('INBOX_MGMT.CSAT.LANGUAGE.PLACEHOLDER')"
+                />
+              </WithLabel>
+
+              <div
+                v-if="shouldShowTemplateStatus"
+                class="flex gap-2 items-center mt-4"
+              >
+                <Icon
+                  :icon="templateApprovalStatus.icon"
+                  :class="templateApprovalStatus.color"
+                  class="size-4"
+                />
+                <span
+                  :class="templateApprovalStatus.color"
+                  class="text-sm font-medium"
+                >
+                  {{ templateApprovalStatus.text }}
+                </span>
+              </div>
+            </div>
+
+            <div
+              class="flex flex-col flex-shrink-0 justify-start items-center p-6 mt-1 rounded-xl basis-2/5 bg-n-slate-2 outline outline-1 outline-n-weak"
+            >
+              <p
+                class="inline-flex items-center text-sm font-medium text-n-slate-11"
+              >
+                {{ $t('INBOX_MGMT.CSAT.MESSAGE_PREVIEW.LABEL') }}
+                <Icon
+                  v-tooltip.top-end="
+                    $t('INBOX_MGMT.CSAT.MESSAGE_PREVIEW.TOOLTIP')
+                  "
+                  icon="i-lucide-info"
+                  class="flex-shrink-0 mx-1 size-4"
+                />
+              </p>
+              <CSATTemplate
+                :message="messagePreviewData"
+                :button-text="state.templateButtonText"
+                class="pt-12"
+              />
+            </div>
+          </div>
+        </template>
+
+        <!-- Non-WhatsApp channels layout -->
+        <template v-else>
+          <WithLabel
+            :label="$t('INBOX_MGMT.CSAT.MESSAGE.LABEL')"
+            name="message"
+          >
+            <Editor
+              v-model="state.message"
+              :placeholder="$t('INBOX_MGMT.CSAT.MESSAGE.PLACEHOLDER')"
+              :max-length="200"
+              class="w-full"
+            />
+          </WithLabel>
+        </template>
 
         <WithLabel
           :label="$t('INBOX_MGMT.CSAT.SURVEY_RULE.LABEL')"
@@ -180,7 +498,7 @@ const saveSettings = async () => {
         >
           <div class="mb-4">
             <span
-              class="inline-flex flex-wrap items-center gap-1.5 text-sm text-n-slate-12"
+              class="inline-flex flex-wrap gap-1.5 items-center text-sm text-n-slate-12"
             >
               {{ $t('INBOX_MGMT.CSAT.SURVEY_RULE.DESCRIPTION_PREFIX') }}
               <FilterSelect
@@ -217,7 +535,11 @@ const saveSettings = async () => {
           </div>
         </WithLabel>
         <p class="text-sm italic text-n-slate-11">
-          {{ $t('INBOX_MGMT.CSAT.NOTE') }}
+          {{
+            isWhatsAppChannel
+              ? $t('INBOX_MGMT.CSAT.WHATSAPP_NOTE')
+              : $t('INBOX_MGMT.CSAT.NOTE')
+          }}
         </p>
         <div>
           <NextButton
@@ -229,5 +551,11 @@ const saveSettings = async () => {
         </div>
       </div>
     </SectionLayout>
+
+    <!-- Template Update Confirmation Dialog -->
+    <ConfirmTemplateUpdateDialog
+      ref="confirmDialog"
+      @confirm="handleConfirmTemplateUpdate"
+    />
   </div>
 </template>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/components/ConfirmTemplateUpdateDialog.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/components/ConfirmTemplateUpdateDialog.vue
new file mode 100644
index 000000000..6df5c2918
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/components/ConfirmTemplateUpdateDialog.vue
@@ -0,0 +1,34 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import Dialog from 'dashboard/components-next/dialog/Dialog.vue';
+
+const emit = defineEmits(['confirm']);
+
+const { t } = useI18n();
+const dialogRef = ref(null);
+
+const handleDialogConfirm = () => {
+  emit('confirm');
+  dialogRef.value?.close();
+};
+
+defineExpose({
+  dialogRef,
+  open: () => dialogRef.value?.open(),
+  close: () => dialogRef.value?.close(),
+});
+</script>
+
+<template>
+  <Dialog
+    ref="dialogRef"
+    type="alert"
+    :title="t('INBOX_MGMT.CSAT.TEMPLATE_UPDATE_DIALOG.TITLE')"
+    :description="t('INBOX_MGMT.CSAT.TEMPLATE_UPDATE_DIALOG.DESCRIPTION')"
+    :confirm-button-label="t('INBOX_MGMT.CSAT.TEMPLATE_UPDATE_DIALOG.CONFIRM')"
+    :cancel-button-label="t('INBOX_MGMT.CSAT.TEMPLATE_UPDATE_DIALOG.CANCEL')"
+    @confirm="handleDialogConfirm"
+  />
+</template>
diff --git a/app/javascript/dashboard/store/modules/conversationSearch.js b/app/javascript/dashboard/store/modules/conversationSearch.js
index d1d739076..093d670f2 100644
--- a/app/javascript/dashboard/store/modules/conversationSearch.js
+++ b/app/javascript/dashboard/store/modules/conversationSearch.js
@@ -57,8 +57,9 @@ export const actions = {
       });
     }
   },
-  async fullSearch({ commit, dispatch }, { q }) {
-    if (!q) {
+  async fullSearch({ commit, dispatch }, payload) {
+    const { q, ...filters } = payload;
+    if (!q && !Object.keys(filters).length) {
       return;
     }
     commit(types.FULL_SEARCH_SET_UI_FLAG, {
@@ -67,10 +68,10 @@ export const actions = {
     });
     try {
       await Promise.all([
-        dispatch('contactSearch', { q }),
-        dispatch('conversationSearch', { q }),
-        dispatch('messageSearch', { q }),
-        dispatch('articleSearch', { q }),
+        dispatch('contactSearch', { q, ...filters }),
+        dispatch('conversationSearch', { q, ...filters }),
+        dispatch('messageSearch', { q, ...filters }),
+        dispatch('articleSearch', { q, ...filters }),
       ]);
     } catch (error) {
       // Ignore error
@@ -81,10 +82,11 @@ export const actions = {
       });
     }
   },
-  async contactSearch({ commit }, { q, page = 1 }) {
+  async contactSearch({ commit }, payload) {
+    const { page = 1, ...searchParams } = payload;
     commit(types.CONTACT_SEARCH_SET_UI_FLAG, { isFetching: true });
     try {
-      const { data } = await SearchAPI.contacts({ q, page });
+      const { data } = await SearchAPI.contacts({ ...searchParams, page });
       commit(types.CONTACT_SEARCH_SET, data.payload.contacts);
     } catch (error) {
       // Ignore error
@@ -92,10 +94,11 @@ export const actions = {
       commit(types.CONTACT_SEARCH_SET_UI_FLAG, { isFetching: false });
     }
   },
-  async conversationSearch({ commit }, { q, page = 1 }) {
+  async conversationSearch({ commit }, payload) {
+    const { page = 1, ...searchParams } = payload;
     commit(types.CONVERSATION_SEARCH_SET_UI_FLAG, { isFetching: true });
     try {
-      const { data } = await SearchAPI.conversations({ q, page });
+      const { data } = await SearchAPI.conversations({ ...searchParams, page });
       commit(types.CONVERSATION_SEARCH_SET, data.payload.conversations);
     } catch (error) {
       // Ignore error
@@ -103,10 +106,11 @@ export const actions = {
       commit(types.CONVERSATION_SEARCH_SET_UI_FLAG, { isFetching: false });
     }
   },
-  async messageSearch({ commit }, { q, page = 1 }) {
+  async messageSearch({ commit }, payload) {
+    const { page = 1, ...searchParams } = payload;
     commit(types.MESSAGE_SEARCH_SET_UI_FLAG, { isFetching: true });
     try {
-      const { data } = await SearchAPI.messages({ q, page });
+      const { data } = await SearchAPI.messages({ ...searchParams, page });
       commit(types.MESSAGE_SEARCH_SET, data.payload.messages);
     } catch (error) {
       // Ignore error
@@ -114,10 +118,11 @@ export const actions = {
       commit(types.MESSAGE_SEARCH_SET_UI_FLAG, { isFetching: false });
     }
   },
-  async articleSearch({ commit }, { q, page = 1 }) {
+  async articleSearch({ commit }, payload) {
+    const { page = 1, ...searchParams } = payload;
     commit(types.ARTICLE_SEARCH_SET_UI_FLAG, { isFetching: true });
     try {
-      const { data } = await SearchAPI.articles({ q, page });
+      const { data } = await SearchAPI.articles({ ...searchParams, page });
       commit(types.ARTICLE_SEARCH_SET, data.payload.articles);
     } catch (error) {
       // Ignore error
diff --git a/app/javascript/dashboard/store/modules/inboxes.js b/app/javascript/dashboard/store/modules/inboxes.js
index ac7d1483e..c24a90599 100644
--- a/app/javascript/dashboard/store/modules/inboxes.js
+++ b/app/javascript/dashboard/store/modules/inboxes.js
@@ -83,6 +83,14 @@ export const getters = {
         return false;
       }
 
+      // Filter out CSAT templates (customer_satisfaction_survey and its versions)
+      if (
+        template.name &&
+        template.name.startsWith('customer_satisfaction_survey')
+      ) {
+        return false;
+      }
+
       // Filter out interactive templates (LIST, PRODUCT, CATALOG), location templates, and call permission templates
       const hasUnsupportedComponents = template.components.some(
         component =>
@@ -344,6 +352,14 @@ export const actions = {
       throw new Error(error);
     }
   },
+  createCSATTemplate: async (_, { inboxId, template }) => {
+    const response = await InboxesAPI.createCSATTemplate(inboxId, template);
+    return response.data;
+  },
+  getCSATTemplateStatus: async (_, { inboxId }) => {
+    const response = await InboxesAPI.getCSATTemplateStatus(inboxId);
+    return response.data;
+  },
 };
 
 export const mutations = {
diff --git a/app/javascript/dashboard/store/modules/specs/conversationSearch/actions.spec.js b/app/javascript/dashboard/store/modules/specs/conversationSearch/actions.spec.js
index 6ac21f84a..d73fe72b4 100644
--- a/app/javascript/dashboard/store/modules/specs/conversationSearch/actions.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/conversationSearch/actions.spec.js
@@ -77,6 +77,16 @@ describe('#actions', () => {
       expect(dispatch).toHaveBeenCalledWith('messageSearch', { q: 'test' });
       expect(dispatch).toHaveBeenCalledWith('articleSearch', { q: 'test' });
     });
+
+    it('should pass filters to all search actions including articleSearch', async () => {
+      const payload = { q: 'test', since: 1700000000, until: 1732000000 };
+      await actions.fullSearch({ commit, dispatch }, payload);
+
+      expect(dispatch).toHaveBeenCalledWith('contactSearch', payload);
+      expect(dispatch).toHaveBeenCalledWith('conversationSearch', payload);
+      expect(dispatch).toHaveBeenCalledWith('messageSearch', payload);
+      expect(dispatch).toHaveBeenCalledWith('articleSearch', payload);
+    });
   });
 
   describe('#contactSearch', () => {
@@ -165,6 +175,22 @@ describe('#actions', () => {
       ]);
     });
 
+    it('should handle article search with date filters', async () => {
+      axios.get.mockResolvedValue({
+        data: { payload: { articles: [{ id: 1 }] } },
+      });
+
+      await actions.articleSearch(
+        { commit },
+        { q: 'test', page: 1, since: 1700000000, until: 1732000000 }
+      );
+      expect(commit.mock.calls).toEqual([
+        [types.ARTICLE_SEARCH_SET_UI_FLAG, { isFetching: true }],
+        [types.ARTICLE_SEARCH_SET, [{ id: 1 }]],
+        [types.ARTICLE_SEARCH_SET_UI_FLAG, { isFetching: false }],
+      ]);
+    });
+
     it('should handle failed article search', async () => {
       axios.get.mockRejectedValue({});
       await actions.articleSearch({ commit }, { q: 'test' });
diff --git a/app/javascript/shared/composables/specs/useExpandableContent.spec.js b/app/javascript/shared/composables/specs/useExpandableContent.spec.js
new file mode 100644
index 000000000..404acada9
--- /dev/null
+++ b/app/javascript/shared/composables/specs/useExpandableContent.spec.js
@@ -0,0 +1,130 @@
+import { nextTick } from 'vue';
+import { useExpandableContent } from '../useExpandableContent';
+
+// Mock VueUse composables
+vi.mock('@vueuse/core', () => ({
+  useToggle: vi.fn(initialValue => {
+    let value = initialValue;
+    const toggle = newValue => {
+      value = newValue !== undefined ? newValue : !value;
+    };
+    return [{ value }, toggle];
+  }),
+  useResizeObserver: vi.fn((element, callback) => {
+    // Store callback for manual triggering in tests
+    if (element.value) {
+      callback();
+    }
+  }),
+}));
+
+describe('useExpandableContent', () => {
+  let originalGetComputedStyle;
+
+  beforeEach(() => {
+    // Mock window.getComputedStyle
+    originalGetComputedStyle = window.getComputedStyle;
+    window.getComputedStyle = vi.fn(() => ({
+      lineHeight: '20px',
+    }));
+  });
+
+  afterEach(() => {
+    window.getComputedStyle = originalGetComputedStyle;
+    vi.clearAllMocks();
+  });
+
+  it('returns expected properties', () => {
+    const result = useExpandableContent();
+
+    expect(result).toHaveProperty('contentElement');
+    expect(result).toHaveProperty('isExpanded');
+    expect(result).toHaveProperty('needsToggle');
+    expect(result).toHaveProperty('toggleExpanded');
+    expect(result).toHaveProperty('checkOverflow');
+  });
+
+  it('initializes with default values', () => {
+    const { isExpanded, needsToggle } = useExpandableContent();
+
+    expect(isExpanded.value).toBe(false);
+    expect(needsToggle.value).toBe(false);
+  });
+
+  it('checkOverflow sets needsToggle to true when content overflows', async () => {
+    const { contentElement, needsToggle, checkOverflow } =
+      useExpandableContent();
+
+    // Mock element with overflow
+    contentElement.value = {
+      scrollHeight: 100, // Much larger than 2 lines (40px)
+    };
+
+    checkOverflow();
+    await nextTick();
+
+    expect(needsToggle.value).toBe(true);
+  });
+
+  it('checkOverflow sets needsToggle to false when content fits', async () => {
+    const { contentElement, needsToggle, checkOverflow } =
+      useExpandableContent();
+
+    // Mock element without overflow
+    contentElement.value = {
+      scrollHeight: 30, // Less than 2 lines (40px)
+    };
+
+    checkOverflow();
+    await nextTick();
+
+    expect(needsToggle.value).toBe(false);
+  });
+
+  it('respects custom maxLines option', async () => {
+    const { contentElement, needsToggle, checkOverflow } = useExpandableContent(
+      {
+        maxLines: 3,
+      }
+    );
+
+    // Mock element that fits in 3 lines but not 2
+    contentElement.value = {
+      scrollHeight: 50, // Fits in 3 lines (60px) but not 2 lines (40px)
+    };
+
+    checkOverflow();
+    await nextTick();
+
+    expect(needsToggle.value).toBe(false);
+  });
+
+  it('uses defaultLineHeight when computed style is unavailable', async () => {
+    window.getComputedStyle = vi.fn(() => ({
+      lineHeight: 'normal', // Not a valid number
+    }));
+
+    const { contentElement, needsToggle, checkOverflow } = useExpandableContent(
+      {
+        defaultLineHeight: 16,
+      }
+    );
+
+    // Mock element that overflows with 16px line height (32px max)
+    contentElement.value = {
+      scrollHeight: 40,
+    };
+
+    checkOverflow();
+    await nextTick();
+
+    expect(needsToggle.value).toBe(true);
+  });
+
+  it('handles null contentElement gracefully', () => {
+    const { checkOverflow } = useExpandableContent();
+
+    // Should not throw when contentElement is null
+    expect(() => checkOverflow()).not.toThrow();
+  });
+});
diff --git a/app/javascript/shared/composables/useExpandableContent.js b/app/javascript/shared/composables/useExpandableContent.js
new file mode 100644
index 000000000..fa945b81c
--- /dev/null
+++ b/app/javascript/shared/composables/useExpandableContent.js
@@ -0,0 +1,62 @@
+import { ref, computed, nextTick, onMounted } from 'vue';
+import { useToggle, useResizeObserver } from '@vueuse/core';
+
+/**
+ * Composable for handling expandable content with "Read more / Read less" functionality.
+ * Detects content overflow and provides toggle state for expansion.
+ *
+ * @param {Object} options - Configuration options
+ * @param {number} [options.maxLines=2] - Maximum number of lines before showing toggle
+ * @param {number} [options.defaultLineHeight=20] - Fallback line height if computed style is unavailable
+ * @param {boolean} [options.useResizeObserverForCheck=false] - Use ResizeObserver for continuous overflow checking
+ * @returns {Object} - Composable state and methods
+ */
+export function useExpandableContent(options = {}) {
+  const {
+    maxLines = 2,
+    defaultLineHeight = 20,
+    useResizeObserverForCheck = false,
+  } = options;
+
+  const contentElement = ref(null);
+  const [isExpanded, toggleExpanded] = useToggle(false);
+  const needsToggle = ref(false);
+
+  const showReadMore = computed(() => needsToggle.value && !isExpanded.value);
+  const showReadLess = computed(() => needsToggle.value && isExpanded.value);
+
+  /**
+   * Checks if content overflows the maximum allowed height
+   * and updates needsToggle accordingly
+   */
+  const checkOverflow = () => {
+    if (!contentElement.value) return;
+
+    const element = contentElement.value;
+    const computedStyle = window.getComputedStyle(element);
+    const lineHeight =
+      parseFloat(computedStyle.lineHeight) || defaultLineHeight;
+    const maxHeight = lineHeight * maxLines;
+
+    needsToggle.value = element.scrollHeight > maxHeight;
+  };
+
+  // Setup overflow checking based on configuration
+  if (useResizeObserverForCheck) {
+    useResizeObserver(contentElement, checkOverflow);
+  } else {
+    onMounted(() => {
+      nextTick(checkOverflow);
+    });
+  }
+
+  return {
+    contentElement,
+    isExpanded,
+    needsToggle,
+    showReadMore,
+    showReadLess,
+    toggleExpanded,
+    checkOverflow,
+  };
+}
diff --git a/app/jobs/data_import_job.rb b/app/jobs/data_import_job.rb
index db1411e68..d8bbeb992 100644
--- a/app/jobs/data_import_job.rb
+++ b/app/jobs/data_import_job.rb
@@ -65,7 +65,6 @@ class DataImportJob < ApplicationJob
 
     @data_import.failed_records.attach(io: StringIO.new(csv_data), filename: "#{Time.zone.today.strftime('%Y%m%d')}_contacts.csv",
                                        content_type: 'text/csv')
-    send_import_notification_to_admin
   end
 
   def generate_csv_data(rejected_contacts)
diff --git a/app/models/message.rb b/app/models/message.rb
index 0bf7a176b..3be04c54f 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -322,12 +322,21 @@ class Message < ApplicationRecord
   end
 
   def update_waiting_since
-    if human_response? && !private && conversation.waiting_since.present?
-      Rails.configuration.dispatcher.dispatch(
-        REPLY_CREATED, Time.zone.now, waiting_since: conversation.waiting_since, message: self
-      )
-      conversation.update(waiting_since: nil)
+    waiting_present = conversation.waiting_since.present?
+
+    if waiting_present && !private
+      if human_response?
+        Rails.configuration.dispatcher.dispatch(
+          REPLY_CREATED, Time.zone.now, waiting_since: conversation.waiting_since, message: self
+        )
+        conversation.update(waiting_since: nil)
+      elsif bot_response?
+        # Bot responses also clear waiting_since (simpler than checking on next customer message)
+        conversation.update(waiting_since: nil)
+      end
     end
+
+    # Set waiting_since when customer sends a message (if currently blank)
     conversation.update(waiting_since: created_at) if incoming? && conversation.waiting_since.blank?
   end
 
@@ -341,6 +350,11 @@ class Message < ApplicationRecord
       sender.is_a?(User)
   end
 
+  def bot_response?
+    # Check if this is a response from AgentBot or Captain::Assistant
+    outgoing? && sender_type.in?(['AgentBot', 'Captain::Assistant'])
+  end
+
   def dispatch_create_events
     Rails.configuration.dispatcher.dispatch(MESSAGE_CREATED, Time.zone.now, message: self, performed_by: Current.executed_by)
 
diff --git a/app/models/portal.rb b/app/models/portal.rb
index a62ba8e4d..c1d98a301 100644
--- a/app/models/portal.rb
+++ b/app/models/portal.rb
@@ -53,7 +53,7 @@ class Portal < ApplicationRecord
       file_type: logo.content_type,
       account_id: account_id,
       file_url: url_for(logo),
-      blob_id: logo.blob_id,
+      blob_id: logo.blob.signed_id,
       filename: logo.filename.to_s
     }
   end
diff --git a/app/models/webhook.rb b/app/models/webhook.rb
index 3fafb4354..1d61c1614 100644
--- a/app/models/webhook.rb
+++ b/app/models/webhook.rb
@@ -5,7 +5,7 @@
 #  id            :bigint           not null, primary key
 #  name          :string
 #  subscriptions :jsonb
-#  url           :string
+#  url           :text
 #  webhook_type  :integer          default("account_type")
 #  created_at    :datetime         not null
 #  updated_at    :datetime         not null
diff --git a/app/presenters/mail_presenter.rb b/app/presenters/mail_presenter.rb
index 202c255a1..08e370cd8 100644
--- a/app/presenters/mail_presenter.rb
+++ b/app/presenters/mail_presenter.rb
@@ -95,6 +95,7 @@ class MailPresenter < SimpleDelegator
       content_type: content_type,
       date: date,
       from: from,
+      headers: headers_data,
       html_content: html_content,
       in_reply_to: in_reply_to,
       message_id: message_id,
@@ -136,6 +137,16 @@ class MailPresenter < SimpleDelegator
     from_email_address(@mail[:reply_to].try(:value)) || @mail['X-Original-Sender'].try(:value) || from_email_address(from.first)
   end
 
+  def headers_data
+    headers = {
+      'x-original-from' => @mail['X-Original-From']&.value,
+      'x-original-sender' => @mail['X-Original-Sender']&.value,
+      'x-forwarded-for' => @mail['X-Forwarded-For']&.value
+    }.compact
+
+    headers.presence
+  end
+
   def from_email_address(email)
     Mail::Address.new(email).address
   end
diff --git a/app/services/csat_survey_service.rb b/app/services/csat_survey_service.rb
index 15d63722c..9afddc6d3 100644
--- a/app/services/csat_survey_service.rb
+++ b/app/services/csat_survey_service.rb
@@ -4,7 +4,9 @@ class CsatSurveyService
   def perform
     return unless should_send_csat_survey?
 
-    if within_messaging_window?
+    if whatsapp_channel? && template_available_and_approved?
+      send_whatsapp_template_survey
+    elsif within_messaging_window?
       ::MessageTemplates::Template::CsatSurvey.new(conversation: conversation).perform
     else
       create_csat_not_sent_activity_message
@@ -35,6 +37,64 @@ class CsatSurveyService
     conversation.can_reply?
   end
 
+  def whatsapp_channel?
+    inbox.channel_type == 'Channel::Whatsapp'
+  end
+
+  def template_available_and_approved?
+    template_config = inbox.csat_config&.dig('template')
+    return false unless template_config
+
+    template_name = template_config['name'] || Whatsapp::CsatTemplateNameService.csat_template_name(inbox.id)
+
+    status_result = inbox.channel.provider_service.get_template_status(template_name)
+
+    status_result[:success] && status_result[:template][:status] == 'APPROVED'
+  rescue StandardError => e
+    Rails.logger.error "Error checking CSAT template status: #{e.message}"
+    false
+  end
+
+  def send_whatsapp_template_survey
+    template_config = inbox.csat_config&.dig('template')
+    template_name = template_config['name'] || Whatsapp::CsatTemplateNameService.csat_template_name(inbox.id)
+
+    phone_number = conversation.contact_inbox.source_id
+    template_info = build_template_info(template_name, template_config)
+    message = build_csat_message
+
+    message_id = inbox.channel.provider_service.send_template(phone_number, template_info, message)
+
+    message.update!(source_id: message_id) if message_id.present?
+  rescue StandardError => e
+    Rails.logger.error "Error sending WhatsApp CSAT template for conversation #{conversation.id}: #{e.message}"
+  end
+
+  def build_template_info(template_name, template_config)
+    {
+      name: template_name,
+      lang_code: template_config['language'] || 'en',
+      parameters: [
+        {
+          type: 'button',
+          sub_type: 'url',
+          index: '0',
+          parameters: [{ type: 'text', text: conversation.uuid }]
+        }
+      ]
+    }
+  end
+
+  def build_csat_message
+    conversation.messages.build(
+      account: conversation.account,
+      inbox: inbox,
+      message_type: :outgoing,
+      content: inbox.csat_config&.dig('message') || 'Please rate this conversation',
+      content_type: :input_csat
+    )
+  end
+
   def create_csat_not_sent_activity_message
     content = I18n.t('conversations.activity.csat.not_sent_due_to_messaging_window')
     activity_message_params = {
diff --git a/app/services/search_service.rb b/app/services/search_service.rb
index 0fbe4ec3b..d6a0453cf 100644
--- a/app/services/search_service.rb
+++ b/app/services/search_service.rb
@@ -31,25 +31,38 @@ class SearchService
   end
 
   def filter_conversations
-    @conversations = current_account.conversations.where(inbox_id: accessable_inbox_ids)
-                                    .joins('INNER JOIN contacts ON conversations.contact_id = contacts.id')
-                                    .where("cast(conversations.display_id as text) ILIKE :search OR contacts.name ILIKE :search OR contacts.email
+    conversations_query = current_account.conversations.where(inbox_id: accessable_inbox_ids)
+                                         .joins('INNER JOIN contacts ON conversations.contact_id = contacts.id')
+                                         .where("cast(conversations.display_id as text) ILIKE :search OR contacts.name ILIKE :search OR contacts.email
                             ILIKE :search OR contacts.phone_number ILIKE :search OR contacts.identifier ILIKE :search", search: "%#{search_query}%")
-                                    .order('conversations.created_at DESC')
-                                    .page(params[:page])
-                                    .per(15)
+
+    if current_account.feature_enabled?('advanced_search')
+      conversations_query = apply_time_filter(conversations_query,
+                                              'conversations.last_activity_at')
+    end
+
+    @conversations = conversations_query.order('conversations.created_at DESC')
+                                        .page(params[:page])
+                                        .per(15)
   end
 
   def filter_messages
     @messages = if use_gin_search
                   filter_messages_with_gin
                 elsif should_run_advanced_search?
-                  advanced_search
+                  advanced_search_with_fallback
                 else
                   filter_messages_with_like
                 end
   end
 
+  def advanced_search_with_fallback
+    advanced_search
+  rescue Faraday::ConnectionFailed, Searchkick::Error, Elasticsearch::Transport::Transport::Error => e
+    Rails.logger.warn("Elasticsearch unavailable, falling back to SQL search: #{e.message}")
+    use_gin_search ? filter_messages_with_gin : filter_messages_with_like
+  end
+
   def should_run_advanced_search?
     ChatwootApp.advanced_search_allowed? && current_account.feature_enabled?('advanced_search')
   end
@@ -58,6 +71,7 @@ class SearchService
 
   def filter_messages_with_gin
     base_query = message_base_query
+    base_query = apply_message_filters(base_query)
 
     if search_query.present?
       # Use the @@ operator with to_tsquery for better GIN index utilization
@@ -82,11 +96,12 @@ class SearchService
   end
 
   def filter_messages_with_like
-    message_base_query
-      .where('messages.content ILIKE :search', search: "%#{search_query}%")
-      .reorder('created_at DESC')
-      .page(params[:page])
-      .per(15)
+    base_query = message_base_query
+    base_query = apply_message_filters(base_query)
+    base_query.where('messages.content ILIKE :search', search: "%#{search_query}%")
+              .reorder('created_at DESC')
+              .page(params[:page])
+              .per(15)
   end
 
   def message_base_query
@@ -95,6 +110,45 @@ class SearchService
     query
   end
 
+  def apply_message_filters(query)
+    return query unless current_account.feature_enabled?('advanced_search')
+
+    query = apply_time_filter(query, 'messages.created_at')
+    query = apply_sender_filter(query)
+    apply_inbox_id_filter(query)
+  end
+
+  def apply_sender_filter(query)
+    sender_type, sender_id = parse_from_param(params[:from])
+    return query unless sender_type && sender_id
+
+    query.where(sender_type: sender_type, sender_id: sender_id)
+  end
+
+  def parse_from_param(from_param)
+    return [nil, nil] unless from_param&.match?(/\A(contact|agent):\d+\z/)
+
+    type, id = from_param.split(':')
+    sender_type = type == 'agent' ? 'User' : 'Contact'
+    [sender_type, id.to_i]
+  end
+
+  def apply_inbox_id_filter(query)
+    return query if params[:inbox_id].blank?
+
+    inbox_id = params[:inbox_id].to_i
+    return query if inbox_id.zero?
+    return query unless validate_inbox_access(inbox_id)
+
+    query.where(inbox_id: inbox_id)
+  end
+
+  def validate_inbox_access(inbox_id)
+    return true if should_skip_inbox_filtering?
+
+    accessable_inbox_ids.include?(inbox_id)
+  end
+
   def should_skip_inbox_filtering?
     account_user.administrator? || user_has_access_to_all_inboxes?
   end
@@ -108,19 +162,46 @@ class SearchService
   end
 
   def filter_contacts
-    @contacts = current_account.contacts.where(
+    contacts_query = current_account.contacts.where(
       "name ILIKE :search OR email ILIKE :search OR phone_number
       ILIKE :search OR identifier ILIKE :search", search: "%#{search_query}%"
-    ).resolved_contacts(
+    )
+
+    contacts_query = apply_time_filter(contacts_query, 'last_activity_at') if current_account.feature_enabled?('advanced_search')
+
+    @contacts = contacts_query.resolved_contacts(
       use_crm_v2: current_account.feature_enabled?('crm_v2')
     ).order_on_last_activity_at('desc').page(params[:page]).per(15)
   end
 
   def filter_articles
-    @articles = current_account.articles
-                               .text_search(search_query)
-                               .page(params[:page])
-                               .per(15)
+    articles_query = current_account.articles.text_search(search_query)
+    articles_query = apply_time_filter(articles_query, 'updated_at') if current_account.feature_enabled?('advanced_search')
+
+    @articles = articles_query.page(params[:page]).per(15)
+  end
+
+  def apply_time_filter(query, column_name)
+    return query if params[:since].blank? && params[:until].blank?
+
+    query = query.where("#{column_name} >= ?", cap_since_time(params[:since])) if params[:since].present?
+    query = query.where("#{column_name} <= ?", cap_until_time(params[:until])) if params[:until].present?
+    query
+  end
+
+  def cap_since_time(since_param)
+    max_lookback = 90.days.ago
+    requested_time = Time.zone.at(since_param.to_i)
+
+    # Silently cap to max_lookback if requested time is too far back
+    [requested_time, max_lookback].max
+  end
+
+  def cap_until_time(until_param)
+    max_future = 90.days.from_now
+    requested_time = Time.zone.at(until_param.to_i)
+
+    [requested_time, max_future].min
   end
 end
 
diff --git a/app/views/api/v1/accounts/search/_article.json.jbuilder b/app/views/api/v1/accounts/search/_article.json.jbuilder
index a3cf94614..352cb64d8 100644
--- a/app/views/api/v1/accounts/search/_article.json.jbuilder
+++ b/app/views/api/v1/accounts/search/_article.json.jbuilder
@@ -6,3 +6,5 @@ json.slug article.slug
 json.portal_slug article.portal.slug
 json.account_id article.account_id
 json.category_name article.category&.name
+json.status article.status
+json.updated_at article.updated_at.to_i
diff --git a/app/views/api/v1/accounts/search/_contact.json.jbuilder b/app/views/api/v1/accounts/search/_contact.json.jbuilder
index 8d6ebcc96..0d9578725 100644
--- a/app/views/api/v1/accounts/search/_contact.json.jbuilder
+++ b/app/views/api/v1/accounts/search/_contact.json.jbuilder
@@ -3,3 +3,5 @@ json.id contact.id
 json.name contact.name
 json.phone_number contact.phone_number
 json.identifier contact.identifier
+json.additional_attributes contact.additional_attributes
+json.last_activity_at contact.last_activity_at&.to_i
diff --git a/app/views/layouts/vueapp.html.erb b/app/views/layouts/vueapp.html.erb
index 6cb238c6e..d97ece981 100644
--- a/app/views/layouts/vueapp.html.erb
+++ b/app/views/layouts/vueapp.html.erb
@@ -63,10 +63,10 @@
       }
       window.errorLoggingConfig = '<%= ENV.fetch('SENTRY_FRONTEND_DSN', '') || ENV.fetch('SENTRY_DSN', '') %>'
     </script>
-    <% if @global_config['ANALYTICS_TOKEN'].present? %>
+    <% if @global_config['CLOUD_ANALYTICS_TOKEN'].present? %>
     <script>
       window.analyticsConfig = {
-        token: '<%= @global_config['ANALYTICS_TOKEN'] %>',
+        token: '<%= @global_config['CLOUD_ANALYTICS_TOKEN'] %>',
       }
     </script>
     <% end %>
diff --git a/config/installation_config.yml b/config/installation_config.yml
index 8581deb97..567da8a59 100644
--- a/config/installation_config.yml
+++ b/config/installation_config.yml
@@ -225,10 +225,10 @@
 - name: DEPLOYMENT_ENV
   value: self-hosted
   description: 'The deployment environment of the installation, to differentiate between Chatwoot cloud and self-hosted'
-- name: ANALYTICS_TOKEN
+- name: CLOUD_ANALYTICS_TOKEN
   value:
   display_title: 'Analytics Token'
-  description: 'The PostHog analytics token for Chatwoot cloud'
+  description: 'The Amplitude analytics API key for Chatwoot cloud'
   type: secret
 - name: CLEARBIT_API_KEY
   value:
diff --git a/config/locales/am.yml b/config/locales/am.yml
index 73e512339..f53012a9e 100644
--- a/config/locales/am.yml
+++ b/config/locales/am.yml
@@ -48,6 +48,8 @@ am:
       failed: Signup failed
     assignment_policy:
       not_found: Assignment policy not found
+    attachments:
+      invalid: Invalid attachment
     saml:
       feature_not_enabled: SAML feature not enabled for this account
       sso_not_enabled: SAML SSO is not enabled for this installation
@@ -68,6 +70,9 @@ am:
         invalid: must be a valid domain name
       search:
         query_missing: Specify search string with parameter q
+    messages:
+      search:
+        time_range_limit_exceeded: 'Search is limited to the last %{days} days'
     categories:
       locale:
         unique: should be unique in the category and portal
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 7479e90b4..eb1573a38 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -48,6 +48,8 @@ ar:
       failed: فشلت عملية التسجيل
     assignment_policy:
       not_found: Assignment policy not found
+    attachments:
+      invalid: Invalid attachment
     saml:
       feature_not_enabled: SAML feature not enabled for this account
       sso_not_enabled: SAML SSO is not enabled for this installation
@@ -68,6 +70,9 @@ ar:
         invalid: must be a valid domain name
       search:
         query_missing: Specify search string with parameter q
+    messages:
+      search:
+        time_range_limit_exceeded: 'Search is limited to the last %{days} days'
     categories:
       locale:
         unique: يجب أن تكون فريدة من نوعها في الفئة والبوابة
diff --git a/config/locales/az.yml b/config/locales/az.yml
index 5d882c837..f3dbec20a 100644
--- a/config/locales/az.yml
+++ b/config/locales/az.yml
@@ -48,6 +48,8 @@ az:
       failed: Signup failed
     assignment_policy:
       not_found: Assignment policy not found
+    attachments:
+      invalid: Invalid attachment
     saml:
       feature_not_enabled: SAML feature not enabled for this account
       sso_not_enabled: SAML SSO is not enabled for this installation
@@ -68,6 +70,9 @@ az:
         invalid: must be a valid domain name
       search:
         query_missing: Specify search string with parameter q
+    messages:
+      search:
+        time_range_limit_exceeded: 'Search is limited to the last %{days} days'
     categories:
       locale:
         unique: should be unique in the category and portal
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index e7d9051ab..8349a4dc1 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -48,6 +48,8 @@ bg:
       failed: Signup failed
     assignment_policy:
       not_found: Assignment policy not found
+    attachments:
+      invalid: Invalid attachment
     saml:
       feature_not_enabled: SAML feature not enabled for this account
       sso_not_enabled: SAML SSO is not enabled for this installation
@@ -68,6 +70,9 @@ bg:
         invalid: must be a valid domain name
       search:
         query_missing: Specify search string with parameter q
+    messages:
+      search:
+        time_range_limit_exceeded: 'Search is limited to the last %{days} days'
     categories:
       locale:
         unique: should be unique in the category and portal
diff --git a/config/locales/bn.yml b/config/locales/bn.yml
index d049fcb05..aa1bc9c79 100644
--- a/config/locales/bn.yml
+++ b/config/locales/bn.yml
@@ -48,6 +48,8 @@ bn:
       failed: Signup failed
     assignment_policy:
       not_found: Assignment policy not found
+    attachments:
+      invalid: Invalid attachment
     saml:
       feature_not_enabled: SAML feature not enabled for this account
       sso_not_enabled: SAML SSO is not enabled for this installation
@@ -68,6 +70,9 @@ bn:
         invalid: must be a valid domain name
       search:
         query_missing: Specify search string with parameter q
+    messages:
+      search:
+        time_range_limit_exceeded: 'Search is limited to the last %{days} days'
     categories:
       locale:
         unique: should be unique in the category and portal
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index ebc2da3cc..8dd65ee7f 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -48,6 +48,8 @@ ca:
       failed: El registre ha fallat
     assignment_policy:
       not_found: Assignment policy not found
+    attachments:
+      invalid: Invalid attachment
     saml:
       feature_not_enabled: SAML feature not enabled for this account
       sso_not_enabled: SAML SSO is not enabled for this installation
@@ -68,6 +70,9 @@ ca:
         invalid: must be a valid domain name
       search:
         query_missing: Specify search string with parameter q
+    messages:
+      search:
+        time_range_limit_exceeded: 'Search is limited to the last %{days} days'
     categories:
       locale:
         unique: hauria de ser únic a la categoria i al portal
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index bd0796239..47819244e 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -48,6 +48,8 @@ cs:
       failed: Registrace se nezdařila
     assignment_policy:
       not_found: Assignment policy not found
+    attachments:
+      invalid: Invalid attachment
     saml:
       feature_not_enabled: SAML feature not enabled for this account
       sso_not_enabled: SAML SSO is not enabled for this installation
@@ -68,6 +70,9 @@ cs:
         invalid: must be a valid domain name
       search:
         query_missing: Specify search string with parameter q
+    messages:
+      search:
+        time_range_limit_exceeded: 'Search is limited to the last %{days} days'
     categories:
       locale:
         unique: should be unique in the category and portal
diff --git a/config/locales/da.yml b/config/locales/da.yml
index f5b526707..5f3a95b46 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -48,6 +48,8 @@ da:
       failed: Tilmelding mislykkedes
     assignment_policy:
       not_found: Assignment policy not found
+    attachments:
+      invalid: Invalid attachment
     saml:
       feature_not_enabled: SAML feature not enabled for this account
       sso_not_enabled: SAML SSO is not enabled for this installation
@@ -68,6 +70,9 @@ da:
         invalid: must be a valid domain name
       search:
         query_missing: Specify search string with parameter q
+    messages:
+      search:
+        time_range_limit_exceeded: 'Search is limited to the last %{days} days'
     categories:
       locale:
         unique: bør være unik i kategorien og portalen
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 6e6a544a7..48154b21d 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -48,6 +48,8 @@ de:
       failed: Anmeldung gescheitert
     assignment_policy:
       not_found: Assignment policy not found
+    attachments:
+      invalid: Invalid attachment
     saml:
       feature_not_enabled: SAML feature not enabled for this account
       sso_not_enabled: SAML SSO is not enabled for this installation
@@ -68,6 +70,9 @@ de:
         invalid: must be a valid domain name
       search:
         query_missing: Specify search string with parameter q
+    messages:
+      search:
+        time_range_limit_exceeded: 'Search is limited to the last %{days} days'
     categories:
       locale:
         unique: sollte in der Kategorie und im Portal eindeutig sein
diff --git a/config/locales/el.yml b/config/locales/el.yml
index db15c55a6..d804c4bde 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -48,6 +48,8 @@ el:
       failed: Η εγγραφή απέτυχε
     assignment_policy:
       not_found: Assignment policy not found
+    attachments:
+      invalid: Invalid attachment
     saml:
       feature_not_enabled: SAML feature not enabled for this account
       sso_not_enabled: SAML SSO is not enabled for this installation
@@ -68,6 +70,9 @@ el:
         invalid: must be a valid domain name
       search:
         query_missing: Specify search string with parameter q
+    messages:
+      search:
+        time_range_limit_exceeded: 'Search is limited to the last %{days} days'
     categories:
       locale:
         unique: πρέπει να είναι μοναδικό στην κατηγορία και την πύλη
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 71706f665..aacabb1fc 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -84,6 +84,9 @@ en:
         invalid: must be a valid domain name
       search:
         query_missing: Specify search string with parameter q
+    messages:
+      search:
+        time_range_limit_exceeded: 'Search is limited to the last %{days} days'
     categories:
       locale:
         unique: should be unique in the category and portal
diff --git a/config/locales/es.yml b/config/locales/es.yml
index c78419730..dc7cbf037 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -48,6 +48,8 @@ es:
       failed: Registro fallido
     assignment_policy:
       not_found: Assignment policy not found
+    attachments:
+      invalid: Invalid attachment
     saml:
       feature_not_enabled: SAML feature not enabled for this account
       sso_not_enabled: SAML SSO is not enabled for this installation
@@ -68,6 +70,9 @@ es:
         invalid: must be a valid domain name
       search:
         query_missing: Specify search string with parameter q
+    messages:
+      search:
+        time_range_limit_exceeded: 'Search is limited to the last %{days} days'
     categories:
       locale:
         unique: debe ser único en la categoría y el portal
diff --git a/config/locales/et.yml b/config/locales/et.yml
index 7b9fb50dd..7eb167dc1 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -48,6 +48,8 @@ et:
       failed: Signup failed
     assignment_policy:
       not_found: Assignment policy not found
+    attachments:
+      invalid: Invalid attachment
     saml:
       feature_not_enabled: SAML feature not enabled for this account
       sso_not_enabled: SAML SSO is not enabled for this installation
@@ -68,6 +70,9 @@ et:
         invalid: must be a valid domain name
       search:
         query_missing: Specify search string with parameter q
+    messages:
+      search:
+        time_range_limit_exceeded: 'Search is limited to the last %{days} days'
     categories:
       locale:
         unique: should be unique in the category and portal
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 1336264b3..711327d47 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -48,6 +48,8 @@ fa:
       failed: ثبت نام ناموفق بود
     assignment_policy:
       not_found: Assignment policy not found
+    attachments:
+      invalid: Invalid attachment
     saml:
       feature_not_enabled: SAML feature not enabled for this account
       sso_not_enabled: SAML SSO is not enabled for this installation
@@ -68,6 +70,9 @@ fa:
         invalid: must be a valid domain name
       search:
         query_missing: Specify search string with parameter q
+    messages:
+      search:
+        time_range_limit_exceeded: 'Search is limited to the last %{days} days'
     categories:
       locale:
         unique: باید منحصر به فرد در دسته‌بندی و پورتال باشد
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index ea1821872..b4e537064 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -48,6 +48,8 @@ fi:
       failed: Rekisteröityminen epäonnistui
     assignment_policy:
       not_found: Assignment policy not found
+    attachments:
+      invalid: Invalid attachment
     saml:
       feature_not_enabled: SAML feature not enabled for this account
       sso_not_enabled: SAML SSO is not enabled for this installation
@@ -68,6 +70,9 @@ fi:
         invalid: must be a valid domain name
       search:
         query_missing: Specify search string with parameter q
+    messages:
+      search:
+        time_range_limit_exceeded: 'Search is limited to the last %{days} days'
     categories:
       locale:
         unique: should be unique in the category and portal
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 3e1339872..389fdb243 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -48,6 +48,8 @@ fr:
       failed: L'inscription a échoué
     assignment_policy:
       not_found: Assignment policy not found
+    attachments:
+      invalid: Invalid attachment
     saml:
       feature_not_enabled: SAML feature not enabled for this account
       sso_not_enabled: SAML SSO is not enabled for this installation
@@ -68,6 +70,9 @@ fr:
         invalid: must be a valid domain name
       search:
         query_missing: Specify search string with parameter q
+    messages:
+      search:
+        time_range_limit_exceeded: 'Search is limited to the last %{days} days'
     categories:
       locale:
         unique: Doit être unique dans la catégorie et le portail
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 07f90a40b..acede34d6 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -48,6 +48,8 @@ he:
       failed: הרישמה נכשלה
     assignment_policy:
       not_found: מדיניות הקצאה לא נמצאה
+    attachments:
+      invalid: Invalid attachment
     saml:
       feature_not_enabled: תכונת SAML לא מופעלת עבור חשבון זה
       sso_not_enabled: SAML SSO is not enabled for this installation
@@ -68,6 +70,9 @@ he:
         invalid: חייב להיות שם דומיין תקין
       search:
         query_missing: Specify search string with parameter q
+    messages:
+      search:
+        time_range_limit_exceeded: 'Search is limited to the last %{days} days'
     categories:
       locale:
         unique: צריך להיות ייחודי בקטגוריה ובפורטל
diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index 3647fff47..662297605 100644
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -48,6 +48,8 @@ hi:
       failed: Signup failed
     assignment_policy:
       not_found: Assignment policy not found
+    attachments:
+      invalid: Invalid attachment
     saml:
       feature_not_enabled: SAML feature not enabled for this account
       sso_not_enabled: SAML SSO is not enabled for this installation
@@ -68,6 +70,9 @@ hi:
         invalid: must be a valid domain name
       search:
         query_missing: Specify search string with parameter q
+    messages:
+      search:
+        time_range_limit_exceeded: 'Search is limited to the last %{days} days'
     categories:
       locale:
         unique: should be unique in the category and portal
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 50afda416..adb10e198 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -48,6 +48,8 @@ hr:
       failed: Signup failed
     assignment_policy:
       not_found: Assignment policy not found
+    attachments:
+      invalid: Invalid attachment
     saml:
       feature_not_enabled: SAML feature not enabled for this account
       sso_not_enabled: SAML SSO is not enabled for this installation
@@ -68,6 +70,9 @@ hr:
         invalid: must be a valid domain name
       search:
         query_missing: Specify search string with parameter q
+    messages:
+      search:
+        time_range_limit_exceeded: 'Search is limited to the last %{days} days'
     categories:
       locale:
         unique: should be unique in the category and portal
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 36f7ef63b..b1563a377 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -48,6 +48,8 @@ hu:
       failed: Feliratkozás sikertelen
     assignment_policy:
       not_found: Assignment policy not found
+    attachments:
+      invalid: Invalid attachment
     saml:
       feature_not_enabled: SAML feature not enabled for this account
       sso_not_enabled: SAML SSO is not enabled for this installation
@@ -68,6 +70,9 @@ hu:
         invalid: must be a valid domain name
       search:
         query_missing: Specify search string with parameter q
+    messages:
+      search:
+        time_range_limit_exceeded: 'Search is limited to the last %{days} days'
     categories:
       locale:
         unique: egyedinek kell lennie a kategóriában a portálon
diff --git a/config/locales/hy.yml b/config/locales/hy.yml
index a87a0fab7..d41117ca8 100644
--- a/config/locales/hy.yml
+++ b/config/locales/hy.yml
@@ -48,6 +48,8 @@ hy:
       failed: Signup failed
     assignment_policy:
       not_found: Assignment policy not found
+    attachments:
+      invalid: Invalid attachment
     saml:
       feature_not_enabled: SAML feature not enabled for this account
       sso_not_enabled: SAML SSO is not enabled for this installation
@@ -68,6 +70,9 @@ hy:
         invalid: must be a valid domain name
       search:
         query_missing: Specify search string with parameter q
+    messages:
+      search:
+        time_range_limit_exceeded: 'Search is limited to the last %{days} days'
     categories:
       locale:
         unique: should be unique in the category and portal
diff --git a/config/locales/id.yml b/config/locales/id.yml
index 0f64a17aa..b5bf69bf2 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -48,6 +48,8 @@ id:
       failed: Pendaftaran gagal
     assignment_policy:
       not_found: Assignment policy not found
+    attachments:
+      invalid: Invalid attachment
     saml:
       feature_not_enabled: SAML feature not enabled for this account
       sso_not_enabled: SAML SSO is not enabled for this installation
@@ -68,6 +70,9 @@ id:
         invalid: must be a valid domain name
       search:
         query_missing: Specify search string with parameter q
+    messages:
+      search:
+        time_range_limit_exceeded: 'Search is limited to the last %{days} days'
     categories:
       locale:
         unique: harus unik dalam kategori dan portal
diff --git a/config/locales/is.yml b/config/locales/is.yml
index 7ed92f30c..faf4d1c63 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -48,6 +48,8 @@ is:
       failed: Signup failed
     assignment_policy:
       not_found: Assignment policy not found
+    attachments:
+      invalid: Invalid attachment
     saml:
       feature_not_enabled: SAML feature not enabled for this account
       sso_not_enabled: SAML SSO is not enabled for this installation
@@ -68,6 +70,9 @@ is:
         invalid: must be a valid domain name
       search:
         query_missing: Specify search string with parameter q
+    messages:
+      search:
+        time_range_limit_exceeded: 'Search is limited to the last %{days} days'
     categories:
       locale:
         unique: ætti að vera einstakt í flokki og gátt
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 25d2fbc6c..e6cc80c75 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -48,6 +48,8 @@ it:
       failed: Registrazione non riuscita
     assignment_policy:
       not_found: Policy di assegnazione non trovata
+    attachments:
+      invalid: Allegato non valido
     saml:
       feature_not_enabled: Funzionalità SAML non attiva per questo account
       sso_not_enabled: SAML SSO non è abilitato per questa installazione
@@ -67,7 +69,10 @@ it:
       domain:
         invalid: deve essere un dominio valido
       search:
-        query_missing: Specify search string with parameter q
+        query_missing: Specifica la stringa di ricerca con parametro q
+    messages:
+      search:
+        time_range_limit_exceeded: 'La ricerca è limitata agli ultimi %{days} giorni'
     categories:
       locale:
         unique: deve essere unico nella categoria e nel portale
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index a26c1c9e4..ebbea91ef 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -48,6 +48,8 @@ ja:
       failed: サインアップに失敗しました
     assignment_policy:
       not_found: Assignment policy not found
+    attachments:
+      invalid: Invalid attachment
     saml:
       feature_not_enabled: SAML feature not enabled for this account
       sso_not_enabled: SAML SSO is not enabled for this installation
@@ -68,6 +70,9 @@ ja:
         invalid: must be a valid domain name
       search:
         query_missing: Specify search string with parameter q
+    messages:
+      search:
+        time_range_limit_exceeded: 'Search is limited to the last %{days} days'
     categories:
       locale:
         unique: カテゴリとポータルで一意である必要があります
diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index b118522e2..2f3047807 100644
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -48,6 +48,8 @@ ka:
       failed: Signup failed
     assignment_policy:
       not_found: Assignment policy not found
+    attachments:
+      invalid: Invalid attachment
     saml:
       feature_not_enabled: SAML feature not enabled for this account
       sso_not_enabled: SAML SSO is not enabled for this installation
@@ -68,6 +70,9 @@ ka:
         invalid: must be a valid domain name
       search:
         query_missing: Specify search string with parameter q
+    messages:
+      search:
+        time_range_limit_exceeded: 'Search is limited to the last %{days} days'
     categories:
       locale:
         unique: should be unique in the category and portal
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 1bd2a1fc3..90bd992ab 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -48,6 +48,8 @@ ko:
       failed: Signup failed
     assignment_policy:
       not_found: Assignment policy not found
+    attachments:
+      invalid: Invalid attachment
     saml:
       feature_not_enabled: SAML feature not enabled for this account
       sso_not_enabled: SAML SSO is not enabled for this installation
@@ -68,6 +70,9 @@ ko:
         invalid: must be a valid domain name
       search:
         query_missing: Specify search string with parameter q
+    messages:
+      search:
+        time_range_limit_exceeded: 'Search is limited to the last %{days} days'
     categories:
       locale:
         unique: should be unique in the category and portal
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 5a354642f..5d89b1a13 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -48,6 +48,8 @@ lt:
       failed: Prisijungimas nesėkmingas
     assignment_policy:
       not_found: Assignment policy not found
+    attachments:
+      invalid: Invalid attachment
     saml:
       feature_not_enabled: SAML feature not enabled for this account
       sso_not_enabled: SAML SSO neįjungta šiai diegimo versijai
@@ -68,6 +70,9 @@ lt:
         invalid: must be a valid domain name
       search:
         query_missing: Nurodykite paieškos eilutę su parametru q
+    messages:
+      search:
+        time_range_limit_exceeded: 'Search is limited to the last %{days} days'
     categories:
       locale:
         unique: turėtų būti unikalūs kategorijoje ir portale
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index b58917eaf..f235045c6 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -48,6 +48,8 @@ lv:
       failed: Reģistrēšanās neizdevās
     assignment_policy:
       not_found: Assignment policy not found
+    attachments:
+      invalid: Invalid attachment
     saml:
       feature_not_enabled: SAML feature not enabled for this account
       sso_not_enabled: SAML SSO is not enabled for this installation
@@ -68,6 +70,9 @@ lv:
         invalid: must be a valid domain name
       search:
         query_missing: Specify search string with parameter q
+    messages:
+      search:
+        time_range_limit_exceeded: 'Search is limited to the last %{days} days'
     categories:
       locale:
         unique: vajadzētu būt unikālai, kategorijā un portālā
diff --git a/config/locales/ml.yml b/config/locales/ml.yml
index 87e529871..4aadc4432 100644
--- a/config/locales/ml.yml
+++ b/config/locales/ml.yml
@@ -48,6 +48,8 @@ ml:
       failed: സൈനപ്പ് പരാജയപ്പെട്ടു
     assignment_policy:
       not_found: Assignment policy not found
+    attachments:
+      invalid: Invalid attachment
     saml:
       feature_not_enabled: SAML feature not enabled for this account
       sso_not_enabled: SAML SSO is not enabled for this installation
@@ -68,6 +70,9 @@ ml:
         invalid: must be a valid domain name
       search:
         query_missing: Specify search string with parameter q
+    messages:
+      search:
+        time_range_limit_exceeded: 'Search is limited to the last %{days} days'
     categories:
       locale:
         unique: should be unique in the category and portal
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index d0e2f3bb6..5be805e3b 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -48,6 +48,8 @@ ms:
       failed: Signup failed
     assignment_policy:
       not_found: Assignment policy not found
+    attachments:
+      invalid: Invalid attachment
     saml:
       feature_not_enabled: SAML feature not enabled for this account
       sso_not_enabled: SAML SSO is not enabled for this installation
@@ -68,6 +70,9 @@ ms:
         invalid: must be a valid domain name
       search:
         query_missing: Specify search string with parameter q
+    messages:
+      search:
+        time_range_limit_exceeded: 'Search is limited to the last %{days} days'
     categories:
       locale:
         unique: should be unique in the category and portal
diff --git a/config/locales/ne.yml b/config/locales/ne.yml
index 75072b2d9..ee5a55ce2 100644
--- a/config/locales/ne.yml
+++ b/config/locales/ne.yml
@@ -48,6 +48,8 @@ ne:
       failed: Signup failed
     assignment_policy:
       not_found: Assignment policy not found
+    attachments:
+      invalid: Invalid attachment
     saml:
       feature_not_enabled: SAML feature not enabled for this account
       sso_not_enabled: SAML SSO is not enabled for this installation
@@ -68,6 +70,9 @@ ne:
         invalid: must be a valid domain name
       search:
         query_missing: Specify search string with parameter q
+    messages:
+      search:
+        time_range_limit_exceeded: 'Search is limited to the last %{days} days'
     categories:
       locale:
         unique: should be unique in the category and portal
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 6b7035fc9..bb8f1beb0 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -48,6 +48,8 @@ nl:
       failed: Aanmelden mislukt
     assignment_policy:
       not_found: Assignment policy not found
+    attachments:
+      invalid: Invalid attachment
     saml:
       feature_not_enabled: SAML feature not enabled for this account
       sso_not_enabled: SAML SSO is not enabled for this installation
@@ -68,6 +70,9 @@ nl:
         invalid: must be a valid domain name
       search:
         query_missing: Specify search string with parameter q
+    messages:
+      search:
+        time_range_limit_exceeded: 'Search is limited to the last %{days} days'
     categories:
       locale:
         unique: moet uniek zijn in de categorie en portal
diff --git a/config/locales/no.yml b/config/locales/no.yml
index da693a903..fa1824a96 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -48,6 +48,8 @@
       failed: Registrering mislyktes
     assignment_policy:
       not_found: Assignment policy not found
+    attachments:
+      invalid: Invalid attachment
     saml:
       feature_not_enabled: SAML feature not enabled for this account
       sso_not_enabled: SAML SSO is not enabled for this installation
@@ -68,6 +70,9 @@
         invalid: must be a valid domain name
       search:
         query_missing: Specify search string with parameter q
+    messages:
+      search:
+        time_range_limit_exceeded: 'Search is limited to the last %{days} days'
     categories:
       locale:
         unique: må være unikt i kategorien og portalen
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 3fa5dfa37..a39dfdbbc 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -48,6 +48,8 @@ pl:
       failed: Rejestracja nie powiodła się
     assignment_policy:
       not_found: Assignment policy not found
+    attachments:
+      invalid: Invalid attachment
     saml:
       feature_not_enabled: SAML feature not enabled for this account
       sso_not_enabled: SAML SSO is not enabled for this installation
@@ -68,6 +70,9 @@ pl:
         invalid: must be a valid domain name
       search:
         query_missing: Specify search string with parameter q
+    messages:
+      search:
+        time_range_limit_exceeded: 'Search is limited to the last %{days} days'
     categories:
       locale:
         unique: powinno być unikalne w kategorii i portalu
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 5d8418969..194a1e8f1 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -48,6 +48,8 @@ pt:
       failed: Falha na inscrição
     assignment_policy:
       not_found: Assignment policy not found
+    attachments:
+      invalid: Invalid attachment
     saml:
       feature_not_enabled: SAML feature not enabled for this account
       sso_not_enabled: SAML SSO is not enabled for this installation
@@ -68,6 +70,9 @@ pt:
         invalid: must be a valid domain name
       search:
         query_missing: Specify search string with parameter q
+    messages:
+      search:
+        time_range_limit_exceeded: 'Search is limited to the last %{days} days'
     categories:
       locale:
         unique: deve ser único na categoria e no portal
diff --git a/config/locales/pt_BR.yml b/config/locales/pt_BR.yml
index 9163ad193..cd7d84f8f 100644
--- a/config/locales/pt_BR.yml
+++ b/config/locales/pt_BR.yml
@@ -48,9 +48,11 @@ pt_BR:
       failed: Registro falhou
     assignment_policy:
       not_found: Política de atribuição não encontrada
+    attachments:
+      invalid: Anexo inválido
     saml:
       feature_not_enabled: SAML não está habilitado para esta conta
-      sso_not_enabled: SAML SSO is not enabled for this installation
+      sso_not_enabled: O SSO via SAML não está habilitado para esta instalação
     data_import:
       data_type:
         invalid: Tipo de dado inválido
@@ -67,7 +69,10 @@ pt_BR:
       domain:
         invalid: must be a valid domain name
       search:
-        query_missing: Specify search string with parameter q
+        query_missing: Especifique a ‘string’ de busca com o parâmetro q
+    messages:
+      search:
+        time_range_limit_exceeded: 'A pesquisa está limitada aos últimos %{days} dias'
     categories:
       locale:
         unique: deve ser único na categoria e no portal
@@ -109,12 +114,12 @@ pt_BR:
       invalid_credentials: Credenciais ou código de verificação inválidos
       feature_unavailable: O recurso MFA não está disponível. Por favor, configure as chaves de criptografia.
     topup:
-      credits_required: Credits amount is required
-      invalid_credits: Invalid credits amount
-      invalid_option: Invalid topup option
-      plan_not_eligible: Top-ups are only available for paid plans. Please upgrade your plan first.
-      stripe_customer_not_configured: Stripe customer not configured
-      no_payment_method: No payment methods found. Please add a payment method before making a purchase.
+      credits_required: A quantidade de créditos é obrigatória
+      invalid_credits: Quantidade de créditos inválida
+      invalid_option: Opção de recarga inválida
+      plan_not_eligible: As recargas estão disponíveis apenas para planos pagos. Por favor, faça o upgrade do seu plano primeiro.
+      stripe_customer_not_configured: Cliente do Stripe não configurado
+      no_payment_method: Nenhum método de pagamento encontrado. Por favor, adicione um método de pagamento antes de realizar uma compra.
   profile:
     mfa:
       enabled: MFA habilitado com sucesso
@@ -190,8 +195,8 @@ pt_BR:
     messages:
       instagram_story_content: '%{story_sender} mencionou você na conversa: '
       instagram_deleted_story_content: Este Story não está mais disponível.
-      instagram_shared_story_content: 'Shared story'
-      instagram_shared_post_content: 'Shared post'
+      instagram_shared_story_content: 'Story compartilhado'
+      instagram_shared_post_content: 'Post compartilhado'
       deleted: Esta mensagem foi excluída
       whatsapp:
         list_button_label: 'Escolha um item'
@@ -329,7 +334,7 @@ pt_BR:
       pdf_processing_failed: 'Falha ao processar o documento PDF %{document_id}: %{error}'
       pdf_processing_success: 'Documento PDF processado com sucesso %{document_id}'
       faq_generation_complete: 'FAQ generation complete. Total FAQs created: %{count}'
-      using_paginated_faq: ''
+      using_paginated_faq: 'Usando geração de FAQ''s paginada para o documento %{document_id}'
       using_standard_faq: 'Using standard FAQ generation for document %{document_id}'
       response_creation_error: 'Error in creating response document: %{error}'
       missing_openai_file_id: 'O documento deve ter openai_file_id para processamento paginado'
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index e73da1a5d..c7551301f 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -48,6 +48,8 @@ ro:
       failed: Înregistrare eșuată
     assignment_policy:
       not_found: Assignment policy not found
+    attachments:
+      invalid: Invalid attachment
     saml:
       feature_not_enabled: SAML feature not enabled for this account
       sso_not_enabled: SAML SSO is not enabled for this installation
@@ -68,6 +70,9 @@ ro:
         invalid: must be a valid domain name
       search:
         query_missing: Specify search string with parameter q
+    messages:
+      search:
+        time_range_limit_exceeded: 'Search is limited to the last %{days} days'
     categories:
       locale:
         unique: ar trebui să fie unic în categorie și portal
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 000b35b35..57dcab79b 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -48,6 +48,8 @@ ru:
       failed: Ошибка регистрации
     assignment_policy:
       not_found: Политика назначения не найдена
+    attachments:
+      invalid: Invalid attachment
     saml:
       feature_not_enabled: Функция SAML не включена для этой учетной записи
       sso_not_enabled: SAML SSO is not enabled for this installation
@@ -68,6 +70,9 @@ ru:
         invalid: должно быть корректным доменным именем
       search:
         query_missing: Specify search string with parameter q
+    messages:
+      search:
+        time_range_limit_exceeded: 'Search is limited to the last %{days} days'
     categories:
       locale:
         unique: Должны быть уникальными в категории и портале
diff --git a/config/locales/sh.yml b/config/locales/sh.yml
index f433238f9..c796e3b1d 100644
--- a/config/locales/sh.yml
+++ b/config/locales/sh.yml
@@ -48,6 +48,8 @@ sh:
       failed: Signup failed
     assignment_policy:
       not_found: Assignment policy not found
+    attachments:
+      invalid: Invalid attachment
     saml:
       feature_not_enabled: SAML feature not enabled for this account
       sso_not_enabled: SAML SSO is not enabled for this installation
@@ -68,6 +70,9 @@ sh:
         invalid: must be a valid domain name
       search:
         query_missing: Specify search string with parameter q
+    messages:
+      search:
+        time_range_limit_exceeded: 'Search is limited to the last %{days} days'
     categories:
       locale:
         unique: should be unique in the category and portal
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 64de456a6..230d20bf5 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -48,6 +48,8 @@ sk:
       failed: Signup failed
     assignment_policy:
       not_found: Assignment policy not found
+    attachments:
+      invalid: Invalid attachment
     saml:
       feature_not_enabled: SAML feature not enabled for this account
       sso_not_enabled: SAML SSO is not enabled for this installation
@@ -68,6 +70,9 @@ sk:
         invalid: must be a valid domain name
       search:
         query_missing: Specify search string with parameter q
+    messages:
+      search:
+        time_range_limit_exceeded: 'Search is limited to the last %{days} days'
     categories:
       locale:
         unique: should be unique in the category and portal
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 33da71385..cf4d9efb9 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -48,6 +48,8 @@ sl:
       failed: Registracija neuspešna
     assignment_policy:
       not_found: Assignment policy not found
+    attachments:
+      invalid: Invalid attachment
     saml:
       feature_not_enabled: SAML feature not enabled for this account
       sso_not_enabled: SAML SSO is not enabled for this installation
@@ -68,6 +70,9 @@ sl:
         invalid: must be a valid domain name
       search:
         query_missing: Specify search string with parameter q
+    messages:
+      search:
+        time_range_limit_exceeded: 'Search is limited to the last %{days} days'
     categories:
       locale:
         unique: mora biti edinstven v kategoriji in portalu
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index c2830c9b2..6f80d6d5c 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -48,6 +48,8 @@ sq:
       failed: Signup failed
     assignment_policy:
       not_found: Nuk u gjet politika e caktimit
+    attachments:
+      invalid: Invalid attachment
     saml:
       feature_not_enabled: SAML feature not enabled for this account
       sso_not_enabled: SAML SSO is not enabled for this installation
@@ -68,6 +70,9 @@ sq:
         invalid: must be a valid domain name
       search:
         query_missing: Specify search string with parameter q
+    messages:
+      search:
+        time_range_limit_exceeded: 'Search is limited to the last %{days} days'
     categories:
       locale:
         unique: should be unique in the category and portal
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 2cf3fbd0e..93f829511 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -48,6 +48,8 @@ sr-Latn:
       failed: Registracija nije uspela
     assignment_policy:
       not_found: Assignment policy not found
+    attachments:
+      invalid: Invalid attachment
     saml:
       feature_not_enabled: SAML feature not enabled for this account
       sso_not_enabled: SAML SSO is not enabled for this installation
@@ -68,6 +70,9 @@ sr-Latn:
         invalid: must be a valid domain name
       search:
         query_missing: Specify search string with parameter q
+    messages:
+      search:
+        time_range_limit_exceeded: 'Search is limited to the last %{days} days'
     categories:
       locale:
         unique: treba biti jedinstvena u kategoriji i portalu
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index d118c3332..1e97d629f 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -48,6 +48,8 @@ sv:
       failed: Registrering misslyckades
     assignment_policy:
       not_found: Assignment policy not found
+    attachments:
+      invalid: Invalid attachment
     saml:
       feature_not_enabled: SAML feature not enabled for this account
       sso_not_enabled: SAML SSO is not enabled for this installation
@@ -68,6 +70,9 @@ sv:
         invalid: must be a valid domain name
       search:
         query_missing: Specify search string with parameter q
+    messages:
+      search:
+        time_range_limit_exceeded: 'Search is limited to the last %{days} days'
     categories:
       locale:
         unique: should be unique in the category and portal
diff --git a/config/locales/ta.yml b/config/locales/ta.yml
index 23bcff84d..7dce234f2 100644
--- a/config/locales/ta.yml
+++ b/config/locales/ta.yml
@@ -48,6 +48,8 @@ ta:
       failed: உள்நுழையும் முயறிசி தோல்வி அடைந்துள்ளது
     assignment_policy:
       not_found: Assignment policy not found
+    attachments:
+      invalid: Invalid attachment
     saml:
       feature_not_enabled: SAML feature not enabled for this account
       sso_not_enabled: SAML SSO is not enabled for this installation
@@ -68,6 +70,9 @@ ta:
         invalid: must be a valid domain name
       search:
         query_missing: Specify search string with parameter q
+    messages:
+      search:
+        time_range_limit_exceeded: 'Search is limited to the last %{days} days'
     categories:
       locale:
         unique: should be unique in the category and portal
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 330cc7e21..c9d491fe4 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -48,6 +48,8 @@ th:
       failed: Signup failed
     assignment_policy:
       not_found: Assignment policy not found
+    attachments:
+      invalid: Invalid attachment
     saml:
       feature_not_enabled: SAML feature not enabled for this account
       sso_not_enabled: SAML SSO is not enabled for this installation
@@ -68,6 +70,9 @@ th:
         invalid: must be a valid domain name
       search:
         query_missing: Specify search string with parameter q
+    messages:
+      search:
+        time_range_limit_exceeded: 'Search is limited to the last %{days} days'
     categories:
       locale:
         unique: should be unique in the category and portal
diff --git a/config/locales/tl.yml b/config/locales/tl.yml
index 07e25d150..24c6360bb 100644
--- a/config/locales/tl.yml
+++ b/config/locales/tl.yml
@@ -48,6 +48,8 @@ tl:
       failed: Signup failed
     assignment_policy:
       not_found: Assignment policy not found
+    attachments:
+      invalid: Invalid attachment
     saml:
       feature_not_enabled: SAML feature not enabled for this account
       sso_not_enabled: SAML SSO is not enabled for this installation
@@ -68,6 +70,9 @@ tl:
         invalid: must be a valid domain name
       search:
         query_missing: Specify search string with parameter q
+    messages:
+      search:
+        time_range_limit_exceeded: 'Search is limited to the last %{days} days'
     categories:
       locale:
         unique: should be unique in the category and portal
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 08b386c64..84498ff7f 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -20,9 +20,9 @@ tr:
   hello: 'Merhaba Dünya'
   inbox:
     reauthorization:
-      success: 'Channel reauthorized successfully'
-      not_required: 'Reauthorization is not required for this inbox'
-      invalid_channel: 'Invalid channel type for reauthorization'
+      success: 'Kanal başarıyla yeniden yetkilendirildi'
+      not_required: 'Bu gelen kutusu için yeniden yetkilendirme gerekmez'
+      invalid_channel: 'Yeniden yetkilendirme için geçersiz kanal türü'
   auth:
     saml:
       invalid_email: 'Lütfen geçerli bir e-posta adresi girin'
@@ -30,9 +30,9 @@ tr:
   messages:
     reset_password_success: Parola sıfırlama isteği başarılı. Talimatlar için postanızı kontrol edin.
     reset_password_failure: Belirtilen e-postaya sahip herhangi bir kullanıcı bulamadık.
-    reset_password_saml_user: This account uses SAML authentication. Password reset is not available. Please contact your administrator.
-    login_saml_user: This account uses SAML authentication. Please sign in through your organization's SAML provider.
-    saml_not_available: SAML authentication is not available in this installation.
+    reset_password_saml_user: Bu hesap SAML kimlik doğrulaması kullanmaktadır. Şifre sıfırlama mevcut değildir. Lütfen yöneticinizle iletişime geçin.
+    login_saml_user: Bu hesap SAML kimlik doğrulaması kullanmaktadır. Lütfen kuruluşunuzun SAML sağlayıcısı aracılığıyla oturum açın.
+    saml_not_available: SAML kimlik doğrulaması bu kurulumda mevcut değildir.
     inbox_deletetion_response: Gelen kutusu silme isteğiniz bir süre sonra işleme alınacaktır.
   errors:
     validations:
@@ -41,15 +41,17 @@ tr:
       invalid: Hatalı işlem
     signup:
       disposable_email: Tek kullanımlık e-postalara izin vermiyoruz
-      blocked_domain: This domain is not allowed. If you believe this is a mistake, please contact support.
+      blocked_domain: Bu alan adına izin verilmiyor. Bunun bir hata olduğunu düşünüyorsanız, lütfen destek ile iletişime geçin.
       invalid_email: Geçersiz bir e-posta girdiniz
       email_already_exists: '%{email} ile zaten bir hesaba kaydoldunuz'
       invalid_params: 'Hata, lütfen kayıt olma parametrelerini kontrol edin ve tekrar deneyin'
       failed: Kayıt başarısız oldu
     assignment_policy:
       not_found: Assignment policy not found
+    attachments:
+      invalid: Invalid attachment
     saml:
-      feature_not_enabled: SAML feature not enabled for this account
+      feature_not_enabled: Bu hesap için SAML özelliği etkinleştirilmemiş
       sso_not_enabled: SAML SSO bu kurulum için etkinleştirilmemiş
     data_import:
       data_type:
@@ -65,9 +67,12 @@ tr:
         invalid: e164 formatında olmalı
     companies:
       domain:
-        invalid: must be a valid domain name
+        invalid: geçerli bir alan adı olmalıdır
       search:
         query_missing: q parametresiyle arama dizesini belirtin
+    messages:
+      search:
+        time_range_limit_exceeded: 'Arama son %{days} gün ile sınırlıdır'
     categories:
       locale:
         unique: kategori ve portalde tekil olmalı
@@ -76,13 +81,13 @@ tr:
     slack:
       invalid_channel_id: 'Geçersiz Slack kanalı. Lütfen tekrar deneyin'
     whatsapp:
-      token_exchange_failed: 'Failed to exchange code for access token. Please try again.'
-      invalid_token_permissions: 'The access token does not have the required permissions for WhatsApp.'
-      phone_info_fetch_failed: 'Failed to fetch phone number information. Please try again.'
+      token_exchange_failed: 'Erişim tokeni için kod değişimi başarısız oldu. Lütfen tekrar deneyin.'
+      invalid_token_permissions: 'Erişim tokeni WhatsApp için gerekli izinlere sahip değildir.'
+      phone_info_fetch_failed: 'Telefon numarası bilgisi alınamadı. Lütfen tekrar deneyin.'
       phone_number_already_exists: 'Bu telefon numarası için zaten bir kanal mevcut: %{phone_number}, hata devam ederse lütfen destek ile iletişime geçin'
       reauthorization:
-        generic: 'Failed to reauthorize WhatsApp. Please try again.'
-        not_supported: 'Reauthorization is not supported for this type of WhatsApp channel.'
+        generic: 'WhatsApp''ı yeniden yetkilendirme işlemi başarısız oldu. Lütfen tekrar deneyin.'
+        not_supported: 'Bu tür WhatsApp kanalları için yeniden yetkilendirme desteklenmemektedir.'
     inboxes:
       imap:
         socket_error: Lütfen ağ bağlantınızı, IMAP adresini kontrol edin ve tekrar deneyin.
@@ -129,7 +134,7 @@ tr:
       conversations_count: Assigned conversations
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
-      resolution_count: Çözünürlük Sayısı
+      resolution_count: Çözüm Sayısı
       avg_customer_waiting_time: Avg customer waiting time
     inbox_csv:
       inbox_name: Inbox adı
@@ -149,7 +154,7 @@ tr:
       conversations_count: Konuşma sayısı
       avg_first_response_time: Avg first response time
       avg_resolution_time: Avg resolution time
-      resolution_count: Çözünürlük Sayısı
+      resolution_count: Çözüm Sayısı
       avg_customer_waiting_time: Avg customer waiting time
     conversation_traffic_csv:
       timezone: Zaman dilimi
@@ -175,15 +180,15 @@ tr:
         recorded_at: Kaydedilen tarih
   notifications:
     notification_title:
-      conversation_creation: 'A conversation (#%{display_id}) has been created in %{inbox_name}'
-      conversation_assignment: 'A conversation (#%{display_id}) has been assigned to you'
-      assigned_conversation_new_message: 'A new message is created in conversation (#%{display_id})'
-      conversation_mention: 'You have been mentioned in conversation (#%{display_id})'
-      sla_missed_first_response: 'SLA target first response missed for conversation (#%{display_id})'
-      sla_missed_next_response: 'SLA target next response missed for conversation (#%{display_id})'
-      sla_missed_resolution: 'SLA target resolution missed for conversation (#%{display_id})'
-    attachment: 'Attachment'
-    no_content: 'No content'
+      conversation_creation: '%{inbox_name} kutusunda (#%{display_id}) numaralı bir konuşma oluşturuldu.'
+      conversation_assignment: '(#%{display_id}) numaralı bir konuşma size atandı'
+      assigned_conversation_new_message: '(#%{display_id}) numaralı konuşmada yeni bir mesaj oluşturuldu'
+      conversation_mention: '(#%{display_id}) numaralı konuşmada sizden bahsedildi'
+      sla_missed_first_response: '(#%{display_id}) numaralı konuşmada ilk yanıt SLA hedefi aşıldı'
+      sla_missed_next_response: '(#%{display_id}) numaralı konuşmada sonraki yanıt SLA hedefi aşıldı'
+      sla_missed_resolution: '(#%{display_id}) numaralı konuşmada çözüm SLA hedefi aşıldı'
+    attachment: 'Ek'
+    no_content: 'İçerik yok'
   conversations:
     captain:
       handoff: 'Daha fazla yardım için başka bir temsilciye aktarılıyor.'
@@ -202,7 +207,7 @@ tr:
         resolved: 'Konuşma, %{user_name} tarafından etkinlik olmadığı için çözüldü olarak işaretlendi'
         open: 'Konuşma, %{user_name} tarafından açık olarak işaretlendi'
       agent_bot:
-        error_moved_to_open: 'Conversation was marked open by system due to an error with the agent bot.'
+        error_moved_to_open: 'Temsilci botta meydana gelen bir hata nedeniyle konuşma, sistem tarafından açık olarak işaretlendi.'
       status:
         resolved: 'Konuşma %{user_name} tarafından çözümlendi olarak işaretlendi'
         contact_resolved: 'Konuşma %{contact_name} tarafından çözümlendi olarak işaretlendi'
@@ -241,7 +246,7 @@ tr:
         not_sent_due_to_messaging_window: 'Giden mesaj kısıtlamaları nedeniyle otomatik çözüm mesajı gönderilmedi'
       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.'
+      auto_resolution_message: 'Bir süredir aktif olmayan konuşmayı sonlandırıyoruz. Daha fazla yardıma ihtiyacınız varsa lütfen yeni bir konuşma başlatın.'
     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.'
@@ -270,39 +275,39 @@ tr:
     #Note: webhooks and dashboard_apps don't need short_description as they use different modal components
     dashboard_apps:
       name: 'Panel Uygulamaları'
-      description: 'Dashboard Apps allow you to create and embed applications that display user information, orders, or payment history, providing more context to your customer support agents.'
+      description: 'Panel Uygulamaları, kullanıcı bilgilerini, siparişleri veya ödeme geçmişini gösteren uygulamalar oluşturmanıza ve bunları panelinize eklemenize olanak tanır. Bu sayede müşteri destek temsilcileriniz daha fazla bağlam bilgisine sahip olur.'
     dyte:
       name: 'Dyte'
       short_description: 'Müşterilerle doğrudan Chatwoot üzerinden video/sesli arama başlatın.'
-      description: 'Dyte is a product that integrates audio and video functionalities into your application. With this integration, your agents can start video/voice calls with your customers directly from Chatwoot.'
+      description: 'Dyte, uygulamanıza ses ve video işlevselliklerini entegre eden bir üründür. Bu entegrasyon sayesinde temsilcileriniz, Chatwoot üzerinden müşterilerinizle doğrudan video veya sesli görüşme başlatabilir.'
       meeting_name: '%{agent_name} bir toplantı başlattı'
     slack:
       name: 'Slack'
       short_description: 'Doğrudan Slack''te bildirimler alın ve konuşmalara yanıt verin.'
-      description: "Integrate Chatwoot with Slack to keep your team in sync. This integration allows you to receive notifications for new conversations and respond to them directly within Slack's interface."
+      description: "Chatwoot’u Slack ile entegre ederek ekibinizin senkronize çalışmasını sağlayın. Bu entegrasyon sayesinde yeni konuşmalar için bildirim alabilir ve onlara doğrudan Slack arayüzünden yanıt verebilirsiniz."
     webhooks:
       name: 'Webhooks'
-      description: 'Webhook events provide real-time updates about activities in your Chatwoot account. You can subscribe to your preferred events, and Chatwoot will send you HTTP callbacks with the updates.'
+      description: 'Webhook etkinlikleri, Chatwoot hesabınızdaki faaliyetlerle ilgili gerçek zamanlı güncellemeler sağlar. Tercih ettiğiniz etkinliklere abone olabilir ve Chatwoot size bu güncellemelerle HTTP geri çağrıları (callback) gönderecektir.'
     dialogflow:
       name: 'Dialogflow botu'
       short_description: 'Temsilcilere aktarmadan önce ilk soruları yanıtlayacak sohbet botları oluşturun.'
-      description: 'Build chatbots with Dialogflow and easily integrate them into your inbox. These bots can handle initial queries before transferring them to a customer service agent.'
+      description: 'Dialogflow ile sohbet botları oluşturun ve bunları gelen kutunuza kolayca entegre edin. Bu botlar, müşteri hizmetleri temsilcisine yönlendirmeden önce ilk soruları karşılayabilir.'
     google_translate:
       name: 'Google Çeviri'
       short_description: 'Müşteri mesajlarını temsilciler için otomatik olarak çevirin.'
-      description: "Integrate Google Translate to help agents easily translate customer messages. This integration automatically detects the language and converts it to the agent's or admin's preferred language."
+      description: "Google Translate’i entegre ederek temsilcilerin müşteri mesajlarını kolayca çevirmesine yardımcı olun. Bu entegrasyon, mesajın dilini otomatik olarak algılar ve temsilcinin veya yöneticinin tercih ettiği dile çevirir."
     openai:
       name: 'OpenAI'
       short_description: 'Yapay zekâ destekli yanıt önerileri, özetleme ve mesaj geliştirme.'
-      description: 'Leverage the power of large language models from OpenAI with the features such as reply suggestions, summarization, message rephrasing, spell-checking, and label classification.'
+      description: 'OpenAI’nin büyük dil modellerinin gücünden, yanıt önerileri, özetleme, mesaj yeniden ifade etme, yazım denetimi ve etiket sınıflandırma gibi özelliklerle yararlanın.'
     linear:
       name: 'Linear'
       short_description: 'Linear sorunlarını doğrudan sohbetlerden oluşturun ve bağlayın.'
       description: 'Create issues in Linear directly from your conversation window. Alternatively, link existing Linear issues for a more streamlined and efficient issue tracking process.'
     notion:
       name: 'Notion'
-      short_description: 'Integrate databases, documents and pages directly with Captain.'
-      description: 'Connect your Notion workspace to enable Captain to access and generate intelligent responses using content from your databases, documents, and pages to provide more contextual customer support.'
+      short_description: 'Veritabanlarını, dokümanları ve sayfaları doğrudan Captain ile entegre edin.'
+      description: 'Captain''ın veritabanlarınız, dokümanlarınız ve sayfalarınızdaki içeriklere erişebilmesi ve bunları kullanarak daha bağlamsal bir müşteri desteği sunan akıllı yanıtlar oluşturabilmesi için Notion çalışma alanınızı bağlayın.'
     shopify:
       name: 'Shopify'
       short_description: 'Shopify mağazanızdan sipariş detaylarına ve müşteri verilerine erişin.'
@@ -395,8 +400,8 @@ tr:
       one: '%{count} hour'
       other: '%{count} hours'
     minutes:
-      one: '%{count} minute'
-      other: '%{count} minutes'
+      one: '%{count} dakika'
+      other: '%{count} dakika'
     seconds:
       one: '%{count} second'
       other: '%{count} seconds'
@@ -423,13 +428,13 @@ tr:
       Döküm:
       %{format_messages}
   agent_capacity_policy:
-    inbox_already_assigned: 'Inbox has already been assigned to this policy'
+    inbox_already_assigned: 'Gelen Kutusu bu politikaya zaten atanmış'
   portals:
     send_instructions:
       email_required: 'E-posta gereklidir'
       invalid_email_format: 'Geçersiz e-posta formatı'
       custom_domain_not_configured: 'Özel alan adı yapılandırılmadı'
-      instructions_sent_successfully: 'Instructions sent successfully'
+      instructions_sent_successfully: 'Talimatlar başarıyla gönderildi'
       subject: '%{custom_domain} kurulumunu tamamlayın'
     ssl_status:
       custom_domain_not_configured: 'Özel alan adı yapılandırılmamış'
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 537d84657..e118f3747 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -48,6 +48,8 @@ uk:
       failed: Помилка реєстрації
     assignment_policy:
       not_found: Assignment policy not found
+    attachments:
+      invalid: Invalid attachment
     saml:
       feature_not_enabled: SAML feature not enabled for this account
       sso_not_enabled: SAML SSO is not enabled for this installation
@@ -68,6 +70,9 @@ uk:
         invalid: must be a valid domain name
       search:
         query_missing: Specify search string with parameter q
+    messages:
+      search:
+        time_range_limit_exceeded: 'Search is limited to the last %{days} days'
     categories:
       locale:
         unique: має бути унікальним на категорії і порталі
diff --git a/config/locales/ur.yml b/config/locales/ur.yml
index ae775f79c..efa5ea0f5 100644
--- a/config/locales/ur.yml
+++ b/config/locales/ur.yml
@@ -48,6 +48,8 @@ ur:
       failed: Signup failed
     assignment_policy:
       not_found: Assignment policy not found
+    attachments:
+      invalid: Invalid attachment
     saml:
       feature_not_enabled: SAML feature not enabled for this account
       sso_not_enabled: SAML SSO is not enabled for this installation
@@ -68,6 +70,9 @@ ur:
         invalid: must be a valid domain name
       search:
         query_missing: Specify search string with parameter q
+    messages:
+      search:
+        time_range_limit_exceeded: 'Search is limited to the last %{days} days'
     categories:
       locale:
         unique: should be unique in the category and portal
diff --git a/config/locales/ur_IN.yml b/config/locales/ur_IN.yml
index 582848822..449052a1f 100644
--- a/config/locales/ur_IN.yml
+++ b/config/locales/ur_IN.yml
@@ -48,6 +48,8 @@ ur:
       failed: Signup failed
     assignment_policy:
       not_found: Assignment policy not found
+    attachments:
+      invalid: Invalid attachment
     saml:
       feature_not_enabled: SAML feature not enabled for this account
       sso_not_enabled: SAML SSO is not enabled for this installation
@@ -68,6 +70,9 @@ ur:
         invalid: must be a valid domain name
       search:
         query_missing: Specify search string with parameter q
+    messages:
+      search:
+        time_range_limit_exceeded: 'Search is limited to the last %{days} days'
     categories:
       locale:
         unique: should be unique in the category and portal
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 43677fa80..1690f5041 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -48,6 +48,8 @@ vi:
       failed: Đăng ký thât bại
     assignment_policy:
       not_found: Assignment policy not found
+    attachments:
+      invalid: Invalid attachment
     saml:
       feature_not_enabled: SAML feature not enabled for this account
       sso_not_enabled: SAML SSO is not enabled for this installation
@@ -68,6 +70,9 @@ vi:
         invalid: must be a valid domain name
       search:
         query_missing: Specify search string with parameter q
+    messages:
+      search:
+        time_range_limit_exceeded: 'Search is limited to the last %{days} days'
     categories:
       locale:
         unique: phải là duy nhất trong danh mục và cổng thông tin
diff --git a/config/locales/zh_CN.yml b/config/locales/zh_CN.yml
index 2f67a8459..712c4c255 100644
--- a/config/locales/zh_CN.yml
+++ b/config/locales/zh_CN.yml
@@ -48,6 +48,8 @@ zh_CN:
       failed: 注册失败
     assignment_policy:
       not_found: Assignment policy not found
+    attachments:
+      invalid: Invalid attachment
     saml:
       feature_not_enabled: SAML feature not enabled for this account
       sso_not_enabled: SAML SSO is not enabled for this installation
@@ -68,6 +70,9 @@ zh_CN:
         invalid: must be a valid domain name
       search:
         query_missing: Specify search string with parameter q
+    messages:
+      search:
+        time_range_limit_exceeded: 'Search is limited to the last %{days} days'
     categories:
       locale:
         unique: 在类别和门户中应该是唯一的
diff --git a/config/locales/zh_TW.yml b/config/locales/zh_TW.yml
index 4bb076b28..41635213e 100644
--- a/config/locales/zh_TW.yml
+++ b/config/locales/zh_TW.yml
@@ -48,6 +48,8 @@ zh_TW:
       failed: 註冊失敗。
     assignment_policy:
       not_found: Assignment policy not found
+    attachments:
+      invalid: Invalid attachment
     saml:
       feature_not_enabled: SAML feature not enabled for this account
       sso_not_enabled: SAML SSO is not enabled for this installation
@@ -68,6 +70,9 @@ zh_TW:
         invalid: must be a valid domain name
       search:
         query_missing: Specify search string with parameter q
+    messages:
+      search:
+        time_range_limit_exceeded: 'Search is limited to the last %{days} days'
     categories:
       locale:
         unique: should be unique in the category and portal
diff --git a/db/migrate/20251229081141_change_webhook_url_to_text.rb b/db/migrate/20251229081141_change_webhook_url_to_text.rb
new file mode 100644
index 000000000..633fd5b45
--- /dev/null
+++ b/db/migrate/20251229081141_change_webhook_url_to_text.rb
@@ -0,0 +1,9 @@
+class ChangeWebhookUrlToText < ActiveRecord::Migration[7.1]
+  def up
+    change_column :webhooks, :url, :text
+  end
+
+  def down
+    change_column :webhooks, :url, :string
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 82dcd37f6..ebdcffed0 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.1].define(version: 2025_11_19_161025) do
+ActiveRecord::Schema[7.1].define(version: 2025_12_29_081141) do
   # These extensions should be enabled to support this database
   enable_extension "pg_stat_statements"
   enable_extension "pg_trgm"
@@ -1239,7 +1239,7 @@ ActiveRecord::Schema[7.1].define(version: 2025_11_19_161025) do
   create_table "webhooks", force: :cascade do |t|
     t.integer "account_id"
     t.integer "inbox_id"
-    t.string "url"
+    t.text "url"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.integer "webhook_type", default: 0
diff --git a/enterprise/app/controllers/api/v1/accounts/companies_controller.rb b/enterprise/app/controllers/api/v1/accounts/companies_controller.rb
index 86216b03c..3ec547cda 100644
--- a/enterprise/app/controllers/api/v1/accounts/companies_controller.rb
+++ b/enterprise/app/controllers/api/v1/accounts/companies_controller.rb
@@ -3,6 +3,7 @@ class Api::V1::Accounts::CompaniesController < Api::V1::Accounts::EnterpriseAcco
   sort_on :name, type: :string
   sort_on :domain, type: :string
   sort_on :created_at, type: :datetime
+  sort_on :contacts_count, internal_name: :order_on_contacts_count, type: :scope, scope_params: [:direction]
 
   RESULTS_PER_PAGE = 25
 
diff --git a/enterprise/app/controllers/enterprise/super_admin/app_configs_controller.rb b/enterprise/app/controllers/enterprise/super_admin/app_configs_controller.rb
index 0ed7ee67a..87ac8f6d6 100644
--- a/enterprise/app/controllers/enterprise/super_admin/app_configs_controller.rb
+++ b/enterprise/app/controllers/enterprise/super_admin/app_configs_controller.rb
@@ -34,9 +34,9 @@ module Enterprise::SuperAdmin::AppConfigsController
   end
 
   def internal_config_options
-    %w[CHATWOOT_INBOX_TOKEN CHATWOOT_INBOX_HMAC_KEY ANALYTICS_TOKEN CLEARBIT_API_KEY DASHBOARD_SCRIPTS INACTIVE_WHATSAPP_NUMBERS BLOCKED_EMAIL_DOMAINS
+    %w[CHATWOOT_INBOX_TOKEN CHATWOOT_INBOX_HMAC_KEY CLOUD_ANALYTICS_TOKEN CLEARBIT_API_KEY DASHBOARD_SCRIPTS INACTIVE_WHATSAPP_NUMBERS
        SKIP_INCOMING_BCC_PROCESSING CAPTAIN_CLOUD_PLAN_LIMITS ACCOUNT_SECURITY_NOTIFICATION_WEBHOOK_URL CHATWOOT_INSTANCE_ADMIN_EMAIL
-       OG_IMAGE_CDN_URL OG_IMAGE_CLIENT_REF CLOUDFLARE_API_KEY CLOUDFLARE_ZONE_ID
+       OG_IMAGE_CDN_URL OG_IMAGE_CLIENT_REF CLOUDFLARE_API_KEY CLOUDFLARE_ZONE_ID BLOCKED_EMAIL_DOMAINS
        OTEL_PROVIDER LANGFUSE_PUBLIC_KEY LANGFUSE_SECRET_KEY LANGFUSE_BASE_URL]
   end
 
diff --git a/enterprise/app/jobs/captain/conversation/response_builder_job.rb b/enterprise/app/jobs/captain/conversation/response_builder_job.rb
index 9f8acc474..0f5e82e7f 100644
--- a/enterprise/app/jobs/captain/conversation/response_builder_job.rb
+++ b/enterprise/app/jobs/captain/conversation/response_builder_job.rb
@@ -30,7 +30,7 @@ class Captain::Conversation::ResponseBuilderJob < ApplicationJob
   delegate :account, :inbox, to: :@conversation
 
   def generate_and_process_response
-    @response = Captain::Llm::AssistantChatService.new(assistant: @assistant, conversation_id: @conversation.id).generate_response(
+    @response = Captain::Llm::AssistantChatService.new(assistant: @assistant, conversation_id: @conversation.display_id).generate_response(
       message_history: collect_previous_messages
     )
     process_response
diff --git a/enterprise/app/models/company.rb b/enterprise/app/models/company.rb
index 9fa18b8ad..d96344f9b 100644
--- a/enterprise/app/models/company.rb
+++ b/enterprise/app/models/company.rb
@@ -35,4 +35,11 @@ class Company < ApplicationRecord
   scope :search_by_name_or_domain, lambda { |query|
     where('name ILIKE :search OR domain ILIKE :search', search: "%#{query.strip}%")
   }
+  scope :order_on_contacts_count, lambda { |direction|
+    order(
+      Arel::Nodes::SqlLiteral.new(
+        sanitize_sql_for_order("\"companies\".\"contacts_count\" #{direction} NULLS LAST")
+      )
+    )
+  }
 end
diff --git a/enterprise/app/services/captain/llm/contact_notes_service.rb b/enterprise/app/services/captain/llm/contact_notes_service.rb
index d37f9fea6..46965a7c1 100644
--- a/enterprise/app/services/captain/llm/contact_notes_service.rb
+++ b/enterprise/app/services/captain/llm/contact_notes_service.rb
@@ -37,6 +37,7 @@ class Captain::Llm::ContactNotesService < Llm::BaseAiService
       model: @model,
       temperature: @temperature,
       account_id: @conversation.account_id,
+      conversation_id: @conversation.display_id,
       feature_name: 'contact_notes',
       messages: [
         { role: 'system', content: system_prompt },
diff --git a/enterprise/app/services/captain/llm/conversation_faq_service.rb b/enterprise/app/services/captain/llm/conversation_faq_service.rb
index e9152bc99..3cc74ed52 100644
--- a/enterprise/app/services/captain/llm/conversation_faq_service.rb
+++ b/enterprise/app/services/captain/llm/conversation_faq_service.rb
@@ -100,7 +100,7 @@ class Captain::Llm::ConversationFaqService < Llm::BaseAiService
       model: @model,
       temperature: @temperature,
       account_id: @conversation.account_id,
-      conversation_id: @conversation.id,
+      conversation_id: @conversation.display_id,
       feature_name: 'conversation_faq',
       messages: [
         { role: 'system', content: system_prompt },
diff --git a/enterprise/app/services/enterprise/search_service.rb b/enterprise/app/services/enterprise/search_service.rb
index 628578b9d..624485da7 100644
--- a/enterprise/app/services/enterprise/search_service.rb
+++ b/enterprise/app/services/enterprise/search_service.rb
@@ -1,7 +1,7 @@
 module Enterprise::SearchService
   def advanced_search
-    where_conditions = { account_id: current_account.id  }
-    where_conditions[:inbox_id] = accessable_inbox_ids unless should_skip_inbox_filtering?
+    where_conditions = build_where_conditions
+    apply_filters(where_conditions)
 
     Message.search(
       search_query,
@@ -12,4 +12,77 @@ module Enterprise::SearchService
       per_page: 15
     )
   end
+
+  private
+
+  def build_where_conditions
+    conditions = { account_id: current_account.id }
+    conditions[:inbox_id] = accessable_inbox_ids unless should_skip_inbox_filtering?
+    conditions
+  end
+
+  def apply_filters(where_conditions)
+    apply_from_filter(where_conditions)
+    apply_time_range_filter(where_conditions)
+    apply_inbox_filter(where_conditions)
+  end
+
+  def apply_from_filter(where_conditions)
+    sender_type, sender_id = parse_from_param(params[:from])
+    return unless sender_type && sender_id
+
+    where_conditions[:sender_type] = sender_type
+    where_conditions[:sender_id] = sender_id
+  end
+
+  def parse_from_param(from_param)
+    return [nil, nil] unless from_param&.match?(/\A(contact|agent):\d+\z/)
+
+    type, id = from_param.split(':')
+    sender_type = type == 'agent' ? 'User' : 'Contact'
+    [sender_type, id.to_i]
+  end
+
+  def apply_time_range_filter(where_conditions)
+    time_conditions = {}
+    time_conditions[:gte] = enforce_time_limit(params[:since])
+    time_conditions[:lte] = cap_until_time(params[:until]) if params[:until].present?
+
+    where_conditions[:created_at] = time_conditions if time_conditions.any?
+  end
+
+  def cap_until_time(until_param)
+    max_future = 90.days.from_now
+    requested_time = Time.zone.at(until_param.to_i)
+
+    [requested_time, max_future].min
+  end
+
+  def enforce_time_limit(since_param)
+    max_lookback = Limits::MESSAGE_SEARCH_TIME_RANGE_LIMIT_DAYS.days.ago
+
+    if since_param.present?
+      requested_time = Time.zone.at(since_param.to_i)
+      # Silently cap to max_lookback if requested time is too far back
+      [requested_time, max_lookback].max
+    else
+      max_lookback
+    end
+  end
+
+  def apply_inbox_filter(where_conditions)
+    return if params[:inbox_id].blank?
+
+    inbox_id = params[:inbox_id].to_i
+    return if inbox_id.zero?
+    return unless validate_inbox_access(inbox_id)
+
+    where_conditions[:inbox_id] = inbox_id
+  end
+
+  def validate_inbox_access(inbox_id)
+    return true if should_skip_inbox_filtering?
+
+    accessable_inbox_ids.include?(inbox_id)
+  end
 end
diff --git a/lib/integrations/google_translate/processor_service.rb b/lib/integrations/google_translate/processor_service.rb
index 33fe56770..d17a802a7 100644
--- a/lib/integrations/google_translate/processor_service.rb
+++ b/lib/integrations/google_translate/processor_service.rb
@@ -11,7 +11,7 @@ class Integrations::GoogleTranslate::ProcessorService
 
     response = client.translate_text(
       contents: [content],
-      target_language_code: target_language,
+      target_language_code: bcp47_language_code,
       parent: "projects/#{hook.settings['project_id']}",
       mime_type: mime_type
     )
@@ -23,6 +23,10 @@ class Integrations::GoogleTranslate::ProcessorService
 
   private
 
+  def bcp47_language_code
+    target_language.tr('_', '-')
+  end
+
   def email_channel?
     message&.inbox&.email?
   end
diff --git a/lib/limits.rb b/lib/limits.rb
index c0fc03806..ce8ab7872 100644
--- a/lib/limits.rb
+++ b/lib/limits.rb
@@ -9,6 +9,7 @@ module Limits
   COMPANY_NAME_LENGTH_LIMIT = 100
   COMPANY_DESCRIPTION_LENGTH_LIMIT = 1000
   MAX_CUSTOM_FILTERS_PER_USER = 1000
+  MESSAGE_SEARCH_TIME_RANGE_LIMIT_DAYS = 90
 
   def self.conversation_message_per_minute_limit
     ENV.fetch('CONVERSATION_MESSAGE_PER_MINUTE_LIMIT', '200').to_i
diff --git a/lib/tasks/search_test_data.rake b/lib/tasks/search_test_data.rake
new file mode 100644
index 000000000..c1a6cac36
--- /dev/null
+++ b/lib/tasks/search_test_data.rake
@@ -0,0 +1,183 @@
+# rubocop:disable Metrics/BlockLength
+namespace :search do
+  desc 'Create test messages for advanced search manual testing across multiple inboxes'
+  task setup_test_data: :environment do
+    puts '🔍 Setting up test data for advanced search...'
+
+    account = Account.first
+    unless account
+      puts '❌ No account found. Please create an account first.'
+      exit 1
+    end
+
+    agents = account.users.to_a
+    unless agents.any?
+      puts '❌ No agents found. Please create users first.'
+      exit 1
+    end
+
+    puts "✅ Using account: #{account.name} (ID: #{account.id})"
+    puts "✅ Found #{agents.count} agent(s)"
+
+    # Create missing inbox types for comprehensive testing
+    puts "\n📥 Checking and creating inboxes..."
+
+    # API inbox
+    unless account.inboxes.exists?(channel_type: 'Channel::Api')
+      puts '  Creating API inbox...'
+      account.inboxes.create!(
+        name: 'Search Test API',
+        channel: Channel::Api.create!(account: account)
+      )
+    end
+
+    # Web Widget inbox
+    unless account.inboxes.exists?(channel_type: 'Channel::WebWidget')
+      puts '  Creating WebWidget inbox...'
+      account.inboxes.create!(
+        name: 'Search Test WebWidget',
+        channel: Channel::WebWidget.create!(account: account, website_url: 'https://example.com')
+      )
+    end
+
+    # Email inbox
+    unless account.inboxes.exists?(channel_type: 'Channel::Email')
+      puts '  Creating Email inbox...'
+      account.inboxes.create!(
+        name: 'Search Test Email',
+        channel: Channel::Email.create!(
+          account: account,
+          email: 'search-test@example.com',
+          imap_enabled: false,
+          smtp_enabled: false
+        )
+      )
+    end
+
+    inboxes = account.inboxes.to_a
+    puts "✅ Using #{inboxes.count} inbox(es):"
+    inboxes.each { |i| puts "   - #{i.name} (ID: #{i.id}, Type: #{i.channel_type})" }
+
+    # Create 10 test contacts
+    contacts = []
+    10.times do |i|
+      contacts << account.contacts.find_or_create_by!(
+        email: "test-customer-#{i}@example.com"
+      ) do |c|
+        c.name = Faker::Name.name
+      end
+    end
+    puts "✅ Created/found #{contacts.count} test contacts"
+
+    target_messages = 50_000
+    messages_per_conversation = 100
+    total_conversations = target_messages / messages_per_conversation
+
+    puts "\n📝 Creating #{target_messages} messages across #{total_conversations} conversations..."
+    puts "   Distribution: #{inboxes.count} inboxes × #{total_conversations / inboxes.count} conversations each"
+
+    start_time = 2.years.ago
+    end_time = Time.current
+    time_range = end_time - start_time
+
+    created_count = 0
+    failed_count = 0
+    conversations_per_inbox = total_conversations / inboxes.count
+    conversation_statuses = [:open, :resolved]
+
+    inboxes.each do |inbox|
+      conversations_per_inbox.times do
+        # Pick random contact and agent for this conversation
+        contact = contacts.sample
+        agent = agents.sample
+
+        # Create or find ContactInbox
+        contact_inbox = ContactInbox.find_or_create_by!(
+          contact: contact,
+          inbox: inbox
+        ) do |ci|
+          ci.source_id = "test_#{SecureRandom.hex(8)}"
+        end
+
+        # Create conversation
+        conversation = inbox.conversations.create!(
+          account: account,
+          contact: contact,
+          inbox: inbox,
+          contact_inbox: contact_inbox,
+          status: conversation_statuses.sample
+        )
+
+        # Create messages for this conversation (50 incoming, 50 outgoing)
+        50.times do
+          random_time = start_time + (rand * time_range)
+
+          # Incoming message from contact
+          begin
+            Message.create!(
+              content: Faker::Movie.quote,
+              account: account,
+              inbox: inbox,
+              conversation: conversation,
+              message_type: :incoming,
+              sender: contact,
+              created_at: random_time,
+              updated_at: random_time
+            )
+            created_count += 1
+          rescue StandardError => e
+            failed_count += 1
+            puts "❌ Failed to create message: #{e.message}" if failed_count <= 5
+          end
+
+          # Outgoing message from agent
+          begin
+            Message.create!(
+              content: Faker::Movie.quote,
+              account: account,
+              inbox: inbox,
+              conversation: conversation,
+              message_type: :outgoing,
+              sender: agent,
+              created_at: random_time + rand(60..600),
+              updated_at: random_time + rand(60..600)
+            )
+            created_count += 1
+          rescue StandardError => e
+            failed_count += 1
+            puts "❌ Failed to create message: #{e.message}" if failed_count <= 5
+          end
+
+          print "\r🔄 Progress: #{created_count}/#{target_messages} messages created..." if (created_count % 500).zero?
+        end
+      end
+    end
+
+    puts "\n\n✅ Successfully created #{created_count} messages!"
+    puts "❌ Failed: #{failed_count}" if failed_count.positive?
+
+    puts "\n📊 Summary:"
+    puts "  - Total messages: #{Message.where(account: account).count}"
+    puts "  - Total conversations: #{Conversation.where(account: account).count}"
+
+    min_date = Message.where(account: account).minimum(:created_at)&.strftime('%Y-%m-%d')
+    max_date = Message.where(account: account).maximum(:created_at)&.strftime('%Y-%m-%d')
+    puts "  - Date range: #{min_date} to #{max_date}"
+    puts "\nBreakdown by inbox:"
+    inboxes.each do |inbox|
+      msg_count = Message.where(inbox: inbox).count
+      conv_count = Conversation.where(inbox: inbox).count
+      puts "  - #{inbox.name} (#{inbox.channel_type}): #{msg_count} messages, #{conv_count} conversations"
+    end
+    puts "\nBreakdown by sender type:"
+    puts "  - Incoming (from contacts): #{Message.where(account: account, message_type: :incoming).count}"
+    puts "  - Outgoing (from agents): #{Message.where(account: account, message_type: :outgoing).count}"
+
+    puts "\n🔧 Next steps:"
+    puts '  1. Ensure OpenSearch is running: mise elasticsearch-start'
+    puts '  2. Reindex messages: rails runner "Message.search_index.import Message.all"'
+    puts "  3. Enable feature: rails runner \"Account.find(#{account.id}).enable_features('advanced_search')\""
+    puts "\n💡 Then test the search with filters via API or Rails console!"
+  end
+end
+# rubocop:enable Metrics/BlockLength
diff --git a/package.json b/package.json
index 87f44528a..1d9b72be2 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,7 @@
   "dependencies": {
     "@breezystack/lamejs": "^1.2.7",
     "@chatwoot/ninja-keys": "1.2.3",
-    "@chatwoot/prosemirror-schema": "1.2.6",
+    "@chatwoot/prosemirror-schema": "1.3.5",
     "@chatwoot/utils": "^0.0.51",
     "@formkit/core": "^1.6.7",
     "@formkit/vue": "^1.6.7",
@@ -83,7 +83,7 @@
     "mitt": "^3.0.1",
     "opus-recorder": "^8.0.5",
     "pinia": "^3.0.4",
-    "posthog-js": "^1.260.2",
+    "@amplitude/analytics-browser": "^2.11.10",
     "qrcode": "^1.5.4",
     "semver": "7.6.3",
     "snakecase-keys": "^8.0.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 663cc1999..f062848c5 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,6 +13,9 @@ importers:
 
   .:
     dependencies:
+      '@amplitude/analytics-browser':
+        specifier: ^2.11.10
+        version: 2.33.1
       '@breezystack/lamejs':
         specifier: ^1.2.7
         version: 1.2.7
@@ -20,8 +23,8 @@ importers:
         specifier: 1.2.3
         version: 1.2.3
       '@chatwoot/prosemirror-schema':
-        specifier: 1.2.6
-        version: 1.2.6
+        specifier: 1.3.5
+        version: 1.3.5
       '@chatwoot/utils':
         specifier: ^0.0.51
         version: 0.0.51
@@ -169,9 +172,6 @@ importers:
       pinia:
         specifier: ^3.0.4
         version: 3.0.4(typescript@5.6.2)(vue@3.5.12(typescript@5.6.2))
-      posthog-js:
-        specifier: ^1.260.2
-        version: 1.260.3
       qrcode:
         specifier: ^1.5.4
         version: 1.5.4
@@ -371,6 +371,30 @@ packages:
     resolution: {integrity: sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==}
     engines: {node: '>=10'}
 
+  '@amplitude/analytics-browser@2.33.1':
+    resolution: {integrity: sha512-93wZjuAFJ7QdyptF82i1pezm5jKuBWITHI++XshDgpks1RstJvJ9n11Ak8MnE4L2BGQ93XDN2aVEHfmQkt0/Pw==}
+
+  '@amplitude/analytics-connector@1.6.4':
+    resolution: {integrity: sha512-SpIv0IQMNIq6SH3UqFGiaZyGSc7PBZwRdq7lvP0pBxW8i4Ny+8zwI0pV+VMfMHQwWY3wdIbWw5WQphNjpdq1/Q==}
+
+  '@amplitude/analytics-core@2.35.0':
+    resolution: {integrity: sha512-7RmHYELXCGu8yuO9D6lEXiqkMtiC5sePNhCWmwuP30dneDYHtH06gaYvAFH/YqOFuE6enwEEJfFYtcaPhyiqtA==}
+
+  '@amplitude/plugin-autocapture-browser@1.18.3':
+    resolution: {integrity: sha512-njYque5t1QCEEe5V8Ls4yVVklTM6V7OXxBk6pqznN/hj/Pc4X8Wjy898pZ2VtbnvpagBKKzGb5B6Syl8OXiicw==}
+
+  '@amplitude/plugin-network-capture-browser@1.7.3':
+    resolution: {integrity: sha512-zfWgAN7g6AigJAsgrGmlgVwydOHH6XvweBoxhU+qEvRydboiIVCDLSxuXczUsBG7kYVLWRdBK1DYoE5J7lqTGA==}
+
+  '@amplitude/plugin-page-url-enrichment-browser@0.5.9':
+    resolution: {integrity: sha512-TqdELx4WrdRutCjHUFUzum/f/UjhbdTZw0UKkYFAj5gwAKDjaPEjL4waRvINOTaVLsne1A6ck4KEMfC8AKByFw==}
+
+  '@amplitude/plugin-page-view-tracking-browser@2.6.6':
+    resolution: {integrity: sha512-dBcJlrdKgPzSgS3exDRRrMLqhIaOjwlIy7o8sEMn1PpMawERlbumSSdtfII6L4L67HYUPo4PY4Kp4acqSzaLvQ==}
+
+  '@amplitude/plugin-web-vitals-browser@1.1.4':
+    resolution: {integrity: sha512-XQXI9OjTNSz2yi0lXw2VYMensDzzSkMCfvXNniTb1LgnHwBcQ1JWPcTqHLPFrvvNckeIdOT78vjs7yA+c1FyzA==}
+
   '@ampproject/remapping@2.3.0':
     resolution: {integrity: sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==}
     engines: {node: '>=6.0.0'}
@@ -430,8 +454,8 @@ packages:
   '@chatwoot/ninja-keys@1.2.3':
     resolution: {integrity: sha512-xM8d9P5ikDMZm2WbaCTk/TW5HFauylrU3cJ75fq5je6ixKwyhl/0kZbVN/vbbZN4+AUX/OaSIn6IJbtCgIF67g==}
 
-  '@chatwoot/prosemirror-schema@1.2.6':
-    resolution: {integrity: sha512-ej60kU3m/tP0VoGkOJhj0X+Mxt7fEX5DSEE4IibCZnTM4kMewkMxSYyPu0AXqaA4nKX1hTMrwcbv1t7gVQttWQ==}
+  '@chatwoot/prosemirror-schema@1.3.5':
+    resolution: {integrity: sha512-3Koj3jwO1qOxJG84D4FqPOJ6o8k6ehZi1zedO3vKRERATm2Cy1p+ET6FEvVYWUpoBvDwR6hNVScXrcNNVobhsA==}
 
   '@chatwoot/utils@0.0.51':
     resolution: {integrity: sha512-WlEmWfOTzR7YZRUWzn5Wpm15/BRudpwqoNckph8TohyDbiim1CP4UZGa+qjajxTbNGLLhtKlm0Xl+X16+5Wceg==}
@@ -1091,9 +1115,6 @@ packages:
   '@polka/url@1.0.0-next.28':
     resolution: {integrity: sha512-8LduaNlMZGwdZ6qWrKlfa+2M4gahzFkprZiAt2TF8uS0qQgBizKXpXURqvTJ4WtmupWxaLqjRb2UCTe72mu+Aw==}
 
-  '@posthog/core@1.0.1':
-    resolution: {integrity: sha512-bwXUeHe+MLgENm8+/FxEbiNocOw1Vjewmm+HEUaYQe6frq8OhZnrvtnzZU3Q3DF6N0UbAmD/q+iNfNgyx8mozg==}
-
   '@radix-ui/colors@3.0.0':
     resolution: {integrity: sha512-FUOsGBkHrYJwCSEtWRCIfQbZG7q1e6DgxCIOe1SUQzDe/7rXXeA47s8yCn6fuTNQAj1Zq4oTFi9Yjp3wzElcxg==}
 
@@ -1326,6 +1347,9 @@ packages:
   '@types/web-bluetooth@0.0.20':
     resolution: {integrity: sha512-g9gZnnXVq7gM7v3tJCWV/qw7w+KeOlSHAhgF9RytFyifW6AF61hdT2ucrYhPq9hLs5JIryeupHV3qGk95dH9ow==}
 
+  '@types/zen-observable@0.8.3':
+    resolution: {integrity: sha512-fbF6oTd4sGGy0xjHPKAt+eS2CrxJ3+6gQ3FGcBoIJR2TLAyCkCyI8JqZNy+FeON0AhVgNJoUumVoZQjBFUqHkw==}
+
   '@ungap/structured-clone@1.2.0':
     resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==}
 
@@ -2450,9 +2474,6 @@ packages:
   fastq@1.15.0:
     resolution: {integrity: sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==}
 
-  fflate@0.4.8:
-    resolution: {integrity: sha512-FJqqoDBR00Mdj9ppamLa/Y7vxm+PRmNWA67N846RvsoYVMKB4q3y/de5PA7gUmRMYK/8CMz2GDZQmCRN1wBcWA==}
-
   file-entry-cache@6.0.1:
     resolution: {integrity: sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==}
     engines: {node: ^10.12.0 || >=12.0.0}
@@ -3791,20 +3812,6 @@ packages:
     resolution: {integrity: sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==}
     engines: {node: ^10 || ^12 || >=14}
 
-  posthog-js@1.260.3:
-    resolution: {integrity: sha512-FCtksk0GQn22Rk9P7x7dsmAO7a2aBxPeYb2O2KXSraxR8xd2G6lUOOthVDK+qgtmuhpUZuur/mHrXEslMUEtjg==}
-    peerDependencies:
-      '@rrweb/types': 2.0.0-alpha.17
-      rrweb-snapshot: 2.0.0-alpha.17
-    peerDependenciesMeta:
-      '@rrweb/types':
-        optional: true
-      rrweb-snapshot:
-        optional: true
-
-  preact@10.27.1:
-    resolution: {integrity: sha512-V79raXEWch/rbqoNc7nT9E4ep7lu+mI3+sBmfRD4i1M73R3WLYcCtdI0ibxGVf4eQL8ZIz2nFacqEC+rmnOORQ==}
-
   prelude-ls@1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
@@ -3979,6 +3986,9 @@ packages:
   rust-result@1.0.0:
     resolution: {integrity: sha512-6cJzSBU+J/RJCF063onnQf0cDUOHs9uZI1oroSGnHOph+CQTIJ5Pp2hK5kEQq1+7yE/EEWfulSNXAQ2jikPthA==}
 
+  rxjs@7.8.2:
+    resolution: {integrity: sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==}
+
   sade@1.8.1:
     resolution: {integrity: sha512-xal3CZX1Xlo/k4ApwCFrHVACi9fBqJ7V+mwhBsuf/1IOKbBy098Fex+Wa/5QMubw09pSZ/u8EY8PWgevJsXp1A==}
     engines: {node: '>=6'}
@@ -4665,8 +4675,8 @@ packages:
   wavesurfer.js@7.8.6:
     resolution: {integrity: sha512-EDexkMwkkQBTWruhfWQRkTtvRggtKFTPuJX/oZ5wbIZEfyww9EBeLr2mtkxzA1S8TlWPx6adY5WyjOlNYNyHSg==}
 
-  web-vitals@4.2.4:
-    resolution: {integrity: sha512-r4DIlprAGwJ7YM11VZp4R884m0Vmgr6EAKe3P+kO0PPj3Unqyvv59rczf6UiGcb9Z8QxZVcqKNwv/g0WNdWwsw==}
+  web-vitals@5.1.0:
+    resolution: {integrity: sha512-ArI3kx5jI0atlTtmV0fWU3fjpLmq/nD3Zr1iFFlJLaqa5wLBkUSzINwBPySCX/8jRyjlmy1Volw1kz1g9XE4Jg==}
 
   webidl-conversions@7.0.0:
     resolution: {integrity: sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==}
@@ -4834,6 +4844,12 @@ packages:
     resolution: {integrity: sha512-b4JR1PFR10y1mKjhHY9LaGo6tmrgjit7hxVIeAmyMw3jegXR4dhYqLaQF5zMXZxY7tLpMyJeLjr1C4rLmkVe8g==}
     engines: {node: '>=12.20'}
 
+  zen-observable-ts@1.1.0:
+    resolution: {integrity: sha512-1h4zlLSqI2cRLPJUHJFL8bCWHhkpuXkF+dbGkRaWjgDIG26DmzyshUMrdV/rL3UnR+mhaX4fRq8LPouq0MYYIA==}
+
+  zen-observable@0.8.15:
+    resolution: {integrity: sha512-PQ2PC7R9rslx84ndNBZB/Dkv8V8fZEpk83RLgXtYd0fwUgEjseMn1Dgajh2x6S8QbZAFa9p2qVCEuYZNgve0dQ==}
+
 snapshots:
 
   '@aashutoshrathi/word-wrap@1.2.6': {}
@@ -4844,6 +4860,51 @@ snapshots:
 
   '@alloc/quick-lru@5.2.0': {}
 
+  '@amplitude/analytics-browser@2.33.1':
+    dependencies:
+      '@amplitude/analytics-core': 2.35.0
+      '@amplitude/plugin-autocapture-browser': 1.18.3
+      '@amplitude/plugin-network-capture-browser': 1.7.3
+      '@amplitude/plugin-page-url-enrichment-browser': 0.5.9
+      '@amplitude/plugin-page-view-tracking-browser': 2.6.6
+      '@amplitude/plugin-web-vitals-browser': 1.1.4
+      tslib: 2.8.1
+
+  '@amplitude/analytics-connector@1.6.4': {}
+
+  '@amplitude/analytics-core@2.35.0':
+    dependencies:
+      '@amplitude/analytics-connector': 1.6.4
+      tslib: 2.8.1
+      zen-observable-ts: 1.1.0
+
+  '@amplitude/plugin-autocapture-browser@1.18.3':
+    dependencies:
+      '@amplitude/analytics-core': 2.35.0
+      rxjs: 7.8.2
+      tslib: 2.8.1
+
+  '@amplitude/plugin-network-capture-browser@1.7.3':
+    dependencies:
+      '@amplitude/analytics-core': 2.35.0
+      tslib: 2.8.1
+
+  '@amplitude/plugin-page-url-enrichment-browser@0.5.9':
+    dependencies:
+      '@amplitude/analytics-core': 2.35.0
+      tslib: 2.8.1
+
+  '@amplitude/plugin-page-view-tracking-browser@2.6.6':
+    dependencies:
+      '@amplitude/analytics-core': 2.35.0
+      tslib: 2.8.1
+
+  '@amplitude/plugin-web-vitals-browser@1.1.4':
+    dependencies:
+      '@amplitude/analytics-core': 2.35.0
+      tslib: 2.8.1
+      web-vitals: 5.1.0
+
   '@ampproject/remapping@2.3.0':
     dependencies:
       '@jridgewell/gen-mapping': 0.3.8
@@ -4909,7 +4970,7 @@ snapshots:
       hotkeys-js: 3.8.7
       lit: 2.2.6
 
-  '@chatwoot/prosemirror-schema@1.2.6':
+  '@chatwoot/prosemirror-schema@1.3.5':
     dependencies:
       markdown-it-sup: 2.0.0
       prosemirror-commands: 1.6.0
@@ -5626,8 +5687,6 @@ snapshots:
 
   '@polka/url@1.0.0-next.28': {}
 
-  '@posthog/core@1.0.1': {}
-
   '@radix-ui/colors@3.0.0': {}
 
   '@rails/actioncable@6.1.3': {}
@@ -5810,6 +5869,8 @@ snapshots:
 
   '@types/web-bluetooth@0.0.20': {}
 
+  '@types/zen-observable@0.8.3': {}
+
   '@ungap/structured-clone@1.2.0': {}
 
   '@videojs/http-streaming@2.13.1(video.js@7.18.1)':
@@ -7202,8 +7263,6 @@ snapshots:
     dependencies:
       reusify: 1.0.4
 
-  fflate@0.4.8: {}
-
   file-entry-cache@6.0.1:
     dependencies:
       flat-cache: 3.1.0
@@ -8671,16 +8730,6 @@ snapshots:
       picocolors: 1.1.1
       source-map-js: 1.2.1
 
-  posthog-js@1.260.3:
-    dependencies:
-      '@posthog/core': 1.0.1
-      core-js: 3.38.1
-      fflate: 0.4.8
-      preact: 10.27.1
-      web-vitals: 4.2.4
-
-  preact@10.27.1: {}
-
   prelude-ls@1.2.1: {}
 
   prettier-linter-helpers@1.0.0:
@@ -8895,6 +8944,10 @@ snapshots:
     dependencies:
       individual: 2.0.0
 
+  rxjs@7.8.2:
+    dependencies:
+      tslib: 2.8.1
+
   sade@1.8.1:
     dependencies:
       mri: 1.2.0
@@ -9667,7 +9720,7 @@ snapshots:
 
   wavesurfer.js@7.8.6: {}
 
-  web-vitals@4.2.4: {}
+  web-vitals@5.1.0: {}
 
   webidl-conversions@7.0.0: {}
 
@@ -9824,3 +9877,10 @@ snapshots:
   yocto-queue@0.1.0: {}
 
   yocto-queue@1.1.1: {}
+
+  zen-observable-ts@1.1.0:
+    dependencies:
+      '@types/zen-observable': 0.8.3
+      zen-observable: 0.8.15
+
+  zen-observable@0.8.15: {}
diff --git a/spec/controllers/api/v1/accounts/search_controller_spec.rb b/spec/controllers/api/v1/accounts/search_controller_spec.rb
index ea59bec9c..9b7b0b2f1 100644
--- a/spec/controllers/api/v1/accounts/search_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/search_controller_spec.rb
@@ -69,6 +69,80 @@ RSpec.describe 'Search', type: :request do
         expect(response_data[:payload].keys).to contain_exactly(:contacts)
         expect(response_data[:payload][:contacts].length).to eq 1
       end
+
+      it 'returns last_activity_at in contact search results' do
+        contact = create(:contact, email: 'activity@test.com', account: account, last_activity_at: 3.days.ago)
+
+        get "/api/v1/accounts/#{account.id}/search/contacts",
+            headers: agent.create_new_auth_token,
+            params: { q: 'activity' },
+            as: :json
+
+        expect(response).to have_http_status(:success)
+        response_data = JSON.parse(response.body, symbolize_names: true)
+
+        contact_result = response_data[:payload][:contacts].first
+        expect(contact_result[:last_activity_at]).to eq(contact.last_activity_at.to_i)
+        expect(contact_result).not_to have_key(:created_at)
+      end
+
+      context 'with advanced_search feature enabled', :opensearch do
+        before do
+          account.enable_features!('advanced_search')
+        end
+
+        it 'filters contacts by since parameter' do
+          create(:contact, email: 'old@test.com', account: account, last_activity_at: 10.days.ago)
+          create(:contact, email: 'recent@test.com', account: account, last_activity_at: 2.days.ago)
+
+          get "/api/v1/accounts/#{account.id}/search/contacts",
+              headers: agent.create_new_auth_token,
+              params: { q: 'test', since: 5.days.ago.to_i },
+              as: :json
+
+          expect(response).to have_http_status(:success)
+          response_data = JSON.parse(response.body, symbolize_names: true)
+
+          contact_emails = response_data[:payload][:contacts].pluck(:email)
+          expect(contact_emails).to include('recent@test.com')
+          expect(contact_emails).not_to include('old@test.com')
+        end
+
+        it 'filters contacts by until parameter' do
+          create(:contact, email: 'old@test.com', account: account, last_activity_at: 10.days.ago)
+          create(:contact, email: 'recent@test.com', account: account, last_activity_at: 2.days.ago)
+
+          get "/api/v1/accounts/#{account.id}/search/contacts",
+              headers: agent.create_new_auth_token,
+              params: { q: 'test', until: 5.days.ago.to_i },
+              as: :json
+
+          expect(response).to have_http_status(:success)
+          response_data = JSON.parse(response.body, symbolize_names: true)
+
+          contact_emails = response_data[:payload][:contacts].pluck(:email)
+          expect(contact_emails).to include('old@test.com')
+          expect(contact_emails).not_to include('recent@test.com')
+        end
+
+        it 'filters contacts by both since and until parameters' do
+          create(:contact, email: 'veryold@test.com', account: account, last_activity_at: 20.days.ago)
+          create(:contact, email: 'old@test.com', account: account, last_activity_at: 10.days.ago)
+          create(:contact, email: 'recent@test.com', account: account, last_activity_at: 2.days.ago)
+
+          get "/api/v1/accounts/#{account.id}/search/contacts",
+              headers: agent.create_new_auth_token,
+              params: { q: 'test', since: 15.days.ago.to_i, until: 5.days.ago.to_i },
+              as: :json
+
+          expect(response).to have_http_status(:success)
+          response_data = JSON.parse(response.body, symbolize_names: true)
+
+          contact_emails = response_data[:payload][:contacts].pluck(:email)
+          expect(contact_emails).to include('old@test.com')
+          expect(contact_emails).not_to include('veryold@test.com', 'recent@test.com')
+        end
+      end
     end
   end
 
@@ -94,6 +168,104 @@ RSpec.describe 'Search', type: :request do
         expect(response_data[:payload].keys).to contain_exactly(:conversations)
         expect(response_data[:payload][:conversations].length).to eq 1
       end
+
+      context 'with advanced_search feature enabled', :opensearch do
+        before do
+          account.enable_features!('advanced_search')
+        end
+
+        it 'filters conversations by since parameter' do
+          unique_id = SecureRandom.hex(8)
+          old_contact = create(:contact, email: "old-#{unique_id}@test.com", account: account)
+          recent_contact = create(:contact, email: "recent-#{unique_id}@test.com", account: account)
+          old_conversation = create(:conversation, account: account, contact: old_contact)
+          recent_conversation = create(:conversation, account: account, contact: recent_contact)
+          create(:message, conversation: old_conversation, account: account, content: 'message 1')
+          create(:message, conversation: recent_conversation, account: account, content: 'message 2')
+          create(:inbox_member, user: agent, inbox: old_conversation.inbox)
+          create(:inbox_member, user: agent, inbox: recent_conversation.inbox)
+
+          # Bypass CURRENT_TIMESTAMP default
+          # rubocop:disable Rails/SkipsModelValidations
+          Conversation.where(id: old_conversation.id).update_all(last_activity_at: 10.days.ago)
+          Conversation.where(id: recent_conversation.id).update_all(last_activity_at: 2.days.ago)
+          # rubocop:enable Rails/SkipsModelValidations
+
+          get "/api/v1/accounts/#{account.id}/search/conversations",
+              headers: agent.create_new_auth_token,
+              params: { q: unique_id, since: 5.days.ago.to_i },
+              as: :json
+
+          expect(response).to have_http_status(:success)
+          response_data = JSON.parse(response.body, symbolize_names: true)
+
+          conversation_display_ids = response_data[:payload][:conversations].pluck(:id)
+          expect(conversation_display_ids).to eq([recent_conversation.display_id])
+        end
+
+        it 'filters conversations by until parameter' do
+          unique_id = SecureRandom.hex(8)
+          old_contact = create(:contact, email: "old-#{unique_id}@test.com", account: account)
+          recent_contact = create(:contact, email: "recent-#{unique_id}@test.com", account: account)
+          old_conversation = create(:conversation, account: account, contact: old_contact)
+          recent_conversation = create(:conversation, account: account, contact: recent_contact)
+          create(:message, conversation: old_conversation, account: account, content: 'message 1')
+          create(:message, conversation: recent_conversation, account: account, content: 'message 2')
+          create(:inbox_member, user: agent, inbox: old_conversation.inbox)
+          create(:inbox_member, user: agent, inbox: recent_conversation.inbox)
+
+          # Bypass CURRENT_TIMESTAMP default
+          # rubocop:disable Rails/SkipsModelValidations
+          Conversation.where(id: old_conversation.id).update_all(last_activity_at: 10.days.ago)
+          Conversation.where(id: recent_conversation.id).update_all(last_activity_at: 2.days.ago)
+          # rubocop:enable Rails/SkipsModelValidations
+
+          get "/api/v1/accounts/#{account.id}/search/conversations",
+              headers: agent.create_new_auth_token,
+              params: { q: unique_id, until: 5.days.ago.to_i },
+              as: :json
+
+          expect(response).to have_http_status(:success)
+          response_data = JSON.parse(response.body, symbolize_names: true)
+
+          conversation_display_ids = response_data[:payload][:conversations].pluck(:id)
+          expect(conversation_display_ids).to eq([old_conversation.display_id])
+        end
+
+        it 'filters conversations by both since and until parameters' do
+          unique_id = SecureRandom.hex(8)
+          very_old_contact = create(:contact, email: "veryold-#{unique_id}@test.com", account: account)
+          old_contact = create(:contact, email: "old-#{unique_id}@test.com", account: account)
+          recent_contact = create(:contact, email: "recent-#{unique_id}@test.com", account: account)
+          very_old_conversation = create(:conversation, account: account, contact: very_old_contact)
+          old_conversation = create(:conversation, account: account, contact: old_contact)
+          recent_conversation = create(:conversation, account: account, contact: recent_contact)
+          create(:message, conversation: very_old_conversation, account: account, content: 'message 1')
+          create(:message, conversation: old_conversation, account: account, content: 'message 2')
+          create(:message, conversation: recent_conversation, account: account, content: 'message 3')
+          create(:inbox_member, user: agent, inbox: very_old_conversation.inbox)
+          create(:inbox_member, user: agent, inbox: old_conversation.inbox)
+          create(:inbox_member, user: agent, inbox: recent_conversation.inbox)
+
+          # Bypass CURRENT_TIMESTAMP default
+          # rubocop:disable Rails/SkipsModelValidations
+          Conversation.where(id: very_old_conversation.id).update_all(last_activity_at: 20.days.ago)
+          Conversation.where(id: old_conversation.id).update_all(last_activity_at: 10.days.ago)
+          Conversation.where(id: recent_conversation.id).update_all(last_activity_at: 2.days.ago)
+          # rubocop:enable Rails/SkipsModelValidations
+
+          get "/api/v1/accounts/#{account.id}/search/conversations",
+              headers: agent.create_new_auth_token,
+              params: { q: unique_id, since: 15.days.ago.to_i, until: 5.days.ago.to_i },
+              as: :json
+
+          expect(response).to have_http_status(:success)
+          response_data = JSON.parse(response.body, symbolize_names: true)
+
+          conversation_display_ids = response_data[:payload][:conversations].pluck(:id)
+          expect(conversation_display_ids).to eq([old_conversation.display_id])
+        end
+      end
     end
   end
 
@@ -175,6 +347,74 @@ RSpec.describe 'Search', type: :request do
 
         expect(response_data[:payload][:articles].length).to eq 15 # Default per_page is 15
       end
+
+      context 'with advanced_search feature enabled', :opensearch do
+        before do
+          account.enable_features!('advanced_search')
+        end
+
+        it 'filters articles by since parameter' do
+          portal = create(:portal, account: account)
+          old_article = create(:article, title: 'Old Article test', account: account, portal: portal,
+                                         author: agent, status: 'published', updated_at: 10.days.ago)
+          recent_article = create(:article, title: 'Recent Article test', account: account, portal: portal,
+                                            author: agent, status: 'published', updated_at: 2.days.ago)
+
+          get "/api/v1/accounts/#{account.id}/search/articles",
+              headers: agent.create_new_auth_token,
+              params: { q: 'test', since: 5.days.ago.to_i },
+              as: :json
+
+          expect(response).to have_http_status(:success)
+          response_data = JSON.parse(response.body, symbolize_names: true)
+
+          article_ids = response_data[:payload][:articles].pluck(:id)
+          expect(article_ids).to include(recent_article.id)
+          expect(article_ids).not_to include(old_article.id)
+        end
+
+        it 'filters articles by until parameter' do
+          portal = create(:portal, account: account)
+          old_article = create(:article, title: 'Old Article test', account: account, portal: portal,
+                                         author: agent, status: 'published', updated_at: 10.days.ago)
+          recent_article = create(:article, title: 'Recent Article test', account: account, portal: portal,
+                                            author: agent, status: 'published', updated_at: 2.days.ago)
+
+          get "/api/v1/accounts/#{account.id}/search/articles",
+              headers: agent.create_new_auth_token,
+              params: { q: 'test', until: 5.days.ago.to_i },
+              as: :json
+
+          expect(response).to have_http_status(:success)
+          response_data = JSON.parse(response.body, symbolize_names: true)
+
+          article_ids = response_data[:payload][:articles].pluck(:id)
+          expect(article_ids).to include(old_article.id)
+          expect(article_ids).not_to include(recent_article.id)
+        end
+
+        it 'filters articles by both since and until parameters' do
+          portal = create(:portal, account: account)
+          very_old_article = create(:article, title: 'Very Old Article test', account: account, portal: portal,
+                                              author: agent, status: 'published', updated_at: 20.days.ago)
+          old_article = create(:article, title: 'Old Article test', account: account, portal: portal,
+                                         author: agent, status: 'published', updated_at: 10.days.ago)
+          recent_article = create(:article, title: 'Recent Article test', account: account, portal: portal,
+                                            author: agent, status: 'published', updated_at: 2.days.ago)
+
+          get "/api/v1/accounts/#{account.id}/search/articles",
+              headers: agent.create_new_auth_token,
+              params: { q: 'test', since: 15.days.ago.to_i, until: 5.days.ago.to_i },
+              as: :json
+
+          expect(response).to have_http_status(:success)
+          response_data = JSON.parse(response.body, symbolize_names: true)
+
+          article_ids = response_data[:payload][:articles].pluck(:id)
+          expect(article_ids).to include(old_article.id)
+          expect(article_ids).not_to include(very_old_article.id, recent_article.id)
+        end
+      end
     end
   end
 end
diff --git a/spec/enterprise/controllers/api/v1/accounts/companies_controller_spec.rb b/spec/enterprise/controllers/api/v1/accounts/companies_controller_spec.rb
index f5d82310a..3dadcec43 100644
--- a/spec/enterprise/controllers/api/v1/accounts/companies_controller_spec.rb
+++ b/spec/enterprise/controllers/api/v1/accounts/companies_controller_spec.rb
@@ -81,6 +81,46 @@ RSpec.describe 'Companies API', type: :request do
         expect(response_body['payload'].size).to eq(3)
         expect(response_body['payload'].map { |c| c['name'] }).not_to include('Other Account Company')
       end
+
+      it 'sorts companies by contacts_count in ascending order' do
+        company_with_5 = create(:company, name: 'Company with 5', account: account)
+        company_with_2 = create(:company, name: 'Company with 2', account: account)
+        company_with_10 = create(:company, name: 'Company with 10', account: account)
+        create_list(:contact, 5, company: company_with_5, account: account)
+        create_list(:contact, 2, company: company_with_2, account: account)
+        create_list(:contact, 10, company: company_with_10, account: account)
+
+        get "/api/v1/accounts/#{account.id}/companies",
+            params: { sort: 'contacts_count' },
+            headers: admin.create_new_auth_token,
+            as: :json
+        expect(response).to have_http_status(:success)
+        response_body = response.parsed_body
+        company_ids = response_body['payload'].map { |c| c['id'] }
+
+        expect(company_ids.index(company_with_2.id)).to be < company_ids.index(company_with_5.id)
+        expect(company_ids.index(company_with_5.id)).to be < company_ids.index(company_with_10.id)
+      end
+
+      it 'sorts companies by contacts_count in descending order' do
+        company_with_5 = create(:company, name: 'Company with 5', account: account)
+        company_with_2 = create(:company, name: 'Company with 2', account: account)
+        company_with_10 = create(:company, name: 'Company with 10', account: account)
+        create_list(:contact, 5, company: company_with_5, account: account)
+        create_list(:contact, 2, company: company_with_2, account: account)
+        create_list(:contact, 10, company: company_with_10, account: account)
+
+        get "/api/v1/accounts/#{account.id}/companies",
+            params: { sort: '-contacts_count' },
+            headers: admin.create_new_auth_token,
+            as: :json
+        expect(response).to have_http_status(:success)
+        response_body = response.parsed_body
+        company_ids = response_body['payload'].map { |c| c['id'] }
+
+        expect(company_ids.index(company_with_10.id)).to be < company_ids.index(company_with_5.id)
+        expect(company_ids.index(company_with_5.id)).to be < company_ids.index(company_with_2.id)
+      end
     end
   end
 
diff --git a/spec/enterprise/jobs/captain/conversation/response_builder_job_spec.rb b/spec/enterprise/jobs/captain/conversation/response_builder_job_spec.rb
index 08a77626a..777086613 100644
--- a/spec/enterprise/jobs/captain/conversation/response_builder_job_spec.rb
+++ b/spec/enterprise/jobs/captain/conversation/response_builder_job_spec.rb
@@ -28,7 +28,7 @@ RSpec.describe Captain::Conversation::ResponseBuilderJob, type: :job do
       end
 
       it 'uses Captain::Llm::AssistantChatService' do
-        expect(Captain::Llm::AssistantChatService).to receive(:new).with(assistant: assistant, conversation_id: conversation.id)
+        expect(Captain::Llm::AssistantChatService).to receive(:new).with(assistant: assistant, conversation_id: conversation.display_id)
         expect(Captain::Assistant::AgentRunnerService).not_to receive(:new)
 
         described_class.perform_now(conversation, assistant)
diff --git a/spec/enterprise/models/message_spec.rb b/spec/enterprise/models/message_spec.rb
index 5a9dc4e27..aa1537e65 100644
--- a/spec/enterprise/models/message_spec.rb
+++ b/spec/enterprise/models/message_spec.rb
@@ -14,8 +14,9 @@ RSpec.describe Message do
 
     create(:message, message_type: :outgoing, conversation: conversation, sender: captain_assistant)
 
+    # Captain::Assistant responses clear waiting_since (like AgentBot)
     expect(conversation.first_reply_created_at).to be_nil
-    expect(conversation.waiting_since).to be_within(0.000001.seconds).of(conversation.created_at)
+    expect(conversation.waiting_since).to be_nil
 
     create(:message, message_type: :outgoing, conversation: conversation)
 
diff --git a/spec/lib/webhooks/trigger_spec.rb b/spec/lib/webhooks/trigger_spec.rb
index 3a4acf4e9..78bf361c4 100644
--- a/spec/lib/webhooks/trigger_spec.rb
+++ b/spec/lib/webhooks/trigger_spec.rb
@@ -18,7 +18,9 @@ describe Webhooks::Trigger do
 
   before do
     ActiveJob::Base.queue_adapter = :test
+    allow(GlobalConfig).to receive(:get_value).and_call_original
     allow(GlobalConfig).to receive(:get_value).with('WEBHOOK_TIMEOUT').and_return(webhook_timeout)
+    allow(GlobalConfig).to receive(:get_value).with('DEPLOYMENT_ENV').and_return(nil)
   end
 
   after do
diff --git a/spec/mailboxes/reply_mailbox_spec.rb b/spec/mailboxes/reply_mailbox_spec.rb
index 2658731bc..d062c7d73 100644
--- a/spec/mailboxes/reply_mailbox_spec.rb
+++ b/spec/mailboxes/reply_mailbox_spec.rb
@@ -12,8 +12,8 @@ RSpec.describe ReplyMailbox do
     let(:conversation) { create(:conversation, assignee: agent, inbox: create(:inbox, account: account, greeting_enabled: false), account: account) }
     let(:described_subject) { described_class.receive reply_mail }
     let(:serialized_attributes) do
-      %w[bcc cc content_type date from html_content in_reply_to message_id multipart number_of_attachments references subject text_content to
-         auto_reply]
+      %w[bcc cc content_type date from headers html_content in_reply_to message_id multipart number_of_attachments references subject text_content
+         to auto_reply]
     end
 
     context 'with reply uuid present' do
@@ -397,7 +397,7 @@ RSpec.describe ReplyMailbox do
     let(:support_in_reply_to_mail) { create_inbound_email_from_fixture('support_in_reply_to.eml') }
     let(:described_subject) { described_class.receive support_mail }
     let(:serialized_attributes) do
-      %w[bcc cc content_type date from html_content in_reply_to message_id multipart number_of_attachments references subject
+      %w[bcc cc content_type date from headers html_content in_reply_to message_id multipart number_of_attachments references subject
          text_content to auto_reply]
     end
     let(:conversation) { Conversation.where(inbox_id: channel_email.inbox).last }
diff --git a/spec/models/conversation_spec.rb b/spec/models/conversation_spec.rb
index 7a5398456..5a4acf329 100644
--- a/spec/models/conversation_spec.rb
+++ b/spec/models/conversation_spec.rb
@@ -978,5 +978,70 @@ RSpec.describe Conversation do
       reply_events = account.reporting_events.where(name: 'reply_time', conversation_id: conversation.id)
       expect(reply_events.count).to eq(0)
     end
+
+    context 'when AgentBot responds between customer messages' do
+      let(:agent_bot) { create(:agent_bot, account: account) }
+
+      def create_bot_message(conversation, created_at: Time.current)
+        message = nil
+        perform_enqueued_jobs do
+          message = create(:message,
+                           message_type: 'outgoing',
+                           account: conversation.account,
+                           inbox: conversation.inbox,
+                           conversation: conversation,
+                           sender: agent_bot,
+                           created_at: created_at)
+        end
+        message
+      end
+
+      it 'calculates reply time from the most recent customer message after bot response' do
+        # Initial conversation: customer message -> agent first reply (to establish first_reply_created_at)
+        create_customer_message(conversation, created_at: 10.hours.ago)
+        create_agent_message(conversation, created_at: 9.hours.ago)
+
+        # Customer message 1
+        create_customer_message(conversation, created_at: 5.hours.ago)
+
+        # Bot responds
+        create_bot_message(conversation, created_at: 4.hours.ago)
+
+        # Customer message 2 (after bot response) - should reset waiting_since
+        create_customer_message(conversation, created_at: 2.hours.ago)
+
+        # Human agent replies - should create reply_time event from customer message 2
+        create_agent_message(conversation, created_at: 1.hour.ago)
+
+        reply_events = account.reporting_events.where(name: 'reply_time', conversation_id: conversation.id)
+        expect(reply_events.count).to eq(1) # Only the second agent reply creates a reply_time event
+        # Reply time should be 1 hour (from customer message 2 to agent reply)
+        expect(reply_events.first.value).to be_within(60).of(3600)
+      end
+
+      it 'handles multiple bot responses before customer messages again' do
+        # Initial conversation: customer message -> agent first reply
+        create_customer_message(conversation, created_at: 10.hours.ago)
+        create_agent_message(conversation, created_at: 9.hours.ago)
+
+        # Customer message 1
+        create_customer_message(conversation, created_at: 6.hours.ago)
+
+        # Bot responds multiple times
+        create_bot_message(conversation, created_at: 5.hours.ago)
+        create_bot_message(conversation, created_at: 4.hours.ago)
+
+        # Customer message 2 (after multiple bot responses) - should reset waiting_since
+        create_customer_message(conversation, created_at: 2.hours.ago)
+
+        # Human agent replies
+        create_agent_message(conversation, created_at: 1.hour.ago)
+
+        reply_events = account.reporting_events.where(name: 'reply_time', conversation_id: conversation.id)
+        expect(reply_events.count).to eq(1) # Only the second agent reply creates a reply_time event
+        # Reply time should be 1 hour (from customer message 2 to agent reply)
+        expect(reply_events.first.value).to be_within(60).of(3600)
+      end
+    end
   end
 end
diff --git a/spec/models/message_spec.rb b/spec/models/message_spec.rb
index 8905f5103..d606c266d 100644
--- a/spec/models/message_spec.rb
+++ b/spec/models/message_spec.rb
@@ -300,6 +300,63 @@ RSpec.describe Message do
 
       expect(conversation.waiting_since).to eq old_waiting_since
     end
+
+    context 'when bot has responded to the conversation' do
+      let(:agent_bot) { create(:agent_bot, account: conversation.account) }
+
+      before do
+        # Create initial customer message
+        create(:message, conversation: conversation, message_type: :incoming,
+                         created_at: 2.hours.ago)
+        conversation.update(waiting_since: 2.hours.ago)
+
+        # Bot responds
+        create(:message, conversation: conversation, message_type: :outgoing,
+                         sender: agent_bot, created_at: 1.hour.ago)
+      end
+
+      it 'resets waiting_since when customer sends a new message after bot response' do
+        new_message = build(:message, conversation: conversation, message_type: :incoming)
+        new_message.save!
+
+        conversation.reload
+        expect(conversation.waiting_since).to be_within(1.second).of(new_message.created_at)
+      end
+
+      it 'does not reset waiting_since if last response was from human agent' do
+        # Human agent responds (clears waiting_since)
+        create(:message, conversation: conversation, message_type: :outgoing,
+                         sender: agent)
+        conversation.reload
+        expect(conversation.waiting_since).to be_nil
+
+        # Customer sends new message
+        new_message = build(:message, conversation: conversation, message_type: :incoming)
+        new_message.save!
+
+        conversation.reload
+        expect(conversation.waiting_since).to be_within(1.second).of(new_message.created_at)
+      end
+
+      it 'clears waiting_since when bot responds' do
+        # After the bot response in before block, waiting_since should already be cleared
+        conversation.reload
+        expect(conversation.waiting_since).to be_nil
+
+        # Customer sends another message
+        create(:message, conversation: conversation, message_type: :incoming,
+                         created_at: 30.minutes.ago)
+        conversation.reload
+        expect(conversation.waiting_since).to be_within(1.second).of(30.minutes.ago)
+
+        # Another bot response should clear it again
+        create(:message, conversation: conversation, message_type: :outgoing,
+                         sender: agent_bot, created_at: 15.minutes.ago)
+
+        conversation.reload
+        expect(conversation.waiting_since).to be_nil
+      end
+    end
   end
 
   context 'with webhook_data' do
diff --git a/spec/presenters/mail_presenter_spec.rb b/spec/presenters/mail_presenter_spec.rb
index b9b23c8ce..bbe51c52d 100644
--- a/spec/presenters/mail_presenter_spec.rb
+++ b/spec/presenters/mail_presenter_spec.rb
@@ -41,6 +41,7 @@ RSpec.describe MailPresenter do
                                 :content_type,
                                 :date,
                                 :from,
+                                :headers,
                                 :html_content,
                                 :in_reply_to,
                                 :message_id,
@@ -60,6 +61,39 @@ RSpec.describe MailPresenter do
       expect(data[:auto_reply]).to eq(decorated_mail.auto_reply?)
     end
 
+    it 'includes forwarded headers in serialized_data' do
+      mail_with_headers = Mail.new do
+        from 'Sender <sender@example.com>'
+        to 'Inbox <inbox@example.com>'
+        subject :header
+        body 'Hi'
+        header['X-Original-From'] = 'Original <original@example.com>'
+        header['X-Original-Sender'] = 'original@example.com'
+        header['X-Forwarded-For'] = 'forwarder@example.com'
+      end
+
+      data = described_class.new(mail_with_headers).serialized_data
+
+      expect(data[:headers]).to eq(
+        'x-original-from' => 'Original <original@example.com>',
+        'x-original-sender' => 'original@example.com',
+        'x-forwarded-for' => 'forwarder@example.com'
+      )
+    end
+
+    it 'returns nil headers when forwarding headers are missing' do
+      mail_without_headers = Mail.new do
+        from 'Sender <sender@example.com>'
+        to 'Inbox <inbox@example.com>'
+        subject :header
+        body 'Hi'
+      end
+
+      data = described_class.new(mail_without_headers).serialized_data
+
+      expect(data[:headers]).to be_nil
+    end
+
     it 'give email from in downcased format' do
       expect(decorated_mail.from.first.eql?(mail.from.first.downcase)).to be true
     end
diff --git a/spec/services/csat_survey_service_spec.rb b/spec/services/csat_survey_service_spec.rb
index ecb5a75c6..6359fbda1 100644
--- a/spec/services/csat_survey_service_spec.rb
+++ b/spec/services/csat_survey_service_spec.rb
@@ -3,7 +3,9 @@ require 'rails_helper'
 describe CsatSurveyService do
   let(:account) { create(:account) }
   let(:inbox) { create(:inbox, account: account, csat_survey_enabled: true) }
-  let(:conversation) { create(:conversation, inbox: inbox, account: account, status: :resolved) }
+  let(:contact) { create(:contact, account: account) }
+  let(:contact_inbox) { create(:contact_inbox, contact: contact, inbox: inbox, source_id: '+1234567890') }
+  let(:conversation) { create(:conversation, contact_inbox: contact_inbox, inbox: inbox, account: account, status: :resolved) }
   let(:service) { described_class.new(conversation: conversation) }
 
   describe '#perform' do
@@ -87,5 +89,269 @@ describe CsatSurveyService do
         expect(Conversations::ActivityMessageJob).not_to have_received(:perform_later)
       end
     end
+
+    context 'when it is a WhatsApp channel' do
+      let(:whatsapp_channel) do
+        create(:channel_whatsapp, account: account, provider: 'whatsapp_cloud',
+                                  sync_templates: false, validate_provider_config: false)
+      end
+      let(:whatsapp_inbox) { create(:inbox, channel: whatsapp_channel, account: account, csat_survey_enabled: true) }
+      let(:whatsapp_contact) { create(:contact, account: account) }
+      let(:whatsapp_contact_inbox) { create(:contact_inbox, contact: whatsapp_contact, inbox: whatsapp_inbox, source_id: '1234567890') }
+      let(:whatsapp_conversation) do
+        create(:conversation, contact_inbox: whatsapp_contact_inbox, inbox: whatsapp_inbox, account: account, status: :resolved)
+      end
+      let(:whatsapp_service) { described_class.new(conversation: whatsapp_conversation) }
+      let(:mock_provider_service) { instance_double(Whatsapp::Providers::WhatsappCloudService) }
+
+      before do
+        allow(Whatsapp::Providers::WhatsappCloudService).to receive(:new).and_return(mock_provider_service)
+        allow(whatsapp_conversation).to receive(:can_reply?).and_return(true)
+      end
+
+      context 'when template is available and approved' do
+        before do
+          setup_approved_template('customer_survey_template')
+        end
+
+        it 'sends WhatsApp template survey instead of regular survey' do
+          mock_successful_template_send('template_message_id_123')
+
+          whatsapp_service.perform
+
+          expect(mock_provider_service).to have_received(:send_template).with(
+            '1234567890',
+            hash_including(
+              name: 'customer_survey_template',
+              lang_code: 'en',
+              parameters: array_including(
+                hash_including(
+                  type: 'button',
+                  sub_type: 'url',
+                  index: '0',
+                  parameters: array_including(
+                    hash_including(type: 'text', text: whatsapp_conversation.uuid)
+                  )
+                )
+              )
+            ),
+            instance_of(Message)
+          )
+          expect(MessageTemplates::Template::CsatSurvey).not_to have_received(:new)
+        end
+
+        it 'updates message with returned message ID' do
+          mock_successful_template_send('template_message_id_123')
+
+          whatsapp_service.perform
+
+          csat_message = whatsapp_conversation.messages.where(content_type: :input_csat).last
+          expect(csat_message).to be_present
+          expect(csat_message.source_id).to eq('template_message_id_123')
+        end
+
+        it 'builds correct template info with default template name' do
+          expected_template_name = "customer_satisfaction_survey_#{whatsapp_inbox.id}"
+          whatsapp_inbox.update(csat_config: { 'template' => {}, 'message' => 'Rate us' })
+          allow(mock_provider_service).to receive(:get_template_status)
+            .with(expected_template_name)
+            .and_return({ success: true, template: { status: 'APPROVED' } })
+          allow(mock_provider_service).to receive(:send_template) do |_phone, _template, message|
+            message.save!
+            'msg_id'
+          end
+
+          whatsapp_service.perform
+
+          expect(mock_provider_service).to have_received(:send_template).with(
+            '1234567890',
+            hash_including(
+              name: expected_template_name,
+              lang_code: 'en'
+            ),
+            anything
+          )
+        end
+
+        it 'builds CSAT message with correct attributes' do
+          allow(mock_provider_service).to receive(:send_template) do |_phone, _template, message|
+            message.save!
+            'msg_id'
+          end
+
+          whatsapp_service.perform
+
+          csat_message = whatsapp_conversation.messages.where(content_type: :input_csat).last
+          expect(csat_message.account).to eq(account)
+          expect(csat_message.inbox).to eq(whatsapp_inbox)
+          expect(csat_message.message_type).to eq('outgoing')
+          expect(csat_message.content).to eq('Please rate your experience')
+          expect(csat_message.content_type).to eq('input_csat')
+        end
+
+        it 'uses default message when not configured' do
+          setup_approved_template('test', { 'template' => { 'name' => 'test' } })
+          mock_successful_template_send('msg_id')
+
+          whatsapp_service.perform
+
+          csat_message = whatsapp_conversation.messages.where(content_type: :input_csat).last
+          expect(csat_message.content).to eq('Please rate this conversation')
+        end
+      end
+
+      context 'when template is not available or not approved' do
+        it 'falls back to regular survey when template is pending' do
+          setup_template_with_status('pending_template', 'PENDING')
+
+          whatsapp_service.perform
+
+          expect(MessageTemplates::Template::CsatSurvey).to have_received(:new).with(conversation: whatsapp_conversation)
+          expect(csat_template).to have_received(:perform)
+        end
+
+        it 'falls back to regular survey when template is rejected' do
+          setup_template_with_status('pending_template', 'REJECTED')
+
+          whatsapp_service.perform
+
+          expect(MessageTemplates::Template::CsatSurvey).to have_received(:new).with(conversation: whatsapp_conversation)
+          expect(csat_template).to have_received(:perform)
+        end
+
+        it 'falls back to regular survey when template API call fails' do
+          allow(mock_provider_service).to receive(:get_template_status)
+            .with('pending_template')
+            .and_return({ success: false, error: 'Template not found' })
+
+          whatsapp_service.perform
+
+          expect(MessageTemplates::Template::CsatSurvey).to have_received(:new).with(conversation: whatsapp_conversation)
+          expect(csat_template).to have_received(:perform)
+        end
+
+        it 'falls back to regular survey when template status check raises error' do
+          allow(mock_provider_service).to receive(:get_template_status)
+            .and_raise(StandardError, 'API connection failed')
+
+          whatsapp_service.perform
+
+          expect(MessageTemplates::Template::CsatSurvey).to have_received(:new).with(conversation: whatsapp_conversation)
+          expect(csat_template).to have_received(:perform)
+        end
+      end
+
+      context 'when no template is configured' do
+        it 'falls back to regular survey' do
+          whatsapp_service.perform
+
+          expect(MessageTemplates::Template::CsatSurvey).to have_received(:new).with(conversation: whatsapp_conversation)
+          expect(csat_template).to have_received(:perform)
+        end
+      end
+
+      context 'when template sending fails' do
+        before do
+          setup_approved_template('working_template', {
+                                    'template' => { 'name' => 'working_template' },
+                                    'message' => 'Rate us'
+                                  })
+        end
+
+        it 'handles template sending errors gracefully' do
+          mock_template_send_failure('Template send failed')
+
+          expect { whatsapp_service.perform }.not_to raise_error
+
+          # Should still create the CSAT message even if sending fails
+          csat_message = whatsapp_conversation.messages.where(content_type: :input_csat).last
+          expect(csat_message).to be_present
+          expect(csat_message.source_id).to be_nil
+        end
+
+        it 'does not update message when send_template returns nil' do
+          mock_template_send_with_no_id
+
+          whatsapp_service.perform
+
+          csat_message = whatsapp_conversation.messages.where(content_type: :input_csat).last
+          expect(csat_message).to be_present
+          expect(csat_message.source_id).to be_nil
+        end
+      end
+
+      context 'when outside messaging window' do
+        before do
+          allow(whatsapp_conversation).to receive(:can_reply?).and_return(false)
+        end
+
+        it 'sends template survey even when outside messaging window if template is approved' do
+          setup_approved_template('approved_template', { 'template' => { 'name' => 'approved_template' } })
+          mock_successful_template_send('msg_id')
+
+          whatsapp_service.perform
+
+          expect(mock_provider_service).to have_received(:send_template)
+          expect(MessageTemplates::Template::CsatSurvey).not_to have_received(:new)
+          # No activity message should be created when template is successfully sent
+        end
+
+        it 'creates activity message when template is not available and outside window' do
+          whatsapp_service.perform
+
+          expect(Conversations::ActivityMessageJob).to have_received(:perform_later).with(
+            whatsapp_conversation,
+            hash_including(content: I18n.t('conversations.activity.csat.not_sent_due_to_messaging_window'))
+          )
+          expect(MessageTemplates::Template::CsatSurvey).not_to have_received(:new)
+        end
+      end
+    end
+  end
+
+  private
+
+  def setup_approved_template(template_name, config = nil)
+    template_config = config || {
+      'template' => {
+        'name' => template_name,
+        'language' => 'en'
+      },
+      'message' => 'Please rate your experience'
+    }
+    whatsapp_inbox.update(csat_config: template_config)
+    allow(mock_provider_service).to receive(:get_template_status)
+      .with(template_name)
+      .and_return({ success: true, template: { status: 'APPROVED' } })
+  end
+
+  def setup_template_with_status(template_name, status)
+    whatsapp_inbox.update(csat_config: {
+                            'template' => { 'name' => template_name }
+                          })
+    allow(mock_provider_service).to receive(:get_template_status)
+      .with(template_name)
+      .and_return({ success: true, template: { status: status } })
+  end
+
+  def mock_successful_template_send(message_id)
+    allow(mock_provider_service).to receive(:send_template) do |_phone, _template, message|
+      message.save!
+      message_id
+    end
+  end
+
+  def mock_template_send_failure(error_message = 'Template send failed')
+    allow(mock_provider_service).to receive(:send_template) do |_phone, _template, message|
+      message.save!
+      raise StandardError, error_message
+    end
+  end
+
+  def mock_template_send_with_no_id
+    allow(mock_provider_service).to receive(:send_template) do |_phone, _template, message|
+      message.save!
+      nil
+    end
   end
 end
diff --git a/spec/services/search_service_spec.rb b/spec/services/search_service_spec.rb
index 9ce1b0785..e1775b1a0 100644
--- a/spec/services/search_service_spec.rb
+++ b/spec/services/search_service_spec.rb
@@ -95,6 +95,7 @@ describe SearchService do
         let(:search_type) { 'Message' }
 
         it 'uses LIKE search when search_with_gin feature is disabled' do
+          allow(account).to receive(:feature_enabled?).and_call_original
           allow(account).to receive(:feature_enabled?).with('search_with_gin').and_return(false)
           search_service = described_class.new(current_user: user, current_account: account, params: params, search_type: search_type)
 
@@ -105,6 +106,7 @@ describe SearchService do
         end
 
         it 'uses GIN search when search_with_gin feature is enabled' do
+          allow(account).to receive(:feature_enabled?).and_call_original
           allow(account).to receive(:feature_enabled?).with('search_with_gin').and_return(true)
           search_service = described_class.new(current_user: user, current_account: account, params: params, search_type: search_type)
 
@@ -119,11 +121,13 @@ describe SearchService do
           message3 = create(:message, account: account, inbox: inbox, content: 'Harry is a wizard apprentice')
 
           # Test with GIN search
+          allow(account).to receive(:feature_enabled?).and_call_original
           allow(account).to receive(:feature_enabled?).with('search_with_gin').and_return(true)
           gin_search = described_class.new(current_user: user, current_account: account, params: params, search_type: search_type)
           gin_results = gin_search.perform[:messages].map(&:id)
 
           # Test with LIKE search
+          allow(account).to receive(:feature_enabled?).and_call_original
           allow(account).to receive(:feature_enabled?).with('search_with_gin').and_return(false)
           like_search = described_class.new(current_user: user, current_account: account, params: params, search_type: search_type)
           like_results = like_search.perform[:messages].map(&:id)
@@ -133,6 +137,108 @@ describe SearchService do
           expect(gin_results).to include(message.id, message2.id, message3.id)
         end
       end
+
+      # rubocop:disable RSpec/MultipleMemoizedHelpers
+      context 'when filtering messages with time, sender, and inbox', :opensearch do
+        let!(:agent) { create(:user, account: account) }
+        let!(:inbox2) { create(:inbox, account: account) }
+        let!(:old_message) do
+          create(:message, account: account, inbox: inbox, content: 'old wizard message', sender: harry, created_at: 80.days.ago)
+        end
+        let!(:recent_message) do
+          create(:message, account: account, inbox: inbox, content: 'recent wizard message', sender: harry, created_at: 1.day.ago)
+        end
+        let!(:agent_message) do
+          create(:message, account: account, inbox: inbox, content: 'wizard from agent', sender: agent, created_at: 1.day.ago)
+        end
+        let!(:inbox2_message) do
+          create(:message, account: account, inbox: inbox2, content: 'wizard in inbox2', sender: harry, created_at: 1.day.ago)
+        end
+
+        before do
+          account.enable_features!('advanced_search')
+          create(:inbox_member, inbox: inbox2, user: user)
+        end
+
+        it 'filters messages by time range with LIKE search' do
+          allow(ChatwootApp).to receive(:advanced_search_allowed?).and_return(false)
+          allow(account).to receive(:feature_enabled?).and_call_original
+          allow(account).to receive(:feature_enabled?).with('search_with_gin').and_return(false)
+          allow(account).to receive(:feature_enabled?).with('advanced_search').and_return(true)
+          params = { q: 'wizard', since: 50.days.ago.to_i, search_type: 'Message' }
+          search = described_class.new(current_user: user, current_account: account, params: params, search_type: 'Message')
+          results = search.perform[:messages]
+
+          expect(results.map(&:id)).to include(recent_message.id, agent_message.id, inbox2_message.id)
+          expect(results.map(&:id)).not_to include(old_message.id)
+        end
+
+        it 'filters messages by time range with GIN search' do
+          allow(ChatwootApp).to receive(:advanced_search_allowed?).and_return(false)
+          allow(account).to receive(:feature_enabled?).and_call_original
+          allow(account).to receive(:feature_enabled?).with('search_with_gin').and_return(true)
+          allow(account).to receive(:feature_enabled?).with('advanced_search').and_return(true)
+          params = { q: 'wizard', since: 50.days.ago.to_i, search_type: 'Message' }
+          search = described_class.new(current_user: user, current_account: account, params: params, search_type: 'Message')
+          results = search.perform[:messages]
+
+          expect(results.map(&:id)).to include(recent_message.id, agent_message.id, inbox2_message.id)
+          expect(results.map(&:id)).not_to include(old_message.id)
+        end
+
+        it 'filters messages by sender (contact)' do
+          allow(ChatwootApp).to receive(:advanced_search_allowed?).and_return(false)
+          allow(account).to receive(:feature_enabled?).and_call_original
+          allow(account).to receive(:feature_enabled?).with('search_with_gin').and_return(false)
+          allow(account).to receive(:feature_enabled?).with('advanced_search').and_return(true)
+          params = { q: 'wizard', from: "contact:#{harry.id}", search_type: 'Message' }
+          search = described_class.new(current_user: user, current_account: account, params: params, search_type: 'Message')
+          results = search.perform[:messages]
+
+          expect(results.map(&:id)).to include(recent_message.id, old_message.id, inbox2_message.id)
+          expect(results.map(&:id)).not_to include(agent_message.id)
+        end
+
+        it 'filters messages by sender (agent)' do
+          allow(ChatwootApp).to receive(:advanced_search_allowed?).and_return(false)
+          allow(account).to receive(:feature_enabled?).and_call_original
+          allow(account).to receive(:feature_enabled?).with('search_with_gin').and_return(false)
+          allow(account).to receive(:feature_enabled?).with('advanced_search').and_return(true)
+          params = { q: 'wizard', from: "agent:#{agent.id}", search_type: 'Message' }
+          search = described_class.new(current_user: user, current_account: account, params: params, search_type: 'Message')
+          results = search.perform[:messages]
+
+          expect(results.map(&:id)).to include(agent_message.id)
+          expect(results.map(&:id)).not_to include(recent_message.id, old_message.id, inbox2_message.id)
+        end
+
+        it 'filters messages by inbox' do
+          allow(ChatwootApp).to receive(:advanced_search_allowed?).and_return(false)
+          allow(account).to receive(:feature_enabled?).and_call_original
+          allow(account).to receive(:feature_enabled?).with('search_with_gin').and_return(false)
+          allow(account).to receive(:feature_enabled?).with('advanced_search').and_return(true)
+          params = { q: 'wizard', inbox_id: inbox2.id, search_type: 'Message' }
+          search = described_class.new(current_user: user, current_account: account, params: params, search_type: 'Message')
+          results = search.perform[:messages]
+
+          expect(results.map(&:id)).to include(inbox2_message.id)
+          expect(results.map(&:id)).not_to include(recent_message.id, old_message.id, agent_message.id)
+        end
+
+        it 'combines multiple filters' do
+          allow(ChatwootApp).to receive(:advanced_search_allowed?).and_return(false)
+          allow(account).to receive(:feature_enabled?).and_call_original
+          allow(account).to receive(:feature_enabled?).with('search_with_gin').and_return(false)
+          allow(account).to receive(:feature_enabled?).with('advanced_search').and_return(true)
+          params = { q: 'wizard', since: 50.days.ago.to_i, inbox_id: inbox.id, from: "contact:#{harry.id}", search_type: 'Message' }
+          search = described_class.new(current_user: user, current_account: account, params: params, search_type: 'Message')
+          results = search.perform[:messages]
+
+          expect(results.map(&:id)).to include(recent_message.id)
+          expect(results.map(&:id)).not_to include(old_message.id, agent_message.id, inbox2_message.id)
+        end
+      end
+      # rubocop:enable RSpec/MultipleMemoizedHelpers
     end
 
     context 'when conversation search' do
@@ -183,6 +289,91 @@ describe SearchService do
         expect(results.length).to eq(15) # Default per_page is 15
       end
     end
+
+    context 'when filtering contacts with time caps', :opensearch do
+      let!(:old_contact) { create(:contact, name: 'Old Potter', email: 'old@test.com', account: account, last_activity_at: 100.days.ago) }
+      let!(:recent_contact) { create(:contact, name: 'Recent Potter', email: 'recent@test.com', account: account, last_activity_at: 1.day.ago) }
+
+      before do
+        account.enable_features!('advanced_search')
+      end
+
+      it 'caps since to 90 days ago and excludes older contacts' do
+        params = { q: 'Potter', since: 100.days.ago.to_i, search_type: 'Contact' }
+        search = described_class.new(current_user: user, current_account: account, params: params, search_type: 'Contact')
+        results = search.perform[:contacts]
+
+        expect(results.map(&:id)).not_to include(old_contact.id)
+        expect(results.map(&:id)).to include(recent_contact.id)
+      end
+
+      it 'caps until to 90 days from now' do
+        params = { q: 'Potter', until: 100.days.from_now.to_i, search_type: 'Contact' }
+        search = described_class.new(current_user: user, current_account: account, params: params, search_type: 'Contact')
+        results = search.perform[:contacts]
+
+        # Both contacts should be included since their last_activity_at is before the capped time
+        expect(results.map(&:id)).to include(recent_contact.id)
+      end
+    end
+
+    context 'when filtering conversations with time caps', :opensearch do
+      let!(:old_conversation) { create(:conversation, contact: harry, inbox: inbox, account: account, last_activity_at: 100.days.ago) }
+      let!(:recent_conversation) { create(:conversation, contact: harry, inbox: inbox, account: account, last_activity_at: 1.day.ago) }
+
+      before do
+        account.enable_features!('advanced_search')
+      end
+
+      it 'caps since to 90 days ago and excludes older conversations' do
+        params = { q: 'Harry', since: 100.days.ago.to_i, search_type: 'Conversation' }
+        search = described_class.new(current_user: user, current_account: account, params: params, search_type: 'Conversation')
+        results = search.perform[:conversations]
+
+        expect(results.map(&:id)).not_to include(old_conversation.id)
+        expect(results.map(&:id)).to include(recent_conversation.id)
+      end
+
+      it 'caps until to 90 days from now' do
+        params = { q: 'Harry', until: 100.days.from_now.to_i, search_type: 'Conversation' }
+        search = described_class.new(current_user: user, current_account: account, params: params, search_type: 'Conversation')
+        results = search.perform[:conversations]
+
+        # Both conversations should be included since their last_activity_at is before the capped time
+        expect(results.map(&:id)).to include(recent_conversation.id)
+      end
+    end
+
+    context 'when filtering articles with time caps', :opensearch do
+      let!(:old_article) do
+        create(:article, title: 'Old Magic Guide', account: account, portal: portal, author: user, status: 'published', updated_at: 100.days.ago)
+      end
+      let!(:recent_article) do
+        create(:article, title: 'Recent Magic Guide', account: account, portal: portal, author: user, status: 'published', updated_at: 1.day.ago)
+      end
+
+      before do
+        account.enable_features!('advanced_search')
+      end
+
+      it 'caps since to 90 days ago and excludes older articles' do
+        params = { q: 'Magic', since: 100.days.ago.to_i, search_type: 'Article' }
+        search = described_class.new(current_user: user, current_account: account, params: params, search_type: 'Article')
+        results = search.perform[:articles]
+
+        expect(results.map(&:id)).not_to include(old_article.id)
+        expect(results.map(&:id)).to include(recent_article.id)
+      end
+
+      it 'caps until to 90 days from now' do
+        params = { q: 'Magic', until: 100.days.from_now.to_i, search_type: 'Article' }
+        search = described_class.new(current_user: user, current_account: account, params: params, search_type: 'Article')
+        results = search.perform[:articles]
+
+        # Both articles should be included since their updated_at is before the capped time
+        expect(results.map(&:id)).to include(recent_article.id)
+      end
+    end
   end
 
   describe '#message_base_query' do
@@ -260,4 +451,306 @@ describe SearchService do
       expect(search.send(:use_gin_search)).to be false
     end
   end
+
+  describe '#advanced_search with filters', if: Message.respond_to?(:search) do
+    let(:params) { { q: 'test' } }
+    let(:search_type) { 'Message' }
+
+    before do
+      allow(ChatwootApp).to receive(:advanced_search_allowed?).and_return(true)
+      allow(account).to receive(:feature_enabled?).and_call_original
+      allow(account).to receive(:feature_enabled?).with('advanced_search').and_return(true)
+      allow(Message).to receive(:search).and_return([])
+    end
+
+    context 'when advanced_search feature flag is disabled' do
+      it 'ignores filters and falls back to standard search' do
+        allow(ChatwootApp).to receive(:advanced_search_allowed?).and_return(false)
+        contact = create(:contact, account: account)
+        inbox2 = create(:inbox, account: account)
+
+        params = { q: 'test', from: "contact:#{contact.id}", inbox_id: inbox2.id, since: 3.days.ago.to_i }
+        search_service = described_class.new(current_user: user, current_account: account, params: params, search_type: search_type)
+
+        expect(search_service).not_to receive(:advanced_search)
+        search_service.perform
+      end
+    end
+
+    context 'when filtering by from parameter' do
+      let(:contact) { create(:contact, account: account) }
+      let(:agent) { create(:user, account: account) }
+
+      it 'filters messages from specific contact' do
+        params = { q: 'test', from: "contact:#{contact.id}" }
+        search_service = described_class.new(current_user: user, current_account: account, params: params, search_type: search_type)
+
+        expect(Message).to receive(:search).with(
+          'test',
+          hash_including(
+            where: hash_including(
+              sender_type: 'Contact',
+              sender_id: contact.id
+            )
+          )
+        ).and_return([])
+
+        search_service.perform
+      end
+
+      it 'filters messages from specific agent' do
+        params = { q: 'test', from: "agent:#{agent.id}" }
+        search_service = described_class.new(current_user: user, current_account: account, params: params, search_type: search_type)
+
+        expect(Message).to receive(:search).with(
+          'test',
+          hash_including(
+            where: hash_including(
+              sender_type: 'User',
+              sender_id: agent.id
+            )
+          )
+        ).and_return([])
+
+        search_service.perform
+      end
+
+      it 'ignores invalid from parameter format' do
+        params = { q: 'test', from: 'invalid:format' }
+        search_service = described_class.new(current_user: user, current_account: account, params: params, search_type: search_type)
+
+        expect(Message).to receive(:search).with(
+          'test',
+          hash_including(
+            where: hash_not_including(:sender_type, :sender_id)
+          )
+        ).and_return([])
+
+        search_service.perform
+      end
+    end
+
+    context 'when filtering by time range' do
+      it 'defaults to 90 days ago when no since parameter is provided' do
+        params = { q: 'test' }
+        search_service = described_class.new(current_user: user, current_account: account, params: params, search_type: search_type)
+
+        expect(Message).to receive(:search).with(
+          'test',
+          hash_including(
+            where: hash_including(
+              created_at: hash_including(gte: be_within(1.second).of(Limits::MESSAGE_SEARCH_TIME_RANGE_LIMIT_DAYS.days.ago))
+            )
+          )
+        ).and_return([])
+
+        search_service.perform
+      end
+
+      it 'silently caps since timestamp to 90 day limit when exceeded' do
+        since_timestamp = (Limits::MESSAGE_SEARCH_TIME_RANGE_LIMIT_DAYS * 2).days.ago.to_i
+        params = { q: 'test', since: since_timestamp }
+        search_service = described_class.new(current_user: user, current_account: account, params: params, search_type: search_type)
+
+        expect(Message).to receive(:search).with(
+          'test',
+          hash_including(
+            where: hash_including(
+              created_at: hash_including(gte: be_within(1.second).of(Limits::MESSAGE_SEARCH_TIME_RANGE_LIMIT_DAYS.days.ago))
+            )
+          )
+        ).and_return([])
+
+        search_service.perform
+      end
+
+      it 'filters messages since timestamp when within 90 day limit' do
+        since_timestamp = 3.days.ago.to_i
+        params = { q: 'test', since: since_timestamp }
+        search_service = described_class.new(current_user: user, current_account: account, params: params, search_type: search_type)
+
+        expect(Message).to receive(:search).with(
+          'test',
+          hash_including(
+            where: hash_including(
+              created_at: hash_including(gte: Time.zone.at(since_timestamp))
+            )
+          )
+        ).and_return([])
+
+        search_service.perform
+      end
+
+      it 'filters messages until timestamp' do
+        until_timestamp = 5.days.ago.to_i
+        params = { q: 'test', until: until_timestamp }
+        search_service = described_class.new(current_user: user, current_account: account, params: params, search_type: search_type)
+
+        expect(Message).to receive(:search).with(
+          'test',
+          hash_including(
+            where: hash_including(
+              created_at: hash_including(lte: Time.zone.at(until_timestamp))
+            )
+          )
+        ).and_return([])
+
+        search_service.perform
+      end
+
+      it 'filters messages within time range' do
+        since_timestamp = 5.days.ago.to_i
+        until_timestamp = 12.hours.ago.to_i
+        params = { q: 'test', since: since_timestamp, until: until_timestamp }
+        search_service = described_class.new(current_user: user, current_account: account, params: params, search_type: search_type)
+
+        expect(Message).to receive(:search).with(
+          'test',
+          hash_including(
+            where: hash_including(
+              created_at: hash_including(
+                gte: Time.zone.at(since_timestamp),
+                lte: Time.zone.at(until_timestamp)
+              )
+            )
+          )
+        ).and_return([])
+
+        search_service.perform
+      end
+
+      it 'silently caps until timestamp to 90 days from now when exceeded' do
+        until_timestamp = 100.days.from_now.to_i
+        params = { q: 'test', until: until_timestamp }
+        search_service = described_class.new(current_user: user, current_account: account, params: params, search_type: search_type)
+
+        expect(Message).to receive(:search).with(
+          'test',
+          hash_including(
+            where: hash_including(
+              created_at: hash_including(lte: be_within(1.second).of(90.days.from_now))
+            )
+          )
+        ).and_return([])
+
+        search_service.perform
+      end
+    end
+
+    context 'when filtering by inbox_id' do
+      let!(:inbox2) { create(:inbox, account: account) }
+
+      before do
+        create(:inbox_member, user: user, inbox: inbox2)
+      end
+
+      it 'filters messages from specific inbox' do
+        params = { q: 'test', inbox_id: inbox2.id }
+        search_service = described_class.new(current_user: user, current_account: account, params: params, search_type: search_type)
+
+        expect(Message).to receive(:search).with(
+          'test',
+          hash_including(
+            where: hash_including(inbox_id: inbox2.id)
+          )
+        ).and_return([])
+
+        search_service.perform
+      end
+
+      it 'ignores inbox filter when user lacks access' do
+        restricted_inbox = create(:inbox, account: account)
+        params = { q: 'test', inbox_id: restricted_inbox.id }
+        search_service = described_class.new(current_user: user, current_account: account, params: params, search_type: search_type)
+
+        expect(Message).to receive(:search).with(
+          'test',
+          hash_including(
+            where: hash_not_including(inbox_id: restricted_inbox.id)
+          )
+        ).and_return([])
+
+        search_service.perform
+      end
+    end
+
+    context 'when combining multiple filters' do
+      it 'applies all filters together' do
+        test_contact = create(:contact, account: account)
+        test_inbox = create(:inbox, account: account)
+        create(:inbox_member, user: user, inbox: test_inbox)
+
+        since_timestamp = 3.days.ago.to_i
+        params = { q: 'test', from: "contact:#{test_contact.id}", inbox_id: test_inbox.id, since: since_timestamp }
+        search_service = described_class.new(current_user: user, current_account: account, params: params, search_type: search_type)
+
+        expect(Message).to receive(:search).with(
+          'test',
+          hash_including(
+            where: hash_including(
+              sender_type: 'Contact',
+              sender_id: test_contact.id,
+              inbox_id: test_inbox.id,
+              created_at: hash_including(gte: Time.zone.at(since_timestamp))
+            )
+          )
+        ).and_return([])
+
+        search_service.perform
+      end
+    end
+  end
+
+  describe '#advanced_search_with_fallback' do
+    let(:params) { { q: 'test' } }
+    let(:search_type) { 'Message' }
+
+    context 'when Elasticsearch is unavailable' do
+      it 'falls back to LIKE search when Elasticsearch connection fails' do
+        allow(account).to receive(:feature_enabled?).and_call_original
+        allow(account).to receive(:feature_enabled?).with('advanced_search').and_return(true)
+        allow(account).to receive(:feature_enabled?).with('search_with_gin').and_return(false)
+
+        params = { q: 'test' }
+        search_service = described_class.new(current_user: user, current_account: account, params: params, search_type: search_type)
+
+        allow(search_service).to receive(:advanced_search).and_raise(Faraday::ConnectionFailed.new('Connection refused'))
+
+        expect(search_service).to receive(:filter_messages_with_like).and_call_original
+        expect { search_service.perform }.not_to raise_error
+      end
+
+      it 'falls back to GIN search when Elasticsearch is unavailable and GIN is enabled' do
+        allow(account).to receive(:feature_enabled?).and_call_original
+        allow(account).to receive(:feature_enabled?).with('advanced_search').and_return(true)
+        allow(account).to receive(:feature_enabled?).with('search_with_gin').and_return(true)
+
+        params = { q: 'test' }
+        search_service = described_class.new(current_user: user, current_account: account, params: params, search_type: search_type)
+
+        allow(search_service).to receive(:advanced_search).and_raise(Searchkick::Error.new('Elasticsearch unavailable'))
+
+        expect(search_service).to receive(:filter_messages_with_gin).and_call_original
+        expect { search_service.perform }.not_to raise_error
+      end
+
+      it 'applies filters correctly in SQL fallback when Elasticsearch fails' do
+        allow(account).to receive(:feature_enabled?).and_call_original
+        allow(account).to receive(:feature_enabled?).with('advanced_search').and_return(true)
+        allow(account).to receive(:feature_enabled?).with('search_with_gin').and_return(false)
+
+        test_contact = create(:contact, account: account)
+        create(:message, account: account, inbox: inbox, content: 'test message', sender: test_contact, created_at: 1.day.ago)
+
+        params = { q: 'test', from: "contact:#{test_contact.id}", since: 2.days.ago.to_i }
+        search_service = described_class.new(current_user: user, current_account: account, params: params, search_type: search_type)
+
+        allow(search_service).to receive(:advanced_search).and_raise(Faraday::ConnectionFailed.new('Connection refused'))
+
+        results = search_service.perform[:messages]
+        expect(results).not_to be_empty
+        expect(results.first.sender_id).to eq(test_contact.id)
+      end
+    end
+  end
 end
diff --git a/spec/support/opensearch_check.rb b/spec/support/opensearch_check.rb
new file mode 100644
index 000000000..96c82f8c9
--- /dev/null
+++ b/spec/support/opensearch_check.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'net/http'
+require 'json'
+
+RSpec.configure do |config|
+  # Run OpenSearch connectivity check only for specs tagged with :opensearch
+  config.before(:context, :opensearch) do
+    opensearch_url = ENV.fetch('OPENSEARCH_URL', nil)
+
+    next if opensearch_url.blank?
+
+    puts "\n==== OpenSearch Connectivity Check ===="
+    puts "OPENSEARCH_URL: #{opensearch_url}"
+
+    begin
+      uri = URI.parse("#{opensearch_url}/_cluster/health")
+      response = Net::HTTP.get_response(uri)
+
+      raise "OpenSearch is not reachable at #{opensearch_url}. HTTP Status: #{response.code}" unless response.is_a?(Net::HTTPSuccess)
+
+      health = JSON.parse(response.body)
+      status = health['status']
+
+      puts "Cluster status: #{status}"
+      puts "Cluster name: #{health['cluster_name']}"
+      puts "Number of nodes: #{health['number_of_nodes']}"
+
+      raise "OpenSearch cluster is not healthy. Status: #{status}" unless %w[green yellow].include?(status)
+
+      puts '✓ OpenSearch is healthy and ready for tests'
+      puts "========================================\n\n"
+    rescue StandardError => e
+      puts "\n❌ ERROR: Failed to connect to OpenSearch"
+      puts "Message: #{e.message}"
+      puts "========================================\n\n"
+      raise "OpenSearch connectivity check failed: #{e.message}"
+    end
+  end
+end
diff --git a/swagger/paths/application/contacts/merge.yml b/swagger/paths/application/contacts/merge.yml
new file mode 100644
index 000000000..2c5057837
--- /dev/null
+++ b/swagger/paths/application/contacts/merge.yml
@@ -0,0 +1,55 @@
+tags:
+  - Contacts
+operationId: contactMerge
+summary: Merge Contacts
+security:
+  - userApiKey: []
+description: |
+  Merge two contacts into a single contact. The base contact remains and receives all
+  data from the mergee contact. After the merge, the mergee contact is permanently deleted.
+
+  This action is irreversible. All conversations, labels, and custom attributes from the
+  mergee contact will be moved to the base contact.
+requestBody:
+  required: true
+  content:
+    application/json:
+      schema:
+        type: object
+        required:
+          - base_contact_id
+          - mergee_contact_id
+        properties:
+          base_contact_id:
+            type: integer
+            description: ID of the contact that will remain after the merge and receive all data
+            example: 1
+          mergee_contact_id:
+            type: integer
+            description: ID of the contact that will be merged into the base contact and deleted
+            example: 2
+responses:
+  '200':
+    description: Contacts merged successfully
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/contact_base'
+  '400':
+    description: Bad request - invalid contact IDs or contacts cannot be merged
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
+  '401':
+    description: Unauthorized
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
+  '404':
+    description: One or both contacts not found
+    content:
+      application/json:
+        schema:
+          $ref: '#/components/schemas/bad_request_error'
diff --git a/swagger/paths/index.yml b/swagger/paths/index.yml
index d5126a8d1..9d6ee2430 100644
--- a/swagger/paths/index.yml
+++ b/swagger/paths/index.yml
@@ -275,6 +275,12 @@
 /api/v1/accounts/{account_id}/contacts/{id}/contactable_inboxes:
   $ref: ./application/contactable_inboxes/get.yml
 
+# Contact Merge
+/api/v1/accounts/{account_id}/actions/contact_merge:
+  parameters:
+    - $ref: '#/components/parameters/account_id'
+  post:
+    $ref: ./application/contacts/merge.yml
 
 # Automation Rule
 /api/v1/accounts/{account_id}/automation_rules:
diff --git a/swagger/swagger.json b/swagger/swagger.json
index 8d539c259..c210ba716 100644
--- a/swagger/swagger.json
+++ b/swagger/swagger.json
@@ -3424,6 +3424,94 @@
         }
       }
     },
+    "/api/v1/accounts/{account_id}/actions/contact_merge": {
+      "parameters": [
+        {
+          "$ref": "#/components/parameters/account_id"
+        }
+      ],
+      "post": {
+        "tags": [
+          "Contacts"
+        ],
+        "operationId": "contactMerge",
+        "summary": "Merge Contacts",
+        "security": [
+          {
+            "userApiKey": []
+          }
+        ],
+        "description": "Merge two contacts into a single contact. The base contact remains and receives all\ndata from the mergee contact. After the merge, the mergee contact is permanently deleted.\n\nThis action is irreversible. All conversations, labels, and custom attributes from the\nmergee contact will be moved to the base contact.\n",
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "required": [
+                  "base_contact_id",
+                  "mergee_contact_id"
+                ],
+                "properties": {
+                  "base_contact_id": {
+                    "type": "integer",
+                    "description": "ID of the contact that will remain after the merge and receive all data",
+                    "example": 1
+                  },
+                  "mergee_contact_id": {
+                    "type": "integer",
+                    "description": "ID of the contact that will be merged into the base contact and deleted",
+                    "example": 2
+                  }
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Contacts merged successfully",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/contact_base"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad request - invalid contact IDs or contacts cannot be merged",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "One or both contacts not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/api/v1/accounts/{account_id}/automation_rules": {
       "parameters": [
         {
diff --git a/swagger/tag_groups/application_swagger.json b/swagger/tag_groups/application_swagger.json
index 2fd0cbdee..59849ea5a 100644
--- a/swagger/tag_groups/application_swagger.json
+++ b/swagger/tag_groups/application_swagger.json
@@ -1967,6 +1967,94 @@
         }
       }
     },
+    "/api/v1/accounts/{account_id}/actions/contact_merge": {
+      "parameters": [
+        {
+          "$ref": "#/components/parameters/account_id"
+        }
+      ],
+      "post": {
+        "tags": [
+          "Contacts"
+        ],
+        "operationId": "contactMerge",
+        "summary": "Merge Contacts",
+        "security": [
+          {
+            "userApiKey": []
+          }
+        ],
+        "description": "Merge two contacts into a single contact. The base contact remains and receives all\ndata from the mergee contact. After the merge, the mergee contact is permanently deleted.\n\nThis action is irreversible. All conversations, labels, and custom attributes from the\nmergee contact will be moved to the base contact.\n",
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "required": [
+                  "base_contact_id",
+                  "mergee_contact_id"
+                ],
+                "properties": {
+                  "base_contact_id": {
+                    "type": "integer",
+                    "description": "ID of the contact that will remain after the merge and receive all data",
+                    "example": 1
+                  },
+                  "mergee_contact_id": {
+                    "type": "integer",
+                    "description": "ID of the contact that will be merged into the base contact and deleted",
+                    "example": 2
+                  }
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Contacts merged successfully",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/contact_base"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad request - invalid contact IDs or contacts cannot be merged",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "One or both contacts not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/bad_request_error"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/api/v1/accounts/{account_id}/automation_rules": {
       "parameters": [
         {