From 3e5ca9bca95df2c7ea5d1dc86e04f8a79724281f Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Wed, 9 Jul 2025 09:23:20 +0530
Subject: [PATCH 01/20] fix: Widget message input resize issue (#11896)

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

diff --git a/app/javascript/shared/components/ResizableTextArea.vue b/app/javascript/shared/components/ResizableTextArea.vue
index 088753a23..4dda62cf9 100644
--- a/app/javascript/shared/components/ResizableTextArea.vue
+++ b/app/javascript/shared/components/ResizableTextArea.vue
@@ -69,7 +69,7 @@ export default {
     },
   },
   watch: {
-    value() {
+    modelValue() {
       this.resizeTextarea();
       // 🚨 watch triggers every time the value is changed, we cannot set this to focus then
       // when this runs, it sets the cursor to the end of the body, ignoring the signature

From 5140deb6f682026594f1be847a643466829bbb96 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Wed, 9 Jul 2025 22:21:25 +0530
Subject: [PATCH 02/20] feat: Captain settings header component (#11912)

---
 .../settings/SettingsHeader.story.vue         | 28 +++++++++++++++++++
 .../settings/SettingsHeader.vue               | 19 +++++++++++++
 2 files changed, 47 insertions(+)
 create mode 100644 app/javascript/dashboard/components-next/captain/pageComponents/settings/SettingsHeader.story.vue
 create mode 100644 app/javascript/dashboard/components-next/captain/pageComponents/settings/SettingsHeader.vue

diff --git a/app/javascript/dashboard/components-next/captain/pageComponents/settings/SettingsHeader.story.vue b/app/javascript/dashboard/components-next/captain/pageComponents/settings/SettingsHeader.story.vue
new file mode 100644
index 000000000..654e5ab16
--- /dev/null
+++ b/app/javascript/dashboard/components-next/captain/pageComponents/settings/SettingsHeader.story.vue
@@ -0,0 +1,28 @@
+<script setup>
+import SettingsHeader from './SettingsHeader.vue';
+</script>
+
+<template>
+  <Story
+    title="Captain/PageComponents/SettingsHeader"
+    :layout="{ type: 'grid', width: '800px' }"
+  >
+    <Variant title="Default">
+      <div class="px-6 py-4 bg-n-background">
+        <SettingsHeader
+          heading="General Settings"
+          description="Configure general preferences for your workspace."
+        />
+      </div>
+    </Variant>
+
+    <Variant title="Long Description">
+      <div class="px-6 py-4 bg-n-background">
+        <SettingsHeader
+          heading="Integrations"
+          description="Manage and configure third-party integrations such as Slack, Zapier, and Webhooks to enhance your workflow."
+        />
+      </div>
+    </Variant>
+  </Story>
+</template>
diff --git a/app/javascript/dashboard/components-next/captain/pageComponents/settings/SettingsHeader.vue b/app/javascript/dashboard/components-next/captain/pageComponents/settings/SettingsHeader.vue
new file mode 100644
index 000000000..dc6b7dda9
--- /dev/null
+++ b/app/javascript/dashboard/components-next/captain/pageComponents/settings/SettingsHeader.vue
@@ -0,0 +1,19 @@
+<script setup>
+defineProps({
+  heading: {
+    type: String,
+    required: true,
+  },
+  description: {
+    type: String,
+    default: '',
+  },
+});
+</script>
+
+<template>
+  <header class="flex flex-col items-start gap-2">
+    <h2 class="text-n-slate-12 text-base font-medium">{{ heading }}</h2>
+    <p class="text-n-slate-11 text-sm">{{ description }}</p>
+  </header>
+</template>

From 17500cc62d3fdf23c5ff1c8c238e866289de7dab Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Thu, 10 Jul 2025 11:36:37 +0530
Subject: [PATCH 03/20] chore: Auto assign PR to author when PR opened (#11890)

- gh action to auto-assign PR to author when PR opened
---
 .github/workflows/auto-assign-pr.yml | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 .github/workflows/auto-assign-pr.yml

diff --git a/.github/workflows/auto-assign-pr.yml b/.github/workflows/auto-assign-pr.yml
new file mode 100644
index 000000000..98df89707
--- /dev/null
+++ b/.github/workflows/auto-assign-pr.yml
@@ -0,0 +1,28 @@
+name: Auto-assign PR to Author
+
+on:
+  pull_request:
+    types: [opened]
+
+jobs:
+  auto-assign:
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+    steps:
+      - name: Auto-assign PR to author
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const { owner, repo } = context.repo;
+            const pull_number = context.payload.pull_request.number;
+            const author = context.payload.pull_request.user.login;
+            
+            await github.rest.issues.addAssignees({
+              owner,
+              repo,
+              issue_number: pull_number,
+              assignees: [author]
+            });
+            
+            console.log(`Assigned PR #${pull_number} to ${author}`);
\ No newline at end of file

From 802f0694ed9971d5ab441bd06b82638e403cc1bb Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Fri, 11 Jul 2025 11:46:15 +0530
Subject: [PATCH 04/20] chore: Alphabetically sort inbox list on settings page
 (#11921)

# Pull Request Template

## Description

This PR updates the inbox list on the settings page to be sorted
alphabetically.

## Type of change

- [x] Bug fix (non-breaking change which fixes an issue)

## How Has This Been Tested?

### Screenshot
<img width="222" height="463" alt="image"
src="https://github.com/user-attachments/assets/0caabeb1-b2bd-4072-a44f-e0ac5a52404d"
/>



## Checklist:

- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my code
- [ ] I have commented on my code, particularly in hard-to-understand
areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [x] New and existing unit tests pass locally with my changes
- [ ] Any dependent changes have been merged and published in downstream
modules
---
 .../routes/dashboard/settings/inbox/Index.vue   | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/Index.vue
index aae2263a7..c4cf5f5ad 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/Index.vue
@@ -1,12 +1,16 @@
 <script setup>
+import { computed, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
 import { useAlert } from 'dashboard/composables';
 import Thumbnail from 'dashboard/components/widgets/Thumbnail.vue';
 import { useAdmin } from 'dashboard/composables/useAdmin';
 import SettingsLayout from '../SettingsLayout.vue';
 import BaseSettingsHeader from '../components/BaseSettingsHeader.vue';
-import { computed, ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { useStoreGetters, useStore } from 'dashboard/composables/store';
+import {
+  useMapGetter,
+  useStoreGetters,
+  useStore,
+} from 'dashboard/composables/store';
 import ChannelName from './components/ChannelName.vue';
 import ChannelIcon from 'next/icon/ChannelIcon.vue';
 import Button from 'dashboard/components-next/button/Button.vue';
@@ -19,7 +23,12 @@ const { isAdmin } = useAdmin();
 const showDeletePopup = ref(false);
 const selectedInbox = ref({});
 
-const inboxesList = computed(() => getters['inboxes/getInboxes'].value);
+const inboxes = useMapGetter('inboxes/getInboxes');
+
+const inboxesList = computed(() => {
+  return inboxes.value?.slice().sort((a, b) => a.name.localeCompare(b.name));
+});
+
 const uiFlags = computed(() => getters['inboxes/getUIFlags'].value);
 
 const deleteConfirmText = computed(

From 5b9f997fa0c47d73115fea66ba21c682b7c7bded Mon Sep 17 00:00:00 2001
From: Tanmay Deep Sharma <32020192+tds-1@users.noreply.github.com>
Date: Fri, 11 Jul 2025 23:28:46 +0700
Subject: [PATCH 05/20] feat: Add the support for images in Captain (#11850)

---
 .../accounts/captain/assistants_controller.rb |   4 +-
 .../conversation/response_builder_job.rb      |  44 +--
 .../captain/llm/assistant_chat_service.rb     |  13 +-
 .../open_ai_message_builder_service.rb        |  60 ++++
 .../hook_execution_service.rb                 |  29 +-
 .../captain/assistants_controller_spec.rb     |   8 +-
 .../conversation/response_builder_job_spec.rb | 137 ++++++++
 .../open_ai_message_builder_service_spec.rb   | 310 ++++++++++++++++++
 8 files changed, 560 insertions(+), 45 deletions(-)
 create mode 100644 enterprise/app/services/captain/open_ai_message_builder_service.rb
 create mode 100644 spec/enterprise/services/captain/open_ai_message_builder_service_spec.rb

diff --git a/enterprise/app/controllers/api/v1/accounts/captain/assistants_controller.rb b/enterprise/app/controllers/api/v1/accounts/captain/assistants_controller.rb
index e5a055836..ec8e8e653 100644
--- a/enterprise/app/controllers/api/v1/accounts/captain/assistants_controller.rb
+++ b/enterprise/app/controllers/api/v1/accounts/captain/assistants_controller.rb
@@ -25,8 +25,8 @@ class Api::V1::Accounts::Captain::AssistantsController < Api::V1::Accounts::Base
 
   def playground
     response = Captain::Llm::AssistantChatService.new(assistant: @assistant).generate_response(
-      params[:message_content],
-      message_history
+      additional_message: params[:message_content],
+      message_history: message_history
     )
 
     render json: response
diff --git a/enterprise/app/jobs/captain/conversation/response_builder_job.rb b/enterprise/app/jobs/captain/conversation/response_builder_job.rb
index f341a6e98..b207bd2a4 100644
--- a/enterprise/app/jobs/captain/conversation/response_builder_job.rb
+++ b/enterprise/app/jobs/captain/conversation/response_builder_job.rb
@@ -1,6 +1,7 @@
 class Captain::Conversation::ResponseBuilderJob < ApplicationJob
   MAX_MESSAGE_LENGTH = 10_000
-  retry_on ActiveStorage::FileNotFoundError, attempts: 3
+  retry_on ActiveStorage::FileNotFoundError, attempts: 3, wait: 2.seconds
+  retry_on Faraday::BadRequestError, attempts: 3, wait: 2.seconds
 
   def perform(conversation, assistant)
     @conversation = conversation
@@ -13,7 +14,7 @@ class Captain::Conversation::ResponseBuilderJob < ApplicationJob
       generate_and_process_response
     end
   rescue StandardError => e
-    raise e if e.is_a?(ActiveStorage::FileNotFoundError)
+    raise e if e.is_a?(ActiveStorage::FileNotFoundError) || e.is_a?(Faraday::BadRequestError)
 
     handle_error(e)
   ensure
@@ -26,8 +27,7 @@ class Captain::Conversation::ResponseBuilderJob < ApplicationJob
 
   def generate_and_process_response
     @response = Captain::Llm::AssistantChatService.new(assistant: @assistant).generate_response(
-      @conversation.messages.incoming.last.content,
-      collect_previous_messages
+      message_history: collect_previous_messages
     )
 
     return process_action('handoff') if handoff_requested?
@@ -43,39 +43,19 @@ class Captain::Conversation::ResponseBuilderJob < ApplicationJob
       .where(message_type: [:incoming, :outgoing])
       .where(private: false)
       .map do |message|
-        {
-          content: message_content(message),
-          role: determine_role(message)
-        }
-      end
-  end
-
-  def message_content(message)
-    return message.content if message.content.present?
-    return 'User has shared a message without content' unless message.attachments.any?
-
-    audio_transcriptions = extract_audio_transcriptions(message.attachments)
-    return audio_transcriptions if audio_transcriptions.present?
-
-    'User has shared an attachment'
-  end
-
-  def extract_audio_transcriptions(attachments)
-    audio_attachments = attachments.where(file_type: :audio)
-    return '' if audio_attachments.blank?
-
-    transcriptions = ''
-    audio_attachments.each do |attachment|
-      result = Messages::AudioTranscriptionService.new(attachment).perform
-      transcriptions += result[:transcriptions] if result[:success]
+      {
+        content: prepare_multimodal_message_content(message),
+        role: determine_role(message)
+      }
     end
-    transcriptions
   end
 
   def determine_role(message)
-    return 'system' if message.content.blank?
+    message.message_type == 'incoming' ? 'user' : 'assistant'
+  end
 
-    message.message_type == 'incoming' ? 'user' : 'system'
+  def prepare_multimodal_message_content(message)
+    Captain::OpenAiMessageBuilderService.new(message: message).generate_content
   end
 
   def handoff_requested?
diff --git a/enterprise/app/services/captain/llm/assistant_chat_service.rb b/enterprise/app/services/captain/llm/assistant_chat_service.rb
index 569931d44..ca8fafaa0 100644
--- a/enterprise/app/services/captain/llm/assistant_chat_service.rb
+++ b/enterprise/app/services/captain/llm/assistant_chat_service.rb
@@ -12,9 +12,16 @@ class Captain::Llm::AssistantChatService < Llm::BaseOpenAiService
     register_tools
   end
 
-  def generate_response(input, previous_messages = [], role = 'user')
-    @messages += previous_messages
-    @messages << { role: role, content: input } if input.present?
+  # additional_message: A single message (String) from the user that should be appended to the chat.
+  #                    It can be an empty String or nil when you only want to supply historical messages.
+  # message_history:   An Array of already formatted messages that provide the previous context.
+  # role:              The role for the additional_message (defaults to `user`).
+  #
+  # NOTE: Parameters are provided as keyword arguments to improve clarity and avoid relying on
+  # positional ordering.
+  def generate_response(additional_message: nil, message_history: [], role: 'user')
+    @messages += message_history
+    @messages << { role: role, content: additional_message } if additional_message.present?
     request_chat_completion
   end
 
diff --git a/enterprise/app/services/captain/open_ai_message_builder_service.rb b/enterprise/app/services/captain/open_ai_message_builder_service.rb
new file mode 100644
index 000000000..43d2851c9
--- /dev/null
+++ b/enterprise/app/services/captain/open_ai_message_builder_service.rb
@@ -0,0 +1,60 @@
+class Captain::OpenAiMessageBuilderService
+  pattr_initialize [:message!]
+
+  def generate_content
+    parts = []
+    parts << text_part(@message.content) if @message.content.present?
+    parts.concat(attachment_parts(@message.attachments)) if @message.attachments.any?
+
+    return 'Message without content' if parts.blank?
+    return parts.first[:text] if parts.one? && parts.first[:type] == 'text'
+
+    parts
+  end
+
+  private
+
+  def text_part(text)
+    { type: 'text', text: text }
+  end
+
+  def image_part(image_url)
+    { type: 'image_url', image_url: { url: image_url } }
+  end
+
+  def attachment_parts(attachments)
+    image_attachments = attachments.where(file_type: :image)
+    image_content = image_parts(image_attachments)
+
+    transcription = extract_audio_transcriptions(attachments)
+    transcription_part = text_part(transcription) if transcription.present?
+
+    attachment_part = text_part('User has shared an attachment') if attachments.where.not(file_type: %i[image audio]).exists?
+
+    [image_content, transcription_part, attachment_part].flatten.compact
+  end
+
+  def image_parts(image_attachments)
+    image_attachments.each_with_object([]) do |attachment, parts|
+      url = get_attachment_url(attachment)
+      parts << image_part(url) if url.present?
+    end
+  end
+
+  def get_attachment_url(attachment)
+    return attachment.download_url if attachment.download_url.present?
+    return attachment.external_url if attachment.external_url.present?
+
+    attachment.file.attached? ? attachment.file_url : nil
+  end
+
+  def extract_audio_transcriptions(attachments)
+    audio_attachments = attachments.where(file_type: :audio)
+    return '' if audio_attachments.blank?
+
+    audio_attachments.map do |attachment|
+      result = Messages::AudioTranscriptionService.new(attachment).perform
+      result[:success] ? result[:transcriptions] : ''
+    end.join
+  end
+end
\ No newline at end of file
diff --git a/enterprise/app/services/enterprise/message_templates/hook_execution_service.rb b/enterprise/app/services/enterprise/message_templates/hook_execution_service.rb
index 92ccba553..ac1c3a95d 100644
--- a/enterprise/app/services/enterprise/message_templates/hook_execution_service.rb
+++ b/enterprise/app/services/enterprise/message_templates/hook_execution_service.rb
@@ -1,13 +1,34 @@
 module Enterprise::MessageTemplates::HookExecutionService
+  MAX_ATTACHMENT_WAIT_SECONDS = 4
+
   def trigger_templates
     super
     return unless should_process_captain_response?
     return perform_handoff unless inbox.captain_active?
 
-    Captain::Conversation::ResponseBuilderJob.perform_later(
-      conversation,
-      conversation.inbox.captain_assistant
-    )
+    schedule_captain_response
+  end
+
+  private
+
+  def schedule_captain_response
+    job_args = [conversation, conversation.inbox.captain_assistant]
+
+    if message.attachments.blank?
+      Captain::Conversation::ResponseBuilderJob.perform_later(*job_args)
+    else
+      wait_time = calculate_attachment_wait_time
+      Captain::Conversation::ResponseBuilderJob.set(wait: wait_time).perform_later(*job_args)
+    end
+  end
+
+  def calculate_attachment_wait_time
+    attachment_count = message.attachments.size
+    base_wait = 1.second
+
+    # Wait longer for more attachments or larger files
+    additional_wait = [attachment_count * 1, MAX_ATTACHMENT_WAIT_SECONDS].min.seconds
+    base_wait + additional_wait
   end
 
   def should_process_captain_response?
diff --git a/spec/enterprise/controllers/api/v1/accounts/captain/assistants_controller_spec.rb b/spec/enterprise/controllers/api/v1/accounts/captain/assistants_controller_spec.rb
index 1f6d83d80..80be6f30f 100644
--- a/spec/enterprise/controllers/api/v1/accounts/captain/assistants_controller_spec.rb
+++ b/spec/enterprise/controllers/api/v1/accounts/captain/assistants_controller_spec.rb
@@ -211,8 +211,8 @@ RSpec.describe 'Api::V1::Accounts::Captain::Assistants', type: :request do
 
         expect(response).to have_http_status(:success)
         expect(chat_service).to have_received(:generate_response).with(
-          valid_params[:message_content],
-          valid_params[:message_history]
+          additional_message: valid_params[:message_content],
+          message_history: valid_params[:message_history]
         )
         expect(json_response[:content]).to eq('Assistant response')
       end
@@ -232,8 +232,8 @@ RSpec.describe 'Api::V1::Accounts::Captain::Assistants', type: :request do
 
         expect(response).to have_http_status(:success)
         expect(chat_service).to have_received(:generate_response).with(
-          params_without_history[:message_content],
-          []
+          additional_message: params_without_history[:message_content],
+          message_history: []
         )
       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 1e4a6e824..c21205d52 100644
--- a/spec/enterprise/jobs/captain/conversation/response_builder_job_spec.rb
+++ b/spec/enterprise/jobs/captain/conversation/response_builder_job_spec.rb
@@ -30,5 +30,142 @@ RSpec.describe Captain::Conversation::ResponseBuilderJob, type: :job do
       account.reload
       expect(account.usage_limits[:captain][:responses][:consumed]).to eq(1)
     end
+
+    context 'when message contains an image' do
+      let(:message_with_image) { create(:message, conversation: conversation, message_type: :incoming, content: 'Can you help with this error?') }
+      let(:image_attachment) { message_with_image.attachments.create!(account: account, file_type: :image, external_url: 'https://example.com/error.jpg') }
+
+      before do
+        image_attachment
+      end
+
+      it 'includes image URL directly in the message content for OpenAI vision analysis' do
+        # Expect the generate_response to receive multimodal content with image URL
+        expect(mock_llm_chat_service).to receive(:generate_response) do |**kwargs|
+          history = kwargs[:message_history]
+          last_entry = history.last
+          expect(last_entry[:content]).to be_an(Array)
+          expect(last_entry[:content].any? { |part| part[:type] == 'text' && part[:text] == 'Can you help with this error?' }).to be true
+          expect(last_entry[:content].any? do |part|
+            part[:type] == 'image_url' && part[:image_url][:url] == 'https://example.com/error.jpg'
+          end).to be true
+          { 'response' => 'I can see the error in your image. It appears to be a database connection issue.' }
+        end
+
+        described_class.perform_now(conversation, assistant)
+      end
+    end
+  end
+
+  describe 'retry mechanisms for image processing' do
+    let(:conversation) { create(:conversation, inbox: inbox, account: account) }
+    let(:mock_llm_chat_service) { instance_double(Captain::Llm::AssistantChatService) }
+    let(:mock_message_builder) { instance_double(Captain::OpenAiMessageBuilderService) }
+
+    before do
+      create(:message, conversation: conversation, content: 'Hello with image', message_type: :incoming)
+      allow(Captain::Llm::AssistantChatService).to receive(:new).and_return(mock_llm_chat_service)
+      allow(Captain::OpenAiMessageBuilderService).to receive(:new).with(message: anything).and_return(mock_message_builder)
+      allow(mock_message_builder).to receive(:generate_content).and_return('Hello with image')
+      allow(mock_llm_chat_service).to receive(:generate_response).and_return({ 'response' => 'Test response' })
+    end
+
+    context 'when ActiveStorage::FileNotFoundError occurs' do
+      it 'handles file errors and triggers handoff' do
+        allow(mock_message_builder).to receive(:generate_content)
+          .and_raise(ActiveStorage::FileNotFoundError, 'Image file not found')
+
+        # For retryable errors, the job should handle them and proceed with handoff
+        described_class.perform_now(conversation, assistant)
+
+        # Verify handoff occurred due to repeated failures
+        expect(conversation.reload.status).to eq('open')
+      end
+
+      it 'succeeds when no error occurs' do
+        # Don't raise any error, should succeed normally
+        allow(mock_message_builder).to receive(:generate_content)
+          .and_return('Image content processed successfully')
+
+        described_class.perform_now(conversation, assistant)
+
+        expect(conversation.messages.outgoing.count).to eq(1)
+        expect(conversation.messages.outgoing.last.content).to eq('Test response')
+      end
+    end
+
+    context 'when Faraday::BadRequestError occurs' do
+      it 'handles API errors and triggers handoff' do
+        allow(mock_llm_chat_service).to receive(:generate_response)
+          .and_raise(Faraday::BadRequestError, 'Bad request to image service')
+
+        described_class.perform_now(conversation, assistant)
+        expect(conversation.reload.status).to eq('open')
+      end
+
+      it 'succeeds when no error occurs' do
+        # Don't raise any error, should succeed normally
+        allow(mock_llm_chat_service).to receive(:generate_response)
+          .and_return({ 'response' => 'Response after retry' })
+
+        described_class.perform_now(conversation, assistant)
+
+        expect(conversation.messages.outgoing.last.content).to eq('Response after retry')
+      end
+    end
+
+    context 'when image processing fails permanently' do
+      before do
+        allow(mock_message_builder).to receive(:generate_content)
+          .and_raise(ActiveStorage::FileNotFoundError, 'Image permanently unavailable')
+      end
+
+      it 'triggers handoff after max retries' do
+        # Since perform_now re-raises retryable errors, simulate the final failure after retries
+        allow(mock_message_builder).to receive(:generate_content)
+          .and_raise(StandardError, 'Max retries exceeded')
+
+        expect(ChatwootExceptionTracker).to receive(:new).and_call_original
+
+        described_class.perform_now(conversation, assistant)
+
+        expect(conversation.reload.status).to eq('open')
+      end
+    end
+
+    context 'when non-retryable error occurs' do
+      let(:standard_error) { StandardError.new('Generic error') }
+
+      before do
+        allow(mock_llm_chat_service).to receive(:generate_response).and_raise(standard_error)
+      end
+
+      it 'handles error and triggers handoff' do
+        expect(ChatwootExceptionTracker).to receive(:new)
+          .with(standard_error, account: account)
+          .and_call_original
+
+        described_class.perform_now(conversation, assistant)
+
+        expect(conversation.reload.status).to eq('open')
+      end
+
+      it 'ensures Current.executed_by is reset' do
+        expect(Current).to receive(:executed_by=).with(assistant)
+        expect(Current).to receive(:executed_by=).with(nil)
+
+        described_class.perform_now(conversation, assistant)
+      end
+    end
+  end
+
+  describe 'job configuration' do
+    it 'has retry_on configuration for retryable errors' do
+      expect(described_class).to respond_to(:retry_on)
+    end
+
+    it 'defines MAX_MESSAGE_LENGTH constant' do
+      expect(described_class::MAX_MESSAGE_LENGTH).to eq(10_000)
+    end
   end
 end
diff --git a/spec/enterprise/services/captain/open_ai_message_builder_service_spec.rb b/spec/enterprise/services/captain/open_ai_message_builder_service_spec.rb
new file mode 100644
index 000000000..76e91ae7a
--- /dev/null
+++ b/spec/enterprise/services/captain/open_ai_message_builder_service_spec.rb
@@ -0,0 +1,310 @@
+require 'rails_helper'
+
+RSpec.describe Captain::OpenAiMessageBuilderService do
+  subject(:service) { described_class.new(message: message) }
+
+  let(:message) { create(:message, content: 'Hello world') }
+
+  describe '#generate_content' do
+    context 'when message has only text content' do
+      it 'returns the text content directly' do
+        expect(service.generate_content).to eq('Hello world')
+      end
+    end
+
+    context 'when message has no content and no attachments' do
+      let(:message) { create(:message, content: nil) }
+
+      it 'returns default message' do
+        expect(service.generate_content).to eq('Message without content')
+      end
+    end
+
+    context 'when message has text content and attachments' do
+      before do
+        attachment = message.attachments.build(account_id: message.account_id, file_type: :image, external_url: 'https://example.com/image.jpg')
+        attachment.save!
+      end
+
+      it 'returns an array of content parts' do
+        result = service.generate_content
+        expect(result).to be_an(Array)
+        expect(result).to include({ type: 'text', text: 'Hello world' })
+        expect(result).to include({ type: 'image_url', image_url: { url: 'https://example.com/image.jpg' } })
+      end
+    end
+
+    context 'when message has only non-text attachments' do
+      let(:message) { create(:message, content: nil) }
+
+      before do
+        attachment = message.attachments.build(account_id: message.account_id, file_type: :image, external_url: 'https://example.com/image.jpg')
+        attachment.save!
+      end
+
+      it 'returns an array of content parts without text' do
+        result = service.generate_content
+        expect(result).to be_an(Array)
+        expect(result).to include({ type: 'image_url', image_url: { url: 'https://example.com/image.jpg' } })
+        expect(result).not_to include(hash_including(type: 'text', text: 'Hello world'))
+      end
+    end
+  end
+
+  describe '#attachment_parts' do
+    let(:message) { create(:message, content: nil) }
+    let(:attachments) { message.attachments }
+
+    context 'with image attachments' do
+      before do
+        attachment = message.attachments.build(account_id: message.account_id, file_type: :image, external_url: 'https://example.com/image.jpg')
+        attachment.save!
+      end
+
+      it 'includes image parts' do
+        result = service.send(:attachment_parts, attachments)
+        expect(result).to include({ type: 'image_url', image_url: { url: 'https://example.com/image.jpg' } })
+      end
+    end
+
+    context 'with audio attachments' do
+      let(:audio_attachment) do
+        attachment = message.attachments.build(account_id: message.account_id, file_type: :audio)
+        attachment.save!
+        attachment
+      end
+
+      before do
+        allow(Messages::AudioTranscriptionService).to receive(:new).with(audio_attachment).and_return(
+          instance_double(Messages::AudioTranscriptionService, perform: { success: true, transcriptions: 'Audio transcription text' })
+        )
+      end
+
+      it 'includes transcription text part' do
+        audio_attachment # trigger creation
+        result = service.send(:attachment_parts, attachments)
+        expect(result).to include({ type: 'text', text: 'Audio transcription text' })
+      end
+    end
+
+    context 'with other file types' do
+      before do
+        attachment = message.attachments.build(account_id: message.account_id, file_type: :file)
+        attachment.save!
+      end
+
+      it 'includes generic attachment message' do
+        result = service.send(:attachment_parts, attachments)
+        expect(result).to include({ type: 'text', text: 'User has shared an attachment' })
+      end
+    end
+
+    context 'with mixed attachment types' do
+      let(:image_attachment) do
+        attachment = message.attachments.build(account_id: message.account_id, file_type: :image, external_url: 'https://example.com/image.jpg')
+        attachment.save!
+        attachment
+      end
+
+      let(:audio_attachment) do
+        attachment = message.attachments.build(account_id: message.account_id, file_type: :audio)
+        attachment.save!
+        attachment
+      end
+
+      let(:document_attachment) do
+        attachment = message.attachments.build(account_id: message.account_id, file_type: :file)
+        attachment.save!
+        attachment
+      end
+
+      before do
+        allow(Messages::AudioTranscriptionService).to receive(:new).with(audio_attachment).and_return(
+          instance_double(Messages::AudioTranscriptionService, perform: { success: true, transcriptions: 'Audio text' })
+        )
+      end
+
+      it 'includes all relevant parts' do
+        image_attachment    # trigger creation
+        audio_attachment    # trigger creation
+        document_attachment # trigger creation
+
+        result = service.send(:attachment_parts, attachments)
+        expect(result).to include({ type: 'image_url', image_url: { url: 'https://example.com/image.jpg' } })
+        expect(result).to include({ type: 'text', text: 'Audio text' })
+        expect(result).to include({ type: 'text', text: 'User has shared an attachment' })
+      end
+    end
+  end
+
+  describe '#image_parts' do
+    let(:message) { create(:message, content: nil) }
+
+    context 'with valid image attachments' do
+      let(:image1) do
+        attachment = message.attachments.build(account_id: message.account_id, file_type: :image, external_url: 'https://example.com/image1.jpg')
+        attachment.save!
+        attachment
+      end
+
+      let(:image2) do
+        attachment = message.attachments.build(account_id: message.account_id, file_type: :image, external_url: 'https://example.com/image2.jpg')
+        attachment.save!
+        attachment
+      end
+
+      it 'returns image parts for all valid images' do
+        image1 # trigger creation
+        image2 # trigger creation
+
+        image_attachments = message.attachments.where(file_type: :image)
+        result = service.send(:image_parts, image_attachments)
+
+        expect(result).to include({ type: 'image_url', image_url: { url: 'https://example.com/image1.jpg' } })
+        expect(result).to include({ type: 'image_url', image_url: { url: 'https://example.com/image2.jpg' } })
+      end
+    end
+
+    context 'with image attachments without URLs' do
+      let(:image_attachment) do
+        attachment = message.attachments.build(account_id: message.account_id, file_type: :image, external_url: nil)
+        attachment.save!
+        attachment
+      end
+
+      before do
+        allow(image_attachment).to receive(:file).and_return(instance_double(ActiveStorage::Attached::One, attached?: false))
+      end
+
+      it 'skips images without valid URLs' do
+        image_attachment # trigger creation
+
+        image_attachments = message.attachments.where(file_type: :image)
+        result = service.send(:image_parts, image_attachments)
+
+        expect(result).to be_empty
+      end
+    end
+  end
+
+  describe '#get_attachment_url' do
+    let(:attachment) do
+      attachment = message.attachments.build(account_id: message.account_id, file_type: :image)
+      attachment.save!
+      attachment
+    end
+
+    context 'when attachment has external_url' do
+      before { attachment.update(external_url: 'https://example.com/image.jpg') }
+
+      it 'returns external_url' do
+        expect(service.send(:get_attachment_url, attachment)).to eq('https://example.com/image.jpg')
+      end
+    end
+
+    context 'when attachment has attached file' do
+      before do
+        attachment.update(external_url: nil)
+        allow(attachment).to receive(:file).and_return(instance_double(ActiveStorage::Attached::One, attached?: true))
+        allow(attachment).to receive(:file_url).and_return('https://local.com/file.jpg')
+        allow(attachment).to receive(:download_url).and_return('')
+      end
+
+      it 'returns file_url' do
+        expect(service.send(:get_attachment_url, attachment)).to eq('https://local.com/file.jpg')
+      end
+    end
+
+    context 'when attachment has no URL or file' do
+      before do
+        attachment.update(external_url: nil)
+        allow(attachment).to receive(:file).and_return(instance_double(ActiveStorage::Attached::One, attached?: false))
+      end
+
+      it 'returns nil' do
+        expect(service.send(:get_attachment_url, attachment)).to be_nil
+      end
+    end
+  end
+
+  describe '#extract_audio_transcriptions' do
+    let(:message) { create(:message, content: nil) }
+
+    context 'with no audio attachments' do
+      it 'returns empty string' do
+        result = service.send(:extract_audio_transcriptions, message.attachments)
+        expect(result).to eq('')
+      end
+    end
+
+    context 'with successful audio transcriptions' do
+      let(:audio1) do
+        attachment = message.attachments.build(account_id: message.account_id, file_type: :audio)
+        attachment.save!
+        attachment
+      end
+
+      let(:audio2) do
+        attachment = message.attachments.build(account_id: message.account_id, file_type: :audio)
+        attachment.save!
+        attachment
+      end
+
+      before do
+        allow(Messages::AudioTranscriptionService).to receive(:new).with(audio1).and_return(
+          instance_double(Messages::AudioTranscriptionService, perform: { success: true, transcriptions: 'First audio text. ' })
+        )
+        allow(Messages::AudioTranscriptionService).to receive(:new).with(audio2).and_return(
+          instance_double(Messages::AudioTranscriptionService, perform: { success: true, transcriptions: 'Second audio text.' })
+        )
+      end
+
+      it 'concatenates all successful transcriptions' do
+        audio1 # trigger creation
+        audio2 # trigger creation
+
+        attachments = message.attachments
+        result = service.send(:extract_audio_transcriptions, attachments)
+        expect(result).to eq('First audio text. Second audio text.')
+      end
+    end
+
+    context 'with failed audio transcriptions' do
+      let(:audio_attachment) do
+        attachment = message.attachments.build(account_id: message.account_id, file_type: :audio)
+        attachment.save!
+        attachment
+      end
+
+      before do
+        allow(Messages::AudioTranscriptionService).to receive(:new).with(audio_attachment).and_return(
+          instance_double(Messages::AudioTranscriptionService, perform: { success: false, transcriptions: nil })
+        )
+      end
+
+      it 'returns empty string for failed transcriptions' do
+        audio_attachment # trigger creation
+
+        attachments = message.attachments
+        result = service.send(:extract_audio_transcriptions, attachments)
+        expect(result).to eq('')
+      end
+    end
+  end
+
+  describe 'private helper methods' do
+    describe '#text_part' do
+      it 'returns correct text part format' do
+        result = service.send(:text_part, 'Hello world')
+        expect(result).to eq({ type: 'text', text: 'Hello world' })
+      end
+    end
+
+    describe '#image_part' do
+      it 'returns correct image part format' do
+        result = service.send(:image_part, 'https://example.com/image.jpg')
+        expect(result).to eq({ type: 'image_url', image_url: { url: 'https://example.com/image.jpg' } })
+      end
+    end
+  end
+end

From 1b02ebec68d650e86509e54d536c507411132e2b Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Sat, 12 Jul 2025 10:06:30 +0530
Subject: [PATCH 06/20] fix: Approved FAQ not disappearing from pending list
 after filtering (#11909)

# Pull Request Template

## Description

This PR fixes an issue where approved FAQs were not removed from the
list when filtered by `pending` status.

**Fix:** Implemented real-time client-side filtering using a
`filteredResponses` computed property in `Index.vue`, updated all list
and selection logic to use it, and also hide the card toggle dropdown
button when the bulk action checkbox is selected.


## Type of change

- [x] Bug fix (non-breaking change which fixes an issue)

## How Has This Been Tested?

### Loom video

https://www.loom.com/share/216221a4910c44ebb1d49ab9e34c820c?sid=98c9c239-54eb-4bd9-b04d-aeccc55bfb3a

## Checklist:

- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my code
- [ ] I have commented on my code, particularly in hard-to-understand
areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [x] New and existing unit tests pass locally with my changes
- [ ] Any dependent changes have been merged and published in downstream
modules

---------

Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
---
 .../captain/assistant/ResponseCard.vue        |  6 +-
 .../dashboard/captain/responses/Index.vue     | 58 ++++++++++++-------
 2 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/app/javascript/dashboard/components-next/captain/assistant/ResponseCard.vue b/app/javascript/dashboard/components-next/captain/assistant/ResponseCard.vue
index 7879411c8..a924ca228 100644
--- a/app/javascript/dashboard/components-next/captain/assistant/ResponseCard.vue
+++ b/app/javascript/dashboard/components-next/captain/assistant/ResponseCard.vue
@@ -55,6 +55,10 @@ const props = defineProps({
     type: Boolean,
     default: false,
   },
+  showMenu: {
+    type: Boolean,
+    default: true,
+  },
 });
 
 const emit = defineEmits(['action', 'navigate', 'select', 'hover']);
@@ -130,7 +134,7 @@ const handleDocumentableClick = () => {
       <span class="text-base text-n-slate-12 line-clamp-1">
         {{ question }}
       </span>
-      <div v-if="!compact" class="flex items-center gap-2">
+      <div v-if="!compact && showMenu" class="flex items-center gap-2">
         <Policy
           v-on-clickaway="() => toggleDropdown(false)"
           :permissions="['administrator']"
diff --git a/app/javascript/dashboard/routes/dashboard/captain/responses/Index.vue b/app/javascript/dashboard/routes/dashboard/captain/responses/Index.vue
index e771e72ed..85e7f1ed0 100644
--- a/app/javascript/dashboard/routes/dashboard/captain/responses/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/captain/responses/Index.vue
@@ -55,6 +55,12 @@ const statusOptions = computed(() =>
   }))
 );
 
+const filteredResponses = computed(() => {
+  return selectedStatus.value === 'pending'
+    ? responses.value.filter(r => r.status === 'pending')
+    : responses.value;
+});
+
 const selectedStatusLabel = computed(() => {
   const status = statusOptions.value.find(
     option => option.value === selectedStatus.value
@@ -94,7 +100,9 @@ const handleEdit = () => {
 };
 
 const handleAction = ({ action, id }) => {
-  selectedResponse.value = responses.value.find(response => id === response.id);
+  selectedResponse.value = filteredResponses.value.find(
+    response => id === response.id
+  );
   nextTick(() => {
     if (action === 'delete') {
       handleDelete();
@@ -139,7 +147,7 @@ const hoveredCard = ref(null);
 
 const bulkSelectionState = computed(() => {
   const selectedCount = bulkSelectedIds.value.size;
-  const totalCount = responses.value?.length || 0;
+  const totalCount = filteredResponses.value?.length || 0;
 
   return {
     hasSelected: selectedCount > 0,
@@ -152,13 +160,13 @@ const bulkCheckbox = computed({
   get: () => bulkSelectionState.value.allSelected,
   set: value => {
     bulkSelectedIds.value = value
-      ? new Set(responses.value.map(r => r.id))
+      ? new Set(filteredResponses.value.map(r => r.id))
       : new Set();
   },
 });
 
 const buildSelectedCountLabel = computed(() => {
-  const count = responses.value?.length || 0;
+  const count = filteredResponses.value?.length || 0;
   return bulkSelectionState.value.allSelected
     ? t('CAPTAIN.RESPONSES.UNSELECT_ALL', { count })
     : t('CAPTAIN.RESPONSES.SELECT_ALL', { count });
@@ -174,6 +182,24 @@ const handleCardSelect = id => {
   bulkSelectedIds.value = selected;
 };
 
+const fetchResponseAfterBulkAction = () => {
+  const hasNoResponsesLeft = filteredResponses.value?.length === 0;
+  const currentPage = responseMeta.value?.page;
+
+  if (hasNoResponsesLeft) {
+    // Page is now empty after bulk action.
+    // Fetch the previous page if not already on the first page.
+    const pageToFetch = currentPage > 1 ? currentPage - 1 : currentPage;
+    fetchResponses(pageToFetch);
+  } else {
+    // Page still has responses left, re-fetch the same page.
+    fetchResponses(currentPage);
+  }
+
+  // Clear selection
+  bulkSelectedIds.value = new Set();
+};
+
 const handleBulkApprove = async () => {
   try {
     await store.dispatch(
@@ -181,8 +207,7 @@ const handleBulkApprove = async () => {
       Array.from(bulkSelectedIds.value)
     );
 
-    // Clear selection
-    bulkSelectedIds.value = new Set();
+    fetchResponseAfterBulkAction();
     useAlert(t('CAPTAIN.RESPONSES.BULK_APPROVE.SUCCESS_MESSAGE'));
   } catch (error) {
     useAlert(
@@ -205,23 +230,13 @@ const onPageChange = page => {
 };
 
 const onDeleteSuccess = () => {
-  if (responses.value?.length === 0 && responseMeta.value?.page > 1) {
+  if (filteredResponses.value?.length === 0 && responseMeta.value?.page > 1) {
     onPageChange(responseMeta.value.page - 1);
   }
 };
 
 const onBulkDeleteSuccess = () => {
-  // Only fetch if no records left
-  if (responses.value?.length === 0) {
-    const page =
-      responseMeta.value?.page > 1
-        ? responseMeta.value.page - 1
-        : responseMeta.value.page;
-    fetchResponses(page);
-  }
-
-  // Clear selection
-  bulkSelectedIds.value = new Set();
+  fetchResponseAfterBulkAction();
 };
 
 const handleStatusFilterChange = ({ value }) => {
@@ -249,8 +264,8 @@ onMounted(() => {
     :header-title="$t('CAPTAIN.RESPONSES.HEADER')"
     :button-label="$t('CAPTAIN.RESPONSES.ADD_NEW')"
     :is-fetching="isFetching"
-    :is-empty="!responses.length"
-    :show-pagination-footer="!isFetching && !!responses.length"
+    :is-empty="!filteredResponses.length"
+    :show-pagination-footer="!isFetching && !!filteredResponses.length"
     :feature-flag="FEATURE_FLAGS.CAPTAIN"
     @update:current-page="onPageChange"
     @click="handleCreate"
@@ -368,7 +383,7 @@ onMounted(() => {
 
       <div class="flex flex-col gap-4">
         <ResponseCard
-          v-for="response in responses"
+          v-for="response in filteredResponses"
           :id="response.id"
           :key="response.id"
           :question="response.question"
@@ -380,6 +395,7 @@ onMounted(() => {
           :updated-at="response.updated_at"
           :is-selected="bulkSelectedIds.has(response.id)"
           :selectable="hoveredCard === response.id || bulkSelectedIds.size > 0"
+          :show-menu="!bulkSelectedIds.has(response.id)"
           @action="handleAction"
           @navigate="handleNavigationAction"
           @select="handleCardSelect"

From 18eb53acf4c8c232a30f2fb615275185f334a431 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Sat, 12 Jul 2025 17:02:10 +0530
Subject: [PATCH 07/20] feat: New Assistants Edit Page (#11920)

# Pull Request Template

## Description

Fixes https://linear.app/chatwoot/issue/CW-4602/assistants-edit-page

### Screenshots
<img width="1650" height="890" alt="image"
src="https://github.com/user-attachments/assets/f9834cd3-9cf3-4173-8d33-1aad04d8991e"
/>
<img width="1650" height="890" alt="image"
src="https://github.com/user-attachments/assets/a628328a-fdfd-4ee7-86b5-2a1945e0c114"
/>

---------

Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
---
 .../components-next/breadcrumb/Breadcrumb.vue |  29 ++--
 .../captain/SettingsPageLayout.vue            |  91 +++++++++++
 .../settings/AssistantBasicSettingsForm.vue   | 151 +++++++++++++++++
 .../settings/AssistantControlItems.vue        |  43 +++++
 .../settings/AssistantSystemSettingsForm.vue  | 125 ++++++++++++++
 app/javascript/dashboard/featureFlags.js      |   2 +
 .../i18n/locale/en/integrations.json          |  31 ++++
 .../dashboard/captain/assistants/Edit.vue     |  17 +-
 .../captain/assistants/settings/Settings.vue  | 154 ++++++++++++++++++
 .../dashboard/captain/captain.routes.js       |   1 +
 config/features.yml                           |   4 +
 11 files changed, 634 insertions(+), 14 deletions(-)
 create mode 100644 app/javascript/dashboard/components-next/captain/SettingsPageLayout.vue
 create mode 100644 app/javascript/dashboard/components-next/captain/pageComponents/assistant/settings/AssistantBasicSettingsForm.vue
 create mode 100644 app/javascript/dashboard/components-next/captain/pageComponents/assistant/settings/AssistantControlItems.vue
 create mode 100644 app/javascript/dashboard/components-next/captain/pageComponents/assistant/settings/AssistantSystemSettingsForm.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/captain/assistants/settings/Settings.vue

diff --git a/app/javascript/dashboard/components-next/breadcrumb/Breadcrumb.vue b/app/javascript/dashboard/components-next/breadcrumb/Breadcrumb.vue
index 8ca325607..8a1b26e90 100644
--- a/app/javascript/dashboard/components-next/breadcrumb/Breadcrumb.vue
+++ b/app/javascript/dashboard/components-next/breadcrumb/Breadcrumb.vue
@@ -15,8 +15,8 @@ const emit = defineEmits(['click']);
 
 const { t } = useI18n();
 
-const onClick = event => {
-  emit('click', event);
+const onClick = (item, index) => {
+  emit('click', item, index);
 };
 </script>
 
@@ -24,22 +24,25 @@ const onClick = event => {
   <nav :aria-label="t('BREADCRUMB.ARIA_LABEL')" class="flex items-center h-8">
     <ol class="flex items-center mb-0">
       <li v-for="(item, index) in items" :key="index" class="flex items-center">
+        <Icon
+          v-if="index > 0"
+          icon="i-lucide-chevron-right"
+          class="flex-shrink-0 mx-2 size-4 text-n-slate-11 dark:text-n-slate-11"
+        />
+
+        <!-- Render as button for all except the last item -->
         <button
-          v-if="index === 0"
+          v-if="index !== items.length - 1"
           class="inline-flex items-center justify-center min-w-0 gap-2 p-0 text-sm font-medium transition-all duration-200 ease-in-out border-0 rounded-lg text-n-slate-11 hover:text-n-slate-12 outline-transparent max-w-56"
-          @click="onClick"
+          @click="onClick(item, index)"
         >
           <span class="min-w-0 truncate">{{ item.label }}</span>
         </button>
-        <template v-else>
-          <Icon
-            icon="i-lucide-chevron-right"
-            class="flex-shrink-0 mx-2 size-4 text-n-slate-11 dark:text-n-slate-11"
-          />
-          <span class="text-sm truncate text-n-slate-12 max-w-56">
-            {{ item.emoji ? item.emoji : '' }} {{ item.label }}
-          </span>
-        </template>
+
+        <!-- The last breadcrumb item is plain text -->
+        <span v-else class="text-sm truncate text-n-slate-12 max-w-56">
+          {{ item.emoji ? item.emoji : '' }} {{ item.label }}
+        </span>
       </li>
     </ol>
   </nav>
diff --git a/app/javascript/dashboard/components-next/captain/SettingsPageLayout.vue b/app/javascript/dashboard/components-next/captain/SettingsPageLayout.vue
new file mode 100644
index 000000000..4a48794b3
--- /dev/null
+++ b/app/javascript/dashboard/components-next/captain/SettingsPageLayout.vue
@@ -0,0 +1,91 @@
+<script setup>
+import { useRouter } from 'vue-router';
+import PaginationFooter from 'dashboard/components-next/pagination/PaginationFooter.vue';
+import Spinner from 'dashboard/components-next/spinner/Spinner.vue';
+import Breadcrumb from 'dashboard/components-next/breadcrumb/Breadcrumb.vue';
+
+defineProps({
+  isFetching: {
+    type: Boolean,
+    default: false,
+  },
+  isEmpty: {
+    type: Boolean,
+    default: false,
+  },
+  currentPage: {
+    type: Number,
+    default: 1,
+  },
+  totalCount: {
+    type: Number,
+    default: 100,
+  },
+  itemsPerPage: {
+    type: Number,
+    default: 25,
+  },
+  showPaginationFooter: {
+    type: Boolean,
+    default: false,
+  },
+  breadcrumbItems: {
+    type: Array,
+    default: () => [],
+  },
+});
+
+const emit = defineEmits(['update:currentPage']);
+
+const router = useRouter();
+
+const handlePageChange = event => {
+  emit('update:currentPage', event);
+};
+
+const handleBreadcrumbClick = item => {
+  router.push({
+    name: item.routeName,
+  });
+};
+</script>
+
+<template>
+  <section
+    class="my-4 px-10 flex flex-col w-full h-screen overflow-y-auto bg-n-background"
+  >
+    <div class="max-w-[60rem] mx-auto flex flex-col w-full h-full">
+      <header class="mb-7 sticky top-0 z-10 bg-n-background">
+        <Breadcrumb :items="breadcrumbItems" @click="handleBreadcrumbClick" />
+      </header>
+      <main class="flex gap-16 w-full flex-1 pb-16">
+        <section
+          v-if="$slots.body || $slots.emptyState || isFetching"
+          class="flex flex-col w-full"
+        >
+          <div
+            v-if="isFetching"
+            class="flex items-center justify-center py-10 text-n-slate-11"
+          >
+            <Spinner />
+          </div>
+          <div v-else-if="isEmpty">
+            <slot name="emptyState" />
+          </div>
+          <slot v-else name="body" />
+        </section>
+        <section v-if="$slots.controls" class="flex w-full">
+          <slot name="controls" />
+        </section>
+      </main>
+      <footer v-if="showPaginationFooter" class="sticky bottom-0 z-10 pb-4">
+        <PaginationFooter
+          :current-page="currentPage"
+          :total-items="totalCount"
+          :items-per-page="itemsPerPage"
+          @update:current-page="handlePageChange"
+        />
+      </footer>
+    </div>
+  </section>
+</template>
diff --git a/app/javascript/dashboard/components-next/captain/pageComponents/assistant/settings/AssistantBasicSettingsForm.vue b/app/javascript/dashboard/components-next/captain/pageComponents/assistant/settings/AssistantBasicSettingsForm.vue
new file mode 100644
index 000000000..236791793
--- /dev/null
+++ b/app/javascript/dashboard/components-next/captain/pageComponents/assistant/settings/AssistantBasicSettingsForm.vue
@@ -0,0 +1,151 @@
+<script setup>
+import { reactive, computed, watch } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useVuelidate } from '@vuelidate/core';
+import { required, minLength } from '@vuelidate/validators';
+
+import Input from 'dashboard/components-next/input/Input.vue';
+import Button from 'dashboard/components-next/button/Button.vue';
+import Editor from 'dashboard/components-next/Editor/Editor.vue';
+
+const props = defineProps({
+  assistant: {
+    type: Object,
+    default: () => ({}),
+  },
+});
+
+const emit = defineEmits(['submit']);
+
+const { t } = useI18n();
+
+const initialState = {
+  name: '',
+  description: '',
+  productName: '',
+  features: {
+    conversationFaqs: false,
+    memories: false,
+  },
+};
+
+const state = reactive({ ...initialState });
+
+const validationRules = {
+  name: { required, minLength: minLength(1) },
+  description: { required, minLength: minLength(1) },
+  productName: { required, minLength: minLength(1) },
+};
+
+const v$ = useVuelidate(validationRules, state);
+
+const getErrorMessage = field => {
+  return v$.value[field].$error ? v$.value[field].$errors[0].$message : '';
+};
+
+const formErrors = computed(() => ({
+  name: getErrorMessage('name'),
+  description: getErrorMessage('description'),
+  productName: getErrorMessage('productName'),
+}));
+
+const updateStateFromAssistant = assistant => {
+  const { config = {} } = assistant;
+  state.name = assistant.name;
+  state.description = assistant.description;
+  state.productName = config.product_name;
+  state.features = {
+    conversationFaqs: config.feature_faq || false,
+    memories: config.feature_memory || false,
+  };
+};
+
+const handleBasicInfoUpdate = async () => {
+  const result = await Promise.all([
+    v$.value.name.$validate(),
+    v$.value.description.$validate(),
+    v$.value.productName.$validate(),
+  ]).then(results => results.every(Boolean));
+  if (!result) return;
+
+  const payload = {
+    name: state.name,
+    description: state.description,
+    config: {
+      ...props.assistant.config,
+      product_name: state.productName,
+      feature_faq: state.features.conversationFaqs,
+      feature_memory: state.features.memories,
+    },
+  };
+
+  emit('submit', payload);
+};
+
+watch(
+  () => props.assistant,
+  newAssistant => {
+    if (newAssistant) updateStateFromAssistant(newAssistant);
+  },
+  { immediate: true }
+);
+</script>
+
+<template>
+  <div class="flex flex-col gap-6">
+    <Input
+      v-model="state.name"
+      :label="t('CAPTAIN.ASSISTANTS.FORM.NAME.LABEL')"
+      :placeholder="t('CAPTAIN.ASSISTANTS.FORM.NAME.PLACEHOLDER')"
+      :message="formErrors.name"
+      :message-type="formErrors.name ? 'error' : 'info'"
+    />
+
+    <Input
+      v-model="state.productName"
+      :label="t('CAPTAIN.ASSISTANTS.FORM.PRODUCT_NAME.LABEL')"
+      :placeholder="t('CAPTAIN.ASSISTANTS.FORM.PRODUCT_NAME.PLACEHOLDER')"
+      :message="formErrors.productName"
+      :message-type="formErrors.productName ? 'error' : 'info'"
+    />
+
+    <Editor
+      v-model="state.description"
+      :label="t('CAPTAIN.ASSISTANTS.FORM.DESCRIPTION.LABEL')"
+      :placeholder="t('CAPTAIN.ASSISTANTS.FORM.DESCRIPTION.PLACEHOLDER')"
+      :message="formErrors.description"
+      :message-type="formErrors.description ? 'error' : 'info'"
+    />
+
+    <div class="flex flex-col gap-2">
+      <label class="text-sm font-medium text-n-slate-12">
+        {{ t('CAPTAIN.ASSISTANTS.FORM.FEATURES.TITLE') }}
+      </label>
+      <div class="flex flex-col gap-2">
+        <label class="flex items-center gap-2">
+          <input
+            v-model="state.features.conversationFaqs"
+            type="checkbox"
+            class="form-checkbox"
+          />
+          {{ t('CAPTAIN.ASSISTANTS.FORM.FEATURES.ALLOW_CONVERSATION_FAQS') }}
+        </label>
+        <label class="flex items-center gap-2">
+          <input
+            v-model="state.features.memories"
+            type="checkbox"
+            class="form-checkbox"
+          />
+          {{ t('CAPTAIN.ASSISTANTS.FORM.FEATURES.ALLOW_MEMORIES') }}
+        </label>
+      </div>
+    </div>
+
+    <div>
+      <Button
+        :label="t('CAPTAIN.ASSISTANTS.FORM.UPDATE')"
+        @click="handleBasicInfoUpdate"
+      />
+    </div>
+  </div>
+</template>
diff --git a/app/javascript/dashboard/components-next/captain/pageComponents/assistant/settings/AssistantControlItems.vue b/app/javascript/dashboard/components-next/captain/pageComponents/assistant/settings/AssistantControlItems.vue
new file mode 100644
index 000000000..2bbede899
--- /dev/null
+++ b/app/javascript/dashboard/components-next/captain/pageComponents/assistant/settings/AssistantControlItems.vue
@@ -0,0 +1,43 @@
+<script setup>
+import { useRouter } from 'vue-router';
+import Button from 'dashboard/components-next/button/Button.vue';
+
+defineProps({
+  controlItem: {
+    type: Object,
+    default: () => ({}),
+  },
+});
+
+const router = useRouter();
+
+const onClick = name => {
+  router.push({ name });
+};
+</script>
+
+<template>
+  <div
+    :key="controlItem.name"
+    class="pt-3 ltr:pl-4 rtl:pr-4 ltr:pr-2 rtl:pl-2 pb-5 gap-2 flex flex-col w-full shadow outline-1 outline outline-n-container rounded-2xl bg-n-solid-2 cursor-pointer"
+    @click="onClick(controlItem.routeName)"
+  >
+    <div class="flex items-center justify-between w-full gap-1 h-8">
+      <span class="text-sm font-medium text-n-slate-12 line-clamp-1">
+        {{ controlItem.name }}
+      </span>
+      <div class="flex items-center gap-2">
+        <Button
+          icon="i-lucide-chevron-right"
+          slate
+          ghost
+          xs
+          @click="onClick(controlItem.routeName)"
+        />
+      </div>
+    </div>
+    <span class="text-n-slate-11 text-sm leading-[21px] line-clamp-5">
+      {{ controlItem.description }}
+    </span>
+  </div>
+</template>
diff --git a/app/javascript/dashboard/components-next/captain/pageComponents/assistant/settings/AssistantSystemSettingsForm.vue b/app/javascript/dashboard/components-next/captain/pageComponents/assistant/settings/AssistantSystemSettingsForm.vue
new file mode 100644
index 000000000..b86bdacb4
--- /dev/null
+++ b/app/javascript/dashboard/components-next/captain/pageComponents/assistant/settings/AssistantSystemSettingsForm.vue
@@ -0,0 +1,125 @@
+<script setup>
+import { reactive, computed, watch } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useVuelidate } from '@vuelidate/core';
+import { minLength } from '@vuelidate/validators';
+
+import Button from 'dashboard/components-next/button/Button.vue';
+import Editor from 'dashboard/components-next/Editor/Editor.vue';
+
+const props = defineProps({
+  assistant: {
+    type: Object,
+    default: () => ({}),
+  },
+});
+
+const emit = defineEmits(['submit']);
+
+const { t } = useI18n();
+
+const initialState = {
+  handoffMessage: '',
+  resolutionMessage: '',
+  temperature: 1,
+};
+
+const state = reactive({ ...initialState });
+
+const validationRules = {
+  handoffMessage: { minLength: minLength(1) },
+  resolutionMessage: { minLength: minLength(1) },
+};
+
+const v$ = useVuelidate(validationRules, state);
+
+const getErrorMessage = field => {
+  return v$.value[field].$error ? v$.value[field].$errors[0].$message : '';
+};
+
+const formErrors = computed(() => ({
+  handoffMessage: getErrorMessage('handoffMessage'),
+  resolutionMessage: getErrorMessage('resolutionMessage'),
+}));
+
+const updateStateFromAssistant = assistant => {
+  const { config = {} } = assistant;
+  state.handoffMessage = config.handoff_message;
+  state.resolutionMessage = config.resolution_message;
+  state.temperature = config.temperature || 1;
+};
+
+const handleSystemMessagesUpdate = async () => {
+  const result = await Promise.all([
+    v$.value.handoffMessage.$validate(),
+    v$.value.resolutionMessage.$validate(),
+  ]).then(results => results.every(Boolean));
+  if (!result) return;
+
+  const payload = {
+    config: {
+      ...props.assistant.config,
+      handoff_message: state.handoffMessage,
+      resolution_message: state.resolutionMessage,
+      temperature: state.temperature || 1,
+    },
+  };
+
+  emit('submit', payload);
+};
+
+watch(
+  () => props.assistant,
+  newAssistant => {
+    if (newAssistant) updateStateFromAssistant(newAssistant);
+  },
+  { immediate: true }
+);
+</script>
+
+<template>
+  <div class="flex flex-col gap-6">
+    <Editor
+      v-model="state.handoffMessage"
+      :label="t('CAPTAIN.ASSISTANTS.FORM.HANDOFF_MESSAGE.LABEL')"
+      :placeholder="t('CAPTAIN.ASSISTANTS.FORM.HANDOFF_MESSAGE.PLACEHOLDER')"
+      :message="formErrors.handoffMessage"
+      :message-type="formErrors.handoffMessage ? 'error' : 'info'"
+    />
+
+    <Editor
+      v-model="state.resolutionMessage"
+      :label="t('CAPTAIN.ASSISTANTS.FORM.RESOLUTION_MESSAGE.LABEL')"
+      :placeholder="t('CAPTAIN.ASSISTANTS.FORM.RESOLUTION_MESSAGE.PLACEHOLDER')"
+      :message="formErrors.resolutionMessage"
+      :message-type="formErrors.resolutionMessage ? 'error' : 'info'"
+    />
+
+    <div class="flex flex-col gap-2">
+      <label class="text-sm font-medium text-n-slate-12">
+        {{ t('CAPTAIN.ASSISTANTS.FORM.TEMPERATURE.LABEL') }}
+      </label>
+      <div class="flex items-center gap-4">
+        <input
+          v-model="state.temperature"
+          type="range"
+          min="0"
+          max="1"
+          step="0.1"
+          class="w-full"
+        />
+        <span class="text-sm text-n-slate-12">{{ state.temperature }}</span>
+      </div>
+      <p class="text-sm text-n-slate-11 italic">
+        {{ t('CAPTAIN.ASSISTANTS.FORM.TEMPERATURE.DESCRIPTION') }}
+      </p>
+    </div>
+
+    <div>
+      <Button
+        :label="t('CAPTAIN.ASSISTANTS.FORM.UPDATE')"
+        @click="handleSystemMessagesUpdate"
+      />
+    </div>
+  </div>
+</template>
diff --git a/app/javascript/dashboard/featureFlags.js b/app/javascript/dashboard/featureFlags.js
index 1a6ada9fa..98234539b 100644
--- a/app/javascript/dashboard/featureFlags.js
+++ b/app/javascript/dashboard/featureFlags.js
@@ -36,6 +36,7 @@ export const FEATURE_FLAGS = {
   REPORT_V4: 'report_v4',
   CHANNEL_INSTAGRAM: 'channel_instagram',
   CONTACT_CHATWOOT_SUPPORT_TEAM: 'contact_chatwoot_support_team',
+  CAPTAIN_V2: 'captain_integration_v2',
 };
 
 export const PREMIUM_FEATURES = [
@@ -44,4 +45,5 @@ export const PREMIUM_FEATURES = [
   FEATURE_FLAGS.CUSTOM_ROLES,
   FEATURE_FLAGS.AUDIT_LOGS,
   FEATURE_FLAGS.HELP_CENTER,
+  FEATURE_FLAGS.CAPTAIN_V2,
 ];
diff --git a/app/javascript/dashboard/i18n/locale/en/integrations.json b/app/javascript/dashboard/i18n/locale/en/integrations.json
index b3e091722..fc8cff644 100644
--- a/app/javascript/dashboard/i18n/locale/en/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/en/integrations.json
@@ -478,6 +478,37 @@
         "ERROR_MESSAGE": "There was an error updating the assistant, please try again.",
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
+      "SETTINGS": {
+        "BREADCRUMB": {
+          "ASSISTANT": "Assistant"
+        },
+        "BASIC_SETTINGS": {
+          "TITLE": "Basic settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "SYSTEM_SETTINGS": {
+          "TITLE": "System settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "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.",
+          "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."
+            },
+            "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.”"
+            },
+            "RESPONSE_GUIDELINES": {
+              "TITLE": "Response guidelines",
+              "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
+            }
+          }
+        }
+      },
       "OPTIONS": {
         "EDIT_ASSISTANT": "Edit Assistant",
         "DELETE_ASSISTANT": "Delete Assistant",
diff --git a/app/javascript/dashboard/routes/dashboard/captain/assistants/Edit.vue b/app/javascript/dashboard/routes/dashboard/captain/assistants/Edit.vue
index 8b64e2663..2b2506934 100644
--- a/app/javascript/dashboard/routes/dashboard/captain/assistants/Edit.vue
+++ b/app/javascript/dashboard/routes/dashboard/captain/assistants/Edit.vue
@@ -5,10 +5,13 @@ import { useStore } from 'dashboard/composables/store';
 import { useMapGetter } from 'dashboard/composables/store';
 import { useAlert } from 'dashboard/composables';
 import { useI18n } from 'vue-i18n';
+import { FEATURE_FLAGS } from 'dashboard/featureFlags';
 import PageLayout from 'dashboard/components-next/captain/PageLayout.vue';
 import EditAssistantForm from '../../../../components-next/captain/pageComponents/assistant/EditAssistantForm.vue';
 import AssistantPlayground from 'dashboard/components-next/captain/assistant/AssistantPlayground.vue';
 
+import AssistantSettings from 'dashboard/routes/dashboard/captain/assistants/settings/Settings.vue';
+
 const route = useRoute();
 const store = useStore();
 const { t } = useI18n();
@@ -19,6 +22,16 @@ const assistant = computed(() =>
   store.getters['captainAssistants/getRecord'](Number(assistantId))
 );
 
+const isFeatureEnabledonAccount = useMapGetter(
+  'accounts/isFeatureEnabledonAccount'
+);
+const currentAccountId = useMapGetter('getCurrentAccountId');
+
+const isCaptainV2Enabled = isFeatureEnabledonAccount.value(
+  currentAccountId.value,
+  FEATURE_FLAGS.CAPTAIN_V2
+);
+
 const isAssistantAvailable = computed(() => !!assistant.value?.id);
 
 const handleSubmit = async updatedAssistant => {
@@ -36,14 +49,16 @@ const handleSubmit = async updatedAssistant => {
 };
 
 onMounted(() => {
-  if (!isAssistantAvailable.value) {
+  if (!isAssistantAvailable.value || !isCaptainV2Enabled) {
     store.dispatch('captainAssistants/show', assistantId);
   }
 });
 </script>
 
 <template>
+  <AssistantSettings v-if="isCaptainV2Enabled" />
   <PageLayout
+    v-else
     :header-title="assistant?.name"
     :show-pagination-footer="false"
     :is-fetching="isFetching"
diff --git a/app/javascript/dashboard/routes/dashboard/captain/assistants/settings/Settings.vue b/app/javascript/dashboard/routes/dashboard/captain/assistants/settings/Settings.vue
new file mode 100644
index 000000000..c39d685cc
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/captain/assistants/settings/Settings.vue
@@ -0,0 +1,154 @@
+<script setup>
+import { computed, onMounted } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import { useAlert } from 'dashboard/composables';
+import { useStore } from 'dashboard/composables/store';
+import { useMapGetter } from 'dashboard/composables/store';
+import SettingsPageLayout from 'dashboard/components-next/captain/SettingsPageLayout.vue';
+import SettingsHeader from 'dashboard/components-next/captain/pageComponents/settings/SettingsHeader.vue';
+import AssistantBasicSettingsForm from 'dashboard/components-next/captain/pageComponents/assistant/settings/AssistantBasicSettingsForm.vue';
+import AssistantSystemSettingsForm from 'dashboard/components-next/captain/pageComponents/assistant/settings/AssistantSystemSettingsForm.vue';
+import AssistantControlItems from 'dashboard/components-next/captain/pageComponents/assistant/settings/AssistantControlItems.vue';
+
+const { t } = useI18n();
+const route = useRoute();
+const store = useStore();
+const assistantId = route.params.assistantId;
+const uiFlags = useMapGetter('captainAssistants/getUIFlags');
+const isFetching = computed(() => uiFlags.value.fetchingItem);
+const assistant = computed(() =>
+  store.getters['captainAssistants/getRecord'](Number(assistantId))
+);
+
+const isAssistantAvailable = computed(() => !!assistant.value?.id);
+
+const controlItems = computed(() => {
+  return [
+    {
+      name: t(
+        'CAPTAIN.ASSISTANTS.SETTINGS.CONTROL_ITEMS.OPTIONS.GUARDRAILS.TITLE'
+      ),
+      description: t(
+        'CAPTAIN.ASSISTANTS.SETTINGS.CONTROL_ITEMS.OPTIONS.GUARDRAILS.DESCRIPTION'
+      ),
+      // routeName: 'captain_assistants_guardrails_index',
+    },
+    {
+      name: t(
+        'CAPTAIN.ASSISTANTS.SETTINGS.CONTROL_ITEMS.OPTIONS.SCENARIOS.TITLE'
+      ),
+      description: t(
+        'CAPTAIN.ASSISTANTS.SETTINGS.CONTROL_ITEMS.OPTIONS.SCENARIOS.DESCRIPTION'
+      ),
+      // routeName: 'captain_assistants_scenarios_index',
+    },
+    {
+      name: t(
+        'CAPTAIN.ASSISTANTS.SETTINGS.CONTROL_ITEMS.OPTIONS.RESPONSE_GUIDELINES.TITLE'
+      ),
+      description: t(
+        'CAPTAIN.ASSISTANTS.SETTINGS.CONTROL_ITEMS.OPTIONS.RESPONSE_GUIDELINES.DESCRIPTION'
+      ),
+      // routeName: 'captain_assistants_guidelines_index',
+    },
+  ];
+});
+
+const breadcrumbItems = computed(() => {
+  const activeControlItem = controlItems.value?.find(
+    item => item.routeName === route.name
+  );
+
+  return [
+    {
+      label: t('CAPTAIN.ASSISTANTS.SETTINGS.BREADCRUMB.ASSISTANT'),
+      routeName: 'captain_assistants_index',
+    },
+    { label: assistant.value?.name, routeName: 'captain_assistants_edit' },
+    ...(activeControlItem
+      ? [
+          {
+            label: activeControlItem.name,
+            routeName: activeControlItem.routeName,
+          },
+        ]
+      : []),
+  ];
+});
+
+const handleSubmit = async updatedAssistant => {
+  try {
+    await store.dispatch('captainAssistants/update', {
+      id: assistantId,
+      ...updatedAssistant,
+    });
+    useAlert(t('CAPTAIN.ASSISTANTS.EDIT.SUCCESS_MESSAGE'));
+  } catch (error) {
+    const errorMessage =
+      error?.message || t('CAPTAIN.ASSISTANTS.EDIT.ERROR_MESSAGE');
+    useAlert(errorMessage);
+  }
+};
+
+onMounted(() => {
+  if (!isAssistantAvailable.value) {
+    store.dispatch('captainAssistants/show', assistantId);
+  }
+});
+</script>
+
+<template>
+  <SettingsPageLayout
+    :breadcrumb-items="breadcrumbItems"
+    :is-fetching="isFetching"
+    class="[&>div]:max-w-[80rem]"
+  >
+    <template #body>
+      <div class="flex flex-col gap-6">
+        <div class="flex flex-col gap-6">
+          <SettingsHeader
+            :heading="t('CAPTAIN.ASSISTANTS.SETTINGS.BASIC_SETTINGS.TITLE')"
+            :description="
+              t('CAPTAIN.ASSISTANTS.SETTINGS.BASIC_SETTINGS.DESCRIPTION')
+            "
+          />
+          <AssistantBasicSettingsForm
+            :assistant="assistant"
+            @submit="handleSubmit"
+          />
+        </div>
+        <span class="h-px w-full bg-n-weak mt-2" />
+        <div class="flex flex-col gap-6">
+          <SettingsHeader
+            :heading="t('CAPTAIN.ASSISTANTS.SETTINGS.SYSTEM_SETTINGS.TITLE')"
+            :description="
+              t('CAPTAIN.ASSISTANTS.SETTINGS.SYSTEM_SETTINGS.DESCRIPTION')
+            "
+          />
+          <AssistantSystemSettingsForm
+            :assistant="assistant"
+            @submit="handleSubmit"
+          />
+        </div>
+      </div>
+    </template>
+    <template #controls>
+      <div class="flex flex-col gap-6">
+        <SettingsHeader
+          :heading="t('CAPTAIN.ASSISTANTS.SETTINGS.CONTROL_ITEMS.TITLE')"
+          :description="
+            t('CAPTAIN.ASSISTANTS.SETTINGS.CONTROL_ITEMS.DESCRIPTION')
+          "
+        />
+        <div class="flex flex-col gap-6">
+          <AssistantControlItems
+            v-for="item in controlItems"
+            :key="item.name"
+            :control-item="item"
+          />
+        </div>
+      </div>
+    </template>
+  </SettingsPageLayout>
+</template>
diff --git a/app/javascript/dashboard/routes/dashboard/captain/captain.routes.js b/app/javascript/dashboard/routes/dashboard/captain/captain.routes.js
index 17afeca14..7294a7433 100644
--- a/app/javascript/dashboard/routes/dashboard/captain/captain.routes.js
+++ b/app/javascript/dashboard/routes/dashboard/captain/captain.routes.js
@@ -3,6 +3,7 @@ import { INSTALLATION_TYPES } from 'dashboard/constants/installationTypes';
 import { frontendURL } from '../../../helper/URLHelper';
 import AssistantIndex from './assistants/Index.vue';
 import AssistantEdit from './assistants/Edit.vue';
+// import AssistantSettings from './assistants/settings/Settings.vue';
 import AssistantInboxesIndex from './assistants/inboxes/Index.vue';
 import DocumentsIndex from './documents/Index.vue';
 import ResponsesIndex from './responses/Index.vue';
diff --git a/config/features.yml b/config/features.yml
index 5171b1c01..d41f705ad 100644
--- a/config/features.yml
+++ b/config/features.yml
@@ -176,3 +176,7 @@
 - name: notion_integration
   display_name: Notion Integration
   enabled: false
+- name: captain_integration_v2
+  display_name: Captain V2
+  enabled: false
+  premium: true

From 661326ae51ed7cd21d87e4aec5be19f327d3cdc6 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Mon, 14 Jul 2025 10:27:50 +0530
Subject: [PATCH 08/20] fix: Contact name editing did not allow spaces (#11931)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Pull Request Template

## Description

This PR fixes an issue where editing a contact name from the “Contacts”
tab would not allow spaces in the First or Last Name fields — the space
would disappear immediately after typing.
This issue did not occur in the sidebar editor or when adding a new
contact.



**Cause:** The form had a deep watcher on `contactData`, which triggered
`prepareStateBasedOnProps()` on every nested change. This caused the
form state to reset.

**Solution:** Replaced the deep watcher with a shallow watcher that only
watches `contactData.id`.
This fires once on mount and whenever a new contact is selected,
avoiding unnecessary re-hydration while the user is typing.


Fixes https://github.com/chatwoot/chatwoot/issues/11922 ,
CW-[4623](https://linear.app/chatwoot/issue/CW-4623/inconsistent-name-field-validation-when-editing-contacts-from-contacts)

## Type of change

- [x] Bug fix (non-breaking change which fixes an issue)

## How Has This Been Tested?

### Screencast


https://github.com/user-attachments/assets/e088f627-d7b1-4d67-85eb-58911ac0c012



## Checklist:

- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my code
- [ ] I have commented on my code, particularly in hard-to-understand
areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [x] New and existing unit tests pass locally with my changes
- [ ] Any dependent changes have been merged and published in downstream
modules
---
 .../Contacts/ContactsForm/ContactsForm.vue            | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/javascript/dashboard/components-next/Contacts/ContactsForm/ContactsForm.vue b/app/javascript/dashboard/components-next/Contacts/ContactsForm/ContactsForm.vue
index cd8c767b8..e77a0c10d 100644
--- a/app/javascript/dashboard/components-next/Contacts/ContactsForm/ContactsForm.vue
+++ b/app/javascript/dashboard/components-next/Contacts/ContactsForm/ContactsForm.vue
@@ -218,10 +218,13 @@ const resetForm = () => {
   Object.assign(state, defaultState);
 };
 
-watch(() => props.contactData, prepareStateBasedOnProps, {
-  immediate: true,
-  deep: true,
-});
+watch(
+  () => props.contactData?.id,
+  id => {
+    if (id) prepareStateBasedOnProps();
+  },
+  { immediate: true }
+);
 
 // Expose state to parent component for avatar upload
 defineExpose({

From 07dd6448f47580332ac7f6cb803ea470b2ee8e76 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Mon, 14 Jul 2025 11:02:51 +0530
Subject: [PATCH 09/20] fix: fast scrolling in canned responses list on mouse
 hover (#11933)

# Pull Request Template

## Description

This PR fixes a fast scrolling issue in the canned responses list that
occurred when hovering near the top or bottom edge.

Fixes https://github.com/chatwoot/chatwoot/issues/11923,
[CW-4624](https://linear.app/chatwoot/issue/CW-4624/canned-responses-menu-scrolls-too-fast-when-mouse-near-top-or-bottom)

## Type of change

- [x] Bug fix (non-breaking change which fixes an issue)

## How Has This Been Tested?

### Screencast

**Before**


https://github.com/user-attachments/assets/1c39ad33-c5c9-49ce-a252-542428b7f7e3

**After**


https://github.com/user-attachments/assets/19c73713-0ffe-461a-9c3d-486e53e21abf




## Checklist:

- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my code
- [ ] I have commented on my code, particularly in hard-to-understand
areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [x] New and existing unit tests pass locally with my changes
- [ ] Any dependent changes have been merged and published in downstream
modules
---
 .../widgets/mentions/MentionBox.vue           | 23 ++++++++-----------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/app/javascript/dashboard/components/widgets/mentions/MentionBox.vue b/app/javascript/dashboard/components/widgets/mentions/MentionBox.vue
index 894ab3045..999ec758d 100644
--- a/app/javascript/dashboard/components/widgets/mentions/MentionBox.vue
+++ b/app/javascript/dashboard/components/widgets/mentions/MentionBox.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, watch, computed } from 'vue';
+import { ref, watch, computed, nextTick } from 'vue';
 import { useKeyboardNavigableList } from 'dashboard/composables/useKeyboardNavigableList';
 
 const props = defineProps({
@@ -19,19 +19,16 @@ const mentionsListContainerRef = ref(null);
 const selectedIndex = ref(0);
 
 const adjustScroll = () => {
-  const container = mentionsListContainerRef.value;
-  const item = container.querySelector(`#mention-item-${selectedIndex.value}`);
-  if (item) {
-    const itemTop = item.offsetTop;
-    const itemBottom = itemTop + item.offsetHeight;
-    const containerTop = container.scrollTop;
-    const containerBottom = containerTop + container.offsetHeight;
-    if (itemTop < containerTop) {
-      container.scrollTop = itemTop;
-    } else if (itemBottom + 34 > containerBottom) {
-      container.scrollTop = itemBottom - container.offsetHeight + 34;
+  nextTick(() => {
+    const container = mentionsListContainerRef.value;
+    if (!container) return;
+    const selectedElement = container.querySelector(
+      `#mention-item-${selectedIndex.value}`
+    );
+    if (selectedElement) {
+      selectedElement.scrollIntoView({ block: 'nearest', behavior: 'auto' });
     }
-  }
+  });
 };
 
 const onSelect = () => {

From d89fa09359f1091b1fa2569d694484c68d44f5d6 Mon Sep 17 00:00:00 2001
From: Chatwoot Bot <92152627+chatwoot-bot@users.noreply.github.com>
Date: Mon, 14 Jul 2025 02:22:57 -0700
Subject: [PATCH 10/20] chore: Update translations (#11903)

Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
---
 .../i18n/locale/am/attributesMgmt.json        | 12 +++++++
 .../dashboard/i18n/locale/am/automation.json  | 11 ++++++
 .../i18n/locale/am/generalSettings.json       |  1 +
 .../i18n/locale/am/integrations.json          | 31 ++++++++++++++++
 .../dashboard/i18n/locale/am/macros.json      |  7 ++++
 .../i18n/locale/ar/attributesMgmt.json        | 12 +++++++
 .../dashboard/i18n/locale/ar/automation.json  | 11 ++++++
 .../i18n/locale/ar/generalSettings.json       |  1 +
 .../i18n/locale/ar/integrations.json          | 31 ++++++++++++++++
 .../dashboard/i18n/locale/ar/macros.json      |  7 ++++
 .../i18n/locale/az/attributesMgmt.json        | 12 +++++++
 .../dashboard/i18n/locale/az/automation.json  | 11 ++++++
 .../i18n/locale/az/generalSettings.json       |  1 +
 .../i18n/locale/az/integrations.json          | 31 ++++++++++++++++
 .../dashboard/i18n/locale/az/macros.json      |  7 ++++
 .../i18n/locale/bg/attributesMgmt.json        | 12 +++++++
 .../dashboard/i18n/locale/bg/automation.json  | 11 ++++++
 .../i18n/locale/bg/generalSettings.json       |  1 +
 .../i18n/locale/bg/integrations.json          | 31 ++++++++++++++++
 .../dashboard/i18n/locale/bg/macros.json      |  7 ++++
 .../i18n/locale/ca/attributesMgmt.json        | 12 +++++++
 .../dashboard/i18n/locale/ca/automation.json  | 11 ++++++
 .../i18n/locale/ca/generalSettings.json       |  1 +
 .../i18n/locale/ca/integrations.json          | 31 ++++++++++++++++
 .../dashboard/i18n/locale/ca/macros.json      |  7 ++++
 .../i18n/locale/cs/attributesMgmt.json        | 12 +++++++
 .../dashboard/i18n/locale/cs/automation.json  | 11 ++++++
 .../i18n/locale/cs/generalSettings.json       |  1 +
 .../i18n/locale/cs/integrations.json          | 31 ++++++++++++++++
 .../dashboard/i18n/locale/cs/macros.json      |  7 ++++
 .../i18n/locale/da/attributesMgmt.json        | 12 +++++++
 .../dashboard/i18n/locale/da/automation.json  | 11 ++++++
 .../i18n/locale/da/generalSettings.json       |  1 +
 .../i18n/locale/da/integrations.json          | 31 ++++++++++++++++
 .../dashboard/i18n/locale/da/macros.json      |  7 ++++
 .../i18n/locale/de/attributesMgmt.json        | 12 +++++++
 .../dashboard/i18n/locale/de/automation.json  | 11 ++++++
 .../i18n/locale/de/generalSettings.json       |  1 +
 .../i18n/locale/de/integrations.json          | 31 ++++++++++++++++
 .../dashboard/i18n/locale/de/macros.json      |  7 ++++
 .../i18n/locale/el/attributesMgmt.json        | 12 +++++++
 .../dashboard/i18n/locale/el/automation.json  | 11 ++++++
 .../i18n/locale/el/generalSettings.json       |  1 +
 .../i18n/locale/el/integrations.json          | 31 ++++++++++++++++
 .../dashboard/i18n/locale/el/macros.json      |  7 ++++
 .../i18n/locale/es/attributesMgmt.json        | 12 +++++++
 .../dashboard/i18n/locale/es/automation.json  | 11 ++++++
 .../i18n/locale/es/generalSettings.json       |  1 +
 .../i18n/locale/es/integrations.json          | 31 ++++++++++++++++
 .../dashboard/i18n/locale/es/macros.json      |  7 ++++
 .../i18n/locale/fa/attributesMgmt.json        | 12 +++++++
 .../dashboard/i18n/locale/fa/automation.json  | 11 ++++++
 .../i18n/locale/fa/generalSettings.json       |  1 +
 .../i18n/locale/fa/integrations.json          | 31 ++++++++++++++++
 .../dashboard/i18n/locale/fa/macros.json      |  7 ++++
 .../i18n/locale/fi/attributesMgmt.json        | 12 +++++++
 .../dashboard/i18n/locale/fi/automation.json  | 11 ++++++
 .../i18n/locale/fi/generalSettings.json       |  1 +
 .../i18n/locale/fi/integrations.json          | 31 ++++++++++++++++
 .../dashboard/i18n/locale/fi/macros.json      |  7 ++++
 .../i18n/locale/fr/attributesMgmt.json        | 12 +++++++
 .../dashboard/i18n/locale/fr/automation.json  | 11 ++++++
 .../i18n/locale/fr/generalSettings.json       |  1 +
 .../i18n/locale/fr/integrations.json          | 31 ++++++++++++++++
 .../dashboard/i18n/locale/fr/macros.json      |  7 ++++
 .../i18n/locale/he/attributesMgmt.json        | 12 +++++++
 .../dashboard/i18n/locale/he/automation.json  | 11 ++++++
 .../i18n/locale/he/generalSettings.json       |  1 +
 .../i18n/locale/he/integrations.json          | 31 ++++++++++++++++
 .../dashboard/i18n/locale/he/macros.json      |  7 ++++
 .../i18n/locale/hi/attributesMgmt.json        | 12 +++++++
 .../dashboard/i18n/locale/hi/automation.json  | 11 ++++++
 .../i18n/locale/hi/generalSettings.json       |  1 +
 .../i18n/locale/hi/integrations.json          | 31 ++++++++++++++++
 .../dashboard/i18n/locale/hi/macros.json      |  7 ++++
 .../i18n/locale/hr/attributesMgmt.json        | 12 +++++++
 .../dashboard/i18n/locale/hr/automation.json  | 11 ++++++
 .../i18n/locale/hr/generalSettings.json       |  1 +
 .../i18n/locale/hr/integrations.json          | 31 ++++++++++++++++
 .../dashboard/i18n/locale/hr/macros.json      |  7 ++++
 .../i18n/locale/hu/attributesMgmt.json        | 12 +++++++
 .../dashboard/i18n/locale/hu/automation.json  | 11 ++++++
 .../i18n/locale/hu/generalSettings.json       |  1 +
 .../i18n/locale/hu/integrations.json          | 31 ++++++++++++++++
 .../dashboard/i18n/locale/hu/macros.json      |  7 ++++
 .../i18n/locale/hy/attributesMgmt.json        | 12 +++++++
 .../dashboard/i18n/locale/hy/automation.json  | 11 ++++++
 .../i18n/locale/hy/generalSettings.json       |  1 +
 .../i18n/locale/hy/integrations.json          | 31 ++++++++++++++++
 .../dashboard/i18n/locale/hy/macros.json      |  7 ++++
 .../i18n/locale/id/attributesMgmt.json        | 12 +++++++
 .../dashboard/i18n/locale/id/automation.json  | 11 ++++++
 .../i18n/locale/id/generalSettings.json       |  1 +
 .../i18n/locale/id/integrations.json          | 31 ++++++++++++++++
 .../dashboard/i18n/locale/id/macros.json      |  7 ++++
 .../i18n/locale/is/attributesMgmt.json        | 12 +++++++
 .../dashboard/i18n/locale/is/automation.json  | 11 ++++++
 .../i18n/locale/is/generalSettings.json       |  1 +
 .../i18n/locale/is/integrations.json          | 31 ++++++++++++++++
 .../dashboard/i18n/locale/is/macros.json      |  7 ++++
 .../i18n/locale/it/attributesMgmt.json        | 12 +++++++
 .../dashboard/i18n/locale/it/automation.json  | 11 ++++++
 .../i18n/locale/it/generalSettings.json       |  1 +
 .../i18n/locale/it/integrations.json          | 31 ++++++++++++++++
 .../dashboard/i18n/locale/it/macros.json      |  7 ++++
 .../i18n/locale/ja/attributesMgmt.json        | 12 +++++++
 .../dashboard/i18n/locale/ja/automation.json  | 11 ++++++
 .../i18n/locale/ja/generalSettings.json       |  1 +
 .../i18n/locale/ja/integrations.json          | 31 ++++++++++++++++
 .../dashboard/i18n/locale/ja/macros.json      |  7 ++++
 .../i18n/locale/ka/attributesMgmt.json        | 12 +++++++
 .../dashboard/i18n/locale/ka/automation.json  | 11 ++++++
 .../i18n/locale/ka/generalSettings.json       |  1 +
 .../i18n/locale/ka/integrations.json          | 31 ++++++++++++++++
 .../dashboard/i18n/locale/ka/macros.json      |  7 ++++
 .../i18n/locale/ko/attributesMgmt.json        | 12 +++++++
 .../dashboard/i18n/locale/ko/automation.json  | 11 ++++++
 .../i18n/locale/ko/generalSettings.json       |  1 +
 .../i18n/locale/ko/integrations.json          | 31 ++++++++++++++++
 .../dashboard/i18n/locale/ko/macros.json      |  7 ++++
 .../i18n/locale/lt/attributesMgmt.json        | 12 +++++++
 .../dashboard/i18n/locale/lt/automation.json  | 11 ++++++
 .../i18n/locale/lt/generalSettings.json       |  1 +
 .../i18n/locale/lt/integrations.json          | 31 ++++++++++++++++
 .../dashboard/i18n/locale/lt/macros.json      |  7 ++++
 .../i18n/locale/lv/attributesMgmt.json        | 12 +++++++
 .../dashboard/i18n/locale/lv/automation.json  | 11 ++++++
 .../i18n/locale/lv/generalSettings.json       |  1 +
 .../i18n/locale/lv/integrations.json          | 31 ++++++++++++++++
 .../dashboard/i18n/locale/lv/macros.json      |  7 ++++
 .../i18n/locale/ml/attributesMgmt.json        | 12 +++++++
 .../dashboard/i18n/locale/ml/automation.json  | 11 ++++++
 .../i18n/locale/ml/generalSettings.json       |  1 +
 .../i18n/locale/ml/integrations.json          | 31 ++++++++++++++++
 .../dashboard/i18n/locale/ml/macros.json      |  7 ++++
 .../i18n/locale/ms/attributesMgmt.json        | 12 +++++++
 .../dashboard/i18n/locale/ms/automation.json  | 11 ++++++
 .../i18n/locale/ms/generalSettings.json       |  1 +
 .../i18n/locale/ms/integrations.json          | 31 ++++++++++++++++
 .../dashboard/i18n/locale/ms/macros.json      |  7 ++++
 .../i18n/locale/ne/attributesMgmt.json        | 12 +++++++
 .../dashboard/i18n/locale/ne/automation.json  | 11 ++++++
 .../i18n/locale/ne/generalSettings.json       |  1 +
 .../i18n/locale/ne/integrations.json          | 31 ++++++++++++++++
 .../dashboard/i18n/locale/ne/macros.json      |  7 ++++
 .../i18n/locale/nl/attributesMgmt.json        | 12 +++++++
 .../dashboard/i18n/locale/nl/automation.json  | 11 ++++++
 .../i18n/locale/nl/generalSettings.json       |  1 +
 .../i18n/locale/nl/integrations.json          | 31 ++++++++++++++++
 .../dashboard/i18n/locale/nl/macros.json      |  7 ++++
 .../i18n/locale/no/attributesMgmt.json        | 12 +++++++
 .../dashboard/i18n/locale/no/automation.json  | 11 ++++++
 .../i18n/locale/no/generalSettings.json       |  1 +
 .../i18n/locale/no/integrations.json          | 31 ++++++++++++++++
 .../dashboard/i18n/locale/no/macros.json      |  7 ++++
 .../i18n/locale/pl/attributesMgmt.json        | 12 +++++++
 .../dashboard/i18n/locale/pl/automation.json  | 11 ++++++
 .../i18n/locale/pl/generalSettings.json       |  1 +
 .../i18n/locale/pl/integrations.json          | 31 ++++++++++++++++
 .../dashboard/i18n/locale/pl/macros.json      |  7 ++++
 .../i18n/locale/pt/attributesMgmt.json        | 12 +++++++
 .../dashboard/i18n/locale/pt/automation.json  | 11 ++++++
 .../i18n/locale/pt/generalSettings.json       |  1 +
 .../i18n/locale/pt/integrations.json          | 31 ++++++++++++++++
 .../dashboard/i18n/locale/pt/macros.json      |  7 ++++
 .../i18n/locale/pt_BR/attributesMgmt.json     | 12 +++++++
 .../i18n/locale/pt_BR/automation.json         | 11 ++++++
 .../i18n/locale/pt_BR/generalSettings.json    |  1 +
 .../i18n/locale/pt_BR/integrations.json       | 31 ++++++++++++++++
 .../dashboard/i18n/locale/pt_BR/macros.json   |  7 ++++
 .../i18n/locale/ro/attributesMgmt.json        | 12 +++++++
 .../dashboard/i18n/locale/ro/automation.json  | 11 ++++++
 .../i18n/locale/ro/generalSettings.json       |  1 +
 .../i18n/locale/ro/integrations.json          | 31 ++++++++++++++++
 .../dashboard/i18n/locale/ro/macros.json      |  7 ++++
 .../dashboard/i18n/locale/ru/agentBots.json   |  6 ++--
 .../i18n/locale/ru/attributesMgmt.json        | 12 +++++++
 .../dashboard/i18n/locale/ru/automation.json  | 35 ++++++++++++-------
 .../dashboard/i18n/locale/ru/contact.json     |  8 ++---
 .../i18n/locale/ru/conversation.json          | 12 +++----
 .../i18n/locale/ru/generalSettings.json       | 31 ++++++++--------
 .../dashboard/i18n/locale/ru/inboxMgmt.json   | 14 ++++----
 .../i18n/locale/ru/integrations.json          | 31 ++++++++++++++++
 .../dashboard/i18n/locale/ru/macros.json      | 23 +++++++-----
 .../dashboard/i18n/locale/ru/settings.json    |  2 +-
 .../i18n/locale/sh/attributesMgmt.json        | 12 +++++++
 .../dashboard/i18n/locale/sh/automation.json  | 11 ++++++
 .../i18n/locale/sh/generalSettings.json       |  1 +
 .../i18n/locale/sh/integrations.json          | 31 ++++++++++++++++
 .../dashboard/i18n/locale/sh/macros.json      |  7 ++++
 .../i18n/locale/sk/attributesMgmt.json        | 12 +++++++
 .../dashboard/i18n/locale/sk/automation.json  | 11 ++++++
 .../i18n/locale/sk/generalSettings.json       |  1 +
 .../i18n/locale/sk/integrations.json          | 31 ++++++++++++++++
 .../dashboard/i18n/locale/sk/macros.json      |  7 ++++
 .../i18n/locale/sl/attributesMgmt.json        | 12 +++++++
 .../dashboard/i18n/locale/sl/automation.json  | 11 ++++++
 .../i18n/locale/sl/generalSettings.json       |  1 +
 .../i18n/locale/sl/integrations.json          | 31 ++++++++++++++++
 .../dashboard/i18n/locale/sl/macros.json      |  7 ++++
 .../i18n/locale/sq/attributesMgmt.json        | 12 +++++++
 .../dashboard/i18n/locale/sq/automation.json  | 11 ++++++
 .../i18n/locale/sq/generalSettings.json       |  1 +
 .../i18n/locale/sq/integrations.json          | 31 ++++++++++++++++
 .../dashboard/i18n/locale/sq/macros.json      |  7 ++++
 .../i18n/locale/sr/attributesMgmt.json        | 12 +++++++
 .../dashboard/i18n/locale/sr/automation.json  | 11 ++++++
 .../i18n/locale/sr/generalSettings.json       |  1 +
 .../i18n/locale/sr/integrations.json          | 31 ++++++++++++++++
 .../dashboard/i18n/locale/sr/macros.json      |  7 ++++
 .../i18n/locale/sv/attributesMgmt.json        | 12 +++++++
 .../dashboard/i18n/locale/sv/automation.json  | 11 ++++++
 .../i18n/locale/sv/generalSettings.json       |  1 +
 .../i18n/locale/sv/integrations.json          | 31 ++++++++++++++++
 .../dashboard/i18n/locale/sv/macros.json      |  7 ++++
 .../i18n/locale/ta/attributesMgmt.json        | 12 +++++++
 .../dashboard/i18n/locale/ta/automation.json  | 11 ++++++
 .../i18n/locale/ta/generalSettings.json       |  1 +
 .../i18n/locale/ta/integrations.json          | 31 ++++++++++++++++
 .../dashboard/i18n/locale/ta/macros.json      |  7 ++++
 .../i18n/locale/th/attributesMgmt.json        | 12 +++++++
 .../dashboard/i18n/locale/th/automation.json  | 11 ++++++
 .../i18n/locale/th/generalSettings.json       |  1 +
 .../i18n/locale/th/integrations.json          | 31 ++++++++++++++++
 .../dashboard/i18n/locale/th/macros.json      |  7 ++++
 .../i18n/locale/tl/attributesMgmt.json        | 12 +++++++
 .../dashboard/i18n/locale/tl/automation.json  | 11 ++++++
 .../i18n/locale/tl/generalSettings.json       |  1 +
 .../i18n/locale/tl/integrations.json          | 31 ++++++++++++++++
 .../dashboard/i18n/locale/tl/macros.json      |  7 ++++
 .../i18n/locale/tr/attributesMgmt.json        | 12 +++++++
 .../dashboard/i18n/locale/tr/automation.json  | 11 ++++++
 .../i18n/locale/tr/generalSettings.json       |  1 +
 .../i18n/locale/tr/integrations.json          | 31 ++++++++++++++++
 .../dashboard/i18n/locale/tr/macros.json      |  7 ++++
 .../i18n/locale/uk/attributesMgmt.json        | 12 +++++++
 .../dashboard/i18n/locale/uk/automation.json  | 11 ++++++
 .../i18n/locale/uk/generalSettings.json       |  1 +
 .../i18n/locale/uk/integrations.json          | 31 ++++++++++++++++
 .../dashboard/i18n/locale/uk/macros.json      |  7 ++++
 .../i18n/locale/ur/attributesMgmt.json        | 12 +++++++
 .../dashboard/i18n/locale/ur/automation.json  | 11 ++++++
 .../i18n/locale/ur/generalSettings.json       |  1 +
 .../i18n/locale/ur/integrations.json          | 31 ++++++++++++++++
 .../dashboard/i18n/locale/ur/macros.json      |  7 ++++
 .../i18n/locale/ur_IN/attributesMgmt.json     | 12 +++++++
 .../i18n/locale/ur_IN/automation.json         | 11 ++++++
 .../i18n/locale/ur_IN/generalSettings.json    |  1 +
 .../i18n/locale/ur_IN/integrations.json       | 31 ++++++++++++++++
 .../dashboard/i18n/locale/ur_IN/macros.json   |  7 ++++
 .../i18n/locale/vi/attributesMgmt.json        | 12 +++++++
 .../dashboard/i18n/locale/vi/automation.json  | 11 ++++++
 .../i18n/locale/vi/generalSettings.json       |  1 +
 .../i18n/locale/vi/integrations.json          | 31 ++++++++++++++++
 .../dashboard/i18n/locale/vi/macros.json      |  7 ++++
 .../i18n/locale/zh_CN/attributesMgmt.json     | 12 +++++++
 .../i18n/locale/zh_CN/automation.json         | 11 ++++++
 .../i18n/locale/zh_CN/generalSettings.json    |  1 +
 .../i18n/locale/zh_CN/integrations.json       | 31 ++++++++++++++++
 .../dashboard/i18n/locale/zh_CN/macros.json   |  7 ++++
 .../i18n/locale/zh_TW/attributesMgmt.json     | 12 +++++++
 .../i18n/locale/zh_TW/automation.json         | 11 ++++++
 .../i18n/locale/zh_TW/generalSettings.json    |  1 +
 .../i18n/locale/zh_TW/integrations.json       | 31 ++++++++++++++++
 .../dashboard/i18n/locale/zh_TW/macros.json   |  7 ++++
 config/locales/ru.yml                         |  2 +-
 266 files changed, 3281 insertions(+), 57 deletions(-)

diff --git a/app/javascript/dashboard/i18n/locale/am/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/am/attributesMgmt.json
index dd413ab26..cea6359de 100644
--- a/app/javascript/dashboard/i18n/locale/am/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/am/attributesMgmt.json
@@ -5,6 +5,18 @@
     "LOADING": "Fetching custom attributes",
     "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.",
     "LEARN_MORE": "Learn more about custom attributes",
+    "ATTRIBUTE_MODELS": {
+      "CONVERSATION": "Conversation",
+      "CONTACT": "Contact"
+    },
+    "ATTRIBUTE_TYPES": {
+      "TEXT": "Text",
+      "NUMBER": "Number",
+      "LINK": "Link",
+      "DATE": "Date",
+      "LIST": "List",
+      "CHECKBOX": "Checkbox"
+    },
     "ADD": {
       "TITLE": "Add Custom Attribute",
       "SUBMIT": "Create",
diff --git a/app/javascript/dashboard/i18n/locale/am/automation.json b/app/javascript/dashboard/i18n/locale/am/automation.json
index c5dd4a514..cb030332f 100644
--- a/app/javascript/dashboard/i18n/locale/am/automation.json
+++ b/app/javascript/dashboard/i18n/locale/am/automation.json
@@ -150,6 +150,17 @@
       "ADD_SLA": "Add SLA",
       "OPEN_CONVERSATION": "Open conversation"
     },
+    "MESSAGE_TYPES": {
+      "INCOMING": "Incoming Message",
+      "OUTGOING": "Outgoing Message"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "None",
+      "LOW": "Low",
+      "MEDIUM": "Medium",
+      "HIGH": "High",
+      "URGENT": "Urgent"
+    },
     "ATTRIBUTES": {
       "MESSAGE_TYPE": "Message Type",
       "MESSAGE_CONTAINS": "Message Contains",
diff --git a/app/javascript/dashboard/i18n/locale/am/generalSettings.json b/app/javascript/dashboard/i18n/locale/am/generalSettings.json
index 9055574c5..d924bffbd 100644
--- a/app/javascript/dashboard/i18n/locale/am/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/am/generalSettings.json
@@ -134,6 +134,7 @@
     "MULTISELECT": {
       "ENTER_TO_SELECT": "Press enter to select",
       "ENTER_TO_REMOVE": "Press enter to remove",
+      "NO_OPTIONS": "List is empty",
       "SELECT_ONE": "Select one",
       "SELECT": "Select"
     }
diff --git a/app/javascript/dashboard/i18n/locale/am/integrations.json b/app/javascript/dashboard/i18n/locale/am/integrations.json
index ed5ef8b72..6dc0e6cb3 100644
--- a/app/javascript/dashboard/i18n/locale/am/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/am/integrations.json
@@ -481,6 +481,37 @@
         "ERROR_MESSAGE": "There was an error updating the assistant, please try again.",
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
+      "SETTINGS": {
+        "BREADCRUMB": {
+          "ASSISTANT": "Assistant"
+        },
+        "BASIC_SETTINGS": {
+          "TITLE": "Basic settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "SYSTEM_SETTINGS": {
+          "TITLE": "System settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "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.",
+          "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."
+            },
+            "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.”"
+            },
+            "RESPONSE_GUIDELINES": {
+              "TITLE": "Response guidelines",
+              "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
+            }
+          }
+        }
+      },
       "OPTIONS": {
         "EDIT_ASSISTANT": "Edit Assistant",
         "DELETE_ASSISTANT": "Delete Assistant",
diff --git a/app/javascript/dashboard/i18n/locale/am/macros.json b/app/javascript/dashboard/i18n/locale/am/macros.json
index d22744190..fcb409f34 100644
--- a/app/javascript/dashboard/i18n/locale/am/macros.json
+++ b/app/javascript/dashboard/i18n/locale/am/macros.json
@@ -99,6 +99,13 @@
       "CHANGE_PRIORITY": "Change Priority",
       "ADD_PRIVATE_NOTE": "Add a Private Note",
       "SEND_WEBHOOK_EVENT": "Send Webhook Event"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "None",
+      "LOW": "Low",
+      "MEDIUM": "Medium",
+      "HIGH": "High",
+      "URGENT": "Urgent"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ar/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/ar/attributesMgmt.json
index 23edb12d3..25fa4a68d 100644
--- a/app/javascript/dashboard/i18n/locale/ar/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ar/attributesMgmt.json
@@ -5,6 +5,18 @@
     "LOADING": "جلب الصفات المخصصة",
     "DESCRIPTION": "سمة مخصصة تتتبع تفاصيل إضافية حول جهات الاتصال أو المحادثات الخاصة بك - مثل خطة الاشتراك أو تاريخ الشراء الأول. يمكنك إضافة أنواع مختلفة من السمات المخصصة، مثل النص أو القوائم أو الأرقام، لالتقاط المعلومات المحددة التي تحتاجها.",
     "LEARN_MORE": "تعرف على المزيد حول السمات المخصصة",
+    "ATTRIBUTE_MODELS": {
+      "CONVERSATION": "المحادثات",
+      "CONTACT": "جهات الاتصال"
+    },
+    "ATTRIBUTE_TYPES": {
+      "TEXT": "النص",
+      "NUMBER": "العدد",
+      "LINK": "الرابط",
+      "DATE": "Date",
+      "LIST": "القائمة",
+      "CHECKBOX": "خانة الاختيار"
+    },
     "ADD": {
       "TITLE": "إضافة صفة خاصة",
       "SUBMIT": "إنشاء",
diff --git a/app/javascript/dashboard/i18n/locale/ar/automation.json b/app/javascript/dashboard/i18n/locale/ar/automation.json
index 3b7962a9e..ebb94fb2d 100644
--- a/app/javascript/dashboard/i18n/locale/ar/automation.json
+++ b/app/javascript/dashboard/i18n/locale/ar/automation.json
@@ -150,6 +150,17 @@
       "ADD_SLA": "Add SLA",
       "OPEN_CONVERSATION": "فتح المحادثة"
     },
+    "MESSAGE_TYPES": {
+      "INCOMING": "Incoming Message",
+      "OUTGOING": "Outgoing Message"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "لا شيء",
+      "LOW": "منخفضة",
+      "MEDIUM": "متوسطة",
+      "HIGH": "عالية",
+      "URGENT": "عاجل"
+    },
     "ATTRIBUTES": {
       "MESSAGE_TYPE": "Message Type",
       "MESSAGE_CONTAINS": "Message Contains",
diff --git a/app/javascript/dashboard/i18n/locale/ar/generalSettings.json b/app/javascript/dashboard/i18n/locale/ar/generalSettings.json
index 38b78d789..1aaf03e4b 100644
--- a/app/javascript/dashboard/i18n/locale/ar/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ar/generalSettings.json
@@ -134,6 +134,7 @@
     "MULTISELECT": {
       "ENTER_TO_SELECT": "اضغط على زر الإدخال للاختيار",
       "ENTER_TO_REMOVE": "اضغط على زر الإدخال للحذف",
+      "NO_OPTIONS": "List is empty",
       "SELECT_ONE": "اختر واحدا",
       "SELECT": "اختر"
     }
diff --git a/app/javascript/dashboard/i18n/locale/ar/integrations.json b/app/javascript/dashboard/i18n/locale/ar/integrations.json
index e32a292f0..2ba87ef12 100644
--- a/app/javascript/dashboard/i18n/locale/ar/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ar/integrations.json
@@ -481,6 +481,37 @@
         "ERROR_MESSAGE": "There was an error updating the assistant, please try again.",
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
+      "SETTINGS": {
+        "BREADCRUMB": {
+          "ASSISTANT": "Assistant"
+        },
+        "BASIC_SETTINGS": {
+          "TITLE": "Basic settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "SYSTEM_SETTINGS": {
+          "TITLE": "System settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "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.",
+          "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."
+            },
+            "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.”"
+            },
+            "RESPONSE_GUIDELINES": {
+              "TITLE": "Response guidelines",
+              "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
+            }
+          }
+        }
+      },
       "OPTIONS": {
         "EDIT_ASSISTANT": "Edit Assistant",
         "DELETE_ASSISTANT": "Delete Assistant",
diff --git a/app/javascript/dashboard/i18n/locale/ar/macros.json b/app/javascript/dashboard/i18n/locale/ar/macros.json
index e40cc21ff..323309916 100644
--- a/app/javascript/dashboard/i18n/locale/ar/macros.json
+++ b/app/javascript/dashboard/i18n/locale/ar/macros.json
@@ -99,6 +99,13 @@
       "CHANGE_PRIORITY": "تغيير الأولوية",
       "ADD_PRIVATE_NOTE": "Add a Private Note",
       "SEND_WEBHOOK_EVENT": "Send Webhook Event"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "لا شيء",
+      "LOW": "منخفضة",
+      "MEDIUM": "متوسطة",
+      "HIGH": "عالية",
+      "URGENT": "عاجل"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/az/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/az/attributesMgmt.json
index dd413ab26..cea6359de 100644
--- a/app/javascript/dashboard/i18n/locale/az/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/az/attributesMgmt.json
@@ -5,6 +5,18 @@
     "LOADING": "Fetching custom attributes",
     "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.",
     "LEARN_MORE": "Learn more about custom attributes",
+    "ATTRIBUTE_MODELS": {
+      "CONVERSATION": "Conversation",
+      "CONTACT": "Contact"
+    },
+    "ATTRIBUTE_TYPES": {
+      "TEXT": "Text",
+      "NUMBER": "Number",
+      "LINK": "Link",
+      "DATE": "Date",
+      "LIST": "List",
+      "CHECKBOX": "Checkbox"
+    },
     "ADD": {
       "TITLE": "Add Custom Attribute",
       "SUBMIT": "Create",
diff --git a/app/javascript/dashboard/i18n/locale/az/automation.json b/app/javascript/dashboard/i18n/locale/az/automation.json
index c5dd4a514..cb030332f 100644
--- a/app/javascript/dashboard/i18n/locale/az/automation.json
+++ b/app/javascript/dashboard/i18n/locale/az/automation.json
@@ -150,6 +150,17 @@
       "ADD_SLA": "Add SLA",
       "OPEN_CONVERSATION": "Open conversation"
     },
+    "MESSAGE_TYPES": {
+      "INCOMING": "Incoming Message",
+      "OUTGOING": "Outgoing Message"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "None",
+      "LOW": "Low",
+      "MEDIUM": "Medium",
+      "HIGH": "High",
+      "URGENT": "Urgent"
+    },
     "ATTRIBUTES": {
       "MESSAGE_TYPE": "Message Type",
       "MESSAGE_CONTAINS": "Message Contains",
diff --git a/app/javascript/dashboard/i18n/locale/az/generalSettings.json b/app/javascript/dashboard/i18n/locale/az/generalSettings.json
index 9055574c5..d924bffbd 100644
--- a/app/javascript/dashboard/i18n/locale/az/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/az/generalSettings.json
@@ -134,6 +134,7 @@
     "MULTISELECT": {
       "ENTER_TO_SELECT": "Press enter to select",
       "ENTER_TO_REMOVE": "Press enter to remove",
+      "NO_OPTIONS": "List is empty",
       "SELECT_ONE": "Select one",
       "SELECT": "Select"
     }
diff --git a/app/javascript/dashboard/i18n/locale/az/integrations.json b/app/javascript/dashboard/i18n/locale/az/integrations.json
index ed5ef8b72..6dc0e6cb3 100644
--- a/app/javascript/dashboard/i18n/locale/az/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/az/integrations.json
@@ -481,6 +481,37 @@
         "ERROR_MESSAGE": "There was an error updating the assistant, please try again.",
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
+      "SETTINGS": {
+        "BREADCRUMB": {
+          "ASSISTANT": "Assistant"
+        },
+        "BASIC_SETTINGS": {
+          "TITLE": "Basic settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "SYSTEM_SETTINGS": {
+          "TITLE": "System settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "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.",
+          "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."
+            },
+            "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.”"
+            },
+            "RESPONSE_GUIDELINES": {
+              "TITLE": "Response guidelines",
+              "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
+            }
+          }
+        }
+      },
       "OPTIONS": {
         "EDIT_ASSISTANT": "Edit Assistant",
         "DELETE_ASSISTANT": "Delete Assistant",
diff --git a/app/javascript/dashboard/i18n/locale/az/macros.json b/app/javascript/dashboard/i18n/locale/az/macros.json
index d22744190..fcb409f34 100644
--- a/app/javascript/dashboard/i18n/locale/az/macros.json
+++ b/app/javascript/dashboard/i18n/locale/az/macros.json
@@ -99,6 +99,13 @@
       "CHANGE_PRIORITY": "Change Priority",
       "ADD_PRIVATE_NOTE": "Add a Private Note",
       "SEND_WEBHOOK_EVENT": "Send Webhook Event"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "None",
+      "LOW": "Low",
+      "MEDIUM": "Medium",
+      "HIGH": "High",
+      "URGENT": "Urgent"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/bg/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/bg/attributesMgmt.json
index 51d38a9de..2792e3fe1 100644
--- a/app/javascript/dashboard/i18n/locale/bg/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/bg/attributesMgmt.json
@@ -5,6 +5,18 @@
     "LOADING": "Fetching custom attributes",
     "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.",
     "LEARN_MORE": "Learn more about custom attributes",
+    "ATTRIBUTE_MODELS": {
+      "CONVERSATION": "Разговор",
+      "CONTACT": "Contact"
+    },
+    "ATTRIBUTE_TYPES": {
+      "TEXT": "Text",
+      "NUMBER": "Number",
+      "LINK": "Link",
+      "DATE": "Date",
+      "LIST": "List",
+      "CHECKBOX": "Checkbox"
+    },
     "ADD": {
       "TITLE": "Add Custom Attribute",
       "SUBMIT": "Създаване",
diff --git a/app/javascript/dashboard/i18n/locale/bg/automation.json b/app/javascript/dashboard/i18n/locale/bg/automation.json
index bfbddab68..091882f9a 100644
--- a/app/javascript/dashboard/i18n/locale/bg/automation.json
+++ b/app/javascript/dashboard/i18n/locale/bg/automation.json
@@ -150,6 +150,17 @@
       "ADD_SLA": "Add SLA",
       "OPEN_CONVERSATION": "Open conversation"
     },
+    "MESSAGE_TYPES": {
+      "INCOMING": "Incoming Message",
+      "OUTGOING": "Outgoing Message"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "None",
+      "LOW": "Low",
+      "MEDIUM": "Medium",
+      "HIGH": "High",
+      "URGENT": "Urgent"
+    },
     "ATTRIBUTES": {
       "MESSAGE_TYPE": "Message Type",
       "MESSAGE_CONTAINS": "Message Contains",
diff --git a/app/javascript/dashboard/i18n/locale/bg/generalSettings.json b/app/javascript/dashboard/i18n/locale/bg/generalSettings.json
index a452fd932..abe6e4f87 100644
--- a/app/javascript/dashboard/i18n/locale/bg/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/bg/generalSettings.json
@@ -134,6 +134,7 @@
     "MULTISELECT": {
       "ENTER_TO_SELECT": "Press enter to select",
       "ENTER_TO_REMOVE": "Press enter to remove",
+      "NO_OPTIONS": "List is empty",
       "SELECT_ONE": "Select one",
       "SELECT": "Select"
     }
diff --git a/app/javascript/dashboard/i18n/locale/bg/integrations.json b/app/javascript/dashboard/i18n/locale/bg/integrations.json
index 47899e6ee..78ebd6408 100644
--- a/app/javascript/dashboard/i18n/locale/bg/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/bg/integrations.json
@@ -481,6 +481,37 @@
         "ERROR_MESSAGE": "There was an error updating the assistant, please try again.",
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
+      "SETTINGS": {
+        "BREADCRUMB": {
+          "ASSISTANT": "Assistant"
+        },
+        "BASIC_SETTINGS": {
+          "TITLE": "Basic settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "SYSTEM_SETTINGS": {
+          "TITLE": "System settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "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.",
+          "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."
+            },
+            "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.”"
+            },
+            "RESPONSE_GUIDELINES": {
+              "TITLE": "Response guidelines",
+              "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
+            }
+          }
+        }
+      },
       "OPTIONS": {
         "EDIT_ASSISTANT": "Edit Assistant",
         "DELETE_ASSISTANT": "Delete Assistant",
diff --git a/app/javascript/dashboard/i18n/locale/bg/macros.json b/app/javascript/dashboard/i18n/locale/bg/macros.json
index 1822680dd..48f462ac4 100644
--- a/app/javascript/dashboard/i18n/locale/bg/macros.json
+++ b/app/javascript/dashboard/i18n/locale/bg/macros.json
@@ -99,6 +99,13 @@
       "CHANGE_PRIORITY": "Change Priority",
       "ADD_PRIVATE_NOTE": "Add a Private Note",
       "SEND_WEBHOOK_EVENT": "Send Webhook Event"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "None",
+      "LOW": "Low",
+      "MEDIUM": "Medium",
+      "HIGH": "High",
+      "URGENT": "Urgent"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ca/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/ca/attributesMgmt.json
index e91f94361..a99790cb2 100644
--- a/app/javascript/dashboard/i18n/locale/ca/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ca/attributesMgmt.json
@@ -5,6 +5,18 @@
     "LOADING": "S'estan recollint atributs personalitzats",
     "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.",
     "LEARN_MORE": "Learn more about custom attributes",
+    "ATTRIBUTE_MODELS": {
+      "CONVERSATION": "Conversa",
+      "CONTACT": "Contacte"
+    },
+    "ATTRIBUTE_TYPES": {
+      "TEXT": "Llista",
+      "NUMBER": "Número",
+      "LINK": "Enllaç",
+      "DATE": "Date",
+      "LIST": "Llista",
+      "CHECKBOX": "Casella de selecció"
+    },
     "ADD": {
       "TITLE": "Afegir atribut personalitzat",
       "SUBMIT": "Crear",
diff --git a/app/javascript/dashboard/i18n/locale/ca/automation.json b/app/javascript/dashboard/i18n/locale/ca/automation.json
index da6e0753e..7cb9e7b9a 100644
--- a/app/javascript/dashboard/i18n/locale/ca/automation.json
+++ b/app/javascript/dashboard/i18n/locale/ca/automation.json
@@ -150,6 +150,17 @@
       "ADD_SLA": "Afegeix SLA",
       "OPEN_CONVERSATION": "Obrir conversa"
     },
+    "MESSAGE_TYPES": {
+      "INCOMING": "Incoming Message",
+      "OUTGOING": "Outgoing Message"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "Ningú",
+      "LOW": "Baixa",
+      "MEDIUM": "Mitjana",
+      "HIGH": "Alta",
+      "URGENT": "Urgent"
+    },
     "ATTRIBUTES": {
       "MESSAGE_TYPE": "Message Type",
       "MESSAGE_CONTAINS": "Message Contains",
diff --git a/app/javascript/dashboard/i18n/locale/ca/generalSettings.json b/app/javascript/dashboard/i18n/locale/ca/generalSettings.json
index 72df0e477..7f6b166fa 100644
--- a/app/javascript/dashboard/i18n/locale/ca/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ca/generalSettings.json
@@ -134,6 +134,7 @@
     "MULTISELECT": {
       "ENTER_TO_SELECT": "Presiona retorn (tecla enter) per seleccionar",
       "ENTER_TO_REMOVE": "Presiona retorn (tecla enter) per eliminar",
+      "NO_OPTIONS": "List is empty",
       "SELECT_ONE": "Selecciona un",
       "SELECT": "Selecciona"
     }
diff --git a/app/javascript/dashboard/i18n/locale/ca/integrations.json b/app/javascript/dashboard/i18n/locale/ca/integrations.json
index ebbd228f1..19fe25301 100644
--- a/app/javascript/dashboard/i18n/locale/ca/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ca/integrations.json
@@ -481,6 +481,37 @@
         "ERROR_MESSAGE": "There was an error updating the assistant, please try again.",
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
+      "SETTINGS": {
+        "BREADCRUMB": {
+          "ASSISTANT": "Assistant"
+        },
+        "BASIC_SETTINGS": {
+          "TITLE": "Basic settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "SYSTEM_SETTINGS": {
+          "TITLE": "System settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "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.",
+          "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."
+            },
+            "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.”"
+            },
+            "RESPONSE_GUIDELINES": {
+              "TITLE": "Response guidelines",
+              "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
+            }
+          }
+        }
+      },
       "OPTIONS": {
         "EDIT_ASSISTANT": "Edit Assistant",
         "DELETE_ASSISTANT": "Delete Assistant",
diff --git a/app/javascript/dashboard/i18n/locale/ca/macros.json b/app/javascript/dashboard/i18n/locale/ca/macros.json
index c17834b51..4a4ca3ceb 100644
--- a/app/javascript/dashboard/i18n/locale/ca/macros.json
+++ b/app/javascript/dashboard/i18n/locale/ca/macros.json
@@ -99,6 +99,13 @@
       "CHANGE_PRIORITY": "Canvia la prioritat",
       "ADD_PRIVATE_NOTE": "Add a Private Note",
       "SEND_WEBHOOK_EVENT": "Send Webhook Event"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "Ningú",
+      "LOW": "Baixa",
+      "MEDIUM": "Mitjana",
+      "HIGH": "Alta",
+      "URGENT": "Urgent"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/cs/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/cs/attributesMgmt.json
index 7a830ea21..2eaf44a28 100644
--- a/app/javascript/dashboard/i18n/locale/cs/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/cs/attributesMgmt.json
@@ -5,6 +5,18 @@
     "LOADING": "Fetching custom attributes",
     "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.",
     "LEARN_MORE": "Learn more about custom attributes",
+    "ATTRIBUTE_MODELS": {
+      "CONVERSATION": "Conversation",
+      "CONTACT": "Contact"
+    },
+    "ATTRIBUTE_TYPES": {
+      "TEXT": "Text",
+      "NUMBER": "Number",
+      "LINK": "Link",
+      "DATE": "Date",
+      "LIST": "List",
+      "CHECKBOX": "Checkbox"
+    },
     "ADD": {
       "TITLE": "Add Custom Attribute",
       "SUBMIT": "Create",
diff --git a/app/javascript/dashboard/i18n/locale/cs/automation.json b/app/javascript/dashboard/i18n/locale/cs/automation.json
index cda8f4b51..87a57463f 100644
--- a/app/javascript/dashboard/i18n/locale/cs/automation.json
+++ b/app/javascript/dashboard/i18n/locale/cs/automation.json
@@ -150,6 +150,17 @@
       "ADD_SLA": "Add SLA",
       "OPEN_CONVERSATION": "Open conversation"
     },
+    "MESSAGE_TYPES": {
+      "INCOMING": "Incoming Message",
+      "OUTGOING": "Outgoing Message"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "Nic",
+      "LOW": "Low",
+      "MEDIUM": "Medium",
+      "HIGH": "High",
+      "URGENT": "Urgent"
+    },
     "ATTRIBUTES": {
       "MESSAGE_TYPE": "Typ zprávy",
       "MESSAGE_CONTAINS": "Zpráva obsahuje",
diff --git a/app/javascript/dashboard/i18n/locale/cs/generalSettings.json b/app/javascript/dashboard/i18n/locale/cs/generalSettings.json
index 8baf19b67..1a1f43848 100644
--- a/app/javascript/dashboard/i18n/locale/cs/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/cs/generalSettings.json
@@ -134,6 +134,7 @@
     "MULTISELECT": {
       "ENTER_TO_SELECT": "Stiskněte Enter pro vybrání",
       "ENTER_TO_REMOVE": "Stiskněte Enter pro odebrání",
+      "NO_OPTIONS": "List is empty",
       "SELECT_ONE": "Vyberte jeden",
       "SELECT": "Select"
     }
diff --git a/app/javascript/dashboard/i18n/locale/cs/integrations.json b/app/javascript/dashboard/i18n/locale/cs/integrations.json
index 5e75289d8..8d287dbd0 100644
--- a/app/javascript/dashboard/i18n/locale/cs/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/cs/integrations.json
@@ -481,6 +481,37 @@
         "ERROR_MESSAGE": "There was an error updating the assistant, please try again.",
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
+      "SETTINGS": {
+        "BREADCRUMB": {
+          "ASSISTANT": "Assistant"
+        },
+        "BASIC_SETTINGS": {
+          "TITLE": "Basic settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "SYSTEM_SETTINGS": {
+          "TITLE": "System settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "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.",
+          "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."
+            },
+            "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.”"
+            },
+            "RESPONSE_GUIDELINES": {
+              "TITLE": "Response guidelines",
+              "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
+            }
+          }
+        }
+      },
       "OPTIONS": {
         "EDIT_ASSISTANT": "Edit Assistant",
         "DELETE_ASSISTANT": "Delete Assistant",
diff --git a/app/javascript/dashboard/i18n/locale/cs/macros.json b/app/javascript/dashboard/i18n/locale/cs/macros.json
index 9071ccd8f..de63b2618 100644
--- a/app/javascript/dashboard/i18n/locale/cs/macros.json
+++ b/app/javascript/dashboard/i18n/locale/cs/macros.json
@@ -99,6 +99,13 @@
       "CHANGE_PRIORITY": "Change Priority",
       "ADD_PRIVATE_NOTE": "Přidat soukromou poznámku",
       "SEND_WEBHOOK_EVENT": "Poslat událost webhook"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "Nic",
+      "LOW": "Low",
+      "MEDIUM": "Medium",
+      "HIGH": "High",
+      "URGENT": "Urgent"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/da/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/da/attributesMgmt.json
index f95b0ae32..7c2522de1 100644
--- a/app/javascript/dashboard/i18n/locale/da/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/da/attributesMgmt.json
@@ -5,6 +5,18 @@
     "LOADING": "Henter brugerdefinerede attributter",
     "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.",
     "LEARN_MORE": "Learn more about custom attributes",
+    "ATTRIBUTE_MODELS": {
+      "CONVERSATION": "Samtale",
+      "CONTACT": "Kontakt"
+    },
+    "ATTRIBUTE_TYPES": {
+      "TEXT": "Tekst",
+      "NUMBER": "Nummer",
+      "LINK": "Link",
+      "DATE": "Date",
+      "LIST": "Liste",
+      "CHECKBOX": "Afkrydsningsfelt"
+    },
     "ADD": {
       "TITLE": "Tilføj Tilpasset Attribut",
       "SUBMIT": "Opret",
diff --git a/app/javascript/dashboard/i18n/locale/da/automation.json b/app/javascript/dashboard/i18n/locale/da/automation.json
index d7a3637fd..73003407c 100644
--- a/app/javascript/dashboard/i18n/locale/da/automation.json
+++ b/app/javascript/dashboard/i18n/locale/da/automation.json
@@ -150,6 +150,17 @@
       "ADD_SLA": "Add SLA",
       "OPEN_CONVERSATION": "Åbn samtale"
     },
+    "MESSAGE_TYPES": {
+      "INCOMING": "Incoming Message",
+      "OUTGOING": "Outgoing Message"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "Ingen",
+      "LOW": "Low",
+      "MEDIUM": "Medium",
+      "HIGH": "High",
+      "URGENT": "Urgent"
+    },
     "ATTRIBUTES": {
       "MESSAGE_TYPE": "Message Type",
       "MESSAGE_CONTAINS": "Message Contains",
diff --git a/app/javascript/dashboard/i18n/locale/da/generalSettings.json b/app/javascript/dashboard/i18n/locale/da/generalSettings.json
index 2c0d82000..cf8279ecb 100644
--- a/app/javascript/dashboard/i18n/locale/da/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/da/generalSettings.json
@@ -134,6 +134,7 @@
     "MULTISELECT": {
       "ENTER_TO_SELECT": "Tryk enter for at vælge",
       "ENTER_TO_REMOVE": "Tryk enter for at fjerne",
+      "NO_OPTIONS": "List is empty",
       "SELECT_ONE": "Vælg en",
       "SELECT": "Vælg"
     }
diff --git a/app/javascript/dashboard/i18n/locale/da/integrations.json b/app/javascript/dashboard/i18n/locale/da/integrations.json
index 9a4898f3a..20c9b65dd 100644
--- a/app/javascript/dashboard/i18n/locale/da/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/da/integrations.json
@@ -481,6 +481,37 @@
         "ERROR_MESSAGE": "There was an error updating the assistant, please try again.",
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
+      "SETTINGS": {
+        "BREADCRUMB": {
+          "ASSISTANT": "Assistant"
+        },
+        "BASIC_SETTINGS": {
+          "TITLE": "Basic settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "SYSTEM_SETTINGS": {
+          "TITLE": "System settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "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.",
+          "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."
+            },
+            "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.”"
+            },
+            "RESPONSE_GUIDELINES": {
+              "TITLE": "Response guidelines",
+              "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
+            }
+          }
+        }
+      },
       "OPTIONS": {
         "EDIT_ASSISTANT": "Edit Assistant",
         "DELETE_ASSISTANT": "Delete Assistant",
diff --git a/app/javascript/dashboard/i18n/locale/da/macros.json b/app/javascript/dashboard/i18n/locale/da/macros.json
index 6c826e526..1335941c9 100644
--- a/app/javascript/dashboard/i18n/locale/da/macros.json
+++ b/app/javascript/dashboard/i18n/locale/da/macros.json
@@ -99,6 +99,13 @@
       "CHANGE_PRIORITY": "Change Priority",
       "ADD_PRIVATE_NOTE": "Add a Private Note",
       "SEND_WEBHOOK_EVENT": "Send Webhook Event"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "Ingen",
+      "LOW": "Low",
+      "MEDIUM": "Medium",
+      "HIGH": "High",
+      "URGENT": "Urgent"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/de/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/de/attributesMgmt.json
index cb9a136e9..651f91b34 100644
--- a/app/javascript/dashboard/i18n/locale/de/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/de/attributesMgmt.json
@@ -5,6 +5,18 @@
     "LOADING": "Benutzerdefinierte Attribute abrufen",
     "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.",
     "LEARN_MORE": "Learn more about custom attributes",
+    "ATTRIBUTE_MODELS": {
+      "CONVERSATION": "Konversation",
+      "CONTACT": "Kontakt"
+    },
+    "ATTRIBUTE_TYPES": {
+      "TEXT": "Text",
+      "NUMBER": "Nummer",
+      "LINK": "Link",
+      "DATE": "Date",
+      "LIST": "Liste",
+      "CHECKBOX": "Checkbox"
+    },
     "ADD": {
       "TITLE": "Benutzerdefiniertes Attribut hinzufügen",
       "SUBMIT": "Erstellen",
diff --git a/app/javascript/dashboard/i18n/locale/de/automation.json b/app/javascript/dashboard/i18n/locale/de/automation.json
index a74a646ed..4a4c2b06f 100644
--- a/app/javascript/dashboard/i18n/locale/de/automation.json
+++ b/app/javascript/dashboard/i18n/locale/de/automation.json
@@ -150,6 +150,17 @@
       "ADD_SLA": "Add SLA",
       "OPEN_CONVERSATION": "Unterhaltung öffnen"
     },
+    "MESSAGE_TYPES": {
+      "INCOMING": "Incoming Message",
+      "OUTGOING": "Outgoing Message"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "Keine",
+      "LOW": "Niedrig",
+      "MEDIUM": "Mittel",
+      "HIGH": "Hoch",
+      "URGENT": "Dringend"
+    },
     "ATTRIBUTES": {
       "MESSAGE_TYPE": "Message Type",
       "MESSAGE_CONTAINS": "Message Contains",
diff --git a/app/javascript/dashboard/i18n/locale/de/generalSettings.json b/app/javascript/dashboard/i18n/locale/de/generalSettings.json
index 91054bf76..e029c0157 100644
--- a/app/javascript/dashboard/i18n/locale/de/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/de/generalSettings.json
@@ -134,6 +134,7 @@
     "MULTISELECT": {
       "ENTER_TO_SELECT": "Drücken Sie zur Auswahl die Eingabetaste",
       "ENTER_TO_REMOVE": "Drücken Sie zum Entfernen die Eingabetaste",
+      "NO_OPTIONS": "List is empty",
       "SELECT_ONE": "Eines wählen",
       "SELECT": "Auswählen"
     }
diff --git a/app/javascript/dashboard/i18n/locale/de/integrations.json b/app/javascript/dashboard/i18n/locale/de/integrations.json
index 7b99aacd8..c96687676 100644
--- a/app/javascript/dashboard/i18n/locale/de/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/de/integrations.json
@@ -481,6 +481,37 @@
         "ERROR_MESSAGE": "There was an error updating the assistant, please try again.",
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
+      "SETTINGS": {
+        "BREADCRUMB": {
+          "ASSISTANT": "Assistant"
+        },
+        "BASIC_SETTINGS": {
+          "TITLE": "Basic settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "SYSTEM_SETTINGS": {
+          "TITLE": "System settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "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.",
+          "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."
+            },
+            "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.”"
+            },
+            "RESPONSE_GUIDELINES": {
+              "TITLE": "Response guidelines",
+              "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
+            }
+          }
+        }
+      },
       "OPTIONS": {
         "EDIT_ASSISTANT": "Edit Assistant",
         "DELETE_ASSISTANT": "Delete Assistant",
diff --git a/app/javascript/dashboard/i18n/locale/de/macros.json b/app/javascript/dashboard/i18n/locale/de/macros.json
index d618e6b58..829c5c79a 100644
--- a/app/javascript/dashboard/i18n/locale/de/macros.json
+++ b/app/javascript/dashboard/i18n/locale/de/macros.json
@@ -99,6 +99,13 @@
       "CHANGE_PRIORITY": "Priorität ändern",
       "ADD_PRIVATE_NOTE": "Add a Private Note",
       "SEND_WEBHOOK_EVENT": "Send Webhook Event"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "Keine",
+      "LOW": "Niedrig",
+      "MEDIUM": "Mittel",
+      "HIGH": "Hoch",
+      "URGENT": "Dringend"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/el/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/el/attributesMgmt.json
index 01381db20..5f9ea8a08 100644
--- a/app/javascript/dashboard/i18n/locale/el/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/el/attributesMgmt.json
@@ -5,6 +5,18 @@
     "LOADING": "Λήψη προσαρμοσμένων ιδιοτήτων",
     "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.",
     "LEARN_MORE": "Learn more about custom attributes",
+    "ATTRIBUTE_MODELS": {
+      "CONVERSATION": "Συνομιλία",
+      "CONTACT": "Επαφές"
+    },
+    "ATTRIBUTE_TYPES": {
+      "TEXT": "Κείμενο",
+      "NUMBER": "Αριθμός",
+      "LINK": "Σύνδεσμος",
+      "DATE": "Date",
+      "LIST": "Λίστα",
+      "CHECKBOX": "Checkbox"
+    },
     "ADD": {
       "TITLE": "Προσθήκη προσαρμοσμένης ιδιότητας",
       "SUBMIT": "Δημιουργία",
diff --git a/app/javascript/dashboard/i18n/locale/el/automation.json b/app/javascript/dashboard/i18n/locale/el/automation.json
index f5df02cb9..96d461e34 100644
--- a/app/javascript/dashboard/i18n/locale/el/automation.json
+++ b/app/javascript/dashboard/i18n/locale/el/automation.json
@@ -150,6 +150,17 @@
       "ADD_SLA": "Add SLA",
       "OPEN_CONVERSATION": "Άνοιγμα συνομιλίας"
     },
+    "MESSAGE_TYPES": {
+      "INCOMING": "Incoming Message",
+      "OUTGOING": "Outgoing Message"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "Κανένα",
+      "LOW": "Low",
+      "MEDIUM": "Medium",
+      "HIGH": "High",
+      "URGENT": "Urgent"
+    },
     "ATTRIBUTES": {
       "MESSAGE_TYPE": "Message Type",
       "MESSAGE_CONTAINS": "Message Contains",
diff --git a/app/javascript/dashboard/i18n/locale/el/generalSettings.json b/app/javascript/dashboard/i18n/locale/el/generalSettings.json
index d5b29ee95..16145434d 100644
--- a/app/javascript/dashboard/i18n/locale/el/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/el/generalSettings.json
@@ -134,6 +134,7 @@
     "MULTISELECT": {
       "ENTER_TO_SELECT": "Πάτησε enter για επιλογή",
       "ENTER_TO_REMOVE": "Πάτησε enter για αφαίρεση",
+      "NO_OPTIONS": "List is empty",
       "SELECT_ONE": "Επιλέξτε ένα",
       "SELECT": "Επιλογή"
     }
diff --git a/app/javascript/dashboard/i18n/locale/el/integrations.json b/app/javascript/dashboard/i18n/locale/el/integrations.json
index 627863b74..aa4ad87c6 100644
--- a/app/javascript/dashboard/i18n/locale/el/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/el/integrations.json
@@ -481,6 +481,37 @@
         "ERROR_MESSAGE": "There was an error updating the assistant, please try again.",
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
+      "SETTINGS": {
+        "BREADCRUMB": {
+          "ASSISTANT": "Assistant"
+        },
+        "BASIC_SETTINGS": {
+          "TITLE": "Basic settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "SYSTEM_SETTINGS": {
+          "TITLE": "System settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "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.",
+          "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."
+            },
+            "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.”"
+            },
+            "RESPONSE_GUIDELINES": {
+              "TITLE": "Response guidelines",
+              "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
+            }
+          }
+        }
+      },
       "OPTIONS": {
         "EDIT_ASSISTANT": "Edit Assistant",
         "DELETE_ASSISTANT": "Delete Assistant",
diff --git a/app/javascript/dashboard/i18n/locale/el/macros.json b/app/javascript/dashboard/i18n/locale/el/macros.json
index 6f46f1a52..02ed92095 100644
--- a/app/javascript/dashboard/i18n/locale/el/macros.json
+++ b/app/javascript/dashboard/i18n/locale/el/macros.json
@@ -99,6 +99,13 @@
       "CHANGE_PRIORITY": "Change Priority",
       "ADD_PRIVATE_NOTE": "Add a Private Note",
       "SEND_WEBHOOK_EVENT": "Send Webhook Event"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "Κανένα",
+      "LOW": "Low",
+      "MEDIUM": "Medium",
+      "HIGH": "High",
+      "URGENT": "Urgent"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/es/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/es/attributesMgmt.json
index e55a41fd0..8b70b2a6c 100644
--- a/app/javascript/dashboard/i18n/locale/es/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/es/attributesMgmt.json
@@ -5,6 +5,18 @@
     "LOADING": "Obtener atributos personalizados",
     "DESCRIPTION": "Un atributo personalizado rastrea detalles adicionales sobre tus contactos o conversaciones, como el plan de suscripción o la fecha de su primera compra. Puede agregar diferentes tipos de atributos personalizados, como textos, listas o números, para capturar la información específica que necesita.",
     "LEARN_MORE": "Aprende más sobre los atributos personalizados",
+    "ATTRIBUTE_MODELS": {
+      "CONVERSATION": "Conversación",
+      "CONTACT": "Contacto"
+    },
+    "ATTRIBUTE_TYPES": {
+      "TEXT": "Texto",
+      "NUMBER": "Número",
+      "LINK": "Enlace",
+      "DATE": "Date",
+      "LIST": "Lista",
+      "CHECKBOX": "Casilla"
+    },
     "ADD": {
       "TITLE": "Añadir atributo personalizado",
       "SUBMIT": "Crear",
diff --git a/app/javascript/dashboard/i18n/locale/es/automation.json b/app/javascript/dashboard/i18n/locale/es/automation.json
index a81798027..95f1f2684 100644
--- a/app/javascript/dashboard/i18n/locale/es/automation.json
+++ b/app/javascript/dashboard/i18n/locale/es/automation.json
@@ -150,6 +150,17 @@
       "ADD_SLA": "Añadir SLA",
       "OPEN_CONVERSATION": "Abrir conversación"
     },
+    "MESSAGE_TYPES": {
+      "INCOMING": "Incoming Message",
+      "OUTGOING": "Outgoing Message"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "Ninguna",
+      "LOW": "Baja",
+      "MEDIUM": "Media",
+      "HIGH": "Alta",
+      "URGENT": "Urgente"
+    },
     "ATTRIBUTES": {
       "MESSAGE_TYPE": "Tipo de mensaje",
       "MESSAGE_CONTAINS": "El mensaje contiene",
diff --git a/app/javascript/dashboard/i18n/locale/es/generalSettings.json b/app/javascript/dashboard/i18n/locale/es/generalSettings.json
index deb9e532f..579c0b275 100644
--- a/app/javascript/dashboard/i18n/locale/es/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/es/generalSettings.json
@@ -134,6 +134,7 @@
     "MULTISELECT": {
       "ENTER_TO_SELECT": "Pulse Enter para seleccionar",
       "ENTER_TO_REMOVE": "Presione Enter para eliminar",
+      "NO_OPTIONS": "List is empty",
       "SELECT_ONE": "Seleccione uno",
       "SELECT": "Seleccionar"
     }
diff --git a/app/javascript/dashboard/i18n/locale/es/integrations.json b/app/javascript/dashboard/i18n/locale/es/integrations.json
index b7f4b5494..241699a35 100644
--- a/app/javascript/dashboard/i18n/locale/es/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/es/integrations.json
@@ -481,6 +481,37 @@
         "ERROR_MESSAGE": "There was an error updating the assistant, please try again.",
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
+      "SETTINGS": {
+        "BREADCRUMB": {
+          "ASSISTANT": "Assistant"
+        },
+        "BASIC_SETTINGS": {
+          "TITLE": "Basic settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "SYSTEM_SETTINGS": {
+          "TITLE": "System settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "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.",
+          "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."
+            },
+            "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.”"
+            },
+            "RESPONSE_GUIDELINES": {
+              "TITLE": "Response guidelines",
+              "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
+            }
+          }
+        }
+      },
       "OPTIONS": {
         "EDIT_ASSISTANT": "Edit Assistant",
         "DELETE_ASSISTANT": "Delete Assistant",
diff --git a/app/javascript/dashboard/i18n/locale/es/macros.json b/app/javascript/dashboard/i18n/locale/es/macros.json
index 0085c7ebd..703796baa 100644
--- a/app/javascript/dashboard/i18n/locale/es/macros.json
+++ b/app/javascript/dashboard/i18n/locale/es/macros.json
@@ -99,6 +99,13 @@
       "CHANGE_PRIORITY": "Cambiar prioridad",
       "ADD_PRIVATE_NOTE": "Add a Private Note",
       "SEND_WEBHOOK_EVENT": "Enviar Evento de Webhook"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "Ninguna",
+      "LOW": "Baja",
+      "MEDIUM": "Media",
+      "HIGH": "Alta",
+      "URGENT": "Urgente"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fa/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/fa/attributesMgmt.json
index bcd0c174e..d8e32fcc0 100644
--- a/app/javascript/dashboard/i18n/locale/fa/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fa/attributesMgmt.json
@@ -5,6 +5,18 @@
     "LOADING": "واکشی ویژگی‌های سفارشی",
     "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.",
     "LEARN_MORE": "Learn more about custom attributes",
+    "ATTRIBUTE_MODELS": {
+      "CONVERSATION": "گفتگو",
+      "CONTACT": "مخاطب"
+    },
+    "ATTRIBUTE_TYPES": {
+      "TEXT": "متن",
+      "NUMBER": "شماره",
+      "LINK": "پیوند",
+      "DATE": "Date",
+      "LIST": "فهرست",
+      "CHECKBOX": "چک باکس"
+    },
     "ADD": {
       "TITLE": "اضافه کردن ویژگی سفارشی",
       "SUBMIT": "ايجاد كردن",
diff --git a/app/javascript/dashboard/i18n/locale/fa/automation.json b/app/javascript/dashboard/i18n/locale/fa/automation.json
index b04ae78dd..eac1fcc59 100644
--- a/app/javascript/dashboard/i18n/locale/fa/automation.json
+++ b/app/javascript/dashboard/i18n/locale/fa/automation.json
@@ -150,6 +150,17 @@
       "ADD_SLA": "اضافه کردن SLA",
       "OPEN_CONVERSATION": "باز کردن گفتگو"
     },
+    "MESSAGE_TYPES": {
+      "INCOMING": "Incoming Message",
+      "OUTGOING": "Outgoing Message"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "هیچکدام",
+      "LOW": "پایین",
+      "MEDIUM": "متوسط",
+      "HIGH": "بالا",
+      "URGENT": "فوری"
+    },
     "ATTRIBUTES": {
       "MESSAGE_TYPE": "Message Type",
       "MESSAGE_CONTAINS": "Message Contains",
diff --git a/app/javascript/dashboard/i18n/locale/fa/generalSettings.json b/app/javascript/dashboard/i18n/locale/fa/generalSettings.json
index 412be985d..51464933c 100644
--- a/app/javascript/dashboard/i18n/locale/fa/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/fa/generalSettings.json
@@ -134,6 +134,7 @@
     "MULTISELECT": {
       "ENTER_TO_SELECT": "برای انتخاب Enter را فشار دهید",
       "ENTER_TO_REMOVE": "برای حذف دکمه enter را فشار دهید",
+      "NO_OPTIONS": "List is empty",
       "SELECT_ONE": "یکی را انتخاب کن",
       "SELECT": "انتخاب کنید"
     }
diff --git a/app/javascript/dashboard/i18n/locale/fa/integrations.json b/app/javascript/dashboard/i18n/locale/fa/integrations.json
index 7b6e8fe5c..664b7e763 100644
--- a/app/javascript/dashboard/i18n/locale/fa/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/fa/integrations.json
@@ -481,6 +481,37 @@
         "ERROR_MESSAGE": "There was an error updating the assistant, please try again.",
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
+      "SETTINGS": {
+        "BREADCRUMB": {
+          "ASSISTANT": "Assistant"
+        },
+        "BASIC_SETTINGS": {
+          "TITLE": "Basic settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "SYSTEM_SETTINGS": {
+          "TITLE": "System settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "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.",
+          "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."
+            },
+            "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.”"
+            },
+            "RESPONSE_GUIDELINES": {
+              "TITLE": "Response guidelines",
+              "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
+            }
+          }
+        }
+      },
       "OPTIONS": {
         "EDIT_ASSISTANT": "Edit Assistant",
         "DELETE_ASSISTANT": "Delete Assistant",
diff --git a/app/javascript/dashboard/i18n/locale/fa/macros.json b/app/javascript/dashboard/i18n/locale/fa/macros.json
index 2501c2f66..b64fa945c 100644
--- a/app/javascript/dashboard/i18n/locale/fa/macros.json
+++ b/app/javascript/dashboard/i18n/locale/fa/macros.json
@@ -99,6 +99,13 @@
       "CHANGE_PRIORITY": "تغییر اولویت",
       "ADD_PRIVATE_NOTE": "Add a Private Note",
       "SEND_WEBHOOK_EVENT": "Send Webhook Event"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "هیچکدام",
+      "LOW": "پایین",
+      "MEDIUM": "متوسط",
+      "HIGH": "بالا",
+      "URGENT": "فوری"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fi/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/fi/attributesMgmt.json
index 329efa8c7..aa0c88f30 100644
--- a/app/javascript/dashboard/i18n/locale/fi/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fi/attributesMgmt.json
@@ -5,6 +5,18 @@
     "LOADING": "Fetching custom attributes",
     "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.",
     "LEARN_MORE": "Learn more about custom attributes",
+    "ATTRIBUTE_MODELS": {
+      "CONVERSATION": "Conversation",
+      "CONTACT": "Contact"
+    },
+    "ATTRIBUTE_TYPES": {
+      "TEXT": "Text",
+      "NUMBER": "Number",
+      "LINK": "Link",
+      "DATE": "Date",
+      "LIST": "List",
+      "CHECKBOX": "Checkbox"
+    },
     "ADD": {
       "TITLE": "Add Custom Attribute",
       "SUBMIT": "Luo",
diff --git a/app/javascript/dashboard/i18n/locale/fi/automation.json b/app/javascript/dashboard/i18n/locale/fi/automation.json
index c151c7530..bff30cd6e 100644
--- a/app/javascript/dashboard/i18n/locale/fi/automation.json
+++ b/app/javascript/dashboard/i18n/locale/fi/automation.json
@@ -150,6 +150,17 @@
       "ADD_SLA": "Add SLA",
       "OPEN_CONVERSATION": "Open conversation"
     },
+    "MESSAGE_TYPES": {
+      "INCOMING": "Incoming Message",
+      "OUTGOING": "Outgoing Message"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "None",
+      "LOW": "Low",
+      "MEDIUM": "Medium",
+      "HIGH": "High",
+      "URGENT": "Urgent"
+    },
     "ATTRIBUTES": {
       "MESSAGE_TYPE": "Message Type",
       "MESSAGE_CONTAINS": "Message Contains",
diff --git a/app/javascript/dashboard/i18n/locale/fi/generalSettings.json b/app/javascript/dashboard/i18n/locale/fi/generalSettings.json
index 699606a35..58701ec53 100644
--- a/app/javascript/dashboard/i18n/locale/fi/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/fi/generalSettings.json
@@ -134,6 +134,7 @@
     "MULTISELECT": {
       "ENTER_TO_SELECT": "Paina enter valitaksesi",
       "ENTER_TO_REMOVE": "Paina enter poistaaksesi",
+      "NO_OPTIONS": "List is empty",
       "SELECT_ONE": "Valitse yksi",
       "SELECT": "Select"
     }
diff --git a/app/javascript/dashboard/i18n/locale/fi/integrations.json b/app/javascript/dashboard/i18n/locale/fi/integrations.json
index d61448b90..65ca0ab1c 100644
--- a/app/javascript/dashboard/i18n/locale/fi/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/fi/integrations.json
@@ -481,6 +481,37 @@
         "ERROR_MESSAGE": "There was an error updating the assistant, please try again.",
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
+      "SETTINGS": {
+        "BREADCRUMB": {
+          "ASSISTANT": "Assistant"
+        },
+        "BASIC_SETTINGS": {
+          "TITLE": "Basic settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "SYSTEM_SETTINGS": {
+          "TITLE": "System settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "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.",
+          "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."
+            },
+            "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.”"
+            },
+            "RESPONSE_GUIDELINES": {
+              "TITLE": "Response guidelines",
+              "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
+            }
+          }
+        }
+      },
       "OPTIONS": {
         "EDIT_ASSISTANT": "Edit Assistant",
         "DELETE_ASSISTANT": "Delete Assistant",
diff --git a/app/javascript/dashboard/i18n/locale/fi/macros.json b/app/javascript/dashboard/i18n/locale/fi/macros.json
index b7aab78d5..a2716f073 100644
--- a/app/javascript/dashboard/i18n/locale/fi/macros.json
+++ b/app/javascript/dashboard/i18n/locale/fi/macros.json
@@ -99,6 +99,13 @@
       "CHANGE_PRIORITY": "Change Priority",
       "ADD_PRIVATE_NOTE": "Add a Private Note",
       "SEND_WEBHOOK_EVENT": "Send Webhook Event"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "None",
+      "LOW": "Low",
+      "MEDIUM": "Medium",
+      "HIGH": "High",
+      "URGENT": "Urgent"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fr/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/fr/attributesMgmt.json
index 9ab09b086..54a3fe591 100644
--- a/app/javascript/dashboard/i18n/locale/fr/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fr/attributesMgmt.json
@@ -5,6 +5,18 @@
     "LOADING": "Récupération des attributs personnalisés",
     "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.",
     "LEARN_MORE": "Learn more about custom attributes",
+    "ATTRIBUTE_MODELS": {
+      "CONVERSATION": "Conversation",
+      "CONTACT": "Contact"
+    },
+    "ATTRIBUTE_TYPES": {
+      "TEXT": "Texte",
+      "NUMBER": "Nombre",
+      "LINK": "Lien",
+      "DATE": "Date",
+      "LIST": "Liste",
+      "CHECKBOX": "Case à cocher"
+    },
     "ADD": {
       "TITLE": "Ajouter un attribut personnalisé",
       "SUBMIT": "Créer",
diff --git a/app/javascript/dashboard/i18n/locale/fr/automation.json b/app/javascript/dashboard/i18n/locale/fr/automation.json
index 46153c7d7..9bae08e81 100644
--- a/app/javascript/dashboard/i18n/locale/fr/automation.json
+++ b/app/javascript/dashboard/i18n/locale/fr/automation.json
@@ -150,6 +150,17 @@
       "ADD_SLA": "Add SLA",
       "OPEN_CONVERSATION": "Ouvrir la conversation"
     },
+    "MESSAGE_TYPES": {
+      "INCOMING": "Incoming Message",
+      "OUTGOING": "Outgoing Message"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "Aucun",
+      "LOW": "Faible",
+      "MEDIUM": "Moyenne",
+      "HIGH": "Élevé",
+      "URGENT": "Urgent"
+    },
     "ATTRIBUTES": {
       "MESSAGE_TYPE": "Type de message",
       "MESSAGE_CONTAINS": "Le message contient",
diff --git a/app/javascript/dashboard/i18n/locale/fr/generalSettings.json b/app/javascript/dashboard/i18n/locale/fr/generalSettings.json
index e2485cd9c..664d04eda 100644
--- a/app/javascript/dashboard/i18n/locale/fr/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/fr/generalSettings.json
@@ -134,6 +134,7 @@
     "MULTISELECT": {
       "ENTER_TO_SELECT": "Appuyer sur Entrée pour sélectionner",
       "ENTER_TO_REMOVE": "Appuyer sur Entrée pour supprimer",
+      "NO_OPTIONS": "List is empty",
       "SELECT_ONE": "Sélectionnez un",
       "SELECT": "Sélectionner"
     }
diff --git a/app/javascript/dashboard/i18n/locale/fr/integrations.json b/app/javascript/dashboard/i18n/locale/fr/integrations.json
index 153c04ca0..4013de48f 100644
--- a/app/javascript/dashboard/i18n/locale/fr/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/fr/integrations.json
@@ -481,6 +481,37 @@
         "ERROR_MESSAGE": "There was an error updating the assistant, please try again.",
         "NOT_FOUND": "Impossible de trouver l'assistant. Veuillez réessayer."
       },
+      "SETTINGS": {
+        "BREADCRUMB": {
+          "ASSISTANT": "Assistant"
+        },
+        "BASIC_SETTINGS": {
+          "TITLE": "Basic settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "SYSTEM_SETTINGS": {
+          "TITLE": "System settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "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.",
+          "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."
+            },
+            "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.”"
+            },
+            "RESPONSE_GUIDELINES": {
+              "TITLE": "Response guidelines",
+              "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
+            }
+          }
+        }
+      },
       "OPTIONS": {
         "EDIT_ASSISTANT": "Edit Assistant",
         "DELETE_ASSISTANT": "Delete Assistant",
diff --git a/app/javascript/dashboard/i18n/locale/fr/macros.json b/app/javascript/dashboard/i18n/locale/fr/macros.json
index 33c0117e0..20623d702 100644
--- a/app/javascript/dashboard/i18n/locale/fr/macros.json
+++ b/app/javascript/dashboard/i18n/locale/fr/macros.json
@@ -99,6 +99,13 @@
       "CHANGE_PRIORITY": "Modifier la priorité",
       "ADD_PRIVATE_NOTE": "Ajouter une note privée",
       "SEND_WEBHOOK_EVENT": "Envoyer un événement Webhook"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "Aucun",
+      "LOW": "Faible",
+      "MEDIUM": "Moyenne",
+      "HIGH": "Élevé",
+      "URGENT": "Urgent"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/he/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/he/attributesMgmt.json
index dedd146f4..20379d916 100644
--- a/app/javascript/dashboard/i18n/locale/he/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/he/attributesMgmt.json
@@ -5,6 +5,18 @@
     "LOADING": "שולף מאפיינים מותאמים אישית",
     "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.",
     "LEARN_MORE": "Learn more about custom attributes",
+    "ATTRIBUTE_MODELS": {
+      "CONVERSATION": "שיחה",
+      "CONTACT": "איש קשר"
+    },
+    "ATTRIBUTE_TYPES": {
+      "TEXT": "טקסט",
+      "NUMBER": "מספר",
+      "LINK": "קישור",
+      "DATE": "Date",
+      "LIST": "רשימה",
+      "CHECKBOX": "תיבת סימון"
+    },
     "ADD": {
       "TITLE": "הוסף מאפיין מותאם אישית",
       "SUBMIT": "צור",
diff --git a/app/javascript/dashboard/i18n/locale/he/automation.json b/app/javascript/dashboard/i18n/locale/he/automation.json
index 5b8f1edd7..bd7b0628f 100644
--- a/app/javascript/dashboard/i18n/locale/he/automation.json
+++ b/app/javascript/dashboard/i18n/locale/he/automation.json
@@ -150,6 +150,17 @@
       "ADD_SLA": "Add SLA",
       "OPEN_CONVERSATION": "שיחה פתוחה"
     },
+    "MESSAGE_TYPES": {
+      "INCOMING": "Incoming Message",
+      "OUTGOING": "Outgoing Message"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "כלום",
+      "LOW": "Low",
+      "MEDIUM": "Medium",
+      "HIGH": "High",
+      "URGENT": "Urgent"
+    },
     "ATTRIBUTES": {
       "MESSAGE_TYPE": "Message Type",
       "MESSAGE_CONTAINS": "Message Contains",
diff --git a/app/javascript/dashboard/i18n/locale/he/generalSettings.json b/app/javascript/dashboard/i18n/locale/he/generalSettings.json
index 0c231eb57..57bf89e3b 100644
--- a/app/javascript/dashboard/i18n/locale/he/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/he/generalSettings.json
@@ -134,6 +134,7 @@
     "MULTISELECT": {
       "ENTER_TO_SELECT": "הקש אנטר כדי לבחור",
       "ENTER_TO_REMOVE": "הקש אנטר כדי להסיר",
+      "NO_OPTIONS": "List is empty",
       "SELECT_ONE": "תבחר אחד",
       "SELECT": "בחר"
     }
diff --git a/app/javascript/dashboard/i18n/locale/he/integrations.json b/app/javascript/dashboard/i18n/locale/he/integrations.json
index 187d6f4db..9bf791de7 100644
--- a/app/javascript/dashboard/i18n/locale/he/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/he/integrations.json
@@ -481,6 +481,37 @@
         "ERROR_MESSAGE": "There was an error updating the assistant, please try again.",
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
+      "SETTINGS": {
+        "BREADCRUMB": {
+          "ASSISTANT": "Assistant"
+        },
+        "BASIC_SETTINGS": {
+          "TITLE": "Basic settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "SYSTEM_SETTINGS": {
+          "TITLE": "System settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "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.",
+          "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."
+            },
+            "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.”"
+            },
+            "RESPONSE_GUIDELINES": {
+              "TITLE": "Response guidelines",
+              "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
+            }
+          }
+        }
+      },
       "OPTIONS": {
         "EDIT_ASSISTANT": "Edit Assistant",
         "DELETE_ASSISTANT": "Delete Assistant",
diff --git a/app/javascript/dashboard/i18n/locale/he/macros.json b/app/javascript/dashboard/i18n/locale/he/macros.json
index d5fb1a7de..b44671a9f 100644
--- a/app/javascript/dashboard/i18n/locale/he/macros.json
+++ b/app/javascript/dashboard/i18n/locale/he/macros.json
@@ -99,6 +99,13 @@
       "CHANGE_PRIORITY": "Change Priority",
       "ADD_PRIVATE_NOTE": "Add a Private Note",
       "SEND_WEBHOOK_EVENT": "Send Webhook Event"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "כלום",
+      "LOW": "Low",
+      "MEDIUM": "Medium",
+      "HIGH": "High",
+      "URGENT": "Urgent"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hi/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/hi/attributesMgmt.json
index dd413ab26..cea6359de 100644
--- a/app/javascript/dashboard/i18n/locale/hi/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hi/attributesMgmt.json
@@ -5,6 +5,18 @@
     "LOADING": "Fetching custom attributes",
     "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.",
     "LEARN_MORE": "Learn more about custom attributes",
+    "ATTRIBUTE_MODELS": {
+      "CONVERSATION": "Conversation",
+      "CONTACT": "Contact"
+    },
+    "ATTRIBUTE_TYPES": {
+      "TEXT": "Text",
+      "NUMBER": "Number",
+      "LINK": "Link",
+      "DATE": "Date",
+      "LIST": "List",
+      "CHECKBOX": "Checkbox"
+    },
     "ADD": {
       "TITLE": "Add Custom Attribute",
       "SUBMIT": "Create",
diff --git a/app/javascript/dashboard/i18n/locale/hi/automation.json b/app/javascript/dashboard/i18n/locale/hi/automation.json
index c5dd4a514..cb030332f 100644
--- a/app/javascript/dashboard/i18n/locale/hi/automation.json
+++ b/app/javascript/dashboard/i18n/locale/hi/automation.json
@@ -150,6 +150,17 @@
       "ADD_SLA": "Add SLA",
       "OPEN_CONVERSATION": "Open conversation"
     },
+    "MESSAGE_TYPES": {
+      "INCOMING": "Incoming Message",
+      "OUTGOING": "Outgoing Message"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "None",
+      "LOW": "Low",
+      "MEDIUM": "Medium",
+      "HIGH": "High",
+      "URGENT": "Urgent"
+    },
     "ATTRIBUTES": {
       "MESSAGE_TYPE": "Message Type",
       "MESSAGE_CONTAINS": "Message Contains",
diff --git a/app/javascript/dashboard/i18n/locale/hi/generalSettings.json b/app/javascript/dashboard/i18n/locale/hi/generalSettings.json
index 9055574c5..d924bffbd 100644
--- a/app/javascript/dashboard/i18n/locale/hi/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/hi/generalSettings.json
@@ -134,6 +134,7 @@
     "MULTISELECT": {
       "ENTER_TO_SELECT": "Press enter to select",
       "ENTER_TO_REMOVE": "Press enter to remove",
+      "NO_OPTIONS": "List is empty",
       "SELECT_ONE": "Select one",
       "SELECT": "Select"
     }
diff --git a/app/javascript/dashboard/i18n/locale/hi/integrations.json b/app/javascript/dashboard/i18n/locale/hi/integrations.json
index 252b62930..99526906d 100644
--- a/app/javascript/dashboard/i18n/locale/hi/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/hi/integrations.json
@@ -481,6 +481,37 @@
         "ERROR_MESSAGE": "There was an error updating the assistant, please try again.",
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
+      "SETTINGS": {
+        "BREADCRUMB": {
+          "ASSISTANT": "Assistant"
+        },
+        "BASIC_SETTINGS": {
+          "TITLE": "Basic settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "SYSTEM_SETTINGS": {
+          "TITLE": "System settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "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.",
+          "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."
+            },
+            "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.”"
+            },
+            "RESPONSE_GUIDELINES": {
+              "TITLE": "Response guidelines",
+              "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
+            }
+          }
+        }
+      },
       "OPTIONS": {
         "EDIT_ASSISTANT": "Edit Assistant",
         "DELETE_ASSISTANT": "Delete Assistant",
diff --git a/app/javascript/dashboard/i18n/locale/hi/macros.json b/app/javascript/dashboard/i18n/locale/hi/macros.json
index d22744190..fcb409f34 100644
--- a/app/javascript/dashboard/i18n/locale/hi/macros.json
+++ b/app/javascript/dashboard/i18n/locale/hi/macros.json
@@ -99,6 +99,13 @@
       "CHANGE_PRIORITY": "Change Priority",
       "ADD_PRIVATE_NOTE": "Add a Private Note",
       "SEND_WEBHOOK_EVENT": "Send Webhook Event"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "None",
+      "LOW": "Low",
+      "MEDIUM": "Medium",
+      "HIGH": "High",
+      "URGENT": "Urgent"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hr/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/hr/attributesMgmt.json
index a1cbfd0ac..5846bd8be 100644
--- a/app/javascript/dashboard/i18n/locale/hr/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hr/attributesMgmt.json
@@ -5,6 +5,18 @@
     "LOADING": "Fetching custom attributes",
     "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.",
     "LEARN_MORE": "Learn more about custom attributes",
+    "ATTRIBUTE_MODELS": {
+      "CONVERSATION": "Conversation",
+      "CONTACT": "Contact"
+    },
+    "ATTRIBUTE_TYPES": {
+      "TEXT": "Tekst",
+      "NUMBER": "Broj",
+      "LINK": "Povezica",
+      "DATE": "Date",
+      "LIST": "Popis",
+      "CHECKBOX": "Kvačica"
+    },
     "ADD": {
       "TITLE": "Add Custom Attribute",
       "SUBMIT": "Create",
diff --git a/app/javascript/dashboard/i18n/locale/hr/automation.json b/app/javascript/dashboard/i18n/locale/hr/automation.json
index 1b55967df..33366a391 100644
--- a/app/javascript/dashboard/i18n/locale/hr/automation.json
+++ b/app/javascript/dashboard/i18n/locale/hr/automation.json
@@ -150,6 +150,17 @@
       "ADD_SLA": "Add SLA",
       "OPEN_CONVERSATION": "Otvori razgovor"
     },
+    "MESSAGE_TYPES": {
+      "INCOMING": "Incoming Message",
+      "OUTGOING": "Outgoing Message"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "None",
+      "LOW": "Nisko",
+      "MEDIUM": "Srednje",
+      "HIGH": "Visoko",
+      "URGENT": "Hitno"
+    },
     "ATTRIBUTES": {
       "MESSAGE_TYPE": "Message Type",
       "MESSAGE_CONTAINS": "Message Contains",
diff --git a/app/javascript/dashboard/i18n/locale/hr/generalSettings.json b/app/javascript/dashboard/i18n/locale/hr/generalSettings.json
index 135b66d04..29f00256e 100644
--- a/app/javascript/dashboard/i18n/locale/hr/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/hr/generalSettings.json
@@ -134,6 +134,7 @@
     "MULTISELECT": {
       "ENTER_TO_SELECT": "Press enter to select",
       "ENTER_TO_REMOVE": "Press enter to remove",
+      "NO_OPTIONS": "List is empty",
       "SELECT_ONE": "Select one",
       "SELECT": "Select"
     }
diff --git a/app/javascript/dashboard/i18n/locale/hr/integrations.json b/app/javascript/dashboard/i18n/locale/hr/integrations.json
index f7ccb7e83..7dca0f7b5 100644
--- a/app/javascript/dashboard/i18n/locale/hr/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/hr/integrations.json
@@ -481,6 +481,37 @@
         "ERROR_MESSAGE": "There was an error updating the assistant, please try again.",
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
+      "SETTINGS": {
+        "BREADCRUMB": {
+          "ASSISTANT": "Assistant"
+        },
+        "BASIC_SETTINGS": {
+          "TITLE": "Basic settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "SYSTEM_SETTINGS": {
+          "TITLE": "System settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "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.",
+          "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."
+            },
+            "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.”"
+            },
+            "RESPONSE_GUIDELINES": {
+              "TITLE": "Response guidelines",
+              "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
+            }
+          }
+        }
+      },
       "OPTIONS": {
         "EDIT_ASSISTANT": "Edit Assistant",
         "DELETE_ASSISTANT": "Delete Assistant",
diff --git a/app/javascript/dashboard/i18n/locale/hr/macros.json b/app/javascript/dashboard/i18n/locale/hr/macros.json
index 57f06dfd4..0334a5a45 100644
--- a/app/javascript/dashboard/i18n/locale/hr/macros.json
+++ b/app/javascript/dashboard/i18n/locale/hr/macros.json
@@ -99,6 +99,13 @@
       "CHANGE_PRIORITY": "Promjena prioriteta",
       "ADD_PRIVATE_NOTE": "Add a Private Note",
       "SEND_WEBHOOK_EVENT": "Send Webhook Event"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "None",
+      "LOW": "Nisko",
+      "MEDIUM": "Srednje",
+      "HIGH": "Visoko",
+      "URGENT": "Hitno"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hu/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/hu/attributesMgmt.json
index de3dae31f..7d5f6f97e 100644
--- a/app/javascript/dashboard/i18n/locale/hu/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hu/attributesMgmt.json
@@ -5,6 +5,18 @@
     "LOADING": "Vonzó egyedi tulajdonság",
     "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.",
     "LEARN_MORE": "Learn more about custom attributes",
+    "ATTRIBUTE_MODELS": {
+      "CONVERSATION": "Beszélgetés",
+      "CONTACT": "Kontakt"
+    },
+    "ATTRIBUTE_TYPES": {
+      "TEXT": "Szöveg",
+      "NUMBER": "Szám",
+      "LINK": "Link",
+      "DATE": "Date",
+      "LIST": "Lista",
+      "CHECKBOX": "Jelölőnégyzet"
+    },
     "ADD": {
       "TITLE": "Adj meg egyedi tulajdonságot",
       "SUBMIT": "Létrehozás",
diff --git a/app/javascript/dashboard/i18n/locale/hu/automation.json b/app/javascript/dashboard/i18n/locale/hu/automation.json
index 7de73e485..f3e1f4f3c 100644
--- a/app/javascript/dashboard/i18n/locale/hu/automation.json
+++ b/app/javascript/dashboard/i18n/locale/hu/automation.json
@@ -150,6 +150,17 @@
       "ADD_SLA": "Add SLA",
       "OPEN_CONVERSATION": "Beszélgetés megnyitása"
     },
+    "MESSAGE_TYPES": {
+      "INCOMING": "Incoming Message",
+      "OUTGOING": "Outgoing Message"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "Nincs",
+      "LOW": "Alacsony",
+      "MEDIUM": "Közepes",
+      "HIGH": "Magas",
+      "URGENT": "Sürgős"
+    },
     "ATTRIBUTES": {
       "MESSAGE_TYPE": "Message Type",
       "MESSAGE_CONTAINS": "Message Contains",
diff --git a/app/javascript/dashboard/i18n/locale/hu/generalSettings.json b/app/javascript/dashboard/i18n/locale/hu/generalSettings.json
index 12d41de10..83e2e727e 100644
--- a/app/javascript/dashboard/i18n/locale/hu/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/hu/generalSettings.json
@@ -134,6 +134,7 @@
     "MULTISELECT": {
       "ENTER_TO_SELECT": "Enter-rel válaszd ki",
       "ENTER_TO_REMOVE": "Enter-rel távolítsd el",
+      "NO_OPTIONS": "List is empty",
       "SELECT_ONE": "Válassz egyet",
       "SELECT": "Kiválasztás"
     }
diff --git a/app/javascript/dashboard/i18n/locale/hu/integrations.json b/app/javascript/dashboard/i18n/locale/hu/integrations.json
index 96c356132..fbac63a00 100644
--- a/app/javascript/dashboard/i18n/locale/hu/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/hu/integrations.json
@@ -481,6 +481,37 @@
         "ERROR_MESSAGE": "There was an error updating the assistant, please try again.",
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
+      "SETTINGS": {
+        "BREADCRUMB": {
+          "ASSISTANT": "Assistant"
+        },
+        "BASIC_SETTINGS": {
+          "TITLE": "Basic settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "SYSTEM_SETTINGS": {
+          "TITLE": "System settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "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.",
+          "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."
+            },
+            "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.”"
+            },
+            "RESPONSE_GUIDELINES": {
+              "TITLE": "Response guidelines",
+              "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
+            }
+          }
+        }
+      },
       "OPTIONS": {
         "EDIT_ASSISTANT": "Edit Assistant",
         "DELETE_ASSISTANT": "Delete Assistant",
diff --git a/app/javascript/dashboard/i18n/locale/hu/macros.json b/app/javascript/dashboard/i18n/locale/hu/macros.json
index 8cbd8fc93..3c8d0e930 100644
--- a/app/javascript/dashboard/i18n/locale/hu/macros.json
+++ b/app/javascript/dashboard/i18n/locale/hu/macros.json
@@ -99,6 +99,13 @@
       "CHANGE_PRIORITY": "Prioritás megváltoztatása",
       "ADD_PRIVATE_NOTE": "Add a Private Note",
       "SEND_WEBHOOK_EVENT": "Send Webhook Event"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "Nincs",
+      "LOW": "Alacsony",
+      "MEDIUM": "Közepes",
+      "HIGH": "Magas",
+      "URGENT": "Sürgős"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hy/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/hy/attributesMgmt.json
index dd413ab26..cea6359de 100644
--- a/app/javascript/dashboard/i18n/locale/hy/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hy/attributesMgmt.json
@@ -5,6 +5,18 @@
     "LOADING": "Fetching custom attributes",
     "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.",
     "LEARN_MORE": "Learn more about custom attributes",
+    "ATTRIBUTE_MODELS": {
+      "CONVERSATION": "Conversation",
+      "CONTACT": "Contact"
+    },
+    "ATTRIBUTE_TYPES": {
+      "TEXT": "Text",
+      "NUMBER": "Number",
+      "LINK": "Link",
+      "DATE": "Date",
+      "LIST": "List",
+      "CHECKBOX": "Checkbox"
+    },
     "ADD": {
       "TITLE": "Add Custom Attribute",
       "SUBMIT": "Create",
diff --git a/app/javascript/dashboard/i18n/locale/hy/automation.json b/app/javascript/dashboard/i18n/locale/hy/automation.json
index c5dd4a514..cb030332f 100644
--- a/app/javascript/dashboard/i18n/locale/hy/automation.json
+++ b/app/javascript/dashboard/i18n/locale/hy/automation.json
@@ -150,6 +150,17 @@
       "ADD_SLA": "Add SLA",
       "OPEN_CONVERSATION": "Open conversation"
     },
+    "MESSAGE_TYPES": {
+      "INCOMING": "Incoming Message",
+      "OUTGOING": "Outgoing Message"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "None",
+      "LOW": "Low",
+      "MEDIUM": "Medium",
+      "HIGH": "High",
+      "URGENT": "Urgent"
+    },
     "ATTRIBUTES": {
       "MESSAGE_TYPE": "Message Type",
       "MESSAGE_CONTAINS": "Message Contains",
diff --git a/app/javascript/dashboard/i18n/locale/hy/generalSettings.json b/app/javascript/dashboard/i18n/locale/hy/generalSettings.json
index 9055574c5..d924bffbd 100644
--- a/app/javascript/dashboard/i18n/locale/hy/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/hy/generalSettings.json
@@ -134,6 +134,7 @@
     "MULTISELECT": {
       "ENTER_TO_SELECT": "Press enter to select",
       "ENTER_TO_REMOVE": "Press enter to remove",
+      "NO_OPTIONS": "List is empty",
       "SELECT_ONE": "Select one",
       "SELECT": "Select"
     }
diff --git a/app/javascript/dashboard/i18n/locale/hy/integrations.json b/app/javascript/dashboard/i18n/locale/hy/integrations.json
index 7ae07cfa2..a873cfcf5 100644
--- a/app/javascript/dashboard/i18n/locale/hy/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/hy/integrations.json
@@ -481,6 +481,37 @@
         "ERROR_MESSAGE": "There was an error updating the assistant, please try again.",
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
+      "SETTINGS": {
+        "BREADCRUMB": {
+          "ASSISTANT": "Assistant"
+        },
+        "BASIC_SETTINGS": {
+          "TITLE": "Basic settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "SYSTEM_SETTINGS": {
+          "TITLE": "System settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "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.",
+          "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."
+            },
+            "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.”"
+            },
+            "RESPONSE_GUIDELINES": {
+              "TITLE": "Response guidelines",
+              "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
+            }
+          }
+        }
+      },
       "OPTIONS": {
         "EDIT_ASSISTANT": "Edit Assistant",
         "DELETE_ASSISTANT": "Delete Assistant",
diff --git a/app/javascript/dashboard/i18n/locale/hy/macros.json b/app/javascript/dashboard/i18n/locale/hy/macros.json
index d22744190..fcb409f34 100644
--- a/app/javascript/dashboard/i18n/locale/hy/macros.json
+++ b/app/javascript/dashboard/i18n/locale/hy/macros.json
@@ -99,6 +99,13 @@
       "CHANGE_PRIORITY": "Change Priority",
       "ADD_PRIVATE_NOTE": "Add a Private Note",
       "SEND_WEBHOOK_EVENT": "Send Webhook Event"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "None",
+      "LOW": "Low",
+      "MEDIUM": "Medium",
+      "HIGH": "High",
+      "URGENT": "Urgent"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/id/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/id/attributesMgmt.json
index 432744cc5..aa2be4973 100644
--- a/app/javascript/dashboard/i18n/locale/id/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/id/attributesMgmt.json
@@ -5,6 +5,18 @@
     "LOADING": "Mengambil atribut kustom",
     "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.",
     "LEARN_MORE": "Learn more about custom attributes",
+    "ATTRIBUTE_MODELS": {
+      "CONVERSATION": "Percakapan",
+      "CONTACT": "Kontak"
+    },
+    "ATTRIBUTE_TYPES": {
+      "TEXT": "Teks",
+      "NUMBER": "Nomor",
+      "LINK": "Tautan",
+      "DATE": "Date",
+      "LIST": "Daftar",
+      "CHECKBOX": "Kotak centang"
+    },
     "ADD": {
       "TITLE": "Tambah Atribut Kustom",
       "SUBMIT": "Buat",
diff --git a/app/javascript/dashboard/i18n/locale/id/automation.json b/app/javascript/dashboard/i18n/locale/id/automation.json
index 53a15ed78..8d6c50a7c 100644
--- a/app/javascript/dashboard/i18n/locale/id/automation.json
+++ b/app/javascript/dashboard/i18n/locale/id/automation.json
@@ -150,6 +150,17 @@
       "ADD_SLA": "Add SLA",
       "OPEN_CONVERSATION": "Buka percakapan"
     },
+    "MESSAGE_TYPES": {
+      "INCOMING": "Incoming Message",
+      "OUTGOING": "Outgoing Message"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "Tidak ada",
+      "LOW": "Rendah",
+      "MEDIUM": "Sedang",
+      "HIGH": "Tinggi",
+      "URGENT": "Penting"
+    },
     "ATTRIBUTES": {
       "MESSAGE_TYPE": "Message Type",
       "MESSAGE_CONTAINS": "Message Contains",
diff --git a/app/javascript/dashboard/i18n/locale/id/generalSettings.json b/app/javascript/dashboard/i18n/locale/id/generalSettings.json
index 435759147..e540e8ecb 100644
--- a/app/javascript/dashboard/i18n/locale/id/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/id/generalSettings.json
@@ -134,6 +134,7 @@
     "MULTISELECT": {
       "ENTER_TO_SELECT": "Tekan enter untuk memilih",
       "ENTER_TO_REMOVE": "Tekan enter untuk menghapus",
+      "NO_OPTIONS": "List is empty",
       "SELECT_ONE": "Pilih satu",
       "SELECT": "Pilih"
     }
diff --git a/app/javascript/dashboard/i18n/locale/id/integrations.json b/app/javascript/dashboard/i18n/locale/id/integrations.json
index 46631614a..4f7dcd456 100644
--- a/app/javascript/dashboard/i18n/locale/id/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/id/integrations.json
@@ -481,6 +481,37 @@
         "ERROR_MESSAGE": "There was an error updating the assistant, please try again.",
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
+      "SETTINGS": {
+        "BREADCRUMB": {
+          "ASSISTANT": "Assistant"
+        },
+        "BASIC_SETTINGS": {
+          "TITLE": "Basic settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "SYSTEM_SETTINGS": {
+          "TITLE": "System settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "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.",
+          "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."
+            },
+            "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.”"
+            },
+            "RESPONSE_GUIDELINES": {
+              "TITLE": "Response guidelines",
+              "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
+            }
+          }
+        }
+      },
       "OPTIONS": {
         "EDIT_ASSISTANT": "Edit Assistant",
         "DELETE_ASSISTANT": "Delete Assistant",
diff --git a/app/javascript/dashboard/i18n/locale/id/macros.json b/app/javascript/dashboard/i18n/locale/id/macros.json
index 25f6abbef..4d39b93d5 100644
--- a/app/javascript/dashboard/i18n/locale/id/macros.json
+++ b/app/javascript/dashboard/i18n/locale/id/macros.json
@@ -99,6 +99,13 @@
       "CHANGE_PRIORITY": "Ubah Prioritas",
       "ADD_PRIVATE_NOTE": "Add a Private Note",
       "SEND_WEBHOOK_EVENT": "Send Webhook Event"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "Tidak ada",
+      "LOW": "Rendah",
+      "MEDIUM": "Sedang",
+      "HIGH": "Tinggi",
+      "URGENT": "Penting"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/is/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/is/attributesMgmt.json
index 2f447c934..74c148256 100644
--- a/app/javascript/dashboard/i18n/locale/is/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/is/attributesMgmt.json
@@ -5,6 +5,18 @@
     "LOADING": "Fetching custom attributes",
     "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.",
     "LEARN_MORE": "Learn more about custom attributes",
+    "ATTRIBUTE_MODELS": {
+      "CONVERSATION": "Conversation",
+      "CONTACT": "Contact"
+    },
+    "ATTRIBUTE_TYPES": {
+      "TEXT": "Text",
+      "NUMBER": "Number",
+      "LINK": "Link",
+      "DATE": "Date",
+      "LIST": "List",
+      "CHECKBOX": "Checkbox"
+    },
     "ADD": {
       "TITLE": "Add Custom Attribute",
       "SUBMIT": "Create",
diff --git a/app/javascript/dashboard/i18n/locale/is/automation.json b/app/javascript/dashboard/i18n/locale/is/automation.json
index 0e527019e..d5d36f3f8 100644
--- a/app/javascript/dashboard/i18n/locale/is/automation.json
+++ b/app/javascript/dashboard/i18n/locale/is/automation.json
@@ -150,6 +150,17 @@
       "ADD_SLA": "Add SLA",
       "OPEN_CONVERSATION": "Opna samtal"
     },
+    "MESSAGE_TYPES": {
+      "INCOMING": "Incoming Message",
+      "OUTGOING": "Outgoing Message"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "Enginn",
+      "LOW": "Low",
+      "MEDIUM": "Medium",
+      "HIGH": "High",
+      "URGENT": "Urgent"
+    },
     "ATTRIBUTES": {
       "MESSAGE_TYPE": "Message Type",
       "MESSAGE_CONTAINS": "Message Contains",
diff --git a/app/javascript/dashboard/i18n/locale/is/generalSettings.json b/app/javascript/dashboard/i18n/locale/is/generalSettings.json
index 9b8aec36c..6c7af2ba0 100644
--- a/app/javascript/dashboard/i18n/locale/is/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/is/generalSettings.json
@@ -134,6 +134,7 @@
     "MULTISELECT": {
       "ENTER_TO_SELECT": "Enter til þess að velja",
       "ENTER_TO_REMOVE": "Enter til þess að fjarlægja",
+      "NO_OPTIONS": "List is empty",
       "SELECT_ONE": "Veldu eitt",
       "SELECT": "Velja"
     }
diff --git a/app/javascript/dashboard/i18n/locale/is/integrations.json b/app/javascript/dashboard/i18n/locale/is/integrations.json
index bea96a131..4743ad6d0 100644
--- a/app/javascript/dashboard/i18n/locale/is/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/is/integrations.json
@@ -481,6 +481,37 @@
         "ERROR_MESSAGE": "There was an error updating the assistant, please try again.",
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
+      "SETTINGS": {
+        "BREADCRUMB": {
+          "ASSISTANT": "Assistant"
+        },
+        "BASIC_SETTINGS": {
+          "TITLE": "Basic settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "SYSTEM_SETTINGS": {
+          "TITLE": "System settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "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.",
+          "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."
+            },
+            "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.”"
+            },
+            "RESPONSE_GUIDELINES": {
+              "TITLE": "Response guidelines",
+              "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
+            }
+          }
+        }
+      },
       "OPTIONS": {
         "EDIT_ASSISTANT": "Edit Assistant",
         "DELETE_ASSISTANT": "Delete Assistant",
diff --git a/app/javascript/dashboard/i18n/locale/is/macros.json b/app/javascript/dashboard/i18n/locale/is/macros.json
index 1149373b9..2e9daa248 100644
--- a/app/javascript/dashboard/i18n/locale/is/macros.json
+++ b/app/javascript/dashboard/i18n/locale/is/macros.json
@@ -99,6 +99,13 @@
       "CHANGE_PRIORITY": "Change Priority",
       "ADD_PRIVATE_NOTE": "Add a Private Note",
       "SEND_WEBHOOK_EVENT": "Send Webhook Event"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "Enginn",
+      "LOW": "Low",
+      "MEDIUM": "Medium",
+      "HIGH": "High",
+      "URGENT": "Urgent"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/it/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/it/attributesMgmt.json
index c1ea593cb..9a4600105 100644
--- a/app/javascript/dashboard/i18n/locale/it/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/it/attributesMgmt.json
@@ -5,6 +5,18 @@
     "LOADING": "Recupero degli attributi personalizzati",
     "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.",
     "LEARN_MORE": "Learn more about custom attributes",
+    "ATTRIBUTE_MODELS": {
+      "CONVERSATION": "Conversazioni",
+      "CONTACT": "Contatto"
+    },
+    "ATTRIBUTE_TYPES": {
+      "TEXT": "Testo",
+      "NUMBER": "Numero",
+      "LINK": "Link",
+      "DATE": "Date",
+      "LIST": "Elenco",
+      "CHECKBOX": "Checkbox"
+    },
     "ADD": {
       "TITLE": "Aggiungi attributo personalizzato",
       "SUBMIT": "Crea",
diff --git a/app/javascript/dashboard/i18n/locale/it/automation.json b/app/javascript/dashboard/i18n/locale/it/automation.json
index fef16e1d0..1d1225fb8 100644
--- a/app/javascript/dashboard/i18n/locale/it/automation.json
+++ b/app/javascript/dashboard/i18n/locale/it/automation.json
@@ -150,6 +150,17 @@
       "ADD_SLA": "Add SLA",
       "OPEN_CONVERSATION": "Apri conversazione"
     },
+    "MESSAGE_TYPES": {
+      "INCOMING": "Incoming Message",
+      "OUTGOING": "Outgoing Message"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "Nessuno",
+      "LOW": "Low",
+      "MEDIUM": "Medium",
+      "HIGH": "High",
+      "URGENT": "Urgent"
+    },
     "ATTRIBUTES": {
       "MESSAGE_TYPE": "Message Type",
       "MESSAGE_CONTAINS": "Message Contains",
diff --git a/app/javascript/dashboard/i18n/locale/it/generalSettings.json b/app/javascript/dashboard/i18n/locale/it/generalSettings.json
index 63d8c2ef9..0ab832438 100644
--- a/app/javascript/dashboard/i18n/locale/it/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/it/generalSettings.json
@@ -134,6 +134,7 @@
     "MULTISELECT": {
       "ENTER_TO_SELECT": "Premi Invio per selezionare",
       "ENTER_TO_REMOVE": "Premi Invio per rimuovere",
+      "NO_OPTIONS": "List is empty",
       "SELECT_ONE": "Selezionane uno",
       "SELECT": "Select"
     }
diff --git a/app/javascript/dashboard/i18n/locale/it/integrations.json b/app/javascript/dashboard/i18n/locale/it/integrations.json
index a908a28d9..a6017f857 100644
--- a/app/javascript/dashboard/i18n/locale/it/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/it/integrations.json
@@ -481,6 +481,37 @@
         "ERROR_MESSAGE": "There was an error updating the assistant, please try again.",
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
+      "SETTINGS": {
+        "BREADCRUMB": {
+          "ASSISTANT": "Assistant"
+        },
+        "BASIC_SETTINGS": {
+          "TITLE": "Basic settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "SYSTEM_SETTINGS": {
+          "TITLE": "System settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "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.",
+          "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."
+            },
+            "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.”"
+            },
+            "RESPONSE_GUIDELINES": {
+              "TITLE": "Response guidelines",
+              "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
+            }
+          }
+        }
+      },
       "OPTIONS": {
         "EDIT_ASSISTANT": "Edit Assistant",
         "DELETE_ASSISTANT": "Delete Assistant",
diff --git a/app/javascript/dashboard/i18n/locale/it/macros.json b/app/javascript/dashboard/i18n/locale/it/macros.json
index fbbfe2c50..cc2c0e274 100644
--- a/app/javascript/dashboard/i18n/locale/it/macros.json
+++ b/app/javascript/dashboard/i18n/locale/it/macros.json
@@ -99,6 +99,13 @@
       "CHANGE_PRIORITY": "Change Priority",
       "ADD_PRIVATE_NOTE": "Add a Private Note",
       "SEND_WEBHOOK_EVENT": "Send Webhook Event"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "Nessuno",
+      "LOW": "Low",
+      "MEDIUM": "Medium",
+      "HIGH": "High",
+      "URGENT": "Urgent"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ja/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/ja/attributesMgmt.json
index 34eff6a53..b1fe37e3e 100644
--- a/app/javascript/dashboard/i18n/locale/ja/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ja/attributesMgmt.json
@@ -5,6 +5,18 @@
     "LOADING": "カスタム属性を取得中",
     "DESCRIPTION": "カスタム属性は、連絡先や会話に関する追加の詳細（例：サブスクリプションプランや初回購入日など）を記録します。必要な情報をキャプチャするために、テキスト、リスト、数値など、さまざまなタイプのカスタム属性を追加できます。",
     "LEARN_MORE": "カスタム属性について詳しく学ぶ",
+    "ATTRIBUTE_MODELS": {
+      "CONVERSATION": "会話",
+      "CONTACT": "連絡先"
+    },
+    "ATTRIBUTE_TYPES": {
+      "TEXT": "テキスト",
+      "NUMBER": "数値",
+      "LINK": "リンク",
+      "DATE": "Date",
+      "LIST": "リスト",
+      "CHECKBOX": "チェックボックス"
+    },
     "ADD": {
       "TITLE": "カスタム属性を追加",
       "SUBMIT": "作成",
diff --git a/app/javascript/dashboard/i18n/locale/ja/automation.json b/app/javascript/dashboard/i18n/locale/ja/automation.json
index d5384e5b5..d25e7183d 100644
--- a/app/javascript/dashboard/i18n/locale/ja/automation.json
+++ b/app/javascript/dashboard/i18n/locale/ja/automation.json
@@ -150,6 +150,17 @@
       "ADD_SLA": "SLAを追加",
       "OPEN_CONVERSATION": "会話を開く"
     },
+    "MESSAGE_TYPES": {
+      "INCOMING": "Incoming Message",
+      "OUTGOING": "Outgoing Message"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "なし",
+      "LOW": "低",
+      "MEDIUM": "中",
+      "HIGH": "高",
+      "URGENT": "緊急"
+    },
     "ATTRIBUTES": {
       "MESSAGE_TYPE": "Message Type",
       "MESSAGE_CONTAINS": "Message Contains",
diff --git a/app/javascript/dashboard/i18n/locale/ja/generalSettings.json b/app/javascript/dashboard/i18n/locale/ja/generalSettings.json
index 8323df4d7..38f0747df 100644
--- a/app/javascript/dashboard/i18n/locale/ja/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ja/generalSettings.json
@@ -134,6 +134,7 @@
     "MULTISELECT": {
       "ENTER_TO_SELECT": "Enterキーで選択",
       "ENTER_TO_REMOVE": "Enterキーで削除",
+      "NO_OPTIONS": "List is empty",
       "SELECT_ONE": "1つを選択",
       "SELECT": "選択"
     }
diff --git a/app/javascript/dashboard/i18n/locale/ja/integrations.json b/app/javascript/dashboard/i18n/locale/ja/integrations.json
index d7119ea0b..7c2d29b3c 100644
--- a/app/javascript/dashboard/i18n/locale/ja/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ja/integrations.json
@@ -481,6 +481,37 @@
         "ERROR_MESSAGE": "アシスタントの更新中にエラーが発生しました。もう一度お試しください。",
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
+      "SETTINGS": {
+        "BREADCRUMB": {
+          "ASSISTANT": "アシスタント"
+        },
+        "BASIC_SETTINGS": {
+          "TITLE": "Basic settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "SYSTEM_SETTINGS": {
+          "TITLE": "System settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "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.",
+          "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."
+            },
+            "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.”"
+            },
+            "RESPONSE_GUIDELINES": {
+              "TITLE": "Response guidelines",
+              "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
+            }
+          }
+        }
+      },
       "OPTIONS": {
         "EDIT_ASSISTANT": "アシスタントを編集",
         "DELETE_ASSISTANT": "アシスタントを削除",
diff --git a/app/javascript/dashboard/i18n/locale/ja/macros.json b/app/javascript/dashboard/i18n/locale/ja/macros.json
index b17e80898..39813bfb6 100644
--- a/app/javascript/dashboard/i18n/locale/ja/macros.json
+++ b/app/javascript/dashboard/i18n/locale/ja/macros.json
@@ -99,6 +99,13 @@
       "CHANGE_PRIORITY": "優先度を変更",
       "ADD_PRIVATE_NOTE": "Add a Private Note",
       "SEND_WEBHOOK_EVENT": "Send Webhook Event"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "なし",
+      "LOW": "低",
+      "MEDIUM": "中",
+      "HIGH": "高",
+      "URGENT": "緊急"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ka/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/ka/attributesMgmt.json
index dd413ab26..cea6359de 100644
--- a/app/javascript/dashboard/i18n/locale/ka/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ka/attributesMgmt.json
@@ -5,6 +5,18 @@
     "LOADING": "Fetching custom attributes",
     "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.",
     "LEARN_MORE": "Learn more about custom attributes",
+    "ATTRIBUTE_MODELS": {
+      "CONVERSATION": "Conversation",
+      "CONTACT": "Contact"
+    },
+    "ATTRIBUTE_TYPES": {
+      "TEXT": "Text",
+      "NUMBER": "Number",
+      "LINK": "Link",
+      "DATE": "Date",
+      "LIST": "List",
+      "CHECKBOX": "Checkbox"
+    },
     "ADD": {
       "TITLE": "Add Custom Attribute",
       "SUBMIT": "Create",
diff --git a/app/javascript/dashboard/i18n/locale/ka/automation.json b/app/javascript/dashboard/i18n/locale/ka/automation.json
index c5dd4a514..cb030332f 100644
--- a/app/javascript/dashboard/i18n/locale/ka/automation.json
+++ b/app/javascript/dashboard/i18n/locale/ka/automation.json
@@ -150,6 +150,17 @@
       "ADD_SLA": "Add SLA",
       "OPEN_CONVERSATION": "Open conversation"
     },
+    "MESSAGE_TYPES": {
+      "INCOMING": "Incoming Message",
+      "OUTGOING": "Outgoing Message"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "None",
+      "LOW": "Low",
+      "MEDIUM": "Medium",
+      "HIGH": "High",
+      "URGENT": "Urgent"
+    },
     "ATTRIBUTES": {
       "MESSAGE_TYPE": "Message Type",
       "MESSAGE_CONTAINS": "Message Contains",
diff --git a/app/javascript/dashboard/i18n/locale/ka/generalSettings.json b/app/javascript/dashboard/i18n/locale/ka/generalSettings.json
index 9055574c5..d924bffbd 100644
--- a/app/javascript/dashboard/i18n/locale/ka/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ka/generalSettings.json
@@ -134,6 +134,7 @@
     "MULTISELECT": {
       "ENTER_TO_SELECT": "Press enter to select",
       "ENTER_TO_REMOVE": "Press enter to remove",
+      "NO_OPTIONS": "List is empty",
       "SELECT_ONE": "Select one",
       "SELECT": "Select"
     }
diff --git a/app/javascript/dashboard/i18n/locale/ka/integrations.json b/app/javascript/dashboard/i18n/locale/ka/integrations.json
index 7ae07cfa2..a873cfcf5 100644
--- a/app/javascript/dashboard/i18n/locale/ka/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ka/integrations.json
@@ -481,6 +481,37 @@
         "ERROR_MESSAGE": "There was an error updating the assistant, please try again.",
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
+      "SETTINGS": {
+        "BREADCRUMB": {
+          "ASSISTANT": "Assistant"
+        },
+        "BASIC_SETTINGS": {
+          "TITLE": "Basic settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "SYSTEM_SETTINGS": {
+          "TITLE": "System settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "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.",
+          "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."
+            },
+            "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.”"
+            },
+            "RESPONSE_GUIDELINES": {
+              "TITLE": "Response guidelines",
+              "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
+            }
+          }
+        }
+      },
       "OPTIONS": {
         "EDIT_ASSISTANT": "Edit Assistant",
         "DELETE_ASSISTANT": "Delete Assistant",
diff --git a/app/javascript/dashboard/i18n/locale/ka/macros.json b/app/javascript/dashboard/i18n/locale/ka/macros.json
index d22744190..fcb409f34 100644
--- a/app/javascript/dashboard/i18n/locale/ka/macros.json
+++ b/app/javascript/dashboard/i18n/locale/ka/macros.json
@@ -99,6 +99,13 @@
       "CHANGE_PRIORITY": "Change Priority",
       "ADD_PRIVATE_NOTE": "Add a Private Note",
       "SEND_WEBHOOK_EVENT": "Send Webhook Event"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "None",
+      "LOW": "Low",
+      "MEDIUM": "Medium",
+      "HIGH": "High",
+      "URGENT": "Urgent"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ko/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/ko/attributesMgmt.json
index 8ef01ffb5..04e80ebe2 100644
--- a/app/javascript/dashboard/i18n/locale/ko/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ko/attributesMgmt.json
@@ -5,6 +5,18 @@
     "LOADING": "사용자 지정 속성들 가져오기",
     "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.",
     "LEARN_MORE": "Learn more about custom attributes",
+    "ATTRIBUTE_MODELS": {
+      "CONVERSATION": "Conversation",
+      "CONTACT": "Contact"
+    },
+    "ATTRIBUTE_TYPES": {
+      "TEXT": "텍스트",
+      "NUMBER": "숫자",
+      "LINK": "링크",
+      "DATE": "Date",
+      "LIST": "리스트",
+      "CHECKBOX": "체크박스"
+    },
     "ADD": {
       "TITLE": "사용자 지정 속성 추가하기",
       "SUBMIT": "만들기",
diff --git a/app/javascript/dashboard/i18n/locale/ko/automation.json b/app/javascript/dashboard/i18n/locale/ko/automation.json
index 66df959f0..7731b9cff 100644
--- a/app/javascript/dashboard/i18n/locale/ko/automation.json
+++ b/app/javascript/dashboard/i18n/locale/ko/automation.json
@@ -150,6 +150,17 @@
       "ADD_SLA": "Add SLA",
       "OPEN_CONVERSATION": "Open conversation"
     },
+    "MESSAGE_TYPES": {
+      "INCOMING": "Incoming Message",
+      "OUTGOING": "Outgoing Message"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "없음",
+      "LOW": "Low",
+      "MEDIUM": "Medium",
+      "HIGH": "High",
+      "URGENT": "Urgent"
+    },
     "ATTRIBUTES": {
       "MESSAGE_TYPE": "Message Type",
       "MESSAGE_CONTAINS": "Message Contains",
diff --git a/app/javascript/dashboard/i18n/locale/ko/generalSettings.json b/app/javascript/dashboard/i18n/locale/ko/generalSettings.json
index 340825f62..3b9315802 100644
--- a/app/javascript/dashboard/i18n/locale/ko/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ko/generalSettings.json
@@ -134,6 +134,7 @@
     "MULTISELECT": {
       "ENTER_TO_SELECT": "선택하려면 Enter 키를 누르십시오.",
       "ENTER_TO_REMOVE": "제거하려면 Enter 키를 누르십시오.",
+      "NO_OPTIONS": "List is empty",
       "SELECT_ONE": "하나 선택",
       "SELECT": "Select"
     }
diff --git a/app/javascript/dashboard/i18n/locale/ko/integrations.json b/app/javascript/dashboard/i18n/locale/ko/integrations.json
index c279a9097..72a9b8792 100644
--- a/app/javascript/dashboard/i18n/locale/ko/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ko/integrations.json
@@ -481,6 +481,37 @@
         "ERROR_MESSAGE": "There was an error updating the assistant, please try again.",
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
+      "SETTINGS": {
+        "BREADCRUMB": {
+          "ASSISTANT": "Assistant"
+        },
+        "BASIC_SETTINGS": {
+          "TITLE": "Basic settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "SYSTEM_SETTINGS": {
+          "TITLE": "System settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "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.",
+          "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."
+            },
+            "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.”"
+            },
+            "RESPONSE_GUIDELINES": {
+              "TITLE": "Response guidelines",
+              "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
+            }
+          }
+        }
+      },
       "OPTIONS": {
         "EDIT_ASSISTANT": "Edit Assistant",
         "DELETE_ASSISTANT": "Delete Assistant",
diff --git a/app/javascript/dashboard/i18n/locale/ko/macros.json b/app/javascript/dashboard/i18n/locale/ko/macros.json
index a7f5c1464..397c1ce27 100644
--- a/app/javascript/dashboard/i18n/locale/ko/macros.json
+++ b/app/javascript/dashboard/i18n/locale/ko/macros.json
@@ -99,6 +99,13 @@
       "CHANGE_PRIORITY": "Change Priority",
       "ADD_PRIVATE_NOTE": "Add a Private Note",
       "SEND_WEBHOOK_EVENT": "Send Webhook Event"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "없음",
+      "LOW": "Low",
+      "MEDIUM": "Medium",
+      "HIGH": "High",
+      "URGENT": "Urgent"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/lt/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/lt/attributesMgmt.json
index 9098ff500..ae6e1704d 100644
--- a/app/javascript/dashboard/i18n/locale/lt/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/lt/attributesMgmt.json
@@ -5,6 +5,18 @@
     "LOADING": "Gaunami personalizuoti požymiai",
     "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.",
     "LEARN_MORE": "Learn more about custom attributes",
+    "ATTRIBUTE_MODELS": {
+      "CONVERSATION": "Pokalbis",
+      "CONTACT": "Kontaktas"
+    },
+    "ATTRIBUTE_TYPES": {
+      "TEXT": "Tekstas",
+      "NUMBER": "Numeris",
+      "LINK": "Nuoroda",
+      "DATE": "Date",
+      "LIST": "Sąrašas",
+      "CHECKBOX": "Žymimasis langelis"
+    },
     "ADD": {
       "TITLE": "Pridėti personalizuotą požymį",
       "SUBMIT": "Sukurti",
diff --git a/app/javascript/dashboard/i18n/locale/lt/automation.json b/app/javascript/dashboard/i18n/locale/lt/automation.json
index 08ff2e825..58540a9e3 100644
--- a/app/javascript/dashboard/i18n/locale/lt/automation.json
+++ b/app/javascript/dashboard/i18n/locale/lt/automation.json
@@ -150,6 +150,17 @@
       "ADD_SLA": "Add SLA",
       "OPEN_CONVERSATION": "Atidaryti pokalbį"
     },
+    "MESSAGE_TYPES": {
+      "INCOMING": "Incoming Message",
+      "OUTGOING": "Outgoing Message"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "Nėra",
+      "LOW": "Žemas",
+      "MEDIUM": "Vidutinis",
+      "HIGH": "Aukštas",
+      "URGENT": "Skubus"
+    },
     "ATTRIBUTES": {
       "MESSAGE_TYPE": "Message Type",
       "MESSAGE_CONTAINS": "Message Contains",
diff --git a/app/javascript/dashboard/i18n/locale/lt/generalSettings.json b/app/javascript/dashboard/i18n/locale/lt/generalSettings.json
index 42fdca091..5ac0b32d3 100644
--- a/app/javascript/dashboard/i18n/locale/lt/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/lt/generalSettings.json
@@ -134,6 +134,7 @@
     "MULTISELECT": {
       "ENTER_TO_SELECT": "Paspauskite Enter, kad pasirinktumėte",
       "ENTER_TO_REMOVE": "Paspausti Enter, kad pašalintumėte",
+      "NO_OPTIONS": "List is empty",
       "SELECT_ONE": "Pasirinkti vieną",
       "SELECT": "Pasirinkti"
     }
diff --git a/app/javascript/dashboard/i18n/locale/lt/integrations.json b/app/javascript/dashboard/i18n/locale/lt/integrations.json
index 2761b7024..333cc4a3e 100644
--- a/app/javascript/dashboard/i18n/locale/lt/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/lt/integrations.json
@@ -481,6 +481,37 @@
         "ERROR_MESSAGE": "There was an error updating the assistant, please try again.",
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
+      "SETTINGS": {
+        "BREADCRUMB": {
+          "ASSISTANT": "Assistant"
+        },
+        "BASIC_SETTINGS": {
+          "TITLE": "Basic settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "SYSTEM_SETTINGS": {
+          "TITLE": "System settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "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.",
+          "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."
+            },
+            "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.”"
+            },
+            "RESPONSE_GUIDELINES": {
+              "TITLE": "Response guidelines",
+              "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
+            }
+          }
+        }
+      },
       "OPTIONS": {
         "EDIT_ASSISTANT": "Edit Assistant",
         "DELETE_ASSISTANT": "Delete Assistant",
diff --git a/app/javascript/dashboard/i18n/locale/lt/macros.json b/app/javascript/dashboard/i18n/locale/lt/macros.json
index fca14391a..19532d650 100644
--- a/app/javascript/dashboard/i18n/locale/lt/macros.json
+++ b/app/javascript/dashboard/i18n/locale/lt/macros.json
@@ -99,6 +99,13 @@
       "CHANGE_PRIORITY": "Pakeisti Prioritetą",
       "ADD_PRIVATE_NOTE": "Add a Private Note",
       "SEND_WEBHOOK_EVENT": "Send Webhook Event"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "Nėra",
+      "LOW": "Žemas",
+      "MEDIUM": "Vidutinis",
+      "HIGH": "Aukštas",
+      "URGENT": "Skubus"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/lv/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/lv/attributesMgmt.json
index d2c169ad5..88bfba87a 100644
--- a/app/javascript/dashboard/i18n/locale/lv/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/lv/attributesMgmt.json
@@ -5,6 +5,18 @@
     "LOADING": "Notiek pielāgotu īpašību iegūšana",
     "DESCRIPTION": "Pielāgots atribūts ļauj izsekot papildu informāciju par jūsu kontaktpersonām vai sarunām, piemēram, abonēšanas plānu vai viņu pirmā pirkuma datumu. Varat pievienot dažāda veida pielāgotus atribūtus, piemēram, tekstu, sarakstus vai skaitļus, lai tvertu konkrētu jums nepieciešamo informāciju.",
     "LEARN_MORE": "Uzzināt vairāk par pielāgotajiem atribūtiem",
+    "ATTRIBUTE_MODELS": {
+      "CONVERSATION": "Saruna",
+      "CONTACT": "Kontaktpersona"
+    },
+    "ATTRIBUTE_TYPES": {
+      "TEXT": "Teksts",
+      "NUMBER": "Numurs",
+      "LINK": "Saite",
+      "DATE": "Date",
+      "LIST": "Saraksts",
+      "CHECKBOX": "Izvēles rūtiņa"
+    },
     "ADD": {
       "TITLE": "Pievienot Pielāgotu Īpašību",
       "SUBMIT": "Izveidot",
diff --git a/app/javascript/dashboard/i18n/locale/lv/automation.json b/app/javascript/dashboard/i18n/locale/lv/automation.json
index f1e107b17..ad1219a01 100644
--- a/app/javascript/dashboard/i18n/locale/lv/automation.json
+++ b/app/javascript/dashboard/i18n/locale/lv/automation.json
@@ -150,6 +150,17 @@
       "ADD_SLA": "Pievienot SLA",
       "OPEN_CONVERSATION": "Atvērt sarunu"
     },
+    "MESSAGE_TYPES": {
+      "INCOMING": "Incoming Message",
+      "OUTGOING": "Outgoing Message"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "Nav",
+      "LOW": "Zema",
+      "MEDIUM": "Vidēja",
+      "HIGH": "Augsta",
+      "URGENT": "Steidzama"
+    },
     "ATTRIBUTES": {
       "MESSAGE_TYPE": "Ziņojuma Tips",
       "MESSAGE_CONTAINS": "Ziņojums Satur",
diff --git a/app/javascript/dashboard/i18n/locale/lv/generalSettings.json b/app/javascript/dashboard/i18n/locale/lv/generalSettings.json
index 74cc49c37..7cf56963e 100644
--- a/app/javascript/dashboard/i18n/locale/lv/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/lv/generalSettings.json
@@ -134,6 +134,7 @@
     "MULTISELECT": {
       "ENTER_TO_SELECT": "Nospiediet enter, lai izvēlētos",
       "ENTER_TO_REMOVE": "Nospiediet enter, lai noņemtu",
+      "NO_OPTIONS": "List is empty",
       "SELECT_ONE": "Izvēlieties vienu",
       "SELECT": "Izvēlieties"
     }
diff --git a/app/javascript/dashboard/i18n/locale/lv/integrations.json b/app/javascript/dashboard/i18n/locale/lv/integrations.json
index 840ae0fd7..305a18a89 100644
--- a/app/javascript/dashboard/i18n/locale/lv/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/lv/integrations.json
@@ -481,6 +481,37 @@
         "ERROR_MESSAGE": "Atjauninot asistentu radās kļūda. Lūdzu, mēģiniet vēlreiz.",
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
+      "SETTINGS": {
+        "BREADCRUMB": {
+          "ASSISTANT": "Asistents"
+        },
+        "BASIC_SETTINGS": {
+          "TITLE": "Basic settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "SYSTEM_SETTINGS": {
+          "TITLE": "System settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "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.",
+          "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."
+            },
+            "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.”"
+            },
+            "RESPONSE_GUIDELINES": {
+              "TITLE": "Response guidelines",
+              "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
+            }
+          }
+        }
+      },
       "OPTIONS": {
         "EDIT_ASSISTANT": "Rediģēt Asistentu",
         "DELETE_ASSISTANT": "Dzēst Asistentu",
diff --git a/app/javascript/dashboard/i18n/locale/lv/macros.json b/app/javascript/dashboard/i18n/locale/lv/macros.json
index 3a9f99744..29ecd5d48 100644
--- a/app/javascript/dashboard/i18n/locale/lv/macros.json
+++ b/app/javascript/dashboard/i18n/locale/lv/macros.json
@@ -99,6 +99,13 @@
       "CHANGE_PRIORITY": "Mainīt prioritāti",
       "ADD_PRIVATE_NOTE": "Pievienot Privātu Piezīmi",
       "SEND_WEBHOOK_EVENT": "Nosūtīt Webhook Notikumu"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "Nav",
+      "LOW": "Zema",
+      "MEDIUM": "Vidēja",
+      "HIGH": "Augsta",
+      "URGENT": "Steidzama"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ml/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/ml/attributesMgmt.json
index 3b694741f..588aec0e7 100644
--- a/app/javascript/dashboard/i18n/locale/ml/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ml/attributesMgmt.json
@@ -5,6 +5,18 @@
     "LOADING": "Fetching custom attributes",
     "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.",
     "LEARN_MORE": "Learn more about custom attributes",
+    "ATTRIBUTE_MODELS": {
+      "CONVERSATION": "സംഭാഷണം",
+      "CONTACT": "ബന്ധപ്പെടുക"
+    },
+    "ATTRIBUTE_TYPES": {
+      "TEXT": "Text",
+      "NUMBER": "Number",
+      "LINK": "Link",
+      "DATE": "Date",
+      "LIST": "List",
+      "CHECKBOX": "Checkbox"
+    },
     "ADD": {
       "TITLE": "Add Custom Attribute",
       "SUBMIT": "സൃഷ്ടിക്കുക",
diff --git a/app/javascript/dashboard/i18n/locale/ml/automation.json b/app/javascript/dashboard/i18n/locale/ml/automation.json
index eba67abf8..d1d8dcdbd 100644
--- a/app/javascript/dashboard/i18n/locale/ml/automation.json
+++ b/app/javascript/dashboard/i18n/locale/ml/automation.json
@@ -150,6 +150,17 @@
       "ADD_SLA": "Add SLA",
       "OPEN_CONVERSATION": "Open conversation"
     },
+    "MESSAGE_TYPES": {
+      "INCOMING": "Incoming Message",
+      "OUTGOING": "Outgoing Message"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "None",
+      "LOW": "Low",
+      "MEDIUM": "Medium",
+      "HIGH": "High",
+      "URGENT": "Urgent"
+    },
     "ATTRIBUTES": {
       "MESSAGE_TYPE": "Message Type",
       "MESSAGE_CONTAINS": "Message Contains",
diff --git a/app/javascript/dashboard/i18n/locale/ml/generalSettings.json b/app/javascript/dashboard/i18n/locale/ml/generalSettings.json
index 791618123..f95147b6e 100644
--- a/app/javascript/dashboard/i18n/locale/ml/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ml/generalSettings.json
@@ -134,6 +134,7 @@
     "MULTISELECT": {
       "ENTER_TO_SELECT": "Press enter to select",
       "ENTER_TO_REMOVE": "Press enter to remove",
+      "NO_OPTIONS": "List is empty",
       "SELECT_ONE": "Select one",
       "SELECT": "Select"
     }
diff --git a/app/javascript/dashboard/i18n/locale/ml/integrations.json b/app/javascript/dashboard/i18n/locale/ml/integrations.json
index 6afe4c696..da82936ce 100644
--- a/app/javascript/dashboard/i18n/locale/ml/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ml/integrations.json
@@ -481,6 +481,37 @@
         "ERROR_MESSAGE": "There was an error updating the assistant, please try again.",
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
+      "SETTINGS": {
+        "BREADCRUMB": {
+          "ASSISTANT": "Assistant"
+        },
+        "BASIC_SETTINGS": {
+          "TITLE": "Basic settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "SYSTEM_SETTINGS": {
+          "TITLE": "System settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "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.",
+          "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."
+            },
+            "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.”"
+            },
+            "RESPONSE_GUIDELINES": {
+              "TITLE": "Response guidelines",
+              "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
+            }
+          }
+        }
+      },
       "OPTIONS": {
         "EDIT_ASSISTANT": "Edit Assistant",
         "DELETE_ASSISTANT": "Delete Assistant",
diff --git a/app/javascript/dashboard/i18n/locale/ml/macros.json b/app/javascript/dashboard/i18n/locale/ml/macros.json
index bf31c8ec3..afd84e332 100644
--- a/app/javascript/dashboard/i18n/locale/ml/macros.json
+++ b/app/javascript/dashboard/i18n/locale/ml/macros.json
@@ -99,6 +99,13 @@
       "CHANGE_PRIORITY": "Change Priority",
       "ADD_PRIVATE_NOTE": "Add a Private Note",
       "SEND_WEBHOOK_EVENT": "Send Webhook Event"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "None",
+      "LOW": "Low",
+      "MEDIUM": "Medium",
+      "HIGH": "High",
+      "URGENT": "Urgent"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ms/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/ms/attributesMgmt.json
index bfb3b6afe..dd0c1c03c 100644
--- a/app/javascript/dashboard/i18n/locale/ms/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ms/attributesMgmt.json
@@ -5,6 +5,18 @@
     "LOADING": "Mendapatkan atribut penyesuian",
     "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.",
     "LEARN_MORE": "Learn more about custom attributes",
+    "ATTRIBUTE_MODELS": {
+      "CONVERSATION": "Conversation",
+      "CONTACT": "Contact"
+    },
+    "ATTRIBUTE_TYPES": {
+      "TEXT": "Teks",
+      "NUMBER": "Nombor",
+      "LINK": "Pautan",
+      "DATE": "Date",
+      "LIST": "Senarai",
+      "CHECKBOX": "Kotak Semak"
+    },
     "ADD": {
       "TITLE": "Tambahkan Atribut Penyesuian",
       "SUBMIT": "Create",
diff --git a/app/javascript/dashboard/i18n/locale/ms/automation.json b/app/javascript/dashboard/i18n/locale/ms/automation.json
index d14827bb8..41ae90074 100644
--- a/app/javascript/dashboard/i18n/locale/ms/automation.json
+++ b/app/javascript/dashboard/i18n/locale/ms/automation.json
@@ -150,6 +150,17 @@
       "ADD_SLA": "Add SLA",
       "OPEN_CONVERSATION": "Open conversation"
     },
+    "MESSAGE_TYPES": {
+      "INCOMING": "Incoming Message",
+      "OUTGOING": "Outgoing Message"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "None",
+      "LOW": "Low",
+      "MEDIUM": "Medium",
+      "HIGH": "High",
+      "URGENT": "Urgent"
+    },
     "ATTRIBUTES": {
       "MESSAGE_TYPE": "Message Type",
       "MESSAGE_CONTAINS": "Message Contains",
diff --git a/app/javascript/dashboard/i18n/locale/ms/generalSettings.json b/app/javascript/dashboard/i18n/locale/ms/generalSettings.json
index 986a4efe4..5b62bba3f 100644
--- a/app/javascript/dashboard/i18n/locale/ms/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ms/generalSettings.json
@@ -134,6 +134,7 @@
     "MULTISELECT": {
       "ENTER_TO_SELECT": "Press enter to select",
       "ENTER_TO_REMOVE": "Press enter to remove",
+      "NO_OPTIONS": "List is empty",
       "SELECT_ONE": "Select one",
       "SELECT": "Select"
     }
diff --git a/app/javascript/dashboard/i18n/locale/ms/integrations.json b/app/javascript/dashboard/i18n/locale/ms/integrations.json
index 48a8afe8c..ff4b9cc98 100644
--- a/app/javascript/dashboard/i18n/locale/ms/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ms/integrations.json
@@ -481,6 +481,37 @@
         "ERROR_MESSAGE": "There was an error updating the assistant, please try again.",
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
+      "SETTINGS": {
+        "BREADCRUMB": {
+          "ASSISTANT": "Assistant"
+        },
+        "BASIC_SETTINGS": {
+          "TITLE": "Basic settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "SYSTEM_SETTINGS": {
+          "TITLE": "System settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "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.",
+          "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."
+            },
+            "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.”"
+            },
+            "RESPONSE_GUIDELINES": {
+              "TITLE": "Response guidelines",
+              "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
+            }
+          }
+        }
+      },
       "OPTIONS": {
         "EDIT_ASSISTANT": "Edit Assistant",
         "DELETE_ASSISTANT": "Delete Assistant",
diff --git a/app/javascript/dashboard/i18n/locale/ms/macros.json b/app/javascript/dashboard/i18n/locale/ms/macros.json
index 4a17a2cb5..48099f5f9 100644
--- a/app/javascript/dashboard/i18n/locale/ms/macros.json
+++ b/app/javascript/dashboard/i18n/locale/ms/macros.json
@@ -99,6 +99,13 @@
       "CHANGE_PRIORITY": "Change Priority",
       "ADD_PRIVATE_NOTE": "Add a Private Note",
       "SEND_WEBHOOK_EVENT": "Send Webhook Event"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "None",
+      "LOW": "Low",
+      "MEDIUM": "Medium",
+      "HIGH": "High",
+      "URGENT": "Urgent"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ne/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/ne/attributesMgmt.json
index dd413ab26..cea6359de 100644
--- a/app/javascript/dashboard/i18n/locale/ne/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ne/attributesMgmt.json
@@ -5,6 +5,18 @@
     "LOADING": "Fetching custom attributes",
     "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.",
     "LEARN_MORE": "Learn more about custom attributes",
+    "ATTRIBUTE_MODELS": {
+      "CONVERSATION": "Conversation",
+      "CONTACT": "Contact"
+    },
+    "ATTRIBUTE_TYPES": {
+      "TEXT": "Text",
+      "NUMBER": "Number",
+      "LINK": "Link",
+      "DATE": "Date",
+      "LIST": "List",
+      "CHECKBOX": "Checkbox"
+    },
     "ADD": {
       "TITLE": "Add Custom Attribute",
       "SUBMIT": "Create",
diff --git a/app/javascript/dashboard/i18n/locale/ne/automation.json b/app/javascript/dashboard/i18n/locale/ne/automation.json
index ceda8e268..c8d4f5041 100644
--- a/app/javascript/dashboard/i18n/locale/ne/automation.json
+++ b/app/javascript/dashboard/i18n/locale/ne/automation.json
@@ -150,6 +150,17 @@
       "ADD_SLA": "Add SLA",
       "OPEN_CONVERSATION": "Open conversation"
     },
+    "MESSAGE_TYPES": {
+      "INCOMING": "Incoming Message",
+      "OUTGOING": "Outgoing Message"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "None",
+      "LOW": "Low",
+      "MEDIUM": "Medium",
+      "HIGH": "High",
+      "URGENT": "Urgent"
+    },
     "ATTRIBUTES": {
       "MESSAGE_TYPE": "Message Type",
       "MESSAGE_CONTAINS": "Message Contains",
diff --git a/app/javascript/dashboard/i18n/locale/ne/generalSettings.json b/app/javascript/dashboard/i18n/locale/ne/generalSettings.json
index 9055574c5..d924bffbd 100644
--- a/app/javascript/dashboard/i18n/locale/ne/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ne/generalSettings.json
@@ -134,6 +134,7 @@
     "MULTISELECT": {
       "ENTER_TO_SELECT": "Press enter to select",
       "ENTER_TO_REMOVE": "Press enter to remove",
+      "NO_OPTIONS": "List is empty",
       "SELECT_ONE": "Select one",
       "SELECT": "Select"
     }
diff --git a/app/javascript/dashboard/i18n/locale/ne/integrations.json b/app/javascript/dashboard/i18n/locale/ne/integrations.json
index 1f4a6b1a1..6e12d5fae 100644
--- a/app/javascript/dashboard/i18n/locale/ne/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ne/integrations.json
@@ -481,6 +481,37 @@
         "ERROR_MESSAGE": "There was an error updating the assistant, please try again.",
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
+      "SETTINGS": {
+        "BREADCRUMB": {
+          "ASSISTANT": "Assistant"
+        },
+        "BASIC_SETTINGS": {
+          "TITLE": "Basic settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "SYSTEM_SETTINGS": {
+          "TITLE": "System settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "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.",
+          "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."
+            },
+            "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.”"
+            },
+            "RESPONSE_GUIDELINES": {
+              "TITLE": "Response guidelines",
+              "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
+            }
+          }
+        }
+      },
       "OPTIONS": {
         "EDIT_ASSISTANT": "Edit Assistant",
         "DELETE_ASSISTANT": "Delete Assistant",
diff --git a/app/javascript/dashboard/i18n/locale/ne/macros.json b/app/javascript/dashboard/i18n/locale/ne/macros.json
index d22744190..fcb409f34 100644
--- a/app/javascript/dashboard/i18n/locale/ne/macros.json
+++ b/app/javascript/dashboard/i18n/locale/ne/macros.json
@@ -99,6 +99,13 @@
       "CHANGE_PRIORITY": "Change Priority",
       "ADD_PRIVATE_NOTE": "Add a Private Note",
       "SEND_WEBHOOK_EVENT": "Send Webhook Event"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "None",
+      "LOW": "Low",
+      "MEDIUM": "Medium",
+      "HIGH": "High",
+      "URGENT": "Urgent"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/nl/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/nl/attributesMgmt.json
index 8e8097b54..9163080b6 100644
--- a/app/javascript/dashboard/i18n/locale/nl/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/nl/attributesMgmt.json
@@ -5,6 +5,18 @@
     "LOADING": "Aangepaste attributen ophalen",
     "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.",
     "LEARN_MORE": "Learn more about custom attributes",
+    "ATTRIBUTE_MODELS": {
+      "CONVERSATION": "Gesprek",
+      "CONTACT": "Contact"
+    },
+    "ATTRIBUTE_TYPES": {
+      "TEXT": "Tekst",
+      "NUMBER": "Getal",
+      "LINK": "Link",
+      "DATE": "Date",
+      "LIST": "Lijst",
+      "CHECKBOX": "Selectievakje"
+    },
     "ADD": {
       "TITLE": "Aangepast attribuut toevoegen",
       "SUBMIT": "Aanmaken",
diff --git a/app/javascript/dashboard/i18n/locale/nl/automation.json b/app/javascript/dashboard/i18n/locale/nl/automation.json
index 1539499c4..7dcc192e4 100644
--- a/app/javascript/dashboard/i18n/locale/nl/automation.json
+++ b/app/javascript/dashboard/i18n/locale/nl/automation.json
@@ -150,6 +150,17 @@
       "ADD_SLA": "Add SLA",
       "OPEN_CONVERSATION": "Open conversation"
     },
+    "MESSAGE_TYPES": {
+      "INCOMING": "Incoming Message",
+      "OUTGOING": "Outgoing Message"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "Geen",
+      "LOW": "Laag",
+      "MEDIUM": "Gemiddeld",
+      "HIGH": "Hoog",
+      "URGENT": "Dringend"
+    },
     "ATTRIBUTES": {
       "MESSAGE_TYPE": "Message Type",
       "MESSAGE_CONTAINS": "Message Contains",
diff --git a/app/javascript/dashboard/i18n/locale/nl/generalSettings.json b/app/javascript/dashboard/i18n/locale/nl/generalSettings.json
index c15d168e8..3ddf3e240 100644
--- a/app/javascript/dashboard/i18n/locale/nl/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/nl/generalSettings.json
@@ -134,6 +134,7 @@
     "MULTISELECT": {
       "ENTER_TO_SELECT": "Press enter to select",
       "ENTER_TO_REMOVE": "Press enter to remove",
+      "NO_OPTIONS": "List is empty",
       "SELECT_ONE": "Selecteer een",
       "SELECT": "Selecteer"
     }
diff --git a/app/javascript/dashboard/i18n/locale/nl/integrations.json b/app/javascript/dashboard/i18n/locale/nl/integrations.json
index f25f04f05..2591cc2e6 100644
--- a/app/javascript/dashboard/i18n/locale/nl/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/nl/integrations.json
@@ -481,6 +481,37 @@
         "ERROR_MESSAGE": "There was an error updating the assistant, please try again.",
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
+      "SETTINGS": {
+        "BREADCRUMB": {
+          "ASSISTANT": "Assistant"
+        },
+        "BASIC_SETTINGS": {
+          "TITLE": "Basic settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "SYSTEM_SETTINGS": {
+          "TITLE": "System settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "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.",
+          "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."
+            },
+            "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.”"
+            },
+            "RESPONSE_GUIDELINES": {
+              "TITLE": "Response guidelines",
+              "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
+            }
+          }
+        }
+      },
       "OPTIONS": {
         "EDIT_ASSISTANT": "Edit Assistant",
         "DELETE_ASSISTANT": "Delete Assistant",
diff --git a/app/javascript/dashboard/i18n/locale/nl/macros.json b/app/javascript/dashboard/i18n/locale/nl/macros.json
index 7f5f59eb9..d1c3015a4 100644
--- a/app/javascript/dashboard/i18n/locale/nl/macros.json
+++ b/app/javascript/dashboard/i18n/locale/nl/macros.json
@@ -99,6 +99,13 @@
       "CHANGE_PRIORITY": "Change Priority",
       "ADD_PRIVATE_NOTE": "Add a Private Note",
       "SEND_WEBHOOK_EVENT": "Send Webhook Event"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "Geen",
+      "LOW": "Laag",
+      "MEDIUM": "Gemiddeld",
+      "HIGH": "Hoog",
+      "URGENT": "Dringend"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/no/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/no/attributesMgmt.json
index a6aafe4f6..d16d3dd9b 100644
--- a/app/javascript/dashboard/i18n/locale/no/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/no/attributesMgmt.json
@@ -5,6 +5,18 @@
     "LOADING": "Fetching custom attributes",
     "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.",
     "LEARN_MORE": "Learn more about custom attributes",
+    "ATTRIBUTE_MODELS": {
+      "CONVERSATION": "Conversation",
+      "CONTACT": "Contact"
+    },
+    "ATTRIBUTE_TYPES": {
+      "TEXT": "Text",
+      "NUMBER": "Number",
+      "LINK": "Link",
+      "DATE": "Date",
+      "LIST": "List",
+      "CHECKBOX": "Checkbox"
+    },
     "ADD": {
       "TITLE": "Add Custom Attribute",
       "SUBMIT": "Opprett",
diff --git a/app/javascript/dashboard/i18n/locale/no/automation.json b/app/javascript/dashboard/i18n/locale/no/automation.json
index afc9e7744..06f3afc4d 100644
--- a/app/javascript/dashboard/i18n/locale/no/automation.json
+++ b/app/javascript/dashboard/i18n/locale/no/automation.json
@@ -150,6 +150,17 @@
       "ADD_SLA": "Add SLA",
       "OPEN_CONVERSATION": "Open conversation"
     },
+    "MESSAGE_TYPES": {
+      "INCOMING": "Incoming Message",
+      "OUTGOING": "Outgoing Message"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "None",
+      "LOW": "Low",
+      "MEDIUM": "Medium",
+      "HIGH": "High",
+      "URGENT": "Urgent"
+    },
     "ATTRIBUTES": {
       "MESSAGE_TYPE": "Message Type",
       "MESSAGE_CONTAINS": "Message Contains",
diff --git a/app/javascript/dashboard/i18n/locale/no/generalSettings.json b/app/javascript/dashboard/i18n/locale/no/generalSettings.json
index 4329140a9..aacb3a470 100644
--- a/app/javascript/dashboard/i18n/locale/no/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/no/generalSettings.json
@@ -134,6 +134,7 @@
     "MULTISELECT": {
       "ENTER_TO_SELECT": "Trykk enter for å velge",
       "ENTER_TO_REMOVE": "Trykk enter for å fjerne",
+      "NO_OPTIONS": "List is empty",
       "SELECT_ONE": "Velg en",
       "SELECT": "Select"
     }
diff --git a/app/javascript/dashboard/i18n/locale/no/integrations.json b/app/javascript/dashboard/i18n/locale/no/integrations.json
index 0af8f92b2..6fbe4fc98 100644
--- a/app/javascript/dashboard/i18n/locale/no/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/no/integrations.json
@@ -481,6 +481,37 @@
         "ERROR_MESSAGE": "There was an error updating the assistant, please try again.",
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
+      "SETTINGS": {
+        "BREADCRUMB": {
+          "ASSISTANT": "Assistant"
+        },
+        "BASIC_SETTINGS": {
+          "TITLE": "Basic settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "SYSTEM_SETTINGS": {
+          "TITLE": "System settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "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.",
+          "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."
+            },
+            "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.”"
+            },
+            "RESPONSE_GUIDELINES": {
+              "TITLE": "Response guidelines",
+              "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
+            }
+          }
+        }
+      },
       "OPTIONS": {
         "EDIT_ASSISTANT": "Edit Assistant",
         "DELETE_ASSISTANT": "Delete Assistant",
diff --git a/app/javascript/dashboard/i18n/locale/no/macros.json b/app/javascript/dashboard/i18n/locale/no/macros.json
index 06f4adca9..b5b1e663e 100644
--- a/app/javascript/dashboard/i18n/locale/no/macros.json
+++ b/app/javascript/dashboard/i18n/locale/no/macros.json
@@ -99,6 +99,13 @@
       "CHANGE_PRIORITY": "Change Priority",
       "ADD_PRIVATE_NOTE": "Add a Private Note",
       "SEND_WEBHOOK_EVENT": "Send Webhook Event"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "None",
+      "LOW": "Low",
+      "MEDIUM": "Medium",
+      "HIGH": "High",
+      "URGENT": "Urgent"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pl/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/pl/attributesMgmt.json
index bfe7b29f9..0875ffe97 100644
--- a/app/javascript/dashboard/i18n/locale/pl/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pl/attributesMgmt.json
@@ -5,6 +5,18 @@
     "LOADING": "Pobieranie atrybutów niestandardowych",
     "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.",
     "LEARN_MORE": "Learn more about custom attributes",
+    "ATTRIBUTE_MODELS": {
+      "CONVERSATION": "Rozmowa",
+      "CONTACT": "Kontakt"
+    },
+    "ATTRIBUTE_TYPES": {
+      "TEXT": "Tekst",
+      "NUMBER": "Numer",
+      "LINK": "Link",
+      "DATE": "Date",
+      "LIST": "Lista",
+      "CHECKBOX": "Pole Wyboru"
+    },
     "ADD": {
       "TITLE": "Dodaj Atrybut Niestandardowy",
       "SUBMIT": "Utwórz",
diff --git a/app/javascript/dashboard/i18n/locale/pl/automation.json b/app/javascript/dashboard/i18n/locale/pl/automation.json
index 0817a235e..71fb4b21e 100644
--- a/app/javascript/dashboard/i18n/locale/pl/automation.json
+++ b/app/javascript/dashboard/i18n/locale/pl/automation.json
@@ -150,6 +150,17 @@
       "ADD_SLA": "Add SLA",
       "OPEN_CONVERSATION": "Otwórz rozmowę"
     },
+    "MESSAGE_TYPES": {
+      "INCOMING": "Incoming Message",
+      "OUTGOING": "Outgoing Message"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "Brak",
+      "LOW": "Niski",
+      "MEDIUM": "Średni",
+      "HIGH": "Wysoki",
+      "URGENT": "Pilne"
+    },
     "ATTRIBUTES": {
       "MESSAGE_TYPE": "Message Type",
       "MESSAGE_CONTAINS": "Message Contains",
diff --git a/app/javascript/dashboard/i18n/locale/pl/generalSettings.json b/app/javascript/dashboard/i18n/locale/pl/generalSettings.json
index b81d9741c..3798b6f7b 100644
--- a/app/javascript/dashboard/i18n/locale/pl/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/pl/generalSettings.json
@@ -134,6 +134,7 @@
     "MULTISELECT": {
       "ENTER_TO_SELECT": "Naciśnij Enter, aby wybrać",
       "ENTER_TO_REMOVE": "Naciśnij Enter, aby usunąć",
+      "NO_OPTIONS": "List is empty",
       "SELECT_ONE": "Wybierz jeden",
       "SELECT": "Wybierz"
     }
diff --git a/app/javascript/dashboard/i18n/locale/pl/integrations.json b/app/javascript/dashboard/i18n/locale/pl/integrations.json
index 3ebc5bd01..09344b553 100644
--- a/app/javascript/dashboard/i18n/locale/pl/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/pl/integrations.json
@@ -481,6 +481,37 @@
         "ERROR_MESSAGE": "There was an error updating the assistant, please try again.",
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
+      "SETTINGS": {
+        "BREADCRUMB": {
+          "ASSISTANT": "Assistant"
+        },
+        "BASIC_SETTINGS": {
+          "TITLE": "Basic settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "SYSTEM_SETTINGS": {
+          "TITLE": "System settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "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.",
+          "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."
+            },
+            "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.”"
+            },
+            "RESPONSE_GUIDELINES": {
+              "TITLE": "Response guidelines",
+              "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
+            }
+          }
+        }
+      },
       "OPTIONS": {
         "EDIT_ASSISTANT": "Edit Assistant",
         "DELETE_ASSISTANT": "Delete Assistant",
diff --git a/app/javascript/dashboard/i18n/locale/pl/macros.json b/app/javascript/dashboard/i18n/locale/pl/macros.json
index 9b48b8faa..dab2bcea1 100644
--- a/app/javascript/dashboard/i18n/locale/pl/macros.json
+++ b/app/javascript/dashboard/i18n/locale/pl/macros.json
@@ -99,6 +99,13 @@
       "CHANGE_PRIORITY": "Zmień priorytet",
       "ADD_PRIVATE_NOTE": "Add a Private Note",
       "SEND_WEBHOOK_EVENT": "Send Webhook Event"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "Brak",
+      "LOW": "Niski",
+      "MEDIUM": "Średni",
+      "HIGH": "Wysoki",
+      "URGENT": "Pilne"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/pt/attributesMgmt.json
index 26cd969d3..4920cbf52 100644
--- a/app/javascript/dashboard/i18n/locale/pt/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt/attributesMgmt.json
@@ -5,6 +5,18 @@
     "LOADING": "A obter atributos personalizados",
     "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.",
     "LEARN_MORE": "Learn more about custom attributes",
+    "ATTRIBUTE_MODELS": {
+      "CONVERSATION": "Conversa",
+      "CONTACT": "Contacto"
+    },
+    "ATTRIBUTE_TYPES": {
+      "TEXT": "Texto",
+      "NUMBER": "Número",
+      "LINK": "Endereço",
+      "DATE": "Date",
+      "LIST": "Lista",
+      "CHECKBOX": "Caixa de seleção"
+    },
     "ADD": {
       "TITLE": "Adicionar atributo personalizado",
       "SUBMIT": "Criar",
diff --git a/app/javascript/dashboard/i18n/locale/pt/automation.json b/app/javascript/dashboard/i18n/locale/pt/automation.json
index c24eae5fd..10209ce2c 100644
--- a/app/javascript/dashboard/i18n/locale/pt/automation.json
+++ b/app/javascript/dashboard/i18n/locale/pt/automation.json
@@ -150,6 +150,17 @@
       "ADD_SLA": "Adicionar SLA",
       "OPEN_CONVERSATION": "Abrir conversa"
     },
+    "MESSAGE_TYPES": {
+      "INCOMING": "Incoming Message",
+      "OUTGOING": "Outgoing Message"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "Nenhuma",
+      "LOW": "Baixa",
+      "MEDIUM": "Média",
+      "HIGH": "Elevada",
+      "URGENT": "Urgente"
+    },
     "ATTRIBUTES": {
       "MESSAGE_TYPE": "Tipo de mensagem",
       "MESSAGE_CONTAINS": "A mensagem contém",
diff --git a/app/javascript/dashboard/i18n/locale/pt/generalSettings.json b/app/javascript/dashboard/i18n/locale/pt/generalSettings.json
index 7e5c3f105..b7b27c15a 100644
--- a/app/javascript/dashboard/i18n/locale/pt/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/pt/generalSettings.json
@@ -134,6 +134,7 @@
     "MULTISELECT": {
       "ENTER_TO_SELECT": "Pressione Enter para escolher",
       "ENTER_TO_REMOVE": "Pressione Enter para eliminar",
+      "NO_OPTIONS": "List is empty",
       "SELECT_ONE": "Selecionar um",
       "SELECT": "Selecionar"
     }
diff --git a/app/javascript/dashboard/i18n/locale/pt/integrations.json b/app/javascript/dashboard/i18n/locale/pt/integrations.json
index 37e22315b..41c301b0c 100644
--- a/app/javascript/dashboard/i18n/locale/pt/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/pt/integrations.json
@@ -481,6 +481,37 @@
         "ERROR_MESSAGE": "There was an error updating the assistant, please try again.",
         "NOT_FOUND": "Não foi possível encontrar o assistente. Por favor, tente novamente."
       },
+      "SETTINGS": {
+        "BREADCRUMB": {
+          "ASSISTANT": "Assistant"
+        },
+        "BASIC_SETTINGS": {
+          "TITLE": "Basic settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "SYSTEM_SETTINGS": {
+          "TITLE": "System settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "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.",
+          "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."
+            },
+            "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.”"
+            },
+            "RESPONSE_GUIDELINES": {
+              "TITLE": "Response guidelines",
+              "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
+            }
+          }
+        }
+      },
       "OPTIONS": {
         "EDIT_ASSISTANT": "Edit Assistant",
         "DELETE_ASSISTANT": "Delete Assistant",
diff --git a/app/javascript/dashboard/i18n/locale/pt/macros.json b/app/javascript/dashboard/i18n/locale/pt/macros.json
index b83d91887..95c132fe7 100644
--- a/app/javascript/dashboard/i18n/locale/pt/macros.json
+++ b/app/javascript/dashboard/i18n/locale/pt/macros.json
@@ -99,6 +99,13 @@
       "CHANGE_PRIORITY": "Alterar prioridade",
       "ADD_PRIVATE_NOTE": "Adicionar uma Nota Privada",
       "SEND_WEBHOOK_EVENT": "Enviar evento webhook"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "Nenhuma",
+      "LOW": "Baixa",
+      "MEDIUM": "Média",
+      "HIGH": "Elevada",
+      "URGENT": "Urgente"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/pt_BR/attributesMgmt.json
index 6bfd16cba..9a2295a4f 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/attributesMgmt.json
@@ -5,6 +5,18 @@
     "LOADING": "Buscando atributos personalizados",
     "DESCRIPTION": "Um atributo personalizado controla detalhes adicionais sobre seus contatos ou conversas — como o plano de assinatura ou a data de sua primeira compra. Você pode adicionar diferentes tipos de atributos personalizados, como texto, listas ou números, para capturar as informações específicas que você precisa.",
     "LEARN_MORE": "Saiba mais sobre atributos personalizados",
+    "ATTRIBUTE_MODELS": {
+      "CONVERSATION": "Conversas",
+      "CONTACT": "Contato"
+    },
+    "ATTRIBUTE_TYPES": {
+      "TEXT": "Texto",
+      "NUMBER": "Número",
+      "LINK": "Link",
+      "DATE": "Date",
+      "LIST": "Lista",
+      "CHECKBOX": "Checkbox"
+    },
     "ADD": {
       "TITLE": "Adicionar atributo personalizado",
       "SUBMIT": "Criar",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/automation.json b/app/javascript/dashboard/i18n/locale/pt_BR/automation.json
index edf41d5ff..d8a31f792 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/automation.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/automation.json
@@ -150,6 +150,17 @@
       "ADD_SLA": "Adicionar SLA",
       "OPEN_CONVERSATION": "Abrir conversa"
     },
+    "MESSAGE_TYPES": {
+      "INCOMING": "Incoming Message",
+      "OUTGOING": "Outgoing Message"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "Nenhuma",
+      "LOW": "Baixa",
+      "MEDIUM": "Média",
+      "HIGH": "Alta",
+      "URGENT": "Urgente"
+    },
     "ATTRIBUTES": {
       "MESSAGE_TYPE": "Tipo da Mensagem",
       "MESSAGE_CONTAINS": "A mensagem contém",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/generalSettings.json b/app/javascript/dashboard/i18n/locale/pt_BR/generalSettings.json
index 77b9cfb8e..dfbee86f4 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/generalSettings.json
@@ -134,6 +134,7 @@
     "MULTISELECT": {
       "ENTER_TO_SELECT": "Digite enter para selecionar",
       "ENTER_TO_REMOVE": "Digite enter para remover",
+      "NO_OPTIONS": "List is empty",
       "SELECT_ONE": "Selecione um",
       "SELECT": "Selecionar"
     }
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/integrations.json b/app/javascript/dashboard/i18n/locale/pt_BR/integrations.json
index a87545975..14fcbd0f5 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/integrations.json
@@ -481,6 +481,37 @@
         "ERROR_MESSAGE": "Ocorreu um erro ao criar o assistente, por favor tente novamente.",
         "NOT_FOUND": "Não foi possível encontrar o assistente. Tente novamente."
       },
+      "SETTINGS": {
+        "BREADCRUMB": {
+          "ASSISTANT": "Assistente"
+        },
+        "BASIC_SETTINGS": {
+          "TITLE": "Basic settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "SYSTEM_SETTINGS": {
+          "TITLE": "System settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "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.",
+          "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."
+            },
+            "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.”"
+            },
+            "RESPONSE_GUIDELINES": {
+              "TITLE": "Response guidelines",
+              "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
+            }
+          }
+        }
+      },
       "OPTIONS": {
         "EDIT_ASSISTANT": "Editar Assistente",
         "DELETE_ASSISTANT": "Excluir Assistente",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/macros.json b/app/javascript/dashboard/i18n/locale/pt_BR/macros.json
index 02261ef04..81f30c4f1 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/macros.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/macros.json
@@ -99,6 +99,13 @@
       "CHANGE_PRIORITY": "Alterar Prioridade",
       "ADD_PRIVATE_NOTE": "Adicionar uma Nota Privada",
       "SEND_WEBHOOK_EVENT": "Enviar evento de Webhook"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "Nenhuma",
+      "LOW": "Baixa",
+      "MEDIUM": "Média",
+      "HIGH": "Alta",
+      "URGENT": "Urgente"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ro/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/ro/attributesMgmt.json
index 74e7ef52b..6816068e9 100644
--- a/app/javascript/dashboard/i18n/locale/ro/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ro/attributesMgmt.json
@@ -5,6 +5,18 @@
     "LOADING": "Preluarea atributelor particularizate",
     "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.",
     "LEARN_MORE": "Learn more about custom attributes",
+    "ATTRIBUTE_MODELS": {
+      "CONVERSATION": "Conversație",
+      "CONTACT": "Contact"
+    },
+    "ATTRIBUTE_TYPES": {
+      "TEXT": "Text",
+      "NUMBER": "Număr",
+      "LINK": "Legătură",
+      "DATE": "Date",
+      "LIST": "Listă",
+      "CHECKBOX": "Căsuță de bifat"
+    },
     "ADD": {
       "TITLE": "Adauga atributii personalizate",
       "SUBMIT": "Creeaza",
diff --git a/app/javascript/dashboard/i18n/locale/ro/automation.json b/app/javascript/dashboard/i18n/locale/ro/automation.json
index 14d212def..eb25fa3e6 100644
--- a/app/javascript/dashboard/i18n/locale/ro/automation.json
+++ b/app/javascript/dashboard/i18n/locale/ro/automation.json
@@ -150,6 +150,17 @@
       "ADD_SLA": "Add SLA",
       "OPEN_CONVERSATION": "Deschiderea conversației"
     },
+    "MESSAGE_TYPES": {
+      "INCOMING": "Incoming Message",
+      "OUTGOING": "Outgoing Message"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "Nimic",
+      "LOW": "Scăzut",
+      "MEDIUM": "Mediu",
+      "HIGH": "Mare",
+      "URGENT": "Urgent"
+    },
     "ATTRIBUTES": {
       "MESSAGE_TYPE": "Message Type",
       "MESSAGE_CONTAINS": "Message Contains",
diff --git a/app/javascript/dashboard/i18n/locale/ro/generalSettings.json b/app/javascript/dashboard/i18n/locale/ro/generalSettings.json
index a0dbf8706..87f6bba40 100644
--- a/app/javascript/dashboard/i18n/locale/ro/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ro/generalSettings.json
@@ -134,6 +134,7 @@
     "MULTISELECT": {
       "ENTER_TO_SELECT": "Apăsați enter pentru a selecta",
       "ENTER_TO_REMOVE": "Introduceți numele complet al persoanei de contact",
+      "NO_OPTIONS": "List is empty",
       "SELECT_ONE": "Alege una",
       "SELECT": "Selectați"
     }
diff --git a/app/javascript/dashboard/i18n/locale/ro/integrations.json b/app/javascript/dashboard/i18n/locale/ro/integrations.json
index e7d963b22..65f3d53c9 100644
--- a/app/javascript/dashboard/i18n/locale/ro/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ro/integrations.json
@@ -481,6 +481,37 @@
         "ERROR_MESSAGE": "There was an error updating the assistant, please try again.",
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
+      "SETTINGS": {
+        "BREADCRUMB": {
+          "ASSISTANT": "Assistant"
+        },
+        "BASIC_SETTINGS": {
+          "TITLE": "Basic settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "SYSTEM_SETTINGS": {
+          "TITLE": "System settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "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.",
+          "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."
+            },
+            "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.”"
+            },
+            "RESPONSE_GUIDELINES": {
+              "TITLE": "Response guidelines",
+              "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
+            }
+          }
+        }
+      },
       "OPTIONS": {
         "EDIT_ASSISTANT": "Edit Assistant",
         "DELETE_ASSISTANT": "Delete Assistant",
diff --git a/app/javascript/dashboard/i18n/locale/ro/macros.json b/app/javascript/dashboard/i18n/locale/ro/macros.json
index 79a414fdc..443a3cbd7 100644
--- a/app/javascript/dashboard/i18n/locale/ro/macros.json
+++ b/app/javascript/dashboard/i18n/locale/ro/macros.json
@@ -99,6 +99,13 @@
       "CHANGE_PRIORITY": "Modificarea priorității",
       "ADD_PRIVATE_NOTE": "Add a Private Note",
       "SEND_WEBHOOK_EVENT": "Send Webhook Event"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "Nimic",
+      "LOW": "Scăzut",
+      "MEDIUM": "Mediu",
+      "HIGH": "Mare",
+      "URGENT": "Urgent"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ru/agentBots.json b/app/javascript/dashboard/i18n/locale/ru/agentBots.json
index 5bd76e24c..2d4b58c7a 100644
--- a/app/javascript/dashboard/i18n/locale/ru/agentBots.json
+++ b/app/javascript/dashboard/i18n/locale/ru/agentBots.json
@@ -2,7 +2,7 @@
   "AGENT_BOTS": {
     "HEADER": "Боты",
     "LOADING_EDITOR": "Загрузка редактора...",
-    "DESCRIPTION": "Agent Bots are like the most fabulous members of your team. They can handle the small stuff, so you can focus on the stuff that matters. Give them a try. You can manage your bots from this page or create new ones using the 'Add Bot' button.",
+    "DESCRIPTION": "Боты — это ваши незаменимые помощники. Они берут на себя рутину, чтобы вы могли сосредоточиться на важном. Попробуйте! Управлять ботами можно на этой странице, а новых — создавать с помощью кнопки «Добавить бота».",
     "LEARN_MORE": "Learn about agent bots",
     "GLOBAL_BOT": "System bot",
     "GLOBAL_BOT_BADGE": "Система",
@@ -22,7 +22,7 @@
       "SELECT_PLACEHOLDER": "Выбрать бота"
     },
     "ADD": {
-      "TITLE": "Add Bot",
+      "TITLE": "Добавить бота",
       "CANCEL_BUTTON_TEXT": "Отменить",
       "API": {
         "SUCCESS_MESSAGE": "Бот успешно добавлен.",
@@ -30,7 +30,7 @@
       }
     },
     "LIST": {
-      "404": "No bots found. You can create a bot by clicking the 'Add Bot' button.",
+      "404": "Боты не найдены. Вы можете создать бота, нажав кнопку 'Добавить бота' ↗",
       "LOADING": "Получение ботов...",
       "TABLE_HEADER": {
         "DETAILS": "Bot Details",
diff --git a/app/javascript/dashboard/i18n/locale/ru/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/ru/attributesMgmt.json
index a3059a333..28a8fe0f6 100644
--- a/app/javascript/dashboard/i18n/locale/ru/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ru/attributesMgmt.json
@@ -5,6 +5,18 @@
     "LOADING": "Получение пользовательских атрибутов",
     "DESCRIPTION": "Пользовательский атрибут отслеживает дополнительную информацию о ваших контактах или разговорах, таких как план подписки или дата их первой покупки. Вы можете добавить различные типы пользовательских атрибутов, такие как текст, списки или цифры, чтобы захватить нужную вам информацию.",
     "LEARN_MORE": "Узнайте больше о пользовательских атрибутах",
+    "ATTRIBUTE_MODELS": {
+      "CONVERSATION": "Диалоги",
+      "CONTACT": "Контакт"
+    },
+    "ATTRIBUTE_TYPES": {
+      "TEXT": "Текст",
+      "NUMBER": "Число",
+      "LINK": "Ссылка",
+      "DATE": "Date",
+      "LIST": "Список",
+      "CHECKBOX": "Флажок"
+    },
     "ADD": {
       "TITLE": "Добавить пользовательский атрибут",
       "SUBMIT": "Создать",
diff --git a/app/javascript/dashboard/i18n/locale/ru/automation.json b/app/javascript/dashboard/i18n/locale/ru/automation.json
index bc4174ba5..ac987ce30 100644
--- a/app/javascript/dashboard/i18n/locale/ru/automation.json
+++ b/app/javascript/dashboard/i18n/locale/ru/automation.json
@@ -130,32 +130,43 @@
     "EVENTS": {
       "CONVERSATION_CREATED": "Диалог создан",
       "CONVERSATION_UPDATED": "Диалог обновлён",
-      "MESSAGE_CREATED": "Message Created",
+      "MESSAGE_CREATED": "Сообщение создано",
       "CONVERSATION_OPENED": "Conversation Opened"
     },
     "ACTIONS": {
-      "ASSIGN_AGENT": "Assign to Agent",
-      "ASSIGN_TEAM": "Assign a Team",
-      "ADD_LABEL": "Add a Label",
-      "REMOVE_LABEL": "Remove a Label",
-      "SEND_EMAIL_TO_TEAM": "Send an Email to Team",
-      "SEND_EMAIL_TRANSCRIPT": "Send an Email Transcript",
+      "ASSIGN_AGENT": "Назначить агента",
+      "ASSIGN_TEAM": "Назначить команду",
+      "ADD_LABEL": "Добавить метку",
+      "REMOVE_LABEL": "Удалить метку",
+      "SEND_EMAIL_TO_TEAM": "Отправить Email команде",
+      "SEND_EMAIL_TRANSCRIPT": "Отправить историю переписки на email",
       "MUTE_CONVERSATION": "Заглушить диалог",
       "SNOOZE_CONVERSATION": "Включить звук диалога",
       "RESOLVE_CONVERSATION": "Решить диалог",
-      "SEND_WEBHOOK_EVENT": "Send Webhook Event",
-      "SEND_ATTACHMENT": "Send Attachment",
-      "SEND_MESSAGE": "Send a Message",
+      "SEND_WEBHOOK_EVENT": "Отправить событие Webhook",
+      "SEND_ATTACHMENT": "Отправить вложение",
+      "SEND_MESSAGE": "Отправить сообщение",
       "CHANGE_PRIORITY": "Изменить приоритет",
       "ADD_SLA": "Добавить SLA",
       "OPEN_CONVERSATION": "Открыть беседу"
     },
+    "MESSAGE_TYPES": {
+      "INCOMING": "Incoming Message",
+      "OUTGOING": "Outgoing Message"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "Ничего",
+      "LOW": "Низкая",
+      "MEDIUM": "Средняя",
+      "HIGH": "Высокая",
+      "URGENT": "Срочность"
+    },
     "ATTRIBUTES": {
-      "MESSAGE_TYPE": "Message Type",
+      "MESSAGE_TYPE": "Тип сообщения",
       "MESSAGE_CONTAINS": "Message Contains",
       "EMAIL": "Email",
       "INBOX": "Электронная почта",
-      "CONVERSATION_LANGUAGE": "Conversation Language",
+      "CONVERSATION_LANGUAGE": "Язык сообщения",
       "PHONE_NUMBER": "Номер телефона",
       "STATUS": "Статус",
       "BROWSER_LANGUAGE": "Язык браузера",
diff --git a/app/javascript/dashboard/i18n/locale/ru/contact.json b/app/javascript/dashboard/i18n/locale/ru/contact.json
index dcc5aeed1..66c86ea04 100644
--- a/app/javascript/dashboard/i18n/locale/ru/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ru/contact.json
@@ -285,7 +285,7 @@
     "HEADER": {
       "TITLE": "Контакты",
       "SEARCH_TITLE": "Поиск контактов",
-      "ACTIVE_TITLE": "Active contacts",
+      "ACTIVE_TITLE": "Активные контакты",
       "SEARCH_PLACEHOLDER": "Поиск...",
       "MESSAGE_BUTTON": "Сообщение",
       "SEND_MESSAGE": "Отправить сообщение",
@@ -460,8 +460,8 @@
         }
       },
       "DELETE_CONTACT": {
-        "MESSAGE": "This action is permanent and irreversible.",
-        "BUTTON": "Delete now"
+        "MESSAGE": "Это действие необратимо.",
+        "BUTTON": "Удалить"
       }
     },
     "DETAILS": {
@@ -550,7 +550,7 @@
         "YOU": "Вы",
         "SAVE": "Сохранить заметку",
         "EXPAND": "Развернуть",
-        "COLLAPSE": "Collapse",
+        "COLLAPSE": "Свернуть",
         "NO_NOTES": "No notes, you can add notes from the contact details page.",
         "EMPTY_STATE": "Нет заметок, связанных с этим контактом. Вы можете добавить заметку в поле выше."
       }
diff --git a/app/javascript/dashboard/i18n/locale/ru/conversation.json b/app/javascript/dashboard/i18n/locale/ru/conversation.json
index 214b9c0fc..1ccf73838 100644
--- a/app/javascript/dashboard/i18n/locale/ru/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ru/conversation.json
@@ -70,7 +70,7 @@
       "RESOLVE_ACTION": "Завершить",
       "REOPEN_ACTION": "Открыть заново",
       "OPEN_ACTION": "Открыть",
-      "MORE_ACTIONS": "More actions",
+      "MORE_ACTIONS": "Ещё действия",
       "OPEN": "Открыть",
       "CLOSE": "Закрыть",
       "DETAILS": "подробности",
@@ -123,8 +123,8 @@
       }
     },
     "DELETE_CONVERSATION": {
-      "TITLE": "Delete conversation #{conversationId}",
-      "DESCRIPTION": "Are you sure you want to delete this conversation?",
+      "TITLE": "Удалить диалог #{conversationId}",
+      "DESCRIPTION": "Вы уверены, что хотите удалить этот диалог?",
       "CONFIRM": "Удалить"
     },
     "CARD_CONTEXT_MENU": {
@@ -143,7 +143,7 @@
       "ASSIGN_LABEL": "Назначить метки",
       "AGENTS_LOADING": "Загрузка агентов...",
       "ASSIGN_TEAM": "Назначить команду",
-      "DELETE": "Delete conversation",
+      "DELETE": "Удалить диалог",
       "API": {
         "AGENT_ASSIGNMENT": {
           "SUCCESFUL": "ID разговора {conversationId} присвоен \"{agentName}\"",
@@ -218,8 +218,8 @@
     "ASSIGN_LABEL_SUCCESFUL": "Метка успешно назначена",
     "ASSIGN_LABEL_FAILED": "Назначение метки не удалось",
     "CHANGE_TEAM": "Команда назначенная в беседу изменена",
-    "SUCCESS_DELETE_CONVERSATION": "Conversation deleted successfully",
-    "FAIL_DELETE_CONVERSATION": "Couldn't delete conversation! Try again",
+    "SUCCESS_DELETE_CONVERSATION": "Диалог удален",
+    "FAIL_DELETE_CONVERSATION": "Не удалось удалить диалог! Попробуйте снова",
     "FILE_SIZE_LIMIT": "Превышен лимит вложений в {MAXIMUM_SUPPORTED_FILE_UPLOAD_SIZE} MB",
     "MESSAGE_ERROR": "Не удается отправить это сообщение, повторите попытку позже",
     "SENT_BY": "Отправитель:",
diff --git a/app/javascript/dashboard/i18n/locale/ru/generalSettings.json b/app/javascript/dashboard/i18n/locale/ru/generalSettings.json
index ea6b9fca1..1fa6a728c 100644
--- a/app/javascript/dashboard/i18n/locale/ru/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ru/generalSettings.json
@@ -45,32 +45,32 @@
         "NOTE": "Этот ID требуется для построения интеграции, основанной на API"
       },
       "AUTO_RESOLVE": {
-        "TITLE": "Auto-resolve conversations",
-        "NOTE": "This configuration would allow you to automatically resolve the conversation after a certain period of inactivity.",
+        "TITLE": "Автоматически завершать диалоги",
+        "NOTE": "Эта опция позволит вам завершать диалоги после определенного периода бездействия.",
         "DURATION": {
-          "LABEL": "Inactivity duration",
-          "HELP": "Time period of inactivity after which conversation is auto-resolved",
+          "LABEL": "Время бездействия",
+          "HELP": "Время бездействия, после которого диалог будет завершен",
           "PLACEHOLDER": "30",
-          "ERROR": "Auto resolve duration should be between 10 minutes and 999 days",
+          "ERROR": "Время автозавершения должно быть между 10 минутами и 999 днями",
           "API": {
             "SUCCESS": "Auto resolve settings updated successfully",
             "ERROR": "Failed to update auto resolve settings"
           }
         },
         "MESSAGE": {
-          "LABEL": "Custom auto-resolution message",
-          "PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
-          "HELP": "Message sent to the customer after conversation is auto-resolved"
+          "LABEL": "Сообщение об автозавершении диалога",
+          "PLACEHOLDER": "Диалог помечен завершенным автоматически из-за бездействия в течение 15 дней",
+          "HELP": "Сообщение будет отправлено после автозавершения диалога"
         },
         "PREFERENCES": "Настройки",
         "LABEL": {
-          "LABEL": "Add label after auto-resolution",
-          "PLACEHOLDER": "Select a label"
+          "LABEL": "Добавить метку после автозавершения",
+          "PLACEHOLDER": "Выбрать метку"
         },
         "IGNORE_WAITING": {
-          "LABEL": "Skip conversations waiting for agent’s reply"
+          "LABEL": "Пропустить диалоги ожидающие ответа агента"
         },
-        "UPDATE_BUTTON": "Save Changes"
+        "UPDATE_BUTTON": "Сохранить"
       },
       "NAME": {
         "LABEL": "Имя аккаунта",
@@ -108,14 +108,14 @@
         "LABEL": "Inactivity duration for resolution",
         "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
-        "ERROR": "Auto resolve duration should be between 10 minutes and 999 days",
+        "ERROR": "Время автозавершения должно быть между 10 минутами и 999 днями",
         "API": {
-          "SUCCESS": "Auto resolve settings updated successfully",
+          "SUCCESS": "Настройки автозавершения сохранены",
           "ERROR": "Failed to update auto resolve settings"
         },
         "UPDATE_BUTTON": "Обновить",
         "MESSAGE_LABEL": "Custom resolution message",
-        "MESSAGE_PLACEHOLDER": "Conversation was marked resolved by system due to 15 days of inactivity",
+        "MESSAGE_PLACEHOLDER": "Диалог помечен завершенным автоматически из-за бездействия в течение 15 дней",
         "MESSAGE_HELP": "This message is sent to the customer when a conversation is automatically resolved by the system due to inactivity."
       },
       "FEATURES": {
@@ -134,6 +134,7 @@
     "MULTISELECT": {
       "ENTER_TO_SELECT": "Нажмите Enter для выбора",
       "ENTER_TO_REMOVE": "Нажмите Enter для удаления",
+      "NO_OPTIONS": "List is empty",
       "SELECT_ONE": "Выберите один",
       "SELECT": "Выбрать"
     }
diff --git a/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json
index 04267a433..80dac64cf 100644
--- a/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json
@@ -619,25 +619,25 @@
     },
     "CSAT": {
       "TITLE": "Включить CSAT",
-      "SUBTITLE": "Automatically trigger CSAT surveys at the end of conversations to understand how customers feel about their support experience. Track satisfaction trends and identify areas for improvement over time.",
+      "SUBTITLE": "Автоматически отправляйте CSAT-опросы в конце диалога, чтобы оценить уровень удовлетворенности клиентов. Отслеживайте динамику и находите точки роста для улучшения сервиса.",
       "DISPLAY_TYPE": {
         "LABEL": "Display type"
       },
       "MESSAGE": {
         "LABEL": "Сообщение",
-        "PLACEHOLDER": "Please enter a message to show users with the form"
+        "PLACEHOLDER": "Добавьте сообщение, которое будет отображено в форме обратной связи"
       },
       "SURVEY_RULE": {
-        "LABEL": "Survey rule",
-        "DESCRIPTION_PREFIX": "Send the survey if the conversation",
-        "DESCRIPTION_SUFFIX": "any of the labels",
+        "LABEL": "Условие опросы",
+        "DESCRIPTION_PREFIX": "Отправить опрос если диалог",
+        "DESCRIPTION_SUFFIX": "метки",
         "OPERATOR": {
           "CONTAINS": "содержит",
           "DOES_NOT_CONTAINS": "не содержит"
         },
-        "SELECT_PLACEHOLDER": "select labels"
+        "SELECT_PLACEHOLDER": "Выбрать метки"
       },
-      "NOTE": "Note: CSAT surveys are sent only once per conversation",
+      "NOTE": "Примечание: опросы CSAT отправляются только один раз для диалога",
       "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/ru/integrations.json b/app/javascript/dashboard/i18n/locale/ru/integrations.json
index 5128a9557..545f4ce72 100644
--- a/app/javascript/dashboard/i18n/locale/ru/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ru/integrations.json
@@ -481,6 +481,37 @@
         "ERROR_MESSAGE": "При обновлении ассистента произошла ошибка, пожалуйста, попробуйте еще раз.",
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
+      "SETTINGS": {
+        "BREADCRUMB": {
+          "ASSISTANT": "Ассистент"
+        },
+        "BASIC_SETTINGS": {
+          "TITLE": "Basic settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "SYSTEM_SETTINGS": {
+          "TITLE": "System settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "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.",
+          "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."
+            },
+            "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.”"
+            },
+            "RESPONSE_GUIDELINES": {
+              "TITLE": "Response guidelines",
+              "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
+            }
+          }
+        }
+      },
       "OPTIONS": {
         "EDIT_ASSISTANT": "Редактировать ассистента",
         "DELETE_ASSISTANT": "Удалить ассистента",
diff --git a/app/javascript/dashboard/i18n/locale/ru/macros.json b/app/javascript/dashboard/i18n/locale/ru/macros.json
index 69411fd10..c86c0ef06 100644
--- a/app/javascript/dashboard/i18n/locale/ru/macros.json
+++ b/app/javascript/dashboard/i18n/locale/ru/macros.json
@@ -85,20 +85,27 @@
       "ATLEAST_ONE_ACTION_REQUIRED": "Требуется хотя бы одно действие"
     },
     "ACTIONS": {
-      "ASSIGN_TEAM": "Assign a Team",
+      "ASSIGN_TEAM": "Назначить команду",
       "ASSIGN_AGENT": "Assign an Agent",
-      "ADD_LABEL": "Add a Label",
-      "REMOVE_LABEL": "Remove a Label",
-      "REMOVE_ASSIGNED_TEAM": "Remove Assigned Team",
-      "SEND_EMAIL_TRANSCRIPT": "Send an Email Transcript",
+      "ADD_LABEL": "Добавить метку",
+      "REMOVE_LABEL": "Удалить метку",
+      "REMOVE_ASSIGNED_TEAM": "Удалить назначенную команду",
+      "SEND_EMAIL_TRANSCRIPT": "Отправить историю переписки на email",
       "MUTE_CONVERSATION": "Заглушить диалог",
       "SNOOZE_CONVERSATION": "Включить звук диалога",
       "RESOLVE_CONVERSATION": "Решить диалог",
-      "SEND_ATTACHMENT": "Send Attachment",
-      "SEND_MESSAGE": "Send a Message",
+      "SEND_ATTACHMENT": "Отправить вложение",
+      "SEND_MESSAGE": "Отправить сообщение",
       "CHANGE_PRIORITY": "Изменить приоритет",
       "ADD_PRIVATE_NOTE": "Add a Private Note",
-      "SEND_WEBHOOK_EVENT": "Send Webhook Event"
+      "SEND_WEBHOOK_EVENT": "Отправить событие Webhook"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "Ничего",
+      "LOW": "Низкая",
+      "MEDIUM": "Средняя",
+      "HIGH": "Высокая",
+      "URGENT": "Срочность"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ru/settings.json b/app/javascript/dashboard/i18n/locale/ru/settings.json
index 9828305d8..7d7878aae 100644
--- a/app/javascript/dashboard/i18n/locale/ru/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ru/settings.json
@@ -286,7 +286,7 @@
     "REPORTS": "Отчёты",
     "SETTINGS": "Настройки",
     "CONTACTS": "Контакты",
-    "ACTIVE": "Активно",
+    "ACTIVE": "Активные",
     "CAPTAIN": "Капитан",
     "CAPTAIN_ASSISTANTS": "Ассистенты",
     "CAPTAIN_DOCUMENTS": "Документы",
diff --git a/app/javascript/dashboard/i18n/locale/sh/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/sh/attributesMgmt.json
index dd413ab26..cea6359de 100644
--- a/app/javascript/dashboard/i18n/locale/sh/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sh/attributesMgmt.json
@@ -5,6 +5,18 @@
     "LOADING": "Fetching custom attributes",
     "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.",
     "LEARN_MORE": "Learn more about custom attributes",
+    "ATTRIBUTE_MODELS": {
+      "CONVERSATION": "Conversation",
+      "CONTACT": "Contact"
+    },
+    "ATTRIBUTE_TYPES": {
+      "TEXT": "Text",
+      "NUMBER": "Number",
+      "LINK": "Link",
+      "DATE": "Date",
+      "LIST": "List",
+      "CHECKBOX": "Checkbox"
+    },
     "ADD": {
       "TITLE": "Add Custom Attribute",
       "SUBMIT": "Create",
diff --git a/app/javascript/dashboard/i18n/locale/sh/automation.json b/app/javascript/dashboard/i18n/locale/sh/automation.json
index c5dd4a514..cb030332f 100644
--- a/app/javascript/dashboard/i18n/locale/sh/automation.json
+++ b/app/javascript/dashboard/i18n/locale/sh/automation.json
@@ -150,6 +150,17 @@
       "ADD_SLA": "Add SLA",
       "OPEN_CONVERSATION": "Open conversation"
     },
+    "MESSAGE_TYPES": {
+      "INCOMING": "Incoming Message",
+      "OUTGOING": "Outgoing Message"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "None",
+      "LOW": "Low",
+      "MEDIUM": "Medium",
+      "HIGH": "High",
+      "URGENT": "Urgent"
+    },
     "ATTRIBUTES": {
       "MESSAGE_TYPE": "Message Type",
       "MESSAGE_CONTAINS": "Message Contains",
diff --git a/app/javascript/dashboard/i18n/locale/sh/generalSettings.json b/app/javascript/dashboard/i18n/locale/sh/generalSettings.json
index 9055574c5..d924bffbd 100644
--- a/app/javascript/dashboard/i18n/locale/sh/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/sh/generalSettings.json
@@ -134,6 +134,7 @@
     "MULTISELECT": {
       "ENTER_TO_SELECT": "Press enter to select",
       "ENTER_TO_REMOVE": "Press enter to remove",
+      "NO_OPTIONS": "List is empty",
       "SELECT_ONE": "Select one",
       "SELECT": "Select"
     }
diff --git a/app/javascript/dashboard/i18n/locale/sh/integrations.json b/app/javascript/dashboard/i18n/locale/sh/integrations.json
index 7ae07cfa2..a873cfcf5 100644
--- a/app/javascript/dashboard/i18n/locale/sh/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/sh/integrations.json
@@ -481,6 +481,37 @@
         "ERROR_MESSAGE": "There was an error updating the assistant, please try again.",
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
+      "SETTINGS": {
+        "BREADCRUMB": {
+          "ASSISTANT": "Assistant"
+        },
+        "BASIC_SETTINGS": {
+          "TITLE": "Basic settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "SYSTEM_SETTINGS": {
+          "TITLE": "System settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "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.",
+          "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."
+            },
+            "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.”"
+            },
+            "RESPONSE_GUIDELINES": {
+              "TITLE": "Response guidelines",
+              "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
+            }
+          }
+        }
+      },
       "OPTIONS": {
         "EDIT_ASSISTANT": "Edit Assistant",
         "DELETE_ASSISTANT": "Delete Assistant",
diff --git a/app/javascript/dashboard/i18n/locale/sh/macros.json b/app/javascript/dashboard/i18n/locale/sh/macros.json
index d22744190..fcb409f34 100644
--- a/app/javascript/dashboard/i18n/locale/sh/macros.json
+++ b/app/javascript/dashboard/i18n/locale/sh/macros.json
@@ -99,6 +99,13 @@
       "CHANGE_PRIORITY": "Change Priority",
       "ADD_PRIVATE_NOTE": "Add a Private Note",
       "SEND_WEBHOOK_EVENT": "Send Webhook Event"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "None",
+      "LOW": "Low",
+      "MEDIUM": "Medium",
+      "HIGH": "High",
+      "URGENT": "Urgent"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sk/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/sk/attributesMgmt.json
index 33ee79bb1..8c12be367 100644
--- a/app/javascript/dashboard/i18n/locale/sk/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sk/attributesMgmt.json
@@ -5,6 +5,18 @@
     "LOADING": "Fetching custom attributes",
     "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.",
     "LEARN_MORE": "Learn more about custom attributes",
+    "ATTRIBUTE_MODELS": {
+      "CONVERSATION": "Conversation",
+      "CONTACT": "Contact"
+    },
+    "ATTRIBUTE_TYPES": {
+      "TEXT": "Text",
+      "NUMBER": "Number",
+      "LINK": "Link",
+      "DATE": "Date",
+      "LIST": "List",
+      "CHECKBOX": "Checkbox"
+    },
     "ADD": {
       "TITLE": "Add Custom Attribute",
       "SUBMIT": "Create",
diff --git a/app/javascript/dashboard/i18n/locale/sk/automation.json b/app/javascript/dashboard/i18n/locale/sk/automation.json
index 3807bf174..6dc317f0d 100644
--- a/app/javascript/dashboard/i18n/locale/sk/automation.json
+++ b/app/javascript/dashboard/i18n/locale/sk/automation.json
@@ -150,6 +150,17 @@
       "ADD_SLA": "Add SLA",
       "OPEN_CONVERSATION": "Open conversation"
     },
+    "MESSAGE_TYPES": {
+      "INCOMING": "Incoming Message",
+      "OUTGOING": "Outgoing Message"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "Žiadne",
+      "LOW": "Low",
+      "MEDIUM": "Medium",
+      "HIGH": "High",
+      "URGENT": "Urgent"
+    },
     "ATTRIBUTES": {
       "MESSAGE_TYPE": "Message Type",
       "MESSAGE_CONTAINS": "Message Contains",
diff --git a/app/javascript/dashboard/i18n/locale/sk/generalSettings.json b/app/javascript/dashboard/i18n/locale/sk/generalSettings.json
index 6259dfbac..8b08c54e2 100644
--- a/app/javascript/dashboard/i18n/locale/sk/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/sk/generalSettings.json
@@ -134,6 +134,7 @@
     "MULTISELECT": {
       "ENTER_TO_SELECT": "Stlačením tlačidla enter vyberte",
       "ENTER_TO_REMOVE": "Stlačením tlačidla enter vymažte",
+      "NO_OPTIONS": "List is empty",
       "SELECT_ONE": "Vyberte jeden",
       "SELECT": "Select"
     }
diff --git a/app/javascript/dashboard/i18n/locale/sk/integrations.json b/app/javascript/dashboard/i18n/locale/sk/integrations.json
index d6a32b14f..3cfebeddf 100644
--- a/app/javascript/dashboard/i18n/locale/sk/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/sk/integrations.json
@@ -481,6 +481,37 @@
         "ERROR_MESSAGE": "There was an error updating the assistant, please try again.",
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
+      "SETTINGS": {
+        "BREADCRUMB": {
+          "ASSISTANT": "Assistant"
+        },
+        "BASIC_SETTINGS": {
+          "TITLE": "Basic settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "SYSTEM_SETTINGS": {
+          "TITLE": "System settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "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.",
+          "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."
+            },
+            "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.”"
+            },
+            "RESPONSE_GUIDELINES": {
+              "TITLE": "Response guidelines",
+              "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
+            }
+          }
+        }
+      },
       "OPTIONS": {
         "EDIT_ASSISTANT": "Edit Assistant",
         "DELETE_ASSISTANT": "Delete Assistant",
diff --git a/app/javascript/dashboard/i18n/locale/sk/macros.json b/app/javascript/dashboard/i18n/locale/sk/macros.json
index 130125910..c72181013 100644
--- a/app/javascript/dashboard/i18n/locale/sk/macros.json
+++ b/app/javascript/dashboard/i18n/locale/sk/macros.json
@@ -99,6 +99,13 @@
       "CHANGE_PRIORITY": "Change Priority",
       "ADD_PRIVATE_NOTE": "Add a Private Note",
       "SEND_WEBHOOK_EVENT": "Send Webhook Event"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "Žiadne",
+      "LOW": "Low",
+      "MEDIUM": "Medium",
+      "HIGH": "High",
+      "URGENT": "Urgent"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sl/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/sl/attributesMgmt.json
index dd413ab26..1d05e911c 100644
--- a/app/javascript/dashboard/i18n/locale/sl/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sl/attributesMgmt.json
@@ -5,6 +5,18 @@
     "LOADING": "Fetching custom attributes",
     "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.",
     "LEARN_MORE": "Learn more about custom attributes",
+    "ATTRIBUTE_MODELS": {
+      "CONVERSATION": "Conversation",
+      "CONTACT": "Contact"
+    },
+    "ATTRIBUTE_TYPES": {
+      "TEXT": "Tekst",
+      "NUMBER": "Številka",
+      "LINK": "Link",
+      "DATE": "Date",
+      "LIST": "Seznam",
+      "CHECKBOX": "Potrditveno polje"
+    },
     "ADD": {
       "TITLE": "Add Custom Attribute",
       "SUBMIT": "Create",
diff --git a/app/javascript/dashboard/i18n/locale/sl/automation.json b/app/javascript/dashboard/i18n/locale/sl/automation.json
index 9adfcbae2..6872f1679 100644
--- a/app/javascript/dashboard/i18n/locale/sl/automation.json
+++ b/app/javascript/dashboard/i18n/locale/sl/automation.json
@@ -150,6 +150,17 @@
       "ADD_SLA": "Dodaj",
       "OPEN_CONVERSATION": "Open conversation"
     },
+    "MESSAGE_TYPES": {
+      "INCOMING": "Incoming Message",
+      "OUTGOING": "Outgoing Message"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "None",
+      "LOW": "Low",
+      "MEDIUM": "Medium",
+      "HIGH": "High",
+      "URGENT": "Urgent"
+    },
     "ATTRIBUTES": {
       "MESSAGE_TYPE": "Message Type",
       "MESSAGE_CONTAINS": "Message Contains",
diff --git a/app/javascript/dashboard/i18n/locale/sl/generalSettings.json b/app/javascript/dashboard/i18n/locale/sl/generalSettings.json
index 9055574c5..d924bffbd 100644
--- a/app/javascript/dashboard/i18n/locale/sl/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/sl/generalSettings.json
@@ -134,6 +134,7 @@
     "MULTISELECT": {
       "ENTER_TO_SELECT": "Press enter to select",
       "ENTER_TO_REMOVE": "Press enter to remove",
+      "NO_OPTIONS": "List is empty",
       "SELECT_ONE": "Select one",
       "SELECT": "Select"
     }
diff --git a/app/javascript/dashboard/i18n/locale/sl/integrations.json b/app/javascript/dashboard/i18n/locale/sl/integrations.json
index 266929039..1f17a5449 100644
--- a/app/javascript/dashboard/i18n/locale/sl/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/sl/integrations.json
@@ -481,6 +481,37 @@
         "ERROR_MESSAGE": "There was an error updating the assistant, please try again.",
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
+      "SETTINGS": {
+        "BREADCRUMB": {
+          "ASSISTANT": "Assistant"
+        },
+        "BASIC_SETTINGS": {
+          "TITLE": "Basic settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "SYSTEM_SETTINGS": {
+          "TITLE": "System settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "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.",
+          "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."
+            },
+            "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.”"
+            },
+            "RESPONSE_GUIDELINES": {
+              "TITLE": "Response guidelines",
+              "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
+            }
+          }
+        }
+      },
       "OPTIONS": {
         "EDIT_ASSISTANT": "Edit Assistant",
         "DELETE_ASSISTANT": "Delete Assistant",
diff --git a/app/javascript/dashboard/i18n/locale/sl/macros.json b/app/javascript/dashboard/i18n/locale/sl/macros.json
index d22744190..fcb409f34 100644
--- a/app/javascript/dashboard/i18n/locale/sl/macros.json
+++ b/app/javascript/dashboard/i18n/locale/sl/macros.json
@@ -99,6 +99,13 @@
       "CHANGE_PRIORITY": "Change Priority",
       "ADD_PRIVATE_NOTE": "Add a Private Note",
       "SEND_WEBHOOK_EVENT": "Send Webhook Event"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "None",
+      "LOW": "Low",
+      "MEDIUM": "Medium",
+      "HIGH": "High",
+      "URGENT": "Urgent"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sq/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/sq/attributesMgmt.json
index dd413ab26..cea6359de 100644
--- a/app/javascript/dashboard/i18n/locale/sq/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sq/attributesMgmt.json
@@ -5,6 +5,18 @@
     "LOADING": "Fetching custom attributes",
     "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.",
     "LEARN_MORE": "Learn more about custom attributes",
+    "ATTRIBUTE_MODELS": {
+      "CONVERSATION": "Conversation",
+      "CONTACT": "Contact"
+    },
+    "ATTRIBUTE_TYPES": {
+      "TEXT": "Text",
+      "NUMBER": "Number",
+      "LINK": "Link",
+      "DATE": "Date",
+      "LIST": "List",
+      "CHECKBOX": "Checkbox"
+    },
     "ADD": {
       "TITLE": "Add Custom Attribute",
       "SUBMIT": "Create",
diff --git a/app/javascript/dashboard/i18n/locale/sq/automation.json b/app/javascript/dashboard/i18n/locale/sq/automation.json
index c424e63f3..9f8da3b10 100644
--- a/app/javascript/dashboard/i18n/locale/sq/automation.json
+++ b/app/javascript/dashboard/i18n/locale/sq/automation.json
@@ -150,6 +150,17 @@
       "ADD_SLA": "Add SLA",
       "OPEN_CONVERSATION": "Open conversation"
     },
+    "MESSAGE_TYPES": {
+      "INCOMING": "Incoming Message",
+      "OUTGOING": "Outgoing Message"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "None",
+      "LOW": "Low",
+      "MEDIUM": "Medium",
+      "HIGH": "High",
+      "URGENT": "Urgent"
+    },
     "ATTRIBUTES": {
       "MESSAGE_TYPE": "Message Type",
       "MESSAGE_CONTAINS": "Message Contains",
diff --git a/app/javascript/dashboard/i18n/locale/sq/generalSettings.json b/app/javascript/dashboard/i18n/locale/sq/generalSettings.json
index 9055574c5..d924bffbd 100644
--- a/app/javascript/dashboard/i18n/locale/sq/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/sq/generalSettings.json
@@ -134,6 +134,7 @@
     "MULTISELECT": {
       "ENTER_TO_SELECT": "Press enter to select",
       "ENTER_TO_REMOVE": "Press enter to remove",
+      "NO_OPTIONS": "List is empty",
       "SELECT_ONE": "Select one",
       "SELECT": "Select"
     }
diff --git a/app/javascript/dashboard/i18n/locale/sq/integrations.json b/app/javascript/dashboard/i18n/locale/sq/integrations.json
index f99d12d45..f503fe78f 100644
--- a/app/javascript/dashboard/i18n/locale/sq/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/sq/integrations.json
@@ -481,6 +481,37 @@
         "ERROR_MESSAGE": "There was an error updating the assistant, please try again.",
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
+      "SETTINGS": {
+        "BREADCRUMB": {
+          "ASSISTANT": "Assistant"
+        },
+        "BASIC_SETTINGS": {
+          "TITLE": "Basic settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "SYSTEM_SETTINGS": {
+          "TITLE": "System settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "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.",
+          "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."
+            },
+            "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.”"
+            },
+            "RESPONSE_GUIDELINES": {
+              "TITLE": "Response guidelines",
+              "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
+            }
+          }
+        }
+      },
       "OPTIONS": {
         "EDIT_ASSISTANT": "Edit Assistant",
         "DELETE_ASSISTANT": "Delete Assistant",
diff --git a/app/javascript/dashboard/i18n/locale/sq/macros.json b/app/javascript/dashboard/i18n/locale/sq/macros.json
index d22744190..fcb409f34 100644
--- a/app/javascript/dashboard/i18n/locale/sq/macros.json
+++ b/app/javascript/dashboard/i18n/locale/sq/macros.json
@@ -99,6 +99,13 @@
       "CHANGE_PRIORITY": "Change Priority",
       "ADD_PRIVATE_NOTE": "Add a Private Note",
       "SEND_WEBHOOK_EVENT": "Send Webhook Event"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "None",
+      "LOW": "Low",
+      "MEDIUM": "Medium",
+      "HIGH": "High",
+      "URGENT": "Urgent"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sr/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/sr/attributesMgmt.json
index e63fc629f..913750764 100644
--- a/app/javascript/dashboard/i18n/locale/sr/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sr/attributesMgmt.json
@@ -5,6 +5,18 @@
     "LOADING": "Prikupljanje prilagođenih atributa",
     "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.",
     "LEARN_MORE": "Learn more about custom attributes",
+    "ATTRIBUTE_MODELS": {
+      "CONVERSATION": "Razgovor",
+      "CONTACT": "Kontakt"
+    },
+    "ATTRIBUTE_TYPES": {
+      "TEXT": "Tekst",
+      "NUMBER": "Broj",
+      "LINK": "Veza",
+      "DATE": "Date",
+      "LIST": "Lista",
+      "CHECKBOX": "Polje za potvrdu"
+    },
     "ADD": {
       "TITLE": "Dodaj prilagođeni atribut",
       "SUBMIT": "Kreiraj",
diff --git a/app/javascript/dashboard/i18n/locale/sr/automation.json b/app/javascript/dashboard/i18n/locale/sr/automation.json
index fe4fa9494..1dcc9ad1b 100644
--- a/app/javascript/dashboard/i18n/locale/sr/automation.json
+++ b/app/javascript/dashboard/i18n/locale/sr/automation.json
@@ -150,6 +150,17 @@
       "ADD_SLA": "Add SLA",
       "OPEN_CONVERSATION": "Otvoren razgovor"
     },
+    "MESSAGE_TYPES": {
+      "INCOMING": "Incoming Message",
+      "OUTGOING": "Outgoing Message"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "Niko",
+      "LOW": "Low",
+      "MEDIUM": "Medium",
+      "HIGH": "High",
+      "URGENT": "Urgent"
+    },
     "ATTRIBUTES": {
       "MESSAGE_TYPE": "Message Type",
       "MESSAGE_CONTAINS": "Message Contains",
diff --git a/app/javascript/dashboard/i18n/locale/sr/generalSettings.json b/app/javascript/dashboard/i18n/locale/sr/generalSettings.json
index dedb5eed4..e12643802 100644
--- a/app/javascript/dashboard/i18n/locale/sr/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/sr/generalSettings.json
@@ -134,6 +134,7 @@
     "MULTISELECT": {
       "ENTER_TO_SELECT": "Pritisnite enter da bi ste izabrali",
       "ENTER_TO_REMOVE": "Pritisnite enter da bi ste uklonili",
+      "NO_OPTIONS": "List is empty",
       "SELECT_ONE": "Izaberite jedno",
       "SELECT": "Select"
     }
diff --git a/app/javascript/dashboard/i18n/locale/sr/integrations.json b/app/javascript/dashboard/i18n/locale/sr/integrations.json
index 07988f805..829d4c62c 100644
--- a/app/javascript/dashboard/i18n/locale/sr/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/sr/integrations.json
@@ -481,6 +481,37 @@
         "ERROR_MESSAGE": "There was an error updating the assistant, please try again.",
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
+      "SETTINGS": {
+        "BREADCRUMB": {
+          "ASSISTANT": "Assistant"
+        },
+        "BASIC_SETTINGS": {
+          "TITLE": "Basic settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "SYSTEM_SETTINGS": {
+          "TITLE": "System settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "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.",
+          "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."
+            },
+            "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.”"
+            },
+            "RESPONSE_GUIDELINES": {
+              "TITLE": "Response guidelines",
+              "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
+            }
+          }
+        }
+      },
       "OPTIONS": {
         "EDIT_ASSISTANT": "Edit Assistant",
         "DELETE_ASSISTANT": "Delete Assistant",
diff --git a/app/javascript/dashboard/i18n/locale/sr/macros.json b/app/javascript/dashboard/i18n/locale/sr/macros.json
index 9b0002656..f4a346918 100644
--- a/app/javascript/dashboard/i18n/locale/sr/macros.json
+++ b/app/javascript/dashboard/i18n/locale/sr/macros.json
@@ -99,6 +99,13 @@
       "CHANGE_PRIORITY": "Change Priority",
       "ADD_PRIVATE_NOTE": "Add a Private Note",
       "SEND_WEBHOOK_EVENT": "Send Webhook Event"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "Niko",
+      "LOW": "Low",
+      "MEDIUM": "Medium",
+      "HIGH": "High",
+      "URGENT": "Urgent"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sv/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/sv/attributesMgmt.json
index e0ea37954..8703cf762 100644
--- a/app/javascript/dashboard/i18n/locale/sv/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sv/attributesMgmt.json
@@ -5,6 +5,18 @@
     "LOADING": "Fetching custom attributes",
     "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.",
     "LEARN_MORE": "Learn more about custom attributes",
+    "ATTRIBUTE_MODELS": {
+      "CONVERSATION": "Conversation",
+      "CONTACT": "Contact"
+    },
+    "ATTRIBUTE_TYPES": {
+      "TEXT": "Text",
+      "NUMBER": "Number",
+      "LINK": "Link",
+      "DATE": "Date",
+      "LIST": "List",
+      "CHECKBOX": "Checkbox"
+    },
     "ADD": {
       "TITLE": "Add Custom Attribute",
       "SUBMIT": "Skapa",
diff --git a/app/javascript/dashboard/i18n/locale/sv/automation.json b/app/javascript/dashboard/i18n/locale/sv/automation.json
index a0c4be432..3f3c61a42 100644
--- a/app/javascript/dashboard/i18n/locale/sv/automation.json
+++ b/app/javascript/dashboard/i18n/locale/sv/automation.json
@@ -150,6 +150,17 @@
       "ADD_SLA": "Add SLA",
       "OPEN_CONVERSATION": "Open conversation"
     },
+    "MESSAGE_TYPES": {
+      "INCOMING": "Incoming Message",
+      "OUTGOING": "Outgoing Message"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "None",
+      "LOW": "Låg",
+      "MEDIUM": "Medel",
+      "HIGH": "Hög",
+      "URGENT": "Brådskande"
+    },
     "ATTRIBUTES": {
       "MESSAGE_TYPE": "Message Type",
       "MESSAGE_CONTAINS": "Message Contains",
diff --git a/app/javascript/dashboard/i18n/locale/sv/generalSettings.json b/app/javascript/dashboard/i18n/locale/sv/generalSettings.json
index 6cc100cac..bd69e0a73 100644
--- a/app/javascript/dashboard/i18n/locale/sv/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/sv/generalSettings.json
@@ -134,6 +134,7 @@
     "MULTISELECT": {
       "ENTER_TO_SELECT": "Tryck Enter för att välja",
       "ENTER_TO_REMOVE": "Tryck Enter för att ta bort",
+      "NO_OPTIONS": "List is empty",
       "SELECT_ONE": "Markera en/ett",
       "SELECT": "Select"
     }
diff --git a/app/javascript/dashboard/i18n/locale/sv/integrations.json b/app/javascript/dashboard/i18n/locale/sv/integrations.json
index 57ec78359..99a61da25 100644
--- a/app/javascript/dashboard/i18n/locale/sv/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/sv/integrations.json
@@ -481,6 +481,37 @@
         "ERROR_MESSAGE": "There was an error updating the assistant, please try again.",
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
+      "SETTINGS": {
+        "BREADCRUMB": {
+          "ASSISTANT": "Assistant"
+        },
+        "BASIC_SETTINGS": {
+          "TITLE": "Basic settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "SYSTEM_SETTINGS": {
+          "TITLE": "System settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "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.",
+          "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."
+            },
+            "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.”"
+            },
+            "RESPONSE_GUIDELINES": {
+              "TITLE": "Response guidelines",
+              "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
+            }
+          }
+        }
+      },
       "OPTIONS": {
         "EDIT_ASSISTANT": "Edit Assistant",
         "DELETE_ASSISTANT": "Delete Assistant",
diff --git a/app/javascript/dashboard/i18n/locale/sv/macros.json b/app/javascript/dashboard/i18n/locale/sv/macros.json
index 2f96a8a9b..fd1c46728 100644
--- a/app/javascript/dashboard/i18n/locale/sv/macros.json
+++ b/app/javascript/dashboard/i18n/locale/sv/macros.json
@@ -99,6 +99,13 @@
       "CHANGE_PRIORITY": "Change Priority",
       "ADD_PRIVATE_NOTE": "Add a Private Note",
       "SEND_WEBHOOK_EVENT": "Send Webhook Event"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "None",
+      "LOW": "Låg",
+      "MEDIUM": "Medel",
+      "HIGH": "Hög",
+      "URGENT": "Brådskande"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ta/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/ta/attributesMgmt.json
index 059e756fd..75cd2d709 100644
--- a/app/javascript/dashboard/i18n/locale/ta/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ta/attributesMgmt.json
@@ -5,6 +5,18 @@
     "LOADING": "Fetching custom attributes",
     "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.",
     "LEARN_MORE": "Learn more about custom attributes",
+    "ATTRIBUTE_MODELS": {
+      "CONVERSATION": "Conversation",
+      "CONTACT": "Contact"
+    },
+    "ATTRIBUTE_TYPES": {
+      "TEXT": "Text",
+      "NUMBER": "Number",
+      "LINK": "Link",
+      "DATE": "Date",
+      "LIST": "List",
+      "CHECKBOX": "Checkbox"
+    },
     "ADD": {
       "TITLE": "Add Custom Attribute",
       "SUBMIT": "Create",
diff --git a/app/javascript/dashboard/i18n/locale/ta/automation.json b/app/javascript/dashboard/i18n/locale/ta/automation.json
index 09ddaf827..faa9204ad 100644
--- a/app/javascript/dashboard/i18n/locale/ta/automation.json
+++ b/app/javascript/dashboard/i18n/locale/ta/automation.json
@@ -150,6 +150,17 @@
       "ADD_SLA": "Add SLA",
       "OPEN_CONVERSATION": "Open conversation"
     },
+    "MESSAGE_TYPES": {
+      "INCOMING": "Incoming Message",
+      "OUTGOING": "Outgoing Message"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "None",
+      "LOW": "Low",
+      "MEDIUM": "Medium",
+      "HIGH": "High",
+      "URGENT": "Urgent"
+    },
     "ATTRIBUTES": {
       "MESSAGE_TYPE": "Message Type",
       "MESSAGE_CONTAINS": "Message Contains",
diff --git a/app/javascript/dashboard/i18n/locale/ta/generalSettings.json b/app/javascript/dashboard/i18n/locale/ta/generalSettings.json
index 7f638a536..2a6b67810 100644
--- a/app/javascript/dashboard/i18n/locale/ta/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ta/generalSettings.json
@@ -134,6 +134,7 @@
     "MULTISELECT": {
       "ENTER_TO_SELECT": "Press enter to select",
       "ENTER_TO_REMOVE": "Press enter to remove",
+      "NO_OPTIONS": "List is empty",
       "SELECT_ONE": "Select one",
       "SELECT": "Select"
     }
diff --git a/app/javascript/dashboard/i18n/locale/ta/integrations.json b/app/javascript/dashboard/i18n/locale/ta/integrations.json
index fc80613a2..8e6720bc9 100644
--- a/app/javascript/dashboard/i18n/locale/ta/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ta/integrations.json
@@ -481,6 +481,37 @@
         "ERROR_MESSAGE": "There was an error updating the assistant, please try again.",
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
+      "SETTINGS": {
+        "BREADCRUMB": {
+          "ASSISTANT": "Assistant"
+        },
+        "BASIC_SETTINGS": {
+          "TITLE": "Basic settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "SYSTEM_SETTINGS": {
+          "TITLE": "System settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "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.",
+          "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."
+            },
+            "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.”"
+            },
+            "RESPONSE_GUIDELINES": {
+              "TITLE": "Response guidelines",
+              "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
+            }
+          }
+        }
+      },
       "OPTIONS": {
         "EDIT_ASSISTANT": "Edit Assistant",
         "DELETE_ASSISTANT": "Delete Assistant",
diff --git a/app/javascript/dashboard/i18n/locale/ta/macros.json b/app/javascript/dashboard/i18n/locale/ta/macros.json
index b422140c1..dbc7d5d68 100644
--- a/app/javascript/dashboard/i18n/locale/ta/macros.json
+++ b/app/javascript/dashboard/i18n/locale/ta/macros.json
@@ -99,6 +99,13 @@
       "CHANGE_PRIORITY": "Change Priority",
       "ADD_PRIVATE_NOTE": "Add a Private Note",
       "SEND_WEBHOOK_EVENT": "Send Webhook Event"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "None",
+      "LOW": "Low",
+      "MEDIUM": "Medium",
+      "HIGH": "High",
+      "URGENT": "Urgent"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/th/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/th/attributesMgmt.json
index c74951bc7..afa772f64 100644
--- a/app/javascript/dashboard/i18n/locale/th/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/th/attributesMgmt.json
@@ -5,6 +5,18 @@
     "LOADING": "กำลังดึงแอตทริบิวต์ที่กำหนดเอง",
     "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.",
     "LEARN_MORE": "Learn more about custom attributes",
+    "ATTRIBUTE_MODELS": {
+      "CONVERSATION": "การสนทนา",
+      "CONTACT": "ผู้ติดต่อ"
+    },
+    "ATTRIBUTE_TYPES": {
+      "TEXT": "ข้อความ",
+      "NUMBER": "ตัวเลข",
+      "LINK": "ลิงก์",
+      "DATE": "Date",
+      "LIST": "รายการ",
+      "CHECKBOX": "ช่องทำเครื่องหมาย"
+    },
     "ADD": {
       "TITLE": "เพิ่มแอตทริบิวต์เเบบกำหนดเอง",
       "SUBMIT": "สร้าง",
diff --git a/app/javascript/dashboard/i18n/locale/th/automation.json b/app/javascript/dashboard/i18n/locale/th/automation.json
index fc4976557..6bdfacd95 100644
--- a/app/javascript/dashboard/i18n/locale/th/automation.json
+++ b/app/javascript/dashboard/i18n/locale/th/automation.json
@@ -150,6 +150,17 @@
       "ADD_SLA": "Add SLA",
       "OPEN_CONVERSATION": "เปิดดูการสนทนา"
     },
+    "MESSAGE_TYPES": {
+      "INCOMING": "Incoming Message",
+      "OUTGOING": "Outgoing Message"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "ไม่มี",
+      "LOW": "Low",
+      "MEDIUM": "Medium",
+      "HIGH": "High",
+      "URGENT": "Urgent"
+    },
     "ATTRIBUTES": {
       "MESSAGE_TYPE": "Message Type",
       "MESSAGE_CONTAINS": "Message Contains",
diff --git a/app/javascript/dashboard/i18n/locale/th/generalSettings.json b/app/javascript/dashboard/i18n/locale/th/generalSettings.json
index 782bcd3cd..853d21254 100644
--- a/app/javascript/dashboard/i18n/locale/th/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/th/generalSettings.json
@@ -134,6 +134,7 @@
     "MULTISELECT": {
       "ENTER_TO_SELECT": "กด enter เพื่อเลือก",
       "ENTER_TO_REMOVE": "กด enter เพื่อลบ",
+      "NO_OPTIONS": "List is empty",
       "SELECT_ONE": "เลือก",
       "SELECT": "เลือก"
     }
diff --git a/app/javascript/dashboard/i18n/locale/th/integrations.json b/app/javascript/dashboard/i18n/locale/th/integrations.json
index c57f0d5b5..df909c238 100644
--- a/app/javascript/dashboard/i18n/locale/th/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/th/integrations.json
@@ -481,6 +481,37 @@
         "ERROR_MESSAGE": "There was an error updating the assistant, please try again.",
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
+      "SETTINGS": {
+        "BREADCRUMB": {
+          "ASSISTANT": "Assistant"
+        },
+        "BASIC_SETTINGS": {
+          "TITLE": "Basic settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "SYSTEM_SETTINGS": {
+          "TITLE": "System settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "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.",
+          "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."
+            },
+            "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.”"
+            },
+            "RESPONSE_GUIDELINES": {
+              "TITLE": "Response guidelines",
+              "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
+            }
+          }
+        }
+      },
       "OPTIONS": {
         "EDIT_ASSISTANT": "Edit Assistant",
         "DELETE_ASSISTANT": "Delete Assistant",
diff --git a/app/javascript/dashboard/i18n/locale/th/macros.json b/app/javascript/dashboard/i18n/locale/th/macros.json
index 0694aaa22..2671c7036 100644
--- a/app/javascript/dashboard/i18n/locale/th/macros.json
+++ b/app/javascript/dashboard/i18n/locale/th/macros.json
@@ -99,6 +99,13 @@
       "CHANGE_PRIORITY": "Change Priority",
       "ADD_PRIVATE_NOTE": "Add a Private Note",
       "SEND_WEBHOOK_EVENT": "Send Webhook Event"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "ไม่มี",
+      "LOW": "Low",
+      "MEDIUM": "Medium",
+      "HIGH": "High",
+      "URGENT": "Urgent"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/tl/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/tl/attributesMgmt.json
index dd413ab26..cea6359de 100644
--- a/app/javascript/dashboard/i18n/locale/tl/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/tl/attributesMgmt.json
@@ -5,6 +5,18 @@
     "LOADING": "Fetching custom attributes",
     "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.",
     "LEARN_MORE": "Learn more about custom attributes",
+    "ATTRIBUTE_MODELS": {
+      "CONVERSATION": "Conversation",
+      "CONTACT": "Contact"
+    },
+    "ATTRIBUTE_TYPES": {
+      "TEXT": "Text",
+      "NUMBER": "Number",
+      "LINK": "Link",
+      "DATE": "Date",
+      "LIST": "List",
+      "CHECKBOX": "Checkbox"
+    },
     "ADD": {
       "TITLE": "Add Custom Attribute",
       "SUBMIT": "Create",
diff --git a/app/javascript/dashboard/i18n/locale/tl/automation.json b/app/javascript/dashboard/i18n/locale/tl/automation.json
index c5dd4a514..cb030332f 100644
--- a/app/javascript/dashboard/i18n/locale/tl/automation.json
+++ b/app/javascript/dashboard/i18n/locale/tl/automation.json
@@ -150,6 +150,17 @@
       "ADD_SLA": "Add SLA",
       "OPEN_CONVERSATION": "Open conversation"
     },
+    "MESSAGE_TYPES": {
+      "INCOMING": "Incoming Message",
+      "OUTGOING": "Outgoing Message"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "None",
+      "LOW": "Low",
+      "MEDIUM": "Medium",
+      "HIGH": "High",
+      "URGENT": "Urgent"
+    },
     "ATTRIBUTES": {
       "MESSAGE_TYPE": "Message Type",
       "MESSAGE_CONTAINS": "Message Contains",
diff --git a/app/javascript/dashboard/i18n/locale/tl/generalSettings.json b/app/javascript/dashboard/i18n/locale/tl/generalSettings.json
index 9055574c5..d924bffbd 100644
--- a/app/javascript/dashboard/i18n/locale/tl/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/tl/generalSettings.json
@@ -134,6 +134,7 @@
     "MULTISELECT": {
       "ENTER_TO_SELECT": "Press enter to select",
       "ENTER_TO_REMOVE": "Press enter to remove",
+      "NO_OPTIONS": "List is empty",
       "SELECT_ONE": "Select one",
       "SELECT": "Select"
     }
diff --git a/app/javascript/dashboard/i18n/locale/tl/integrations.json b/app/javascript/dashboard/i18n/locale/tl/integrations.json
index ed5ef8b72..6dc0e6cb3 100644
--- a/app/javascript/dashboard/i18n/locale/tl/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/tl/integrations.json
@@ -481,6 +481,37 @@
         "ERROR_MESSAGE": "There was an error updating the assistant, please try again.",
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
+      "SETTINGS": {
+        "BREADCRUMB": {
+          "ASSISTANT": "Assistant"
+        },
+        "BASIC_SETTINGS": {
+          "TITLE": "Basic settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "SYSTEM_SETTINGS": {
+          "TITLE": "System settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "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.",
+          "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."
+            },
+            "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.”"
+            },
+            "RESPONSE_GUIDELINES": {
+              "TITLE": "Response guidelines",
+              "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
+            }
+          }
+        }
+      },
       "OPTIONS": {
         "EDIT_ASSISTANT": "Edit Assistant",
         "DELETE_ASSISTANT": "Delete Assistant",
diff --git a/app/javascript/dashboard/i18n/locale/tl/macros.json b/app/javascript/dashboard/i18n/locale/tl/macros.json
index d22744190..fcb409f34 100644
--- a/app/javascript/dashboard/i18n/locale/tl/macros.json
+++ b/app/javascript/dashboard/i18n/locale/tl/macros.json
@@ -99,6 +99,13 @@
       "CHANGE_PRIORITY": "Change Priority",
       "ADD_PRIVATE_NOTE": "Add a Private Note",
       "SEND_WEBHOOK_EVENT": "Send Webhook Event"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "None",
+      "LOW": "Low",
+      "MEDIUM": "Medium",
+      "HIGH": "High",
+      "URGENT": "Urgent"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/tr/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/tr/attributesMgmt.json
index 252a67e57..28ab82469 100644
--- a/app/javascript/dashboard/i18n/locale/tr/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/tr/attributesMgmt.json
@@ -5,6 +5,18 @@
     "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.",
     "LEARN_MORE": "Learn more about custom attributes",
+    "ATTRIBUTE_MODELS": {
+      "CONVERSATION": "Sohbet",
+      "CONTACT": "İletişim"
+    },
+    "ATTRIBUTE_TYPES": {
+      "TEXT": "Metin",
+      "NUMBER": "Sayı",
+      "LINK": "Bağlantı",
+      "DATE": "Date",
+      "LIST": "Liste",
+      "CHECKBOX": "Onay Kutusu"
+    },
     "ADD": {
       "TITLE": "Nitelik Ekle",
       "SUBMIT": "Oluştur",
diff --git a/app/javascript/dashboard/i18n/locale/tr/automation.json b/app/javascript/dashboard/i18n/locale/tr/automation.json
index 4be5c6a5e..9d2641908 100644
--- a/app/javascript/dashboard/i18n/locale/tr/automation.json
+++ b/app/javascript/dashboard/i18n/locale/tr/automation.json
@@ -150,6 +150,17 @@
       "ADD_SLA": "Add SLA",
       "OPEN_CONVERSATION": "Görüşmeyi aç"
     },
+    "MESSAGE_TYPES": {
+      "INCOMING": "Incoming Message",
+      "OUTGOING": "Outgoing Message"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "Hiç",
+      "LOW": "Düşük",
+      "MEDIUM": "Orta",
+      "HIGH": "Yüksek",
+      "URGENT": "Acil"
+    },
     "ATTRIBUTES": {
       "MESSAGE_TYPE": "Mesaj Türü",
       "MESSAGE_CONTAINS": "Mesaj İçerir",
diff --git a/app/javascript/dashboard/i18n/locale/tr/generalSettings.json b/app/javascript/dashboard/i18n/locale/tr/generalSettings.json
index ee0c15945..1e22b121f 100644
--- a/app/javascript/dashboard/i18n/locale/tr/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/tr/generalSettings.json
@@ -134,6 +134,7 @@
     "MULTISELECT": {
       "ENTER_TO_SELECT": "Seçmek için enter tuşuna basın",
       "ENTER_TO_REMOVE": "Kaldırmak için enter tuşuna basın",
+      "NO_OPTIONS": "List is empty",
       "SELECT_ONE": "Birini seç",
       "SELECT": "Seç"
     }
diff --git a/app/javascript/dashboard/i18n/locale/tr/integrations.json b/app/javascript/dashboard/i18n/locale/tr/integrations.json
index e8ed52fff..cc34d1c25 100644
--- a/app/javascript/dashboard/i18n/locale/tr/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/tr/integrations.json
@@ -481,6 +481,37 @@
         "ERROR_MESSAGE": "There was an error updating the assistant, please try again.",
         "NOT_FOUND": "Asistan bulunamadı. Lütfen tekrar deneyin."
       },
+      "SETTINGS": {
+        "BREADCRUMB": {
+          "ASSISTANT": "Assistant"
+        },
+        "BASIC_SETTINGS": {
+          "TITLE": "Basic settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "SYSTEM_SETTINGS": {
+          "TITLE": "System settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "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.",
+          "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."
+            },
+            "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.”"
+            },
+            "RESPONSE_GUIDELINES": {
+              "TITLE": "Response guidelines",
+              "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
+            }
+          }
+        }
+      },
       "OPTIONS": {
         "EDIT_ASSISTANT": "Edit Assistant",
         "DELETE_ASSISTANT": "Delete Assistant",
diff --git a/app/javascript/dashboard/i18n/locale/tr/macros.json b/app/javascript/dashboard/i18n/locale/tr/macros.json
index 8535a86ab..5ee5d01d1 100644
--- a/app/javascript/dashboard/i18n/locale/tr/macros.json
+++ b/app/javascript/dashboard/i18n/locale/tr/macros.json
@@ -99,6 +99,13 @@
       "CHANGE_PRIORITY": "Önceliği Değiştir",
       "ADD_PRIVATE_NOTE": "Özel Bir Not Ekle",
       "SEND_WEBHOOK_EVENT": "Webhook Olayı Gönder"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "Hiç",
+      "LOW": "Düşük",
+      "MEDIUM": "Orta",
+      "HIGH": "Yüksek",
+      "URGENT": "Acil"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/uk/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/uk/attributesMgmt.json
index 372054fce..a89b19361 100644
--- a/app/javascript/dashboard/i18n/locale/uk/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/uk/attributesMgmt.json
@@ -5,6 +5,18 @@
     "LOADING": "Отримання користувацьких атрибутів",
     "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.",
     "LEARN_MORE": "Learn more about custom attributes",
+    "ATTRIBUTE_MODELS": {
+      "CONVERSATION": "Діалог",
+      "CONTACT": "Контакт"
+    },
+    "ATTRIBUTE_TYPES": {
+      "TEXT": "Текст",
+      "NUMBER": "Номер",
+      "LINK": "Лінк",
+      "DATE": "Date",
+      "LIST": "Список",
+      "CHECKBOX": "Прапорець"
+    },
     "ADD": {
       "TITLE": "Додати свій атрибут",
       "SUBMIT": "Створити",
diff --git a/app/javascript/dashboard/i18n/locale/uk/automation.json b/app/javascript/dashboard/i18n/locale/uk/automation.json
index 4d6ca8dc0..bc7203411 100644
--- a/app/javascript/dashboard/i18n/locale/uk/automation.json
+++ b/app/javascript/dashboard/i18n/locale/uk/automation.json
@@ -150,6 +150,17 @@
       "ADD_SLA": "Додати SLA",
       "OPEN_CONVERSATION": "Відкрити розмову"
     },
+    "MESSAGE_TYPES": {
+      "INCOMING": "Incoming Message",
+      "OUTGOING": "Outgoing Message"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "Нiчого",
+      "LOW": "Низький",
+      "MEDIUM": "Середній",
+      "HIGH": "Високий",
+      "URGENT": "Терміновий"
+    },
     "ATTRIBUTES": {
       "MESSAGE_TYPE": "Message Type",
       "MESSAGE_CONTAINS": "Message Contains",
diff --git a/app/javascript/dashboard/i18n/locale/uk/generalSettings.json b/app/javascript/dashboard/i18n/locale/uk/generalSettings.json
index bc34739af..24fedd761 100644
--- a/app/javascript/dashboard/i18n/locale/uk/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/uk/generalSettings.json
@@ -134,6 +134,7 @@
     "MULTISELECT": {
       "ENTER_TO_SELECT": "Натисніть Enter, щоб обрати",
       "ENTER_TO_REMOVE": "Натисніть Enter, щоб видалити",
+      "NO_OPTIONS": "List is empty",
       "SELECT_ONE": "Виберіть",
       "SELECT": "Обрати"
     }
diff --git a/app/javascript/dashboard/i18n/locale/uk/integrations.json b/app/javascript/dashboard/i18n/locale/uk/integrations.json
index 2631d17fb..5ea9db884 100644
--- a/app/javascript/dashboard/i18n/locale/uk/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/uk/integrations.json
@@ -481,6 +481,37 @@
         "ERROR_MESSAGE": "There was an error updating the assistant, please try again.",
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
+      "SETTINGS": {
+        "BREADCRUMB": {
+          "ASSISTANT": "Assistant"
+        },
+        "BASIC_SETTINGS": {
+          "TITLE": "Basic settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "SYSTEM_SETTINGS": {
+          "TITLE": "System settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "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.",
+          "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."
+            },
+            "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.”"
+            },
+            "RESPONSE_GUIDELINES": {
+              "TITLE": "Response guidelines",
+              "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
+            }
+          }
+        }
+      },
       "OPTIONS": {
         "EDIT_ASSISTANT": "Edit Assistant",
         "DELETE_ASSISTANT": "Delete Assistant",
diff --git a/app/javascript/dashboard/i18n/locale/uk/macros.json b/app/javascript/dashboard/i18n/locale/uk/macros.json
index e6c48da6a..fbe695139 100644
--- a/app/javascript/dashboard/i18n/locale/uk/macros.json
+++ b/app/javascript/dashboard/i18n/locale/uk/macros.json
@@ -99,6 +99,13 @@
       "CHANGE_PRIORITY": "Змінити пріоритет",
       "ADD_PRIVATE_NOTE": "Add a Private Note",
       "SEND_WEBHOOK_EVENT": "Send Webhook Event"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "Нiчого",
+      "LOW": "Низький",
+      "MEDIUM": "Середній",
+      "HIGH": "Високий",
+      "URGENT": "Терміновий"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ur/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/ur/attributesMgmt.json
index 11ddd1912..c159616c9 100644
--- a/app/javascript/dashboard/i18n/locale/ur/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ur/attributesMgmt.json
@@ -5,6 +5,18 @@
     "LOADING": "Fetching custom attributes",
     "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.",
     "LEARN_MORE": "Learn more about custom attributes",
+    "ATTRIBUTE_MODELS": {
+      "CONVERSATION": "Conversation",
+      "CONTACT": "Contact"
+    },
+    "ATTRIBUTE_TYPES": {
+      "TEXT": "Text",
+      "NUMBER": "Number",
+      "LINK": "Link",
+      "DATE": "Date",
+      "LIST": "List",
+      "CHECKBOX": "Checkbox"
+    },
     "ADD": {
       "TITLE": "Add Custom Attribute",
       "SUBMIT": "Create",
diff --git a/app/javascript/dashboard/i18n/locale/ur/automation.json b/app/javascript/dashboard/i18n/locale/ur/automation.json
index 4b9e281ad..344827a29 100644
--- a/app/javascript/dashboard/i18n/locale/ur/automation.json
+++ b/app/javascript/dashboard/i18n/locale/ur/automation.json
@@ -150,6 +150,17 @@
       "ADD_SLA": "Add SLA",
       "OPEN_CONVERSATION": "Open conversation"
     },
+    "MESSAGE_TYPES": {
+      "INCOMING": "Incoming Message",
+      "OUTGOING": "Outgoing Message"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "None",
+      "LOW": "Low",
+      "MEDIUM": "Medium",
+      "HIGH": "High",
+      "URGENT": "Urgent"
+    },
     "ATTRIBUTES": {
       "MESSAGE_TYPE": "Message Type",
       "MESSAGE_CONTAINS": "Message Contains",
diff --git a/app/javascript/dashboard/i18n/locale/ur/generalSettings.json b/app/javascript/dashboard/i18n/locale/ur/generalSettings.json
index 95190e330..c7e3f67f4 100644
--- a/app/javascript/dashboard/i18n/locale/ur/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ur/generalSettings.json
@@ -134,6 +134,7 @@
     "MULTISELECT": {
       "ENTER_TO_SELECT": "Press enter to select",
       "ENTER_TO_REMOVE": "Press enter to remove",
+      "NO_OPTIONS": "List is empty",
       "SELECT_ONE": "Select one",
       "SELECT": "Select"
     }
diff --git a/app/javascript/dashboard/i18n/locale/ur/integrations.json b/app/javascript/dashboard/i18n/locale/ur/integrations.json
index cbd8d202b..b91c0e339 100644
--- a/app/javascript/dashboard/i18n/locale/ur/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ur/integrations.json
@@ -481,6 +481,37 @@
         "ERROR_MESSAGE": "There was an error updating the assistant, please try again.",
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
+      "SETTINGS": {
+        "BREADCRUMB": {
+          "ASSISTANT": "Assistant"
+        },
+        "BASIC_SETTINGS": {
+          "TITLE": "Basic settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "SYSTEM_SETTINGS": {
+          "TITLE": "System settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "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.",
+          "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."
+            },
+            "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.”"
+            },
+            "RESPONSE_GUIDELINES": {
+              "TITLE": "Response guidelines",
+              "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
+            }
+          }
+        }
+      },
       "OPTIONS": {
         "EDIT_ASSISTANT": "Edit Assistant",
         "DELETE_ASSISTANT": "Delete Assistant",
diff --git a/app/javascript/dashboard/i18n/locale/ur/macros.json b/app/javascript/dashboard/i18n/locale/ur/macros.json
index 31bfe5ea4..55ced796f 100644
--- a/app/javascript/dashboard/i18n/locale/ur/macros.json
+++ b/app/javascript/dashboard/i18n/locale/ur/macros.json
@@ -99,6 +99,13 @@
       "CHANGE_PRIORITY": "Change Priority",
       "ADD_PRIVATE_NOTE": "Add a Private Note",
       "SEND_WEBHOOK_EVENT": "Send Webhook Event"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "None",
+      "LOW": "Low",
+      "MEDIUM": "Medium",
+      "HIGH": "High",
+      "URGENT": "Urgent"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/ur_IN/attributesMgmt.json
index dd413ab26..cea6359de 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/attributesMgmt.json
@@ -5,6 +5,18 @@
     "LOADING": "Fetching custom attributes",
     "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.",
     "LEARN_MORE": "Learn more about custom attributes",
+    "ATTRIBUTE_MODELS": {
+      "CONVERSATION": "Conversation",
+      "CONTACT": "Contact"
+    },
+    "ATTRIBUTE_TYPES": {
+      "TEXT": "Text",
+      "NUMBER": "Number",
+      "LINK": "Link",
+      "DATE": "Date",
+      "LIST": "List",
+      "CHECKBOX": "Checkbox"
+    },
     "ADD": {
       "TITLE": "Add Custom Attribute",
       "SUBMIT": "Create",
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/automation.json b/app/javascript/dashboard/i18n/locale/ur_IN/automation.json
index c5dd4a514..cb030332f 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/automation.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/automation.json
@@ -150,6 +150,17 @@
       "ADD_SLA": "Add SLA",
       "OPEN_CONVERSATION": "Open conversation"
     },
+    "MESSAGE_TYPES": {
+      "INCOMING": "Incoming Message",
+      "OUTGOING": "Outgoing Message"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "None",
+      "LOW": "Low",
+      "MEDIUM": "Medium",
+      "HIGH": "High",
+      "URGENT": "Urgent"
+    },
     "ATTRIBUTES": {
       "MESSAGE_TYPE": "Message Type",
       "MESSAGE_CONTAINS": "Message Contains",
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/generalSettings.json b/app/javascript/dashboard/i18n/locale/ur_IN/generalSettings.json
index 9055574c5..d924bffbd 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/generalSettings.json
@@ -134,6 +134,7 @@
     "MULTISELECT": {
       "ENTER_TO_SELECT": "Press enter to select",
       "ENTER_TO_REMOVE": "Press enter to remove",
+      "NO_OPTIONS": "List is empty",
       "SELECT_ONE": "Select one",
       "SELECT": "Select"
     }
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/integrations.json b/app/javascript/dashboard/i18n/locale/ur_IN/integrations.json
index 7ae07cfa2..a873cfcf5 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/integrations.json
@@ -481,6 +481,37 @@
         "ERROR_MESSAGE": "There was an error updating the assistant, please try again.",
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
+      "SETTINGS": {
+        "BREADCRUMB": {
+          "ASSISTANT": "Assistant"
+        },
+        "BASIC_SETTINGS": {
+          "TITLE": "Basic settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "SYSTEM_SETTINGS": {
+          "TITLE": "System settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "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.",
+          "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."
+            },
+            "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.”"
+            },
+            "RESPONSE_GUIDELINES": {
+              "TITLE": "Response guidelines",
+              "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
+            }
+          }
+        }
+      },
       "OPTIONS": {
         "EDIT_ASSISTANT": "Edit Assistant",
         "DELETE_ASSISTANT": "Delete Assistant",
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/macros.json b/app/javascript/dashboard/i18n/locale/ur_IN/macros.json
index d22744190..fcb409f34 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/macros.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/macros.json
@@ -99,6 +99,13 @@
       "CHANGE_PRIORITY": "Change Priority",
       "ADD_PRIVATE_NOTE": "Add a Private Note",
       "SEND_WEBHOOK_EVENT": "Send Webhook Event"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "None",
+      "LOW": "Low",
+      "MEDIUM": "Medium",
+      "HIGH": "High",
+      "URGENT": "Urgent"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/vi/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/vi/attributesMgmt.json
index 89bff6176..db171391d 100644
--- a/app/javascript/dashboard/i18n/locale/vi/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/vi/attributesMgmt.json
@@ -5,6 +5,18 @@
     "LOADING": "Đang lấy thuộc tính tuỳ chỉnh",
     "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.",
     "LEARN_MORE": "Learn more about custom attributes",
+    "ATTRIBUTE_MODELS": {
+      "CONVERSATION": "Cuộc hội thoại",
+      "CONTACT": "Liên hệ"
+    },
+    "ATTRIBUTE_TYPES": {
+      "TEXT": "Văn bản",
+      "NUMBER": "Số",
+      "LINK": "Liên kết",
+      "DATE": "Date",
+      "LIST": "Danh sách",
+      "CHECKBOX": "Hộp kiểm"
+    },
     "ADD": {
       "TITLE": "Thêm thuộc tính Tùy chỉnh",
       "SUBMIT": "Tạo",
diff --git a/app/javascript/dashboard/i18n/locale/vi/automation.json b/app/javascript/dashboard/i18n/locale/vi/automation.json
index 9de0b8eaf..4e01b5ddb 100644
--- a/app/javascript/dashboard/i18n/locale/vi/automation.json
+++ b/app/javascript/dashboard/i18n/locale/vi/automation.json
@@ -150,6 +150,17 @@
       "ADD_SLA": "Add SLA",
       "OPEN_CONVERSATION": "Mở cuộc trò chuyện"
     },
+    "MESSAGE_TYPES": {
+      "INCOMING": "Incoming Message",
+      "OUTGOING": "Outgoing Message"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "Không có",
+      "LOW": "Thấp",
+      "MEDIUM": "Trung bình",
+      "HIGH": "Cao",
+      "URGENT": "Cấp bách"
+    },
     "ATTRIBUTES": {
       "MESSAGE_TYPE": "Message Type",
       "MESSAGE_CONTAINS": "Message Contains",
diff --git a/app/javascript/dashboard/i18n/locale/vi/generalSettings.json b/app/javascript/dashboard/i18n/locale/vi/generalSettings.json
index a5e003478..9b87085b0 100644
--- a/app/javascript/dashboard/i18n/locale/vi/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/vi/generalSettings.json
@@ -134,6 +134,7 @@
     "MULTISELECT": {
       "ENTER_TO_SELECT": "Bấm enter để chọn",
       "ENTER_TO_REMOVE": "Bấm enter để xoá",
+      "NO_OPTIONS": "List is empty",
       "SELECT_ONE": "Chọn một",
       "SELECT": "Chọn"
     }
diff --git a/app/javascript/dashboard/i18n/locale/vi/integrations.json b/app/javascript/dashboard/i18n/locale/vi/integrations.json
index 5fa5d2b3d..fde4a605d 100644
--- a/app/javascript/dashboard/i18n/locale/vi/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/vi/integrations.json
@@ -481,6 +481,37 @@
         "ERROR_MESSAGE": "There was an error updating the assistant, please try again.",
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
+      "SETTINGS": {
+        "BREADCRUMB": {
+          "ASSISTANT": "Assistant"
+        },
+        "BASIC_SETTINGS": {
+          "TITLE": "Basic settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "SYSTEM_SETTINGS": {
+          "TITLE": "System settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "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.",
+          "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."
+            },
+            "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.”"
+            },
+            "RESPONSE_GUIDELINES": {
+              "TITLE": "Response guidelines",
+              "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
+            }
+          }
+        }
+      },
       "OPTIONS": {
         "EDIT_ASSISTANT": "Edit Assistant",
         "DELETE_ASSISTANT": "Delete Assistant",
diff --git a/app/javascript/dashboard/i18n/locale/vi/macros.json b/app/javascript/dashboard/i18n/locale/vi/macros.json
index ba075f393..4f582d211 100644
--- a/app/javascript/dashboard/i18n/locale/vi/macros.json
+++ b/app/javascript/dashboard/i18n/locale/vi/macros.json
@@ -99,6 +99,13 @@
       "CHANGE_PRIORITY": "Change Priority",
       "ADD_PRIVATE_NOTE": "Add a Private Note",
       "SEND_WEBHOOK_EVENT": "Send Webhook Event"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "Không có",
+      "LOW": "Thấp",
+      "MEDIUM": "Trung bình",
+      "HIGH": "Cao",
+      "URGENT": "Cấp bách"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/zh_CN/attributesMgmt.json
index a2c5e1afe..861539156 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/attributesMgmt.json
@@ -5,6 +5,18 @@
     "LOADING": "正在获取自定义属性",
     "DESCRIPTION": "自定义属性可跟踪有关您的联系人或对话的其他详细信息——例如订阅计划或首次购买日期。您可以添加不同类型的自定义属性，如文本、列表或数字，以捕获您需要的特定信息。",
     "LEARN_MORE": "自定义属性说明",
+    "ATTRIBUTE_MODELS": {
+      "CONVERSATION": "会话",
+      "CONTACT": "联系人"
+    },
+    "ATTRIBUTE_TYPES": {
+      "TEXT": "文本",
+      "NUMBER": "号码",
+      "LINK": "链接",
+      "DATE": "Date",
+      "LIST": "列表",
+      "CHECKBOX": "复选框"
+    },
     "ADD": {
       "TITLE": "添加自定义属性",
       "SUBMIT": "创建",
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/automation.json b/app/javascript/dashboard/i18n/locale/zh_CN/automation.json
index 51741d23a..75a0ef0e5 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/automation.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/automation.json
@@ -150,6 +150,17 @@
       "ADD_SLA": "添加SLA",
       "OPEN_CONVERSATION": "打开对话"
     },
+    "MESSAGE_TYPES": {
+      "INCOMING": "Incoming Message",
+      "OUTGOING": "Outgoing Message"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "啥都没有",
+      "LOW": "低",
+      "MEDIUM": "中",
+      "HIGH": "高",
+      "URGENT": "紧急的"
+    },
     "ATTRIBUTES": {
       "MESSAGE_TYPE": "消息类型",
       "MESSAGE_CONTAINS": "消息包含",
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json b/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json
index effd00ee8..beb501125 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json
@@ -134,6 +134,7 @@
     "MULTISELECT": {
       "ENTER_TO_SELECT": "按回车键选择",
       "ENTER_TO_REMOVE": "按回车键删除",
+      "NO_OPTIONS": "List is empty",
       "SELECT_ONE": "请选择一个",
       "SELECT": "选择"
     }
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/integrations.json b/app/javascript/dashboard/i18n/locale/zh_CN/integrations.json
index 0c90f63be..1b8d11e24 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/integrations.json
@@ -481,6 +481,37 @@
         "ERROR_MESSAGE": "更新助手时出错，请重试",
         "NOT_FOUND": "无法找到助手。请重试。"
       },
+      "SETTINGS": {
+        "BREADCRUMB": {
+          "ASSISTANT": "助手"
+        },
+        "BASIC_SETTINGS": {
+          "TITLE": "Basic settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "SYSTEM_SETTINGS": {
+          "TITLE": "System settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "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.",
+          "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."
+            },
+            "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.”"
+            },
+            "RESPONSE_GUIDELINES": {
+              "TITLE": "Response guidelines",
+              "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
+            }
+          }
+        }
+      },
       "OPTIONS": {
         "EDIT_ASSISTANT": "编辑助手",
         "DELETE_ASSISTANT": "删除助手",
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/macros.json b/app/javascript/dashboard/i18n/locale/zh_CN/macros.json
index afad13777..9c7e0d8ec 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/macros.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/macros.json
@@ -99,6 +99,13 @@
       "CHANGE_PRIORITY": "更改优先级",
       "ADD_PRIVATE_NOTE": "添加私密注释",
       "SEND_WEBHOOK_EVENT": "发送 Webhook 事件"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "啥都没有",
+      "LOW": "低",
+      "MEDIUM": "中",
+      "HIGH": "高",
+      "URGENT": "紧急的"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/zh_TW/attributesMgmt.json
index dc19657b3..32b8b3945 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/attributesMgmt.json
@@ -5,6 +5,18 @@
     "LOADING": "正在取得自訂屬性",
     "DESCRIPTION": "自定義屬性可用於追蹤有關聯絡人或對話的額外詳情，例如訂閱方案或首次購買的日期。您可以添加不同類型的自定義屬性，如文字、清單或數字，以捕捉您所需的特定資訊。",
     "LEARN_MORE": "Learn more about custom attributes",
+    "ATTRIBUTE_MODELS": {
+      "CONVERSATION": "對話",
+      "CONTACT": "聯絡人"
+    },
+    "ATTRIBUTE_TYPES": {
+      "TEXT": "文字",
+      "NUMBER": "數字",
+      "LINK": "連結",
+      "DATE": "Date",
+      "LIST": "列表",
+      "CHECKBOX": "勾選框"
+    },
     "ADD": {
       "TITLE": "新增自訂屬性",
       "SUBMIT": "建立",
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/automation.json b/app/javascript/dashboard/i18n/locale/zh_TW/automation.json
index 4b96c3dbc..666701615 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/automation.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/automation.json
@@ -150,6 +150,17 @@
       "ADD_SLA": "Add SLA",
       "OPEN_CONVERSATION": "開啟對話"
     },
+    "MESSAGE_TYPES": {
+      "INCOMING": "Incoming Message",
+      "OUTGOING": "Outgoing Message"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "無",
+      "LOW": "Low",
+      "MEDIUM": "Medium",
+      "HIGH": "High",
+      "URGENT": "Urgent"
+    },
     "ATTRIBUTES": {
       "MESSAGE_TYPE": "Message Type",
       "MESSAGE_CONTAINS": "Message Contains",
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/generalSettings.json b/app/javascript/dashboard/i18n/locale/zh_TW/generalSettings.json
index e13e6724a..4eadce691 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/generalSettings.json
@@ -134,6 +134,7 @@
     "MULTISELECT": {
       "ENTER_TO_SELECT": "按下 enter 以選擇",
       "ENTER_TO_REMOVE": "按下 enter 以移除",
+      "NO_OPTIONS": "List is empty",
       "SELECT_ONE": "選擇其中一項",
       "SELECT": "選擇"
     }
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/integrations.json b/app/javascript/dashboard/i18n/locale/zh_TW/integrations.json
index e7100d0ac..dc0057bb3 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/integrations.json
@@ -481,6 +481,37 @@
         "ERROR_MESSAGE": "There was an error updating the assistant, please try again.",
         "NOT_FOUND": "Could not find the assistant. Please try again."
       },
+      "SETTINGS": {
+        "BREADCRUMB": {
+          "ASSISTANT": "Assistant"
+        },
+        "BASIC_SETTINGS": {
+          "TITLE": "Basic settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "SYSTEM_SETTINGS": {
+          "TITLE": "System settings",
+          "DESCRIPTION": "Customize what the assistant says when ending a conversation or transferring to a human."
+        },
+        "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.",
+          "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."
+            },
+            "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.”"
+            },
+            "RESPONSE_GUIDELINES": {
+              "TITLE": "Response guidelines",
+              "DESCRIPTION": "The vibe and structure of your assistant’s replies—clear and friendly? Short and snappy? Detailed and formal?"
+            }
+          }
+        }
+      },
       "OPTIONS": {
         "EDIT_ASSISTANT": "Edit Assistant",
         "DELETE_ASSISTANT": "Delete Assistant",
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/macros.json b/app/javascript/dashboard/i18n/locale/zh_TW/macros.json
index a5ad2ea07..cb3ed1194 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/macros.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/macros.json
@@ -99,6 +99,13 @@
       "CHANGE_PRIORITY": "Change Priority",
       "ADD_PRIVATE_NOTE": "Add a Private Note",
       "SEND_WEBHOOK_EVENT": "Send Webhook Event"
+    },
+    "PRIORITY_TYPES": {
+      "NONE": "無",
+      "LOW": "Low",
+      "MEDIUM": "Medium",
+      "HIGH": "High",
+      "URGENT": "Urgent"
     }
   }
 }
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 21b859d44..bdde6d62a 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -183,7 +183,7 @@ ru:
       csat:
         not_sent_due_to_messaging_window: 'CSAT survey not sent due to outgoing message restrictions'
       auto_resolve:
-        not_sent_due_to_messaging_window: 'Auto-resolve message not sent due to outgoing message restrictions'
+        not_sent_due_to_messaging_window: 'Сообщение автозавершения не отправлено из-за ограничений исходящих сообщений'
       muted: '%{user_name} заглушил(а) этот разговор'
       unmuted: '%{user_name} включил(а) уведомления для разговора'
       auto_resolution_message: 'Разговор закрывается, поскольку он был неактивен в течение длительного времени. Пожалуйста, начните новый разговор, если потребуется дополнительная помощь.'

From 93f18315ccde5133d67e8f84e7846eb22533493f Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Mon, 14 Jul 2025 16:12:38 +0530
Subject: [PATCH 11/20] feat: add `Captain::Scenario` Model and API [CW-4597]
 (#11907)

Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
---
 config/routes.rb                              |   1 +
 ...20250710145708_create_captain_scenarios.rb |  18 ++
 db/schema.rb                                  |  18 +-
 .../accounts/captain/scenarios_controller.rb  |  47 ++++
 enterprise/app/models/captain/assistant.rb    |   1 +
 enterprise/app/models/captain/scenario.rb     |  44 +++
 .../app/policies/captain/scenario_policy.rb   |  21 ++
 .../captain/scenarios/create.json.jbuilder    |   1 +
 .../captain/scenarios/index.json.jbuilder     |   5 +
 .../captain/scenarios/show.json.jbuilder      |   1 +
 .../captain/scenarios/update.json.jbuilder    |   1 +
 .../v1/models/captain/_scenario.json.jbuilder |  16 ++
 .../captain/scenarios_controller_spec.rb      | 258 ++++++++++++++++++
 .../models/captain/scenario_spec.rb           |  63 +++++
 spec/factories/captain/scenario.rb            |  11 +
 15 files changed, 505 insertions(+), 1 deletion(-)
 create mode 100644 db/migrate/20250710145708_create_captain_scenarios.rb
 create mode 100644 enterprise/app/controllers/api/v1/accounts/captain/scenarios_controller.rb
 create mode 100644 enterprise/app/models/captain/scenario.rb
 create mode 100644 enterprise/app/policies/captain/scenario_policy.rb
 create mode 100644 enterprise/app/views/api/v1/accounts/captain/scenarios/create.json.jbuilder
 create mode 100644 enterprise/app/views/api/v1/accounts/captain/scenarios/index.json.jbuilder
 create mode 100644 enterprise/app/views/api/v1/accounts/captain/scenarios/show.json.jbuilder
 create mode 100644 enterprise/app/views/api/v1/accounts/captain/scenarios/update.json.jbuilder
 create mode 100644 enterprise/app/views/api/v1/models/captain/_scenario.json.jbuilder
 create mode 100644 spec/enterprise/controllers/api/v1/accounts/captain/scenarios_controller_spec.rb
 create mode 100644 spec/enterprise/models/captain/scenario_spec.rb
 create mode 100644 spec/factories/captain/scenario.rb

diff --git a/config/routes.rb b/config/routes.rb
index 41ee52f42..4aad60039 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -57,6 +57,7 @@ Rails.application.routes.draw do
                 post :playground
               end
               resources :inboxes, only: [:index, :create, :destroy], param: :inbox_id
+              resources :scenarios
             end
             resources :assistant_responses
             resources :bulk_actions, only: [:create]
diff --git a/db/migrate/20250710145708_create_captain_scenarios.rb b/db/migrate/20250710145708_create_captain_scenarios.rb
new file mode 100644
index 000000000..a922bd478
--- /dev/null
+++ b/db/migrate/20250710145708_create_captain_scenarios.rb
@@ -0,0 +1,18 @@
+class CreateCaptainScenarios < ActiveRecord::Migration[7.1]
+  def change
+    create_table :captain_scenarios do |t|
+      t.string :title
+      t.text :description
+      t.text :instruction
+      t.jsonb :tools, default: []
+      t.boolean :enabled, default: true, null: false
+      t.references :assistant, null: false
+      t.references :account, null: false
+
+      t.timestamps
+    end
+
+    add_index :captain_scenarios, :enabled
+    add_index :captain_scenarios, [:assistant_id, :enabled]
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index af0c89086..837eb58bd 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_06_27_195529) do
+ActiveRecord::Schema[7.1].define(version: 2025_07_10_145708) do
   # These extensions should be enabled to support this database
   enable_extension "pg_stat_statements"
   enable_extension "pg_trgm"
@@ -305,6 +305,22 @@ ActiveRecord::Schema[7.1].define(version: 2025_06_27_195529) do
     t.index ["inbox_id"], name: "index_captain_inboxes_on_inbox_id"
   end
 
+  create_table "captain_scenarios", force: :cascade do |t|
+    t.string "title"
+    t.text "description"
+    t.text "instruction"
+    t.jsonb "tools", default: []
+    t.boolean "enabled", default: true, null: false
+    t.bigint "assistant_id", null: false
+    t.bigint "account_id", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["account_id"], name: "index_captain_scenarios_on_account_id"
+    t.index ["assistant_id", "enabled"], name: "index_captain_scenarios_on_assistant_id_and_enabled"
+    t.index ["assistant_id"], name: "index_captain_scenarios_on_assistant_id"
+    t.index ["enabled"], name: "index_captain_scenarios_on_enabled"
+  end
+
   create_table "categories", force: :cascade do |t|
     t.integer "account_id", null: false
     t.integer "portal_id", null: false
diff --git a/enterprise/app/controllers/api/v1/accounts/captain/scenarios_controller.rb b/enterprise/app/controllers/api/v1/accounts/captain/scenarios_controller.rb
new file mode 100644
index 000000000..7c329053b
--- /dev/null
+++ b/enterprise/app/controllers/api/v1/accounts/captain/scenarios_controller.rb
@@ -0,0 +1,47 @@
+class Api::V1::Accounts::Captain::ScenariosController < Api::V1::Accounts::BaseController
+  before_action :current_account
+  before_action -> { check_authorization(Captain::Scenario) }
+  before_action :set_assistant
+  before_action :set_scenario, only: [:show, :update, :destroy]
+
+  def index
+    @scenarios = assistant_scenarios.enabled
+  end
+
+  def show; end
+
+  def create
+    @scenario = assistant_scenarios.create!(scenario_params.merge(account: Current.account))
+  end
+
+  def update
+    @scenario.update!(scenario_params)
+  end
+
+  def destroy
+    @scenario.destroy
+    head :no_content
+  end
+
+  private
+
+  def set_assistant
+    @assistant = account_assistants.find(params[:assistant_id])
+  end
+
+  def account_assistants
+    @account_assistants ||= Current.account.captain_assistants
+  end
+
+  def set_scenario
+    @scenario = assistant_scenarios.find(params[:id])
+  end
+
+  def assistant_scenarios
+    @assistant.scenarios
+  end
+
+  def scenario_params
+    params.require(:scenario).permit(:title, :description, :instruction, :enabled, tools: [])
+  end
+end
\ No newline at end of file
diff --git a/enterprise/app/models/captain/assistant.rb b/enterprise/app/models/captain/assistant.rb
index 40cf99df9..8f1227231 100644
--- a/enterprise/app/models/captain/assistant.rb
+++ b/enterprise/app/models/captain/assistant.rb
@@ -30,6 +30,7 @@ class Captain::Assistant < ApplicationRecord
            through: :captain_inboxes
   has_many :messages, as: :sender, dependent: :nullify
   has_many :copilot_threads, dependent: :destroy_async
+  has_many :scenarios, class_name: 'Captain::Scenario', dependent: :destroy_async
 
   validates :name, presence: true
   validates :description, presence: true
diff --git a/enterprise/app/models/captain/scenario.rb b/enterprise/app/models/captain/scenario.rb
new file mode 100644
index 000000000..ff8e63c64
--- /dev/null
+++ b/enterprise/app/models/captain/scenario.rb
@@ -0,0 +1,44 @@
+# == Schema Information
+#
+# Table name: captain_scenarios
+#
+#  id           :bigint           not null, primary key
+#  description  :text
+#  enabled      :boolean          default(TRUE), not null
+#  instruction  :text
+#  title        :string
+#  tools        :jsonb
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
+#  account_id   :bigint           not null
+#  assistant_id :bigint           not null
+#
+# Indexes
+#
+#  index_captain_scenarios_on_account_id                (account_id)
+#  index_captain_scenarios_on_assistant_id              (assistant_id)
+#  index_captain_scenarios_on_assistant_id_and_enabled  (assistant_id,enabled)
+#  index_captain_scenarios_on_enabled                   (enabled)
+#
+class Captain::Scenario < ApplicationRecord
+  self.table_name = 'captain_scenarios'
+
+  belongs_to :assistant, class_name: 'Captain::Assistant'
+  belongs_to :account
+
+  validates :title, presence: true
+  validates :description, presence: true
+  validates :instruction, presence: true
+  validates :assistant_id, presence: true
+  validates :account_id, presence: true
+
+  scope :enabled, -> { where(enabled: true) }
+
+  before_save :populate_tools
+
+  private
+
+  def populate_tools
+    # TODO: Implement tools population logic
+  end
+end
diff --git a/enterprise/app/policies/captain/scenario_policy.rb b/enterprise/app/policies/captain/scenario_policy.rb
new file mode 100644
index 000000000..82c5d236b
--- /dev/null
+++ b/enterprise/app/policies/captain/scenario_policy.rb
@@ -0,0 +1,21 @@
+class Captain::ScenarioPolicy < ApplicationPolicy
+  def index?
+    true
+  end
+
+  def show?
+    true
+  end
+
+  def create?
+    @account_user.administrator?
+  end
+
+  def update?
+    @account_user.administrator?
+  end
+
+  def destroy?
+    @account_user.administrator?
+  end
+end
\ No newline at end of file
diff --git a/enterprise/app/views/api/v1/accounts/captain/scenarios/create.json.jbuilder b/enterprise/app/views/api/v1/accounts/captain/scenarios/create.json.jbuilder
new file mode 100644
index 000000000..98566b10f
--- /dev/null
+++ b/enterprise/app/views/api/v1/accounts/captain/scenarios/create.json.jbuilder
@@ -0,0 +1 @@
+json.partial! 'api/v1/models/captain/scenario', scenario: @scenario
\ No newline at end of file
diff --git a/enterprise/app/views/api/v1/accounts/captain/scenarios/index.json.jbuilder b/enterprise/app/views/api/v1/accounts/captain/scenarios/index.json.jbuilder
new file mode 100644
index 000000000..60e97a017
--- /dev/null
+++ b/enterprise/app/views/api/v1/accounts/captain/scenarios/index.json.jbuilder
@@ -0,0 +1,5 @@
+json.data do
+  json.array! @scenarios do |scenario|
+    json.partial! 'api/v1/models/captain/scenario', scenario: scenario
+  end
+end
\ No newline at end of file
diff --git a/enterprise/app/views/api/v1/accounts/captain/scenarios/show.json.jbuilder b/enterprise/app/views/api/v1/accounts/captain/scenarios/show.json.jbuilder
new file mode 100644
index 000000000..98566b10f
--- /dev/null
+++ b/enterprise/app/views/api/v1/accounts/captain/scenarios/show.json.jbuilder
@@ -0,0 +1 @@
+json.partial! 'api/v1/models/captain/scenario', scenario: @scenario
\ No newline at end of file
diff --git a/enterprise/app/views/api/v1/accounts/captain/scenarios/update.json.jbuilder b/enterprise/app/views/api/v1/accounts/captain/scenarios/update.json.jbuilder
new file mode 100644
index 000000000..98566b10f
--- /dev/null
+++ b/enterprise/app/views/api/v1/accounts/captain/scenarios/update.json.jbuilder
@@ -0,0 +1 @@
+json.partial! 'api/v1/models/captain/scenario', scenario: @scenario
\ No newline at end of file
diff --git a/enterprise/app/views/api/v1/models/captain/_scenario.json.jbuilder b/enterprise/app/views/api/v1/models/captain/_scenario.json.jbuilder
new file mode 100644
index 000000000..ae78c7bb8
--- /dev/null
+++ b/enterprise/app/views/api/v1/models/captain/_scenario.json.jbuilder
@@ -0,0 +1,16 @@
+json.id scenario.id
+json.title scenario.title
+json.description scenario.description
+json.instruction scenario.instruction
+json.tools scenario.tools
+json.enabled scenario.enabled
+json.assistant_id scenario.assistant_id
+json.account_id scenario.account_id
+json.created_at scenario.created_at
+json.updated_at scenario.updated_at
+if scenario.assistant.present?
+  json.assistant do
+    json.id scenario.assistant.id
+    json.name scenario.assistant.name
+  end
+end
\ No newline at end of file
diff --git a/spec/enterprise/controllers/api/v1/accounts/captain/scenarios_controller_spec.rb b/spec/enterprise/controllers/api/v1/accounts/captain/scenarios_controller_spec.rb
new file mode 100644
index 000000000..c66571921
--- /dev/null
+++ b/spec/enterprise/controllers/api/v1/accounts/captain/scenarios_controller_spec.rb
@@ -0,0 +1,258 @@
+require 'rails_helper'
+
+RSpec.describe 'Api::V1::Accounts::Captain::Scenarios', type: :request do
+  let(:account) { create(:account) }
+  let(:admin) { create(:user, account: account, role: :administrator) }
+  let(:agent) { create(:user, account: account, role: :agent) }
+  let(:assistant) { create(:captain_assistant, account: account) }
+
+  def json_response
+    JSON.parse(response.body, symbolize_names: true)
+  end
+
+  describe 'GET /api/v1/accounts/{account.id}/captain/assistants/{assistant.id}/scenarios' do
+    context 'when it is an un-authenticated user' do
+      it 'returns unauthorized status' do
+        get "/api/v1/accounts/#{account.id}/captain/assistants/#{assistant.id}/scenarios"
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an agent' do
+      it 'returns success status' do
+        create_list(:captain_scenario, 3, assistant: assistant, account: account)
+        get "/api/v1/accounts/#{account.id}/captain/assistants/#{assistant.id}/scenarios",
+            headers: agent.create_new_auth_token,
+            as: :json
+
+        expect(response).to have_http_status(:success)
+        expect(json_response[:data].length).to eq(3)
+      end
+    end
+
+    context 'when it is an admin' do
+      it 'returns success status and scenarios' do
+        create_list(:captain_scenario, 5, assistant: assistant, account: account)
+        get "/api/v1/accounts/#{account.id}/captain/assistants/#{assistant.id}/scenarios",
+            headers: admin.create_new_auth_token,
+            as: :json
+
+        expect(response).to have_http_status(:success)
+        expect(json_response[:data].length).to eq(5)
+      end
+
+      it 'returns only enabled scenarios' do
+        create(:captain_scenario, assistant: assistant, account: account, enabled: true)
+        create(:captain_scenario, assistant: assistant, account: account, enabled: false)
+        get "/api/v1/accounts/#{account.id}/captain/assistants/#{assistant.id}/scenarios",
+            headers: admin.create_new_auth_token,
+            as: :json
+
+        expect(response).to have_http_status(:success)
+        expect(json_response[:data].length).to eq(1)
+        expect(json_response[:data].first[:enabled]).to be(true)
+      end
+    end
+  end
+
+  describe 'GET /api/v1/accounts/{account.id}/captain/assistants/{assistant.id}/scenarios/{id}' do
+    let(:scenario) { create(:captain_scenario, assistant: assistant, account: account) }
+
+    context 'when it is an un-authenticated user' do
+      it 'returns unauthorized status' do
+        get "/api/v1/accounts/#{account.id}/captain/assistants/#{assistant.id}/scenarios/#{scenario.id}"
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an agent' do
+      it 'returns success status and scenario' do
+        get "/api/v1/accounts/#{account.id}/captain/assistants/#{assistant.id}/scenarios/#{scenario.id}",
+            headers: agent.create_new_auth_token,
+            as: :json
+
+        expect(response).to have_http_status(:success)
+        expect(json_response[:id]).to eq(scenario.id)
+        expect(json_response[:title]).to eq(scenario.title)
+      end
+    end
+
+    context 'when scenario does not exist' do
+      it 'returns not found status' do
+        get "/api/v1/accounts/#{account.id}/captain/assistants/#{assistant.id}/scenarios/999999",
+            headers: agent.create_new_auth_token
+
+        expect(response).to have_http_status(:not_found)
+      end
+    end
+  end
+
+  describe 'POST /api/v1/accounts/{account.id}/captain/assistants/{assistant.id}/scenarios' do
+    let(:valid_attributes) do
+      {
+        scenario: {
+          title: 'Test Scenario',
+          description: 'Test description',
+          instruction: 'Test instruction',
+          enabled: true,
+          tools: %w[tool1 tool2]
+        }
+      }
+    end
+
+    context 'when it is an un-authenticated user' do
+      it 'returns unauthorized status' do
+        post "/api/v1/accounts/#{account.id}/captain/assistants/#{assistant.id}/scenarios",
+             params: valid_attributes
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an agent' do
+      it 'returns unauthorized status' do
+        post "/api/v1/accounts/#{account.id}/captain/assistants/#{assistant.id}/scenarios",
+             params: valid_attributes,
+             headers: agent.create_new_auth_token
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an admin' do
+      it 'creates a new scenario and returns success status' do
+        expect do
+          post "/api/v1/accounts/#{account.id}/captain/assistants/#{assistant.id}/scenarios",
+               params: valid_attributes,
+               headers: admin.create_new_auth_token,
+               as: :json
+        end.to change(Captain::Scenario, :count).by(1)
+
+        expect(response).to have_http_status(:success)
+        expect(json_response[:title]).to eq('Test Scenario')
+        expect(json_response[:description]).to eq('Test description')
+        expect(json_response[:enabled]).to be(true)
+        expect(json_response[:assistant_id]).to eq(assistant.id)
+      end
+
+      context 'with invalid parameters' do
+        let(:invalid_attributes) do
+          {
+            scenario: {
+              title: '',
+              description: '',
+              instruction: ''
+            }
+          }
+        end
+
+        it 'returns unprocessable entity status' do
+          post "/api/v1/accounts/#{account.id}/captain/assistants/#{assistant.id}/scenarios",
+               params: invalid_attributes,
+               headers: admin.create_new_auth_token,
+               as: :json
+
+          expect(response).to have_http_status(:unprocessable_entity)
+        end
+      end
+    end
+  end
+
+  describe 'PATCH /api/v1/accounts/{account.id}/captain/assistants/{assistant.id}/scenarios/{id}' do
+    let(:scenario) { create(:captain_scenario, assistant: assistant, account: account) }
+    let(:update_attributes) do
+      {
+        scenario: {
+          title: 'Updated Scenario Title',
+          enabled: false
+        }
+      }
+    end
+
+    context 'when it is an un-authenticated user' do
+      it 'returns unauthorized status' do
+        patch "/api/v1/accounts/#{account.id}/captain/assistants/#{assistant.id}/scenarios/#{scenario.id}",
+              params: update_attributes
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an agent' do
+      it 'returns unauthorized status' do
+        patch "/api/v1/accounts/#{account.id}/captain/assistants/#{assistant.id}/scenarios/#{scenario.id}",
+              params: update_attributes,
+              headers: agent.create_new_auth_token
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an admin' do
+      it 'updates the scenario and returns success status' do
+        patch "/api/v1/accounts/#{account.id}/captain/assistants/#{assistant.id}/scenarios/#{scenario.id}",
+              params: update_attributes,
+              headers: admin.create_new_auth_token,
+              as: :json
+
+        expect(response).to have_http_status(:success)
+        expect(json_response[:title]).to eq('Updated Scenario Title')
+        expect(json_response[:enabled]).to be(false)
+      end
+
+      context 'with invalid parameters' do
+        let(:invalid_attributes) do
+          {
+            scenario: {
+              title: ''
+            }
+          }
+        end
+
+        it 'returns unprocessable entity status' do
+          patch "/api/v1/accounts/#{account.id}/captain/assistants/#{assistant.id}/scenarios/#{scenario.id}",
+                params: invalid_attributes,
+                headers: admin.create_new_auth_token,
+                as: :json
+
+          expect(response).to have_http_status(:unprocessable_entity)
+        end
+      end
+    end
+  end
+
+  describe 'DELETE /api/v1/accounts/{account.id}/captain/assistants/{assistant.id}/scenarios/{id}' do
+    let!(:scenario) { create(:captain_scenario, assistant: assistant, account: account) }
+
+    context 'when it is an un-authenticated user' do
+      it 'returns unauthorized status' do
+        delete "/api/v1/accounts/#{account.id}/captain/assistants/#{assistant.id}/scenarios/#{scenario.id}"
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an agent' do
+      it 'returns unauthorized status' do
+        delete "/api/v1/accounts/#{account.id}/captain/assistants/#{assistant.id}/scenarios/#{scenario.id}",
+               headers: agent.create_new_auth_token
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an admin' do
+      it 'deletes the scenario and returns no content status' do
+        expect do
+          delete "/api/v1/accounts/#{account.id}/captain/assistants/#{assistant.id}/scenarios/#{scenario.id}",
+                 headers: admin.create_new_auth_token
+        end.to change(Captain::Scenario, :count).by(-1)
+
+        expect(response).to have_http_status(:no_content)
+      end
+
+      context 'when scenario does not exist' do
+        it 'returns not found status' do
+          delete "/api/v1/accounts/#{account.id}/captain/assistants/#{assistant.id}/scenarios/999999",
+                 headers: admin.create_new_auth_token
+
+          expect(response).to have_http_status(:not_found)
+        end
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/spec/enterprise/models/captain/scenario_spec.rb b/spec/enterprise/models/captain/scenario_spec.rb
new file mode 100644
index 000000000..f944373e2
--- /dev/null
+++ b/spec/enterprise/models/captain/scenario_spec.rb
@@ -0,0 +1,63 @@
+require 'rails_helper'
+
+RSpec.describe Captain::Scenario, type: :model do
+  describe 'associations' do
+    it { is_expected.to belong_to(:assistant).class_name('Captain::Assistant') }
+    it { is_expected.to belong_to(:account) }
+  end
+
+  describe 'validations' do
+    it { is_expected.to validate_presence_of(:title) }
+    it { is_expected.to validate_presence_of(:description) }
+    it { is_expected.to validate_presence_of(:instruction) }
+    it { is_expected.to validate_presence_of(:assistant_id) }
+    it { is_expected.to validate_presence_of(:account_id) }
+  end
+
+  describe 'scopes' do
+    let(:account) { create(:account) }
+    let(:assistant) { create(:captain_assistant, account: account) }
+
+    describe '.enabled' do
+      it 'returns only enabled scenarios' do
+        enabled_scenario = create(:captain_scenario, assistant: assistant, account: account, enabled: true)
+        disabled_scenario = create(:captain_scenario, assistant: assistant, account: account, enabled: false)
+
+        expect(described_class.enabled).to include(enabled_scenario)
+        expect(described_class.enabled).not_to include(disabled_scenario)
+      end
+    end
+  end
+
+  describe 'callbacks' do
+    let(:account) { create(:account) }
+    let(:assistant) { create(:captain_assistant, account: account) }
+
+    describe 'before_save :populate_tools' do
+      it 'calls populate_tools before saving' do
+        scenario = build(:captain_scenario, assistant: assistant, account: account)
+        expect(scenario).to receive(:populate_tools)
+        scenario.save
+      end
+    end
+  end
+
+  describe 'factory' do
+    it 'creates a valid scenario with associations' do
+      account = create(:account)
+      assistant = create(:captain_assistant, account: account)
+      scenario = build(:captain_scenario, assistant: assistant, account: account)
+      expect(scenario).to be_valid
+    end
+
+    it 'creates a scenario with all required attributes' do
+      scenario = create(:captain_scenario)
+      expect(scenario.title).to be_present
+      expect(scenario.description).to be_present
+      expect(scenario.instruction).to be_present
+      expect(scenario.enabled).to be true
+      expect(scenario.assistant).to be_present
+      expect(scenario.account).to be_present
+    end
+  end
+end
\ No newline at end of file
diff --git a/spec/factories/captain/scenario.rb b/spec/factories/captain/scenario.rb
new file mode 100644
index 000000000..fc9149bfa
--- /dev/null
+++ b/spec/factories/captain/scenario.rb
@@ -0,0 +1,11 @@
+FactoryBot.define do
+  factory :captain_scenario, class: 'Captain::Scenario' do
+    sequence(:title) { |n| "Scenario #{n}" }
+    description { 'Test scenario description' }
+    instruction { 'Test scenario instruction for the assistant to follow' }
+    tools { [] }
+    enabled { true }
+    association :assistant, factory: :captain_assistant
+    association :account
+  end
+end

From 113255651259d403cbaec0a2b3999d589a17f7f0 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Mon, 14 Jul 2025 17:12:28 +0530
Subject: [PATCH 12/20] feat: setup qlty [CW-4614] (#11918)

---
 .codeclimate.yml             | 62 --------------------------
 .qlty/.gitignore             |  7 +++
 .qlty/configs/.hadolint.yaml |  2 +
 .qlty/configs/.shellcheckrc  |  1 +
 .qlty/configs/.yamllint.yaml |  8 ++++
 .qlty/qlty.toml              | 84 ++++++++++++++++++++++++++++++++++++
 6 files changed, 102 insertions(+), 62 deletions(-)
 delete mode 100644 .codeclimate.yml
 create mode 100644 .qlty/.gitignore
 create mode 100644 .qlty/configs/.hadolint.yaml
 create mode 100644 .qlty/configs/.shellcheckrc
 create mode 100644 .qlty/configs/.yamllint.yaml
 create mode 100644 .qlty/qlty.toml

diff --git a/.codeclimate.yml b/.codeclimate.yml
deleted file mode 100644
index c68251f32..000000000
--- a/.codeclimate.yml
+++ /dev/null
@@ -1,62 +0,0 @@
-version: '2'
-plugins:
-  rubocop:
-    enabled: false
-    channel: rubocop-0-73
-  eslint:
-    enabled: false
-  csslint:
-    enabled: true
-  scss-lint:
-    enabled: true
-  brakeman:
-    enabled: false
-checks:
-  similar-code:
-    enabled: false
-  method-count:
-    enabled: true
-    config:
-      threshold: 32
-  file-lines:
-    enabled: true
-    config:
-      threshold: 300
-  method-lines:
-    config:
-      threshold: 50
-exclude_patterns:
-  - 'spec/'
-  - '**/specs/**/**'
-  - '**/spec/**/**'
-  - 'db/*'
-  - 'bin/**/*'
-  - 'db/**/*'
-  - 'config/**/*'
-  - 'public/**/*'
-  - 'vendor/**/*'
-  - 'node_modules/**/*'
-  - 'lib/tasks/auto_annotate_models.rake'
-  - 'app/test-matchers.js'
-  - 'docs/*'
-  - '**/*.md'
-  - '**/*.yml'
-  - 'app/javascript/dashboard/i18n/locale'
-  - '**/*.stories.js'
-  - 'stories/'
-  - 'app/javascript/dashboard/components/widgets/conversation/advancedFilterItems/index.js'
-  - 'app/javascript/shared/constants/countries.js'
-  - 'app/javascript/dashboard/components/widgets/conversation/advancedFilterItems/languages.js'
-  - 'app/javascript/dashboard/routes/dashboard/contacts/contactFilterItems/index.js'
-  - 'app/javascript/dashboard/routes/dashboard/settings/automation/constants.js'
-  - 'app/javascript/dashboard/components/widgets/FilterInput/FilterOperatorTypes.js'
-  - 'app/javascript/dashboard/routes/dashboard/settings/reports/constants.js'
-  - 'app/javascript/dashboard/store/captain/storeFactory.js'
-  - 'app/javascript/dashboard/i18n/index.js'
-  - 'app/javascript/widget/i18n/index.js'
-  - 'app/javascript/survey/i18n/index.js'
-  - 'app/javascript/shared/constants/locales.js'
-  - 'app/javascript/dashboard/helper/specs/macrosFixtures.js'
-  - 'app/javascript/dashboard/routes/dashboard/settings/macros/constants.js'
-  - '**/fixtures/**'
-  - '**/*/fixtures.js'
diff --git a/.qlty/.gitignore b/.qlty/.gitignore
new file mode 100644
index 000000000..30366188d
--- /dev/null
+++ b/.qlty/.gitignore
@@ -0,0 +1,7 @@
+*
+!configs
+!configs/**
+!hooks
+!hooks/**
+!qlty.toml
+!.gitignore
diff --git a/.qlty/configs/.hadolint.yaml b/.qlty/configs/.hadolint.yaml
new file mode 100644
index 000000000..8f7e23e45
--- /dev/null
+++ b/.qlty/configs/.hadolint.yaml
@@ -0,0 +1,2 @@
+ignored:
+  - DL3008
diff --git a/.qlty/configs/.shellcheckrc b/.qlty/configs/.shellcheckrc
new file mode 100644
index 000000000..6a38d9281
--- /dev/null
+++ b/.qlty/configs/.shellcheckrc
@@ -0,0 +1 @@
+source-path=SCRIPTDIR
\ No newline at end of file
diff --git a/.qlty/configs/.yamllint.yaml b/.qlty/configs/.yamllint.yaml
new file mode 100644
index 000000000..d22fa7799
--- /dev/null
+++ b/.qlty/configs/.yamllint.yaml
@@ -0,0 +1,8 @@
+rules:
+  document-start: disable
+  quoted-strings:
+    required: only-when-needed
+    extra-allowed: ["{|}"]
+  key-duplicates: {}
+  octal-values:
+    forbid-implicit-octal: true
diff --git a/.qlty/qlty.toml b/.qlty/qlty.toml
new file mode 100644
index 000000000..57981a5f7
--- /dev/null
+++ b/.qlty/qlty.toml
@@ -0,0 +1,84 @@
+# This file was automatically generated by `qlty init`.
+# You can modify it to suit your needs.
+# We recommend you to commit this file to your repository.
+#
+# This configuration is used by both Qlty CLI and Qlty Cloud.
+#
+#     Qlty CLI -- Code quality toolkit for developers
+#     Qlty Cloud -- Fully automated Code Health Platform
+#
+# Try Qlty Cloud: https://qlty.sh
+#
+# For a guide to configuration, visit https://qlty.sh/d/config
+# Or for a full reference, visit https://qlty.sh/d/qlty-toml
+config_version = "0"
+
+exclude_patterns = [
+  "*_min.*",
+  "*-min.*",
+  "*.min.*",
+  "**/.yarn/**",
+  "**/*.d.ts",
+  "**/assets/**",
+  "**/bower_components/**",
+  "**/build/**",
+  "**/cache/**",
+  "**/config/**",
+  "**/db/**",
+  "**/deps/**",
+  "**/dist/**",
+  "**/extern/**",
+  "**/external/**",
+  "**/generated/**",
+  "**/Godeps/**",
+  "**/gradlew/**",
+  "**/mvnw/**",
+  "**/node_modules/**",
+  "**/protos/**",
+  "**/seed/**",
+  "**/target/**",
+  "**/templates/**",
+  "**/testdata/**",
+  "**/vendor/**", "spec/", "**/specs/**/**", "**/spec/**/**", "db/*", "bin/**/*", "db/**/*", "config/**/*", "public/**/*", "vendor/**/*", "node_modules/**/*", "lib/tasks/auto_annotate_models.rake", "app/test-matchers.js", "docs/*", "**/*.md", "**/*.yml", "app/javascript/dashboard/i18n/locale", "**/*.stories.js", "stories/", "app/javascript/dashboard/components/widgets/conversation/advancedFilterItems/index.js", "app/javascript/shared/constants/countries.js", "app/javascript/dashboard/components/widgets/conversation/advancedFilterItems/languages.js", "app/javascript/dashboard/routes/dashboard/contacts/contactFilterItems/index.js", "app/javascript/dashboard/routes/dashboard/settings/automation/constants.js", "app/javascript/dashboard/components/widgets/FilterInput/FilterOperatorTypes.js", "app/javascript/dashboard/routes/dashboard/settings/reports/constants.js", "app/javascript/dashboard/store/captain/storeFactory.js", "app/javascript/dashboard/i18n/index.js", "app/javascript/widget/i18n/index.js", "app/javascript/survey/i18n/index.js", "app/javascript/shared/constants/locales.js", "app/javascript/dashboard/helper/specs/macrosFixtures.js", "app/javascript/dashboard/routes/dashboard/settings/macros/constants.js", "**/fixtures/**", "**/*/fixtures.js",
+]
+
+test_patterns = [
+  "**/test/**",
+  "**/spec/**",
+  "**/*.test.*",
+  "**/*.spec.*",
+  "**/*_test.*",
+  "**/*_spec.*",
+  "**/test_*.*",
+  "**/spec_*.*",
+]
+
+[smells]
+mode = "comment"
+
+[smells.boolean_logic]
+threshold = 4
+
+[smells.file_complexity]
+threshold = 66
+enabled = true
+
+[smells.return_statements]
+threshold = 4
+
+[smells.nested_control_flow]
+threshold = 4
+
+[smells.function_parameters]
+threshold = 4
+
+[smells.function_complexity]
+threshold = 5
+
+[smells.duplication]
+enabled = true
+threshold = 20
+
+[[source]]
+name = "default"
+default = true

From 4378506a359dc657702453466970e130c6462afe Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 15 Jul 2025 08:56:03 +0530
Subject: [PATCH 13/20] feat: add response guidelines and guardrails field
 (#11911)

Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
---
 ...es_and_guardrails_to_captain_assistants.rb |  6 +++
 db/schema.rb                                  |  4 +-
 .../accounts/captain/assistants_controller.rb | 18 +++++---
 enterprise/app/models/captain/assistant.rb    | 16 +++----
 .../models/captain/_assistant.json.jbuilder   |  2 +
 .../captain/assistants_controller_spec.rb     | 42 ++++++++++++++++++-
 6 files changed, 72 insertions(+), 16 deletions(-)
 create mode 100644 db/migrate/20250714104358_add_response_guidelines_and_guardrails_to_captain_assistants.rb

diff --git a/db/migrate/20250714104358_add_response_guidelines_and_guardrails_to_captain_assistants.rb b/db/migrate/20250714104358_add_response_guidelines_and_guardrails_to_captain_assistants.rb
new file mode 100644
index 000000000..3c048b8f7
--- /dev/null
+++ b/db/migrate/20250714104358_add_response_guidelines_and_guardrails_to_captain_assistants.rb
@@ -0,0 +1,6 @@
+class AddResponseGuidelinesAndGuardrailsToCaptainAssistants < ActiveRecord::Migration[7.1]
+  def change
+    add_column :captain_assistants, :response_guidelines, :jsonb, default: []
+    add_column :captain_assistants, :guardrails, :jsonb, default: []
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 837eb58bd..1806ab23f 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_07_10_145708) do
+ActiveRecord::Schema[7.1].define(version: 2025_07_14_104358) do
   # These extensions should be enabled to support this database
   enable_extension "pg_stat_statements"
   enable_extension "pg_trgm"
@@ -277,6 +277,8 @@ ActiveRecord::Schema[7.1].define(version: 2025_07_10_145708) do
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.jsonb "config", default: {}, null: false
+    t.jsonb "response_guidelines", default: []
+    t.jsonb "guardrails", default: []
     t.index ["account_id"], name: "index_captain_assistants_on_account_id"
   end
 
diff --git a/enterprise/app/controllers/api/v1/accounts/captain/assistants_controller.rb b/enterprise/app/controllers/api/v1/accounts/captain/assistants_controller.rb
index ec8e8e653..37890fade 100644
--- a/enterprise/app/controllers/api/v1/accounts/captain/assistants_controller.rb
+++ b/enterprise/app/controllers/api/v1/accounts/captain/assistants_controller.rb
@@ -43,12 +43,18 @@ class Api::V1::Accounts::Captain::AssistantsController < Api::V1::Accounts::Base
   end
 
   def assistant_params
-    params.require(:assistant).permit(:name, :description,
-                                      config: [
-                                        :product_name, :feature_faq, :feature_memory,
-                                        :welcome_message, :handoff_message, :resolution_message,
-                                        :instructions, :temperature
-                                      ])
+    permitted = params.require(:assistant).permit(:name, :description,
+                                                  config: [
+                                                    :product_name, :feature_faq, :feature_memory,
+                                                    :welcome_message, :handoff_message, :resolution_message,
+                                                    :instructions, :temperature
+                                                  ])
+
+    # Handle array parameters separately to allow partial updates
+    permitted[:response_guidelines] = params[:assistant][:response_guidelines] if params[:assistant][:response_guidelines].present?
+    permitted[:guardrails] = params[:assistant][:guardrails] if params[:assistant][:guardrails].present?
+
+    permitted
   end
 
   def playground_params
diff --git a/enterprise/app/models/captain/assistant.rb b/enterprise/app/models/captain/assistant.rb
index 8f1227231..4ce4c4afd 100644
--- a/enterprise/app/models/captain/assistant.rb
+++ b/enterprise/app/models/captain/assistant.rb
@@ -2,13 +2,15 @@
 #
 # Table name: captain_assistants
 #
-#  id          :bigint           not null, primary key
-#  config      :jsonb            not null
-#  description :string
-#  name        :string           not null
-#  created_at  :datetime         not null
-#  updated_at  :datetime         not null
-#  account_id  :bigint           not null
+#  id                  :bigint           not null, primary key
+#  config              :jsonb            not null
+#  description         :string
+#  guardrails          :jsonb
+#  name                :string           not null
+#  response_guidelines :jsonb
+#  created_at          :datetime         not null
+#  updated_at          :datetime         not null
+#  account_id          :bigint           not null
 #
 # Indexes
 #
diff --git a/enterprise/app/views/api/v1/models/captain/_assistant.json.jbuilder b/enterprise/app/views/api/v1/models/captain/_assistant.json.jbuilder
index 80008423c..d597ed220 100644
--- a/enterprise/app/views/api/v1/models/captain/_assistant.json.jbuilder
+++ b/enterprise/app/views/api/v1/models/captain/_assistant.json.jbuilder
@@ -2,6 +2,8 @@ json.account_id resource.account_id
 json.config resource.config
 json.created_at resource.created_at.to_i
 json.description resource.description
+json.guardrails resource.guardrails
 json.id resource.id
 json.name resource.name
+json.response_guidelines resource.response_guidelines
 json.updated_at resource.updated_at.to_i
diff --git a/spec/enterprise/controllers/api/v1/accounts/captain/assistants_controller_spec.rb b/spec/enterprise/controllers/api/v1/accounts/captain/assistants_controller_spec.rb
index 80be6f30f..b6418c8ec 100644
--- a/spec/enterprise/controllers/api/v1/accounts/captain/assistants_controller_spec.rb
+++ b/spec/enterprise/controllers/api/v1/accounts/captain/assistants_controller_spec.rb
@@ -62,7 +62,9 @@ RSpec.describe 'Api::V1::Accounts::Captain::Assistants', type: :request do
       {
         assistant: {
           name: 'New Assistant',
-          description: 'Assistant Description'
+          description: 'Assistant Description',
+          response_guidelines: ['Be helpful', 'Be concise'],
+          guardrails: ['No harmful content', 'Stay on topic']
         }
       }
     end
@@ -96,6 +98,8 @@ RSpec.describe 'Api::V1::Accounts::Captain::Assistants', type: :request do
         end.to change(Captain::Assistant, :count).by(1)
 
         expect(json_response[:name]).to eq('New Assistant')
+        expect(json_response[:response_guidelines]).to eq(['Be helpful', 'Be concise'])
+        expect(json_response[:guardrails]).to eq(['No harmful content', 'Stay on topic'])
         expect(response).to have_http_status(:success)
       end
     end
@@ -106,7 +110,9 @@ RSpec.describe 'Api::V1::Accounts::Captain::Assistants', type: :request do
     let(:update_attributes) do
       {
         assistant: {
-          name: 'Updated Assistant'
+          name: 'Updated Assistant',
+          response_guidelines: ['Updated guideline'],
+          guardrails: ['Updated guardrail']
         }
       }
     end
@@ -139,6 +145,38 @@ RSpec.describe 'Api::V1::Accounts::Captain::Assistants', type: :request do
 
         expect(response).to have_http_status(:success)
         expect(json_response[:name]).to eq('Updated Assistant')
+        expect(json_response[:response_guidelines]).to eq(['Updated guideline'])
+        expect(json_response[:guardrails]).to eq(['Updated guardrail'])
+      end
+
+      it 'updates only response_guidelines when only that is provided' do
+        assistant.update!(response_guidelines: ['Original guideline'], guardrails: ['Original guardrail'])
+        original_name = assistant.name
+
+        patch "/api/v1/accounts/#{account.id}/captain/assistants/#{assistant.id}",
+              params: { assistant: { response_guidelines: ['New guideline only'] } },
+              headers: admin.create_new_auth_token,
+              as: :json
+
+        expect(response).to have_http_status(:success)
+        expect(json_response[:name]).to eq(original_name)
+        expect(json_response[:response_guidelines]).to eq(['New guideline only'])
+        expect(json_response[:guardrails]).to eq(['Original guardrail'])
+      end
+
+      it 'updates only guardrails when only that is provided' do
+        assistant.update!(response_guidelines: ['Original guideline'], guardrails: ['Original guardrail'])
+        original_name = assistant.name
+
+        patch "/api/v1/accounts/#{account.id}/captain/assistants/#{assistant.id}",
+              params: { assistant: { guardrails: ['New guardrail only'] } },
+              headers: admin.create_new_auth_token,
+              as: :json
+
+        expect(response).to have_http_status(:success)
+        expect(json_response[:name]).to eq(original_name)
+        expect(json_response[:response_guidelines]).to eq(['Original guideline'])
+        expect(json_response[:guardrails]).to eq(['New guardrail only'])
       end
     end
   end

From 61d10044a04f84252e038c1f5a1cce287063435e Mon Sep 17 00:00:00 2001
From: Tanmay Deep Sharma <32020192+tds-1@users.noreply.github.com>
Date: Tue, 15 Jul 2025 11:37:06 +0700
Subject: [PATCH 14/20] feat: Whatsapp embedded signup (#11612)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Description

This PR introduces WhatsApp Embedded Signup functionality, enabling
users to connect their WhatsApp Business accounts through Meta's
streamlined OAuth flow without manual webhook configuration. This
significantly improves the user experience by automating the entire
setup process.

**Key Features:**

- Embedded signup flow using Facebook SDK and Meta's OAuth 2.0
- Automatic webhook registration and phone number configuration
- Enhanced provider selection UI with card-based design
- Real-time progress tracking during signup process
- Comprehensive error handling and user feedback


## Required Configuration

The following environment variables must be configured by administrators
before this feature can be used:
Super Admin Configuration (via
super_admin/app_config?config=whatsapp_embedded)

- `WHATSAPP_APP_ID`: The Facebook App ID for WhatsApp Business API
integration
- `WHATSAPP_CONFIGURATION_ID`: The Configuration ID for WhatsApp
Embedded Signup flow (obtained from Meta Developer Portal)
- `WHATSAPP_APP_SECRET`: The App Secret for WhatsApp Embedded Signup
flow (required for token exchange)
![Screenshot 2025-06-09 at 11 21
08 AM](https://github.com/user-attachments/assets/1615fb0d-27fc-4d9e-b193-9be7894ea93a)


## How Has This Been Tested?

#### Backend Tests (RSpec):

- Authentication validation for embedded signup endpoints
- Authorization code validation and error handling
- Missing business parameter validation
- Proper response format for configuration endpoint
- Unauthorized access prevention

#### Manual Test Cases:

- Complete embedded signup flow (happy path)
- Provider selection UI navigation
- Facebook authentication popup handling
- Error scenarios (cancelled auth, invalid business data, API failures)
- Configuration presence/absence behavior

## Related Screenshots:

![Screenshot 2025-06-09 at 7 48
18 PM](https://github.com/user-attachments/assets/34001425-df11-4d78-9424-334461e3178f)
![Screenshot 2025-06-09 at 7 48
22 PM](https://github.com/user-attachments/assets/c09f4964-3aba-4c39-9285-d1e8e37d0e33)
![Screenshot 2025-06-09 at 7 48
32 PM](https://github.com/user-attachments/assets/a34d5382-7a91-4e1c-906e-dc2d570c864a)
![Screenshot 2025-06-09 at 10 43
05 AM](https://github.com/user-attachments/assets/a15840d8-8223-4513-82e4-b08f23c95927)
![Screenshot 2025-06-09 at 10 42
56 AM](https://github.com/user-attachments/assets/8c345022-38b5-44c4-aba2-0cda81389c69)


Fixes
https://linear.app/chatwoot/issue/CW-2131/spec-for-whatsapp-cloud-channels-sign-in-with-facebook

---------

Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Co-authored-by: iamsivin <iamsivin@gmail.com>
Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Co-authored-by: Sojan Jose <sojan@pepalo.com>
---
 .rubocop.yml                                  |   2 +-
 .../integrations/notion_controller.rb         |   2 +-
 .../notion/authorizations_controller.rb       |   2 +-
 .../whatsapp/authorizations_controller.rb     |  64 ++++
 app/controllers/dashboard_controller.rb       |   2 +
 .../notion/callbacks_controller.rb            |   2 +-
 .../super_admin/app_configs_controller.rb     |   5 +-
 .../dashboard/api/channel/whatsappChannel.js  |  14 +
 app/javascript/dashboard/featureFlags.js      |   1 +
 .../dashboard/i18n/locale/en/inboxMgmt.json   |  29 ++
 .../dashboard/settings/inbox/FinishSetup.vue  |  16 +-
 .../dashboard/settings/inbox/Settings.vue     |  14 +-
 .../settings/inbox/channels/Whatsapp.vue      | 172 +++++++--
 .../inbox/channels/WhatsappEmbeddedSignup.vue | 327 ++++++++++++++++++
 .../dashboard/store/modules/inboxes.js        |  14 +
 app/models/channel/whatsapp.rb                |  38 ++
 app/presenters/message_content_presenter.rb   |   2 +-
 .../whatsapp/channel_creation_service.rb      |  75 ++++
 .../whatsapp/embedded_signup_service.rb       |  44 +++
 app/services/whatsapp/facebook_api_client.rb  |  86 +++++
 app/services/whatsapp/phone_info_service.rb   |  57 +++
 .../whatsapp/token_exchange_service.rb        |  26 ++
 .../whatsapp/token_validation_service.rb      |  42 +++
 .../whatsapp/webhook_setup_service.rb         |  67 ++++
 .../v1/accounts/search/articles.json.jbuilder |   2 +-
 .../callbacks/embedded_signup.json.jbuilder   |   1 +
 app/views/layouts/vueapp.html.erb             |   3 +
 config/features.yml                           |   3 +
 config/installation_config.yml                |  20 ++
 config/routes.rb                              |   4 +
 .../20250620120000_create_channel_voice.rb    |   2 +-
 .../accounts/captain/scenarios_controller.rb  |   2 +-
 .../app/helpers/super_admin/features.yml      |   6 +
 enterprise/app/models/channel/voice.rb        |   1 -
 .../app/policies/captain/scenario_policy.rb   |   2 +-
 .../open_ai_message_builder_service.rb        |   2 +-
 .../captain/scenarios/create.json.jbuilder    |   2 +-
 .../captain/scenarios/index.json.jbuilder     |   2 +-
 .../captain/scenarios/show.json.jbuilder      |   2 +-
 .../captain/scenarios/update.json.jbuilder    |   2 +-
 .../v1/models/captain/_scenario.json.jbuilder |   2 +-
 .../images/dashboard/channels/whatsapp.png    | Bin 46629 -> 13525 bytes
 .../notion/authorization_controller_spec.rb   |   2 +-
 .../authorizations_controller_spec.rb         | 303 ++++++++++++++++
 .../captain/scenarios_controller_spec.rb      |   2 +-
 .../models/captain/scenario_spec.rb           |   2 +-
 spec/models/channel/whatsapp_spec.rb          |  61 ++++
 spec/models/concerns/featurable_spec.rb       |  57 +++
 .../message_content_presenter_spec.rb         |   2 +-
 spec/services/csat_survey_service_spec.rb     |   2 +-
 .../linear/activity_message_service_spec.rb   |   2 +-
 .../whatsapp/channel_creation_service_spec.rb | 119 +++++++
 .../whatsapp/embedded_signup_service_spec.rb  | 127 +++++++
 .../whatsapp/facebook_api_client_spec.rb      | 197 +++++++++++
 .../whatsapp/phone_info_service_spec.rb       | 147 ++++++++
 .../whatsapp/token_exchange_service_spec.rb   |  45 +++
 .../whatsapp/token_validation_service_spec.rb |  99 ++++++
 .../whatsapp/webhook_setup_service_spec.rb    | 119 +++++++
 58 files changed, 2384 insertions(+), 63 deletions(-)
 create mode 100644 app/controllers/api/v1/accounts/whatsapp/authorizations_controller.rb
 create mode 100644 app/javascript/dashboard/api/channel/whatsappChannel.js
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/inbox/channels/WhatsappEmbeddedSignup.vue
 create mode 100644 app/services/whatsapp/channel_creation_service.rb
 create mode 100644 app/services/whatsapp/embedded_signup_service.rb
 create mode 100644 app/services/whatsapp/facebook_api_client.rb
 create mode 100644 app/services/whatsapp/phone_info_service.rb
 create mode 100644 app/services/whatsapp/token_exchange_service.rb
 create mode 100644 app/services/whatsapp/token_validation_service.rb
 create mode 100644 app/services/whatsapp/webhook_setup_service.rb
 create mode 100644 app/views/api/v1/accounts/whatsapp/callbacks/embedded_signup.json.jbuilder
 create mode 100644 spec/controllers/api/v1/accounts/whatsapp/authorizations_controller_spec.rb
 create mode 100644 spec/models/concerns/featurable_spec.rb
 create mode 100644 spec/services/whatsapp/channel_creation_service_spec.rb
 create mode 100644 spec/services/whatsapp/embedded_signup_service_spec.rb
 create mode 100644 spec/services/whatsapp/facebook_api_client_spec.rb
 create mode 100644 spec/services/whatsapp/phone_info_service_spec.rb
 create mode 100644 spec/services/whatsapp/token_exchange_service_spec.rb
 create mode 100644 spec/services/whatsapp/token_validation_service_spec.rb
 create mode 100644 spec/services/whatsapp/webhook_setup_service_spec.rb

diff --git a/.rubocop.yml b/.rubocop.yml
index 12e756af6..e30a71ee9 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -283,7 +283,7 @@ Rails/RedundantActiveRecordAllMethod:
   Enabled: false
 
 Layout/TrailingEmptyLines:
-  Enabled: false
+  Enabled: true
 
 Style/SafeNavigationChainLength:
   Enabled: false
diff --git a/app/controllers/api/v1/accounts/integrations/notion_controller.rb b/app/controllers/api/v1/accounts/integrations/notion_controller.rb
index dff6ccece..ecf6bae6e 100644
--- a/app/controllers/api/v1/accounts/integrations/notion_controller.rb
+++ b/app/controllers/api/v1/accounts/integrations/notion_controller.rb
@@ -11,4 +11,4 @@ class Api::V1::Accounts::Integrations::NotionController < Api::V1::Accounts::Bas
   def fetch_hook
     @hook = Integrations::Hook.where(account: Current.account).find_by(app_id: 'notion')
   end
-end
\ No newline at end of file
+end
diff --git a/app/controllers/api/v1/accounts/notion/authorizations_controller.rb b/app/controllers/api/v1/accounts/notion/authorizations_controller.rb
index bb9b2f858..3e0f6586a 100644
--- a/app/controllers/api/v1/accounts/notion/authorizations_controller.rb
+++ b/app/controllers/api/v1/accounts/notion/authorizations_controller.rb
@@ -18,4 +18,4 @@ class Api::V1::Accounts::Notion::AuthorizationsController < Api::V1::Accounts::O
       render json: { success: false }, status: :unprocessable_entity
     end
   end
-end
\ No newline at end of file
+end
diff --git a/app/controllers/api/v1/accounts/whatsapp/authorizations_controller.rb b/app/controllers/api/v1/accounts/whatsapp/authorizations_controller.rb
new file mode 100644
index 000000000..e7a1f3fa6
--- /dev/null
+++ b/app/controllers/api/v1/accounts/whatsapp/authorizations_controller.rb
@@ -0,0 +1,64 @@
+class Api::V1::Accounts::Whatsapp::AuthorizationsController < Api::V1::Accounts::BaseController
+  before_action :validate_feature_enabled!
+
+  # POST /api/v1/accounts/:account_id/whatsapp/authorization
+  # Handles the embedded signup callback data from the Facebook SDK
+  def create
+    validate_embedded_signup_params!
+    channel = process_embedded_signup
+    render_success_response(channel.inbox)
+  rescue StandardError => e
+    render_error_response(e)
+  end
+
+  private
+
+  def process_embedded_signup
+    service = Whatsapp::EmbeddedSignupService.new(
+      account: Current.account,
+      code: params[:code],
+      business_id: params[:business_id],
+      waba_id: params[:waba_id],
+      phone_number_id: params[:phone_number_id]
+    )
+    service.perform
+  end
+
+  def render_success_response(inbox)
+    render json: {
+      success: true,
+      id: inbox.id,
+      name: inbox.name,
+      channel_type: 'whatsapp'
+    }
+  end
+
+  def render_error_response(error)
+    Rails.logger.error "[WHATSAPP AUTHORIZATION] Embedded signup error: #{error.message}"
+    Rails.logger.error error.backtrace.join("\n")
+    render json: {
+      success: false,
+      error: error.message
+    }, status: :unprocessable_entity
+  end
+
+  def validate_feature_enabled!
+    return if Current.account.feature_whatsapp_embedded_signup?
+
+    render json: {
+      success: false,
+      error: 'WhatsApp embedded signup is not enabled for this account'
+    }, status: :forbidden
+  end
+
+  def validate_embedded_signup_params!
+    missing_params = []
+    missing_params << 'code' if params[:code].blank?
+    missing_params << 'business_id' if params[:business_id].blank?
+    missing_params << 'waba_id' if params[:waba_id].blank?
+
+    return if missing_params.empty?
+
+    raise ArgumentError, "Required parameters are missing: #{missing_params.join(', ')}"
+  end
+end
diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb
index 6a4ce2461..4a2df5ee5 100644
--- a/app/controllers/dashboard_controller.rb
+++ b/app/controllers/dashboard_controller.rb
@@ -67,6 +67,8 @@ class DashboardController < ActionController::Base
       FB_APP_ID: GlobalConfigService.load('FB_APP_ID', ''),
       INSTAGRAM_APP_ID: GlobalConfigService.load('INSTAGRAM_APP_ID', ''),
       FACEBOOK_API_VERSION: GlobalConfigService.load('FACEBOOK_API_VERSION', 'v17.0'),
+      WHATSAPP_APP_ID: GlobalConfigService.load('WHATSAPP_APP_ID', ''),
+      WHATSAPP_CONFIGURATION_ID: GlobalConfigService.load('WHATSAPP_CONFIGURATION_ID', ''),
       IS_ENTERPRISE: ChatwootApp.enterprise?,
       AZURE_APP_ID: GlobalConfigService.load('AZURE_APP_ID', ''),
       GIT_SHA: GIT_HASH
diff --git a/app/controllers/notion/callbacks_controller.rb b/app/controllers/notion/callbacks_controller.rb
index 94030fc8e..22dcf6d30 100644
--- a/app/controllers/notion/callbacks_controller.rb
+++ b/app/controllers/notion/callbacks_controller.rb
@@ -33,4 +33,4 @@ class Notion::CallbacksController < OauthCallbackController
   def notion_redirect_uri
     "#{ENV.fetch('FRONTEND_URL', nil)}/app/accounts/#{account.id}/settings/integrations/notion"
   end
-end
\ No newline at end of file
+end
diff --git a/app/controllers/super_admin/app_configs_controller.rb b/app/controllers/super_admin/app_configs_controller.rb
index 771f9f28c..3972d5a28 100644
--- a/app/controllers/super_admin/app_configs_controller.rb
+++ b/app/controllers/super_admin/app_configs_controller.rb
@@ -39,8 +39,9 @@ class SuperAdmin::AppConfigsController < SuperAdmin::ApplicationController
       'email' => ['MAILER_INBOUND_EMAIL_DOMAIN'],
       'linear' => %w[LINEAR_CLIENT_ID LINEAR_CLIENT_SECRET],
       'slack' => %w[SLACK_CLIENT_ID SLACK_CLIENT_SECRET],
-      'notion' => %w[NOTION_CLIENT_ID NOTION_CLIENT_SECRET],
-      'instagram' => %w[INSTAGRAM_APP_ID INSTAGRAM_APP_SECRET INSTAGRAM_VERIFY_TOKEN INSTAGRAM_API_VERSION ENABLE_INSTAGRAM_CHANNEL_HUMAN_AGENT]
+      'instagram' => %w[INSTAGRAM_APP_ID INSTAGRAM_APP_SECRET INSTAGRAM_VERIFY_TOKEN INSTAGRAM_API_VERSION ENABLE_INSTAGRAM_CHANNEL_HUMAN_AGENT],
+      'whatsapp_embedded' => %w[WHATSAPP_APP_ID WHATSAPP_APP_SECRET WHATSAPP_CONFIGURATION_ID WHATSAPP_API_VERSION],
+      'notion' => %w[NOTION_CLIENT_ID NOTION_CLIENT_SECRET]
     }
 
     @allowed_configs = mapping.fetch(@config, %w[ENABLE_ACCOUNT_SIGNUP FIREBASE_PROJECT_ID FIREBASE_CREDENTIALS])
diff --git a/app/javascript/dashboard/api/channel/whatsappChannel.js b/app/javascript/dashboard/api/channel/whatsappChannel.js
new file mode 100644
index 000000000..e1003b123
--- /dev/null
+++ b/app/javascript/dashboard/api/channel/whatsappChannel.js
@@ -0,0 +1,14 @@
+/* global axios */
+import ApiClient from '../ApiClient';
+
+class WhatsappChannel extends ApiClient {
+  constructor() {
+    super('whatsapp', { accountScoped: true });
+  }
+
+  createEmbeddedSignup(params) {
+    return axios.post(`${this.baseUrl()}/whatsapp/authorization`, params);
+  }
+}
+
+export default new WhatsappChannel();
diff --git a/app/javascript/dashboard/featureFlags.js b/app/javascript/dashboard/featureFlags.js
index 98234539b..78109e82c 100644
--- a/app/javascript/dashboard/featureFlags.js
+++ b/app/javascript/dashboard/featureFlags.js
@@ -36,6 +36,7 @@ export const FEATURE_FLAGS = {
   REPORT_V4: 'report_v4',
   CHANNEL_INSTAGRAM: 'channel_instagram',
   CONTACT_CHATWOOT_SUPPORT_TEAM: 'contact_chatwoot_support_team',
+  WHATSAPP_EMBEDDED_SIGNUP: 'whatsapp_embedded_signup',
   CAPTAIN_V2: 'captain_integration_v2',
 };
 
diff --git a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
index be7a6f2f9..eb999a0e5 100644
--- a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
@@ -222,10 +222,17 @@
         "DESC": "Start supporting your customers via WhatsApp.",
         "PROVIDERS": {
           "LABEL": "API Provider",
+          "WHATSAPP_EMBEDDED": "WhatsApp Business",
           "TWILIO": "Twilio",
           "WHATSAPP_CLOUD": "WhatsApp Cloud",
+          "WHATSAPP_CLOUD_DESC": "Quick setup through Meta",
+          "TWILIO_DESC": "Connect via Twilio credentials",
           "360_DIALOG": "360Dialog"
         },
+        "SELECT_PROVIDER": {
+          "TITLE": "Select your API provider",
+          "DESCRIPTION": "Choose your WhatsApp provider. You can connect directly through Meta which requires no setup, or connect through Twilio using your account credentials."
+        },
         "INBOX_NAME": {
           "LABEL": "Inbox Name",
           "PLACEHOLDER": "Please enter an inbox name",
@@ -264,6 +271,28 @@
           "WEBHOOK_VERIFICATION_TOKEN": "Webhook Verification Token"
         },
         "SUBMIT_BUTTON": "Create WhatsApp Channel",
+        "EMBEDDED_SIGNUP": {
+          "TITLE": "Quick Setup with Meta",
+          "DESC": "You will be redirected to Meta to log into your WhatsApp Business account. Having admin access will help make the setup smooth and easy.",
+          "BENEFITS": {
+            "TITLE": "Benefits of Embedded Signup:",
+            "EASY_SETUP": "No manual configuration required",
+            "SECURE_AUTH": "Secure OAuth based authentication",
+            "AUTO_CONFIG": "Automatic webhook and phone number configuration"
+          },
+          "SUBMIT_BUTTON": "Connect with WhatsApp Business",
+          "AUTH_PROCESSING": "Authenticating with Meta",
+          "WAITING_FOR_BUSINESS_INFO": "Please complete business setup in the Meta window...",
+          "PROCESSING": "Setting up your WhatsApp Business Account",
+          "LOADING_SDK": "Loading Facebook SDK...",
+          "CANCELLED": "WhatsApp Signup was cancelled",
+          "SUCCESS_TITLE": "WhatsApp Business Account Connected!",
+          "WAITING_FOR_AUTH": "Waiting for authentication...",
+          "INVALID_BUSINESS_DATA": "Invalid business data received from Facebook. Please try again.",
+          "SIGNUP_ERROR": "Signup error occurred",
+          "AUTH_NOT_COMPLETED": "Authentication not completed. Please restart the process.",
+          "SUCCESS_FALLBACK": "WhatsApp Business Account has been successfully configured"
+        },
         "API": {
           "ERROR_MESSAGE": "We were not able to save the WhatsApp channel"
         }
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/FinishSetup.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/FinishSetup.vue
index f6d0707af..ac09448f6 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/FinishSetup.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/FinishSetup.vue
@@ -47,6 +47,13 @@ export default {
         this.currentInbox.provider === 'whatsapp_cloud'
       );
     },
+    // If the inbox is a whatsapp cloud inbox and the source is not embedded signup, then show the webhook details
+    shouldShowWhatsAppWebhookDetails() {
+      return (
+        this.isWhatsAppCloudInbox &&
+        this.currentInbox.provider_config?.source !== 'embedded_signup'
+      );
+    },
     message() {
       if (this.isATwilioInbox) {
         return `${this.$t('INBOX_MGMT.FINISH.MESSAGE')}. ${this.$t(
@@ -66,7 +73,7 @@ export default {
         )}`;
       }
 
-      if (this.isWhatsAppCloudInbox) {
+      if (this.isWhatsAppCloudInbox && this.shouldShowWhatsAppWebhookDetails) {
         return `${this.$t('INBOX_MGMT.FINISH.MESSAGE')}. ${this.$t(
           'INBOX_MGMT.ADD.WHATSAPP.API_CALLBACK.SUBTITLE'
         )}`;
@@ -113,8 +120,11 @@ export default {
             :script="currentInbox.callback_webhook_url"
           />
         </div>
-        <div v-if="isWhatsAppCloudInbox" class="w-[50%] max-w-[50%] ml-[25%]">
-          <p class="mt-8 font-medium text-n-slate-11">
+        <div
+          v-if="shouldShowWhatsAppWebhookDetails"
+          class="w-[50%] max-w-[50%] ml-[25%]"
+        >
+          <p class="mt-8 font-medium text-slate-700 dark:text-slate-200">
             {{ $t('INBOX_MGMT.ADD.WHATSAPP.API_CALLBACK.WEBHOOK_URL') }}
           </p>
           <woot-code lang="html" :script="currentInbox.callback_webhook_url" />
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
index a3f60c6d5..420d7b7b9 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
@@ -86,6 +86,12 @@ export default {
     selectedTabKey() {
       return this.tabs[this.selectedTabIndex]?.key;
     },
+    shouldShowWhatsAppConfiguration() {
+      return !!(
+        this.isAWhatsAppCloudChannel &&
+        this.inbox.provider_config?.source !== 'embedded_signup'
+      );
+    },
     whatsAppAPIProviderName() {
       if (this.isAWhatsAppCloudChannel) {
         return this.$t('INBOX_MGMT.ADD.WHATSAPP.PROVIDERS.WHATSAPP_CLOUD');
@@ -137,7 +143,7 @@ export default {
         this.isALineChannel ||
         this.isAPIInbox ||
         (this.isAnEmailChannel && !this.inbox.provider) ||
-        this.isAWhatsAppChannel ||
+        this.shouldShowWhatsAppConfiguration ||
         this.isAWebWidgetInbox
       ) {
         visibleToAllChannelTabs = [
@@ -383,7 +389,7 @@ export default {
 
 <template>
   <div
-    class="flex-grow flex-shrink w-full min-w-0 pl-0 pr-0 overflow-auto settings"
+    class="overflow-auto flex-grow flex-shrink pr-0 pl-0 w-full min-w-0 settings"
   >
     <SettingIntroBanner
       :header-image="inbox.avatarUrl"
@@ -405,7 +411,7 @@ export default {
         />
       </woot-tabs>
     </SettingIntroBanner>
-    <section class="w-full max-w-6xl mx-auto">
+    <section class="mx-auto w-full max-w-6xl">
       <MicrosoftReauthorize v-if="microsoftUnauthorized" :inbox="inbox" />
       <FacebookReauthorize v-if="facebookUnauthorized" :inbox="inbox" />
       <GoogleReauthorize v-if="googleUnauthorized" :inbox="inbox" />
@@ -735,7 +741,7 @@ export default {
               :business-name="businessName"
               @update="toggleSenderNameType"
             />
-            <div class="flex flex-col items-start gap-2 mt-2">
+            <div class="flex flex-col gap-2 items-start mt-2">
               <NextButton
                 ghost
                 blue
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Whatsapp.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Whatsapp.vue
index 68a9d8bcd..318882b08 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Whatsapp.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Whatsapp.vue
@@ -1,48 +1,156 @@
-<script>
-import PageHeader from '../../SettingsSubPageHeader.vue';
+<script setup>
+import { computed } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import { useStore } from 'vuex';
 import Twilio from './Twilio.vue';
 import ThreeSixtyDialogWhatsapp from './360DialogWhatsapp.vue';
 import CloudWhatsapp from './CloudWhatsapp.vue';
+import WhatsappEmbeddedSignup from './WhatsappEmbeddedSignup.vue';
+import { FEATURE_FLAGS } from 'dashboard/featureFlags';
 
-export default {
-  components: {
-    PageHeader,
-    Twilio,
-    ThreeSixtyDialogWhatsapp,
-    CloudWhatsapp,
+const route = useRoute();
+const router = useRouter();
+const { t } = useI18n();
+const store = useStore();
+
+const PROVIDER_TYPES = {
+  WHATSAPP: 'whatsapp',
+  TWILIO: 'twilio',
+  WHATSAPP_CLOUD: 'whatsapp_cloud',
+  WHATSAPP_EMBEDDED: 'whatsapp_embedded',
+  THREE_SIXTY_DIALOG: '360dialog',
+};
+
+const hasWhatsappAppId = computed(() => {
+  return (
+    window.chatwootConfig?.whatsappAppId &&
+    window.chatwootConfig.whatsappAppId !== 'none'
+  );
+});
+
+const isWhatsappEmbeddedSignupEnabled = computed(() => {
+  const accountId = route.params.accountId;
+  return store.getters['accounts/isFeatureEnabledonAccount'](
+    accountId,
+    FEATURE_FLAGS.WHATSAPP_EMBEDDED_SIGNUP
+  );
+});
+
+const selectedProvider = computed(() => route.query.provider);
+
+const showProviderSelection = computed(() => !selectedProvider.value);
+
+const showConfiguration = computed(() => Boolean(selectedProvider.value));
+
+const availableProviders = computed(() => [
+  {
+    value: PROVIDER_TYPES.WHATSAPP,
+    label: t('INBOX_MGMT.ADD.WHATSAPP.PROVIDERS.WHATSAPP_CLOUD'),
+    description: t('INBOX_MGMT.ADD.WHATSAPP.PROVIDERS.WHATSAPP_CLOUD_DESC'),
+    icon: '/assets/images/dashboard/channels/whatsapp.png',
   },
-  data() {
-    return {
-      provider: 'whatsapp_cloud',
-    };
+  {
+    value: PROVIDER_TYPES.TWILIO,
+    label: t('INBOX_MGMT.ADD.WHATSAPP.PROVIDERS.TWILIO'),
+    description: t('INBOX_MGMT.ADD.WHATSAPP.PROVIDERS.TWILIO_DESC'),
+    icon: '/assets/images/dashboard/channels/twilio.png',
   },
+]);
+
+const selectProvider = providerValue => {
+  router.push({
+    name: route.name,
+    params: route.params,
+    query: { provider: providerValue },
+  });
+};
+
+const shouldShowEmbeddedSignup = provider => {
+  // Check if the feature is enabled for the account
+  if (!isWhatsappEmbeddedSignupEnabled.value) {
+    return false;
+  }
+
+  return (
+    (provider === PROVIDER_TYPES.WHATSAPP && hasWhatsappAppId.value) ||
+    provider === PROVIDER_TYPES.WHATSAPP_EMBEDDED
+  );
+};
+
+const shouldShowCloudWhatsapp = provider => {
+  // If embedded signup feature is enabled and app ID is configured, don't show cloud whatsapp
+  if (isWhatsappEmbeddedSignupEnabled.value && hasWhatsappAppId.value) {
+    return false;
+  }
+
+  // Show cloud whatsapp when:
+  // 1. Provider is whatsapp AND
+  // 2. Either no app ID is configured OR embedded signup feature is disabled
+  return provider === PROVIDER_TYPES.WHATSAPP;
 };
 </script>
 
 <template>
   <div
-    class="border border-n-weak bg-n-solid-1 rounded-t-lg border-b-0 h-full w-full p-6 col-span-6 overflow-auto"
+    class="overflow-auto col-span-6 p-6 w-full h-full rounded-t-lg border border-b-0 border-n-weak bg-n-solid-1"
   >
-    <PageHeader
-      :header-title="$t('INBOX_MGMT.ADD.WHATSAPP.TITLE')"
-      :header-content="$t('INBOX_MGMT.ADD.WHATSAPP.DESC')"
-    />
-    <div class="flex-shrink-0 flex-grow-0">
-      <label>
-        {{ $t('INBOX_MGMT.ADD.WHATSAPP.PROVIDERS.LABEL') }}
-        <select v-model="provider">
-          <option value="whatsapp_cloud">
-            {{ $t('INBOX_MGMT.ADD.WHATSAPP.PROVIDERS.WHATSAPP_CLOUD') }}
-          </option>
-          <option value="twilio">
-            {{ $t('INBOX_MGMT.ADD.WHATSAPP.PROVIDERS.TWILIO') }}
-          </option>
-        </select>
-      </label>
+    <div v-if="showProviderSelection">
+      <div class="mb-10 text-left">
+        <h1 class="mb-2 text-lg font-medium text-slate-12">
+          {{ $t('INBOX_MGMT.ADD.WHATSAPP.SELECT_PROVIDER.TITLE') }}
+        </h1>
+        <p class="text-sm leading-relaxed text-slate-11">
+          {{ $t('INBOX_MGMT.ADD.WHATSAPP.SELECT_PROVIDER.DESCRIPTION') }}
+        </p>
+      </div>
+
+      <div class="flex gap-6 justify-start">
+        <div
+          v-for="provider in availableProviders"
+          :key="provider.value"
+          class="gap-6 px-5 py-6 w-96 rounded-2xl border transition-all duration-200 cursor-pointer border-n-weak hover:bg-n-slate-3"
+          @click="selectProvider(provider.value)"
+        >
+          <div class="flex justify-start mb-5">
+            <div
+              class="flex justify-center items-center rounded-full size-10 bg-n-alpha-2"
+            >
+              <img
+                :src="provider.icon"
+                :alt="provider.label"
+                class="object-contain size-[26px]"
+              />
+            </div>
+          </div>
+
+          <div class="text-start">
+            <h3 class="mb-1.5 text-sm font-medium text-slate-12">
+              {{ provider.label }}
+            </h3>
+            <p class="text-sm text-slate-11">
+              {{ provider.description }}
+            </p>
+          </div>
+        </div>
+      </div>
     </div>
 
-    <Twilio v-if="provider === 'twilio'" type="whatsapp" />
-    <ThreeSixtyDialogWhatsapp v-else-if="provider === '360dialog'" />
-    <CloudWhatsapp v-else />
+    <div v-else-if="showConfiguration">
+      <div class="px-6 py-5 rounded-2xl border bg-n-solid-2 border-n-weak">
+        <WhatsappEmbeddedSignup
+          v-if="shouldShowEmbeddedSignup(selectedProvider)"
+        />
+        <CloudWhatsapp v-else-if="shouldShowCloudWhatsapp(selectedProvider)" />
+        <Twilio
+          v-else-if="selectedProvider === PROVIDER_TYPES.TWILIO"
+          type="whatsapp"
+        />
+        <ThreeSixtyDialogWhatsapp
+          v-else-if="selectedProvider === PROVIDER_TYPES.THREE_SIXTY_DIALOG"
+        />
+        <CloudWhatsapp v-else />
+      </div>
+    </div>
   </div>
 </template>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/WhatsappEmbeddedSignup.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/WhatsappEmbeddedSignup.vue
new file mode 100644
index 000000000..070957717
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/WhatsappEmbeddedSignup.vue
@@ -0,0 +1,327 @@
+<script setup>
+import { ref, computed, onMounted, onBeforeUnmount } from 'vue';
+import { useStore } from 'vuex';
+import { useRouter } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import { useAlert } from 'dashboard/composables';
+import Icon from 'next/icon/Icon.vue';
+import NextButton from 'next/button/Button.vue';
+import LoadingState from 'dashboard/components/widgets/LoadingState.vue';
+import { loadScript } from 'dashboard/helper/DOMHelpers';
+import { parseAPIErrorResponse } from 'dashboard/store/utils/api';
+
+const store = useStore();
+const router = useRouter();
+const { t } = useI18n();
+
+// State
+const fbSdkLoaded = ref(false);
+const isProcessing = ref(false);
+const processingMessage = ref('');
+const authCodeReceived = ref(false);
+const authCode = ref(null);
+const businessData = ref(null);
+const isAuthenticating = ref(false);
+
+// Computed
+const whatsappIconPath = '/assets/images/dashboard/channels/whatsapp.png';
+
+const benefits = computed(() => [
+  {
+    key: 'EASY_SETUP',
+    text: t('INBOX_MGMT.ADD.WHATSAPP.EMBEDDED_SIGNUP.BENEFITS.EASY_SETUP'),
+  },
+  {
+    key: 'SECURE_AUTH',
+    text: t('INBOX_MGMT.ADD.WHATSAPP.EMBEDDED_SIGNUP.BENEFITS.SECURE_AUTH'),
+  },
+  {
+    key: 'AUTO_CONFIG',
+    text: t('INBOX_MGMT.ADD.WHATSAPP.EMBEDDED_SIGNUP.BENEFITS.AUTO_CONFIG'),
+  },
+]);
+
+const showLoader = computed(() => isAuthenticating.value || isProcessing.value);
+
+// Error handling
+const handleSignupError = data => {
+  isProcessing.value = false;
+  authCodeReceived.value = false;
+  isAuthenticating.value = false;
+
+  const errorMessage =
+    data.error ||
+    data.message ||
+    t('INBOX_MGMT.ADD.WHATSAPP.API.ERROR_MESSAGE');
+  useAlert(errorMessage);
+};
+
+const handleSignupCancellation = () => {
+  isProcessing.value = false;
+  authCodeReceived.value = false;
+  isAuthenticating.value = false;
+};
+
+const handleSignupSuccess = inboxData => {
+  isProcessing.value = false;
+  isAuthenticating.value = false;
+
+  if (inboxData && inboxData.id) {
+    useAlert(t('INBOX_MGMT.FINISH.MESSAGE'));
+    router.replace({
+      name: 'settings_inboxes_add_agents',
+      params: {
+        page: 'new',
+        inbox_id: inboxData.id,
+      },
+    });
+  } else {
+    useAlert(t('INBOX_MGMT.ADD.WHATSAPP.EMBEDDED_SIGNUP.SUCCESS_FALLBACK'));
+    router.replace({
+      name: 'settings_inbox_list',
+    });
+  }
+};
+
+// Signup flow
+const completeSignupFlow = async businessDataParam => {
+  if (!authCodeReceived.value || !authCode.value) {
+    handleSignupError({
+      error: t('INBOX_MGMT.ADD.WHATSAPP.EMBEDDED_SIGNUP.AUTH_NOT_COMPLETED'),
+    });
+    return;
+  }
+
+  isProcessing.value = true;
+  processingMessage.value = t(
+    'INBOX_MGMT.ADD.WHATSAPP.EMBEDDED_SIGNUP.PROCESSING'
+  );
+
+  try {
+    const params = {
+      code: authCode.value,
+      business_id: businessDataParam.business_id,
+      waba_id: businessDataParam.waba_id,
+      phone_number_id: businessDataParam.phone_number_id,
+    };
+
+    const responseData = await store.dispatch(
+      'inboxes/createWhatsAppEmbeddedSignup',
+      params
+    );
+
+    authCode.value = null;
+    handleSignupSuccess(responseData);
+  } catch (error) {
+    const errorMessage =
+      parseAPIErrorResponse(error) ||
+      t('INBOX_MGMT.ADD.WHATSAPP.API.ERROR_MESSAGE');
+    handleSignupError({ error: errorMessage });
+  }
+};
+
+const isValidBusinessData = businessDataLocal => {
+  return (
+    businessDataLocal &&
+    businessDataLocal.business_id &&
+    businessDataLocal.waba_id
+  );
+};
+
+// Message handling
+const handleEmbeddedSignupData = async data => {
+  if (data.event === 'FINISH') {
+    const businessDataLocal = data.data;
+
+    if (isValidBusinessData(businessDataLocal)) {
+      businessData.value = businessDataLocal;
+      if (authCodeReceived.value && authCode.value) {
+        await completeSignupFlow(businessDataLocal);
+      } else {
+        processingMessage.value = t(
+          'INBOX_MGMT.ADD.WHATSAPP.EMBEDDED_SIGNUP.WAITING_FOR_AUTH'
+        );
+      }
+    } else {
+      handleSignupError({
+        error: t(
+          'INBOX_MGMT.ADD.WHATSAPP.EMBEDDED_SIGNUP.INVALID_BUSINESS_DATA'
+        ),
+      });
+    }
+  } else if (data.event === 'CANCEL') {
+    handleSignupCancellation();
+  } else if (data.event === 'error') {
+    handleSignupError({
+      error:
+        data.error_message ||
+        t('INBOX_MGMT.ADD.WHATSAPP.EMBEDDED_SIGNUP.SIGNUP_ERROR'),
+      error_id: data.error_id,
+      session_id: data.session_id,
+    });
+  }
+};
+
+const fbLoginCallback = response => {
+  if (response.authResponse && response.authResponse.code) {
+    authCode.value = response.authResponse.code;
+    authCodeReceived.value = true;
+    processingMessage.value = t(
+      'INBOX_MGMT.ADD.WHATSAPP.EMBEDDED_SIGNUP.WAITING_FOR_BUSINESS_INFO'
+    );
+
+    if (businessData.value) {
+      completeSignupFlow(businessData.value);
+    }
+  } else if (response.error) {
+    handleSignupError({ error: response.error });
+  } else {
+    isProcessing.value = false;
+    isAuthenticating.value = false;
+    useAlert(t('INBOX_MGMT.ADD.WHATSAPP.EMBEDDED_SIGNUP.CANCELLED'));
+  }
+};
+
+const handleSignupMessage = event => {
+  // Validate origin for security - following Facebook documentation
+  // https://developers.facebook.com/docs/whatsapp/embedded-signup/implementation#step-3--add-embedded-signup-to-your-website
+  if (!event.origin.endsWith('facebook.com')) return;
+
+  // Parse and handle WhatsApp embedded signup events
+  try {
+    const data = JSON.parse(event.data);
+    if (data.type === 'WA_EMBEDDED_SIGNUP') {
+      handleEmbeddedSignupData(data);
+    }
+  } catch {
+    // Ignore non-JSON or irrelevant messages
+  }
+};
+
+const runFBInit = () => {
+  window.FB.init({
+    appId: window.chatwootConfig?.whatsappAppId,
+    autoLogAppEvents: true,
+    xfbml: true,
+    version: window.chatwootConfig?.whatsappApiVersion || 'v22.0',
+  });
+  fbSdkLoaded.value = true;
+};
+
+const loadFacebookSdk = async () => {
+  return loadScript('https://connect.facebook.net/en_US/sdk.js', {
+    async: true,
+    defer: true,
+    crossOrigin: 'anonymous',
+  });
+};
+
+const tryWhatsAppLogin = () => {
+  isAuthenticating.value = true;
+  processingMessage.value = t(
+    'INBOX_MGMT.ADD.WHATSAPP.EMBEDDED_SIGNUP.AUTH_PROCESSING'
+  );
+
+  window.FB.login(fbLoginCallback, {
+    config_id: window.chatwootConfig?.whatsappConfigurationId,
+    response_type: 'code',
+    override_default_response_type: true,
+    extras: {
+      setup: {},
+      featureType: '',
+      sessionInfoVersion: '3',
+    },
+  });
+};
+
+const launchEmbeddedSignup = async () => {
+  try {
+    // Load SDK first if not loaded, following Facebook.vue pattern exactly
+    await loadFacebookSdk();
+    runFBInit(); // Initialize FB after loading
+
+    // Now proceed with login
+    tryWhatsAppLogin();
+  } catch (error) {
+    handleSignupError({
+      error: t('INBOX_MGMT.ADD.WHATSAPP.EMBEDDED_SIGNUP.SDK_LOAD_ERROR'),
+    });
+  }
+};
+
+// Lifecycle
+const setupMessageListener = () => {
+  window.addEventListener('message', handleSignupMessage);
+};
+
+const cleanupMessageListener = () => {
+  window.removeEventListener('message', handleSignupMessage);
+};
+
+const initialize = () => {
+  window.fbAsyncInit = runFBInit;
+  setupMessageListener();
+};
+
+onMounted(() => {
+  initialize();
+});
+
+onBeforeUnmount(() => {
+  cleanupMessageListener();
+});
+</script>
+
+<template>
+  <div class="h-full">
+    <LoadingState v-if="showLoader" :message="processingMessage" />
+
+    <div v-else>
+      <div class="flex flex-col items-start mb-6 text-start">
+        <div class="flex justify-start mb-6">
+          <div
+            class="flex justify-center items-center w-12 h-12 rounded-full bg-n-alpha-2"
+          >
+            <img
+              :src="whatsappIconPath"
+              :alt="$t('INBOX_MGMT.ADD.WHATSAPP.PROVIDERS.WHATSAPP_CLOUD')"
+              class="object-contain w-8 h-8"
+              draggable="false"
+            />
+          </div>
+        </div>
+
+        <h3 class="mb-2 text-base font-medium text-n-slate-12">
+          {{ $t('INBOX_MGMT.ADD.WHATSAPP.EMBEDDED_SIGNUP.TITLE') }}
+        </h3>
+        <p class="text-sm leading-[24px] text-n-slate-12">
+          {{ $t('INBOX_MGMT.ADD.WHATSAPP.EMBEDDED_SIGNUP.DESC') }}
+        </p>
+      </div>
+
+      <div class="flex flex-col gap-2 mb-6">
+        <div
+          v-for="benefit in benefits"
+          :key="benefit.key"
+          class="flex gap-2 items-center text-sm text-n-slate-11"
+        >
+          <Icon icon="i-lucide-check" class="text-n-slate-11 size-4" />
+          {{ benefit.text }}
+        </div>
+      </div>
+
+      <div class="flex mt-4">
+        <NextButton
+          :disabled="isAuthenticating"
+          :is-loading="isAuthenticating"
+          faded
+          slate
+          class="w-full"
+          @click="launchEmbeddedSignup"
+        >
+          {{ $t('INBOX_MGMT.ADD.WHATSAPP.EMBEDDED_SIGNUP.SUBMIT_BUTTON') }}
+        </NextButton>
+      </div>
+    </div>
+  </div>
+</template>
diff --git a/app/javascript/dashboard/store/modules/inboxes.js b/app/javascript/dashboard/store/modules/inboxes.js
index aef95d1b1..68f4780e9 100644
--- a/app/javascript/dashboard/store/modules/inboxes.js
+++ b/app/javascript/dashboard/store/modules/inboxes.js
@@ -5,6 +5,7 @@ import InboxesAPI from '../../api/inboxes';
 import WebChannel from '../../api/channel/webChannel';
 import FBChannel from '../../api/channel/fbChannel';
 import TwilioChannel from '../../api/channel/twilioChannel';
+import WhatsappChannel from '../../api/channel/whatsappChannel';
 import { throwErrorMessage } from '../utils/api';
 import AnalyticsHelper from '../../helper/AnalyticsHelper';
 import camelcaseKeys from 'camelcase-keys';
@@ -198,6 +199,19 @@ export const actions = {
       throw new Error(error);
     }
   },
+  createWhatsAppEmbeddedSignup: async ({ commit }, params) => {
+    try {
+      commit(types.default.SET_INBOXES_UI_FLAG, { isCreating: true });
+      const response = await WhatsappChannel.createEmbeddedSignup(params);
+      commit(types.default.ADD_INBOXES, response.data);
+      commit(types.default.SET_INBOXES_UI_FLAG, { isCreating: false });
+      sendAnalyticsEvent('whatsapp');
+      return response.data;
+    } catch (error) {
+      commit(types.default.SET_INBOXES_UI_FLAG, { isCreating: false });
+      throw error;
+    }
+  },
   ...channelActions,
   // TODO: Extract other create channel methods to separate files to reduce file size
   // - createChannel
diff --git a/app/models/channel/whatsapp.rb b/app/models/channel/whatsapp.rb
index 1848e17a9..b7bfd0da7 100644
--- a/app/models/channel/whatsapp.rb
+++ b/app/models/channel/whatsapp.rb
@@ -33,6 +33,7 @@ class Channel::Whatsapp < ApplicationRecord
   validate :validate_provider_config
 
   after_create :sync_templates
+  after_create_commit :setup_webhooks
 
   def name
     'Whatsapp'
@@ -67,4 +68,41 @@ class Channel::Whatsapp < ApplicationRecord
   def validate_provider_config
     errors.add(:provider_config, 'Invalid Credentials') unless provider_service.validate_provider_config?
   end
+
+  def setup_webhooks
+    return unless should_setup_webhooks?
+
+    perform_webhook_setup
+  rescue StandardError => e
+    handle_webhook_setup_error(e)
+  end
+
+  def should_setup_webhooks?
+    whatsapp_cloud_provider? && embedded_signup_source? && webhook_config_present?
+  end
+
+  def whatsapp_cloud_provider?
+    provider == 'whatsapp_cloud'
+  end
+
+  def embedded_signup_source?
+    provider_config['source'] == 'embedded_signup'
+  end
+
+  def webhook_config_present?
+    provider_config['business_account_id'].present? && provider_config['api_key'].present?
+  end
+
+  def perform_webhook_setup
+    business_account_id = provider_config['business_account_id']
+    api_key = provider_config['api_key']
+
+    Whatsapp::WebhookSetupService.new(self, business_account_id, api_key).perform
+  end
+
+  def handle_webhook_setup_error(error)
+    Rails.logger.error "[WHATSAPP] Webhook setup failed: #{error.message}"
+    # Don't raise the error to prevent channel creation from failing
+    # Webhooks can be retried later
+  end
 end
diff --git a/app/presenters/message_content_presenter.rb b/app/presenters/message_content_presenter.rb
index 461dc8b88..016e5caea 100644
--- a/app/presenters/message_content_presenter.rb
+++ b/app/presenters/message_content_presenter.rb
@@ -17,4 +17,4 @@ class MessageContentPresenter < SimpleDelegator
   def survey_url(conversation_uuid)
     "#{ENV.fetch('FRONTEND_URL', nil)}/survey/responses/#{conversation_uuid}"
   end
-end
\ No newline at end of file
+end
diff --git a/app/services/whatsapp/channel_creation_service.rb b/app/services/whatsapp/channel_creation_service.rb
new file mode 100644
index 000000000..3039ca003
--- /dev/null
+++ b/app/services/whatsapp/channel_creation_service.rb
@@ -0,0 +1,75 @@
+class Whatsapp::ChannelCreationService
+  def initialize(account, waba_info, phone_info, access_token)
+    @account = account
+    @waba_info = waba_info
+    @phone_info = phone_info
+    @access_token = access_token
+  end
+
+  def perform
+    validate_parameters!
+
+    existing_channel = find_existing_channel
+    raise "Channel already exists: #{existing_channel.phone_number}" if existing_channel
+
+    create_channel_with_inbox
+  end
+
+  private
+
+  def validate_parameters!
+    raise ArgumentError, 'Account is required' if @account.blank?
+    raise ArgumentError, 'WABA info is required' if @waba_info.blank?
+    raise ArgumentError, 'Phone info is required' if @phone_info.blank?
+    raise ArgumentError, 'Access token is required' if @access_token.blank?
+  end
+
+  def find_existing_channel
+    Channel::Whatsapp.find_by(
+      account: @account,
+      phone_number: @phone_info[:phone_number]
+    )
+  end
+
+  def create_channel_with_inbox
+    ActiveRecord::Base.transaction do
+      channel = create_channel
+      create_inbox(channel)
+      channel.reload
+      channel
+    end
+  end
+
+  def create_channel
+    Channel::Whatsapp.create!(
+      account: @account,
+      phone_number: @phone_info[:phone_number],
+      provider: 'whatsapp_cloud',
+      provider_config: build_provider_config
+    )
+  end
+
+  def build_provider_config
+    {
+      api_key: @access_token,
+      phone_number_id: @phone_info[:phone_number_id],
+      business_account_id: @waba_info[:waba_id],
+      source: 'embedded_signup'
+    }
+  end
+
+  def create_inbox(channel)
+    inbox_name = build_inbox_name
+
+    Inbox.create!(
+      account: @account,
+      name: inbox_name,
+      channel: channel
+    )
+  end
+
+  def build_inbox_name
+    business_name = @phone_info[:business_name] || @waba_info[:business_name]
+    "#{business_name} WhatsApp"
+  end
+end
diff --git a/app/services/whatsapp/embedded_signup_service.rb b/app/services/whatsapp/embedded_signup_service.rb
new file mode 100644
index 000000000..0adf073cd
--- /dev/null
+++ b/app/services/whatsapp/embedded_signup_service.rb
@@ -0,0 +1,44 @@
+class Whatsapp::EmbeddedSignupService
+  def initialize(account:, code:, business_id:, waba_id:, phone_number_id:)
+    @account = account
+    @code = code
+    @business_id = business_id
+    @waba_id = waba_id
+    @phone_number_id = phone_number_id
+  end
+
+  def perform
+    validate_parameters!
+
+    # Exchange code for user access token
+    access_token = Whatsapp::TokenExchangeService.new(@code).perform
+
+    # Fetch phone information
+    phone_info = Whatsapp::PhoneInfoService.new(@waba_id, @phone_number_id, access_token).perform
+
+    # Validate token has access to the WABA
+    Whatsapp::TokenValidationService.new(access_token, @waba_id).perform
+
+    # Create channel
+    waba_info = { waba_id: @waba_id, business_name: phone_info[:business_name] }
+
+    # Webhook setup is now handled in the channel after_create_commit callback
+    Whatsapp::ChannelCreationService.new(@account, waba_info, phone_info, access_token).perform
+  rescue StandardError => e
+    Rails.logger.error("[WHATSAPP] Embedded signup failed: #{e.message}")
+    raise e
+  end
+
+  private
+
+  def validate_parameters!
+    missing_params = []
+    missing_params << 'code' if @code.blank?
+    missing_params << 'business_id' if @business_id.blank?
+    missing_params << 'waba_id' if @waba_id.blank?
+
+    return if missing_params.empty?
+
+    raise ArgumentError, "Required parameters are missing: #{missing_params.join(', ')}"
+  end
+end
diff --git a/app/services/whatsapp/facebook_api_client.rb b/app/services/whatsapp/facebook_api_client.rb
new file mode 100644
index 000000000..1aebdad2a
--- /dev/null
+++ b/app/services/whatsapp/facebook_api_client.rb
@@ -0,0 +1,86 @@
+class Whatsapp::FacebookApiClient
+  BASE_URI = 'https://graph.facebook.com'.freeze
+
+  def initialize(access_token = nil)
+    @access_token = access_token
+    @api_version = GlobalConfigService.load('WHATSAPP_API_VERSION', 'v22.0')
+  end
+
+  def exchange_code_for_token(code)
+    response = HTTParty.get(
+      "#{BASE_URI}/#{@api_version}/oauth/access_token",
+      query: {
+        client_id: GlobalConfigService.load('WHATSAPP_APP_ID', ''),
+        client_secret: GlobalConfigService.load('WHATSAPP_APP_SECRET', ''),
+        code: code
+      }
+    )
+
+    handle_response(response, 'Token exchange failed')
+  end
+
+  def fetch_phone_numbers(waba_id)
+    response = HTTParty.get(
+      "#{BASE_URI}/#{@api_version}/#{waba_id}/phone_numbers",
+      query: { access_token: @access_token }
+    )
+
+    handle_response(response, 'WABA phone numbers fetch failed')
+  end
+
+  def debug_token(input_token)
+    response = HTTParty.get(
+      "#{BASE_URI}/#{@api_version}/debug_token",
+      query: {
+        input_token: input_token,
+        access_token: build_app_access_token
+      }
+    )
+
+    handle_response(response, 'Token validation failed')
+  end
+
+  def register_phone_number(phone_number_id, pin)
+    response = HTTParty.post(
+      "#{BASE_URI}/#{@api_version}/#{phone_number_id}/register",
+      headers: request_headers,
+      body: { messaging_product: 'whatsapp', pin: pin.to_s }.to_json
+    )
+
+    handle_response(response, 'Phone registration failed')
+  end
+
+  def subscribe_waba_webhook(waba_id, callback_url, verify_token)
+    response = HTTParty.post(
+      "#{BASE_URI}/#{@api_version}/#{waba_id}/subscribed_apps",
+      headers: request_headers,
+      body: {
+        override_callback_uri: callback_url,
+        verify_token: verify_token
+      }.to_json
+    )
+
+    handle_response(response, 'Webhook subscription failed')
+  end
+
+  private
+
+  def request_headers
+    {
+      'Authorization' => "Bearer #{@access_token}",
+      'Content-Type' => 'application/json'
+    }
+  end
+
+  def build_app_access_token
+    app_id = GlobalConfigService.load('WHATSAPP_APP_ID', '')
+    app_secret = GlobalConfigService.load('WHATSAPP_APP_SECRET', '')
+    "#{app_id}|#{app_secret}"
+  end
+
+  def handle_response(response, error_message)
+    raise "#{error_message}: #{response.body}" unless response.success?
+
+    response.parsed_response
+  end
+end
diff --git a/app/services/whatsapp/phone_info_service.rb b/app/services/whatsapp/phone_info_service.rb
new file mode 100644
index 000000000..72a3e53d0
--- /dev/null
+++ b/app/services/whatsapp/phone_info_service.rb
@@ -0,0 +1,57 @@
+class Whatsapp::PhoneInfoService
+  def initialize(waba_id, phone_number_id, access_token)
+    @waba_id = waba_id
+    @phone_number_id = phone_number_id
+    @access_token = access_token
+    @api_client = Whatsapp::FacebookApiClient.new(access_token)
+  end
+
+  def perform
+    validate_parameters!
+    fetch_and_process_phone_info
+  end
+
+  private
+
+  def validate_parameters!
+    raise ArgumentError, 'WABA ID is required' if @waba_id.blank?
+    raise ArgumentError, 'Access token is required' if @access_token.blank?
+  end
+
+  def fetch_and_process_phone_info
+    response = @api_client.fetch_phone_numbers(@waba_id)
+    phone_numbers = response['data']
+
+    phone_data = find_phone_data(phone_numbers)
+    raise "No phone numbers found for WABA #{@waba_id}" if phone_data.nil?
+
+    build_phone_info(phone_data)
+  end
+
+  def find_phone_data(phone_numbers)
+    return nil if phone_numbers.blank?
+
+    if @phone_number_id.present?
+      phone_numbers.find { |phone| phone['id'] == @phone_number_id } || phone_numbers.first
+    else
+      phone_numbers.first
+    end
+  end
+
+  def build_phone_info(phone_data)
+    display_phone_number = sanitize_phone_number(phone_data['display_phone_number'])
+
+    {
+      phone_number_id: phone_data['id'],
+      phone_number: "+#{display_phone_number}",
+      verified: phone_data['code_verification_status'] == 'VERIFIED',
+      business_name: phone_data['verified_name'] || phone_data['display_phone_number']
+    }
+  end
+
+  def sanitize_phone_number(phone_number)
+    return phone_number if phone_number.blank?
+
+    phone_number.gsub(/[\s\-\(\)\.\+]/, '').strip
+  end
+end
diff --git a/app/services/whatsapp/token_exchange_service.rb b/app/services/whatsapp/token_exchange_service.rb
new file mode 100644
index 000000000..112c54831
--- /dev/null
+++ b/app/services/whatsapp/token_exchange_service.rb
@@ -0,0 +1,26 @@
+class Whatsapp::TokenExchangeService
+  def initialize(code)
+    @code = code
+    @api_client = Whatsapp::FacebookApiClient.new
+  end
+
+  def perform
+    validate_code!
+    exchange_token
+  end
+
+  private
+
+  def validate_code!
+    raise ArgumentError, 'Authorization code is required' if @code.blank?
+  end
+
+  def exchange_token
+    response = @api_client.exchange_code_for_token(@code)
+    access_token = response['access_token']
+
+    raise "No access token in response: #{response}" if access_token.blank?
+
+    access_token
+  end
+end
diff --git a/app/services/whatsapp/token_validation_service.rb b/app/services/whatsapp/token_validation_service.rb
new file mode 100644
index 000000000..863f9da51
--- /dev/null
+++ b/app/services/whatsapp/token_validation_service.rb
@@ -0,0 +1,42 @@
+class Whatsapp::TokenValidationService
+  def initialize(access_token, waba_id)
+    @access_token = access_token
+    @waba_id = waba_id
+    @api_client = Whatsapp::FacebookApiClient.new(access_token)
+  end
+
+  def perform
+    validate_parameters!
+    validate_token_waba_access
+  end
+
+  private
+
+  def validate_parameters!
+    raise ArgumentError, 'Access token is required' if @access_token.blank?
+    raise ArgumentError, 'WABA ID is required' if @waba_id.blank?
+  end
+
+  def validate_token_waba_access
+    token_debug_data = @api_client.debug_token(@access_token)
+    waba_scope = extract_waba_scope(token_debug_data)
+    verify_waba_authorization(waba_scope)
+  end
+
+  def extract_waba_scope(token_data)
+    granular_scopes = token_data.dig('data', 'granular_scopes')
+    waba_scope = granular_scopes&.find { |scope| scope['scope'] == 'whatsapp_business_management' }
+
+    raise 'No WABA scope found in token' unless waba_scope
+
+    waba_scope
+  end
+
+  def verify_waba_authorization(waba_scope)
+    authorized_waba_ids = waba_scope['target_ids'] || []
+
+    return if authorized_waba_ids.include?(@waba_id)
+
+    raise "Token does not have access to WABA #{@waba_id}. Authorized WABAs: #{authorized_waba_ids}"
+  end
+end
diff --git a/app/services/whatsapp/webhook_setup_service.rb b/app/services/whatsapp/webhook_setup_service.rb
new file mode 100644
index 000000000..6aff531f7
--- /dev/null
+++ b/app/services/whatsapp/webhook_setup_service.rb
@@ -0,0 +1,67 @@
+class Whatsapp::WebhookSetupService
+  def initialize(channel, waba_id, access_token)
+    @channel = channel
+    @waba_id = waba_id
+    @access_token = access_token
+    @api_client = Whatsapp::FacebookApiClient.new(access_token)
+  end
+
+  def perform
+    validate_parameters!
+    register_phone_number
+    setup_webhook
+  end
+
+  private
+
+  def validate_parameters!
+    raise ArgumentError, 'Channel is required' if @channel.blank?
+    raise ArgumentError, 'WABA ID is required' if @waba_id.blank?
+    raise ArgumentError, 'Access token is required' if @access_token.blank?
+  end
+
+  def register_phone_number
+    phone_number_id = @channel.provider_config['phone_number_id']
+    pin = fetch_or_create_pin
+
+    @api_client.register_phone_number(phone_number_id, pin)
+    store_pin(pin)
+  rescue StandardError => e
+    Rails.logger.warn("[WHATSAPP] Phone registration failed but continuing: #{e.message}")
+    # Continue with webhook setup even if registration fails
+    # This is just a warning, not a blocking error
+  end
+
+  def fetch_or_create_pin
+    # Check if we have a stored PIN for this phone number
+    existing_pin = @channel.provider_config['verification_pin']
+    return existing_pin.to_i if existing_pin.present?
+
+    # Generate a new 6-digit PIN if none exists
+    SecureRandom.random_number(900_000) + 100_000
+  end
+
+  def store_pin(pin)
+    # Store the PIN in provider_config for future use
+    @channel.provider_config['verification_pin'] = pin
+    @channel.save!
+  end
+
+  def setup_webhook
+    callback_url = build_callback_url
+    verify_token = @channel.provider_config['webhook_verify_token']
+
+    @api_client.subscribe_waba_webhook(@waba_id, callback_url, verify_token)
+
+  rescue StandardError => e
+    Rails.logger.error("[WHATSAPP] Webhook setup failed: #{e.message}")
+    raise "Webhook setup failed: #{e.message}"
+  end
+
+  def build_callback_url
+    frontend_url = ENV.fetch('FRONTEND_URL', nil)
+    phone_number = @channel.phone_number
+
+    "#{frontend_url}/webhooks/whatsapp/#{phone_number}"
+  end
+end
diff --git a/app/views/api/v1/accounts/search/articles.json.jbuilder b/app/views/api/v1/accounts/search/articles.json.jbuilder
index 7d4fe031c..f20a163d8 100644
--- a/app/views/api/v1/accounts/search/articles.json.jbuilder
+++ b/app/views/api/v1/accounts/search/articles.json.jbuilder
@@ -4,4 +4,4 @@ json.payload do
       json.partial! 'article', formats: [:json], article: article
     end
   end
-end
\ No newline at end of file
+end
diff --git a/app/views/api/v1/accounts/whatsapp/callbacks/embedded_signup.json.jbuilder b/app/views/api/v1/accounts/whatsapp/callbacks/embedded_signup.json.jbuilder
new file mode 100644
index 000000000..2ad94ff82
--- /dev/null
+++ b/app/views/api/v1/accounts/whatsapp/callbacks/embedded_signup.json.jbuilder
@@ -0,0 +1 @@
+json.partial! 'api/v1/models/inbox', formats: [:json], resource: @inbox
diff --git a/app/views/layouts/vueapp.html.erb b/app/views/layouts/vueapp.html.erb
index 4be41f8b2..8ccac6c48 100644
--- a/app/views/layouts/vueapp.html.erb
+++ b/app/views/layouts/vueapp.html.erb
@@ -39,6 +39,9 @@
         googleOAuthClientId: '<%= ENV.fetch('GOOGLE_OAUTH_CLIENT_ID', nil) %>',
         googleOAuthCallbackUrl: '<%= ENV.fetch('GOOGLE_OAUTH_CALLBACK_URL', nil) %>',
         fbApiVersion: '<%= @global_config['FACEBOOK_API_VERSION'] %>',
+        whatsappAppId: '<%= @global_config['WHATSAPP_APP_ID'] %>',
+        whatsappConfigurationId: '<%= @global_config['WHATSAPP_CONFIGURATION_ID'] %>',
+        whatsappApiVersion: '<%= @global_config['WHATSAPP_API_VERSION'] %>',
         signupEnabled: '<%= @global_config['ENABLE_ACCOUNT_SIGNUP'] %>',
         isEnterprise: '<%= @global_config['IS_ENTERPRISE'] %>',
         <% if @global_config['IS_ENTERPRISE'] %>
diff --git a/config/features.yml b/config/features.yml
index d41f705ad..99d7bea6d 100644
--- a/config/features.yml
+++ b/config/features.yml
@@ -180,3 +180,6 @@
   display_name: Captain V2
   enabled: false
   premium: true
+- name: whatsapp_embedded_signup
+  display_name: WhatsApp Embedded Signup
+  enabled: false
diff --git a/config/installation_config.yml b/config/installation_config.yml
index 58d593502..b17d3cec0 100644
--- a/config/installation_config.yml
+++ b/config/installation_config.yml
@@ -126,6 +126,26 @@
   type: boolean
 # ------- End of Facebook Channel Related Config ------- #
 
+# ------- WhatsApp Channel Related Config ------- #
+- name: WHATSAPP_APP_ID
+  display_title: 'WhatsApp App ID'
+  description: 'The Facebook App ID for WhatsApp Business API integration'
+  locked: false
+- name: WHATSAPP_CONFIGURATION_ID
+  display_title: 'WhatsApp Configuration ID'
+  description: 'The Configuration ID for WhatsApp Embedded Signup flow (required for embedded signup)'
+  locked: false
+- name: WHATSAPP_APP_SECRET
+  display_title: 'WhatsApp App Secret'
+  description: 'The App Secret for WhatsApp Embedded Signup flow (required for embedded signup)'
+  locked: false
+- name: WHATSAPP_API_VERSION
+  display_title: 'WhatsApp API Version'
+  description: 'Configure this if you want to use a different WhatsApp API version. Make sure its prefixed with `v`'
+  value: 'v22.0'
+  locked: false
+# ------- End of WhatsApp Channel Related Config ------- #
+
 # MARK: Microsoft Email Channel Config
 - name: AZURE_APP_ID
   display_title: 'Azure App ID'
diff --git a/config/routes.rb b/config/routes.rb
index 4aad60039..f262febdf 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -233,6 +233,10 @@ Rails.application.routes.draw do
             resource :authorization, only: [:create]
           end
 
+          namespace :whatsapp do
+            resource :authorization, only: [:create]
+          end
+
           resources :webhooks, only: [:index, :create, :update, :destroy]
           namespace :integrations do
             resources :apps, only: [:index, :show]
diff --git a/db/migrate/20250620120000_create_channel_voice.rb b/db/migrate/20250620120000_create_channel_voice.rb
index 9e2a25723..2d1a41e74 100644
--- a/db/migrate/20250620120000_create_channel_voice.rb
+++ b/db/migrate/20250620120000_create_channel_voice.rb
@@ -13,4 +13,4 @@ class CreateChannelVoice < ActiveRecord::Migration[7.0]
     add_index :channel_voice, :phone_number, unique: true
     add_index :channel_voice, :account_id
   end
-end
\ No newline at end of file
+end
diff --git a/enterprise/app/controllers/api/v1/accounts/captain/scenarios_controller.rb b/enterprise/app/controllers/api/v1/accounts/captain/scenarios_controller.rb
index 7c329053b..376cee0b3 100644
--- a/enterprise/app/controllers/api/v1/accounts/captain/scenarios_controller.rb
+++ b/enterprise/app/controllers/api/v1/accounts/captain/scenarios_controller.rb
@@ -44,4 +44,4 @@ class Api::V1::Accounts::Captain::ScenariosController < Api::V1::Accounts::BaseC
   def scenario_params
     params.require(:scenario).permit(:title, :description, :instruction, :enabled, tools: [])
   end
-end
\ No newline at end of file
+end
diff --git a/enterprise/app/helpers/super_admin/features.yml b/enterprise/app/helpers/super_admin/features.yml
index e86f66832..f2b2b263c 100644
--- a/enterprise/app/helpers/super_admin/features.yml
+++ b/enterprise/app/helpers/super_admin/features.yml
@@ -103,6 +103,12 @@ slack:
   enabled: true
   icon: 'icon-slack'
   config_key: 'slack'
+whatsapp_embedded:
+  name: 'WhatsApp Embedded'
+  description: 'Configuration for setting up WhatsApp Embedded Integration'
+  enabled: true
+  icon: 'icon-whatsapp-line'
+  config_key: 'whatsapp_embedded'
 shopify:
   name: 'Shopify'
   description: 'Configuration for setting up Shopify Integration'
diff --git a/enterprise/app/models/channel/voice.rb b/enterprise/app/models/channel/voice.rb
index a313129e2..20ae5a74c 100644
--- a/enterprise/app/models/channel/voice.rb
+++ b/enterprise/app/models/channel/voice.rb
@@ -61,4 +61,3 @@ class Channel::Voice < ApplicationRecord
     end
   end
 end
-
diff --git a/enterprise/app/policies/captain/scenario_policy.rb b/enterprise/app/policies/captain/scenario_policy.rb
index 82c5d236b..d532b5b92 100644
--- a/enterprise/app/policies/captain/scenario_policy.rb
+++ b/enterprise/app/policies/captain/scenario_policy.rb
@@ -18,4 +18,4 @@ class Captain::ScenarioPolicy < ApplicationPolicy
   def destroy?
     @account_user.administrator?
   end
-end
\ No newline at end of file
+end
diff --git a/enterprise/app/services/captain/open_ai_message_builder_service.rb b/enterprise/app/services/captain/open_ai_message_builder_service.rb
index 43d2851c9..4aaa64e0a 100644
--- a/enterprise/app/services/captain/open_ai_message_builder_service.rb
+++ b/enterprise/app/services/captain/open_ai_message_builder_service.rb
@@ -57,4 +57,4 @@ class Captain::OpenAiMessageBuilderService
       result[:success] ? result[:transcriptions] : ''
     end.join
   end
-end
\ No newline at end of file
+end
diff --git a/enterprise/app/views/api/v1/accounts/captain/scenarios/create.json.jbuilder b/enterprise/app/views/api/v1/accounts/captain/scenarios/create.json.jbuilder
index 98566b10f..8963e07c5 100644
--- a/enterprise/app/views/api/v1/accounts/captain/scenarios/create.json.jbuilder
+++ b/enterprise/app/views/api/v1/accounts/captain/scenarios/create.json.jbuilder
@@ -1 +1 @@
-json.partial! 'api/v1/models/captain/scenario', scenario: @scenario
\ No newline at end of file
+json.partial! 'api/v1/models/captain/scenario', scenario: @scenario
diff --git a/enterprise/app/views/api/v1/accounts/captain/scenarios/index.json.jbuilder b/enterprise/app/views/api/v1/accounts/captain/scenarios/index.json.jbuilder
index 60e97a017..dc5860fb9 100644
--- a/enterprise/app/views/api/v1/accounts/captain/scenarios/index.json.jbuilder
+++ b/enterprise/app/views/api/v1/accounts/captain/scenarios/index.json.jbuilder
@@ -2,4 +2,4 @@ json.data do
   json.array! @scenarios do |scenario|
     json.partial! 'api/v1/models/captain/scenario', scenario: scenario
   end
-end
\ No newline at end of file
+end
diff --git a/enterprise/app/views/api/v1/accounts/captain/scenarios/show.json.jbuilder b/enterprise/app/views/api/v1/accounts/captain/scenarios/show.json.jbuilder
index 98566b10f..8963e07c5 100644
--- a/enterprise/app/views/api/v1/accounts/captain/scenarios/show.json.jbuilder
+++ b/enterprise/app/views/api/v1/accounts/captain/scenarios/show.json.jbuilder
@@ -1 +1 @@
-json.partial! 'api/v1/models/captain/scenario', scenario: @scenario
\ No newline at end of file
+json.partial! 'api/v1/models/captain/scenario', scenario: @scenario
diff --git a/enterprise/app/views/api/v1/accounts/captain/scenarios/update.json.jbuilder b/enterprise/app/views/api/v1/accounts/captain/scenarios/update.json.jbuilder
index 98566b10f..8963e07c5 100644
--- a/enterprise/app/views/api/v1/accounts/captain/scenarios/update.json.jbuilder
+++ b/enterprise/app/views/api/v1/accounts/captain/scenarios/update.json.jbuilder
@@ -1 +1 @@
-json.partial! 'api/v1/models/captain/scenario', scenario: @scenario
\ No newline at end of file
+json.partial! 'api/v1/models/captain/scenario', scenario: @scenario
diff --git a/enterprise/app/views/api/v1/models/captain/_scenario.json.jbuilder b/enterprise/app/views/api/v1/models/captain/_scenario.json.jbuilder
index ae78c7bb8..a0a832efc 100644
--- a/enterprise/app/views/api/v1/models/captain/_scenario.json.jbuilder
+++ b/enterprise/app/views/api/v1/models/captain/_scenario.json.jbuilder
@@ -13,4 +13,4 @@ if scenario.assistant.present?
     json.id scenario.assistant.id
     json.name scenario.assistant.name
   end
-end
\ No newline at end of file
+end
diff --git a/public/assets/images/dashboard/channels/whatsapp.png b/public/assets/images/dashboard/channels/whatsapp.png
index 547ff675ef6c0763ddf5c9bd5f58ceaff8e6d649..7bee740d98d5c669bf57e9ff8b4a01ea767e639a 100644
GIT binary patch
literal 13525
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

literal 46629
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
FV1lhl5k3F_

diff --git a/spec/controllers/api/v1/accounts/notion/authorization_controller_spec.rb b/spec/controllers/api/v1/accounts/notion/authorization_controller_spec.rb
index ac4bc2841..b003d5c85 100644
--- a/spec/controllers/api/v1/accounts/notion/authorization_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/notion/authorization_controller_spec.rb
@@ -50,4 +50,4 @@ RSpec.describe 'Notion Authorization API', type: :request do
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/spec/controllers/api/v1/accounts/whatsapp/authorizations_controller_spec.rb b/spec/controllers/api/v1/accounts/whatsapp/authorizations_controller_spec.rb
new file mode 100644
index 000000000..eca193c76
--- /dev/null
+++ b/spec/controllers/api/v1/accounts/whatsapp/authorizations_controller_spec.rb
@@ -0,0 +1,303 @@
+require 'rails_helper'
+
+RSpec.describe 'WhatsApp Authorization API', type: :request do
+  let(:account) { create(:account) }
+
+  describe 'POST /api/v1/accounts/{account.id}/whatsapp/authorization' do
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        post "/api/v1/accounts/#{account.id}/whatsapp/authorization"
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated user' do
+      let(:agent) { create(:user, account: account, role: :agent) }
+      let(:administrator) { create(:user, account: account, role: :administrator) }
+
+      context 'when feature is not enabled' do
+        before do
+          account.disable_features!(:whatsapp_embedded_signup)
+        end
+
+        it 'returns forbidden' do
+          post "/api/v1/accounts/#{account.id}/whatsapp/authorization",
+               params: {
+                 code: 'test_code',
+                 business_id: 'test_business_id',
+                 waba_id: 'test_waba_id'
+               },
+               headers: agent.create_new_auth_token,
+               as: :json
+
+          expect(response).to have_http_status(:forbidden)
+          expect(response.parsed_body['error']).to eq('WhatsApp embedded signup is not enabled for this account')
+        end
+      end
+
+      context 'when feature is enabled' do
+        before do
+          account.enable_features!(:whatsapp_embedded_signup)
+        end
+
+        it 'returns unprocessable entity when code is missing' do
+          post "/api/v1/accounts/#{account.id}/whatsapp/authorization",
+               params: {
+                 business_id: 'test_business_id',
+                 waba_id: 'test_waba_id'
+               },
+               headers: agent.create_new_auth_token,
+               as: :json
+
+          expect(response).to have_http_status(:unprocessable_entity)
+          expect(response.parsed_body['error']).to include('code')
+        end
+
+        it 'returns unprocessable entity when business_id is missing' do
+          post "/api/v1/accounts/#{account.id}/whatsapp/authorization",
+               params: {
+                 code: 'test_code',
+                 waba_id: 'test_waba_id'
+               },
+               headers: agent.create_new_auth_token,
+               as: :json
+
+          expect(response).to have_http_status(:unprocessable_entity)
+          expect(response.parsed_body['error']).to include('business_id')
+        end
+
+        it 'returns unprocessable entity when waba_id is missing' do
+          post "/api/v1/accounts/#{account.id}/whatsapp/authorization",
+               params: {
+                 code: 'test_code',
+                 business_id: 'test_business_id'
+               },
+               headers: agent.create_new_auth_token,
+               as: :json
+
+          expect(response).to have_http_status(:unprocessable_entity)
+          expect(response.parsed_body['error']).to include('waba_id')
+        end
+
+        it 'creates whatsapp channel successfully' do
+          whatsapp_channel = create(:channel_whatsapp, account: account, validate_provider_config: false, sync_templates: false)
+          inbox = create(:inbox, account: account, channel: whatsapp_channel)
+          embedded_signup_service = instance_double(Whatsapp::EmbeddedSignupService)
+
+          allow(Whatsapp::EmbeddedSignupService).to receive(:new).and_return(embedded_signup_service)
+          allow(embedded_signup_service).to receive(:perform).and_return(whatsapp_channel)
+          allow(whatsapp_channel).to receive(:inbox).and_return(inbox)
+
+          # Stub webhook setup service to prevent HTTP calls
+          webhook_service = instance_double(Whatsapp::WebhookSetupService)
+          allow(Whatsapp::WebhookSetupService).to receive(:new).and_return(webhook_service)
+          allow(webhook_service).to receive(:perform)
+
+          post "/api/v1/accounts/#{account.id}/whatsapp/authorization",
+               params: {
+                 code: 'test_code',
+                 business_id: 'test_business_id',
+                 waba_id: 'test_waba_id',
+                 phone_number_id: 'test_phone_id'
+               },
+               headers: agent.create_new_auth_token,
+               as: :json
+
+          expect(response).to have_http_status(:success)
+          response_data = response.parsed_body
+          expect(response_data['success']).to be true
+          expect(response_data['id']).to eq(inbox.id)
+          expect(response_data['name']).to eq(inbox.name)
+          expect(response_data['channel_type']).to eq('whatsapp')
+        end
+
+        it 'calls the embedded signup service with correct parameters' do
+          whatsapp_channel = create(:channel_whatsapp, account: account, validate_provider_config: false, sync_templates: false)
+          inbox = create(:inbox, account: account, channel: whatsapp_channel)
+          embedded_signup_service = instance_double(Whatsapp::EmbeddedSignupService)
+
+          expect(Whatsapp::EmbeddedSignupService).to receive(:new).with(
+            account: account,
+            code: 'test_code',
+            business_id: 'test_business_id',
+            waba_id: 'test_waba_id',
+            phone_number_id: 'test_phone_id'
+          ).and_return(embedded_signup_service)
+
+          allow(embedded_signup_service).to receive(:perform).and_return(whatsapp_channel)
+          allow(whatsapp_channel).to receive(:inbox).and_return(inbox)
+
+          # Stub webhook setup service
+          webhook_service = instance_double(Whatsapp::WebhookSetupService)
+          allow(Whatsapp::WebhookSetupService).to receive(:new).and_return(webhook_service)
+          allow(webhook_service).to receive(:perform)
+
+          post "/api/v1/accounts/#{account.id}/whatsapp/authorization",
+               params: {
+                 code: 'test_code',
+                 business_id: 'test_business_id',
+                 waba_id: 'test_waba_id',
+                 phone_number_id: 'test_phone_id'
+               },
+               headers: agent.create_new_auth_token,
+               as: :json
+        end
+
+        it 'accepts phone_number_id as optional parameter' do
+          whatsapp_channel = create(:channel_whatsapp, account: account, validate_provider_config: false, sync_templates: false)
+          inbox = create(:inbox, account: account, channel: whatsapp_channel)
+          embedded_signup_service = instance_double(Whatsapp::EmbeddedSignupService)
+
+          expect(Whatsapp::EmbeddedSignupService).to receive(:new).with(
+            account: account,
+            code: 'test_code',
+            business_id: 'test_business_id',
+            waba_id: 'test_waba_id',
+            phone_number_id: nil
+          ).and_return(embedded_signup_service)
+
+          allow(embedded_signup_service).to receive(:perform).and_return(whatsapp_channel)
+          allow(whatsapp_channel).to receive(:inbox).and_return(inbox)
+
+          # Stub webhook setup service
+          webhook_service = instance_double(Whatsapp::WebhookSetupService)
+          allow(Whatsapp::WebhookSetupService).to receive(:new).and_return(webhook_service)
+          allow(webhook_service).to receive(:perform)
+
+          post "/api/v1/accounts/#{account.id}/whatsapp/authorization",
+               params: {
+                 code: 'test_code',
+                 business_id: 'test_business_id',
+                 waba_id: 'test_waba_id'
+               },
+               headers: agent.create_new_auth_token,
+               as: :json
+
+          expect(response).to have_http_status(:success)
+        end
+
+        it 'returns unprocessable entity when service fails' do
+          allow(Whatsapp::EmbeddedSignupService).to receive(:new).and_raise(StandardError, 'Service error')
+
+          post "/api/v1/accounts/#{account.id}/whatsapp/authorization",
+               params: {
+                 code: 'test_code',
+                 business_id: 'test_business_id',
+                 waba_id: 'test_waba_id'
+               },
+               headers: agent.create_new_auth_token,
+               as: :json
+
+          expect(response).to have_http_status(:unprocessable_entity)
+          response_data = response.parsed_body
+          expect(response_data['success']).to be false
+          expect(response_data['error']).to eq('Service error')
+        end
+
+        it 'logs error when service fails' do
+          allow(Whatsapp::EmbeddedSignupService).to receive(:new).and_raise(StandardError, 'Service error')
+
+          expect(Rails.logger).to receive(:error).with(/\[WHATSAPP AUTHORIZATION\] Embedded signup error: Service error/)
+          expect(Rails.logger).to receive(:error).with(/authorizations_controller/)
+
+          post "/api/v1/accounts/#{account.id}/whatsapp/authorization",
+               params: {
+                 code: 'test_code',
+                 business_id: 'test_business_id',
+                 waba_id: 'test_waba_id'
+               },
+               headers: agent.create_new_auth_token,
+               as: :json
+        end
+
+        it 'handles token exchange errors' do
+          allow(Whatsapp::EmbeddedSignupService).to receive(:new)
+            .and_raise(StandardError, 'Invalid authorization code')
+
+          post "/api/v1/accounts/#{account.id}/whatsapp/authorization",
+               params: {
+                 code: 'invalid_code',
+                 business_id: 'test_business_id',
+                 waba_id: 'test_waba_id'
+               },
+               headers: agent.create_new_auth_token,
+               as: :json
+
+          expect(response).to have_http_status(:unprocessable_entity)
+          expect(response.parsed_body['error']).to eq('Invalid authorization code')
+        end
+
+        it 'handles channel already exists error' do
+          allow(Whatsapp::EmbeddedSignupService).to receive(:new)
+            .and_raise(StandardError, 'Channel already exists')
+
+          post "/api/v1/accounts/#{account.id}/whatsapp/authorization",
+               params: {
+                 code: 'test_code',
+                 business_id: 'test_business_id',
+                 waba_id: 'test_waba_id'
+               },
+               headers: agent.create_new_auth_token,
+               as: :json
+
+          expect(response).to have_http_status(:unprocessable_entity)
+          expect(response.parsed_body['error']).to eq('Channel already exists')
+        end
+      end
+
+      context 'when user is not authorized for the account' do
+        let(:other_account) { create(:account) }
+
+        before do
+          account.enable_features!(:whatsapp_embedded_signup)
+        end
+
+        it 'returns unauthorized' do
+          post "/api/v1/accounts/#{other_account.id}/whatsapp/authorization",
+               params: {
+                 code: 'test_code',
+                 business_id: 'test_business_id',
+                 waba_id: 'test_waba_id'
+               },
+               headers: agent.create_new_auth_token,
+               as: :json
+
+          expect(response).to have_http_status(:unauthorized)
+        end
+      end
+
+      context 'when user is an administrator' do
+        before do
+          account.enable_features!(:whatsapp_embedded_signup)
+        end
+
+        it 'allows channel creation' do
+          embedded_signup_service = instance_double(Whatsapp::EmbeddedSignupService)
+          whatsapp_channel = create(:channel_whatsapp, account: account, validate_provider_config: false, sync_templates: false)
+          inbox = create(:inbox, account: account, channel: whatsapp_channel)
+
+          allow(Whatsapp::EmbeddedSignupService).to receive(:new).and_return(embedded_signup_service)
+          allow(embedded_signup_service).to receive(:perform).and_return(whatsapp_channel)
+          allow(whatsapp_channel).to receive(:inbox).and_return(inbox)
+
+          # Stub webhook setup service
+          webhook_service = instance_double(Whatsapp::WebhookSetupService)
+          allow(Whatsapp::WebhookSetupService).to receive(:new).and_return(webhook_service)
+          allow(webhook_service).to receive(:perform)
+
+          post "/api/v1/accounts/#{account.id}/whatsapp/authorization",
+               params: {
+                 code: 'test_code',
+                 business_id: 'test_business_id',
+                 waba_id: 'test_waba_id'
+               },
+               headers: administrator.create_new_auth_token,
+               as: :json
+
+          expect(response).to have_http_status(:success)
+        end
+      end
+    end
+  end
+end
diff --git a/spec/enterprise/controllers/api/v1/accounts/captain/scenarios_controller_spec.rb b/spec/enterprise/controllers/api/v1/accounts/captain/scenarios_controller_spec.rb
index c66571921..ed223622b 100644
--- a/spec/enterprise/controllers/api/v1/accounts/captain/scenarios_controller_spec.rb
+++ b/spec/enterprise/controllers/api/v1/accounts/captain/scenarios_controller_spec.rb
@@ -255,4 +255,4 @@ RSpec.describe 'Api::V1::Accounts::Captain::Scenarios', type: :request do
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/spec/enterprise/models/captain/scenario_spec.rb b/spec/enterprise/models/captain/scenario_spec.rb
index f944373e2..1f13a362b 100644
--- a/spec/enterprise/models/captain/scenario_spec.rb
+++ b/spec/enterprise/models/captain/scenario_spec.rb
@@ -60,4 +60,4 @@ RSpec.describe Captain::Scenario, type: :model do
       expect(scenario.account).to be_present
     end
   end
-end
\ No newline at end of file
+end
diff --git a/spec/models/channel/whatsapp_spec.rb b/spec/models/channel/whatsapp_spec.rb
index 4368807fe..29a00fd96 100644
--- a/spec/models/channel/whatsapp_spec.rb
+++ b/spec/models/channel/whatsapp_spec.rb
@@ -61,4 +61,65 @@ RSpec.describe Channel::Whatsapp do
       expect(channel.provider_config['webhook_verify_token']).to eq '123'
     end
   end
+
+  describe 'webhook setup after creation' do
+    let(:account) { create(:account) }
+    let(:webhook_service) { instance_double(Whatsapp::WebhookSetupService) }
+
+    before do
+      allow(Whatsapp::WebhookSetupService).to receive(:new).and_return(webhook_service)
+      allow(webhook_service).to receive(:perform)
+    end
+
+    context 'when channel is created through embedded signup' do
+      it 'does not raise error if webhook setup fails' do
+        allow(webhook_service).to receive(:perform).and_raise(StandardError, 'Webhook error')
+
+        expect do
+          create(:channel_whatsapp,
+                 account: account,
+                 provider: 'whatsapp_cloud',
+                 provider_config: {
+                   'source' => 'embedded_signup',
+                   'business_account_id' => 'test_waba_id',
+                   'api_key' => 'test_access_token'
+                 },
+                 validate_provider_config: false,
+                 sync_templates: false)
+        end.not_to raise_error
+      end
+    end
+
+    context 'when channel is created through manual setup' do
+      it 'does not setup webhooks' do
+        expect(Whatsapp::WebhookSetupService).not_to receive(:new)
+
+        create(:channel_whatsapp,
+               account: account,
+               provider: 'whatsapp_cloud',
+               provider_config: {
+                 'business_account_id' => 'test_waba_id',
+                 'api_key' => 'test_access_token'
+               },
+               validate_provider_config: false,
+               sync_templates: false)
+      end
+    end
+
+    context 'when channel is created with different provider' do
+      it 'does not setup webhooks for 360dialog provider' do
+        expect(Whatsapp::WebhookSetupService).not_to receive(:new)
+
+        create(:channel_whatsapp,
+               account: account,
+               provider: 'default',
+               provider_config: {
+                 'source' => 'embedded_signup',
+                 'api_key' => 'test_360dialog_key'
+               },
+               validate_provider_config: false,
+               sync_templates: false)
+      end
+    end
+  end
 end
diff --git a/spec/models/concerns/featurable_spec.rb b/spec/models/concerns/featurable_spec.rb
new file mode 100644
index 000000000..1cf0b87f2
--- /dev/null
+++ b/spec/models/concerns/featurable_spec.rb
@@ -0,0 +1,57 @@
+require 'rails_helper'
+
+RSpec.describe Featurable do
+  let(:account) { create(:account) }
+
+  describe 'WhatsApp embedded signup feature' do
+    it 'is disabled by default' do
+      expect(account.feature_whatsapp_embedded_signup?).to be false
+      expect(account.feature_enabled?('whatsapp_embedded_signup')).to be false
+    end
+
+    describe '#enable_features!' do
+      it 'enables the whatsapp embedded signup feature' do
+        account.enable_features!(:whatsapp_embedded_signup)
+        expect(account.feature_whatsapp_embedded_signup?).to be true
+        expect(account.feature_enabled?('whatsapp_embedded_signup')).to be true
+      end
+
+      it 'enables multiple features at once' do
+        account.enable_features!(:whatsapp_embedded_signup, :help_center)
+        expect(account.feature_whatsapp_embedded_signup?).to be true
+        expect(account.feature_help_center?).to be true
+      end
+    end
+
+    describe '#disable_features!' do
+      before do
+        account.enable_features!(:whatsapp_embedded_signup)
+      end
+
+      it 'disables the whatsapp embedded signup feature' do
+        expect(account.feature_whatsapp_embedded_signup?).to be true
+
+        account.disable_features!(:whatsapp_embedded_signup)
+        expect(account.feature_whatsapp_embedded_signup?).to be false
+      end
+    end
+
+    describe '#enabled_features' do
+      it 'includes whatsapp_embedded_signup when enabled' do
+        account.enable_features!(:whatsapp_embedded_signup)
+        expect(account.enabled_features).to include('whatsapp_embedded_signup' => true)
+      end
+
+      it 'does not include whatsapp_embedded_signup when disabled' do
+        account.disable_features!(:whatsapp_embedded_signup)
+        expect(account.enabled_features).not_to include('whatsapp_embedded_signup' => true)
+      end
+    end
+
+    describe '#all_features' do
+      it 'includes whatsapp_embedded_signup in all features list' do
+        expect(account.all_features).to have_key('whatsapp_embedded_signup')
+      end
+    end
+  end
+end
diff --git a/spec/presenters/message_content_presenter_spec.rb b/spec/presenters/message_content_presenter_spec.rb
index f85bdb8d1..fe709fd21 100644
--- a/spec/presenters/message_content_presenter_spec.rb
+++ b/spec/presenters/message_content_presenter_spec.rb
@@ -63,4 +63,4 @@ RSpec.describe MessageContentPresenter do
       expect(presenter.conversation).to eq(conversation)
     end
   end
-end
\ No newline at end of file
+end
diff --git a/spec/services/csat_survey_service_spec.rb b/spec/services/csat_survey_service_spec.rb
index 5b3b3279a..ecb5a75c6 100644
--- a/spec/services/csat_survey_service_spec.rb
+++ b/spec/services/csat_survey_service_spec.rb
@@ -88,4 +88,4 @@ describe CsatSurveyService do
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/spec/services/linear/activity_message_service_spec.rb b/spec/services/linear/activity_message_service_spec.rb
index 4b51f6520..e950ec8e3 100644
--- a/spec/services/linear/activity_message_service_spec.rb
+++ b/spec/services/linear/activity_message_service_spec.rb
@@ -171,4 +171,4 @@ RSpec.describe Linear::ActivityMessageService, type: :service do
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/spec/services/whatsapp/channel_creation_service_spec.rb b/spec/services/whatsapp/channel_creation_service_spec.rb
new file mode 100644
index 000000000..1c1f46232
--- /dev/null
+++ b/spec/services/whatsapp/channel_creation_service_spec.rb
@@ -0,0 +1,119 @@
+require 'rails_helper'
+
+describe Whatsapp::ChannelCreationService do
+  let(:account) { create(:account) }
+  let(:waba_info) { { waba_id: 'test_waba_id', business_name: 'Test Business' } }
+  let(:phone_info) do
+    {
+      phone_number_id: 'test_phone_id',
+      phone_number: '+1234567890',
+      verified: true,
+      business_name: 'Test Business'
+    }
+  end
+  let(:access_token) { 'test_access_token' }
+  let(:service) { described_class.new(account, waba_info, phone_info, access_token) }
+
+  describe '#perform' do
+    before do
+      # Clean up any existing channels to avoid phone number conflicts
+      Channel::Whatsapp.destroy_all
+
+      # Stub the webhook setup service to prevent HTTP calls during tests
+      webhook_service = instance_double(Whatsapp::WebhookSetupService)
+      allow(Whatsapp::WebhookSetupService).to receive(:new).and_return(webhook_service)
+      allow(webhook_service).to receive(:perform)
+
+      # Stub the provider validation and sync_templates
+      allow(Channel::Whatsapp).to receive(:new).and_wrap_original do |method, *args|
+        channel = method.call(*args)
+        allow(channel).to receive(:validate_provider_config)
+        allow(channel).to receive(:sync_templates)
+        channel
+      end
+    end
+
+    context 'when channel does not exist' do
+      it 'creates a new channel' do
+        expect { service.perform }.to change(Channel::Whatsapp, :count).by(1)
+      end
+
+      it 'creates channel with correct attributes' do
+        channel = service.perform
+        expect(channel.phone_number).to eq('+1234567890')
+        expect(channel.provider).to eq('whatsapp_cloud')
+        expect(channel.provider_config['api_key']).to eq(access_token)
+        expect(channel.provider_config['phone_number_id']).to eq('test_phone_id')
+        expect(channel.provider_config['business_account_id']).to eq('test_waba_id')
+        expect(channel.provider_config['source']).to eq('embedded_signup')
+      end
+
+      it 'creates an inbox for the channel' do
+        channel = service.perform
+        inbox = channel.inbox
+        expect(inbox).not_to be_nil
+        expect(inbox.name).to eq('Test Business WhatsApp')
+        expect(inbox.account).to eq(account)
+      end
+    end
+
+    context 'when channel already exists' do
+      before do
+        create(:channel_whatsapp, account: account, phone_number: '+1234567890',
+                                  provider: 'whatsapp_cloud', sync_templates: false, validate_provider_config: false)
+      end
+
+      it 'raises an error' do
+        expect { service.perform }.to raise_error(/Channel already exists/)
+      end
+    end
+
+    context 'when required parameters are missing' do
+      it 'raises error when account is nil' do
+        service = described_class.new(nil, waba_info, phone_info, access_token)
+        expect { service.perform }.to raise_error(ArgumentError, 'Account is required')
+      end
+
+      it 'raises error when waba_info is nil' do
+        service = described_class.new(account, nil, phone_info, access_token)
+        expect { service.perform }.to raise_error(ArgumentError, 'WABA info is required')
+      end
+
+      it 'raises error when phone_info is nil' do
+        service = described_class.new(account, waba_info, nil, access_token)
+        expect { service.perform }.to raise_error(ArgumentError, 'Phone info is required')
+      end
+
+      it 'raises error when access_token is blank' do
+        service = described_class.new(account, waba_info, phone_info, '')
+        expect { service.perform }.to raise_error(ArgumentError, 'Access token is required')
+      end
+    end
+
+    context 'when business_name is in different places' do
+      context 'when business_name is only in phone_info' do
+        let(:waba_info) { { waba_id: 'test_waba_id' } }
+
+        it 'uses business_name from phone_info' do
+          channel = service.perform
+          expect(channel.inbox.name).to eq('Test Business WhatsApp')
+        end
+      end
+
+      context 'when business_name is only in waba_info' do
+        let(:phone_info) do
+          {
+            phone_number_id: 'test_phone_id',
+            phone_number: '+1234567890',
+            verified: true
+          }
+        end
+
+        it 'uses business_name from waba_info' do
+          channel = service.perform
+          expect(channel.inbox.name).to eq('Test Business WhatsApp')
+        end
+      end
+    end
+  end
+end
diff --git a/spec/services/whatsapp/embedded_signup_service_spec.rb b/spec/services/whatsapp/embedded_signup_service_spec.rb
new file mode 100644
index 000000000..95af73523
--- /dev/null
+++ b/spec/services/whatsapp/embedded_signup_service_spec.rb
@@ -0,0 +1,127 @@
+require 'rails_helper'
+
+describe Whatsapp::EmbeddedSignupService do
+  let(:account) { create(:account) }
+  let(:code) { 'test_authorization_code' }
+  let(:business_id) { 'test_business_id' }
+  let(:waba_id) { 'test_waba_id' }
+  let(:phone_number_id) { 'test_phone_number_id' }
+  let(:service) do
+    described_class.new(
+      account: account,
+      code: code,
+      business_id: business_id,
+      waba_id: waba_id,
+      phone_number_id: phone_number_id
+    )
+  end
+
+  describe '#perform' do
+    let(:access_token) { 'test_access_token' }
+    let(:phone_info) do
+      {
+        phone_number_id: phone_number_id,
+        phone_number: '+1234567890',
+        verified: true,
+        business_name: 'Test Business'
+      }
+    end
+    let(:channel) { instance_double(Channel::Whatsapp) }
+
+    let(:token_exchange_service) { instance_double(Whatsapp::TokenExchangeService) }
+    let(:phone_info_service) { instance_double(Whatsapp::PhoneInfoService) }
+    let(:token_validation_service) { instance_double(Whatsapp::TokenValidationService) }
+    let(:channel_creation_service) { instance_double(Whatsapp::ChannelCreationService) }
+
+    before do
+      allow(GlobalConfig).to receive(:clear_cache)
+
+      allow(Whatsapp::TokenExchangeService).to receive(:new).with(code).and_return(token_exchange_service)
+      allow(token_exchange_service).to receive(:perform).and_return(access_token)
+
+      allow(Whatsapp::PhoneInfoService).to receive(:new)
+        .with(waba_id, phone_number_id, access_token).and_return(phone_info_service)
+      allow(phone_info_service).to receive(:perform).and_return(phone_info)
+
+      allow(Whatsapp::TokenValidationService).to receive(:new)
+        .with(access_token, waba_id).and_return(token_validation_service)
+      allow(token_validation_service).to receive(:perform)
+
+      allow(Whatsapp::ChannelCreationService).to receive(:new)
+        .with(account, { waba_id: waba_id, business_name: 'Test Business' }, phone_info, access_token)
+        .and_return(channel_creation_service)
+      allow(channel_creation_service).to receive(:perform).and_return(channel)
+
+      # Webhook setup is now handled in the channel after_create callback
+      # So we stub it at the model level
+      webhook_service = instance_double(Whatsapp::WebhookSetupService)
+      allow(Whatsapp::WebhookSetupService).to receive(:new).and_return(webhook_service)
+      allow(webhook_service).to receive(:perform)
+    end
+
+    it 'orchestrates all services in the correct order' do
+      expect(token_exchange_service).to receive(:perform).ordered
+      expect(phone_info_service).to receive(:perform).ordered
+      expect(token_validation_service).to receive(:perform).ordered
+      expect(channel_creation_service).to receive(:perform).ordered
+
+      result = service.perform
+      expect(result).to eq(channel)
+    end
+
+    context 'when required parameters are missing' do
+      it 'raises error when code is blank' do
+        service = described_class.new(
+          account: account,
+          code: '',
+          business_id: business_id,
+          waba_id: waba_id,
+          phone_number_id: phone_number_id
+        )
+        expect { service.perform }.to raise_error(ArgumentError, /Required parameters are missing: code/)
+      end
+
+      it 'raises error when business_id is blank' do
+        service = described_class.new(
+          account: account,
+          code: code,
+          business_id: '',
+          waba_id: waba_id,
+          phone_number_id: phone_number_id
+        )
+        expect { service.perform }.to raise_error(ArgumentError, /Required parameters are missing: business_id/)
+      end
+
+      it 'raises error when waba_id is blank' do
+        service = described_class.new(
+          account: account,
+          code: code,
+          business_id: business_id,
+          waba_id: '',
+          phone_number_id: phone_number_id
+        )
+        expect { service.perform }.to raise_error(ArgumentError, /Required parameters are missing: waba_id/)
+      end
+
+      it 'raises error when multiple parameters are blank' do
+        service = described_class.new(
+          account: account,
+          code: '',
+          business_id: '',
+          waba_id: waba_id,
+          phone_number_id: phone_number_id
+        )
+        expect { service.perform }.to raise_error(ArgumentError, /Required parameters are missing: code, business_id/)
+      end
+    end
+
+    context 'when any service fails' do
+      it 'logs and re-raises the error' do
+        allow(token_exchange_service).to receive(:perform).and_raise('Token error')
+
+        expect(Rails.logger).to receive(:error).with('[WHATSAPP] Embedded signup failed: Token error')
+        expect { service.perform }.to raise_error('Token error')
+      end
+    end
+  end
+end
diff --git a/spec/services/whatsapp/facebook_api_client_spec.rb b/spec/services/whatsapp/facebook_api_client_spec.rb
new file mode 100644
index 000000000..6c2af7716
--- /dev/null
+++ b/spec/services/whatsapp/facebook_api_client_spec.rb
@@ -0,0 +1,197 @@
+require 'rails_helper'
+
+describe Whatsapp::FacebookApiClient do
+  let(:access_token) { 'test_access_token' }
+  let(:api_client) { described_class.new(access_token) }
+  let(:api_version) { 'v22.0' }
+  let(:app_id) { 'test_app_id' }
+  let(:app_secret) { 'test_app_secret' }
+
+  before do
+    allow(GlobalConfigService).to receive(:load).with('WHATSAPP_API_VERSION', 'v22.0').and_return(api_version)
+    allow(GlobalConfigService).to receive(:load).with('WHATSAPP_APP_ID', '').and_return(app_id)
+    allow(GlobalConfigService).to receive(:load).with('WHATSAPP_APP_SECRET', '').and_return(app_secret)
+  end
+
+  describe '#exchange_code_for_token' do
+    let(:code) { 'test_code' }
+
+    context 'when successful' do
+      before do
+        stub_request(:get, "https://graph.facebook.com/#{api_version}/oauth/access_token")
+          .with(query: { client_id: app_id, client_secret: app_secret, code: code })
+          .to_return(
+            status: 200,
+            body: { access_token: 'new_token' }.to_json,
+            headers: { 'Content-Type' => 'application/json' }
+          )
+      end
+
+      it 'returns the response data' do
+        result = api_client.exchange_code_for_token(code)
+        expect(result['access_token']).to eq('new_token')
+      end
+    end
+
+    context 'when failed' do
+      before do
+        stub_request(:get, "https://graph.facebook.com/#{api_version}/oauth/access_token")
+          .with(query: { client_id: app_id, client_secret: app_secret, code: code })
+          .to_return(status: 400, body: { error: 'Invalid code' }.to_json)
+      end
+
+      it 'raises an error' do
+        expect { api_client.exchange_code_for_token(code) }.to raise_error(/Token exchange failed/)
+      end
+    end
+  end
+
+  describe '#fetch_phone_numbers' do
+    let(:waba_id) { 'test_waba_id' }
+
+    context 'when successful' do
+      before do
+        stub_request(:get, "https://graph.facebook.com/#{api_version}/#{waba_id}/phone_numbers")
+          .with(query: { access_token: access_token })
+          .to_return(
+            status: 200,
+            body: { data: [{ id: '123', display_phone_number: '1234567890' }] }.to_json,
+            headers: { 'Content-Type' => 'application/json' }
+          )
+      end
+
+      it 'returns the phone numbers data' do
+        result = api_client.fetch_phone_numbers(waba_id)
+        expect(result['data']).to be_an(Array)
+        expect(result['data'].first['id']).to eq('123')
+      end
+    end
+
+    context 'when failed' do
+      before do
+        stub_request(:get, "https://graph.facebook.com/#{api_version}/#{waba_id}/phone_numbers")
+          .with(query: { access_token: access_token })
+          .to_return(status: 403, body: { error: 'Access denied' }.to_json)
+      end
+
+      it 'raises an error' do
+        expect { api_client.fetch_phone_numbers(waba_id) }.to raise_error(/WABA phone numbers fetch failed/)
+      end
+    end
+  end
+
+  describe '#debug_token' do
+    let(:input_token) { 'test_input_token' }
+    let(:app_access_token) { "#{app_id}|#{app_secret}" }
+
+    context 'when successful' do
+      before do
+        stub_request(:get, "https://graph.facebook.com/#{api_version}/debug_token")
+          .with(query: { input_token: input_token, access_token: app_access_token })
+          .to_return(
+            status: 200,
+            body: { data: { app_id: app_id, is_valid: true } }.to_json,
+            headers: { 'Content-Type' => 'application/json' }
+          )
+      end
+
+      it 'returns the debug token data' do
+        result = api_client.debug_token(input_token)
+        expect(result['data']['is_valid']).to be(true)
+      end
+    end
+
+    context 'when failed' do
+      before do
+        stub_request(:get, "https://graph.facebook.com/#{api_version}/debug_token")
+          .with(query: { input_token: input_token, access_token: app_access_token })
+          .to_return(status: 400, body: { error: 'Invalid token' }.to_json)
+      end
+
+      it 'raises an error' do
+        expect { api_client.debug_token(input_token) }.to raise_error(/Token validation failed/)
+      end
+    end
+  end
+
+  describe '#register_phone_number' do
+    let(:phone_number_id) { 'test_phone_id' }
+    let(:pin) { '123456' }
+
+    context 'when successful' do
+      before do
+        stub_request(:post, "https://graph.facebook.com/#{api_version}/#{phone_number_id}/register")
+          .with(
+            headers: { 'Authorization' => "Bearer #{access_token}", 'Content-Type' => 'application/json' },
+            body: { messaging_product: 'whatsapp', pin: pin }.to_json
+          )
+          .to_return(
+            status: 200,
+            body: { success: true }.to_json,
+            headers: { 'Content-Type' => 'application/json' }
+          )
+      end
+
+      it 'returns success response' do
+        result = api_client.register_phone_number(phone_number_id, pin)
+        expect(result['success']).to be(true)
+      end
+    end
+
+    context 'when failed' do
+      before do
+        stub_request(:post, "https://graph.facebook.com/#{api_version}/#{phone_number_id}/register")
+          .with(
+            headers: { 'Authorization' => "Bearer #{access_token}", 'Content-Type' => 'application/json' },
+            body: { messaging_product: 'whatsapp', pin: pin }.to_json
+          )
+          .to_return(status: 400, body: { error: 'Registration failed' }.to_json)
+      end
+
+      it 'raises an error' do
+        expect { api_client.register_phone_number(phone_number_id, pin) }.to raise_error(/Phone registration failed/)
+      end
+    end
+  end
+
+  describe '#subscribe_waba_webhook' do
+    let(:waba_id) { 'test_waba_id' }
+    let(:callback_url) { 'https://example.com/webhook' }
+    let(:verify_token) { 'test_verify_token' }
+
+    context 'when successful' do
+      before do
+        stub_request(:post, "https://graph.facebook.com/#{api_version}/#{waba_id}/subscribed_apps")
+          .with(
+            headers: { 'Authorization' => "Bearer #{access_token}", 'Content-Type' => 'application/json' },
+            body: { override_callback_uri: callback_url, verify_token: verify_token }.to_json
+          )
+          .to_return(
+            status: 200,
+            body: { success: true }.to_json,
+            headers: { 'Content-Type' => 'application/json' }
+          )
+      end
+
+      it 'returns success response' do
+        result = api_client.subscribe_waba_webhook(waba_id, callback_url, verify_token)
+        expect(result['success']).to be(true)
+      end
+    end
+
+    context 'when failed' do
+      before do
+        stub_request(:post, "https://graph.facebook.com/#{api_version}/#{waba_id}/subscribed_apps")
+          .with(
+            headers: { 'Authorization' => "Bearer #{access_token}", 'Content-Type' => 'application/json' },
+            body: { override_callback_uri: callback_url, verify_token: verify_token }.to_json
+          )
+          .to_return(status: 400, body: { error: 'Webhook subscription failed' }.to_json)
+      end
+
+      it 'raises an error' do
+        expect { api_client.subscribe_waba_webhook(waba_id, callback_url, verify_token) }.to raise_error(/Webhook subscription failed/)
+      end
+    end
+  end
+end
diff --git a/spec/services/whatsapp/phone_info_service_spec.rb b/spec/services/whatsapp/phone_info_service_spec.rb
new file mode 100644
index 000000000..bf1517a39
--- /dev/null
+++ b/spec/services/whatsapp/phone_info_service_spec.rb
@@ -0,0 +1,147 @@
+require 'rails_helper'
+
+describe Whatsapp::PhoneInfoService do
+  let(:waba_id) { 'test_waba_id' }
+  let(:phone_number_id) { 'test_phone_number_id' }
+  let(:access_token) { 'test_access_token' }
+  let(:service) { described_class.new(waba_id, phone_number_id, access_token) }
+  let(:api_client) { instance_double(Whatsapp::FacebookApiClient) }
+
+  before do
+    allow(Whatsapp::FacebookApiClient).to receive(:new).with(access_token).and_return(api_client)
+  end
+
+  describe '#perform' do
+    let(:phone_response) do
+      {
+        'data' => [
+          {
+            'id' => phone_number_id,
+            'display_phone_number' => '1234567890',
+            'verified_name' => 'Test Business',
+            'code_verification_status' => 'VERIFIED'
+          }
+        ]
+      }
+    end
+
+    context 'when all parameters are valid' do
+      before do
+        allow(api_client).to receive(:fetch_phone_numbers).with(waba_id).and_return(phone_response)
+      end
+
+      it 'returns formatted phone info' do
+        result = service.perform
+        expect(result).to eq({
+                               phone_number_id: phone_number_id,
+                               phone_number: '+1234567890',
+                               verified: true,
+                               business_name: 'Test Business'
+                             })
+      end
+    end
+
+    context 'when phone_number_id is not provided' do
+      let(:phone_number_id) { nil }
+      let(:phone_response) do
+        {
+          'data' => [
+            {
+              'id' => 'first_phone_id',
+              'display_phone_number' => '1234567890',
+              'verified_name' => 'Test Business',
+              'code_verification_status' => 'VERIFIED'
+            }
+          ]
+        }
+      end
+
+      before do
+        allow(api_client).to receive(:fetch_phone_numbers).with(waba_id).and_return(phone_response)
+      end
+
+      it 'uses the first available phone number' do
+        result = service.perform
+        expect(result[:phone_number_id]).to eq('first_phone_id')
+      end
+    end
+
+    context 'when specific phone_number_id is not found' do
+      let(:phone_number_id) { 'different_id' }
+      let(:phone_response) do
+        {
+          'data' => [
+            {
+              'id' => 'available_phone_id',
+              'display_phone_number' => '9876543210',
+              'verified_name' => 'Different Business',
+              'code_verification_status' => 'VERIFIED'
+            }
+          ]
+        }
+      end
+
+      before do
+        allow(api_client).to receive(:fetch_phone_numbers).with(waba_id).and_return(phone_response)
+      end
+
+      it 'uses the first available phone number as fallback' do
+        result = service.perform
+        expect(result[:phone_number_id]).to eq('available_phone_id')
+        expect(result[:phone_number]).to eq('+9876543210')
+      end
+    end
+
+    context 'when no phone numbers are available' do
+      let(:phone_response) { { 'data' => [] } }
+
+      before do
+        allow(api_client).to receive(:fetch_phone_numbers).with(waba_id).and_return(phone_response)
+      end
+
+      it 'raises an error' do
+        expect { service.perform }.to raise_error(/No phone numbers found for WABA/)
+      end
+    end
+
+    context 'when waba_id is blank' do
+      let(:waba_id) { '' }
+
+      it 'raises ArgumentError' do
+        expect { service.perform }.to raise_error(ArgumentError, 'WABA ID is required')
+      end
+    end
+
+    context 'when access_token is blank' do
+      let(:access_token) { '' }
+
+      it 'raises ArgumentError' do
+        expect { service.perform }.to raise_error(ArgumentError, 'Access token is required')
+      end
+    end
+
+    context 'when phone number has special characters' do
+      let(:phone_response) do
+        {
+          'data' => [
+            {
+              'id' => phone_number_id,
+              'display_phone_number' => '+1 (234) 567-8900',
+              'verified_name' => 'Test Business',
+              'code_verification_status' => 'VERIFIED'
+            }
+          ]
+        }
+      end
+
+      before do
+        allow(api_client).to receive(:fetch_phone_numbers).with(waba_id).and_return(phone_response)
+      end
+
+      it 'sanitizes the phone number' do
+        result = service.perform
+        expect(result[:phone_number]).to eq('+12345678900')
+      end
+    end
+  end
+end
diff --git a/spec/services/whatsapp/token_exchange_service_spec.rb b/spec/services/whatsapp/token_exchange_service_spec.rb
new file mode 100644
index 000000000..cbe97751b
--- /dev/null
+++ b/spec/services/whatsapp/token_exchange_service_spec.rb
@@ -0,0 +1,45 @@
+require 'rails_helper'
+
+describe Whatsapp::TokenExchangeService do
+  let(:code) { 'test_authorization_code' }
+  let(:service) { described_class.new(code) }
+  let(:api_client) { instance_double(Whatsapp::FacebookApiClient) }
+
+  before do
+    allow(Whatsapp::FacebookApiClient).to receive(:new).and_return(api_client)
+  end
+
+  describe '#perform' do
+    context 'when code is valid' do
+      let(:token_response) { { 'access_token' => 'new_access_token' } }
+
+      before do
+        allow(api_client).to receive(:exchange_code_for_token).with(code).and_return(token_response)
+      end
+
+      it 'returns the access token' do
+        expect(service.perform).to eq('new_access_token')
+      end
+    end
+
+    context 'when code is blank' do
+      let(:service) { described_class.new('') }
+
+      it 'raises ArgumentError' do
+        expect { service.perform }.to raise_error(ArgumentError, 'Authorization code is required')
+      end
+    end
+
+    context 'when response has no access token' do
+      let(:token_response) { { 'error' => 'Invalid code' } }
+
+      before do
+        allow(api_client).to receive(:exchange_code_for_token).with(code).and_return(token_response)
+      end
+
+      it 'raises an error' do
+        expect { service.perform }.to raise_error(/No access token in response/)
+      end
+    end
+  end
+end
diff --git a/spec/services/whatsapp/token_validation_service_spec.rb b/spec/services/whatsapp/token_validation_service_spec.rb
new file mode 100644
index 000000000..d9cf40257
--- /dev/null
+++ b/spec/services/whatsapp/token_validation_service_spec.rb
@@ -0,0 +1,99 @@
+require 'rails_helper'
+
+describe Whatsapp::TokenValidationService do
+  let(:access_token) { 'test_access_token' }
+  let(:waba_id) { 'test_waba_id' }
+  let(:service) { described_class.new(access_token, waba_id) }
+  let(:api_client) { instance_double(Whatsapp::FacebookApiClient) }
+
+  before do
+    allow(Whatsapp::FacebookApiClient).to receive(:new).with(access_token).and_return(api_client)
+  end
+
+  describe '#perform' do
+    context 'when token has access to WABA' do
+      let(:debug_response) do
+        {
+          'data' => {
+            'granular_scopes' => [
+              {
+                'scope' => 'whatsapp_business_management',
+                'target_ids' => [waba_id, 'another_waba_id']
+              }
+            ]
+          }
+        }
+      end
+
+      before do
+        allow(api_client).to receive(:debug_token).with(access_token).and_return(debug_response)
+      end
+
+      it 'validates successfully' do
+        expect { service.perform }.not_to raise_error
+      end
+    end
+
+    context 'when token does not have access to WABA' do
+      let(:debug_response) do
+        {
+          'data' => {
+            'granular_scopes' => [
+              {
+                'scope' => 'whatsapp_business_management',
+                'target_ids' => ['different_waba_id']
+              }
+            ]
+          }
+        }
+      end
+
+      before do
+        allow(api_client).to receive(:debug_token).with(access_token).and_return(debug_response)
+      end
+
+      it 'raises an error' do
+        expect { service.perform }.to raise_error(/Token does not have access to WABA/)
+      end
+    end
+
+    context 'when no WABA scope is found' do
+      let(:debug_response) do
+        {
+          'data' => {
+            'granular_scopes' => [
+              {
+                'scope' => 'some_other_scope',
+                'target_ids' => ['some_id']
+              }
+            ]
+          }
+        }
+      end
+
+      before do
+        allow(api_client).to receive(:debug_token).with(access_token).and_return(debug_response)
+      end
+
+      it 'raises an error' do
+        expect { service.perform }.to raise_error('No WABA scope found in token')
+      end
+    end
+
+    context 'when access_token is blank' do
+      let(:access_token) { '' }
+
+      it 'raises ArgumentError' do
+        expect { service.perform }.to raise_error(ArgumentError, 'Access token is required')
+      end
+    end
+
+    context 'when waba_id is blank' do
+      let(:waba_id) { '' }
+
+      it 'raises ArgumentError' do
+        expect { service.perform }.to raise_error(ArgumentError, 'WABA ID is required')
+      end
+    end
+  end
+end
diff --git a/spec/services/whatsapp/webhook_setup_service_spec.rb b/spec/services/whatsapp/webhook_setup_service_spec.rb
new file mode 100644
index 000000000..89beca922
--- /dev/null
+++ b/spec/services/whatsapp/webhook_setup_service_spec.rb
@@ -0,0 +1,119 @@
+require 'rails_helper'
+
+describe Whatsapp::WebhookSetupService do
+  let(:channel) do
+    create(:channel_whatsapp,
+           phone_number: '+1234567890',
+           provider_config: {
+             'phone_number_id' => 'test_phone_id',
+             'webhook_verify_token' => 'test_verify_token'
+           },
+           provider: 'whatsapp_cloud',
+           sync_templates: false,
+           validate_provider_config: false)
+  end
+  let(:waba_id) { 'test_waba_id' }
+  let(:access_token) { 'test_access_token' }
+  let(:service) { described_class.new(channel, waba_id, access_token) }
+  let(:api_client) { instance_double(Whatsapp::FacebookApiClient) }
+
+  before do
+    # Clean up any existing channels to avoid phone number conflicts
+    Channel::Whatsapp.destroy_all
+    allow(Whatsapp::FacebookApiClient).to receive(:new).and_return(api_client)
+  end
+
+  describe '#perform' do
+    context 'when all operations succeed' do
+      before do
+        allow(SecureRandom).to receive(:random_number).with(900_000).and_return(123_456)
+        allow(api_client).to receive(:register_phone_number).with('123456789', 223_456)
+        allow(api_client).to receive(:subscribe_waba_webhook)
+          .with(waba_id, anything, 'test_verify_token')
+          .and_return({ 'success' => true })
+        allow(channel).to receive(:save!)
+      end
+
+      it 'registers the phone number' do
+        with_modified_env FRONTEND_URL: 'https://app.chatwoot.com' do
+          expect(api_client).to receive(:register_phone_number).with('123456789', 223_456)
+          service.perform
+        end
+      end
+
+      it 'sets up webhook subscription' do
+        with_modified_env FRONTEND_URL: 'https://app.chatwoot.com' do
+          expect(api_client).to receive(:subscribe_waba_webhook)
+            .with(waba_id, 'https://app.chatwoot.com/webhooks/whatsapp/+1234567890', 'test_verify_token')
+          service.perform
+        end
+      end
+    end
+
+    context 'when phone registration fails' do
+      before do
+        allow(SecureRandom).to receive(:random_number).with(900_000).and_return(123_456)
+        allow(api_client).to receive(:register_phone_number)
+          .and_raise('Registration failed')
+        allow(api_client).to receive(:subscribe_waba_webhook)
+          .and_return({ 'success' => true })
+      end
+
+      it 'continues with webhook setup' do
+        with_modified_env FRONTEND_URL: 'https://app.chatwoot.com' do
+          expect(api_client).to receive(:subscribe_waba_webhook)
+          expect { service.perform }.not_to raise_error
+        end
+      end
+    end
+
+    context 'when webhook setup fails' do
+      before do
+        allow(SecureRandom).to receive(:random_number).with(900_000).and_return(123_456)
+        allow(api_client).to receive(:register_phone_number)
+        allow(api_client).to receive(:subscribe_waba_webhook)
+          .and_raise('Webhook failed')
+      end
+
+      it 'raises an error' do
+        with_modified_env FRONTEND_URL: 'https://app.chatwoot.com' do
+          expect { service.perform }.to raise_error(/Webhook setup failed/)
+        end
+      end
+    end
+
+    context 'when required parameters are missing' do
+      it 'raises error when channel is nil' do
+        service = described_class.new(nil, waba_id, access_token)
+        expect { service.perform }.to raise_error(ArgumentError, 'Channel is required')
+      end
+
+      it 'raises error when waba_id is blank' do
+        service = described_class.new(channel, '', access_token)
+        expect { service.perform }.to raise_error(ArgumentError, 'WABA ID is required')
+      end
+
+      it 'raises error when access_token is blank' do
+        service = described_class.new(channel, waba_id, '')
+        expect { service.perform }.to raise_error(ArgumentError, 'Access token is required')
+      end
+    end
+
+    context 'when PIN already exists' do
+      before do
+        channel.provider_config['verification_pin'] = 123_456
+        allow(api_client).to receive(:register_phone_number)
+        allow(api_client).to receive(:subscribe_waba_webhook).and_return({ 'success' => true })
+        allow(channel).to receive(:save!)
+      end
+
+      it 'reuses existing PIN' do
+        with_modified_env FRONTEND_URL: 'https://app.chatwoot.com' do
+          expect(api_client).to receive(:register_phone_number).with('123456789', 123_456)
+          expect(SecureRandom).not_to receive(:random_number)
+          service.perform
+        end
+      end
+    end
+  end
+end

From 6b8dd3c86ad0b45f72b2820a1671e3bec5f27c59 Mon Sep 17 00:00:00 2001
From: Vishnu Narayanan <iamwishnu@gmail.com>
Date: Wed, 16 Jul 2025 08:19:00 +0530
Subject: [PATCH 15/20] chore: move UpdateMessageStatus to deferred queue
 (#11943)

-  move `UpdateMessageStatus` to `deferred` queue below `scheduled_jobs`

---------

Co-authored-by: Pranav <pranav@chatwoot.com>
Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
---
 app/jobs/conversations/update_message_status_job.rb       | 2 +-
 config/sidekiq.yml                                        | 1 +
 spec/jobs/conversations/update_message_status_job_spec.rb | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/jobs/conversations/update_message_status_job.rb b/app/jobs/conversations/update_message_status_job.rb
index 6fcef4361..efe2937b4 100644
--- a/app/jobs/conversations/update_message_status_job.rb
+++ b/app/jobs/conversations/update_message_status_job.rb
@@ -1,5 +1,5 @@
 class Conversations::UpdateMessageStatusJob < ApplicationJob
-  queue_as :low
+  queue_as :deferred
 
   # This job only support marking messages as read or delivered, update this array if we want to support more statuses
   VALID_STATUSES = %w[read delivered].freeze
diff --git a/config/sidekiq.yml b/config/sidekiq.yml
index af813d92a..d2d764382 100644
--- a/config/sidekiq.yml
+++ b/config/sidekiq.yml
@@ -23,6 +23,7 @@
   - action_mailbox_routing
   - low
   - scheduled_jobs
+  - deferred
   - housekeeping
   - async_database_migration
   - active_storage_analysis
diff --git a/spec/jobs/conversations/update_message_status_job_spec.rb b/spec/jobs/conversations/update_message_status_job_spec.rb
index ff5c90292..508d2dc1c 100644
--- a/spec/jobs/conversations/update_message_status_job_spec.rb
+++ b/spec/jobs/conversations/update_message_status_job_spec.rb
@@ -10,7 +10,7 @@ RSpec.describe Conversations::UpdateMessageStatusJob do
   it 'enqueues the job' do
     expect { job }.to have_enqueued_job(described_class)
       .with(conversation.id, conversation.contact_last_seen_at, :read)
-      .on_queue('low')
+      .on_queue('deferred')
   end
 
   context 'when called' do

From 0ea616a6eaeb0398b474d46192d142bf43c3d1f0 Mon Sep 17 00:00:00 2001
From: Aman Kumar <72304680+Aman-14@users.noreply.github.com>
Date: Wed, 16 Jul 2025 09:04:02 +0530
Subject: [PATCH 16/20] feat: WhatsApp campaigns (#11910)

# Pull Request Template

## Description

This PR adds support for WhatsApp campaigns to Chatwoot, allowing
businesses to reach their customers through WhatsApp. The implementation
includes backend support for WhatsApp template messages, frontend UI
components, and integration with the existing campaign system.

Fixes #8465

Fixes https://linear.app/chatwoot/issue/CW-3390/whatsapp-campaigns

## Type of change

- [x] New feature (non-breaking change which adds functionality)
- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] Breaking change (fix or feature that would cause existing
functionality not to work as expected)
- [ ] This change requires a documentation update

## How Has This Been Tested?

- Tested WhatsApp campaign creation UI flow
- Verified backend API endpoints for campaign creation
- Tested campaign service integration with WhatsApp templates
- Validated proper filtering of WhatsApp campaigns in the store

## Checklist:

- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my code
- [x] I have commented on my code, particularly in hard-to-understand
areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [ ] New and existing unit tests pass locally with my changes
- [ ] Any dependent changes have been merged and published in downstream
modules

## What we have changed:

We have added support for WhatsApp campaigns as requested in the
discussion.
Ref: https://github.com/orgs/chatwoot/discussions/8465

**Note:** This implementation doesn't exactly match the maintainer's
specification and variable support is missing. This is an initial
implementation that provides the core WhatsApp campaign functionality.

### Changes included:

**Backend:**
- Added `template_params` column to campaigns table (migration + schema)
- Created `Whatsapp::OneoffCampaignService` for WhatsApp campaign
execution
- Updated campaign model to support WhatsApp inbox types
- Added template_params support to campaign controller and API

**Frontend:**
- Added WhatsApp campaign page, dialog, and form components
- Updated campaign store to filter WhatsApp campaigns separately
- Added WhatsApp-specific routes and empty state
- Updated i18n translations for WhatsApp campaigns
- Modified sidebar to include WhatsApp campaigns navigation

This provides a foundation for WhatsApp campaigns that can be extended
with variable support and other enhancements in future iterations.

---------

Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 .../api/v1/accounts/campaigns_controller.rb   |   2 +-
 .../EmptyState/WhatsAppCampaignEmptyState.vue |  37 ++
 .../WhatsAppCampaignDialog.vue                |  48 +++
 .../WhatsAppCampaign/WhatsAppCampaignForm.vue | 357 ++++++++++++++++++
 .../components-next/sidebar/Sidebar.vue       |   5 +
 app/javascript/dashboard/featureFlags.js      |   1 +
 .../dashboard/i18n/locale/en/campaign.json    |  64 ++++
 .../dashboard/i18n/locale/en/settings.json    |   1 +
 .../dashboard/campaigns/campaigns.routes.js   |  10 +
 .../campaigns/pages/LiveChatCampaignsPage.vue |   7 +-
 .../campaigns/pages/SMSCampaignsPage.vue      |   5 +-
 .../campaigns/pages/WhatsAppCampaignsPage.vue |  74 ++++
 .../dashboard/store/modules/campaigns.js      |  35 +-
 .../dashboard/store/modules/inboxes.js        |   5 +
 .../store/modules/specs/campaigns/fixtures.js |  55 +++
 .../modules/specs/campaigns/getters.spec.js   |  64 +++-
 app/models/campaign.rb                        |  19 +-
 .../whatsapp/oneoff_campaign_service.rb       |  94 +++++
 .../whatsapp/send_on_whatsapp_service.rb      |  88 +----
 .../whatsapp/template_processor_service.rb    |  95 +++++
 .../api/v1/models/_campaign.json.jbuilder     |   1 +
 config/features.yml                           |   3 +
 ...102213_add_template_params_to_campaigns.rb |   5 +
 db/schema.rb                                  |   1 +
 spec/factories/campaigns.rb                   |  17 +
 spec/factories/channel/channel_whatsapp.rb    |   1 +
 .../whatsapp/oneoff_campaign_service_spec.rb  | 169 +++++++++
 27 files changed, 1152 insertions(+), 111 deletions(-)
 create mode 100644 app/javascript/dashboard/components-next/Campaigns/EmptyState/WhatsAppCampaignEmptyState.vue
 create mode 100644 app/javascript/dashboard/components-next/Campaigns/Pages/CampaignPage/WhatsAppCampaign/WhatsAppCampaignDialog.vue
 create mode 100644 app/javascript/dashboard/components-next/Campaigns/Pages/CampaignPage/WhatsAppCampaign/WhatsAppCampaignForm.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/campaigns/pages/WhatsAppCampaignsPage.vue
 create mode 100644 app/services/whatsapp/oneoff_campaign_service.rb
 create mode 100644 app/services/whatsapp/template_processor_service.rb
 create mode 100644 db/migrate/20250709102213_add_template_params_to_campaigns.rb
 create mode 100644 spec/services/whatsapp/oneoff_campaign_service_spec.rb

diff --git a/app/controllers/api/v1/accounts/campaigns_controller.rb b/app/controllers/api/v1/accounts/campaigns_controller.rb
index b1a132246..2a1650e53 100644
--- a/app/controllers/api/v1/accounts/campaigns_controller.rb
+++ b/app/controllers/api/v1/accounts/campaigns_controller.rb
@@ -29,6 +29,6 @@ class Api::V1::Accounts::CampaignsController < Api::V1::Accounts::BaseController
 
   def campaign_params
     params.require(:campaign).permit(:title, :description, :message, :enabled, :trigger_only_during_business_hours, :inbox_id, :sender_id,
-                                     :scheduled_at, audience: [:type, :id], trigger_rules: {})
+                                     :scheduled_at, audience: [:type, :id], trigger_rules: {}, template_params: {})
   end
 end
diff --git a/app/javascript/dashboard/components-next/Campaigns/EmptyState/WhatsAppCampaignEmptyState.vue b/app/javascript/dashboard/components-next/Campaigns/EmptyState/WhatsAppCampaignEmptyState.vue
new file mode 100644
index 000000000..ab01acb4a
--- /dev/null
+++ b/app/javascript/dashboard/components-next/Campaigns/EmptyState/WhatsAppCampaignEmptyState.vue
@@ -0,0 +1,37 @@
+<script setup>
+import { ONE_OFF_CAMPAIGN_EMPTY_STATE_CONTENT } from './CampaignEmptyStateContent';
+
+import EmptyStateLayout from 'dashboard/components-next/EmptyStateLayout.vue';
+import CampaignCard from 'dashboard/components-next/Campaigns/CampaignCard/CampaignCard.vue';
+
+defineProps({
+  title: {
+    type: String,
+    default: '',
+  },
+  subtitle: {
+    type: String,
+    default: '',
+  },
+});
+</script>
+
+<template>
+  <EmptyStateLayout :title="title" :subtitle="subtitle">
+    <template #empty-state-item>
+      <div class="flex flex-col gap-4 p-px">
+        <CampaignCard
+          v-for="campaign in ONE_OFF_CAMPAIGN_EMPTY_STATE_CONTENT"
+          :key="campaign.id"
+          :title="campaign.title"
+          :message="campaign.message"
+          :is-enabled="campaign.enabled"
+          :status="campaign.campaign_status"
+          :sender="campaign.sender"
+          :inbox="campaign.inbox"
+          :scheduled-at="campaign.scheduled_at"
+        />
+      </div>
+    </template>
+  </EmptyStateLayout>
+</template>
diff --git a/app/javascript/dashboard/components-next/Campaigns/Pages/CampaignPage/WhatsAppCampaign/WhatsAppCampaignDialog.vue b/app/javascript/dashboard/components-next/Campaigns/Pages/CampaignPage/WhatsAppCampaign/WhatsAppCampaignDialog.vue
new file mode 100644
index 000000000..12a789fee
--- /dev/null
+++ b/app/javascript/dashboard/components-next/Campaigns/Pages/CampaignPage/WhatsAppCampaign/WhatsAppCampaignDialog.vue
@@ -0,0 +1,48 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { useStore } from 'dashboard/composables/store';
+import { useAlert, useTrack } from 'dashboard/composables';
+import { CAMPAIGN_TYPES } from 'shared/constants/campaign.js';
+import { CAMPAIGNS_EVENTS } from 'dashboard/helper/AnalyticsHelper/events.js';
+
+import WhatsAppCampaignForm from 'dashboard/components-next/Campaigns/Pages/CampaignPage/WhatsAppCampaign/WhatsAppCampaignForm.vue';
+
+const emit = defineEmits(['close']);
+
+const store = useStore();
+const { t } = useI18n();
+
+const addCampaign = async campaignDetails => {
+  try {
+    await store.dispatch('campaigns/create', campaignDetails);
+
+    useTrack(CAMPAIGNS_EVENTS.CREATE_CAMPAIGN, {
+      type: CAMPAIGN_TYPES.ONE_OFF,
+    });
+
+    useAlert(t('CAMPAIGN.WHATSAPP.CREATE.FORM.API.SUCCESS_MESSAGE'));
+  } catch (error) {
+    const errorMessage =
+      error?.response?.message ||
+      t('CAMPAIGN.WHATSAPP.CREATE.FORM.API.ERROR_MESSAGE');
+    useAlert(errorMessage);
+  }
+};
+
+const handleSubmit = campaignDetails => {
+  addCampaign(campaignDetails);
+};
+
+const handleClose = () => emit('close');
+</script>
+
+<template>
+  <div
+    class="w-[25rem] z-50 min-w-0 absolute top-10 ltr:right-0 rtl:left-0 bg-n-alpha-3 backdrop-blur-[100px] p-6 rounded-xl border border-n-weak shadow-md flex flex-col gap-6"
+  >
+    <h3 class="text-base font-medium text-n-slate-12">
+      {{ t(`CAMPAIGN.WHATSAPP.CREATE.TITLE`) }}
+    </h3>
+    <WhatsAppCampaignForm @submit="handleSubmit" @cancel="handleClose" />
+  </div>
+</template>
diff --git a/app/javascript/dashboard/components-next/Campaigns/Pages/CampaignPage/WhatsAppCampaign/WhatsAppCampaignForm.vue b/app/javascript/dashboard/components-next/Campaigns/Pages/CampaignPage/WhatsAppCampaign/WhatsAppCampaignForm.vue
new file mode 100644
index 000000000..df76ae901
--- /dev/null
+++ b/app/javascript/dashboard/components-next/Campaigns/Pages/CampaignPage/WhatsAppCampaign/WhatsAppCampaignForm.vue
@@ -0,0 +1,357 @@
+<script setup>
+import { reactive, computed, watch, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useVuelidate } from '@vuelidate/core';
+import { required, minLength } from '@vuelidate/validators';
+import { useMapGetter } from 'dashboard/composables/store';
+
+import Input from 'dashboard/components-next/input/Input.vue';
+import Button from 'dashboard/components-next/button/Button.vue';
+import ComboBox from 'dashboard/components-next/combobox/ComboBox.vue';
+import TagMultiSelectComboBox from 'dashboard/components-next/combobox/TagMultiSelectComboBox.vue';
+
+const emit = defineEmits(['submit', 'cancel']);
+
+const { t } = useI18n();
+
+const formState = {
+  uiFlags: useMapGetter('campaigns/getUIFlags'),
+  labels: useMapGetter('labels/getLabels'),
+  inboxes: useMapGetter('inboxes/getWhatsAppInboxes'),
+  getWhatsAppTemplates: useMapGetter('inboxes/getWhatsAppTemplates'),
+};
+
+const initialState = {
+  title: '',
+  inboxId: null,
+  templateId: null,
+  scheduledAt: null,
+  selectedAudience: [],
+};
+
+const state = reactive({ ...initialState });
+const processedParams = ref({});
+
+const rules = {
+  title: { required, minLength: minLength(1) },
+  inboxId: { required },
+  templateId: { required },
+  scheduledAt: { required },
+  selectedAudience: { required },
+};
+
+const v$ = useVuelidate(rules, state);
+
+const isCreating = computed(() => formState.uiFlags.value.isCreating);
+
+const currentDateTime = computed(() => {
+  // Added to disable the scheduled at field from being set to the current time
+  const now = new Date();
+  const localTime = new Date(now.getTime() - now.getTimezoneOffset() * 60000);
+  return localTime.toISOString().slice(0, 16);
+});
+
+const mapToOptions = (items, valueKey, labelKey) =>
+  items?.map(item => ({
+    value: item[valueKey],
+    label: item[labelKey],
+  })) ?? [];
+
+const audienceList = computed(() =>
+  mapToOptions(formState.labels.value, 'id', 'title')
+);
+
+const inboxOptions = computed(() =>
+  mapToOptions(formState.inboxes.value, 'id', 'name')
+);
+
+const templateOptions = computed(() => {
+  if (!state.inboxId) return [];
+  const templates = formState.getWhatsAppTemplates.value(state.inboxId);
+  return templates.map(template => {
+    // Create a more user-friendly label from template name
+    const friendlyName = template.name
+      .replace(/_/g, ' ')
+      .replace(/\b\w/g, l => l.toUpperCase());
+
+    return {
+      value: template.id,
+      label: `${friendlyName} (${template.language || 'en'})`,
+      template: template,
+    };
+  });
+});
+
+const selectedTemplate = computed(() => {
+  if (!state.templateId) return null;
+  return templateOptions.value.find(option => option.value === state.templateId)
+    ?.template;
+});
+
+const templateString = computed(() => {
+  if (!selectedTemplate.value) return '';
+  try {
+    return (
+      selectedTemplate.value.components?.find(
+        component => component.type === 'BODY'
+      )?.text || ''
+    );
+  } catch (error) {
+    return '';
+  }
+});
+
+const processedString = computed(() => {
+  if (!templateString.value) return '';
+  return templateString.value.replace(/{{([^}]+)}}/g, (match, variable) => {
+    return processedParams.value[variable] || `{{${variable}}}`;
+  });
+});
+
+const getErrorMessage = (field, errorKey) => {
+  const baseKey = 'CAMPAIGN.WHATSAPP.CREATE.FORM';
+  return v$.value[field].$error ? t(`${baseKey}.${errorKey}.ERROR`) : '';
+};
+
+const formErrors = computed(() => ({
+  title: getErrorMessage('title', 'TITLE'),
+  inbox: getErrorMessage('inboxId', 'INBOX'),
+  template: getErrorMessage('templateId', 'TEMPLATE'),
+  scheduledAt: getErrorMessage('scheduledAt', 'SCHEDULED_AT'),
+  audience: getErrorMessage('selectedAudience', 'AUDIENCE'),
+}));
+
+const hasRequiredTemplateParams = computed(() => {
+  const params = Object.values(processedParams.value);
+  return params.length === 0 || params.every(param => param.trim() !== '');
+});
+
+const isSubmitDisabled = computed(
+  () => v$.value.$invalid || !hasRequiredTemplateParams.value
+);
+
+const formatToUTCString = localDateTime =>
+  localDateTime ? new Date(localDateTime).toISOString() : null;
+
+const resetState = () => {
+  Object.assign(state, initialState);
+  processedParams.value = {};
+  v$.value.$reset();
+};
+
+const handleCancel = () => emit('cancel');
+
+const generateVariables = () => {
+  const matchedVariables = templateString.value.match(/{{([^}]+)}}/g);
+  if (!matchedVariables) {
+    processedParams.value = {};
+    return;
+  }
+
+  const finalVars = matchedVariables.map(match => match.replace(/{{|}}/g, ''));
+  processedParams.value = finalVars.reduce((acc, variable) => {
+    acc[variable] = processedParams.value[variable] || '';
+    return acc;
+  }, {});
+};
+
+const prepareCampaignDetails = () => {
+  // Find the selected template to get its content
+  const currentTemplate = selectedTemplate.value;
+
+  // Extract template content - this should be the template message body
+  const templateContent = templateString.value;
+
+  // Prepare template_params object with the same structure as used in contacts
+  const templateParams = {
+    name: currentTemplate?.name || '',
+    namespace: currentTemplate?.namespace || '',
+    category: currentTemplate?.category || 'UTILITY',
+    language: currentTemplate?.language || 'en_US',
+    processed_params: processedParams.value,
+  };
+
+  return {
+    title: state.title,
+    message: templateContent,
+    template_params: templateParams,
+    inbox_id: state.inboxId,
+    scheduled_at: formatToUTCString(state.scheduledAt),
+    audience: state.selectedAudience?.map(id => ({
+      id,
+      type: 'Label',
+    })),
+  };
+};
+
+const handleSubmit = async () => {
+  const isFormValid = await v$.value.$validate();
+  if (!isFormValid) return;
+
+  emit('submit', prepareCampaignDetails());
+  resetState();
+  handleCancel();
+};
+
+// Reset template selection when inbox changes
+watch(
+  () => state.inboxId,
+  () => {
+    state.templateId = null;
+    processedParams.value = {};
+  }
+);
+
+// Generate variables when template changes
+watch(
+  () => state.templateId,
+  () => {
+    generateVariables();
+  }
+);
+</script>
+
+<template>
+  <form class="flex flex-col gap-4" @submit.prevent="handleSubmit">
+    <Input
+      v-model="state.title"
+      :label="t('CAMPAIGN.WHATSAPP.CREATE.FORM.TITLE.LABEL')"
+      :placeholder="t('CAMPAIGN.WHATSAPP.CREATE.FORM.TITLE.PLACEHOLDER')"
+      :message="formErrors.title"
+      :message-type="formErrors.title ? 'error' : 'info'"
+    />
+
+    <div class="flex flex-col gap-1">
+      <label for="inbox" class="mb-0.5 text-sm font-medium text-n-slate-12">
+        {{ t('CAMPAIGN.WHATSAPP.CREATE.FORM.INBOX.LABEL') }}
+      </label>
+      <ComboBox
+        id="inbox"
+        v-model="state.inboxId"
+        :options="inboxOptions"
+        :has-error="!!formErrors.inbox"
+        :placeholder="t('CAMPAIGN.WHATSAPP.CREATE.FORM.INBOX.PLACEHOLDER')"
+        :message="formErrors.inbox"
+        class="[&>div>button]:bg-n-alpha-black2 [&>div>button:not(.focused)]:dark:outline-n-weak [&>div>button:not(.focused)]:hover:!outline-n-slate-6"
+      />
+    </div>
+
+    <div class="flex flex-col gap-1">
+      <label for="template" class="mb-0.5 text-sm font-medium text-n-slate-12">
+        {{ t('CAMPAIGN.WHATSAPP.CREATE.FORM.TEMPLATE.LABEL') }}
+      </label>
+      <ComboBox
+        id="template"
+        v-model="state.templateId"
+        :options="templateOptions"
+        :has-error="!!formErrors.template"
+        :placeholder="t('CAMPAIGN.WHATSAPP.CREATE.FORM.TEMPLATE.PLACEHOLDER')"
+        :message="formErrors.template"
+        class="[&>div>button]:bg-n-alpha-black2 [&>div>button:not(.focused)]:dark:outline-n-weak [&>div>button:not(.focused)]:hover:!outline-n-slate-6"
+      />
+      <p class="mt-1 text-xs text-n-slate-11">
+        {{ t('CAMPAIGN.WHATSAPP.CREATE.FORM.TEMPLATE.INFO') }}
+      </p>
+    </div>
+
+    <!-- Template Preview -->
+    <div
+      v-if="selectedTemplate"
+      class="flex flex-col gap-4 p-4 rounded-lg bg-n-alpha-black2"
+    >
+      <div class="flex justify-between items-center">
+        <h3 class="text-sm font-medium text-n-slate-12">
+          {{ selectedTemplate.name }}
+        </h3>
+        <span class="text-xs text-n-slate-11">
+          {{ t('CAMPAIGN.WHATSAPP.CREATE.FORM.TEMPLATE.LANGUAGE') }}:
+          {{ selectedTemplate.language || 'en' }}
+        </span>
+      </div>
+
+      <div class="flex flex-col gap-2">
+        <div class="rounded-md bg-n-alpha-black3">
+          <div class="text-sm whitespace-pre-wrap text-n-slate-12">
+            {{ processedString }}
+          </div>
+        </div>
+      </div>
+
+      <div class="text-xs text-n-slate-11">
+        {{ t('CAMPAIGN.WHATSAPP.CREATE.FORM.TEMPLATE.CATEGORY') }}:
+        {{ selectedTemplate.category || 'UTILITY' }}
+      </div>
+    </div>
+
+    <!-- Template Variables -->
+    <div
+      v-if="Object.keys(processedParams).length > 0"
+      class="flex flex-col gap-3"
+    >
+      <label class="text-sm font-medium text-n-slate-12">
+        {{ t('CAMPAIGN.WHATSAPP.CREATE.FORM.TEMPLATE.VARIABLES_LABEL') }}
+      </label>
+      <div class="flex flex-col gap-2">
+        <div
+          v-for="(value, key) in processedParams"
+          :key="key"
+          class="flex gap-2 items-center"
+        >
+          <Input
+            v-model="processedParams[key]"
+            type="text"
+            class="flex-1"
+            :placeholder="
+              t('CAMPAIGN.WHATSAPP.CREATE.FORM.TEMPLATE.VARIABLE_PLACEHOLDER', {
+                variable: key,
+              })
+            "
+          />
+        </div>
+      </div>
+    </div>
+
+    <div class="flex flex-col gap-1">
+      <label for="audience" class="mb-0.5 text-sm font-medium text-n-slate-12">
+        {{ t('CAMPAIGN.WHATSAPP.CREATE.FORM.AUDIENCE.LABEL') }}
+      </label>
+      <TagMultiSelectComboBox
+        v-model="state.selectedAudience"
+        :options="audienceList"
+        :label="t('CAMPAIGN.WHATSAPP.CREATE.FORM.AUDIENCE.LABEL')"
+        :placeholder="t('CAMPAIGN.WHATSAPP.CREATE.FORM.AUDIENCE.PLACEHOLDER')"
+        :has-error="!!formErrors.audience"
+        :message="formErrors.audience"
+        class="[&>div>button]:bg-n-alpha-black2"
+      />
+    </div>
+
+    <Input
+      v-model="state.scheduledAt"
+      :label="t('CAMPAIGN.WHATSAPP.CREATE.FORM.SCHEDULED_AT.LABEL')"
+      type="datetime-local"
+      :min="currentDateTime"
+      :placeholder="t('CAMPAIGN.WHATSAPP.CREATE.FORM.SCHEDULED_AT.PLACEHOLDER')"
+      :message="formErrors.scheduledAt"
+      :message-type="formErrors.scheduledAt ? 'error' : 'info'"
+    />
+
+    <div class="flex gap-3 justify-between items-center w-full">
+      <Button
+        variant="faded"
+        color="slate"
+        type="button"
+        :label="t('CAMPAIGN.WHATSAPP.CREATE.FORM.BUTTONS.CANCEL')"
+        class="w-full bg-n-alpha-2 text-n-blue-text hover:bg-n-alpha-3"
+        @click="handleCancel"
+      />
+      <Button
+        :label="t('CAMPAIGN.WHATSAPP.CREATE.FORM.BUTTONS.CREATE')"
+        class="w-full"
+        type="submit"
+        :is-loading="isCreating"
+        :disabled="isCreating || isSubmitDisabled"
+      />
+    </div>
+  </form>
+</template>
diff --git a/app/javascript/dashboard/components-next/sidebar/Sidebar.vue b/app/javascript/dashboard/components-next/sidebar/Sidebar.vue
index 171f4a4d8..12f15ce4b 100644
--- a/app/javascript/dashboard/components-next/sidebar/Sidebar.vue
+++ b/app/javascript/dashboard/components-next/sidebar/Sidebar.vue
@@ -331,6 +331,11 @@ const menuItems = computed(() => {
           label: t('SIDEBAR.SMS'),
           to: accountScopedRoute('campaigns_sms_index'),
         },
+        {
+          name: 'WhatsApp',
+          label: t('SIDEBAR.WHATSAPP'),
+          to: accountScopedRoute('campaigns_whatsapp_index'),
+        },
       ],
     },
     {
diff --git a/app/javascript/dashboard/featureFlags.js b/app/javascript/dashboard/featureFlags.js
index 78109e82c..28b6b09b7 100644
--- a/app/javascript/dashboard/featureFlags.js
+++ b/app/javascript/dashboard/featureFlags.js
@@ -4,6 +4,7 @@ export const FEATURE_FLAGS = {
   AUTO_RESOLVE_CONVERSATIONS: 'auto_resolve_conversations',
   AUTOMATIONS: 'automations',
   CAMPAIGNS: 'campaigns',
+  WHATSAPP_CAMPAIGNS: 'whatsapp_campaign',
   CANNED_RESPONSES: 'canned_responses',
   CRM: 'crm',
   CUSTOM_ATTRIBUTES: 'custom_attributes',
diff --git a/app/javascript/dashboard/i18n/locale/en/campaign.json b/app/javascript/dashboard/i18n/locale/en/campaign.json
index e2418d52e..10366e79e 100644
--- a/app/javascript/dashboard/i18n/locale/en/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/en/campaign.json
@@ -137,6 +137,70 @@
         }
       }
     },
+    "WHATSAPP": {
+      "HEADER_TITLE": "WhatsApp campaigns",
+      "NEW_CAMPAIGN": "Create campaign",
+      "EMPTY_STATE": {
+        "TITLE": "No WhatsApp campaigns are available",
+        "SUBTITLE": "Launch a WhatsApp campaign to reach your customers directly. Send offers or make announcements with ease. Click 'Create campaign' to get started."
+      },
+      "CARD": {
+        "STATUS": {
+          "COMPLETED": "Completed",
+          "SCHEDULED": "Scheduled"
+        },
+        "CAMPAIGN_DETAILS": {
+          "SENT_FROM": "Sent from",
+          "ON": "on"
+        }
+      },
+      "CREATE": {
+        "TITLE": "Create WhatsApp campaign",
+        "CANCEL_BUTTON_TEXT": "Cancel",
+        "CREATE_BUTTON_TEXT": "Create",
+        "FORM": {
+          "TITLE": {
+            "LABEL": "Title",
+            "PLACEHOLDER": "Please enter the title of campaign",
+            "ERROR": "Title is required"
+          },
+          "INBOX": {
+            "LABEL": "Select Inbox",
+            "PLACEHOLDER": "Select Inbox",
+            "ERROR": "Inbox is required"
+          },
+          "TEMPLATE": {
+            "LABEL": "WhatsApp Template",
+            "PLACEHOLDER": "Select a template",
+            "INFO": "Select a template to use for this campaign.",
+            "ERROR": "Template is required",
+            "PREVIEW_TITLE": "Process {templateName}",
+            "LANGUAGE": "Language",
+            "CATEGORY": "Category",
+            "VARIABLES_LABEL": "Variables",
+            "VARIABLE_PLACEHOLDER": "Enter value for {variable}"
+          },
+          "AUDIENCE": {
+            "LABEL": "Audience",
+            "PLACEHOLDER": "Select the customer labels",
+            "ERROR": "Audience is required"
+          },
+          "SCHEDULED_AT": {
+            "LABEL": "Scheduled time",
+            "PLACEHOLDER": "Please select the time",
+            "ERROR": "Scheduled time is required"
+          },
+          "BUTTONS": {
+            "CREATE": "Create",
+            "CANCEL": "Cancel"
+          },
+          "API": {
+            "SUCCESS_MESSAGE": "WhatsApp campaign created successfully",
+            "ERROR_MESSAGE": "There was an error. Please try again."
+          }
+        }
+      }
+    },
     "CONFIRM_DELETE": {
       "TITLE": "Are you sure to delete?",
       "DESCRIPTION": "The delete action is permanent and cannot be reversed.",
diff --git a/app/javascript/dashboard/i18n/locale/en/settings.json b/app/javascript/dashboard/i18n/locale/en/settings.json
index 219041d75..fde198c92 100644
--- a/app/javascript/dashboard/i18n/locale/en/settings.json
+++ b/app/javascript/dashboard/i18n/locale/en/settings.json
@@ -319,6 +319,7 @@
     "CSAT": "CSAT",
     "LIVE_CHAT": "Live Chat",
     "SMS": "SMS",
+    "WHATSAPP": "WhatsApp",
     "CAMPAIGNS": "Campaigns",
     "ONGOING": "Ongoing",
     "ONE_OFF": "One off",
diff --git a/app/javascript/dashboard/routes/dashboard/campaigns/campaigns.routes.js b/app/javascript/dashboard/routes/dashboard/campaigns/campaigns.routes.js
index e0c1f3a17..c5f2dbdb1 100644
--- a/app/javascript/dashboard/routes/dashboard/campaigns/campaigns.routes.js
+++ b/app/javascript/dashboard/routes/dashboard/campaigns/campaigns.routes.js
@@ -3,6 +3,7 @@ import { frontendURL } from 'dashboard/helper/URLHelper.js';
 import CampaignsPageRouteView from './pages/CampaignsPageRouteView.vue';
 import LiveChatCampaignsPage from './pages/LiveChatCampaignsPage.vue';
 import SMSCampaignsPage from './pages/SMSCampaignsPage.vue';
+import WhatsAppCampaignsPage from './pages/WhatsAppCampaignsPage.vue';
 import { FEATURE_FLAGS } from 'dashboard/featureFlags';
 
 const meta = {
@@ -50,6 +51,15 @@ const campaignsRoutes = {
           meta,
           component: SMSCampaignsPage,
         },
+        {
+          path: 'whatsapp',
+          name: 'campaigns_whatsapp_index',
+          meta: {
+            ...meta,
+            featureFlag: FEATURE_FLAGS.WHATSAPP_CAMPAIGNS,
+          },
+          component: WhatsAppCampaignsPage,
+        },
       ],
     },
   ],
diff --git a/app/javascript/dashboard/routes/dashboard/campaigns/pages/LiveChatCampaignsPage.vue b/app/javascript/dashboard/routes/dashboard/campaigns/pages/LiveChatCampaignsPage.vue
index 93d5d1ec6..6cc2bf181 100644
--- a/app/javascript/dashboard/routes/dashboard/campaigns/pages/LiveChatCampaignsPage.vue
+++ b/app/javascript/dashboard/routes/dashboard/campaigns/pages/LiveChatCampaignsPage.vue
@@ -3,7 +3,6 @@ import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useToggle } from '@vueuse/core';
 import { useStoreGetters, useMapGetter } from 'dashboard/composables/store';
-import { CAMPAIGN_TYPES } from 'shared/constants/campaign.js';
 
 import Spinner from 'dashboard/components-next/spinner/Spinner.vue';
 import CampaignLayout from 'dashboard/components-next/Campaigns/CampaignLayout.vue';
@@ -25,8 +24,8 @@ const isFetchingCampaigns = computed(() => uiFlags.value.isFetching);
 
 const [showLiveChatCampaignDialog, toggleLiveChatCampaignDialog] = useToggle();
 
-const liveChatCampaigns = computed(() =>
-  getters['campaigns/getCampaigns'].value(CAMPAIGN_TYPES.ONGOING)
+const liveChatCampaigns = computed(
+  () => getters['campaigns/getLiveChatCampaigns'].value
 );
 
 const hasNoLiveChatCampaigns = computed(
@@ -59,7 +58,7 @@ const handleDelete = campaign => {
 
     <div
       v-if="isFetchingCampaigns"
-      class="flex items-center justify-center py-10 text-n-slate-11"
+      class="flex justify-center items-center py-10 text-n-slate-11"
     >
       <Spinner />
     </div>
diff --git a/app/javascript/dashboard/routes/dashboard/campaigns/pages/SMSCampaignsPage.vue b/app/javascript/dashboard/routes/dashboard/campaigns/pages/SMSCampaignsPage.vue
index a38a818f0..c04726ebe 100644
--- a/app/javascript/dashboard/routes/dashboard/campaigns/pages/SMSCampaignsPage.vue
+++ b/app/javascript/dashboard/routes/dashboard/campaigns/pages/SMSCampaignsPage.vue
@@ -3,7 +3,6 @@ import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useToggle } from '@vueuse/core';
 import { useStoreGetters, useMapGetter } from 'dashboard/composables/store';
-import { CAMPAIGN_TYPES } from 'shared/constants/campaign.js';
 
 import Spinner from 'dashboard/components-next/spinner/Spinner.vue';
 import CampaignLayout from 'dashboard/components-next/Campaigns/CampaignLayout.vue';
@@ -23,9 +22,7 @@ const isFetchingCampaigns = computed(() => uiFlags.value.isFetching);
 
 const confirmDeleteCampaignDialogRef = ref(null);
 
-const SMSCampaigns = computed(() =>
-  getters['campaigns/getCampaigns'].value(CAMPAIGN_TYPES.ONE_OFF)
-);
+const SMSCampaigns = computed(() => getters['campaigns/getSMSCampaigns'].value);
 
 const hasNoSMSCampaigns = computed(
   () => SMSCampaigns.value?.length === 0 && !isFetchingCampaigns.value
diff --git a/app/javascript/dashboard/routes/dashboard/campaigns/pages/WhatsAppCampaignsPage.vue b/app/javascript/dashboard/routes/dashboard/campaigns/pages/WhatsAppCampaignsPage.vue
new file mode 100644
index 000000000..96aa21b5a
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/campaigns/pages/WhatsAppCampaignsPage.vue
@@ -0,0 +1,74 @@
+<script setup>
+import { computed, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useToggle } from '@vueuse/core';
+import { useStoreGetters, useMapGetter } from 'dashboard/composables/store';
+
+import Spinner from 'dashboard/components-next/spinner/Spinner.vue';
+import CampaignLayout from 'dashboard/components-next/Campaigns/CampaignLayout.vue';
+import CampaignList from 'dashboard/components-next/Campaigns/Pages/CampaignPage/CampaignList.vue';
+import WhatsAppCampaignDialog from 'dashboard/components-next/Campaigns/Pages/CampaignPage/WhatsAppCampaign/WhatsAppCampaignDialog.vue';
+import ConfirmDeleteCampaignDialog from 'dashboard/components-next/Campaigns/Pages/CampaignPage/ConfirmDeleteCampaignDialog.vue';
+import WhatsAppCampaignEmptyState from 'dashboard/components-next/Campaigns/EmptyState/WhatsAppCampaignEmptyState.vue';
+
+const { t } = useI18n();
+const getters = useStoreGetters();
+
+const selectedCampaign = ref(null);
+const [showWhatsAppCampaignDialog, toggleWhatsAppCampaignDialog] = useToggle();
+
+const uiFlags = useMapGetter('campaigns/getUIFlags');
+const isFetchingCampaigns = computed(() => uiFlags.value.isFetching);
+
+const confirmDeleteCampaignDialogRef = ref(null);
+
+const WhatsAppCampaigns = computed(
+  () => getters['campaigns/getWhatsAppCampaigns'].value
+);
+
+const hasNoWhatsAppCampaigns = computed(
+  () => WhatsAppCampaigns.value?.length === 0 && !isFetchingCampaigns.value
+);
+
+const handleDelete = campaign => {
+  selectedCampaign.value = campaign;
+  confirmDeleteCampaignDialogRef.value.dialogRef.open();
+};
+</script>
+
+<template>
+  <CampaignLayout
+    :header-title="t('CAMPAIGN.WHATSAPP.HEADER_TITLE')"
+    :button-label="t('CAMPAIGN.WHATSAPP.NEW_CAMPAIGN')"
+    @click="toggleWhatsAppCampaignDialog()"
+    @close="toggleWhatsAppCampaignDialog(false)"
+  >
+    <template #action>
+      <WhatsAppCampaignDialog
+        v-if="showWhatsAppCampaignDialog"
+        @close="toggleWhatsAppCampaignDialog(false)"
+      />
+    </template>
+    <div
+      v-if="isFetchingCampaigns"
+      class="flex items-center justify-center py-10 text-n-slate-11"
+    >
+      <Spinner />
+    </div>
+    <CampaignList
+      v-else-if="!hasNoWhatsAppCampaigns"
+      :campaigns="WhatsAppCampaigns"
+      @delete="handleDelete"
+    />
+    <WhatsAppCampaignEmptyState
+      v-else
+      :title="t('CAMPAIGN.WHATSAPP.EMPTY_STATE.TITLE')"
+      :subtitle="t('CAMPAIGN.WHATSAPP.EMPTY_STATE.SUBTITLE')"
+      class="pt-14"
+    />
+    <ConfirmDeleteCampaignDialog
+      ref="confirmDeleteCampaignDialogRef"
+      :selected-campaign="selectedCampaign"
+    />
+  </CampaignLayout>
+</template>
diff --git a/app/javascript/dashboard/store/modules/campaigns.js b/app/javascript/dashboard/store/modules/campaigns.js
index c5a73d1d3..c558716f0 100644
--- a/app/javascript/dashboard/store/modules/campaigns.js
+++ b/app/javascript/dashboard/store/modules/campaigns.js
@@ -3,6 +3,8 @@ import types from '../mutation-types';
 import CampaignsAPI from '../../api/campaigns';
 import AnalyticsHelper from '../../helper/AnalyticsHelper';
 import { CAMPAIGNS_EVENTS } from '../../helper/AnalyticsHelper/events';
+import { CAMPAIGN_TYPES } from 'shared/constants/campaign';
+import { INBOX_TYPES } from 'dashboard/helper/inbox';
 
 export const state = {
   records: [],
@@ -16,10 +18,35 @@ export const getters = {
   getUIFlags(_state) {
     return _state.uiFlags;
   },
-  getCampaigns: _state => campaignType => {
-    return _state.records
-      .filter(record => record.campaign_type === campaignType)
-      .sort((a1, a2) => a1.id - a2.id);
+  getCampaigns:
+    _state =>
+    (campaignType, inboxChannelTypes = null) => {
+      let filteredRecords = _state.records.filter(
+        record => record.campaign_type === campaignType
+      );
+
+      if (inboxChannelTypes && Array.isArray(inboxChannelTypes)) {
+        filteredRecords = filteredRecords.filter(record => {
+          return (
+            record.inbox &&
+            inboxChannelTypes.includes(record.inbox.channel_type)
+          );
+        });
+      }
+
+      return filteredRecords.sort((a1, a2) => a1.id - a2.id);
+    },
+  getSMSCampaigns: (_state, _getters) => {
+    const smsChannelTypes = [INBOX_TYPES.SMS, INBOX_TYPES.TWILIO];
+    return _getters.getCampaigns(CAMPAIGN_TYPES.ONE_OFF, smsChannelTypes);
+  },
+  getWhatsAppCampaigns: (_state, _getters) => {
+    const whatsappChannelTypes = [INBOX_TYPES.WHATSAPP];
+    return _getters.getCampaigns(CAMPAIGN_TYPES.ONE_OFF, whatsappChannelTypes);
+  },
+  getLiveChatCampaigns: (_state, _getters) => {
+    const liveChatChannelTypes = [INBOX_TYPES.WEB];
+    return _getters.getCampaigns(CAMPAIGN_TYPES.ONGOING, liveChatChannelTypes);
   },
   getAllCampaigns: _state => {
     return _state.records;
diff --git a/app/javascript/dashboard/store/modules/inboxes.js b/app/javascript/dashboard/store/modules/inboxes.js
index 68f4780e9..14bd4c2a9 100644
--- a/app/javascript/dashboard/store/modules/inboxes.js
+++ b/app/javascript/dashboard/store/modules/inboxes.js
@@ -96,6 +96,11 @@ export const getters = {
         (item.channel_type === INBOX_TYPES.TWILIO && item.medium === 'sms')
     );
   },
+  getWhatsAppInboxes($state) {
+    return $state.records.filter(
+      item => item.channel_type === INBOX_TYPES.WHATSAPP
+    );
+  },
   dialogFlowEnabledInboxes($state) {
     return $state.records.filter(
       item => item.channel_type !== INBOX_TYPES.EMAIL
diff --git a/app/javascript/dashboard/store/modules/specs/campaigns/fixtures.js b/app/javascript/dashboard/store/modules/specs/campaigns/fixtures.js
index 08fd398e2..400b43638 100644
--- a/app/javascript/dashboard/store/modules/specs/campaigns/fixtures.js
+++ b/app/javascript/dashboard/store/modules/specs/campaigns/fixtures.js
@@ -11,6 +11,11 @@ export default [
       url: 'https://github.com',
       time_on_page: 10,
     },
+    inbox: {
+      id: 1,
+      channel_type: 'Channel::WebWidget',
+      name: 'Web Widget',
+    },
     created_at: '2021-05-03T04:53:36.354Z',
     updated_at: '2021-05-03T04:53:36.354Z',
   },
@@ -24,6 +29,11 @@ export default [
       url: 'https://chatwoot.com',
       time_on_page: '20',
     },
+    inbox: {
+      id: 2,
+      channel_type: 'Channel::TwilioSms',
+      name: 'Twilio SMS',
+    },
     created_at: '2021-05-03T08:15:35.828Z',
     updated_at: '2021-05-03T08:15:35.828Z',
   },
@@ -39,7 +49,52 @@ export default [
       url: 'https://noshow.com',
       time_on_page: 10,
     },
+    inbox: {
+      id: 3,
+      channel_type: 'Channel::WebWidget',
+      name: 'Web Widget 2',
+    },
     created_at: '2021-05-03T10:22:51.025Z',
     updated_at: '2021-05-03T10:22:51.025Z',
   },
+  {
+    id: 4,
+    title: 'WhatsApp Campaign',
+    description: null,
+    account_id: 1,
+    campaign_type: 'one_off',
+    message: 'Hello {{name}}, your order is ready!',
+    enabled: true,
+    trigger_rules: {},
+    inbox: {
+      id: 4,
+      channel_type: 'Channel::Whatsapp',
+      name: 'WhatsApp Business',
+    },
+    template_params: {
+      name: 'order_ready',
+      namespace: 'business_namespace',
+      language: 'en_US',
+      processed_params: { name: 'John' },
+    },
+    created_at: '2021-05-03T12:15:35.828Z',
+    updated_at: '2021-05-03T12:15:35.828Z',
+  },
+  {
+    id: 5,
+    title: 'SMS Promotion',
+    description: null,
+    account_id: 1,
+    campaign_type: 'one_off',
+    message: 'Get 20% off your next order!',
+    enabled: true,
+    trigger_rules: {},
+    inbox: {
+      id: 5,
+      channel_type: 'Channel::Sms',
+      name: 'SMS Channel',
+    },
+    created_at: '2021-05-03T14:15:35.828Z',
+    updated_at: '2021-05-03T14:15:35.828Z',
+  },
 ];
diff --git a/app/javascript/dashboard/store/modules/specs/campaigns/getters.spec.js b/app/javascript/dashboard/store/modules/specs/campaigns/getters.spec.js
index 52f14c296..231b83adc 100644
--- a/app/javascript/dashboard/store/modules/specs/campaigns/getters.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/campaigns/getters.spec.js
@@ -13,20 +13,58 @@ describe('#getters', () => {
   it('get one_off campaigns', () => {
     const state = { records: campaigns };
     expect(getters.getCampaigns(state)('one_off')).toEqual([
-      {
-        id: 2,
-        title: 'Onboarding Campaign',
-        description: null,
-        account_id: 1,
-        campaign_type: 'one_off',
+      campaigns[1],
+      campaigns[3],
+      campaigns[4],
+    ]);
+  });
 
-        trigger_rules: {
-          url: 'https://chatwoot.com',
-          time_on_page: '20',
-        },
-        created_at: '2021-05-03T08:15:35.828Z',
-        updated_at: '2021-05-03T08:15:35.828Z',
-      },
+  it('get campaigns by channel type', () => {
+    const state = { records: campaigns };
+    expect(
+      getters.getCampaigns(state)('one_off', ['Channel::Whatsapp'])
+    ).toEqual([campaigns[3]]);
+  });
+
+  it('get campaigns by multiple channel types', () => {
+    const state = { records: campaigns };
+    expect(
+      getters.getCampaigns(state)('one_off', [
+        'Channel::TwilioSms',
+        'Channel::Sms',
+      ])
+    ).toEqual([campaigns[1], campaigns[4]]);
+  });
+
+  it('get SMS campaigns', () => {
+    const state = { records: campaigns };
+    const mockGetters = {
+      getCampaigns: getters.getCampaigns(state),
+    };
+    expect(getters.getSMSCampaigns(state, mockGetters)).toEqual([
+      campaigns[1],
+      campaigns[4],
+    ]);
+  });
+
+  it('get WhatsApp campaigns', () => {
+    const state = { records: campaigns };
+    const mockGetters = {
+      getCampaigns: getters.getCampaigns(state),
+    };
+    expect(getters.getWhatsAppCampaigns(state, mockGetters)).toEqual([
+      campaigns[3],
+    ]);
+  });
+
+  it('get Live Chat campaigns', () => {
+    const state = { records: campaigns };
+    const mockGetters = {
+      getCampaigns: getters.getCampaigns(state),
+    };
+    expect(getters.getLiveChatCampaigns(state, mockGetters)).toEqual([
+      campaigns[0],
+      campaigns[2],
     ]);
   });
 
diff --git a/app/models/campaign.rb b/app/models/campaign.rb
index f937b1d71..2927181c6 100644
--- a/app/models/campaign.rb
+++ b/app/models/campaign.rb
@@ -10,6 +10,7 @@
 #  enabled                            :boolean          default(TRUE)
 #  message                            :text             not null
 #  scheduled_at                       :datetime
+#  template_params                    :jsonb
 #  title                              :string           not null
 #  trigger_only_during_business_hours :boolean          default(FALSE)
 #  trigger_rules                      :jsonb
@@ -57,12 +58,22 @@ class Campaign < ApplicationRecord
     return unless one_off?
     return if completed?
 
-    Twilio::OneoffSmsCampaignService.new(campaign: self).perform if inbox.inbox_type == 'Twilio SMS'
-    Sms::OneoffSmsCampaignService.new(campaign: self).perform if inbox.inbox_type == 'Sms'
+    execute_campaign
   end
 
   private
 
+  def execute_campaign
+    case inbox.inbox_type
+    when 'Twilio SMS'
+      Twilio::OneoffSmsCampaignService.new(campaign: self).perform
+    when 'Sms'
+      Sms::OneoffSmsCampaignService.new(campaign: self).perform
+    when 'Whatsapp'
+      Whatsapp::OneoffCampaignService.new(campaign: self).perform if account.feature_enabled?(:whatsapp_campaign)
+    end
+  end
+
   def set_display_id
     reload
   end
@@ -70,14 +81,14 @@ class Campaign < ApplicationRecord
   def validate_campaign_inbox
     return unless inbox
 
-    errors.add :inbox, 'Unsupported Inbox type' unless ['Website', 'Twilio SMS', 'Sms'].include? inbox.inbox_type
+    errors.add :inbox, 'Unsupported Inbox type' unless ['Website', 'Twilio SMS', 'Sms', 'Whatsapp'].include? inbox.inbox_type
   end
 
   # TO-DO we clean up with better validations when campaigns evolve into more inboxes
   def ensure_correct_campaign_attributes
     return if inbox.blank?
 
-    if ['Twilio SMS', 'Sms'].include?(inbox.inbox_type)
+    if ['Twilio SMS', 'Sms', 'Whatsapp'].include?(inbox.inbox_type)
       self.campaign_type = 'one_off'
       self.scheduled_at ||= Time.now.utc
     else
diff --git a/app/services/whatsapp/oneoff_campaign_service.rb b/app/services/whatsapp/oneoff_campaign_service.rb
new file mode 100644
index 000000000..c2f0080f3
--- /dev/null
+++ b/app/services/whatsapp/oneoff_campaign_service.rb
@@ -0,0 +1,94 @@
+class Whatsapp::OneoffCampaignService
+  pattr_initialize [:campaign!]
+
+  def perform
+    validate_campaign!
+    process_audience(extract_audience_labels)
+    campaign.completed!
+  end
+
+  private
+
+  delegate :inbox, to: :campaign
+  delegate :channel, to: :inbox
+
+  def validate_campaign_type!
+    raise "Invalid campaign #{campaign.id}" unless whatsapp_campaign? && campaign.one_off?
+  end
+
+  def whatsapp_campaign?
+    campaign.inbox.inbox_type == 'Whatsapp'
+  end
+
+  def validate_campaign_status!
+    raise 'Completed Campaign' if campaign.completed?
+  end
+
+  def validate_provider!
+    raise 'WhatsApp Cloud provider required' if channel.provider != 'whatsapp_cloud'
+  end
+
+  def validate_feature_flag!
+    raise 'WhatsApp campaigns feature not enabled' unless campaign.account.feature_enabled?(:whatsapp_campaign)
+  end
+
+  def validate_campaign!
+    validate_campaign_type!
+    validate_campaign_status!
+    validate_provider!
+    validate_feature_flag!
+  end
+
+  def extract_audience_labels
+    audience_label_ids = campaign.audience.select { |audience| audience['type'] == 'Label' }.pluck('id')
+    campaign.account.labels.where(id: audience_label_ids).pluck(:title)
+  end
+
+  def process_contact(contact)
+    Rails.logger.info "Processing contact: #{contact.name} (#{contact.phone_number})"
+
+    if contact.phone_number.blank?
+      Rails.logger.info "Skipping contact #{contact.name} - no phone number"
+      return
+    end
+
+    if campaign.template_params.blank?
+      Rails.logger.error "Skipping contact #{contact.name} - no template_params found for WhatsApp campaign"
+      return
+    end
+
+    send_whatsapp_template_message(to: contact.phone_number)
+  end
+
+  def process_audience(audience_labels)
+    contacts = campaign.account.contacts.tagged_with(audience_labels, any: true)
+    Rails.logger.info "Processing #{contacts.count} contacts for campaign #{campaign.id}"
+
+    contacts.each { |contact| process_contact(contact) }
+
+    Rails.logger.info "Campaign #{campaign.id} processing completed"
+  end
+
+  def send_whatsapp_template_message(to:)
+    processor = Whatsapp::TemplateProcessorService.new(
+      channel: channel,
+      template_params: campaign.template_params
+    )
+
+    name, namespace, lang_code, processed_parameters = processor.call
+
+    return if name.blank?
+
+    channel.send_template(to, {
+                            name: name,
+                            namespace: namespace,
+                            lang_code: lang_code,
+                            parameters: processed_parameters
+                          })
+
+  rescue StandardError => e
+    Rails.logger.error "Failed to send WhatsApp template message to #{to}: #{e.message}"
+    Rails.logger.error "Backtrace: #{e.backtrace.first(5).join('\n')}"
+    raise e
+  end
+end
diff --git a/app/services/whatsapp/send_on_whatsapp_service.rb b/app/services/whatsapp/send_on_whatsapp_service.rb
index 61b78f892..8cecfd41f 100644
--- a/app/services/whatsapp/send_on_whatsapp_service.rb
+++ b/app/services/whatsapp/send_on_whatsapp_service.rb
@@ -15,7 +15,13 @@ class Whatsapp::SendOnWhatsappService < Base::SendOnChannelService
   end
 
   def send_template_message
-    name, namespace, lang_code, processed_parameters = processable_channel_message_template
+    processor = Whatsapp::TemplateProcessorService.new(
+      channel: channel,
+      template_params: template_params,
+      message: message
+    )
+
+    name, namespace, lang_code, processed_parameters = processor.call
 
     return if name.blank?
 
@@ -28,86 +34,6 @@ class Whatsapp::SendOnWhatsappService < Base::SendOnChannelService
     message.update!(source_id: message_id) if message_id.present?
   end
 
-  def processable_channel_message_template
-    if template_params.present?
-      return [
-        template_params['name'],
-        template_params['namespace'],
-        template_params['language'],
-        processed_templates_params(template_params)
-      ]
-    end
-
-    # Delete the following logic once the update for template_params is stable
-    # see if we can match the message content to a template
-    # An example template may look like "Your package has been shipped. It will be delivered in {{1}} business days.
-    # We want to iterate over these templates with our message body and see if we can fit it to any of the templates
-    # Then we use regex to parse the template varibles and convert them into the proper payload
-    channel.message_templates&.each do |template|
-      match_obj = template_match_object(template)
-      next if match_obj.blank?
-
-      # we have a match, now we need to parse the template variables and convert them into the wa recommended format
-      processed_parameters = match_obj.captures.map { |x| { type: 'text', text: x } }
-
-      # no need to look up further end the search
-      return [template['name'], template['namespace'], template['language'], processed_parameters]
-    end
-    [nil, nil, nil, nil]
-  end
-
-  def template_match_object(template)
-    body_object = validated_body_object(template)
-    return if body_object.blank?
-
-    template_match_regex = build_template_match_regex(body_object['text'])
-    message.outgoing_content.match(template_match_regex)
-  end
-
-  def build_template_match_regex(template_text)
-    # Converts the whatsapp template to a comparable regex string to check against the message content
-    # the variables are of the format {{num}} ex:{{1}}
-
-    # transform the template text into a regex string
-    # we need to replace the {{num}} with matchers that can be used to capture the variables
-    template_text = template_text.gsub(/{{\d}}/, '(.*)')
-    # escape if there are regex characters in the template text
-    template_text = Regexp.escape(template_text)
-    # ensuring only the variables remain as capture groups
-    template_text = template_text.gsub(Regexp.escape('(.*)'), '(.*)')
-
-    template_match_string = "^#{template_text}$"
-    Regexp.new template_match_string
-  end
-
-  def template(template_params)
-    channel.message_templates.find do |t|
-      t['name'] == template_params['name'] && t['language'] == template_params['language']
-    end
-  end
-
-  def processed_templates_params(template_params)
-    template = template(template_params)
-    return if template.blank?
-
-    parameter_format = template['parameter_format']
-
-    if parameter_format == 'NAMED'
-      template_params['processed_params']&.map { |key, value| { type: 'text', parameter_name: key, text: value } }
-    else
-      template_params['processed_params']&.map { |_, value| { type: 'text', text: value } }
-    end
-  end
-
-  def validated_body_object(template)
-    # we don't care if its not approved template
-    return if template['status'] != 'approved'
-
-    # we only care about text body object in template. if not present we discard the template
-    # we don't support other forms of templates
-    template['components'].find { |obj| obj['type'] == 'BODY' && obj.key?('text') }
-  end
-
   def send_session_message
     message_id = channel.send_message(message.conversation.contact_inbox.source_id, message)
     message.update!(source_id: message_id) if message_id.present?
diff --git a/app/services/whatsapp/template_processor_service.rb b/app/services/whatsapp/template_processor_service.rb
new file mode 100644
index 000000000..2ce9fcf8f
--- /dev/null
+++ b/app/services/whatsapp/template_processor_service.rb
@@ -0,0 +1,95 @@
+class Whatsapp::TemplateProcessorService
+  pattr_initialize [:channel!, :template_params, :message]
+
+  def call
+    if template_params.present?
+      process_template_with_params
+    else
+      process_template_from_message
+    end
+  end
+
+  private
+
+  def process_template_with_params
+    [
+      template_params['name'],
+      template_params['namespace'],
+      template_params['language'],
+      processed_templates_params
+    ]
+  end
+
+  def process_template_from_message
+    return [nil, nil, nil, nil] if message.blank?
+
+    # Delete the following logic once the update for template_params is stable
+    # see if we can match the message content to a template
+    # An example template may look like "Your package has been shipped. It will be delivered in {{1}} business days.
+    # We want to iterate over these templates with our message body and see if we can fit it to any of the templates
+    # Then we use regex to parse the template varibles and convert them into the proper payload
+    channel.message_templates&.each do |template|
+      match_obj = template_match_object(template)
+      next if match_obj.blank?
+
+      # we have a match, now we need to parse the template variables and convert them into the wa recommended format
+      processed_parameters = match_obj.captures.map { |x| { type: 'text', text: x } }
+
+      # no need to look up further end the search
+      return [template['name'], template['namespace'], template['language'], processed_parameters]
+    end
+    [nil, nil, nil, nil]
+  end
+
+  def template_match_object(template)
+    body_object = validated_body_object(template)
+    return if body_object.blank?
+
+    template_match_regex = build_template_match_regex(body_object['text'])
+    message.outgoing_content.match(template_match_regex)
+  end
+
+  def build_template_match_regex(template_text)
+    # Converts the whatsapp template to a comparable regex string to check against the message content
+    # the variables are of the format {{num}} ex:{{1}}
+
+    # transform the template text into a regex string
+    # we need to replace the {{num}} with matchers that can be used to capture the variables
+    template_text = template_text.gsub(/{{\d}}/, '(.*)')
+    # escape if there are regex characters in the template text
+    template_text = Regexp.escape(template_text)
+    # ensuring only the variables remain as capture groups
+    template_text = template_text.gsub(Regexp.escape('(.*)'), '(.*)')
+
+    template_match_string = "^#{template_text}$"
+    Regexp.new template_match_string
+  end
+
+  def find_template
+    channel.message_templates.find do |t|
+      t['name'] == template_params['name'] && t['language'] == template_params['language'] && t['status']&.downcase == 'approved'
+    end
+  end
+
+  def processed_templates_params
+    template = find_template
+    return if template.blank?
+
+    parameter_format = template['parameter_format']
+
+    if parameter_format == 'NAMED'
+      template_params['processed_params']&.map { |key, value| { type: 'text', parameter_name: key, text: value } }
+    else
+      template_params['processed_params']&.map { |_, value| { type: 'text', text: value } }
+    end
+  end
+
+  def validated_body_object(template)
+    # we don't care if its not approved template
+    return if template['status'] != 'approved'
+
+    # we only care about text body object in template. if not present we discard the template
+    # we don't support other forms of templates
+    template['components'].find { |obj| obj['type'] == 'BODY' && obj.key?('text') }
+  end
+end
diff --git a/app/views/api/v1/models/_campaign.json.jbuilder b/app/views/api/v1/models/_campaign.json.jbuilder
index 8706175df..8757fd0f8 100644
--- a/app/views/api/v1/models/_campaign.json.jbuilder
+++ b/app/views/api/v1/models/_campaign.json.jbuilder
@@ -9,6 +9,7 @@ json.sender do
   json.partial! 'api/v1/models/agent', formats: [:json], resource: resource.sender if resource.sender.present?
 end
 json.message resource.message
+json.template_params resource.template_params
 json.campaign_status resource.campaign_status
 json.enabled resource.enabled
 json.campaign_type resource.campaign_type
diff --git a/config/features.yml b/config/features.yml
index 99d7bea6d..85b95a732 100644
--- a/config/features.yml
+++ b/config/features.yml
@@ -183,3 +183,6 @@
 - name: whatsapp_embedded_signup
   display_name: WhatsApp Embedded Signup
   enabled: false
+- name: whatsapp_campaign
+  display_name: WhatsApp Campaign
+  enabled: false
diff --git a/db/migrate/20250709102213_add_template_params_to_campaigns.rb b/db/migrate/20250709102213_add_template_params_to_campaigns.rb
new file mode 100644
index 000000000..d70359b30
--- /dev/null
+++ b/db/migrate/20250709102213_add_template_params_to_campaigns.rb
@@ -0,0 +1,5 @@
+class AddTemplateParamsToCampaigns < ActiveRecord::Migration[7.1]
+  def change
+    add_column :campaigns, :template_params, :jsonb, default: {}, null: false
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 1806ab23f..34637315b 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -237,6 +237,7 @@ ActiveRecord::Schema[7.1].define(version: 2025_07_14_104358) do
     t.jsonb "audience", default: []
     t.datetime "scheduled_at", precision: nil
     t.boolean "trigger_only_during_business_hours", default: false
+    t.jsonb "template_params"
     t.index ["account_id"], name: "index_campaigns_on_account_id"
     t.index ["campaign_status"], name: "index_campaigns_on_campaign_status"
     t.index ["campaign_type"], name: "index_campaigns_on_campaign_type"
diff --git a/spec/factories/campaigns.rb b/spec/factories/campaigns.rb
index 4d4c6de18..c3c32d149 100644
--- a/spec/factories/campaigns.rb
+++ b/spec/factories/campaigns.rb
@@ -12,5 +12,22 @@ FactoryBot.define do
         channel: create(:channel_widget, account: campaign.account)
       )
     end
+
+    trait :whatsapp do
+      after(:build) do |campaign|
+        campaign.inbox = create(
+          :inbox,
+          account: campaign.account,
+          channel: create(:channel_whatsapp, account: campaign.account)
+        )
+        campaign.template_params = {
+          'name' => 'ticket_status_updated',
+          'namespace' => '23423423_2342423_324234234_2343224',
+          'category' => 'UTILITY',
+          'language' => 'en',
+          'processed_params' => { 'name' => 'John', 'ticket_id' => '2332' }
+        }
+      end
+    end
   end
 end
diff --git a/spec/factories/channel/channel_whatsapp.rb b/spec/factories/channel/channel_whatsapp.rb
index d437ed346..ad2bab241 100644
--- a/spec/factories/channel/channel_whatsapp.rb
+++ b/spec/factories/channel/channel_whatsapp.rb
@@ -36,6 +36,7 @@ FactoryBot.define do
          'status' => 'APPROVED',
          'category' => 'UTILITY',
          'language' => 'en',
+         'namespace' => '23423423_2342423_324234234_2343224',
          'components' => [
            { 'text' => "Hello {{name}},  Your support ticket with ID: \#{{ticket_id}} has been updated by the support agent.",
              'type' => 'BODY',
diff --git a/spec/services/whatsapp/oneoff_campaign_service_spec.rb b/spec/services/whatsapp/oneoff_campaign_service_spec.rb
new file mode 100644
index 000000000..33107e8de
--- /dev/null
+++ b/spec/services/whatsapp/oneoff_campaign_service_spec.rb
@@ -0,0 +1,169 @@
+require 'rails_helper'
+
+describe Whatsapp::OneoffCampaignService do
+  let(:account) { create(:account) }
+  let!(:whatsapp_channel) do
+    create(:channel_whatsapp, account: account, provider: 'whatsapp_cloud', validate_provider_config: false, sync_templates: false)
+  end
+  let!(:whatsapp_inbox) { whatsapp_channel.inbox }
+  let(:label1) { create(:label, account: account) }
+  let(:label2) { create(:label, account: account) }
+  let!(:campaign) do
+    create(:campaign, inbox: whatsapp_inbox, account: account,
+                      audience: [{ type: 'Label', id: label1.id }, { type: 'Label', id: label2.id }],
+                      template_params: template_params)
+  end
+  let(:template_params) do
+    {
+      'name' => 'ticket_status_updated',
+      'namespace' => '23423423_2342423_324234234_2343224',
+      'category' => 'UTILITY',
+      'language' => 'en',
+      'processed_params' => { 'name' => 'John', 'ticket_id' => '2332' }
+    }
+  end
+
+  before do
+    # Stub HTTP requests to WhatsApp API
+    stub_request(:post, /graph\.facebook\.com.*messages/)
+      .to_return(status: 200, body: { messages: [{ id: 'message_id_123' }] }.to_json, headers: { 'Content-Type' => 'application/json' })
+
+    # Ensure the service uses our mocked channel object by stubbing the whole delegation chain
+    # Using allow_any_instance_of here because the service is instantiated within individual tests
+    # and we need to mock the delegated channel method for proper test isolation
+    allow_any_instance_of(described_class).to receive(:channel).and_return(whatsapp_channel) # rubocop:disable RSpec/AnyInstance
+  end
+
+  describe '#perform' do
+    before do
+      # Enable WhatsApp campaigns feature flag for all tests
+      account.enable_features!(:whatsapp_campaign)
+    end
+
+    context 'when campaign validation fails' do
+      it 'raises error if campaign is completed' do
+        campaign.completed!
+
+        expect { described_class.new(campaign: campaign).perform }.to raise_error 'Completed Campaign'
+      end
+
+      it 'raises error when campaign is not a WhatsApp campaign' do
+        sms_channel = create(:channel_sms, account: account)
+        sms_inbox = create(:inbox, channel: sms_channel, account: account)
+        invalid_campaign = create(:campaign, inbox: sms_inbox, account: account)
+
+        expect { described_class.new(campaign: invalid_campaign).perform }
+          .to raise_error "Invalid campaign #{invalid_campaign.id}"
+      end
+
+      it 'raises error when campaign is not oneoff' do
+        allow(campaign).to receive(:one_off?).and_return(false)
+
+        expect { described_class.new(campaign: campaign).perform }.to raise_error "Invalid campaign #{campaign.id}"
+      end
+
+      it 'raises error when channel provider is not whatsapp_cloud' do
+        whatsapp_channel.update!(provider: 'default')
+
+        expect { described_class.new(campaign: campaign).perform }.to raise_error 'WhatsApp Cloud provider required'
+      end
+
+      it 'raises error when WhatsApp campaigns feature is not enabled' do
+        account.disable_features!(:whatsapp_campaign)
+
+        expect { described_class.new(campaign: campaign).perform }.to raise_error 'WhatsApp campaigns feature not enabled'
+      end
+    end
+
+    context 'when campaign is valid' do
+      it 'marks campaign as completed' do
+        described_class.new(campaign: campaign).perform
+
+        expect(campaign.reload.completed?).to be true
+      end
+
+      it 'processes contacts with matching labels' do
+        contact_with_label1, contact_with_label2, contact_with_both_labels =
+          create_list(:contact, 3, :with_phone_number, account: account)
+        contact_with_label1.update_labels([label1.title])
+        contact_with_label2.update_labels([label2.title])
+        contact_with_both_labels.update_labels([label1.title, label2.title])
+
+        expect(whatsapp_channel).to receive(:send_template).exactly(3).times
+
+        described_class.new(campaign: campaign).perform
+      end
+
+      it 'skips contacts without phone numbers' do
+        contact_without_phone = create(:contact, account: account, phone_number: nil)
+        contact_without_phone.update_labels([label1.title])
+
+        expect(whatsapp_channel).not_to receive(:send_template)
+
+        described_class.new(campaign: campaign).perform
+      end
+
+      it 'uses template processor service to process templates' do
+        contact = create(:contact, :with_phone_number, account: account)
+        contact.update_labels([label1.title])
+
+        expect(Whatsapp::TemplateProcessorService).to receive(:new)
+          .with(channel: whatsapp_channel, template_params: template_params)
+          .and_call_original
+
+        described_class.new(campaign: campaign).perform
+      end
+
+      it 'sends template message with correct parameters' do
+        contact = create(:contact, :with_phone_number, account: account)
+        contact.update_labels([label1.title])
+
+        expect(whatsapp_channel).to receive(:send_template).with(
+          contact.phone_number,
+          hash_including(
+            name: 'ticket_status_updated',
+            namespace: '23423423_2342423_324234234_2343224',
+            lang_code: 'en',
+            parameters: array_including(
+              hash_including(type: 'text', parameter_name: 'name', text: 'John'),
+              hash_including(type: 'text', parameter_name: 'ticket_id', text: '2332')
+            )
+          )
+        )
+
+        described_class.new(campaign: campaign).perform
+      end
+    end
+
+    context 'when template_params is missing' do
+      let(:template_params) { nil }
+
+      it 'skips contacts and logs error' do
+        contact = create(:contact, :with_phone_number, account: account)
+        contact.update_labels([label1.title])
+
+        expect(Rails.logger).to receive(:error)
+          .with("Skipping contact #{contact.name} - no template_params found for WhatsApp campaign")
+        expect(whatsapp_channel).not_to receive(:send_template)
+
+        described_class.new(campaign: campaign).perform
+      end
+    end
+
+    context 'when send_template raises an error' do
+      it 'logs error and re-raises' do
+        contact = create(:contact, :with_phone_number, account: account)
+        contact.update_labels([label1.title])
+        error_message = 'WhatsApp API error'
+
+        allow(whatsapp_channel).to receive(:send_template).and_raise(StandardError, error_message)
+
+        expect(Rails.logger).to receive(:error)
+          .with("Failed to send WhatsApp template message to #{contact.phone_number}: #{error_message}")
+        expect(Rails.logger).to receive(:error).with(/Backtrace:/)
+
+        expect { described_class.new(campaign: campaign).perform }.to raise_error(StandardError, error_message)
+      end
+    end
+  end
+end

From 45d4d3660c646faf8b755e0e73c1022eae84fd69 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Tue, 15 Jul 2025 21:27:35 -0700
Subject: [PATCH 17/20] feat: Add private note action to automations (#11926)

## Summary
- allow AutomationRule to accept `add_private_note` action
- support `add_private_note` in automation action service
- expose private note action in frontend constants and i18n
- test new automation rule action

## Testing
- `pnpm eslint
app/javascript/dashboard/routes/dashboard/settings/automation/constants.js`
- `bundle exec rubocop app/services/automation_rules/action_service.rb
app/models/automation_rule.rb
spec/services/automation_rules/action_service_spec.rb`
- `bundle exec rspec
spec/services/automation_rules/action_service_spec.rb`


------
https://chatgpt.com/codex/tasks/task_e_6870c5f7b8b88326a9bd60b2ba710ccd

Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
---
 .../dashboard/i18n/locale/en/automation.json  |  1 +
 .../settings/automation/constants.js          |  5 +++++
 app/models/automation_rule.rb                 |  3 ++-
 .../automation_rules/action_service.rb        |  7 ++++++
 .../automation_rules/action_service_spec.rb   | 22 +++++++++++++++++++
 5 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/app/javascript/dashboard/i18n/locale/en/automation.json b/app/javascript/dashboard/i18n/locale/en/automation.json
index cb030332f..cf63de81c 100644
--- a/app/javascript/dashboard/i18n/locale/en/automation.json
+++ b/app/javascript/dashboard/i18n/locale/en/automation.json
@@ -146,6 +146,7 @@
       "SEND_WEBHOOK_EVENT": "Send Webhook Event",
       "SEND_ATTACHMENT": "Send Attachment",
       "SEND_MESSAGE": "Send a Message",
+      "ADD_PRIVATE_NOTE": "Add a Private Note",
       "CHANGE_PRIORITY": "Change Priority",
       "ADD_SLA": "Add SLA",
       "OPEN_CONVERSATION": "Open conversation"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/automation/constants.js b/app/javascript/dashboard/routes/dashboard/settings/automation/constants.js
index 1b0f0599f..dfa6163d8 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/automation/constants.js
+++ b/app/javascript/dashboard/routes/dashboard/settings/automation/constants.js
@@ -555,6 +555,11 @@ export const AUTOMATION_ACTION_TYPES = [
     label: 'SEND_MESSAGE',
     inputType: 'textarea',
   },
+  {
+    key: 'add_private_note',
+    label: 'ADD_PRIVATE_NOTE',
+    inputType: 'textarea',
+  },
   {
     key: 'change_priority',
     label: 'CHANGE_PRIORITY',
diff --git a/app/models/automation_rule.rb b/app/models/automation_rule.rb
index c8f5a180d..6f3f47d9c 100644
--- a/app/models/automation_rule.rb
+++ b/app/models/automation_rule.rb
@@ -41,7 +41,8 @@ class AutomationRule < ApplicationRecord
 
   def actions_attributes
     %w[send_message add_label remove_label send_email_to_team assign_team assign_agent send_webhook_event mute_conversation
-       send_attachment change_status resolve_conversation open_conversation snooze_conversation change_priority send_email_transcript].freeze
+       send_attachment change_status resolve_conversation open_conversation snooze_conversation change_priority send_email_transcript
+       add_private_note].freeze
   end
 
   def file_base_data
diff --git a/app/services/automation_rules/action_service.rb b/app/services/automation_rules/action_service.rb
index 290e14a9e..e409faba2 100644
--- a/app/services/automation_rules/action_service.rb
+++ b/app/services/automation_rules/action_service.rb
@@ -47,6 +47,13 @@ class AutomationRules::ActionService < ActionService
     Messages::MessageBuilder.new(nil, @conversation, params).perform
   end
 
+  def add_private_note(message)
+    return if conversation_a_tweet?
+
+    params = { content: message[0], private: true, content_attributes: { automation_rule_id: @rule.id } }
+    Messages::MessageBuilder.new(nil, @conversation.reload, params).perform
+  end
+
   def send_email_to_team(params)
     teams = Team.where(id: params[0][:team_ids])
 
diff --git a/spec/services/automation_rules/action_service_spec.rb b/spec/services/automation_rules/action_service_spec.rb
index bdfa7af0c..e63fd7545 100644
--- a/spec/services/automation_rules/action_service_spec.rb
+++ b/spec/services/automation_rules/action_service_spec.rb
@@ -117,5 +117,27 @@ RSpec.describe AutomationRules::ActionService do
         expect(mailer).to have_received(:conversation_transcript).exactly(1).times
       end
     end
+
+    describe '#perform with add_private_note action' do
+      let(:message_builder) { double }
+
+      before do
+        allow(Messages::MessageBuilder).to receive(:new).and_return(message_builder)
+        rule.actions.delete_if { |a| a['action_name'] == 'send_message' }
+        rule.actions << { action_name: 'add_private_note', action_params: ['Note'] }
+      end
+
+      it 'will add private note' do
+        expect(message_builder).to receive(:perform)
+        described_class.new(rule, account, conversation).perform
+      end
+
+      it 'will not add note if conversation is a tweet' do
+        twitter_inbox = create(:inbox, channel: create(:channel_twitter_profile, account: account))
+        conversation = create(:conversation, inbox: twitter_inbox, additional_attributes: { type: 'tweet' })
+        expect(message_builder).not_to receive(:perform)
+        described_class.new(rule, account, conversation).perform
+      end
+    end
   end
 end

From 13b4fdb34ce13aba73483eb583e3849a546c81cb Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Tue, 15 Jul 2025 21:28:39 -0700
Subject: [PATCH 18/20] chore: Add submenu for super admin settings (#11860)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Improve how settings are rendered in Chatwoot Super admin panel
- Add google settings support
- show setting for community edition

##  Settings page - community edition
<img width="1702" alt="Screenshot 2025-07-08 at 9 08 03 PM"
src="https://github.com/user-attachments/assets/0434f56f-ea74-44a8-a7b0-8e26fab88093"
/>

## Expanded settings
<img width="1675" alt="Screenshot 2025-07-03 at 2 17 16 AM"
src="https://github.com/user-attachments/assets/3aa1f888-c54a-4b58-896a-0d3e828fa176"
/>

---------

Co-authored-by: Sojan Jose <sojan@Sojans-MacBook-Pro.local>
Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
---
 .../super_admin/app_configs_controller.rb     |  3 +-
 .../super_admin/application_controller.rb     |  3 +-
 .../helpers/super_admin/features.yml          | 35 +++++++++++----
 .../helpers/super_admin/features_helper.rb    |  2 +-
 app/helpers/super_admin/navigation_helper.rb  | 16 +++++++
 .../super_admin/application/_icons.html.erb   |  6 +++
 .../application/_nav_item.html.erb            |  4 +-
 .../application/_navigation.html.erb          |  5 +--
 .../application/_settings_menu.html.erb       | 24 +++++++++++
 .../_upgrade_button_community.html.erb        |  4 ++
 .../_upgrade_button_enterprise.html.erb       |  4 ++
 app/views/super_admin/settings/show.html.erb  | 43 ++++++++++---------
 config/installation_config.yml                | 22 ++++++++++
 lib/chatwoot_hub.rb                           |  4 ++
 14 files changed, 137 insertions(+), 38 deletions(-)
 rename {enterprise/app => app}/helpers/super_admin/features.yml (90%)
 rename {enterprise/app => app}/helpers/super_admin/features_helper.rb (78%)
 create mode 100644 app/helpers/super_admin/navigation_helper.rb
 create mode 100644 app/views/super_admin/application/_settings_menu.html.erb
 create mode 100644 app/views/super_admin/settings/_upgrade_button_community.html.erb
 create mode 100644 app/views/super_admin/settings/_upgrade_button_enterprise.html.erb

diff --git a/app/controllers/super_admin/app_configs_controller.rb b/app/controllers/super_admin/app_configs_controller.rb
index 3972d5a28..5cf158b98 100644
--- a/app/controllers/super_admin/app_configs_controller.rb
+++ b/app/controllers/super_admin/app_configs_controller.rb
@@ -41,7 +41,8 @@ class SuperAdmin::AppConfigsController < SuperAdmin::ApplicationController
       'slack' => %w[SLACK_CLIENT_ID SLACK_CLIENT_SECRET],
       'instagram' => %w[INSTAGRAM_APP_ID INSTAGRAM_APP_SECRET INSTAGRAM_VERIFY_TOKEN INSTAGRAM_API_VERSION ENABLE_INSTAGRAM_CHANNEL_HUMAN_AGENT],
       'whatsapp_embedded' => %w[WHATSAPP_APP_ID WHATSAPP_APP_SECRET WHATSAPP_CONFIGURATION_ID WHATSAPP_API_VERSION],
-      'notion' => %w[NOTION_CLIENT_ID NOTION_CLIENT_SECRET]
+      'notion' => %w[NOTION_CLIENT_ID NOTION_CLIENT_SECRET],
+      'google' => %w[GOOGLE_OAUTH_CLIENT_ID GOOGLE_OAUTH_CLIENT_SECRET GOOGLE_OAUTH_REDIRECT_URI]
     }
 
     @allowed_configs = mapping.fetch(@config, %w[ENABLE_ACCOUNT_SIGNUP FIREBASE_PROJECT_ID FIREBASE_CREDENTIALS])
diff --git a/app/controllers/super_admin/application_controller.rb b/app/controllers/super_admin/application_controller.rb
index 775fb34fc..5b04fbb44 100644
--- a/app/controllers/super_admin/application_controller.rb
+++ b/app/controllers/super_admin/application_controller.rb
@@ -7,8 +7,9 @@
 class SuperAdmin::ApplicationController < Administrate::ApplicationController
   include ActionView::Helpers::TagHelper
   include ActionView::Context
+  include SuperAdmin::NavigationHelper
 
-  helper_method :render_vue_component
+  helper_method :render_vue_component, :settings_open?, :settings_pages
   # authenticiation done via devise : SuperAdmin Model
   before_action :authenticate_super_admin!
 
diff --git a/enterprise/app/helpers/super_admin/features.yml b/app/helpers/super_admin/features.yml
similarity index 90%
rename from enterprise/app/helpers/super_admin/features.yml
rename to app/helpers/super_admin/features.yml
index f2b2b263c..f49004e79 100644
--- a/enterprise/app/helpers/super_admin/features.yml
+++ b/app/helpers/super_admin/features.yml
@@ -1,5 +1,7 @@
 # TODO: Move this values to features.yml itself
 # No need to replicate the same values in two places
+
+# ------- Premium Features ------- #
 captain:
   name: 'Captain'
   description: 'Enable AI-powered conversations with your customers.'
@@ -32,6 +34,15 @@ disable_branding:
   enabled: <%= (ChatwootHub.pricing_plan != 'community') %>
   icon: 'icon-sailbot-fill'
   enterprise: true
+
+# ------- Product Features ------- #
+help_center:
+  name: 'Help Center'
+  description: 'Allow agents to create help center articles and publish them in a portal.'
+  enabled: true
+  icon: 'icon-book-2-line'
+
+# ------- Communication Channels ------- #
 live_chat:
   name: 'Live Chat'
   description: 'Improve your customer experience using a live chat on your website.'
@@ -42,6 +53,12 @@ email:
   description: 'Manage your email customer interactions from Chatwoot.'
   enabled: true
   icon: 'icon-mail-send-fill'
+  config_key: 'email'
+sms:
+  name: 'SMS'
+  description: 'Manage your SMS customer interactions from Chatwoot.'
+  enabled: true
+  icon: 'icon-message-line'
 messenger:
   name: 'Messenger'
   description: 'Stay connected with your customers on Facebook & Instagram.'
@@ -69,22 +86,22 @@ line:
   description: 'Manage your Line customer interactions from Chatwoot.'
   enabled: true
   icon: 'icon-line-line'
-sms:
-  name: 'SMS'
-  description: 'Manage your SMS customer interactions from Chatwoot.'
+
+# ------- OAuth & Authentication ------- #
+google:
+  name: 'Google'
+  description: 'Configuration for setting up Google OAuth Integration'
   enabled: true
-  icon: 'icon-message-line'
-help_center:
-  name: 'Help Center'
-  description: 'Allow agents to create help center articles and publish them in a portal.'
-  enabled: true
-  icon: 'icon-book-2-line'
+  icon: 'icon-google'
+  config_key: 'google'
 microsoft:
   name: 'Microsoft'
   description: 'Configuration for setting up Microsoft Email'
   enabled: true
   icon: 'icon-microsoft'
   config_key: 'microsoft'
+
+# ------- Third-party Integrations ------- #
 linear:
   name: 'Linear'
   description: 'Configuration for setting up Linear Integration'
diff --git a/enterprise/app/helpers/super_admin/features_helper.rb b/app/helpers/super_admin/features_helper.rb
similarity index 78%
rename from enterprise/app/helpers/super_admin/features_helper.rb
rename to app/helpers/super_admin/features_helper.rb
index 2fbcd1715..475ad6d25 100644
--- a/enterprise/app/helpers/super_admin/features_helper.rb
+++ b/app/helpers/super_admin/features_helper.rb
@@ -1,6 +1,6 @@
 module SuperAdmin::FeaturesHelper
   def self.available_features
-    YAML.load(ERB.new(Rails.root.join('enterprise/app/helpers/super_admin/features.yml').read).result).with_indifferent_access
+    YAML.load(ERB.new(Rails.root.join('app/helpers/super_admin/features.yml').read).result).with_indifferent_access
   end
 
   def self.plan_details
diff --git a/app/helpers/super_admin/navigation_helper.rb b/app/helpers/super_admin/navigation_helper.rb
new file mode 100644
index 000000000..5fca3fa76
--- /dev/null
+++ b/app/helpers/super_admin/navigation_helper.rb
@@ -0,0 +1,16 @@
+module SuperAdmin::NavigationHelper
+  def settings_open?
+    params[:controller].in? %w[super_admin/settings super_admin/app_configs]
+  end
+
+  def settings_pages
+    features = SuperAdmin::FeaturesHelper.available_features.select do |_feature, attrs|
+      attrs['config_key'].present? && attrs['enabled']
+    end
+
+    # Add general at the beginning
+    general_feature = [['general', { 'config_key' => 'general', 'name' => 'General' }]]
+
+    general_feature + features.to_a
+  end
+end
diff --git a/app/views/super_admin/application/_icons.html.erb b/app/views/super_admin/application/_icons.html.erb
index 6669fe87d..a45c4c1b3 100644
--- a/app/views/super_admin/application/_icons.html.erb
+++ b/app/views/super_admin/application/_icons.html.erb
@@ -2,6 +2,12 @@
   <symbol id="icon-microsoft" viewBox="0 0 24 24">
     <path fill="currentColor" d="M2 3h9v9H2zm9 19H2v-9h9zM21 3v9h-9V3zm0 19h-9v-9h9z"/>
   </symbol>
+  <symbol id="icon-google" viewBox="0 0 24 24">
+    <path fill="currentColor" d="M22.56 12.25c0-.78-.07-1.53-.2-2.25H12v4.26h5.92c-.26 1.37-1.04 2.53-2.21 3.31v2.77h3.57c2.08-1.92 3.28-4.74 3.28-8.09z"/>
+    <path fill="currentColor" d="M12 23c2.97 0 5.46-.98 7.28-2.66l-3.57-2.77c-.98.66-2.23 1.06-3.71 1.06-2.86 0-5.29-1.93-6.16-4.53H2.18v2.84C3.99 20.53 7.7 23 12 23z"/>
+    <path fill="currentColor" d="M5.84 14.09c-.22-.66-.35-1.36-.35-2.09s.13-1.43.35-2.09V7.07H2.18C1.43 8.55 1 10.22 1 12s.43 3.45 1.18 4.93l2.85-2.22.81-.62z"/>
+    <path fill="currentColor" d="M12 5.38c1.62 0 3.06.56 4.21 1.64l3.15-3.15C17.45 2.09 14.97 1 12 1 7.7 1 3.99 3.47 2.18 7.07l3.66 2.84c.87-2.6 3.3-4.53 6.16-4.53z"/>
+  </symbol>
   <symbol id="icon-cancel" viewBox="0 0 48 48">
     <path fill-rule="evenodd" d="M24 19.757l-8.485-8.485c-.784-.783-2.047-.782-2.827 0l-1.417 1.416c-.777.777-.78 2.046.002 2.827L19.757 24l-8.485 8.485c-.783.784-.782 2.047 0 2.827l1.416 1.417c.777.777 2.046.78 2.827-.002L24 28.243l8.485 8.485c.784.783 2.047.782 2.827 0l1.417-1.416c.777-.777.78-2.046-.002-2.827L28.243 24l8.485-8.485c.783-.784.782-2.047 0-2.827l-1.416-1.417c-.777-.777-2.046-.78-2.827.002L24 19.757zM24 47c12.703 0 23-10.297 23-23S36.703 1 24 1 1 11.297 1 24s10.297 23 23 23z" />
   </symbol>
diff --git a/app/views/super_admin/application/_nav_item.html.erb b/app/views/super_admin/application/_nav_item.html.erb
index a6366d8b5..a32fddd11 100644
--- a/app/views/super_admin/application/_nav_item.html.erb
+++ b/app/views/super_admin/application/_nav_item.html.erb
@@ -1,6 +1,4 @@
-<li
-  class="px-4 border-l-4 mb-1 <%= current_page?(url) ? 'border-woot-500' : 'border-transparent' %>"
->
+<li class="px-4 mb-1">
   <% text_class_name = current_page?(url) ? 'text-woot-500 bg-slate-25' : 'text-slate-800' %>
   <%= link_to(url, class: text_class_name + " -ml-1 focus:outline-none cursor-pointer flex items-center px-2 py-1.5 text-slate-800 cursor-pointer hover:text-woot-500 hover:bg-slate-25 rounded-lg") do %>
     <svg width="16" height="16"><use xlink:href="#<%= icon %>" /></svg>
diff --git a/app/views/super_admin/application/_navigation.html.erb b/app/views/super_admin/application/_navigation.html.erb
index f673c6bd1..787576d33 100644
--- a/app/views/super_admin/application/_navigation.html.erb
+++ b/app/views/super_admin/application/_navigation.html.erb
@@ -39,14 +39,13 @@ as defined by the routes in the `admin/` namespace
             label: display_resource_name(resource),
           }
         %>
+
       <% end %>
+      <%= render 'settings_menu', open: settings_open? %>
     </ul>
   </div>
   <div>
     <ul class="my-4">
-      <% if ChatwootApp.enterprise? %>
-      <%= render partial: "nav_item", locals: { icon: 'icon-settings-2-line', url: super_admin_settings_url, label: 'Settings' } %>
-      <% end %>
       <%= render partial: "nav_item", locals: { icon: 'icon-mist-fill', url: sidekiq_web_url, label: 'Sidekiq Dashboard' } %>
       <%= render partial: "nav_item", locals: { icon: 'icon-health-book-line', url: super_admin_instance_status_url, label: 'Instance Health' } %>
       <%= render partial: "nav_item", locals: { icon: 'icon-dashboard-line', url: '/', label: 'Agent Dashboard' } %>
diff --git a/app/views/super_admin/application/_settings_menu.html.erb b/app/views/super_admin/application/_settings_menu.html.erb
new file mode 100644
index 000000000..3d5173c12
--- /dev/null
+++ b/app/views/super_admin/application/_settings_menu.html.erb
@@ -0,0 +1,24 @@
+<li class="px-4 mb-1">
+  <details class="group" <%= 'open' if open %>>
+    <summary class="-ml-1 flex items-center px-2 py-1.5 cursor-pointer rounded-lg <%= open ? 'text-woot-500 bg-slate-25' : 'text-slate-800 hover:text-woot-500 hover:bg-slate-25' %> list-none">
+      <%= link_to super_admin_settings_url, class: 'flex items-center flex-1' do %>
+        <svg width="16" height="16"><use xlink:href="#icon-settings-2-line" /></svg>
+        <span class="ml-2 text-sm">Settings</span>
+      <% end %>
+      <svg class="ml-auto w-4 h-4 transition-transform duration-200 group-open:rotate-180" viewBox="0 0 20 20" fill="currentColor">
+        <path fill-rule="evenodd" d="M5.293 7.293a1 1 0 011.414 0L10 10.586l3.293-3.293a1 1 0 111.414 1.414l-4 4a1 1 0 01-1.414 0l-4-4a1 1 0 010-1.414z" clip-rule="evenodd" />
+      </svg>
+    </summary>
+    <ul class="ml-4 mt-1">
+      <% settings_pages.each do |_feature_key, attrs| %>
+        <% url = super_admin_app_config_url(config: attrs['config_key']) %>
+        <li class="px-4 mb-1">
+          <% text_class = current_page?(url) ? 'text-woot-500 bg-slate-25' : 'text-slate-800' %>
+          <%= link_to url, class: text_class + ' -ml-1 flex items-center px-2 py-1.5 hover:text-woot-500 hover:bg-slate-25 rounded-lg' do %>
+            <span class="ml-2 text-sm"><%= attrs['name'] %></span>
+          <% end %>
+        </li>
+      <% end %>
+    </ul>
+  </details>
+</li>
diff --git a/app/views/super_admin/settings/_upgrade_button_community.html.erb b/app/views/super_admin/settings/_upgrade_button_community.html.erb
new file mode 100644
index 000000000..b80ee44c8
--- /dev/null
+++ b/app/views/super_admin/settings/_upgrade_button_community.html.erb
@@ -0,0 +1,4 @@
+<span class="flex gap-1 items-center bg-slate-100 h-9 border border-solid border-slate-100 rounded text-n-slate-11 font-medium p-2">
+  <svg class="h-4 w-4" width="24" height="24" fill="none" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M13.209 3.103c-.495-1.004-1.926-1.004-2.421 0L8.43 7.88l-5.273.766c-1.107.161-1.55 1.522-.748 2.303l3.815 3.72-.9 5.25c-.19 1.103.968 1.944 1.959 1.424l4.715-2.48 4.716 2.48c.99.52 2.148-.32 1.96-1.424l-.902-5.25 3.816-3.72c.8-.78.359-2.142-.748-2.303l-5.273-.766-2.358-4.777ZM9.74 8.615l2.258-4.576 2.259 4.576a1.35 1.35 0 0 0 1.016.738l5.05.734-3.654 3.562a1.35 1.35 0 0 0-.388 1.195l.862 5.03-4.516-2.375a1.35 1.35 0 0 0-1.257 0l-4.516 2.374.862-5.029a1.35 1.35 0 0 0-.388-1.195l-3.654-3.562 5.05-.734c.44-.063.82-.34 1.016-.738ZM1.164 3.782a.75.75 0 0 0 .118 1.054l2.5 2a.75.75 0 1 0 .937-1.172l-2.5-2a.75.75 0 0 0-1.055.118Z" fill="currentColor"/><path d="M22.836 18.218a.75.75 0 0 0-.117-1.054l-2.5-2a.75.75 0 0 0-.938 1.172l2.5 2a.75.75 0 0 0 1.055-.117ZM1.282 17.164a.75.75 0 1 0 .937 1.172l2.5-2a.75.75 0 0 0-.937-1.172l-2.5 2ZM22.836 3.782a.75.75 0 0 1-.117 1.054l-2.5 2a.75.75 0 0 1-.938-1.172l-2.5-2a.75.75 0 0 1 1.055.118Z"  fill="currentColor"/></svg>
+  <span class="px-1">Switch to Enterprise edition</span>
+</span>
diff --git a/app/views/super_admin/settings/_upgrade_button_enterprise.html.erb b/app/views/super_admin/settings/_upgrade_button_enterprise.html.erb
new file mode 100644
index 000000000..4fbd96367
--- /dev/null
+++ b/app/views/super_admin/settings/_upgrade_button_enterprise.html.erb
@@ -0,0 +1,4 @@
+<a href="<%= ChatwootHub.billing_url %>" target="_blank" rel="noopener noreferrer" class="flex gap-1 items-center bg-slate-100 h-9 hover:bg-slate-300 hover:text-n-slate-12 border border-solid border-slate-100 rounded text-n-slate-11 font-medium p-2 focus:outline-none">
+  <svg class="h-4 w-4" width="24" height="24" fill="none" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M13.209 3.103c-.495-1.004-1.926-1.004-2.421 0L8.43 7.88l-5.273.766c-1.107.161-1.55 1.522-.748 2.303l3.815 3.72-.9 5.25c-.19 1.103.968 1.944 1.959 1.424l4.715-2.48 4.716 2.48c.99.52 2.148-.32 1.96-1.424l-.902-5.25 3.816-3.72c.8-.78.359-2.142-.748-2.303l-5.273-.766-2.358-4.777ZM9.74 8.615l2.258-4.576 2.259 4.576a1.35 1.35 0 0 0 1.016.738l5.05.734-3.654 3.562a1.35 1.35 0 0 0-.388 1.195l.862 5.03-4.516-2.375a1.35 1.35 0 0 0-1.257 0l-4.516 2.374.862-5.029a1.35 1.35 0 0 0-.388-1.195l-3.654-3.562 5.05-.734c.44-.063.82-.34 1.016-.738ZM1.164 3.782a.75.75 0 0 0 .118 1.054l2.5 2a.75.75 0 1 0 .937-1.172l-2.5-2a.75.75 0 0 0-1.055.118Z" fill="currentColor"/><path d="M22.836 18.218a.75.75 0 0 0-.117-1.054l-2.5-2a.75.75 0 0 0-.938 1.172l2.5 2a.75.75 0 0 0 1.055-.117ZM1.282 17.164a.75.75 0 1 0 .937 1.172l2.5-2a.75.75 0 0 0-.937-1.172l-2.5 2ZM22.836 3.782a.75.75 0 0 1-.117 1.054l-2.5 2a.75.75 0 0 1-.938-1.172l-2.5-2a.75.75 0 0 1 1.055.118Z"  fill="currentColor"/></svg>
+  <span class="px-1">Upgrade now</span>
+</a>
diff --git a/app/views/super_admin/settings/show.html.erb b/app/views/super_admin/settings/show.html.erb
index 4c15cbdab..fd424ed90 100644
--- a/app/views/super_admin/settings/show.html.erb
+++ b/app/views/super_admin/settings/show.html.erb
@@ -39,24 +39,26 @@
         </button>
       </div>
     </div>
-    <div class="flex p-4 outline outline-1 outline-n-container rounded-lg items-start md:items-center shadow-sm flex-col md:flex-row">
-      <div class="flex flex-col flex-grow gap-1">
-        <div class="flex items-center gap-2">
-          <h2 class="h-5 leading-5 text-n-slate-12 text-sm font-medium">Current plan</h2>
-          <a href="<%= refresh_super_admin_settings_url %>" class="inline-flex gap-1 text-xs font-medium items-center text-woot-500 hover:text-woot-700">
-            <svg width="16" height="16"><use xlink:href="#icon-refresh-line" /></svg>
-            <span>Refresh</span>
-          </a>
+    <% if ChatwootApp.enterprise? %>
+      <div class="flex p-4 outline outline-1 outline-n-container rounded-lg items-start md:items-center shadow-sm flex-col md:flex-row">
+        <div class="flex flex-col flex-grow gap-1">
+          <div class="flex items-center gap-2">
+            <h2 class="h-5 leading-5 text-n-slate-12 text-sm font-medium">Current plan</h2>
+            <a href="<%= refresh_super_admin_settings_url %>" class="inline-flex gap-1 text-xs font-medium items-center text-woot-500 hover:text-woot-700">
+              <svg width="16" height="16"><use xlink:href="#icon-refresh-line" /></svg>
+              <span>Refresh</span>
+            </a>
+          </div>
+          <p class="text-n-slate-11 m-0 text-sm"><%= SuperAdmin::FeaturesHelper.plan_details.html_safe %></p>
         </div>
-        <p class="text-n-slate-11 m-0 text-sm"><%= SuperAdmin::FeaturesHelper.plan_details.html_safe %></p>
+        <a href="<%= ChatwootHub.billing_url %>" target="_blank" rel="noopener noreferrer">
+          <button class="mt-4 md:mt-0 flex gap-1 items-center bg-transparent shadow-sm h-9 hover:text-n-slate-12 hover:bg-slate-50 outline outline-1 outline-n-container rounded text-n-slate-11 font-medium p-2 focus:outline-none">
+            <svg width="16" height="16"><use xlink:href="#icon-settings-2-line" /></svg>
+            <span class="px-1">Manage</span>
+          </button>
+        </a>
       </div>
-      <a href="<%= ChatwootHub.billing_url %>" target="_blank" rel="noopener noreferrer">
-        <button class="mt-4 md:mt-0 flex gap-1 items-center bg-transparent shadow-sm h-9 hover:text-n-slate-12 hover:bg-slate-50 outline outline-1 outline-n-container rounded text-n-slate-11 font-medium p-2 focus:outline-none">
-          <svg width="16" height="16"><use xlink:href="#icon-settings-2-line" /></svg>
-          <span class="px-1">Manage</span>
-        </button>
-      </a>
-    </div>
+    <% end %>
 
     <% if ChatwootHub.pricing_plan != 'community' &&  User.count > ChatwootHub.pricing_plan_quantity %>
     <div role="alert">
@@ -99,10 +101,11 @@
           </div>
           <% if !attrs[:enabled] %>
           <div class="flex h-9 absolute top-5 items-center invisible group-hover:visible">
-            <a href="<%= ChatwootHub.billing_url %>" target="_blank" rel="noopener noreferrer" class="flex gap-1 items-center bg-slate-100 h-9 hover:bg-slate-300 hover:text-n-slate-12 border border-solid border-slate-100 rounded text-n-slate-11 font-medium p-2 focus:outline-none">
-              <svg class="h-4 w-4" width="24" height="24" fill="none" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M13.209 3.103c-.495-1.004-1.926-1.004-2.421 0L8.43 7.88l-5.273.766c-1.107.161-1.55 1.522-.748 2.303l3.815 3.72-.9 5.25c-.19 1.103.968 1.944 1.959 1.424l4.715-2.48 4.716 2.48c.99.52 2.148-.32 1.96-1.424l-.902-5.25 3.816-3.72c.8-.78.359-2.142-.748-2.303l-5.273-.766-2.358-4.777ZM9.74 8.615l2.258-4.576 2.259 4.576a1.35 1.35 0 0 0 1.016.738l5.05.734-3.654 3.562a1.35 1.35 0 0 0-.388 1.195l.862 5.03-4.516-2.375a1.35 1.35 0 0 0-1.257 0l-4.516 2.374.862-5.029a1.35 1.35 0 0 0-.388-1.195l-3.654-3.562 5.05-.734c.44-.063.82-.34 1.016-.738ZM1.164 3.782a.75.75 0 0 0 .118 1.054l2.5 2a.75.75 0 1 0 .937-1.172l-2.5-2a.75.75 0 0 0-1.055.118Z" fill="currentColor"/><path d="M22.836 18.218a.75.75 0 0 0-.117-1.054l-2.5-2a.75.75 0 0 0-.938 1.172l2.5 2a.75.75 0 0 0 1.055-.117ZM1.282 17.164a.75.75 0 1 0 .937 1.172l2.5-2a.75.75 0 0 0-.937-1.172l-2.5 2ZM22.836 3.782a.75.75 0 0 1-.117 1.054l-2.5 2a.75.75 0 0 1-.938-1.172l2.5-2a.75.75 0 0 1 1.055.118Z"  fill="currentColor"/></svg>
-              <span class="px-1">Upgrade now</span>
-            </a>
+            <% if ChatwootApp.enterprise? %>
+              <%= render 'upgrade_button_enterprise' %>
+            <% else %>
+              <%= render 'upgrade_button_community' %>
+            <% end %>
           </div>
           <% end %>
           <div class="flex items-center justify-between mb-1.5 mt-4">
diff --git a/config/installation_config.yml b/config/installation_config.yml
index b17d3cec0..2e8d94a96 100644
--- a/config/installation_config.yml
+++ b/config/installation_config.yml
@@ -87,11 +87,14 @@
 
 # ------- Email Related Config ------- #
 - name: MAILER_INBOUND_EMAIL_DOMAIN
+  display_title: 'Inbound Email Domain'
   value:
   description: 'The domain name to be used for generating conversation continuity emails (reply+id@domain.com)'
   locked: false
 - name: MAILER_SUPPORT_EMAIL
+  display_title: 'Support Email'
   value:
+  description: 'The support email address for your installation'
   locked: false
 # ------- End of Email Related Config ------- #
 
@@ -394,3 +397,22 @@
   locked: false
   type: secret
 # ------- End of OG Image Related Config ------- #
+
+## ------ Configs added for Google OAuth ------ ##
+- name: GOOGLE_OAUTH_CLIENT_ID
+  display_title: 'Google OAuth Client ID'
+  value:
+  locked: false
+  description: 'Google OAuth Client ID for email authentication'
+- name: GOOGLE_OAUTH_CLIENT_SECRET
+  display_title: 'Google OAuth Client Secret'
+  value:
+  locked: false
+  description: 'Google OAuth Client Secret for email authentication'
+  type: secret
+- name: GOOGLE_OAUTH_REDIRECT_URI
+  display_title: 'Google OAuth Redirect URI'
+  value:
+  locked: false
+  description: 'The redirect URI configured in your Google OAuth app'
+## ------ End of Configs added for Google OAuth ------ ##
diff --git a/lib/chatwoot_hub.rb b/lib/chatwoot_hub.rb
index 0d99becd3..c18fb299b 100644
--- a/lib/chatwoot_hub.rb
+++ b/lib/chatwoot_hub.rb
@@ -19,10 +19,14 @@ class ChatwootHub
   end
 
   def self.pricing_plan
+    return 'community' unless ChatwootApp.enterprise?
+
     InstallationConfig.find_by(name: 'INSTALLATION_PRICING_PLAN')&.value || 'community'
   end
 
   def self.pricing_plan_quantity
+    return 0 unless ChatwootApp.enterprise?
+
     InstallationConfig.find_by(name: 'INSTALLATION_PRICING_PLAN_QUANTITY')&.value || 0
   end
 

From fcd604dcde3627cfe29e7d198a84406dd0c89c96 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Wed, 16 Jul 2025 10:09:46 +0530
Subject: [PATCH 19/20] chore: Make `captain_integration_v2` an internal
 feature (#11953)

---
 config/features.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/features.yml b/config/features.yml
index 85b95a732..4706c46f0 100644
--- a/config/features.yml
+++ b/config/features.yml
@@ -180,6 +180,7 @@
   display_name: Captain V2
   enabled: false
   premium: true
+  chatwoot_internal: true
 - name: whatsapp_embedded_signup
   display_name: WhatsApp Embedded Signup
   enabled: false

From 090316a078f41b9621bcda9c92661d1ce3fbf57e Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Wed, 16 Jul 2025 00:09:26 -0700
Subject: [PATCH 20/20]  Bump version to 4.4.0

---
 config/app.yml | 2 +-
 package.json   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/app.yml b/config/app.yml
index 6ba134f19..e6fc39be3 100644
--- a/config/app.yml
+++ b/config/app.yml
@@ -1,5 +1,5 @@
 shared: &shared
-  version: '4.3.0'
+  version: '4.4.0'
 
 development:
   <<: *shared
diff --git a/package.json b/package.json
index 1ca8d1025..e0fd2cf7b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@chatwoot/chatwoot",
-  "version": "4.3.0",
+  "version": "4.4.0",
   "license": "MIT",
   "scripts": {
     "eslint": "eslint app/**/*.{js,vue}",